0 files changed, 0 insertions, 0 deletions
diff --git a/.document b/.document
index ac7c493840..9a5067bc52 100644
--- a/.document
+++ b/.document
@@ -9,8 +9,6 @@
 # prelude
 prelude.rb
 
-rbconfig.rb
-
 # the lib/ directory (which has its own .document file)
 lib
 
@@ -22,7 +20,9 @@ ChangeLog
 
 NEWS
 
-README.md
-README.ja.md
+README
+README.EXT
+README.EXT.ja
+README.ja
 
 doc
diff --git a/.editorconfig b/.editorconfig
index f404977180..67abf4b978 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -14,7 +14,3 @@ end_of_line = crlf
 [**.rb]
 indent_style = space
 indent_size = 2
-
-[*.yml]
-indent_size = 2
-indent_style = space
diff --git a/.gdbinit b/.gdbinit
index ab6eac45d9..e2a34f3715 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -63,13 +63,7 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
     printf "%sT_OBJECT%s: ", $color_type, $color_end
-    print ((struct RObject *)($arg0))->basic
-    if ($flags & ROBJECT_EMBED)
-      print/x *((VALUE*)((struct RObject*)($arg0))->as.ary) @ (ROBJECT_EMBED_LEN_MAX+0)
-    else
-      print (((struct RObject *)($arg0))->as.heap)
-      print/x *(((struct RObject*)($arg0))->as.heap.ivptr) @ (((struct RObject*)($arg0))->as.heap.numiv)
-    end
+    print (struct RObject *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
     printf "%sT_CLASS%s%s: ", $color_type, ($flags & RUBY_FL_SINGLETON) ? "*" : "", $color_end
@@ -218,7 +212,7 @@ define rp
   if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
     printf "%sT_SYMBOL%s: ", $color_type, $color_end
     print (struct RSymbol *)($arg0)
-    set $id_type = ((struct RSymbol *)($arg0))->id & RUBY_ID_SCOPE_MASK
+    set $id_type = ((struct RSymbol *)($arg0))->type
     if $id_type == RUBY_ID_LOCAL
       printf "l"
     else
@@ -251,12 +245,6 @@ define rp
     printf "%sT_UNDEF%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
-  if ($flags & RUBY_T_MASK) == RUBY_T_IMEMO
-    printf "%sT_IMEMO%s(", $color_type, $color_end
-    output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&imemo_mask)
-    printf "): "
-    rp_imemo $arg0
-  else
   if ($flags & RUBY_T_MASK) == RUBY_T_NODE
     printf "%sT_NODE%s(", $color_type, $color_end
     output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
@@ -301,7 +289,6 @@ define rp
   end
   end
   end
-  end
 end
 document rp
   Print a Ruby's VALUE.
@@ -391,9 +378,9 @@ define rp_id
       end
     end
     printf "(%ld): ", $id
-    set $str = lookup_id_str($id)
-    if $str
-      rp_string $str
+    rb_numtable_entry global_symbols.id_str $id
+    if $rb_numtable_rec
+      rp_string $rb_numtable_rec
     else
       echo undef\n
     end
@@ -419,13 +406,6 @@ document rp_id
   Print an ID.
 end
 
-define output_string
-  set $flags = ((struct RBasic*)($arg0))->flags
-  printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \
-	    ((struct RString*)($arg0))->as.heap.ptr : \
-	    ((struct RString*)($arg0))->as.ary)
-end
-
 define rp_string
   set $flags = ((struct RBasic*)($arg0))->flags
   set print address off
@@ -468,62 +448,18 @@ end
 
 define rp_class
   printf "(struct RClass *) %p", (void*)$arg0
-  if ((struct RClass *)($arg0))->ptr.origin_ != $arg0
-    printf " -> %p", ((struct RClass *)($arg0))->ptr.origin_
+  if ((struct RClass *)($arg0))->ptr.origin != $arg0
+    printf " -> %p", ((struct RClass *)($arg0))->ptr.origin
   end
   printf "\n"
   rb_classname $arg0
-  print/x *(struct RClass *)($arg0)
+  print *(struct RClass *)($arg0)
   print *((struct RClass *)($arg0))->ptr
 end
 document rp_class
   Print the content of a Class/Module.
 end
 
-define rp_imemo
-  set $flags = (enum imemo_type)((((struct RBasic *)($arg0))->flags >> RUBY_FL_USHIFT) & imemo_mask)
-  if $flags == imemo_cref
-    printf "(rb_cref_t *) %p\n", (void*)$arg0
-    print *(rb_cref_t *)$arg0
-  else
-  if $flags == imemo_svar
-    printf "(struct vm_svar *) %p\n", (void*)$arg0
-    print *(struct vm_svar *)$arg0
-  else
-  if $flags == imemo_throw_data
-    printf "(struct vm_throw_data *) %p\n", (void*)$arg0
-    print *(struct vm_throw_data *)$arg0
-  else
-  if $flags == imemo_ifunc
-    printf "(struct vm_ifunc *) %p\n", (void*)$arg0
-    print *(struct vm_ifunc *)$arg0
-  else
-  if $flags == imemo_memo
-    printf "(struct MEMO *) %p\n", (void*)$arg0
-    print *(struct MEMO *)$arg0
-  else
-  if $flags == imemo_ment
-    printf "(rb_method_entry_t *) %p\n", (void*)$arg0
-    print *(rb_method_entry_t *)$arg0
-  else
-  if $flags == imemo_iseq
-    printf "(rb_iseq_t *) %p\n", (void*)$arg0
-    print *(rb_iseq_t *)$arg0
-  else
-    printf "(struct RIMemo *) %p\n", (void*)$arg0
-    print *(struct RIMemo *)$arg0
-  end
-  end
-  end
-  end
-  end
-  end
-  end
-end
-document rp_imemo
-  Print the content of a memo
-end
-
 define nd_type
   print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
 end
@@ -802,12 +738,6 @@ define nd_tval
   rp ($arg0).u2.value
 end
 
-define nd_tree
-  set $buf = (struct RString *)rb_str_buf_new(0)
-  call dump_node((VALUE)($buf), rb_str_new(0, 0), 0, ($arg0))
-  printf "%s\n", $buf->as.heap.ptr
-end
-
 define rb_p
   call rb_p($arg0)
 end
@@ -875,7 +805,8 @@ end
 
 define rb_classname
   # up to 128bit int
-  set $rb_classname = rb_mod_name($arg0)
+  set $rb_classname_permanent = "0123456789ABCDEF"
+  set $rb_classname = classname($arg0, $rb_classname_permanent)
   if $rb_classname != RUBY_Qnil
     rp $rb_classname
   else
@@ -932,246 +863,33 @@ end
 
 define rb_ps_vm
   print $ps_vm = (rb_vm_t*)$arg0
-  set $ps_thread_ln = $ps_vm->living_threads.n.next
-  set $ps_thread_ln_last = $ps_vm->living_threads.n.prev
-  while 1
-    set $ps_thread_th = (rb_thread_t *)$ps_thread_ln
-    set $ps_thread = (VALUE)($ps_thread_th->self)
-    rb_ps_thread $ps_thread
-    if $ps_thread_ln == $ps_thread_ln_last
-      loop_break
+  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->as.packed.entries[$ps_threads_i].key
+      set $ps_threads_val = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].val
+      rb_ps_thread $ps_threads_key $ps_threads_val
+      set $ps_threads_i = $ps_threads_i + 1
     end
-    set $ps_thread_ln = $ps_thread_ln->next
-  end
-end
-document rb_ps_vm
-Dump all threads in a (rb_vm_t*) and their callstacks
-end
-
-define print_lineno
-  set $cfp = $arg0
-  set $iseq = $cfp->iseq
-  set $pos = $cfp->pc - $iseq->body->iseq_encoded
-  if $pos != 0
-    set $pos = $pos - 1
-  end
-
-  set $i = 0
-  set $size = $iseq->body->line_info_size
-  set $table = $iseq->body->line_info_table
-  #printf "size: %d\n", $size
-  if $size == 0
   else
-    set $i = 1
-    while $i < $size
-      #printf "table[%d]: position: %d, line: %d, pos: %d\n", $i, $table[$i].position, $table[$i].line_no, $pos
-      if $table[$i].position > $pos
-        loop_break
-      end
-      set $i = $i + 1
-      if $table[$i].position == $pos
-        loop_break
-      end
-    end
-    printf "%d", $table[$i-1].line_no
-  end
-end
-
-define check_method_entry
-  # get $immeo and $can_be_svar and return $me
-  set $imemo = (struct RBasic *)$arg0
-  set $can_be_svar = $arg1
-  if $imemo != RUBY_Qfalse
-    set $type = ($imemo->flags >> 12) & 0x07
-    if $type == imemo_ment
-      set $me = (rb_callable_method_entry_t *)$imemo
-    else
-    if $type == imemo_svar
-      set $imemo == ((struct vm_svar *)$imemo)->cref_or_me
-      check_method_entry $imemo 0
-    end
+    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
-
-define output_id
-  set $id = $arg0
-  # rb_id_to_serial
-  if $id > tLAST_OP_ID
-    set $serial = (rb_id_serial_t)($id >> RUBY_ID_SCOPE_SHIFT)
-  else
-    set $serial = (rb_id_serial_t)$id
-  end
-  if $serial && $serial <= global_symbols.last_id
-    set $idx = $serial / ID_ENTRY_UNIT
-    set $ids = (struct RArray *)global_symbols.ids
-    set $flags = $ids->basic.flags
-    if ($flags & RUBY_FL_USER1)
-      set $idsptr = $ids->as.ary
-      set $idslen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
-    else
-      set $idsptr = $ids->as.heap.ptr
-      set $idslen = $ids->as.heap.len
-    end
-    if $idx < $idslen
-      set $t = 0
-      set $ary = (struct RArray *)$idsptr[$idx]
-      if $ary != RUBY_Qnil
-        set $flags = $ary->basic.flags
-        if ($flags & RUBY_FL_USER1)
-          set $aryptr = $ary->as.ary
-          set $arylen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
-        else
-          set $aryptr = $ary->as.heap.ptr
-          set $arylen = $ary->as.heap.len
-        end
-        set $result = $aryptr[($serial % ID_ENTRY_UNIT) * ID_ENTRY_SIZE + $t]
-        output_string $result
-      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_th = (rb_thread_t*)$ps_thread->data
-  printf "* #<Thread:%p rb_thread_t:%p native_thread:%p>\n", \
-    $ps_thread, $ps_thread_th, $ps_thread_th->thread_id
-  set $cfp = $ps_thread_th->cfp
-  set $cfpend = (rb_control_frame_t *)($ps_thread_th->stack + $ps_thread_th->stack_size)-1
-  while $cfp < $cfpend
-    if $cfp->iseq
-      if $cfp->pc
-        set $location = $cfp->iseq->body->location
-        output_string $location.path
-        printf ":"
-        print_lineno $cfp
-        printf ":in `"
-        output_string $location.label
-        printf "'\n"
-      else
-        printf "???.rb:???:in `???'\n"
-      end
-    else
-      # if VM_FRAME_TYPE($cfp->flag) == VM_FRAME_MAGIC_CFUNC
-      set $ep = $cfp->ep
-      if ($ep[0] & 0xffff0001) == 0x55550001
-        #define VM_ENV_FLAG_LOCAL 0x02
-        #define VM_ENV_PREV_EP(ep)   GC_GUARDED_PTR_REF(ep[VM_ENV_DATA_INDEX_SPECVAL])
-        set $me = 0
-        set $env_specval = $ep[-1]
-        set $env_me_cref = $ep[-2]
-        while ($env_specval & 0x02) != 0
-          check_method_entry $env_me_cref 0
-          if $me != 0
-            loop_break
-          end
-          set $ep = $ep[0]
-          set $env_specval = $ep[-1]
-          set $env_me_cref = $ep[-2]
-        end
-        if $me == 0
-          check_method_entry $env_me_cref 1
-        end
-        set print symbol-filename on
-        output/a $me->def->body.cfunc.func
-        set print symbol-filename off
-        set $mid = $me->def->original_id
-        printf ":in `"
-        output_id $mid
-        printf "'\n"
-      else
-        printf "unknown_frame:???:in `???'\n"
-      end
-    end
-    set $cfp = $cfp + 1
-  end
-end
-
-define rb_count_objects
-  set $objspace = ruby_current_vm->objspace
-  set $counts_00 = 0
-  set $counts_01 = 0
-  set $counts_02 = 0
-  set $counts_03 = 0
-  set $counts_04 = 0
-  set $counts_05 = 0
-  set $counts_06 = 0
-  set $counts_07 = 0
-  set $counts_08 = 0
-  set $counts_09 = 0
-  set $counts_0a = 0
-  set $counts_0b = 0
-  set $counts_0c = 0
-  set $counts_0d = 0
-  set $counts_0e = 0
-  set $counts_0f = 0
-  set $counts_10 = 0
-  set $counts_11 = 0
-  set $counts_12 = 0
-  set $counts_13 = 0
-  set $counts_14 = 0
-  set $counts_15 = 0
-  set $counts_16 = 0
-  set $counts_17 = 0
-  set $counts_18 = 0
-  set $counts_19 = 0
-  set $counts_1a = 0
-  set $counts_1b = 0
-  set $counts_1c = 0
-  set $counts_1d = 0
-  set $counts_1e = 0
-  set $counts_1f = 0
-  set $total = 0
-  set $i = 0
-  while $i < $objspace->heap_pages.allocated_pages
-    printf "\rcounting... %d/%d", $i, $objspace->heap_pages.allocated_pages
-    set $page = $objspace->heap_pages.sorted[$i]
-    set $p = $page->start
-    set $pend = $p + $page->total_slots
-    while $p < $pend
-      set $flags = $p->as.basic.flags & 0x1f
-      eval "set $counts_%02x = $counts_%02x + 1", $flags, $flags
-      set $p = $p + 1
-    end
-    set $total = $total + $page->total_slots
-    set $i = $i + 1
-  end
-  printf "\rTOTAL: %d, FREE: %d\n", $total, $counts_00
-  printf "T_OBJECT: %d\n", $counts_01
-  printf "T_CLASS: %d\n", $counts_02
-  printf "T_MODULE: %d\n", $counts_03
-  printf "T_FLOAT: %d\n", $counts_04
-  printf "T_STRING: %d\n", $counts_05
-  printf "T_REGEXP: %d\n", $counts_06
-  printf "T_ARRAY: %d\n", $counts_07
-  printf "T_HASH: %d\n", $counts_08
-  printf "T_STRUCT: %d\n", $counts_09
-  printf "T_BIGNUM: %d\n", $counts_0a
-  printf "T_FILE: %d\n", $counts_0b
-  printf "T_DATA: %d\n", $counts_0c
-  printf "T_MATCH: %d\n", $counts_0d
-  printf "T_COMPLEX: %d\n", $counts_0e
-  printf "T_RATIONAL: %d\n", $counts_0f
-  #printf "UNKNOWN_10: %d\n", $counts_10
-  printf "T_NIL: %d\n", $counts_11
-  printf "T_TRUE: %d\n", $counts_12
-  printf "T_FALSE: %d\n", $counts_13
-  printf "T_SYMBOL: %d\n", $counts_14
-  printf "T_FIXNUM: %d\n", $counts_15
-  printf "T_UNDEF: %d\n", $counts_16
-  #printf "UNKNOWN_17: %d\n", $counts_17
-  #printf "UNKNOWN_18: %d\n", $counts_18
-  #printf "UNKNOWN_19: %d\n", $counts_19
-  printf "T_IMEMO: %d\n", $counts_1a
-  printf "T_NODE: %d\n", $counts_1b
-  printf "T_ICLASS: %d\n", $counts_1c
-  printf "T_ZOMBIE: %d\n", $counts_1d
-  #printf "UNKNOWN_1E: %d\n", $counts_1e
-  printf "T_MASK: %d\n", $counts_1f
-end
-document rb_count_objects
-  Counts all objects grouped by type.
+  set $ps_thread_id = $arg1
+  print $ps_thread_th = (rb_thread_t*)$ps_thread->data
 end
 
 # Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
@@ -1190,26 +908,3 @@ define SDR
   call rb_vmdebug_stack_dump_raw_current()
 end
 
-define rbi
-  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_LABEL
-    p *(LABEL*)$arg0
-  else
-  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_INSN
-    p *(INSN*)$arg0
-  else
-  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_ADJUST
-    p *(ADJUST*)$arg0
-  else
-    print *$arg0
-  end
-  end
-  end
-end
-
-define dump_node
-  set $str = rb_parser_dump_tree($arg0, 0)
-  set $flags = ((struct RBasic*)($str))->flags
-  printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \
-                        ((struct RString*)$str)->as.heap.ptr : \
-                        ((struct RString*)$str)->as.ary)
-end
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index d9785fad00..0000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,5 +0,0 @@
-*.gemspec diff=ruby
-*.rb diff=ruby
-bin/* diff=ruby
-tool/update-deps diff=ruby
-tool/make-snapshot diff=ruby
diff --git a/.gitignore b/.gitignore
index 165f313e84..9515852837 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,17 @@
 *-*-*.def
-*-*-*.exp
-*-*-*.lib
 *.a
 *.bak
-*.bc
 *.dSYM
 *.dmyh
 *.dylib
 *.elc
-*.i
 *.inc
 *.log
 *.o
-*.obj
 *.orig
-*.pdb
 *.rej
-*.s
 *.sav
 *.swp
-*.yarb
 *~
 .*-*
 .*.list
@@ -32,18 +24,13 @@
 .svn
 Makefile
 Makefile.old
-cygruby*.def
 extconf.h
 y.output
 y.tab.c
 
 # /
 /*-fake.rb
-/*.dll
-/*.exe
-/*.res
 /*.pc
-/*.rc
 /*_prelude.c
 /COPYING.LIB
 /ChangeLog-*
@@ -69,8 +56,6 @@ y.tab.c
 /config.status.lineno
 /configure
 /coverage/simplecov
-/coverage/simplecov-html
-/coverage/doclie
 /coverage/.last_run.json
 /coverage/.resultset.json*
 /coverage/assets
@@ -105,8 +90,6 @@ y.tab.c
 /riscos
 /rubicon
 /ruby
-/ruby-runner
-/ruby-runner.h
 /ruby-man.rd.gz
 /sizes.c
 /test.rb
@@ -114,7 +97,6 @@ y.tab.c
 /transdb.h
 /uncommon.mk
 /verconf.h
-/verconf.mk
 /web
 /yasmdata.rb
 
@@ -123,25 +105,12 @@ y.tab.c
 /benchmark/fasta.output.*
 /benchmark/wc.input
 
-/enc/*.def
-/enc/*.exp
-/enc/*.lib
-/enc/unicode/data/*/*.txt
-
 # /enc/trans/
 /enc/trans/*.c
-/enc/trans/*.def
-/enc/trans/*.exp
-/enc/trans/*.lib
-/enc/trans/.time
 
 # /ext/
 /ext/extinit.c
 
-# /ext/-test-/win32/dln/
-/ext/-test-/win32/dln/dlntest.exp
-/ext/-test-/win32/dln/dlntest.lib
-
 # /ext/dl/callback/
 /ext/dl/callback/callback-*.c
 /ext/dl/callback/callback.c
@@ -149,9 +118,6 @@ y.tab.c
 # /ext/etc/
 /ext/etc/constdefs.h
 
-# /ext/fiddle/
-/ext/fiddle/libffi-*
-
 # /ext/rbconfig/
 /ext/rbconfig/sizeof/sizes.c
 
@@ -167,6 +133,9 @@ y.tab.c
 /ext/socket/constdefs.h
 /ext/socket/constdefs.c
 
+# /ext/tk/
+/ext/tk/config_list
+
 # /gems
 /gems/*.gem
 
diff --git a/.travis.yml b/.travis.yml
index e061f959a8..d39c72b0f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,66 +16,71 @@
 #
 # is also a good place to look at.
 
+# Language specification.
 language: c
 
-sudo: false
-
+# Compilers.  Several  compilers are  provided in Travis,  so we try  them all.
+# The value set here is visible via $CC environment variable.
 compiler:
   - gcc
+  - clang
 
-os:
-  - linux
-
+# Dependencies.  Some  header files are missing  in a Travis' worker  VM, so we
+# have  to install  them.  The  "1.9.1" here  is OK.   It is  the  most adopted
+# version string  for Debian/Ubuntu, and  no dependencies have been  changed so
+# far since the 1.9.1 release.
 before_install:
-  - "CONFIG_FLAG="
-  - "JOBS='-j 4'"
+  - "sudo apt-get -qq update"
+  - "sudo apt-get -qq install $CC" # upgrade if any
+install: "sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null"
 
+# Script is where the test runs.  Note  we just do "make test", not other tests
+# like  test-all, test-rubyspec.   This is  because  they take  too much  time,
+# enough for Travis to shut down the VM as being stalled.
 before_script:
   - "uname -a"
   - "uname -r"
   - "rm -fr .ext autom4te.cache"
-  - "echo $TERM"
-  - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files"
+  - "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
   - "autoconf"
   - "mkdir config_1st config_2nd"
-  - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
+  - "./configure -C --with-gcc=$CC"
   - "cp -pr config.status .ext/include config_1st"
   - "make reconfig"
   - "cp -pr config.status .ext/include config_2nd"
   - "diff -ru config_1st config_2nd"
-  - "make after-update BASERUBY=ruby"
-  - "make -s $JOBS"
-  - "make update-rubyspec"
-
+  - "make -sj encs"
+  - "make -sj exts"
 script:
-  - "make test TESTOPTS=--color=never"
-  - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'"
-  - "make test-rubyspec MSPECOPT=-fm"
+  - "make test OPTS=-v"
+  - "make test-all TESTS='-qv -j2'"
 
 # Branch matrix.  Not all branches are Travis-ready so we limit branches here.
 branches:
   only:
     - trunk
+    - ruby_1_9_3
+    - ruby_2_0_0
     - ruby_2_1
     - ruby_2_2
-    - ruby_2_3
-    - /^feature\//
-    - /^bug\//
 
 # We want to be notified when something happens.
 notifications:
   irc:
     channels:
-      - "chat.freenode.net#ruby-core"
-      - "chat.freenode.net#ruby-ja"
+      - "irc.freenode.org#ruby-core"
+      - "irc.freenode.org#ruby-ja"
     on_success: change # [always|never|change] # default: always
-    on_failure: always # [always|never|change] # default: always
+    on_failure: change # [always|never|change] # default: always
     template:
       - "%{message} by @%{author}: See %{build_url}"
 
-  email:
-    - ko1c-failure@atdot.net
-    - shibata.hiroshi@gmail.com
+  # Update ruby-head installed on Travis CI so other projects can test against it.
+  webhooks:
+    urls:
+      - "https://rubies.travis-ci.org/rebuild/ruby-head"
+    on_success: always
+    on_failure: never
 
 # Local Variables:
 # mode: YAML
diff --git a/COPYING b/COPYING
index 426810a7fb..a1f19ff99d 100644
--- a/COPYING
+++ b/COPYING
@@ -44,9 +44,9 @@ You can redistribute it and/or modify it under either the terms of the
      For the list of those files and their copying conditions, see the
      file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as
+  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,
+     copyright of the software, but belong to whomever generated them, 
      and may be sold commercially, and may be aggregated with this
      software.
 
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000000..dc0c1aed39
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,8211 @@
+Wed Sep 17 23:12:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/rfc3986_parser.rb: specify a regexp for :OPAQUE; generic.rb
+	  assumes it is present, and will refuse all values otherwise.
+	  by Matthew Draper <matthew@trebex.net>
+	  https://github.com/ruby/ruby/pull/718 fix GH-718
+
+Wed Sep 17 16:22:58 2014  Eric Wong  <e@80x24.org>
+
+	* ext/zlib/zlib.c (zlib_mem_alloc): check overflow
+
+Wed Sep 17 11:33:35 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof):
+	  added test for long long [fix GH-716]
+
+Wed Sep 17 11:09:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/rbinstall.rb: fixed invalid options with latest rubygems.
+	  https://github.com/rubygems/rubygems/issues/1013
+
+Tue Sep 16 19:19:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* benchmark/bm_app_aobench.rb: update outdated links to the
+	  original program.  [ruby-dev:48550] [Feature #10247]
+
+Tue Sep 16 01:06:40 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* reg*.c: Merge Onigmo 5.15.0 38a870960aa7370051a3544
+
+Mon Sep 15 16:21:10 2014  Eric Wong  <e@80x24.org>
+
+	* io.c (struct io_advise_struct): 32 => 24 bytes on 64-bit
+	* io.c (struct io_internal_writev_struct): 24 => 16 bytes on 64-bit
+	* process.c (struct waitpid_arg): ditto
+
+Mon Sep 15 10:29:25 2014  Natalie Weizenbaum  <nweiz@google.com>
+
+	* ext/pathname/lib/pathname.rb (SAME_PATHS):
+	  Pathname#relative_path_from uses String#casecmp to compare strings
+	  on case-insensitive filesystem platforms (e.g., Windows). This can
+	  return nil for strings with different encodings, and the code
+	  previously assumed that it always returned a Fixnum.  [Fix GH-713]
+
+Mon Sep 15 09:43:18 2014  Sho Hashimoto  <sho.hsmt@gmail.com>
+
+	* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo,
+	  SIZEOF_LONG_LON.  [Fix GH-714]
+
+Mon Sep 15 08:13:40 2014  Matthew Draper  <matthew@trebex.net>
+
+	* sprintf.c (rb_str_format): rational 'f' format works for more
+	  values.  [fix GH-717]
+
+Sun Sep 14 16:57:27 2014  Eric Wong  <e@80x24.org>
+
+	* template/vm.inc.tmpl: "insns.c" => "insns.def"
+	* tool/instruction.rb: typo fix
+
+Sun Sep 14 12:29:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_tracer.rb: fixed testcase for rubygems update.
+
+Sun Sep 14 12:29:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems:  Update to RubyGems 2.4.1 master(713ab65)
+	  Complete history at:
+	  https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216
+
+	* test/rubygems:  ditto.
+
+Sun Sep 14 11:03:24 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: update version
+	* ext/psych/psych.gemspec: ditto
+
+Sun Sep 14 08:43:37 2014  Eric Wong  <e@80x24.org>
+
+	* ccan/container_of/container_of.h (container_of_or_null): added
+	  [ccan 7ec5b8e06b2fd5fa98b1fcde1158c286d2d429d8] (David Gibson)
+
+Sun Sep 14 08:41:44 2014  Eric Wong  <e@80x24.org>
+
+	* ccan/list/list.h (list_del_init, list_node_init): new functions
+	  for multiple list_del() calls
+	  [ccan ec8654d94d3c5c47aa5f82698f7e8048c79765b1] (Rusty Russell)
+
+Sat Sep 13 22:19:26 2014  Bernard Potocki  <bernard.potocki@imanel.org>
+
+	* hash.c (rb_hash_aset): fix misleading example which may suggest
+	  that Hash.store will return self instead of value - Hash#store
+	  is returning value and update itself, as well as Hash#[]=.
+	  [Fix GH-715]
+
+Sat Sep 13 15:16:31 2014  Eric Wong  <e@80x24.org>
+
+	* class.c: use ALLOC(rb_subclass_entry_t)
+
+Sat Sep 13 14:14:00 2014  Eric Wong  <e@80x24.org>
+
+	* process.c (free_exec_arg): remove
+	  (memsize_exec_arg): ptr is never NULL
+	  (exec_arg_data_type): use RUBY_TYPED_DEFAULT_FREE
+
+	* variable.c (autoload_i_free): remove
+	  (autoload_data_i_type): use RUBY_TYPED_DEFAULT_FREE
+	  (autoload_memsize): ptr is never NULL
+
+	* vm_backtrace.c (location_free): remove
+	  (location_mark): ptr is never NULL
+	  (location_data_type): use RUBY_TYPED_DEFAULT_FREE
+	  (backtrace_mark): ditto
+	  (backtrace_free): ditto
+
+Sat Sep 13 13:43:07 2014  Eric Wong  <e@80x24.org>
+
+	* doc/NEWS-2.0.0: fix typo for default RUBY_FIBER_MACHINE_STACK_SIZE
+	  [ci skip]
+
+Sat Sep 13 11:16:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_event.c(ev_advise, ole_event_free,
+	  fev_s_allocate, fev_unadvise): avoid segmentation fault when COM
+	  server freed before calling Unadvise from WIN32OLE_EVENT object.
+	* ext/win32ole/win32ole.c: ditto.
+
+Sat Sep 13 09:47:44 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: use https for *.ruby-lang.org links
+
+Sat Sep 13 06:31:23 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (thread_alloc): remove needless volatile
+
+Sat Sep 13 06:13:55 2014  Eric Wong  <e@80x24.org>
+
+	* proc.c (proc_free): remove, use RUBY_TYPED_DEFAULT_FREE
+	  (proc_mark, proc_memsize): remove needless branching
+
+	* vm.c (env_free): remove, use RUBY_TYPED_DEFAULT_FREE
+	  (env_mark, env_memsize): remove needless branching
+
+Sat Sep 13 05:52:15 2014  Eric Wong  <e@80x24.org>
+
+	* proc.c (rb_proc_alloc): inline and move to vm.c
+	  (rb_proc_wrap): new wrapper function used by rb_proc_alloc
+	  (proc_dup): simplify alloc + copy + wrap operation
+	  [ruby-core:64994]
+
+	* vm.c (rb_proc_alloc): new inline function
+	  (rb_vm_make_proc): call rb_proc_alloc
+
+	* vm_core.h: remove rb_proc_alloc, add rb_proc_wrap
+
+	* benchmark/bm_vm2_newlambda.rb: short test to show difference
+
+Sat Sep 13 04:40:04 2014  Eric Wong  <e@80x24.org>
+
+	* process.c (Init_process): subclass Thread as Process::Waiter
+	  (rb_detach_process): use Process::Waiter instead of singleton class
+	  Thanks to headius and nobu. [Bug #10231]
+
+	* test/ruby/test_process.rb (test_process_detach): new test
+
+	* inits.c (rb_call_inits): call Init_Thread before Init_process to
+	  ensure Process::Waiter may be a subclass of Thread
+
+Fri Sep 12 18:14:28 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (env_alloc): inline to avoid extra zeroing
+	  tiny speedup [ruby-core:64980]
+
+Fri Sep 12 17:13:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_make, remove_method): ditto.
+
+Fri Sep 12 14:39:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: Upgraded to test-unit-3.0.1 and minitest-5.4.1
+
+Fri Sep 12 06:55:40 2014  Eric Wong  <e@80x24.org>
+
+	* string.c (Init_frozen_strings): use st_init_table_with_size
+
+Fri Sep 12 06:15:37 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (sym_find): remove Symbol.find because we have Symbol GC now.
+	  https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20140904Japan
+	  If you still want this, request again on Redmine. [Feature #7854]
+	  https://bugs.ruby-lang.org/issues/7854
+
+	* ext/-test-/symbol/init.c (sym_find): moved from string.c for tests.
+
+Fri Sep 12 04:24:03 2014  Eric Wong  <e@80x24.org>
+
+	* insns.def (once): define and use fake RUNNING_THREAD_ONCE_DONE
+	  pointer to indicate is->once.running_thread is done.
+
+	* vm_core.h (iseq_inline_storage_entry): remove done field,
+	  allowing the union to be reduced from 24=>16 bytes on 64-bit
+	  [Feature #10187]
+
+Thu Sep 11 20:10:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_thread_mark): use rb_gc_mark_values() to mark VM stack.
+
+Thu Sep 11 19:50:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_register_special_exception): make new function to
+	  make and register special exceptions.
+
+	* vm.c (rb_vm_mark): do not need to mark special exceptions
+	  because they are registered by rb_gc_register_mark_object().
+
+	* eval.c (Init_eval): use rb_vm_register_special_exception().
+
+	* gc.c (Init_GC): ditto.
+
+	* proc.c (Init_Proc): ditto.
+
+	* thread.c (Init_Thread): ditto.
+
+Thu Sep 11 19:32:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_mark_values): added.
+	  This function is similar to rb_gc_mark_locations(), but not
+	  conservative.
+
+	* internal.h: ditto.
+
+	* vm.c (env_mark): use rb_gc_mark_values() because env values should
+	  be Ruby VALUEs.
+
+Thu Sep 11 19:16:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_ptr): rename to gc_mark_set.
+
+	* gc.c (gc_mark): add gc_mark_ptr() to skip is_markable_object()
+	  check. gc_mark_maybe() can use gc_mark_ptr() directly because
+	  passed pointer is checked by is_pointer_to_heap().
+
+Thu Sep 11 18:40:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored temporary files and coverage results.
+
+Thu Sep 11 18:15:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored only simplecov.
+	* coverage/README: Added coverage docs.
+
+Thu Sep 11 17:25:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, gc.c: add new internal events
+	  RUBY_INTERNAL_EVENT_GC_ENTER and
+	  RUBY_INTERNAL_EVENT_GC_EXIT.
+
+	  When invoking GC process, GC_ENTER event is called.
+	  When exiting from GC process, GC_EXIT event is called.
+
+	  Incremental GC (incremental marking and lazy sweep) can call
+	  these events many times.
+
+	  For example (minor marking):
+	  (1) GC_ENTER
+	  - (2) GC_START (minor GC)
+	    (minor marking)
+	  - (3) GC_END_MARK
+	    (start lazy sweep)
+	  (4) GC_EXIT
+	    (ruby process)
+	  (5) GC_ENTER
+	    (lazy sweep)
+	  (6) GC_EXIT
+	    (ruby process)
+	    (... repeat (5), (6))
+	  (7) GC_ENTER
+	      (finish lazy sweep)
+	    - (8) GC_END_SWEEP
+	  (9) GC_EXIT
+
+	  2nd example (incremental major marking):
+	  (1) GC_ENTER
+	  - (2) GC_START (minor GC)
+	    (start incremental marking)
+	  (3) GC_EXIT
+	    (ruby process)
+	  (4) GC_ENTER
+	    (incremental marking)
+	  (5) GC_EXIT
+	     (ruby process)
+	     (... repeat (4), (5))
+	  (6) GC_ENTER
+	    (finish incremental marking)
+	  - (7) GC_END_MARK
+	    (start lazy sweep)
+	  (8) GC_EXIT
+	    (ruby process)
+	  (9) GC_ENTER
+	    (lazy sweep)
+	  (10) GC_EXIT
+	    (ruby process)
+	    (... repeat (9), (10))
+	  (11) GC_ENTER
+	    (finish lazy marking)
+	  - (12) GC_STOP_SWEEP
+	  (13) GC_EXIT
+
+	  These internal events enable to measure GC pause time completely.
+
+Thu Sep 11 17:04:54 2014  Eric Wong  <e@80x24.org>
+
+	* lib/benchmark.rb: remove CLOCK_MONOTONIC_RAW support
+	  Thanks to Vit Ondruch for reporting the issue on ARM.
+	  [Bug #10202]
+
+Thu Sep 11 14:31:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: freeze nil/true/false.
+	  [Feature #8923]
+
+	* gc.c (should_be_finalizable): check frozen after checkin FL_ABLE.
+
+	* object.c (rb_obj_taint): check
+	  OBJ_TAINTABLE(obj).
+
+	* object.c (rb_obj_freeze): remove immediate_frozen_tbl
+	  because all of immediate values are frozen. YAY!
+
+	* object.c (rb_obj_frozen_p): ditto.
+
+	* test/ruby/test_eval.rb: skip instance_variable_set for
+	  frozen objects.
+
+	* test/ruby/test_weakmap.rb: check ArgumentError instead of
+	  RuntimeError.
+
+Thu Sep 11 10:03:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(21b241a)
+
+Wed Sep 10 17:52:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_vm_addr2insn): rename to rb_vm_insn_addr2insn
+	  to clear what address.
+
+Wed Sep 10 16:22:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: fix condition.
+
+Wed Sep 10 15:29:46 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_call_info_t): ci->flag becomes 32-bit unsigned int
+	  ci->index becomes a 32-bit signed int (from signed long).
+	  Reorder for better packing on 64-bit, giving an 8 byte reduction
+	  from 104 to 96 bytes for each ci.
+	  [Feature #10187]
+
+	* compile.c (new_callinfo, setup_args, iseq_compile_each,
+	  iseq_build_from_ary_body): adjust for type changes
+
+	* vm_insnhelper.c (vm_getivar): ditto
+
+Wed Sep 10 15:07:35 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (rb_iseq_translate_threaded_code):
+	  modify in-place w/o copy
+	  (rb_vm_addr2insn): new function for debug
+	  (rb_iseq_original_iseq): ditto
+	  (iseq_set_sequence): assign iseq_encoded directly
+	  [Feature #10185]
+
+	* vm_core (rb_iseq_t): move original ->iseq to bottom
+
+	* iseq.c (iseq_free, iseq_free): adjust for new layout
+	  (rb_iseq_disasm): use original iseq for dump
+	  (iseq_data_to_ary): ditto
+	  (rb_iseq_line_trace_each): ditto
+	  (rb_iseq_build_for_ruby2cext): use iseq_encoded directly
+
+	* vm_dump.c (rb_vmdebug_debug_print_pre): use original iseq
+
+Wed Sep 10 15:00:11 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_mark): remove NULL check
+	  (time_memsize): ditto
+	  (time_free): remove, use RUBY_TYPED_DEFAULT_FREE instead
+	  [Feature #10219]
+
+Wed Sep 10 14:14:57 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (encs enc trans libencs libenc libtrans): force to run
+	  enk.mk because common.mk does not know the dependency, but enk.mk
+	  knows. [ruby-dev:48530] [Bug #10220]
+
+Wed Sep 10 11:59:10 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): update rdoc.
+
+Wed Sep 10 11:52:08 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): rename:
+	  * malloc_increase -> malloc_increase_bytes
+	  * malloc_limit -> malloc_increase_bytes_limit
+	  * oldmalloc_increase -> oldmalloc_increase_bytes
+	  * oldmalloc_limit -> oldmalloc_increase_bytes_limit
+	  ref: [Feature #9924]
+
+Wed Sep 10 11:45:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): rename `heap_used' to `heap_allocated_pages'.
+	  ref: [Feature #9924]
+
+	* test/ruby/test_gc.rb: add constraints test for gc stat information.
+
+Wed Sep 10 11:31:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): rename:
+	  * remembered_shady_object -> remembered_wb_unprotected_objects
+	  * remembered_shady_object_limit -> remembered_wb_unprotected_objects_limit
+	  * old_object -> old_objects
+	  * old_object_limit -> old_objects_limit
+	  ref: [Feature #9924]
+
+Wed Sep 10 11:12:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): support:
+	  * total_allocated_pages
+	  * total_freed_pages
+	  ref: [Feature #9924]
+
+Wed Sep 10 10:48:04 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: catch up last fix.
+
+Wed Sep 10 10:36:08 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_total_slot): rename objspace_available_slots.
+
+	* gc.c (objspace_live_slot, objspace_free_slot): rename
+	  ..._slot() to ..._slots().
+
+	* gc.c (objspace_free_slot): should subtract heap_pages_final_slots.
+
+	* gc.c (gc_stat_internal):
+	  * add `heap_available_slots' field
+	  * rename heap_live_slot to heap_live_slots
+	  * rename heap_free_slot to heap_free_slots
+	  ref: [Feature #9924]
+
+Wed Sep 10 07:22:53 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: refactoring for RGENGC_PROFILE > 0.
+
+	  * rename rb_objspace_t::profile::..._count
+	    to rb_objspace_t::profile::total_..._count
+	  * rename promote_infant_types to promote_types
+
+	* gc.c (gc_remember_unprotected): count remembered shady objects here.
+
+Wed Sep 10 03:12:12 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* gc.c (init_mark_stack): MEMZERO() receive type as 2nd argument instead
+	  of size.
+	  Coverity Scan found this bug.
+
+Tue Sep  9 21:55:39 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/sample/excel2.rb: remove some commented-out code.
+	  rotate graph more slowly to see graph clearly.
+
+Tue Sep  9 19:52:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename rb_objspace_t::marked_objects to marked_slots.
+
+	* gc.c (gc_marks_start): should be clear first.
+
+	* gc.c (gc_marks_start): remembered shady objects are also marked.
+
+	* gc.c (gc_stat_internal): add heap_marked_slots.
+
+Tue Sep  9 18:58:48 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename
+	  * total_allocated_object_num -> total_allocated_objects
+	  * total_allocated_object_num_at_gc_start -> total_allocated_objects_at_gc_start
+	  * total_freed_object_num -> total_freed_objects
+
+	* gc.c (gc_stat_internal):
+	  * rename total_allocated_object -> total_allocated_objects
+	  * rename total_freed_object -> total_freed_objects
+
+Tue Sep  9 18:51:36 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): fix symbol names
+	  * heap_final_slot -> heap_final_slots
+	  * heap_swept_slot -> heap_swept_slots
+
+Tue Sep  9 18:18:07 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_t::heap_pages): rename field names:
+	  * used -> allocated_pages
+	  * increment -> allocatable_pages
+	  * length -> sorted_length
+	  And remove unused `limit' field.
+
+	* gc.c: rename macros:
+	  * heap_pages_used -> heap_allocated_pages
+	  * heap_pages_length -> heap_pages_sorted_length
+	  * heap_pages_increment -> heap_allocatable_pages
+
+	* gc.c (gc_stat_internal): fix symbol names
+	  * heap_used -> heap_allocated_pages
+	  * heap_eden_page_length -> heap_eden_pages
+	  * heap_tomb_page_length -> heap_tomb_pages
+	  * heap_increment -> heap_allocatable_pages
+	  * heap_length -> heap_sorted_length
+
+	  ref: [Feature #9924]
+	  https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
+	  Yellow color fields in this table are changed.
+
+	* test/ruby/test_gc.rb: catch up this change.
+
+Tue Sep  9 14:56:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: continue layout changing.
+
+	  newobj_of() also touch:
+	  (4) increment total_allocated_object_num
+	  (5) check hook_events
+
+	  And gather fields related to marking phase.
+
+Tue Sep  9 14:21:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix layout of rb_objspace_t to improve cache locality.
+
+	  newobj_of() accesses:
+	  (1) rb_objspace_t::flags
+	  (2) rb_objspace_t::eden_heap::freelist
+	  (3) and rb_objspace_t::eden_heap::free_pages if freelist is NULL.
+
+Tue Sep  9 14:09:36 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: move rb_objspace_t::flags::gc_stressful after during_gc
+	  to make accessing both parameters easy.
+
+	* gc.c (heap_get_freeobj): add LIKELY() hint.
+
+	* gc.c (heap_get_freeobj_from_next_freepage): ditto.
+
+	* gc.c (newobj_of): check both parameters at once for exceptional
+	  case.
+
+Tue Sep  9 13:51:32 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add rb_objspace_t::flags::gc_stressful and
+	  ruby_gc_stressful macro.
+	  Rename objspace->gc_stress to objspace->gc_stress_mode.
+
+	  If objspace->gc_stress_mode is true (!nil and !false) then
+	  ruby_gc_stressful becomes TRUE.
+
+	  ruby_gc_stressful will speedup newobj_of() slightly.
+
+	* gc.c: initialize ruby_gc_stress(full|_mode) by gc_params.gc_stress
+	  even if ENABLE_VM_OBJSPACE is false.
+
+Tue Sep  9 13:05:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove ruby_disable_gc_stress and add ruby_disable_gc
+	  to speed-up newobj_of().
+
+	* gc.c (ready_to_gc): check ruby_disable_gc.
+
+	* signal.c: use ruby_disable_gc.
+
+Tue Sep  9 12:11:41 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename gc_stat entries and check stat transition.
+
+Tue Sep  9 12:06:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_sweep_rest): remove wrong modification of during_gc flag.
+
+Tue Sep  9 11:39:41 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: pack boolean values into rb_objspace_t::flags with bit fields
+	  to improve cache locality.
+
+Tue Sep  9 11:11:05 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_object.rb: extend timeout.
+
+Tue Sep  9 09:02:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
+	  $CXXFLAGS, as they are often used by C++ compiler.
+	  [ruby-core:54532] [Bug #8315]
+
+Tue Sep  9 07:03:22 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c: remove needless SYM2ID <-> ID2SYM conversions
+	  [misc #10207]
+
+Tue Sep  9 05:48:42 2014  Eric Wong  <e@80x24.org>
+
+	* symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return
+	  This is not a complete fix for bug 10206, but seems to reduce
+	  that crash and also looks correct.
+
+Tue Sep  9 04:36:24 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_env_t): use flexible array
+	  This reduces allocations and speeds up the lambda calculus
+	  fizzbuzz (bm_app_lc_fizzbuzz.rb) benchmark [ruby-core:64858]
+	* proc.c (get_local_variable_ptr): deconst to adjust for flex array
+	* vm.c (env_mark, env_free, env_memsize): remove check for env->env
+	* vm.c (env_alloc): single allocation for flex array
+	* vm.c (vm_make_env_each): adjust env_alloc call
+
+Mon Sep  8 16:08:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_lc_fizzbuzz.rb: should skip output on benchmark.
+
+Mon Sep  8 16:04:02 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_lc_fizzbuzz.rb: `answer.to_a' does not return
+	  a string, but an array.
+
+Mon Sep  8 13:18:37 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_lc_fizzbuzz.rb: added.
+
+	  This program is described closely in "Understanding Computation"
+	  chapter 6 by Tom Stuart. <http://computationbook.com/>
+
+	  Japanese translation will be published soon.
+	  <http://www.oreilly.co.jp/books/9784873116976/>
+
+Mon Sep  8 12:01:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add incremental GC algorithm. [Feature #10137]
+
+	  Please refer this ticket for details.
+
+	  This change also introduces the following changes.
+
+	  * Remove RGENGC_AGE2_PROMOTION and introduce object age (0 to 3).
+	    Age can be count with FL_PROMOTE0 and FL_PROMOTE1 flags in
+	    RBasic::flags (2 bit). Age == 3 objects become old objects.
+	  * WB_PROTECTED flag in RBasic to WB_UNPROTECTED bitmap.
+	  * LONG_LIVED bitmap to represent living objects while minor GCs
+	    It specifies (1) Old objects and (2) remembered shady objects.
+	  * Introduce rb_objspace_t::marked_objects which counts marked
+	    objects in current marking phase. marking count is needed to
+	    introduce incremental marking.
+	  * rename mark related function and sweep related function to
+	    gc_(marks|sweep)_(start|finish|step|rest|continue).
+	  * rename rgengc_report() to gc_report().
+	  * Add obj_info() function to get cstr of object details.
+	  * Add MEASURE_LINE() macro to measure execution time of specific line.
+	  * and many small fixes.
+
+	* include/ruby/ruby.h: add flag USE_RINCGC.
+	  Now USE_RINCGC can be set only with USE_RGENGC.
+
+	* include/ruby/ruby.h: introduce FL_PROMOTED0 and add FL_PROMOTED1
+	  to count object age.
+
+	* include/ruby/ruby.h: rewrite write barriers for incremental marking.
+
+	* debug.c: catch up flag name changes.
+
+	* internal.h: add rb_gc_writebarrier_remember() instead of
+	  rb_gc_writebarrier_remember_promoted().
+
+	* array.c (ary_memcpy0): use rb_gc_writebarrier_remember().
+
+	* array.c (rb_ary_modify): ditto.
+
+	* hash.c (rb_hash_keys): ditto.
+
+	* hash.c (rb_hash_values): ditto.
+
+	* object.c (init_copy): use rb_copy_wb_protected_attribute() because
+	  FL_WB_PROTECTED is moved from RBasic::flags.
+
+	* test/objspace/test_objspace.rb: catch up ObjectSpace.dump() changes.
+
+Sun Sep  7 12:47:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: PTHREAD_CANCEL_DISABLE is not defined on Android.
+
+Sat Sep  6 20:59:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): The gid zero is not a privilege.
+
+Sat Sep  6 20:19:16 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (struct child_handler_disabler_state): cancelstate field
+	  added.
+	  (disable_child_handler_before_fork): Record cancelstate.
+	  (disable_child_handler_fork_parent): Restore cancelstate.
+
+Sat Sep  6 19:27:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (struct child_handler_disabler_state): Defined.
+
+Sat Sep  6 18:31:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rake.rb, lib/rake/*, test/rake/*: Update latest rake master(e47d023)
+
+Sat Sep  6 16:38:08 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variant.c (ole_val2variant_err,
+	  ole_val2variantdata, Init_win32ole_variant): support VT_ERROR
+	  variant with error code. add WIN32OLE_VARIANT::NoParam.
+	* test/win32ole/test_win32ole_variant.rb(test_c_noparam,
+	  test_vt_error_noparam): ditto.
+	* ext/win32ole/win32ole.c: ditto.
+
+Sat Sep  6 11:08:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg_ambiguous_gen): fix warning message, "even" does
+	  not mean the number of spaces here.  state the place to put a
+	  space and the operator.  [ruby-core:64790] [Bug #10204]
+
+Sat Sep  6 08:44:40 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
+	  rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
+
+Sat Sep  6 08:10:44 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_io.rb (test_readpartial_locktmp): use IO#nonblock=
+	  Old fcntl invocation may drop necessary flags on some platforms.
+
+Sat Sep  6 07:46:51 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_io.rb (test_readpartial_locktmp): avoid EBADF
+	  [ruby-core:64773] [ruby-core:64775]
+
+Sat Sep  6 01:34:31 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_f_exec): Call before_exec_async_signal_safe and
+	  after_exec_async_signal_safe around rb_exec_async_signal_safe.
+	  (rb_exec_async_signal_safe): Don't call
+	  before_exec_async_signal_safe and after_exec_async_signal_safe.
+	  (rb_exec_without_timer_thread): Call before_exec and
+	  after_exec.
+	  (disable_child_handler_fork_child): Make SIGPIPE handler SIG_DFL.
+
+Sat Sep  6 00:49:41 2014  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (ruby_signal): Don't set SA_SIGINFO for SIG_IGN and
+	  SIG_DFL.
+
+Fri Sep  5 21:45:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (disable_child_handler_before_fork): New function.
+	  (disable_child_handler_fork_parent): Ditto.
+	  (disable_child_handler_fork_child): Ditto.
+	  (retry_fork_async_signal_safe): Call above functions to disable
+	  signal handlers in child process.
+
+Fri Sep  5 21:02:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (handle_fork_error): Make try_gc_p argument volatile to
+	  suppress "clobbered" warning.
+
+Fri Sep  5 20:48:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (handle_fork_error): Don't need state_p argument.
+
+Fri Sep  5 20:35:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): Fix a return value.
+
+Fri Sep  5 19:00:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shellwords.rb: proofreading documentation.
+	  [Bug #10155][ruby-core:64471]
+
+Fri Sep  5 18:34:33 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* test/csv/test_row.rb: Added some missing tests in CSV.
+	  [fix GH-710]
+	* test/csv/test_table.rb: ditto.
+
+Fri Sep  5 12:57:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): Refine uid/gid check.
+
+Fri Sep  5 12:40:55 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check sys/id.h, getuidx and getgidx for AIX.
+
+	* process.c (getresuid): Defined for AIX.
+	  (getresgid): Ditto
+	  AIX don't have getresuid/getresgid but getuidx/getgidx.
+
+Fri Sep  5 12:28:21 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): Fix assignments.
+
+Fri Sep  5 11:10:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc/generator/pot/po.rb: fixed broken tests for trailing whitespace.
+	* test/rdoc/test_rdoc_generator_pot.rb: ditto.
+	* test/rdoc/test_rdoc_generator_pot_po.rb: ditto.
+
+Fri Sep  5 10:41:07 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/rdoc/test_rdoc_rdoc.rb (TestRDocRDoc#test_parse_file_encoding):
+	  typofix.
+
+Fri Sep  5 10:39:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(313287)
+
+Fri Sep  5 06:04:22 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c: remove unused USE_THREAD_RECYCLE [misc #10198]
+
+Fri Sep  5 00:29:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (dirfd): Check function.
+
+	* dir.c (dir_fileno): New method.
+	  [ruby-dev:48265] [Feature #9880]
+
+Thu Sep  4 23:39:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): New function.
+	  (retry_fork_async_signal_safe): Don't use vfork() for privileged
+	  process.
+
+	* configure.in (getresuid): Check function.
+	  (getresgid): Ditto.
+
+Thu Sep  4 20:22:14 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* test/pathname/test_pathname.rb: added testcase for Pathname#mountpoint?.
+	  [fix GH-709]
+
+Thu Sep  4 20:09:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* symbian/*: removed Symbian support.
+	  [Feature #10199][ruby-core:64725]
+	* dln.c: ditto.
+	* include/ruby/defines.h: ditto.
+	* thread_pthread.c: ditto.
+	* vm.c: ditto.
+
+Thu Sep  4 17:44:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* dir.c (glob_helper): use #ifdef instead of #if.
+	  gcc's -Wundef option shows warning for undefined macro.
+
+	* numeric.c (flo_is_finite_p): ditto.
+
+	* vm_dump.c (rb_vmdebug_thread_dump_state): ditto.
+
+	* vm_core.h: define VM_DEBUG_VERIFY_METHOD_CACHE to 0.
+
+Thu Sep  4 03:57:46 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: spelling fix ("bellow" => "below") [ci-skip]
+
+Thu Sep  4 03:52:16 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: add trailing slash to URLs [ci-skip]
+
+Wed Sep  3 19:10:28 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (before_fork_ruby): Renamed from before_fork.
+	  (after_fork_ruby): Renamed from after_fork.
+
+Wed Sep  3 18:56:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (forked_child): Removed.
+
+Wed Sep  3 16:56:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_copy_ivar): allocate no memory for empty
+	  instance variables.  [ruby-core:64700] [Bug #10191]
+
+Wed Sep  3 12:05:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork_async_signal_safe): Use vfork() if available.
+	  vfork() is still faster than fork() especially when the parent
+	  process uses big memory.
+
+	  ruby -rbenchmark -e 'a = "a" * 1_000_000_000; puts Benchmark.measure { system("true") }'
+	  fork:   0.000000   0.010000   0.010000 (  0.014968)
+	  vfork:  0.000000   0.000000   0.000000 (  0.000912)
+	  on Debian sid.
+
+Wed Sep  3 11:33:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
+	  added timeout into testcase for low performance environment.
+	  [Bug #9984][ruby-core:63367]
+
+Wed Sep  3 07:50:15 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Use AC_FUNC_FORK.
+
+	* io.c: Use HAVE_WORKING_FORK instead of HAVE_FORK.
+
+	* process.c: Ditto.
+
+Wed Sep  3 00:12:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork_async_signal_safe): Don't return on in child
+	  process.
+
+Tue Sep  2 23:47:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork_async_signal_safe): Specialized version of
+	  retry_fork respect to rb_fork_async_signal_safe.
+	  (retry_fork_ruby): Specialized version of retry_fork respect to
+	  rb_fork_ruby.
+	  (rb_fork_ruby): Removed.
+
+Tue Sep  2 23:26:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (send_child_error): Simplified.
+	  (recv_child_error): Ditto.
+
+Tue Sep  2 22:56:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_async_signal_safe): Inline rb_fork_internal.
+	  (rb_fork_ruby): Ditto.
+	  (rb_fork_internal): Removed.
+	  (chfunc_protect): Removed.
+
+Tue Sep  2 22:43:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_new_with_block): Set autoclose to avoid
+	  EBADF.
+
+Tue Sep  2 22:01:51 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Makefile.in (update-coverage): Remove a never executed line.
+
+Tue Sep  2 19:48:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (handle_fork_error): Extracted from retry_fork.
+
+Tue Sep  2 17:02:53 2014  Vit Ondruch  <v.ondruch@tiscali.cz>
+
+	* tool/rbinstall.rb: fixed error of local installation.
+	  [Bug #10192][ruby-core:64702]
+
+Tue Sep  2 16:58:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/runner.rb: reporting test coverage for test-all with COVERAGE env.
+	  [Feature #10189][ruby-core:64681][fix GH-708]
+	* Makefile.in: added task for coverage report.
+	* common.mk: added definition of forked simplecov url.
+	* .gitignore: ignored coverage directory.
+
+Mon Sep  1 20:11:02 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (rbtime2vtdate): try to convert millisecond
+	  of Time object to millisecond of VT_DATE VARIANT.
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_time2date_with_msec): ditto.
+
+Sun Aug 31 16:58:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/benchmark.rb: Fix a syntax error.
+
+Sun Aug 31 08:46:44 2014  Eric Wong  <e@80x24.org>
+
+	* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE
+	  [Bug #10101]
+
+	* test/zlib/test_zlib.rb (test_rewind): test each_byte
+
+Sat Aug 30 19:22:47 2014  Eric Wong  <e@80x24.org>
+
+	* symbol.c (rb_sym2id): do not return garbage object
+
+Sat Aug 30 06:39:48 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and
+	  loading. Fixes GH #85. Thanks @brentdax for the patch!
+	* test/psych/test_exception.rb: test for fix
+
+Sat Aug 30 06:23:40 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that
+	  look like integers but have a newline. Fixes GH #189
+	* test/psych/test_string.rb: test for fix
+
+Sat Aug 30 06:10:39 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash
+	  should merge the hash in to the parent.
+	* test/psych/test_merge_keys.rb: test for change. Fixes GH #202
+
+Sat Aug 30 06:00:26 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings
+	  should not be treated as merge keys.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys
+	  containing "<<" should roundtrip.
+	* test/psych/test_merge_keys.rb: test for change. Fixes GH #203
+
+Fri Aug 29 17:56:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/imap/test_imap_response_parser.rb: removed needless code.
+
+Fri Aug 29 17:36:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/rinda/test_rinda.rb: removed useless assignment variables.
+	* test/rss/rss-assertions.rb: ditto.
+	* test/rss/test_maker_itunes.rb: ditto.
+
+Fri Aug 29 16:18:26 2014  Eric Wong  <e@80x24.org>
+
+	* string.c: revert part of r47311, add rb_vm_fstring_table(),
+	  remove vm_core.h dependency. [ruby-core:64627]
+
+Fri Aug 29 15:17:13 2014  Eric Wong  <e@80x24.org>
+
+	* string.c: remove static frozen_strings
+	* string.c (Init_frozen_strings): new function
+	* string.c (rb_fstring): remove check for frozen strings,
+	  use per-VM table
+	* string.c (rb_str_free): use per-VM table
+	* string.c (Init_String): use per-VM table
+	* vm_core.h (rb_vm_t): add frozen_strings table
+	* internal.h (Init_frozen_strings): new function prototype
+	* eval.c (ruby_setup): call Init_frozen_strings
+	  [Feature #10182]
+
+Wed Aug 27 23:10:24 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/tempfile.rb: remove "require 'thread'". its features are no
+	  longer used.
+
+Wed Aug 27 21:19:40 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation.
+	  [Feature #10174][ruby-core:64584]
+	* lib/erb.rb: ditto.
+	* lib/observer.rb: ditto.
+	* lib/rake/invocation_chain.rb: ditto.
+	* lib/rubygems/command_manager.rb: ditto.
+	* lib/rubygems/config_file.rb: ditto.
+	* lib/uri/common.rb: ditto.
+
+Wed Aug 27 21:08:20 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/drb/drb.rb: use attr_reader instead of Module#attr.
+	  [Feature #10172][ruby-core:64582]
+	* lib/irb/ruby-token.rb: ditto.
+	* lib/net/telnet.rb: ditto.
+	* lib/rdoc/ruby_token.rb: ditto.
+	* lib/thwait.rb: ditto.
+
+Wed Aug 27 19:52:33 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecond
+	  of VT_DATE VARIANT to nsec of Time object.
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_dbl2date_with_msec): ditto.
+
+Wed Aug 27 09:57:29 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: removed unreachable code.
+	* test/ruby/test_rational.rb: ditto.
+
+Wed Aug 27 07:59:17 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_set_sequence): check for multiplication overflow
+
+Tue Aug 26 22:07:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: cherry-picked working assertions from r47251.
+	* test/ruby/test_rational.rb: cherry-picked working assertions from r47263.
+
+Tue Aug 26 21:07:56 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**):
+	  remove as these are now built-in.  [ruby-core:63973] [Bug #10086]
+
+Tue Aug 26 20:46:55 2014  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_time_unmagnify_to_float): Avoid double rounding.
+	  Reported by Tsuyoshi Sawada.
+	  https://bugs.ruby-lang.org/issues/10135#note-1
+
+Tue Aug 26 17:12:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_close): ignore only "closed stream" IOError and
+	  NoMethodError, do not swallow other exceptions at the end of
+	  block.  [ruby-core:64463] [Bug #10153]
+
+Tue Aug 26 13:46:33 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* template/fake.rb.in: fix failed to make install when @srcdir@ is
+	  absolute path.
+
+Tue Aug 26 13:43:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_range.rb: added workaround for VERBOSE message.
+
+Tue Aug 26 12:38:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_mathn.rb: added workaround for VERBOSE messages.
+
+Tue Aug 26 11:44:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shell/process-controller.rb: removed commented-out code.
+
+Tue Aug 26 11:39:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/thwait.rb (ThreadsWait): removed needless constant.
+
+Tue Aug 26 09:27:10 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/mathn.rb: mathn library is deprecated on ruby 2.2.
+	  [Feature #10169][ruby-core:64553]
+
+Tue Aug 26 09:25:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/mathn.rb: removed commented-out code.
+
+Mon Aug 25 20:15:50 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(fole_s_connect, fole_initialize): raise a
+	  security error with the tainted string object.
+	* ext/win32ole/win32ole_event.c(ev_advise): ditto.
+	* test/win32ole/test_win32ole.rb(test_s_new_exc_svr_tainted,
+	  test_s_new_exc_host_tainted): ditto.
+	* test/win32ole/test_win32ole_event.rb(test_s_new_exc_tainted): ditto.
+
+Mon Aug 25 12:56:54 2014  Ivan Korunkov  <ivankorunkov@ya.ru>
+
+	* lib/logger.rb (format_datetime): use "%6N" to show microsecond.
+	  [Fix GH-704]
+
+Mon Aug 25 11:02:07 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_iseq_location_t): change first_lineno type to VALUE
+	* iseq.c (rb_iseq_build_for_ruby2cext): update based on argument
+
+Sun Aug 24 16:14:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/e2mmap.rb: remove needless instance variables.
+	* lib/irb.rb: ditto.
+	* lib/irb/**/*.rb: ditto.
+	* lib/shell.rb: ditto.
+
+Sun Aug 24 12:44:26 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: removed needless conditions.
+	* test/ruby/test_rational.rb: ditto.
+
+Sun Aug 24 11:47:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_rational.rb: fixed indent.
+
+Sun Aug 24 11:44:11 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_rational.rb: remove commented-out code.
+
+Sun Aug 24 11:09:29 2014  Eric Wong  <e@80x24.org>
+
+	* lib/benchmark.rb (measure): reduce allocations as in r47260
+
+Sun Aug 24 10:35:54 2014  Pete Higgins  <pete@peterhiggins.org>
+
+	* lib/benchmark.rb (module Benchmark): define BENCHMARK_CLOCK
+	  (realtime): use Process.clock_gettime(BENCHMARK_CLOCK)
+	  Reduces allocations to improve performance [Feature #10165]
+
+	* test/benchmark/test_benchmark.rb (test_realtime_output): new test
+
+Fri Aug 22 20:23:54 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_fstring): fix condition (easy to cause infinite loop!).
+
+Fri Aug 22 20:07:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_fstring, fstr_update_callback): simply delete garbage
+	  key first.
+
+	  Garbage keys can be swept by lazy sweeping invoked by creating new
+	  fstring.  So that simply do:
+	  (1) delete garbage key and return `fstr_update_callback' immediately
+	  (2) try again `fstr_update_callback()' to create a new fstr.
+
+	  This bug can be cause memory corruption, reported by
+	  http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20140821T220302Z.fail.html.gz
+
+Fri Aug 22 19:30:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: removed commented-out code.
+
+Fri Aug 22 19:25:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: fixed broken tests. Math is not
+	  compatible CMath now.
+
+Fri Aug 22 15:36:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (Doxyfile): revert r43888, not to require preinstalled
+	  ruby.  [ruby-core:64488] [Bug #10161]
+
+Fri Aug 22 12:32:15 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shell.rb: removed commented-out code.
+	* lib/shell/builtin-command.rb: ditto.
+	* lib/shell/command-processor.rb: ditto.
+
+Fri Aug 22 12:21:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/complex.rb: removed deprecated library.
+	* lib/rational.rb: ditto.
+
+Fri Aug 22 11:38:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/prettyprint.rb: removed PrettyPrint#first?
+	  because it is obsoleted method since Ruby 1.8.2
+
+Thu Aug 21 17:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (constat_attr): manage reverse video internally
+	  since Windows console window does not manage it.  based on the
+	  patch by white leaf in [ruby-dev:48483].  [Bug #10158]
+
+Thu Aug 21 14:45:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/e2mmap.rb: removed commented-out code.
+
+Thu Aug 21 13:23:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rinda/ring.rb: split executable code into sample directory.
+	* sample/rinda-ring.rb: ditto.
+
+Thu Aug 21 13:21:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/acl.rb: split executable code into sample directory.
+	* sample/drb/acl.rb: ditto.
+
+Thu Aug 21 12:55:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored temporary file for Changelog.
+	  http://mkosaki.blog46.fc2.com/blog-entry-1284.html
+
+Thu Aug 21 12:40:22 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/imap.rb: split executable code into sample directory.
+	* sample/net-imap.rb: ditto.
+
+Thu Aug 21 12:23:56 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/imap.rb: removed commented-out code.
+
+Wed Aug 20 17:27:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_TRY_CFLAGS, RUBY_TRY_LDFLAGS),
+	  (RUBY_CHECK_BUILTIN_SETJMP, RUBY_SETJMP_TYPE),
+	  (RUBY_STACK_GROW_DIRECTION): quote defun names, for some
+	  versions of autoconf possibly.  [ruby-core:64473] [Bug #10156]
+
+Tue Aug 19 22:28:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix condition to round.
+	  [ruby-core:64454] [Bug #10151]
+
+Tue Aug 19 22:22:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
+	  registered signs.  [ruby-core:64452] [Bug #10149]
+
+Tue Aug 19 13:59:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compar.c (rb_cmperr): preserve encodings of arguments in the
+	  message.
+
+Tue Aug 19 10:13:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/thread/thread.c (get_array): check instance variables are
+	  initialized properly.  [ruby-core:63826][Bug #10062]
+
+Mon Aug 18 17:06:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): support rational 'f' format.
+	  [ruby-core:64382] [Bug #10136]
+
+Mon Aug 18 08:03:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* spec/default.mspec: use 2.2 definition.
+
+Sun Aug 17 19:41:40 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gc.c (obj_memsize_of): don't calculate memsize of T_NODE
+	  when called from check_gen_consistency. It fixes segmentation
+	  fault on RGENGC_CHECK_MODE >= 1 introduced by r47188.
+
+Sun Aug 17 17:08:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): use RHASH_SIZE instead of
+	  calling Hash#length method.
+
+Sat Aug 16 19:32:06 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_event.c (evs_length): use RARRAY_LEN instead
+	  of calling Array#length method.
+
+Sat Aug 16 10:20:17 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_timespec): fix tv_nsec overflow
+	  [Bug #10144]
+
+Fri Aug 15 20:34:17 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_EVENT src from
+	  win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_event.c: ditto.
+	* ext/win32ole/win32ole_event.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Fri Aug 15 19:38:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (rb_iseq_clone): Should not insert write barrier from
+	  non-RVALUE data (to non-RVALUE data, of course).
+
+	  Ruby 2.1 also has a same problem.
+
+Fri Aug 15 19:34:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (setup_fake_str): fake strings should not set class by
+	  RBASIC_SET_CLASS() because it insert write barriers to fake
+	  (non-RVALUE) structure.
+
+	  It can cause unexpected behaviour.
+
+	  Ruby 2.1 also have a same problem (setup_fake_str() in parse.y).
+
+	* symbol.c (setup_fake_str): ditto.
+
+Fri Aug 15 19:27:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_tmp_new_fill): added.
+	  This function creates internal use only array (which is completely
+	  hided by ObjectSpace.each_object) with filling nil.
+
+	  Otherwise, it can be includes strange VALUEs.
+
+	* internal.h: added.
+
+	* node.h: use rb_ary_tmp_new_fill() for MEMO.
+
+Fri Aug 15 10:13:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/gserver.rb: removed unmaintained code.
+	  [ruby-core:40313][Feature #5480]
+	* lib/xmlrpc/httpserver.rb: ditto.
+
+Fri Aug 15 09:22:12 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_thread_struct): reorder to pack
+	* cont.c (rb_context_struct, rb_fiber_struct): ditto
+	  On x86-64, these changes reduces:
+	  rb_thread_struct to 1000 bytes (from 1016)
+	  rb_context_struct to 1288 bytes (from 1312)
+	  rb_fiber_struct to 2272 bytes (from 2304)
+
+Fri Aug 15 09:06:31 2014  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.h: define RB_NATIVETHREAD_LOCK_INIT and
+	  RB_NATIVETHREAD_COND_INIT macros
+
+	* thread_pthread.c (native_mutex_lock, native_mutex_unlock,
+	  native_mutex_trylock, native_mutex_initialize,
+	  native_mutex_destroy, native_cond_wait):
+	  use rb_nativethread_lock_t instead of pthread_mutex_t
+	  [Feature #10134]
+
+	* thread_pthread.c (native_mutex_debug): make argument type-agnostic
+	  to avoid later cast.
+
+	* thread_pthread.c (register_cached_thread_and_wait):
+	  replace PTHREAD_COND_INITIALIZER with RB_NATIVETHREAD_COND_INIT,
+	  use native_mutex_{lock,unlock}
+
+	* thread_pthread.c (use_cached_thread):
+	  use native_mutex_{lock,unlock}
+
+	* thread_pthread.c (native_sleep):
+	  use rb_nativethread_lock_t to match th->interrupt_lock,
+	  use native_mutex_{lock,unlock}
+
+	* thread_pthread.c (timer_thread_lock): use rb_nativethread_lock_t type
+
+Fri Aug 15 08:10:29 2014  Eric Wong  <e@80x24.org>
+
+	* cont.c (cont_mark): fix typo in unused path [ci skip]
+
+Fri Aug 15 06:00:56 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (rb_thread_mark): update comment about marking `me'
+	  [ruby-core:64340] [ruby-core:64341]
+
+Fri Aug 15 05:53:59 2014  Eric Wong  <e@80x24.org>
+
+	* README.EXT: preliminary documentation for RB_GC_GUARD
+	  [Bug #10100] [ruby-core:60741]
+
+Thu Aug 14 00:26:19 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_RECORD src from
+	  win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_record.c: ditto.
+	* ext/win32ole/win32ole_record.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Wed Aug 13 21:41:04 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_VARIANT src from
+	  win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_variant.c: ditto.
+	* ext/win32ole/win32ole_variant.c: ditto.
+	* ext/win32ole/depend: ditto.
+
+Wed Aug 13 20:09:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: remove unused variable.
+
+Wed Aug 13 19:31:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_search_handler_method, rescue_callback,
+	  folerecord_inspect): use PRIsVALUE in rb_sprintf.
+
+	* ext/win32ole/win32ole_param.c (foleparam_inspect): ditto.
+
+	* ext/win32ole/win32ole_variable.c (folevariable_inspect): use
+	  PRIsVALUE in rb_sprintf, use rb_inspect.
+
+Wed Aug 13 11:54:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/completion.rb: reverted r47163.
+	  because another case can't be show completion target.
+
+Wed Aug 13 11:17:00 2014  Shimpei Makimoto  <github@makimoto.org>
+
+	* lib/irb.rb: Prevent irb from crashing when exception with
+	  nil backtrace is raised.
+	  [fix GH-434][ruby-core:58078][Bug #9063]
+	* test/irb/test_raise_no_backtrace_exception.rb: ditto.
+
+Wed Aug 13 11:08:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/completion.rb: fixed broken completion list with
+	  String including spaces. Contributed from @dunric. [fix GH-465]
+
+Wed Aug 13 00:07:01 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_PARAM src from win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_param.c: ditto.
+	* ext/win32ole/win32ole_param.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Tue Aug 12 23:17:47 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: refactoring. move some methods
+	  into win32ole_type.c / win32ole_method.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_method.c: ditto.
+	* ext/win32ole/win32ole_method.h: ditto.
+	* ext/win32ole/win32ole_type.h: ditto.
+	* ext/win32ole/win32ole_type.h: ditto.
+
+Tue Aug 12 22:59:48 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: refactoring. move
+	  ole_typelib_from_itypeinfo into win32ole_typelib.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_typelib.h: ditto.
+	* ext/win32ole/win32ole_typelib.h: ditto.
+
+Tue Aug 12 21:49:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_create_dcom): use the converted
+	  result if the argument can be converted to a string, to get rid
+	  of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127]
+
+Tue Aug 12 14:22:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* configure.in: ignored working directory same as prefix value.
+	  [ruby-core:54999] [Bug #8409]
+
+Tue Aug 12 13:34:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/fileutils.rb: enable to remove with non-owner directory.
+	  [ruby-dev:45976] [Bug #6756]
+	* test/fileutils/test_fileutils.rb: add testcase for #6756.
+
+Tue Aug 12 12:57:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* vm_exec.c: improve performance in ppc64 arch.
+	  [ruby-core:63437] [Feature #9997]
+
+Tue Aug 12 12:14:52 2014  Akira Matsuda <ronnie@dio.jp>
+
+	* lib/fileutils.rb: fix typo.
+	  [ruby-dev:47831] [Bug #9180]
+
+Tue Aug 12 10:10:42 2014  Eric Wong  <e@80x24.org>
+
+	* vm_method.c (release_method_definition): use rb_free_method_entry
+
+Tue Aug 12 06:16:09 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_METHOD src from
+	  win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_method.c: ditto.
+	* ext/win32ole/win32ole_method.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Mon Aug 11 22:19:15 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variable.c (folevariable_inspect): refactoring.
+
+Mon Aug 11 20:47:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_VARIABLE src from
+	  win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_variable.c: ditto.
+	* ext/win32ole/win32ole_variable.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Mon Aug 11 16:17:21 2014  Tony Miller  <mcfiredrill@gmail.com>
+
+	* dir.c (rb_dir_exists_p): [DOC] Document that Dir.exists? is
+	  deprecated.  [ruby-core:64135] [Bug #10102]
+
+Mon Aug 11 11:26:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb: start rdoc parsing inside singleton class
+	  definition to include the document there.
+	  [ruby-core:64157] [Bug #10105]
+
+Sun Aug 10 12:22:43 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_type.c: refactoring.
+
+Sun Aug 10 10:34:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/cgi/session/pstore.rb: separated sample code.
+	* lib/open3.rb: ditto.
+
+Sun Aug 10 10:03:24 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/ext/multi-irb.rb: removed commented-out code.
+
+Sat Aug  9 11:02:07 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb.rb: removed commented-out code.
+	* lib/irb/**/*.rb: ditto.
+
+Sat Aug  9 10:35:30 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* lib/cmath.rb: fixed indent. [fix GH-696]
+	* lib/drb/ssl.rb: ditto.
+	* lib/irb/**/*.rb: ditto.
+
+Sat Aug  9 10:28:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/minitest/test_minitest_unit.rb: removed obsoleted condition
+	  for Ruby 1.8.
+	* test/ruby/test_time_tz.rb: ditto.
+
+Sat Aug  9 10:18:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/cgi/test_cgi_core.rb: removed obsoleted condition for Ruby 1.8.
+	* test/cgi/test_cgi_header.rb: ditto.
+	* test/cgi/test_cgi_multipart.rb: ditto.
+	* test/cgi/test_cgi_tag_helper.rb: ditto.
+
+Sat Aug  9 00:34:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_TYPE src from win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_type.c: ditto.
+	* ext/win32ole/win32ole_type.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Fri Aug  8 01:53:37 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/securerandom.rb: use OpenSSL::BN for performance improvement.
+
+	* benchmark/bm_securerandom.rb: benchmark script.
+
+Fri Aug  8 17:19:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/open-uri.rb: remove needless condition for old ruby version.
+	* test/open-uri/test_open-uri.rb: ditto.
+
+Fri Aug  8 16:40:59 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/init.rb: removed unreachable code.
+
+Fri Aug  8 16:34:22 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/drb.rb: removed unreachable code.
+
+Fri Aug  8 14:33:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/webrick/httpproxy.rb: remove needless condition
+	  for old ruby version.
+
+Fri Aug  8 01:07:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fix invalid char in eval, should raise
+	  an syntax error too, as well as directly coded.
+	  [ruby-core:64243] [Bug #10117]
+
+Thu Aug  7 23:25:29 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/open3.rb: avoid unnecessary write if stdin_data is empty.
+
+Thu Aug  7 21:42:49 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_typelib.c (foletypelib_version): return
+	  version string.
+
+	* test/win32ole/test_win32ole_typelib.rb (test_version): ditto.
+
+Thu Aug  7 15:13:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/cgi.rb: remove needless condition for old ruby version.
+
+Thu Aug  7 06:04:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yyerror): preserve source code encoding in
+	  syntax error messages.  [ruby-core:64228] [Bug #10114]
+
+Wed Aug  6 20:56:02 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate src of WIN32OLE_TYPELIB from
+	  win32ole.c
+
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_typelib.c: ditto.
+	* ext/win32ole/win32ole_typelib.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Wed Aug  6 20:44:07 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (enum_one): [DOC] Move enum.one? documentation before the
+	  relevant method.  Submitted by @vipulnsward. [Fixes GH-687]
+	  https://github.com/ruby/ruby/pull/687
+
+Wed Aug  6 20:25:47 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#replace): Check if an object given is enumerable
+	  before clearing self.  Reported by yui-knk. [GH-675]
+	  https://github.com/ruby/ruby/pull/675
+
+Wed Aug  6 20:07:26 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (olerecord_ivar_set): remove rb_str_subseq.
+
+Wed Aug  6 19:09:27 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set): Implement Set#clone by splitting
+	  initialize_copy into initialize_dup and initialize_clone.
+	  Submitted by yui-knk. [Fixes GH-661]
+	  https://github.com/ruby/ruby/pull/661
+
+Wed Aug  6 18:42:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate src of WIN32OLERuntimeError
+	  from win32ole.c.
+
+	* ext/win32ole/win32ole.h: ditto
+	* ext/win32ole/depend: ditto.
+	* ext/win32ole/win32ole_error.c: ditto.
+	* ext/win32ole/win32ole_error.h: ditto.
+
+Wed Aug  6 04:33:58 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
+	  of parser to handle IPv6 address. [Bug #9129]
+
+Wed Aug  6 04:16:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/requests.rb (Net::HTTP::Options::RESPONSE_HAS_BODY):
+	  OPTIONS requests may have response bodies. [Feature #8429]
+	  http://tools.ietf.org/html/rfc7231#section-4.3.7
+
+Wed Aug  6 03:18:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb (Net::HTTP::GenericRequest#exec):
+	  handle req['host'] in update_uri.
+
+	* lib/net/http/generic_request.rb
+	  (Net::HTTP::GenericRequest#update_uri):
+	  use req['host'] if it is explicitly set. Even if URI is given,
+	  it is already used for the initial value of req['host'].
+	  Therefore overwritten value should be respected. [Bug #10054]
+
+Wed Aug  6 03:17:34 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb
+	  (Net::HTTP::GenericRequest#update_uri):
+	  handle scheme, host, and port to reflect connection to @uri.
+
+	* lib/net/http.rb (Net::HTTP#begin_transport): move trivial handling
+	  to Net::HTTP::GenericRequest#update_uri.
+
+
+Wed Aug  6 02:16:43 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb
+	  (Net::HTTP::GenericRequest#initialize):
+	  optimize object allocation.
+
+Wed Aug  6 01:16:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#path_query): remove a private method.
+
+Wed Aug  6 01:15:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#normalize!): use String#empty?
+
+	* lib/uri/generic.rb (URI::Generic#path_query): optimized.
+
+	* lib/uri/generic.rb (URI::Generic#to_s): optimized.
+
+Wed Aug  6 00:15:10 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/http.rb (URI::HTTP#request_uri): optimized.
+	  decrease object allocation, and ensure always create at least one new
+	  object for return value.
+
+Wed Aug  6 03:41:21 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for
+	  hashes emitted by Syck. Github #198
+	* test/psych/test_hash.rb: test for change.
+
+Tue Aug  5 19:27:59 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): skip VariantClear when
+	  argument is VT_RECORD variant.
+
+Tue Aug  5 15:52:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: Upgrade to test-unit-3.0.0 and minitest-5.4.0.
+
+Mon Aug  4 21:50:09 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_record.rb: add for WIN32OLE_RECORD
+	  test(need .NET Framework 3.5 to run test).
+
+Mon Aug  4 19:49:34 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): call rb_hash_foreach instead
+	  of rb_block_call.
+
+	* ext/win32ole/win32ole.c: add comment for rdoc of WIN32OLE_VARIANT
+	  class.
+
+Mon Aug  4 09:12:47 2014  Eric Wong  <e@80x24.org>
+
+	* variable.c: cleanup to use rb_const_lookup
+	  [Feature #10107]
+
+	* vm_insnhelper.c: ditto
+
+Sun Aug  3 10:55:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_check_symbol_cstr): ditto.
+
+Sun Aug  3 10:43:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): unusable super class should cause
+	  method missing when BasicObject is refined but not been using.
+	  [ruby-core:64166] [Bug #10106]
+
+Sat Aug  2 23:47:45 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE::VARIANT src file
+	  from win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_variant_m.c: ditto.
+	* ext/win32ole/win32ole_variant_m.h: ditto.
+	* ext/win32ole/depend: ditto.
+	* ext/.document: ditto.
+
+Sat Aug  2 14:34:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add comments for rdoc.
+
+Sat Aug  2 10:26:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_itself): new method Object#itself.  based on the
+	  patch by Rafael Franca in [ruby-core:64156].
+	  [EXPERIMENTAL] this method may be renamed due to compatibilities.
+	  [ruby-core:44704] [Feature #6373]
+
+Fri Aug  1 22:30:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folerecord_initialize): accept
+	  only 2 arguments. The 2nd argument should be WIN32OLE object or
+	  WIN32OLE_RECORD object.
+
+Fri Aug  1 20:17:33 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): call
+	  folerecord_s_allocate instead of WIN32OLE_RECORD.new.
+
+Fri Aug  1 18:39:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/date/test_date.rb: remove commented-out code.
+	* test/date/test_date_arith.rb: ditto.
+	* test/date/test_date_attr.rb: ditto.
+	* test/date/test_date_parse.rb: ditto.
+
+Fri Aug  1 16:35:32 2014  Evan Miller  <evan@squareup.com>
+
+	* numeric.c (flodivmod): all results are NaN if divisor is NaN.
+	  [fix GH-692]
+
+Thu Aug 01 07:28:12 2014  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c: [DOC] Add description of
+	  `BigDecimal.new` exceptions.  Patched by @joker1007 and
+	  @prathamesh-sonpatki [Fixes GH-690]
+	  https://github.com/ruby/ruby/pull/690
+
+Thu Jul 31 22:20:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_RECORD#inspect.
+
+Thu Jul 31 20:35:32 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add
+	  WIN32OLE_RECORD#ole_instance_variable_set and
+	  WIN32OLE_RECORD#ole_instance_variable_get
+
+Wed Jul 30 23:28:10 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* sprintf.c (rb_str_format): like r47006, get rid of
+	  function calls in RSTRING_PTR().
+
+Wed Jul 30 22:10:29 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* process.c (rlimit_resource_type, rlimit_resource_value):
+	  get rid of inadvertent dynamic symbol pin-down.
+
+	* re.c (match_backref_number): ditto.
+
+	* signal.c (esignal_init, rb_f_kill, trap_signm): ditto.
+
+	* transcode.c (econv_opts): ditto.
+
+	* vm_trace.c (symbol2event_flag): ditto.
+
+Wed Jul 30 21:29:39 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): pass WIN32OLE_RECORD variant
+	  by reference when invoke OLE methods at first.
+
+	* ext/win32ole/win32ole.c (olerecord_set_ivar): release
+	  IRecordInfo interface before setting another IRecordInfo interface.
+
+Wed Jul 30 13:17:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove unused macros.
+
+Tue Jul 29 22:21:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (hash2olerec): ignore WIN32OLE_RECORD
+	  instance variable if the variable is nil.
+
+Tue Jul 29 19:43:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folerecord_method_missing): refactoring.
+	  divide functionality of folerecord_method_missing into
+	  olerecord_ivar_set and olerecord_ivar_get.
+
+Mon Jul 28 20:20:08 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win23ole.c (folerecord_method_missing): support
+	  setter of member of WIN32OLE_RECORD object.
+
+Mon Jul 28 06:37:19 2014  Zachary Scott  <e@zzak.io>
+
+	* vm_eval.c: [DOC] Fix rdoc formatting of patch from [Bug #9551]
+
+Mon Jul 28 06:34:43 2014  Zachary Scott  <e@zzak.io>
+
+	* vm_eval.c: [DOC] [Bug #9551] Improve clarity of Kernel::catch
+	  documentation, patch by Jesse Sielaff.
+
+Mon Jul 28 06:24:54 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] [Bug #9563] Recommend using URI.escape
+	  before parsing a uri to avoid invalid characters. Reported by
+	  Evgeniy Serykh.
+
+Mon Jul 28 05:55:56 2014  Zachary Scott  <e@zzak.io>
+
+	* time.c: [DOC] Clarify %Y in strftime, which can accept any digits
+	  and will output at least 4 digits as the year. Reported by Yury
+	  Trofimenko [Bug #10049]
+
+	* lib/time.rb: ditto
+
+Mon Jul 28 05:32:06 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments
+	  are handled by RFC3986, originally reported by John Feminella.
+
+Mon Jul 28 05:21:41 2014  Zachary Scott  <e@zzak.io>
+
+	* file.c: [DOC] Clarify how File.file? handles symbolic links. Also
+	  cleaned up the rdoc style for this method, more to follow.
+	  Originally reported by Michael Renner [Bug #10067]
+
+Mon Jul 28 05:12:22 2014  Zachary Scott  <e@zzak.io>
+
+	* time.c: [DOC] Remove dead link and old bug report, which hasn't been
+	  reproduced in a few years. Reported by Federico Builes [Bug #10071]
+
+Mon Jul 28 04:39:58 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/zlib/zlib.c: [DOC] Remove default value of Zlib constants, as
+	  they may change in the implementation without notice. Patched by
+	  @robin850 [Fixes GH-682] https://github.com/ruby/ruby/pull/682
+
+Mon Jul 28 04:35:35 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_hmac.c: Fix NO_HMAC warning [Fixes GH-665]
+	  Patched by @vipulnsward https://github.com/ruby/ruby/pull/665
+
+Sun Jul 27 19:49:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/cgi/core.rb: remove unused variables.
+	* lib/erb.rb: ditto.
+	* lib/mkmf.rb: ditto.
+	* lib/net/http/response.rb: ditto.
+	* lib/optparse/version.rb: ditto.
+	* lib/prime.rb: ditto.
+	* lib/racc/parser.rb: ditto.
+	* lib/rexml/document.rb: ditto.
+	* lib/rexml/dtd/dtd.rb: ditto.
+	* lib/rexml/element.rb: ditto.
+	* lib/rexml/functions.rb: ditto.
+	* lib/rexml/parsers/xpathparser.rb: ditto.
+
+Sun Jul 27 05:11:21 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/irb.rb: [DOC] PROMPT_I cannot be nil, patch by @hgillane
+	  Fixes documenting-ruby/ruby#37
+	  https://github.com/documenting-ruby/ruby/pull/37
+
+Sun Jul 27 02:41:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shell/command-processor.rb: remove unused variable.
+	* lib/shell/system-command.rb: ditto.
+	* lib/tmpdir.rb: ditto.
+	* lib/uri/generic.rb: ditto.
+
+Sun Jul 27 02:08:31 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/weakref.rb: split executable code into sample directory.
+	* sample/weakref.rb: ditto.
+
+Sun Jul 27 02:06:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/delegate.rb: split executable code into sample directory.
+	* sample/delegate.rb: ditto.
+
+Sun Jul 27 01:46:34 2014  Zachary Scott  <e@zzak.io>
+
+	* proc.c (method_super_method): [DOC] Method#super_method
+
+Sun Jul 27 01:22:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (method_super_method): new method Method#super_method,
+	  which returns a method object of the method to be called by
+	  `super` in the receiver method object.
+	  [ruby-core:62202] [Feature #9781]
+
+Sat Jul 26 17:22:14 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/objspace/objspace_dump.c (dump_append): avoid fflush.
+
+	  because dump_append_string_value() iterates over each chars,
+	  fflush()-ing here effectively issues system calls on every single
+	  bytes exist in a ruby process.
+
+Sat Jul 26 16:55:18 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.h (struct iseq_compile_data_storage): reduce overhead
+	  to 16 bytes (from 32) on 64-bit
+
+Sat Jul 26 16:28:06 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_iseq_struct): reduce to 280 bytes
+	  (from 288 bytes) on 64-bit
+
+Sat Jul 26 06:44:43 2014  Eric Wong  <e@80x24.org>
+
+	* parse.y (struct parse_params): shrink to 320 to 304 bytes on 64-bit
+
+Sat Jul 26 05:58:35 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/ruby.h (ZALLOC, ZALLOC_N): implement
+	  (Data_Make_Struct, TypedData_Make_Struct):
+	  ZALLOC replaces ALLOC+memset
+	  [ruby-core:63951][Feature #10082]
+	* compile.c (iseq_seq_sequence): ZALLOC_N replaces ALLOC_N+MEMZERO
+	* cont.c (fiber_t_alloc): ZALLOC replaces ALLOC+MEMZERO
+	* io.c (rb_io_reopen): ditto
+	* iseq.c (prepare_iseq_build): ditto
+	* parse.y (new_args_tail_gen, parser_new, ripper_s_allocate): ditto
+	* re.c (match_alloc): ditto
+	* variable.c (rb_const_set): ditto
+	* ext/socket/raddrinfo.c (get_addrinfo): ditto
+	* ext/strscan/strscan.c (strscan_s_allocate): ditto
+	* gc.c (rb_objspace_alloc): calloc replaces malloc+MEMZERO
+
+Sat Jul 26 05:54:54 2014  Eric Wong  <e@80x24.org>
+
+	* symbol.c (dsymbol_check): remove unneeded semi-colon
+
+Fri Jul 25 14:07:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change objspace::rgengc::parent_object_is_old (boolean)
+	  to objspace::rgengc::parent_object (VALUE).
+	  Use Qfalse or RVALUE pointer instead of FALSE and TRUE.
+
+	* gc.c (gc_marks_body): should clear parent_object just before
+	  gc_mark_roots() because there are no parents objects
+	  for root objects.
+
+Fri Jul 25 13:45:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_writebarrier_remember_promoted): should remember only
+	  OLD objects on RGENGC_AGE2_PROMOTION.
+
+Fri Jul 25 13:42:02 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_stacked_objects): fix error message.
+
+Fri Jul 25 13:18:00 2014  Will Farrington  <wfarrington@digitalocean.com>
+
+	* ext/socket/socket.c (sock_gethostname): Use NI_MAXHOST to support
+	  hostnames longer than 64 characters if the system supports it.
+	  [fixes GH-683]
+
+Fri Jul 25 12:21:11 2014  Santiago Pastorino  <santiago@wyeworks.com>
+
+	* compile.c (defined_expr): make the condition if the receiver
+	  is explicit or implicit cleaner.  [fix GH-681]
+
+Fri Jul 25 03:53:52 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/keywords.rdoc:  [DOC] Describe each keyword.
+
+Thu Jul 24 22:40:24 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_RECORD#initialize
+	  method.
+
+	* ext/win32ole/win32ole.c (ole_val2variant): convert WIN32OLE_RECORD
+	  object to VT_RECORD variant.
+
+Thu Jul 24 20:10:59 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix major GC flags.
+	  * add GPR_FLAG_MAJOR_BY_FORCE, which indicates
+	    major GC by METHOD, CAPI and so on (see GC_BY).
+	  * remove GPR_FLAG_MAJOR_BY_RESCAN because not used.
+	  * remove GPR_FLAG_MAJOR_BY_STRESS, use FORCE instead.
+
+	* test/ruby/test_gc.rb: catch up.
+
+Thu Jul 24 15:55:02 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/io.h (struct rb_io_buffer_t): PACKED_STRUCT should not
+	  be used for platform-specific optimization. PACKED_STRUCT_UNALIGNED
+	  should be used. [ruby-core:63988] [Bug #10088]
+
+Thu Jul 24 04:42:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/benchmark.rb: split executable code into sample directory.
+	* sample/benchmark.rb: ditto.
+
+Thu Jul 24 04:36:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/tempfile.rb: split executable code into sample directory.
+	* sample/tempfile.rb: ditto.
+
+Thu Jul 24 04:29:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/pstore.rb: split executable code into sample directory.
+	* sample/pstore.rb: ditto.
+
+Wed Jul 23 23:50:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h, siphash.c, st.c (UNALIGNED_WORD_ACCESS):
+	  add PowerPC64 too, which is capable to access unaligned words.
+	  patched by Gustavo Frederico Temple Pedrosa in [ruby-core:63937].
+	  [Feature #10081]
+
+	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): ditto.
+
+Wed Jul 23 04:04:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/extserv.rb: remove duplicate code with sample directory.
+	  contributed from @vipulnsward. [fix GH-679]
+
+Tue Jul 22 12:56:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_count): fix wrong single-byte optimization.
+	  7bit ascii can be a trailing byte in Shift_JIS.
+	  [ruby-dev:48442] [Bug #10078]
+
+Tue Jul 22 01:48:38 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/io.h (rb_io_buffer_t): fix packing on gcc
+	  r46892 caused packing to be a no-op on gcc (4.7.2-5, Debian)
+	  [Bug #10079][ruby-core:63912]
+
+Mon Jul 21 15:55:42 2014  fuji70  <fujifuji70@gmail.com>
+
+	* lib/optparse.rb (getopts): print default values and descriptions
+	  in the help message.  [fix GH-676]
+
+Sun Jul 20 14:26:27 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_proc_t): reduce to 64 bytes from 72 on 64-bit
+
+Sun Jul 20 13:50:34 2014  Eric Wong  <e@80x24.org>
+
+	* transcode.c (rb_econv_t): reduce to 184 bytes from 200 on 64-bit
+
+Sun Jul 20 12:44:23 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/io.h (rb_io_buffer_t): pack structure
+	  Reduces rb_io_t from 200 to 192 bytes, allowing rb_io_t to
+	  occupy one less cache line.
+	  [Feature #10050]
+
+Sun Jul 20 12:41:53 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/io.h (rb_io_t): shrink to 200 bytes from 216 on 64-bit
+	  This puts us within 8 bytes of being three cache lines instead of
+	  four lines on x86-64.  This breaks the ABI.
+	  [Feature #10050]
+
+Sun Jul 20 12:36:46 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/oniguruma.h (struct re_pattern_buffer): shrink to 448
+	  bytes from 464 bytes on 64-bit.  This breaks the ABI.
+	  [Feature #10034]
+
+Sun Jul 20 01:06:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/openssl/ossl.c: use encryptor instead of encrypter in doc.
+	  contributed from @vipulnsward. [fix GH-663]
+
+Sun Jul 20 00:32:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize): [DOC] fix rdoc of append mode.  it does
+	  not move the pointer at open.  [ruby-core:63747] [Bug #10039]
+
+Sat Jul 19 12:40:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): allow to access private attribute
+	  reader in op_assign.  [ruby-core:63817] [Bug #10060]
+
+Sat Jul 19 11:56:36 2014  Grey Baker  <greysteil@gmail.com>
+
+	* lib/time.rb (Time#apply_offset): Guards against a `nil` return
+	  value from `Time.month_days` when offsetting date.  Out of range
+	  values are then caught when `Time.utc` is called (as usual).
+
+	  Previously a `nil` return value from `Time.month_days` would
+	  have the `<` operator called on it, and raise `NoMethodError`.
+	  [fix GH-667]
+
+	* lib/rdoc/parser/changelog.rb (RDoc#parse_entries): fix dirty hack.
+
+Sat Jul 19 06:19:01 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: refactoring.
+
+Fri Jul 18 22:34:41 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folevariant_initialize): WIN32OLE_VARIANT
+	  does not support VT_RECORD. VT_RECORD should be supported in
+	  WIN32OLE_RECORD.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_vt_record_exc):
+	  ditto.
+
+Fri Jul 18 19:54:03 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folevariant_initialize): remove unnecessary
+	  code.
+
+Fri Jul 18 19:11:03 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix/eigenvalue_decomposition: Style fix
+	  Patch by Gogo Tanaka [#10058]
+
+Fri Jul 18 19:03:53 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Avoid using `and`.
+	  Patch by gogo tanaka [#10058]
+
+Fri Jul 18 17:41:54 2014  GoGo tanaka  <qlli.illb@gmail.com>
+
+	* test/matrix/test_matrix.rb: Add tests for Matrix class.
+	  [Feature #10057][ruby-core:63809]
+
+Fri Jul 18 10:14:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/fileutils.rb: added missing options of FileUtils.touch by @Domon.
+	  [fix GH-669]
+
+Thu Jul 17 19:57:27 2014  Herwin  <herwin@quarantainenet.nl>
+
+	* ext/thread/thread.c (rb_szqueue_push): add optional parameter,
+	  non_block defaulted to false.  [ruby-core:63794] [Feature #10052]
+
+Wed Jul 16 23:01:43 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): support array of
+	  VT_RECORD variant.
+
+Wed Jul 16 20:21:49 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_core.h (struct rb_iseq_struct): stack_max is changed to int
+	  because all calculations related to stack_max in compile.c
+	  (iseq_set_sequence) and vm_insnhelper.c (vm_push_frame) are
+	  conducted by using int. This partly reverts r23945.
+	* vm_insnhelper.c (vm_push_frame): ditto. This reverts r42401.
+
+Wed Jul 16 19:55:32 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_core.h (struct rb_iseq_struct): temporal workaround of [Bug 10037].
+	  Add padding on big-endian 64-bit architecture (e.g. sparc64).
+
+Wed Jul 16 19:32:23 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_record_method_missing): call
+	  rb_hash_fetch instead of rb_hash_aref.
+
+Wed Jul 16 18:08:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (rb_iseq_defined_string): use rb_gc_mark_object() instead of
+	  marking from vm_mark().
+
+	* vm.c (rb_vm_mark): ditto.
+
+Wed Jul 16 18:03:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_roots): call rb_vm_mark directly.
+
+	* vm.c: remove mark function for RubyVM object because
+	  RubyVM object marked manually.
+
+Wed Jul 16 12:25:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09.
+	  this includes Support for Unicode 7.0 [Bug #9092].
+
+Tue Jul 15 23:59:27 2014  Jared Jennings  <jared.jennings.ctr@us.af.mil>
+
+	* ext/digest: make built-in digest function implementations
+	  indicate success or failure of init and final functions.
+	  [ruby-core:61614] [Bug #9659]
+
+	* ext/digest/digest.c: expect digest init and finish functions to
+	  indicate success or failure; raise exception on failure.
+	  [ruby-core:61614] [Bug #9659]
+
+Tue Jul 15 20:31:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: modify document for WIN32OLE_RECORD.
+
+Tue Jul 15 12:42:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* defs/default_gems: change version definition file of rake.
+
+Tue Jul 15 12:00:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rake.rb, lib/rake/*.rb: Upgrade to rake-10.3.2
+	  [fix GH-668]
+	* test/rake/*.rb: ditto.
+
+Mon Jul 14 19:14:51 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: modify WIN32OLE class document and
+	  add comment for constants of WIN32OLE.
+
+Mon Jul 14 16:38:45 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_iseq_struct): reduce to 288 bytes
+	  on x86-64 (from 296 bytes)
+
+Mon Jul 14 16:07:25 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.h (struct iseq_catch_table_entry): shrink to 32 bytes
+	  on x86-64 (from 48 bytes)
+
+Mon Jul 14 16:04:41 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.h (struct iseq_catch_table): new flexible array struct
+		 (iseq_catch_table_bytes): allocated size function
+	* vm_core.h (struct rb_iseq_struct): update catch_table member
+	  This reduces the struct from 304 to 296 bytes on x86-64.
+	* compile.c (iseq_set_exception_table): update for struct changes
+	* iseq.c (iseq_free): ditto
+	* iseq.c (iseq_memsize): ditto
+	* iseq.c (rb_iseq_disasm): ditto
+	* iseq.c (iseq_data_to_ary): ditto
+	* iseq.c (rb_iseq_build_for_ruby2cext): ditto (untested)
+	* vm.c (vm_exec): ditto
+	* vm_core.h (struct rb_iseq_struct): ditto
+	* vm_insnhelper.c (vm_throw): ditto
+
+Sun Jul 13 17:49:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/openssl/ossl_cipher.c: Fix call to ciphers class method and
+	  spell out `encryption` by @vipulnsward [fix GH-664]
+
+Sun Jul 13 17:31:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro.
+	* ext/sdbm/init.c: ditto.
+
+Sun Jul 13 17:25:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/dbm/dbm.c: fix wrong arguments in GetDBM2 macro by @v2e4lisp.
+	  [fix GH-655]
+
+Sun Jul 13 16:44:56 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_call_info_struct): improve packing
+	  This reduces the struct from 112 to 104 bytes on x86-64.
+
+Sun Jul 13 15:53:25 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_iseq_struct): stack_max is uint32_t
+	  This reduces the struct from 312 to 304 bytes on x86-64.
+
+Sun Jul 13 10:56:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_broken_backtrace): exit with failure
+	  normally, no needs to abort.  [ruby-core:63678] [Bug #10008]
+
+Sat Jul 12 15:10:22 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_record_method_missing): correct
+	  fields Hash key.
+
+Sat Jul 12 04:17:40 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/net/smtp.rb (Net::SMTP#data): enable buffering while
+	  'data' send for optimizing Net::SMTP#send_message.
+	  [ruby-dev:48329] [misc #9981]
+	  patch by Masahiro Tomita.
+
+Sat Jul 12 01:13:45 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/ruby/envutil.rb (assert_no_memory_leak): On Solaris 9 or later,
+	  if possible, execute child ruby with environment variables
+	  LD_PRELOAD=libumem.so UMEM_OPTIONS="backend=mmap". With these
+	  variables, freed memory is immediately returned to the OS.
+	  [Bug #10020] [ruby-dev:48391]
+
+Fri Jul 11 20:49:10 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_RECORD class to support
+	  VT_RECORD OLE variables.
+
+Fri Jul 11 17:15:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/abbrev.rb: remove executable.
+
+Fri Jul 11 16:45:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/fileutils.rb: handle ENOENT error with symlink targeted to
+	  non-exists file. [ruby-dev:45933] [Bug #6716]
+
+Fri Jul 11 15:59:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* array.c: Clarify documentation for Array#insert.
+	  [ruby-core:62934] [Bug #9901]
+
+Fri Jul 11 15:39:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* io.c: Improve Documentation by @dapplebeforedawn.
+	  [fix GH-658] [ruby-core:63579] [Bug #10012]
+
+Fri Jul 11 14:19:14 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Fix sign for cross_product [#9499]
+
+Fri Jul 11 11:11:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/prepare_so_k_nucleotide.rb: use require_relative.
+
+	* benchmark/prepare_so_reverse_complement.rb: ditto.
+
+Fri Jul 11 10:09:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (encodes): fix buffer overrun by tail_lf.  Thanks to
+	  Mamoru Tasaka and Tomas Hoger.  [ruby-core:63604] [Bug #10019]
+
+Thu Jul 10 23:51:36 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* hash.c (ruby_setenv): Fix TestEnv#test_aset failure on Solaris 9.
+	  When name contains '=', ruby_setenv raises Errno::EINVAL.
+	  That is the same behavior as Solaris 10.
+	  NULL check for malloc return value is also added.
+
+Thu Jul 10 15:02:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): adjust VM stack
+	  pointer to get rid of overwriting splat arguments by arguments
+	  for `to_hash` conversion.  [ruby-core:63593] [Bug #10016]
+
+Thu Jul 10 01:09:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* symbol.c: remove rb_gc_mark_symbols().
+
+	  fstrings referred by static symbols and pinned dynamic symbols
+	  are registered by rb_gc_register_mark_object().
+
+	  fstrings referred by dynamic symbols (not pinned symbols)
+	  are referred from global_symbols.dsymbol_fstr_hash (Hash object).
+
+	  Note that fstrings referred from dynamic symbols must live logger
+	  than symbol objects themselves because rb_gc_free_dsymbol() uses
+	  fstrings to remove from symbol tables.
+	  This is why we can not mark fstrings from dynamic symbols.
+
+	  This technique reduces root objects for GC marking.
+
+	* gc.c (gc_mark_roots): ditto.
+
+	* internal.h: ditto.
+
+Thu Jul 10 00:24:18 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* common.mk (DTRACE_DEPENDENT_OBJS): fix build failure on Solaris
+	  introduced in r46768. Object files containing dtrace probes should
+	  be listed in DTRACE_DEPENDENT_OBJS.
+
+Wed Jul  9 17:07:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.c, symbol.h: Symbol class implementation and internals,
+	  split from parse.y.
+
+Wed Jul  9 14:45:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: change Symbol <-> ID relationship to avoid
+	  exposing IDs from collectable symbols.
+	  [Bug #10014]
+
+	  Now, rb_check_id() returns 0 if corresponding symbol is
+	  pinned dynamic symbol.
+
+	  There is remaining intern_cstr_without_pindown(), it can return
+	  IDs from collectable symbols. We must be careful to use it
+	  (only used in parse.y).  I think it should be removed if
+	  it does not have impact for performance.
+
+	* parse.y:
+	  add:
+	  * STATIC_SYM2ID()
+	  * STATIC_ID2SYM()
+	  rename:
+	  * rb_pin_dynamic_symbol() -> dsymbol_pindown()
+
+	* internal.h:
+	  remove:
+	  * rb_check_id_without_pindown()
+	  * rb_sym2id_without_pindown()
+	  add:
+	  * rb_check_symbol()
+	  * rb_check_symbol_cstr()
+
+	* load.c: use rb_check_id() or rb_check_id_cstr().
+
+	* object.c: ditto.
+
+	* struct.c: ditto.
+
+	* thread.c: ditto.
+
+	* vm_method.c: ditto.
+
+	* string.c (sym_find): use only rb_check_symbol().
+
+	* sprintf.c (rb_str_format): use rb_check_symbol_cstr().
+
+Wed Jul  9 12:21:55 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (symbols_i): delete garbage symbols for Symbol.all_symbols.
+
+Wed Jul  9 05:49:08 2014  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.h (struct rb_global_vm_lock_struct):
+	  do not expose pthread type for lock
+
+Wed Jul  9 05:41:40 2014  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.h: remove unneeded semaphore.h include
+
+Wed Jul  9 00:12:28 2014  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: fix counting indent in identify_string_dvar.
+
+Tue Jul  8 16:58:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/memory_status.rb (Memory::PSCMD): use ps command which
+	  outputs expected result.  [ruby-dev:48370] [Bug #10010]
+
+Tue Jul  8 14:45:17 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (dsymbol_alloc): set global_symbols.minor_marked to 0.
+
+	* parse.y (dsymbol_check): set RSYMBOL(sym)->fstr to 0
+	  because we should not touch fstr after that.
+
+	* parse.y (rb_gc_free_dsymbol): skip deleting str and sym
+	  from tables if fstr == 0.
+
+Mon Jul  7 14:31:52 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: remove global_symbols::pinned_dsym
+	  (and ::pinned_dsym_minor_marked).
+
+	  Mark pinned dsymbols by rb_gc_register_mark_object() because
+	  they are immortal.
+
+	* parse.y (rb_gc_free_dsymbol): rename parameter name `ptr' to `sym'.
+
+Mon Jul  7 12:45:51 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: revert miss-commit.
+
+Mon Jul  7 12:40:59 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: need to use updated (re-created) symbols.
+
+Mon Jul  7 11:02:55 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/mkconfig.rb: remove not to require rbconfig/obsolete.rb.
+
+	* lib/rbconfig/obsolete.rb: removed.
+
+Mon Jul  7 10:52:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: do not use rb_gc_resurrect(), but create a new dynamic
+	  symbol for garbage dynamic symbol.
+
+	* common.mk: use gc.h by parse.y.
+
+Mon Jul  7 02:18:42 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (fstr_update_callback): do not use rb_gc_resurrect()
+	  any more.
+
+	  Make new frozen string and replace with garbage frozen string.
+
+	* common.mk: use gc.h from string.c.
+
+Mon Jul  7 00:36:13 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename is_dying_object() to is_garbage_object().
+
+	* gc.h: rb_objspace_garbage_object_p() as an exported function.
+
+Sun Jul  6 21:30:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (is_dying_object): fix missed condition.
+
+	* gc.c (is_live_object): move frequent path first.
+
+Sun Jul  6 21:00:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename is_dead_object() to is_dying_object().
+	  This function is not opposite against is_live_object()
+	  because is_dying_object() does *not* check object type.
+
+	* gc.c (is_dying_object): change condition.
+
+	* gc.c (is_live_object): use T_NONE instead of 0.
+
+	* gc.c (rb_objspace_dying_object_p): added.
+
+Sun Jul  6 13:37:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_register_mark_object): change data structure.
+	  From single array, to array of arrays. Each array only has 1024
+	  entries.
+
+	* vm.c (Init_vm_objects): change default capa from 1 to 128.
+
+Sat Jul  5 05:05:53 2014  Vipul A M  <vipulnsward@gmail.com>
+
+	* lib/irb/locale.rb (IRB::Locale#modifier): fix wrong attr_reader
+	  `modifieer` => `modifier` from irb locale.  [fix GH-656]
+
+Fri Jul  4 20:45:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: rename symbols::sym_id to symbols::str_id.
+	  This table is not {Symbol => ID} table, but
+	  {String => ID} table.
+
+	* parse.y (lookup_sym_id): also rename lookup_sym_id() to
+	  lookup_str_id() because key is not Symbol, but String.
+
+Fri Jul  4 18:42:04 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (must_be_dynamic_symbol): fix missed-condition.
+
+Fri Jul  4 18:38:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (rb_pin_dynamic_symbol): should be `static' function.
+
+Fri Jul  4 18:03:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (must_be_dynamic_symbol): refactoring.
+	  * add `inline'.
+	  * use UNLIKELY().
+	  * check only DYNAMIC_SYM_P(), otherwise it is a bug.
+	  * lookup_id_str() is not needed in second condition.
+
+Fri Jul  4 11:53:56 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: remove unused code
+	  surrounded by `#if ENABLE_SELECTOR_NAMESPACE'
+
+Fri Jul  4 10:08:24 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/rubygems/test_gem_package.rb: avoid tempfile leaks using Tempfile#close!
+	* test/rubygems/test_gem_request_set.rb: ditto.
+	* test/rubygems/test_gem_request_set_gem_dependency_api.rb: ditto.
+
+Fri Jul  4 04:42:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/response.rb (Net::Inflater#inflate_adapter):
+	  prevent automatic encoding conversion.
+
+Fri Jul  4 04:39:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/response.rb (Net::HTTPResponse.each_response_header):
+	  raise first exception even if inflate_body_io.finish raises error.
+	  when begin block raises error, finish usually raises error too.
+
+Fri Jul  4 02:56:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#query=): remove validation, just
+	  escape. [Feature #2542]
+
+	* lib/uri/generic.rb (URI::Generic#fragment=): ditto.
+
+	* lib/uri/generic.rb (URI::Generic#check_query): removed.
+
+	* lib/uri/generic.rb (URI::Generic#set_query): ditto.
+
+	* lib/uri/generic.rb (URI::Generic#check_fragment): ditto.
+
+	* lib/uri/generic.rb (URI::Generic#set_fragment): ditto.
+
+Thu Jul  3 12:40:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--with-static-linked-ext): fix for extensions to
+	  be linked statically.
+
+	* Makefile.in, common.mk: use ENCSTATIC for enc directory.
+
+	* ext/extmk.rb: supply dependencies of statically linked extension
+	  libraries.
+
+Wed Jul  2 15:45:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_heap_lazy_sweep): simplify logic.
+
+	* gc.c (gc_page_sweep): return TRUE if empty slots are available.
+
+Wed Jul  2 09:48:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* logger.rb: removed unmaintained code.
+	  [Feature #9860][ruby-core:62724]
+	* test/logger/test_application.rb: ditto.
+
+Wed Jul  2 03:20:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* node.c (dump_node): handle nd_value == (NODE *)-1 to mean this
+	  keyword argument is required
+
+Wed Jul  2 02:57:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_env_local_variables): returns array of local
+	  variable name symbols in the environment by envval.
+
+	* proc.c (bind_local_variables): use rb_vm_env_local_variables.
+
+Wed Jul  2 02:23:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (bind_receiver): new method to return the bound receiver
+	  of the binding object.  [ruby-dev:47613] [Feature #8779]
+
+Wed Jul  2 02:14:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (bind_local_variables): update env from envval for each
+	  iterations.  [ruby-dev:48351] [Bug #10001]
+
+Tue Jul  1 23:46:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* NEWS: [DOC] mention about Binding#local_variables, introduced at
+	  r44392 (see [Feature #8773]).
+
+Tue Jul  1 23:30:51 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* numeric.c (num_step_scan_args): table argument of rb_get_kwargs() is
+	  array of IDs, not Symbols. [ruby-dev:48353] [Bug #9811]
+
+Tue Jul  1 16:18:22 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb, test/digest/test_digest_hmac.rb:
+	  Digest::HMAC is finally removed as previously noticed.
+	  [fix GH-648]
+
+Tue Jul  1 11:13:43 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/date/lib/date/format.rb: removed empty file by @vipulnsward.
+	* ext/date/lib/date.rb: removed needless require.
+	  [fix GH-647]
+
+Mon Jun 30 16:42:52 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): return size_t value instead of VALUE
+	  and remove `out' parameter.
+
+	* gc.c: add braces for `if' statements.
+
+	* gc.c (gc_stat_internal): fix comment.
+
+Mon Jun 30 15:07:34 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: support `USE_RGENGC == 0'.
+
+	* test/ruby/test_gc.rb: ditto.
+
+Mon Jun 30 11:36:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* file.c: [DOC] document File.join returns a string.
+	  Contributed by @dapplebeforedawn. [fix GH-646]
+
+Sat Jun 28 22:57:01 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/pathname/pathname.c (path_birthtime): Windows support.
+	  see [Feature #9857] [ruby-dev:48339]
+
+Sat Jun 28 22:44:16 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_birthtime): New method,
+	  Pathname#birthtime.
+	  Proposed by Kazuhiro NISHIYAMA.  [ruby-dev:48232] [Feature #9857]
+
+Sat Jun 28 20:29:03 2014  Simon Baird  <simon.baird@gmail.com>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#PI): change error
+	  message about zero or negative precision for clarity and
+	  consistency with other methods.  [GH-644]
+
+Sat Jun 28 15:32:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb (create_listeners): Close socket objects.
+
+Sat Jun 28 13:58:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): should not overwrite SystemStackError
+	  backtrace if set already.  [ruby-core:63377] [Feature #6216]
+
+	* eval.c (setup_exception): get rid of method calls before raising
+	  stack overflow, not to cause stack overflow again.
+
+	* defs/id.def: add IDs for backtraces.
+
+Sat Jun 28 04:08:22 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb: update to latest specs, RFC 6068 and HTML5.
+
+	* lib/uri/mailto.rb (HEADER_PATTERN): removed.
+
+	* lib/uri/mailto.rb (HEADER_REGEXP): use RFC 6068 hfields.
+
+	* lib/uri/mailto.rb (EMAIL_REGEXP): use HTML5 email regexp.
+
+	* lib/uri/mailto.rb (URI::MailTo.build): support multiple to addresses.
+
+	* lib/uri/mailto.rb (URI::MailTo#initialize): Support multiple to
+	  addresses. Don't check with regexp, only split.
+
+	* lib/uri/mailto.rb (URI::MailTo#check_to): verify by matching
+	  URI path-rootless and HTML5 email regexp with unescaped one.
+
+	* lib/uri/mailto.rb (URI::MailTo#check_headers): verify only by
+	  HEADER_REGEXP.
+
+	* lib/uri/mailto.rb (URI::MailTo#set_headers): don't check by
+	  HEADER_REGEXP, only split it.
+
+Sat Jun 28 00:35:10 2014  Lauri Tirkkonen  <lotheac@iki.fi>
+
+	* tool/mkconfig.rb: fix empty RbConfig::CONFIG["prefix"] when
+	  configured --with-rubyarchprefix, remove prefix from rubyarchdir
+	  after expansion for the case it does not start with '$(prefix)'.
+	  [fix GH-643]
+
+Fri Jun 27 15:20:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase.
+	  because it's effected by removing minitest from stdlib.
+
+Fri Jun 27 12:29:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/specification.rb: fixed broken condition caused
+	  by removing YAML::ENGINE.
+	* lib/rubygems/package/old.rb: ditto.
+
+Fri Jun 27 05:33:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_shift): fix memory leak on Windows, free environment
+	  strings block always.  [ruby-dev:48332] [Bug #9983]
+
+Fri Jun 27 03:41:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (GETASTER): should not use the numbered argument to be
+	  formatted, raise ArgumentError instead.
+	  [ruby-dev:48330] [Bug #9982]
+
+Thu Jun 26 18:18:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/with_different_ofs.rb: move into test library directory.
+	* test/csv/base.rb: fix require path for with_different_ofs.rb.
+	* test/digest/test_digest_extend.rb: ditto.
+
+Thu Jun 26 18:06:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/profile_test_all.rb: move into test library directory.
+	* test/runner.rb: fix require path for profile_test_all.rb.
+
+Thu Jun 26 17:57:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/webrick/httpproxy.rb: remove useless assigned variables.
+	* lib/webrick/httpservlet/cgihandler.rb: ditto.
+	* lib/webrick/httpservlet/erbhandler.rb: ditto.
+	* lib/webrick/server.rb: ditto.
+
+Thu Jun 26 08:28:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_select): fix memory leak and crash on Windows, make
+	  keys array first instead of iterating on environ directly.
+	  [ruby-dev:48325] [Bug #9978]
+
+Thu Jun 26 02:45:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (error_print): put a newline after an anonymous
+	  exception class name.
+
+Wed Jun 25 22:31:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): fix memory leak on Windows, free
+	  environment strings block after check for the size.
+	  [ruby-dev:48323] [Bug #9977]
+
+Wed Jun 25 15:44:12 2014  Eric Wong  <e@80x24.org>
+
+	* ccan/container_of/container_of.h (container_off_var):
+	  avoid warning with -Wcast-qual
+	  [ccan ba5ad771af4aa9e085498de6c3c665c52694460f (Rusty Russell)]
+
+Wed Jun 25 10:19:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_aset, env_has_key, env_assoc, env_has_value),
+	  (env_rassoc, env_key): prohibit tainted strings if $SAFE is
+	  non-zero.  [Bug #9976]
+
+Tue Jun 24 14:46:17 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/gserver.rb: remove redundant use of to_s in interpolation.
+	* lib/logger.rb: ditto.
+	* lib/optparse.rb: ditto.
+	* lib/rbconfig/obsolete.rb: ditto.
+	* lib/resolv.rb: ditto.
+	* lib/webrick/httpresponse.rb: ditto.
+
+Tue Jun 24 10:50:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_path_str_new): make PATH environment variable
+	  string, to be frozen.
+
+Tue Jun 24 10:40:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/make-snapshot: download bundle gems when package making.
+	  [Feature #9852][ruby-core:62676]
+	* gems/bundled_gems: listed bundled gems for Ruby 2.2.
+
+Tue Jun 24 10:20:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/downloader.rb: make Downloader class to general download utility.
+	  It can be used without config.guess and config.sub.
+	* tool/get-config_files: ditto.
+	* tool/make-snapshot: ditto.
+
+Tue Jun 24 06:17:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* eval.c (setup_exception): "mesg == sysstack_error" and
+	  sysstack_error_p(mesg) are duplicated.
+	  r46502 seems to want to use latter.
+
+Tue Jun 24 06:15:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tcltklib.c: fix format specifiers for VALUE and
+	  Tcl_Interp*.  [ruby-core:63283] [Bug #9972]
+
+Tue Jun 24 05:40:41 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* nacl/nacl-config.rb: Use File.exist? instead of executable?
+	  for irt_core. Recent nacl_sdk has non-executable irt_core.
+	  Patch by Shinichiro Hamaji.
+	  [Fixes GH-529] https://github.com/ruby/ruby/pull/529
+
+Mon Jun 23 18:44:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/config_files.rb: rename class ConfigFiles to Downloader.
+	* tool/get-config_files: ditto.
+	* tool/make-snapshot: ditto.
+
+Mon Jun 23 18:03:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/rbinstall.rb: support to install bundle gems.
+
+Mon Jun 23 17:33:11 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/imap.rb (Net::IMAP#fetch): [DOC] Describe how a range in
+	  +set+ is interpreted, and mention -1 which can be used for '*'.
+
+Mon Jun 23 16:22:50 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RHash): no longer. [Feature #9889]
+
+	* include/ruby/ruby.h (RHASH): ditto.
+
+	* include/ruby/ruby.h (RHASH_ITER_LEV): deprecated.  Will be deleted later.
+
+	* include/ruby/ruby.h (RHASH_IFNONE): ditto.
+
+	* internal.h (struct RHash): moved here.
+
+	* internal.h (RHASH): ditto.
+
+	* hash.c (rb_hash_iter_lev): do not use this.
+
+	* hash.c (rb_hash_ifnone): ditto.
+
+Mon Jun 23 13:30:11 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RComplex): no longer. [Feature #9888]
+
+	* include/ruby/ruby.h (RCOMPLEX): ditto.
+
+	* include/ruby/ruby.h (RCOMPLEX_SET_REAL): deprecated.  Will be deleted later.
+
+	* include/ruby/ruby.h (RCOMPLEX_SET_IMAG): ditto.
+
+	* internal.h (struct RFloat): moved here.
+
+	* internal.h (RCOMPLEX): ditto.
+
+	* complex.c (rb_complex_set_real): do not use this.
+
+	* complex.c (rb_complex_set_imag): ditto.
+
+Mon Jun 23 13:10:15 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RFloat): no longer.  [Feature #9863]
+
+	* include/ruby/ruby.h (RFLOAT): ditto.
+
+	* internal.h (struct RFloat): moved here.
+
+	* internal.h (RFLOAT): ditto.
+
+Mon Jun 23 12:01:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (check_port): allow strings for port= as
+	  described in rdoc.
+
+	* lib/uri/rfc3986_parser.rb (regexp): implementation detail of above.
+
+Mon Jun 23 11:35:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): set backtrace in system stack error
+	  other than the pre-allocated sysstack_error.  [Feature #6216]
+
+	* proc.c (Init_Proc): freeze the pre-allocated sysstack_error.
+
+	* vm_insnhelper.c (vm_stackoverflow): raise new instance for each
+	  times without calling any methods to keep the backtrace with no
+	  further stack overflow.
+
+	* object.c (rb_obj_copy_ivar): extract function to copy instance
+	  variables only for T_OBJECT from init_copy.
+
+Mon Jun 23 11:11:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): drop the last tag too close to
+	  the fault page, to get rid of stack overflow deadlock.
+	  [Bug #9971]
+
+Sun Jun 22 09:11:15 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb: remove registry.
+	  'registry' is not used and RFC3986 doesn't use it.
+
+Sun Jun 22 09:10:09 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/rfc3986_parser.rb: raise exception when given a URI string
+	  has non ASCII in order to keep the regexp compiled for US-ASCII.
+
+Sun Jun 22 09:05:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::REGEXP): move to lib/uri/rfc2396_parser.rb.
+
+	* lib/uri/common.rb (URI::Parser): ditto.
+
+	* lib/uri/common.rb (URI.split): use RFC3986_Parser. [Feature #2542]
+
+	* lib/uri/common.rb (URI.parse): ditto.
+
+	* lib/uri/common.rb (URI.join): ditto.
+
+	* lib/uri/common.rb (URI.extract): deprecated.
+
+	* lib/uri/common.rb (URI.regexp): ditto.
+
+	* lib/uri/rfc2396_parser.rb: added.
+
+	* lib/uri/rfc3986_parser.rb: added.
+
+Sun Jun 22 09:04:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb (initialize): as previous commit, fix arg_check
+
+Sun Jun 22 09:01:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/ftp.rb (initialize): argument checking flag is arg_check,
+	  but arg[-1] is fragment.
+
+	* lib/uri/ftp.rb (initialize): explicitly specify arguments.
+
+Sat Jun 21 12:50:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
+	  with 3-digit.  libffi 3.1 returns just 2-digit.
+	  [ruby-core:62920] [Bug #9897]
+
+Sat Jun 21 07:06:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_find): [DOC] never accepted a symbol.
+	  [ruby-dev:48308] [Bug #9966]
+
+Fri Jun 20 17:15:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/lib/tracepointchecker.rb: add to check TracePoint healthiness.
+
+	* test/runner.rb: use it.
+
+Fri Jun 20 07:26:44 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: rewrite tests with
+	  assert_consistent_call_return().
+
+	  assert_consistent_call_return() is also modified to check
+	  consistency.
+
+Fri Jun 20 07:07:28 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_iseq_compile_node): put start label of block after
+	  trace (b_call).
+	  [Bug #9964]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	  added assert_consistent_call_return() method check call/return
+	  consistency.
+
+Fri Jun 20 05:26:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (rb_catch_protect): fix same problem of [Bug #9961].
+
+	* vm_eval.c (rb_iterate): ditto.
+
+Thu Jun 19 21:41:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_rewind_cfp): add new function to rewind specified cfp
+	  with invoking RUBY_EVENT_C_RETURN.
+	  [Bug #9961]
+
+	* vm_core.h: ditto.
+
+	* eval.c (rb_protect): use it.
+
+	* eval.c (rb_rescue2): ditto.
+
+	* vm_eval.c (rb_iterate): ditto.
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	* vm_core.h (rb_vm_rewind_cfp): add the prototype declaration.
+
+Thu Jun 19 19:47:21 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block_from_c): move call/return event timing for
+	  bmethod. It can invoke inconsistent call event if this call raises
+	  argument error.
+	  [Bug #9959]
+
+	* vm_insnhelper.c (vm_call_bmethod_body): ditto.
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Thu Jun 19 18:14:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or
+	  rescue clause.
+
+	* vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at rescue/ensure.
+
+	* test/ruby/test_settracefunc.rb: should not invoke b_return at rescue
+	  clause.
+	  [Bug #9957]
+
+	* vm_dump.c (control_frame_dump): check VM_FRAME_MAGIC_RESCUE.
+
+	* vm_dump.c (vm_stack_dump_each): ditto.
+
+Thu Jun 19 13:39:11 2014  Arne Brasseur  <arne@arnebrasseur.net>
+
+	* proc.c (rb_method_curry): Implement Method#curry, which delegates
+	  to to_proc.curry.  [ruby-core:62212] [Feature #9783]
+
+Tue Jun 17 16:41:49 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (gets, readline): read lines without LF properly.
+	  [ruby-core:63205] [Bug #9949]
+
+	* test/net/ftp/test_buffered_socket.rb: related test.
+
+Tue Jun 17 12:35:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (extract_raise_opts): pass unknown options to the
+	  exception, so that exception class can receive a hash argument.
+	  [ruby-core:63203] [Feature #8257]
+
+Tue Jun 17 12:24:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_memsize_of): memsize_of(T_ZOMBIE) returns 0, not a rb_bug.
+	  ObjectSpace.count_objects_size() uses memsize_of(T_ZOMBIE).
+
+	  This bug introduced at r46348.
+
+Mon Jun 16 19:00:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/runner.rb: failure message should be passed as an argument.
+
+Mon Jun 16 18:42:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/runner.rb: capture TracePoint stat before setup and compare
+	  it after teardown.
+
+Mon Jun 16 14:33:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (open): use UTF-8 version function to support
+	  non-ascii path properly.  [ruby-core:63185] [Bug #9946]
+
+Sat Jun 14 10:54:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rcombinate0): remove recursion, by looping with indexes
+	  stored in `p`.
+
+	* array.c (rpermute0): remove recursion, by looping with indexes
+	  stored in `p`.
+
+	* array.c (permute0): remove recursion, by looping with indexes
+	  stored in `p`.  [ruby-core:63103] [Bug #9932]
+
+Sat Jun 14 10:52:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): update capa only when buffer get
+	  reallocated.
+	  http://d.hatena.ne.jp/nagachika/20140613/ruby_trunk_changes_46413_46420#r46413
+
+Sat Jun 14 08:28:59 2014  Zachary Scott  <e@zzak.io>
+
+	* man/rake.1: [DOC] Update links for Rake, patch by @hsbt [Bug #9904]
+	  [Fixes GH-628] https://github.com/ruby/ruby/pull/628
+
+Fri Jun 13 17:58:58 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: add new method TracePoint.stat to debug
+	  TracePoint mechanism.
+
+	  Ruby users should not use this method. So I don't note this method
+	  in the NEWS file.
+
+	* test/runner.rb: detect zombie active TracePoints with
+	  TracePoint.stat.
+
+Fri Jun 13 17:46:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: clear and restore recursive checking thread local data
+	  to avoid unexpected throw from TracePoint.
+	  [Bug #9940]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	* thread.c: added
+	  * rb_threadptr_reset_recursive_data(rb_thread_t *th);
+	  * rb_threadptr_restore_recursive_data(rb_thread_t *th, VALUE old);
+
+	* vm_core.h: ditto.
+
+Fri Jun 13 17:33:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_combination): iterate on a shared copy, and use
+	  array of indexes instead of array of chosen objects.
+	  [ruby-core:63149] [Bug #9939]
+
+	* array.c (yield_indexed_values): extract from permute0(),
+	  rpermute0(), and rcombinate0().
+
+Fri Jun 13 13:42:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_permutation): `p` is the array of size `r`, as
+	  commented at permute0().  since `n >= r` here, buffer overflow
+	  never happened, just reduce unnecessary allocation though.
+
+Thu Jun 12 20:32:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): should consider the capacity instead
+	  of the old length, as pointed out by nagachika.
+
+Thu Jun 12 18:31:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/http/responses.rb: added Net::HTTPPermanentRedirect(308)
+	  Contributed by @yorkie [fix GH-638]
+
+Thu Jun 12 13:27:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_freeze): shrink the buffer before freezing, as
+	  pointed out by Eric Wong at [ruby-core:63119].
+
+Thu Jun 12 13:09:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (expand_path): shrink expanded path which no longer needs
+	  rooms to append.  [ruby-core:63114] [Bug #9934]
+
+Wed Jun 11 17:37:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_scalar_pthread_t): pthread_t is not required
+	  to be a scalar type.
+
+	* thread.c (fill_thread_id_string, thread_id_str): dump pthread_t
+	  in hexadecimal form if it is not a scalar type, assume it can be
+	  represented in a pointer form otherwise.  based on the patch by
+	  Rei Odaira at [ruby-core:62867].  [ruby-core:62857] [Bug #9884]
+
+	* thread_pthread.c (Init_native_thread, thread_start_func_1),
+	  (native_thread_create): set thread_id_str if needed.
+
+	* vm_core.h (rb_thread_t): add thread_id_string if needed.
+
+Wed Jun 11 01:53:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: invoke GC before memory allocation (xmalloc/xrealloc)
+	  when GC.stress = true.
+	  [Bug #9859]
+
+	* test/ruby/test_gc.rb: add a test.
+
+Tue Jun 10 13:20:14 2014  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: Provide a mechanism to specify the
+	  max_multipart_length of multipart data.
+	  [Feature #8370] patch by Leif Eriksen <leif.eriksen.au@gmail.com>
+
+Tue Jun 10 10:57:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV#<<): honor explicitly given encoding.  based on
+	  the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
+	  [ruby-core:62113].  [Bug #9766]
+
+Mon Jun  9 20:40:48 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change full GC timing to keep lower memory usage.
+
+	  Extend heap only at
+	  (1) after major GC
+	  or
+	  (2) after several (two times, at current) minor GC
+
+	  Details in https://bugs.ruby-lang.org/issues/9607#note-9
+	  [Bug #9607]
+
+Mon Jun  9 16:01:41 2014  Masahiro Ide  <imasahiro9@gmail.com>
+
+	* gc.c (gcdebug_sentinel): fix typo, "sentinel" not "sential".
+	  [fix GH-634]
+
+Mon Jun  9 00:04:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (posix_fadvise): disable use of posix_fadvise
+	  itself on 32-bit AIX.  [ruby-core:62968] [Bug #9914]
+
+Sun Jun  8 23:28:00 2014    <kanemoto@ruby-lang.org>
+
+	* io.c (rb_io_advise): AIX currently does not support a 32-bit call to
+	  posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira.
+	  [ruby-core:62968] [Bug #9914]
+
+Sun Jun  8 04:52:40 2014  Jun Hiroe  <Jun.Hiroe@gmail.com>
+
+	* string.c (rb_str_slice_bang): [DOC] update return value against
+	  a fixnum, which has changed because of M17N.  [fix GH-631]
+
+Sat Jun  7 22:13:42 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* numeric.c (do_coerce): Add a warning when an exception is raised
+	  or an invalid value is returned in #coerce called by
+	  numeric comparison operators and the exception
+	  thrown by the caller has no information on the failure.
+	  In the next release such exception should not be rescued or
+	  should be the cause of the caller exception. nil is accepted
+	  as the "no possible coercion" return value. See #7688.
+
+	* test/ruby/test_numeric.rb: Add corresponding test.
+
+Sat Jun  7 18:15:33 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* numeric.c (bit_coerce): remove constant parameter `err'
+	  (always TRUE) of bit_coerce().
+
+Sat Jun  7 16:01:57 2014  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size
+	  for later use. Patch by Rei Odaira. [ruby-core:62945] [Bug #9905]
+
+Sat Jun  7 12:51:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (read_all): truncate the buffer before appending read data,
+	  instead of truncating before reading.
+	  [ruby-core:55951] [Bug #8625]
+
+Sat Jun  7 12:28:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/digest.c (rb_digest_instance_equal): no need to call
+	  `to_s` twice.  [Bug #9913]
+
+Sat Jun  7 11:35:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* object.c (rb_mod_initialize_clone): Override Kernel#initialize_clone
+	  to avoid an exception on Class.new.freeze.clone.to_s.
+	  Reported by Andrew Grimm.  [ruby-core:41858] [Bug #5828]
+
+Sat Jun  7 06:03:11 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/digest/digest.c (rb_digest_instance_equal):
+	  fix #== for non-string arguments. [ruby-core:62967] [Bug #9913]
+
+	* test/digest/test_digest.rb: add test for above.
+
+Fri Jun  6 22:19:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (private_recv_p): check by node type, instead of a
+	  magic number.
+
+	* node.h (NODE_PRIVATE_RECV), parse.y (attrset_gen): remove
+
+Fri Jun  6 17:07:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each), parse.y (new_attr_op_assign_gen):
+	  allow op assign to a private attribute.
+	  [ruby-core:62949] [Bug #9907]
+
+Fri Jun  6 13:39:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_setstrbuf, io_read): should not shorten the given buffer until
+	  read succeeds.  [ruby-core:55951] [Bug #8625]
+
+Fri Jun  6 07:41:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with a
+	  tag so that they can be parsed on input. [Bug #9873] [ruby-core:62825]
+	* test/psych/test_symbol.rb: test for change
+
+Thu Jun  5 16:08:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_page_sweep): refactoring.
+
+	* gc.c (gc_page_sweep): should not set, but add final_slots into
+	  sweep_page->final_slots.
+
+Thu Jun  5 14:36:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (jemalloc): check for the header regardless drop-in
+	  libjemalloc is found, for `malloc_conf` declaration.
+
+	* version.c (ruby_show_version): show `malloc_conf` if set.
+	  [Feature #9113]
+
+	* configure.in (with-jemalloc): also check for header, for ABIs
+	  which JEMALLOC_MANGLE is needed, i.e., Mach-O and PE-COFF
+	  platforms.  [ruby-core:62939] [Feature #9113]
+
+	* include/ruby/missing.h: include alternative malloc header to
+	  replace memory management functions.
+
+	* dln.c, io.c, parse.y, st.c: undef malloc family before
+	  re-definition to suppress warnings.
+
+Thu Jun  5 12:52:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* man/ruby.1: remove rubyforge entry.
+
+Thu Jun  5 12:45:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* misc/README: use github link instead of rubyforge.
+
+Thu Jun  5 10:03:29 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_free): check also FL_PROMOTED bit by RVALUE_OLD_P().
+
+Thu Jun  5 03:45:28 2014  Eric Wong  <e@80x24.org>
+
+	* configure.in: add --with-jemalloc option
+	  [ruby-core:62912]
+
+Wed Jun  4 22:28:14 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce RZombie to manage zombie objects.
+	  Rewrite finalizing logics with this type.
+
+	* gc.c (gc_verify_internal_consistency): verify zombie (finalizing)
+	  objects count.
+
+Wed Jun  4 22:09:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_aref, rb_reg_regsub): consider encoding of captured
+	  names, encoding-incompatible should not match.
+	  [ruby-dev:48278] [Bug #9903]
+
+Wed Jun  4 21:23:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_aref): should not ignore name after NUL byte.
+	  [ruby-dev:48275] [Bug #9902]
+
+Wed Jun  4 04:08:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (core_hash_merge_kwd): should return the result hash, which
+	  may be converted from and differ from the given argument.
+	  [ruby-core:62921] [Bug #9898]
+
+Tue Jun  3 23:32:34 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (load_file_internal2): Extracted from load_file_internal.
+	  (load_file_internal): Invoke load_file_internal2 using rb_protect.
+	  Close an opened FD if load_file_internal2 raises an exception.
+
+Tue Jun  3 19:11:45 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_free): should not rest_sweep() here.
+	  Some data structures are already freed.
+
+Tue Jun  3 18:43:51 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: allocate more objects to invoke GC by newobj.
+	  GC allows extending pages depends on heap_increment.
+
+Tue Jun  3 18:01:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): add
+	  gc_verify_internal_consistency() when RGENGC_CHECK_MODE >= 2.
+
+Tue Jun  3 17:54:21 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change the counting method for young objects.
+	  clear counter at the beginning of every GC and
+	  count promoted (infant->young) objects.
+
+	  Some promotions (infant->young) are transition of promoting to old
+	  objects. We should not count such promotions.
+
+	  With this technique, we don't need to check young objects
+	  at obj_free().
+
+Tue Jun  3 16:38:19 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add verifying counters code in gc_verify_internal_consistency().
+	  gc_verify_internal_consistency() counts all
+	  - live objects
+	  - young objects (if age2 promotion)
+	  - old objects
+	  in all pages and compares with objspace managing counters.
+
+	* gc.c (gc_after_sweep): do gc_verify_internal_consistency()
+	  when RGENGC_CHECK_MODE >= 2.
+
+Tue Jun  3 13:14:04 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body
+	  type as "MIXED" followed immediately by params
+	  [ruby-core:62864] [Bug #9885]
+	  Patch by @rayners (David Raynes). [Fixes GH-622]
+	  https://github.com/ruby/ruby/pull/622
+
+Tue Jun  3 13:18:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_live_slot): live slot count should not include final
+	  slot (contains T_ZOMBIE) count.
+
+Tue Jun  3 13:03:21 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_free): fix spacing.
+
+Tue Jun  3 12:59:32 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (check_gen_consistency): fix error message.
+
+Tue Jun  3 12:40:23 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: count old/young objects more correctly.
+
+	* gc.c (RVALUE_DEMOTE_FROM_OLD): decrement old object count.
+
+	* gc.c (RVALUE_DEMOTE_FROM_YOUNG): decrement young object count.
+
+	* gc.c (rb_gc_resurrect): increment old object count.
+
+	* gc.c (gc_marks_body): should not add old object count.
+	  This code is completely my misunderstanding.
+
+	* gc.c (rb_gc_force_recycle): decrement young or old object count
+	  correctly.
+
+Tue Jun  3 12:26:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit
+	  correctly for fiddle/import unavailable environments.
+
+Tue Jun  3 09:45:13 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result):
+	  shouldn't use same server for respective tests, because the 1st
+	  test sometimes kills the server main loop silently.
+	  [Bug #9881] [ruby-dev:48266]
+
+Tue Jun  3 01:34:59 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT: [DOC] Add rb_call_super when subclassing from @robin850
+	  [Fixes GH-623] https://github.com/ruby/ruby/pull/623
+
+Mon Jun  2 17:14:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (ruby_vm_destruct): remove useless call of
+	  rb_gc_force_recycle().
+
+	  At this line, a VM object is already freed
+	  (is changed to T_NONE) by rb_gc_call_finalizer_at_exit().
+
+Mon Jun  2 15:50:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_using_refinement): add write-barriers for
+	  cref->nd_refinements.
+
+Mon Jun  2 12:26:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* CONTRIBUTING.md: added contributing guide for github. [fix GH-625]
+
+Mon Jun  2 07:30:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (default_warning): New method.
+
+	* test/ruby/test_autoload.rb: Use EnvUtil.default_warning.
+
+Mon Jun  2 07:05:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h: constify `rb_encoding` arguments.
+
+	* include/ruby/oniguruma.h: constify `OnigEncoding` arguments.
+
+Sun Jun  1 12:05:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/drb: Wrap tests definitions by DRbTests module.  This makes
+	  several tests (ACLEntryTest, TestBug4409, etc.) easier to understand
+	  that they are tests for DRb.
+
+Sun Jun  1 11:36:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rinda/ring.rb (RingFinger#make_socket): Close the socket on
+	  exception.
+
+Sun Jun  1 06:55:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (intern_str): dynamic attrset ID is registered by
+	  `rb_id_attrset()` already, so no further registration is needed.
+	  [ruby-core:62861]
+
+Sun Jun  1 04:52:47 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/English.rb: [DOC] $LOADED_FEATURES moved to load.c [Fixes GH-620]
+	  Patch submitted by @leafac in https://github.com/ruby/ruby/pull/620
+	* doc/globals.rdoc: Added $LOADED_FEATURES to list
+
+Sat May 31 22:30:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/leakchecker.rb: Leak checker extracted from
+	  test/lib/minitest/unit.rb.
+
+Sat May 31 21:15:43 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* thread.c (rb_thread_atfork_internal): My compiler complains
+	  about this variable being used before initialized. I looked at
+	  the code and expanded the macro and turned out it was actually
+	  USED for pointer arithmetic, not dereferenced.  So this was
+	  never a serious bug.  But is annoying indeed to see warnings
+	  every time.  I added `=0` and all went healthy.
+
+	* configure.in: Also, I found that the problematic macro expansion
+	  only happens when we lack __typeof__ C extension, which shall
+	  not be the case of my compiler.  I added AC_C_TYPEOF to kick ass.
+
+Sat May 31 16:32:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/ipaddr.rb: extracted inline tests into test dir.
+	* test/test_ipaddr.rb: ditto.
+
+Sat May 31 16:29:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/digest/lib/digest/hmac.rb: extracted inline tests into test dir.
+	* test/digest/test_digest_hmac.rb: ditto.
+
+Sat May 31 16:02:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_syslog.rb: remove executable.
+
+Sat May 31 08:58:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/unicode.c (init_case_fold_table): no longer need to
+	  initialize tables at runtime.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case unfolding table 3.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case unfolding table 2.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case unfolding table 1.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case folding table.
+
+	* enc/unicode/case-folding.rb (print_table): merge non-locale and
+	  locale tables, and reduce initializing loops.
+
+	* enc/unicode/case-folding.rb (CaseFolding): modularize, and add
+	  --output-file option.
+
+	* enc/unicode/case-folding.rb: script to convert CaseFolding.txt,
+	  translated from CaseFolding.py.
+
+Sat May 31 08:31:41 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Check Tempfile leaks for each test method
+	  again.
+
+Sat May 31 03:50:50 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/delegate.rb: [DOC] Document raise in Delegator class
+	  Patch by @lucasmazza. [Fixes GH-621]
+	  https://github.com/ruby/ruby/pull/621
+
+Fri May 30 21:23:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb: Use a pipe to detect server shutdown.
+	  shutdown() or close() for listening socket is not a reliable.
+	  Actually, both doesn't work (doesn't wake up select()) on
+	  DragonFly BSD 3.6.2.
+
+	* test/webrick/utils.rb: :ShutdownSocketWithoutClose is not required
+	  now to immediate server shutdown detection.
+	  This fixes fd leaks.
+
+	* test/net/http/utils.rb: Ditto.
+
+Fri May 30 20:58:37 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (check_fd_leak): Sort the inspected
+	  objects list for a FD.
+
+Fri May 30 18:06:55 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (check_fd_leak): Try GC to delete leaked
+	  FDs.
+
+Fri May 30 12:05:59 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/lib/test/unit/parallel.rb (_run_suite): orig_stdout may be nil
+	  though I don't know the reason.
+
+Fri May 30 11:33:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_substr): need to reset code range for shared
+	  string too, not only copied string.
+	  [ruby-core:62842] [Bug #9882]
+
+Fri May 30 10:22:21 2014  Mark Lorenz  <mlorenz@covermymeds.com>
+
+	* lib/erb.rb (result): [DOC] no longer accepts a Proc, as
+	  Kernel.eval does not.  [fix GH-619]
+
+Fri May 30 07:25:46 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/dir: Dir#fileno implemented.
+
+	* test/lib/minitest/unit.rb (find_fds): Don't return the fd used to
+	  scan /proc/$$/fd.
+
+Fri May 30 04:48:00 2014  Eric Wong  <e@80x24.org>
+
+	* parse.y (rb_gc_mark_parser): remove, empty since r8758
+	* internal.h: ditto, not usable from extensions since 2.0.0
+	* gc.c (gc_mark_roots): remove checkpoint for parser
+
+Thu May 29 23:27:50 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* signal.c (ruby_signal): should return either `old.sa_sigaction`
+	  or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
+	  `old.sa_flags`, because they may not be a union.
+	  [ruby-core:62836] [Bug #9878]
+
+Thu May 29 23:11:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (pipe_open): Close pipes when rb_execarg_fixup() raises
+	  an exception.
+	  (rb_execarg_fixup_v): New function.
+
+Thu May 29 22:18:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (capture_subprocess_io): Close fds.
+
+Thu May 29 19:47:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_s_pipe): Close pipes if io_encoding_set() raises an
+	  exception.
+	  (io_encoding_set_v): New function.
+
+Thu May 29 19:42:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/csv.rb (CSV.open): Close the opened file when an exception
+	  occur.
+
+Thu May 29 19:31:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
+	  if any exception occur.
+
+Thu May 29 05:05:29 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/ruby.h: Hide Symbol internals.
+	  (struct RSymbol): moved to internal.h
+	  (RSYMBOL): ditto
+
+Thu May 29 00:28:56 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): Open a socket
+	  after path length check.
+	  This fixes a fd leak by TestSocket_UNIXSocket#test_too_long_path.
+
+Wed May 28 23:04:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer1): Use
+	  ObjectSpace.each_object to close files.
+	  GC.start is not reliable.
+
+Wed May 28 19:00:31 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/imap.rb (Net::IMAP#initialize): Close the opened socket when
+	  any exception occur.
+	  This fixes a fd leak by IMAPTest#test_imaps_post_connection_check
+	  which start_tls_session() raises an exception.
+
+Wed May 28 18:06:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work
+	  when SSL is not started.
+	  This fix the fd leak by test_https_proxy_authentication in
+	  test/net/http/test_https_proxy.rb.
+
+Wed May 28 10:29:28 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (rb_vm_living_threads_foreach): remove function
+	  [ruby-core:62745]
+	* thread.c (terminate_i): remove
+	* thread.c (terminate_all): implement (inlines old terminate_i)
+	* thread.c (rb_thread_terminate_all): use terminate_all
+	* thread.c (rb_thread_fd_close_i): remove
+	* thread.c (rb_thread_fd_close): iterate inline
+	* thread.c (thread_list_i): remove
+	* thread.c (rb_thread_list): iterate inline
+	* thread.c (rb_thread_atfork_internal): iterate inline
+	* thread.c (terminate_atfork_i): update types to remove casts
+	* thread.c (terminate_atfork_before_exec_i): ditto
+	* thread.c (struct thgroup_list_params): remove definition
+	* thread.c (thgroup_list_i): remove
+	* thread.c (thgroup_list): iterate inline
+	* thread.c (check_deadlock_i): remove
+	* thread.c (debug_deadlock_check): implement (inlines check_deadlock_i)
+	* thread.c (debug_i): remove
+	* thread.c (rb_check_deadlock): iterate inline
+	* vm.c (vm_mark_each_thread_func): remove
+	* vm.c (rb_vm_mark): iterate inline
+	* vm_core.h (rb_vm_living_threads_remove): remove
+	* vm_trace.c (clear_trace_func_i): remove
+	* vm_trace.c (rb_clear_trace_func): iterate inline
+
+Wed May 28 09:30:51 2014  Eric Wong  <e@80x24.org>
+
+	* signal.c (signal_exec): ignore immediate cmd for SIG_IGN
+	* signal.c (trap_handler): set cmd to true for SIG_IGN
+	* signal.c (trap): handle nil and true values for oldcmd
+	  [Bug #9835]
+
+Wed May 28 01:02:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile#inspect): Show "(closed)" if the tempfile
+	  is closed.
+
+Wed May 28 00:38:09 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Use Tempfile#close! instead of
+	  Tempfile#unlink to close file descriptors.
+
+	* test/openssl/test_config.rb: Ditto.
+
+	* test/ruby/test_io.rb: Ditto.
+
+Wed May 28 00:06:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
+	  exception occur.
+
+Tue May 27 23:50:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/cgi/core.rb: Use Tempfile#close! instead of Tempfile#unlink
+	  to close file descriptors.
+
+Tue May 27 23:06:46 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_number_literal_suffix): refine error message for
+	  extra dot and digits.
+
+Tue May 27 22:44:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/rexml: Avoid fd leaks.
+
+Tue May 27 22:24:25 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Indent.
+
+Tue May 27 22:15:29 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Wrap by REXMLTests module.
+
+Tue May 27 22:11:10 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_encoding_2.rb: Remove a needless file.
+
+Tue May 27 22:10:30 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_contrib.rb: Indent.
+
+Tue May 27 21:28:16 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/ifaddr.c (ifaddr_inspect_flags): support IFF_SIMPLEX.
+
+Tue May 27 21:03:03 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: Use REXMLTests as wrapping module for REXML tests.
+	  I avoid using the same module for library in test because
+	  it provides "include REXML" environment in test. Normally,
+	  users don't use REXML on "include REXML" environment. So I
+	  don't want to write tests on "include REXML" environment.
+
+Tue May 27 20:59:37 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_comment.rb: Remove needless REXML module wrapping.
+
+Tue May 27 20:56:49 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/openssl/test_pkcs7.rb: Fix inverted expected and actual values.
+
+Tue May 27 20:26:06 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer1): some opened fds are
+	  remain before GC, so unlink the tempfile is failed.
+
+Tue May 27 19:07:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_autoclose_p): Don't raise on frozen IO.
+
+	* test/lib/minitest/unit.rb: IO#autoclose? may raise IOError.
+
+Tue May 27 19:01:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pair.rb: Modify TestSSL#test_read_and_write
+	  to handle partial sysreads. [Bug #7398][ruby-core:49563]
+	* test/openssl/test_ssl.rb: ditto.
+
+Tue May 27 18:46:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pkcs7.rb: Add tests for PKCS7#type= and add_data.
+	  [Feature #7399][ruby-core:49565]
+
+Tue May 27 17:45:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_hmac.rb (test_binary_update): Added Test for
+	  HMAC signing with UTF-8 String. [Bug #7512][ruby-core:50559]
+
+Tue May 27 17:10:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/runner.rb: fixed randomly test failure.
+	  [Bug #6573][ruby-core:45563]
+
+Tue May 27 16:58:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_timeout.rb (test_timeout): inverted test condition.
+	  [Bug #8523]
+
+Tue May 27 12:24:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show leaked file descriptors.
+
+Tue May 27 11:12:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_fileno, rb_io_inspect): non-modification does not
+	  error on frozen IO.  [ruby-dev:48241] [Bug #9865]
+
+Tue May 27 00:00:21 2014  yui-knk  <spiketeika@gmail.com>
+
+	* insns.def (defineclass): fix typo in the instruction comment.
+	  [fix GH-618]
+
+Mon May 26 16:33:15 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file.rb: skip the test of atime on Windows, because
+	  Windows delays updating atime about 1 hour.
+	  see more details:
+	    http://msdn.microsoft.com/en-us/library/windows/desktop/ms724290%28v=vs.85%29.aspx
+
+Mon May 26 12:25:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optionparser.rb, lib/optparse.rb (OptParse): aliases.
+	  [ruby-core:62751] [Feature #9864]
+
+Mon May 26 07:59:34 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show Finished threads line-by-line.
+
+Mon May 26 01:39:02 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/csv.rb: Reject nil as data source for CSV.new, patch by @Peeja.
+	  [Fixes GH-580] https://github.com/ruby/ruby/pull/580
+
+Mon May 26 01:07:51 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show leaked threads and tempfiles
+	  line-by-line.
+
+Sun May 25 23:02:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (MiniTest::Assertions#diff): Remove
+	  tempfiles.
+
+Sun May 25 22:42:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Check tempfile leak for each test class.
+
+Sun May 25 20:31:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_{getcontext,setcontext}): do not
+	  disable ucontext.h entirely, but disable use of functions only.
+	  `ucontext_t` is necessary in the signal handler now.
+
+Sun May 25 20:00:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): revert part of r46100, the
+	  previous condition was correct, and fix compilation error on
+	  other architecture linux.  [ruby-core:62746] [Bug #9862]
+
+Sun May 25 17:09:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Less ObjectSpace.each_object(Tempfile)
+	  invocation.
+
+Sun May 25 16:54:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Use Thread.list instead of
+	  ObjectSpace.each_object(Thread).
+
+Sun May 25 15:53:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
+	  threads.
+
+Sun May 25 15:26:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb: Override the inspect method of the thread
+	  used in WEBrick::Utils::TimeoutHandler.
+
+Sun May 25 14:22:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl: Join threads.
+
+Sun May 25 12:46:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_bug_context): new function to report bug with
+	  context.
+
+	* vm_dump.c (rb_vm_bugreport): accepts `ucontext_t` argument to
+	  dump machine registers.  based on [GH-584].
+
+	* signal.c (sigbus, sigsegv): dump machine registers if available.
+
+Sun May 25 12:32:42 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Sort leaked threads and tempfiles.
+
+Sun May 25 12:15:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): fix condition to use ucontext
+	  register, mcontext_t dereference, and its member names, on Mac
+	  OS X.
+
+Sun May 25 11:58:26 2014  Zachary Scott  <e@zzak.io>
+
+	* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
+	  Patch by Erik Hollembeak [Bug #9814]
+
+Sun May 25 11:56:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): fix string width when precision is
+	  given.  as the result of `memchr` is NULL or its offset from the
+	  start cannot exceed the size, the comparison was always false.
+	  [ruby-core:62737] [Bug #9861]
+
+Sun May 25 11:32:42 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/yaml.rb: Remove Psych::EngineManager [Bug #8344]
+	* test/psych/*: ditto.
+
+Sun May 25 10:34:15 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/regexp.rdoc: [DOC] Clarify whitespace matching by @allolex
+	  [Fixes GH-606] https://github.com/ruby/ruby/pull/606
+
+Sun May 25 10:19:34 2014  Zachary Scott  <e@zzak.io>
+
+	* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
+	  Patch submitted via documenting-ruby/ruby#34
+
+Sun May 25 10:16:43 2014  Zachary Scott  <e@zzak.io>
+
+	* cont.c: [DOC] Fix rdoc in example for Fiber#transfer by @majjoha
+	  Patch submitted via documenting-ruby/ruby#33
+
+Sun May 25 10:01:11 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/irb.rb: [DOC] Fixed syntax error in example by @jasdeepsingh.
+	  Patch submitted via documenting-ruby/ruby#32
+
+Sun May 25 09:58:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/fileutils/test_fileutils.rb (test_chown_R): Add tests for
+	  chown_R. [Feature #9383][ruby-core:59641]
+
+Sun May 25 09:57:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/fileutils/test_fileutils.rb: Added recursively chown tests.
+	  [Feature #9303][ruby-core:59325]
+
+Sun May 25 09:41:56 2014  Zachary Scott  <e@zzak.io>
+
+	* class.c: [DOC] Fixed grammar and examples of instance_methods.
+	  By @alex-frost via documenting-ruby/ruby#31
+
+Sun May 25 09:40:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show leaked threads and tempfiles.
+
+Sun May 25 08:54:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_partial_record_read.rb: Testing read_nonblock on
+	  a partial TLS record results in IO::WaitReadable by @mohamedhafez.
+	  [fix GH-547]
+
+Sun May 25 08:43:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/logger.rb: refactored to include Logger::Period.
+
+Sun May 25 06:50:19 2014  Zachary Scott  <e@zzak.io>
+
+	* vm_eval.c: [DOC] Improve instance_eval description when given a
+	  block or String arguments. By @nathanl via documenting-ruby/ruby#28
+
+Sun May 25 06:29:39 2014  Zachary Scott  <e@zzak.io>
+
+	* array.c: [DOC] Clarify default argument for Array.new.
+	  By @Elffers [Fixes GH-610]
+
+Sat May 24 22:37:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* array.c: [DOC] Add more documents to shuffle! and shuffle.
+	  Contributed by @JuanitoFatas [ci skip][fix GH-612]
+
+Sat May 24 22:28:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/lib/minitest/.document: removed unused configuration.
+
+Sat May 24 19:08:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/spec.rb: Unused file removed.
+
+	* test/lib/minitest/autorun.rb: Don't require minitest/spec.
+
+	* test/lib/minitest/benchmark.rb: Ditto.
+
+Sat May 24 18:45:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/benchmark/test_benchmark.rb: Use test/unit.
+
+Sat May 24 16:20:59 2014  Eric Wong  <e@80x24.org>
+
+	* process.c (proc_getgroups, proc_setgroups): use ALLOCV_N
+	  [Bug #9856]
+
+Sat May 24 15:49:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (parallelize_me!): Removed.
+	  This fixes the line-by-line structure of the test result in verbose
+	  mode.  [ruby-core:54905]
+
+	* test/lib/minitest/parallel_each.rb: Removed.
+
+	* test/minitest/test_minitest_mock.rb: Don't call parallelize_me!.
+
+	* test/minitest/test_minitest_spec.rb: Ditto.
+
+	* test/minitest/test_minitest_unit.rb: Ditto.
+	  Tests for parallel feature removed.
+
+Sat May 24 15:29:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/hell.rb: Unused file removed.
+
+	* test/lib/minitest/pride.rb: Ditto.
+
+Sat May 24 15:05:32 2014  yui-knk  <spiketeika@gmail.com>
+
+	* enumerator.c (yielder_yield_push): Insert a break after the
+	  method return value.  [fix GH-617]
+
+Sat May 24 14:59:12 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest: Remove comments not appropriate now.
+
+	* test/minitest: Ditto.
+
+Sat May 24 14:02:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* NEWS: added minitest changes.
+
+Sat May 24 13:42:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/lib/test/unit/test-unit.gemspec: removed needless gemspec file.
+
+Sat May 24 09:39:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* defs/default_gems: removed minitest entry.
+
+Sat May 24 06:17:33 2014  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	*  lib/minitest: minitest 4.7.5 removed. Need to support proper
+	  gem packaging / installation before minitest 5 can be added.
+
+Sat May 24 05:54:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: More constants
+
+Sat May 24 00:25:34 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* NEWS: add information of incompatibility about Prime.prime?
+	* lib/prime.rb: fix docs.
+
+Fri May 23 21:36:28 2014  Josh Goebel  <dreamer3@gmail.com>
+
+	* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
+	  for messages not ending with a new-line.
+	  [ruby-core:61441] [Bug #9627] [fix GH-616]
+
+Fri May 23 03:48:08 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (rb_free_m_tbl): mark function as static
+
+	* method.h (rb_free_m_tbl): remove prototype
+
+Thu May 22 22:58:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: More TCP option constants.
+	  Describe Linux and glibc versions.
+
+Thu May 22 20:38:10 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (stat_birthtime): add birthtime support [Feature #9647]
+
+	* file.c (rb_stat_birthtime): add File::Stat.birthtime
+
+	* file.c (rb_file_s_birthtime): add File.birthtime
+
+	* file.c (rb_file_birthtime): add File#birthtime
+
+	* configure.in: check struct stat.st_birthtimespec.
+
+Thu May 22 19:38:14 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c: remove IO::Statfs because of reject. [Feature #9772]
+
+Thu May 22 14:02:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/jis/props.kwd: constify character property tables of JIS
+	  based encodings by perfect hash.
+
+	* enc/euc_jp.c, enc/shift_jis.c: use character property functions.
+
+Wed May 21 12:21:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: Fix compilation error on Android.
+	  Bionic doesn't define TCP state constants.
+
+Wed May 21 11:42:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: workaround for Info.plist to get rid of `dsymutil`
+	  crash by wrong files in parent directories.
+	  [ruby-core:62594] [Bug #9840]
+
+Tue May 20 20:57:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_dir.rb (test_glob): added testcase of double
+	  slash path.
+
+Tue May 20 04:58:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Don't check fields of struct tcp_info if the
+	  structure is not available.
+
+Mon May 19 23:13:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_tcp_info): Permit longer data.  (glibc
+	  2.7 adds tcpi_rcv_rtt, tcpi_rcv_space and tcpi_total_retrans to
+	  struct tcp_info.)
+
+Mon May 19 20:49:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_tcp_info): New function to inspect
+	  struct tcp_info.
+	  (sockopt_inspect): Use inspect_tcp_info.
+
+	* ext/socket/extconf.rb: Check tcp_info related things.
+
+	* ext/socket/rubysocket.h: Include netinet/tcp_fsm.h if available.
+
+Mon May 19 19:36:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb: Use Etc.uname.
+
+	* test/gdbm/test_gdbm.rb: Ditto.
+
+Mon May 19 16:54:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_uname): add support for Windows using
+	  GetVersionExW(), GetSystemInfo(), and GetComputerNameExW() with
+	  `ComputerNameDnsHostname`.  [Feature #9842]
+
+Mon May 19 16:29:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_pat_search): advance by byte offset but not by char
+	  offset.  [ruby-core:62669] [Bug #9849]
+
+Mon May 19 14:06:18 2014  Shota Fukumori  <her@sorah.jp>
+
+	* bin/testrb: Removed. Forgot to remove in r45971.
+	  [Feature #9711] [ruby-core:62620]
+
+Sun May 18 16:42:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_m17n_comb.rb (test_str_crypt): Use Etc.confstr to
+	  detect the glibc version.
+	  libc.so is not an executable on Debian GNU/kFreeBSD 7.0 (wheezy).
+
+Sun May 18 12:15:54 2014  Jonathan Mukai-Heidt  <johnnymukai@gmail.com>
+
+	* io.c (argf_each_line, argf_inplace_mode_set): [DOC] Update ARGF
+	  documentation examples.  `ARGF.lines` has been deprecated in
+	  favor of `ARGF.each_line`.  [Fixes GH-615]
+
+Sun May 18 11:59:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* missing/nextafter.c: Include ruby/missing.h.
+
+Sun May 18 11:09:28 2014  Tanaka Akira  <akr@fsij.org>
+
+	* win32/Makefile.sub: Add nextafter.obj to MISSING.
+
+Sun May 18 10:46:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c: Etc.sysconf, Etc.confstr and IO#pathconf implemented.
+
+	* ext/etc/extconf.rb: Check sysconf(), confstr() and fpathconf().
+
+	* ext/etc/mkconstants.rb: New file.
+
+	   [ruby-core:62600] [Feature #9842]
+
+Sun May 18 09:58:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c: Etc.uname method implemented.
+
+	* ext/etc/extconf.rb: Check uname() function.
+
+	  [ruby-core:62139] [Feature #9770]
+
+Sun May 18 09:16:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check nextafter() availability.
+
+	* include/ruby/missing.h (nextafter): New optional declaration.
+
+	* missing/nextafter.c: New file.
+
+	* numeric.c: Float#next_float and Float#prev_float implemented.
+
+	   [ruby-core:62562] [Feature #9834]
+
+Sun May 18 09:02:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c: Enumerable#slice_after implemented.
+
+	* enumerator.c: Enumerator::Lazy#slice_after implemented.
+
+	  Requested by Tsuyoshi Sawada.  [ruby-core:58123] [Feature #9071]
+
+Sun May 18 08:22:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_setstrbuf): always check if the buffer is modifiable.
+	  [ruby-core:62643] [Bug #9847]
+
+Sun May 18 01:21:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h: Hide Rational internal.
+	  (RRational): Moved to internal.h
+	  (RRATIONAL): Ditto.
+	  (RRATIONAL_SET_NUM): Moved to rational.c.
+	  (RRATIONAL_SET_DEN): Ditto.
+
+	* rational.c (rb_rational_num): New function.
+	  (rb_rational_den): Ditto.
+
+	* include/ruby/intern.h (rb_rational_num): Declared.
+	  (rb_rational_den): Ditto.
+
+	* ext/bigdecimal/bigdecimal.c: Follow the above change.
+
+	* ext/date/date_core.c: Ditto.
+
+	  [ruby-core:60665] [Feature #9513]
+
+Sat May 17 17:04:32 2014  Shota Fukumori  <her@sorah.jp>
+
+	* NEWS: Add news about removal of lib/test/**/*.rb.
+
+Sat May 17 16:57:33 2014  Shota Fukumori  <her@sorah.jp>
+
+	* lib/test: Removed because ruby's test cases now independent to
+	  lib/test by r45970. [Feature #9711] [ruby-core:62620]
+
+	  I'm still considering about the future of lib/minitest, lib/test.
+	  (bundling gems?)
+
+Sat May 17 15:06:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/runner.rb: remove dependency test-unit and minitest
+	  from stdlib when running with test-all.
+	  [Feature #9711][ruby-core:61890]
+	* test/testunit/*.rb: ditto.
+	* test/lib: ditto.
+
+Sat May 17 11:02:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): try match PLAIN as well as ALPHA, which are
+	  separated by previous commits.  [ruby-core:61552] [Bug #9648]
+
+	* dir.c (glob_make_pattern): set PLAIN for non-magical path to
+	  skip parts which not need to glob.
+	  [ruby-core:61552] [Bug #9648]
+
+	* dir.c (has_magic): return ALPHA at alphabetical name regardless
+	  FNM_CASEFOLD flag.
+
+	* dir.c (glob_helper): fix conditions for ALPHA.
+	  [ruby-core:61552] [Bug #9648]
+
+Sat May 17 01:49:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): reduce matching at non-magical path on
+	  Windows.
+
+Sat May 17 01:49:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_pattern_type): separate names with alphabet but no
+	  magical from plain.
+
+	* dir.c (glob_helper): match plain names as-is to treat super-root
+	  same as the root.  [ruby-core:61552] [Bug #9648]
+
+Fri May 16 17:38:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks, gc_marks_body): increase the counter of young objects
+	  at the major GC because AGE2Promotion changes all old objects into
+	  young objects at major GC.
+
+Fri May 16 17:26:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_sweep): heap_pages_swept_slots should contains
+	  heap_pages_increment.
+
+	  For example, GC by exceeding malloc_limit can remain
+	  heap_pages_increment.
+
+Thu May 15 21:18:43 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
+	  [ruby-core:62095] [Bug #8358]
+
+Thu May 15 21:04:06 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
+	  is skipped after raise.
+	  DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
+	  But it causes Marshal.load failure due to undefined class/module
+	  DL::DLError when doing test-all parallel and test-all doesn't
+	  complete. We create new MiniTest::Skip object to avoid Marshal.load
+	  failure.
+	  [ruby-core:62133] [Bug #9767]
+
+	* test/testunit/test_parallel.rb (TestParallel): add a test.
+
+	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
+
+Thu May 15 18:57:23 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): move gc_heap_prepare_minimum_pages()
+	  from gc_sweep().
+
+Thu May 15 18:51:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_extend_pages): calculate next growing heap size.
+
+	* gc.c (heap_set_increment): accept addition pages instead of
+	  minimum pages.
+
+	* gc.c (gc_after_sweep): use heap_etend_pages().
+
+	* gc.c (gc_heap_prepare_minimum_pages): add only 1 page.
+
+	* gc.c (heap_ready_to_gc): add only 1 page.
+
+Thu May 15 18:42:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce macros to remove magic number.
+
+	  GC_HEAP_FREE_SLOTS_MIN_RATIO = 0.3: guarantee minimum empty slots
+	                                      ratio after sweep.
+	  GC_HEAP_FREE_SLOTS_MAX_RATIO = 0.8: allow to free pages 0.2 (= 1-0.8)
+	                                      of current existing slots.
+
+Thu May 15 17:32:51 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* thread_win32.c (rb_w32_stack_overflow_handler): use Structured
+	  Exception Handling by AddVectoredExceptionHandler() for machine
+	  stack overflow on mingw.
+	  This would be equivalent to the handling using __try and __except
+	  on mswin introduced by r43748.
+
+Wed May 14 19:31:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/openssl/depend: remove dependency from internal headers.
+	  [Feature #9612]
+
+	* ext/openssl/ossl.c (ossl_fips_mode_set): ditto.
+
+	* ext/coverage/depend: ditto.
+
+	* include/ruby/thread_native.h: added.
+
+	  This header file only provides wrapper functions to control
+	  native threads. These wrapper functions are used by MRI
+	  implementation.
+
+	* vm_core.h: use include/ruby/thread_native.h.
+
+	* thread.c: ditto.
+
+	* thread_pthread.h: ditto.
+
+	* thread_win32.h: ditto.
+
+	* thread_native.h: removed.
+
+Wed May 14 18:03:28 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: enable RGENGC_AGE2_PROMOTION.
+
+Wed May 14 18:02:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_rememberset_mark): promote remembered object earlier.
+
+Mon May 12 23:57:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_atan2_inf_c99): check whether runtime atan2
+	  handles Inf as C99. [ruby-core:62536] [Bug #9831]
+
+Mon May 12 20:33:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Invoke AC_REPLACE_FUNCS for each function.
+
+Mon May 12 19:52:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: count young object correctly and show it in GC.stat
+	  on RGENGC_AGE2_PROMOTION.
+
+	* gc.c (RVALUE_PROMOTE_YOUNG): decrement young object count on
+	  YOUNG->OLD.
+
+	* gc.c (obj_free): decrement young object count when young object
+	  freed.
+
+	* gc.c (gc_marks): should not clear young object count.
+
+	* gc.c (gc_stat_internal): GC.stat :young_object information.
+
+Mon May 12 01:30:59 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ifaddr.c (IS_IFADDRS): Unused macro removed.
+
+	* ext/strscan/strscan.c (BUFSIZE): Ditto.
+
+	* ext/zlib/zlib.c (OBJ_IS_FREED): Ditto.
+
+Sun May 11 22:27:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* compile.c (BUFSIZE): Unused macro removed.
+
+	* vm.c (BUFSIZE): Ditto.
+
+	* pack.c (INT64toNUM): Ditto.
+	  (UINT64toNUM): Ditto.
+	  (BYTEWIDTH): Ditto.
+
+	* time.c (lshift): Ditto.
+	  (UINT64toNUM): Ditto.
+	  (id_lshift): Unused variable removed.
+
+Sun May 11 21:23:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swaps): Unused macro removed.
+	  (swapi): Ditto.
+	  (swapl): Ditto.
+	  (swapll): Ditto.
+
+Sun May 11 08:02:49 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_vm_t): list_head and counter for living_threads
+	  (rb_thread_t): vmlt_node for living_threads linkage
+	  (rb_vm_living_threads_init): new function wrapper
+	  (rb_vm_living_threads_insert): ditto
+	  (rb_vm_living_threads_remove): ditto
+	* vm.c (rb_vm_living_threads_foreach): new function wrapper
+	* thread.c (terminate_i, thread_start_func_2, thread_create_core,
+	  thread_fd_close_i, thread_fd_close): update to use new APIs
+	* vm.c (vm_mark_each_thread_func, rb_vm_mark, ruby_vm_destruct,
+	  vm_memsize, vm_init2, Init_VM): ditto
+	* vm_trace.c (clear_trace_func_i, rb_clear_trace_func): ditto
+	* benchmark/bm_vm_thread_close.rb: added to show improvement
+	* ccan/build_assert/build_assert.h: added as a dependency of list.h
+	* ccan/check_type/check_type.h: ditto
+	* ccan/container_of/container_of.h: ditto
+	* ccan/licenses/BSD-MIT: ditto
+	* ccan/licenses/CC0: ditto
+	* ccan/str/str.h: ditto (stripped of unused macros)
+	* ccan/list/list.h: ditto
+	* common.mk: add CCAN_LIST_INCLUDES
+	  [ruby-core:61871][Feature #9632 (part 1)]
+
+Sun May 11 01:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_f_kill): directly enqueue an ignored signal to self,
+	  except for SIGSEGV and SIGBUS.  [ruby-dev:48203] [Bug #9820]
+
+Sat May 10 22:37:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (push_glob): match in UTF-8 on Mac OS X.
+	  [ruby-dev:48213] [Bug #9825]
+
+Sat May 10 13:32:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): stop if forked in a sub-thread,
+	  the thread has become the main thread.
+	  [ruby-core:62070] [Bug #9751]
+
+Sat May 10 09:32:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]
+
+Sat May 10 08:47:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (trap): Return "SYSTEM_DEFAULT" if SIG_DFL is set.
+
+Fri May  9 14:27:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
+	  CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
+	  affected.  [ruby-core:62469] [Bug #9818]
+
+Fri May  9 03:59:06 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/delegate.rb: Fix example of using delegator.
+	  patched from Andrey Koleshko. [Fixes GH-505]
+
+Fri May  9 03:42:43 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/shell.rb: add documentation in lib/shell.rb
+	  patched from reprah. [Fixes GH-516]
+
+Fri May  9 03:28:04 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/fileutils.rb: show fileutils require at top.
+	  patched from Richard Schneeman. [Fixes GH-604]
+
+Fri May  9 03:07:09 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/prime.rb (Prime#prime?): negative numbers can't be primes
+	  by definition. reported by Ivan Kataitsev. [Bug #7395]
+	* test/test_prime.rb: add test.
+
+Thu May  8 14:34:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_init_copy): always clear instance variable,
+	  constant and method tables first, regardless the source tables.
+	  [ruby-dev:48182] [Bug #9813]
+
+Thu May  8 10:53:14 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: OpenBSD needs to include sys/param.h before include
+	  sys/mount.h. [ruby-dev:48167]
+
+Thu May  8 10:17:04 2014  Karsten Sperling  <karsten@sperling.co.nz>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): stop
+	  handling requests on shutdown, even if the socket is readable
+	  and IO.select() returns true.  [Fixes GH-607]
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start): IO.select()
+	  raises ENOTSOCK on shutdown on Windows.
+
+Wed May  7 21:45:00 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):
+	  Consider Socket#accept as well as TCPServer#accept.
+	  Reported by Sam Stelfox.  [ruby-core:62064] [Bug #9750]
+
+Wed May  7 17:24:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_step_scan_args): check keyword arguments and fail
+	  if they conflict with positional arguments.
+	  [ruby-dev:48177] [Bug #9811]
+
+Wed May  7 12:06:14 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: remove debug output and output results into
+	  specified file.
+
+Wed May  7 11:55:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: add '--rawdata-output=[FILE] option to output
+	  raw results into FILE.
+
+Wed May  7 11:25:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_local_variables): exclude variables hidden by
+	  shadowing.  [ruby-core:60501] [Bug #9486]
+
+	* vm.c (collect_local_variables_in_iseq): ditto.
+
+Tue May  6 23:29:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (new_bv_gen): no duplicated names, if already added in
+	  shadowing_lvar().
+
+	* parse.y (local_tbl_gen): remove local variables duplicated with
+	  arguments.
+	  [ruby-core:60501] [Bug #9486]
+
+Tue May  6 18:48:50 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.make_time): Adjust the time zone of "now".
+
+Tue May  6 18:33:12 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* io.c (io_{read,write}_nonblock): use rb_get_kwargs instead of
+	  rb_hash_aref.
+
+Tue May  6 18:03:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.make_time): Argument validation code moved from
+	  Time.parse and Time.strptime.
+
+Tue May  6 17:27:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation
+	  to use EST.
+	  Reported by Marcus Stollsteimer.
+	  [ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682]
+
+Tue May  6 04:31:48 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* file.c (rb_f_test): removed meaningless "case 'a'".
+
+Tue May  6 01:28:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI.open_uri): Call StringIO#close only if
+	  the StringIO object is not closed yet.
+	  Reported by Jordi Massaguer Pla.  [ruby-core:42538] [Bug #6010]
+
+Tue May  6 01:08:01 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: define File::NULL if not defined and /dev/null
+	  is available to run benchmark driver on ruby 1.9.2.
+
+Mon May  5 23:53:24 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: Add IP_TRANSPARENT.
+	  IP_TRANSPARENT is provieded since glibc-2.12.
+	  Reported by Eliezer Croitoru.  [ruby-core:50372] [Bug #7476]
+
+Mon May  5 22:29:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_redirect): Open the file in write mode for
+	  redirect from [:out, :err].
+	  Proposed and implemented by Yusuke Endoh.
+	  [ruby-dev:41430] [Feature #3348]
+
+Mon May  5 21:52:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all
+	  separators File::SEPARATOR from File::ALT_SEPARATOR.
+	  Reported by Daniel Rikowski.
+	  Fixed by Nobuyoshi Nakada.  [Bug #9618]
+
+	* ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto.
+
+Mon May  5 21:48:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/lib/pathname.rb (Pathname#/): Aliased to Pathname#+.
+	  Suggested by Alexey Muranov.  [ruby-core:61432] [Feature #9625]
+
+Mon May  5 17:26:09 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* math.c (rb_math_sqrt): omitted exporting an unused function,
+	  anyway.
+	* internal.h: follows the above change.
+
+Mon May  5 11:44:03 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.strptime): Raise ArgumentError if Date._strptime
+	  doesn't extract date information.
+	  Reported by tadayoshi funaba.  [ruby-core:62349]
+
+Mon May  5 01:12:27 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (rt_rewrite_frags): a new feature (not a
+	  bug fix) of strptime.  applies offset even if the given date is
+	  not local time (%s and %Q).  This is an exceptional feature and
+	  I do NOT recommend to use this at all.  Thank you git community.
+
+Sun May  4 20:51:32 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.force_zone!): Use usual local time if it has
+	  expected offset from UTC.
+
+Sun May  4 17:58:12 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.force_zone!): New private method.
+	  (Time.make_time): Use Time.force_zone!.
+	  (Time.strptime): Ditto.
+	  (Time.rfc2822): Ditto.
+	  (Time.xmlschema): Ditto.
+
+	* lib/rss/rss.rb (Time.w3cdtf): Use Time.force_zone!.
+
+Sun May  4 10:22:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (math_atan2): return values like as expected by C99 if
+	  both two arguments are infinity.  based on the patch by cremno
+	  phobia <cremno AT mail.ru> in [ruby-core:62310].  [Feature #9799]
+
+Sun May  4 03:46:42 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.httpdate): Always return a UTC Time object.
+
+Sun May  4 03:26:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.make_time): Refactored.
+
+Sun May  4 02:53:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.rfc2822): Fix year completion.
+	  Produce fixed-offset time object if appropriate.
+	  (Time.xmlschema): Produce fixed-offset time object if appropriate.
+
+Sat May  3 23:52:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (make_time): Produce fixed-offset time object if
+	  appropriate.
+	  (Time.strptime): Use d[:zone] instead of d[:offset].
+
+	* lib/rss/rss.rb (Time.w3cdtf): Produce fixed-offset time object if
+	  appropriate.
+
+Sat May  3 20:21:38 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.strptime): Use d[:offset] if d[:seconds] is not
+	  given.
+	  Reported by tadayoshi funaba.  [ruby-core:62322]
+
+Sat May  3 04:04:16 2014  Eric Wong  <e@80x24.org>
+
+	* complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END
+	  [Bug #9608]
+	* rational.c (read_digits): ditto
+
+Sat May  3 00:06:30 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename
+	  is supported on AIX, HP-UX, and Solaris, by using the value of
+	  struct statvfs.f_basetype.
+
+	* configure.in (HAVE_STRUCT_STATVFS_F_BASETYPE): check struct
+	  statvfs.f_basetype which is available on AIX, HP-UX, and Solaris.
+
+Fri May  2 21:04:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (next_id): no reason to set ID_STATIC_SYM here, as ID
+	  returned by rb_intern3 can be a dynamic symbol and the static
+	  symbol flag is set otherwise.  [Bug #9787]
+
+Fri May  2 11:32:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_seek, test_seek_symwhence): defer
+	  File::Statfs#type call which may not be implemented, to mitigate
+	  errors on platforms where SEEK_DATA is available but f_type in
+	  struct statfs is not.  [ruby-dev:48154] [Bug #9789]
+
+Fri May  2 10:37:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset): turn dynamically interned Symbol into
+	  an ID, since rb_str_dynamic_intern returns a Symbol but not an
+	  ID.  [ruby-core:62226] [Bug #9787]
+
+Thu May  1 22:19:34 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* file.c: Change AND condition to nested condition.
+
+Thu May  1 00:36:26 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* file.c (FSTATFS): check availability of struct statfs and
+	  struct statvfs in addition to fstatfs(2) and fstatvfs(2).
+	  This fixes error in Solaris. [Bug #9788] [ruby-dev:48145]
+
+Wed Apr 30 19:46:23 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_after_sweep): suppress unnecessary expanding heap.
+	  Tomb heap pages are freed pages here, so expanding heap is
+	  not required.
+
+Wed Apr 30 17:58:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record
+	  it is bmethod frame.
+
+	* vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame
+	  is VM_FRAME_FLAG_BMETHOD.
+	  [Bug #9759]
+
+	* test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func.
+
+	* vm_core.h: rename rb_thread_t::passed_me to
+	  rb_thread_t::passed_bmethod_me to clarify the usage.
+
+	* vm_insnhelper.c (vm_call_bmethod_body): use renamed member.
+
+Wed Apr 30 17:06:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset): pin down dynamic symbol only. it is
+	  possible that attrset ID can be registered as a static symbol
+	  after the corresponding attrget ID has been registered as a
+	  dynamic, and then the latter may be collected.
+	  [ruby-core:62226] [Bug #9787]
+
+Tue Apr 29 14:17:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: Rescue LoadError on etc.so for miniruby.
+	  Revert r45707, r45711, r45717.
+
+Tue Apr 29 12:50:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in
+	  rescue LoadError on 'etc'.
+
+Tue Apr 29 10:21:38 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* parse.y (symbols_i): like r45492, call rb_gc_resurrect().
+
+Tue Apr 29 04:29:05 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* file.c (HAVE_STRUCT_STATFS_T_F_FSTYPENAME): Add new macro for
+	  statfs_t.
+	* file.c (HAVE_STRUCT_STATFS_T_F_TYPE): ditto.
+
+	* file.c (rb_io_statfs): check FSTATFS macro only instead of
+	  HAVE_FSTATFS and HAVE_FSTATVFS.
+
+	* file.c (statfs_type): use new macro.
+	* file.c (statfs_fstypename): ditto.
+	* file.c (statfs_inspect): ditto.
+
+Tue Apr 29 00:20:26 2014  Rajarshi Das  <rajarshid@cybage.com>
+
+	* bootstraptest/test_literal.rb: fix typo of "dynamic".  [ci skip]
+
+	* regexp.rdoc: fix typo of "organized".  [ci skip]
+
+	* lib/session.rb: fix typo of "recognized".  [ci skip]
+
+Mon Apr 28 21:40:27 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (HAVE_STRUCT_STATFS_F_TYPE): check struct statfs.f_type
+	  to support OpenBSD.
+
+	* file.c (statfs_type): use above macro to switch.
+
+	* file.c (statfs_inspect): ditto.
+
+Mon Apr 28 18:06:08 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: check struct statvfs and struct statvfs.f_fstypename.
+
+	* configure.in: on NetBSD fstatfs is obsoleted.
+
+	* file.c: support NetBSD for File::Statfs.
+
+Mon Apr 28 17:42:42 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: This argument must be a pointer.
+
+Mon Apr 28 17:40:15 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: Fix typos. These are undefined variables.
+
+Sun Apr 27 19:39:42 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strptime.c (date__strptime_internal): do not
+	  overwrite century.
+
+Sat Apr 26 11:50:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_enum.rb (test_flat_map): Added test for flat_map.
+	  Contribute from @igaiga. [fix GH-598]
+
+Sat Apr 26 10:55:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_array_): make copy a first hash not to modify
+	  the argument itself.  keyword splat should be non-destructive.
+	  [ruby-core:62161] [Bug #9776]
+
+Sat Apr 26 08:05:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_process.rb (test_rlimit_nofile): Don't limit
+	  RLIMIT_NOFILE too small.
+	  This fix sporadic "[ASYNC BUG] thread_timer: select" on GNU/Linux.
+
+Fri Apr 25 22:54:34 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
+	  ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
+	  directory is not an empty directory, rmdir() shall fail and set
+	  errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
+	  [Bug #9571] [ruby-dev:48017]
+
+Fri Apr 25 19:16:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension.
+
+Fri Apr 25 14:55:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_func___builtin_unreachable): try with an
+	  external variable not only by a warning, which might not be
+	  shown due to the optimization.  [ruby-core:61647] [Bug #9665]
+
+Fri Apr 25 13:11:49 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: NetBSD's ksh, used by configure, needs escapes.
+
+Fri Apr 25 12:51:08 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: correct pthread_setname_np's prototype on NetBSD.
+	  [Bug #9586]
+
+Thu Apr 24 23:17:25 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/fileutils.rb (fu_get_uid, fu_get_gid): Etc.getpwnam/getgrnam may
+	  returns nil.
+
+	* lib/webrick/utils.rb (su): ditto.
+
+Thu Apr 24 22:55:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/test_io.rb: Add etc.so to $" before require 'tmpdir'.
+
+Thu Apr 24 21:09:55 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* man/ruby.1: fix broken link.
+
+Thu Apr 24 20:53:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: Don't need to rescue LoadError for etc.so.
+
+Thu Apr 24 17:39:53 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (statfs_inspect): suppress warnings.
+	  assume those values won't be larger than LONG_LONG_MAX.
+
+Thu Apr 24 11:53:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
+	  other than Symbol is an undefined behavior.  fix up r31699.
+	  [ruby-core:62142] [Bug #9771]
+
+Thu Apr 24 11:21:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for
+	  non-symbol values, for the time being.
+
+Thu Apr 24 05:50:13 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (dsym_node_gen): like r45492, call rb_gc_resurrect().
+
+Wed Apr 23 20:36:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/extconf.rb: Build ext/etc unconditionally.
+
+Wed Apr 23 14:10:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (statfs_fsid): remove statfs.f_fsid because it doesn't return
+	  meaningful value portably. http://togetter.com/li/658517
+
+Wed Apr 23 11:03:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_write): use rb_str_append to
+	  reuse coderange bits other than ASCII-8BIT, and keep
+	  taintedness.  [ruby-dev:48118] [Bug #9769]
+
+Wed Apr 23 00:43:00 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (ustatfs): implementation of
+	  statfs(2) clone. [EXPERIMENTAL]
+
+	* file.c (rb_io_statfs): use above function.
+
+	* configure.in, win32/Makefile.sub (struct statfs): available.
+
+Tue Apr 22 23:56:24 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_io_stafs): use statfs(2) if fstatfs(2) is unavailable.
+
+	* configure.in (fstatfs): check it.
+
+Tue Apr 22 22:15:51 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_io_statfs): need to define even if the system doesn't have
+	  fstatfs(2).
+
+	* test/ruby/test_file.rb (TestFile#test_statfs): skip if IO#stafs is not
+	  implemented.
+
+Tue Apr 22 19:32:48 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c: newly added a class File::Statfs. (experimental)
+
+Tue Apr 22 08:22:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_malloc_increase): don't cause GC by malloc_increase
+	  when memop type is MEMOP_TYPE_REALLOC.
+
+	  GC at realloc is not well maintained.
+	  We need a time to make it safe.
+	  [ruby-dev:48117]
+
+Tue Apr 22 06:54:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (objspace_malloc_increase): run full mark if 0x04 bit is
+	  set in ruby_gc_stress.  [ruby-core:62103] [Feature #9761]
+
+	* gc.c (objspace_malloc_increase): run GC after realloc not only
+	  malloc and calloc by GC.stress.  [ruby-core:62103] [Feature #9761]
+
+Mon Apr 21 19:12:20 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_coderange_scan_restartable): coderange is always
+	  ENC_CODERANGE_VALID if the string is ASCII-8BIT and already has a non
+	  ASCII character.
+
+Mon Apr 21 19:02:44 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (coderange_scan): remove useless condition `p < e` after
+	  search_nonascii.
+
+	* string.c (rb_str_coderange_scan_restartable): ditto.
+
+Mon Apr 21 18:55:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/-test-/string/coderange.c: add Bug::String.new#coderange_scan
+	  to explicitly scan coderange.
+
+Mon Apr 21 18:19:35 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (coderange_scan): remove unused logic.
+
+	* string.c (rb_str_coderange_scan_restartable): ditto.
+
+Mon Apr 21 14:11:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_putc): fix for non-ascii
+	  encoding, like as IO#putc.  [ruby-dev:48114] [Bug #9765]
+
+Sun Apr 20 12:57:15 2014  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* st.c (st_foreach_check): change start point of search at check
+	  from top to current. [ruby-dev:48047] [Bug #9646]
+
+Sun Apr 20 08:41:33 2014  Andrew DeMaria  <ademariad@gmail.com>
+
+	* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
+	  user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
+	  [ruby-trunk - Bug #9760]
+
+Sun Apr 20 06:01:18 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (rb_gc_writebarrier): drop special case for big hash/array
+	  [Bug #9518]
+
+Sat Apr 19 15:38:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): flush cmdarg flags inside left-paren in a
+	  command argument, to allow parenthesed do-block as an argument
+	  without arguments parentheses.  [ruby-core:61950] [Bug #9726]
+
+Sat Apr 19 10:07:24 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (struct RBignum): Use size_t for len.
+
+	* include/ruby/intern.h (rb_big_new): Use size_t instead of long to
+	  specify the size of bignum.
+	  (rb_big_resize): Ditto.
+
+	* bignum.c: Follow above changes.
+
+	* rational.c: Follow above changes.
+
+	* marshal.c: Follow above changes.
+
+Sat Apr 19 00:32:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num2long): Returns a long.
+	  (rb_num2ulong): Returns a unsigned long.
+
+	* bignum.c (rb_big2long): Returns a long.
+	  (rb_big2ulong): Returns a unsigned long.
+
+	* include/ruby/intern.h: Follow above changes.
+
+	* include/ruby/ruby.h: Follow above changes.
+	  (rb_num2long_inline): No need to cast.
+	  (rb_num2ulong_inline): Ditto.
+
+Sat Apr 19 00:17:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (SHARABLE_SUBSTRING_P): predicate if substring can be
+	  shared with the original string.  true if just at the end of the
+	  original string, for the time being.  all substring will be able to
+	  be shared in the future.
+
+Fri Apr 18 21:48:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_new_frozen): consider the shared string at
+	  middle.
+
+	* string.c (rb_str_subseq, rb_str_substr, str_byte_substr): share
+	  middle of a string.
+
+Fri Apr 18 15:40:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c: use uintptr_t instead of VALUE because they are not ruby
+	  object.
+
+Fri Apr 18 14:51:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c: check str_strlen's argument, and add comment or
+	  use NULL if simply it uses str's enc.
+
+Fri Apr 18 14:32:40 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_strlen): use enc_strlen if the coderange is known.
+
+Fri Apr 18 14:21:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (enc_strlen): move UTF-8 optimization from str_strlen to
+	  enc_strlen.
+
+Fri Apr 18 08:50:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_getcwd_malloc): check if getcwd allocates
+	  buffer if NULL is given [ruby-core:62072] [Bug #9752]
+
+Thu Apr 17 16:28:10 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* prelude.rb: [DOC] Update Thread::exclusive docs by @stevenharman.
+
+Thu Apr 17 10:03:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#copy_entry): update rdoc about
+	  preserve option and permissions, following r31123.
+	  [ruby-core:62065] [Bug #9748]
+
+Wed Apr 16 23:47:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (dont_recycle_block_arg): fix condition to recycle block
+	  argument.  lambda with rest can get internal array directly.
+	  [ruby-core:62060] [Bug #9749]
+
+Wed Apr 16 09:51:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
+	  finalizes only a copy of the digest context, the context must be
+	  cleaned up after initialization by EVP_MD_CTX_cleanup() or a
+	  memory leak will occur.  [ruby-core:62038] [Bug #9743]
+
+Tue Apr 15 19:36:42 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (rb_w32_cmdvector): removed.
+
+	* win32/win32.c (rb_w32_sysinit): use WCHAR version of GetCommandLine()
+	  internally.
+
+	* win32/win32.c (w32_cmdvector): renamed from rb_w32_cmdvector.  use
+	  WCHAR* instead of char* internally.
+
+	these changes are expected to not changing the behavior yet.
+
+Tue Apr 15 19:26:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/extmk.rb: Re-generate extmk.mk and dummy makefiles only if
+	  really required.
+	  This fixes a problem to run multiple test-all concurrently as:
+	  make test-all & make test-all & make test-all & ...
+
+Tue Apr 15 12:49:53 2014  Sam Rawlins  <sam.rawlins@gmail.com>
+
+	* enum.c (enum_each_slice, enum_each_cons): make more efficient by
+	  allocating less and recycling block argument arrays if possible.
+	  [Fixes GH-596]
+
+Mon Apr 14 18:44:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): get base addrs in fill_lines to use it
+	  with dladdr_fbases introduced at r45563.
+	  it didn't get before if the executable is not pie.
+
+Mon Apr 14 18:05:48 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (main_exe_path): support FreeBSD.
+	  At least sh, csh, tcsh, bash, and zsh sets realpath of the main
+	  executable for dladdr, but gdb doesn't.
+
+Mon Apr 14 17:20:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (umethod_bind): use the ancestor iclass instead of new
+	  iclass to get rid of infinite recursion, if the defined module
+	  is already included.  [ruby-core:62014] [Bug #9721]
+
+Sun Apr 13 12:46:58 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (SIZEOF_BDIGIT): Renamed from SIZEOF_BDIGITS.
+
+	* internal.h: Ditto.
+
+	* marshal.c: Ditto.
+
+	* rational.c: Ditto.
+
+Sun Apr 13 10:18:09 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: Unused target, $(MKMAIN_CMD), removed.
+
+	* Makefile.in (MKMAIN_CMD): Unused macro removed.
+
+	* win32/Makefile.sub (MKMAIN_CMD): Ditto.
+
+Sat Apr 12 22:11:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear
+	  caller's self which is useless, so that it can get collected.
+	  [Fixes GH-592]
+
+Sat Apr 12 09:26:48 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_ocsp.c:  [DOC] Document OpenSSL::OCSP.
+
+Fri Apr 11 18:52:38 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ARY_SET): added.
+
+	  ARY_SET() is same functionality of RARRAY_ASET(), but
+	  it has an assertion (`ary' doesn't have shared array).
+
+Fri Apr 11 16:54:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: make shared arrays WB-protected objects.
+
+	  Shared arrays were WB-unprotected object because
+	  sharing array can modify shared array's buffer
+	  if it occupied shared array.
+
+	  [sharing array (ary)] -> [shared array (shared)] -> <buff>
+	                |                                       A
+	                +---------------------------------------+
+	             write `buff' with WB(ary, &buff[i], obj)
+	             -> if `ary' and `shared' are old, then only `ary'
+	                will be remembered.
+	             -> traverse from `ary'. But `shared' is old, so
+	                that written `obj' is not marked.
+
+	  It cause WB miss so that shared arrays were WB-unprotected.
+	  (WB-unprotected objects are marked everytime if it is living)
+
+	  This patch insert WB() for `shared' if it is needed.
+
+Fri Apr 11 15:05:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_method_call_with_block, umethod_bind): call with
+	  IClass including the module for a module instance method.
+	  [ruby-core:61936] [Bug #9721]
+
+	* vm_insnhelper.c (vm_search_super_method): allow bound
+	  UnboundMethod case.
+
+Fri Apr 11 12:02:30 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): set base address
+	  which is retrieved from dladdr to dladdr_fbases, to skip already
+	  parsed objects.
+
+Fri Apr 11 12:44:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_reject): may be turned into a shared array during
+	  the given block.  [ruby-dev:48101] [Bug #9727]
+
+Thu Apr 10 23:41:21 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/ftp.rb (Net::FTP#login): [DOC] The default password for
+	  anonymous login was changed to "anonymous@" in r25313.
+
+Thu Apr 10 19:22:58 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_array.rb: remove useless `assert'.
+
+Thu Apr 10 19:11:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_modify): remember shared array owner if a shared
+	  array owner is promoted and a shared array is not promoted.
+
+	  Now, shared array is WB-unprotected so that shared arrays are not
+	  promoted.  All objects referred from shared array should be marked
+	  correctly.
+
+	  [ruby-core:61919] [ruby-trunk - Bug #9718]
+
+	* test/ruby/test_array.rb: add a test for above.
+
+Thu Apr 10 18:57:12 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_verify_internal_consistency): move lines and enable
+	  allrefs_dump() on RGENGC_CHECK_MODE >= 4.
+
+Thu Apr 10 15:01:06 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (append_obj): clear allocated memory.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): free `base_addrs'.
+
+Thu Apr 10 14:40:18 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_writebarrier_unprotect_promoted): disable to dump debug
+	  message when RGENGC_CHECK_MODE == 0.
+
+Thu Apr 10 08:13:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h
+	  is not available.
+	  Fixes build on Android (x86).
+
+Wed Apr  9 23:22:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (mark_current_machine_context): Call SET_STACK_END.
+	  This reverts a hunk of r40703 by ko1.
+	  This fixes [ruby-dev:48098] [Bug #9717].
+
+Wed Apr  9 21:02:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (OBJ2UID1): Defined even if getpwnam_r is not usable.
+	  (OBJ2GID1): Defined even if getgrnam_r is not usable.
+	  This fixes compilation error on Android.
+
+Wed Apr  9 15:16:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_default_internal): fix rdoc.  `__FILE__` is
+	  in filesystem encoding but not `default_internal`.
+	  [ruby-core:61894] [Bug #9713]
+
+Wed Apr  9 14:43:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: more long timeout.
+	  This test failed under RGENGC_CHECK_MODE >= 2.
+
+Wed Apr  9 13:07:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
+	  x64-mingw, which causes SEGV with callcc.
+	  [ruby-core:61887] [Bug #9710]
+
+Wed Apr  9 12:44:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_buf_cat): should round up the capacity by 4KiB,
+	  but not number of rooms.  [ruby-core:61886] [Bug #9709]
+
+Tue Apr  8 22:55:32 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (MakeMakefile#dir_config): [DOC] Improve
+	  documentation.
+
+Tue Apr  8 22:31:44 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename `RGENGC_THREEGEN' to `RGENGC_AGE2_PROMOTION'.
+
+	* gc.c (rgengc_rememberset_mark): don't promote, but remain in
+	  remember set for infant objects.
+
+	* gc.c (RVALUE_PROMOTE_INFANT, RVALUE_PROMOTE_YOUNG): count numbers
+	  in these functions.
+
+Mon Apr  7 21:11:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
+	  Reported by Saravana kumar.  [ruby-core:61820] [Bug #9697]
+	  Fixed by Heesob Park.  [ruby-core:61868]
+
+Mon Apr  7 07:20:23 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb (do_rpc): don't check body length.
+	  If HTTP content-encoding is used, the length may be different.
+	  [Bug #8182] [ruby-core:53811]
+
+Mon Apr  7 02:39:48 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Matrix#cofactor [fix GH-568]
+	  Add first_minor [fix GH-568]
+	  Handle empty diagonal matrix case [fix GH-576]
+	  Patches by gogotanaka
+
+Sun Apr  6 08:52:50 2014  Bugra Barin  <bugrabarin@hotmail.com>
+
+	* dln.c (dln_load): use wchar version to load a library in
+	  non-ascii path on Windows.  based on the patch by Bugra Barin
+	  <bugrabarin AT hotmail.com> in [ruby-core:61845].  [Bug #9699]
+
+Sat Apr  5 19:36:33 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
+
+Sat Apr  5 00:31:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
+	  [ruby-dev:48089] [Bug #9702]
+
+Fri Apr  4 07:13:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func___builtin_setjmp): should not skip
+	  flags restoration in RUBY_WERROR_FLAG by `break`.
+	  [ruby-dev:48086] [Bug #9698]
+
+Wed Apr  2 21:50:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp()
+	  in Apple LLVM 5.1 (LLVM 3.4svn) uses `void**`, not `jmp_buf`.
+	  [Bug #9692]
+
+Wed Apr  2 20:57:15 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, gc.h (rb_objspace_each_objects_without_setup):
+	  Add a new (hidden) C-API to iterate objspace snapshot.
+
+	  This API is not safe to call any C-APIs in a given callback
+	  function. Be careful to use this C-API.
+
+Wed Apr  2 17:43:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func___builtin_setjmp): gcc 4.9 disallows a
+	  variable as the second argument of __builtin_longjmp().
+	  [ruby-core:61800] [Bug #9692]
+
+Wed Apr  2 15:12:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* common.mk: Use redmine-2.x url for DeveloperHowto wiki.
+	  [ruby-core:60657] [Bug #9511]
+
+Wed Apr  2 11:46:29 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/pathname/lib/pathname.rb (Pathname#join): Fix error with
+	  empty args. Reported by ko1 via IRC.
+
+	* test/pathname/test_pathname.rb (TestPathname#test_join): Add the
+	  test for above case.
+
+Tue Apr  1 11:39:57 2014  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Symbol HeaderConverter: strip leading/trailing space.
+	  Reported by Skye Shaw
+	  [Fixes GH-575]
+
+Tue Apr  1 11:34:04 2014  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Don't attempt to convert nil headers.
+	  Reported by Skye Shaw
+
+Tue Apr  1 17:29:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config_files.rb (ConfigFiles.download): show failed URI.
+	  [ruby-core:61792] [Bug #9690]
+
+Tue Apr  1 12:06:49 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): don't depend hard coded
+	  symbol '_start'.
+
+	* addr2line.c (fill_lines): instead of above, get a dynamic symbol
+	  in the main executable and use it to know the base address.
+
+	* addr2line.c (follow_debuglink0): use obj_info_t instead of
+	  line_info_t to handle object related data.
+
+	* addr2line.c (main_exe_path): defined for Linux.
+
+Tue Apr  1 08:58:39 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* parse.y (rb_str_dynamic_intern): set mark bit if dynamic symbol
+	  is before sweeping.
+
+Tue Apr  1 07:37:00 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): use dynsym, which is used for dynamic
+	  linking and always exists, if there's no symtab.
+
+Tue Apr  1 07:27:15 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (rb_print_backtrace): current implementation
+	  uses dladdr to get the path of objects.
+
+Mon Mar 31 23:57:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
+	  [ruby-core:61756] [Bug #9578]
+
+Mon Mar 31 17:23:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/memory_status.rb: require envutil before accessing EnvUtil
+	  module.  reported by ko1 via twitter.
+
+Mon Mar 31 10:28:01 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (st_init_table_with_size): update comment
+	  [Feature #9425]
+
+Sun Mar 30 23:39:26 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal):
+	  reset inherit flag of socket to avoid unintentional inheritance of
+	  socket.  note that the return value of SetHandleInformation() is not
+	  verified intentionally because old Windows may return an error.
+	  [Bug #9688] [ruby-core:61754]
+
+Sat Mar 29 13:04:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_sweep): cap `malloc_limit' to
+	  gc_params.malloc_limit_max.  It can grow and grow with such case:
+	    `loop{"a" * (1024 ** 2)}'
+	  [Bug #9687]
+
+	  This issue is pointed by Tim Robertson.
+	  http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
+
+Fri Mar 28 19:32:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (not_a_member): extract name error and use same error
+	  messages.  based on the patch by Marcus Stollsteimer <sto.mar AT
+	  web.de> at [ruby-core:61721].  [Bug #9684]
+
+Fri Mar 28 09:21:54 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5
+
+Fri Mar 28 09:11:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
+	  libyaml-0.1.6 for CVE-2014-2525.
+	* ext/psych/yaml/config.h: ditto.
+	* ext/psych/yaml/scanner.c: ditto.
+	* ext/psych/yaml/yaml_private.h: ditto.
+
+Thu Mar 27 18:58:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_regexp): set regexp for MatchData from string.
+
+	* re.c (rb_backref_set_string): create MatchData from string and
+	  set backref.
+
+	* string.c (rb_pat_search, rb_str_sub, rb_str_sub_bang, str_gsub),
+	  (scan_once, rb_str_scan, rb_str_partition): use rb_str_index
+	  instead of rb_reg_search() when pattern is a String.  based on
+	  the patch by Sam Rawlins <sam.rawlins@gmail.com> [Fixes GH-579]
+
+Thu Mar 27 11:58:55 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): check shdr[i].sh_type because even if
+	  .symtab section exists, the section's type can be SHT_NOBITS and
+	  actual data doesn't exist in the file.
+	  revert r45441.
+
+Wed Mar 26 14:57:35 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y: inline must be static (for mswin).
+	  fixed build error introduced at r45426.
+
+Wed Mar 26 14:33:00 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* internal.h (USE_SYMBOL_GC): enable Symbol GC by default (USE_SYMBOL_GC == 1).
+
+Tue Mar 25 22:57:11 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* parse.y: support Symbol GC. [ruby-trunk Feature #9634]
+	  See this ticket about Symbol GC.
+
+	* include/ruby/ruby.h:
+	  Declare few functions.
+	  * rb_sym2id: almost same as old SYM2ID but support dynamic symbols.
+	  * rb_id2sym: almost same as old ID2SYM but support dynamic symbols.
+	  * rb_sym2str: almost same as `rb_id2str(SYM2ID(sym))` but not
+	    pin down a dynamic symbol.
+	  Declare a new struct.
+	  * struct RSymbol: represents a dynamic symbol as object in
+	    Ruby's heaps.
+	  Add few macros.
+	  * STATIC_SYM_P: check a static symbol.
+	  * DYNAMIC_SYM_P: check a dynamic symbol.
+	  * RSYMBOL: cast to RSymbol
+
+	* gc.c: declare RSymbol. support T_SYMBOL.
+
+	* internal.h: Declare few functions.
+	  * rb_gc_free_dsymbol: free up a dynamic symbol. GC call this
+	    function at a sweep phase.
+	  * rb_str_dynamic_intern: convert a string to a dynamic symbol.
+	  * rb_check_id_without_pindown: not pinning function.
+	  * rb_sym2id_without_pindown: ditto.
+	  * rb_check_id_cstr_without_pindown: ditto.
+
+	* string.c (Init_String): String#intern and String#to_sym use
+	  rb_str_dynamic_intern.
+
+	* template/id.h.tmpl: use LSB of ID as a flag for determining a
+	  static symbol, so we shift left other ruby_id_types.
+
+	* string.c: use rb_sym2str instead `rb_id2str(SYM2ID(sym))` to
+	  avoid pinning.
+
+	* load.c: use xx_without_pindown function at creating temporary ID
+	  to avoid pinning.
+
+	* object.c: ditto.
+
+	* sprintf.c: ditto.
+
+	* struct.c: ditto.
+
+	* thread.c: ditto.
+
+	* variable.c: ditto.
+
+	* vm_method.c: ditto.
+
+Wed Mar 26 13:25:54 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): loop reverse order not to overwrite
+	  the basis of base addresses comparison.
+
+	* addr2line.c: use uintptr_t instead of intptr_t for pointers.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): don't use syms.
+
+	* vm_dump.c (rb_print_backtrace): ditto.
+
+	* addr2line.h: ditto.
+
+Wed Mar 26 11:20:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): internal objects are not dumpable.
+	  [ruby-core:61677] [Bug #9674]
+
+	* ext/thread/thread.c (undumpable): ConditionVariable and Queue
+	  are not dumpable.  [ruby-core:61677] [Bug #9674]
+
+Wed Mar 26 10:36:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (follow_debuglink): show message if it closes opened
+	  (and maybe used) elf binary.
+
+Wed Mar 26 10:34:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_line): pass and use offset instead of
+	  curobj_baseaddr.
+
+Wed Mar 26 09:07:48 2014  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: add --disable-pie. [Feature #9673]
+
+Wed Mar 26 08:47:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): don't run fill_lines multiple times.
+
+Wed Mar 26 08:45:00 2014  Sam Rawlins  <sam.rawlins@gmail.com>
+
+	* internal.h: add prototype for rb_reg_search0
+
+	* re.c: rename rb_reg_search to rb_reg_search0, add set_backref_str
+	  argument to allow callers to indicate that they don't require the
+	  backref string to be allocated.
+
+	* string.c: don't allocate backref str if replacement string is provided
+
+	[GH-578] [Bug #9676] [ruby-core:61682]
+
+Wed Mar 26 08:29:43 2014  mo khan  <mo@mokhan.ca>
+
+	* lib/rubygems.rb: fix spelling of Jim Weirich.  [Fixes GH-577]
+
+Wed Mar 26 01:55:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): a function to get must
+	  be a function in the main executable, whose absolute path is not
+	  available by dladdr, and ruby get it by /proc/self/exe on Linux.
+
+Wed Mar 26 01:34:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): skip if path is NULL.
+
+Tue Mar 25 23:57:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): only a newline after label should be
+	  significant.  [ruby-core:61658] [Bug #9669]
+
+Tue Mar 25 23:32:25 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/pathname/lib/pathname.rb (Pathname#join): remove unnecessary
+	  unshift.
+
+	* test/pathname/test_pathname.rb (TestPathname#test_join): add tests.
+
+Tue Mar 25 16:47:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_state_e, parser_params, f_arglist, parser_yylex):
+	  separate EXPR_LABELARG from EXPR_BEG and let newline significant,
+	  so that required keyword argument can place at the end of
+	  argument list without parentheses.  [ruby-core:61658] [Bug #9669]
+
+Mon Mar 24 22:19:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_initialize): filename can not be modified.
+
+Mon Mar 24 15:19:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): fetch path of the
+	  executable from /proc/self/exe on Linux.
+
+Mon Mar 24 14:14:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gc.c: Fix up default GC params by @csfrancis [fix GH-556]
+
+Mon Mar 24 13:13:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (parse_debug_line_cu): explicitly specify signed char
+	  because DWARF's line_Base is signed char and char maybe unsigned.
+	  patched by Rei Odaira. [ruby-dev:48068] [Bug #9654]
+
+Sun Mar 23 11:03:50 2014  Kohei Suzuki  <eagletmt@gmail.com>
+
+	* vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
+	  for a method aliased in a module.  [ruby-core:61636] [Bug #9663]
+
+Sun Mar 23 08:12:27 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (hash_pos): use bitwise AND to avoid slow modulo op
+	  (new_size): power-of-two sizes for hash_pos change
+	  (st_numhash): adjust for common keys due to lack of prime modulo
+	  [Feature #9425]
+	* hash.c (rb_any_hash): right shift for symbols
+	* benchmark/bm_hash_aref_miss.rb: added to show improvement
+	* benchmark/bm_hash_aref_sym_long.rb: ditto
+	* benchmark/bm_hash_aref_str.rb: ditto
+	* benchmark/bm_hash_aref_sym.rb: ditto
+	* benchmark/bm_hash_ident_num.rb: added to prevent regression
+	* benchmark/bm_hash_ident_obj.rb: ditto
+	* benchmark/bm_hash_ident_str.rb: ditto
+	* benchmark/bm_hash_ident_sym.rb: ditto
+
+Sat Mar 22 22:56:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): compare the file names of object in which
+	  symbols exist. [Bug #9654] [ruby-dev:48058]
+
+Sat Mar 22 06:46:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi/util.rb (escape_html, unescape_html): make synonyms
+	  aliases instead of wrapper methods.
+
+	* lib/cgi/util.rb (escape_element, unescape_element): ditto.
+	  [Fixes GH-573]
+
+Fri Mar 21 21:57:34 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Fix a build problem with clang and --with-opt-dir.
+	  If ruby is configured with --with-opt-dir=dir when using clang
+	  as compiler, a warning `clang: warning: argument unused during
+	  compilation: '-I dir'` is emitted almost every time clang
+	  compiles a file.  Unfortunately, RUBY_CHECK_PRINTF_PREFIX takes
+	  any output from the compiler as fatal error, and the check thus
+	  fails due to the warning.  This is an attempt to fix the problem
+	  by adding a flag -Qunused-arguments to CFLAGS locally in the
+	  function to suppress the warning. [ruby-dev:48062] [Bug #9658]
+	  [Fixes GH-571] https://github.com/ruby/ruby/pull/571
+
+Fri Mar 21 16:31:56 2014  Zachary Scott  <e@zzak.io>
+
+	* gc.c: [DOC] Fix call-seq for GC.start by @jasonrclark [Fixes GH-572]
+	  https://github.com/ruby/ruby/pull/572
+
+Thu Mar 20 11:37:28 2014  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Fixed a broken regular expression that was causing
+	  CSV to miss escaping some special meaning characters when used
+	  in parsing.
+	  Reported by David Unric
+	  [ruby-core:54986] [Bug #8405]
+
+Thu Mar 20 16:53:07 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_malloc_increase): should not invoke
+	  garbage_collect_with_gvl() here on non-ruby threads.
+
+	  Should just ignore the malloc_increase.
+
+	  This issue is pointed by Eric Wong [ruby-core:61519].
+
+Thu Mar 20 13:05:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of
+	  RARRAY_PTR().
+
+Thu Mar 20 12:59:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/intern.h (rb_obj_call_init, rb_class_new_instance):
+	  constify a parameter (VALUE *).
+	  I believe this incompatibility doesn't break any code.
+	  However, if you have trouble, please tell us.
+
+	* eval.c, object.c: ditto.
+
+Thu Mar 20 12:31:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_get_without_cache): get rid of
+	  infinite recursion at aliases in a subclass and a superclass.
+	  return actually defined class for other than singleton class.
+	  [ruby-core:60431] [Bug #9475]
+
+Wed Mar 19 17:13:06 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_mload): freeze and preserve marshal-loaded time zone
+	* test/ruby/test_time.rb: add test for GC on loaded object
+	  [Bug #9652]
+
+Tue Mar 18 23:20:12 2014  Shota Fukumori  <her@sorah.jp>
+
+	* vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
+
+Tue Mar 18 22:03:41 2014  Shota Fukumori  <her@sorah.jp>
+
+	* vm_eval.c (eval_string_with_cref): Use file path even if scope is
+	  given. Related to [ruby-core:56099] [Bug #8662] and r42103.
+
+Mon Mar 17 13:17:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* enumerator.c (enumerator_block_call): use RARRAY_CONST_PTR()
+	  instead of RARRAY_PTR().
+
+	* io.c (rb_io_s_popen): ditto.
+
+	* numeric.c (num_step_size): ditto.
+
+	* vm_eval.c (rb_apply): ditto.
+
+	* vm_eval.c (rb_eval_cmd): ditto.
+
+Mon Mar 17 10:11:59 2014  Eric Wong  <e@80x24.org>
+
+	* variable.c (rb_const_set): delete existing entry on redefinition
+	  [Bug #9645]
+	* test/ruby/test_const.rb (test_redefinition): test for leak
+
+Sun Mar 16 21:33:01 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]
+	  Based on patch by @stomar
+
+Sun Mar 16 13:21:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): insert a space between option and its
+	  argument for non-GCC compilers.  [ruby-core:61429] [Bug #9624]
+
+Sun Mar 16 08:05:06 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (objspace_xcalloc): fix GC accounting
+
+Sun Mar 16 06:33:35 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): return address is just after calling
+	  address. Therefore noreturn function with tail call's return
+	  address may be in another function.
+
+Sun Mar 16 05:51:55 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]
+
+Sat Mar 15 18:54:03 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/.document: remove refinement from documentable directories.
+
+Sat Mar 15 11:02:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): check for each options to control
+	  symbol resolution.  [ruby-core:61429] [Bug #9624]
+
+Sat Mar 15 07:02:35 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (st_update): remove unnecessary assignment
+
+Fri Mar 14 14:58:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): fetch symbol names from ELF binary's
+	  symbol table if it is built with cc -g and not stripped.
+	  Now ruby can show static symbols on Linux though glibc's
+	  backtrace_symbols(3) don't show them.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): use dladdr(3) to
+	  detect what object file declares the symbol because
+	  dl_iterate_phdr can't detect the main executable file
+	  and codes on the stack.
+	  NOTE: signal trampolines sometimes on the user stack. (FreeBSD)
+
+	* addr2line.c (rb_dump_backtrace_with_lines): stop showing
+	  backtrace if the function's name is main.
+	  NOTE: FreeBSD's backtrace (libexecinfo) shows _start and
+	  an additional address. Why it doesn't remove them on dladdr phase
+	  is, dladdr may fail to detect the main function but detect
+	  as _start function. Therefore it must be after scanning
+	  the symbol table and getting correct name.
+
+
+Fri Mar 14 12:07:46 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/literals.rdoc: [DOC] Single quote strings allows escape
+	  of backslash as well, patch by @idupree [Fixes GH-553]
+	  https://github.com/ruby/ruby/pull/553
+
+Fri Mar 14 01:18:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (invoke_block_from_c): add splattable argument.
+
+	* vm.c (vm_invoke_proc): disallow to splat when directly invoked.
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_callee_setup_arg):
+	  relax arity check of yielded lambda.  [ruby-core:61340] [Bug #9605]
+
+	* test/ruby/test_yield.rb (TestRubyYieldGen#emu_bind_params): no
+	  longer raise ArgumentError when splatting to lambda.
+
+Thu Mar 13 23:51:02 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/-test-/win32/dln/libdlntest.c (dlntest_ordinal): no need to
+	  specify export in the source file because .def file do it.
+	  get rid of warning on linking.
+
+Wed Mar 12 11:19:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat
+	  argument, since argc may differ for each calls.
+	  [ruby-core:61422] [Bug #9622]
+
+	* vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an
+	  inline function.
+
+Wed Mar 12 07:26:05 2014  Eric Wong  <e@80x24.org>
+
+	* insns.def (opt_regexpmatch2): respect redefined match op
+	  Thanks to Sam Rawlins for the fix.
+	* test/ruby/test_string.rb: test based on Tsuyoshi Sawada's report
+	  [Bug #9581]
+
+Tue Mar 11 22:31:25 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/.document: add objspace/objspace_dump.c to document file.
+
+Tue Mar 11 22:22:38 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/objspace/test_objspace.rb (TestObjSpace#test_dump_uninitialized_file):
+	  remove dependency on json library.
+
+Tue Mar 11 10:55:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT{,.ja} (Appendix B): update contents of `ruby_options`
+	  and replace `ruby_run` with `ruby_run_node`.  based on the patch
+	  by Kaneko Yuichiro at [ruby-dev:48030] [Bug #9619].
+
+Tue Mar 11 06:54:00 2014  Scott Francis  <scott.francis@shopify.com>
+
+	* ext/objspace/objspace_dump.c: Check fptr before trying to dump RFILE
+	  object fd. [GH-562]
+
+	* test/objspace/test_objspace.rb: add test
+
+Tue Mar 11 02:04:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD.
+
+	* vm_dump.c (procstat_vm): copied from FreeBSD.
+	  http://svnweb.freebsd.org/base/head/usr.bin/procstat/procstat_vm.c?revision=261780
+
+Mon Mar 10 12:14:26 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: always check dladdr(1).
+
+	* addr2line.c (fill_lines): show the line number in C backtrace if
+	  ruby is built without --enable-shared (PIE) on Linux.
+	  patch is originally by Shinichiro Hamaji
+	  https://twitter.com/shinh/status/441957774264504321
+	  NOTE: ld doesn't insert __executable_start for PIE.
+	  dladdr(3)'s argument must be a function pointer.
+
+Mon Mar 10 10:51:17 2014  ksss  <co000ri@gmail.com>
+
+	* test/ruby/test_enumerator.rb (test_iterators): fix test for hash
+	  iterators.  [Fixes GH-558]
+
+Sun Mar  9 14:14:49 2014  Eric Wong  <e@80x24.org>
+
+	* class.c (rb_class_subclass_add): use xmalloc
+	* class.c (rb_module_add_to_subclasses_list): ditto
+	* class.c (rb_class_remove_from_super_subclasses): use xfree
+	* class.c (rb_class_remove_from_module_subclasses): ditto
+	  [Bug #9616]
+
+Sun Mar  9 13:51:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/function.c (function_call): fix memory leak when an
+	  exception occurs at argument conversion or the function call.
+
+Sun Mar  9 06:42:40 2014  Eric Wong  <e@80x24.org>
+
+	* variable.c (struct global_variable): shrink by 8 bytes on 64-bit
+
+Sat Mar  8 17:42:51 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (add_opt_method): cleanup to use rb_method_entry_at
+
+Sat Mar  8 13:46:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
+	  ext/fiddle/handle.c (fiddle_handle_free),
+	  ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
+	  based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].
+
+Sat Mar  8 13:30:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (obj2uid, obj2gid): now getpwnam_r() and getgrnam_r()
+	  may need larger buffers than sysconf values, so retry with
+	  expanding the buffer when ERANGE is returned.
+	  [ruby-core:61325] [Bug #9600]
+
+Fri Mar  7 19:29:13 2014  Eric Wong  <e@80x24.org>
+
+	* vm_eval.c (vm_call0_body): use RARRAY_CONST_PTR
+	  (check_funcall_exec): ditto
+	  [ruby-core:61360]
+
+Fri Mar  7 19:14:11 2014  Eric Wong  <e@80x24.org>
+
+	* vm_eval.c (vm_call0_body): fix RB_GC_GUARD location
+	  (check_funcall_exec): ditto
+	  [Bug #9609]
+
+Fri Mar  7 14:48:17 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* parse.y (ENC_SINGLE): Unused macro removed.
+
+Fri Mar  7 12:06:19 2014  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* test/openssl/test_ssl.rb: Reuse TLS default options from
+	  OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
+
+Thu Mar  6 15:15:24 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/assignment.rdoc: [DOC] Fix assignment directions
+	  By @idupree [Fixes GH-555] https://github.com/ruby/ruby/pull/555
+
+Thu Mar  6 15:07:18 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/methods.rdoc: [DOC] Fix example for block arguments
+	  By @idupree [Fixes GH-554] https://github.com/ruby/ruby/pull/554
+
+Thu Mar  6 10:33:31 2014  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* lib/openssl/ssl.rb: Explicitly whitelist the default
+	  SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable
+	  compression by default.
+	  Reported by Jeff Hodges.
+	  [ruby-core:59829] [Bug #9424]
+
+Wed Mar  5 15:56:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_arg_asgn): define optional arguments as argument
+	  variables in the rhs default expressions.
+	  [ruby-core:61299] [Bug #9593]
+
+Wed Mar  5 11:58:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
+	  error reasons with old OpenSSL, and insert a colon iff formatted
+	  message is not empty.
+
+Wed Mar  5 00:42:00 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/pathname/lib/pathname.rb (Pathname#find): add "ignore_error"
+	  keyword argument defaulted to true as well as Find#find.
+
+Tue Mar  4 23:00:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_eval.rb (TestEval#make_test_binding): renamed.
+	  it's not test method.
+
+Tue Mar  4 20:50:59 2014  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* st.c (st_foreach): fix type of hash. not st_data_t but st_index_t.
+
+Tue Mar  4 19:41:40 2014  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in: ".DEFAULT" target removed because it is not for
+	  specifying default target.
+
+Tue Mar  4 00:25:35 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/find.rb (Find#find): should pass ignore_error option to enumerators.
+
+Mon Mar  3 13:27:35 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/test_find.rb (TestFind#test_unsearchable_dir): ruby cannot make
+	  directory unreachable by owner on Windows.
+
+Mon Mar  3 08:10:04 2014  Eric Wong  <e@80x24.org>
+
+	* vm_method.c (rb_method_entry_get_without_cache): disable GMC
+	  writing if GMC is disabled.
+	  [ruby-core:61218]
+
+Mon Mar  3 07:47:17 2014  Eric Wong  <e@80x24.org>
+
+	* README.EXT: wrap GetDBM with do/while(0)
+	* README.EXT.ja: ditto
+	* ext/dbm/dbm.c: ditto, likewise for GetDBM2
+	* ext/gdbm/gdbm.c: ditto
+	* ext/sdbm/init.c: ditto
+	  [ruby-core:61217]
+
+Mon Mar  3 07:17:31 2014  Zachary Scott  <e@zzak.io>
+
+	* NEWS: [DOC] Update doc regarding filesystem load when flushing IO
+
+Mon Mar  3 04:37:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_fsync): need to fsync even if on Windows.  fixed mistake
+	  of r45254 and r45256.
+
+Mon Mar  3 04:21:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole: get rid of warnings (unused variable).
+
+Mon Mar  3 02:53:53 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_flush_raw): [EXPERIMENTAL] remove force syncing for Win32
+	  to speed up IO.  this may break some tests, and they'll be fixed
+	  later.
+	  [ruby-core:58570] [Bug #9153]
+
+Mon Mar  3 00:17:43 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_backtrace.rb: get rid of warnings.  unused variable,
+	  shadowing.
+
+Sun Mar  2 11:15:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/find.rb (Find#find): add "ignore_error" keyword argument
+	  defaulted to true.  [ruby-core:51025] [Feature #7596]
+
+Sun Mar  2 11:13:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): define as Function for
+	  very old readline versions.  [ruby-core:61209] [Bug #9578]
+
+Sun Mar  2 10:47:58 2014  Eric Wong  <e@80x24.org>
+
+	* load.c (ruby_init_ext): make idempotent to suppress warnings
+
+Sat Mar  1 19:51:42 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.capture3): Ignore Errno::EPIPE for writing
+	  stdin_data.
+	  (Open3.capture2): Ditto.
+	  (Open3.capture2e): Ditto.
+
+Sat Mar  1 19:06:47 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (ruby_gc_set_params): simplify condition
+
+Sat Mar  1 16:18:40 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
+	  of Function to support readline-6.3.  (rl_hook_func_t is available
+	  since readline-4.2.)
+	  Reported by Dmitry Medvinsky.  [ruby-core:61141] [Bug #9578]
+
+Sat Mar  1 16:05:58 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (ruby_gc_set_params): fix building without RGenGC
+
+Sat Mar  1 11:08:00 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
+	  objects.
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
+	  objects.
+
+	* test/psych/test_encoding.rb: add test
+
+	* ext/psych/lib/psych.rb: add version
+
+Sat Mar  1 10:52:34 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT.ja: [DOC] Fix typo "macro macro" @utenmiki [Fixes GH-551]
+	  https://github.com/ruby/ruby/pull/551
+
+Fri Feb 28 11:16:55 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c: Fix Numeric#step with 0 unit [Bug #9575]
+
+Thu Feb 27 17:59:01 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/optparse.rb: [DOC] Add example of generating help with optparse.
+	  Patch by @joelmccracken documenting-ruby/ruby#19
+	  https://github.com/documenting-ruby/ruby/pull/19
+
+Thu Feb 27 12:10:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (ruby_num_interval_step_size): check signs and get rid
+	  of implementation dependent behavior of negative division.
+	  [ruby-core:61106] [Bug #9570]
+
+Thu Feb 27 03:55:45 2014  Zachary Scott  <e@zzak.io>
+
+	* thread.c: [DOC] Typo in comment for _FORTIFY_SOURCE [Fixes GH-548]
+	  Patch by @qnet-herwin https://github.com/ruby/ruby/pull/548
+
+Wed Feb 26 18:43:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_pages_free_unused_pages): check tomb page availability
+	  at first.
+	  And return immediately if we don't touch sorted list any more.
+
+Wed Feb 26 14:10:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): preserve exception class name encoding
+	  in debug mode messages.
+
+	* eval.c (setup_exception): preserve errinfo across calling #to_s
+	  method on the exception.  [ruby-core:61091] [Bug #9568]
+
+Wed Feb 26 01:29:27 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (sym_find): Add Symbol.find(str), which returns whether given
+	  string is defined as symbol or not. [Feature #7854]
+
+Tue Feb 25 22:52:02 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/dl/dl.c (rb_dl_realloc): use NUM2SIZET instead of NUM2INT.
+
+	* ext/fiddle/fiddle.c (rb_fiddle_realloc): ditto.
+
+Tue Feb 25 22:49:30 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/dl/dl.c (rb_dl_malloc): use NUM2SIZET instead of NUM2INT.
+	  Coverity Scan found this bug.
+
+	* ext/fiddle/fiddle.c (rb_fiddle_malloc): ditto.
+
+Tue Feb 25 12:06:13 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* win32/Makefile.sub: define PACKED_STRUCT.
+
+Mon Feb 24 21:41:56 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.md, README.ja.md: removed (wrong) mode setting for emacs.
+
+Mon Feb 24 20:05:41 2014  Eric Wong  <e@80x24.org>
+
+	* configure.in: define PACKED_STRUCT_UNALIGNED for x86*
+	* timev.h (struct vtm): use PACKED_STRUCT_UNALIGNED
+	* time.c (struct time_object): ditto
+	  [Bug #9558] non-x86 cannot safely access unaligned addresses
+
+Mon Feb 24 18:10:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/fiddle/test_function.rb: remove unused variables.
+	* test/fileutils/test_fileutils.rb: ditto.
+	* test/io/console/test_io_console.rb: ditto.
+
+Mon Feb 24 12:37:51 2014  Eric Wong  <e@80x24.org>
+
+	* configure.in: use -Wno-packed-bitfield-compat for GCC 4.4+
+	  use __attribute__((packed)) if available
+	* timev.h: shrink and pack struct vtm
+	* time.c: pack struct time_object and adjust/introduce helpers
+	  [ruby-core:60794]
+
+Sun Feb 23 17:55:50 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xmltokens.rb: Add missing non ASCII valid characters
+	  to element name characters. Now, REXML name tokens exactly
+	  match "[5] Name" in the XML spec and "[4] NCName" in the
+	  Namespaces in XML spec. See comment about the details.
+	  [Bug #9539]  [ruby-core:60901]
+	  Reported by Mario Barcala. Thanks!!!
+
+	* test/rexml/xpath/test_node.rb: Add tests for the above case.
+
+Sun Feb 23 12:18:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (inet_pton): use rb_w32_inet_pton, instead of
+	  inet_pton directly, which is unavailable on older version Windows.
+
+	* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a
+	  wrapper function for inet_pton minimum supported client is
+	  Vista, as well as inet_ntop.
+
+Sun Feb 23 11:33:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/imap/test_imap.rb: remove unused variables.
+	* test/net/imap/test_imap_response_parser.rb: ditto.
+	* test/net/pop/test_pop.rb: ditto.
+
+Sun Feb 23 02:19:51 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
+	  security.mac.portacl.port_high is changed.
+	  See mac_portacl(4) for details.
+	  Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]
+
+Sat Feb 22 23:17:01 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xpath_parser.rb: Fix indent.
+
+Sat Feb 22 23:15:35 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/xpath/test_attribute.rb: Simplify.
+
+Sat Feb 22 20:28:47 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: more friendly.
+
+Sat Feb 22 20:24:43 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_xpath*.rb: Move to ...
+	* test/rexml/xpath/*.rb: ... here.
+
+Sat Feb 22 20:04:41 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/listener.rb: Untabify.
+
+Sat Feb 22 19:07:31 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): need read access for conout$
+	  because some functions need it.  [Bug#9554]
+
+Sat Feb 22 18:40:58 2014  Eric Wong  <e@80x24.org>
+
+	* .gitignore: ignore benchmark files
+
+Sat Feb 22 01:22:24 2014  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bary_mul_precheck): fix a copy-paste error.
+	  Coverity Scan found this bug.
+
+Sat Feb 22 00:58:51 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/socket/raddrinfo.c (rb_getaddrinfo): second argument of
+	  MEMZERO is type.  Coverity Scan found this bug.
+
+Fri Feb 21 23:47:24 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/init.c (wait_connectable): break if the socket is
+	  writable to avoid infinite loops on FreeBSD and other platforms
+	  which conforms to SUSv3.  This problem cannot be reproduced with
+	  loopback interfaces, so it's hard to write test code.
+	  rsock_connect() and wait_connectable() are overly complicated, so
+	  they should be refactored, but I commit this fix as a workaround
+	  for the release of Ruby 1.9.3 scheduled on Feb 24.
+	  [ruby-core:60940] [Bug #9547]
+
+Fri Feb 21 23:03:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: added to handle redmine tickets.
+
+Fri Feb 21 20:42:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_init_copy): do nothing if copying self.
+	  [ruby-dev:47989] [Bug #9535]
+
+	* hash.c (rb_hash_initialize_copy): ditto.
+
+Fri Feb 21 16:45:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/logger.rb (next_rotate_time, previous_period_end): consider
+	  DST change.
+
+	* lib/logger.rb (Logger::LogDevice#check_shift_log): compare the
+	  current time with the time for the next rotation to fix rotation
+	  miss when date changed between the comparison and log writing.
+	  based on the patch by megayu <yuhg2310 AT gmail.com>.
+	  [Fixes GH-539]
+
+Fri Feb 21 10:39:33 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	*  test/monitor/test_monitor.rb: remove unused variables.
+	*  test/resolv/test_dns.rb: ditto.
+	*  test/rexml/test_functions.rb: ditto.
+	*  test/rss/test_setup_maker_itunes.rb: ditto.
+
+Fri Feb 21 09:48:56 2014  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
+	  (bsock_recvmsg_internal): ditto
+	* test/socket/test_unix.rb: test above for infinite loop
+
+Fri Feb 21 08:27:19 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD):
+	  use rb_gc_guarded_ptr_val on non-GCC/MSC
+	* gc.c (rb_gc_guarded_ptr_val): rename and adjust argument.
+	  RB_GC_GUARD should be robust enough for any compiler.
+	  [ruby-core:60816] [Bug #7805]
+
+Thu Feb 20 22:21:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc.
+	  Suggested by Eric Wong.
+	  https://bugs.ruby-lang.org/issues/9525#note-14
+
+Thu Feb 20 11:21:13 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_flatten): fix behavior of flatten(-1).
+	  [ruby-dev:47988] [Bug #9533]
+
+	* test/ruby/test_array.rb: test for above.
+
+Wed Feb 19 18:57:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Bypass getaddrinfo() if node and serv are numeric.
+	  Reporeted by Naotoshi Seo.  [ruby-core:60801] [Bug #9525]
+
+	* ext/socket/extconf.rb: Detect struct sockaddr_in6.sin6_len.
+
+	* ext/socket/sockport.h (SET_SIN6_LEN): New macro.
+	  (INIT_SOCKADDR_IN6): Ditto.
+
+	* ext/socket/rubysocket.h (struct rb_addrinfo): Add
+	  allocated_by_malloc field.
+
+	* ext/socket/raddrinfo.c (numeric_getaddrinfo): New function.
+	  (rb_getaddrinfo): Call numeric_getaddrinfo at first.
+	  (rb_freeaddrinfo): Free struct addrinfo properly when it is
+	  allocated by numeric_getaddrinfo.
+
+Wed Feb 19 18:31:48 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Wrap struct addrinfo by struct rb_addrinfo.
+
+Wed Feb 19 17:47:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory.
+
+Wed Feb 19 11:39:41 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: it must see rb_cv_broken_memmem not rb_cv_func_memmem.
+
+Tue Feb 18 23:18:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/socket/test_socket.rb: unix socket is required by test case.
+
+Tue Feb 18 20:48:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/socket/test_addrinfo.rb: remove unused variables.
+	* test/socket/test_nonblock.rb: ditto.
+	* test/socket/test_socket.rb: ditto.
+	* test/socket/test_unix.rb: ditto.
+	* test/testunit/test_parallel.rb: ditto.
+	* test/webrick/test_filehandler.rb: ditto.
+	* test/xmlrpc/test_features.rb: ditto.
+	* test/zlib/test_zlib.rb: ditto.
+
+Tue Feb 18 14:27:18 2014  Shota Fukumori  <her@sorah.jp>
+
+	* lib/test/unit.rb: Requires minitest < 5.0.0 if Gem is available.
+
+Tue Feb 18 14:24:07 2014  Shota Fukumori  <her@sorah.jp>
+
+	* lib/test/unit/test-unit.gemspec: Add minitest < 5.0.0 dependency
+
+	* tool/rbinstall.rb: Add empty implementations for `add_dependency`,
+	  `add_runtime_dependency`, `add_development_dependency` for
+	  Gem::Specification.
+
+Tue Feb 18 12:06:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (FILE_COUNT): Removed.  (win32.c defines it in itself.)
+	  (FILE_READPTR): Ditto.
+
+Tue Feb 18 09:35:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test/psych/test_string.rb: remove unused variables.
+	* test/test/psych/test_yaml.rb: ditto.
+
+Mon Feb 17 21:31:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: ignore warning messages for running with -w
+	  option such as chkbuild.
+
+Mon Feb 17 20:00:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Move BDIGIT and related definitions from
+	  include/ruby/defines.h.
+
+Mon Feb 17 17:41:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (marshal_dump, marshal_load): do not recycle wrapper
+	  objects, to prevent from segfault with continuation.
+	  [ruby-dev:47970] [Bug #9523]
+
+Mon Feb 17 15:43:59 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/keywords.rdoc: [DOC] Add keywords doc by documenting-ruby/ruby#29
+	  https://github.com/documenting-ruby/ruby/pull/29
+
+Mon Feb 17 12:31:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (get_envparam_double): fix a warning message.
+
+Mon Feb 17 12:09:52 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce new environment variable
+	  "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
+	  frequency.
+
+	  Do full GC when the number of old objects is more than R * N
+	  where R is this factor and
+                N is the number of old objects just after last full GC.
+
+	* test/ruby/test_gc.rb: add a test.
+
+Mon Feb 17 11:28:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_pty.rb: ignore warnings to unused variables.
+
+Mon Feb 17 11:27:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_find.rb: remove unused variables.
+
+Sun Feb 17 02:12:00 2014  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto.
+
+Sun Feb 16 15:53:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_securerandom.rb: File.exists? is deprecated. use File.exist?
+
+Sun Feb 16 15:05:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/pathname/test_pathname.rb: File.exists? is deprecated. use File.exist?
+
+Sun Feb 16 15:00:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/ftp/test_ftp.rb: remove unused variables.
+	* test/logger/test_logger.rb: ditto.
+
+Sun Feb 16 14:52:46 2014  Eric Wong  <e@80x24.org>
+
+	* dir.c (dir_s_glob): RB_GC_GUARD instead of volatile
+
+Sun Feb 16 14:33:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (RBIGNUM_SIGN): Defined for compatibility.
+	  (RBIGNUM_POSITIVE_P): Ditto.
+	  (RBIGNUM_NEGATIVE_P): Ditto.
+
+Sun Feb 16 12:46:47 2014  Eric Wong  <e@80x24.org>
+
+	* io.c (rb_f_backquote): trade volatile for manual recycle
+	  rb_gc_force_recycle ensures object is visible until recycle
+
+Sun Feb 16 11:55:14 2014  Eric Wong  <e@80x24.org>
+
+	* marshal.c (marshal_dump): use rb_gc_force_recycle for GC-safety
+	  (marshal_load): ditto
+	  [ruby-core:60730] [Bug #7805]
+
+Sun Feb 16 08:11:23 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT.ja: [DOC] Fix typo by @utenmiki [Fixes GH-534]
+	  https://github.com/ruby/ruby/pull/534
+
+Sun Feb 16 07:48:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/bigdecimal/bigdecimal.c (BIGNUM_ZERO_P): Unused macro removed.
+
+Sun Feb 16 06:12:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Rename macro names: RBIGNUM_FOO to BIGNUM_FOO.
+	  (BIGNUM_EMBED_LEN_NUMBITS): Renamed from RBIGNUM_EMBED_LEN_NUMBITS.
+	  (BIGNUM_EMBED_LEN_MAX): Renamed from RBIGNUM_EMBED_LEN_MAX.
+	  (BIGNUM_SIGN_BIT): Renamed from RBIGNUM_SIGN_BIT.
+	  (BIGNUM_SIGN): Renamed from RBIGNUM_SIGN.
+	  (BIGNUM_SET_SIGN): Renamed from RBIGNUM_SET_SIGN.
+	  (BIGNUM_POSITIVE_P): Renamed from RBIGNUM_POSITIVE_P.
+	  (BIGNUM_NEGATIVE_P): Renamed from RBIGNUM_NEGATIVE_P.
+	  (BIGNUM_EMBED_FLAG): Renamed from RBIGNUM_EMBED_FLAG.
+	  (BIGNUM_EMBED_LEN_MASK): Renamed from RBIGNUM_EMBED_LEN_MASK.
+	  (BIGNUM_EMBED_LEN_SHIFT): Renamed from RBIGNUM_EMBED_LEN_SHIFT.
+	  (BIGNUM_LEN): Renamed from RBIGNUM_LEN.
+	  (RBIGNUM_DIGITS): Renamed from RBIGNUM_DIGITS.
+	  (BIGNUM_LENINT): Renamed from RBIGNUM_LENINT.
+
+	* bignum.c: Follow the above change.
+
+	* gc.c: Ditto.
+
+	* marshal.c: Ditto.
+
+	* math.c: Ditto.
+
+	* numeric.c: Ditto.
+
+	* random.c: Ditto.
+
+	* rational.c: Ditto.
+
+	* sprintf.c: Ditto.
+
+	* ext/-test-/bignum/bigzero.c: Ditto.
+
+	* ext/-test-/bignum/intpack.c: Ditto.
+
+	* ext/bigdecimal/bigdecimal.c: Ditto.
+
+Sat Feb 15 20:48:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (FILE_READEND): Don't detect it because it is not used.
+
+Sat Feb 15 13:22:28 2014  Eric Wong  <e@80x24.org>
+
+	* probes_helper.h (RUBY_DTRACE_HOOK): correct type for _id
+
+Sat Feb 15 11:47:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_cmp): Avoid bignum allocation for comparison
+	  between bignum and fixnum.
+
+Sat Feb 15 10:55:12 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* ext/-test-/win32/fd_setsize/depend: fix wrong dependencies.
+	  [ruby-dev:47253]
+
+Sat Feb 15 00:38:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c: Enumerable#{min,min_by,max,max_by} extended to take an
+	  optional argument.
+	  (nmin_cmp): New function.
+	  (nmin_block_cmp): Ditto
+	  (nmin_filter): Ditto.
+	  (nmin_i): Ditto.
+	  (nmin_run): Ditto.
+	  (enum_min): Call nmin_run if the optional argument is given.
+	  (nmin_max): Ditto.
+	  (nmin_min_by): Ditto.
+	  (nmin_max_by): Ditto.
+
+	* range.c: Range#{min,max} extended to take an optional argument.
+	  (range_min): Call range_first if the optional argument is given.
+	  (range_max): Call rb_call_super if the optional argument is given.
+
+	[ruby-core:57111] [Feature #8887]
+
+Sat Feb 15 00:27:46 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h,
+	  internal.h,
+	  ext/-test-/bignum/bigzero.c: Hide a Bignum definition.
+	  [ruby-core:42891] [Feature #6083]
+
+Sat Feb 15 00:13:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h,
+	  include/ruby/io.h,
+	  include/ruby/ruby.h,
+	  include/ruby/win32.h,
+	  include/ruby/backward/rubysig.h,
+	  bignum.c,
+	  gc.c,
+	  io.c,
+	  process.c,
+	  safe.c,
+	  struct.c,
+	  thread.c,
+	  ext/socket/rubysocket.h,
+	  ext/-test-/old_thread_select: Remove deprecated definitions
+	  [ruby-core:60581] [Feature #9502]
+
+Fri Feb 14 18:38:46 2014  Eric Wong  <e@80x24.org>
+
+	* string.c (rb_str_format_m): trade volatile for RB_GC_GUARD
+	  RB_GC_GUARD meaning is clear and has better code generation.
+	  [ruby-core:60688]
+
+Thu Feb 13 23:30:30 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): should check ci->me->flag of
+	  a refining method in case the method is private.
+	  [ruby-core:60111] [Bug #9452]
+
+	* vm_method.c (make_method_entry_refined): set me->flag of a refined
+	  method entry to NOEX_PUBLIC in case the original method is private
+	  and it is refined as a public method.  The original flag is stored
+	  in me->def->body.orig_me, so it's OK to make a refined method
+	  entry public.  [ruby-core:60111] [Bug #9452]
+
+	* test/ruby/test_refinement.rb: related tests.
+
+Thu Feb 13 18:38:15 2014  Eric Wong  <e@80x24.org>
+
+	* re.c (rb_reg_raise): remove volatile
+	  Unnecessary since r41597
+
+Thu Feb 13 18:28:51 2014  Eric Wong  <e@80x24.org>
+
+	* re.c (rb_reg_regcomp): remove volatile
+	  Unnecessary since r13261
+
+Thu Feb 13 16:54:32 2014  Zachary Scott  <e@zzak.io>
+
+	* test/ruby/test_array.rb: Ensure flatten! is used for test_flatten
+	  Patch by @ksss [Fixes GH-530] https://github.com/ruby/ruby/pull/530
+
+Thu Feb 13 15:43:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (IDSET_ATTRSET_FOR_INTERN): fix off-by-one bug.
+
+	* parse.y (rb_enc_symname_type): junk ID succeeded by '=' is also
+	  attrset ID.  [ruby-core:60668] [Bug #8756]
+
+Thu Feb 13 11:06:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check if pthread_setname_np is available.
+
+	* thread_pthread.c: pthread_setname_np is not available on old
+	  Darwins.  [ruby-core:60524] [Bug #9492]
+
+Thu Feb 13 00:56:59 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* configure.in: revert r44922. I should have used AC_CHECK_FUNCS()
+	  to just define a symbol if the function is available.
+
+Thu Feb 13 00:20:58 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* configure.in: use AC_CHECK_FUNC instead of AC_CHECK_FUNCS
+	  if available.
+
+Thu Feb 13 00:15:10 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* configure.in: fix to undefine HAVE_MEMMEM correctly if it is broken.
+
+Tue Feb 11 23:54:40 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_cmp): Specialize a comparison to zero.
+
+	* ext/bigdecimal/bigdecimal.c (is_negative): Use rb_big_cmp instead of
+	  RBIGNUM_NEGATIVE_P.
+	  (BigMath_s_log): Ditto.
+
+Tue Feb 11 22:59:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): Use rb_integer_pack.
+	  Fix SEGV by OpenSSL::BN.new(1 << (2**34)).
+
+Tue Feb 11 17:00:38 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/tk/README.tcltklib: [DOC] Fix typo by @xta [Fixes GH-532]
+
+Sun Feb  9 13:59:29 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Fix compilation error.
+	  https://bugs.ruby-lang.org/issues/8358#note-16
+
+Sun Feb  9 05:20:24 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (rb_cv_gnu_qsort_r): use compile error "conflicting
+	  types for 'qsort_r'" instead of AC_RUN_IFELSE.
+
+Sun Feb  9 04:07:34 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/yaml.rb: [DOC] Add links to syck and psych on github [Bug #9501]
+	  Based on a patch by Giorgos Tsiftsis
+
+Sun Feb  9 02:13:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (OBJ_TAINTABLE, OBJ_TAINT, OBJ_INFECT),
+	  marshal.c (r_entry0): all Numerics never be tainted now.
+	  [ruby-core:57346] [Bug #8945]
+
+Sat Feb  8 23:40:35 2014  Vit Ondruch  <vondruch@redhat.com>
+
+	* configure.in: add quoting brackets and append wildcard for the
+	  rest after target_cpu, to properly detect platform for SSE2
+	  instructions.  [ruby-core:60576] [Bug #8358]
+
+Sat Feb  8 21:44:07 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* configure.in: check qsort_r(3) and whether it is GNU version.
+	  BSD version has different prototype.
+
+	* util.h: use qsort_r() as ruby_qsort() if it is GNU version.
+
+	* util.c: define ruby_qsort() if needed.
+
+Sat Feb  8 16:34:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#get_labels):
+	  Make it iterative.
+
+Sat Feb  8 15:54:12 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, gc.h (rb_objspace_marked_object_p): added.
+	  This function *ONLY* works just after marking phase,
+	  before any sweeping.
+	  This function is highly depending current GC implementation
+	  and can be removed future version.
+
+Sat Feb  8 15:41:37 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: Don't set CLOEXEC flag explicitly.  (Ruby set it by
+	  default.)
+
+Sat Feb  8 15:27:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise
+	  DecodeError if no data before the limit.
+	  Reported by Will Bryant.  [ruby-core:60557] [Bug #9498]
+
+Sat Feb  8 15:11:21 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (SMALLBUF): Unused macro removed.
+
+Fri Feb  7 23:37:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on
+	  socket creation.
+	  Reported by Bjoern Rennhak.  [ruby-core:60442] [Bug #9477]
+
+Fri Feb  7 21:58:48 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/open-uri.rb: [DOC] use lower case version of core classes, same
+	  as commit r44878, based on patch by Jonathan Jackson [Bug #9483]
+
+Fri Feb  7 21:54:53 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
+	  classes when referring to return value, since we aren't directly
+	  talking about the class. Patch by Jonathan Jackson [Bug #9483]
+
+Fri Feb 7 05:28:38 2014  Eric Wong  <e@80x24.org>
+
+	* constant.h: reduce rb_const_entry_t size on 64-bit
+	  Patch by Adam Avilla [ruby-core:60542] [Feature #9496]
+
+Thu Feb  6 15:27:46 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (get_envparam_int): correct warning messages.
+
+	* gc.c (get_envparam_double): ditto.
+
+Thu Feb  6 15:17:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (get_envparam_int): don't accept a value equals to lowerbound
+	  (changed by last commit) because "" or "foo" (not a number) strings
+	  are parsed as 0. They should be rejected.
+
+	* gc.c (get_envparam_double): ditto.
+
+Thu Feb  6 09:00:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (ruby_gc_set_params): if RUBY_GC_OLDMALLOC_LIMIT is provided,
+	  then set objspace->rgengc.oldmalloc_increase_limit.
+	  Without this fix, the env variable RUBY_GC_OLDMALLOC_LIMIT
+	  does not work.
+
+	* gc.c (get_envparam_int): accept a value equals to lowerbound.
+
+	* gc.c (get_envparam_double): ditto.
+
+Thu Feb 6 08:23:28 2014  Eric Wong  <e@80x24.org>
+
+	* ext/thread/thread.c (rb_szqueue_max_set): use correct queue and
+	  limit wakeups.  [Bug #9343][ruby-core:60517]
+	* test/thread/test_queue.rb (test_sized_queue_assign_max):
+	  test for bug
+
+Thu Feb  6 07:18:01 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.2.2.  Complete history at:
+
+	  http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05
+
+	* test/rubygems:  ditto.
+
+Wed Feb  5 20:56:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (to_be_skipped_id): ignore anonymous attributes.
+
+	* pack.c (Init_pack): use anonymous ID so that associated objects
+	  do not appear in the packed result.
+
+	* parse.y (rb_make_internal_id): return an anonymous ID for
+	  internal use.
+
+Wed Feb  5 14:41:56 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vsnprintf.c: remove duplicated def of `UNINITIALIZED_VAR()'.
+
+Wed Feb  5 14:40:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace_dump.c (dump_object): use STR_SHARED_P()
+	  instead of removed STR_NOCAPA_P() macro.
+
+Wed Feb  5 13:51:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h, vm_core.h: move LIKELY/UNLIKELY/UNINITIALIZED_VAR()
+	  macros from vm_core.h to internal.h.
+
+	* string.c: remove dependency to "vm_core.h".
+
+	* common.mk: ditto.
+
+Wed Feb  5 13:29:01 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_str_free): use FL_TEST(str, STR_SHARED) directly
+	  because str is not embed.
+
+	* string.c (str_replace): remove `FL_SET(str, STR_SHARED)' line
+	  because STR_SET_SHARED() set STR_SHARED.
+
+Wed Feb  5 13:18:08 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* internal.h: remove macros STR_NOCAPA and STR_NOCAPA_P().
+
+	* string.c (rb_str_resize): remove `STR_SET_NOEMBED(str)' because
+	  str_make_independent_expand() set NOEMBED flag.
+
+	* string.c (rb_str_resize): remove `STR_NOCAPA_P(str)' check because
+	  `str' is independent (not shared).
+
+Wed Feb  5 12:54:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c: refactoring, especially about string flags.
+
+	* string.c (STR_UNSET_NOCAPA): removed.
+	  Use FL_UNSET() with STR_SHARED.
+
+	* string.c (rb_str_capacity): check STR_SHARED directly
+	  because it is not a embed string.
+
+	* string.c (rb_str_modify_expand): ditto.
+
+	* string.c (rb_str_shared_replace): use STR_SET_SHARED().
+
+	* string.c (str_make_independent_expand): remove STR_UNSET_NOCAPA()
+	  because `str' is not shared string.
+
+Wed Feb  5 12:11:04 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (RESIZE_CAPA): should not resize shared string.
+
+Wed Feb  5 11:46:42 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_children): STR_ASSOC is no longer available.
+	  Reported by @nagachika.
+	  http://d.hatena.ne.jp/nagachika/20140204
+
+Wed Feb  5 11:27:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_str_new_frozen): refactoring code.
+	  * Move code from str_new_frozen_with_klass() (and remove it)
+	  * `aux.shared' should not be 0 for STR_SHARED strings.
+
+Wed Feb  5 04:23:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: New release of psych.
+	* ext/psych/psych.gemspec: ditto
+
+Wed Feb  5 04:16:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/yaml/emitter.c: merge libyaml 0.1.5
+	* ext/psych/yaml/loader.c: ditto
+	* ext/psych/yaml/parser.c: ditto
+	* ext/psych/yaml/reader.c: ditto
+	* ext/psych/yaml/scanner.c: ditto
+	* ext/psych/yaml/writer.c: ditto
+	* ext/psych/yaml/yaml_private.h: ditto
+
+Tue Feb  4 19:10:29 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c: use long allocator names instead of numbered
+	  allocator names.
+	  * rb_str_new2 -> rb_str_new_cstr
+	  * rb_str_new4 -> rb_str_new_frozen
+	  * rb_str_new5 -> rb_str_new_with_class
+	  * str_new3 -> str_new_shared
+	  * str_new4 -> str_new_frozen_with_klass
+
+Tue Feb  4 17:20:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): return the filename with actual cases on
+	  the filesystem if it is case-insensitive.  [ruby-core:42469]
+	  [Feature #5994]
+
+Tue Feb  4 16:16:58 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c: use STR_SHARED instead of ELTS_SHARED.
+	  (same value, but more clear meaning)
+
+Tue Feb  4 16:09:14 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c: remove STR_ASSOC related code.
+	  By r44804, string objects can not have STR_ASSOC flag.
+
+	* internal.h: ditto.
+
+	* ext/objspace/objspace_dump.c (dump_object): ditto.
+
+Tue Feb  4 14:07:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (str_associate, str_associated): keep associated objects
+	  in an instance variables, instead of in the internal structure.
+
+	* string.c (rb_str_associate, rb_str_associated): deprecate.
+
+Tue Feb  4 12:55:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_modify_expand): enable capacity and disable
+	  association with packed objects when setting capa, so that
+	  pack("p") string fails to unpack properly after modified.
+
+Tue Feb  4 12:45:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_make_pattern): all alphabets are magic characters on
+	  case-insensitive filesystems.  [ruby-core:42469] [Feature #5994]
+
+Tue Feb  4 09:47:57 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.2.2 prerelease to check fixes to
+	  CI.
+	* test/rubygems:  ditto.
+
+Mon Feb  3 12:04:47 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* error.c: [DOC] Exception#cause may return nil. [ci skip]
+
+Sun Feb 2 05:48:42 2014  Eric Wong <e@80x24.org>
+
+	* io.c (rb_io_syswrite): add RB_GC_GUARD
+	  [Bug #9472][ruby-core:60407]
+
+Sat Feb  1 15:09:16 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_typedesc2val): add VT_RECORD case.
+
+Sat Feb  1 06:38:51 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/drb/drb.rb: [DOC] Add note about start_service for each process
+	  Based on a patch by @rosenfeld [Fixes GH-514] [ci skip]
+	  https://github.com/ruby/ruby/pull/514
+
+Sat Feb  1 06:30:20 2014  Zachary Scott  <e@zzak.io>
+
+	* error.c: [DOC] Document Exception#cause by @jasonrclark [ci skip]
+	  [Fixes GH-519] https://github.com/ruby/ruby/pull/519
+
+Sat Feb  1 06:10:49 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/securerandom.rb: [DOC] Add note on require for examples
+	  Based on a patch by @schneems [Fixes GH-518] [ci skip]
+	  https://github.com/ruby/ruby/pull/518
+
+Sat Feb  1 06:04:56 2014  Zachary Scott  <e@zzak.io>
+
+	* numeric.c: [DOC] Fix typo in example for #step [ci skip]
+	  Patch by @ksss [Fixes GH-522] https://github.com/ruby/ruby/pull/522
+
+Fri Jan 31 17:01:47 2014  Eric Wong <e@80x24.org>
+
+	* ext/socket/init.c (rsock_socket0): split out SOCK_CLOEXEC version
+	* ext/socket/socket.c (rsock_socketpair0): ditto
+	  [ruby-core:60377]
+
+Fri Jan 31 03:48:40 2014  Eric Wong <e@80x24.org>
+
+	* benchmark/driver: avoid large alloc in driver process
+	  [ruby-core:59869] [Bug #9430]
+
+Thu Jan 30 14:45:49 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
+	  supported by GNU make.
+
+Thu Jan 30 08:26:21 2014  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
+	  [ruby-core:57599] [Bug #8978].
+
+Wed Jan 29 20:08:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (nogvl_copy_stream_sendfile): check socket on other than
+	  linux, as sendfile(2) on non-socket fd works only on linux.
+	  [Feature #9427]
+
+Wed Jan 29 18:09:48 2014  Eric Wong <e@80x24.org>
+
+	* io.c (nogvl_copy_stream_sendfile): remove socket check
+	  [ruby-core:59856][Feature #9427]
+
+Wed Jan 29 04:29:54 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/openssl/ossl_ssl.c: pass read_nonblock options to underlying IO
+	  when SSL session has not been started.
+
+	* test/openssl/test_ssl.rb: test for change.
+
+Wed Jan 29 03:49:36 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
+	  [ruby-core:57599] [Bug #8978].  Thanks mame!
+
+Wed Jan 29 03:36:42 2014  Eric Wong <e@80x24.org>
+
+	* doc/contributing.rdoc: allow/encourage other git hosts
+	  [ruby-core:59807][misc #9421]
+
+Tue Jan 28 23:36:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Avoid redundant fcntl/fstat syscalls for cloexec
+	  sockets.
+	  Patch by Eric Wong.  [ruby-core:59429] [Feature #9330]
+
+Tue Jan 28 20:51:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (READ_FROM_CHILD): Apply the last hunk of
+	  0001-process.c-avoid-EINTR-from-Process.spawn.patch written by
+	  Eric Wong in [Bug #8770].
+
+Tue Jan 28 16:31:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p):
+	  place get_stack above others to get stack boundary information.
+	  [ruby-core:60113] [Bug #9454]
+
+Tue Jan 28 15:27:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c: rlimit is only available on Linux.
+	  At least r44712 breaks FreeBSD.
+	  [ruby-core:60113] [Bug #9454]
+
+Tue Jan 28 15:17:59 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/set.rb: [DOC] Add examples for Set#intersect? and Set#disjoint?
+	  Patch by xavier nayrac [Bug #9331] [ci skip]
+
+Tue Jan 28 15:12:22 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/zlib/zlib.c (rb_zlib_adler32): [DOC] Add example for adler32
+	  Patch by Vajrasky Kok [Bug #9307] [ci skip]
+
+Tue Jan 28 08:56:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block
+	  as hash key when loading serialized instruction sequences from arrays.
+	  [Bug #9455] [ruby-core:60146]
+
+Mon Jan 27 21:52:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c: get current main thread stack size, which may
+	  be expanded than allocated size at initialization, by rlimit().
+	  [ruby-core:60113] [Bug #9454]
+
+Sat Jan 25 22:17:02 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* README.ja.md, README.md: update the controller address of
+	  mailing lists.
+
+Sat Jan 25 14:50:42 2014  Eric Wong  <normalperson@yhbt.net>
+
+	* process.c (send_child_error): retry write on EINTR to fix
+	  occasional Errno::EINTR from Process.spawn.
+
+	* process.c (recv_child_error): retry read on EINTR to fix
+	  occasional Errno::EINTR from Process.spawn.
+
+Sat Jan 25 14:21:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): result of assignment should be
+	  its rhs instead of returned value from a method.
+	  [ruby-core:60071] [Bug #9448]
+
+Sat Jan 25 11:16:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_extract_keywords): treat nil keyword_hash same as 0,
+	  for the case rb_scan_args returns nil if no keyword hash.
+
+Fri Jan 24 15:13:20 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/racc/rdoc/grammar.en.rdoc: [DOC] Correct grammar and typos
+	  Patch by Giorgos Tsiftsis [Bug #9429] [ci skip]
+
+Thu Jan 23 20:20:17 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/envutil.rb: try to wait a bit (0.1sec) when ruby process
+	  exits by signals because some SEGV tests fail because of not enough
+	  error output.
+
+Thu Jan 23 20:06:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: check the target thread.
+
+Thu Jan 23 19:59:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: check the target thread.
+
+Thu Jan 23 14:26:44 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/fileutils.rb: [DOC] Fix typo in options_of() example [Bug #9392]
+	  Patch by Giorgos Tsiftsis
+
+Thu Jan 23 13:56:16 2014  Zachary Scott  <e@zzak.io>
+
+	* README -> README.md: [DOC] Format README with Markdown [Bug #9255]
+	* README.ja -> README.ja.md: ditto
+
+Wed Jan 22 15:59:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/thread/thread.c (Init_thread): ConditionVariable and Queue
+	  are not able to copy.  [ruby-core:59961] [Bug #9440]
+
+Tue Jan 21 20:14:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): fix for platforms
+	  where PTHREAD_STACK_MIN is a dynamic value and not a compile-time
+	  constant.  [ruby-dev:47911] [Bug #9436]
+
+Tue Jan 21 17:55:09 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] Use static w3.org uri [ci skip]
+	  Patch by @ykzts [Fix GH-484] https://github.com/ruby/ruby/pull/484
+
+Tue Jan 21 16:43:22 2014  Zachary Scott  <e@zzak.io>
+
+	* enum.c: [DOC] Add simple example of Enumerable#zip [ci skip]
+	  Patch by @nruth on documenting-ruby/ruby#22
+	  https://github.com/documenting-ruby/ruby/pull/22
+
+Tue Jan 21 16:26:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (rb_thread_create_timer_thread): expand timer
+	  thread stack size to get rid of segfault on FreeBSD/powerpc64.
+	  based on the patch by Steve Wills at [ruby-core:59923].
+	  [ruby-core:56590] [Bug #8783]
+
+Tue Jan 21 04:31:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: Use "int" for IP_MULTICAST_LOOP and
+	  IP_MULTICAST_TTL on Mac OS X and Windows.
+
+Tue Jan 21 00:39:15 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: Use "byte" as default argument for
+	  IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket option to follow
+	  the original multicast implementation.
+
+Mon Jan 20 20:20:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: Use preprocessor macros to avoid repeated
+	  conditionals.
+
+Mon Jan 20 13:55:03 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/rubygems/version.rb: [DOC] Use gender-neutral pronouns [ci skip]
+	* lib/rubygems/security.rb: ditto
+
+Sun Jan 19 06:38:48 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* compar.c (cmp_equal): warn for this release and still rescue
+	  standard exceptions for a nicer transition. See #7688.
+	  Partly reverts r44502.
+
+	* test/ruby/test_comparable.rb: adapt assertion to match new behavior.
+
+Sun Jan 19 06:27:18 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* test/ruby/test_comparable.rb: specify behavior for the different
+	  kind of exceptions rescued (or not) by Comparable#==.
+
+Sat Jan 18 23:12:19 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Avoid unnecessary ppoll/select on Linux.
+	  Patch by Eric Wong.  [ruby-core:57950] [Bug #9039]
+
+Sat Jan 18 22:57:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
+	  string.
+	  Patch by Ryan Brunner.  [ruby-core:58220] [Bug #9093]
+
+Sat Jan 18 22:35:15 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_update_max_fd): Return immediately if the given fd is small
+	  enough.
+
+Sat Jan 18 22:25:53 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c: Test O_CLOEXEC only once.
+	  Patch by Eric Wong.  [ruby-core:59419] [Feature #9328]
+
+Sat Jan 18 21:24:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket
+	  option takes a byte on OpenBSD.
+	  Fixed by Jeremy Evans.  [ruby-core:59496] [Bug #9350]
+
+Sat Jan 18 21:19:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb: Make proxy disabling working again.
+	  Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]
+
+Fri Jan 17 20:05:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator): keep source information methods
+	  which start and end with '__'.  [ruby-core:59718] [Bug #9403]
+
+Fri Jan 17 17:58:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_mod_s_constants): return its own constants for other
+	  than Module itself.  [ruby-core:59763] [Bug #9413]
+
+Tue Jan 16 00:17:00 2014  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.5.
+
+Wed Jan 15 20:30:31 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (io_binwrite): use writev(2) to avoid double write if available.
+
+	* configure.in: check writev(2)
+
+Wed Jan 15 14:04:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (get_encoding): respect BOM on pseudo encodings.
+	  [ruby-dev:47895] [Bug #9415]
+
+Wed Jan 15 14:03:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (get_actual_encoding): get actual encoding according to
+	  the BOM if exists.
+
+	* string.c (rb_str_inspect): use according encoding, instead of
+	  pseudo encodings, UTF-{16,32}.  [ruby-core:59757] [Bug #8940]
+
+Tue Jan 14 21:07:22 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS
+	  on SizedQueue#clear. [ruby-core:59462] [Bug #9342]
+
+	* test/thread/test_queue.rb: add test. the patch is from
+	  Justin Collins.
+
+Tue Jan 14 15:58:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap
+	  depending on PRIsVALUE for 1.9.  [Backport #9406]
+
+	* ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback
+	  definition for 2.1 or older.  [ruby-core:59750] [Backport #9406]
+
+Tue Jan 14 11:28:44 2014  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* vm_exec.c (cfp): Fixes a SEGV issue in r44554.
+	  r11 can be broken by subroutine and sometimes causes SEGV at
+	  runtime.  Use r13 instead.
+
+Tue Jan 14 02:20:00 2014  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional
+	  digit for the quotient to be compatible with bigdecimal 1.2.1 and
+	  the former.  [ruby-core:59365] [#9316] [#9305]
+
+	* test/bigdecimal/test_bigdecimal.rb: tests for the above change.
+
+	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.4.
+
+Mon Jan 13 14:55:31 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
+	  Since RAA has been deprecated, and the SSL package has been replaced
+	  with net/https this statement is entirely false and should be
+	  deleted. [Bug #9152]
+
+Mon Jan 13 14:47:07 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
+	  Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394]
+	* lib/open-uri.rb: ditto
+
+Mon Jan 13 14:25:55 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
+
+Mon Jan 13 12:03:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS
+	  instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong.
+	  [Bug #9302] [ruby-core:59324]
+
+	* test/thread/test_queue.rb: add test
+
+Sun Jan 12 16:41:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (iseq_load): keep type_map to get rid of memory leak.
+	  based on a patch by Eric Wong at [ruby-core:59699].  [Bug #9399]
+
+Sun Jan 12 09:21:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/util.h (DECIMAL_SIZE_OF_BITS): a preprocessor
+	  constant macro to approximate decimal representation size of n-bits
+	  integer.
+
+	* iseq.c (register_label): use DECIMAL_SIZE_OF_BITS for better
+	  approximation.
+
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto.
+
+	* common.mk (iseq.o), ext/bigdecimal/depend (bigdecimal.o): add
+	  dependency to ruby/util.h for DECIMAL_SIZE_OF_BITS.
+
+Fri Jan 10 16:27:20 2014  Yuki Yugui Sonoda  <yugui@google.com>
+
+	* vm_exec.c (cfp): Avoid generating invalid binary for
+	  NativeClient.
+	  r15 on x86_64 is reserved by NativeClient.  So r15 to cfp used to
+	  generate invalid binary under some combinations of compiler
+	  optimization flags.
+
+Fri Jan 10 18:01:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_super_method): allow bound method from a
+	  module, yet another method transplanting.
+
+Fri Jan 10 13:34:04 2014  Aman Gupta <ruby@tmm1.net>
+
+	* insns.def (opt_aref_with): new instruction to optimize Hash#[],
+	  removing any allocation overhead when used with a string literal
+	  key. Patch by normalperson (Eric Wong). [ruby-core:59640] [Bug #9382]
+	* insns.def (opt_aset_with): new instruction to optimize Hash#[]=
+	* compile.c (iseq_compile_each): compiler shortcuts for new
+	  instructions
+	* hash.c (static VALUE rb_hash_compare_by_id_p): fix documentation for
+	  Hash#compare_by_identity to reflect frozen string sharing
+	* test/ruby/test_hash.rb (class TestHash): test for new behavior
+
+Fri Jan 10 06:23:21 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* range.c (Range#size): [DOC] improve description and add examples.
+	  Patch by @skade. [Fixes GH-501]
+
+Fri Jan 10 00:47:52 2014  Josef Stribny  <strzibny@gmail.com>
+
+	* ext/tk/extconf.rb: fix to pass arrays instead of strings to
+	  libpathflag.  patch at [ruby-core:59665].  [Bug #9386]
+
+Thu Jan  9 20:49:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: -mstackrealign is necessary for -msse2 working.
+	  [ruby-core:54716] [Bug #8349]
+
+	* configure.in: use SSE2 instructions to drop unexpected precisions on
+	  other than mingw.  [ruby-core:59472] [Bug #8358]
+
+Thu Jan  9 20:31:10 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (rb_objid_hash): should return `long'.  brushup r44534.
+
+	* object.c (rb_obj_hash): follow above change.
+
+Thu Jan  9 19:12:37 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_pop_cfunc_frame): added.  It cares c_return event.
+	  The patch base by drkaes (Stefan Kaes).
+	  [Bug #9321]
+
+	* variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame()
+	  instead of rb_frame_pop().
+
+	* vm_eval.c (raise_method_missing): ditto.
+
+	* vm_eval.c (rb_iterate): ditto.
+
+	* internal.h (rb_vm_pop_cfunc_frame): add decl.
+
+	* test/ruby/test_settracefunc.rb: add tests.
+	  provided by drkaes (Stefan Kaes).
+
+	* vm.c, eval.c, include/ruby/intern.h (rb_frame_pop):
+	  move definition of rb_frame_pop() and deprecate it.
+	  It doesn't care about `return' events.
+
+Thu Jan  9 17:40:28 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* hash.c (rb_any_hash): should treat the return value of rb_objid_hash()
+	  as `long', because ruby assumes the hash value of the object id of
+	  an object is `long'.
+	  this fixes test failures on mswin64 introduced at r44525.
+
+Thu Jan  9 09:55:20 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
+	  quotes should not have changed.  [ruby-core:59316] [Bug #9300]
+
+	* ext/psych/lib/psych.rb: fixed missing require.
+
+	* test/psych/test_string.rb: test
+
+Thu Jan  9 09:51:00 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: anonymous structs
+	  should be able to roundtrip.  Thanks @splattael!
+
+	* test/psych/test_object_references.rb: test for change
+
+Wed Jan  8 22:53:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_search_super_method): when super called in a
+	  bound UnboundMethod generated from a module, no superclass is
+	  found since the current defined class is the module, then call
+	  method_missing in that case.  [ruby-core:59619] [Bug #9377]
+
+Wed Jan  8 15:55:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_objid_hash): return hash value from object ID with a
+	  salt, extract from rb_any_hash().
+
+	* object.c (rb_obj_hash): return same value as rb_any_hash().
+	  fix r44125.  [ruby-core:59638] [Bug #9381]
+
+Wed Jan  8 13:12:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout::ExitException.catch): pass arguments
+	  for new instance.
+
+	* lib/timeout.rb (Timeout::ExitException#exception): fallback to
+	  Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]
+
+	* lib/timeout.rb (Timeout#timeout): initialize ExitException with
+	  message for the fallback case.
+
+Tue Jan  7 12:43:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
+	  raised ExitException, which should not be thrown.
+
+	* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
+	  it ought to be caught.
+
+	* lib/timeout.rb (Timeout#timeout): when a custom exception is given,
+	  no instance is needed to be caught, so defer creating new instance
+	  until it is raised.  [ruby-core:59511] [Bug #9354]
+
+Tue Jan  7 10:16:02 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems master 21e409d / RubyGems 2.2.1.
+
+	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html
+	  for a list of bug fixes.
+
+	* test/rubygems:  ditto.
+
+Tue Jan  7 10:10:46 2014  Eric Wong <e@80x24.org>
+
+	* ext/json/generator/depend: add build dependencies for json extension
+	  [Bug #9374] [ruby-core:59609]
+	* ext/json/parser/depend: ditto
+
+Tue Jan  7 04:35:46 2014  Aman Gupta <ruby@tmm1.net>
+
+	* array.c (ary_add_hash): Fix consistency issue between Array#uniq and
+	  Array#uniq! [Bug #9340] [ruby-core:59457]
+	* test/ruby/test_array.rb (class TestArray): regression test for above.
+
+Mon Jan  6 21:28:48 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* .gitignore: ignore *-fake.rb generated even when CROSS_COMPILING = no
+	  since r42862.
+
+Sun Jan  5 20:14:14 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* compar.c (cmp_equal): remove error hiding in Comparable#==.
+	  Comparable#== no longer rescues exceptions silently.
+	  This was the cause of quite a couple bugs. See #7688. [EXPERIMENTAL]
+
+	* test/ruby/test_comparable.rb: adapt assertion to match new behavior.
+
+	* lib/rdoc/method_attr.rb: fix bugs discovered by this change.
+
+	* test/rdoc/test_rdoc_normal_class.rb: fix bugs in tests.
+
+Sat Jan  4 22:44:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* struct.c (rb_struct_set): return assigned value from setter method
+	  rather than struct object. [Bug #9353] [ruby-core:59509]
+
+	* test/ruby/test_struct.rb (test_setter_method_returns_value): add test
+
+Sat Jan  4 21:44:31 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/ruby/test_gc.rb (TestGc#test_latest_gc_info): use
+	  GC.stat(:key) instead of GC.stat.
+
+Sat Jan  4 19:15:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (rsock_syserr_fail_host_port): use format flags,
+	  '+' to inspect, ' ' to quote unprintables.
+
+	* ext/socket/socket.c (rsock_syserr_fail_path): ditto.
+
+	* ext/socket/socket.c (rsock_syserr_fail_raddrinfo): ditto.
+
+	* ext/socket/socket.c (rsock_syserr_fail_host_port): add errno
+	  argument version and use rb_syserr_fail_str() instead of
+	  rb_sys_fail_str() with restoring errno.
+
+	* ext/socket/socket.c (rsock_syserr_fail_path): ditto, and
+	  rb_syserr_fail().
+
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto, use
+	  rsock_syserr_fail_raddrinfo().
+
+	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto.
+
+	* ext/socket/socket.c (setup_domain_and_type): ditto.
+
+Sat Jan  4 17:18:58 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm.c (RubyVM::OPTS): get rid of a garbage character.
+
+Sat Jan  4 10:17:54 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
+	  ipv4_multicast_ttl option for portability.
+
+Sat Jan  4 10:15:47 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
+	  ipv4_multicast_loop option for portability.  Patch by Jeremy Evans.
+	  [ruby-trunk - Bug #9351]
+
+Fri Jan  3 19:09:00 2014  Eric Wong  <normalperson@yhbt.net>
+
+	* ext/socket/socket.c (rsock_sys_fail_host_port): save and restore errno
+	  before calling rb_sys_fail_str to prevent [BUG] errno == 0.
+	  Patch by Eric Wong. [ruby-core:59498] [Bug #9352]
+
+	* ext/socket/socket.c (rsock_sys_fail_path): ditto
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto
+	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto
+	* ext/socket/socket.c (rsock_sys_fail_raddrinfo_or_sockaddr): ditto
+
+Fri Jan  3 10:43:57 2014  Aman Gupta <ruby@tmm1.net>
+
+	* test/net/imap/cacert.pem: generate new CA cert, since the last one
+	  expired. [Bug #9341] [ruby-core:59459]
+	* test/net/imap/server.crt: new server cert signed with updated CA.
+	* test/net/imap/Makefile: add `make regen_certs` to automate this
+	  process.
+
+Fri Jan  3 00:09:54 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/bigdecimal: update class method call style from :: to .
+	  in documentation and usage.
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb: [DOC] fix examples values.
+	  Computations were made using ruby 2.0.0p247 to ensure
+	  no effect of the recent BigDecimal bug.
+
+	* ext/bigdecimal/sample/nlsolve.rb: fix indent.
+
+Thu Jan  2 16:07:21 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (io_fwrite): freeze converted str.
+
+Thu Jan  2 04:15:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_longjmp): remove an extra modifier from the forward
+	  declaration to match the actual definition.  [ruby-core:59451]
+	  [Bug #9338]
+
+Thu Jan  2 01:23:30 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* vm_eval.c (method_missing): use ALLOCV_N() instead of
+	  ALLOCA_N() and rb_ary_tmp_new().
+
+Thu Jan  2 00:53:16 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* array.c (rb_ary_zip): use ALLOCV_N() instead of ALLOCA_N().
+
+Thu Jan  2 00:04:29 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_keys): make rb_hash_keys() static.
+	  it is no longer used from array.c since r43969.
+	  the patch is from normalperson (Eric Wong).
+	  [ruby-core:59449] [Feature #9336]
+
+	* internal.h: remove definition of rb_hash_keys().
+
+Wed Jan  1 18:19:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after
+	  LIBPATHFLAG and RPATHFLAG are set.  [ruby-dev:47868] [Bug #9317]
+
+Wed Jan  1 11:12:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: use SSE2 instructions for drop unexpected
+	  precisions.  [ruby-core:54738] [Bug #8358]
+
+Tue Dec 31 23:49:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_f_raise): add cause: optional keyword argument.
+	  [ruby-core:58610] [Feature #8257] [EXPERIMENTAL]
+
+Tue Dec 31 21:44:17 2013  Akio Tajima <artonx@yahoo.co.jp>
+
+	* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
+	  Fixed [Bug #9333].
+
+Tue Dec 31 21:02:27 2013  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* io.c (io_fwrite): allocate frozen str only when str is not converted.
+
+Tue Dec 31 15:44:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
+	  backward compatibility.  [ruby-core:59426] [Bug #9329]
+
+Mon Dec 30 23:33:07 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* variable.c: [DOC] adding extra example in docs.
+	  patched by Steve Klabnik. [Bug #9210]
+
+Mon Dec 30 18:34:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (must_encindex, rb_enc_from_index, rb_obj_encoding): mask
+	  encoding index and ignore dummy flags.  [ruby-core:59354] [Bug #9314]
+
+Mon Dec 30 16:11:52 2013  WATANABE Hirofumi  <eban@ruby-lang.org>
+
+	* tool/make-snapshot: needs CXXFLAGS.  [ruby-core:59393][Bug #9320]
+
+Sun Dec 29 18:36:54 2013  Shota Fukumori  <her@sorah.jp>
+
+	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
+	  Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
+
+Sun Dec 29 12:11:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
+	  chain consistent.  [ruby-core:59358] [Bug #9315]
+
+	* proc.c (method_owner): return the original defined_class from
+	  prepended iclass, instead.
+
+Sun Dec 29 08:47:24 2013  Lucas Allan Amorim  <lucas.allan@gmail.com>
+
+	* test/ruby/test_sprintf.rb (test_hash): Added tests for sprintf
+	  with a hash as parameter.  [Fixes GH-491]
+
+Sun Dec 29 07:27:51 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* compar.c (cmp_eq_recursive): Fix the return value, the value for
+	  failed #<=> should be nil. It was raising a NoMethodError for
+	  the test case TestComparable#test_no_cmp (undefined method `>'
+	  for false:FalseClass). Yet one more reason for #7688.
+
+Sat Dec 28 22:21:59 2013  Benoit Daloze  <eregontp@gmail.com>
+
+	* object.c (Kernel#<=>) surround Comparable operators with <code> tags.
+	  The #== method was hidden in ri/rdoc's output and was highlighting
+	  the line instead.
+
+Sat Dec 28 17:24:00 2013  DV Suresh  <e@dvsuresh.me>
+
+	* benchmark/bm_so_meteor_contest.rb: [DOC] Fix a few typos
+	* ext/fiddle/lib/fiddle/import.rb: ditto
+	* ext/psych/lib/psych.rb: ditto
+	* ext/psych/lib/psych/nodes/sequence.rb: ditto
+	* ext/tk/lib/multi-tk.rb: ditto
+	* ext/tk/lib/tcltk.rb: ditto
+
+Sat Dec 28 00:42:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
+	  isolate command argument state from outer scope.
+	  [ruby-core:59342] [Bug #9308]
+
+Fri Dec 27 13:25:03 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/{setup.mak,Makefile.sub}: update fake.rb like
+	  template/fake.rb.in.
+
+Thu Dec 26 16:10:41 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (fake.rb): should depend on version.h because
+	  if RUBY_VERSION is updated, fake.rb need to say the new version
+	  to avoid install error in rbconfig.rb.
+
+Thu Dec 26 14:25:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (HASH_REJECT_COPY_EXTRA_STATES): turn off the old
+	  behavior, copying extra states by accident.
+
+Thu Dec 26 10:49:14 2013  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* version.h (RUBY_VERSION): 2.2.0 development has started.
+
+Thu Dec 26 10:27:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0
+	  explicit tagging.
+
+Thu Dec 26 06:35:25 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c: Having any mandatory keyword argument increases min arity
+	  [#9299]
+
+Thu Dec 26 06:27:08 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* proc.c: Having optional keyword arguments makes maximum arity +1,
+	  not unlimited [#8072]
+
+Thu Dec 26 01:09:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/release.sh: make symbolic links.
+
+Thu Dec 26 00:45:33 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/make-snapshot: support new version scheme.
+
+Wed Dec 25 22:44:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments): set arg_keyword_check from
+	  nd_cflag, which is set by parser.  internal ID is used for
+	  unnamed keyword rest argument, which should be separated from no
+	  keyword check.
+
+	* iseq.c (rb_iseq_parameters): if no keyword check, keyword rest is
+	  present.
+
+	* parse.y (new_args_tail_gen): set keywords check to nd_cflag, which
+	  equals to that keyword rest is not present.
+
+Wed Dec 25 22:32:19 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/abbrev.rb: [DOC] rdoc format patch by Giorgos Tsiftsis [Bug #9146]
+
+Wed Dec 25 20:30:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_parameters): push argument type symbol only for
+	  unnamed rest keywords argument.
+
+Wed Dec 25 20:28:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_iseq_min_max_arity): maximum argument is unlimited if
+	  having rest keywords argument.  [ruby-core:53298] [Bug #8072]
+
+Wed Dec 25 18:29:22 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (argument_error): insert dummy frame to make
+	  a backtrace object intead of modify backtrace string array.
+	  [Bug #9295]
+
+	* test/ruby/test_backtrace.rb: add a test for this patch.
+	  fix test to compare a result of Exception#backtrace with
+	  a result of Exception#backtrace_locations.
+
+Wed Dec 25 13:00:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: let mingw do something black-magic, and check if
+	  _gmtime64_s() is available actually.
+
+	* win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and
+	  _localtime64_s() if available, not depending on very confusing
+	  mingw variants macros.  based on the patch by phasis68 (Heesob
+	  Park) at [ruby-core:58764].  [ruby-core:58391] [Bug #9119]
+
+Wed Dec 25 12:33:41 2013  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* sample/trick2013/: added the award-winning entries of TRICK 2013.
+	  See https://github.com/tric/trick2013 for the contest outline.
+	  (Matz has approved the attachment.)
+
+Wed Dec 25 10:42:02 2013  Yamashita Yuu  <yamashita@geishatokyo.com>
+
+	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
+	  `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
+	  `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
+	  snapshot of OpenSSL 1.0.1.  [Fixes GH-488]
+
+Wed Dec 25 01:03:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (bind_local_variables): allowing binding to list its
+	  local variables.  patch by Jack Danger Canty <jackdanger AT
+	  squareup.com> at [ruby-core:56543].  [Feature #8773]
+
+Tue Dec 24 23:20:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fileutils/fileasserts.rb (assert_ownership_user): new
+	  assertion for user ownership.
+
+	* test/fileutils/test_fileutils.rb (test_chown_error),
+	  (test_chown_without_permission, test_chown_with_root):
+	  based on the patch by vajrasky (Vajrasky Kok) at
+	  [ruby-core:59298].  [Feature #9292]
+
+Tue Dec 24 16:28:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_mod_define_method): consider visibility only if self
+	  in the caller is same as the receiver, otherwise make public as
+	  well as old behavior.  [ruby-core:57747] [Bug #9005]
+	  [ruby-core:58497] [Bug #9141]
+
+	* vm.c (rb_vm_cref_in_context): return ruby level cref if self is
+	  same.
+
+Tue Dec 24 14:13:14 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* README.EXT: add a refer to URL.
+
+Tue Dec 24 13:48:45 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* README.EXT: add a document about RGenGC.
+	  Reviewed by havenwood.
+	  [misc #8962]
+
+	* README.EXT.ja: ditto.
+
+Tue Dec 24 12:11:43 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h (RARRAY_ASET): try to avoid compiler warning.
+	  [Bug #9287]
+
+Tue Dec 24 05:04:56 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/fileutils/test_fileutils.rb (setup): should not call
+	  Process.groups for Windows.  get rid of many errors introduced by
+	  r44364.
+
+Mon Dec 23 18:37:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fileutils/fileasserts.rb (assert_ownership_group): new
+	  assertion for group ownership.
+
+	* test/fileutils/test_fileutils.rb (test_chown{,_verbose,_noop}):
+	  based on the patch by vajrasky (Vajrasky Kok) at
+	  [ruby-core:59281].  [Feature #9286]
+
+Mon Dec 23 15:53:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (HAS_EXTRA_STATES): warn extra states only when something
+	  differ.  [ruby-core:59254] [Bug #9275]
+
+Mon Dec 23 12:42:13 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* array.c: Have to_h raise on elements that are not key-value pairs
+	  [#9239]
+
+	* enum.c: ditto
+
+Mon Dec 23 05:01:55 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/methods.rdoc: [DOC] Added example for underscore
+	  conventions in method names. Also added doc to clarify encoding
+	  character set support for Ruby programs and elaborated on defining
+	  predicate and bang methods. Based on a patch by @gaurish
+	  [Fixes GH-477] https://github.com/ruby/ruby/pull/477
+
+Mon Dec 23 03:18:09 2013  Zachary Scott  <e@zzak.io>
+
+	* doc/ChangeLog-1.9.3: [DOC] Fix typos by @dvsuresh
+	  [Fixes GH-485] https://github.com/ruby/ruby/pull/485
+	* ext/openssl/ossl_config.c: ditto
+	* lib/rss/utils.rb, lib/time.rb: ditto
+	* test/ruby/envutil.rb: ditto
+
+Sun Dec 22 23:56:56 2013  Zachary Scott  <e@zzak.io>
+
+	* lib/{rake,rdoc,rss}/*, test/rexml/test_listener.rb: [DOC] Fix typos
+	  by @dvsuresh [Fixes GH-486] https://github.com/ruby/ruby/pull/486
+
+Sun Dec 22 11:08:47 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* test/rubygems/test_gem_ext_builder.rb:  Fix warning due to ambiguous
+	  expression.
+
+Sun Dec 22 11:05:53 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/install_command.rb:  Restore gem install
+	  --ignore-dependencies for remote gems
+	* test/rubygems/test_gem_commands_install_command.rb:  Test for the
+	  above.
+
+Sun Dec 22 10:23:40 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc.rb:  Set RDoc to release version.
+
+Sun Dec 22 10:19:07 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  Set RubyGems to release version.
+
+Sun Dec 22 10:16:08 2013  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb (module Gem):  Fix comment for
+	  Gem::load_path_insert_index.
+
+Sun Dec 22 04:07:55 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (ruby_gc_set_params): don't show obsolete warnings for
+	  RUBY_FREE_MIN/RUBY_HEAP_MIN_SLOTS if
+	  RUBY_GC_HEAP_FREE_SLOTS/RUBY_GC_HEAP_INIT_SLOTS are given.
+	  [Bug #9276]
+
+Sat Dec 21 13:00:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c: remove unnecessary the source path from EEXIST error
+	  messages and show the destination path only.  [ruby-core:59202]
+	  [Feature #9263]
+
+Sat Dec 21 12:37:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
+	  consider encodings in hosts file.  [ruby-core:59239] [Bug #9273]
+
+	* lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.
+
+Sat Dec 21 05:43:27 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/make-snapshot: replace RUBY_PATCHLEVEL_STR in version.h to
+	  show users that this ruby is a preview/rc version.
+
+Sat Dec 21 05:03:49 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly
+	  install win32.h.
+	  [ruby-core:58801][Bug #9199] reported by arton.
+
+For the changes before 2.1.0, see doc/ChangeLog-2.1.0
+For the changes before 2.0.0, see doc/ChangeLog-2.0.0
+For the changes before 1.9.3, see doc/ChangeLog-1.9.3
+For the changes before 1.8.0, see doc/ChangeLog-1.8.0
+
+Local variables:
+coding: us-ascii
+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))))
+  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
+indent-tabs-mode: t
+tab-width: 8
+change-log-indent-text: 2
+end:
+vim: tabstop=8 shiftwidth=2
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
index 35a8e75876..b97a08d928 100644
--- a/KNOWNBUGS.rb
+++ b/KNOWNBUGS.rb
@@ -1,7 +1,5 @@
 #
-# IMPORTANT: Always keep the first 7 lines (comments),
-# even if this file is otherwise empty.
-#
-# This test file includes tests which point out known bugs.
+# This test file concludes tests which point out known bugs.
 # So all tests will cause failure.
 #
+
diff --git a/LEGAL b/LEGAL
index 8080cfef61..24e36e6231 100644
--- a/LEGAL
+++ b/LEGAL
@@ -12,7 +12,7 @@ ccan/str/str.h
 
   These files are licensed under the CC0.
 
-    https://creativecommons.org/choose/zero/
+    http://creativecommons.org/choose/zero/
 
 ccan/list/list.h
 
@@ -90,74 +90,6 @@ 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.
 
-enc/trans/GB/GB12345%UCS.src:
-enc/trans/GB/UCS%GB12345.src:
-
-    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.
-
-
-enc/trans/GB/GB2312%UCS.src:
-enc/trans/GB/UCS%GB2312.src:
-
-    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.
-
-enc/trans/JIS/JISX0201-KANA%UCS.src:
-enc/trans/JIS/JISX0208@1990%UCS.src:
-enc/trans/JIS/JISX0212%UCS.src:
-enc/trans/JIS/UCS%JISX0201-KANA.src:
-enc/trans/JIS/UCS%JISX0208@1990.src:
-enc/trans/JIS/UCS%JISX0212.src:
-
-    © 2015 Unicode®, Inc.
-    For terms of use, see http://www.unicode.org/terms_of_use.html
-
-enc/trans/JIS/JISX0213-1%UCS@BMP.src:
-enc/trans/JIS/JISX0213-1%UCS@SIP.src:
-enc/trans/JIS/JISX0213-2%UCS@BMP.src:
-enc/trans/JIS/JISX0213-2%UCS@SIP.src:
-
- 	Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
- 	Copyright (C) 2001 I'O, All Rights Reserved.
- 	Copyright (C) 2006 Project X0213, All Rights Reserved.
- 	You can use, modify, distribute this table freely.
-
-enc/trans/JIS/UCS@BMP%JISX0213-1.src:
-enc/trans/JIS/UCS@BMP%JISX0213-2.src:
-enc/trans/JIS/UCS@SIP%JISX0213-1.src:
-enc/trans/JIS/UCS@SIP%JISX0213-2.src:
-
- 	Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
- 	Copyright (C) 2001 I'O, All Rights Reserved.
- 	You can use, modify, distribute this table freely.
-
 configure:
 
   This file is free software.
@@ -332,33 +264,31 @@ random.c
 
 vm_dump.c:procstat_vm
 
-  This file is under the new-style BSD license.
-
-    Copyright (c) 2007 Robert N. M. Watson
-    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.
-
-    $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $
+ * Copyright (c) 2007 Robert N. M. Watson
+ * 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.
+ *
+ * $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $
 
 vsnprintf.c:
 
@@ -400,10 +330,7 @@ vsnprintf.c:
     From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     paragraph 3 above is now null and void.
 
-st.c:
-strftime.c:
-include/ruby/st.h:
-missing/acosh.c:
+st.[ch]:
 missing/alloca.c:
 missing/dup2.c:
 missing/erf.c:
@@ -415,14 +342,10 @@ missing/lgamma_r.c:
 missing/memcmp.c:
 missing/memmove.c:
 missing/strchr.c:
-missing/strerror.c:
 missing/strstr.c:
 missing/strtol.c:
 missing/tgamma.c:
-ext/date/date_strftime.c:
 ext/digest/sha1/sha1.[ch]:
-ext/sdbm/_sdbm.c:
-ext/sdbm/sdbm.h:
 
   These files are all under public domain.
 
@@ -498,21 +421,32 @@ missing/setproctitle.c
 missing/strlcat.c
 missing/strlcpy.c
 
-  These files are under an ISC-style license.
-
-    Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
+  These files are under the new-style BSD license.
 
-    Permission to use, copy, modify, and distribute this software for any
-    purpose with or without fee is hereby granted, provided that the above
-    copyright notice and this permission notice appear in all copies.
+   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+   All rights reserved.
 
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+   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
 
@@ -593,28 +527,6 @@ ext/digest/sha2/sha2.[ch]:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-ext/json/generator/generator.c:
-
-    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.
-
 ext/nkf/nkf-utf8/config.h:
 ext/nkf/nkf-utf8/nkf.c:
 ext/nkf/nkf-utf8/utf8tbl.c:
@@ -678,9 +590,3 @@ ext/win32ole/win32ole.c:
     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 Perl distribution.
-
-lib/rdoc/generator/template/darkfish/css/fonts.css:
-
-  This file is licensed under the SIL Open Font License.
-
-    http://scripts.sil.org/OFL
diff --git a/Makefile.in b/Makefile.in
index 52618232b0..39fe0bb37f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 NULLCMD = @NULLCMD@
 n=$(NULLCMD)
-ECHO1 = $(V:1=$n)
+ECHO1 = $(V:1=@$n)
 RUNCMD = $(SHELL)
 CDPATH = .
 CHDIR = @CHDIR@
@@ -22,12 +22,9 @@ LD = @LD@
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
-ACLOCAL = aclocal
-CONFIGURE = @CONFIGURE@
 @SET_MAKE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
-HAVE_BASERUBY = @HAVE_BASERUBY@
 TEST_RUNNABLE = @TEST_RUNNABLE@
 CROSS_COMPILING = @CROSS_COMPILING@
 DOXYGEN = @DOXYGEN@
@@ -53,7 +50,7 @@ DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
 
 EXTOUT = @EXTOUT@
 arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
+VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
 
 empty =
 CC_VERSION = @CC_VERSION@
@@ -67,6 +64,7 @@ optflags = @optflags@
 debugflags = @debugflags@
 warnflags = @warnflags@ @strict_warnflags@
 cppflags = @cppflags@
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
 XCFLAGS = @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
@@ -114,14 +112,12 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 XRUBY_LIBDIR = @XRUBY_LIBDIR@
 XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
-BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 
 #### End of system configuration section. ####
 
 MAJOR=	@MAJOR@
 MINOR=	@MINOR@
 TEENY=	@TEENY@
-RUBY_PROGRAM_VERSION = @RUBY_PROGRAM_VERSION@
 
 LIBRUBY_A     = @LIBRUBY_A@
 LIBRUBY_SO    = @LIBRUBY_SO@
@@ -133,19 +129,6 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
 LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
 
-DTRACE_REBUILD_OBJS = $(DTRACE_REBUILD:yes=$(DTRACE_DEPENDENT_OBJS))
-
-DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
-			eval.$(OBJEXT) \
-			gc.$(OBJEXT) \
-			hash.$(OBJEXT) \
-			load.$(OBJEXT) \
-			object.$(OBJEXT) \
-			parse.$(OBJEXT) \
-			string.$(OBJEXT) \
-			symbol.$(OBJEXT) \
-			vm.$(OBJEXT)
-
 THREAD_MODEL  = @THREAD_MODEL@
 
 PREP          = @PREP@
@@ -164,7 +147,7 @@ RMDIRS        = @RMDIRS@
 RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
-ARFLAGS       = @ARFLAGS@
+ARFLAGS       = rcu
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
@@ -174,11 +157,10 @@ OBJDUMP       = @OBJDUMP@
 OBJCOPY       = @OBJCOPY@
 VCS           = @VCS@
 VCSUP         = @VCSUP@
-DTRACE        = @DTRACE@ @DTRACE_OPT@
+DTRACE        = @DTRACE@
 DTRACE_EXT    = @DTRACE_EXT@
-DTRACE_OBJ    = @DTRACE_OBJ@
-DTRACE_REBUILD= @DTRACE_REBUILD@
-DTRACE_GLOMMED_OBJ = $(DTRACE_REBUILD:yes=ruby-glommed.$(OBJEXT))
+DTRACE_OBJ   = @DTRACE_OBJ@
+DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
@@ -188,9 +170,8 @@ SYMBOL_PREFIX = @SYMBOL_PREFIX@
 
 INSTALLED_LIST= .installed.list
 
-NEWLINE_C     = enc/trans/newline.c
+NEWLINE_C     = newline.c
 MINIPRELUDE_C = miniprelude.c
-PRELUDE_C     = prelude.c
 RBCONFIG      = .rbconfig.time
 
 SRC_FILE      = $<
@@ -218,7 +199,7 @@ all:
 miniruby$(EXEEXT):
 		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(DTRACE_OBJ) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
@@ -232,7 +213,7 @@ $(PROGRAM):
 $(LIBRUBY_A):
 		@$(RM) $@
 		$(ECHO) linking static-library $@
-		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS)
+		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(DMYEXT)
 		@-$(RANLIB) $@ 2> /dev/null || true
 		$(ECHO) verifying static-library $@
 		@$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT)
@@ -241,28 +222,20 @@ $(LIBRUBY_A):
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(ECHO) linking shared-library $@
-		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
-		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \
-			-L '$(SYMBOL_PREFIX)*_threadptr_*' $@
+		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(DTRACE_OBJ) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
+		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
 		$(Q) $(POSTLINK)
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
+$(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in
+		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
+		@chmod +x $@
 
 ruby_pc = @ruby_pc@
 $(ruby_pc):
 		@./config.status --file=$@:$(srcdir)/template/ruby.pc.in
 
-ruby-runner.h: template/ruby-runner.h.in
-		@./config.status --file=$@:$(srcdir)/template/$(@F).in
-
-ruby-runner$(EXEEXT): ruby-runner.c ruby-runner.h
-	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $<
-
-$(RBCONFIG): $(PREP)
-
-rbconfig.rb: $(RBCONFIG)
-
 install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
 	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
 	$(ECHO) installing cross-compiling stuff
@@ -298,23 +271,18 @@ uncommon.mk: $(srcdir)/common.mk
 		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
 
 .PHONY: reconfig
-reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args)
+reconfig-args = $(srcdir)/configure $(configure_args)
 config.status-args = ./config.status --recheck
-reconfig-exec-0 = test -t 1 && { CONFIGURE_TTY=yes; export CONFIGURE_TTY; }; exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3 3>&- 4>&-`
+reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
 reconfig-exec-1 = set -x; "$$@"
 
-reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
+reconfig config.status:	$(srcdir)/configure $(srcdir)/enc/Makefile.in \
 			$(srcdir)/include/ruby/version.h
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
-
-$(srcdir)/aclocal.m4:
-	$(CHDIR) $(srcdir) && \
-	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
-	touch $(@F)
+$(srcdir)/configure: $(srcdir)/configure.in
+	$(CHDIR) $(srcdir) && exec $(AUTOCONF)
 
 incs: id.h
 all-incs: probes.h
@@ -333,14 +301,31 @@ lex.c: defs/keywords
 	  $(CP) $(srcdir)/lex.c.blt $@; \
 	else \
 	  [ $(Q) ] && echo generating $@ || set -x; \
-	  gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
-	  | sed 's/(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
-	  > $@.tmp && \
+	  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 && \
+	  sed '/^#ifdef USE_UNICODE_PROPERTIES/d;/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-2.h && \
+	  diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
+	  $(MV) $@.tmp $@ && \
+	  $(CP) $? $(?:.kwd=.src) && \
+	  $(CP) $@ $(?:.kwd=.h.blt); \
+	fi
+
 JIS_PROPS_OPTIONS = -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property
 
 enc/jis/props.h: enc/jis/props.kwd
@@ -376,31 +361,32 @@ enc/jis/props.h: enc/jis/props.kwd
 .d.h:
 	@$(ECHO) translating probes $<
 	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
-	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/RUBY_PROBES_H/' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
+	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
 	$(Q) $(RM) $@.tmp
 
 .dmyh.h:
-	@$(ECHO) making dummy $(DEST_FILE)
-	$(Q)echo '#include "$(*F).dmyh"' > $@
-
-probes.stamp: $(DTRACE_REBUILD_OBJS)
-	$(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
-	  $(RM) $(DTRACE_REBUILD_OBJS) $@; \
-	  $(ECHO0) "rebuilding objects which were modified by \"dtrace -G\""; \
-	  $(MAKE) $(DTRACE_REBUILD_OBJS); \
-	fi
-	$(Q) touch $@
+	@$(ECHO) copying dummy $(DEST_FILE)
+	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
 
-probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
+probes.@OBJEXT@: $(srcdir)/probes.d
 	@$(ECHO) processing probes in object files
-	$(Q) $(RM) $@
-	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
+	$(Q) stamp="$*.stamp"; \
+	  if test -f "$$stamp" -o -f "$@"; then \
+	  $(RM) $(DTRACE_DEPENDENT_OBJS) "$$stamp"; \
+	  for o in $(DTRACE_DEPENDENT_OBJS); do \
+	    echo "rebuilding $$o which was modified by \"dtrace -G\""; \
+	    $(MAKE) "$$o"; \
+	  done; \
+	fi; \
+	touch "$$stamp"
+	$(RM) $@
+	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_OBJS)
 
 # DTrace static library hacks described here:
 # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
 ruby-glommed.$(OBJEXT):
 	@$(ECHO) generating a glommed object with DTrace probes for static library
-	$(Q) $(LD) -r -o $@ $(OBJS)
+	$(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ)
 
 clean-local::
 	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
@@ -417,7 +403,7 @@ clean-ext distclean-ext realclean-ext::
 	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
 	set dummy `\
-	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$::' | sort; \
+	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
 	`; shift; \
 	cd ..; \
 	for dir do \
@@ -439,7 +425,7 @@ clean-extout:
 clean-enc distclean-enc realclean-enc:
 	@test -f "$(ENC_MK)" || exit 0; \
 	echo $(@:-enc=ing) encodings; \
-	exec $(MAKE) $(MAKE_ENC) $(@:-enc=)
+	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(ECHO) compiling $@
@@ -447,87 +433,50 @@ ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 
 enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
 
-update-src::
+up::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
 
-update-download:: update-config_files
+up::
+	-$(Q)$(MAKE) $(MFLAGS) after-update
 
-after-update:: common-srcs
+after-update:: update-config_files
 
 update-mspec:
 	@$(CHDIR) $(srcdir); \
 	if [ -d spec/mspec ]; then \
+	  cd spec/mspec; \
 	  echo updating mspec ...; \
-	  $(Q1:0=:) set -x; \
-	  cd spec/mspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving mspec ...; \
-	  $(Q1:0=:) set -x; \
 	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
 	fi
-	$(Q)cd $(srcdir)/spec/mspec && exec git --no-pager log -1 --oneline
 
 update-rubyspec: update-mspec
 	@$(CHDIR) $(srcdir); \
 	if [ -d spec/rubyspec ]; then \
+	  cd spec/rubyspec; \
 	  echo updating rubyspec ...; \
-	  $(Q1:0=:) set -x; \
-	  cd spec/rubyspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving rubyspec ...; \
-	  $(Q1:0=:) set -x; \
 	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
 	fi
-	$(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
 
 test-rubyspec-precheck:
 	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
 
-update-doclie:
-	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/doclie ]; then \
-	  echo updating doclie ...; \
-	  $(Q1:0=:) set -x; \
-	  cd coverage/doclie && \
-	  git fetch && \
-	  exec git checkout $(DOCLIE_GIT_REF); \
-	else \
-	  echo retrieving doclie ...; \
-	  $(Q1:0=:) set -x; \
-	  exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \
-	fi
-
-update-simplecov-html:
-	@$(CHDIR) $(srcdir); \
-	if [ -d coverage/simplecov-html ]; then \
-	  echo updating simplecov-html ...; \
-	  $(Q1:0=:) set -x; \
-	  cd coverage/simplecov-html && \
-	  git fetch && \
-	  exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
-	else \
-	  echo retrieving simplecov-html ...; \
-	  exec git clone --branch $(SIMPLECOV_HTML_GIT_REF) $(SIMPLECOV_HTML_GIT_URL) coverage/simplecov-html; \
-	fi
-
-update-simplecov:
+update-coverage:
 	@$(CHDIR) $(srcdir); \
 	if [ -d coverage/simplecov ]; then \
+	  cd coverage/simplecov; \
 	  echo updating simplecov ...; \
-	  $(Q1:0=:) set -x; \
-	  cd coverage/simplecov && \
-	  git fetch && \
-	  exec git checkout $(SIMPLECOV_GIT_REF); \
+	  exec git pull; \
 	else \
 	  echo retrieving simplecov ...; \
-	  $(Q1:0=:) set -x; \
-	  exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \
+	  exec git clone $(SIMPLECOV_GIT_URL) coverage/simplecov; \
 	fi
 
-update-coverage: update-simplecov update-simplecov-html update-doclie
-
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
 
@@ -537,13 +486,7 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
 
-verconf.h: $(RBCONFIG)
-
 loadpath: verconf.h
 	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
 	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
 	    -e '/^ /!d;s/ *"\\0"$$//;s/" *"//g'
-
-un-runnable:
-	$(ECHO) cannot make runnable, configure with --enable-load-relative.
-	$(Q) exit 1
diff --git a/NEWS b/NEWS
index 1c0bc904e4..6abfa3fc50 100644
--- a/NEWS
+++ b/NEWS
@@ -1,397 +1,255 @@
 # -*- rdoc -*-
 
-= NEWS for Ruby 2.4.0
+= NEWS for Ruby 2.2.0
 
 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 or Redmine
-(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>)
+with all sufficient information, see the ChangeLog file.
 
-== Changes since the 2.3.0 release
+== Changes since the 2.1.0 release
 
 === Language changes
 
-* Multiple assignment in conditional expression is now allowed.
-  [Feature #10617]
-
-* Refinements is enabled at method by Symbol#to_proc.  [Feature #9451]
-
-* Refinements is enabled with Kernel#send and BasicObject#__send__.
-  [Feature #11476]
-
-* Rescue modifier now applicable to method arguments.
-  [Feature #12686]
-
-* Toplevel return is now allowed.  [Feature #4840]
+* nil/true/false
+  * nil/true/false objects are frozen. [Feature #8923]
 
 === Core classes updates (outstanding ones only)
 
-* Array
-
-  * Array#concat [Feature #12333]
-    Now takes multiple arguments.
-
-  * Array#max and Array#min.  [Feature #12172]
-    This may cause a tiny incompatibility: if you redefine
-    Enumerable#max and call max to an Array, your redefinition will be
-    now ignored.  You should also redefine Array#max.
-
-  * Array#pack [Feature #12754]
-    Now takes optional argument `buffer:' to reuse already allocated buffer.
-
-  * Array#sum  [Feature #12217]
-    This is different from Enumerable#sum in that Array#sum doesn't depend on
-    the definition of each method.
-
-* Comparable
-
-  * Comparable#clamp.  [Feature #10594]
+* Binding
+  * New methods:
+    * Binding#local_variables
+    * Binding#receiver
 
 * Dir
-
-  * Dir.empty?.  [Feature #10121]
+  * New methods:
+    * Dir#fileno
 
 * Enumerable
-
-  * Enumerable#chunk called without a block now return an Enumerator
-    [Feature #2172]
-  * Enumerable#sum  [Feature #12217]
-  * Enumerable#uniq  [Feature #11090]
-
-* Enumerator::Lazy
-
-  * Enumerator::Lazy#chunk_while  [GH-1186]
-  * Enumerator::Lazy#uniq  [Feature #11090]
-
-* File
-
-  * File.empty?.  [Feature #9969]
+  * New methods:
+    * Enumerable#slice_after
+  * Extended methods:
+    * min, min_by, max and max_by supports optional argument to return
+      multiple elements.
 
 * Float
+  * New methods:
+    * Float#next_float
+    * Float#prev_float
 
-  * Float#ceil, Float#floor, and Float#truncate now take an optional
-    digits, as well as Float#round.  [Feature #12245]
-
-  * Float#round now takes an optional keyword argument, half option, and
-    the default behavior is round-up.  [Bug #12548] [Bug #12958]
-    half option can be one of :even, :up, and :down.  [Feature #12953]
-
-* Hash
-
-  * Hash#compact and Hash#compact!  [Feature #11818]
-  * Hash#transform_values and Hash#transform_values!  [Feature #12512]
-
-* Integer
-
-  * Fixnum and Bignum are unified into Integer  [Feature #12005]
-
-  * Integer#ceil, Integer#floor, and Integer#truncate now take an optional
-    digits, as well as Integer#round.  [Feature #12245]
-
-  * Integer#digits for extracting columns of place-value notation [Feature #12447]
-
-  * Integer#round now takes an optional keyword argument, half option, and the
-    default behavior is round-up now.  [Bug #12548] [Bug #12958]
-    half option can be one of :even, :up, and :down.  [Feature #12953]
+* File
+  * New methods:
+    * File.birthtime
+    * File#birthtime
 
-* IO
+* File::Stat
+  * New methods:
+    * File::Stat#birthtime
 
-  * IO#gets, IO#readline, IO#each_line, IO#readlines, IO.foreach now takes
-    an optional keyword argument, chomp flag.  [Feature #12553]
+* GC
+  * Improvements
+    * Introduce incremental marking for major GC. [Feature #10137]
 
 * Kernel
-
-  * Kernel#clone now takes an optional keyword argument, freeze flag.
-    [Feature #12300]
-
-* MatchData
-
-  * MatchData#named_captures [Feature #11999]
-  * MatchData#values_at supports named captures [Feature #9179]
-
-* Module
-
-  * Module#refine accepts a module as the argument now. [Feature #12534]
-  * Module.used_modules [Feature #7418]
-
-* Numeric
-
-  * Numeric#finite?, Numeric#infinite? [Feature #12039]
+  * New methods:
+    * Kernel#itself
 
 * Process
-
-  * Support CLOCK_MONOTONIC_RAW_APPROX, CLOCK_UPTIME_RAW, and
-    CLOCK_UPTIME_RAW_APPROX which are introduced by macOS 10.12.
-
-* Rational
-
-  * Rational#round now takes an optional keyword argument, half option, and
-    the default behavior is round-up now.  [Bug #12548] [Bug #12958]
-    half option can be one of :even, :up, and :down.  [Feature #12953]
-
-* Regexp
-
-  * meta character \X matches Unicode 9.0 characters with some workarounds
-    for UTR #51 Unicode Emoji, Version 4.0 emoji zwj sequences.
-
-  * Regexp#match? [Feature #8110]
-    This returns bool and doesn't save backref.
-
-  * Update Onigmo 6.0.0.
-
-* Regexp/String: Updated Unicode version from 8.0.0 to 9.0.0 [Feature #12513]
-
-* RubyVM::Env
-
-  * RubyVM::Env was removed.
-
-* String
-
-  * String#casecmp? [Feature #12786]
-
-  * String#concat, String#prepend [Feature #12333]
-    Now takes multiple arguments.
-
-  * String#each_line, String#lines now takes an optional keyword argument,
-    chomp flag.  [Feature #12553]
-
-  * String#match? [Feature #12898]
-
-  * String#unpack1 [Feature #12752]
-
-  * String#upcase, String#downcase, String#capitalize, String#swapcase and
-    their bang variants work for all of Unicode, and are no longer limited
-    to ASCII. Supported encodings are UTF-8, UTF-16BE/LE, UTF-32BE/LE, and
-    ISO-8859-1~16. Variations are available with options. See the documentation
-    of String#downcase for details. [Feature #10085]
-
-  * String.new(capacity: size) [Feature #12024]
-
-* StringIO
-
-  * StringIO#gets, StringIO#readline, StringIO#each_line, StringIO#readlines now takes
-    an optional keyword argument, chomp flag.  [Feature #12553]
+  * Extended method:
+    * Process execution methods such as Process.spawn opens the file in write
+      mode for redirect from [:out, :err].
+  * Process creation methods, such as spawn(), uses vfork() system call.
+    vfork() is faster than fork() when the parent process uses huge memory.
 
 * Symbol
+  * Improvements
+    * Most symbols which are returned by String#to_sym and
+      String#intern are GC-able.
+
+* Matrix
+  * New methods:
+    * Matrix#first_minor(row, column) returns the submatrix obtained
+      by deleting the specified row and column.
+    * Matrix#cofactor(row, column) returns the (row, column) cofactor
+      which is obtained by multiplying the first minor by (-1)**(row + column).
+
+* Method
+  * New methods:
+    * Method#curry([arity]) returns a curried Proc.
+    * Method#super_method returns a Method of superclass, which would be called
+      when super is used.
+
+=== Core classes compatibility issues (excluding feature bug fixes)
+
+* GC
+  * incompatible changes:
+    * Rename GC.stat entries. [Feature #9924]
+      See https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
 
-  * Symbol#casecmp? [Feature #12786]
-
-  * Symbol#match now returns MatchData.  [Bug #11991]
-
-  * Symbol#match? [Feature #12898]
-
-  * Symbol#upcase, Symbol#downcase, Symbol#capitalize, and Symbol#swapcase now
-    work for all of Unicode. See the documentation of String#downcase
-    for details. [Feature #10085]
-
-* Thread
-
-  * Thread#report_on_exception and Thread.report_on_exception
-    [Feature #6647]
-
-* TracePoint
-
-  * TracePoint#callee_id [Feature #12747]
-
-* Warning
+* IO
+  * incompatible changes:
+    * When flushing file IO, you cannot assume that the metadata of the file
+      is updated immediately.  On some platforms (especially Windows), it is
+      delayed until the filesystem load is decreased.
+
+* Math
+  * incompatible changes:
+    * Math.log now raises Math::DomainError instead of returning NaN if the
+      base is less than 0, and returns NaN instead of -infinity if both of
+      two arguments are 0.
+    * Math.atan2 now returns values like as expected by C99 if both two
+      arguments are infinity.
+
+* Proc
+  * incompatible changes:
+    * ArgumentError is no longer raised when lambda Proc is passed as a
+      block, and the number of yielded arguments does not match the formal
+      arguments of the lambda, if just an array is yielded and its length
+      matches.
 
-  * New module named Warning is introduced.  By default it has only
-    one singleton method, named warn.  This makes it possible for
-    3rd-party libraries to control the way warnings are handled.
-    [Feature #12299]
+* Process
+  * Process execution methods such as Process.spawn opens the file in write
+    mode for redirect from [:out, :err].
+    Before Ruby 2.2, it was opened in read mode.
 
 === Stdlib updates (outstanding ones only)
 
-* CGI
-
-  * Don't allow , as a separator [Bug #12791]
-
-* CSV
-
-  * Add a liberal_parsing option. [Feature #11839]
-
-* IPAddr
-
-  * IPAddr#== and IPAddr#<=> no longer raise an exception if coercion fails.
-    [Bug #12799]
-
-* IRB
-
-  * Binding#irb: Start a REPL session like `binding.pry` at r56624.
-
-* Logger
-
-  * Allow specifying logger parameters in constructor such
-    as level, progname, datetime_format, formatter. [Feature #12224]
-  * Add shift_period_suffix option. [Feature #10772]
-
-* Net::HTTP
-
-  * New method: Net::HTTP.post [Feature #12375]
-
-* Net::FTP
-
-  * Support TLS (RFC 4217).
-  * Support hash style options for Net::FTP.new.
-  * Add a new optional argument pathname to Net::FTP#status.
-    Contributed by soleboxy. [GH-1478] [Feature #12965]
-
-* OpenSSL
-
-  * Includes Ruby/OpenSSL 2.0. OpenSSL has been extracted as a Gem and is
-    maintained at a separate repository now: https://github.com/ruby/openssl.
-    It still remains as a 'default gem'.  [Feature #9612]
-    Refer to ext/openssl/History.md for the full release note.
-
-* optparse
-
-  * Add an into option. [Feature #11191]
-
-* pathname
+* Digest
+  * Digest::HMAC has been removed just as previously noticed.
 
-  * New method: Pathname#empty? [Feature #12596]
+* Etc
+  * New methods:
+    * Etc.uname
+    * Etc.sysconf
+    * Etc.confstr
+    * IO#pathconf
 
-* Readline
+* Find, Pathname
+  * Extended methods:
+    * find method accepts "ignore_error" keyword argument.
 
-  * Readline.quoting_detection_proc and Readline.quoting_detection_proc=
-    [Feature #12659]
-
-* REXML
-
-  * REXML::Element#[]: If String or Symbol is specified, attribute
-    value is returned. Otherwise, Nth child is returned. This is
-    backward compatible change.
-
-* set
-
-  * New methods: Set#compare_by_identity and Set#compare_by_identity?.
-    [Feature #12210]
-
-* WEBrick
-
-  * Don't allow , as a separator [Bug #12791]
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* Array#sum and Enumerable#sum are implemented.  [Feature #12217]
-  Ruby itself has no compatibility problem because Ruby didn't have sum method
-  for arrays before Ruby 2.4.
-  However many third party gems, activesupport, facets, simple_stats, etc,
-  defines sum method.  These implementations are mostly compatible but
-  there are subtle differences.
-  Ruby's sum method should be mostly compatible but it is impossible to
-  be perfectly compatible with all of them.
-
-* Fixnum and Bignum are unified into Integer  [Feature #12005]
-  Fixnum class and Bignum class is removed.
-  Integer class is changed from abstract class to concrete class.
-  For example, 0 is an instance of Integer: 0.class returns Integer.
-  The constants Fixnum and Bignum is bound to Integer.
-  So obj.kind_of?(Fixnum) works as obj.kind_of?(Integer).
-  At C-level, Fixnum object and Bignum object should be distinguished by
-  FIXNUM_P(obj) and RB_TYPE_P(obj, T_BIGNUM).
-  RUBY_INTEGER_UNIFICATION can be used to detect this feature at C-level.
-  0.class == Integer can be used to detect this feature at Ruby-level.
-  The C-level constants, rb_cFixnum and rb_cBignum, are removed.
-  They can cause compilation failure.
-
-* String/Symbol#upcase/downcase/swapcase/capitalize(!) now work for all of
-  Unicode, not only for ASCII. [Feature #10085]
-  No change is needed if the data is in ASCII anyway or if the limitation
-  to ASCII was only tolerated while waiting for a more extensive implementation.
-  A change (using the :ascii option) is needed in cases where Unicode data
-  is processed, but the operation has to be limited to ASCII only.
-  A good example of this are internationalized domain names.
-
-* TRUE / FALSE / NIL
-  These constants are now obsoleted. [Feature #12574]
-  Use true / false / nil resp. instead.
+* Pathname
+  * Pathname#/ is aliased to Pathname#+.
+  * New methods:
+    * Pathname#birthtime
 
 === Stdlib compatibility issues (excluding feature bug fixes)
 
-* DateTime
-
-  * DateTime#to_time now preserves timezone.  [Bug #12189]
-
-* PSych
-
-  * Update Psych 2.2.2
+* lib/mathn.rb
+  * Show deprecated warning [Feature #10169]
 
-* RDoc
+* ext/date/lib/date/format.rb
+  * Removed because it's empty file.
 
-  * Update RDoc 5.0.0
+* Digest
+  * Digest::HMAC has finally ceased to exist.  Use OpenSSL::HMAC or an external gem instead.
 
-* RubyGems
+* time.rb
+  * Time.parse, Time.strptime, Time.rfc2822, Time.xmlschema may produce
+    fixed-offset Time objects.
+    It is happen when usual localtime doesn't preserve the offset from UTC.
+  * Time.httpdate produces always UTC Time object.
+  * Time.strptime raises ArgumentError when no date information.
 
-  * Update RubyGems 2.6.8
+* lib/rational.rb
+  * Removed because it is deprecated from 2009.
 
-* shellwords
+* lib/complex.rb
+  * Removed because it is deprecated from 2009.
 
-  * Shellwords.shellwords (shellsplit) treats the backslash as escape
-    character only when followed by one of the following characters:
-    $ ` " \ <newline>
-    [Bug #10055]
+* lib/prettyprint.rb
+  * Removed PrettyPrint#first?
 
-* Time
+* lib/minitest/*.rb
+  * Removed because it conflicts to minitest 5. [Feature #9711]
 
-  * Time#to_time now preserves timezone.  [Bug #12271]
+* lib/test/**/*.rb
+  * Removed because it conflicts to minitest 5, and it was just an wrapper
+    of minitest 4. [Feature #9711]
 
-* thread
+* lib/uri
+  * support RFC 3986. [Feature #2542]
 
-  * the extension library is removed.  Till 2.0 it was a pure ruby script
-    "thread.rb", which has precedence over "thread.so", and has been provided
-    in $LOADED_FEATURES since 2.1.
+* GServer
+  * GServer is extracted to gserver gem. It's unmaintain code.
 
-* Tk
-
-  * Tk is removed from stdlib.  [Feature #8539]
-    https://github.com/ruby/tk is the new upstream.
-
-* XMLRPC
+* Logger
+  * Logger::Application is extracted to logger-application gem. It's unmaintain code.
 
-  * XMLRPC is removed from stdlib, and bundled as gem. [Feature #12160][ruby-core:74239]
-    https://github.com/ruby/xmlrpc is the new upstream.
+* Prime
+  * incompatible changes:
+    * Prime.prime? now returns false for negative numbers. This method
+      should not be used to know the number is composite or not. [Bug #7395]
 
-* Zlib
+* Psych
+  * Removed Psych::EngineManager [Bug #8344]
 
-  * Zlib.gzip and Zlib.gunzip [Feature #13020]
+=== Built-in global variables compatibility issues
 
 === C API updates
 
-* ruby_show_version() will no longer exits the process, if
-  RUBY_SHOW_COPYRIGHT_TO_DIE is set to 0.  This will be the default in
-  the future.
-
-* rb_gc_adjust_memory_usage() [Feature #12690]
-
-=== Supported platform changes
-
-* FreeBSD < 4 is no longer supported
-
-=== Implementation improvements
-
-* In some condition, `[x, y].max` and `[x, y].min` are optimized
-  so that a temporal array is not created.  The concrete condition is
-  an implementation detail: currently, the array literal must have no
-  splat, must have at least one expression but literal, the length must
-  be <= 0x100, and Array#max and min must not be redefined.  It will work
-  in most casual and real-life use case where it is written with intent
-  to `Math.max(x, y)`.
-
-* Thread deadlock detection now shows their backtrace and dependency. [Feature #8214]
-
-* st_table (st.c) internal data structure is improved. [Feature #12142]
-
-* Rational is extensively optimized. [Feature #12484]
-
-=== Miscellaneous changes
-
-* ChangeLog is removed from the repository.
-  It is generated from commit messages in Subversion by `make dist`.
-  Also note that now people should follow Git style commit message.
-  The template is written at
-  [Short (50 chars or less) summary of changes](https://git-scm.com/book/ch5-2.html).
-  [Feature #12283]
+* Deprecated APIs removed.  [Feature #9502]
+
+  Check_SafeStr -> SafeStringValue
+  rb_check_safe_str -> SafeStringValue
+  rb_quad_pack -> rb_integer_pack
+  rb_quad_unpack -> rb_integer_unpack
+  rb_read_check : access struct FILE internal. no replacement.
+  rb_struct_iv_get : internal function. no replacement.
+  struct rb_blocking_region_buffer : internal type. no replacement.
+  rb_thread_blocking_region_begin -> rb_thread_call_without_gvl family
+  rb_thread_blocking_region_end -> rb_thread_call_without_gvl family
+  TRAP_BEG -> rb_thread_call_without_gvl family
+  TRAP_END -> rb_thread_call_without_gvl family
+  rb_thread_select -> rb_thread_fd_select
+  struct rb_exec_arg : internal type. no replacement.
+  rb_exec : internal function. no replacement.
+  rb_exec_arg_addopt : internal function. no replacement.
+  rb_exec_arg_fixup : internal function. no replacement.
+  rb_exec_arg_init : internal function. no replacement.
+  rb_exec_err : internal function. no replacement.
+  rb_fork : internal function. no replacement.
+  rb_fork_err : internal function. no replacement.
+  rb_proc_exec_n : internal function. no replacement.
+  rb_run_exec_options : internal function. no replacement.
+  rb_run_exec_options_err : internal function. no replacement.
+  rb_thread_blocking_region -> rb_thread_call_without_gvl family
+  rb_thread_polling -> rb_thread_wait_for
+  rb_big2str0 : internal function. no replacement.
+  rb_big2ulong_pack -> rb_integer_pack
+  rb_gc_set_params : internal function. no replacement.
+
+* struct RBignum is hidden.  [Feature #6083]
+  Use rb_integer_pack and rb_integer_unpack instead.
+
+* struct RRational is hidden.  [Feature #9513]
+  Use rb_rational_num and rb_rational_den instead.
+
+* rb_big_new and rb_big_resize takes a size_t instead of long.
+
+* rb_num2long returns a long instead of SIGNED_VALUE.
+
+* rb_num2ulong returns an unsigned long instead of VALUE.
+
+* st hash table uses power-of-two sizes for speed [Feature #9425].
+  Lookups are 10-25% faster if using appropriate hash functions.
+  However, weaknesses in hash distribution can no longer be masked
+  by prime number-sized tables, so extensions may need to tweak
+  hash functions to ensure good distribution.
+
+* rb_sym2str() added. This is almost same as `rb_id2str(SYM2ID(sym))`
+  but not pinning a dynamic symbol.
+
+* rb_str_cat_cstr() added. This is same as `rb_str_cat2()`.
+
+* `rb_str_substr()` and `rb_str_subseq()` now share middle of a string,
+  but not only the end of a string.  Therefore, result strings may not
+  be NUL-terminated, `StringValueCStr()` is needed calling to obtain a
+  NUL-terminated C string.
+
+* rb_tracepoint_new() supports new internal events accessible only from C:
+  * RUBY_INTERNAL_EVENT_GC_ENTER
+  * RUBY_INTERNAL_EVENT_GC_EXIT
+    r47528
diff --git a/README.EXT b/README.EXT
index 48b8d964c4..f7ee0022df 100644
--- a/README.EXT
+++ b/README.EXT
@@ -1 +1,1679 @@
-Moved to doc/extension.rdoc
+# README.EXT -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+This document explains how to make extension libraries for Ruby.
+
+= Basic Knowledge
+
+In C, variables have types and data do not have types.  In contrast,
+Ruby variables do not have a static type, and data themselves have
+types, so data will need to be converted between the languages.
+
+Data in Ruby are represented by the C type `VALUE'.  Each VALUE data
+has its data-type.
+
+To retrieve C data from a VALUE, you need to:
+
+1. Identify the VALUE's data type
+2. Convert the VALUE into C data
+
+Converting to the wrong data type may cause serious problems.
+
+== Data-Types
+
+The Ruby interpreter has the following data types:
+
+T_NIL       :: nil
+T_OBJECT    :: ordinary object
+T_CLASS     :: class
+T_MODULE    :: module
+T_FLOAT     :: floating point number
+T_STRING    :: string
+T_REGEXP    :: regular expression
+T_ARRAY     :: array
+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
+T_DATA      :: data
+T_SYMBOL    :: symbol
+
+In addition, there are several other types used internally:
+
+T_ICLASS    :: included module
+T_MATCH     :: MatchData object
+T_UNDEF     :: undefined
+T_NODE      :: syntax tree node
+T_ZOMBIE    :: object awaiting finalization
+
+Most of the types are represented by C structures.
+
+== Check Data Type of the VALUE
+
+The macro TYPE() defined in ruby.h shows the data type of the VALUE.
+TYPE() returns the constant number T_XXXX described above.  To handle
+data types, your code will look something like this:
+
+  switch (TYPE(obj)) {
+    case T_FIXNUM:
+      /* process Fixnum */
+      break;
+    case T_STRING:
+      /* process String */
+      break;
+    case T_ARRAY:
+      /* process Array */
+      break;
+    default:
+      /* raise exception */
+      rb_raise(rb_eTypeError, "not valid value");
+      break;
+  }
+
+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.
+
+There are also faster check macros for fixnums and nil.
+
+  FIXNUM_P(obj)
+  NIL_P(obj)
+
+== Convert VALUE into C Data
+
+The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true
+respectively.  They are singletons for the data type.
+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
+argument, to change the value of var in place.
+
+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".  However, we do not recommend
+to access RXXXX data directly because these data structure is complex.
+Use corresponding rb_xxx() functions to access internal struct.
+For example, to access an entry of array, use rb_ary_entry(ary, offset)
+and rb_ary_store(ary, offset, obj).
+
+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)'.
+
+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.
+
+== Convert C Data into VALUE
+
+To convert C data to Ruby values:
+
+FIXNUM ::
+
+  left shift 1 bit, and turn on LSB.
+
+Other pointer values::
+
+  cast to VALUE.
+
+You can determine whether a VALUE is pointer or not by checking its LSB.
+
+Notice Ruby does not allow arbitrary pointer values to be a VALUE.  They
+should be pointers to the structures which Ruby knows about.  The known
+structures are defined in <ruby.h>.
+
+To convert C numbers to Ruby values, use these macros.
+
+INT2FIX() :: for integers within 31bits.
+INT2NUM() :: for arbitrary sized integer.
+
+INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
+range, but is a bit slower.
+
+== 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:
+
+=== String Functions
+
+rb_str_new(const char *ptr, long len) ::
+
+  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)).
+
+rb_tainted_str_new(const char *ptr, long len) ::
+
+  Creates a new tainted Ruby string.  Strings from external data
+  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.
+
+  Note: In the format string, %i is used for Object#to_s (or Object#inspect if
+  '+' flag is set) output (and related argument must be a VALUE).  For integers
+  in format strings, use %d.
+
+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) ::
+rb_str_cat_cstr(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) ::
+rb_enc_str_new_cstr(const char *ptr, 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.
+
+rb_str_resize(VALUE str, long len) ::
+
+  Resizes Ruby string to len bytes.  If str is not modifiable, this
+  function raises an exception.  The length of str must be set in
+  advance.  If len is less than the old length the content beyond
+  len bytes is discarded, else if len is greater than the old length
+  the content beyond the old length bytes will not be preserved but
+  will be garbage.  Note that RSTRING_PTR(str) may change by calling
+  this function.
+
+rb_str_set_len(VALUE str, long len) ::
+
+  Sets the length of Ruby string.  If str is not modifiable, this
+  function raises an exception.  This function preserves the content
+  upto len bytes, regardless RSTRING_LEN(str).  len must not exceed
+  the capacity of str.
+
+=== Array Functions
+
+rb_ary_new() ::
+
+  Creates an array with no elements.
+
+rb_ary_new2(long len) ::
+rb_ary_new_capa(long len) ::
+
+  Creates an array with no elements, allocating internal buffer
+  for len elements.
+
+rb_ary_new3(long n, ...) ::
+rb_ary_new_from_args(long n, ...) ::
+
+  Creates an n-element array from the arguments.
+
+rb_ary_new4(long n, VALUE *elts) ::
+rb_ary_new_from_values(long n, VALUE *elts) ::
+
+  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) ::
+
+  Equivalent to Array#[].
+
+rb_ary_entry(VALUE ary, long offset) ::
+
+  ary[offset]
+
+rb_ary_store(VALUE ary, long offset, VALUE obj) ::
+
+  ary[offset] = obj
+
+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) ::
+
+rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
+
+  Appends len elements of objects from ptr to the array.
+
+= Extending Ruby with C
+
+== 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:
+
+* Classes, Modules
+* Methods, Singleton Methods
+* Constants
+
+=== Class and Module Definition
+
+To define a class or module, use the functions below:
+
+  VALUE rb_define_class(const char *name, VALUE super)
+  VALUE rb_define_module(const char *name)
+
+These functions return the newly created class or module.  You may
+want to save this reference into a variable to use later.
+
+To define nested classes or modules, use the functions below:
+
+  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
+  VALUE rb_define_module_under(VALUE outer, const char *name)
+
+=== Method and Singleton Method Definition
+
+To define methods or singleton methods, use these functions:
+
+  void rb_define_method(VALUE klass, const char *name,
+		        VALUE (*func)(), int argc)
+
+  void rb_define_singleton_method(VALUE object, const char *name,
+			          VALUE (*func)(), int argc)
+
+The `argc' represents the number of the arguments to the C function,
+which must be less than 17.  But I doubt you'll need that many.
+
+If `argc' is negative, it specifies the calling sequence, not number of
+the arguments.
+
+If argc is -1, the function will be called as:
+
+  VALUE func(int argc, VALUE *argv, VALUE obj)
+
+where argc is the actual number of arguments, argv is the C array of
+the arguments, and obj is the receiver.
+
+If argc is -2, the arguments are passed in a Ruby array. The function
+will be called like:
+
+  VALUE func(VALUE obj, VALUE args)
+
+where obj is the receiver, and args is the Ruby array containing
+actual arguments.
+
+There are some more functions to define methods. One takes an ID
+as the name of method to be defined. See also ID or Symbol below.
+
+  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)
+
+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)
+
+or
+
+  include Math
+  sqrt(4)
+
+To define module functions, use:
+
+  void rb_define_module_function(VALUE module, const char *name,
+				 VALUE (*func)(), int argc)
+
+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)
+
+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 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.
+
+If you are overriding an existing method of any ancestor of your class,
+you may rely on:
+
+  VALUE rb_call_super(int argc, const VALUE *argv)
+
+=== Constant Definition
+
+We have 2 functions to define constants:
+
+  void rb_define_const(VALUE klass, const char *name, VALUE val)
+  void rb_define_global_const(const char *name, VALUE val)
+
+The former is to define a constant under specified class/module.  The
+latter is to define a global constant.
+
+== Use Ruby Features from C
+
+There are several ways to invoke Ruby's features from C code.
+
+=== Evaluate Ruby Programs in a String
+
+The easiest way to use Ruby's functionality from a C program is to
+evaluate the string as Ruby program.  This function will do the job:
+
+  VALUE rb_eval_string(const char *str)
+
+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.
+
+=== 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:
+
+  :Identifier
+
+or
+
+  :"any kind of string"
+
+You can get the ID value from a string within C code by using
+
+  rb_intern(const char *name)
+  rb_intern_str(VALUE name)
+
+You can retrieve ID from Ruby object (Symbol or String) given as an
+argument by using
+
+  rb_to_id(VALUE symbol)
+  rb_check_id(volatile VALUE *name)
+  rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
+
+These functions try to convert the argument to a String if it was not
+a Symbol nor a String.  The second function stores the converted
+result into *name, and returns 0 if the string is not a known symbol.
+After this function returned a non-zero value, *name is always a
+Symbol or a String, otherwise it is a String if the result is 0.
+The third function takes NUL-terminated C string, not Ruby VALUE.
+
+You can retrieve Symbol from Ruby object (Symbol or String) given as
+an argument by using
+
+  rb_to_symbol(VALUE name)
+  rb_check_symbol(volatile VALUE *namep)
+  rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
+
+These functions are similar to above functions except that these
+return a Symbol instead of an ID.
+
+You can convert C ID to Ruby Symbol by using
+
+  VALUE ID2SYM(ID id)
+
+and to convert Ruby Symbol object to ID, use
+
+  ID SYM2ID(VALUE symbol)
+
+=== Invoke Ruby Method from C
+
+To invoke methods directly, you can use the function below
+
+  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
+
+This function invokes a method on the recv, with the method name
+specified by the symbol mid.
+
+=== 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.
+
+The functions to access/modify instance variables are below:
+
+  VALUE rb_ivar_get(VALUE obj, ID id)
+  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
+
+id must be the symbol, which can be retrieved by rb_intern().
+
+To access the constants of the class/module:
+
+  VALUE rb_const_get(VALUE obj, ID id)
+
+See also Constant Definition above.
+
+= Information Sharing Between Ruby and C
+
+=== Ruby Constants That C Can Be Accessed From C
+
+As stated in section 1.3,
+the following Ruby constants can be referred from C.
+
+  Qtrue
+  Qfalse
+
+Boolean values.  Qfalse is false in C also (i.e. 0).
+
+  Qnil
+
+Ruby nil in C scope.
+
+== Global Variables Shared Between C and Ruby
+
+Information can be shared between the two environments using shared global
+variables.  To define them, you can use functions listed below:
+
+  void rb_define_variable(const char *name, VALUE *var)
+
+This function defines the variable which is shared by both environments.
+The value of the global variable pointed to by `var' can be accessed
+through Ruby's global variable named `name'.
+
+You can define read-only (from Ruby, of course) variables using the
+function below.
+
+  void rb_define_readonly_variable(const char *name, VALUE *var)
+
+You can defined hooked variables.  The accessor functions (getter and
+setter) are called on access to the hooked variables.
+
+  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().
+
+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);
+
+
+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:
+
+  VALUE (*getter)(ID id);
+  void (*setter)(VALUE val, ID id);
+
+
+== Encapsulate C Data into a Ruby Object
+
+To wrap and objectify a C pointer as a Ruby object (so called
+DATA), use Data_Wrap_Struct().
+
+  Data_Wrap_Struct(klass, mark, free, sval)
+
+Data_Wrap_Struct() returns a created DATA object.  The klass argument
+is the class for the DATA object.  The mark argument is the function
+to mark Ruby objects pointed by this data.  The free argument is the
+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)
+
+This macro returns an allocated Data object, wrapping the pointer to
+the structure, which is also allocated.  This macro works like:
+
+  (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
+
+Arguments klass, mark, and free work like their counterparts in
+Data_Wrap_Struct().  A pointer to the allocated structure will be
+assigned to sval, which should be a pointer of the type specified.
+
+To retrieve the C pointer from the Data object, use the macro
+Data_Get_Struct().
+
+  Data_Get_Struct(obj, type, sval)
+
+A pointer to the structure will be assigned to the variable sval.
+
+See the example below for details.
+
+= Example - Creating dbm Extension
+
+OK, here's the example of making an extension library.  This is the
+extension to access DBMs.  The full source is included in the ext/
+directory in the Ruby's source tree.
+
+== Make the Directory
+
+  % mkdir ext/dbm
+
+Make a directory for the extension library under ext directory.
+
+== Design the Library
+
+You need to design the library features, before making it.
+
+== Write the C Code
+
+You need to write C code for your extension library.  If your library
+has only one source file, choosing ``LIBRARY.c'' as a file name is
+preferred.  On the other hand, in case your library has multiple source
+files, avoid choosing ``LIBRARY.c'' for a file name.  It may conflict
+with an intermediate file ``LIBRARY.o'' on some platforms.
+Note that some functions in mkmf library described below generate
+a file ``conftest.c'' for checking with compilation.  You shouldn't
+choose ``conftest.c'' as a name of a source file.
+
+Ruby will execute the initializing function named ``Init_LIBRARY'' in
+the library.  For example, ``Init_dbm()'' will be executed when loading
+the library.
+
+Here's the example of an initializing function.
+
+  void
+  Init_dbm(void)
+  {
+      /* define DBM class */
+      cDBM = rb_define_class("DBM", rb_cObject);
+      /* DBM includes Enumerable module */
+      rb_include_module(cDBM, rb_mEnumerable);
+
+      /* DBM has class method open(): arguments are received as C array */
+      rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+      /* DBM instance method close(): no args */
+      rb_define_method(cDBM, "close", fdbm_close, 0);
+      /* DBM instance method []: 1 argument */
+      rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+
+      /* ... */
+
+      /* ID for a instance variable to store DBM data */
+      id_dbm = rb_intern("dbm");
+  }
+
+The dbm extension wraps the dbm struct in the C environment using
+Data_Make_Struct.
+
+  struct dbmdata {
+      int  di_size;
+      DBM *di_dbm;
+  };
+
+  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.
+
+To retrieve the dbmdata structure from a Ruby object, we define the
+following macro:
+
+  #define GetDBM(obj, dbmp) do {\
+      Data_Get_Struct(obj, struct dbmdata, dbmp);\
+      if (dbmp->di_dbm == 0) closed_dbm();\
+  } while (0)
+
+This sort of complicated macro does the retrieving and close checking for
+the DBM.
+
+There are three kinds of way to receive method arguments.  First,
+methods with a fixed number of arguments receive arguments like this:
+
+  static VALUE
+  fdbm_delete(VALUE obj, VALUE keystr)
+  {
+        /* ... */
+  }
+
+The first argument of the C function is the self, the rest are the
+arguments to the method.
+
+Second, methods with an arbitrary number of arguments receive
+arguments like this:
+
+  static VALUE
+  fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+  {
+      /* ... */
+      if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+          mode = 0666;		/* default value */
+      }
+      /* ... */
+  }
+
+The first argument is the number of method arguments, the second
+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.  The third argument is a string that specifies how to
+capture method arguments and assign them to the following VALUE
+references.
+
+
+The following is an example of a method that takes arguments by Ruby's
+array:
+
+  static VALUE
+  thread_initialize(VALUE thread, VALUE args)
+  {
+      /* ... */
+  }
+
+The first argument is the receiver, the second one is the Ruby array
+which contains the arguments to the method.
+
+*Notice*: GC should know about global variables which refer to Ruby's objects,
+but are not exported to the Ruby world.  You need to protect them by
+
+  void rb_global_variable(VALUE *var)
+
+== Prepare extconf.rb
+
+If the file named extconf.rb exists, it will be executed to generate
+Makefile.
+
+extconf.rb is the file for checking compilation conditions etc.  You
+need to put
+
+  require 'mkmf'
+
+at the top of the file.  You can use the functions below to check
+various conditions.
+
+  have_macro(macro[, headers[, opt]]): check whether macro is defined
+  have_library(lib[, func[, headers[, opt]]]): check whether library containing function exists
+  find_library(lib[, func, *paths]): find library from paths
+  have_func(func[, headers[, opt]): check whether function exists
+  have_var(var[, headers[, opt]]): check whether variable exists
+  have_header(header[, preheaders[, opt]]): check whether header file exists
+  find_header(header, *paths): find header from paths
+  have_framework(fw): check whether framework exists (for MacOS X)
+  have_struct_member(type, member[, headers[, opt]]): check whether struct has member
+  have_type(type[, headers[, opt]]): check whether type exists
+  find_type(type, opt, *headers): check whether type exists in headers
+  have_const(const[, headers[, opt]]): check whether constant is defined
+  check_sizeof(type[, headers[, opts]]): check size of type
+  check_signedness(type[, headers[, opts]]): check signedness of type
+  convertible_int(type[, headers[, opts]]): find convertible integer type
+  find_executable(bin[, path]): find executable file path
+  create_header(header): generate configured header
+  create_makefile(target[, target_prefix]): generate Makefile
+
+See MakeMakefile for full documentation of these functions.
+
+The value of the variables below will affect the Makefile.
+
+  $CFLAGS: included in CFLAGS make variable (such as -O)
+  $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
+  $LDFLAGS: included in LDFLAGS make variable (such as -L)
+  $objs: list of object file names
+
+Normally, the object files list is automatically generated by searching
+source files, but you must define them explicitly if any sources will
+be generated while building.
+
+If a compilation condition is not fulfilled, you should not call
+``create_makefile''.  The Makefile will not be generated, compilation will
+not be done.
+
+== Prepare Depend (Optional)
+
+If the file named depend exists, Makefile will include that file to
+check dependencies.  You can make this file by invoking
+
+  % gcc -MM *.c > depend
+
+It's harmless.  Prepare it.
+
+== Generate Makefile
+
+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.
+
+== Run make
+
+Type
+
+  make
+
+to compile your extension.  You don't need this step either if you have
+put the extension library under the ext directory of the ruby source tree.
+
+== Debug
+
+You may need to rb_debug the extension.  Extensions can be linked
+statically by adding the directory name in the ext/Setup file so that
+you can inspect the extension with the debugger.
+
+== Done! Now You Have the Extension Library
+
+You can do anything you want with your library.  The author of Ruby
+will not claim any restrictions on your code depending on the Ruby API.
+Feel free to use, modify, distribute or sell your program.
+
+= Appendix A. Ruby Source Files Overview
+
+== Ruby Language Core
+
+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  :: grammar definition
+parse.c  :: automatically generated from parse.y
+keywords :: reserved keywords
+lex.c    :: automatically generated from keywords
+
+== 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 switching
+  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
+
+debug.c    :: debug symbols for C debugger
+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      :: 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#sprintf
+string.c     :: String
+struct.c     :: Struct
+time.c       :: Time
+
+defs/known_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
+
+== Types
+
+VALUE ::
+
+  The type for the Ruby object.  Actual structures are defined in ruby.h,
+  such as struct RString, etc.  To refer the values in structures, use
+  casting macros like RSTRING(obj).
+
+== Variables and Constants
+
+Qnil::
+  nil object
+
+Qtrue::
+  true object (default true value)
+
+Qfalse::
+  false object
+
+== C Pointer Wrapping
+
+Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
+
+  Wrap a C pointer into a Ruby object.  If object has references to other
+  Ruby objects, they should be marked by using the mark function during
+  the GC process.  Otherwise, mark should be 0.  When this object is no
+  longer referred by anywhere, the pointer will be discarded by free
+  function.
+
+Data_Make_Struct(klass, type, mark, free, sval) ::
+
+  This macro allocates memory using malloc(), assigns it to the variable
+  sval, and returns the DATA encapsulating the pointer to memory region.
+
+Data_Get_Struct(data, type, sval) ::
+
+  This macro retrieves the pointer value from DATA, and assigns it to
+  the variable sval.
+
+== Checking Data Types
+
+TYPE(value) ::
+
+  Internal type (T_NIL, T_FIXNUM, etc.)
+
+FIXNUM_P(value) ::
+
+  Is +value+ a Fixnum?
+
+NIL_P(value) ::
+
+  Is +value+ nil?
+
+void Check_Type(VALUE value, int type) ::
+
+  Ensures +value+ is of the given internal +type+ or raises a TypeError
+
+SaveStringValue(value) ::
+
+  Checks that +value+ is a String and is not tainted
+
+== Data Type Conversion
+
+FIX2INT(value), INT2FIX(i) ::
+
+  Fixnum <-> integer
+
+FIX2LONG(value), LONG2FIX(l) ::
+
+  Fixnum <-> long
+
+NUM2INT(value), INT2NUM(i) ::
+
+  Numeric <-> integer
+
+NUM2UINT(value), UINT2NUM(ui) ::
+
+  Numeric <-> unsigned integer
+
+NUM2LONG(value), LONG2NUM(l) ::
+
+  Numeric <-> long
+
+NUM2ULONG(value), ULONG2NUM(ul) ::
+
+  Numeric <-> unsigned long
+
+NUM2LL(value), LL2NUM(ll) ::
+
+  Numeric <-> long long
+
+NUM2ULL(value), ULL2NUM(ull) ::
+
+  Numeric <-> unsigned long long
+
+NUM2OFFT(value), OFFT2NUM(off) ::
+
+  Numeric <-> off_t
+
+NUM2SIZET(value), SIZET2NUM(size) ::
+
+  Numeric <-> size_t
+
+NUM2SSIZET(value), SSIZET2NUM(ssize) ::
+
+  Numeric <-> ssize_t
+
+rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags) ::
+
+  Numeric <-> Arbitrary size integer buffer
+
+NUM2DBL(value) ::
+
+  Numeric -> double
+
+rb_float_new(f) ::
+
+  double -> Float
+
+RSTRING_LEN(str) ::
+
+  String -> length of String data in bytes
+
+RSTRING_PTR(str) ::
+
+  String -> pointer to String data
+  Note that the result pointer may not be NUL-terminated
+
+StringValue(value) ::
+
+  Object with #to_str -> String
+
+StringValuePtr(value) ::
+
+  Object with #to_str -> pointer to String data
+
+StringValueCStr(value) ::
+
+  Object with #to_str -> pointer to String data without NUL bytes
+  It is guaranteed that the result data is NUL-terminated
+
+rb_str_new2(s) ::
+
+  char * -> String
+
+== Defining Class and Module
+
+VALUE rb_define_class(const char *name, VALUE super) ::
+
+  Defines a new Ruby class as a subclass of super.
+
+VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
+
+  Creates a new Ruby class as a subclass of super, under the module's
+  namespace.
+
+VALUE rb_define_module(const char *name) ::
+
+  Defines a new Ruby module.
+
+VALUE rb_define_module_under(VALUE module, const char *name) ::
+
+  Defines a new Ruby module under the module's namespace.
+
+void rb_include_module(VALUE klass, VALUE module) ::
+
+  Includes module into class.  If class already includes it, just ignored.
+
+void rb_extend_object(VALUE object, VALUE module) ::
+
+  Extend the object with the module's attributes.
+
+== Defining Global Variables
+
+void rb_define_variable(const char *name, VALUE *var) ::
+
+  Defines a global variable which is shared between C and Ruby.  If name
+  contains a character which is not allowed to be part of the symbol,
+  it can't be seen from Ruby programs.
+
+void rb_define_readonly_variable(const char *name, VALUE *var) ::
+
+  Defines a read-only global variable.  Works just like
+  rb_define_variable(), except the defined variable is read-only.
+
+void rb_define_virtual_variable(const char *name, VALUE (*getter)(), VALUE (*setter)()) ::
+
+  Defines a virtual variable, whose behavior is defined by a pair of C
+  functions.  The getter function is called when the variable is
+  referenced.  The setter function is called when the variable is set to a
+  value.  The prototype for getter/setter functions are:
+
+    VALUE getter(ID id)
+    void setter(VALUE val, ID id)
+
+  The getter function must return the value for the access.
+
+void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), VALUE (*setter)()) ::
+
+  Defines hooked variable.  It's a virtual variable with a C variable.
+  The getter is called as
+
+    VALUE getter(ID id, VALUE *var)
+
+  returning a new value.  The setter is called as
+
+    void setter(VALUE val, ID id, VALUE *var)
+
+  GC requires C global variables which hold Ruby values to be marked.
+
+void rb_global_variable(VALUE *var)
+
+  Tells GC to protect these variables.
+
+== Constant Definition
+
+void rb_define_const(VALUE klass, const char *name, VALUE val) ::
+
+  Defines a new constant under the class/module.
+
+void rb_define_global_const(const char *name, VALUE val) ::
+
+  Defines a global constant.  This is just the same as
+
+    rb_define_const(cKernal, name, val)
+
+== Method Definition
+
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+
+  Defines a method for the class.  func is the function pointer.  argc
+  is the number of arguments.  if argc is -1, the function will receive
+  3 arguments: argc, argv, and self.  if argc is -2, the function will
+  receive 2 arguments, self and args, where args is a Ruby array of
+  the method arguments.
+
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+
+  Defines a private method for the class.  Arguments are same as
+  rb_define_method().
+
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+
+  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 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 [option-hash-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
+    option-hash-arg-spec := sym-for-option-hash-arg
+    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-option-hash-arg        := ":"   ; Indicates that an option
+                                            ; hash is captured if the last
+                                            ; argument is a hash or can be
+                                            ; converted to a hash with
+                                            ; #to_hash.  When the last
+                                            ; argument is nil, it is
+                                            ; captured if it is not
+                                            ; ambiguous to take it as
+                                            ; empty option hash; i.e. '*'
+                                            ; is not specified and
+                                            ; arguments are given more
+                                            ; than sufficient.
+    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 option hash or iterator
+  block, is returned.
+
+== Invoking Ruby method
+
+VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
+
+  Invokes a method.  To retrieve mid from a method name, use rb_intern().
+  Able to call even private/protected methods.
+
+VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
+VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  Invokes a method, passing arguments as an array of values.
+  Able to call even private/protected methods.
+
+VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  Invokes a method, passing arguments as an array of values.
+  Able to call only public methods.
+
+VALUE rb_eval_string(const char *str) ::
+
+  Compiles and executes the string as a Ruby program.
+
+ID rb_intern(const char *name) ::
+
+  Returns ID corresponding to the name.
+
+char *rb_id2name(ID id) ::
+
+  Returns the name corresponding ID.
+
+char *rb_class2name(VALUE klass) ::
+
+  Returns the name of the class.
+
+int rb_respond_to(VALUE object, ID id) ::
+
+  Returns true if the object responds to the message specified by id.
+
+== Instance Variables
+
+VALUE rb_iv_get(VALUE obj, const char *name) ::
+
+  Retrieve the value of the instance variable.  If the name is not
+  prefixed by `@', that variable shall be inaccessible from Ruby.
+
+VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
+
+  Sets the value of the instance variable.
+
+== Control Structure
+
+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)(), 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)(), 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 when no exception occurred.
+
+VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
+
+  Calls the function func with arg as the argument.  If no exception
+  occurred 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.
+  You have to clear the error info with rb_set_errinfo(Qnil) when
+  ignoring the caught exception.
+
+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.
+
+void rb_iter_break() ::
+
+  Exits from the current innermost block.  This function never return to
+  the caller.
+
+void rb_iter_break_value(VALUE value) ::
+
+  Exits from the current innermost block with the value.  The block will
+  return the given argument value.  This function never return to the
+  caller.
+
+== Exceptions and Errors
+
+void rb_warn(const char *fmt, ...) ::
+
+  Prints a warning message according to a printf-like format.
+
+void rb_warning(const char *fmt, ...) ::
+
+  Prints a warning message according to a printf-like format, if
+  $VERBOSE is true.
+
+void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
+
+  Raises RuntimeError.  The fmt is a format string just like printf().
+
+void rb_raise(VALUE exception, const char *fmt, ...) ::
+
+  Raises a class exception.  The fmt is a format string just like printf().
+
+void rb_fatal(const char *fmt, ...) ::
+
+  Raises a fatal error, terminates the interpreter.  No exception handling
+  will be done for fatal errors, but ensure blocks will be executed.
+
+void rb_bug(const char *fmt, ...) ::
+
+  Terminates the interpreter immediately.  This function should be
+  called under the situation caused by the bug in the interpreter.  No
+  exception handling nor ensure execution will be done.
+
+Note: In the format string, %i is used for Object#to_s (or Object#inspect if
+'+' flag is set) output (and related argument must be a VALUE).  For integers
+in format strings, use %d.
+
+== Initialize and Start the Interpreter
+
+The embedding API functions are below (not needed for extension libraries):
+
+void ruby_init() ::
+
+  Initializes the interpreter.
+
+void *ruby_options(int argc, char **argv) ::
+
+  Process command line arguments for the interpreter.
+  And compiles the Ruby source to execute.
+  It returns an opaque pointer to the compiled source
+  or an internal special value.
+
+int ruby_run_node(void *n) ::
+
+  Runs the given compiled source and exits this process.
+  It returns EXIT_SUCCESS if successfully runs the source.
+  Otherwise, it returns other value.
+
+void ruby_script(char *name) ::
+
+  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_flag_t events,
+                         VALUE data)
+
+Adds a hook function for the specified interpreter events.
+events should be OR'ed value of:
+
+  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
+
+The definition of rb_event_hook_func_t is below:
+
+  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 Compatibility
+
+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 corresponding 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 for use in extconf.rb
+
+See documentation for {mkmf}[rdoc-ref:MakeMakefile].
+
+= Appendix D. Generational GC
+
+Ruby 2.1 introduced a generational garbage collector (called RGenGC).
+RGenGC (mostly) keeps compatibility.
+
+Generally, the use of the technique called write barriers is required in
+extension libraries for generational GC
+(http://en.wikipedia.org/wiki/Garbage_collection_%28computer_science%29).
+RGenGC works fine without write barriers in extension libraries.
+
+If your library adheres to the following tips, performance can
+be further improved. Especially, the "Don't touch pointers directly" section is
+important.
+
+== Incompatibility
+
+You can't write RBASIC(obj)->klass field directly because it is const
+value now.
+
+Basically you should not write this field because MRI expects it to be
+an immutable field, but if you want to do it in your extension you can
+use the following functions:
+
+VALUE rb_obj_hide(VALUE obj) ::
+
+  Clear RBasic::klass field. The object will be an internal object.
+  ObjectSpace::each_object can't find this object.
+
+VALUE rb_obj_reveal(VALUE obj, VALUE klass) ::
+
+  Reset RBasic::klass to be klass.
+  We expect the `klass' is hidden class by rb_obj_hide().
+
+== Write barriers
+
+RGenGC doesn't require write barriers to support generational GC.
+However, caring about write barrier can improve the performance of
+RGenGC. Please check the following tips.
+
+=== Don't touch pointers directly
+
+In MRI (include/ruby/ruby.h), some macros to acquire pointers to the
+internal data structures are supported such as RARRAY_PTR(),
+RSTRUCT_PTR() and so on.
+
+DO NOT USE THESE MACROS and instead use the corresponding C-APIs such as
+rb_ary_aref(), rb_ary_store() and so on.
+
+=== Consider whether to insert write barriers
+
+You don't need to care about write barriers if you only use built-in
+types.
+
+If you support T_DATA objects, you may consider using write barriers.
+
+Inserting write barriers into T_DATA objects only works with the
+following type objects: (a) long-lived objects, (b) when a huge number
+of objects are generated and (c) container-type objects that have
+references to other objects. If your extension provides such a type of
+T_DATA objects, consider inserting write barriers.
+
+(a): short-lived objects don't become old generation objects.
+(b): only a few oldgen objects don't have performance impact.
+(c): only a few references don't have performance impact.
+
+Inserting write barriers is a very difficult hack, it is easy to
+introduce critical bugs. And inserting write barriers has several areas
+of overhead. Basically we don't recommend you insert write barriers.
+Please carefully consider the risks.
+
+=== Combine with built-in types
+
+Please consider utilizing built-in types. Most built-in types support
+write barrier, so you can use them to avoid manually inserting write
+barriers.
+
+For example, if your T_DATA has references to other objects, then you
+can move these references to Array. A T_DATA object only has a reference
+to an array object. Or you can also use a Struct object to gather a
+T_DATA object (without any references) and an that Array contains
+references.
+
+With use of such techniques, you don't need to insert write barriers
+anymore.
+
+=== Insert write barriers
+
+[AGAIN] Inserting write barriers is a very difficult hack, and it is
+easy to introduce critical bugs. And inserting write barriers has
+several areas of overhead. Basically we don't recommend you insert write
+barriers. Please carefully consider the risks.
+
+Before inserting write barriers, you need to know about RGenGC algorithm
+(gc.c will help you). Macros and functions to insert write barriers are
+available in in include/ruby/ruby.h. An example is available in iseq.c.
+
+For a complete guide for RGenGC and write barriers, please refer to
+<https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RGenGC>.
+
+= Appendix E. RB_GC_GUARD to protect from premature GC
+
+C Ruby currently uses conservative garbage collection, thus VALUE
+variables must remain visible on the stack or registers to ensure any
+associated data remains usable.  Optimizing C compilers are not designed
+with conservative garbage collection in mind, so they may optimize away
+the original VALUE even if the code depends on data associated with that
+VALUE.
+
+The following example illustrates the use of RB_GC_GUARD to ensure
+the contents of sptr remain valid while the second invocation of
+rb_str_new_cstr is running.
+
+  VALUE s, w;
+  const char *sptr;
+
+  s = rb_str_new_cstr("hello world!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+  sptr = RSTRING_PTR(s);
+  w = rb_str_new_cstr(sptr + 6); /* Possible GC invocation */
+
+  RB_GC_GUARD(s); /* ensure s (and thus sptr) do not get GC-ed */
+
+In the above example, RB_GC_GUARD must be placed _after_ the last use of
+sptr.  Placing RB_GC_GUARD before dereferencing sptr would be of no use.
+RB_GC_GUARD is only effective on the VALUE data type, not converted C
+data types.
+
+RB_GC_GUARD would not be necessary at all in the above example if
+non-inlined function calls are made on the `s' VALUE after sptr is
+dereferenced.  Thus, in the above example, calling any un-inlined
+function on `s' such as:
+
+  rb_str_modify(s);
+
+Will ensure `s' stays on the stack or register to prevent a
+GC invocation from prematurely freeing it.
+
+Using the RB_GC_GUARD macro is preferable to using the "volatile"
+keyword in C.  RB_GC_GUARD has the following advantages:
+
+1) the intent of the macro use is clear
+
+2) RB_GC_GUARD only affects its call site, "volatile" generates some
+   extra code every time the variable is used, hurting optimization.
+
+3) "volatile" implementations may be buggy/inconsistent in some
+   compilers and architectures. RB_GC_GUARD is customizable for broken
+   systems/compilers without those without negatively affecting other
+   systems.
+
+/*
+ * Local variables:
+ * fill-column: 70
+ * end:
+ */
diff --git a/README.EXT.ja b/README.EXT.ja
index f884ecbb0e..0ab61abcbe 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -1 +1,1666 @@
-doc/extension.ja.rdocに移動しました
+# README.EXT.ja -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
+
+Rubyの拡張ライブラリの作り方を説明します．
+
+= 基礎知識
+
+Cの変数には型があり，データには型がありません．ですから，た
+とえばポインタをintの変数に代入すると，その値は整数として取
+り扱われます．逆にRubyの変数には型がなく，データに型がありま
+す．この違いのため，CとRubyは相互に変換しなければ，お互いの
+データをアクセスできません．
+
+RubyのデータはVALUEというCの型で表現されます．VALUE型のデー
+タはそのデータタイプを自分で知っています．このデータタイプと
+いうのはデータ(オブジェクト)の実際の構造を意味していて，Ruby
+のクラスとはまた違ったものです．
+
+VALUEからCにとって意味のあるデータを取り出すためには
+
+1. VALUEのデータタイプを知る
+2. VALUEをCのデータに変換する
+
+の両方が必要です．(1)を忘れると間違ったデータの変換が行われ
+て，最悪プログラムがcore dumpします．
+
+== データタイプ
+
+Rubyにはユーザが使う可能性のある以下のタイプがあります．
+
+T_NIL      :: nil
+T_OBJECT   :: 通常のオブジェクト
+T_CLASS    :: クラス
+T_MODULE   :: モジュール
+T_FLOAT    :: 浮動小数点数
+T_STRING   :: 文字列
+T_REGEXP   :: 正規表現
+T_ARRAY    :: 配列
+T_HASH     :: 連想配列
+T_STRUCT   :: (Rubyの)構造体
+T_BIGNUM   :: 多倍長整数
+T_FIXNUM   :: Fixnum(31bitまたは63bit長整数)
+T_COMPLEX  :: 複素数
+T_RATIONAL :: 有理数
+T_FILE     :: 入出力
+T_TRUE     :: 真
+T_FALSE    :: 偽
+T_DATA     :: データ
+T_SYMBOL   :: シンボル
+
+その他に内部で利用されている以下のタイプがあります．
+
+  T_ICLASS
+  T_MATCH
+  T_UNDEF
+  T_NODE
+  T_ZOMBIE
+
+ほとんどのタイプはCの構造体で実装されています．
+
+== VALUEのデータタイプをチェックする
+
+ruby.hではTYPE()というマクロが定義されていて，VALUEのデータ
+タイプを知ることが出来ます．TYPE()マクロは上で紹介したT_XXXX
+の形式の定数を返します．VALUEのデータタイプに応じて処理する
+場合には，TYPE()の値で分岐することになります．
+
+  switch (TYPE(obj)) {
+    case T_FIXNUM:
+      /* FIXNUMの処理 */
+      break;
+    case T_STRING:
+      /* 文字列の処理 */
+      break;
+    case T_ARRAY:
+      /* 配列の処理 */
+      break;
+    default:
+      /* 例外を発生させる */
+      rb_raise(rb_eTypeError, "not valid value");
+      break;
+  }
+
+それとデータタイプをチェックして，正しくなければ例外を発生す
+る関数が用意されています．
+
+  void Check_Type(VALUE value, int type)
+
+この関数はvalueがtypeで無ければ，例外を発生させます．引数と
+して与えられたVALUEのデータタイプが正しいかどうかチェックす
+るためには，この関数を使います．
+
+FIXNUMとNILに関してはより高速な判別マクロが用意されています．
+
+  FIXNUM_P(obj)
+  NIL_P(obj)
+
+== VALUEをCのデータに変換する
+
+データタイプがT_NIL，T_FALSE，T_TRUEである時，データはそれぞ
+れnil，false，trueです．このデータタイプのオブジェクトはひと
+つずつしか存在しません．
+
+データタイプが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はそのままキャスト(型変換)すれば構造体の
+ポインタに変換できます．
+
+構造体は「struct RXxxxx」という名前でruby.hで定義されていま
+す．例えば文字列は「struct RString」です．実際に使う可能性が
+あるのは文字列と配列くらいだと思います．
+
+ruby.hでは構造体へキャストするマクロも「RXXXXX()」(全部大文
+字にしたもの)という名前で提供されています(例: RSTRING())．た
+だし、構造体への直接のアクセスはできるだけ避け，対応する
+rb_xxxx() といった関数を使うようにして下さい．例えば，配列の
+要素へアクセスする場合は，rb_ary_entry(ary, offset)，
+rb_ary_store(ary, offset, obj) を利用するようにして下さい．
+
+構造体からデータを取り出すマクロが提供されています．文字列
+strの長さを得るためには「RSTRING_LEN(str)」とし，文字列strを
+char*として得るためには「RSTRING_PTR(str)」とします．
+
+Rubyの構造体を直接アクセスする時に気をつけなければならないこ
+とは，配列や文字列の構造体の中身は参照するだけで，直接変更し
+ないことです．直接変更した場合，オブジェクトの内容の整合性が
+とれなくなって，思わぬバグの原因になります．
+
+== CのデータをVALUEに変換する
+
+VALUEの実際の構造は
+
+FIXNUMの場合 ::
+
+  1bit左シフトして，LSBを立てる．
+
+その他のポインタの場合 ::
+
+  そのままVALUEにキャストする．
+
+となっています．よって，LSBをチェックすればVALUEがFIXNUMかど
+うかわかるわけです(ポインタのLSBが立っていないことを仮定して
+いる)．
+
+ですから，FIXNUM以外のRubyのオブジェクトの構造体は単にVALUE
+にキャストするだけでVALUEに変換出来ます．ただし，任意の構造
+体がVALUEにキャスト出来るわけではありません．キャストするの
+はRubyの知っている構造体(ruby.hで定義されているstruct RXxxx
+のもの)だけです．
+
+FIXNUMに関しては変換マクロを経由する必要があります．Cの整数
+からVALUEに変換するマクロは以下のものがあります．必要に応じ
+て使い分けてください．
+
+INT2FIX() :: もとの整数が31bitまたは63bit以内に収まる自信
+      	     がある時
+INT2NUM() :: 任意の整数からVALUEへ
+
+INT2NUM()は整数がFIXNUMの範囲に収まらない場合，Bignumに変換
+してくれます(が，少し遅い)．
+
+== Rubyのデータを操作する
+
+先程も述べた通り，Rubyの構造体をアクセスする時に内容の更新を
+行うことは勧められません．で，Rubyのデータを操作する時には
+Rubyが用意している関数を用いてください．
+
+ここではもっとも使われるであろう文字列と配列の生成/操作を行
+う関数をあげます(全部ではないです)．
+
+=== 文字列に対する関数
+
+rb_str_new(const char *ptr, long len) ::
+
+  新しい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)
+
+  汚染マークが付加された新しいRubyの文字列を生成する．外部
+  からのデータに基づく文字列には汚染マークが付加されるべき
+  である．
+
+rb_tainted_str_new2(const char *ptr)
+rb_tainted_str_new_cstr(const char *ptr)
+
+  Cの文字列から汚染マークが付加されたRubyの文字列を生成する．
+
+rb_sprintf(const char *format, ...)
+rb_vsprintf(const char *format, va_list ap)
+
+  Cの文字列formatと続く引数をprintf(3)のフォーマットにしたがって
+  整形し，Rubyの文字列を生成する．
+
+  注意: %iはObject#to_s('+'フラグが指定されているときはObject#inspect)を
+  使ったVALUEの出力に使用されているため，整数には%dを使用すること．
+
+rb_str_cat(VALUE str, const char *ptr, long len)
+
+  Rubyの文字列strにlenバイトの文字列ptrを追加する．
+
+rb_str_cat2(VALUE str, const char* ptr)
+rb_str_cat_cstr(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)
+rb_enc_str_new_cstr(const char *ptr, 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_str_resize(VALUE str, long len)
+
+  Rubyの文字列のサイズをlenバイトに変更する．strの長さは前
+  以てセットされていなければならない．lenが元の長さよりも短
+  い時は，lenバイトを越えた部分の内容は捨てられる．lenが元
+  の長さよりも長い時は，元の長さを越えた部分の内容は保存さ
+  れないでゴミになるだろう．この関数の呼び出しによって
+  RSTRING_PTR(str)が変更されるかもしれないことに注意．
+
+rb_str_set_len(VALUE str, long len)
+
+  Rubyの文字列のサイズをlenバイトにセットする．strが変更可
+  能でなければ例外が発生する．RSTRING_LEN(str)とは無関係に，
+  lenバイトまでの内容は保存される．lenはstrの容量を越えてい
+  てはならない．
+
+
+== 配列に対する関数
+
+rb_ary_new()
+
+  要素が0の配列を生成する．
+
+rb_ary_new2(long len)
+rb_ary_new_capa(long len)
+
+  要素が0の配列を生成する．len要素分の領域をあらかじめ割り
+  当てておく．
+
+rb_ary_new3(long n, ...)
+rb_ary_new_from_args(long n, ...)
+
+  引数で指定したn要素を含む配列を生成する．
+
+rb_ary_new4(long n, VALUE *elts)
+rb_ary_new_from_values(long n, VALUE *elts)
+
+  配列で与えた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_store(VALUE ary, long offset, VALUE obj) ::
+
+  ary[offset] = obj
+
+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)
+
+rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
+
+  配列aryにptrからlen個のオブジェクトを追加する．
+
+= Rubyの機能を使う
+
+原理的にRubyで書けることはCでも書けます．RubyそのものがCで記
+述されているんですから，当然といえば当然なんですけど．ここで
+はRubyの拡張に使うことが多いだろうと予測される機能を中心に紹
+介します．
+
+== Rubyに機能を追加する
+
+Rubyで提供されている関数を使えばRubyインタプリタに新しい機能
+を追加することができます．Rubyでは以下の機能を追加する関数が
+提供されています．
+
+* クラス，モジュール
+* メソッド，特異メソッドなど
+* 定数
+
+では順に紹介します．
+
+=== クラス/モジュール定義
+
+クラスやモジュールを定義するためには，以下の関数を使います．
+
+  VALUE rb_define_class(const char *name, VALUE super)
+  VALUE rb_define_module(const char *name)
+
+これらの関数は新しく定義されたクラスやモジュールを返します．
+メソッドや定数の定義にこれらの値が必要なので，ほとんどの場合
+は戻り値を変数に格納しておく必要があるでしょう．
+
+クラスやモジュールを他のクラスの内部にネストして定義する時に
+は以下の関数を使います．
+
+  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
+  VALUE rb_define_module_under(VALUE outer, const char *name)
+
+=== メソッド/特異メソッド定義
+
+メソッドや特異メソッドを定義するには以下の関数を使います．
+
+  void rb_define_method(VALUE klass, const char *name,
+                        VALUE (*func)(), int argc)
+
+  void rb_define_singleton_method(VALUE object, const char *name,
+                                  VALUE (*func)(), int argc)
+
+
+念のため説明すると「特異メソッド」とは，その特定のオブジェク
+トに対してだけ有効なメソッドです．RubyではよくSmalltalkにお
+けるクラスメソッドとして，クラスに対する特異メソッドが使われ
+ます．
+
+これらの関数の argcという引数はCの関数へ渡される引数の数(と
+形式)を決めます．argcが0以上の時は関数に引き渡す引数の数を意
+味します．16個以上の引数は使えません(が，要りませんよね，そ
+んなに)．実際の関数には先頭の引数としてselfが与えられますの
+で，指定した数より1多い引数を持つことになります．
+
+argcが負の時は引数の数ではなく，形式を指定したことになります．
+argcが-1の時は引数を配列に入れて渡されます．argcが-2の時は引
+数はRubyの配列として渡されます．
+
+メソッドを定義する関数はまだいくつかあります. ひとつはメソッド
+名として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メソッドとは関数形式でしか呼び出すことの出来ないメソッ
+ドです．
+
+最後に， rb_define_module関数はモジュール関数を定義します．
+モジュール関数とはモジュールの特異メソッドであり，同時に
+privateメソッドでもあるものです．例をあげるとMathモジュール
+のsqrt()などがあげられます．このメソッドは
+
+  Math.sqrt(4)
+
+という形式でも
+
+  include Math
+  sqrt(4)
+
+という形式でも使えます．モジュール関数を定義する関数は以下の
+通りです．
+
+  void rb_define_module_function(VALUE module, const char *name,
+		                 VALUE (*func)(), int argc)
+
+関数的メソッド(Kernelモジュールのprivate method)を定義するた
+めの関数は以下の通りです．
+
+  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はクラスを引数として受け取って，新しく割り当てられたイン
+スタンスを返さなくてはなりません．このインスタンスは，外部リ
+ソースなどを含まない，できるだけ「空」のままにしておいたほう
+がよいでしょう．
+
+=== 定数定義
+
+拡張ライブラリが必要な定数はあらかじめ定義しておいた方が良い
+でしょう．定数を定義する関数は二つあります．
+
+  void rb_define_const(VALUE klass, const char *name, VALUE val)
+  void rb_define_global_const(const char *name, VALUE val)
+
+前者は特定のクラス/モジュールに属する定数を定義するもの，後
+者はグローバルな定数を定義するものです．
+
+== Rubyの機能をCから呼び出す
+
+既に『1.5 Rubyのデータを操作する』で一部紹介したような関数を
+使えば，Rubyの機能を実現している関数を直接呼び出すことが出来
+ます．
+
+# このような関数の一覧表はいまのところありません．ソースを見
+# るしかないですね．
+
+それ以外にもRubyの機能を呼び出す方法はいくつかあります．
+
+=== Rubyのプログラムをevalする
+
+CからRubyの機能を呼び出すもっとも簡単な方法として，文字列で
+与えられたRubyのプログラムを評価する以下の関数があります．
+
+  VALUE rb_eval_string(const char *str)
+
+この評価は現在の環境で行われます．つまり，現在のローカル変数
+などを受け継ぎます．
+
+評価は例外を発生するかもしれないことに注意しましょう. より安全
+な関数もあります.
+
+  VALUE rb_eval_string_protect(const char *str, int *state)
+
+この関数はエラーが発生するとnilを返します．そして，成功時には
+*stateはゼロに，さもなくば非ゼロになります．
+
+=== IDまたはシンボル
+
+Cから文字列を経由せずにRubyのメソッドを呼び出すこともできま
+す．その前に，Rubyインタプリタ内でメソッドや変数名を指定する
+時に使われているIDについて説明しておきましょう．
+
+IDとは変数名，メソッド名を表す整数です．Rubyの中では
+
+ :識別子
+
+または
+
+ :"任意の文字列"
+
+でアクセスできます．Cからこの整数を得るためには関数
+
+  rb_intern(const char *name)
+  rb_intern_str(VALUE name)
+
+を使います．Rubyから引数として与えられたシンボル(または文字
+列)をIDに変換するには以下の関数を使います．
+
+  rb_to_id(VALUE symbol)
+  rb_check_id(volatile VALUE *name)
+  rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
+
+もし引数がシンボルでも文字列でもなければ，to_strメソッドで文
+字列に変換しようとします．第二の関数はその変換結果を*nameに保
+存し,その名前が既知のシンボルでない場合は0を返します．この関
+数が0以外を返した場合は*nameは常にシンボルか文字列であり，0を
+返した場合は常に文字列です．第三の関数はRubyの文字列ではなく
+NUL終端されたCの文字列を使います．
+
+Rubyから引数として与えられたシンボル(または文字列)をシンボル
+に変換するには以下の関数を使います．
+
+  rb_to_symbol(VALUE name)
+  rb_check_symbol(volatile VALUE *namep)
+  rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
+
+これらの関数は，IDの代わりにシンボルを返すことを除けば上記の
+関数と同じです．
+
+=== CからRubyのメソッドを呼び出す
+
+Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
+の関数を使います．
+
+  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
+
+この関数はオブジェクトrecvのmidで指定されるメソッドを呼び出
+します．その他に引数の指定の仕方が違う以下の関数もあります．
+
+  VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+  VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv)
+  VALUE rb_apply(VALUE recv, ID mid, VALUE args)
+
+applyには引数としてRubyの配列を与えます．
+
+=== 変数/定数を参照/更新する
+
+Cから関数を使って参照・更新できるのは，定数，インスタンス変
+数です．大域変数は一部のものはCの大域変数としてアクセスでき
+ます．ローカル変数を参照する方法は公開していません．
+
+オブジェクトのインスタンス変数を参照・更新する関数は以下の通
+りです．
+
+  VALUE rb_ivar_get(VALUE obj, ID id)
+  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
+
+idはrb_intern()で得られるものを使ってください．
+
+定数を参照するには以下の関数を使ってください．
+
+  VALUE rb_const_get(VALUE obj, ID id)
+
+定数を新しく定義するためには『2.1.3 定数定義』で紹介さ
+れている関数を使ってください．
+
+= RubyとCとの情報共有
+
+C言語とRubyの間で情報を共有する方法について解説します．
+
+== Cから参照できるRubyの定数
+
+以下のRubyの定数はCのレベルから参照できます．
+
+  Qtrue
+  Qfalse
+
+真偽値．QfalseはC言語でも偽とみなされます(つまり0)．
+
+  Qnil
+
+C言語から見た「nil」．
+
+== CとRubyで共有される大域変数
+
+CとRubyで大域変数を使って情報を共有できます．共有できる大域
+変数にはいくつかの種類があります．そのなかでもっとも良く使わ
+れると思われるのはrb_define_variable()です．
+
+  void rb_define_variable(const char *name, VALUE *var)
+
+この関数はRubyとCとで共有する大域変数を定義します．変数名が
+`$'で始まらない時には自動的に追加されます．この変数の値を変
+更すると自動的にRubyの対応する変数の値も変わります．
+
+またRuby側からは更新できない変数もあります．このread onlyの
+変数は以下の関数で定義します．
+
+  void rb_define_readonly_variable(const char *name, VALUE *var)
+
+これら変数の他にhookをつけた大域変数を定義できます．hook付き
+の大域変数は以下の関数を用いて定義します．hook付き大域変数の
+値の参照や設定はhookで行う必要があります．
+
+  void rb_define_hooked_variable(const char *name, VALUE *var,
+				 VALUE (*getter)(), void (*setter)())
+
+この関数はCの関数によってhookのつけられた大域変数を定義しま
+す．変数が参照された時には関数getterが，変数に値がセットされ
+た時には関数setterが呼ばれる．hookを指定しない場合はgetterや
+setterに0を指定します．
+# getterもsetterも0ならばrb_define_variable()と同じになる．
+
+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)())
+
+この関数によって定義されたRubyの大域変数が参照された時には
+getterが，変数に値がセットされた時にはsetterが呼ばれます．
+
+getterとsetterの仕様は以下の通りです．
+
+  (*getter)(ID id);
+  (*setter)(VALUE val, ID id);
+
+== CのデータをRubyオブジェクトにする
+
+Cの世界で定義されたデータ(構造体)をRubyのオブジェクトとして
+取り扱いたい場合がありえます．このような場合には，Dataという
+RubyオブジェクトにCの構造体(へのポインタ)をくるむことでRuby
+オブジェクトとして取り扱えるようになります．
+
+Dataオブジェクトを生成して構造体をRubyオブジェクトにカプセル
+化するためには，以下のマクロを使います．
+
+  Data_Wrap_Struct(klass, mark, free, sval)
+
+このマクロの戻り値は生成されたDataオブジェクトです．
+
+klassはこのDataオブジェクトのクラスです．markはこの構造体が
+Rubyのオブジェクトへの参照がある時に使う関数です．そのような
+参照を含まない時には0を指定します．
+
+# そのような参照は勧められません．
+
+freeはこの構造体がもう不要になった時に呼ばれる関数です．この
+関数がガーベージコレクタから呼ばれます．これが-1の場合は，単
+純に開放されます．
+
+markおよびfree関数はGC実行中に呼び出されます.
+なお, GC実行中はRubyオブジェクトのアロケーションは禁止されま
+す. よって, markおよびfree関数でRubyオブジェクトのアロケーシ
+ョンは行わないでください.
+
+Cの構造体の割当とDataオブジェクトの生成を同時に行うマクロと
+して以下のものが提供されています．
+
+  Data_Make_Struct(klass, type, mark, free, sval)
+
+このマクロの戻り値は生成されたDataオブジェクトです．このマク
+ロは以下の式のように働きます:
+
+  (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
+
+klass, mark, freeはData_Wrap_Structと同じ働きをします．type
+は割り当てるC構造体の型です．割り当てられた構造体は変数sval
+に代入されます．この変数の型は (type*) である必要があります．
+
+Dataオブジェクトからポインタを取り出すのは以下のマクロを用い
+ます．
+
+  Data_Get_Struct(obj, type, sval)
+
+Cの構造体へのポインタは変数svalに代入されます．
+
+これらのDataの使い方はちょっと分かりにくいので，後で説明する
+例題を参照してください．
+
+= 例題 - dbmパッケージを作る
+
+ここまでの説明でとりあえず拡張ライブラリは作れるはずです．
+Rubyのextディレクトリにすでに含まれているdbmライブラリを例に
+して段階的に説明します．
+
+== ディレクトリを作る
+
+  % mkdir ext/dbm
+
+Ruby 1.1からは任意のディレクトリでダイナミックライブラリを作
+ることができるようになりました．Rubyに静的にリンクする場合に
+はRubyを展開したディレクトリの下，extディレクトリの中に拡張
+ライブラリ用のディレクトリを作る必要があります．名前は適当に
+選んで構いません．
+
+== 設計する
+
+まあ，当然なんですけど，どういう機能を実現するかどうかまず設
+計する必要があります．どんなクラスをつくるか，そのクラスには
+どんなメソッドがあるか，クラスが提供する定数などについて設計
+します．
+
+== Cコードを書く
+
+拡張ライブラリ本体となるC言語のソースを書きます．C言語のソー
+スがひとつの時には「ライブラリ名.c」を選ぶと良いでしょう．C
+言語のソースが複数の場合には逆に「ライブラリ名.c」というファ
+イル名は避ける必要があります．オブジェクトファイルとモジュー
+ル生成時に中間的に生成される「ライブラリ名.o」というファイル
+とが衝突するからです．また，後述する mkmf ライブラリのいくつ
+かの関数がコンパイルを要するテストのために「conftest.c」とい
+うファイル名を使用することに注意してください．ソースファイル
+名として「conftest.c」を使用してはなりません．
+
+Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名」と
+いう関数を自動的に実行します．dbmライブラリの場合「Init_dbm」
+です．この関数の中でクラス，モジュール，メソッド，定数などの
+定義を行います．dbm.cから一部引用します．
+
+  void
+  Init_dbm(void)
+  {
+      /* DBMクラスを定義する */
+      cDBM = rb_define_class("DBM", rb_cObject);
+      /* DBMはEnumerableモジュールをインクルードする */
+      rb_include_module(cDBM, rb_mEnumerable);
+
+      /* DBMクラスのクラスメソッドopen(): 引数はCの配列で受ける */
+      rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
+
+      /* DBMクラスのメソッドclose(): 引数はなし */
+      rb_define_method(cDBM, "close", fdbm_close, 0);
+      /* DBMクラスのメソッド[]: 引数は1個 */
+      rb_define_method(cDBM, "[]", fdbm_fetch, 1);
+
+      /* ... */
+
+      /* DBMデータを格納するインスタンス変数名のためのID */
+      id_dbm = rb_intern("dbm");
+  }
+
+DBMライブラリはdbmのデータと対応するオブジェクトになるはずで
+すから，Cの世界のdbmをRubyの世界に取り込む必要があります．
+
+dbm.cではData_Make_Structを以下のように使っています．
+
+  struct dbmdata {
+      int  di_size;
+      DBM *di_dbm;
+  };
+
+
+  obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
+
+ここではdbmstruct構造体へのポインタをDataにカプセル化してい
+ます．DBM*を直接カプセル化しないのはclose()した時の処理を考
+えてのことです．
+
+Dataオブジェクトからdbmstruct構造体のポインタを取り出すため
+に以下のマクロを使っています．
+
+  #define GetDBM(obj, dbmp) do {\
+      Data_Get_Struct(obj, struct dbmdata, dbmp);\
+      if (dbmp->di_dbm == 0) closed_dbm();\
+  } while (0)
+
+ちょっと複雑なマクロですが，要するにdbmdata構造体のポインタ
+の取り出しと，closeされているかどうかのチェックをまとめてい
+るだけです．
+
+DBMクラスにはたくさんメソッドがありますが，分類すると3種類の
+引数の受け方があります．ひとつは引数の数が固定のもので，例と
+してはdeleteメソッドがあります．deleteメソッドを実装している
+fdbm_delete()はこのようになっています．
+
+  static VALUE
+  fdbm_delete(VALUE obj, VALUE keystr)
+  {
+      /* ... */
+  }
+
+引数の数が固定のタイプは第1引数がself，第2引数以降がメソッド
+の引数となります．
+
+引数の数が不定のものはCの配列で受けるものとRubyの配列で受け
+るものとがあります．dbmライブラリの中で，Cの配列で受けるもの
+はDBMのクラスメソッドであるopen()です．これを実装している関
+数fdbm_s_open()はこうなっています．
+
+  static VALUE
+  fdbm_s_open(int argc, VALUE *argv, VALUE klass)
+  {
+      /* ... */
+
+      if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
+  	mode = 0666;		/* default value */
+      }
+
+      /* ... */
+  }
+
+このタイプの関数は第1引数が与えられた引数の数，第2引数が与え
+られた引数の入っている配列になります．selfは第3引数として与
+えられます．
+
+この配列で与えられた引数を解析するための関数がopen()でも使わ
+れているrb_scan_args()です．第3引数に指定したフォーマットに従
+い，第4変数以降に指定したVALUEへの参照に値を代入してくれま
+す．
+
+
+引数をRubyの配列として受け取るメソッドの例には
+Thread#initializeがあります．実装はこうです．
+
+  static VALUE
+  thread_initialize(VALUE thread, VALUE args)
+  {
+      /* ... */
+  }
+
+第1引数はself，第2引数はRubyの配列です．
+
+*注意事項*
+
+Rubyと共有はしないがRubyのオブジェクトを格納する可能性のある
+Cの大域変数は以下の関数を使ってRubyインタプリタに変数の存在
+を教えてあげてください．でないとGCでトラブルを起こします．
+
+  void rb_global_variable(VALUE *var)
+
+== extconf.rbを用意する
+
+Makefileを作る場合の雛型になるextconf.rbというファイルを作り
+ます．extconf.rbはライブラリのコンパイルに必要な条件のチェッ
+クなどを行うことが目的です．まず，
+
+  require 'mkmf'
+
+をextconf.rbの先頭に置きます．extconf.rbの中では以下のRuby関
+数を使うことが出来ます．
+
+  have_library(lib, func): ライブラリの存在チェック
+  have_func(func, header): 関数の存在チェック
+  have_header(header): ヘッダファイルの存在チェック
+  create_makefile(target[, target_prefix]): Makefileの生成
+
+以下の変数を使うことができます．
+
+  $CFLAGS: コンパイル時に追加的に指定するフラグ(-Oなど)
+  $CPPFLAGS: プリプロセッサに追加的に指定するフラグ(-Iや-Dなど)
+  $LDFLAGS: リンク時に追加的に指定するフラグ(-Lなど)
+  $objs: リンクされるオブジェクトファイル名のリスト
+
+オブジェクトファイルのリストは，通常はソースファイルを検索し
+て自動的に生成されますが，makeの途中でソースを生成するような
+場合は明示的に指定する必要があります．
+
+ライブラリをコンパイルする条件が揃わず，そのライブラリをコン
+パイルしない時にはcreate_makefileを呼ばなければMakefileは生
+成されず，コンパイルも行われません．
+
+== dependを用意する
+
+もし，ディレクトリにdependというファイルが存在すれば，
+Makefileが依存関係をチェックしてくれます．
+
+  % gcc -MM *.c > depend
+
+などで作ることが出来ます．あって損は無いでしょう．
+
+== Makefileを生成する
+
+Makefileを実際に生成するためには
+
+  ruby extconf.rb
+
+とします．extconf.rbに require 'mkmf' の行がない場合にはエラー
+になりますので，引数を追加して
+
+  ruby -r mkmf extconf.rb
+
+としてください．
+
+site_ruby ディレクトリでなく，
+vendor_ruby ディレクトリにインストールする場合には
+以下のように --vendor オプションを加えてください．
+
+  ruby extconf.rb --vendor
+
+ディレクトリをext以下に用意した場合にはRuby全体のmakeの時に
+自動的にMakefileが生成されますので，このステップは不要です．
+
+== makeする
+
+動的リンクライブラリを生成する場合にはその場でmakeしてくださ
+い．必要であれば make install でインストールされます．
+
+ext以下にディレクトリを用意した場合は，Rubyのディレクトリで
+makeを実行するとMakefileを生成からmake，必要によってはそのモ
+ジュールのRubyへのリンクまで自動的に実行してくれます．
+extconf.rbを書き換えるなどしてMakefileの再生成が必要な時はま
+たRubyディレクトリでmakeしてください．
+
+拡張ライブラリはmake installでRubyライブラリのディレクトリの
+下にコピーされます．もし拡張ライブラリと協調して使うRubyで記
+述されたプログラムがあり，Rubyライブラリに置きたい場合には，
+拡張ライブラリ用のディレクトリの下に lib というディレクトリ
+を作り，そこに 拡張子 .rb のファイルを置いておけば同時にイン
+ストールされます．
+
+== デバッグ
+
+まあ，デバッグしないと動かないでしょうね．ext/Setupにディレ
+クトリ名を書くと静的にリンクするのでデバッガが使えるようにな
+ります．その分コンパイルが遅くなりますけど．
+
+== できあがり
+
+後はこっそり使うなり，広く公開するなり，売るなり，ご自由にお
+使いください．Rubyの作者は拡張ライブラリに関して一切の権利を
+主張しません．
+
+= Appendix A. Rubyのソースコードの分類
+
+Rubyのソースはいくつかに分類することが出来ます．このうちクラ
+スライブラリの部分は基本的に拡張ライブラリと同じ作り方になっ
+ています．これらのソースは今までの説明でほとんど理解できると
+思います．
+
+== Ruby言語のコア
+
+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
+  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
+
+== ユーティリティ関数
+
+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      :: 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#sprintf
+string.c     :: String
+struct.c     :: Struct
+time.c       :: Time
+defs/known_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. 拡張用関数リファレンス
+
+C言語からRubyの機能を利用するAPIは以下の通りである．
+
+== 型
+
+VALUE ::
+
+  Rubyオブジェクトを表現する型．必要に応じてキャストして用いる．
+  組み込み型を表現するCの型はruby.hに記述してあるRで始まる構造
+  体である．VALUE型をこれらにキャストするためにRで始まる構造体
+  名を全て大文字にした名前のマクロが用意されている．
+
+== 変数・定数
+
+Qnil ::
+
+  定数: nilオブジェクト
+
+Qtrue ::
+
+  定数: trueオブジェクト(真のデフォルト値)
+
+Qfalse ::
+
+  定数: falseオブジェクト
+
+== Cデータのカプセル化
+
+Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
+
+  Cの任意のポインタをカプセル化したRubyオブジェクトを返す．こ
+  のポインタがRubyからアクセスされなくなった時，freeで指定した
+  関数が呼ばれる．また，このポインタの指すデータが他のRubyオブ
+  ジェクトを指している場合，markに指定する関数でマークする必要
+  がある．
+
+Data_Make_Struct(klass, type, mark, free, sval) ::
+
+  type型のメモリをmallocし，変数svalに代入した後，それをカプセ
+  ル化したデータを返すマクロ．
+
+Data_Get_Struct(data, type, sval) ::
+
+  dataからtype型のポインタを取り出し変数svalに代入するマクロ．
+
+== 型チェック
+
+  TYPE(value)
+  FIXNUM_P(value)
+  NIL_P(value)
+  void Check_Type(VALUE value, int type)
+  SafeStringValue(value)
+
+== 型変換
+
+  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)
+  rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags)
+  NUM2DBL(value)
+  rb_float_new(f)
+  RSTRING_LEN(str)
+  RSTRING_PTR(str)
+  StringValue(value)
+  StringValuePtr(value)
+  StringValueCStr(value)
+  rb_str_new2(s)
+
+== クラス/モジュール定義
+
+VALUE rb_define_class(const char *name, VALUE super) ::
+
+  superのサブクラスとして新しいRubyクラスを定義する．
+
+VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
+
+  superのサブクラスとして新しいRubyクラスを定義し，moduleの
+  定数として定義する．
+
+VALUE rb_define_module(const char *name) ::
+
+  新しいRubyモジュールを定義する．
+
+VALUE rb_define_module_under(VALUE module, const char *name) ::
+
+  新しいRubyモジュールを定義し，moduleの定数として定義する．
+
+void rb_include_module(VALUE klass, VALUE module) ::
+
+  モジュールをインクルードする．classがすでにmoduleをインク
+  ルードしている時には何もしない(多重インクルードの禁止)．
+
+void rb_extend_object(VALUE object, VALUE module) ::
+
+  オブジェクトをモジュール(で定義されているメソッド)で拡張する．
+
+== 大域変数定義
+
+void rb_define_variable(const char *name, VALUE *var) ::
+
+  RubyとCとで共有するグローバル変数を定義する．変数名が`$'で
+  始まらない時には自動的に追加される．nameとしてRubyの識別子
+  として許されない文字(例えば` ')を含む場合にはRubyプログラ
+  ムからは見えなくなる．
+
+void rb_define_readonly_variable(const char *name, VALUE *var) ::
+
+  RubyとCとで共有するread onlyのグローバル変数を定義する．
+  read onlyであること以外はrb_define_variable()と同じ．
+
+void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) ::
+
+  関数によって実現されるRuby変数を定義する．変数が参照された
+  時にはgetterが，変数に値がセットされた時にはsetterが呼ばれ
+  る．
+
+void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) ::
+
+  関数によってhookのつけられたグローバル変数を定義する．変数
+  が参照された時にはgetterが，関数に値がセットされた時には
+  setterが呼ばれる．getterやsetterに0を指定した時にはhookを
+  指定しないのと同じ事になる．
+
+void rb_global_variable(VALUE *var)
+
+  GCのため，Rubyプログラムからはアクセスされないが, Rubyオブ
+  ジェクトを含む大域変数をマークする．
+
+== 定数
+
+void rb_define_const(VALUE klass, const char *name, VALUE val) ::
+
+  定数を定義する．
+
+void rb_define_global_const(const char *name, VALUE val) ::
+
+  大域定数を定義する．
+
+    rb_define_const(rb_cObject, name, val)
+
+  と同じ意味．
+
+== メソッド定義
+
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+
+  メソッドを定義する．argcはselfを除く引数の数．argcが-1の時,
+  関数には引数の数(selfを含まない)を第1引数, 引数の配列を第2
+  引数とする形式で与えられる(第3引数はself)．argcが-2の時,
+  第1引数がself, 第2引数がargs(argsは引数を含むRubyの配列)と
+  いう形式で与えられる．
+
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+
+  privateメソッドを定義する．引数はrb_define_method()と同じ．
+
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
+
+  特異メソッドを定義する．引数はrb_define_method()と同じ．
+
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
+
+  argc, argv形式で与えられた指定されたフォーマットに従って引
+  数を分解し，続くVALUEへの参照にセットします．このフォーマッ
+  トは，ABNFで記述すると以下の通りです．
+
+    scan-arg-spec  := param-arg-spec [option-hash-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
+    option-hash-arg-spec := sym-for-option-hash-arg
+    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-option-hash-arg        := ":"   ; オプションハッシュを取得する
+                                            ; ための指定; 省略不能な引数の
+                                            ; 数よりも多くの引数が指定され，
+                                            ; 最後の引数がハッシュ（または
+                                            ; #to_hashで変換可能）の場合に
+                                            ; 取得される．最後の引数がnilの
+                                            ; 場合，可変長引数指定がなく，
+                                            ; 省略不能引数の数よりも多くの
+                                            ; 引数が指定された場合に取得される
+    sym-for-block-arg              := "&"   ; イテレータブロックを取得するための
+                                            ; 指定
+
+  フォーマットが"12"の場合，引数は最低1つで，3つ(1+2)まで許さ
+  れるという意味になります．従って，フォーマット文字列に続い
+  て3つのVALUEへの参照を置く必要があります．それらには取得した
+  変数がセットされます．変数への参照の代わりにNULLを指定する
+  こともでき，その場合は取得した引数の値は捨てられます．なお，
+  省略可能引数が省略された時の変数の値はnil(C言語のレベルでは
+  Qnil)になります．
+
+  返り値は与えられた引数の数です．オプションハッシュおよびイ
+  テレータブロックは数えません．
+
+== Rubyメソッド呼び出し
+
+VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
+
+  メソッド呼び出し．文字列からmidを得るためにはrb_intern()を
+  使う．
+  private/protectedなメソッドでも呼び出せる．
+
+VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
+VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  メソッド呼び出し．引数をargc, argv形式で渡す．
+  private/protectedなメソッドでも呼び出せる．
+
+VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  メソッド呼び出し．
+  publicなメソッドしか呼べない．
+
+VALUE rb_eval_string(const char *str)
+
+  文字列をRubyスクリプトとしてコンパイル・実行する．
+
+ID rb_intern(const char *name) ::
+
+  文字列に対応するIDを返す．
+
+char *rb_id2name(ID id) ::
+
+  IDに対応する文字列を返す(デバッグ用)．
+
+char *rb_class2name(VALUE klass) ::
+
+  クラスの名前を返す(デバッグ用)．クラスが名前を持たない時に
+  は, 祖先を遡って名前を持つクラスの名前を返す．
+
+int rb_respond_to(VALUE obj, ID id) ::
+
+  objがidで示されるメソッドを持つかどうかを返す．
+
+== インスタンス変数
+
+VALUE rb_iv_get(VALUE obj, const char *name) ::
+
+  objのインスタンス変数の値を得る．`@'で始まらないインスタン
+  ス変数は Rubyプログラムからアクセスできない「隠れた」イン
+  スタンス変数になる．定数は大文字の名前を持つクラス(または
+  モジュール)のインスタンス変数として実装されている．
+
+VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
+
+  objのインスタンス変数をvalにセットする．
+
+== 制御構造
+
+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を値としてイテレータブロックを呼び出す．
+
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+
+  関数func1をarg1を引数に呼び出す．func1の実行中に例外が発生
+  した時には func2をarg2を引数として呼ぶ．戻り値は例外が発生
+  しなかった時はfunc1の戻り値, 例外が発生した時にはfunc2の戻
+  り値である．
+
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
+
+  関数func1をarg1を引数として実行し, 実行終了後(たとえ例外が
+  発生しても) func2をarg2を引数として実行する．戻り値はfunc1
+  の戻り値である(例外が発生した時は戻らない)．
+
+VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
+
+  関数funcをargを引数として実行し, 例外が発生しなければその戻
+  り値を返す．例外が発生した場合は, *stateに非0をセットして
+  Qnilを返す．
+  rb_jump_tag()を呼ばずに捕捉した例外を無視する場合には，
+  rb_set_errinfo(Qnil)でエラー情報をクリアしなければならない．
+
+void rb_jump_tag(int state) ::
+
+  rb_protect()やrb_eval_string_protect()で捕捉された例外を再
+  送する．stateはそれらの関数から返された値でなければならない．
+  この関数は直接の呼び出し元に戻らない．
+
+void rb_iter_break() ::
+
+  現在の最も内側のブロックを終了する．この関数は直接の呼び出
+  し元に戻らない．
+
+void rb_iter_break_value(VALUE value) ::
+
+  現在の最も内側のブロックをvalueで終了する．ブロックは引数で
+  与えられたvalueを返す．この関数は直接の呼び出し元に戻らない．
+
+== 例外・エラー
+
+void rb_warning(const char *fmt, ...) ::
+
+  rb_verbose時に標準エラー出力に警告情報を表示する．引数は
+  printf()と同じ．
+
+void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
+
+  RuntimeError例外を発生させる．引数はprintf()と同じ．
+
+void rb_raise(VALUE exception, const char *fmt, ...) ::
+
+  exceptionで指定した例外を発生させる．fmt以下の引数は
+  printf()と同じ．
+
+void rb_fatal(const char *fmt, ...) ::
+
+  致命的例外を発生させる．通常の例外処理は行なわれず, インター
+  プリタが終了する(ただしensureで指定されたコードは終了前に
+  実行される)．
+
+void rb_bug(const char *fmt, ...) ::
+
+  インタープリタなどプログラムのバグでしか発生するはずのない
+  状況の時呼ぶ．インタープリタはコアダンプし直ちに終了する．
+  例外処理は一切行なわれない．
+
+注意: %iはObject#to_s('+'フラグが指定されているときはObject#inspect)を
+使ったVALUEの出力に使用されているため，整数には%dを使用すること．
+
+== Rubyの初期化・実行
+
+Rubyをアプリケーションに埋め込む場合には以下のインタフェース
+を使う．通常の拡張ライブラリには必要ない．
+
+void ruby_init() ::
+
+  Rubyインタプリタの初期化を行なう．
+
+void *ruby_options(int argc, char **argv) ::
+
+  Rubyインタプリタのコマンドライン引数の処理を行ない，
+  Rubyのソースコードをコンパイルする．
+  コンパイルされたソースへのポインタ，もしくは特殊値を返す.
+
+int ruby_run_node(void *n) ::
+
+  コンパイルされたコードを実行する．
+  実行に成功した場合はEXIT_SUCCESSを，エラーが起こったときはそれ以外を返す．
+
+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で使える関数たち
+
+extconf.rbの中では利用可能なコンパイル条件チェックの関数は以
+下の通りである．
+
+have_macro(macro, headers) ::
+
+  ヘッダファイルheaderをインクルードしてマクロmacroが定義さ
+  れているかどうかチェックする．マクロが定義されている時true
+  を返す．
+
+have_library(lib, func) ::
+
+  関数funcを定義しているライブラリlibの存在をチェックする．
+  チェックに成功すると，-llibを$libsに追加し，trueを返す．
+
+find_library(lib, func, path...) ::
+
+  関数funcを定義しているライブラリlibの存在を -Lpath を追加
+  しながらチェックする．チェックに成功すると，-llibを$libsに
+  追加し，trueを返す．
+
+have_func(func, header) ::
+
+  ヘッダファイルheaderをインクルードして関数funcの存在をチェ
+  ックする．funcが標準ではリンクされないライブラリ内のもので
+  ある時には先にhave_libraryでそのライブラリをチェックしてお
+  く事．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_{FUNC}` を定義し，trueを返す．
+
+have_var(var, header) ::
+
+  ヘッダファイルheaderをインクルードして変数varの存在をチェッ
+  クする．varが標準ではリンクされないライブラリ内のものであ
+  る時には先にhave_libraryでそのライブラリをチェックしておく
+  事．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_{VAR}` を定義し，trueを返す．
+
+have_header(header) ::
+
+  ヘッダファイルの存在をチェックする．チェックに成功すると，
+  プリプロセッサマクロ `HAVE_{HEADER_H}` を定義し，trueを返す．
+  (スラッシュやドットはアンダースコアに置換される)
+
+find_header(header, path...) ::
+
+  ヘッダファイルheaderの存在を -Ipath を追加しながらチェック
+  する．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_{HEADER_H}` を定義し，trueを返す．
+  (スラッシュやドットはアンダースコアに置換される)
+
+have_struct_member(type, member[, header[, opt]]) ::
+
+  ヘッダファイルheaderをインクルードして型typeが定義され，
+  なおかつメンバmemberが存在するかをチェックする．チェックに
+  成功すると，プリプロセッサマクロ `HAVE_{TYPE}_{MEMBER}` を
+  定義し，trueを返す．
+
+have_type(type, header, opt) ::
+
+  ヘッダファイルheaderをインクルードして型typeが存在するかを
+  チェックする．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_TYPE_{TYPE}` を定義し，trueを返す．
+
+check_sizeof(type, header) ::
+
+  ヘッダファイルheaderをインクルードして型typeのchar単位サイ
+  ズを調べる．チェックに成功すると，プリプロセッサマクロ
+  `SIZEOF_{TYPE}` を定義し，そのサイズを返す．定義されていな
+  いときはnilを返す．
+
+create_makefile(target[, target_prefix]) ::
+
+  拡張ライブラリ用のMakefileを生成する．この関数を呼ばなけれ
+  ばそのライブラリはコンパイルされない．targetはモジュール名
+  を表す．
+
+find_executable(command, path) ::
+
+  コマンドcommandをFile::PATH_SEPARATORで区切られたパス名の
+  リストpathから探す．pathがnilまたは省略された場合は，環境
+  変数PATHの値を使用する．実行可能なコマンドが見つかった場合
+  はパスを含むファイル名，見つからなかった場合はnilを返す．
+
+with_config(withval[, default=nil]) ::
+
+  コマンドライン上の--with-<withval>で指定されたオプション値
+  を得る．
+
+enable_config(config, *defaults) ::
+disable_config(config, *defaults) ::
+
+  コマンドライン上の--enable-<config>または
+  --disable-<config>で指定された真偽値を得る．
+  --enable-<config>が指定されていた場合はtrue，
+  --disable-<config>が指定されていた場合はfalseを返す．
+  どちらも指定されていない場合は，ブロックつきで呼び出されて
+  いる場合は*defaultsをyieldした結果，ブロックなしなら
+  *defaultsを返す．
+
+dir_config(target[, default_dir]) ::
+dir_config(target[, default_include, default_lib]) ::
+
+  コマンドライン上の--with-<target>-dir, --with-<target>-include,
+  --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])
+
+pkg_config(pkg, option=nil) ::
+
+  pkg-configコマンドからパッケージpkgの情報を [cflags, ldflags, libs]
+  の配列として得る．$CFLAGS, $LDFLAGS, $libs にはそれぞれの値が
+  追加される．
+
+  pkg-configの実際のコマンドは，以下の順で試される．
+
+  1. コマンドラインで--with-{pkg}-config={command}オプションが
+     指定された場合: {command} {option}
+  2. {pkg}-config {option}
+  3. pkg-config {option} {pkg}
+
+  optionが指定された場合は，上記の配列の代わりにそのオプションを
+  指定して得られた出力をstripしたものを返す．
+
+= Appendix D. 世代別GC
+
+Ruby 2.1から世代別GCに対応しました．我々はこれをRGenGCと呼んでいます．
+RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つように開発されている
+ため，拡張ライブラリ側の対応はほぼ不要です．
+
+ただし，対応をすることで性能を向上することができる可能性があります．もし
+拡張ライブラリに高い性能が必要である場合は対応を検討して下さい．
+
+とくにRARRAY_PTR()/RHASH_TBL()のようなマクロを用いてポインタに直接アクセ
+スするようなコードは書かないようにして下さい．代わりに，rb_ary_aref(),
+rb_ary_store() などの，適切な API 関数を利用するようにして下さい．
+
+そのほか，対応についての詳細は README.EXT の「Appendix D. Generational
+GC」を参照して下さい．
+
+/*
+ * Local variables:
+ * fill-column: 60
+ * end:
+ */
diff --git a/README.ja.md b/README.ja.md
index 953f949fa2..1e9bae7e0c 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -17,8 +17,8 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい
 *   ガーベージコレクタ
 *   ダイナミックローディング (アーキテクチャによる)
 *   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， Mac OS
-    X，Haikuなどの上でも動く cf.
-    https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
+    X，BeOSなどの上でも動く cf.
+    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
 
 
 ## 入手法
@@ -33,11 +33,11 @@ ftp://ftp.ruby-lang.org/pub/ruby/
 
 開発先端のソースコードは次のコマンドで取得できます．
 
-    $ svn co https://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
 
 他に開発中のブランチの一覧は次のコマンドで見られます．
 
-    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
+    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
 
 ### Gitで
 
@@ -49,13 +49,13 @@ SubversionのミラーをGitHubに公開しています． 以下のコマンド
 
 RubyのホームページのURLは
 
-https://www.ruby-lang.org/
+http://www.ruby-lang.org/
 
 です．
 
 ## メーリングリスト
 
-Rubyのメーリングリストがあります．参加希望の方は
+Rubyのメーリングリストがあります。参加希望の方は
 
 mailto:ruby-list-request@ruby-lang.org
 
@@ -63,22 +63,22 @@ mailto:ruby-list-request@ruby-lang.org
 
     subscribe
 
-と書いて送って下さい．
+と書いて送って下さい。
 
-Ruby開発者向けメーリングリストもあります．こちらではrubyのバグ，将来の仕様拡張など実装上の問題について議論されています． 参加希望の方は
+Ruby開発者向けメーリングリストもあります。こちらではrubyのバグ、将来の仕様拡張など実装上の問題について議論されています。 参加希望の方は
 
 mailto:ruby-dev-request@ruby-lang.org
 
-までruby-listと同様の方法でメールしてください．
+までruby-listと同様の方法でメールしてください。
 
 Ruby拡張モジュールについて話し合うruby-extメーリングリストと数学関係の話題について話し合うruby-mathメーリングリストと
-英語でrubyについて話し合うruby-talkメーリングリストもあります．参加方法はどれも同じです．
+英語でrubyについて話し合うruby-talkメーリングリストもあります。参加方法はどれも同じです。
 
 ## コンパイル・インストール
 
 以下の手順で行ってください．
 
-1.  もし `configure` ファイルが見つからない，もしくは `configure.in` より古いようなら， `autoconf` を実行して
+1.  もし `configure` ファイルが見つからない、もしくは `configure.in` より古いようなら、 `autoconf` を実行して
     新しく `configure` を生成する
 
 2.  `configure` を実行して `Makefile` などを生成する
@@ -109,17 +109,20 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス�
 
     *   `${DESTDIR}${prefix}/bin`
     *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}`
-    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFOR
+        M}`
     *   `${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/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${P
+        LATFORM}`
     *   `${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/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`
@@ -144,28 +147,17 @@ UNIXであれば `configure` がほとんどの差異を吸収してくれるは
 のアーキテクチャが`setjmp()`または`getcontext()`によって全てのレジスタを `jmp_buf` や `ucontext_t`
 に格納することと， `jmp_buf` や `ucontext_t` とスタックが32bitアラインメントされていることを仮定
 しています．特に前者が成立しない場合の対応は非常に困難でしょう． 後者の解決は比較的簡単で， `gc.c` でスタックをマークしている
-部分にアラインメントのバイト数だけずらしてマークするコードを追加するだけで済みます．`defined(__mc68000__)`で括られてい
+部分にアラインメントのバイト数だけずらしてマークするコードを追加するだけで済みます．`defined(_\*mc68000*\_)`で括られてい
 る部分を参考にしてください．
 
 レジスタウィンドウを持つCPUでは，レジスタウィンドウをスタックにフラッシュするアセンブラコードを追加する必要があるかもしれません．
 
 ## 配布条件
 
-[COPYING.ja](COPYING.ja) ファイルを参照してください．
-
-## フィードバック
-
-Rubyに関する質問は Ruby-Talk（英語）や Ruby-List（日本語） (https://www.ruby-lang.org/ja/community/mailing-lists) や，
-stackoverflow (https://ja.stackoverflow.com/) などのWebサイトに投稿してください．
-
-バグ報告は https://bugs.ruby-lang.org で受け付けています．
-
+`COPYING.ja` ファイルを参照してください。
 
 ## 著者
 
-Rubyのオリジナル版は，1995年にまつもとゆきひろ氏によって設計・開発されました．
-
-<mailto:matz@ruby-lang.org>
-
+コメント，バグレポートその他は mailto:matz@ruby-lang.org まで．
 ---
 created at: Thu Aug  3 11:57:36 JST 1995
diff --git a/README.md b/README.md
index 283a92ce21..c6498a8cca 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,3 @@
-[![Build Status](https://travis-ci.org/ruby/ruby.svg)](https://travis-ci.org/ruby/ruby)
-[![Build status](https://ci.appveyor.com/api/projects/status/0sy8rrxut4o0k960/branch/trunk?svg=true)](https://ci.appveyor.com/project/ruby/ruby/branch/trunk)
-
 # What's Ruby
 
 Ruby is the interpreted scripting language for quick and easy object-oriented
@@ -11,57 +8,57 @@ extensible.
 ## Features of Ruby
 
 *   Simple Syntax
-*   **Normal** Object-oriented Features (e.g. class, method calls)
-*   **Advanced** Object-oriented Features (e.g. Mix-in, Singleton-method)
+*   **Normal** Object-Oriented features(ex. class, method calls)
+*   **Advanced** Object-Oriented features(ex. Mix-in, Singleton-method)
 *   Operator Overloading
 *   Exception Handling
 *   Iterators and Closures
 *   Garbage Collection
-*   Dynamic Loading of Object Files (on some architectures)
+*   Dynamic Loading of Object files(on some architecture)
 *   Highly Portable (works on many Unix-like/POSIX compatible platforms as
-    well as Windows, Mac OS X, Haiku, etc.) cf.
-    https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
+    well as Windows, Mac OS X, BeOS etc.) cf.
+    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
 
 
 ## How to get Ruby
 
-For a complete list of ways to install Ruby, including using third-party tools
+For a complete list of ways to install Ruby, including using third party tools
 like rvm, see:
 
-https://www.ruby-lang.org/en/downloads/
+http://www.ruby-lang.org/en/downloads/
 
-The Ruby distribution files can be found on the following FTP site:
+The Ruby distribution files can be found in the following FTP site:
 
 ftp://ftp.ruby-lang.org/pub/ruby/
 
 The trunk of the Ruby source tree can be checked out with the following
 command:
 
-    $ svn co https://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
 
 Or if you are using git then use the following command:
 
     $ git clone git://github.com/ruby/ruby.git
 
 There are some other branches under development.  Try the following command
-to see the list of branches:
+and see the list of branches:
 
-    $ svn ls https://svn.ruby-lang.org/repos/ruby/branches/
+    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
 
 Or if you are using git then use the following command:
 
     $ git ls-remote git://github.com/ruby/ruby.git
 
-## Ruby home page
+## Ruby home-page
 
-The URL of the Ruby home page is:
+The URL of the Ruby home-page is:
 
-https://www.ruby-lang.org/
+http://www.ruby-lang.org/
 
 ## Mailing list
 
-There is a mailing list to talk about Ruby. To subscribe to this list, please
-send the following phrase:
+There is a mailing list to talk about Ruby. To subscribe this list, please
+send the following phrase
 
     subscribe
 
@@ -76,9 +73,9 @@ This is what you need to do to compile and install Ruby:
     win32/README.win32 instead of this document.
 
 2.  If `./configure` does not exist or is older than configure.in, run
-    `autoconf` to (re)generate configure.
+    autoconf to (re)generate configure.
 
-3.  Run `./configure`, which will generate `config.h` and `Makefile`.
+3.  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
@@ -103,22 +100,25 @@ This is what you need to do to compile and install Ruby:
 
 8.  Run '`make install`'
 
-    This command will create the following directories and install files into
+    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}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFOR
+        M}`
     *   `${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/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${P
+        LATFORM}`
     *   `${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/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`
@@ -137,27 +137,21 @@ If you fail to compile ruby, please send the detailed error report with the
 error log and machine/OS type, to help others.
 
 Some extension libraries may not get compiled because of lack of necessary
-external libraries and/or headers, then you will need to run '`make distclean-ext`'
-to remove old configuration after installing them in such case.
+external libraries and/or headers, then you will need to run '`make
+distclean-ext`' to remove old configuration after installing them in such
+case.
 
 ## Copying
 
-See the file [COPYING](COPYING).
+See the file `COPYING`.
 
 ## Feedback
 
 Questions about the Ruby language can be asked on the Ruby-Talk mailing list
-(https://www.ruby-lang.org/en/community/mailing-lists) or on websites like
-(https://stackoverflow.com).
-
-Bug reports should be filed at https://bugs.ruby-lang.org. Read [HowToReport] for more information.
-
-[HowToReport]: https://bugs.ruby-lang.org/projects/ruby/wiki/HowToReport
-
-##Contributing
-
-See the file [CONTRIBUTING.md](CONTRIBUTING.md)
+(http://www.ruby-lang.org/en/community/mailing-lists) or on websites like
+(http://stackoverflow.com).
 
+Bug reports should be filed at http://bugs.ruby-lang.org
 
 ## The Author
 
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 99b24e6d93..0000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- autoconf -*-
-
-AC_DEFUN([_COLORIZE_RESULT_PREPARE], [
-    msg_checking= msg_result_yes= msg_result_no= msg_result_other= msg_reset=
-    AS_IF([test "x${CONFIGURE_TTY}" = xyes -o -t 1], [
-	msg_begin="`tput smso 2>/dev/null`"
-	AS_CASE(["$msg_begin"], ['@<:@'*m],
-	    [msg_begin="`echo "$msg_begin" | sed ['s/[0-9]*m$//']`"
-	    msg_checking="${msg_begin}33m"
-	    AS_IF([test ${TEST_COLORS:+set}], [
-		msg_result_yes=[`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`]
-		msg_result_no=[`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`]
-		msg_result_other=[`expr ":$TEST_COLORS:" : ".*:skip=\([^:]*\):"`]
-	    ])
-	    msg_result_yes="${msg_begin}${msg_result_yes:-32;1}m"
-	    msg_result_no="${msg_begin}${msg_result_no:-31;1}m"
-	    msg_result_other="${msg_begin}${msg_result_other:-33;1}m"
-	    msg_reset="${msg_begin}m"
-	    ])
-	AS_UNSET(msg_begin)
-	])
-    AS_REQUIRE_SHELL_FN([colorize_result],
-	[AS_FUNCTION_DESCRIBE([colorize_result], [MSG], [Colorize result])],
-        [AS_CASE(["$[]1"],
-            [yes], [AS_ECHO(["${msg_result_yes}$[]1${msg_reset}]")],
-            [no], [AS_ECHO(["${msg_result_no}$[]1${msg_reset}]")],
-            [AS_ECHO(["${msg_result_other}$[]1${msg_reset}]")])])
-])
-
-AC_DEFUN([COLORIZE_RESULT], [AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
-    AS_LITERAL_IF([$1],
-	[m4_case([$1],
-		[yes], [AS_ECHO(["${msg_result_yes}$1${msg_reset}"])],
-		[no], [AS_ECHO(["${msg_result_no}$1${msg_reset}"])],
-		[AS_ECHO(["${msg_result_other}$1${msg_reset}"])])],
-	[colorize_result "$1"]) dnl
-])
-
-AC_DEFUN([AC_CHECKING],[dnl
-AC_REQUIRE([_COLORIZE_RESULT_PREPARE])dnl
-AS_MESSAGE([checking ${msg_checking}$1${msg_reset}...])])
-
-AC_DEFUN([AC_MSG_RESULT], [dnl
-{ _AS_ECHO_LOG([result: $1])
-COLORIZE_RESULT([$1]); dnl
-}])
diff --git a/aclocal.m4 b/aclocal.m4
deleted file mode 100644
index 56e944be8f..0000000000
--- a/aclocal.m4
+++ /dev/null
@@ -1,15 +0,0 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
-
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-m4_include([acinclude.m4])
diff --git a/addr2line.c b/addr2line.c
index 3cfb199d8b..c8faf48d62 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -36,9 +36,11 @@
 
 /* Make alloca work the best possible way.  */
 #ifdef __GNUC__
-# ifndef alloca
-#  define alloca __builtin_alloca
-# endif
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif	/* atarist */
 #else
 # ifdef HAVE_ALLOCA_H
 #  include <alloca.h>
@@ -225,7 +227,7 @@ fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
     }
 }
 
-static int
+static void
 parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 		obj_info_t *obj, line_info_t *lines, int offset)
 {
@@ -287,13 +289,9 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 
     include_directories = p;
 
-    /* temporary measure for compress-debug-sections */
-    if (p >= cu_end) return -1;
-
     /* skip include directories */
     while (*p) {
-	p = memchr(p, '\0', cu_end - p);
-	if (!p) return -1;
+	while (*p) p++;
 	p++;
     }
     p++;
@@ -401,24 +399,21 @@ parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
 	}
     }
     *debug_line = p;
-    return 0;
 }
 
-static int
+static void
 parse_debug_line(int num_traces, void **traces,
 		 char *debug_line, unsigned long size,
 		 obj_info_t *obj, line_info_t *lines, int offset)
 {
     char *debug_line_end = debug_line + size;
     while (debug_line < debug_line_end) {
-	if (parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset))
-	    return -1;
+	parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset);
     }
     if (debug_line != debug_line_end) {
 	kprintf("Unexpected size of .debug_line in %s\n",
 		binary_filename);
     }
-    return 0;
 }
 
 /* read file and fill lines */
@@ -627,11 +622,10 @@ fill_lines(int num_traces, void **traces, int check_debuglink,
 	goto finish;
     }
 
-    if (parse_debug_line(num_traces, traces,
-			 file + debug_line_shdr->sh_offset,
-			 debug_line_shdr->sh_size,
-			 obj, lines, offset))
-	goto fail;
+    parse_debug_line(num_traces, traces,
+		     file + debug_line_shdr->sh_offset,
+		     debug_line_shdr->sh_size,
+		     obj, lines, offset);
 finish:
     return dladdr_fbase;
 fail:
@@ -727,8 +721,7 @@ rb_dump_backtrace_with_lines(int num_traces, void **traces)
 	    obj->path = path;
 	    lines[i].path = path;
 	    strcpy(binary_filename, path);
-	    if (fill_lines(num_traces, traces, 1, &obj, lines, i) == (uintptr_t)-1)
-		break;
+	    fill_lines(num_traces, traces, 1, &obj, lines, i);
 	}
 next_line:
 	continue;
@@ -819,7 +812,8 @@ next_line:
 
 #include <stdarg.h>
 #define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1)
-static inline int toupper(int c) { return ('A' <= c && c <= 'Z') ? (c&0x5f) : c; }
+extern int rb_toupper(int c);
+#define    toupper(c)  rb_toupper(c)
 #define    hex2ascii(hex)  (hex2ascii_data[hex])
 char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 static inline int imax(int a, int b) { return (a > b ? a : b); }
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index 1268a7f7e9..0000000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-shallow_clone: true
-platform: x64
-environment:
-  ruby_version: "23-x64"
-install:
-  - SET
-  - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64'
-  - SET PATH=\usr\local\bin;C:\Ruby%ruby_version%\bin;C:\Ruby%ruby_version%\Devkit\mingw\bin;%PATH%;C:\msys64\usr\bin
-  - ruby --version
-  - 'cl'
-  - SET
-  - mkdir \usr\local\bin
-  - mkdir \usr\local\include
-  - mkdir \usr\local\lib
-  - appveyor DownloadFile http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib128.zip
-  - 7z x -o%APPVEYOR_BUILD_FOLDER%\ext\zlib zlib128.zip
-  - for %%I in (c:\OpenSSL-Win64\*.dll) do mklink /h \usr\local\bin\%%~nxI %%I
-build_script:
-  - cd %APPVEYOR_BUILD_FOLDER%
-  - win32\configure.bat --without-ext=+,dbm,gdbm,readline --with-opt-dir=/usr/local --with-openssl-dir=c:/OpenSSL-Win64
-  - nmake -l up
-  - nmake -l
-  - nmake install-nodoc
-test_script:
-  - nmake -l "TESTOPTS=-v -q" btest
-  - nmake -l "TESTOPTS=-v -q" test-basic
diff --git a/array.c b/array.c
index 580d1838a1..6b551dbe24 100644
--- a/array.c
+++ b/array.c
@@ -11,16 +11,18 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
+#include "ruby/encoding.h"
+#include "internal.h"
 #include "probes.h"
 #include "id.h"
 
 #ifndef ARRAY_DEBUG
 # define NDEBUG
 #endif
-#include "ruby_assert.h"
+#include <assert.h>
 
 VALUE rb_cArray;
 
@@ -353,13 +355,9 @@ rb_ary_modify(VALUE ary)
 static VALUE
 ary_ensure_room_for_push(VALUE ary, long add_len)
 {
-    long old_len = RARRAY_LEN(ary);
-    long new_len = old_len + add_len;
+    long new_len = RARRAY_LEN(ary) + add_len;
     long capa;
 
-    if (old_len > ARY_MAX_SIZE - add_len) {
-	rb_raise(rb_eIndexError, "index %ld too big", new_len);
-    }
     if (ARY_SHARED_P(ary)) {
 	if (new_len > RARRAY_EMBED_LEN_MAX) {
 	    VALUE shared = ARY_SHARED(ary);
@@ -453,7 +451,10 @@ ary_alloc(VALUE klass)
 static VALUE
 empty_ary_alloc(VALUE klass)
 {
-    RUBY_DTRACE_CREATE_HOOK(ARRAY, 0);
+    if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) {
+	RUBY_DTRACE_ARRAY_CREATE(0, rb_sourcefile(), rb_sourceline());
+    }
+
     return ary_alloc(klass);
 }
 
@@ -469,16 +470,21 @@ ary_new(VALUE klass, long capa)
 	rb_raise(rb_eArgError, "array size too big");
     }
 
-    RUBY_DTRACE_CREATE_HOOK(ARRAY, capa);
+    if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) {
+	RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline());
+    }
 
-    ary = ary_alloc(klass);
     if (capa > RARRAY_EMBED_LEN_MAX) {
 	ptr = ALLOC_N(VALUE, capa);
+	ary = ary_alloc(klass);
         FL_UNSET_EMBED(ary);
         ARY_SET_PTR(ary, ptr);
         ARY_SET_CAPA(ary, capa);
         ARY_SET_HEAP_LEN(ary, 0);
     }
+    else {
+	ary = ary_alloc(klass);
+    }
 
     return ary;
 }
@@ -496,7 +502,7 @@ rb_ary_new(void)
 }
 
 VALUE
-(rb_ary_new_from_args)(long n, ...)
+rb_ary_new_from_args(long n, ...)
 {
     va_list ar;
     VALUE ary;
@@ -935,7 +941,7 @@ rb_ary_cat(VALUE ary, const VALUE *argv, long len)
  *     a = [ "a", "b", "c" ]
  *     a.push("d", "e", "f")
  *             #=> ["a", "b", "c", "d", "e", "f"]
- *     [1, 2, 3].push(4).push(5)
+ *     [1, 2, 3,].push(4).push(5)
  *             #=> [1, 2, 3, 4, 5]
  */
 
@@ -1065,21 +1071,14 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
     n = RARRAY_LEN(result);
     if (ARY_SHARED_P(ary)) {
 	if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
-	  setup_occupied_shared:
 	    ary_mem_clear(ary, 0, n);
 	}
         ARY_INCREASE_PTR(ary, n);
     }
     else {
-	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
-	    RARRAY_PTR_USE(ary, ptr, {
-		MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
-	    }); /* WB: no new reference */
-	}
-	else {
-	    ary_make_shared(ary);
-	    goto setup_occupied_shared;
-	}
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMMOVE(ptr, ptr + n, VALUE, RARRAY_LEN(ary)-n);
+	}); /* WB: no new reference */
     }
     ARY_INCREASE_LEN(ary, -n);
 
@@ -1094,10 +1093,6 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
     long capa;
     const VALUE *head, *sharedp;
 
-    if (len > ARY_MAX_SIZE - argc) {
-	rb_raise(rb_eIndexError, "index %ld too big", new_len);
-    }
-
     if (ARY_SHARED_P(ary)) {
 	VALUE shared = ARY_SHARED(ary);
 	capa = RARRAY_LEN(shared);
@@ -1195,17 +1190,10 @@ rb_ary_elt(VALUE ary, long offset)
 VALUE
 rb_ary_entry(VALUE ary, long offset)
 {
-    long len = RARRAY_LEN(ary);
-    const VALUE *ptr = RARRAY_CONST_PTR(ary);
-    if (len == 0) return Qnil;
     if (offset < 0) {
-        offset += len;
-        if (offset < 0) return Qnil;
+	offset += RARRAY_LEN(ary);
     }
-    else if (len <= offset) {
-        return Qnil;
-    }
-    return ptr[offset];
+    return rb_ary_elt(ary, offset);
 }
 
 VALUE
@@ -1309,7 +1297,7 @@ rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
  *     a.at(-1)    #=> "e"
  */
 
-VALUE
+static VALUE
 rb_ary_at(VALUE ary, VALUE pos)
 {
     return rb_ary_entry(ary, NUM2LONG(pos));
@@ -1382,9 +1370,8 @@ rb_ary_last(int argc, const VALUE *argv, VALUE ary)
  *  +default+ value.
  *
  *  Alternatively, if a block is given it will only be executed when an
- *  invalid +index+ is referenced.
- *
- *  Negative values of +index+ count from the end of the array.
+ *  invalid +index+ is referenced.  Negative values of +index+ count from the
+ *  end of the array.
  *
  *     a = [ 11, 22, 33, 44 ]
  *     a.fetch(1)               #=> 22
@@ -1561,10 +1548,10 @@ rb_ary_to_ary(VALUE obj)
 }
 
 static void
-rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
+rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 {
+    long rlen;
     long olen;
-    long rofs;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
     olen = RARRAY_LEN(ary);
@@ -1579,11 +1566,14 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 	len = olen - beg;
     }
 
-    {
-	const VALUE *optr = RARRAY_CONST_PTR(ary);
-	rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
+    if (rpl == Qundef) {
+	rlen = 0;
+    }
+    else {
+	rpl = rb_ary_to_ary(rpl);
+	rlen = RARRAY_LEN(rpl);
+	olen = RARRAY_LEN(ary);	/* ary may be resized in rpl.to_ary too */
     }
-
     if (beg >= olen) {
 	VALUE target_ary;
 	if (beg > ARY_MAX_SIZE - rlen) {
@@ -1593,17 +1583,13 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 	len = beg + rlen;
 	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-	    if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs;
-	    ary_memcpy0(ary, beg, rlen, rptr, target_ary);
+	    ary_memcpy0(ary, beg, rlen, RARRAY_CONST_PTR(rpl), target_ary);
 	}
 	ARY_SET_LEN(ary, len);
     }
     else {
 	long alen;
 
-	if (olen - len > ARY_MAX_SIZE - rlen) {
-	    rb_raise(rb_eIndexError, "index %ld too big", olen + rlen - len);
-	}
 	rb_ary_modify(ary);
 	alen = olen + rlen - len;
 	if (alen >= ARY_CAPA(ary)) {
@@ -1617,8 +1603,7 @@ rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 	    ARY_SET_LEN(ary, alen);
 	}
 	if (rlen > 0) {
-	    if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs;
-	    MEMMOVE(RARRAY_PTR(ary) + beg, rptr, VALUE, rlen);
+	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen);
 	}
     }
 }
@@ -1723,13 +1708,13 @@ static VALUE
 rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 {
     long offset, beg, len;
-    VALUE rpl;
 
     if (argc == 3) {
 	rb_ary_modify_check(ary);
 	beg = NUM2LONG(argv[0]);
 	len = NUM2LONG(argv[1]);
-	goto range;
+	rb_ary_splice(ary, beg, len, argv[2]);
+	return argv[2];
     }
     rb_check_arity(argc, 2, 2);
     rb_ary_modify_check(ary);
@@ -1739,11 +1724,8 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
     }
     if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
 	/* check if idx is Range */
-      range:
-	rpl = rb_ary_to_ary(argv[argc-1]);
-	rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR(rpl), RARRAY_LEN(rpl));
-	RB_GC_GUARD(rpl);
-	return argv[argc-1];
+	rb_ary_splice(ary, beg, len, argv[1]);
+	return argv[1];
     }
 
     offset = NUM2LONG(argv[0]);
@@ -1783,7 +1765,7 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
     if (pos < 0) {
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, argv + 1, argc - 1);
+    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
     return ary;
 }
 
@@ -1802,9 +1784,9 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
  *     ary.each                   -> Enumerator
  *
  *  Calls the given block once for each element in +self+, passing that element
- *  as a parameter.  Returns the array itself.
+ *  as a parameter.
  *
- *  If no block is given, an Enumerator is returned.
+ *  An Enumerator is returned if no block is given.
  *
  *     a = [ "a", "b", "c" ]
  *     a.each {|x| print x, " -- " }
@@ -1815,9 +1797,10 @@ ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
  */
 
 VALUE
-rb_ary_each(VALUE ary)
+rb_ary_each(VALUE array)
 {
     long i;
+    volatile VALUE ary = array;
 
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     for (i=0; i<RARRAY_LEN(ary); i++) {
@@ -2174,11 +2157,10 @@ rb_ary_to_h(VALUE ary)
     long i;
     VALUE hash = rb_hash_new();
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	const VALUE elt = rb_ary_elt(ary, i);
-	const VALUE key_value_pair = rb_check_array_type(elt);
+	VALUE key_value_pair = rb_check_array_type(rb_ary_elt(ary, i));
 	if (NIL_P(key_value_pair)) {
-	    rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)",
-		     rb_obj_class(elt), i);
+	    rb_raise(rb_eTypeError, "wrong element type %s at %ld (expected array)",
+		rb_builtin_class_name(rb_ary_elt(ary, i)), i);
 	}
 	if (RARRAY_LEN(key_value_pair) != 2) {
 	    rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)",
@@ -2373,9 +2355,26 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 
 struct ary_sort_data {
     VALUE ary;
-    struct cmp_opt_data cmp_opt;
+    int opt_methods;
+    int opt_inited;
 };
 
+enum {
+    sort_opt_Fixnum,
+    sort_opt_String,
+    sort_optimizable_count
+};
+
+#define STRING_P(s) (RB_TYPE_P((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)
 {
@@ -2407,12 +2406,12 @@ sort_2(const void *ap, const void *bp, void *dummy)
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) {
+    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 (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) {
+    if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) {
 	return rb_str_cmp(a, b);
     }
 
@@ -2433,12 +2432,9 @@ sort_2(const void *ap, const void *bp, void *dummy)
  *  Comparisons for the sort will be done using the <code><=></code> operator
  *  or using an optional code block.
  *
- *  The block must implement a comparison between +a+ and +b+ and return
- *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
- *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
- *
- *  The result is not guaranteed as stable.  When comparison of two
- *  elements returns +0+, the order of the elements is unpredictable.
+ *  The block must implement a comparison between +a+ and +b+, and return
+ *  +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
+ *  if +b+ follows +a+.
  *
  *  See also Enumerable#sort_by.
  *
@@ -2459,8 +2455,8 @@ rb_ary_sort_bang(VALUE ary)
 
 	RBASIC_CLEAR_CLASS(tmp);
 	data.ary = tmp;
-	data.cmp_opt.opt_methods = 0;
-	data.cmp_opt.opt_inited = 0;
+	data.opt_methods = 0;
+	data.opt_inited = 0;
 	RARRAY_PTR_USE(tmp, ptr, {
 	    ruby_qsort(ptr, len, sizeof(VALUE),
 		       rb_block_given_p()?sort_1:sort_2, &data);
@@ -2469,8 +2465,8 @@ rb_ary_sort_bang(VALUE ary)
         if (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);
             }
+            FL_SET_EMBED(ary);
 	    ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
@@ -2517,12 +2513,10 @@ rb_ary_sort_bang(VALUE ary)
  *  Comparisons for the sort will be done using the <code><=></code> operator
  *  or using an optional code block.
  *
- *  The block must implement a comparison between +a+ and +b+ and return
- *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
- *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
+ *  The block must implement a comparison between +a+ and +b+, and return
+ *  +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
+ *  if +b+ follows +a+.
  *
- *  The result is not guaranteed as stable.  When comparison of two
- *  elements returns +0+, the order of the elements is unpredictable.
  *
  *  See also Enumerable#sort_by.
  *
@@ -2539,8 +2533,6 @@ rb_ary_sort(VALUE ary)
     return ary;
 }
 
-static VALUE rb_ary_bsearch_index(VALUE ary);
-
 /*
  *  call-seq:
  *     ary.bsearch {|x| block }  -> elem
@@ -2597,30 +2589,6 @@ static VALUE rb_ary_bsearch_index(VALUE ary);
 static VALUE
 rb_ary_bsearch(VALUE ary)
 {
-    VALUE index_result = rb_ary_bsearch_index(ary);
-
-    if (FIXNUM_P(index_result)) {
-	return rb_ary_entry(ary, FIX2LONG(index_result));
-    }
-    return index_result;
-}
-
-/*
- *  call-seq:
- *     ary.bsearch_index {|x| block }  -> int or nil
- *
- *  By using binary search, finds an index of a value from this array which
- *  meets the given condition in O(log n) where n is the size of the array.
- *
- *  It supports two modes, depending on the nature of the block and they are
- *  exactly the same as in the case of #bsearch method with the only difference
- *  being that this method returns the index of the element instead of the
- *  element itself. For more details consult the documentation for #bsearch.
- */
-
-static VALUE
-rb_ary_bsearch_index(VALUE ary)
-{
     long low = 0, high = RARRAY_LEN(ary), mid;
     int smaller = 0, satisfied = 0;
     VALUE v, val;
@@ -2631,8 +2599,8 @@ rb_ary_bsearch_index(VALUE ary)
 	val = rb_ary_entry(ary, mid);
 	v = rb_yield(val);
 	if (FIXNUM_P(v)) {
-	    if (v == INT2FIX(0)) return INT2FIX(mid);
-	    smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */
+	    if (FIX2INT(v) == 0) return val;
+	    smaller = FIX2INT(v) < 0;
 	}
 	else if (v == Qtrue) {
 	    satisfied = 1;
@@ -2643,16 +2611,16 @@ rb_ary_bsearch_index(VALUE ary)
 	}
 	else if (rb_obj_is_kind_of(v, rb_cNumeric)) {
 	    const VALUE zero = INT2FIX(0);
-	    switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) {
-	      case 0: return INT2FIX(mid);
-	      case 1: smaller = 1; break;
-	      case -1: smaller = 0;
+	    switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, INT2FIX(0))) {
+		case 0: return val;
+		case 1: smaller = 1; break;
+		case -1: smaller = 0;
 	    }
 	}
 	else {
-	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE
-		     " (must be numeric, true, false or nil)",
-		     rb_obj_class(v));
+	    rb_raise(rb_eTypeError, "wrong argument type %s"
+		" (must be numeric, true, false or nil)",
+		rb_obj_classname(v));
 	}
 	if (smaller) {
 	    high = mid;
@@ -2661,8 +2629,9 @@ rb_ary_bsearch_index(VALUE ary)
 	    low = mid + 1;
 	}
     }
+    if (low == RARRAY_LEN(ary)) return Qnil;
     if (!satisfied) return Qnil;
-    return INT2FIX(low);
+    return rb_ary_entry(ary, low);
 }
 
 
@@ -2680,9 +2649,6 @@ sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
  *  Sorts +self+ in place using a set of keys generated by mapping the
  *  values in +self+ through the given block.
  *
- *  The result is not guaranteed as stable.  When two keys are equal,
- *  the order of the corresponding elements is unpredictable.
- *
  *  If no block is given, an Enumerator is returned instead.
  *
  */
@@ -2716,9 +2682,9 @@ rb_ary_sort_by_bang(VALUE ary)
  *  If no block is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "c", "d" ]
- *     a.collect { |x| x + "!" }         #=> ["a!", "b!", "c!", "d!"]
- *     a.map.with_index { |x, i| x * i } #=> ["", "b", "cc", "ddd"]
- *     a                                 #=> ["a", "b", "c", "d"]
+ *     a.collect { |x| x + "!" }        #=> ["a!", "b!", "c!", "d!"]
+ *     a.map.with_index{ |x, i| x * i } #=> ["", "b", "cc", "ddd"]
+ *     a                                #=> ["a", "b", "c", "d"]
  */
 
 static VALUE
@@ -2855,50 +2821,6 @@ rb_ary_select(VALUE ary)
     return result;
 }
 
-struct select_bang_arg {
-    VALUE ary;
-    long len[2];
-};
-
-static VALUE
-select_bang_i(VALUE a)
-{
-    volatile struct select_bang_arg *arg = (void *)a;
-    VALUE ary = arg->ary;
-    long i1, i2;
-
-    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) {
-	VALUE v = RARRAY_AREF(ary, i1);
-	if (!RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
-	}
-	arg->len[1] = ++i2;
-    }
-    return (i1 == i2) ? Qnil : ary;
-}
-
-static VALUE
-select_bang_ensure(VALUE a)
-{
-    volatile struct select_bang_arg *arg = (void *)a;
-    VALUE ary = arg->ary;
-    long len = RARRAY_LEN(ary);
-    long i1 = arg->len[0], i2 = arg->len[1];
-
-    if (i2 < len && i2 < i1) {
-	long tail = 0;
-	if (i1 < len) {
-	    tail = len - i1;
-	    RARRAY_PTR_USE(ary, ptr, {
-		    MEMMOVE(ptr + i2, ptr + i1, VALUE, tail);
-		});
-	}
-	ARY_SET_LEN(ary, i2 + tail);
-    }
-    return ary;
-}
-
 /*
  *  call-seq:
  *     ary.select!  {|item| block } -> ary or nil
@@ -2907,8 +2829,6 @@ select_bang_ensure(VALUE a)
  *  Invokes the given block passing in successive elements from +self+,
  *  deleting elements for which the block returns a +false+ value.
  *
- *  The array may not be changed instantly every time the block is called.
- *
  *  If changes were made, it will return +self+, otherwise it returns +nil+.
  *
  *  See also Array#keep_if
@@ -2920,14 +2840,23 @@ select_bang_ensure(VALUE a)
 static VALUE
 rb_ary_select_bang(VALUE ary)
 {
-    struct select_bang_arg args;
+    long i1, i2;
 
     RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE v = RARRAY_AREF(ary, i1);
+	if (!RTEST(rb_yield(v))) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, v);
+	}
+	i2++;
+    }
 
-    args.ary = ary;
-    args.len[0] = args.len[1] = 0;
-    return rb_ensure(select_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args);
+    if (i1 == i2) return Qnil;
+    if (i2 < i1)
+	ARY_SET_LEN(ary, i2);
+    return ary;
 }
 
 /*
@@ -3128,7 +3057,7 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 	if (len == 0) return rb_ary_new2(0);
 	arg2 = rb_ary_new4(len, RARRAY_CONST_PTR(ary)+pos);
 	RBASIC_SET_CLASS(arg2, rb_obj_class(ary));
-	rb_ary_splice(ary, pos, len, 0, 0);
+	rb_ary_splice(ary, pos, len, Qundef);
 	return arg2;
     }
 
@@ -3170,32 +3099,23 @@ ary_reject(VALUE orig, VALUE result)
 }
 
 static VALUE
-reject_bang_i(VALUE a)
-{
-    volatile struct select_bang_arg *arg = (void *)a;
-    VALUE ary = arg->ary;
-    long i1, i2;
-
-    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) {
-	VALUE v = RARRAY_AREF(ary, i1);
-	if (RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
-	}
-	arg->len[1] = ++i2;
-    }
-    return (i1 == i2) ? Qnil : ary;
-}
-
-static VALUE
 ary_reject_bang(VALUE ary)
 {
-    struct select_bang_arg args;
+    long i;
+    VALUE result = Qnil;
 
     rb_ary_modify_check(ary);
-    args.ary = ary;
-    args.len[0] = args.len[1] = 0;
-    return rb_ensure(reject_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args);
+    for (i = 0; i < RARRAY_LEN(ary); ) {
+	VALUE v = RARRAY_AREF(ary, i);
+	if (RTEST(rb_yield(v))) {
+	    rb_ary_delete_at(ary, i);
+	    result = ary;
+	}
+	else {
+	    i++;
+	}
+    }
+    return result;
 }
 
 /*
@@ -3203,10 +3123,11 @@ ary_reject_bang(VALUE ary)
  *     ary.reject! { |item| block }  -> ary or nil
  *     ary.reject!                   -> Enumerator
  *
- *  Deletes every element of +self+ for which the block evaluates to +true+,
- *  if no changes were made returns +nil+.
+ *  Equivalent to Array#delete_if, deleting elements from +self+ for which the
+ *  block evaluates to +true+, but returns +nil+ if no changes were made.
  *
- *  The array may not be changed instantly every time the block is called.
+ *  The array is changed instantly every time the block is called, not after
+ *  the iteration is over.
  *
  *  See also Enumerable#reject and Array#delete_if.
  *
@@ -3226,7 +3147,7 @@ rb_ary_reject_bang(VALUE ary)
  *     ary.reject                   -> Enumerator
  *
  *  Returns a new array containing the items in +self+ for which the given
- *  block is not +true+. The ordering of non-rejected elements is maintained.
+ *  block is not +true+.
  *
  *  See also Array#delete_if
  *
@@ -3532,10 +3453,12 @@ rb_ary_clear(VALUE ary)
 static VALUE
 rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE item = Qundef, arg1, arg2;
+    VALUE item, arg1, arg2;
     long beg = 0, end = 0, len = 0;
+    int block_p = FALSE;
 
     if (rb_block_given_p()) {
+	block_p = TRUE;
 	rb_scan_args(argc, argv, "02", &arg1, &arg2);
 	argc += 1;		/* hackish */
     }
@@ -3577,7 +3500,7 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 	ARY_SET_LEN(ary, end);
     }
 
-    if (item == Qundef) {
+    if (block_p) {
 	VALUE v;
 	long i;
 
@@ -3606,13 +3529,6 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
  *     c                         #=> [ "a", "b", "c", "d", "e", "f" ]
  *     a                         #=> [ "a", "b", "c" ]
  *
- *  Note that
- *     x += y
- *  is the same as
- *     x = x + y
- *  This means that it produces a new array. As a consequence,
- *  repeated use of <code>+=</code> on arrays can be quite inefficient.
- *
  *  See also Array#concat.
  */
 
@@ -3634,59 +3550,32 @@ rb_ary_plus(VALUE x, VALUE y)
     return z;
 }
 
-static VALUE
-ary_append(VALUE x, VALUE y)
-{
-    long n = RARRAY_LEN(y);
-    if (n > 0) {
-	rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR(y), n);
-    }
-    return x;
-}
-
 /*
  *  call-seq:
- *     ary.concat(other_ary1, other_ary2,...)   -> ary
+ *     ary.concat(other_ary)   -> ary
  *
- *  Appends the elements of +other_ary+s to +self+.
+ *  Appends the elements of +other_ary+ to +self+.
  *
  *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
- *     [ "a" ].concat( ["b"], ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
- *     [ "a" ].concat #=> [ "a" ]
- *
  *     a = [ 1, 2, 3 ]
  *     a.concat( [ 4, 5 ] )
  *     a                                 #=> [ 1, 2, 3, 4, 5 ]
  *
- *     a = [ 1, 2 ]
- *     a.concat(a, a)                    #=> [1, 2, 1, 2, 1, 2]
- *
  *  See also Array#+.
  */
 
-static VALUE
-rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
-{
-    rb_ary_modify_check(ary);
-
-    if (argc > 0) {
-	int i;
-	VALUE args = rb_ary_tmp_new(argc);
-	for (i = 0; i < argc; i++) {
-	    rb_ary_concat(args, argv[i]);
-	}
-	ary_append(ary, args);
-    }
-
-    return ary;
-}
-
 VALUE
 rb_ary_concat(VALUE x, VALUE y)
 {
-    return ary_append(x, to_ary(y));
+    rb_ary_modify_check(x);
+    y = to_ary(y);
+    if (RARRAY_LEN(y) > 0) {
+	rb_ary_splice(x, RARRAY_LEN(x), 0, y);
+    }
+    return x;
 }
 
+
 /*
  *  call-seq:
  *     ary * int     -> new_ary
@@ -3752,7 +3641,7 @@ rb_ary_times(VALUE ary, VALUE times)
 
 /*
  *  call-seq:
- *     ary.assoc(obj)   -> element_ary  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 using <code>obj.==</code>.
@@ -3787,7 +3676,7 @@ rb_ary_assoc(VALUE ary, VALUE key)
 
 /*
  *  call-seq:
- *     ary.rassoc(obj) -> element_ary or nil
+ *     ary.rassoc(obj) -> new_ary or nil
  *
  *  Searches through the array whose elements are also arrays.
  *
@@ -3914,7 +3803,7 @@ rb_ary_eql(VALUE ary1, VALUE ary2)
 
 /*
  *  call-seq:
- *     ary.hash   -> integer
+ *     ary.hash   -> fixnum
  *
  *  Compute a hash-code for this array.
  *
@@ -3938,7 +3827,7 @@ rb_ary_hash(VALUE ary)
 	h = rb_hash_uint(h, NUM2LONG(n));
     }
     h = rb_hash_end(h);
-    return ST2FIX(h);
+    return LONG2FIX(h);
 }
 
 /*
@@ -3957,15 +3846,9 @@ VALUE
 rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
-    VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	e = RARRAY_AREF(ary, i);
-	switch (rb_equal_opt(e, item)) {
-	  case Qundef:
-	    if (rb_equal(e, item)) return Qtrue;
-	    break;
-	  case Qtrue:
+	if (rb_equal(RARRAY_AREF(ary, i), item)) {
 	    return Qtrue;
 	}
     }
@@ -4047,7 +3930,9 @@ ary_add_hash(VALUE hash, VALUE ary)
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	VALUE elt = RARRAY_AREF(ary, i);
-	rb_hash_add_new_element(hash, elt, elt);
+	if (rb_hash_lookup2(hash, elt, Qundef) == Qundef) {
+	    rb_hash_aset(hash, elt, elt);
+	}
     }
     return hash;
 }
@@ -4075,7 +3960,9 @@ ary_add_hash_by(VALUE hash, VALUE ary)
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
 	VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
-	rb_hash_add_new_element(hash, k, v);
+	if (rb_hash_lookup2(hash, k, Qundef) == Qundef) {
+	    rb_hash_aset(hash, k, v);
+	}
     }
     return hash;
 }
@@ -4095,7 +3982,6 @@ ary_recycle_hash(VALUE hash)
 	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
     }
-    RB_GC_GUARD(hash);
 }
 
 /*
@@ -4119,7 +4005,7 @@ static VALUE
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
-    VALUE hash;
+    volatile VALUE hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2));
@@ -4137,12 +4023,13 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
  *  call-seq:
  *     ary & other_ary      -> new_ary
  *
- *  Set Intersection --- Returns a new array containing unique elements common to the
- *  two arrays. The order is preserved from the original array.
+ *  Set Intersection --- Returns a new array containing elements common to the
+ *  two arrays, excluding any duplicates. The order is preserved from the
+ *  original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
- *     [ 1, 1, 3, 5 ] & [ 3, 2, 1 ]                 #=> [ 1, 3 ]
+ *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]                 #=> [ 1, 3 ]
  *     [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ]   #=> [ 'a', 'b' ]
  *
  *  See also Array#uniq.
@@ -4188,12 +4075,11 @@ ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
  *     ary | other_ary     -> new_ary
  *
  *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
- *  excluding any duplicates and preserving the order from the given arrays.
+ *  excluding any duplicates and preserving the order from the original array.
  *
  *  It compares elements using their #hash and #eql? methods for efficiency.
  *
  *     [ "a", "b", "c" ] | [ "c", "d", "a" ]    #=> [ "a", "b", "c", "d" ]
- *     [ "c", "d", "a" ] | [ "a", "b", "c" ]    #=> [ "c", "d", "a", "b" ]
  *
  *  See also Array#uniq.
  */
@@ -4218,116 +4104,6 @@ rb_ary_or(VALUE ary1, VALUE ary2)
     return ary3;
 }
 
-/*
- *  call-seq:
- *     ary.max                     -> obj
- *     ary.max { |a, b| block }    -> obj
- *     ary.max(n)                  -> array
- *     ary.max(n) { |a, b| block } -> array
- *
- *  Returns the object in _ary_ 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"
- *
- *  If the +n+ argument is given, maximum +n+ elements are returned
- *  as an array.
- *
- *     a = %w[albatross dog horse]
- *     a.max(2)                                  #=> ["horse", "dog"]
- *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
- */
-static VALUE
-rb_ary_max(int argc, VALUE *argv, VALUE ary)
-{
-    struct cmp_opt_data cmp_opt = { 0, 0 };
-    VALUE result = Qundef, v;
-    VALUE num;
-    long i;
-
-    rb_scan_args(argc, argv, "01", &num);
-
-    if (!NIL_P(num))
-       return rb_nmin_run(ary, num, 0, 1, 1);
-
-    if (rb_block_given_p()) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	   v = RARRAY_AREF(ary, i);
-	   if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) {
-	       result = v;
-	   }
-	}
-    }
-    else {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	   v = RARRAY_AREF(ary, i);
-	   if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
-	       result = v;
-	   }
-	}
-    }
-    if (result == Qundef) return Qnil;
-    return result;
-}
-
-/*
- *  call-seq:
- *     ary.min                     -> obj
- *     ary.min {| a,b | block }    -> obj
- *     ary.min(n)                  -> array
- *     ary.min(n) {| a,b | block } -> array
- *
- *  Returns the object in _ary_ 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"
- *
- *  If the +n+ argument is given, minimum +n+ elements are returned
- *  as an array.
- *
- *     a = %w[albatross dog horse]
- *     a.min(2)                                  #=> ["albatross", "dog"]
- *     a.min(2) {|a, b| a.length <=> b.length }  #=> ["dog", "horse"]
- */
-static VALUE
-rb_ary_min(int argc, VALUE *argv, VALUE ary)
-{
-    struct cmp_opt_data cmp_opt = { 0, 0 };
-    VALUE result = Qundef, v;
-    VALUE num;
-    long i;
-
-    rb_scan_args(argc, argv, "01", &num);
-
-    if (!NIL_P(num))
-       return rb_nmin_run(ary, num, 0, 0, 1);
-
-    if (rb_block_given_p()) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	   v = RARRAY_AREF(ary, i);
-	   if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) {
-	       result = v;
-	   }
-	}
-    }
-    else {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	   v = RARRAY_AREF(ary, i);
-	   if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
-	       result = v;
-	   }
-	}
-    }
-    if (result == Qundef) return Qnil;
-    return result;
-}
-
 static int
 push_value(st_data_t key, st_data_t val, st_data_t ary)
 {
@@ -4347,8 +4123,6 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
  *
  *  It compares values using their #hash and #eql? methods for efficiency.
  *
- *  +self+ is traversed in order, and the first occurrence is kept.
- *
  *  Returns +nil+ if no changes are made (that is, no duplicates are found).
  *
  *     a = [ "a", "a", "b", "b", "c" ]
@@ -4404,8 +4178,6 @@ rb_ary_uniq_bang(VALUE ary)
  *
  *  It compares values using their #hash and #eql? methods for efficiency.
  *
- *  +self+ is traversed in order, and the first occurrence is kept.
- *
  *     a = [ "a", "a", "b", "b", "c" ]
  *     a.uniq   # => ["a", "b", "c"]
  *
@@ -4557,15 +4329,11 @@ flatten(VALUE ary, int level, int *modified)
     while (1) {
 	while (i < RARRAY_LEN(ary)) {
 	    elt = RARRAY_AREF(ary, i++);
-	    if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) {
-		rb_ary_push(result, elt);
-		continue;
-	    }
 	    tmp = rb_check_array_type(elt);
 	    if (RBASIC(result)->klass) {
 		rb_raise(rb_eRuntimeError, "flatten reentered");
 	    }
-	    if (NIL_P(tmp)) {
+	    if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
 		rb_ary_push(result, elt);
 	    }
 	    else {
@@ -4594,7 +4362,7 @@ flatten(VALUE ary, int level, int *modified)
 
     st_free_table(memo);
 
-    RBASIC_SET_CLASS(result, rb_obj_class(ary));
+    RBASIC_SET_CLASS(result, rb_class_of(ary));
     return result;
 }
 
@@ -4977,8 +4745,8 @@ yield_indexed_values(const VALUE values, const long r, const long *const p)
 /*
  * Compute permutations of +r+ elements of the set <code>[0..n-1]</code>.
  *
- * When we have a complete permutation of array indices, copy the values
- * at those indices into a new array and yield that array.
+ * 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
@@ -5112,7 +4880,7 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
     }
     else {             /* this is the general case */
 	volatile VALUE t0;
-	long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long)));
+	long *p = (long*)ALLOCV(t0, r*sizeof(long)+n*sizeof(char));
 	char *used = (char*)(p + r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
 	RBASIC_CLEAR_CLASS(ary0);
@@ -5196,7 +4964,7 @@ rb_ary_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	for (i = 0; i < len; i++) {
 	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
@@ -5217,8 +4985,8 @@ rb_ary_combination(VALUE ary, VALUE num)
  * Compute repeated permutations of +r+ elements of the set
  * <code>[0..n-1]</code>.
  *
- * When we have a complete repeated permutation of array indices, copy the
- * values at those indices into a new array and yield that array.
+ * 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
@@ -5308,7 +5076,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
     }
     else {             /* this is the general case */
 	volatile VALUE t0;
-	long *p = ALLOCV_N(long, t0, r);
+	long *p = ALLOCV_N(long, t0, r * sizeof(long));
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
 	RBASIC_CLEAR_CLASS(ary0);
 
@@ -5395,7 +5163,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 	rb_yield(rb_ary_new2(0));
     }
     else if (n == 1) {
-	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	for (i = 0; i < len; i++) {
 	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
@@ -5552,7 +5320,7 @@ rb_ary_take(VALUE obj, VALUE n)
 
 /*
  *  call-seq:
- *     ary.take_while { |obj| block }  -> new_ary
+ *     ary.take_while { |arr| block }  -> new_ary
  *     ary.take_while                  -> Enumerator
  *
  *  Passes elements to the block until the block returns +nil+ or +false+, then
@@ -5611,7 +5379,7 @@ rb_ary_drop(VALUE ary, VALUE n)
 
 /*
  *  call-seq:
- *     ary.drop_while { |obj| block }   -> new_ary
+ *     ary.drop_while { |arr| block }   -> new_ary
  *     ary.drop_while                  -> Enumerator
  *
  *  Drops elements up to, but not including, the first element for which the
@@ -5665,191 +5433,6 @@ rb_ary_any_p(VALUE ary)
 }
 
 /*
- * call-seq:
- *   ary.dig(idx, ...)                 -> object
- *
- * Extracts the nested value specified by the sequence of <i>idx</i>
- * objects by calling +dig+ at each step, returning +nil+ if any
- * intermediate step is +nil+.
- *
- *   a = [[1, [2, 3]]]
- *
- *   a.dig(0, 1, 1)                    #=> 3
- *   a.dig(1, 2, 3)                    #=> nil
- *   a.dig(0, 0, 0)                    #=> TypeError: Integer does not have #dig method
- *   [42, {foo: :bar}].dig(1, :foo)    #=> :bar
- */
-
-VALUE
-rb_ary_dig(int argc, VALUE *argv, VALUE self)
-{
-    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
-    self = rb_ary_at(self, *argv);
-    if (!--argc) return self;
-    ++argv;
-    return rb_obj_dig(argc, argv, self, Qnil);
-}
-
-/*
- * call-seq:
- *   ary.sum(init=0)                    -> number
- *   ary.sum(init=0) {|e| expr }        -> number
- *
- * Returns the sum of elements.
- * For example, [e1, e2, e3].sum returns init + e1 + e2 + e3.
- *
- * If a block is given, the block is applied to each element
- * before addition.
- *
- * If <i>ary</i> is empty, it returns <i>init</i>.
- *
- *   [].sum                             #=> 0
- *   [].sum(0.0)                        #=> 0.0
- *   [1, 2, 3].sum                      #=> 6
- *   [3, 5.5].sum                       #=> 8.5
- *   [2.5, 3.0].sum(0.0) {|e| e * e }   #=> 15.25
- *   [Object.new].sum                   #=> TypeError
- *
- * The (arithmetic) mean value of an array can be obtained as follows.
- *
- *   mean = ary.sum(0.0) / ary.length
- *
- * This method can be used for non-numeric objects by
- * explicit <i>init</i> argument.
- *
- *   ["a", "b", "c"].sum("")            #=> "abc"
- *   [[1], [[2]], [3]].sum([])          #=> [1, [2], 3]
- *
- * However, Array#join and Array#flatten is faster than Array#sum for
- * array of strings and array of arrays.
- *
- *   ["a", "b", "c"].join               #=> "abc"
- *   [[1], [[2]], [3]].flatten(1)       #=> [1, [2], 3]
- *
- *
- * Array#sum method may not respect method redefinition of "+" methods
- * such as Integer#+.
- *
- */
-
-static VALUE
-rb_ary_sum(int argc, VALUE *argv, VALUE ary)
-{
-    VALUE e, v, r;
-    long i, n;
-    int block_given;
-
-    if (rb_scan_args(argc, argv, "01", &v) == 0)
-        v = LONG2FIX(0);
-
-    block_given = rb_block_given_p();
-
-    if (RARRAY_LEN(ary) == 0)
-        return v;
-
-    n = 0;
-    r = Qundef;
-    for (i = 0; i < RARRAY_LEN(ary); i++) {
-        e = RARRAY_AREF(ary, i);
-        if (block_given)
-            e = rb_yield(e);
-        if (FIXNUM_P(e)) {
-            n += FIX2LONG(e); /* should not overflow long type */
-            if (!FIXABLE(n)) {
-                v = rb_big_plus(LONG2NUM(n), v);
-                n = 0;
-            }
-        }
-        else if (RB_TYPE_P(e, T_BIGNUM))
-            v = rb_big_plus(e, v);
-        else if (RB_TYPE_P(e, T_RATIONAL)) {
-            if (r == Qundef)
-                r = e;
-            else
-                r = rb_rational_plus(r, e);
-        }
-        else
-            goto not_exact;
-    }
-    if (n != 0)
-        v = rb_fix_plus(LONG2FIX(n), v);
-    if (r != Qundef) {
-        /* r can be an Integer when mathn is loaded */
-        if (FIXNUM_P(r))
-            v = rb_fix_plus(r, v);
-        else if (RB_TYPE_P(r, T_BIGNUM))
-            v = rb_big_plus(r, v);
-        else
-            v = rb_rational_plus(r, v);
-    }
-    return v;
-
-  not_exact:
-    if (n != 0)
-        v = rb_fix_plus(LONG2FIX(n), v);
-    if (r != Qundef) {
-        /* r can be an Integer when mathn is loaded */
-        if (FIXNUM_P(r))
-            v = rb_fix_plus(r, v);
-        else if (RB_TYPE_P(r, T_BIGNUM))
-            v = rb_big_plus(r, v);
-        else
-            v = rb_rational_plus(r, v);
-    }
-
-    if (RB_FLOAT_TYPE_P(e)) {
-        /*
-         * Kahan-Babuska balancing compensated summation algorithm
-         * See http://link.springer.com/article/10.1007/s00607-005-0139-x
-         */
-        double f, c;
-
-        f = NUM2DBL(v);
-        c = 0.0;
-        goto has_float_value;
-        for (; i < RARRAY_LEN(ary); i++) {
-            double x, t;
-            e = RARRAY_AREF(ary, i);
-            if (block_given)
-                e = rb_yield(e);
-            if (RB_FLOAT_TYPE_P(e))
-              has_float_value:
-                x = RFLOAT_VALUE(e);
-            else if (FIXNUM_P(e))
-                x = FIX2LONG(e);
-            else if (RB_TYPE_P(e, T_BIGNUM))
-                x = rb_big2dbl(e);
-            else if (RB_TYPE_P(e, T_RATIONAL))
-                x = rb_num2dbl(e);
-            else
-                goto not_float;
-
-            t = f + x;
-            if (fabs(f) >= fabs(x))
-                c += ((f - t) + x);
-            else
-                c += ((x - t) + f);
-            f = t;
-        }
-        f += c;
-        return DBL2NUM(f);
-
-      not_float:
-        v = DBL2NUM(f);
-    }
-
-    goto has_some_value;
-    for (; i < RARRAY_LEN(ary); i++) {
-        e = RARRAY_AREF(ary, i);
-        if (block_given)
-            e = rb_yield(e);
-      has_some_value:
-        v = rb_funcall(v, idPLUS, 1, e);
-    }
-    return v;
-}
-
-/*
  *  Arrays are ordered, integer-indexed collections of any object.
  *
  *  Array indexing starts at 0, as in C or Java.  A negative index is assumed
@@ -6118,7 +5701,7 @@ Init_Array(void)
     rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
     rb_define_method(rb_cArray, "first", rb_ary_first, -1);
     rb_define_method(rb_cArray, "last", rb_ary_last, -1);
-    rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -1);
+    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_m, -1);
@@ -6176,9 +5759,6 @@ Init_Array(void)
     rb_define_method(rb_cArray, "&", rb_ary_and, 1);
     rb_define_method(rb_cArray, "|", rb_ary_or, 1);
 
-    rb_define_method(rb_cArray, "max", rb_ary_max, -1);
-    rb_define_method(rb_cArray, "min", rb_ary_min, -1);
-
     rb_define_method(rb_cArray, "uniq", rb_ary_uniq, 0);
     rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0);
     rb_define_method(rb_cArray, "compact", rb_ary_compact, 0);
@@ -6201,10 +5781,7 @@ Init_Array(void)
     rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
     rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
     rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0);
-    rb_define_method(rb_cArray, "bsearch_index", rb_ary_bsearch_index, 0);
     rb_define_method(rb_cArray, "any?", rb_ary_any_p, 0);
-    rb_define_method(rb_cArray, "dig", rb_ary_dig, -1);
-    rb_define_method(rb_cArray, "sum", rb_ary_sum, -1);
 
     id_cmp = rb_intern("<=>");
     id_random = rb_intern("random");
diff --git a/basictest/runner.rb b/basictest/runner.rb
deleted file mode 100755
index 0f398e7acc..0000000000
--- a/basictest/runner.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-#! ./miniruby
-
-exit if defined?(CROSS_COMPILING) and CROSS_COMPILING
-ruby = ENV["RUBY"]
-unless ruby
-  load './rbconfig.rb'
-  ruby = "./#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}"
-end
-unless File.exist? ruby
-  print "#{ruby} is not found.\n"
-  print "Try `make' first, then `make test', please.\n"
-  exit false
-end
-ARGV[0] and opt = ARGV[0][/\A--run-opt=(.*)/, 1] and ARGV.shift
-
-$stderr.reopen($stdout)
-error = ''
-
-srcdir = File.expand_path('..', File.dirname(__FILE__))
-if env = ENV["RUBYOPT"]
-  ENV["RUBYOPT"] = env + " -W1"
-end
-`#{ruby} #{opt} -W1 #{srcdir}/basictest/test.rb #{ARGV.join(' ')}`.each_line do |line|
-  if line =~ /^end of test/
-    print "\ntest succeeded\n"
-    exit true
-  end
-  error << line if %r:^(basictest/test.rb|not): =~ line
-end
-puts
-print error
-print "test failed\n"
-exit false
diff --git a/basictest/test.rb b/basictest/test.rb
deleted file mode 100755
index 25d52ca1ef..0000000000
--- a/basictest/test.rb
+++ /dev/null
@@ -1,2367 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: us-ascii -*-
-
-$testnum=0
-$ntest=0
-$failed = 0
-class Progress
-  def initialize
-    @color = nil
-    @tty = nil
-    @quiet = nil
-    @verbose = nil
-    ARGV.each do |arg|
-      case arg
-      when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
-        warn "unknown --color argument: #$3" if $3
-        @color = $1 ? nil : !$2
-      when /\A--tty(=(?:yes|(no)|(.*)))?\z/
-        warn "unknown --tty argument: #$3" if $3
-        @tty = !$1 || !$2
-        true
-      when /\A-(q|-quiet)\z/
-        @quiet = true
-      when /\A-(v|-verbose)\z/
-        @verbose = true
-      end
-    end
-    @tty = STDERR.tty? && !STDOUT.tty? && /dumb/ !~ ENV["TERM"] if @tty.nil?
-    @eol = @tty && !@verbose ? "\r\e[K\r" : "\n"
-    case @color
-    when nil
-      @color = @tty
-    end
-    if @color
-      # dircolors-like style
-      colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
-      begin
-        File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
-          colors[n] ||= c
-        end
-      rescue
-      end
-      @passed = "\e[;#{colors["pass"] || "32"}m"
-      @failed = "\e[;#{colors["fail"] || "31"}m"
-      @reset = "\e[m"
-    else
-      @passed = @failed = @reset = ""
-    end
-    extend(Rotator) if @tty
-  end
-
-  def passed_string
-    "."
-  end
-  def failed_string
-    "#{@failed}F#{@reset}"
-  end
-  def init_string
-  end
-  def finish_string
-    if @quiet
-      @eol
-    else
-      "#{@passed}#{@ok ? 'OK' : ''} #{$testnum}#{@reset}#{@eol}"
-    end
-  end
-  def pass
-    STDERR.print passed_string
-  end
-  def fail
-    @ok = false
-    STDERR.print failed_string
-  end
-  def init
-    @ok = true
-    STDERR.print init_string
-  end
-  def finish
-    STDERR.print finish_string
-  end
-
-  module Rotator
-    ROTATOR = %w[- \\ | /]
-    BS = "\b" * ROTATOR[0].size
-    def passed_string
-      "#{BS}#{ROTATOR[(@count += 1) % ROTATOR.size]}"
-    end
-    def failed_string
-      "#{BS}#{super}#{ROTATOR[@count % ROTATOR.size]}"
-    end
-    def init_string
-      @count = 0
-      " "
-    end
-    def finish_string
-      s = "#{BS}#{' ' * BS.size}#{BS}#{super}"
-      s.gsub!(/\n/, "\r\e[2K\r") if @quiet
-      s
-    end
-  end
-end
-PROGRESS = Progress.new
-
-def test_check(what)
-  unless $ntest.zero?
-    PROGRESS.finish
-  end
-  STDERR.print "#{$0}:#{what} "
-  PROGRESS.init
-  $what = what
-  $testnum = 0
-end
-
-def test_ok(cond,n=1)
-  $testnum+=1
-  $ntest+=1
-  where = (st = caller(n)) ? st[0] : "caller error! (n=#{n}, trace=#{caller(0).join(', ')}"
-  if cond
-    PROGRESS.pass
-    printf "ok %d (%s)\n", $testnum, where
-  else
-    PROGRESS.fail
-    printf "not ok %s %d -- %s\n", $what, $testnum, where
-    $failed+=1
-  end
-  STDOUT.flush
-  STDERR.flush
-end
-
-# make sure conditional operators work
-
-test_check "assignment"
-
-a=[]; a[0] ||= "bar";
-test_ok(a[0] == "bar")
-h={}; h["foo"] ||= "bar";
-test_ok(h["foo"] == "bar")
-
-aa = 5
-aa ||= 25
-test_ok(aa == 5)
-bb ||= 25
-test_ok(bb == 25)
-cc &&=33
-test_ok(cc == nil)
-cc = 5
-cc &&=44
-test_ok(cc == 44)
-
-a = nil; test_ok(a == nil)
-a = 1; test_ok(a == 1)
-a = []; test_ok(a == [])
-a = [1]; test_ok(a == [1])
-a = [nil]; test_ok(a == [nil])
-a = [[]]; test_ok(a == [[]])
-a = [1,2]; test_ok(a == [1,2])
-a = [*[]]; test_ok(a == [])
-a = [*[1]]; test_ok(a == [1])
-a = [*[1,2]]; test_ok(a == [1,2])
-
-a = *[]; test_ok(a == [])
-a = *[1]; test_ok(a == [1])
-a = *[nil]; test_ok(a == [nil])
-a = *[[]]; test_ok(a == [[]])
-a = *[1,2]; test_ok(a == [1,2])
-a = *[*[]]; test_ok(a == [])
-a = *[*[1]]; test_ok(a == [1])
-a = *[*[1,2]]; test_ok(a == [1,2])
-
-a, = nil; test_ok(a == nil)
-a, = 1; test_ok(a == 1)
-a, = []; test_ok(a == nil)
-a, = [1]; test_ok(a == 1)
-a, = [nil]; test_ok(a == nil)
-a, = [[]]; test_ok(a == [])
-a, = 1,2; test_ok(a == 1)
-a, = [1,2]; test_ok(a == 1)
-a, = [*[]]; test_ok(a == nil)
-a, = [*[1]]; test_ok(a == 1)
-a, = *[1,2]; test_ok(a == 1)
-a, = [*[1,2]]; test_ok(a == 1)
-
-a, = *[]; test_ok(a == nil)
-a, = *[1]; test_ok(a == 1)
-a, = *[nil]; test_ok(a == nil)
-a, = *[[]]; test_ok(a == [])
-a, = *[1,2]; test_ok(a == 1)
-a, = *[*[]]; test_ok(a == nil)
-a, = *[*[1]]; test_ok(a == 1)
-a, = *[*[1,2]]; test_ok(a == 1)
-
-*a = nil; test_ok(a == [nil])
-*a = 1; test_ok(a == [1])
-*a = []; test_ok(a == [])
-*a = [1]; test_ok(a == [1])
-*a = [nil]; test_ok(a == [nil])
-*a = [[]]; test_ok(a == [[]])
-*a = [1,2]; test_ok(a == [1,2])
-*a = [*[]]; test_ok(a == [])
-*a = [*[1]]; test_ok(a == [1])
-*a = [*[1,2]]; test_ok(a == [1,2])
-
-*a = *[]; test_ok(a == [])
-*a = *[1]; test_ok(a == [1])
-*a = *[nil]; test_ok(a == [nil])
-*a = *[[]]; test_ok(a == [[]])
-*a = *[1,2]; test_ok(a == [1,2])
-*a = *[*[]]; test_ok(a == [])
-*a = *[*[1]]; test_ok(a == [1])
-*a = *[*[1,2]]; test_ok(a == [1,2])
-
-a,b,*c = nil; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = 1; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = []; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = [1]; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = [nil]; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = [[]]; test_ok([a,b,c] == [[],nil,[]])
-a,b,*c = [1,2]; test_ok([a,b,c] == [1,2,[]])
-a,b,*c = [*[]]; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = [*[1]]; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = [*[1,2]]; test_ok([a,b,c] == [1,2,[]])
-
-a,b,*c = *[]; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = *[1]; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = *[nil]; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = *[[]]; test_ok([a,b,c] == [[],nil,[]])
-a,b,*c = *[1,2]; test_ok([a,b,c] == [1,2,[]])
-a,b,*c = *[*[]]; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = *[*[1]]; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = *[*[1,2]]; test_ok([a,b,c] == [1,2,[]])
-
-def f; yield nil; end; f {|a| test_ok(a == nil)}
-def f; yield 1; end; f {|a| test_ok(a == 1)}
-def f; yield []; end; f {|a| test_ok(a == [])}
-def f; yield [1]; end; f {|a| test_ok(a == [1])}
-def f; yield [nil]; end; f {|a| test_ok(a == [nil])}
-def f; yield [[]]; end; f {|a| test_ok(a == [[]])}
-def f; yield [*[]]; end; f {|a| test_ok(a == [])}
-def f; yield [*[1]]; end; f {|a| test_ok(a == [1])}
-def f; yield [*[1,2]]; end; f {|a| test_ok(a == [1,2])}
-def f; yield *[]; end; f {|a| test_ok(a == nil)}
-def f; yield *[1]; end; f {|a| test_ok(a == 1)}
-def f; yield *[nil]; end; f {|a| test_ok(a == nil)}
-def f; yield *[[]]; end; f {|a| test_ok(a == [])}
-def f; yield *[*[]]; end; f {|a| test_ok(a == nil)}
-def f; yield *[*[1]]; end; f {|a| test_ok(a == 1)}
-def f; yield *[*[1,2]]; end; f {|a| test_ok(a == 1)}
-
-def f; yield; end; f {|a,| test_ok(a == nil)}
-def f; yield nil; end; f {|a,| test_ok(a == nil)}
-def f; yield 1; end; f {|a,| test_ok(a == 1)}
-def f; yield []; end; f {|a,| test_ok(a == nil)}
-def f; yield [1]; end; f {|a,| test_ok(a == 1)}
-def f; yield [nil]; end; f {|a,| test_ok(a == nil)}
-def f; yield [[]]; end; f {|a,| test_ok(a == [])}
-def f; yield [*[]]; end; f {|a,| test_ok(a == nil)}
-def f; yield [*[1]]; end; f {|a,| test_ok(a == 1)}
-def f; yield [*[1,2]]; end; f {|a,| test_ok(a == 1)}
-
-def f; yield *[]; end; f {|a,| test_ok(a == nil)}
-def f; yield *[1]; end; f {|a,| test_ok(a == 1)}
-def f; yield *[nil]; end; f {|a,| test_ok(a == nil)}
-def f; yield *[[]]; end; f {|a,| test_ok(a == nil)}
-def f; yield *[*[]]; end; f {|a,| test_ok(a == nil)}
-def f; yield *[*[1]]; end; f {|a,| test_ok(a == 1)}
-def f; yield *[*[1,2]]; end; f {|a,| test_ok(a == 1)}
-
-def f; yield; end; f {|*a| test_ok(a == [])}
-def f; yield nil; end; f {|*a| test_ok(a == [nil])}
-def f; yield 1; end; f {|*a| test_ok(a == [1])}
-def f; yield []; end; f {|*a| test_ok(a == [[]])}
-def f; yield [1]; end; f {|*a| test_ok(a == [[1]])}
-def f; yield [nil]; end; f {|*a| test_ok(a == [[nil]])}
-def f; yield [[]]; end; f {|*a| test_ok(a == [[[]]])}
-def f; yield [1,2]; end; f {|*a| test_ok(a == [[1,2]])}
-def f; yield [*[]]; end; f {|*a| test_ok(a == [[]])}
-def f; yield [*[1]]; end; f {|*a| test_ok(a == [[1]])}
-def f; yield [*[1,2]]; end; f {|*a| test_ok(a == [[1,2]])}
-
-def f; yield *[]; end; f {|*a| test_ok(a == [])}
-def f; yield *[1]; end; f {|*a| test_ok(a == [1])}
-def f; yield *[nil]; end; f {|*a| test_ok(a == [nil])}
-def f; yield *[[]]; end; f {|*a| test_ok(a == [[]])}
-def f; yield *[*[]]; end; f {|*a| test_ok(a == [])}
-def f; yield *[*[1]]; end; f {|*a| test_ok(a == [1])}
-def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
-
-def f; yield; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
-def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
-def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])}
-def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
-def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])}
-
-def f; yield *[]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield *[1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
-def f; yield *[nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield *[*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
-def f; yield *[*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
-def f; yield *[*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])}
-
-def r; return; end; a = r(); test_ok(a == nil)
-def r; return nil; end; a = r(); test_ok(a == nil)
-def r; return 1; end; a = r(); test_ok(a == 1)
-def r; return []; end; a = r(); test_ok(a == [])
-def r; return [1]; end; a = r(); test_ok(a == [1])
-def r; return [nil]; end; a = r(); test_ok(a == [nil])
-def r; return [[]]; end; a = r(); test_ok(a == [[]])
-def r; return [*[]]; end; a = r(); test_ok(a == [])
-def r; return [*[1]]; end; a = r(); test_ok(a == [1])
-def r; return [*[1,2]]; end; a = r(); test_ok(a == [1,2])
-
-def r; return *[]; end; a = r(); test_ok(a == [])
-def r; return *[1]; end; a = r(); test_ok(a == [1])
-def r; return *[nil]; end; a = r(); test_ok(a == [nil])
-def r; return *[[]]; end; a = r(); test_ok(a == [[]])
-def r; return *[*[]]; end; a = r(); test_ok(a == [])
-def r; return *[*[1]]; end; a = r(); test_ok(a == [1])
-def r; return *[*[1,2]]; end; a = r(); test_ok(a == [1,2])
-
-def r; return *[[]]; end; a = *r(); test_ok(a == [[]])
-def r; return *[*[1,2]]; end; a = *r(); test_ok(a == [1,2])
-
-def r; return; end; *a = r(); test_ok(a == [nil])
-def r; return nil; end; *a = r(); test_ok(a == [nil])
-def r; return 1; end; *a = r(); test_ok(a == [1])
-def r; return []; end; *a = r(); test_ok(a == [])
-def r; return [1]; end; *a = r(); test_ok(a == [1])
-def r; return [nil]; end; *a = r(); test_ok(a == [nil])
-def r; return [[]]; end; *a = r(); test_ok(a == [[]])
-def r; return [1,2]; end; *a = r(); test_ok(a == [1,2])
-def r; return [*[]]; end; *a = r(); test_ok(a == [])
-def r; return [*[1]]; end; *a = r(); test_ok(a == [1])
-def r; return [*[1,2]]; end; *a = r(); test_ok(a == [1,2])
-
-def r; return *[]; end; *a = r(); test_ok(a == [])
-def r; return *[1]; end; *a = r(); test_ok(a == [1])
-def r; return *[nil]; end; *a = r(); test_ok(a == [nil])
-def r; return *[[]]; end; *a = r(); test_ok(a == [[]])
-def r; return *[1,2]; end; *a = r(); test_ok(a == [1,2])
-def r; return *[*[]]; end; *a = r(); test_ok(a == [])
-def r; return *[*[1]]; end; *a = r(); test_ok(a == [1])
-def r; return *[*[1,2]]; end; *a = r(); test_ok(a == [1,2])
-
-def r; return *[[]]; end; *a = *r(); test_ok(a == [[]])
-def r; return *[1,2]; end; *a = *r(); test_ok(a == [1,2])
-def r; return *[*[1,2]]; end; *a = *r(); test_ok(a == [1,2])
-
-def r; return; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return nil; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return 1; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
-def r; return []; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return [1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
-def r; return [nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return [[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]])
-def r; return [1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
-def r; return [*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return [*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
-def r; return [*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
-
-def r; return *[]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return *[1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
-def r; return *[nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return *[[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]])
-def r; return *[1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
-def r; return *[*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
-def r; return *[*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
-def r; return *[*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
-
-f = lambda {|r,| test_ok([] == r)}
-f.call([], *[])
-
-f = lambda {|r,*l| test_ok([] == r); test_ok([1] == l)}
-f.call([], *[1])
-
-f = lambda{|x| x}
-test_ok(f.call(42) == 42)
-test_ok(f.call([42]) == [42])
-test_ok(f.call([[42]]) == [[42]])
-test_ok(f.call([42,55]) == [42,55])
-
-f = lambda{|x,| x}
-test_ok(f.call(42) == 42)
-test_ok(f.call([42]) == [42])
-test_ok(f.call([[42]]) == [[42]])
-test_ok(f.call([42,55]) == [42,55])
-
-f = lambda{|*x| x}
-test_ok(f.call(42) == [42])
-test_ok(f.call([42]) == [[42]])
-test_ok(f.call([[42]]) == [[[42]]])
-test_ok(f.call([42,55]) == [[42,55]])
-test_ok(f.call(42,55) == [42,55])
-
-f = lambda { |a, b=42, *c| [a,b,c] }
-test_ok(f.call(1      ) == [1,42,[  ]] )
-test_ok(f.call(1,43   ) == [1,43,[  ]] )
-test_ok(f.call(1,43,44) == [1,43,[44]] )
-
-f = lambda { |a, b=(a|16), *c, &block| [a,b,c,block&&block[]] }
-test_ok(f.call(8      )     == [8,24,[  ],nil] )
-test_ok(f.call(8,43   )     == [8,43,[  ],nil] )
-test_ok(f.call(8,43,44)     == [8,43,[44],nil] )
-test_ok(f.call(8      ){45} == [8,24,[  ],45 ] )
-test_ok(f.call(8,43   ){45} == [8,43,[  ],45 ] )
-test_ok(f.call(8,43,44){45} == [8,43,[44],45 ] )
-
-f = lambda { |a, b=42, *c, d| [a,b,c,d] }
-test_ok(f.call(1      ,99) == [1,42,[  ],99] )
-test_ok(f.call(1,43   ,99) == [1,43,[  ],99] )
-test_ok(f.call(1,43,44,99) == [1,43,[44],99] )
-
-f = lambda { |a, b=(a|16), &block| [a,b,block&&block[]] }
-test_ok(f.call(8   )     == [8,24,nil] )
-test_ok(f.call(8,43)     == [8,43,nil] )
-test_ok(f.call(8,43)     == [8,43,nil] )
-test_ok(f.call(8   ){45} == [8,24,45 ] )
-test_ok(f.call(8,43){45} == [8,43,45 ] )
-test_ok(f.call(8,43){45} == [8,43,45 ] )
-
-f = lambda { |a, b=42, d| [a,b,d] }
-test_ok(f.call(1   ,99) == [1,42,99] )
-test_ok(f.call(1,43,99) == [1,43,99] )
-test_ok(f.call(1,43,99) == [1,43,99] )
-
-f = lambda { |b=42, *c, &block| [b,c,block&&block[]] }
-test_ok(f.call(     )     == [42,[  ],nil] )
-test_ok(f.call(43   )     == [43,[  ],nil] )
-test_ok(f.call(43,44)     == [43,[44],nil] )
-test_ok(f.call(     ){45} == [42,[  ],45 ] )
-test_ok(f.call(43   ){45} == [43,[  ],45 ] )
-test_ok(f.call(43,44){45} == [43,[44],45 ] )
-
-f = lambda { |b=42, *c, d| [b,c,d] }
-test_ok(f.call(      99) == [42,[  ],99] )
-test_ok(f.call(43   ,99) == [43,[  ],99] )
-test_ok(f.call(43,44,99) == [43,[44],99] )
-
-f = lambda { |b=42, &block| [b,block&&block[]] }
-test_ok(f.call(  )     == [42,nil] )
-test_ok(f.call(43)     == [43,nil] )
-test_ok(f.call(43)     == [43,nil] )
-test_ok(f.call(  ){45} == [42,45 ] )
-test_ok(f.call(43){45} == [43,45 ] )
-test_ok(f.call(43){45} == [43,45 ] )
-
-f = lambda { |b=42, d| [b,d] }
-test_ok(f.call(   99) == [42,99] )
-test_ok(f.call(43,99) == [43,99] )
-test_ok(f.call(43,99) == [43,99] )
-
-
-a,=*[1]
-test_ok(a == 1)
-a,=*[[1]]
-test_ok(a == [1])
-a,=*[[[1]]]
-test_ok(a == [[1]])
-
-x, (y, z) = 1, 2, 3
-test_ok([1,2,nil] == [x,y,z])
-x, (y, z) = 1, [2,3]
-test_ok([1,2,3] == [x,y,z])
-x, (y, z) = 1, [2]
-test_ok([1,2,nil] == [x,y,z])
-
-a = loop do break; end; test_ok(a == nil)
-a = loop do break nil; end; test_ok(a == nil)
-a = loop do break 1; end; test_ok(a == 1)
-a = loop do break []; end; test_ok(a == [])
-a = loop do break [1]; end; test_ok(a == [1])
-a = loop do break [nil]; end; test_ok(a == [nil])
-a = loop do break [[]]; end; test_ok(a == [[]])
-a = loop do break [*[]]; end; test_ok(a == [])
-a = loop do break [*[1]]; end; test_ok(a == [1])
-a = loop do break [*[1,2]]; end; test_ok(a == [1,2])
-
-a = loop do break *[]; end; test_ok(a == [])
-a = loop do break *[1]; end; test_ok(a == [1])
-a = loop do break *[nil]; end; test_ok(a == [nil])
-a = loop do break *[[]]; end; test_ok(a == [[]])
-a = loop do break *[*[]]; end; test_ok(a == [])
-a = loop do break *[*[1]]; end; test_ok(a == [1])
-a = loop do break *[*[1,2]]; end; test_ok(a == [1,2])
-
-*a = loop do break; end; test_ok(a == [nil])
-*a = loop do break nil; end; test_ok(a == [nil])
-*a = loop do break 1; end; test_ok(a == [1])
-*a = loop do break []; end; test_ok(a == [])
-*a = loop do break [1]; end; test_ok(a == [1])
-*a = loop do break [nil]; end; test_ok(a == [nil])
-*a = loop do break [[]]; end; test_ok(a == [[]])
-*a = loop do break [1,2]; end; test_ok(a == [1,2])
-*a = loop do break [*[]]; end; test_ok(a == [])
-*a = loop do break [*[1]]; end; test_ok(a == [1])
-*a = loop do break [*[1,2]]; end; test_ok(a == [1,2])
-
-*a = loop do break *[]; end; test_ok(a == [])
-*a = loop do break *[1]; end; test_ok(a == [1])
-*a = loop do break *[nil]; end; test_ok(a == [nil])
-*a = loop do break *[[]]; end; test_ok(a == [[]])
-*a = loop do break *[1,2]; end; test_ok(a == [1,2])
-*a = loop do break *[*[]]; end; test_ok(a == [])
-*a = loop do break *[*[1]]; end; test_ok(a == [1])
-*a = loop do break *[*[1,2]]; end; test_ok(a == [1,2])
-
-*a = *loop do break *[[]]; end; test_ok(a == [[]])
-*a = *loop do break *[1,2]; end; test_ok(a == [1,2])
-*a = *loop do break *[*[1,2]]; end; test_ok(a == [1,2])
-
-a,b,*c = loop do break; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break nil; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break 1; end; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = loop do break []; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break [1]; end; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = loop do break [nil]; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break [[]]; end; test_ok([a,b,c] == [[],nil,[]])
-a,b,*c = loop do break [1,2]; end; test_ok([a,b,c] == [1,2,[]])
-a,b,*c = loop do break [*[]]; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break [*[1]]; end; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = loop do break [*[1,2]]; end; test_ok([a,b,c] == [1,2,[]])
-
-a,b,*c = loop do break *[]; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break *[1]; end; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = loop do break *[nil]; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break *[[]]; end; test_ok([a,b,c] == [[],nil,[]])
-a,b,*c = loop do break *[1,2]; end; test_ok([a,b,c] == [1,2,[]])
-a,b,*c = loop do break *[*[]]; end; test_ok([a,b,c] == [nil,nil,[]])
-a,b,*c = loop do break *[*[1]]; end; test_ok([a,b,c] == [1,nil,[]])
-a,b,*c = loop do break *[*[1,2]]; end; test_ok([a,b,c] == [1,2,[]])
-
-def r(val); a = yield(); test_ok(a == val, 2); end
-r(nil){next}
-r(nil){next nil}
-r(1){next 1}
-r([]){next []}
-r([1]){next [1]}
-r([nil]){next [nil]}
-r([[]]){next [[]]}
-r([]){next [*[]]}
-r([1]){next [*[1]]}
-r([1,2]){next [*[1,2]]}
-
-r([]){next *[]}
-r([1]){next *[1]}
-r([nil]){next *[nil]}
-r([[]]){next *[[]]}
-r([]){next *[*[]]}
-r([1]){next *[*[1]]}
-r([1,2]){next *[*[1,2]]}
-
-def r(val); *a = yield(); test_ok(a == val, 2); end
-r([nil]){next}
-r([nil]){next nil}
-r([1]){next 1}
-r([]){next []}
-r([1]){next [1]}
-r([nil]){next [nil]}
-r([[]]){next [[]]}
-r([1,2]){next [1,2]}
-r([]){next [*[]]}
-r([1]){next [*[1]]}
-r([1,2]){next [*[1,2]]}
-
-def r(val); *a = *yield(); test_ok(a == val, 2); end
-r([[]]){next *[[]]}
-r([1,2]){next *[1,2]}
-r([1,2]){next *[*[1,2]]}
-
-def r(val); a,b,*c = yield(); test_ok([a,b,c] == val, 2); end
-r([nil,nil,[]]){next}
-r([nil,nil,[]]){next nil}
-r([1,nil,[]]){next 1}
-r([nil,nil,[]]){next []}
-r([1,nil,[]]){next [1]}
-r([nil,nil,[]]){next [nil]}
-r([[],nil,[]]){next [[]]}
-r([1,2,[]]){next [1,2]}
-r([nil,nil,[]]){next [*[]]}
-r([1,nil,[]]){next [*[1]]}
-r([1,2,[]]){next [*[1,2]]}
-
-def r(val); a,b,*c = *yield(); test_ok([a,b,c] == val, 2); end
-r([[],nil,[]]){next *[[]]}
-r([1,2,[]]){next *[1,2]}
-r([1,2,[]]){next *[*[1,2]]}
-
-test_check "condition"
-
-$x = '0';
-
-$x == $x && test_ok(true)
-$x != $x && test_ok(false)
-$x == $x || test_ok(false)
-$x != $x || test_ok(true)
-
-# first test to see if we can run the tests.
-
-test_check "if/unless";
-
-$x = 'test';
-test_ok(if $x == $x then true else false end)
-$bad = false
-unless $x == $x
-  $bad = true
-end
-test_ok(!$bad)
-test_ok(unless $x != $x then true else false end)
-
-test_check "case"
-
-case 5
-when 1, 2, 3, 4, 6, 7, 8
-  test_ok(false)
-when 5
-  test_ok(true)
-end
-
-case 5
-when 5
-  test_ok(true)
-when 1..10
-  test_ok(false)
-end
-
-case 5
-when 1..10
-  test_ok(true)
-else
-  test_ok(false)
-end
-
-case 5
-when 5
-  test_ok(true)
-else
-  test_ok(false)
-end
-
-case "foobar"
-when /^f.*r$/
-  test_ok(true)
-else
-  test_ok(false)
-end
-
-test_check "while/until";
-
-while_tmp = "while_tmp.#{$$}"
-tmp = open(while_tmp, "w")
-tmp.print "tvi925\n";
-tmp.print "tvi920\n";
-tmp.print "vt100\n";
-tmp.print "Amiga\n";
-tmp.print "paper\n";
-tmp.close
-
-# test break
-
-tmp = open(while_tmp, "r")
-test_ok(tmp.kind_of?(File))
-
-while line = tmp.gets()
-  break if /vt100/ =~ line
-end
-
-test_ok(!tmp.eof? && /vt100/ =~ line)
-tmp.close
-
-# test next
-$bad = false
-tmp = open(while_tmp, "r")
-while line = tmp.gets()
-  next if /vt100/ =~ line
-  $bad = 1 if /vt100/ =~ line
-end
-test_ok(!(!tmp.eof? || /vt100/ =~ line || $bad))
-tmp.close
-
-# test redo
-$bad = false
-tmp = open(while_tmp, "r")
-while line = tmp.gets()
-  lastline = line
-  line = line.gsub(/vt100/, 'VT100')
-  if lastline != line
-    line.gsub!('VT100', 'Vt100')
-    redo
-  end
-  $bad = 1 if /vt100/ =~ line
-  $bad = 1 if /VT100/ =~ line
-end
-test_ok(tmp.eof? && !$bad)
-tmp.close
-
-sum=0
-for i in 1..10
-  sum += i
-  i -= 1
-  if i > 0
-    redo
-  end
-end
-test_ok(sum == 220)
-
-# test interval
-$bad = false
-tmp = open(while_tmp, "r")
-while line = tmp.gets()
-  break if 3
-  case line
-  when /vt100/, /Amiga/, /paper/
-    $bad = true
-  end
-end
-test_ok(!$bad)
-tmp.close
-
-File.unlink while_tmp or `/bin/rm -f "#{while_tmp}"`
-test_ok(!File.exist?(while_tmp))
-
-i = 0
-until i>4
-  i+=1
-end
-test_ok(i>4)
-
-
-# exception handling
-test_check "exception";
-
-begin
-  raise "this must be handled"
-  test_ok(false)
-rescue
-  test_ok(true)
-end
-
-$bad = true
-begin
-  raise "this must be handled no.2"
-rescue
-  if $bad
-    $bad = false
-    retry
-    test_ok(false)
-  end
-end
-test_ok(true)
-
-# exception in rescue clause
-$string = "this must be handled no.3"
-begin
-  begin
-    raise "exception in rescue clause"
-  rescue
-    raise $string
-  end
-  test_ok(false)
-rescue => e
-  test_ok($! == e)
-  test_ok(e.message == $string)
-  test_ok(e != $string)
-end
-
-# exception in ensure clause
-begin
-  begin
-    raise "this must be handled no.4"
-  ensure
-    raise "exception in ensure clause"
-  end
-  test_ok(false)
-rescue
-  test_ok(true)
-end
-
-$bad = true
-begin
-  begin
-    raise "this must be handled no.5"
-  ensure
-    $bad = false
-  end
-rescue
-end
-test_ok(!$bad)
-
-$bad = true
-begin
-  begin
-    raise "this must be handled no.6"
-  ensure
-    $bad = false
-  end
-rescue
-end
-test_ok(!$bad)
-
-$bad = true
-while true
-  begin
-    break
-  ensure
-    $bad = false
-  end
-end
-test_ok(!$bad)
-
-test_ok(catch(:foo) {
-     loop do
-       loop do
-	 throw :foo, true
-	 break
-       end
-       break
-       test_ok(false)			# should not reach here
-     end
-     false
-   })
-
-test_check "array"
-test_ok([1, 2] + [3, 4] == [1, 2, 3, 4])
-test_ok([1, 2] * 2 == [1, 2, 1, 2])
-test_ok([1, 2] * ":" == "1:2")
-
-test_ok([1, 2].hash == [1, 2].hash)
-
-test_ok([1,2,3] & [2,3,4] == [2,3])
-test_ok([1,2,3] | [2,3,4] == [1,2,3,4])
-test_ok([1,2,3] - [2,3] == [1])
-
-$x = [0, 1, 2, 3, 4, 5]
-test_ok($x[2] == 2)
-test_ok($x[1..3] == [1, 2, 3])
-test_ok($x[1,3] == [1, 2, 3])
-
-$x[0, 2] = 10
-test_ok($x[0] == 10 && $x[1] == 2)
-
-$x[0, 0] = -1
-test_ok($x[0] == -1 && $x[1] == 10)
-
-$x[-1, 1] = 20
-test_ok($x[-1] == 20 && $x.pop == 20)
-
-# array and/or
-test_ok(([1,2,3]&[2,4,6]) == [2])
-test_ok(([1,2,3]|[2,4,6]) == [1,2,3,4,6])
-
-# compact
-$x = [nil, 1, nil, nil, 5, nil, nil]
-$x.compact!
-test_ok($x == [1, 5])
-
-# uniq
-$x = [1, 1, 4, 2, 5, 4, 5, 1, 2]
-$x.uniq!
-test_ok($x == [1, 4, 2, 5])
-
-# empty?
-test_ok(!$x.empty?)
-$x = []
-test_ok($x.empty?)
-
-# sort
-$x = ["it", "came", "to", "pass", "that", "..."]
-$x = $x.sort.join(" ")
-test_ok($x == "... came it pass that to")
-$x = [2,5,3,1,7]
-$x.sort!{|a,b| a<=>b}		# sort with condition
-test_ok($x == [1,2,3,5,7])
-$x.sort!{|a,b| b-a}		# reverse sort
-test_ok($x == [7,5,3,2,1])
-
-# split test
-$x = "The Book of Mormon"
-test_ok($x.split(//).reverse!.join == $x.reverse)
-test_ok($x.reverse == $x.reverse!)
-test_ok("1 byte string".split(//).reverse.join(":") == "g:n:i:r:t:s: :e:t:y:b: :1")
-$x = "a b c  d"
-test_ok($x.split == ['a', 'b', 'c', 'd'])
-test_ok($x.split(' ') == ['a', 'b', 'c', 'd'])
-test_ok(defined? "a".chomp)
-test_ok("abc".scan(/./) == ["a", "b", "c"])
-test_ok("1a2b3c".scan(/(\d.)/) == [["1a"], ["2b"], ["3c"]])
-# non-greedy match
-test_ok("a=12;b=22".scan(/(.*?)=(\d*);?/) == [["a", "12"], ["b", "22"]])
-
-$x = [1]
-test_ok(($x * 5).join(":") == '1:1:1:1:1')
-test_ok(($x * 1).join(":") == '1')
-test_ok(($x * 0).join(":") == '')
-
-*$x = *(1..7).to_a
-test_ok($x.size == 7)
-test_ok($x == [1, 2, 3, 4, 5, 6, 7])
-
-$x = [1,2,3]
-$x[1,0] = $x
-test_ok($x == [1,1,2,3,2,3])
-
-$x = [1,2,3]
-$x[-1,0] = $x
-test_ok($x == [1,2,1,2,3,3])
-
-$x = [1,2,3]
-$x.concat($x)
-test_ok($x == [1,2,3,1,2,3])
-
-test_check "hash"
-$x = {1=>2, 2=>4, 3=>6}
-
-test_ok($x[1] == 2)
-
-test_ok(begin
-     for k,v in $x
-       raise if k*2 != v
-     end
-     true
-   rescue
-     false
-   end)
-
-test_ok($x.length == 3)
-test_ok($x.has_key?(1))
-test_ok($x.has_value?(4))
-test_ok($x.values_at(2,3) == [4,6])
-test_ok($x == {1=>2, 2=>4, 3=>6})
-
-$z = $x.keys.sort.join(":")
-test_ok($z == "1:2:3")
-
-$z = $x.values.sort.join(":")
-test_ok($z == "2:4:6")
-test_ok($x == $x)
-
-$x.shift
-test_ok($x.length == 2)
-
-$z = [1,2]
-$x[$z] = 256
-test_ok($x[$z] == 256)
-
-$x = Hash.new(0)
-$x[1] = 1
-test_ok($x[1] == 1)
-test_ok($x[2] == 0)
-
-$x = Hash.new([])
-test_ok($x[22] == [])
-test_ok($x[22].equal?($x[22]))
-
-$x = Hash.new{[]}
-test_ok($x[22] == [])
-test_ok(!$x[22].equal?($x[22]))
-
-$x = Hash.new{|h,k| $z = k; h[k] = k*2}
-$z = 0
-test_ok($x[22] == 44)
-test_ok($z == 22)
-$z = 0
-test_ok($x[22] == 44)
-test_ok($z == 0)
-$x.default = 5
-test_ok($x[23] == 5)
-
-$x = Hash.new
-def $x.default(k)
-  $z = k
-  self[k] = k*2
-end
-$z = 0
-test_ok($x[22] == 44)
-test_ok($z == 22)
-$z = 0
-test_ok($x[22] == 44)
-test_ok($z == 0)
-
-test_check "iterator"
-
-test_ok(!iterator?)
-
-def ttt
-  test_ok(iterator?)
-end
-ttt{}
-
-# yield at top level
-test_ok(!defined?(yield))
-
-$x = [1, 2, 3, 4]
-$y = []
-
-# iterator over array
-for i in $x
-  $y.push i
-end
-test_ok($x == $y)
-
-# nested iterator
-def tt
-  1.upto(10) {|i|
-    yield i
-  }
-end
-
-i=0
-tt{|i| break if i == 5}
-test_ok(i == 0)
-
-def tt2(dummy)
-  yield 1
-end
-
-def tt3(&block)
-  tt2(raise(ArgumentError,""),&block)
-end
-
-$x = false
-begin
-  tt3{}
-rescue ArgumentError
-  $x = true
-rescue Exception
-end
-test_ok($x)
-
-def tt4 &block
-  tt2(raise(ArgumentError,""),&block)
-end
-$x = false
-begin
-  tt4{}
-rescue ArgumentError
-  $x = true
-rescue Exception
-end
-test_ok($x)
-
-# iterator break/redo/next/retry
-done = true
-loop{
-  break
-  done = false			# should not reach here
-}
-test_ok(done)
-
-done = false
-$bad = false
-loop {
-  break if done
-  done = true
-  next
-  $bad = true			# should not reach here
-}
-test_ok(!$bad)
-
-done = false
-$bad = false
-loop {
-  break if done
-  done = true
-  redo
-  $bad = true			# should not reach here
-}
-test_ok(!$bad)
-
-$x = []
-for i in 1 .. 7
-  $x.push i
-end
-test_ok($x.size == 7)
-test_ok($x == [1, 2, 3, 4, 5, 6, 7])
-
-# append method to built-in class
-class Array
-  def iter_test1
-    collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}
-  end
-  def iter_test2
-    a = collect{|e| [e, yield(e)]}
-    a.sort{|a,b|a[1]<=>b[1]}
-  end
-end
-$x = [[1,2],[3,4],[5,6]]
-test_ok($x.iter_test1{|x|x} == $x.iter_test2{|x|x})
-
-class IterTest
-  def initialize(e); @body = e; end
-
-  def each0(&block); @body.each(&block); end
-  def each1(&block); @body.each {|*x| block.call(*x) } end
-  def each2(&block); @body.each {|*x| block.call(x) } end
-  def each3(&block); @body.each {|x| block.call(*x) } end
-  def each4(&block); @body.each {|x| block.call(x) } end
-  def each5; @body.each {|*x| yield(*x) } end
-  def each6; @body.each {|*x| yield(x) } end
-  def each7; @body.each {|x| yield(*x) } end
-  def each8; @body.each {|x| yield(x) } end
-
-  def f(a)
-    a
-  end
-end
-test_ok(IterTest.new(nil).method(:f).to_proc.call([1]) == [1])
-m = /\w+/.match("abc")
-test_ok(IterTest.new(nil).method(:f).to_proc.call([m]) == [m])
-
-IterTest.new([0]).each0 {|x| test_ok(x == 0)}
-IterTest.new([1]).each1 {|x| test_ok(x == 1)}
-IterTest.new([2]).each2 {|x| test_ok(x == [2])}
-#IterTest.new([3]).each3 {|x| test_ok(x == 3)}
-IterTest.new([4]).each4 {|x| test_ok(x == 4)}
-IterTest.new([5]).each5 {|x| test_ok(x == 5)}
-IterTest.new([6]).each6 {|x| test_ok(x == [6])}
-#IterTest.new([7]).each7 {|x| test_ok(x == 7)}
-IterTest.new([8]).each8 {|x| test_ok(x == 8)}
-
-IterTest.new([[0]]).each0 {|x| test_ok(x == [0])}
-IterTest.new([[1]]).each1 {|x| test_ok(x == [1])}
-IterTest.new([[2]]).each2 {|x| test_ok(x == [[2]])}
-IterTest.new([[3]]).each3 {|x| test_ok(x == 3)}
-IterTest.new([[4]]).each4 {|x| test_ok(x == [4])}
-IterTest.new([[5]]).each5 {|x| test_ok(x == [5])}
-IterTest.new([[6]]).each6 {|x| test_ok(x == [[6]])}
-IterTest.new([[7]]).each7 {|x| test_ok(x == 7)}
-IterTest.new([[8]]).each8 {|x| test_ok(x == [8])}
-
-IterTest.new([[0,0]]).each0 {|*x| test_ok(x == [[0,0]])}
-IterTest.new([[8,8]]).each8 {|*x| test_ok(x == [[8,8]])}
-
-def m0(v)
-  v
-end
-
-def m1
-  m0(block_given?)
-end
-test_ok(m1{p 'test'})
-test_ok(!m1)
-
-def m
-  m0(block_given?,&Proc.new{})
-end
-test_ok(m1{p 'test'})
-test_ok(!m1)
-
-class C
-  include Enumerable
-  def initialize
-    @a = [1,2,3]
-  end
-  def each(&block)
-    @a.each(&block)
-  end
-end
-
-test_ok(C.new.collect{|n| n} == [1,2,3])
-
-test_ok(Proc == lambda{}.class)
-test_ok(Proc == Proc.new{}.class)
-lambda{|a|test_ok(a==1)}.call(1)
-def block_test(klass, &block)
-  test_ok(klass === block)
-end
-
-block_test(NilClass)
-block_test(Proc){}
-
-def call_argument_test(state, proc, *args)
-  x = state
-  begin
-    proc.call(*args)
-  rescue ArgumentError
-    x = !x
-  end
-  test_ok(x,2)
-end
-
-call_argument_test(true, lambda{||})
-call_argument_test(false, lambda{||}, 1)
-call_argument_test(true, lambda{|a,|}, 1)
-call_argument_test(false, lambda{|a,|})
-call_argument_test(false, lambda{|a,|}, 1,2)
-
-call_argument_test(true, Proc.new{||})
-call_argument_test(true, Proc.new{||}, 1)
-call_argument_test(true, Proc.new{|a,|}, 1)
-call_argument_test(true, Proc.new{|a,|})
-call_argument_test(true, Proc.new{|a,|}, 1,2)
-
-def block_get(&block)
-  block
-end
-
-test_ok(Proc == block_get{}.class)
-call_argument_test(true, block_get{||})
-call_argument_test(true, block_get{||}, 1)
-call_argument_test(true, block_get{|a,|}, 1)
-call_argument_test(true, block_get{|a,|})
-call_argument_test(true, block_get{|a,|}, 1,2)
-
-call_argument_test(true, block_get(&lambda{||}))
-call_argument_test(false, block_get(&lambda{||}),1)
-call_argument_test(true, block_get(&lambda{|a,|}),1)
-call_argument_test(false, block_get(&lambda{|a,|}),1,2)
-
-blk = block_get{11}
-test_ok(blk.class == Proc)
-test_ok(blk.to_proc.class == Proc)
-test_ok(blk.clone.call == 11)
-test_ok(block_get(&blk).class == Proc)
-
-lmd = lambda{44}
-test_ok(lmd.class == Proc)
-test_ok(lmd.to_proc.class == Proc)
-test_ok(lmd.clone.call == 44)
-test_ok(block_get(&lmd).class == Proc)
-
-test_ok(Proc.new{|a,| a}.yield(1,2,3) == 1)
-call_argument_test(true, Proc.new{|a,|}, 1,2)
-
-test_ok(Proc.new{|&b| b.call(10)}.call {|x| x} == 10)
-test_ok(Proc.new{|a,&b| b.call(a)}.call(12) {|x| x} == 12)
-
-def test_return1
-  Proc.new {
-    return 55
-  }.yield + 5
-end
-test_ok(test_return1() == 55)
-def test_return2
-  lambda {
-    return 55
-  }.call + 5
-end
-test_ok(test_return2() == 60)
-
-def proc_call(&b)
-  b.call
-end
-def proc_yield()
-  yield
-end
-def proc_return1
-  lambda{return 42}.call+1
-end
-test_ok(proc_return1() == 43)
-def proc_return2
-  ->{return 42}.call+1
-end
-test_ok(proc_return2() == 43)
-def proc_return3
-  proc_call{return 42}+1
-end
-test_ok(proc_return3() == 42)
-def proc_return4
-  proc_yield{return 42}+1
-end
-test_ok(proc_return4() == 42)
-
-def ljump_test(state, proc, *args)
-  x = state
-  begin
-    proc.call(*args)
-  rescue LocalJumpError
-    x = !x
-  end
-  test_ok(x,2)
-end
-
-ljump_test(false, block_get{break})
-ljump_test(true, lambda{break})
-
-def exit_value_test(&block)
-  block.call
-rescue LocalJumpError
-  $!.exit_value
-end
-
-test_ok(45 == exit_value_test{break 45})
-
-test_ok(55 == begin
-              block_get{break 55}.call
-            rescue LocalJumpError
-              $!.exit_value
-            end)
-
-def block_call(&block)
-  block.call
-end
-
-def test_b1
-  block_call{break 11}
-end
-test_ok(test_b1() == 11)
-
-def ljump_rescue(r)
-  begin
-    yield
-  rescue LocalJumpError => e
-    r if /from proc-closure/ =~ e.message
-  end
-end
-
-def test_b2
-  ljump_rescue(22) do
-    block_get{break 21}.call
-  end
-end
-test_ok(test_b2() == 22)
-
-def test_b3
-  ljump_rescue(33) do
-    Proc.new{break 31}.yield
-  end
-end
-test_ok(test_b3() == 33)
-
-def test_b4
-  lambda{break 44}.call
-end
-test_ok(test_b4() == 44)
-
-def test_b5
-  ljump_rescue(55) do
-    b = block_get{break 54}
-    block_call(&b)
-  end
-end
-test_ok(test_b5() == 55)
-
-def test_b6
-  b = lambda{break 67}
-  block_call(&b)
-  66
-end
-test_ok(test_b6() == 66)
-
-def util_r7
-  block_get{break 78}
-end
-
-def test_b7
-  b = util_r7()
-  ljump_rescue(77) do
-    block_call(&b)
-  end
-end
-test_ok(test_b7() == 77)
-
-def util_b8(&block)
-  block_call(&block)
-end
-
-def test_b8
-  util_b8{break 88}
-end
-test_ok(test_b8() == 88)
-
-def util_b9(&block)
-  lambda{block.call; 98}.call
-end
-
-def test_b9
-  util_b9{break 99}
-end
-test_ok(test_b9() == 99)
-
-def util_b10
-  util_b9{break 100}
-end
-
-def test_b10
-  util_b10()
-end
-test_ok(test_b10() == 100)
-
-def test_b11
-  ljump_rescue(111) do
-    loop do
-      Proc.new{break 110}.yield
-      break 112
-    end
-  end
-end
-test_ok(test_b11() == 111)
-
-def test_b12
-  loop do
-    break lambda{break 122}.call
-    break 121
-  end
-end
-test_ok(test_b12() == 122)
-
-def test_b13
-  ljump_rescue(133) do
-    while true
-      Proc.new{break 130}.yield
-      break 131
-    end
-  end
-end
-test_ok(test_b13() == 133)
-
-def test_b14
-  while true
-    break lambda{break 144}.call
-    break 143
-  end
-end
-test_ok(test_b14() == 144)
-
-def test_b15
-  [0].each {|c| yield 1 }
-  156
-end
-test_ok(test_b15{|e| break 155 } == 155)
-
-def marity_test(m)
-  method = method(m)
-  test_ok(method.arity == method.to_proc.arity, 2)
-end
-marity_test(:test_ok)
-marity_test(:marity_test)
-marity_test(:p)
-
-lambda(&method(:test_ok)).call(true)
-lambda(&block_get{|a,n| test_ok(a,n)}).call(true, 2)
-
-class ITER_TEST1
-   def a
-     block_given?
-   end
-end
-
-class ITER_TEST2 < ITER_TEST1
-   def a
-     test_ok(super)
-     super
-   end
-end
-test_ok(ITER_TEST2.new.a {})
-
-class ITER_TEST3
-  def foo x
-    return yield if block_given?
-    x
-  end
-end
-
-class ITER_TEST4 < ITER_TEST3
-  def foo x
-    test_ok(super == yield)
-    test_ok(super(x, &nil) == x)
-  end
-end
-
-ITER_TEST4.new.foo(44){55}
-
-class ITER_TEST5
-   def tt(aa)
-     aa
-   end
-
-   def uu(a)
-      class << self
-         define_method(:tt) do |sym|
-            super(sym)
-         end
-      end
-   end
-
-   def xx(*x)
-     x.size
-   end
-end
-
-a = ITER_TEST5.new
-a.uu(12)
-test_ok(a.tt(1) == 1)
-
-class ITER_TEST6 < ITER_TEST5
-   def xx(*a)
-      a << 12
-      super
-   end
-end
-
-test_ok(ITER_TEST6.new.xx([24]) == 2)
-
-test_check "float"
-test_ok(2.6.floor == 2)
-test_ok((-2.6).floor == -3)
-test_ok(2.6.ceil == 3)
-test_ok((-2.6).ceil == -2)
-test_ok(2.6.truncate == 2)
-test_ok((-2.6).truncate == -2)
-test_ok(2.6.round == 3)
-test_ok((-2.4).truncate == -2)
-test_ok((13.4 % 1 - 0.4).abs < 0.0001)
-nan = 0.0/0
-def nan_test(x,y)
-  test_ok(x != y)
-  test_ok((x < y) == false)
-  test_ok((x > y) == false)
-  test_ok((x <= y) == false)
-  test_ok((x >= y) == false)
-end
-nan_test(nan, nan)
-nan_test(nan, 0)
-nan_test(nan, 1)
-nan_test(nan, -1)
-nan_test(nan, 1000)
-nan_test(nan, -1000)
-nan_test(nan, 1_000_000_000_000)
-nan_test(nan, -1_000_000_000_000)
-nan_test(nan, 100.0);
-nan_test(nan, -100.0);
-nan_test(nan, 0.001);
-nan_test(nan, -0.001);
-nan_test(nan, 1.0/0);
-nan_test(nan, -1.0/0);
-
-#s = "3.7517675036461267e+17"
-#test_ok(s == sprintf("%.16e", s.to_f))
-f = 3.7517675036461267e+17
-test_ok(f == sprintf("%.16e", f).to_f)
-
-
-test_check "bignum"
-def fact(n)
-  return 1 if n == 0
-  f = 1
-  while n>0
-    f *= n
-    n -= 1
-  end
-  return f
-end
-$x = fact(40)
-test_ok($x == $x)
-test_ok($x == fact(40))
-test_ok($x < $x+2)
-test_ok($x > $x-2)
-test_ok($x == 815915283247897734345611269596115894272000000000)
-test_ok($x != 815915283247897734345611269596115894272000000001)
-test_ok($x+1 == 815915283247897734345611269596115894272000000001)
-test_ok($x/fact(20) == 335367096786357081410764800000)
-$x = -$x
-test_ok($x == -815915283247897734345611269596115894272000000000)
-test_ok(2-(2**32) == -(2**32-2))
-test_ok(2**32 - 5 == (2**32-3)-2)
-
-$good = true;
-for i in 1000..1014
-  $good = false if ((1 << i) != (2**i))
-end
-test_ok($good)
-
-$good = true;
-n1= 1 << 1000
-for i in 1000..1014
-  $good = false if ((1 << i) != n1)
-  n1 *= 2
-end
-test_ok($good)
-
-$good = true;
-n2=n1
-for i in 1..10
-  n1 = n1 / 2
-  n2 = n2 >> 1
-  $good = false if (n1 != n2)
-end
-test_ok($good)
-
-$good = true;
-for i in 4000..4096
-  n1 = 1 << i;
-  if (n1**2-1) / (n1+1) != (n1-1)
-    $good = false
-  end
-end
-test_ok($good)
-
-b = 10**80
-a = b * 9 + 7
-test_ok(7 == a.modulo(b))
-test_ok(-b + 7 == a.modulo(-b))
-test_ok(b + -7 == (-a).modulo(b))
-test_ok(-7 == (-a).modulo(-b))
-test_ok(7 == a.remainder(b))
-test_ok(7 == a.remainder(-b))
-test_ok(-7 == (-a).remainder(b))
-test_ok(-7 == (-a).remainder(-b))
-
-test_ok(10**40+10**20 == 10000000000000000000100000000000000000000)
-test_ok(10**40/10**20 == 100000000000000000000)
-
-a = 677330545177305025495135714080
-b = 14269972710765292560
-test_ok(a % b == 0)
-test_ok(-a % b == 0)
-
-def shift_test(a)
-  b = a / (2 ** 32)
-  c = a >> 32
-  test_ok(b == c)
-
-  b = a * (2 ** 32)
-  c = a << 32
-  test_ok(b == c)
-end
-
-shift_test(-4518325415524767873)
-shift_test(-0xfffffffffffffffff)
-
-test_check "string & char"
-
-test_ok("abcd" == "abcd")
-test_ok("abcd" =~ /abcd/)
-test_ok("abcd" === "abcd")
-# compile time string concatenation
-test_ok("ab" "cd" == "abcd")
-test_ok("#{22}aa" "cd#{44}" == "22aacd44")
-test_ok("#{22}aa" "cd#{44}" "55" "#{66}" == "22aacd445566")
-test_ok("abc" !~ /^$/)
-test_ok("abc\n" !~ /^$/)
-test_ok("abc" !~ /^d*$/)
-test_ok(("abc" =~ /d*$/) == 3)
-test_ok("" =~ /^$/)
-test_ok("\n" =~ /^$/)
-test_ok("a\n\n" =~ /^$/)
-test_ok("abcabc" =~ /.*a/ && $& == "abca")
-test_ok("abcabc" =~ /.*c/ && $& == "abcabc")
-test_ok("abcabc" =~ /.*?a/ && $& == "a")
-test_ok("abcabc" =~ /.*?c/ && $& == "abc")
-test_ok(/(.|\n)*?\n(b|\n)/ =~ "a\nb\n\n" && $& == "a\nb")
-
-test_ok(/^(ab+)+b/ =~ "ababb" && $& == "ababb")
-test_ok(/^(?:ab+)+b/ =~ "ababb" && $& == "ababb")
-test_ok(/^(ab+)+/ =~ "ababb" && $& == "ababb")
-test_ok(/^(?:ab+)+/ =~ "ababb" && $& == "ababb")
-
-test_ok(/(\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
-test_ok(/(?:\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
-
-$x = <<END;
-ABCD
-ABCD
-END
-$x.gsub!(/((.|\n)*?)B((.|\n)*?)D/, '\1\3')
-test_ok($x == "AC\nAC\n")
-
-test_ok("foobar" =~ /foo(?=(bar)|(baz))/)
-test_ok("foobaz" =~ /foo(?=(bar)|(baz))/)
-
-$foo = "abc"
-test_ok("#$foo = abc" == "abc = abc")
-test_ok("#{$foo} = abc" == "abc = abc")
-
-foo = "abc"
-test_ok("#{foo} = abc" == "abc = abc")
-
-test_ok('-' * 5 == '-----')
-test_ok('-' * 1 == '-')
-test_ok('-' * 0 == '')
-
-foo = '-'
-test_ok(foo * 5 == '-----')
-test_ok(foo * 1 == '-')
-test_ok(foo * 0 == '')
-
-$x = "a.gif"
-test_ok($x.sub(/.*\.([^\.]+)$/, '\1') == "gif")
-test_ok($x.sub(/.*\.([^\.]+)$/, 'b.\1') == "b.gif")
-test_ok($x.sub(/.*\.([^\.]+)$/, '\2') == "")
-test_ok($x.sub(/.*\.([^\.]+)$/, 'a\2b') == "ab")
-test_ok($x.sub(/.*\.([^\.]+)$/, '<\&>') == "<a.gif>")
-
-# character constants(assumes ASCII)
-test_ok("a"[0] == ?a)
-test_ok(?a == ?a)
-test_ok(?\C-a == "\1")
-test_ok(?\M-a == "\341")
-test_ok(?\M-\C-a == "\201")
-test_ok("a".upcase![0] == ?A)
-test_ok("A".downcase![0] == ?a)
-test_ok("abc".tr!("a-z", "A-Z") == "ABC")
-test_ok("aabbcccc".tr_s!("a-z", "A-Z") == "ABC")
-test_ok("abcc".squeeze!("a-z") == "abc")
-test_ok("abcd".delete!("bc") == "ad")
-
-$x = "abcdef"
-$y = [ ?a, ?b, ?c, ?d, ?e, ?f ]
-$bad = false
-$x.each_byte {|i|
-  if i.chr != $y.shift
-    $bad = true
-    break
-  end
-}
-test_ok(!$bad)
-
-s = "a string"
-s[0..s.size]="another string"
-test_ok(s == "another string")
-
-s = <<EOS
-#{
-[1,2,3].join(",")
-}
-EOS
-test_ok(s == "1,2,3\n")
-test_ok("Just".to_i(36) == 926381)
-test_ok("-another".to_i(36) == -23200231779)
-test_ok(1299022.to_s(36) == "ruby")
-test_ok(-1045307475.to_s(36) == "-hacker")
-test_ok("Just_another_Ruby_hacker".to_i(36) == 265419172580680477752431643787347)
-test_ok(-265419172580680477752431643787347.to_s(36) == "-justanotherrubyhacker")
-
-a = []
-(0..255).each {|n|
-  ch = [n].pack("C")
-  a.push ch if /a#{Regexp.quote ch}b/x =~ "ab"
-}
-test_ok(a.size == 0)
-
-test_check "assignment"
-a = nil
-test_ok(defined?(a))
-test_ok(a == nil)
-
-# multiple asignment
-a, b = 1, 2
-test_ok(a == 1 && b == 2)
-
-a, b = b, a
-test_ok(a == 2 && b == 1)
-
-a, = 1,2
-test_ok(a == 1)
-
-a, *b = 1, 2, 3
-test_ok(a == 1 && b == [2, 3])
-
-a, (b, c), d = 1, [2, 3], 4
-test_ok(a == 1 && b == 2 && c == 3 && d == 4)
-
-*a = 1, 2, 3
-test_ok(a == [1, 2, 3])
-
-*a = 4
-test_ok(a == [4])
-
-*a = nil
-test_ok(a == [nil])
-
-test_check "call"
-def aaa(a, b=100, *rest)
-  res = [a, b]
-  res += rest if rest
-  return res
-end
-
-# not enough argument
-begin
-  aaa()				# need at least 1 arg
-  test_ok(false)
-rescue
-  test_ok(true)
-end
-
-begin
-  aaa				# no arg given (exception raised)
-  test_ok(false)
-rescue
-  test_ok(true)
-end
-
-test_ok(aaa(1) == [1, 100])
-test_ok(aaa(1, 2) == [1, 2])
-test_ok(aaa(1, 2, 3, 4) == [1, 2, 3, 4])
-test_ok(aaa(1, *[2, 3, 4]) == [1, 2, 3, 4])
-
-test_check "proc"
-$proc = Proc.new{|i| i}
-test_ok($proc.call(2) == 2)
-test_ok($proc.call(3) == 3)
-
-$proc = Proc.new{|i| i*2}
-test_ok($proc.call(2) == 4)
-test_ok($proc.call(3) == 6)
-
-Proc.new{
-  iii=5				# nested local variable
-  $proc = Proc.new{|i|
-    iii = i
-  }
-  $proc2 = Proc.new {
-    $x = iii			# nested variables shared by procs
-  }
-  # scope of nested variables
-  test_ok(defined?(iii))
-}.call
-test_ok(!defined?(iii))		# out of scope
-
-loop{iii=5; test_ok(eval("defined? iii")); break}
-loop {
-  iii = 10
-  def dyna_var_check
-    loop {
-      test_ok(!defined?(iii))
-      break
-    }
-  end
-  dyna_var_check
-  break
-}
-$x=0
-$proc.call(5)
-$proc2.call
-test_ok($x == 5)
-
-if defined? Process.kill
-  test_check "signal"
-
-  $x = 0
-  trap "SIGINT", Proc.new{|sig| $x = 2}
-  Process.kill "SIGINT", $$
-  100.times {
-    sleep 0.1
-    break if $x != 0
-  }
-  test_ok($x == 2)
-
-  trap "SIGINT", Proc.new{raise "Interrupt"}
-
-  x = false
-  begin
-    Process.kill "SIGINT", $$
-    sleep 0.1
-  rescue
-    x = $!
-  end
-  test_ok(x && /Interrupt/ =~ x.message)
-end
-
-test_check "eval"
-test_ok(eval("") == nil)
-$bad=false
-eval 'while false; $bad = true; print "foo\n" end'
-test_ok(!$bad)
-
-test_ok(eval('Object'))
-test_ok(eval('true'))
-test_ok(!eval('nil'))
-test_ok(!eval('false'))
-
-$foo = 'test_ok(true)'
-begin
-  eval $foo
-rescue
-  test_ok(false)
-end
-
-test_ok(eval("$foo") == 'test_ok(true)')
-test_ok(eval("true") == true)
-i = 5
-test_ok(eval("i == 5"))
-test_ok(eval("i") == 5)
-test_ok(eval("defined? i"))
-
-# eval with binding
-def test_ev
-  local1 = "local1"
-  lambda {
-    local2 = "local2"
-    return binding
-  }.call
-end
-
-$x = test_ev
-test_ok(eval("local1", $x) == "local1") # normal local var
-test_ok(eval("local2", $x) == "local2") # nested local var
-$bad = true
-begin
-  p eval("local1")
-rescue NameError		# must raise error
-  $bad = false
-end
-test_ok(!$bad)
-
-module EvTest
-  EVTEST1 = 25
-  evtest2 = 125
-  $x = binding
-end
-test_ok(eval("EVTEST1", $x) == 25)	# constant in module
-test_ok(eval("evtest2", $x) == 125)	# local var in module
-$bad = true
-begin
-  eval("EVTEST1")
-rescue NameError		# must raise error
-  $bad = false
-end
-test_ok(!$bad)
-
-x = binding #! YARV Limitation: Proc.new{}
-eval "i4 = 1", x
-test_ok(eval("i4", x) == 1)
-x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call
-eval "i4 = 22", x
-test_ok(eval("i4", x) == 22)
-$x = []
-x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call
-eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x
-test_ok($x[4].call == 8)
-
-x = binding
-eval "i = 1", x
-test_ok(eval("i", x) == 1)
-x = Proc.new{binding}.call
-eval "i = 22", x
-test_ok(eval("i", x) == 22)
-$x = []
-x = Proc.new{binding}.call
-eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x
-test_ok($x[4].call == 8)
-x = Proc.new{binding}.call
-eval "for i6 in 1..1; j6=i6; end", x
-test_ok(eval("defined? i6", x))
-test_ok(eval("defined? j6", x))
-
-Proc.new {
-  p = binding
-  eval "foo11 = 1", p
-  foo22 = 5
-  Proc.new{foo11=22}.call
-  Proc.new{foo22=55}.call
-  test_ok(eval("foo11", p) == eval("foo11"))
-  test_ok(eval("foo11") == 1)
-  test_ok(eval("foo22", p) == eval("foo22"))
-  test_ok(eval("foo22") == 55)
-}.call if false #! YARV Limitation
-
-#! YARV Limitation: p1 = Proc.new{i7 = 0; Proc.new{i7}}.call
-p1 = Proc.new{i7 = 0; binding}.call
-#! YARV Limitation: test_ok(p1.call == 0)
-eval "i7=5", p1
-#! YARV Limitation: test_ok(p1.call == 5)
-test_ok(!defined?(i7))
-
-if false #! YARV Limitation
-p1 = Proc.new{i7 = 0; Proc.new{i7}}.call
-i7 = nil
-test_ok(p1.call == 0)
-eval "i7=1", p1
-test_ok(p1.call == 1)
-eval "i7=5", p1
-test_ok(p1.call == 5)
-test_ok(i7 == nil)
-end
-
-test_check "system"
-test_ok(`echo foobar` == "foobar\n")
-test_ok(`./miniruby -e 'print "foobar"'` == 'foobar')
-
-script_tmp = "script_tmp.#{$$}"
-tmp = open(script_tmp, "w")
-tmp.print "print $zzz\n";
-tmp.close
-
-test_ok(`./miniruby -s #{script_tmp} -zzz` == 'true')
-test_ok(`./miniruby -s #{script_tmp} -zzz=555` == '555')
-
-tmp = open(script_tmp, "w")
-tmp.print "#! /usr/local/bin/ruby -s\n";
-tmp.print "print $zzz\n";
-tmp.close
-
-test_ok(`./miniruby #{script_tmp} -zzz=678` == '678')
-
-tmp = open(script_tmp, "w")
-tmp.print "this is a leading junk\n";
-tmp.print "#! /usr/local/bin/ruby -s\n";
-tmp.print "print $zzz\n";
-tmp.print "__END__\n";
-tmp.print "this is a trailing junk\n";
-tmp.close
-
-test_ok(`./miniruby -x #{script_tmp}` == '')
-test_ok(`./miniruby -x #{script_tmp} -zzz=555` == '555')
-
-tmp = open(script_tmp, "w")
-for i in 1..5
-  tmp.print i, "\n"
-end
-tmp.close
-
-`./miniruby -i.bak -pe '$_.sub!(/^[0-9]+$/){$&.to_i * 5}' #{script_tmp}`
-done = true
-tmp = open(script_tmp, "r")
-while tmp.gets
-  if $_.to_i % 5 != 0
-    done = false
-    break
-  end
-end
-tmp.close
-test_ok(done)
-
-File.unlink script_tmp or `/bin/rm -f "#{script_tmp}"`
-File.unlink "#{script_tmp}.bak" or `/bin/rm -f "#{script_tmp}.bak"`
-
-test_check "const"
-TEST1 = 1
-TEST2 = 2
-
-module Const
-  TEST3 = 3
-  TEST4 = 4
-end
-
-module Const2
-  TEST3 = 6
-  TEST4 = 8
-end
-
-include Const
-
-test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,3,4])
-
-include Const2
-STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE
-test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,6,8])
-
-
-test_ok((String <=> Object) == -1)
-test_ok((Object <=> String) == 1)
-test_ok((Array <=> String) == nil)
-
-test_check "clone"
-foo = Object.new
-def foo.test
-  "test"
-end
-bar = foo.clone
-def bar.test2
-  "test2"
-end
-
-test_ok(bar.test2 == "test2")
-test_ok(bar.test == "test")
-test_ok(foo.test == "test")
-
-begin
-  foo.test2
-  test_ok false
-rescue NoMethodError
-  test_ok true
-end
-
-module M001; end
-module M002; end
-module M003; include M002; end
-module M002; include M001; end
-module M003; include M002; end
-
-test_ok(M003.ancestors == [M003, M002, M001])
-
-test_check "marshal"
-$x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)]
-$y = Marshal.dump($x)
-test_ok($x == Marshal.load($y))
-
-StrClone=String.clone;
-test_ok(Marshal.load(Marshal.dump(StrClone.new("abc"))).class == StrClone)
-
-[[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z|
-  a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
-  ma = Marshal.dump(a)
-  b = Marshal.load(ma)
-  test_ok(a == b)
-}
-
-test_check "pack"
-
-$format = "c2x5CCxsdils_l_a6";
-# Need the expression in here to force ary[5] to be numeric.  This avoids
-# test2 failing because ary2 goes str->numeric->str and ary does not.
-ary = [1,-100,127,128,32767,987.654321098 / 100.0,12345,123456,-32767,-123456,"abcdef"]
-$x = ary.pack($format)
-ary2 = $x.unpack($format)
-
-test_ok(ary.length == ary2.length)
-test_ok(ary.join(':') == ary2.join(':'))
-test_ok($x =~ /def/)
-
-$x = [-1073741825]
-test_ok($x.pack("q").unpack("q") == $x)
-
-test_check "math"
-test_ok(Math.sqrt(4) == 2)
-
-include Math
-test_ok(sqrt(4) == 2)
-
-test_check "struct"
-struct_test = Struct.new("Test", :foo, :bar)
-test_ok(struct_test == Struct::Test)
-
-test = struct_test.new(1, 2)
-test_ok(test.foo == 1 && test.bar == 2)
-test_ok(test[0] == 1 && test[1] == 2)
-
-a, b = test.to_a
-test_ok(a == 1 && b == 2)
-
-test[0] = 22
-test_ok(test.foo == 22)
-
-test.bar = 47
-test_ok(test.bar == 47)
-
-test_check "variable"
-test_ok($$.instance_of?(Integer))
-
-# read-only variable
-begin
-  $$ = 5
-  test_ok false
-rescue NameError
-  test_ok true
-end
-
-foobar = "foobar"
-$_ = foobar
-test_ok($_ == foobar)
-
-class Gods
-  @@rule = "Uranus"		# private to Gods
-  def ruler0
-    @@rule
-  end
-
-  def self.ruler1		# <= per method definition style
-    @@rule
-  end
-  class << self			# <= multiple method definition style
-    def ruler2
-      @@rule
-    end
-  end
-end
-
-module Olympians
-  @@rule ="Zeus"
-  def ruler3
-    @@rule
-  end
-end
-
-class Titans < Gods
-  @@rule = "Cronus"		# do not affect @@rule in Gods
-  include Olympians
-  def ruler4
-    @@rule
-  end
-end
-
-test_ok(Gods.new.ruler0 == "Cronus")
-test_ok(Gods.ruler1 == "Cronus")
-test_ok(Gods.ruler2 == "Cronus")
-test_ok(Titans.ruler1 == "Cronus")
-test_ok(Titans.ruler2 == "Cronus")
-atlas = Titans.new
-test_ok(atlas.ruler0 == "Cronus")
-test_ok(atlas.ruler3 == "Zeus")
-test_ok(atlas.ruler4 == "Cronus")
-
-test_check "trace"
-$x = 1234
-$y = 0
-trace_var :$x, Proc.new{$y = $x}
-$x = 40414
-test_ok($y == $x)
-
-untrace_var :$x
-$x = 19660208
-test_ok($y != $x)
-
-trace_var :$x, Proc.new{$x *= 2}
-$x = 5
-test_ok($x == 10)
-
-untrace_var :$x
-
-test_check "defined?"
-
-test_ok(defined?($x))		# global variable
-test_ok(defined?($x) == 'global-variable')# returns description
-
-foo=5
-test_ok(defined?(foo))		# local variable
-
-test_ok(defined?(Array))	# constant
-test_ok(defined?(Object.new))	# method
-test_ok(!defined?(Object.print))# private method
-test_ok(defined?(1 == 2))	# operator expression
-
-class Foo
-  def foo
-    p :foo
-  end
-  protected :foo
-  def bar(f)
-    test_ok(defined?(self.foo))
-    test_ok(defined?(f.foo))
-  end
-end
-f = Foo.new
-test_ok(defined?(f.foo) == nil)
-f.bar(f)
-
-def defined_test
-  return !defined?(yield)
-end
-
-test_ok(defined_test)		# not iterator
-test_ok(!defined_test{})	# called as iterator
-
-test_check "alias"
-class Alias0
-  def foo; "foo" end
-end
-class Alias1 < Alias0
-  alias bar foo
-  def foo; "foo+" + super end
-end
-class Alias2 < Alias1
-  alias baz foo
-  undef foo
-end
-
-x = Alias2.new
-test_ok(x.bar == "foo")
-test_ok(x.baz == "foo+foo")
-
-# test_check for cache
-test_ok(x.baz == "foo+foo")
-
-class Alias3 < Alias2
-  def foo
-    defined? super
-  end
-  def bar
-    defined? super
-  end
-  def quux
-    defined? super
-  end
-end
-x = Alias3.new
-test_ok(!x.foo)
-test_ok(x.bar)
-test_ok(!x.quux)
-
-test_check "path"
-test_ok(File.basename("a") == "a")
-test_ok(File.basename("a/b") == "b")
-test_ok(File.basename("a/b/") == "b")
-test_ok(File.basename("/") == "/")
-test_ok(File.basename("//") == "/")
-test_ok(File.basename("///") == "/")
-test_ok(File.basename("a/b////") == "b")
-test_ok(File.basename("a.rb", ".rb") == "a")
-test_ok(File.basename("a.rb///", ".rb") == "a")
-test_ok(File.basename("a.rb///", ".*") == "a")
-test_ok(File.basename("a.rb///", ".c") == "a.rb")
-test_ok(File.dirname("a") == ".")
-test_ok(File.dirname("/") == "/")
-test_ok(File.dirname("/a") == "/")
-test_ok(File.dirname("a/b") == "a")
-test_ok(File.dirname("a/b/c") == "a/b")
-test_ok(File.dirname("/a/b/c") == "/a/b")
-test_ok(File.dirname("/a/b/") == "/a")
-test_ok(File.dirname("/a/b///") == "/a")
-case Dir.pwd
-when %r'\A\w:'
-  test_ok(/\A\w:\/\z/ =~ File.expand_path(".", "/"))
-  test_ok(/\A\w:\/a\z/ =~ File.expand_path("a", "/"))
-  dosish = true
-when %r'\A//'
-  test_ok(%r'\A//[^/]+/[^/]+\z' =~ File.expand_path(".", "/"))
-  test_ok(%r'\A//[^/]+/[^/]+/a\z' =~ File.expand_path(".", "/"))
-  dosish = true
-else
-  test_ok(File.expand_path(".", "/") == "/")
-  test_ok(File.expand_path("sub", "/") == "/sub")
-end
-if dosish
-  test_ok(File.expand_path("/", "//machine/share/sub") == "//machine/share")
-  test_ok(File.expand_path("/dir", "//machine/share/sub") == "//machine/share/dir")
-  test_ok(File.expand_path("/", "z:/sub") == "z:/")
-  test_ok(File.expand_path("/dir", "z:/sub") == "z:/dir")
-end
-test_ok(File.expand_path(".", "//") == "//")
-test_ok(File.expand_path("sub", "//") == "//sub")
-
-# test_check "Proc#binding"
-ObjectSpace.each_object(Proc){|o|
-  begin
-    b = o.binding
-    eval 'self', b
-  rescue ArgumentError
-  end
-}
-
-test_check "gc"
-begin
-  1.upto(10000) {
-    tmp = [0,1,2,3,4,5,6,7,8,9]
-  }
-  tmp = nil
-  test_ok true
-rescue
-  test_ok false
-end
-class S
-  def initialize(a)
-    @a = a
-  end
-end
-l=nil
-100000.times {
-  l = S.new(l)
-}
-GC.start
-test_ok true   # reach here or dumps core
-l = []
-100000.times {
-  l.push([l])
-}
-GC.start
-test_ok true   # reach here or dumps core
-
-ObjectSpace.each_object{|o|
-  o.class.name
-}
-
-test_ok true   # reach here or dumps core
-
-PROGRESS.finish
-if $failed > 0
-  printf "not ok/test: %d failed %d\n", $ntest, $failed
-else
-  printf "end of test(test: %d)\n", $ntest
-end
diff --git a/benchmark/bm_app_aobench.rb b/benchmark/bm_app_aobench.rb
index 2bd6acfaf8..ffab116fcd 100644
--- a/benchmark/bm_app_aobench.rb
+++ b/benchmark/bm_app_aobench.rb
@@ -229,7 +229,7 @@ class Scene
       w.times do |x|
         rad = Vec.new(0.0, 0.0, 0.0)
 
-        # Subsampling
+        # Subsmpling
         nsubsamples.times do |v|
           nsubsamples.times do |u|
 
diff --git a/benchmark/bm_array_shift.rb b/benchmark/bm_array_shift.rb
deleted file mode 100644
index 798bb9e3f4..0000000000
--- a/benchmark/bm_array_shift.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'benchmark'
-
-Benchmark.bm do |x|
-  [10_000,1_000_000,100_000_000].each do |n|
-    ary = Array.new(n,0)
-    GC.start
-    x.report("#{n}:shift"){ ary.shift }
-    (0..4).each do |i|
-      ary = Array.new(n,0)
-      GC.start
-      x.report("#{n}:shift(#{i})"){ ary.shift(i) }
-    end
-  end
-end
diff --git a/benchmark/bm_bighash.rb b/benchmark/bm_bighash.rb
deleted file mode 100644
index e2ad5a5c94..0000000000
--- a/benchmark/bm_bighash.rb
+++ /dev/null
@@ -1 +0,0 @@
-h = {}; 5000000.times {|n| h[n] = n }
diff --git a/benchmark/bm_hash_aref_dsym.rb b/benchmark/bm_hash_aref_dsym.rb
deleted file mode 100644
index af4f8c36d4..0000000000
--- a/benchmark/bm_hash_aref_dsym.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-h = {}
-syms = ('a'..'z').map { |s| s.to_sym }
-syms.each { |s| h[s] = 1 }
-200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_dsym_long.rb b/benchmark/bm_hash_aref_dsym_long.rb
deleted file mode 100644
index 9d7759379e..0000000000
--- a/benchmark/bm_hash_aref_dsym_long.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-# [ruby-core:70129] [Bug #11396]
-collection_size = 200000
-sample_size = 10000
-
-values = (1..collection_size).to_a.map do |x|
-  "THIS IS A LONGER STRING THAT IS ALSO UNIQUE #{x}"
-end
-
-symbol_hash = {}
-
-values.each do |x|
-  symbol_hash[x.to_sym] = 1
-end
-
-# use the same samples each time to minimize deviations
-rng = Random.new(0)
-symbol_sample_array = values.sample(sample_size, random: rng).map(&:to_sym)
-
-3000.times do
-  symbol_sample_array.each { |x| symbol_hash[x] }
-end
diff --git a/benchmark/bm_hash_aref_fix.rb b/benchmark/bm_hash_aref_fix.rb
deleted file mode 100644
index 1346890582..0000000000
--- a/benchmark/bm_hash_aref_fix.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-h = {}
-nums = (1..26).to_a
-nums.each { |i| h[i] = i }
-200_000.times { nums.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_flo.rb b/benchmark/bm_hash_aref_flo.rb
deleted file mode 100644
index 2217274c82..0000000000
--- a/benchmark/bm_hash_aref_flo.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-h = {}
-strs = [*1..10000].map! {|i| i.fdiv(10)}
-strs.each { |s| h[s] = s }
-50.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_sym.rb b/benchmark/bm_hash_aref_sym.rb
index f75d163fe6..54298ffc9e 100644
--- a/benchmark/bm_hash_aref_sym.rb
+++ b/benchmark/bm_hash_aref_sym.rb
@@ -1,9 +1,4 @@
 h = {}
-syms = ('a'..'z').to_a
-begin
-  syms = eval("%i[#{syms.join(' ')}]")
-rescue SyntaxError # <= 1.9.3
-  syms.map!(&:to_sym)
-end
+syms = ('a'..'z').to_a.map(&:to_sym)
 syms.each { |s| h[s] = s }
 200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_sym_long.rb b/benchmark/bm_hash_aref_sym_long.rb
index 9dab8df7be..a9be4059e6 100644
--- a/benchmark/bm_hash_aref_sym_long.rb
+++ b/benchmark/bm_hash_aref_sym_long.rb
@@ -3,11 +3,6 @@ syms = %w[puts warn syswrite write stat bacon lettuce tomato
 some symbols in this array may already be interned  others should not be
 hash browns make good breakfast but not cooked using prime numbers
 shift for division entries delete_if keys exist?
-]
-begin
-  syms = eval("%i[#{syms.join(' ')}]")
-rescue SyntaxError # <= 1.9.3
-  syms.map!(&:to_sym)
-end
+].map!(&:to_sym)
 syms.each { |s| h[s] = s }
 200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_ident_flo.rb b/benchmark/bm_hash_ident_flo.rb
deleted file mode 100644
index 0c7edfed3e..0000000000
--- a/benchmark/bm_hash_ident_flo.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-h = {}.compare_by_identity
-strs = (1..10000).to_a.map!(&:to_f)
-strs.each { |s| h[s] = s }
-50.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_long.rb b/benchmark/bm_hash_long.rb
deleted file mode 100644
index 03d9109602..0000000000
--- a/benchmark/bm_hash_long.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-k1 = "Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong";
-k2 = "Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping Pong Ping";
-h = {k1 => 0, k2 => 0};
-3000000.times{|i| k = i % 2 ? k2 : k1; h [k] = h[k] + 1}
diff --git a/benchmark/bm_hash_shift_u16.rb b/benchmark/bm_hash_shift_u16.rb
deleted file mode 100644
index ec800d0342..0000000000
--- a/benchmark/bm_hash_shift_u16.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-h = {}
-
-(16384..65536).each do |i|
-  h[i] = nil
-end
-
-300000.times do
-  k, v = h.shift
-  h[k] = v
-end
diff --git a/benchmark/bm_hash_shift_u24.rb b/benchmark/bm_hash_shift_u24.rb
deleted file mode 100644
index de4e0fa696..0000000000
--- a/benchmark/bm_hash_shift_u24.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-h = {}
-
-(0xff4000..0xffffff).each do |i|
-  h[i] = nil
-end
-
-300000.times do
-  k, v = h.shift
-  h[k] = v
-end
diff --git a/benchmark/bm_hash_shift_u32.rb b/benchmark/bm_hash_shift_u32.rb
deleted file mode 100644
index 656aa55583..0000000000
--- a/benchmark/bm_hash_shift_u32.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-h = {}
-
-(0xffff4000..0xffffffff).each do |i|
-  h[i] = nil
-end
-
-300000.times do
-  k, v = h.shift
-  h[k] = v
-end
diff --git a/benchmark/bm_hash_small2.rb b/benchmark/bm_hash_small2.rb
deleted file mode 100644
index 45485d9c71..0000000000
--- a/benchmark/bm_hash_small2.rb
+++ /dev/null
@@ -1 +0,0 @@
-1000000.times.map{|i| a={}; 2.times{|j| a[j]=j}; a}
diff --git a/benchmark/bm_hash_small4.rb b/benchmark/bm_hash_small4.rb
deleted file mode 100644
index acd4084334..0000000000
--- a/benchmark/bm_hash_small4.rb
+++ /dev/null
@@ -1 +0,0 @@
-1000000.times.map{|i| a={}; 4.times{|j| a[j]=j}; a}
diff --git a/benchmark/bm_hash_small8.rb b/benchmark/bm_hash_small8.rb
deleted file mode 100644
index 9cffcc91b6..0000000000
--- a/benchmark/bm_hash_small8.rb
+++ /dev/null
@@ -1 +0,0 @@
-1000000.times.map{|i| a={}; 8.times{|j| a[j]=j}; a}
diff --git a/benchmark/bm_hash_to_proc.rb b/benchmark/bm_hash_to_proc.rb
deleted file mode 100644
index 2b675bf509..0000000000
--- a/benchmark/bm_hash_to_proc.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-h = {}
-
-10000.times do |i|
-  h[i] = nil
-end
-
-5000.times do |i|
-  [i].map(&h)
-end
diff --git a/benchmark/bm_io_nonblock_noex.rb b/benchmark/bm_io_nonblock_noex.rb
deleted file mode 100644
index da9357fdc6..0000000000
--- a/benchmark/bm_io_nonblock_noex.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-nr = 1_000_000
-i = 0
-msg = '.'
-buf = '.'
-noex = { exception: false }
-begin
-  r, w = IO.pipe
-  while i < nr
-    i += 1
-    w.write_nonblock(msg, noex)
-    r.read_nonblock(1, buf, noex)
-  end
-rescue ArgumentError # old Rubies
-  while i < nr
-    i += 1
-    w.write_nonblock(msg)
-    r.read_nonblock(1, buf)
-  end
-ensure
-  r.close
-  w.close
-end
diff --git a/benchmark/bm_io_nonblock_noex2.rb b/benchmark/bm_io_nonblock_noex2.rb
deleted file mode 100644
index 56819d049b..0000000000
--- a/benchmark/bm_io_nonblock_noex2.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-nr = 1_000_000
-i = 0
-msg = '.'
-buf = '.'
-begin
-  r, w = IO.pipe
-  while i < nr
-    i += 1
-    w.write_nonblock(msg, exception: false)
-    r.read_nonblock(1, buf, exception: false)
-  end
-rescue ArgumentError # old Rubies
-  while i < nr
-    i += 1
-    w.write_nonblock(msg)
-    r.read_nonblock(1, buf)
-  end
-ensure
-  r.close
-  w.close
-end
diff --git a/benchmark/bm_marshal_dump_flo.rb b/benchmark/bm_marshal_dump_flo.rb
deleted file mode 100644
index 9b8d0c6afb..0000000000
--- a/benchmark/bm_marshal_dump_flo.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-bug10761 = 10000.times.map { |x| x.to_f }
-100.times { Marshal.dump(bug10761) }
diff --git a/benchmark/bm_marshal_dump_load_geniv.rb b/benchmark/bm_marshal_dump_load_geniv.rb
deleted file mode 100644
index 8252ad90fa..0000000000
--- a/benchmark/bm_marshal_dump_load_geniv.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-a = ''
-a.instance_eval do
-  @a = :a
-  @b = :b
-  @c = :c
-end
-100000.times do
-  a = Marshal.load(Marshal.dump(a))
-end
-#p(a.instance_eval { @a == :a && @b == :b && @c == :c })
diff --git a/benchmark/bm_marshal_dump_load_time.rb b/benchmark/bm_marshal_dump_load_time.rb
deleted file mode 100644
index e29743b791..0000000000
--- a/benchmark/bm_marshal_dump_load_time.rb
+++ /dev/null
@@ -1 +0,0 @@
-100000.times { Marshal.load(Marshal.dump(Time.now)) }
diff --git a/benchmark/bm_require.rb b/benchmark/bm_require.rb
deleted file mode 100644
index b8abc88f41..0000000000
--- a/benchmark/bm_require.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), "bm_require.data")
-
-1.upto(10000) do |i|
-  require "c#{i}"
-end
-
-$:.pop
diff --git a/benchmark/bm_require_thread.rb b/benchmark/bm_require_thread.rb
deleted file mode 100644
index e54db6c6e5..0000000000
--- a/benchmark/bm_require_thread.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$:.push File.join(File.dirname(__FILE__), "bm_require.data")
-
-i=0
-t = Thread.new do
-  while true
-    i = i+1 # dummy loop
-  end
-end
-
-1.upto(100) do |i|
-  require "c#{i}"
-end
-
-$:.pop
-t.kill
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
index dcc6b39507..3f759ba7ae 100644
--- a/benchmark/bm_so_fasta.rb
+++ b/benchmark/bm_so_fasta.rb
@@ -3,7 +3,7 @@
 # Contributed by Sokolov Yura
 
 $last = 42.0
-def gen_random(max, im=139968, ia=3877, ic=29573)
+def gen_random (max,im=139968,ia=3877,ic=29573)
     (max * ($last = ($last * ia + ic) % im)) / im
 end
 
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
index 8c136baa6c..b8e93bd150 100755..100644
--- a/benchmark/bm_so_meteor_contest.rb
+++ b/benchmark/bm_so_meteor_contest.rb
@@ -155,7 +155,7 @@ class Rotation
 
   # 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 )
+  def get_values ( directions )
     start = start_adjust(directions)
     values = [ start ]
     directions.each do | direction |
@@ -260,7 +260,7 @@ 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 five bit representation of the bits below it
+#                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,
@@ -467,7 +467,7 @@ def find_top( rotation_skip)
 end
 
 # the normail find routine, iterates through the available pieces, checks all rotations at the current location
-# and adds any boards found.  depth is achieved via recursion.  the overall approach is described
+# 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
@@ -561,3 +561,4 @@ create_collector_support
 @boards_found = 0
 
 find_all ######## DO IT!!!
+
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
index 9a537b2d1c..c7d6fbfb4d 100644
--- a/benchmark/bm_so_pidigits.rb
+++ b/benchmark/bm_so_pidigits.rb
@@ -38,7 +38,7 @@ end
 
 class Transformation
     attr_reader :q, :r, :s, :t
-    def initialize(q, r, s, t)
+    def initialize (q, r, s, t)
         @q,@r,@s,@t,@k = q,r,s,t,0
     end
 
diff --git a/benchmark/bm_vm1_gc_wb_ary.rb b/benchmark/bm_vm1_gc_wb_ary.rb
index 881528845b..ecfab51dbf 100644
--- a/benchmark/bm_vm1_gc_wb_ary.rb
+++ b/benchmark/bm_vm1_gc_wb_ary.rb
@@ -1,12 +1,10 @@
-short_lived_ary = []
-
-if RUBY_VERSION >= "2.2.0"
-  GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false)
-end
+long_lived = []
+GC.start
+GC.start
 
 i = 0
 short_lived = ''
 while i<30_000_000 # while loop 1
-  short_lived_ary[0] = short_lived # write barrier
+  long_lived[0] = short_lived # write barrier
   i+=1
 end
diff --git a/benchmark/bm_vm1_gc_wb_ary_promoted.rb b/benchmark/bm_vm1_gc_wb_ary_promoted.rb
deleted file mode 100644
index 3c8279c956..0000000000
--- a/benchmark/bm_vm1_gc_wb_ary_promoted.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-long_lived = []
-
-if RUBY_VERSION > "2.2.0"
-  3.times{ GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) }
-elsif
-  GC.start
-end
-
-i = 0
-short_lived = ''
-while i<30_000_000 # while loop 1
-  long_lived[0] = short_lived # write barrier
-  i+=1
-end
diff --git a/benchmark/bm_vm1_gc_wb_obj.rb b/benchmark/bm_vm1_gc_wb_obj.rb
index a4067af36b..017eff4f94 100644
--- a/benchmark/bm_vm1_gc_wb_obj.rb
+++ b/benchmark/bm_vm1_gc_wb_obj.rb
@@ -1,15 +1,13 @@
 class C
   attr_accessor :foo
 end
-short_lived_obj = C.new
-
-if RUBY_VERSION >= "2.2.0"
-  GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false)
-end
+long_lived = C.new
+GC.start
+GC.start
 
 i = 0
 short_lived = ''
 while i<30_000_000 # while loop 1
-  short_lived_obj.foo = short_lived # write barrier
+  long_lived.foo = short_lived # write barrier
   i+=1
 end
diff --git a/benchmark/bm_vm1_gc_wb_obj_promoted.rb b/benchmark/bm_vm1_gc_wb_obj_promoted.rb
deleted file mode 100644
index eee07a0248..0000000000
--- a/benchmark/bm_vm1_gc_wb_obj_promoted.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-class C
-  attr_accessor :foo
-end
-long_lived = C.new
-
-if RUBY_VERSION >= "2.2.0"
-  3.times{ GC.start(full_mark: false, immediate_mark: true, lazy_sweep: false) }
-elsif
-  GC.start
-end
-
-i = 0
-short_lived = ''
-while i<30_000_000 # while loop 1
-  long_lived.foo = short_lived # write barrier
-  i+=1
-end
diff --git a/benchmark/bm_vm2_case_lit.rb b/benchmark/bm_vm2_case_lit.rb
deleted file mode 100644
index c62b294e0e..0000000000
--- a/benchmark/bm_vm2_case_lit.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-i = 0
-@ret = [ "foo", true, false, :sym, 6, nil, 0.1, 0xffffffffffffffff ]
-def foo(i)
-  @ret[i % @ret.size]
-end
-
-while i<6_000_000 # while loop 2
-  case foo(i)
-  when "foo" then :foo
-  when true then true
-  when false then false
-  when :sym then :sym
-  when 6 then :fix
-  when nil then nil
-  when 0.1 then :float
-  when 0xffffffffffffffff then :big
-  end
-  i += 1
-end
diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb
index 5d16480c6b..7362f738c5 100644
--- a/benchmark/bm_vm2_mutex.rb
+++ b/benchmark/bm_vm2_mutex.rb
@@ -1,6 +1,6 @@
 require 'thread'
 
-m = Thread::Mutex.new
+m = Mutex.new
 
 i = 0
 while i<6_000_000 # benchmark loop 2
diff --git a/benchmark/bm_vm2_poly_singleton.rb b/benchmark/bm_vm2_poly_singleton.rb
deleted file mode 100644
index 0dba4320c4..0000000000
--- a/benchmark/bm_vm2_poly_singleton.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class C1
-  def m; 1; end
-end
-
-o1 = C1.new
-o2 = C1.new
-o2.singleton_class
-
-i = 0
-while i<6_000_000 # 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_string_literal.rb b/benchmark/bm_vm2_string_literal.rb
deleted file mode 100644
index 1d73036849..0000000000
--- a/benchmark/bm_vm2_string_literal.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
-end
diff --git a/benchmark/bm_vm2_struct_big_aref_hi.rb b/benchmark/bm_vm2_struct_big_aref_hi.rb
deleted file mode 100644
index 22cb26b0a5..0000000000
--- a/benchmark/bm_vm2_struct_big_aref_hi.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.z # x[25]
-end
diff --git a/benchmark/bm_vm2_struct_big_aref_lo.rb b/benchmark/bm_vm2_struct_big_aref_lo.rb
deleted file mode 100644
index 5e61a7087e..0000000000
--- a/benchmark/bm_vm2_struct_big_aref_lo.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.k # x[10]
-end
diff --git a/benchmark/bm_vm2_struct_big_aset.rb b/benchmark/bm_vm2_struct_big_aset.rb
deleted file mode 100644
index 5a1c3d16f3..0000000000
--- a/benchmark/bm_vm2_struct_big_aset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.k = i # x[10] = i
-end
diff --git a/benchmark/bm_vm2_struct_big_href_hi.rb b/benchmark/bm_vm2_struct_big_href_hi.rb
deleted file mode 100644
index fff940a80a..0000000000
--- a/benchmark/bm_vm2_struct_big_href_hi.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:z]
-end
diff --git a/benchmark/bm_vm2_struct_big_href_lo.rb b/benchmark/bm_vm2_struct_big_href_lo.rb
deleted file mode 100644
index 5e4085d59d..0000000000
--- a/benchmark/bm_vm2_struct_big_href_lo.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:k]
-end
diff --git a/benchmark/bm_vm2_struct_big_hset.rb b/benchmark/bm_vm2_struct_big_hset.rb
deleted file mode 100644
index 9c0cee4141..0000000000
--- a/benchmark/bm_vm2_struct_big_hset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(*('a'..'z').map { |x| x.to_sym })
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:k] = i
-end
diff --git a/benchmark/bm_vm2_struct_small_aref.rb b/benchmark/bm_vm2_struct_small_aref.rb
deleted file mode 100644
index 8eaa555b41..0000000000
--- a/benchmark/bm_vm2_struct_small_aref.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.a
-end
diff --git a/benchmark/bm_vm2_struct_small_aset.rb b/benchmark/bm_vm2_struct_small_aset.rb
deleted file mode 100644
index ecd0f95669..0000000000
--- a/benchmark/bm_vm2_struct_small_aset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x.a = i
-end
diff --git a/benchmark/bm_vm2_struct_small_href.rb b/benchmark/bm_vm2_struct_small_href.rb
deleted file mode 100644
index 2c88fee6bf..0000000000
--- a/benchmark/bm_vm2_struct_small_href.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:a]
-end
diff --git a/benchmark/bm_vm2_struct_small_hset.rb b/benchmark/bm_vm2_struct_small_hset.rb
deleted file mode 100644
index 33c36d20f1..0000000000
--- a/benchmark/bm_vm2_struct_small_hset.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-s = Struct.new(:a, :b, :c)
-x = s.new
-i = 0
-while i<6_000_000 # benchmark loop 2
-  i += 1
-  x[:a] = 1
-end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
index e668026915..7db9829d44 100644..100755
--- a/benchmark/bm_vm3_gc.rb
+++ b/benchmark/bm_vm3_gc.rb
@@ -1,3 +1,4 @@
+#! /usr/bin/ruby
 5000.times do
   100.times do
     {"xxxx"=>"yyyy"}
diff --git a/benchmark/bm_vm3_gc_old_full.rb b/benchmark/bm_vm3_gc_old_full.rb
deleted file mode 100644
index cfdfc8c5a5..0000000000
--- a/benchmark/bm_vm3_gc_old_full.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-old_object = Array.new(1_000_000){''}
-100.times do
-  GC.start
-end
diff --git a/benchmark/bm_vm3_gc_old_immediate.rb b/benchmark/bm_vm3_gc_old_immediate.rb
deleted file mode 100644
index ad22feb655..0000000000
--- a/benchmark/bm_vm3_gc_old_immediate.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-old_object = Array.new(1_000_000){''}
-30_000.times do
-  GC.start(full_mark: false, immediate_sweep: true)
-end
diff --git a/benchmark/bm_vm3_gc_old_lazy.rb b/benchmark/bm_vm3_gc_old_lazy.rb
deleted file mode 100644
index b74d44baf1..0000000000
--- a/benchmark/bm_vm3_gc_old_lazy.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-old_object = Array.new(1_000_000){''}
-30_000.times do
-  GC.start(full_mark: false, immediate_sweep: false)
-end
diff --git a/benchmark/bm_vm_symbol_block_pass.rb b/benchmark/bm_vm_symbol_block_pass.rb
deleted file mode 100644
index 1d433353e1..0000000000
--- a/benchmark/bm_vm_symbol_block_pass.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-class C
-  1000.times {|i|
-    eval("def i#{i};end")
-  }
-end
-
-c = C.new
-m = C.instance_methods(false)
-5_000.times do
-  m.each do |n|
-    c.tap(&n)
-  end
-end
diff --git a/benchmark/bm_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
index 66e42c85e1..5c9f85dfb7 100644
--- a/benchmark/bm_vm_thread_mutex1.rb
+++ b/benchmark/bm_vm_thread_mutex1.rb
@@ -1,7 +1,7 @@
 # one thread, one mutex (no contention)
 
 require 'thread'
-m = Thread::Mutex.new
+m = Mutex.new
 r = 0
 max = 2000
 lmax = max * max
diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
index 6e6c804c31..10de59054f 100644
--- a/benchmark/bm_vm_thread_mutex2.rb
+++ b/benchmark/bm_vm_thread_mutex2.rb
@@ -1,7 +1,7 @@
 # two threads, one mutex
 
 require 'thread'
-m = Thread::Mutex.new
+m = Mutex.new
 r = 0
 max = 2000
 lmax = (max * max)/2
diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
index c750dc542a..7f9a44b39d 100644
--- a/benchmark/bm_vm_thread_mutex3.rb
+++ b/benchmark/bm_vm_thread_mutex3.rb
@@ -1,7 +1,7 @@
 # 1000 threads, one mutex
 
 require 'thread'
-m = Thread::Mutex.new
+m = Mutex.new
 r = 0
 max = 2000
 (1..max).map{
diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb
index 112a621905..272d231eba 100644
--- a/benchmark/bm_vm_thread_pipe.rb
+++ b/benchmark/bm_vm_thread_pipe.rb
@@ -1,4 +1,4 @@
-# Measure small and plenty pipe read/write.
+# Mesure small and plenty pipe read/write.
 # A performance may depend on GVL implementation.
 
 lmax = 100_000
diff --git a/benchmark/bm_vm_thread_queue.rb b/benchmark/bm_vm_thread_queue.rb
index 274ceda366..37381ae62b 100644
--- a/benchmark/bm_vm_thread_queue.rb
+++ b/benchmark/bm_vm_thread_queue.rb
@@ -1,7 +1,7 @@
 require 'thread'
 
 n = 1_000_000
-q = Thread::Queue.new
+q = Queue.new
 consumer = Thread.new{
   while q.pop
     # consuming
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index eb976b4a90..3904e25503 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -18,7 +18,6 @@ end
 
 require 'benchmark'
 require 'pp'
-require 'tempfile'
 
 class BenchmarkDriver
   def self.benchmark(opt)
@@ -30,24 +29,6 @@ class BenchmarkDriver
     end
   end
 
-  def self.load(input, type, opt)
-    case type
-    when 'yaml'
-      require 'yaml'
-      h = YAML.load(input)
-    when 'json'
-      require 'json'
-      h = JSON.load(input)
-    else
-      h = eval(input.read)
-    end
-    obj = allocate
-    obj.instance_variable_set("@execs", h[:executables] || h["executables"])
-    obj.instance_variable_set("@results", h[:results] || h["results"])
-    obj.instance_variable_set("@opt", opt)
-    obj
-  end
-
   def output *args
     puts(*args)
     @output and @output.puts(*args)
@@ -96,9 +77,9 @@ class BenchmarkDriver
     @exclude = opt[:exclude] || nil
     @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
     @output = opt[:output] ? open(opt[:output], 'w') : nil
+    @rawdata_output = opt[:rawdata_output] ? open(opt[:rawdata_output], 'w') : nil
     @loop_wl1 = @loop_wl2 = nil
     @ruby_arg = opt[:ruby_arg] || nil
-    @measure_target = opt[:measure_target]
     @opt = opt
 
     # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
@@ -110,7 +91,6 @@ class BenchmarkDriver
       @execs.each_with_index{|(path, label, version), i|
         message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at \"#{path}\""
       }
-      message "measure target: #{@measure_target}"
     end
   end
 
@@ -138,25 +118,6 @@ class BenchmarkDriver
   end
 
   def show_results
-    case @opt[:format]
-    when :tsv
-      strformat = "\t%1$s"
-      numformat = "\t%1$*2$.3f"
-      minwidth = 0
-      name_width = 0
-    when :markdown
-      markdown = true
-      strformat = "|%1$-*2$s"
-      numformat = "|%1$*2$.3f"
-    when :plain
-      strformat = " %1$-*2$s"
-      numformat = " %1$*2$.3f"
-    end
-
-    name_width ||= @results.map {|v,*| v.size}.max
-    minwidth ||= 7
-    width = @execs.map{|(_, v)| [v.size, minwidth].max}
-
     output
 
     if @verbose
@@ -168,27 +129,12 @@ class BenchmarkDriver
       message "Elapsed time: #{Time.now - @start_time} (sec)"
     end
 
-    if rawdata_output = @opt[:rawdata_output]
+    if @rawdata_output
       h = {}
       h[:cpuinfo] = File.read('/proc/cpuinfo') if File.exist?('/proc/cpuinfo')
       h[:executables] = @execs
       h[:results] = @results
-      if (type = File.extname(rawdata_output)).empty?
-        type = rawdata_output
-        rawdata_output = @output.path.sub(/\.[^.\/]+\z/, '') << '.' << rawdata_output
-      end
-      case type
-      when 'yaml'
-        require 'yaml'
-        h = YAML.dump(h)
-      when 'json'
-        require 'json'
-        h = JSON.pretty_generate(h)
-      else
-        require 'pp'
-        h = h.pretty_inspect
-      end
-      open(rawdata_output, 'w') {|f| f.puts h}
+      @rawdata_output.puts h.inspect
     end
 
     output '-----------------------------------------------------------'
@@ -198,33 +144,20 @@ class BenchmarkDriver
       output "minimum results in each #{@repeat} measurements."
     end
 
-    output({
-      real: "Execution time (sec)",
-      peak: "Memory usage (peak) (B)",
-      size: "Memory usage (last size) (B)",
-    }[@measure_target])
-    output if markdown
-    output ["name".ljust(name_width), @execs.map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip
-    output ["-"*name_width, width.map{|n|":".rjust(n, "-")}].join("|") if markdown
+    output "Execution time (sec)"
+    output "name\t#{@execs.map{|(_, v)| v}.join("\t")}"
     @results.each{|v, result|
       rets = []
       s = adjusted_results(v, result){|r|
-        rets << sprintf(numformat, r, width[rets.size])
+        rets << sprintf("%.3f", r)
       }
-      v += s if s
-      output [v.ljust(name_width), rets].join("")
+      output "#{v}#{s}\t#{rets.join("\t")}"
     }
 
     if @execs.size > 1
       output
-      output({
-        real: "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)",
-        peak: "Memory consuming ratio (peak) with the result of `#{@execs[0][1]}' (greater is better)",
-        size: "Memory consuming ratio (size) with the result of `#{@execs[0][1]}' (greater is better)",
-      }[@measure_target])
-      output if markdown
-      output ["name".ljust(name_width), @execs[1..-1].map.with_index{|(_, v), i| sprintf(strformat, v, width[i])}].join("").rstrip
-      output ["-"*name_width, width[1..-1].map{|n|":".rjust(n, "-")}].join("|") if markdown
+      output "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)"
+      output "name\t#{@execs[1..-1].map{|(_, v)| v}.join("\t")}"
       @results.each{|v, result|
         rets = []
         first_value = nil
@@ -233,14 +166,13 @@ class BenchmarkDriver
             if r == 0
               rets << "Error"
             else
-              rets << sprintf(numformat, first_value/Float(r), width[rets.size+1])
+              rets << sprintf("%.3f", first_value/r)
             end
           else
             first_value = r
           end
         }
-        v += s if s
-        output [v.ljust(name_width), rets].join("")
+        output "#{v}#{s}\t#{rets.join("\t")}"
       }
     end
 
@@ -322,30 +254,17 @@ class BenchmarkDriver
   end
 
   def measure executable, file
-    case @measure_target
-    when :real
-      cmd = "#{executable} #{@ruby_arg} #{file}"
-      m = Benchmark.measure{
-        system(cmd, out: File::NULL)
-      }
-      result = m.real
-    when :peak, :size
-      tmp = Tempfile.new("benchmark-memory-wrapper-data")
-      wrapper = "#{File.join(__dir__, 'memory_wrapper.rb')} #{tmp.path} #{@measure_target}"
-      cmd = "#{executable} #{@ruby_arg} #{wrapper} #{file}"
+    cmd = "#{executable} #{@ruby_arg} #{file}"
+
+    m = Benchmark.measure{
       system(cmd, out: File::NULL)
-      result = tmp.read.to_i
-      tmp.close
-    else
-      raise "unknown measure target"
-    end
+    }
 
     if $? != 0
-      raise $?.inspect if $? && $?.signaled?
       output "\`#{cmd}\' exited with abnormal status (#{$?})"
       0
     else
-      result
+      m.real
     end
   end
 end
@@ -355,15 +274,8 @@ if __FILE__ == $0
     :execs => [],
     :dir => File.dirname(__FILE__),
     :repeat => 1,
-    :measure_target => :real,
-    :output => nil,
-    :raw_output => nil,
-    :format => :tsv,
-  }
-  formats = {
-    :tsv => ".tsv",
-    :markdown => ".md",
-    :plain => ".txt",
+    :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
+    :raw_output => nil
   }
 
   parser = OptionParser.new{|o|
@@ -391,18 +303,9 @@ if __FILE__ == $0
     o.on('--ruby-arg [ARG]', "Optional argument for ruby"){|a|
       opt[:ruby_arg] = a
     }
-    o.on('--measure-target [TARGET]', 'real (execution time), peak, size (memory)'){|mt|
-      opt[:measure_target] = mt.to_sym
-    }
     o.on('--rawdata-output [FILE]', 'output rawdata'){|r|
       opt[:rawdata_output] = r
     }
-    o.on('--load-rawdata=FILE', 'input rawdata'){|r|
-      opt[:rawdata_input] = r
-    }
-    o.on('-f', "--format=FORMAT", "output format (#{formats.keys.join(",")})", formats.keys){|r|
-      opt[:format] = r
-    }
     o.on('-v', '--verbose'){|v|
       opt[:verbose] = v
     }
@@ -413,15 +316,6 @@ if __FILE__ == $0
   }
 
   parser.parse!(ARGV)
-  opt[:output] ||= "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}#{formats[opt[:format]]}"
-
-  if input = opt[:rawdata_input]
-    b = open(input) {|f|
-      BenchmarkDriver.load(f, File.extname(input)[1..-1], opt)
-    }
-    b.show_results
-  else
-    BenchmarkDriver.benchmark(opt)
-  end
+  BenchmarkDriver.benchmark(opt)
 end
 
diff --git a/benchmark/memory_wrapper.rb b/benchmark/memory_wrapper.rb
deleted file mode 100644
index 3f4451a037..0000000000
--- a/benchmark/memory_wrapper.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-
-write_file, target, script_file = ARGV
-
-load(script_file)
-require_relative '../test/lib/memory_status'
-open(write_file, 'wb'){|f|
-  ms = Memory::Status.new
-  case target.to_sym
-  when :peak
-    key = ms.respond_to?(:hwm) ? :hwm : :peak
-  when :size
-    key = ms.respond_to?(:rss) ? :rss : :size
-  end
-
-  f.puts ms[key]
-}
diff --git a/benchmark/prepare_require.rb b/benchmark/prepare_require.rb
deleted file mode 100644
index c4786f04ad..0000000000
--- a/benchmark/prepare_require.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-require "fileutils"
-
-def prepare
-  num_files = 10000
-
-  basename = File.dirname($0)
-  data_dir = File.join(basename, "bm_require.data")
-
-  # skip if all of files exists
-  if File.exist?(File.join(data_dir, "c#{num_files}.rb"))
-    return
-  end
-
-  FileUtils.mkdir_p(data_dir)
-
-  1.upto(num_files) do |i|
-    f = File.open("#{data_dir}/c#{i}.rb", "w")
-    f.puts <<-END
-      class C#{i}
-      end
-    END
-  end
-end
-
-prepare
diff --git a/benchmark/prepare_require_thread.rb b/benchmark/prepare_require_thread.rb
deleted file mode 100644
index 339ecb8b39..0000000000
--- a/benchmark/prepare_require_thread.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-load File.join(File.dirname(__FILE__), "prepare_require.rb")
-
diff --git a/bignum.c b/bignum.c
index bf234dba6a..08b4337262 100644
--- a/bignum.c
+++ b/bignum.c
@@ -9,9 +9,10 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
+#include "internal.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -22,7 +23,7 @@
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
-#include "ruby_assert.h"
+#include <assert.h>
 
 #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
 #define USE_GMP
@@ -31,9 +32,7 @@
 
 #define RB_BIGNUM_TYPE_P(x) RB_TYPE_P((x), T_BIGNUM)
 
-#ifndef RUBY_INTEGER_UNIFICATION
 VALUE rb_cBignum;
-#endif
 const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 #ifndef SIZEOF_BDIGIT_DBL
@@ -100,6 +99,7 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
     rb_absint_size(x, NULL))
 
 #define BIGDIVREM_EXTRA_WORDS 1
+#define roomof(n, m) ((long)(((n)+(m)-1) / (m)))
 #define bdigit_roomof(n) roomof(n, SIZEOF_BDIGIT)
 #define BARY_ARGS(ary) ary, numberof(ary)
 
@@ -112,7 +112,7 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
 #define BIGNUM_SET_NEGATIVE_SIGN(b) BIGNUM_SET_SIGN(b, 0)
 #define BIGNUM_SET_POSITIVE_SIGN(b) BIGNUM_SET_SIGN(b, 1)
 
-#define bignew(len,sign) bignew_1(rb_cInteger,(len),(sign))
+#define bignew(len,sign) bignew_1(rb_cBignum,(len),(sign))
 
 #define BDIGITS_ZERO(ptr, n) do { \
   BDIGIT *bdigitz_zero_ptr = (ptr); \
@@ -174,7 +174,7 @@ static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SI
 #define U128(a,b,c,d) (((uint128_t)U64(a,b) << 64) | U64(c,d))
 #endif
 
-/* The following script, maxpow.rb, generates the tables follows.
+/* The following scirpt, maxpow.rb, generates the tables follows.
 
 def big(n, bits)
   ns = []
@@ -1650,7 +1650,7 @@ bary_mul_balance_with_mulfunc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t
             }
             tds = zds + n;
             MEMCPY(wds, zds + n, BDIGIT, xn);
-            mulfunc(tds, tn, xds, xn, yds + n, r, wds+xn, wn-xn);
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds-xn, wn-xn);
             bary_add(zds + n, tn,
                      zds + n, tn,
                      wds, xn);
@@ -2980,7 +2980,7 @@ static VALUE
 bignew_1(VALUE klass, size_t len, int sign)
 {
     NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0));
-    BIGNUM_SET_SIGN(big, sign);
+    BIGNUM_SET_SIGN(big, sign?1:0);
     if (len <= BIGNUM_EMBED_LEN_MAX) {
 	RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
 	BIGNUM_SET_LEN(big, len);
@@ -3176,7 +3176,7 @@ rb_int2big(SIGNED_VALUE n)
     }
     big = rb_uint2big(u);
     if (neg) {
-	BIGNUM_SET_NEGATIVE_SIGN(big);
+	BIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
@@ -3294,7 +3294,7 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
     static const BDIGIT char_bit[1] = { CHAR_BIT };
     BDIGIT numbytes_bary[bdigit_roomof(sizeof(numbytes))];
     BDIGIT val_numbits_bary[bdigit_roomof(sizeof(numbytes) + 1)];
-    BDIGIT nlz_bits_in_msbyte_bary[1];
+    BDIGIT nlz_bits_in_msbyte_bary[1] = { nlz_bits_in_msbyte };
     BDIGIT word_numbits_bary[bdigit_roomof(sizeof(word_numbits))];
     BDIGIT div_bary[numberof(val_numbits_bary) + BIGDIVREM_EXTRA_WORDS];
     BDIGIT mod_bary[numberof(word_numbits_bary)];
@@ -3304,8 +3304,6 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
     int sign;
     size_t numwords;
 
-    nlz_bits_in_msbyte_bary[0] = nlz_bits_in_msbyte;
-
     /*
      * val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte
      * div, mod = val_numbits.divmod(word_numbits)
@@ -3687,44 +3685,16 @@ rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t na
 
 #define conv_digit(c) (ruby_digit36_to_number_table[(unsigned char)(c)])
 
-NORETURN(static inline void invalid_radix(int base));
-NORETURN(static inline void invalid_integer(VALUE s));
-
-static inline int
-valid_radix_p(int base)
-{
-    return (1 < base && base <= 36);
-}
-
-static inline void
-invalid_radix(int base)
-{
-    rb_raise(rb_eArgError, "invalid radix %d", base);
-}
-
-static inline void
-invalid_integer(VALUE s)
-{
-    rb_raise(rb_eArgError, "invalid value for Integer(): %+"PRIsVALUE, s);
-}
-
-static int
-str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, ssize_t *len_p)
+static void
+str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, size_t *len_p)
 {
     char nondigit = 0;
     size_t num_digits = 0;
     const char *digits_start = str;
     const char *digits_end = str;
-    ssize_t len = *len_p;
 
     int c;
 
-    if (!len) {
-	*num_digits_p = 0;
-	*len_p = 0;
-	return TRUE;
-    }
-
     if (badcheck && *str == '_') goto bad;
 
     while ((c = *str++) != 0) {
@@ -3734,32 +3704,27 @@ str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size
 		break;
 	    }
 	    nondigit = (char) c;
+	    continue;
 	}
-	else if ((c = conv_digit(c)) < 0 || c >= base) {
+	else if ((c = conv_digit(c)) < 0) {
 	    break;
 	}
-	else {
-	    nondigit = 0;
-	    num_digits++;
-	    digits_end = str;
-	}
-	if (len > 0 && !--len) break;
+	if (c >= base) break;
+	nondigit = 0;
+        num_digits++;
+        digits_end = str;
     }
-    if (badcheck && nondigit) goto bad;
-    if (badcheck && len) {
+    if (badcheck) {
 	str--;
-	while (*str && ISSPACE(*str)) {
-	    str++;
-	    if (len > 0 && !--len) break;
-	}
-	if (len && *str) {
+	if (s+1 < str && str[-1] == '_') goto bad;
+	while (*str && ISSPACE(*str)) str++;
+	if (*str) {
 	  bad:
-	    return FALSE;
+	    rb_invalid_str(s, "Integer()");
 	}
     }
     *num_digits_p = num_digits;
     *len_p = digits_end - digits_start;
-    return TRUE;
 }
 
 static VALUE
@@ -3974,111 +3939,59 @@ str2big_gmp(
 }
 #endif
 
-/*
- * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes.
- *
- * str:      pointer to the string to be parsed.
- *	     should be NUL-terminated.
- * base:     base of conversion, must be 2..36, or -36..0.
- *           if +base+ > 0, the conversion is done according to the +base+
- *           and unmatched prefix is parsed as a part of the result if
- *           present.
- *           if +base+ <= 0, the conversion is done according to the
- *           prefix if present, in base <code>-base</code> if +base+ < -1,
- *           or in base 10.
- * badcheck: if non-zero, +ArgumentError+ is raised when +str+ is not
- *           valid as an Integer.  if zero, Fixnum 0 is returned in
- *           that case.
- */
 VALUE
 rb_cstr_to_inum(const char *str, int base, int badcheck)
 {
-    char *end;
-    VALUE ret = rb_cstr_parse_inum(str, -1, (badcheck ? NULL : &end), base);
-    if (NIL_P(ret)) {
-	if (badcheck) rb_invalid_str(str, "Integer()");
-	ret = INT2FIX(0);
-    }
-    return ret;
-}
-
-/*
- * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes.
- *
- * str:  pointer to the string to be parsed.
- *       should be NUL-terminated if +len+ is negative.
- * len:  length of +str+ if >= 0.  if +len+ is negative, +str+ should
- *       be NUL-terminated.
- * endp: if non-NULL, the address after parsed part is stored.  if
- *       NULL, Qnil is returned when +str+ is not valid as an Integer.
- * base: see +rb_cstr_to_inum+
- */
-
-VALUE
-rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
-{
-    const char *const s = str;
+    const char *s = str;
     char sign = 1;
     int c;
     VALUE z;
 
-    unsigned long val;
-    int ov;
+    int bits_per_digit;
 
     const char *digits_start, *digits_end;
     size_t num_digits;
     size_t num_bdigits;
-    const ssize_t len0 = len;
-    const int badcheck = !endp;
-
-#define ADV(n) do {\
-	if (len > 0 && len <= (n)) goto bad; \
-	str += (n); \
-	len -= (n); \
-    } while (0)
-#define ASSERT_LEN() do {\
-	assert(len != 0); \
-	if (len0 >= 0) assert(s + len0 == str + len); \
-    } while (0)
+    size_t len;
 
     if (!str) {
-      bad:
-	if (endp) *endp = (char *)str;
-	return Qnil;
+	if (badcheck) {
+          bad:
+            rb_invalid_str(s, "Integer()");
+        }
+	return INT2FIX(0);
     }
-    if (len) {
-	while (ISSPACE(*str)) ADV(1);
+    while (ISSPACE(*str)) str++;
 
-	if (str[0] == '+') {
-	    ADV(1);
-	}
-	else if (str[0] == '-') {
-	    ADV(1);
-	    sign = 0;
-	}
-	ASSERT_LEN();
-	if (str[0] == '+' || str[0] == '-') {
-	    goto bad;
-	}
+    if (str[0] == '+') {
+	str++;
+    }
+    else if (str[0] == '-') {
+	str++;
+	sign = 0;
+    }
+    if (str[0] == '+' || str[0] == '-') {
+	if (badcheck) goto bad;
+	return INT2FIX(0);
     }
     if (base <= 0) {
-	if (str[0] == '0' && len > 1) {
+	if (str[0] == '0') {
 	    switch (str[1]) {
 	      case 'x': case 'X':
 		base = 16;
-		ADV(2);
+                str += 2;
 		break;
 	      case 'b': case 'B':
 		base = 2;
-		ADV(2);
+                str += 2;
 		break;
 	      case 'o': case 'O':
 		base = 8;
-		ADV(2);
+                str += 2;
 		break;
 	      case 'd': case 'D':
 		base = 10;
-		ADV(2);
+                str += 2;
 		break;
 	      default:
 		base = 8;
@@ -4091,36 +4004,31 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 	    base = 10;
 	}
     }
-    else if (len == 1) {
-	/* no prefix */
-    }
     else if (base == 2) {
 	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
-	    ADV(2);
+	    str += 2;
 	}
     }
     else if (base == 8) {
 	if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
-	    ADV(2);
+	    str += 2;
 	}
     }
     else if (base == 10) {
 	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
-	    ADV(2);
+	    str += 2;
 	}
     }
     else if (base == 16) {
 	if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
-	    ADV(2);
+	    str += 2;
 	}
     }
-    if (!valid_radix_p(base)) {
-        invalid_radix(base);
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
     }
-    if (!len) goto bad;
-    if (*str == '0' && len != 1) { /* squeeze preceding 0s */
+    if (*str == '0') {		/* squeeze preceding 0s */
 	int us = 0;
-	const char *end = len < 0 ? NULL : str + len;
 	while ((c = *++str) == '0' || c == '_') {
 	    if (c == '_') {
 		if (++us >= 2)
@@ -4129,29 +4037,26 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 	    else {
 		us = 0;
 	    }
-	    if (str == end) break;
 	}
-	if (!c || ISSPACE(c)) --str;
-	if (end) len = end - str;
-	ASSERT_LEN();
+	if (!(c = *str) || ISSPACE(c)) --str;
     }
     c = *str;
     c = conv_digit(c);
     if (c < 0 || c >= base) {
-	goto bad;
+	if (badcheck) goto bad;
+	return INT2FIX(0);
     }
 
-    val = ruby_scan_digits(str, len, base, &num_digits, &ov);
-    if (!ov) {
-	const char *end = &str[num_digits];
-	if (num_digits > 0 && *end == '_') goto bigparse;
-	if (endp) *endp = (char *)end;
+    bits_per_digit = bit_length(base-1);
+    if (bits_per_digit * strlen(str) <= sizeof(long) * CHAR_BIT) {
+        char *end;
+	unsigned long val = STRTOUL(str, &end, base);
+
+	if (str < end && *end == '_') goto bigparse;
 	if (badcheck) {
-	    if (num_digits == 0) return Qnil; /* no number */
-	    while (len < 0 ? *end : end < str + len) {
-		if (!ISSPACE(*end)) return Qnil; /* trailing garbage */
-		end++;
-	    }
+	    if (end == str) goto bad; /* no number */
+	    while (*end && ISSPACE(*end)) end++;
+	    if (*end) goto bad;	      /* trailing garbage */
 	}
 
 	if (POSFIXABLE(val)) {
@@ -4170,13 +4075,12 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 
   bigparse:
     digits_start = str;
-    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	goto bad;
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
     digits_end = digits_start + len;
 
     if (POW2_P(base)) {
         z = str2big_poweroftwo(sign, digits_start, digits_end, num_digits,
-			       bit_length(base-1));
+                bits_per_digit);
     }
     else {
         int digits_per_bdigits_dbl;
@@ -4206,19 +4110,32 @@ rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
 VALUE
 rb_str_to_inum(VALUE str, int base, int badcheck)
 {
-    VALUE ret;
-    const char *s;
+    char *s;
     long len;
-    char *end;
+    VALUE v = 0;
+    VALUE ret;
 
     StringValue(str);
     rb_must_asciicompat(str);
-    RSTRING_GETMEM(str, s, len);
-    ret = rb_cstr_parse_inum(s, len, (badcheck ? NULL : &end), base);
-    if (NIL_P(ret)) {
-	if (badcheck) invalid_integer(str);
-	ret = INT2FIX(0);
+    if (badcheck) {
+	s = StringValueCStr(str);
     }
+    else {
+	s = RSTRING_PTR(str);
+    }
+    if (s) {
+	len = RSTRING_LEN(str);
+	if (s[len]) {		/* no sentinel somehow */
+	    char *p = ALLOCV(v, len+1);
+
+	    MEMCPY(p, s, char, len);
+	    p[len] = '\0';
+	    s = p;
+	}
+    }
+    ret = rb_cstr_to_inum(s, base, badcheck);
+    if (v)
+	ALLOCV_END(v);
     return ret;
 }
 
@@ -4229,25 +4146,22 @@ rb_str2big_poweroftwo(VALUE arg, int base, int badcheck)
     const char *s, *str;
     const char *digits_start, *digits_end;
     size_t num_digits;
-    ssize_t len;
+    size_t len;
     VALUE z;
 
-    if (!valid_radix_p(base) || !POW2_P(base)) {
-        invalid_radix(base);
+    if (base < 2 || 36 < base || !POW2_P(base)) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
     }
 
     rb_must_asciicompat(arg);
     s = str = StringValueCStr(arg);
-    len = RSTRING_LEN(arg);
     if (*str == '-') {
-	len--;
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
-    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
     digits_end = digits_start + len;
 
     z = str2big_poweroftwo(positive_p, digits_start, digits_end, num_digits,
@@ -4265,28 +4179,25 @@ rb_str2big_normal(VALUE arg, int base, int badcheck)
     const char *s, *str;
     const char *digits_start, *digits_end;
     size_t num_digits;
-    ssize_t len;
+    size_t len;
     VALUE z;
 
     int digits_per_bdigits_dbl;
     size_t num_bdigits;
 
-    if (!valid_radix_p(base)) {
-        invalid_radix(base);
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
     }
 
     rb_must_asciicompat(arg);
-    s = str = StringValuePtr(arg);
-    len = RSTRING_LEN(arg);
-    if (len > 0 && *str == '-') {
-	len--;
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
-    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
     digits_end = digits_start + len;
 
     maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -4307,28 +4218,25 @@ rb_str2big_karatsuba(VALUE arg, int base, int badcheck)
     const char *s, *str;
     const char *digits_start, *digits_end;
     size_t num_digits;
-    ssize_t len;
+    size_t len;
     VALUE z;
 
     int digits_per_bdigits_dbl;
     size_t num_bdigits;
 
-    if (!valid_radix_p(base)) {
-        invalid_radix(base);
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
     }
 
     rb_must_asciicompat(arg);
-    s = str = StringValuePtr(arg);
-    len = RSTRING_LEN(arg);
-    if (len > 0 && *str == '-') {
-	len--;
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
-    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
     digits_end = digits_start + len;
 
     maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -4350,28 +4258,25 @@ rb_str2big_gmp(VALUE arg, int base, int badcheck)
     const char *s, *str;
     const char *digits_start, *digits_end;
     size_t num_digits;
-    ssize_t len;
+    size_t len;
     VALUE z;
 
     int digits_per_bdigits_dbl;
     size_t num_bdigits;
 
-    if (!valid_radix_p(base)) {
-        invalid_radix(base);
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
     }
 
     rb_must_asciicompat(arg);
-    s = str = StringValuePtr(arg);
-    len = RSTRING_LEN(arg);
-    if (len > 0 && *str == '-') {
-	len--;
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
         str++;
         positive_p = 0;
     }
 
     digits_start = str;
-    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
-	invalid_integer(arg);
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
     digits_end = digits_start + len;
 
     maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
@@ -4425,7 +4330,7 @@ rb_ll2big(LONG_LONG n)
     }
     big = rb_ull2big(u);
     if (neg) {
-	BIGNUM_SET_NEGATIVE_SIGN(big);
+	BIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
@@ -4446,46 +4351,6 @@ rb_ll2inum(LONG_LONG n)
 
 #endif  /* HAVE_LONG_LONG */
 
-#ifdef HAVE_INT128_T
-static VALUE
-rb_uint128t2big(uint128_t n)
-{
-    long i;
-    VALUE big = bignew(bdigit_roomof(SIZEOF_INT128_T), 1);
-    BDIGIT *digits = BDIGITS(big);
-
-    for (i = 0; i < bdigit_roomof(SIZEOF_INT128_T); i++) {
-	digits[i] = BIGLO(RSHIFT(n ,BITSPERDIG*i));
-    }
-
-    i = bdigit_roomof(SIZEOF_INT128_T);
-    while (i-- && !digits[i]) ;
-    BIGNUM_SET_LEN(big, i+1);
-    return big;
-}
-
-VALUE
-rb_int128t2big(int128_t n)
-{
-    int neg = 0;
-    uint128_t u;
-    VALUE big;
-
-    if (n < 0) {
-        u = 1 + (uint128_t)(-(n + 1)); /* u = -n avoiding overflow */
-	neg = 1;
-    }
-    else {
-        u = n;
-    }
-    big = rb_uint128t2big(u);
-    if (neg) {
-	BIGNUM_SET_NEGATIVE_SIGN(big);
-    }
-    return big;
-}
-#endif
-
 VALUE
 rb_cstr2inum(const char *str, int base)
 {
@@ -4694,9 +4559,8 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail
         p = buf;
         j = sizeof(buf);
         do {
-            BDIGIT_DBL idx = num % b2s->base;
+            p[--j] = ruby_digitmap[num % b2s->base];
             num /= b2s->base;
-            p[--j] = ruby_digitmap[idx];
         } while (num);
         len = sizeof(buf) - j;
         big2str_alloc(b2s, len + taillen);
@@ -4706,9 +4570,8 @@ big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t tail
         p = b2s->ptr;
         j = b2s->hbase2_numdigits;
         do {
-            BDIGIT_DBL idx = num % b2s->base;
+            p[--j] = ruby_digitmap[num % b2s->base];
             num /= b2s->base;
-            p[--j] = ruby_digitmap[idx];
         } while (j);
         len = b2s->hbase2_numdigits;
     }
@@ -4892,8 +4755,8 @@ big2str_generic(VALUE x, int base)
 	return rb_usascii_str_new2("0");
     }
 
-    if (!valid_radix_p(base))
-	invalid_radix(base);
+    if (base < 2 || 36 < base)
+	rb_raise(rb_eArgError, "invalid radix %d", base);
 
     if (xn >= LONG_MAX/BITSPERDIG) {
         rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
@@ -4959,7 +4822,7 @@ rb_big2str_generic(VALUE x, int base)
 }
 
 #ifdef USE_GMP
-static VALUE
+VALUE
 big2str_gmp(VALUE x, int base)
 {
     const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
@@ -5018,8 +4881,8 @@ rb_big2str1(VALUE x, int base)
 	return rb_usascii_str_new2("0");
     }
 
-    if (!valid_radix_p(base))
-	invalid_radix(base);
+    if (base < 2 || 36 < base)
+	rb_raise(rb_eArgError, "invalid radix %d", base);
 
     if (xn >= LONG_MAX/BITSPERDIG) {
         rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
@@ -5045,6 +4908,35 @@ rb_big2str(VALUE x, int base)
     return rb_big2str1(x, base);
 }
 
+/*
+ *  call-seq:
+ *     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"
+ *     12345654321.to_s(16)     #=> "2dfdbbc31"
+ *     78546939656932.to_s(36)  #=> "rubyrules"
+ */
+
+static VALUE
+rb_big_to_s(int argc, VALUE *argv, VALUE x)
+{
+    int base;
+
+    if (argc == 0) base = 10;
+    else {
+	VALUE b;
+
+	rb_scan_args(argc, argv, "01", &b);
+	base = NUM2INT(b);
+    }
+    return rb_big2str(x, base);
+}
+
 static unsigned long
 big2ulong(VALUE x, const char *type)
 {
@@ -5079,8 +4971,10 @@ rb_big2ulong(VALUE x)
         return num;
     }
     else {
-        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
-            return -(long)(num-1)-1;
+        if (num <= LONG_MAX)
+            return -(long)num;
+        if (num == 1+(unsigned long)(-(LONG_MIN+1)))
+            return LONG_MIN;
     }
     rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 }
@@ -5095,8 +4989,10 @@ rb_big2long(VALUE x)
             return num;
     }
     else {
-        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
-            return -(long)(num-1)-1;
+        if (num <= LONG_MAX)
+            return -(long)num;
+        if (num == 1+(unsigned long)(-(LONG_MIN+1)))
+            return LONG_MIN;
     }
     rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
 }
@@ -5135,8 +5031,10 @@ rb_big2ull(VALUE x)
         return num;
     }
     else {
-        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
-            return -(LONG_LONG)(num-1)-1;
+        if (num <= LLONG_MAX)
+            return -(LONG_LONG)num;
+        if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return LLONG_MIN;
     }
     rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
 }
@@ -5151,8 +5049,10 @@ rb_big2ll(VALUE x)
             return num;
     }
     else {
-        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
-            return -(LONG_LONG)(num-1)-1;
+        if (num <= LLONG_MAX)
+            return -(LONG_LONG)num;
+        if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return LLONG_MIN;
     }
     rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
 }
@@ -5243,7 +5143,7 @@ big2dbl(VALUE x)
 	    }
 	}
     }
-    if (BIGNUM_NEGATIVE_P(x)) d = -d;
+    if (!BIGNUM_SIGN(x)) d = -d;
     return d;
 }
 
@@ -5262,6 +5162,21 @@ rb_big2dbl(VALUE x)
     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(VALUE x)
+{
+    return DBL2NUM(rb_big2dbl(x));
+}
+
 VALUE
 rb_integer_float_cmp(VALUE x, VALUE y)
 {
@@ -5344,24 +5259,36 @@ rb_integer_float_eq(VALUE x, VALUE y)
     return rb_big_eq(x, y);
 }
 
+/*
+ *  call-seq:
+ *     big <=> numeric   -> -1, 0, +1 or nil
+ *
+ *  Comparison---Returns -1, 0, or +1 depending on whether +big+ is
+ *  less than, equal to, or greater than +numeric+. This is the
+ *  basis for the tests in Comparable.
+ *
+ *  +nil+ is returned if the two values are incomparable.
+ *
+ */
+
 VALUE
 rb_big_cmp(VALUE x, VALUE y)
 {
+    int cmp;
+
     if (FIXNUM_P(y)) {
-	x = bigfixize(x);
+        x = bignorm(x);
         if (FIXNUM_P(x)) {
-	    /* SIGNED_VALUE and Fixnum have same sign-bits, same
-	     * order */
-	    SIGNED_VALUE sx = (SIGNED_VALUE)x, sy = (SIGNED_VALUE)y;
-	    if (sx < sy) return INT2FIX(-1);
-	    return INT2FIX(sx > sy);
+            if (FIX2LONG(x) > FIX2LONG(y)) return INT2FIX(1);
+            if (FIX2LONG(x) < FIX2LONG(y)) return INT2FIX(-1);
+            return INT2FIX(0);
+        }
+        else {
+            if (BIGNUM_NEGATIVE_P(x)) return INT2FIX(-1);
+            return INT2FIX(1);
         }
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
-	if (BIGNUM_SIGN(x) == BIGNUM_SIGN(y)) {
-	    int cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y));
-	    return INT2FIX(BIGNUM_SIGN(x) ? cmp : -cmp);
-	}
     }
     else if (RB_FLOAT_TYPE_P(y)) {
         return rb_integer_float_cmp(x, y);
@@ -5369,7 +5296,15 @@ rb_big_cmp(VALUE x, VALUE y)
     else {
 	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
-    return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1);
+
+    if (BIGNUM_SIGN(x) > BIGNUM_SIGN(y)) return INT2FIX(1);
+    if (BIGNUM_SIGN(x) < BIGNUM_SIGN(y)) return INT2FIX(-1);
+
+    cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y));
+    if (BIGNUM_SIGN(x))
+        return INT2FIX(cmp);
+    else
+        return INT2FIX(-cmp);
 }
 
 enum big_op_t {
@@ -5385,7 +5320,7 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
     VALUE rel;
     int n;
 
-    if (RB_INTEGER_TYPE_P(y)) {
+    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
 	rel = rb_big_cmp(x, y);
     }
     else if (RB_FLOAT_TYPE_P(y)) {
@@ -5414,26 +5349,58 @@ big_op(VALUE x, VALUE y, enum big_op_t op)
     return Qundef;
 }
 
-VALUE
-rb_big_gt(VALUE x, VALUE y)
+/*
+ * 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, big_op_gt);
 }
 
-VALUE
-rb_big_ge(VALUE x, VALUE y)
+/*
+ * 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, big_op_ge);
 }
 
-VALUE
-rb_big_lt(VALUE x, VALUE y)
+/*
+ * 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, big_op_lt);
 }
 
-VALUE
-rb_big_le(VALUE x, VALUE y)
+/*
+ * 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, big_op_le);
 }
@@ -5443,8 +5410,8 @@ rb_big_le(VALUE x, VALUE y)
  *     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>Integer#eql?</code>, which
- *  requires <i>obj</i> to be a <code>Integer</code>.
+ *  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
  */
@@ -5453,7 +5420,8 @@ VALUE
 rb_big_eq(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	return bignorm(x) == y ? Qtrue : Qfalse;
+	if (bignorm(x) == y) return Qtrue;
+	y = rb_int2big(FIX2LONG(y));
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
     }
@@ -5469,6 +5437,17 @@ rb_big_eq(VALUE x, VALUE y)
     return Qtrue;
 }
 
+/*
+ *  call-seq:
+ *     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
+ */
+
 VALUE
 rb_big_eql(VALUE x, VALUE y)
 {
@@ -5479,18 +5458,37 @@ rb_big_eql(VALUE x, VALUE y)
     return Qtrue;
 }
 
+/*
+ * call-seq:
+ *    -big   ->  integer
+ *
+ * Unary minus (returns an integer whose value is 0-big)
+ */
+
 VALUE
 rb_big_uminus(VALUE x)
 {
     VALUE z = rb_big_clone(x);
 
-    BIGNUM_NEGATE(z);
+    BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x));
 
     return bignorm(z);
 }
 
-VALUE
-rb_big_comp(VALUE x)
+/*
+ * call-seq:
+ *     ~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(VALUE x)
 {
     VALUE z = rb_big_clone(x);
     BDIGIT *ds = BDIGITS(z);
@@ -5570,7 +5568,7 @@ bigsub_int(VALUE x, long y0)
     assert(xn == zn);
     num = (BDIGIT_DBL_SIGNED)xds[0] - y;
     if (xn == 1 && num < 0) {
-	BIGNUM_NEGATE(z);
+	BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x));
 	zds[0] = (BDIGIT)-num;
 	RB_GC_GUARD(x);
 	return bignorm(z);
@@ -5633,7 +5631,7 @@ bigsub_int(VALUE x, long y0)
     assert(num == 0 || num == -1);
     if (num < 0) {
         get2comp(z);
-	BIGNUM_NEGATE(z);
+	BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x));
     }
     RB_GC_GUARD(x);
     return bignorm(z);
@@ -5749,6 +5747,13 @@ bigadd(VALUE x, VALUE y, int sign)
     return z;
 }
 
+/*
+ *  call-seq:
+ *     big + other  -> Numeric
+ *
+ *  Adds big and other, returning the result.
+ */
+
 VALUE
 rb_big_plus(VALUE x, VALUE y)
 {
@@ -5778,6 +5783,13 @@ rb_big_plus(VALUE x, VALUE y)
     }
 }
 
+/*
+ *  call-seq:
+ *     big - other  -> Numeric
+ *
+ *  Subtracts other from big, returning the result.
+ */
+
 VALUE
 rb_big_minus(VALUE x, VALUE y)
 {
@@ -5865,6 +5877,13 @@ bigmul0(VALUE x, VALUE y)
     return z;
 }
 
+/*
+ *  call-seq:
+ *     big * other  -> Numeric
+ *
+ *  Multiplies big and other, returning the result.
+ */
+
 VALUE
 rb_big_mul(VALUE x, VALUE y)
 {
@@ -6020,18 +6039,43 @@ rb_big_divide(VALUE x, VALUE y, ID op)
     return bignorm(z);
 }
 
+/*
+ *  call-seq:
+ *     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.
+ */
+
 VALUE
 rb_big_modulo(VALUE x, VALUE y)
 {
@@ -6048,7 +6092,16 @@ rb_big_modulo(VALUE x, VALUE y)
     return bignorm(z);
 }
 
-VALUE
+/*
+ *  call-seq:
+ *     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(VALUE x, VALUE y)
 {
     VALUE z;
@@ -6064,6 +6117,13 @@ rb_big_remainder(VALUE x, VALUE y)
     return bignorm(z);
 }
 
+/*
+ *  call-seq:
+ *     big.divmod(numeric)   -> array
+ *
+ *  See <code>Numeric#divmod</code>.
+ *
+ */
 VALUE
 rb_big_divmod(VALUE x, VALUE y)
 {
@@ -6090,7 +6150,7 @@ big_shift(VALUE x, long n)
     return x;
 }
 
-static double
+static VALUE
 big_fdiv(VALUE x, VALUE y, long ey)
 {
 #define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
@@ -6108,14 +6168,14 @@ big_fdiv(VALUE x, VALUE y, long ey)
 #if SIZEOF_LONG > SIZEOF_INT
     {
 	/* Visual C++ can't be here */
-	if (l > INT_MAX) return INFINITY;
-	if (l < INT_MIN) return 0.0;
+	if (l > INT_MAX) return DBL2NUM(INFINITY);
+	if (l < INT_MIN) return DBL2NUM(0.0);
     }
 #endif
-    return ldexp(big2dbl(z), (int)l);
+    return DBL2NUM(ldexp(big2dbl(z), (int)l));
 }
 
-static double
+static VALUE
 big_fdiv_int(VALUE x, VALUE y)
 {
     long l, ey;
@@ -6127,7 +6187,7 @@ big_fdiv_int(VALUE x, VALUE y)
     return big_fdiv(x, y, ey);
 }
 
-static double
+static VALUE
 big_fdiv_float(VALUE x, VALUE y)
 {
     int i;
@@ -6135,8 +6195,21 @@ big_fdiv_float(VALUE x, VALUE y)
     return big_fdiv(x, y, i - DBL_MANT_DIG);
 }
 
-double
-rb_big_fdiv_double(VALUE x, VALUE y)
+/*
+ *  call-seq:
+  *     big.fdiv(numeric) -> float
+ *
+ *  Returns the floating point result of dividing <i>big</i> by
+ *  <i>numeric</i>.
+ *
+ *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
+ *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
+ *
+ */
+
+
+VALUE
+rb_big_fdiv(VALUE x, VALUE y)
 {
     double dx, dy;
 
@@ -6154,21 +6227,28 @@ rb_big_fdiv_double(VALUE x, VALUE y)
     else if (RB_FLOAT_TYPE_P(y)) {
 	dy = RFLOAT_VALUE(y);
 	if (isnan(dy))
-	    return dy;
+	    return y;
 	if (isinf(dx))
 	    return big_fdiv_float(x, y);
     }
     else {
-	return RFLOAT_VALUE(rb_num_coerce_bin(x, y, rb_intern("fdiv")));
+	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
     }
-    return dx / dy;
+    return DBL2NUM(dx / dy);
 }
 
-VALUE
-rb_big_fdiv(VALUE x, VALUE y)
-{
-    return DBL2NUM(rb_big_fdiv_double(x, y));
-}
+/*
+ *  call-seq:
+ *     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
+ *  a Fixnum, Bignum, or Float
+ *
+ *    123456789 ** 2      #=> 15241578750190521
+ *    123456789 ** 1.2    #=> 5126464716.09932
+ *    123456789 ** -2     #=> 6.5610001194102e-17
+ */
 
 VALUE
 rb_big_pow(VALUE x, VALUE y)
@@ -6180,7 +6260,7 @@ rb_big_pow(VALUE x, VALUE y)
     if (y == INT2FIX(0)) return INT2FIX(1);
     if (RB_FLOAT_TYPE_P(y)) {
 	d = RFLOAT_VALUE(y);
-	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x)) && d != round(d))
+	if ((!BIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
 	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
@@ -6279,6 +6359,13 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     return bignorm(z);
 }
 
+/*
+ * call-seq:
+ *     big & numeric   ->  integer
+ *
+ * Performs bitwise +and+ between _big_ and _numeric_.
+ */
+
 VALUE
 rb_big_and(VALUE x, VALUE y)
 {
@@ -6291,7 +6378,7 @@ rb_big_and(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!RB_INTEGER_TYPE_P(y)) {
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '&');
     }
 
@@ -6398,6 +6485,13 @@ bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     return bignorm(z);
 }
 
+/*
+ * call-seq:
+ *     big | numeric   ->  integer
+ *
+ * Performs bitwise +or+ between _big_ and _numeric_.
+ */
+
 VALUE
 rb_big_or(VALUE x, VALUE y)
 {
@@ -6410,7 +6504,7 @@ rb_big_or(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!RB_INTEGER_TYPE_P(y)) {
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '|');
     }
 
@@ -6491,6 +6585,12 @@ bigxor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     RB_GC_GUARD(x);
     return bignorm(z);
 }
+/*
+ * call-seq:
+ *     big ^ numeric   ->  integer
+ *
+ * Performs bitwise +exclusive or+ between _big_ and _numeric_.
+ */
 
 VALUE
 rb_big_xor(VALUE x, VALUE y)
@@ -6504,7 +6604,7 @@ rb_big_xor(VALUE x, VALUE y)
     BDIGIT tmph;
     long tmpn;
 
-    if (!RB_INTEGER_TYPE_P(y)) {
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bit(x, y, '^');
     }
 
@@ -6540,6 +6640,13 @@ rb_big_xor(VALUE x, VALUE y)
     return bignorm(z);
 }
 
+/*
+ * call-seq:
+ *     big << numeric   ->  integer
+ *
+ * Shifts big left _numeric_ positions (right if _numeric_ is negative).
+ */
+
 VALUE
 rb_big_lshift(VALUE x, VALUE y)
 {
@@ -6570,6 +6677,14 @@ rb_big_lshift(VALUE x, VALUE y)
     }
 }
 
+
+/*
+ * call-seq:
+ *     big >> numeric   ->  integer
+ *
+ * Shifts big right _numeric_ positions (left if _numeric_ is negative).
+ */
+
 VALUE
 rb_big_rshift(VALUE x, VALUE y)
 {
@@ -6600,7 +6715,26 @@ rb_big_rshift(VALUE x, VALUE y)
     }
 }
 
-VALUE
+/*
+ *  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(VALUE x, VALUE y)
 {
     BDIGIT *xds;
@@ -6610,7 +6744,7 @@ rb_big_aref(VALUE x, VALUE y)
     BDIGIT bit;
 
     if (RB_BIGNUM_TYPE_P(y)) {
-	if (BIGNUM_NEGATIVE_P(y))
+	if (!BIGNUM_SIGN(y))
 	    return INT2FIX(0);
 	bigtrunc(y);
 	if (BIGSIZE(y) > sizeof(size_t)) {
@@ -6645,13 +6779,22 @@ rb_big_aref(VALUE x, VALUE y)
     return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
 }
 
-VALUE
+/*
+ * call-seq:
+ *   big.hash   -> fixnum
+ *
+ * Compute a hash based on the value of _big_.
+ *
+ * See also Object#hash.
+ */
+
+static VALUE
 rb_big_hash(VALUE x)
 {
     st_index_t hash;
 
     hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*BIGNUM_LEN(x)) ^ BIGNUM_SIGN(x);
-    return ST2FIX(hash);
+    return INT2FIX(hash);
 }
 
 /*
@@ -6669,47 +6812,95 @@ rb_big_hash(VALUE x)
  */
 
 static VALUE
-rb_int_coerce(VALUE x, VALUE y)
+rb_big_coerce(VALUE x, VALUE y)
 {
-    if (RB_INTEGER_TYPE_P(y)) {
-        return rb_assoc_new(y, x);
+    if (FIXNUM_P(y)) {
+	y = rb_int2big(FIX2LONG(y));
     }
-    else {
-        x = rb_Float(x);
-        y = rb_Float(y);
-        return rb_assoc_new(y, x);
+    else if (!RB_BIGNUM_TYPE_P(y)) {
+	rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
+		 rb_obj_classname(y));
     }
+    return rb_assoc_new(y, x);
 }
 
-VALUE
+/*
+ *  call-seq:
+ *     big.abs -> aBignum
+ *     big.magnitude -> aBignum
+ *
+ *  Returns the absolute value of <i>big</i>.
+ *
+ *     -1234567890987654321.abs   #=> 1234567890987654321
+ */
+
+static VALUE
 rb_big_abs(VALUE x)
 {
-    if (BIGNUM_NEGATIVE_P(x)) {
+    if (!BIGNUM_SIGN(x)) {
 	x = rb_big_clone(x);
-	BIGNUM_SET_POSITIVE_SIGN(x);
+	BIGNUM_SET_SIGN(x, 1);
     }
     return x;
 }
 
-int
-rb_big_sign(VALUE x)
-{
-    return BIGNUM_SIGN(x);
-}
+/*
+ *  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
+ */
 
-size_t
+static VALUE
 rb_big_size(VALUE big)
 {
-    return BIGSIZE(big);
+    return SIZET2NUM(BIGSIZE(big));
 }
 
-VALUE
-rb_big_size_m(VALUE big)
-{
-    return SIZET2NUM(rb_big_size(big));
-}
+/*
+ *  call-seq:
+ *     int.bit_length -> integer
+ *
+ *  Returns the number of bits of the value of <i>int</i>.
+ *
+ *  "the number of bits" means that
+ *  the bit position of the highest bit which is different to the sign bit.
+ *  (The bit position of the bit 2**n is n+1.)
+ *  If there is no such bit (zero or minus one), zero is returned.
+ *
+ *  I.e. This method returns ceil(log2(int < 0 ? -int : int+1)).
+ *
+ *     (-2**10000-1).bit_length  #=> 10001
+ *     (-2**10000).bit_length    #=> 10000
+ *     (-2**10000+1).bit_length  #=> 10000
+ *
+ *     (-2**1000-1).bit_length   #=> 1001
+ *     (-2**1000).bit_length     #=> 1000
+ *     (-2**1000+1).bit_length   #=> 1000
+ *
+ *     (2**1000-1).bit_length    #=> 1000
+ *     (2**1000).bit_length      #=> 1001
+ *     (2**1000+1).bit_length    #=> 1001
+ *
+ *     (2**10000-1).bit_length   #=> 10000
+ *     (2**10000).bit_length     #=> 10001
+ *     (2**10000+1).bit_length   #=> 10001
+ *
+ *  This method can be used to detect overflow in Array#pack as follows.
+ *
+ *     if n.bit_length < 32
+ *       [n].pack("l") # no overflow
+ *     else
+ *       raise "overflow"
+ *     end
+ */
 
-VALUE
+static VALUE
 rb_big_bit_length(VALUE big)
 {
     int nlz_bits;
@@ -6750,7 +6941,14 @@ rb_big_bit_length(VALUE big)
             INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
 }
 
-VALUE
+/*
+ *  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 (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
@@ -6759,7 +6957,14 @@ rb_big_odd_p(VALUE num)
     return Qfalse;
 }
 
-VALUE
+/*
+ *  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)
 {
     if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
@@ -6789,17 +6994,51 @@ rb_big_even_p(VALUE num)
 void
 Init_Bignum(void)
 {
-#ifndef RUBY_INTEGER_UNIFICATION
-    rb_cBignum = rb_cInteger;
-#endif
-    rb_define_const(rb_cObject, "Bignum", rb_cInteger);
-    rb_deprecate_constant(rb_cObject, "Bignum");
-
-    rb_define_method(rb_cInteger, "coerce", rb_int_coerce, 1);
+    rb_cBignum = rb_define_class("Bignum", rb_cInteger);
+
+    rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
+    rb_define_alias(rb_cBignum, "inspect", "to_s");
+    rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
+    rb_define_method(rb_cBignum, "-@", rb_big_uminus, 0);
+    rb_define_method(rb_cBignum, "+", rb_big_plus, 1);
+    rb_define_method(rb_cBignum, "-", rb_big_minus, 1);
+    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_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, "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);
+    rb_define_method(rb_cBignum, "^", rb_big_xor, 1);
+    rb_define_method(rb_cBignum, "~", rb_big_neg, 0);
+    rb_define_method(rb_cBignum, "<<", rb_big_lshift, 1);
+    rb_define_method(rb_cBignum, ">>", rb_big_rshift, 1);
+    rb_define_method(rb_cBignum, "[]", rb_big_aref, 1);
+
+    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, "bit_length", rb_big_bit_length, 0);
+    rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0);
+    rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
 
 #ifdef USE_GMP
     /* The version of loaded GMP. */
-    rb_define_const(rb_cInteger, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version));
+    rb_define_const(rb_cBignum, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version));
 #endif
 
     power_cache_init();
diff --git a/bin/erb b/bin/erb
index 6a88c3b26a..6a7ea7d593 100755
--- a/bin/erb
+++ b/bin/erb
@@ -11,8 +11,7 @@ class ERB
       return nil if self.empty?
       arg = self.shift
       return nil if arg == '--'
-      case arg
-      when /\A-(.)(.*)/
+      if arg =~ /^-(.)(.*)/
         if $1 == '-'
           arg, @maybe_arg = arg.split(/=/, 2)
           return arg
@@ -25,8 +24,6 @@ class ERB
           @maybe_arg = nil
         end
         "-#{$1}"
-      when /\A(\w+)=/
-        arg
       else
         self.unshift arg
         nil
@@ -57,7 +54,6 @@ class ERB
     def run(factory=ERB)
       trim_mode = 0
       disable_percent = false
-      variables = {}
       begin
         while switch = ARGV.switch
           case switch
@@ -76,7 +72,7 @@ class ERB
             require ARGV.req_arg
           when '-S'                        # security level
             arg = ARGV.req_arg
-            raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-1]\z/
+            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-3]$/
             safe_level = arg.to_i
           when '-T'                        # trim mode
             arg = ARGV.req_arg
@@ -84,7 +80,7 @@ class ERB
               trim_mode = arg
               next
             end
-            raise "invalid trim mode #{arg.dump}" unless arg =~ /\A[0-2]\z/
+            raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
             trim_mode = arg.to_i
           when '-E', '--encoding'
             arg = ARGV.req_arg
@@ -95,29 +91,25 @@ class ERB
             disable_percent = true
           when '--help'
             raise "print this help"
-          when /\A-/
-            raise "unknown switch #{switch.dump}"
           else
-            var, val = *switch.split('=', 2)
-            (variables ||= {})[var] = val
+            raise "unknown switch #{switch.dump}"
           end
         end
       rescue                               # usage
         STDERR.puts $!.to_s
         STDERR.puts File.basename($0) +
-          " [switches] [var=value...] [inputfile]"
+          " [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
-  -S safe_level    set $SAFE (0..1)
+  -S safe_level    set $SAFE (0..3)
   -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 "%"
-  var=value        set variable
 EOU
         exit 1
       end
@@ -138,23 +130,15 @@ EOU
           puts erb.src
         end
       else
-        bind = TOPLEVEL_BINDING.taint
-        if variables
-          enc = erb.encoding
-          for var, val in variables do
-            val = val.encode(enc) if val
-            bind.local_variable_set(var, val)
-          end
-        end
-        erb.run(bind)
+        erb.run(TOPLEVEL_BINDING.taint)
       end
     end
     module_function :run
 
     def set_encoding(extern, intern = nil)
       verbose, $VERBOSE = $VERBOSE, nil
-      Encoding.default_external = extern unless extern.nil? || extern == ""
-      Encoding.default_internal = intern unless intern.nil? || intern == ""
+      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
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 0000000000..4e0bbb7b7a
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,33 @@
+#!/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 'rubygems'
+  gem 'rake'
+rescue LoadError
+end
+
+require 'rake'
+
+Rake.application.run
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 754c3f0f3b..d58b824386 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -60,7 +60,6 @@ end
 def main
   @ruby = File.expand_path('miniruby')
   @verbose = false
-  $VERBOSE = false
   $stress = false
   @color = nil
   @tty = nil
@@ -137,15 +136,9 @@ End
   @tty &&= !@verbose
   if @color
     # dircolors-like style
-    colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
-    begin
-      File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
-        colors[n] ||= c
-      end
-    rescue
-    end
-    @passed = "\e[;#{colors["pass"] || "32"}m"
-    @failed = "\e[;#{colors["fail"] || "31"}m"
+    colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
+    @passed = "\e[#{colors["pass"] || "32"}m"
+    @failed = "\e[#{colors["fail"] || "31"}m"
     @reset = "\e[m"
   else
     @passed = @failed = @reset = ""
@@ -405,7 +398,7 @@ def flunk(message = '')
 end
 
 def pretty(src, desc, result)
-  src = src.sub(/\A\s*\n/, '')
+  src = src.sub(/\A.*\n/, '')
   (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
 end
 
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
index cdc5960a59..6a2ccfc6da 100644
--- a/bootstraptest/test_block.rb
+++ b/bootstraptest/test_block.rb
@@ -597,17 +597,3 @@ assert_equal 'true', %q{
   C1.new.foo{}
 }
 
-assert_equal 'ok', %q{
-  1.times do
-    begin
-      raise
-    rescue
-      begin
-        raise
-      rescue
-        break
-      end
-    end
-  end
-  'ok'
-}
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
index 8e90ac2728..bf7478006d 100644
--- a/bootstraptest/test_eval.rb
+++ b/bootstraptest/test_eval.rb
@@ -109,7 +109,7 @@ assert_equal %q{foo}, %q{
   }
 }
 assert_equal %q{1}, %q{
-  class Integer
+  class Fixnum
     Const = 1
   end
   1.instance_eval %{
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
index 1cd9f7ac6c..5de6ee1b12 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -24,7 +24,7 @@ assert_finish 10, %q{
 assert_normal_exit(<<'End', '[ruby-dev:37934]')
   main = Thread.current
   Thread.new { sleep 0.01 until main.stop?; Thread.kill main }
-  Process.setrlimit(:NPROC, 1) if defined?(Process::RLIMIT_NPROC)
+  Process.setrlimit(:NPROC, 1)
   fork {}
 End
 
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index 1d2b19368a..cee8cb399e 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -26,7 +26,7 @@ assert_finish 10, %q{
       t1.join
       t2.join
     end
-  rescue LoadError, Timeout::Error, NotImplementedError
+  rescue LoadError, TimeoutError, NotImplementedError
   end
 }, '[ruby-dev:32566]'
 
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index e79092e411..aa65bddae1 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -15,17 +15,17 @@ assert_equal 'sym',             ':sym'
 assert_equal ':sym',            ':sym.inspect'
 assert_equal 'Symbol',          ':sym.class'
 assert_equal '1234',            '1234'
-assert_equal 'Integer',         '1234.class'
+assert_equal 'Fixnum',          '1234.class'
 assert_equal '1234',            '1_2_3_4'
-assert_equal 'Integer',         '1_2_3_4.class'
+assert_equal 'Fixnum',          '1_2_3_4.class'
 assert_equal '18',              '0x12'
-assert_equal 'Integer',         '0x12.class'
+assert_equal 'Fixnum',          '0x12.class'
 assert_equal '15',              '0o17'
-assert_equal 'Integer',         '0o17.class'
+assert_equal 'Fixnum',          '0o17.class'
 assert_equal '5',               '0b101'
-assert_equal 'Integer',         '0b101.class'
+assert_equal 'Fixnum',          '0b101.class'
 assert_equal '123456789012345678901234567890', '123456789012345678901234567890'
-assert_equal 'Integer',         '123456789012345678901234567890.class'
+assert_equal 'Bignum',          '123456789012345678901234567890.class'
 assert_equal '2.0',             '2.0'
 assert_equal 'Float',           '1.3.class'
 
@@ -99,7 +99,7 @@ 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 '[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'
@@ -169,7 +169,7 @@ assert_equal 'a',               'r = ("a".."c"); r.begin'
 assert_equal 'c',               'r = ("a".."c"); r.end'
 
 assert_equal 'String',          '__FILE__.class'
-assert_equal 'Integer',         '__LINE__.class'
+assert_equal 'Fixnum',          '__LINE__.class'
 
 ###
 
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
index 3462aa9434..0a7cb0a577 100644
--- a/bootstraptest/test_method.rb
+++ b/bootstraptest/test_method.rb
@@ -3,7 +3,7 @@ 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_match /\Awrong number of arguments \(.*\b1\b.* 0\)\z/, %q{
+assert_equal 'wrong number of arguments (1 for 0)', %q{
   def m; end
   begin
     m(1)
@@ -12,7 +12,7 @@ assert_match /\Awrong number of arguments \(.*\b1\b.* 0\)\z/, %q{
   end
 }
 
-assert_match /\Awrong number of arguments \(.*\b0\b.* 1\)\z/, %q{
+assert_equal 'wrong number of arguments (0 for 1)', %q{
   def m a; end
   begin
     m
@@ -910,6 +910,34 @@ assert_equal 'ok', %q{
 }, '[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
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
index 24a1a0ce2c..862a94e376 100644
--- a/bootstraptest/test_objectspace.rb
+++ b/bootstraptest/test_objectspace.rb
@@ -35,7 +35,7 @@ assert_normal_exit %q{
 
 assert_normal_exit %q{
   ObjectSpace.define_finalizer("") do
-    Thread::Mutex.new.lock
+    Mutex.new.lock
   end
 }, '[ruby-dev:44049]'
 
diff --git a/bootstraptest/test_string.rb b/bootstraptest/test_string.rb
deleted file mode 100644
index 849dcd45b0..0000000000
--- a/bootstraptest/test_string.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-assert_normal_exit %q{
-  inspect.clear
-}, '[ruby-core:68110]'
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
index a111990a1f..80eaa6416d 100644
--- a/bootstraptest/test_syntax.rb
+++ b/bootstraptest/test_syntax.rb
@@ -376,8 +376,6 @@ 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{1}, %q{if true && ""; then 1; end}
-assert_equal %q{1}, %q{if nil || true; then 1; end}
 assert_equal %q{false}, %q{nil or false or nil or false}
 assert_equal %q{elseng}, %q{
   case
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index d16295de8b..048aeb19c2 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -25,9 +25,8 @@ rescue ThreadError => e
   :ok if /can't create Thread/ =~ e.message
 end
 }
-assert_equal %q{ok}, %q{
-begin
-  :ok if 5000 == 5000.times{|e|
+assert_equal %q{5000}, %q{
+  5000.times{|e|
     (1..2).map{
       Thread.new{
       }
@@ -35,13 +34,9 @@ begin
       e.join()
     }
   }
-rescue ThreadError => e
-  :ok if /can't create Thread/ =~ e.message
-end
 }
-assert_equal %q{ok}, %q{
-begin
-  :ok if 5000 == 5000.times{|e|
+assert_equal %q{5000}, %q{
+  5000.times{|e|
     (1..2).map{
       Thread.new{
       }
@@ -49,9 +44,6 @@ begin
       e.join(1000000000)
     }
   }
-rescue ThreadError => e
-  :ok if /can't create Thread/ =~ e.message
-end
 }
 assert_equal %q{ok}, %q{
 begin
@@ -93,7 +85,7 @@ assert_equal %q{ok}, %q{
       ans = :ok
     end
   }
-  Thread.pass until t.stop?
+  Thread.pass
   t.kill
   t.join
   ans
@@ -347,7 +339,7 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   begin
-    m1, m2 = Thread::Mutex.new, Thread::Mutex.new
+    m1, m2 = Mutex.new, Mutex.new
     f1 = f2 = false
     Thread.new { m1.lock; f2 = true; sleep 0.001 until f1; m2.lock }
     m2.lock; f1 = true; sleep 0.001 until f2; m1.lock
@@ -358,32 +350,32 @@ assert_equal 'ok', %q{
 }
 
 assert_equal 'ok', %q{
-  m = Thread::Mutex.new
+  m = Mutex.new
   Thread.new { m.lock }; sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Thread::Mutex.new
+  m = Mutex.new
   Thread.new { m.lock }; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Thread::Mutex.new
+  m = Mutex.new
   Thread.new { m.lock }.join; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Thread::Mutex.new
+  m = Mutex.new
   Thread.new { m.lock; sleep 0.2 }
   sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
-  m = Thread::Mutex.new
+  m = Mutex.new
   Thread.new { m.lock; sleep 0.2; m.unlock }
   sleep 0.1; m.lock
   :ok
@@ -409,7 +401,7 @@ assert_equal 'ok', %{
   open("zzz.rb", "w") do |f|
     f.puts <<-'end;' # do
       begin
-        m = Thread::Mutex.new
+        m = Mutex.new
         parent = Thread.current
         th1 = Thread.new { m.lock; sleep }
         sleep 0.01 until th1.stop?
@@ -437,8 +429,8 @@ assert_equal 'ok', %{
 assert_finish 3, %q{
   require 'thread'
 
-  lock = Thread::Mutex.new
-  cond = Thread::ConditionVariable.new
+  lock = Mutex.new
+  cond = ConditionVariable.new
   t = Thread.new do
     lock.synchronize do
       cond.wait(lock)
diff --git a/ccan/list/list.h b/ccan/list/list.h
index ca9f9f1f7f..749db7849a 100644
--- a/ccan/list/list.h
+++ b/ccan/list/list.h
@@ -42,8 +42,8 @@ struct list_head
 };
 
 #define LIST_LOC __FILE__  ":" stringify(__LINE__)
-#define list_debug(h, loc) ((void)loc, h)
-#define list_debug_node(n, loc) ((void)loc, n)
+#define list_debug(h, loc) (h)
+#define list_debug_node(n, loc) (n)
 
 /**
  * LIST_HEAD_INIT - initializer for an empty list_head
@@ -104,36 +104,6 @@ static inline void list_node_init(struct list_node *n)
 }
 
 /**
- * list_add_after - add an entry after an existing node in a linked list
- * @h: the list_head to add the node to (for debugging)
- * @p: the existing list_node to add the node after
- * @n: the new list_node to add to the list.
- *
- * The existing list_node must already be a member of the list.
- * The new list_node does not need to be initialized; it will be overwritten.
- *
- * Example:
- *	struct child c1, c2, c3;
- *	LIST_HEAD(h);
- *
- *	list_add_tail(&h, &c1.list);
- *	list_add_tail(&h, &c3.list);
- *	list_add_after(&h, &c1.list, &c2.list);
- */
-#define list_add_after(h, p, n) list_add_after_(h, p, n, LIST_LOC)
-static inline void list_add_after_(struct list_head *h,
-				   struct list_node *p,
-				   struct list_node *n,
-				   const char *abortstr)
-{
-	n->next = p->next;
-	n->prev = p;
-	p->next->prev = n;
-	p->next = n;
-	(void)list_debug(h, abortstr);
-}
-
-/**
  * list_add - add an entry at the start of a linked list.
  * @h: the list_head to add the node to
  * @n: the list_node to add to the list.
@@ -151,34 +121,10 @@ static inline void list_add_(struct list_head *h,
 			     struct list_node *n,
 			     const char *abortstr)
 {
-	list_add_after_(h, &h->n, n, abortstr);
-}
-
-/**
- * list_add_before - add an entry before an existing node in a linked list
- * @h: the list_head to add the node to (for debugging)
- * @p: the existing list_node to add the node before
- * @n: the new list_node to add to the list.
- *
- * The existing list_node must already be a member of the list.
- * The new list_node does not need to be initialized; it will be overwritten.
- *
- * Example:
- *	list_head_init(&h);
- *	list_add_tail(&h, &c1.list);
- *	list_add_tail(&h, &c3.list);
- *	list_add_before(&h, &c3.list, &c2.list);
- */
-#define list_add_before(h, p, n) list_add_before_(h, p, n, LIST_LOC)
-static inline void list_add_before_(struct list_head *h,
-				    struct list_node *p,
-				    struct list_node *n,
-				    const char *abortstr)
-{
-	n->next = p;
-	n->prev = p->prev;
-	p->prev->next = n;
-	p->prev = n;
+	n->next = h->n.next;
+	n->prev = &h->n;
+	h->n.next->prev = n;
+	h->n.next = n;
 	(void)list_debug(h, abortstr);
 }
 
@@ -197,7 +143,11 @@ static inline void list_add_tail_(struct list_head *h,
 				  struct list_node *n,
 				  const char *abortstr)
 {
-	list_add_before_(h, &h->n, n, abortstr);
+	n->next = &h->n;
+	n->prev = h->n.prev;
+	h->n.prev->next = n;
+	h->n.prev = n;
+	(void)list_debug(h, abortstr);
 }
 
 /**
@@ -315,39 +265,6 @@ static inline void list_del_from(struct list_head *h, struct list_node *n)
 }
 
 /**
- * list_swap - swap out an entry from an (unknown) linked list for a new one.
- * @o: the list_node to replace from the list.
- * @n: the list_node to insert in place of the old one.
- *
- * Note that this leaves @o in an undefined state; it can be added to
- * another list, but not deleted/swapped again.
- *
- * See also:
- *	list_del()
- *
- * Example:
- *	struct child x1, x2;
- *	LIST_HEAD(xh);
- *
- *	list_add(&xh, &x1.list);
- *	list_swap(&x1.list, &x2.list);
- */
-#define list_swap(o, n) list_swap_(o, n, LIST_LOC)
-static inline void list_swap_(struct list_node *o,
-			      struct list_node *n,
-			      const char* abortstr)
-{
-	(void)list_debug_node(o, abortstr);
-	*n = *o;
-	n->next->prev = n;
-	n->prev->next = n;
-#ifdef CCAN_LIST_DEBUG
-	/* Catch use-after-del. */
-	o->next = o->prev = NULL;
-#endif
-}
-
-/**
  * list_entry - convert a list_node back into the structure containing it.
  * @n: the list_node
  * @type: the type of the entry
@@ -468,29 +385,9 @@ static inline const void *list_tail_(const struct list_head *h, size_t off)
  *		printf("Name: %s\n", child->name);
  */
 #define list_for_each_rev(h, i, member)					\
-	list_for_each_rev_off(h, i, list_off_var_(i, member))
-
-/**
- * list_for_each_rev_safe - iterate through a list backwards,
- * maybe during deletion
- * @h: the list_head
- * @i: the structure containing the list_node
- * @nxt: the structure containing the list_node
- * @member: the list_node member of the structure
- *
- * This is a convenient wrapper to iterate @i over the entire list backwards.
- * It's a for loop, so you can break and continue as normal.  The extra
- * variable * @nxt is used to hold the next element, so you can delete @i
- * from the list.
- *
- * Example:
- *	struct child *next;
- *	list_for_each_rev_safe(&parent->children, child, next, list) {
- *		printf("Name: %s\n", child->name);
- *	}
- */
-#define list_for_each_rev_safe(h, i, nxt, member)			\
-	list_for_each_rev_safe_off(h, i, nxt, list_off_var_(i, member))
+	for (i = container_of_var(list_debug(h,	LIST_LOC)->n.prev, i, member); \
+	     &i->member != &(h)->n;					\
+	     i = container_of_var(i->member.prev, i, member))
 
 /**
  * list_for_each_safe - iterate through a list, maybe during deletion
@@ -504,6 +401,7 @@ static inline const void *list_tail_(const struct list_head *h, size_t off)
  * @nxt is used to hold the next element, so you can delete @i from the list.
  *
  * Example:
+ *	struct child *next;
  *	list_for_each_safe(&parent->children, child, next, list) {
  *		list_del(&child->list);
  *		parent->num_children--;
@@ -618,24 +516,6 @@ static inline void list_prepend_list_(struct list_head *to,
 	list_head_init(from);
 }
 
-/* internal macros, do not use directly */
-#define list_for_each_off_dir_(h, i, off, dir)				\
-	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.dir,	\
-				   (off));				\
-	list_node_from_off_((void *)i, (off)) != &(h)->n;		\
-	i = list_node_to_off_(list_node_from_off_((void *)i, (off))->dir, \
-			      (off)))
-
-#define list_for_each_safe_off_dir_(h, i, nxt, off, dir)		\
-	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.dir,	\
-				   (off)),				\
-	nxt = list_node_to_off_(list_node_from_off_(i, (off))->dir,	\
-				(off));					\
-	list_node_from_off_(i, (off)) != &(h)->n;			\
-	i = nxt,							\
-	nxt = list_node_to_off_(list_node_from_off_(i, (off))->dir,	\
-				(off)))
-
 /**
  * list_for_each_off - iterate through a list of memory regions.
  * @h: the list_head
@@ -666,18 +546,11 @@ static inline void list_prepend_list_(struct list_head *to,
  *		printf("Name: %s\n", child->name);
  */
 #define list_for_each_off(h, i, off)                                    \
-	list_for_each_off_dir_((h),(i),(off),next)
-
-/**
- * list_for_each_rev_off - iterate through a list of memory regions backwards
- * @h: the list_head
- * @i: the pointer to a memory region wich contains list node data.
- * @off: offset(relative to @i) at which list node data resides.
- *
- * See list_for_each_off for details
- */
-#define list_for_each_rev_off(h, i, off)                                    \
-	list_for_each_off_dir_((h),(i),(off),prev)
+	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next,	\
+				   (off));				\
+       list_node_from_off_((void *)i, (off)) != &(h)->n;                \
+       i = list_node_to_off_(list_node_from_off_((void *)i, (off))->next, \
+                             (off)))
 
 /**
  * list_for_each_safe_off - iterate through a list of memory regions, maybe
@@ -696,26 +569,15 @@ static inline void list_prepend_list_(struct list_head *to,
  *		printf("Name: %s\n", child->name);
  */
 #define list_for_each_safe_off(h, i, nxt, off)                          \
-	list_for_each_safe_off_dir_((h),(i),(nxt),(off),next)
+	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next,	\
+				   (off)),				\
+         nxt = list_node_to_off_(list_node_from_off_(i, (off))->next,   \
+                                 (off));                                \
+       list_node_from_off_(i, (off)) != &(h)->n;                        \
+       i = nxt,                                                         \
+         nxt = list_node_to_off_(list_node_from_off_(i, (off))->next,   \
+                                 (off)))
 
-/**
- * list_for_each_rev_safe_off - iterate backwards through a list of
- * memory regions, maybe during deletion
- * @h: the list_head
- * @i: the pointer to a memory region wich contains list node data.
- * @nxt: the structure containing the list_node
- * @off: offset(relative to @i) at which list node data resides.
- *
- * For details see `list_for_each_rev_off' and `list_for_each_rev_safe'
- * descriptions.
- *
- * Example:
- *	list_for_each_rev_safe_off(&parent->children, child,
- *		next, offsetof(struct child, list))
- *		printf("Name: %s\n", child->name);
- */
-#define list_for_each_rev_safe_off(h, i, nxt, off)                      \
-	list_for_each_safe_off_dir_((h),(i),(nxt),(off),prev)
 
 /* Other -off variants. */
 #define list_entry_off(n, type, off)		\
diff --git a/class.c b/class.c
index 43530c9461..d841328077 100644
--- a/class.c
+++ b/class.c
@@ -23,13 +23,17 @@
  * \{
  */
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/st.h"
+#include "method.h"
 #include "constant.h"
 #include "vm_core.h"
-#include "id_table.h"
+#include "internal.h"
 #include <ctype.h>
 
+int rb_vm_add_root_module(ID id, VALUE module);
+
+
 #define id_attached id__attached__
 
 void
@@ -110,7 +114,7 @@ rb_class_remove_from_module_subclasses(VALUE klass)
 }
 
 void
-rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE arg)
+rb_class_foreach_subclass(VALUE klass, void(*f)(VALUE))
 {
     rb_subclass_entry_t *cur = RCLASS_EXT(klass)->subclasses;
 
@@ -119,32 +123,20 @@ rb_class_foreach_subclass(VALUE klass, void (*f)(VALUE, VALUE), VALUE arg)
     while (cur) {
 	VALUE curklass = cur->klass;
 	cur = cur->next;
-	f(curklass, arg);
+	f(curklass);
     }
 }
 
-static void
-class_detach_subclasses(VALUE klass, VALUE arg)
-{
-    rb_class_remove_from_super_subclasses(klass);
-}
-
 void
 rb_class_detach_subclasses(VALUE klass)
 {
-    rb_class_foreach_subclass(klass, class_detach_subclasses, Qnil);
-}
-
-static void
-class_detach_module_subclasses(VALUE klass, VALUE arg)
-{
-    rb_class_remove_from_module_subclasses(klass);
+    rb_class_foreach_subclass(klass, rb_class_remove_from_super_subclasses);
 }
 
 void
 rb_class_detach_module_subclasses(VALUE klass)
 {
-    rb_class_foreach_subclass(klass, class_detach_module_subclasses, Qnil);
+    rb_class_foreach_subclass(klass, rb_class_remove_from_module_subclasses);
 }
 
 /**
@@ -162,31 +154,25 @@ rb_class_detach_module_subclasses(VALUE klass)
 static VALUE
 class_alloc(VALUE flags, VALUE klass)
 {
-    NEWOBJ_OF(obj, struct RClass, klass, (flags & T_MASK) | FL_PROMOTED1 /* start from age == 2 */ | (RGENGC_WB_PROTECTED_CLASS ? FL_WB_PROTECTED : 0));
-    obj->ptr = ZALLOC(rb_classext_t);
-    /* ZALLOC
-      RCLASS_IV_TBL(obj) = 0;
-      RCLASS_CONST_TBL(obj) = 0;
-      RCLASS_M_TBL(obj) = 0;
-      RCLASS_IV_INDEX_TBL(obj) = 0;
-      RCLASS_SET_SUPER((VALUE)obj, 0);
-      RCLASS_EXT(obj)->subclasses = NULL;
-      RCLASS_EXT(obj)->parent_subclasses = NULL;
-      RCLASS_EXT(obj)->module_subclasses = NULL;
-     */
-    RCLASS_SET_ORIGIN((VALUE)obj, (VALUE)obj);
+    NEWOBJ_OF(obj, struct RClass, klass, (flags & T_MASK) | (RGENGC_WB_PROTECTED_CLASS ? FL_WB_PROTECTED : 0));
+    obj->ptr = ALLOC(rb_classext_t);
+    RCLASS_IV_TBL(obj) = 0;
+    RCLASS_CONST_TBL(obj) = 0;
+    RCLASS_M_TBL_WRAPPER(obj) = 0;
+    RCLASS_SET_SUPER((VALUE)obj, 0);
+    RCLASS_ORIGIN(obj) = (VALUE)obj;
+    RCLASS_IV_INDEX_TBL(obj) = 0;
+
+    RCLASS_EXT(obj)->subclasses = NULL;
+    RCLASS_EXT(obj)->parent_subclasses = NULL;
+    RCLASS_EXT(obj)->module_subclasses = NULL;
     RCLASS_SERIAL(obj) = rb_next_class_serial();
+
     RCLASS_REFINED_CLASS(obj) = Qnil;
     RCLASS_EXT(obj)->allocator = 0;
-
     return (VALUE)obj;
 }
 
-static void
-RCLASS_M_TBL_INIT(VALUE c)
-{
-    RCLASS_M_TBL(c) = rb_id_table_create(0);
-}
 
 /*!
  * A utility function that wraps class_alloc.
@@ -220,8 +206,8 @@ void
 rb_check_inheritable(VALUE super)
 {
     if (!RB_TYPE_P(super, T_CLASS)) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%"PRIsVALUE" given)",
-		 rb_obj_class(super));
+	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");
@@ -247,34 +233,53 @@ rb_class_new(VALUE super)
 }
 
 static void
-clone_method(VALUE old_klass, VALUE new_klass, ID mid, const rb_method_entry_t *me)
-{
-    if (me->def->type == VM_METHOD_TYPE_ISEQ) {
-	rb_cref_t *new_cref;
-	rb_vm_rewrite_cref(me->def->body.iseq.cref, old_klass, new_klass, &new_cref);
-	rb_add_method_iseq(new_klass, mid, me->def->body.iseq.iseqptr, new_cref, METHOD_ENTRY_VISI(me));
+rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass, NODE **new_cref_ptr)
+{
+    NODE *new_node;
+    while (node) {
+	if (node->nd_clss == old_klass) {
+	    new_node = NEW_CREF(new_klass);
+	    RB_OBJ_WRITE(new_node, &new_node->nd_next, node->nd_next);
+	    *new_cref_ptr = new_node;
+	    return;
+	}
+	new_node = NEW_CREF(node->nd_clss);
+	node = node->nd_next;
+	*new_cref_ptr = new_node;
+	new_cref_ptr = &new_node->nd_next;
+    }
+    *new_cref_ptr = NULL;
+}
+
+static void
+clone_method(VALUE klass, ID mid, const rb_method_entry_t *me)
+{
+    VALUE newiseqval;
+    if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) {
+	rb_iseq_t *iseq;
+	NODE *new_cref;
+	newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass);
+	GetISeqPtr(newiseqval, iseq);
+	rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref);
+	RB_OBJ_WRITE(iseq->self, &iseq->cref_stack, new_cref);
+	rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
+	RB_GC_GUARD(newiseqval);
     }
     else {
-	rb_method_entry_set(new_klass, mid, me, METHOD_ENTRY_VISI(me));
+	rb_method_entry_set(klass, mid, me, me->flag);
     }
 }
 
-struct clone_method_arg {
-    VALUE new_klass;
-    VALUE old_klass;
-};
-
-static enum rb_id_table_iterator_result
-clone_method_i(ID key, VALUE value, void *data)
+static int
+clone_method_i(st_data_t key, st_data_t value, st_data_t data)
 {
-    const struct clone_method_arg *arg = (struct clone_method_arg *)data;
-    clone_method(arg->old_klass, arg->new_klass, key, (const rb_method_entry_t *)value);
-    return ID_TABLE_CONTINUE;
+    clone_method((VALUE)data, (ID)key, (const rb_method_entry_t *)value);
+    return ST_CONTINUE;
 }
 
 struct clone_const_arg {
     VALUE klass;
-    struct rb_id_table *tbl;
+    st_table *tbl;
 };
 
 static int
@@ -285,14 +290,14 @@ clone_const(ID key, const rb_const_entry_t *ce, struct clone_const_arg *arg)
     RB_OBJ_WRITTEN(arg->klass, Qundef, ce->value);
     RB_OBJ_WRITTEN(arg->klass, Qundef, ce->file);
 
-    rb_id_table_insert(arg->tbl, key, (VALUE)nce);
-    return ID_TABLE_CONTINUE;
+    st_insert(arg->tbl, key, (st_data_t)nce);
+    return ST_CONTINUE;
 }
 
-static enum rb_id_table_iterator_result
-clone_const_i(ID key, VALUE value, void *data)
+static int
+clone_const_i(st_data_t key, st_data_t value, st_data_t data)
 {
-    return clone_const(key, (const rb_const_entry_t *)value, data);
+    return clone_const((ID)key, (const rb_const_entry_t *)value, (struct clone_const_arg *)data);
 }
 
 static void
@@ -331,7 +336,10 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
 	rb_free_const_table(RCLASS_CONST_TBL(clone));
 	RCLASS_CONST_TBL(clone) = 0;
     }
-    RCLASS_M_TBL(clone) = 0;
+    if (RCLASS_M_TBL_WRAPPER(clone)) {
+	rb_free_m_tbl_wrapper(RCLASS_M_TBL_WRAPPER(clone));
+	RCLASS_M_TBL_WRAPPER(clone) = 0;
+    }
     if (RCLASS_IV_TBL(orig)) {
 	st_data_t id;
 
@@ -346,16 +354,14 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
     if (RCLASS_CONST_TBL(orig)) {
 	struct clone_const_arg arg;
 
-	arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+	RCLASS_CONST_TBL(clone) = st_init_numtable();
 	arg.klass = clone;
-	rb_id_table_foreach(RCLASS_CONST_TBL(orig), clone_const_i, &arg);
+	arg.tbl = RCLASS_CONST_TBL(clone);
+	st_foreach(RCLASS_CONST_TBL(orig), clone_const_i, (st_data_t)&arg);
     }
     if (RCLASS_M_TBL(orig)) {
-	struct clone_method_arg arg;
-	arg.old_klass = orig;
-	arg.new_klass = clone;
 	RCLASS_M_TBL_INIT(clone);
-	rb_id_table_foreach(RCLASS_M_TBL(orig), clone_method_i, &arg);
+	st_foreach(RCLASS_M_TBL(orig), clone_method_i, (st_data_t)clone);
     }
 
     return clone;
@@ -370,7 +376,7 @@ rb_singleton_class_clone(VALUE obj)
 VALUE
 rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 {
-    const VALUE klass = RBASIC(obj)->klass;
+    VALUE klass = RBASIC(obj)->klass;
 
     if (!FL_TEST(klass, FL_SINGLETON))
 	return klass;
@@ -392,20 +398,16 @@ rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 	}
 	if (RCLASS_CONST_TBL(klass)) {
 	    struct clone_const_arg arg;
-	    arg.tbl = RCLASS_CONST_TBL(clone) = rb_id_table_create(0);
+	    RCLASS_CONST_TBL(clone) = st_init_numtable();
 	    arg.klass = clone;
-	    rb_id_table_foreach(RCLASS_CONST_TBL(klass), clone_const_i, &arg);
+	    arg.tbl = RCLASS_CONST_TBL(clone);
+	    st_foreach(RCLASS_CONST_TBL(klass), clone_const_i, (st_data_t)&arg);
 	}
 	if (attach != Qundef) {
 	    rb_singleton_class_attached(clone, attach);
 	}
 	RCLASS_M_TBL_INIT(clone);
-	{
-	    struct clone_method_arg arg;
-	    arg.old_klass = klass;
-	    arg.new_klass = clone;
-	    rb_id_table_foreach(RCLASS_M_TBL(klass), clone_method_i, &arg);
-	}
+	st_foreach(RCLASS_M_TBL(klass), clone_method_i, (st_data_t)clone);
 	rb_singleton_class_attached(RBASIC(clone)->klass, clone);
 	FL_SET(clone, FL_SINGLETON);
 
@@ -424,7 +426,7 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
 	if (!RCLASS_IV_TBL(klass)) {
 	    RCLASS_IV_TBL(klass) = st_init_numtable();
 	}
-	rb_class_ivar_set(klass, id_attached, obj);
+	rb_st_insert_id_and_value(klass, RCLASS_IV_TBL(klass), id_attached, obj);
     }
 }
 
@@ -440,19 +442,6 @@ rb_singleton_class_attached(VALUE klass, VALUE obj)
  */
 #define META_CLASS_OF_CLASS_CLASS_P(k)  (METACLASS_OF(k) == (k))
 
-static int
-rb_singleton_class_has_metaclass_p(VALUE sklass)
-{
-    return rb_attr_get(METACLASS_OF(sklass), id_attached) == sklass;
-}
-
-int
-rb_singleton_class_internal_p(VALUE sklass)
-{
-    return (RB_TYPE_P(rb_attr_get(sklass, id_attached), T_CLASS) &&
-	    !rb_singleton_class_has_metaclass_p(sklass));
-}
-
 /*!
  * whether k has a metaclass
  * @retval 1 if \a k has a metaclass
@@ -460,7 +449,7 @@ rb_singleton_class_internal_p(VALUE sklass)
  */
 #define HAVE_METACLASS_P(k) \
     (FL_TEST(METACLASS_OF(k), FL_SINGLETON) && \
-     rb_singleton_class_has_metaclass_p(k))
+     rb_ivar_get(METACLASS_OF(k), id_attached) == (k))
 
 /*!
  * ensures \a klass belongs to its own eigenclass.
@@ -547,11 +536,6 @@ Init_class_hierarchy(void)
 {
     rb_cBasicObject = boot_defclass("BasicObject", 0);
     rb_cObject = boot_defclass("Object", rb_cBasicObject);
-    rb_gc_register_mark_object(rb_cObject);
-
-    /* resolve class name ASAP for order-independence */
-    rb_class_name(rb_cObject);
-
     rb_cModule = boot_defclass("Module", rb_cObject);
     rb_cClass =  boot_defclass("Class",  rb_cModule);
 
@@ -631,12 +615,12 @@ rb_class_inherited(VALUE super, VALUE 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 TypeError if the class is already defined but the class can not
+ * \throw NameError if the class is already defined but the class can not
  *                  be reopened because its superclass is not \a super.
- * \throw ArgumentError if the \a super is NULL.
  * \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
@@ -652,8 +636,7 @@ rb_define_class(const char *name, VALUE super)
     if (rb_const_defined(rb_cObject, id)) {
 	klass = rb_const_get(rb_cObject, id);
 	if (!RB_TYPE_P(klass, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "%s is not a class (%"PRIsVALUE")",
-		     name, rb_obj_class(klass));
+	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
 	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
@@ -661,7 +644,7 @@ rb_define_class(const char *name, VALUE super)
 	return klass;
     }
     if (!super) {
-	rb_raise(rb_eArgError, "no super class for `%s'", name);
+	rb_warn("no super class for `%s', Object assumed", name);
     }
     klass = rb_define_class_id(id, super);
     rb_vm_add_root_module(id, klass);
@@ -682,7 +665,7 @@ rb_define_class(const char *name, VALUE super)
  * \return the created class
  * \throw TypeError if the constant name \a name is already taken but
  *                  the constant is not a \c Class.
- * \throw TypeError if the class is already defined but the class can not
+ * \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.
  *
@@ -705,7 +688,7 @@ rb_define_class_under(VALUE outer, const char *name, VALUE super)
  * \return the created class
  * \throw TypeError if the constant name \a name is already taken but
  *                  the constant is not a \c Class.
- * \throw TypeError if the class is already defined but the class can not
+ * \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.
  *
@@ -720,21 +703,16 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
     if (rb_const_defined_at(outer, id)) {
 	klass = rb_const_get_at(outer, id);
 	if (!RB_TYPE_P(klass, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a class"
-		     " (%"PRIsVALUE")",
-		     outer, rb_id2str(id), rb_obj_class(klass));
+	    rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_raise(rb_eTypeError, "superclass mismatch for class "
-		     "%"PRIsVALUE"::%"PRIsVALUE""
-		     " (%"PRIsVALUE" is given but was %"PRIsVALUE")",
-		     outer, rb_id2str(id), RCLASS_SUPER(klass), super);
+	    rb_name_error(id, "%s is already defined", rb_id2name(id));
 	}
 	return klass;
     }
     if (!super) {
-	rb_raise(rb_eArgError, "no super class for `%"PRIsVALUE"::%"PRIsVALUE"'",
-		 rb_class_path(outer), rb_id2str(id));
+	rb_warn("no super class for `%s::%s', Object assumed",
+		rb_class2name(outer), rb_id2name(id));
     }
     klass = rb_define_class_id(id, super);
     rb_set_class_path_string(klass, outer, rb_id2str(id));
@@ -773,11 +751,9 @@ rb_define_module(const char *name)
     id = rb_intern(name);
     if (rb_const_defined(rb_cObject, id)) {
 	module = rb_const_get(rb_cObject, id);
-	if (!RB_TYPE_P(module, T_MODULE)) {
-	    rb_raise(rb_eTypeError, "%s is not a module (%"PRIsVALUE")",
-		     name, rb_obj_class(module));
-	}
-	return module;
+	if (RB_TYPE_P(module, T_MODULE))
+	    return module;
+	rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
     }
     module = rb_define_module_id(id);
     rb_vm_add_root_module(id, module);
@@ -799,12 +775,10 @@ rb_define_module_id_under(VALUE outer, ID id)
 
     if (rb_const_defined_at(outer, id)) {
 	module = rb_const_get_at(outer, id);
-	if (!RB_TYPE_P(module, T_MODULE)) {
-	    rb_raise(rb_eTypeError, "%"PRIsVALUE"::%"PRIsVALUE" is not a module"
-		     " (%"PRIsVALUE")",
-		     outer, rb_id2str(id), rb_obj_class(module));
-	}
-	return module;
+	if (RB_TYPE_P(module, T_MODULE))
+	    return module;
+	rb_raise(rb_eTypeError, "%s::%s is not a module",
+		 rb_class2name(outer), rb_obj_classname(module));
     }
     module = rb_define_module_id(id);
     rb_const_set(outer, id, module);
@@ -826,13 +800,13 @@ rb_include_class_new(VALUE module, VALUE super)
 	RCLASS_IV_TBL(module) = st_init_numtable();
     }
     if (!RCLASS_CONST_TBL(module)) {
-	RCLASS_CONST_TBL(module) = rb_id_table_create(0);
+	RCLASS_CONST_TBL(module) = st_init_numtable();
     }
     RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
     RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
 
-    RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) =
-      RCLASS_M_TBL(OBJ_WB_UNPROTECT(RCLASS_ORIGIN(module))); /* TODO: unprotected? */
+    RCLASS_M_TBL_WRAPPER(OBJ_WB_UNPROTECT(klass)) =
+	RCLASS_M_TBL_WRAPPER(OBJ_WB_UNPROTECT(RCLASS_ORIGIN(module)));
 
     RCLASS_SET_SUPER(klass, super);
     if (RB_TYPE_P(module, T_ICLASS)) {
@@ -847,7 +821,7 @@ rb_include_class_new(VALUE module, VALUE super)
     return (VALUE)klass;
 }
 
-static int include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super);
+static int include_modules_at(const VALUE klass, VALUE c, VALUE module);
 
 void
 rb_include_module(VALUE klass, VALUE module)
@@ -855,31 +829,34 @@ rb_include_module(VALUE klass, VALUE module)
     int changed = 0;
 
     rb_frozen_class_p(klass);
-    Check_Type(module, T_MODULE);
+
+    if (!RB_TYPE_P(module, T_MODULE)) {
+	Check_Type(module, T_MODULE);
+    }
+
     OBJ_INFECT(klass, module);
 
-    changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module, TRUE);
+    changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module);
     if (changed < 0)
 	rb_raise(rb_eArgError, "cyclic include detected");
 }
 
-static enum rb_id_table_iterator_result
-add_refined_method_entry_i(ID key, VALUE value, void *data)
+static int
+add_refined_method_entry_i(st_data_t key, st_data_t value, st_data_t data)
 {
-    rb_add_refined_method_entry((VALUE)data, key);
-    return ID_TABLE_CONTINUE;
+    rb_add_refined_method_entry((VALUE) data, (ID) key);
+    return ST_CONTINUE;
 }
 
 static int
-include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
+include_modules_at(const VALUE klass, VALUE c, VALUE module)
 {
     VALUE p, iclass;
     int method_changed = 0, constant_changed = 0;
-    struct rb_id_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
+    const st_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
 
     while (module) {
 	int superclass_seen = FALSE;
-	struct rb_id_table *tbl;
 
 	if (RCLASS_ORIGIN(module) != module)
 	    goto skip;
@@ -887,42 +864,42 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
 	    return -1;
 	/* ignore if the module included already in superclasses */
 	for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
-	    int type = BUILTIN_TYPE(p);
-	    if (type == T_ICLASS) {
-		if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
+	    switch (BUILTIN_TYPE(p)) {
+	      case T_ICLASS:
+		if (RCLASS_M_TBL_WRAPPER(p) == RCLASS_M_TBL_WRAPPER(module)) {
 		    if (!superclass_seen) {
 			c = p;  /* move insertion point */
 		    }
 		    goto skip;
 		}
-	    }
-	    else if (type == T_CLASS) {
-		if (!search_super) break;
+		break;
+	      case T_CLASS:
 		superclass_seen = TRUE;
+		break;
 	    }
 	}
 	iclass = rb_include_class_new(module, RCLASS_SUPER(c));
 	c = RCLASS_SET_SUPER(c, iclass);
 
-	{
-	    VALUE m = module;
-	    if (BUILTIN_TYPE(m) == T_ICLASS) m = RBASIC(m)->klass;
-	    rb_module_add_to_subclasses_list(m, iclass);
+	if (BUILTIN_TYPE(module) == T_ICLASS) {
+	    rb_module_add_to_subclasses_list(RBASIC(module)->klass, iclass);
+	}
+	else {
+	    rb_module_add_to_subclasses_list(module, iclass);
 	}
 
 	if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
 	    VALUE refined_class =
 		rb_refinement_module_get_refined_class(klass);
 
-	    rb_id_table_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i, (void *)refined_class);
+	    st_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i,
+		       (st_data_t) refined_class);
 	    FL_SET(c, RMODULE_INCLUDED_INTO_REFINEMENT);
 	}
-
-	tbl = RMODULE_M_TBL(module);
-	if (tbl && rb_id_table_size(tbl)) method_changed = 1;
-
-	tbl = RMODULE_CONST_TBL(module);
-	if (tbl && rb_id_table_size(tbl)) constant_changed = 1;
+	if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
+	    method_changed = 1;
+	if (RMODULE_CONST_TBL(module) && RMODULE_CONST_TBL(module)->num_entries)
+	    constant_changed = 1;
       skip:
 	module = RCLASS_SUPER(module);
     }
@@ -933,41 +910,44 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module, int search_super)
     return method_changed;
 }
 
-static enum rb_id_table_iterator_result
-move_refined_method(ID key, VALUE value, void *data)
+static int
+move_refined_method(st_data_t key, st_data_t value, st_data_t data)
 {
     rb_method_entry_t *me = (rb_method_entry_t *) value;
-    VALUE klass = (VALUE)data;
-    struct rb_id_table *tbl = RCLASS_M_TBL(klass);
+    st_table *tbl = (st_table *) data;
 
     if (me->def->type == VM_METHOD_TYPE_REFINED) {
-	if (me->def->body.refined.orig_me) {
-	    const rb_method_entry_t *orig_me = me->def->body.refined.orig_me, *new_me;
-	    RB_OBJ_WRITE(me, &me->def->body.refined.orig_me, NULL);
-	    new_me = rb_method_entry_clone(me);
-	    rb_id_table_insert(tbl, key, (VALUE)new_me);
-	    RB_OBJ_WRITTEN(klass, Qundef, new_me);
-	    rb_method_entry_copy(me, orig_me);
-	    return ID_TABLE_CONTINUE;
+	if (me->def->body.orig_me) {
+	    rb_method_entry_t *orig_me = me->def->body.orig_me, *new_me;
+	    me->def->body.orig_me = NULL;
+	    new_me = ALLOC(rb_method_entry_t);
+	    *new_me = *me;
+	    st_add_direct(tbl, key, (st_data_t) new_me);
+	    *me = *orig_me;
+	    xfree(orig_me);
+	    return ST_CONTINUE;
 	}
 	else {
-	    rb_id_table_insert(tbl, key, (VALUE)me);
-	    return ID_TABLE_DELETE;
+	    st_add_direct(tbl, key, (st_data_t) me);
+	    return ST_DELETE;
 	}
     }
     else {
-	return ID_TABLE_CONTINUE;
+	return ST_CONTINUE;
     }
 }
 
 void
 rb_prepend_module(VALUE klass, VALUE module)
 {
+    void rb_vm_check_redefinition_by_prepend(VALUE klass);
     VALUE origin;
     int changed = 0;
 
     rb_frozen_class_p(klass);
+
     Check_Type(module, T_MODULE);
+
     OBJ_INFECT(klass, module);
 
     origin = RCLASS_ORIGIN(klass);
@@ -976,12 +956,13 @@ rb_prepend_module(VALUE klass, VALUE module)
 	OBJ_WB_UNPROTECT(origin); /* TODO: conservative shading. Need more survey. */
 	RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
 	RCLASS_SET_SUPER(klass, origin);
-	RCLASS_SET_ORIGIN(klass, origin);
-	RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
+	RCLASS_ORIGIN(klass) = origin;
+	RCLASS_M_TBL_WRAPPER(origin) = RCLASS_M_TBL_WRAPPER(klass);
 	RCLASS_M_TBL_INIT(klass);
-	rb_id_table_foreach(RCLASS_M_TBL(origin), move_refined_method, (void *)klass);
+	st_foreach(RCLASS_M_TBL(origin), move_refined_method,
+		   (st_data_t) RCLASS_M_TBL(klass));
     }
-    changed = include_modules_at(klass, klass, module, FALSE);
+    changed = include_modules_at(klass, klass, module);
     if (changed < 0)
 	rb_raise(rb_eArgError, "cyclic prepend detected");
     if (changed) {
@@ -1090,81 +1071,75 @@ rb_mod_ancestors(VALUE mod)
     return ary;
 }
 
-static void
-ins_methods_push(st_data_t name, st_data_t ary)
-{
-    rb_ary_push((VALUE)ary, ID2SYM((ID)name));
-}
+#define VISI(x) ((x)&NOEX_MASK)
+#define VISI_CHECK(x,f) (VISI(x) == (f))
 
 static int
-ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
+ins_methods_push(ID name, long type, VALUE ary, long visi)
 {
-    switch ((rb_method_visibility_t)type) {
-      case METHOD_VISI_UNDEF:
-      case METHOD_VISI_PRIVATE:
+    if (type == -1) return ST_CONTINUE;
+
+    switch (visi) {
+      case NOEX_PRIVATE:
+      case NOEX_PROTECTED:
+      case NOEX_PUBLIC:
+	visi = (type == visi);
 	break;
-      default: /* everything but private */
-	ins_methods_push(name, ary);
+      default:
+	visi = (type != NOEX_PRIVATE);
 	break;
     }
+    if (visi) {
+	rb_ary_push(ary, ID2SYM(name));
+    }
     return ST_CONTINUE;
 }
 
 static int
+ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
+{
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, -1); /* everything but private */
+}
+
+static int
 ins_methods_prot_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    if ((rb_method_visibility_t)type == METHOD_VISI_PROTECTED) {
-	ins_methods_push(name, ary);
-    }
-    return ST_CONTINUE;
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PROTECTED);
 }
 
 static int
 ins_methods_priv_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    if ((rb_method_visibility_t)type == METHOD_VISI_PRIVATE) {
-	ins_methods_push(name, ary);
-    }
-    return ST_CONTINUE;
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PRIVATE);
 }
 
 static int
 ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    if ((rb_method_visibility_t)type == METHOD_VISI_PUBLIC) {
-	ins_methods_push(name, ary);
-    }
-    return ST_CONTINUE;
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PUBLIC);
 }
 
-struct method_entry_arg {
-    st_table *list;
-    int recur;
-};
-
-static enum rb_id_table_iterator_result
-method_entry_i(ID key, VALUE value, void *data)
+static int
+method_entry_i(st_data_t key, st_data_t value, st_data_t data)
 {
     const rb_method_entry_t *me = (const rb_method_entry_t *)value;
-    struct method_entry_arg *arg = (struct method_entry_arg *)data;
-    rb_method_visibility_t type;
+    st_table *list = (st_table *)data;
+    long type;
 
-    if (me->def->type == VM_METHOD_TYPE_REFINED) {
-	VALUE owner = me->owner;
-	me = rb_resolve_refined_method(Qnil, me);
-	if (!me) return ID_TABLE_CONTINUE;
-	if (!arg->recur && me->owner != owner) return ID_TABLE_CONTINUE;
+    if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
+	me = rb_resolve_refined_method(Qnil, me, NULL);
+	if (!me) return ST_CONTINUE;
     }
-    if (!st_lookup(arg->list, key, 0)) {
+    if (!st_lookup(list, key, 0)) {
 	if (UNDEFINED_METHOD_ENTRY_P(me)) {
-	    type = METHOD_VISI_UNDEF; /* none */
+	    type = -1; /* none */
 	}
 	else {
-	    type = METHOD_ENTRY_VISI(me);
+	    type = VISI(me->flag);
 	}
-	st_add_direct(arg->list, key, (st_data_t)type);
+	st_add_direct(list, key, type);
     }
-    return ID_TABLE_CONTINUE;
+    return ST_CONTINUE;
 }
 
 static VALUE
@@ -1172,7 +1147,7 @@ class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int
 {
     VALUE ary;
     int recur, prepended = 0;
-    struct method_entry_arg me_arg;
+    st_table *list;
 
     if (argc == 0) {
 	recur = TRUE;
@@ -1188,17 +1163,16 @@ class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int
 	prepended = 1;
     }
 
-    me_arg.list = st_init_numtable();
-    me_arg.recur = recur;
+    list = st_init_numtable();
     for (; mod; mod = RCLASS_SUPER(mod)) {
-	if (RCLASS_M_TBL(mod)) rb_id_table_foreach(RCLASS_M_TBL(mod), method_entry_i, &me_arg);
+	if (RCLASS_M_TBL(mod)) st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)list);
 	if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
 	if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
 	if (!recur) break;
     }
     ary = rb_ary_new();
-    st_foreach(me_arg.list, func, ary);
-    st_free_table(me_arg.list);
+    st_foreach(list, func, ary);
+    st_free_table(list);
 
     return ary;
 }
@@ -1411,8 +1385,7 @@ VALUE
 rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
 {
     VALUE recur, ary, klass, origin;
-    struct method_entry_arg me_arg;
-    struct rb_id_table *mtbl;
+    st_table *list, *mtbl;
 
     if (argc == 0) {
 	recur = Qtrue;
@@ -1422,21 +1395,22 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
     }
     klass = CLASS_OF(obj);
     origin = RCLASS_ORIGIN(klass);
-    me_arg.list = st_init_numtable();
-    me_arg.recur = RTEST(recur);
+    list = st_init_numtable();
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	if ((mtbl = RCLASS_M_TBL(origin)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
+	if ((mtbl = RCLASS_M_TBL(origin)) != 0)
+	    st_foreach(mtbl, method_entry_i, (st_data_t)list);
 	klass = RCLASS_SUPER(klass);
     }
     if (RTEST(recur)) {
 	while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
-	    if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0) rb_id_table_foreach(mtbl, method_entry_i, &me_arg);
+	    if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0)
+		st_foreach(mtbl, method_entry_i, (st_data_t)list);
 	    klass = RCLASS_SUPER(klass);
 	}
     }
     ary = rb_ary_new();
-    st_foreach(me_arg.list, ins_methods_i, ary);
-    st_free_table(me_arg.list);
+    st_foreach(list, ins_methods_i, ary);
+    st_free_table(list);
 
     return ary;
 }
@@ -1501,48 +1475,31 @@ rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
 void
 rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc(klass, mid, func, argc, METHOD_VISI_PUBLIC);
+    rb_add_method_cfunc(klass, mid, func, argc, NOEX_PUBLIC);
 }
 
 void
 rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PUBLIC);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
 }
 
 void
 rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PROTECTED);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PROTECTED);
 }
 
 void
 rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method_cfunc(klass, rb_intern(name), func, argc, METHOD_VISI_PRIVATE);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PRIVATE);
 }
 
 void
 rb_undef_method(VALUE klass, const char *name)
 {
-    rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, METHOD_VISI_UNDEF);
-}
-
-static enum rb_id_table_iterator_result
-undef_method_i(ID name, VALUE value, void *data)
-{
-    VALUE klass = (VALUE)data;
-    rb_add_method(klass, name, VM_METHOD_TYPE_UNDEF, 0, METHOD_VISI_UNDEF);
-    return ID_TABLE_CONTINUE;
-}
-
-void
-rb_undef_methods_from(VALUE klass, VALUE super)
-{
-    struct rb_id_table *mtbl = RCLASS_M_TBL(super);
-    if (mtbl) {
-	rb_id_table_foreach(mtbl, undef_method_i, (void *)klass);
-    }
+    rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, NOEX_UNDEF);
 }
 
 /*!
@@ -1588,8 +1545,7 @@ singleton_class_of(VALUE obj)
 {
     VALUE klass;
 
-    if (FIXNUM_P(obj) || FLONUM_P(obj) || STATIC_SYM_P(obj)) {
-      no_singleton:
+    if (FIXNUM_P(obj) || FLONUM_P(obj) || SYMBOL_P(obj)) {
 	rb_raise(rb_eTypeError, "can't define singleton");
     }
     if (SPECIAL_CONST_P(obj)) {
@@ -1599,21 +1555,16 @@ singleton_class_of(VALUE obj)
 	return klass;
     }
     else {
-	switch (BUILTIN_TYPE(obj)) {
-	  case T_FLOAT: case T_BIGNUM: case T_SYMBOL:
-	    goto no_singleton;
-	  case T_STRING:
-	    if (FL_TEST_RAW(obj, RSTRING_FSTR)) goto no_singleton;
-	    break;
+	enum ruby_value_type type = BUILTIN_TYPE(obj);
+	if (type == T_FLOAT || type == T_BIGNUM) {
+	    rb_raise(rb_eTypeError, "can't define singleton");
 	}
     }
 
     klass = RBASIC(obj)->klass;
     if (!(FL_TEST(klass, FL_SINGLETON) &&
 	  rb_ivar_get(klass, id_attached) == obj)) {
-	rb_serial_t serial = RCLASS_SERIAL(klass);
 	klass = rb_make_metaclass(obj, klass);
-	RCLASS_SERIAL(klass) = serial;
     }
 
     if (OBJ_TAINTED(obj)) {
@@ -1622,24 +1573,11 @@ singleton_class_of(VALUE obj)
     else {
 	FL_UNSET(klass, FL_TAINT);
     }
-    RB_FL_SET_RAW(klass, RB_OBJ_FROZEN_RAW(obj));
+    if (OBJ_FROZEN(obj)) OBJ_FREEZE_RAW(klass);
 
     return klass;
 }
 
-void
-rb_freeze_singleton_class(VALUE x)
-{
-    /* should not propagate to meta-meta-class, and so on */
-    if (!(RBASIC(x)->flags & FL_SINGLETON)) {
-	VALUE klass = RBASIC_CLASS(x);
-	if (klass && (klass = RCLASS_ORIGIN(klass)) != 0 &&
-	    FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
-	    OBJ_FREEZE_RAW(klass);
-	}
-    }
-}
-
 /*!
  * Returns the singleton class of \a obj, or nil if obj is not a
  * singleton object.
@@ -1665,7 +1603,7 @@ rb_singleton_class_get(VALUE obj)
  * Returns the singleton class of \a obj. Creates it if necessary.
  *
  * \param obj an arbitrary object.
- * \throw TypeError if \a obj is a Integer or a Symbol.
+ * \throw TypeError if \a obj is a Fixnum or a Symbol.
  * \return the singleton class.
  *
  * \post \a obj has its own singleton class.
@@ -1769,142 +1707,15 @@ rb_define_attr(VALUE klass, const char *name, int read, int write)
 int
 rb_obj_basic_to_s_p(VALUE obj)
 {
-    const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"));
+    const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"), 0);
     if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC &&
 	me->def->body.cfunc.func == rb_any_to_s)
 	return 1;
     return 0;
 }
 
-VALUE
-rb_keyword_error_new(const char *error, VALUE keys)
-{
-    const char *msg = "";
-    VALUE error_message;
-
-    if (RARRAY_LEN(keys) == 1) {
-	keys = RARRAY_AREF(keys, 0);
-    }
-    else {
-	keys = rb_ary_join(keys, rb_usascii_str_new2(", "));
-	msg = "s";
-    }
-
-    error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys);
-
-    return rb_exc_new_str(rb_eArgError, error_message);
-}
-
-NORETURN(static void rb_keyword_error(const char *error, VALUE keys));
-static void
-rb_keyword_error(const char *error, VALUE keys)
-{
-    rb_exc_raise(rb_keyword_error_new(error, keys));
-}
-
-NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords));
-static void
-unknown_keyword_error(VALUE hash, const ID *table, int keywords)
-{
-    st_table *tbl = rb_hash_tbl_raw(hash);
-    VALUE keys;
-    int i;
-    for (i = 0; i < keywords; i++) {
-	st_data_t key = ID2SYM(table[i]);
-	st_delete(tbl, &key, NULL);
-    }
-    keys = rb_funcallv(hash, rb_intern("keys"), 0, 0);
-    if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
-    rb_keyword_error("unknown", keys);
-}
-
-static int
-separate_symbol(st_data_t key, st_data_t value, st_data_t arg)
-{
-    VALUE *kwdhash = (VALUE *)arg;
-
-    if (!SYMBOL_P(key)) kwdhash++;
-    if (!*kwdhash) *kwdhash = rb_hash_new();
-    rb_hash_aset(*kwdhash, (VALUE)key, (VALUE)value);
-    return ST_CONTINUE;
-}
-
-VALUE
-rb_extract_keywords(VALUE *orighash)
-{
-    VALUE parthash[2] = {0, 0};
-    VALUE hash = *orighash;
-
-    if (RHASH_EMPTY_P(hash)) {
-	*orighash = 0;
-	return hash;
-    }
-    st_foreach(rb_hash_tbl_raw(hash), separate_symbol, (st_data_t)&parthash);
-    *orighash = parthash[1];
-    return parthash[0];
-}
-
-int
-rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values)
-{
-    int i = 0, j;
-    int rest = 0;
-    VALUE missing = Qnil;
-    st_data_t key;
-
-#define extract_kwarg(keyword, val) \
-    (key = (st_data_t)(keyword), values ? \
-     st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : \
-     st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
-
-    if (NIL_P(keyword_hash)) keyword_hash = 0;
-
-    if (optional < 0) {
-	rest = 1;
-	optional = -1-optional;
-    }
-    if (values) {
-	for (j = 0; j < required + optional; j++) {
-	    values[j] = Qundef;
-	}
-    }
-    if (required) {
-	for (; i < required; i++) {
-	    VALUE keyword = ID2SYM(table[i]);
-	    if (keyword_hash) {
-		st_data_t val;
-		if (extract_kwarg(keyword, &val)) {
-		    if (values) values[i] = (VALUE)val;
-		    continue;
-		}
-	    }
-	    if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
-	    rb_ary_push(missing, keyword);
-	}
-	if (!NIL_P(missing)) {
-	    rb_keyword_error("missing", missing);
-	}
-    }
-    j = i;
-    if (optional && keyword_hash) {
-	for (i = 0; i < optional; i++) {
-	    st_data_t val;
-	    if (extract_kwarg(ID2SYM(table[required+i]), &val)) {
-		if (values) values[required+i] = (VALUE)val;
-		j++;
-	    }
-	}
-    }
-    if (!rest && keyword_hash) {
-	if (RHASH_SIZE(keyword_hash) > (unsigned int)(values ? 0 : j)) {
-	    unknown_keyword_error(keyword_hash, table, required+optional);
-	}
-    }
-    return j;
-#undef extract_kwarg
-}
+#include <stdarg.h>
 
-#undef rb_scan_args
 int
 rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 {
@@ -1923,16 +1734,22 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
 	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++;
+	}
     }
-    if (ISDIGIT(*p)) {
-	n_trail = *p - '0';
-	p++;
-    }
+  block_arg:
     if (*p == ':') {
 	f_hash = 1;
 	p++;
@@ -2032,10 +1849,119 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
     return argc;
 }
 
+NORETURN(static void keyword_error(const char *error, VALUE keys));
+static void
+keyword_error(const char *error, VALUE keys)
+{
+    const char *msg = "";
+    if (RARRAY_LEN(keys) == 1) {
+	keys = RARRAY_AREF(keys, 0);
+    }
+    else {
+	keys = rb_ary_join(keys, rb_usascii_str_new2(", "));
+	msg = "s";
+    }
+    rb_raise(rb_eArgError, "%s keyword%s: %"PRIsVALUE, error, msg, keys);
+}
+
+NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords));
+static void
+unknown_keyword_error(VALUE hash, const ID *table, int keywords)
+{
+    VALUE keys;
+    int i;
+    for (i = 0; i < keywords; i++) {
+	rb_hash_delete(hash, ID2SYM(table[i]));
+    }
+    keys = rb_funcall(hash, rb_intern("keys"), 0, 0);
+    if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
+    keyword_error("unknown", keys);
+}
+
+static int
+separate_symbol(st_data_t key, st_data_t value, st_data_t arg)
+{
+    VALUE *kwdhash = (VALUE *)arg;
+
+    if (!SYMBOL_P(key)) kwdhash++;
+    if (!*kwdhash) *kwdhash = rb_hash_new();
+    rb_hash_aset(*kwdhash, (VALUE)key, (VALUE)value);
+    return ST_CONTINUE;
+}
+
+VALUE
+rb_extract_keywords(VALUE *orighash)
+{
+    VALUE parthash[2] = {0, 0};
+    VALUE hash = *orighash;
+
+    if (RHASH_EMPTY_P(hash)) {
+	*orighash = 0;
+	return hash;
+    }
+    st_foreach(rb_hash_tbl_raw(hash), separate_symbol, (st_data_t)&parthash);
+    *orighash = parthash[1];
+    return parthash[0];
+}
+
 int
-rb_class_has_methods(VALUE c)
+rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values)
 {
-    return rb_id_table_size(RCLASS_M_TBL(c)) == 0 ? FALSE : TRUE;
+    int i = 0, j;
+    int rest = 0;
+    VALUE missing = Qnil;
+    st_data_t key;
+
+#define extract_kwarg(keyword, val) \
+    (key = (st_data_t)(keyword), values ? \
+     st_delete(rb_hash_tbl_raw(keyword_hash), &key, (val)) : \
+     st_lookup(rb_hash_tbl_raw(keyword_hash), key, (val)))
+
+    if (NIL_P(keyword_hash)) keyword_hash = 0;
+
+    if (optional < 0) {
+	rest = 1;
+	optional = -1-optional;
+    }
+    if (values) {
+	for (j = 0; j < required + optional; j++) {
+	    values[j] = Qundef;
+	}
+    }
+    if (required) {
+	for (; i < required; i++) {
+	    VALUE keyword = ID2SYM(table[i]);
+	    if (keyword_hash) {
+		st_data_t val;
+		if (extract_kwarg(keyword, &val)) {
+		    if (values) values[i] = (VALUE)val;
+		    continue;
+		}
+	    }
+	    if (NIL_P(missing)) missing = rb_ary_tmp_new(1);
+	    rb_ary_push(missing, keyword);
+	}
+	if (!NIL_P(missing)) {
+	    keyword_error("missing", missing);
+	}
+    }
+    j = i;
+    if (optional && keyword_hash) {
+	for (i = 0; i < optional; i++) {
+	    st_data_t val;
+	    if (extract_kwarg(ID2SYM(table[required+i]), &val)) {
+		if (values) values[required+i] = (VALUE)val;
+		j++;
+	    }
+	}
+    }
+    if (!rest && keyword_hash) {
+	if (RHASH_SIZE(keyword_hash) > (unsigned int)j) {
+	    unknown_keyword_error(keyword_hash, table, required+optional);
+	}
+    }
+    return j;
+#undef extract_kwarg
 }
 
 /*!
diff --git a/common.mk b/common.mk
index 3f4bcf6c3a..2c8f914ccf 100644
--- a/common.mk
+++ b/common.mk
@@ -8,74 +8,41 @@ dll: $(LIBRUBY_SO)
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO0 = $(ECHO1:0=echo)
-ECHO = @$(ECHO0)
-
-UNICODE_VERSION = 9.0.0
-
-### set the following environment variable or uncomment the line if
-### the Unicode data files should be updated completely on every update ('make up',...).
-# ALWAYS_UPDATE_UNICODE = yes
-UNICODE_DATA_DIR = enc/unicode/data/$(UNICODE_VERSION)
-UNICODE_SRC_DATA_DIR = $(srcdir)/$(UNICODE_DATA_DIR)
-UNICODE_HDR_DIR = $(srcdir)/enc/unicode/$(UNICODE_VERSION)
-UNICODE_DATA_HEADERS = \
-	$(UNICODE_HDR_DIR)/casefold.h \
-	$(UNICODE_HDR_DIR)/name2ctype.h \
-	$(empty)
-
-RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY)
+ECHO = $(ECHO1:0=@echo)
+
 RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
-
-GEM_HOME =
-GEM_PATH =
-GEM_VENDOR =
-
-SPEC_GIT_BASE = git://github.com/ruby
+SPEC_GIT_BASE = git://github.com/nurse
 MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
-RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/spec.git
+RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
 
-SIMPLECOV_GIT_URL = git://github.com/colszowka/simplecov.git
-SIMPLECOV_GIT_REF = v0.10.0
-SIMPLECOV_HTML_GIT_URL = git://github.com/colszowka/simplecov-html.git
-SIMPLECOV_HTML_GIT_REF = v0.10.0
-DOCLIE_GIT_URL = git://github.com/ms-ati/docile.git
-DOCLIE_GIT_REF = v1.1.5
+SIMPLECOV_GIT_URL = git://github.com/hsbt/simplecov.git
 
 STATIC_RUBY   = static-ruby
 
-TIMESTAMPDIR  = $(EXTOUT)/.timestamp
 EXTCONF       = extconf.rb
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
 REVISION_H    = ./.revision.time
-PLATFORM_D    = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time
-ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
+PLATFORM_D    = ./$(PLATFORM_DIR)/.time
 RDOCOUT       = $(EXTOUT)/rdoc
-HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
 
-INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
+DMYEXT	      = dmyext.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
-DLDOBJS	      = $(INITOBJS)
+EXTOBJS	      =
+DLDOBJS	      = $(DMYEXT)
 EXTSOLIBS     =
-MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT) miniprelude.$(OBJEXT)
+MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT)
 ENC_MK        = enc.mk
-MAKE_ENC      = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
-		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS)
 
 COMMONOBJS    = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
-		compile.$(OBJEXT) \
 		complex.$(OBJEXT) \
-		cont.$(OBJEXT) \
-		debug.$(OBJEXT) \
 		dir.$(OBJEXT) \
 		dln_find.$(OBJEXT) \
 		encoding.$(OBJEXT) \
@@ -83,13 +50,13 @@ COMMONOBJS    = array.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
 		eval.$(OBJEXT) \
+		load.$(OBJEXT) \
+		proc.$(OBJEXT) \
 		file.$(OBJEXT) \
 		gc.$(OBJEXT) \
 		hash.$(OBJEXT) \
 		inits.$(OBJEXT) \
 		io.$(OBJEXT) \
-		iseq.$(OBJEXT) \
-		load.$(OBJEXT) \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
 		node.$(OBJEXT) \
@@ -97,7 +64,6 @@ COMMONOBJS    = array.$(OBJEXT) \
 		object.$(OBJEXT) \
 		pack.$(OBJEXT) \
 		parse.$(OBJEXT) \
-		proc.$(OBJEXT) \
 		process.$(OBJEXT) \
 		random.$(OBJEXT) \
 		range.$(OBJEXT) \
@@ -118,17 +84,20 @@ COMMONOBJS    = array.$(OBJEXT) \
 		string.$(OBJEXT) \
 		struct.$(OBJEXT) \
 		symbol.$(OBJEXT) \
-		thread.$(OBJEXT) \
 		time.$(OBJEXT) \
 		transcode.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
 		version.$(OBJEXT) \
+		compile.$(OBJEXT) \
+		debug.$(OBJEXT) \
+		iseq.$(OBJEXT) \
 		vm.$(OBJEXT) \
-		vm_backtrace.$(OBJEXT) \
 		vm_dump.$(OBJEXT) \
+		vm_backtrace.$(OBJEXT) \
 		vm_trace.$(OBJEXT) \
-		$(DTRACE_OBJ) \
+		thread.$(OBJEXT) \
+		cont.$(OBJEXT) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
@@ -139,23 +108,22 @@ EXPORTOBJS    = $(DLNOBJ) \
 		$(COMMONOBJS)
 
 OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
-ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
+ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
 
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
 DEFAULT_PRELUDES = $(GEM_PRELUDE)
 PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
-GEM_PRELUDE   = $(srcdir)/gem_prelude.rb
-PRELUDES      = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
-GOLFPRELUDES  = {$(srcdir)}golf_prelude.c
+GEM_PRELUDE = $(srcdir)/gem_prelude.rb
+PRELUDES      = prelude.c miniprelude.c
+GOLFPRELUDES = golf_prelude.c
 
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
 		--mflags="$(MFLAGS)" \
 		--make-flags="$(MAKEFLAGS)"
 EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
-		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \
-		--gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \
+		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --gnumake=$(gnumake) \
 		--
 INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
@@ -170,24 +138,21 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
 			$(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE)
 
 TESTSDIR      = $(srcdir)/test
-TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/
-EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/
 TESTWORKDIR   = testwork
-TESTOPTS      = $(RUBY_TESTOPTS)
 
 TESTRUN_SCRIPT = $(srcdir)/test.rb
 
-COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
+BOOTSTRAPRUBY = $(BASERUBY)
 
-SHOWFLAGS = showflags
+COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
 
-all: $(SHOWFLAGS) main docs
+all: showflags main docs
 
-main: $(SHOWFLAGS) exts $(ENCSTATIC:static=lib)encs
+main: showflags $(ENCSTATIC:static=lib)encs exts
 	@$(NULLCMD)
 
 .PHONY: showflags
-exts enc trans: $(SHOWFLAGS)
+exts enc trans: showflags
 showflags:
 	$(MESSAGE_BEGIN) \
 	"	CC = $(CC)" \
@@ -210,21 +175,20 @@ showconfig:
 exts: build-ext
 
 EXTS_MK = exts.mk
-$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY) $(TIMESTAMPDIR)/.$(arch).time
+$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
 	$(ECHO) generating makefile $@
 	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
 
 configure-ext: $(EXTS_MK)
 
 build-ext: $(EXTS_MK)
-	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
-	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
+	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)"
 
 prog: program wprogram
 
 $(PREP): $(MKFILES)
 
-miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
+miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE) $(DTRACE_OBJ)
 
 objs: $(ALLOBJS)
 
@@ -244,13 +208,13 @@ Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb
 	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
 	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
 
-program: $(SHOWFLAGS) $(PROGRAM)
-wprogram: $(SHOWFLAGS) $(WPROGRAM)
+program: showflags $(PROGRAM)
+wprogram: showflags $(WPROGRAM)
 mini: PHONY miniruby$(EXEEXT)
 
 $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
 
-$(LIBRUBY_A):	$(LIBRUBY_A_OBJS) $(MAINOBJ) $(INITOBJS) $(ARCHFILE)
+$(LIBRUBY_A):	$(OBJS) $(MAINOBJ) $(DTRACE_OBJ) $(DTRACE_GLOMMED_OBJ) $(DMYEXT) $(ARCHFILE)
 
 $(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
 
@@ -263,7 +227,7 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
 
 ruby.imp: $(COMMONOBJS)
 	$(Q)$(NM) -Pgp $(COMMONOBJS) | \
-	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|ruby_static_id_|.*_threadptr_|\.)/{print $$1}' | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
 	sort -u -o $@
 
 install: install-$(INSTALLDOC)
@@ -458,10 +422,6 @@ rdoc: PHONY main
 	@echo Generating RDoc documentation
 	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
 
-html: PHONY main
-	@echo Generating RDoc HTML files
-	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --op "$(HTMLOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
-
 rdoc-coverage: PHONY main
 	@echo Generating RDoc coverage report
 	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
@@ -493,13 +453,12 @@ install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-clean: clean-ext clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-local clean-platform
+clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
 clean-local:: clean-runnable
 	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
-	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
-	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb bisect.sh $(ENC_TRANS_D)
-	-$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || exit 0
+	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
 clean-runnable:: PHONY
 	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || exit 0
 	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || exit 0
@@ -508,61 +467,44 @@ clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
 clean-rdoc: PHONY
-clean-html: PHONY
 clean-capi: PHONY
 clean-platform: PHONY
 clean-extout: PHONY
 	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
-clean-docs: clean-rdoc clean-html clean-capi
+clean-docs: clean-rdoc clean-capi
 
-distclean: distclean-ext distclean-enc distclean-golf distclean-extout distclean-local distclean-platform
+distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
 distclean-local:: clean-local
-	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(PRELUDES)
+	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc
 	$(Q)$(RM) config.cache config.status config.status.lineno
 	$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
-	-$(Q)$(RMALL) $(srcdir)/autom4te.cache
 distclean-ext:: PHONY
 distclean-golf: clean-golf
+	$(Q)$(RM) $(GOLFPRELUDES)
 distclean-rdoc: PHONY
-distclean-html: PHONY
 distclean-capi: PHONY
 distclean-extout: clean-extout
 distclean-platform: clean-platform
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c enc/trans/newline.c revision.h
-	$(Q)$(RM) id.c id.h probes.dmyh
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c enc/trans/newline.c $(PRELUDES) revision.h
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) id.c id.h probes.dmyh
-	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure aclocal.m4 tool/config.guess tool/config.sub gems/*.gem
+	$(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
 realclean-ext:: PHONY
 realclean-golf: distclean-golf
-	$(Q)$(RM) $(GOLFPRELUDES)
 realclean-capi: PHONY
 realclean-extout: distclean-extout
 
 clean-ext distclean-ext realclean-ext::
 	$(Q)$(RM) $(EXTS_MK)
-	$(Q)$(RM) $(TIMESTAMPDIR)/.*.time $(TIMESTAMPDIR)/.$(arch).time $(TIMESTAMPDIR)/$(arch)/.time
-	$(Q)$(RMDIR) $(TIMESTAMPDIR)/$(arch) $(TIMESTAMPDIR) 2> $(NULL) || exit 0
+	$(Q)$(RM) $(EXTOUT)/.timestamp/.*.time
+	$(Q)$(RMDIR) $(EXTOUT)/.timestamp 2> $(NULL) || exit 0
 
 clean-enc distclean-enc realclean-enc: PHONY
 
-clean-enc: clean-enc.d
-
-clean-enc.d: PHONY
-	$(Q)$(RM) $(ENC_TRANS_D)
-	-$(Q) $(RMDIR) enc/jis enc/trans enc 2> $(NULL) || exit 0
-
 clean-rdoc distclean-rdoc realclean-rdoc:
 	@echo $(@:-rdoc=ing) rdoc
 	$(Q)$(RMALL) $(RDOCOUT)
 
-clean-html distclean-html realclean-html:
-	@echo $(@:-html=ing) HTML
-	$(Q)$(RMALL) $(HTMLOUT)
-
 clean-capi distclean-capi realclean-capi:
 	@echo $(@:-capi=ing) capi
 	$(Q)$(RMALL) $(CAPIOUT)
@@ -571,93 +513,62 @@ clean-platform:
 	$(Q) $(RM) $(PLATFORM_D)
 	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
 
-check: main test test-testframework test-almost
+check: main test test-all
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
 
 fake: $(CROSS_COMPILING)-fake
 yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
-no-fake -fake: PHONY
-
-# really doesn't depend on .o, just ensure newer than headers which
-# version.o depends on.
-$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT)
-	$(ECHO) generating $@
-	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \
-	$(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \
-		i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)"
+no-fake: PHONY
 
 btest: $(TEST_RUNNABLE)-btest
 no-btest: PHONY
 yes-btest: fake miniruby$(EXEEXT) PHONY
-	$(Q)$(exec) $(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS)
+	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS)
 
 btest-ruby: $(TEST_RUNNABLE)-btest-ruby
 no-btest-ruby: PHONY
 yes-btest-ruby: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS)
+	$(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS)
 
-test-basic: $(TEST_RUNNABLE)-test-basic
-no-test-basic: PHONY
-yes-test-basic: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/basictest/runner.rb" --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS)
+test-sample: $(TEST_RUNNABLE)-test-sample
+no-test-sample: PHONY
+yes-test-sample: prog PHONY
+	$(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS)
 
 test-knownbugs: test-knownbug
 test-knownbug: $(TEST_RUNNABLE)-test-knownbug
 no-test-knownbug: PHONY
 yes-test-knownbug: prog PHONY
-	-$(exec) $(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb
+	-$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb
 
-test-testframework: $(TEST_RUNNABLE)-test-testframework
-yes-test-testframework: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) testunit minitest
-no-test-testframework: PHONY
+test: test-sample btest-ruby test-knownbug
 
-test-sample: test-basic # backward compatibility for mswin-build
-test: btest-ruby test-knownbug test-basic
-
-# $ make test-all TESTOPTS="--help" displays more detail
-# for example, make test-all TESTOPTS="-j2 -v -n test-name -- test-file-name"
 test-all: $(TEST_RUNNABLE)-test-all
 yes-test-all: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(TESTS)
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
 	$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
 
-test-almost: $(TEST_RUNNABLE)-test-almost
-yes-test-almost: prog PHONY
-	$(Q)$(exec) $(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TEST_EXCLUDES) $(TESTOPTS) $(EXCLUDE_TESTFRAMEWORK) $(TESTS)
-no-test-almost: PHONY
-
 test-ruby: $(TEST_RUNNABLE)-test-ruby
 no-test-ruby: PHONY
 yes-test-ruby: prog encs PHONY
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TEST_EXCLUDES) $(TESTOPTS) -- ruby -ext-
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTOPTS) -- ruby -ext-
 
 extconf: $(PREP)
 	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
-	$(Q)$(BOOTSTRAPRUBY) -n \
-	-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
-	-e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \
-	-e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \
-	$(UNICODE_VERSION) $(UNICODE_DATA_HEADERS)
-	$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \
-		-cross_compiling=$(CROSS_COMPILING) \
-		-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
+$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
+	$(Q)$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
 		-install_name=$(RUBY_INSTALL_NAME) \
-		-so_name=$(RUBY_SO_NAME) \
-		-unicode_version=$(UNICODE_VERSION) \
-	> rbconfig.tmp
-	$(IFCHANGE) "--timestamp=$@" rbconfig.rb rbconfig.tmp
+		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
 test-rubyspec-precheck:
 
-test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb
-	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+test-rubyspec: test-rubyspec-precheck
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
@@ -666,28 +577,30 @@ yes-runnable: PHONY
 
 encs: enc trans
 libencs: libenc libtrans
-encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
+encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
 	$(ECHO) making $@
-	$(Q) $(MAKE) $(MAKE_ENC) $@
+	$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
+		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
+		$(MFLAGS) $@
 
 
 libenc enc: {$(VPATH)}encdb.h
 libtrans trans: {$(VPATH)}transdb.h
 
 $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
-	$(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake
+	$(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG)
 	$(ECHO) generating $@
-	$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@
+	$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $@ $(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-html clean-extout
+.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-basic test-knownbug
+.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
 
@@ -707,40 +620,40 @@ PHONY:
 	$(Q)$(RM) y.tab.c y.tab.h
 
 $(PLATFORM_D):
-	$(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D)
-	@exit > $@
-
-$(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D)
-
-$(ENC_TRANS_D):
-	$(Q) $(MAKEDIRS) enc/trans $(@D)
-	@exit > $@
-
-$(TIMESTAMPDIR)/.$(arch).time:
-	$(Q)$(MAKEDIRS) $(@D) $(TIMESTAMPDIR)/$(arch)
+	$(Q) $(MAKEDIRS) $(PLATFORM_DIR)
 	@exit > $@
 
 ###
 CCAN_DIR = {$(VPATH)}ccan
+CCAN_LIST_INCLUDES = $(CCAN_DIR)/build_assert/build_assert.h \
+			$(CCAN_DIR)/check_type/check_type.h \
+			$(CCAN_DIR)/container_of/container_of.h \
+			$(CCAN_DIR)/list/list.h \
+			$(CCAN_DIR)/str/str.h
 
 RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
 		     {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
 		     {$(VPATH)}subst.h
+ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
+PROBES_H_INCLUDES  = {$(VPATH)}probes.h
+VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
+		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
+	             {$(VPATH)}vm_debug.h {$(VPATH)}id.h {$(VPATH)}thread_native.h \
+	             $(CCAN_LIST_INCLUDES)
 
 ###
 
 acosh.$(OBJEXT): {$(VPATH)}acosh.c
 alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
-crypt.$(OBJEXT): {$(VPATH)}crypt.c {$(VPATH)}crypt.h {$(VPATH)}missing/des_tables.c
+crypt.$(OBJEXT): {$(VPATH)}crypt.c
 dup2.$(OBJEXT): {$(VPATH)}dup2.c
 erf.$(OBJEXT): {$(VPATH)}erf.c
-explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c
 finite.$(OBJEXT): {$(VPATH)}finite.c
 flock.$(OBJEXT): {$(VPATH)}flock.c
 memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
 memmove.$(OBJEXT): {$(VPATH)}memmove.c
 mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
+setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(hdrdir)/ruby.h
 strchr.$(OBJEXT): {$(VPATH)}strchr.c
 strdup.$(OBJEXT): {$(VPATH)}strdup.c
 strerror.$(OBJEXT): {$(VPATH)}strerror.c
@@ -750,35 +663,235 @@ strstr.$(OBJEXT): {$(VPATH)}strstr.c
 strtod.$(OBJEXT): {$(VPATH)}strtod.c
 strtol.$(OBJEXT): {$(VPATH)}strtol.c
 nt.$(OBJEXT): {$(VPATH)}nt.c
+os2.$(OBJEXT): {$(VPATH)}os2.c
+dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
 ia64.$(OBJEXT): {$(VPATH)}ia64.s
 	$(CC) $(CFLAGS) -c $<
 
 ###
 
-# dependencies for generated C sources.
-parse.$(OBJEXT): {$(VPATH)}parse.c
-miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
-prelude.$(OBJEXT): {$(VPATH)}prelude.c
-
-# dependencies for optional sources.
-compile.$(OBJEXT): {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc
-
-win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}win32/file.h \
-  {$(VPATH)}dln.h {$(VPATH)}dln_find.c {$(VPATH)}encindex.h \
-  {$(VPATH)}internal.h {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(PLATFORM_D)
-win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}win32/file.h \
-  $(RUBY_H_INCLUDES) $(PLATFORM_D)
+addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
+array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}vm_opts.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}thread.h {$(VPATH)}internal.h
+class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}constant.h {$(VPATH)}vm_opts.h
+compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
+complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h $(hdrdir)/ruby.h
+dir.$(OBJEXT): {$(VPATH)}dir.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h
+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 $(RUBY_H_INCLUDES)
+dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
+encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h \
+  {$(VPATH)}internal.h
+enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
+  {$(VPATH)}util.h {$(VPATH)}id.h {$(VPATH)}internal.h
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}node.h
+error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.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)}gc.h {$(VPATH)}iseq.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}probes_helper.h
+load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}dln.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h
+file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}dln.h \
+  {$(VPATH)}internal.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)}internal.h {$(VPATH)}constant.h \
+  {$(VPATH)}thread.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}debug.h
+hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}id.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h
+inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h
+io.$(OBJEXT): {$(VPATH)}io.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
+  {$(VPATH)}internal.h {$(VPATH)}thread.h {$(VPATH)}id.h {$(VPATH)}ruby_atomic.h
+main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h {$(VPATH)}vm_debug.h {$(VPATH)}vm_opts.h $(hdrdir)/ruby.h
+marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}internal.h
+math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h
+node.$(OBJEXT): {$(VPATH)}node.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}internal.h
+numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}id.h
+object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}internal.h {$(VPATH)}constant.h $(ENCODING_H_INCLUDES) $(PROBES_H_INCLUDES) \
+  {$(VPATH)}vm_opts.h {$(VPATH)}id.h
+pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}encoding.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}internal.h
+parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}symbol.h {$(VPATH)}regenc.h \
+  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
+  {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
+  {$(VPATH)}parse.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}gc.h
+proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
+  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}iseq.h {$(VPATH)}vm_opts.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)}internal.h \
+  {$(VPATH)}thread.h {$(VPATH)}vm_opts.h
+random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}siphash.c {$(VPATH)}siphash.h {$(VPATH)}internal.h
+range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}id.h
+rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h $(hdrdir)/ruby.h
+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 {$(VPATH)}internal.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)}internal.h {$(VPATH)}vm_opts.h
+safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}internal.h
+signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}internal.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h {$(VPATH)}id.h \
+  {$(VPATH)}regex.h {$(VPATH)}vsnprintf.c $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
+st.$(OBJEXT): {$(VPATH)}st.c $(RUBY_H_INCLUDES)
+strftime.$(OBJEXT): {$(VPATH)}strftime.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}timev.h $(ENCODING_H_INCLUDES)
+string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h {$(VPATH)}gc.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h \
+  $(PROBES_H_INCLUDES)
+struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
+symbol.$(OBJEXT): {$(VPATH)}symbol.c $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}node.h {$(VPATH)}id.h {$(VPATH)}symbol.h \
+  $(PROBES_H_INCLUDES)
+thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
+  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}io.h {$(VPATH)}thread.h {$(VPATH)}timev.h {$(VPATH)}vm_opts.h
+transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}transcode_data.h {$(VPATH)}internal.h
+cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}gc.h {$(VPATH)}eval_intern.h \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}timev.h {$(VPATH)}internal.h
+util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}internal.h
+variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h {$(VPATH)}id.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}internal.h {$(VPATH)}constant.h
+version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
+  $(srcdir)/include/ruby/version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h
+loadpath.$(OBJEXT): {$(VPATH)}loadpath.c $(RUBY_H_INCLUDES) \
+  $(srcdir)/include/ruby/version.h $(srcdir)/version.h {$(VPATH)}config.h \
+  verconf.h
+localeinit.$(OBJEXT): {$(VPATH)}localeinit.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
+miniinit.$(OBJEXT): {$(VPATH)}miniinit.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES)
+
+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)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+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)}internal.h \
+  {$(VPATH)}vm_opts.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.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)}internal.h {$(VPATH)}vm.h {$(VPATH)}constant.h \
+  $(PROBES_H_INCLUDES) {$(VPATH)}probes_helper.h {$(VPATH)}vm_opts.h
+vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}addr2line.h \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.h {$(VPATH)}vm_opts.h {$(VPATH)}internal.h
+id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}vm_opts.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \
+  $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}iseq.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c $(ENCODING_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}vm_debug.h {$(VPATH)}node.h $(hdrdir)/ruby.h
+
+ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h \
+  {$(VPATH)}config.h {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+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 {$(VPATH)}enc/unicode/casefold.h  \
+  {$(VPATH)}subst.h $(RUBY_H_INCLUDES)
+
+utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+
+win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}dln.h {$(VPATH)}dln_find.c \
+  {$(VPATH)}internal.h $(RUBY_H_INCLUDES) $(PLATFORM_D)
+win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D)
 
 $(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
-	$(Q) $(MAKEDIRS) $(@D)
 	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
-enc/trans/newline.$(OBJEXT): $(NEWLINE_C)
+newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.h \
+  {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
+  {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}subst.h
 
-verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
 	$(ECHO) creating $@
-	$(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
+	$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" $(srcdir)/template/verconf.h.tmpl > $@
 
-ruby-glommed.$(OBJEXT): $(OBJS)
+DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
+		eval.$(OBJEXT) \
+		gc.$(OBJEXT) \
+		hash.$(OBJEXT) \
+		load.$(OBJEXT) \
+		object.$(OBJEXT) \
+		parse.$(OBJEXT) \
+		string.$(OBJEXT) \
+		symbol.$(OBJEXT) \
+		vm.$(OBJEXT)
+
+probes.$(OBJEXT): $(DTRACE_DEPENDENT_OBJS)
+ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ)
 
 $(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
 
@@ -800,37 +913,20 @@ INSNS2VMOPT = --srcdir="$(srcdir)"
 
 {$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}enc/trans/newline.c {$(VPATH)}id.c \
-	     srcs-lib srcs-ext
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c srcs-ext srcs-enc
 
-missing-srcs: $(srcdir)/missing/des_tables.c
-
-srcs: common-srcs missing-srcs srcs-enc
-
-EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \
-	   $(srcdir)/ext/rbconfig/sizeof/sizes.c \
-	   $(srcdir)/ext/socket/constdefs.c \
-	   # EXT_SRCS
+EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \
+	   $(srcdir)/ext/dl/callback/callback.c  $(srcdir)/ext/rbconfig/sizeof/sizes.c
 
 srcs-ext: $(EXT_SRCS)
 
-srcs-extra: $(srcdir)/ext/json/parser/parser.c \
-	    $(srcdir)/ext/date/zonetab.h \
-	    $(empty)
-
-LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
-
-srcs-lib: $(LIB_SRCS)
-
 srcs-enc: $(ENC_MK)
 	$(ECHO) making srcs under enc
-	$(Q) $(MAKE) $(MAKE_ENC) srcs
+	$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
 
-all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
-incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
-      {$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \
-      $(REVISION_H) \
-      $(UNICODE_DATA_HEADERS) $(srcdir)/enc/jis/props.h \
+all-incs: incs
+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 enc/jis/props.h \
       {$(VPATH)}id.h {$(VPATH)}probes.dmyh
 
 insns: $(INSNS)
@@ -863,78 +959,59 @@ known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
 
-vm_call_iseq_optimized.inc: $(srcdir)/tool/mk_call_iseq_optimized.rb
-	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/mk_call_iseq_optimized.rb > $@
-
-$(MINIPRELUDE_C): $(COMPILE_PRELUDE)
+$(MINIPRELUDE_C): $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
-		$(srcdir)/template/prelude.c.tmpl
+	$(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
 
-$(PRELUDE_C): $(COMPILE_PRELUDE) \
-	   $(PRELUDE_SCRIPTS)
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
+	   $(srcdir)/lib/rubygems/defaults.rb \
+	   $(srcdir)/lib/rubygems/core_ext/kernel_gem.rb \
+	   $(PRELUDE_SCRIPTS) $(PREP)
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
-		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
+	$(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
 
-{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
+golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
-		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
-
-{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
-probes.dmyh:
+probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
 	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
 
 probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 
 prereq: incs srcs preludes PHONY
 
-preludes: {$(VPATH)}prelude.c
 preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
 
 $(srcdir)/revision.h:
 	@exit > $@
 
-$(REVISION_H): $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
 	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > revision.tmp
 	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
 
-$(srcdir)/ext/ripper/ripper.c: $(srcdir)/parse.y id.h
+$(srcdir)/ext/ripper/ripper.c: parse.y id.h
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && \
-	sed /AUTOGENERATED/q depend | \
-	$(exec) $(MAKE) -f - $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \
-		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
 
 $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
 	$(ECHO) generating $@
 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 
-$(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list
+$(srcdir)/ext/dl/callback/callback.c: $(srcdir)/ext/dl/callback/mkcallback.rb $(srcdir)/ext/dl/dl.h
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)"
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
 
 $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
 		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
 	$(ECHO) generating $@
-	$(Q) $(CHDIR) $(@D) && \
-	sed '/AUTOGENERATED/q' depend | \
-	$(exec) $(MAKE) -f - $(MFLAGS) \
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
 		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
 
-$(srcdir)/ext/socket/constdefs.c: $(srcdir)/ext/socket/depend
-	$(Q) $(CHDIR) $(@D) && \
-	sed '/AUTOGENERATED/q' depend | \
-	$(exec) $(MAKE) -f - $(MFLAGS) \
-		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
-
 ##
 
 run: fake miniruby$(EXEEXT) PHONY
@@ -956,24 +1033,19 @@ COMPARE_RUBY = $(BASERUBY)
 ITEM =
 OPTS =
 
-# You can pass several options through OPTS environment variable.
-# $ make benchmark OPTS="--help" displays more detail.
-# for example,
-#  $ make benchmark COMPARE_RUBY="ruby-trunk" OPTS="-e ruby-2.2.2"
-# This command compares trunk and built-ruby and 2.2.2
-benchmark: miniruby$(EXEEXT) PHONY
+benchmark: $(PROGRAM) PHONY
 	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY) -I$(srcdir)/lib -I. -I$(EXTOUT)/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
+	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
 	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
 
-benchmark-each: miniruby$(EXEEXT) PHONY
+benchmark-each: $(PROGRAM) PHONY
 	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY) -I$(srcdir)/lib -I. -I$(EXTOUT)/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
+	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
 	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
 
-tbench: miniruby$(EXEEXT) PHONY
+tbench: $(PROGRAM) PHONY
 	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
-	            --executables="$(COMPARE_RUBY) -I$(srcdir)/lib -I. -I$(EXTOUT)/common --disable-gem; built-ruby::$(MINIRUBY) --disable-gem" \
+	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
 	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
 
 run.gdb:
@@ -998,178 +1070,38 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY
 	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
 
 dist:
-	$(BASERUBY) $(srcdir)/tool/make-snapshot \
-	-srcdir=$(srcdir) \
-	-unicode-version=$(UNICODE_VERSION) \
-	tmp $(RELNAME)
-
-up:: update-remote
+	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
 
 up::
-	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
+	-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
 
-up::
-	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update
-
-after-update:: extract-extlibs
-
-update-remote:: update-src update-rubyspec update-download
-update-download:: update-unicode update-gems download-extlibs
-
-update-config_files: PHONY
-	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
-	    ../tool/downloader.rb -e gnu \
-	    config.guess config.sub
-
-update-gems: PHONY
-	$(ECHO) Downloading bundled gem files...
-	$(Q) $(BASERUBY) -C "$(srcdir)/gems" \
-	    -I../tool -rdownloader -answ \
-	    -e 'gem, ver = *$$F' \
-	    -e 'old = Dir.glob("#{gem}-*.gem")' \
-	    -e 'gem = "#{gem}-#{ver}.gem"' \
-	    -e 'Downloader::RubyGems.download(gem, nil, nil) and' \
-	    -e 'File.unlink(*(old-[gem]))' \
-	    bundled_gems
-
-extract-gems: PHONY
-	$(ECHO) Extracting bundled gem files...
-	$(Q) $(RUNRUBY) -C "$(srcdir)/gems" \
-	    -I../tool -rgem-unpack -answ \
-	    -e 'gem, ver = *$$F' \
-	    -e 'Gem.unpack("#{gem}-#{ver}.gem")' \
-	    bundled_gems
-
-update-bundled_gems: PHONY
-	$(Q) $(RUNRUBY) -rrubygems \
-	    -pla \
-	    -e '$$_=Gem::SpecFetcher.fetcher.detect(:latest) {|s|' \
-	    -e   'break "#{s.name} #{s.version}" if s.platform=="ruby"&&s.name==$$F[0]' \
-	    -e '}' \
-	     "$(srcdir)/gems/bundled_gems" | \
-	"$(IFCHANGE)" "$(srcdir)/gems/bundled_gems" -
-
-UNICODE_FILES = $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
-		$(UNICODE_SRC_DATA_DIR)/CompositionExclusions.txt \
-		$(UNICODE_SRC_DATA_DIR)/NormalizationTest.txt \
-		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt \
-		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
-		$(empty)
-
-UNICODE_PROPERTY_FILES =  \
-		$(UNICODE_SRC_DATA_DIR)/Blocks.txt \
-		$(UNICODE_SRC_DATA_DIR)/DerivedAge.txt \
-		$(UNICODE_SRC_DATA_DIR)/DerivedCoreProperties.txt \
-		$(UNICODE_SRC_DATA_DIR)/PropList.txt \
-		$(UNICODE_SRC_DATA_DIR)/PropertyAliases.txt \
-		$(UNICODE_SRC_DATA_DIR)/PropertyValueAliases.txt \
-		$(UNICODE_SRC_DATA_DIR)/Scripts.txt \
-		$(UNICODE_SRC_DATA_DIR)/auxiliary/GraphemeBreakProperty.txt \
-		$(empty)
-
-update-unicode: $(UNICODE_FILES)
-
-UNICODE_DOWNLOAD = \
-	$(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
-	    -d $(UNICODE_DATA_DIR) \
-	    -p $(UNICODE_VERSION)/ucd \
-	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode
-
-$(UNICODE_PROPERTY_FILES):
-	$(ECHO) Downloading Unicode $(UNICODE_VERSION) property files...
-	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)/auxiliary"
-	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_PROPERTY_FILES)
-
-$(UNICODE_FILES):
-	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
-	$(Q) $(MAKEDIRS) "$(UNICODE_SRC_DATA_DIR)"
-	$(Q) $(UNICODE_DOWNLOAD) $(UNICODE_FILES)
-
-$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
-	$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time
-
-$(UNICODE_SRC_DATA_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=.unicode-tables.time): $(UNICODE_FILES)
-
-$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
-		$(srcdir)/template/unicode_norm_gen.tmpl
-	$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode
-	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
-		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
-		-I $(srcdir) \
-		$(srcdir)/template/unicode_norm_gen.tmpl \
-		$(UNICODE_DATA_DIR) lib/unicode_normalize
-
-# UPDATE_NAME2CTYPE=    : toplevel
-# UPDATE_NAME2CTYPE=yes : sub-make to update name2ctype.h
-$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=.ignore.)name2ctype.h:
-	$(Q) $(MAKE) $(MFLAGS) Q=$(Q) UPDATE_NAME2CTYPE=yes UNICODE_VERSION=$(UNICODE_VERSION) $@
-
-$(UNICODE_HDR_DIR)/$(UPDATE_NAME2CTYPE:yes=name2ctype.h): \
-		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
-		$(UNICODE_PROPERTY_FILES)
-	$(MAKEDIRS) $(@D)
-	$(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header $(UNICODE_SRC_DATA_DIR) > $@
-
-# the next non-comment line was:
-# $(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb \
-# but was changed to make sure CI works on systems that don't have gperf
-unicode-up: $(UNICODE_DATA_HEADERS)
-
-$(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=casefold.h): \
-		$(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \
-		$(UNICODE_SRC_DATA_DIR)/SpecialCasing.txt \
-		$(UNICODE_SRC_DATA_DIR)/CaseFolding.txt
-
-$(UNICODE_HDR_DIR)/casefold.h: $(srcdir)/enc/unicode/case-folding.rb
-	$(Q) $(ALWAYS_UPDATE_UNICODE:yes=exit &&) $(MAKE) $(MFLAGS) Q=$(Q) UNICODE_VERSION=$(UNICODE_VERSION) update-unicode
-	$(MAKEDIRS) $(@D)
-	$(Q) $(BASERUBY) $(srcdir)/enc/unicode/case-folding.rb \
-		--output-file=$@ \
-		--mapping-data-directory=$(UNICODE_SRC_DATA_DIR)
-
-download-extlibs:
-	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext
-
-extract-extlibs:
-	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --all ext
-
-clean-extlibs:
-	$(Q) $(RMALL) $(srcdir)/.downloaded-cache
-
-clean-gems:
-	$(Q) $(RM) gems/*.gem
-
-CLEAN_CACHE = clean-extlibs
+update-config_files: $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub
+$(srcdir)/tool/config.guess:
+	$(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
+$(srcdir)/tool/config.sub:
+	$(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
 
 info: info-program info-libruby_a info-libruby_so info-arch
-info-program: PHONY
+info-program:
 	@echo PROGRAM=$(PROGRAM)
-info-libruby_a: PHONY
+info-libruby_a:
 	@echo LIBRUBY_A=$(LIBRUBY_A)
-info-libruby_so: PHONY
+info-libruby_so:
 	@echo LIBRUBY_SO=$(LIBRUBY_SO)
-info-arch: PHONY
+info-arch:
 	@echo arch=$(arch)
 
 change: PHONY
 	$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
 
-exam: check test-rubyspec
-
-love: sudo-precheck up all test install check
+love: sudo-precheck up all test install test-all
 	@echo love is all you need
 
 yes-test-all: sudo-precheck
 
-sudo-precheck: PHONY
+sudo-precheck:
 	@$(SUDO) echo > $(NULL)
 
-update-man-date: PHONY
-	-$(Q) $(BASERUBY) -I"$(srcdir)/tool" -rvcs -i -p \
-	-e 'BEGIN{@vcs=VCS.detect(ARGV.shift)}' \
-	-e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \
-	"$(srcdir)" "$(srcdir)"/man/*.1
-
 help: PHONY
 	$(MESSAGE_BEGIN) \
 	"                Makefile of Ruby" \
@@ -1186,18 +1118,16 @@ help: PHONY
 	"  gdb:             runs test.rb by miniruby under gdb" \
 	"  gdb-ruby:        runs test.rb by ruby under gdb" \
 	"  check:           equals make test test-all" \
-	"  exam:            equals make check test-rubyspec" \
 	"  test:            ruby core tests" \
-	"  test-all:        all ruby tests [TESTOPTS=-j4 TESTS=\"<test files>\"]" \
-	"  test-rubyspec:   run the Ruby spec suite" \
-	"  up:              update local copy and autogenerated files" \
-	"  update-rubyspec: update local copy of the Ruby spec suite" \
-	"  benchmark:       benchmark this ruby and COMPARE_RUBY." \
+	"  test-all:        all ruby tests [TESTS=<test files>]" \
+	"  test-rubyspec:   run RubySpec test suite" \
+	"  update-rubyspec: update local copy of RubySpec" \
+	"  benchmark:       benchmark this ruby and COMPARE_RUBY" \
 	"  gcbench:         gc benchmark [GCBENCH_ITEM=<item_name>]" \
 	"  gcbench-rdoc:    gc benchmark with GCBENCH_ITEM=rdoc" \
 	"  install:         install all ruby distributions" \
 	"  install-nodoc:   install without rdoc" \
-	"  install-cross:   install cross compiling stuff" \
+	"  install-cross:   install cross compiling staff" \
 	"  clean:           clean for tarball" \
 	"  distclean:       clean for repository" \
 	"  change:          make change log template" \
@@ -1206,1465 +1136,3 @@ help: PHONY
 	"see DeveloperHowto for more detail: " \
 	"  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \
 	$(MESSAGE_END)
-
-# AUTOGENERATED DEPENDENCIES START
-addr2line.$(OBJEXT): {$(VPATH)}addr2line.c
-addr2line.$(OBJEXT): {$(VPATH)}addr2line.h
-addr2line.$(OBJEXT): {$(VPATH)}config.h
-addr2line.$(OBJEXT): {$(VPATH)}missing.h
-array.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-array.$(OBJEXT): $(top_srcdir)/include/ruby.h
-array.$(OBJEXT): {$(VPATH)}array.c
-array.$(OBJEXT): {$(VPATH)}config.h
-array.$(OBJEXT): {$(VPATH)}defines.h
-array.$(OBJEXT): {$(VPATH)}encoding.h
-array.$(OBJEXT): {$(VPATH)}id.h
-array.$(OBJEXT): {$(VPATH)}intern.h
-array.$(OBJEXT): {$(VPATH)}internal.h
-array.$(OBJEXT): {$(VPATH)}io.h
-array.$(OBJEXT): {$(VPATH)}missing.h
-array.$(OBJEXT): {$(VPATH)}oniguruma.h
-array.$(OBJEXT): {$(VPATH)}probes.dmyh
-array.$(OBJEXT): {$(VPATH)}probes.h
-array.$(OBJEXT): {$(VPATH)}ruby_assert.h
-array.$(OBJEXT): {$(VPATH)}st.h
-array.$(OBJEXT): {$(VPATH)}subst.h
-array.$(OBJEXT): {$(VPATH)}util.h
-bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-bignum.$(OBJEXT): $(top_srcdir)/include/ruby.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c
-bignum.$(OBJEXT): {$(VPATH)}config.h
-bignum.$(OBJEXT): {$(VPATH)}defines.h
-bignum.$(OBJEXT): {$(VPATH)}encoding.h
-bignum.$(OBJEXT): {$(VPATH)}intern.h
-bignum.$(OBJEXT): {$(VPATH)}internal.h
-bignum.$(OBJEXT): {$(VPATH)}io.h
-bignum.$(OBJEXT): {$(VPATH)}missing.h
-bignum.$(OBJEXT): {$(VPATH)}oniguruma.h
-bignum.$(OBJEXT): {$(VPATH)}ruby_assert.h
-bignum.$(OBJEXT): {$(VPATH)}st.h
-bignum.$(OBJEXT): {$(VPATH)}subst.h
-bignum.$(OBJEXT): {$(VPATH)}thread.h
-bignum.$(OBJEXT): {$(VPATH)}util.h
-class.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-class.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-class.$(OBJEXT): $(CCAN_DIR)/list/list.h
-class.$(OBJEXT): $(CCAN_DIR)/str/str.h
-class.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-class.$(OBJEXT): $(top_srcdir)/include/ruby.h
-class.$(OBJEXT): {$(VPATH)}class.c
-class.$(OBJEXT): {$(VPATH)}config.h
-class.$(OBJEXT): {$(VPATH)}constant.h
-class.$(OBJEXT): {$(VPATH)}defines.h
-class.$(OBJEXT): {$(VPATH)}encoding.h
-class.$(OBJEXT): {$(VPATH)}id.h
-class.$(OBJEXT): {$(VPATH)}id_table.h
-class.$(OBJEXT): {$(VPATH)}intern.h
-class.$(OBJEXT): {$(VPATH)}internal.h
-class.$(OBJEXT): {$(VPATH)}io.h
-class.$(OBJEXT): {$(VPATH)}method.h
-class.$(OBJEXT): {$(VPATH)}missing.h
-class.$(OBJEXT): {$(VPATH)}node.h
-class.$(OBJEXT): {$(VPATH)}oniguruma.h
-class.$(OBJEXT): {$(VPATH)}ruby_assert.h
-class.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-class.$(OBJEXT): {$(VPATH)}st.h
-class.$(OBJEXT): {$(VPATH)}subst.h
-class.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-class.$(OBJEXT): {$(VPATH)}thread_native.h
-class.$(OBJEXT): {$(VPATH)}vm_core.h
-class.$(OBJEXT): {$(VPATH)}vm_debug.h
-class.$(OBJEXT): {$(VPATH)}vm_opts.h
-compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-compar.$(OBJEXT): {$(VPATH)}compar.c
-compar.$(OBJEXT): {$(VPATH)}config.h
-compar.$(OBJEXT): {$(VPATH)}defines.h
-compar.$(OBJEXT): {$(VPATH)}id.h
-compar.$(OBJEXT): {$(VPATH)}intern.h
-compar.$(OBJEXT): {$(VPATH)}missing.h
-compar.$(OBJEXT): {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}subst.h
-compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
-compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
-compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-compile.$(OBJEXT): $(top_srcdir)/include/ruby.h
-compile.$(OBJEXT): {$(VPATH)}compile.c
-compile.$(OBJEXT): {$(VPATH)}config.h
-compile.$(OBJEXT): {$(VPATH)}defines.h
-compile.$(OBJEXT): {$(VPATH)}encindex.h
-compile.$(OBJEXT): {$(VPATH)}encoding.h
-compile.$(OBJEXT): {$(VPATH)}gc.h
-compile.$(OBJEXT): {$(VPATH)}id.h
-compile.$(OBJEXT): {$(VPATH)}id_table.h
-compile.$(OBJEXT): {$(VPATH)}insns.inc
-compile.$(OBJEXT): {$(VPATH)}insns_info.inc
-compile.$(OBJEXT): {$(VPATH)}intern.h
-compile.$(OBJEXT): {$(VPATH)}internal.h
-compile.$(OBJEXT): {$(VPATH)}io.h
-compile.$(OBJEXT): {$(VPATH)}iseq.h
-compile.$(OBJEXT): {$(VPATH)}method.h
-compile.$(OBJEXT): {$(VPATH)}missing.h
-compile.$(OBJEXT): {$(VPATH)}node.h
-compile.$(OBJEXT): {$(VPATH)}oniguruma.h
-compile.$(OBJEXT): {$(VPATH)}opt_sc.inc
-compile.$(OBJEXT): {$(VPATH)}optinsn.inc
-compile.$(OBJEXT): {$(VPATH)}optunifs.inc
-compile.$(OBJEXT): {$(VPATH)}re.h
-compile.$(OBJEXT): {$(VPATH)}regex.h
-compile.$(OBJEXT): {$(VPATH)}ruby_assert.h
-compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-compile.$(OBJEXT): {$(VPATH)}st.h
-compile.$(OBJEXT): {$(VPATH)}subst.h
-compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-compile.$(OBJEXT): {$(VPATH)}thread_native.h
-compile.$(OBJEXT): {$(VPATH)}vm_core.h
-compile.$(OBJEXT): {$(VPATH)}vm_debug.h
-compile.$(OBJEXT): {$(VPATH)}vm_opts.h
-complex.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-complex.$(OBJEXT): $(top_srcdir)/include/ruby.h
-complex.$(OBJEXT): {$(VPATH)}complex.c
-complex.$(OBJEXT): {$(VPATH)}config.h
-complex.$(OBJEXT): {$(VPATH)}defines.h
-complex.$(OBJEXT): {$(VPATH)}encoding.h
-complex.$(OBJEXT): {$(VPATH)}intern.h
-complex.$(OBJEXT): {$(VPATH)}internal.h
-complex.$(OBJEXT): {$(VPATH)}io.h
-complex.$(OBJEXT): {$(VPATH)}missing.h
-complex.$(OBJEXT): {$(VPATH)}oniguruma.h
-complex.$(OBJEXT): {$(VPATH)}ruby_assert.h
-complex.$(OBJEXT): {$(VPATH)}st.h
-complex.$(OBJEXT): {$(VPATH)}subst.h
-cont.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-cont.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-cont.$(OBJEXT): $(CCAN_DIR)/list/list.h
-cont.$(OBJEXT): $(CCAN_DIR)/str/str.h
-cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-cont.$(OBJEXT): $(top_srcdir)/include/ruby.h
-cont.$(OBJEXT): {$(VPATH)}config.h
-cont.$(OBJEXT): {$(VPATH)}cont.c
-cont.$(OBJEXT): {$(VPATH)}defines.h
-cont.$(OBJEXT): {$(VPATH)}encoding.h
-cont.$(OBJEXT): {$(VPATH)}eval_intern.h
-cont.$(OBJEXT): {$(VPATH)}gc.h
-cont.$(OBJEXT): {$(VPATH)}id.h
-cont.$(OBJEXT): {$(VPATH)}intern.h
-cont.$(OBJEXT): {$(VPATH)}internal.h
-cont.$(OBJEXT): {$(VPATH)}io.h
-cont.$(OBJEXT): {$(VPATH)}method.h
-cont.$(OBJEXT): {$(VPATH)}missing.h
-cont.$(OBJEXT): {$(VPATH)}node.h
-cont.$(OBJEXT): {$(VPATH)}oniguruma.h
-cont.$(OBJEXT): {$(VPATH)}ruby_assert.h
-cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-cont.$(OBJEXT): {$(VPATH)}st.h
-cont.$(OBJEXT): {$(VPATH)}subst.h
-cont.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-cont.$(OBJEXT): {$(VPATH)}thread_native.h
-cont.$(OBJEXT): {$(VPATH)}vm_core.h
-cont.$(OBJEXT): {$(VPATH)}vm_debug.h
-cont.$(OBJEXT): {$(VPATH)}vm_opts.h
-debug.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-debug.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-debug.$(OBJEXT): $(CCAN_DIR)/list/list.h
-debug.$(OBJEXT): $(CCAN_DIR)/str/str.h
-debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-debug.$(OBJEXT): $(top_srcdir)/include/ruby.h
-debug.$(OBJEXT): {$(VPATH)}config.h
-debug.$(OBJEXT): {$(VPATH)}debug.c
-debug.$(OBJEXT): {$(VPATH)}defines.h
-debug.$(OBJEXT): {$(VPATH)}encoding.h
-debug.$(OBJEXT): {$(VPATH)}eval_intern.h
-debug.$(OBJEXT): {$(VPATH)}id.h
-debug.$(OBJEXT): {$(VPATH)}intern.h
-debug.$(OBJEXT): {$(VPATH)}internal.h
-debug.$(OBJEXT): {$(VPATH)}io.h
-debug.$(OBJEXT): {$(VPATH)}method.h
-debug.$(OBJEXT): {$(VPATH)}missing.h
-debug.$(OBJEXT): {$(VPATH)}node.h
-debug.$(OBJEXT): {$(VPATH)}oniguruma.h
-debug.$(OBJEXT): {$(VPATH)}ruby_assert.h
-debug.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-debug.$(OBJEXT): {$(VPATH)}st.h
-debug.$(OBJEXT): {$(VPATH)}subst.h
-debug.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-debug.$(OBJEXT): {$(VPATH)}thread_native.h
-debug.$(OBJEXT): {$(VPATH)}util.h
-debug.$(OBJEXT): {$(VPATH)}vm_core.h
-debug.$(OBJEXT): {$(VPATH)}vm_debug.h
-debug.$(OBJEXT): {$(VPATH)}vm_opts.h
-dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-dir.$(OBJEXT): $(top_srcdir)/include/ruby.h
-dir.$(OBJEXT): {$(VPATH)}config.h
-dir.$(OBJEXT): {$(VPATH)}defines.h
-dir.$(OBJEXT): {$(VPATH)}dir.c
-dir.$(OBJEXT): {$(VPATH)}encindex.h
-dir.$(OBJEXT): {$(VPATH)}encoding.h
-dir.$(OBJEXT): {$(VPATH)}intern.h
-dir.$(OBJEXT): {$(VPATH)}internal.h
-dir.$(OBJEXT): {$(VPATH)}io.h
-dir.$(OBJEXT): {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}oniguruma.h
-dir.$(OBJEXT): {$(VPATH)}st.h
-dir.$(OBJEXT): {$(VPATH)}subst.h
-dir.$(OBJEXT): {$(VPATH)}util.h
-dln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-dln.$(OBJEXT): {$(VPATH)}config.h
-dln.$(OBJEXT): {$(VPATH)}defines.h
-dln.$(OBJEXT): {$(VPATH)}dln.c
-dln.$(OBJEXT): {$(VPATH)}dln.h
-dln.$(OBJEXT): {$(VPATH)}intern.h
-dln.$(OBJEXT): {$(VPATH)}missing.h
-dln.$(OBJEXT): {$(VPATH)}st.h
-dln.$(OBJEXT): {$(VPATH)}subst.h
-dln_find.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-dln_find.$(OBJEXT): {$(VPATH)}config.h
-dln_find.$(OBJEXT): {$(VPATH)}defines.h
-dln_find.$(OBJEXT): {$(VPATH)}dln.h
-dln_find.$(OBJEXT): {$(VPATH)}dln_find.c
-dln_find.$(OBJEXT): {$(VPATH)}intern.h
-dln_find.$(OBJEXT): {$(VPATH)}missing.h
-dln_find.$(OBJEXT): {$(VPATH)}st.h
-dln_find.$(OBJEXT): {$(VPATH)}subst.h
-dmydln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-dmydln.$(OBJEXT): {$(VPATH)}config.h
-dmydln.$(OBJEXT): {$(VPATH)}defines.h
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c
-dmydln.$(OBJEXT): {$(VPATH)}intern.h
-dmydln.$(OBJEXT): {$(VPATH)}missing.h
-dmydln.$(OBJEXT): {$(VPATH)}st.h
-dmydln.$(OBJEXT): {$(VPATH)}subst.h
-dmyenc.$(OBJEXT): {$(VPATH)}dmyenc.c
-dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enc/ascii.$(OBJEXT): {$(VPATH)}config.h
-enc/ascii.$(OBJEXT): {$(VPATH)}defines.h
-enc/ascii.$(OBJEXT): {$(VPATH)}enc/ascii.c
-enc/ascii.$(OBJEXT): {$(VPATH)}encindex.h
-enc/ascii.$(OBJEXT): {$(VPATH)}missing.h
-enc/ascii.$(OBJEXT): {$(VPATH)}oniguruma.h
-enc/ascii.$(OBJEXT): {$(VPATH)}regenc.h
-enc/trans/newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}config.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}defines.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}enc/trans/newline.c
-enc/trans/newline.$(OBJEXT): {$(VPATH)}intern.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}missing.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}st.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}subst.h
-enc/trans/newline.$(OBJEXT): {$(VPATH)}transcode_data.h
-enc/unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h
-enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h
-enc/unicode.$(OBJEXT): {$(VPATH)}config.h
-enc/unicode.$(OBJEXT): {$(VPATH)}defines.h
-enc/unicode.$(OBJEXT): {$(VPATH)}enc/unicode.c
-enc/unicode.$(OBJEXT): {$(VPATH)}intern.h
-enc/unicode.$(OBJEXT): {$(VPATH)}missing.h
-enc/unicode.$(OBJEXT): {$(VPATH)}oniguruma.h
-enc/unicode.$(OBJEXT): {$(VPATH)}regenc.h
-enc/unicode.$(OBJEXT): {$(VPATH)}regint.h
-enc/unicode.$(OBJEXT): {$(VPATH)}st.h
-enc/unicode.$(OBJEXT): {$(VPATH)}subst.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}config.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}defines.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}enc/us_ascii.c
-enc/us_ascii.$(OBJEXT): {$(VPATH)}encindex.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}missing.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}oniguruma.h
-enc/us_ascii.$(OBJEXT): {$(VPATH)}regenc.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}config.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}defines.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}enc/utf_8.c
-enc/utf_8.$(OBJEXT): {$(VPATH)}encindex.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}missing.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}oniguruma.h
-enc/utf_8.$(OBJEXT): {$(VPATH)}regenc.h
-encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-encoding.$(OBJEXT): $(top_srcdir)/include/ruby.h
-encoding.$(OBJEXT): {$(VPATH)}config.h
-encoding.$(OBJEXT): {$(VPATH)}defines.h
-encoding.$(OBJEXT): {$(VPATH)}encindex.h
-encoding.$(OBJEXT): {$(VPATH)}encoding.c
-encoding.$(OBJEXT): {$(VPATH)}encoding.h
-encoding.$(OBJEXT): {$(VPATH)}intern.h
-encoding.$(OBJEXT): {$(VPATH)}internal.h
-encoding.$(OBJEXT): {$(VPATH)}io.h
-encoding.$(OBJEXT): {$(VPATH)}missing.h
-encoding.$(OBJEXT): {$(VPATH)}oniguruma.h
-encoding.$(OBJEXT): {$(VPATH)}regenc.h
-encoding.$(OBJEXT): {$(VPATH)}ruby_assert.h
-encoding.$(OBJEXT): {$(VPATH)}st.h
-encoding.$(OBJEXT): {$(VPATH)}subst.h
-encoding.$(OBJEXT): {$(VPATH)}util.h
-enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enum.$(OBJEXT): $(top_srcdir)/include/ruby.h
-enum.$(OBJEXT): {$(VPATH)}config.h
-enum.$(OBJEXT): {$(VPATH)}defines.h
-enum.$(OBJEXT): {$(VPATH)}encoding.h
-enum.$(OBJEXT): {$(VPATH)}enum.c
-enum.$(OBJEXT): {$(VPATH)}id.h
-enum.$(OBJEXT): {$(VPATH)}intern.h
-enum.$(OBJEXT): {$(VPATH)}internal.h
-enum.$(OBJEXT): {$(VPATH)}io.h
-enum.$(OBJEXT): {$(VPATH)}missing.h
-enum.$(OBJEXT): {$(VPATH)}oniguruma.h
-enum.$(OBJEXT): {$(VPATH)}st.h
-enum.$(OBJEXT): {$(VPATH)}subst.h
-enum.$(OBJEXT): {$(VPATH)}util.h
-enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enumerator.$(OBJEXT): $(top_srcdir)/include/ruby.h
-enumerator.$(OBJEXT): {$(VPATH)}config.h
-enumerator.$(OBJEXT): {$(VPATH)}defines.h
-enumerator.$(OBJEXT): {$(VPATH)}encoding.h
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c
-enumerator.$(OBJEXT): {$(VPATH)}intern.h
-enumerator.$(OBJEXT): {$(VPATH)}internal.h
-enumerator.$(OBJEXT): {$(VPATH)}io.h
-enumerator.$(OBJEXT): {$(VPATH)}missing.h
-enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h
-enumerator.$(OBJEXT): {$(VPATH)}st.h
-enumerator.$(OBJEXT): {$(VPATH)}subst.h
-error.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-error.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-error.$(OBJEXT): $(CCAN_DIR)/list/list.h
-error.$(OBJEXT): $(CCAN_DIR)/str/str.h
-error.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-error.$(OBJEXT): $(top_srcdir)/include/ruby.h
-error.$(OBJEXT): {$(VPATH)}config.h
-error.$(OBJEXT): {$(VPATH)}defines.h
-error.$(OBJEXT): {$(VPATH)}encoding.h
-error.$(OBJEXT): {$(VPATH)}error.c
-error.$(OBJEXT): {$(VPATH)}id.h
-error.$(OBJEXT): {$(VPATH)}intern.h
-error.$(OBJEXT): {$(VPATH)}internal.h
-error.$(OBJEXT): {$(VPATH)}io.h
-error.$(OBJEXT): {$(VPATH)}known_errors.inc
-error.$(OBJEXT): {$(VPATH)}method.h
-error.$(OBJEXT): {$(VPATH)}missing.h
-error.$(OBJEXT): {$(VPATH)}node.h
-error.$(OBJEXT): {$(VPATH)}oniguruma.h
-error.$(OBJEXT): {$(VPATH)}ruby_assert.h
-error.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-error.$(OBJEXT): {$(VPATH)}st.h
-error.$(OBJEXT): {$(VPATH)}subst.h
-error.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-error.$(OBJEXT): {$(VPATH)}thread_native.h
-error.$(OBJEXT): {$(VPATH)}vm_core.h
-error.$(OBJEXT): {$(VPATH)}vm_debug.h
-error.$(OBJEXT): {$(VPATH)}vm_opts.h
-eval.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-eval.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-eval.$(OBJEXT): $(CCAN_DIR)/list/list.h
-eval.$(OBJEXT): $(CCAN_DIR)/str/str.h
-eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-eval.$(OBJEXT): $(top_srcdir)/include/ruby.h
-eval.$(OBJEXT): {$(VPATH)}config.h
-eval.$(OBJEXT): {$(VPATH)}defines.h
-eval.$(OBJEXT): {$(VPATH)}encoding.h
-eval.$(OBJEXT): {$(VPATH)}eval.c
-eval.$(OBJEXT): {$(VPATH)}eval_error.c
-eval.$(OBJEXT): {$(VPATH)}eval_intern.h
-eval.$(OBJEXT): {$(VPATH)}eval_jump.c
-eval.$(OBJEXT): {$(VPATH)}gc.h
-eval.$(OBJEXT): {$(VPATH)}id.h
-eval.$(OBJEXT): {$(VPATH)}intern.h
-eval.$(OBJEXT): {$(VPATH)}internal.h
-eval.$(OBJEXT): {$(VPATH)}io.h
-eval.$(OBJEXT): {$(VPATH)}iseq.h
-eval.$(OBJEXT): {$(VPATH)}method.h
-eval.$(OBJEXT): {$(VPATH)}missing.h
-eval.$(OBJEXT): {$(VPATH)}node.h
-eval.$(OBJEXT): {$(VPATH)}oniguruma.h
-eval.$(OBJEXT): {$(VPATH)}probes.dmyh
-eval.$(OBJEXT): {$(VPATH)}probes.h
-eval.$(OBJEXT): {$(VPATH)}probes_helper.h
-eval.$(OBJEXT): {$(VPATH)}ruby_assert.h
-eval.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-eval.$(OBJEXT): {$(VPATH)}st.h
-eval.$(OBJEXT): {$(VPATH)}subst.h
-eval.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-eval.$(OBJEXT): {$(VPATH)}thread_native.h
-eval.$(OBJEXT): {$(VPATH)}vm.h
-eval.$(OBJEXT): {$(VPATH)}vm_core.h
-eval.$(OBJEXT): {$(VPATH)}vm_debug.h
-eval.$(OBJEXT): {$(VPATH)}vm_opts.h
-explicit_bzero.$(OBJEXT): {$(VPATH)}config.h
-explicit_bzero.$(OBJEXT): {$(VPATH)}explicit_bzero.c
-explicit_bzero.$(OBJEXT): {$(VPATH)}missing.h
-file.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-file.$(OBJEXT): $(top_srcdir)/include/ruby.h
-file.$(OBJEXT): {$(VPATH)}config.h
-file.$(OBJEXT): {$(VPATH)}defines.h
-file.$(OBJEXT): {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}encindex.h
-file.$(OBJEXT): {$(VPATH)}encoding.h
-file.$(OBJEXT): {$(VPATH)}file.c
-file.$(OBJEXT): {$(VPATH)}intern.h
-file.$(OBJEXT): {$(VPATH)}internal.h
-file.$(OBJEXT): {$(VPATH)}io.h
-file.$(OBJEXT): {$(VPATH)}missing.h
-file.$(OBJEXT): {$(VPATH)}oniguruma.h
-file.$(OBJEXT): {$(VPATH)}st.h
-file.$(OBJEXT): {$(VPATH)}subst.h
-file.$(OBJEXT): {$(VPATH)}util.h
-gc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-gc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-gc.$(OBJEXT): $(CCAN_DIR)/list/list.h
-gc.$(OBJEXT): $(CCAN_DIR)/str/str.h
-gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-gc.$(OBJEXT): $(top_srcdir)/include/ruby.h
-gc.$(OBJEXT): {$(VPATH)}config.h
-gc.$(OBJEXT): {$(VPATH)}constant.h
-gc.$(OBJEXT): {$(VPATH)}debug.h
-gc.$(OBJEXT): {$(VPATH)}defines.h
-gc.$(OBJEXT): {$(VPATH)}encoding.h
-gc.$(OBJEXT): {$(VPATH)}eval_intern.h
-gc.$(OBJEXT): {$(VPATH)}gc.c
-gc.$(OBJEXT): {$(VPATH)}gc.h
-gc.$(OBJEXT): {$(VPATH)}id.h
-gc.$(OBJEXT): {$(VPATH)}id_table.h
-gc.$(OBJEXT): {$(VPATH)}intern.h
-gc.$(OBJEXT): {$(VPATH)}internal.h
-gc.$(OBJEXT): {$(VPATH)}io.h
-gc.$(OBJEXT): {$(VPATH)}method.h
-gc.$(OBJEXT): {$(VPATH)}missing.h
-gc.$(OBJEXT): {$(VPATH)}node.h
-gc.$(OBJEXT): {$(VPATH)}oniguruma.h
-gc.$(OBJEXT): {$(VPATH)}probes.dmyh
-gc.$(OBJEXT): {$(VPATH)}probes.h
-gc.$(OBJEXT): {$(VPATH)}re.h
-gc.$(OBJEXT): {$(VPATH)}regenc.h
-gc.$(OBJEXT): {$(VPATH)}regex.h
-gc.$(OBJEXT): {$(VPATH)}regint.h
-gc.$(OBJEXT): {$(VPATH)}ruby_assert.h
-gc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-gc.$(OBJEXT): {$(VPATH)}st.h
-gc.$(OBJEXT): {$(VPATH)}subst.h
-gc.$(OBJEXT): {$(VPATH)}thread.h
-gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-gc.$(OBJEXT): {$(VPATH)}thread_native.h
-gc.$(OBJEXT): {$(VPATH)}util.h
-gc.$(OBJEXT): {$(VPATH)}vm_core.h
-gc.$(OBJEXT): {$(VPATH)}vm_debug.h
-gc.$(OBJEXT): {$(VPATH)}vm_opts.h
-golf_prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-golf_prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-golf_prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
-golf_prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
-golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-golf_prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
-golf_prelude.$(OBJEXT): {$(VPATH)}config.h
-golf_prelude.$(OBJEXT): {$(VPATH)}defines.h
-golf_prelude.$(OBJEXT): {$(VPATH)}encoding.h
-golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c
-golf_prelude.$(OBJEXT): {$(VPATH)}id.h
-golf_prelude.$(OBJEXT): {$(VPATH)}intern.h
-golf_prelude.$(OBJEXT): {$(VPATH)}internal.h
-golf_prelude.$(OBJEXT): {$(VPATH)}io.h
-golf_prelude.$(OBJEXT): {$(VPATH)}iseq.h
-golf_prelude.$(OBJEXT): {$(VPATH)}method.h
-golf_prelude.$(OBJEXT): {$(VPATH)}missing.h
-golf_prelude.$(OBJEXT): {$(VPATH)}node.h
-golf_prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
-golf_prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
-golf_prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-golf_prelude.$(OBJEXT): {$(VPATH)}st.h
-golf_prelude.$(OBJEXT): {$(VPATH)}subst.h
-golf_prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-golf_prelude.$(OBJEXT): {$(VPATH)}thread_native.h
-golf_prelude.$(OBJEXT): {$(VPATH)}vm_core.h
-golf_prelude.$(OBJEXT): {$(VPATH)}vm_debug.h
-golf_prelude.$(OBJEXT): {$(VPATH)}vm_opts.h
-goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-goruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
-goruby.$(OBJEXT): {$(VPATH)}backward.h
-goruby.$(OBJEXT): {$(VPATH)}config.h
-goruby.$(OBJEXT): {$(VPATH)}defines.h
-goruby.$(OBJEXT): {$(VPATH)}goruby.c
-goruby.$(OBJEXT): {$(VPATH)}intern.h
-goruby.$(OBJEXT): {$(VPATH)}main.c
-goruby.$(OBJEXT): {$(VPATH)}missing.h
-goruby.$(OBJEXT): {$(VPATH)}node.h
-goruby.$(OBJEXT): {$(VPATH)}st.h
-goruby.$(OBJEXT): {$(VPATH)}subst.h
-goruby.$(OBJEXT): {$(VPATH)}vm_debug.h
-hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-hash.$(OBJEXT): $(top_srcdir)/include/ruby.h
-hash.$(OBJEXT): {$(VPATH)}config.h
-hash.$(OBJEXT): {$(VPATH)}defines.h
-hash.$(OBJEXT): {$(VPATH)}encoding.h
-hash.$(OBJEXT): {$(VPATH)}hash.c
-hash.$(OBJEXT): {$(VPATH)}id.h
-hash.$(OBJEXT): {$(VPATH)}intern.h
-hash.$(OBJEXT): {$(VPATH)}internal.h
-hash.$(OBJEXT): {$(VPATH)}io.h
-hash.$(OBJEXT): {$(VPATH)}missing.h
-hash.$(OBJEXT): {$(VPATH)}oniguruma.h
-hash.$(OBJEXT): {$(VPATH)}probes.dmyh
-hash.$(OBJEXT): {$(VPATH)}probes.h
-hash.$(OBJEXT): {$(VPATH)}st.h
-hash.$(OBJEXT): {$(VPATH)}subst.h
-hash.$(OBJEXT): {$(VPATH)}symbol.h
-hash.$(OBJEXT): {$(VPATH)}util.h
-inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-inits.$(OBJEXT): $(top_srcdir)/include/ruby.h
-inits.$(OBJEXT): {$(VPATH)}config.h
-inits.$(OBJEXT): {$(VPATH)}defines.h
-inits.$(OBJEXT): {$(VPATH)}encoding.h
-inits.$(OBJEXT): {$(VPATH)}inits.c
-inits.$(OBJEXT): {$(VPATH)}intern.h
-inits.$(OBJEXT): {$(VPATH)}internal.h
-inits.$(OBJEXT): {$(VPATH)}io.h
-inits.$(OBJEXT): {$(VPATH)}missing.h
-inits.$(OBJEXT): {$(VPATH)}oniguruma.h
-inits.$(OBJEXT): {$(VPATH)}st.h
-inits.$(OBJEXT): {$(VPATH)}subst.h
-io.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-io.$(OBJEXT): $(top_srcdir)/include/ruby.h
-io.$(OBJEXT): {$(VPATH)}config.h
-io.$(OBJEXT): {$(VPATH)}defines.h
-io.$(OBJEXT): {$(VPATH)}dln.h
-io.$(OBJEXT): {$(VPATH)}encindex.h
-io.$(OBJEXT): {$(VPATH)}encoding.h
-io.$(OBJEXT): {$(VPATH)}id.h
-io.$(OBJEXT): {$(VPATH)}intern.h
-io.$(OBJEXT): {$(VPATH)}internal.h
-io.$(OBJEXT): {$(VPATH)}io.c
-io.$(OBJEXT): {$(VPATH)}io.h
-io.$(OBJEXT): {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}oniguruma.h
-io.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-io.$(OBJEXT): {$(VPATH)}st.h
-io.$(OBJEXT): {$(VPATH)}subst.h
-io.$(OBJEXT): {$(VPATH)}thread.h
-io.$(OBJEXT): {$(VPATH)}util.h
-iseq.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-iseq.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-iseq.$(OBJEXT): $(CCAN_DIR)/list/list.h
-iseq.$(OBJEXT): $(CCAN_DIR)/str/str.h
-iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-iseq.$(OBJEXT): $(top_srcdir)/include/ruby.h
-iseq.$(OBJEXT): {$(VPATH)}config.h
-iseq.$(OBJEXT): {$(VPATH)}defines.h
-iseq.$(OBJEXT): {$(VPATH)}encoding.h
-iseq.$(OBJEXT): {$(VPATH)}eval_intern.h
-iseq.$(OBJEXT): {$(VPATH)}gc.h
-iseq.$(OBJEXT): {$(VPATH)}id.h
-iseq.$(OBJEXT): {$(VPATH)}id_table.h
-iseq.$(OBJEXT): {$(VPATH)}insns.inc
-iseq.$(OBJEXT): {$(VPATH)}insns_info.inc
-iseq.$(OBJEXT): {$(VPATH)}intern.h
-iseq.$(OBJEXT): {$(VPATH)}internal.h
-iseq.$(OBJEXT): {$(VPATH)}io.h
-iseq.$(OBJEXT): {$(VPATH)}iseq.c
-iseq.$(OBJEXT): {$(VPATH)}iseq.h
-iseq.$(OBJEXT): {$(VPATH)}method.h
-iseq.$(OBJEXT): {$(VPATH)}missing.h
-iseq.$(OBJEXT): {$(VPATH)}node.h
-iseq.$(OBJEXT): {$(VPATH)}node_name.inc
-iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
-iseq.$(OBJEXT): {$(VPATH)}ruby_assert.h
-iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-iseq.$(OBJEXT): {$(VPATH)}st.h
-iseq.$(OBJEXT): {$(VPATH)}subst.h
-iseq.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-iseq.$(OBJEXT): {$(VPATH)}thread_native.h
-iseq.$(OBJEXT): {$(VPATH)}util.h
-iseq.$(OBJEXT): {$(VPATH)}vm_core.h
-iseq.$(OBJEXT): {$(VPATH)}vm_debug.h
-iseq.$(OBJEXT): {$(VPATH)}vm_opts.h
-load.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-load.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-load.$(OBJEXT): $(CCAN_DIR)/list/list.h
-load.$(OBJEXT): $(CCAN_DIR)/str/str.h
-load.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-load.$(OBJEXT): $(top_srcdir)/include/ruby.h
-load.$(OBJEXT): {$(VPATH)}config.h
-load.$(OBJEXT): {$(VPATH)}defines.h
-load.$(OBJEXT): {$(VPATH)}dln.h
-load.$(OBJEXT): {$(VPATH)}encoding.h
-load.$(OBJEXT): {$(VPATH)}eval_intern.h
-load.$(OBJEXT): {$(VPATH)}id.h
-load.$(OBJEXT): {$(VPATH)}intern.h
-load.$(OBJEXT): {$(VPATH)}internal.h
-load.$(OBJEXT): {$(VPATH)}io.h
-load.$(OBJEXT): {$(VPATH)}load.c
-load.$(OBJEXT): {$(VPATH)}method.h
-load.$(OBJEXT): {$(VPATH)}missing.h
-load.$(OBJEXT): {$(VPATH)}node.h
-load.$(OBJEXT): {$(VPATH)}oniguruma.h
-load.$(OBJEXT): {$(VPATH)}probes.dmyh
-load.$(OBJEXT): {$(VPATH)}probes.h
-load.$(OBJEXT): {$(VPATH)}ruby_assert.h
-load.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-load.$(OBJEXT): {$(VPATH)}st.h
-load.$(OBJEXT): {$(VPATH)}subst.h
-load.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-load.$(OBJEXT): {$(VPATH)}thread_native.h
-load.$(OBJEXT): {$(VPATH)}util.h
-load.$(OBJEXT): {$(VPATH)}vm_core.h
-load.$(OBJEXT): {$(VPATH)}vm_debug.h
-load.$(OBJEXT): {$(VPATH)}vm_opts.h
-loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
-loadpath.$(OBJEXT): $(top_srcdir)/version.h
-loadpath.$(OBJEXT): {$(VPATH)}config.h
-loadpath.$(OBJEXT): {$(VPATH)}defines.h
-loadpath.$(OBJEXT): {$(VPATH)}intern.h
-loadpath.$(OBJEXT): {$(VPATH)}loadpath.c
-loadpath.$(OBJEXT): {$(VPATH)}missing.h
-loadpath.$(OBJEXT): {$(VPATH)}st.h
-loadpath.$(OBJEXT): {$(VPATH)}subst.h
-loadpath.$(OBJEXT): {$(VPATH)}verconf.h
-localeinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-localeinit.$(OBJEXT): $(top_srcdir)/include/ruby.h
-localeinit.$(OBJEXT): {$(VPATH)}config.h
-localeinit.$(OBJEXT): {$(VPATH)}defines.h
-localeinit.$(OBJEXT): {$(VPATH)}encindex.h
-localeinit.$(OBJEXT): {$(VPATH)}encoding.h
-localeinit.$(OBJEXT): {$(VPATH)}intern.h
-localeinit.$(OBJEXT): {$(VPATH)}internal.h
-localeinit.$(OBJEXT): {$(VPATH)}io.h
-localeinit.$(OBJEXT): {$(VPATH)}localeinit.c
-localeinit.$(OBJEXT): {$(VPATH)}missing.h
-localeinit.$(OBJEXT): {$(VPATH)}oniguruma.h
-localeinit.$(OBJEXT): {$(VPATH)}st.h
-localeinit.$(OBJEXT): {$(VPATH)}subst.h
-main.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-main.$(OBJEXT): $(top_srcdir)/include/ruby.h
-main.$(OBJEXT): {$(VPATH)}backward.h
-main.$(OBJEXT): {$(VPATH)}config.h
-main.$(OBJEXT): {$(VPATH)}defines.h
-main.$(OBJEXT): {$(VPATH)}intern.h
-main.$(OBJEXT): {$(VPATH)}main.c
-main.$(OBJEXT): {$(VPATH)}missing.h
-main.$(OBJEXT): {$(VPATH)}node.h
-main.$(OBJEXT): {$(VPATH)}st.h
-main.$(OBJEXT): {$(VPATH)}subst.h
-main.$(OBJEXT): {$(VPATH)}vm_debug.h
-marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-marshal.$(OBJEXT): $(top_srcdir)/include/ruby.h
-marshal.$(OBJEXT): {$(VPATH)}config.h
-marshal.$(OBJEXT): {$(VPATH)}defines.h
-marshal.$(OBJEXT): {$(VPATH)}encindex.h
-marshal.$(OBJEXT): {$(VPATH)}encoding.h
-marshal.$(OBJEXT): {$(VPATH)}id_table.h
-marshal.$(OBJEXT): {$(VPATH)}intern.h
-marshal.$(OBJEXT): {$(VPATH)}internal.h
-marshal.$(OBJEXT): {$(VPATH)}io.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c
-marshal.$(OBJEXT): {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}oniguruma.h
-marshal.$(OBJEXT): {$(VPATH)}st.h
-marshal.$(OBJEXT): {$(VPATH)}subst.h
-marshal.$(OBJEXT): {$(VPATH)}util.h
-math.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-math.$(OBJEXT): $(top_srcdir)/include/ruby.h
-math.$(OBJEXT): {$(VPATH)}config.h
-math.$(OBJEXT): {$(VPATH)}defines.h
-math.$(OBJEXT): {$(VPATH)}encoding.h
-math.$(OBJEXT): {$(VPATH)}intern.h
-math.$(OBJEXT): {$(VPATH)}internal.h
-math.$(OBJEXT): {$(VPATH)}io.h
-math.$(OBJEXT): {$(VPATH)}math.c
-math.$(OBJEXT): {$(VPATH)}missing.h
-math.$(OBJEXT): {$(VPATH)}oniguruma.h
-math.$(OBJEXT): {$(VPATH)}st.h
-math.$(OBJEXT): {$(VPATH)}subst.h
-miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-miniinit.$(OBJEXT): {$(VPATH)}config.h
-miniinit.$(OBJEXT): {$(VPATH)}defines.h
-miniinit.$(OBJEXT): {$(VPATH)}encoding.h
-miniinit.$(OBJEXT): {$(VPATH)}intern.h
-miniinit.$(OBJEXT): {$(VPATH)}miniinit.c
-miniinit.$(OBJEXT): {$(VPATH)}missing.h
-miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
-miniinit.$(OBJEXT): {$(VPATH)}st.h
-miniinit.$(OBJEXT): {$(VPATH)}subst.h
-miniprelude.$(OBJEXT): {$(VPATH)}iseq.h
-miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
-node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-node.$(OBJEXT): $(CCAN_DIR)/list/list.h
-node.$(OBJEXT): $(CCAN_DIR)/str/str.h
-node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-node.$(OBJEXT): $(top_srcdir)/include/ruby.h
-node.$(OBJEXT): {$(VPATH)}config.h
-node.$(OBJEXT): {$(VPATH)}defines.h
-node.$(OBJEXT): {$(VPATH)}encoding.h
-node.$(OBJEXT): {$(VPATH)}id.h
-node.$(OBJEXT): {$(VPATH)}intern.h
-node.$(OBJEXT): {$(VPATH)}internal.h
-node.$(OBJEXT): {$(VPATH)}io.h
-node.$(OBJEXT): {$(VPATH)}method.h
-node.$(OBJEXT): {$(VPATH)}missing.h
-node.$(OBJEXT): {$(VPATH)}node.c
-node.$(OBJEXT): {$(VPATH)}node.h
-node.$(OBJEXT): {$(VPATH)}oniguruma.h
-node.$(OBJEXT): {$(VPATH)}ruby_assert.h
-node.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-node.$(OBJEXT): {$(VPATH)}st.h
-node.$(OBJEXT): {$(VPATH)}subst.h
-node.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-node.$(OBJEXT): {$(VPATH)}thread_native.h
-node.$(OBJEXT): {$(VPATH)}vm_core.h
-node.$(OBJEXT): {$(VPATH)}vm_debug.h
-node.$(OBJEXT): {$(VPATH)}vm_opts.h
-numeric.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-numeric.$(OBJEXT): $(top_srcdir)/include/ruby.h
-numeric.$(OBJEXT): {$(VPATH)}config.h
-numeric.$(OBJEXT): {$(VPATH)}defines.h
-numeric.$(OBJEXT): {$(VPATH)}encoding.h
-numeric.$(OBJEXT): {$(VPATH)}id.h
-numeric.$(OBJEXT): {$(VPATH)}intern.h
-numeric.$(OBJEXT): {$(VPATH)}internal.h
-numeric.$(OBJEXT): {$(VPATH)}io.h
-numeric.$(OBJEXT): {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c
-numeric.$(OBJEXT): {$(VPATH)}oniguruma.h
-numeric.$(OBJEXT): {$(VPATH)}st.h
-numeric.$(OBJEXT): {$(VPATH)}subst.h
-numeric.$(OBJEXT): {$(VPATH)}util.h
-object.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-object.$(OBJEXT): $(top_srcdir)/include/ruby.h
-object.$(OBJEXT): {$(VPATH)}config.h
-object.$(OBJEXT): {$(VPATH)}constant.h
-object.$(OBJEXT): {$(VPATH)}defines.h
-object.$(OBJEXT): {$(VPATH)}encoding.h
-object.$(OBJEXT): {$(VPATH)}id.h
-object.$(OBJEXT): {$(VPATH)}intern.h
-object.$(OBJEXT): {$(VPATH)}internal.h
-object.$(OBJEXT): {$(VPATH)}io.h
-object.$(OBJEXT): {$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c
-object.$(OBJEXT): {$(VPATH)}oniguruma.h
-object.$(OBJEXT): {$(VPATH)}probes.dmyh
-object.$(OBJEXT): {$(VPATH)}probes.h
-object.$(OBJEXT): {$(VPATH)}st.h
-object.$(OBJEXT): {$(VPATH)}subst.h
-object.$(OBJEXT): {$(VPATH)}util.h
-pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-pack.$(OBJEXT): $(top_srcdir)/include/ruby.h
-pack.$(OBJEXT): {$(VPATH)}config.h
-pack.$(OBJEXT): {$(VPATH)}defines.h
-pack.$(OBJEXT): {$(VPATH)}encoding.h
-pack.$(OBJEXT): {$(VPATH)}intern.h
-pack.$(OBJEXT): {$(VPATH)}internal.h
-pack.$(OBJEXT): {$(VPATH)}io.h
-pack.$(OBJEXT): {$(VPATH)}missing.h
-pack.$(OBJEXT): {$(VPATH)}oniguruma.h
-pack.$(OBJEXT): {$(VPATH)}pack.c
-pack.$(OBJEXT): {$(VPATH)}st.h
-pack.$(OBJEXT): {$(VPATH)}subst.h
-parse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-parse.$(OBJEXT): $(top_srcdir)/include/ruby.h
-parse.$(OBJEXT): {$(VPATH)}config.h
-parse.$(OBJEXT): {$(VPATH)}defines.h
-parse.$(OBJEXT): {$(VPATH)}defs/keywords
-parse.$(OBJEXT): {$(VPATH)}encoding.h
-parse.$(OBJEXT): {$(VPATH)}id.h
-parse.$(OBJEXT): {$(VPATH)}intern.h
-parse.$(OBJEXT): {$(VPATH)}internal.h
-parse.$(OBJEXT): {$(VPATH)}io.h
-parse.$(OBJEXT): {$(VPATH)}lex.c
-parse.$(OBJEXT): {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}node.h
-parse.$(OBJEXT): {$(VPATH)}oniguruma.h
-parse.$(OBJEXT): {$(VPATH)}parse.c
-parse.$(OBJEXT): {$(VPATH)}parse.h
-parse.$(OBJEXT): {$(VPATH)}parse.y
-parse.$(OBJEXT): {$(VPATH)}probes.dmyh
-parse.$(OBJEXT): {$(VPATH)}probes.h
-parse.$(OBJEXT): {$(VPATH)}regenc.h
-parse.$(OBJEXT): {$(VPATH)}regex.h
-parse.$(OBJEXT): {$(VPATH)}st.h
-parse.$(OBJEXT): {$(VPATH)}subst.h
-parse.$(OBJEXT): {$(VPATH)}symbol.h
-parse.$(OBJEXT): {$(VPATH)}util.h
-prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
-prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
-prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
-prelude.$(OBJEXT): {$(VPATH)}config.h
-prelude.$(OBJEXT): {$(VPATH)}defines.h
-prelude.$(OBJEXT): {$(VPATH)}encoding.h
-prelude.$(OBJEXT): {$(VPATH)}id.h
-prelude.$(OBJEXT): {$(VPATH)}intern.h
-prelude.$(OBJEXT): {$(VPATH)}internal.h
-prelude.$(OBJEXT): {$(VPATH)}io.h
-prelude.$(OBJEXT): {$(VPATH)}iseq.h
-prelude.$(OBJEXT): {$(VPATH)}method.h
-prelude.$(OBJEXT): {$(VPATH)}missing.h
-prelude.$(OBJEXT): {$(VPATH)}node.h
-prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
-prelude.$(OBJEXT): {$(VPATH)}prelude.c
-prelude.$(OBJEXT): {$(VPATH)}ruby_assert.h
-prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-prelude.$(OBJEXT): {$(VPATH)}st.h
-prelude.$(OBJEXT): {$(VPATH)}subst.h
-prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-prelude.$(OBJEXT): {$(VPATH)}thread_native.h
-prelude.$(OBJEXT): {$(VPATH)}vm_core.h
-prelude.$(OBJEXT): {$(VPATH)}vm_debug.h
-prelude.$(OBJEXT): {$(VPATH)}vm_opts.h
-proc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-proc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-proc.$(OBJEXT): $(CCAN_DIR)/list/list.h
-proc.$(OBJEXT): $(CCAN_DIR)/str/str.h
-proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-proc.$(OBJEXT): $(top_srcdir)/include/ruby.h
-proc.$(OBJEXT): {$(VPATH)}config.h
-proc.$(OBJEXT): {$(VPATH)}defines.h
-proc.$(OBJEXT): {$(VPATH)}encoding.h
-proc.$(OBJEXT): {$(VPATH)}eval_intern.h
-proc.$(OBJEXT): {$(VPATH)}gc.h
-proc.$(OBJEXT): {$(VPATH)}id.h
-proc.$(OBJEXT): {$(VPATH)}intern.h
-proc.$(OBJEXT): {$(VPATH)}internal.h
-proc.$(OBJEXT): {$(VPATH)}io.h
-proc.$(OBJEXT): {$(VPATH)}iseq.h
-proc.$(OBJEXT): {$(VPATH)}method.h
-proc.$(OBJEXT): {$(VPATH)}missing.h
-proc.$(OBJEXT): {$(VPATH)}node.h
-proc.$(OBJEXT): {$(VPATH)}oniguruma.h
-proc.$(OBJEXT): {$(VPATH)}proc.c
-proc.$(OBJEXT): {$(VPATH)}ruby_assert.h
-proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-proc.$(OBJEXT): {$(VPATH)}st.h
-proc.$(OBJEXT): {$(VPATH)}subst.h
-proc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-proc.$(OBJEXT): {$(VPATH)}thread_native.h
-proc.$(OBJEXT): {$(VPATH)}vm_core.h
-proc.$(OBJEXT): {$(VPATH)}vm_debug.h
-proc.$(OBJEXT): {$(VPATH)}vm_opts.h
-process.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-process.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-process.$(OBJEXT): $(CCAN_DIR)/list/list.h
-process.$(OBJEXT): $(CCAN_DIR)/str/str.h
-process.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-process.$(OBJEXT): $(top_srcdir)/include/ruby.h
-process.$(OBJEXT): {$(VPATH)}config.h
-process.$(OBJEXT): {$(VPATH)}defines.h
-process.$(OBJEXT): {$(VPATH)}dln.h
-process.$(OBJEXT): {$(VPATH)}encoding.h
-process.$(OBJEXT): {$(VPATH)}id.h
-process.$(OBJEXT): {$(VPATH)}intern.h
-process.$(OBJEXT): {$(VPATH)}internal.h
-process.$(OBJEXT): {$(VPATH)}io.h
-process.$(OBJEXT): {$(VPATH)}method.h
-process.$(OBJEXT): {$(VPATH)}missing.h
-process.$(OBJEXT): {$(VPATH)}node.h
-process.$(OBJEXT): {$(VPATH)}oniguruma.h
-process.$(OBJEXT): {$(VPATH)}process.c
-process.$(OBJEXT): {$(VPATH)}ruby_assert.h
-process.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-process.$(OBJEXT): {$(VPATH)}st.h
-process.$(OBJEXT): {$(VPATH)}subst.h
-process.$(OBJEXT): {$(VPATH)}thread.h
-process.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-process.$(OBJEXT): {$(VPATH)}thread_native.h
-process.$(OBJEXT): {$(VPATH)}util.h
-process.$(OBJEXT): {$(VPATH)}vm_core.h
-process.$(OBJEXT): {$(VPATH)}vm_debug.h
-process.$(OBJEXT): {$(VPATH)}vm_opts.h
-random.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-random.$(OBJEXT): $(top_srcdir)/include/ruby.h
-random.$(OBJEXT): {$(VPATH)}config.h
-random.$(OBJEXT): {$(VPATH)}defines.h
-random.$(OBJEXT): {$(VPATH)}encoding.h
-random.$(OBJEXT): {$(VPATH)}intern.h
-random.$(OBJEXT): {$(VPATH)}internal.h
-random.$(OBJEXT): {$(VPATH)}io.h
-random.$(OBJEXT): {$(VPATH)}missing.h
-random.$(OBJEXT): {$(VPATH)}oniguruma.h
-random.$(OBJEXT): {$(VPATH)}random.c
-random.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-random.$(OBJEXT): {$(VPATH)}siphash.c
-random.$(OBJEXT): {$(VPATH)}siphash.h
-random.$(OBJEXT): {$(VPATH)}st.h
-random.$(OBJEXT): {$(VPATH)}subst.h
-range.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-range.$(OBJEXT): $(top_srcdir)/include/ruby.h
-range.$(OBJEXT): {$(VPATH)}config.h
-range.$(OBJEXT): {$(VPATH)}defines.h
-range.$(OBJEXT): {$(VPATH)}encoding.h
-range.$(OBJEXT): {$(VPATH)}id.h
-range.$(OBJEXT): {$(VPATH)}intern.h
-range.$(OBJEXT): {$(VPATH)}internal.h
-range.$(OBJEXT): {$(VPATH)}io.h
-range.$(OBJEXT): {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}oniguruma.h
-range.$(OBJEXT): {$(VPATH)}range.c
-range.$(OBJEXT): {$(VPATH)}st.h
-range.$(OBJEXT): {$(VPATH)}subst.h
-rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-rational.$(OBJEXT): $(top_srcdir)/include/ruby.h
-rational.$(OBJEXT): {$(VPATH)}config.h
-rational.$(OBJEXT): {$(VPATH)}defines.h
-rational.$(OBJEXT): {$(VPATH)}encoding.h
-rational.$(OBJEXT): {$(VPATH)}intern.h
-rational.$(OBJEXT): {$(VPATH)}internal.h
-rational.$(OBJEXT): {$(VPATH)}io.h
-rational.$(OBJEXT): {$(VPATH)}missing.h
-rational.$(OBJEXT): {$(VPATH)}oniguruma.h
-rational.$(OBJEXT): {$(VPATH)}rational.c
-rational.$(OBJEXT): {$(VPATH)}ruby_assert.h
-rational.$(OBJEXT): {$(VPATH)}st.h
-rational.$(OBJEXT): {$(VPATH)}subst.h
-re.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-re.$(OBJEXT): $(top_srcdir)/include/ruby.h
-re.$(OBJEXT): {$(VPATH)}config.h
-re.$(OBJEXT): {$(VPATH)}defines.h
-re.$(OBJEXT): {$(VPATH)}encindex.h
-re.$(OBJEXT): {$(VPATH)}encoding.h
-re.$(OBJEXT): {$(VPATH)}intern.h
-re.$(OBJEXT): {$(VPATH)}internal.h
-re.$(OBJEXT): {$(VPATH)}io.h
-re.$(OBJEXT): {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}oniguruma.h
-re.$(OBJEXT): {$(VPATH)}re.c
-re.$(OBJEXT): {$(VPATH)}re.h
-re.$(OBJEXT): {$(VPATH)}regenc.h
-re.$(OBJEXT): {$(VPATH)}regex.h
-re.$(OBJEXT): {$(VPATH)}regint.h
-re.$(OBJEXT): {$(VPATH)}st.h
-re.$(OBJEXT): {$(VPATH)}subst.h
-re.$(OBJEXT): {$(VPATH)}util.h
-regcomp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-regcomp.$(OBJEXT): {$(VPATH)}config.h
-regcomp.$(OBJEXT): {$(VPATH)}defines.h
-regcomp.$(OBJEXT): {$(VPATH)}intern.h
-regcomp.$(OBJEXT): {$(VPATH)}missing.h
-regcomp.$(OBJEXT): {$(VPATH)}oniguruma.h
-regcomp.$(OBJEXT): {$(VPATH)}regcomp.c
-regcomp.$(OBJEXT): {$(VPATH)}regenc.h
-regcomp.$(OBJEXT): {$(VPATH)}regint.h
-regcomp.$(OBJEXT): {$(VPATH)}regparse.h
-regcomp.$(OBJEXT): {$(VPATH)}st.h
-regcomp.$(OBJEXT): {$(VPATH)}subst.h
-regenc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-regenc.$(OBJEXT): {$(VPATH)}config.h
-regenc.$(OBJEXT): {$(VPATH)}defines.h
-regenc.$(OBJEXT): {$(VPATH)}intern.h
-regenc.$(OBJEXT): {$(VPATH)}missing.h
-regenc.$(OBJEXT): {$(VPATH)}oniguruma.h
-regenc.$(OBJEXT): {$(VPATH)}regenc.c
-regenc.$(OBJEXT): {$(VPATH)}regenc.h
-regenc.$(OBJEXT): {$(VPATH)}regint.h
-regenc.$(OBJEXT): {$(VPATH)}st.h
-regenc.$(OBJEXT): {$(VPATH)}subst.h
-regerror.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-regerror.$(OBJEXT): {$(VPATH)}config.h
-regerror.$(OBJEXT): {$(VPATH)}defines.h
-regerror.$(OBJEXT): {$(VPATH)}intern.h
-regerror.$(OBJEXT): {$(VPATH)}missing.h
-regerror.$(OBJEXT): {$(VPATH)}oniguruma.h
-regerror.$(OBJEXT): {$(VPATH)}regenc.h
-regerror.$(OBJEXT): {$(VPATH)}regerror.c
-regerror.$(OBJEXT): {$(VPATH)}regint.h
-regerror.$(OBJEXT): {$(VPATH)}st.h
-regerror.$(OBJEXT): {$(VPATH)}subst.h
-regexec.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-regexec.$(OBJEXT): {$(VPATH)}config.h
-regexec.$(OBJEXT): {$(VPATH)}defines.h
-regexec.$(OBJEXT): {$(VPATH)}intern.h
-regexec.$(OBJEXT): {$(VPATH)}missing.h
-regexec.$(OBJEXT): {$(VPATH)}oniguruma.h
-regexec.$(OBJEXT): {$(VPATH)}regenc.h
-regexec.$(OBJEXT): {$(VPATH)}regexec.c
-regexec.$(OBJEXT): {$(VPATH)}regint.h
-regexec.$(OBJEXT): {$(VPATH)}st.h
-regexec.$(OBJEXT): {$(VPATH)}subst.h
-regparse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-regparse.$(OBJEXT): {$(VPATH)}config.h
-regparse.$(OBJEXT): {$(VPATH)}defines.h
-regparse.$(OBJEXT): {$(VPATH)}intern.h
-regparse.$(OBJEXT): {$(VPATH)}missing.h
-regparse.$(OBJEXT): {$(VPATH)}oniguruma.h
-regparse.$(OBJEXT): {$(VPATH)}regenc.h
-regparse.$(OBJEXT): {$(VPATH)}regint.h
-regparse.$(OBJEXT): {$(VPATH)}regparse.c
-regparse.$(OBJEXT): {$(VPATH)}regparse.h
-regparse.$(OBJEXT): {$(VPATH)}st.h
-regparse.$(OBJEXT): {$(VPATH)}subst.h
-regsyntax.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-regsyntax.$(OBJEXT): {$(VPATH)}config.h
-regsyntax.$(OBJEXT): {$(VPATH)}defines.h
-regsyntax.$(OBJEXT): {$(VPATH)}intern.h
-regsyntax.$(OBJEXT): {$(VPATH)}missing.h
-regsyntax.$(OBJEXT): {$(VPATH)}oniguruma.h
-regsyntax.$(OBJEXT): {$(VPATH)}regenc.h
-regsyntax.$(OBJEXT): {$(VPATH)}regint.h
-regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c
-regsyntax.$(OBJEXT): {$(VPATH)}st.h
-regsyntax.$(OBJEXT): {$(VPATH)}subst.h
-ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.c
-ruby-runner.$(OBJEXT): {$(VPATH)}ruby-runner.h
-ruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-ruby.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-ruby.$(OBJEXT): $(CCAN_DIR)/list/list.h
-ruby.$(OBJEXT): $(CCAN_DIR)/str/str.h
-ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-ruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
-ruby.$(OBJEXT): {$(VPATH)}config.h
-ruby.$(OBJEXT): {$(VPATH)}defines.h
-ruby.$(OBJEXT): {$(VPATH)}dln.h
-ruby.$(OBJEXT): {$(VPATH)}encoding.h
-ruby.$(OBJEXT): {$(VPATH)}eval_intern.h
-ruby.$(OBJEXT): {$(VPATH)}id.h
-ruby.$(OBJEXT): {$(VPATH)}intern.h
-ruby.$(OBJEXT): {$(VPATH)}internal.h
-ruby.$(OBJEXT): {$(VPATH)}io.h
-ruby.$(OBJEXT): {$(VPATH)}method.h
-ruby.$(OBJEXT): {$(VPATH)}missing.h
-ruby.$(OBJEXT): {$(VPATH)}node.h
-ruby.$(OBJEXT): {$(VPATH)}oniguruma.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c
-ruby.$(OBJEXT): {$(VPATH)}ruby_assert.h
-ruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-ruby.$(OBJEXT): {$(VPATH)}st.h
-ruby.$(OBJEXT): {$(VPATH)}subst.h
-ruby.$(OBJEXT): {$(VPATH)}thread.h
-ruby.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-ruby.$(OBJEXT): {$(VPATH)}thread_native.h
-ruby.$(OBJEXT): {$(VPATH)}util.h
-ruby.$(OBJEXT): {$(VPATH)}vm_core.h
-ruby.$(OBJEXT): {$(VPATH)}vm_debug.h
-ruby.$(OBJEXT): {$(VPATH)}vm_opts.h
-safe.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-safe.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-safe.$(OBJEXT): $(CCAN_DIR)/list/list.h
-safe.$(OBJEXT): $(CCAN_DIR)/str/str.h
-safe.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-safe.$(OBJEXT): $(top_srcdir)/include/ruby.h
-safe.$(OBJEXT): {$(VPATH)}config.h
-safe.$(OBJEXT): {$(VPATH)}defines.h
-safe.$(OBJEXT): {$(VPATH)}encoding.h
-safe.$(OBJEXT): {$(VPATH)}id.h
-safe.$(OBJEXT): {$(VPATH)}intern.h
-safe.$(OBJEXT): {$(VPATH)}internal.h
-safe.$(OBJEXT): {$(VPATH)}io.h
-safe.$(OBJEXT): {$(VPATH)}method.h
-safe.$(OBJEXT): {$(VPATH)}missing.h
-safe.$(OBJEXT): {$(VPATH)}node.h
-safe.$(OBJEXT): {$(VPATH)}oniguruma.h
-safe.$(OBJEXT): {$(VPATH)}ruby_assert.h
-safe.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-safe.$(OBJEXT): {$(VPATH)}safe.c
-safe.$(OBJEXT): {$(VPATH)}st.h
-safe.$(OBJEXT): {$(VPATH)}subst.h
-safe.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-safe.$(OBJEXT): {$(VPATH)}thread_native.h
-safe.$(OBJEXT): {$(VPATH)}vm_core.h
-safe.$(OBJEXT): {$(VPATH)}vm_debug.h
-safe.$(OBJEXT): {$(VPATH)}vm_opts.h
-setproctitle.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-setproctitle.$(OBJEXT): $(top_srcdir)/include/ruby.h
-setproctitle.$(OBJEXT): {$(VPATH)}config.h
-setproctitle.$(OBJEXT): {$(VPATH)}defines.h
-setproctitle.$(OBJEXT): {$(VPATH)}intern.h
-setproctitle.$(OBJEXT): {$(VPATH)}missing.h
-setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
-setproctitle.$(OBJEXT): {$(VPATH)}st.h
-setproctitle.$(OBJEXT): {$(VPATH)}subst.h
-setproctitle.$(OBJEXT): {$(VPATH)}util.h
-signal.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-signal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-signal.$(OBJEXT): $(CCAN_DIR)/list/list.h
-signal.$(OBJEXT): $(CCAN_DIR)/str/str.h
-signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-signal.$(OBJEXT): $(top_srcdir)/include/ruby.h
-signal.$(OBJEXT): {$(VPATH)}config.h
-signal.$(OBJEXT): {$(VPATH)}defines.h
-signal.$(OBJEXT): {$(VPATH)}encoding.h
-signal.$(OBJEXT): {$(VPATH)}eval_intern.h
-signal.$(OBJEXT): {$(VPATH)}id.h
-signal.$(OBJEXT): {$(VPATH)}intern.h
-signal.$(OBJEXT): {$(VPATH)}internal.h
-signal.$(OBJEXT): {$(VPATH)}io.h
-signal.$(OBJEXT): {$(VPATH)}method.h
-signal.$(OBJEXT): {$(VPATH)}missing.h
-signal.$(OBJEXT): {$(VPATH)}node.h
-signal.$(OBJEXT): {$(VPATH)}oniguruma.h
-signal.$(OBJEXT): {$(VPATH)}ruby_assert.h
-signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-signal.$(OBJEXT): {$(VPATH)}signal.c
-signal.$(OBJEXT): {$(VPATH)}st.h
-signal.$(OBJEXT): {$(VPATH)}subst.h
-signal.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-signal.$(OBJEXT): {$(VPATH)}thread_native.h
-signal.$(OBJEXT): {$(VPATH)}vm_core.h
-signal.$(OBJEXT): {$(VPATH)}vm_debug.h
-signal.$(OBJEXT): {$(VPATH)}vm_opts.h
-sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-sprintf.$(OBJEXT): $(top_srcdir)/include/ruby.h
-sprintf.$(OBJEXT): {$(VPATH)}config.h
-sprintf.$(OBJEXT): {$(VPATH)}defines.h
-sprintf.$(OBJEXT): {$(VPATH)}encoding.h
-sprintf.$(OBJEXT): {$(VPATH)}id.h
-sprintf.$(OBJEXT): {$(VPATH)}intern.h
-sprintf.$(OBJEXT): {$(VPATH)}internal.h
-sprintf.$(OBJEXT): {$(VPATH)}io.h
-sprintf.$(OBJEXT): {$(VPATH)}missing.h
-sprintf.$(OBJEXT): {$(VPATH)}oniguruma.h
-sprintf.$(OBJEXT): {$(VPATH)}re.h
-sprintf.$(OBJEXT): {$(VPATH)}regex.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c
-sprintf.$(OBJEXT): {$(VPATH)}st.h
-sprintf.$(OBJEXT): {$(VPATH)}subst.h
-sprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-st.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-st.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-st.$(OBJEXT): $(CCAN_DIR)/list/list.h
-st.$(OBJEXT): $(CCAN_DIR)/str/str.h
-st.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-st.$(OBJEXT): $(top_srcdir)/include/ruby.h
-st.$(OBJEXT): {$(VPATH)}config.h
-st.$(OBJEXT): {$(VPATH)}defines.h
-st.$(OBJEXT): {$(VPATH)}encoding.h
-st.$(OBJEXT): {$(VPATH)}intern.h
-st.$(OBJEXT): {$(VPATH)}internal.h
-st.$(OBJEXT): {$(VPATH)}io.h
-st.$(OBJEXT): {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}oniguruma.h
-st.$(OBJEXT): {$(VPATH)}st.c
-st.$(OBJEXT): {$(VPATH)}st.h
-st.$(OBJEXT): {$(VPATH)}subst.h
-strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-strftime.$(OBJEXT): $(top_srcdir)/include/ruby.h
-strftime.$(OBJEXT): {$(VPATH)}config.h
-strftime.$(OBJEXT): {$(VPATH)}defines.h
-strftime.$(OBJEXT): {$(VPATH)}encoding.h
-strftime.$(OBJEXT): {$(VPATH)}intern.h
-strftime.$(OBJEXT): {$(VPATH)}internal.h
-strftime.$(OBJEXT): {$(VPATH)}io.h
-strftime.$(OBJEXT): {$(VPATH)}missing.h
-strftime.$(OBJEXT): {$(VPATH)}oniguruma.h
-strftime.$(OBJEXT): {$(VPATH)}st.h
-strftime.$(OBJEXT): {$(VPATH)}strftime.c
-strftime.$(OBJEXT): {$(VPATH)}subst.h
-strftime.$(OBJEXT): {$(VPATH)}timev.h
-string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-string.$(OBJEXT): $(top_srcdir)/include/ruby.h
-string.$(OBJEXT): {$(VPATH)}config.h
-string.$(OBJEXT): {$(VPATH)}crypt.h
-string.$(OBJEXT): {$(VPATH)}defines.h
-string.$(OBJEXT): {$(VPATH)}encindex.h
-string.$(OBJEXT): {$(VPATH)}encoding.h
-string.$(OBJEXT): {$(VPATH)}gc.h
-string.$(OBJEXT): {$(VPATH)}id.h
-string.$(OBJEXT): {$(VPATH)}intern.h
-string.$(OBJEXT): {$(VPATH)}internal.h
-string.$(OBJEXT): {$(VPATH)}io.h
-string.$(OBJEXT): {$(VPATH)}missing.h
-string.$(OBJEXT): {$(VPATH)}oniguruma.h
-string.$(OBJEXT): {$(VPATH)}probes.dmyh
-string.$(OBJEXT): {$(VPATH)}probes.h
-string.$(OBJEXT): {$(VPATH)}re.h
-string.$(OBJEXT): {$(VPATH)}regex.h
-string.$(OBJEXT): {$(VPATH)}ruby_assert.h
-string.$(OBJEXT): {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c
-string.$(OBJEXT): {$(VPATH)}subst.h
-strlcat.$(OBJEXT): {$(VPATH)}config.h
-strlcat.$(OBJEXT): {$(VPATH)}missing.h
-strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
-strlcpy.$(OBJEXT): {$(VPATH)}config.h
-strlcpy.$(OBJEXT): {$(VPATH)}missing.h
-strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
-struct.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-struct.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-struct.$(OBJEXT): $(CCAN_DIR)/list/list.h
-struct.$(OBJEXT): $(CCAN_DIR)/str/str.h
-struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-struct.$(OBJEXT): $(top_srcdir)/include/ruby.h
-struct.$(OBJEXT): {$(VPATH)}config.h
-struct.$(OBJEXT): {$(VPATH)}defines.h
-struct.$(OBJEXT): {$(VPATH)}encoding.h
-struct.$(OBJEXT): {$(VPATH)}id.h
-struct.$(OBJEXT): {$(VPATH)}intern.h
-struct.$(OBJEXT): {$(VPATH)}internal.h
-struct.$(OBJEXT): {$(VPATH)}io.h
-struct.$(OBJEXT): {$(VPATH)}method.h
-struct.$(OBJEXT): {$(VPATH)}missing.h
-struct.$(OBJEXT): {$(VPATH)}node.h
-struct.$(OBJEXT): {$(VPATH)}oniguruma.h
-struct.$(OBJEXT): {$(VPATH)}ruby_assert.h
-struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-struct.$(OBJEXT): {$(VPATH)}st.h
-struct.$(OBJEXT): {$(VPATH)}struct.c
-struct.$(OBJEXT): {$(VPATH)}subst.h
-struct.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-struct.$(OBJEXT): {$(VPATH)}thread_native.h
-struct.$(OBJEXT): {$(VPATH)}vm_core.h
-struct.$(OBJEXT): {$(VPATH)}vm_debug.h
-struct.$(OBJEXT): {$(VPATH)}vm_opts.h
-symbol.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-symbol.$(OBJEXT): $(top_srcdir)/include/ruby.h
-symbol.$(OBJEXT): {$(VPATH)}config.h
-symbol.$(OBJEXT): {$(VPATH)}defines.h
-symbol.$(OBJEXT): {$(VPATH)}encoding.h
-symbol.$(OBJEXT): {$(VPATH)}gc.h
-symbol.$(OBJEXT): {$(VPATH)}id.c
-symbol.$(OBJEXT): {$(VPATH)}id.h
-symbol.$(OBJEXT): {$(VPATH)}id_table.c
-symbol.$(OBJEXT): {$(VPATH)}id_table.h
-symbol.$(OBJEXT): {$(VPATH)}intern.h
-symbol.$(OBJEXT): {$(VPATH)}internal.h
-symbol.$(OBJEXT): {$(VPATH)}io.h
-symbol.$(OBJEXT): {$(VPATH)}missing.h
-symbol.$(OBJEXT): {$(VPATH)}oniguruma.h
-symbol.$(OBJEXT): {$(VPATH)}probes.dmyh
-symbol.$(OBJEXT): {$(VPATH)}probes.h
-symbol.$(OBJEXT): {$(VPATH)}ruby_assert.h
-symbol.$(OBJEXT): {$(VPATH)}st.h
-symbol.$(OBJEXT): {$(VPATH)}subst.h
-symbol.$(OBJEXT): {$(VPATH)}symbol.c
-symbol.$(OBJEXT): {$(VPATH)}symbol.h
-thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-thread.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-thread.$(OBJEXT): $(CCAN_DIR)/list/list.h
-thread.$(OBJEXT): $(CCAN_DIR)/str/str.h
-thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-thread.$(OBJEXT): $(top_srcdir)/include/ruby.h
-thread.$(OBJEXT): {$(VPATH)}config.h
-thread.$(OBJEXT): {$(VPATH)}defines.h
-thread.$(OBJEXT): {$(VPATH)}encoding.h
-thread.$(OBJEXT): {$(VPATH)}eval_intern.h
-thread.$(OBJEXT): {$(VPATH)}gc.h
-thread.$(OBJEXT): {$(VPATH)}id.h
-thread.$(OBJEXT): {$(VPATH)}intern.h
-thread.$(OBJEXT): {$(VPATH)}internal.h
-thread.$(OBJEXT): {$(VPATH)}io.h
-thread.$(OBJEXT): {$(VPATH)}method.h
-thread.$(OBJEXT): {$(VPATH)}missing.h
-thread.$(OBJEXT): {$(VPATH)}node.h
-thread.$(OBJEXT): {$(VPATH)}oniguruma.h
-thread.$(OBJEXT): {$(VPATH)}ruby_assert.h
-thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-thread.$(OBJEXT): {$(VPATH)}st.h
-thread.$(OBJEXT): {$(VPATH)}subst.h
-thread.$(OBJEXT): {$(VPATH)}thread.c
-thread.$(OBJEXT): {$(VPATH)}thread.h
-thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).c
-thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-thread.$(OBJEXT): {$(VPATH)}thread_native.h
-thread.$(OBJEXT): {$(VPATH)}thread_sync.c
-thread.$(OBJEXT): {$(VPATH)}timev.h
-thread.$(OBJEXT): {$(VPATH)}vm_core.h
-thread.$(OBJEXT): {$(VPATH)}vm_debug.h
-thread.$(OBJEXT): {$(VPATH)}vm_opts.h
-time.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-time.$(OBJEXT): $(top_srcdir)/include/ruby.h
-time.$(OBJEXT): {$(VPATH)}config.h
-time.$(OBJEXT): {$(VPATH)}defines.h
-time.$(OBJEXT): {$(VPATH)}encoding.h
-time.$(OBJEXT): {$(VPATH)}intern.h
-time.$(OBJEXT): {$(VPATH)}internal.h
-time.$(OBJEXT): {$(VPATH)}io.h
-time.$(OBJEXT): {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}oniguruma.h
-time.$(OBJEXT): {$(VPATH)}st.h
-time.$(OBJEXT): {$(VPATH)}subst.h
-time.$(OBJEXT): {$(VPATH)}time.c
-time.$(OBJEXT): {$(VPATH)}timev.h
-transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-transcode.$(OBJEXT): $(top_srcdir)/include/ruby.h
-transcode.$(OBJEXT): {$(VPATH)}config.h
-transcode.$(OBJEXT): {$(VPATH)}defines.h
-transcode.$(OBJEXT): {$(VPATH)}encoding.h
-transcode.$(OBJEXT): {$(VPATH)}intern.h
-transcode.$(OBJEXT): {$(VPATH)}internal.h
-transcode.$(OBJEXT): {$(VPATH)}io.h
-transcode.$(OBJEXT): {$(VPATH)}missing.h
-transcode.$(OBJEXT): {$(VPATH)}oniguruma.h
-transcode.$(OBJEXT): {$(VPATH)}st.h
-transcode.$(OBJEXT): {$(VPATH)}subst.h
-transcode.$(OBJEXT): {$(VPATH)}transcode.c
-transcode.$(OBJEXT): {$(VPATH)}transcode_data.h
-util.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-util.$(OBJEXT): $(top_srcdir)/include/ruby.h
-util.$(OBJEXT): {$(VPATH)}config.h
-util.$(OBJEXT): {$(VPATH)}defines.h
-util.$(OBJEXT): {$(VPATH)}encoding.h
-util.$(OBJEXT): {$(VPATH)}intern.h
-util.$(OBJEXT): {$(VPATH)}internal.h
-util.$(OBJEXT): {$(VPATH)}io.h
-util.$(OBJEXT): {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}oniguruma.h
-util.$(OBJEXT): {$(VPATH)}st.h
-util.$(OBJEXT): {$(VPATH)}subst.h
-util.$(OBJEXT): {$(VPATH)}util.c
-util.$(OBJEXT): {$(VPATH)}util.h
-variable.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-variable.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-variable.$(OBJEXT): $(CCAN_DIR)/list/list.h
-variable.$(OBJEXT): $(CCAN_DIR)/str/str.h
-variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-variable.$(OBJEXT): $(top_srcdir)/include/ruby.h
-variable.$(OBJEXT): {$(VPATH)}config.h
-variable.$(OBJEXT): {$(VPATH)}constant.h
-variable.$(OBJEXT): {$(VPATH)}defines.h
-variable.$(OBJEXT): {$(VPATH)}encoding.h
-variable.$(OBJEXT): {$(VPATH)}id.h
-variable.$(OBJEXT): {$(VPATH)}id_table.h
-variable.$(OBJEXT): {$(VPATH)}intern.h
-variable.$(OBJEXT): {$(VPATH)}internal.h
-variable.$(OBJEXT): {$(VPATH)}io.h
-variable.$(OBJEXT): {$(VPATH)}missing.h
-variable.$(OBJEXT): {$(VPATH)}oniguruma.h
-variable.$(OBJEXT): {$(VPATH)}st.h
-variable.$(OBJEXT): {$(VPATH)}subst.h
-variable.$(OBJEXT): {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c
-version.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-version.$(OBJEXT): $(hdrdir)/ruby/version.h
-version.$(OBJEXT): $(top_srcdir)/revision.h
-version.$(OBJEXT): $(top_srcdir)/version.h
-version.$(OBJEXT): {$(VPATH)}config.h
-version.$(OBJEXT): {$(VPATH)}defines.h
-version.$(OBJEXT): {$(VPATH)}intern.h
-version.$(OBJEXT): {$(VPATH)}missing.h
-version.$(OBJEXT): {$(VPATH)}st.h
-version.$(OBJEXT): {$(VPATH)}subst.h
-version.$(OBJEXT): {$(VPATH)}version.c
-vm.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-vm.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-vm.$(OBJEXT): $(CCAN_DIR)/list/list.h
-vm.$(OBJEXT): $(CCAN_DIR)/str/str.h
-vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm.$(OBJEXT): $(top_srcdir)/include/ruby.h
-vm.$(OBJEXT): {$(VPATH)}config.h
-vm.$(OBJEXT): {$(VPATH)}constant.h
-vm.$(OBJEXT): {$(VPATH)}defines.h
-vm.$(OBJEXT): {$(VPATH)}encoding.h
-vm.$(OBJEXT): {$(VPATH)}eval_intern.h
-vm.$(OBJEXT): {$(VPATH)}gc.h
-vm.$(OBJEXT): {$(VPATH)}id.h
-vm.$(OBJEXT): {$(VPATH)}id_table.h
-vm.$(OBJEXT): {$(VPATH)}insns.def
-vm.$(OBJEXT): {$(VPATH)}insns.inc
-vm.$(OBJEXT): {$(VPATH)}intern.h
-vm.$(OBJEXT): {$(VPATH)}internal.h
-vm.$(OBJEXT): {$(VPATH)}io.h
-vm.$(OBJEXT): {$(VPATH)}iseq.h
-vm.$(OBJEXT): {$(VPATH)}method.h
-vm.$(OBJEXT): {$(VPATH)}missing.h
-vm.$(OBJEXT): {$(VPATH)}node.h
-vm.$(OBJEXT): {$(VPATH)}oniguruma.h
-vm.$(OBJEXT): {$(VPATH)}probes.dmyh
-vm.$(OBJEXT): {$(VPATH)}probes.h
-vm.$(OBJEXT): {$(VPATH)}probes_helper.h
-vm.$(OBJEXT): {$(VPATH)}ruby_assert.h
-vm.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-vm.$(OBJEXT): {$(VPATH)}st.h
-vm.$(OBJEXT): {$(VPATH)}subst.h
-vm.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-vm.$(OBJEXT): {$(VPATH)}thread_native.h
-vm.$(OBJEXT): {$(VPATH)}vm.c
-vm.$(OBJEXT): {$(VPATH)}vm.h
-vm.$(OBJEXT): {$(VPATH)}vm.inc
-vm.$(OBJEXT): {$(VPATH)}vm_args.c
-vm.$(OBJEXT): {$(VPATH)}vm_call_iseq_optimized.inc
-vm.$(OBJEXT): {$(VPATH)}vm_core.h
-vm.$(OBJEXT): {$(VPATH)}vm_debug.h
-vm.$(OBJEXT): {$(VPATH)}vm_eval.c
-vm.$(OBJEXT): {$(VPATH)}vm_exec.c
-vm.$(OBJEXT): {$(VPATH)}vm_exec.h
-vm.$(OBJEXT): {$(VPATH)}vm_insnhelper.c
-vm.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
-vm.$(OBJEXT): {$(VPATH)}vm_method.c
-vm.$(OBJEXT): {$(VPATH)}vm_opts.h
-vm.$(OBJEXT): {$(VPATH)}vmtc.inc
-vm_backtrace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-vm_backtrace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h
-vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h
-vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_backtrace.$(OBJEXT): $(top_srcdir)/include/ruby.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}config.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}defines.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}encoding.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}eval_intern.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}id.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}intern.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}internal.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}io.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}iseq.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}method.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}missing.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}node.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}oniguruma.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_assert.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}st.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}subst.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-vm_backtrace.$(OBJEXT): {$(VPATH)}thread_native.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c
-vm_backtrace.$(OBJEXT): {$(VPATH)}vm_core.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}vm_debug.h
-vm_backtrace.$(OBJEXT): {$(VPATH)}vm_opts.h
-vm_dump.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-vm_dump.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h
-vm_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h
-vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_dump.$(OBJEXT): $(top_srcdir)/include/ruby.h
-vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h
-vm_dump.$(OBJEXT): {$(VPATH)}config.h
-vm_dump.$(OBJEXT): {$(VPATH)}defines.h
-vm_dump.$(OBJEXT): {$(VPATH)}encoding.h
-vm_dump.$(OBJEXT): {$(VPATH)}id.h
-vm_dump.$(OBJEXT): {$(VPATH)}intern.h
-vm_dump.$(OBJEXT): {$(VPATH)}internal.h
-vm_dump.$(OBJEXT): {$(VPATH)}io.h
-vm_dump.$(OBJEXT): {$(VPATH)}iseq.h
-vm_dump.$(OBJEXT): {$(VPATH)}method.h
-vm_dump.$(OBJEXT): {$(VPATH)}missing.h
-vm_dump.$(OBJEXT): {$(VPATH)}node.h
-vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
-vm_dump.$(OBJEXT): {$(VPATH)}ruby_assert.h
-vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-vm_dump.$(OBJEXT): {$(VPATH)}st.h
-vm_dump.$(OBJEXT): {$(VPATH)}subst.h
-vm_dump.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-vm_dump.$(OBJEXT): {$(VPATH)}thread_native.h
-vm_dump.$(OBJEXT): {$(VPATH)}vm_core.h
-vm_dump.$(OBJEXT): {$(VPATH)}vm_debug.h
-vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c
-vm_dump.$(OBJEXT): {$(VPATH)}vm_opts.h
-vm_trace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
-vm_trace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
-vm_trace.$(OBJEXT): $(CCAN_DIR)/list/list.h
-vm_trace.$(OBJEXT): $(CCAN_DIR)/str/str.h
-vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-vm_trace.$(OBJEXT): $(top_srcdir)/include/ruby.h
-vm_trace.$(OBJEXT): {$(VPATH)}config.h
-vm_trace.$(OBJEXT): {$(VPATH)}debug.h
-vm_trace.$(OBJEXT): {$(VPATH)}defines.h
-vm_trace.$(OBJEXT): {$(VPATH)}encoding.h
-vm_trace.$(OBJEXT): {$(VPATH)}eval_intern.h
-vm_trace.$(OBJEXT): {$(VPATH)}id.h
-vm_trace.$(OBJEXT): {$(VPATH)}intern.h
-vm_trace.$(OBJEXT): {$(VPATH)}internal.h
-vm_trace.$(OBJEXT): {$(VPATH)}io.h
-vm_trace.$(OBJEXT): {$(VPATH)}method.h
-vm_trace.$(OBJEXT): {$(VPATH)}missing.h
-vm_trace.$(OBJEXT): {$(VPATH)}node.h
-vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h
-vm_trace.$(OBJEXT): {$(VPATH)}ruby_assert.h
-vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
-vm_trace.$(OBJEXT): {$(VPATH)}st.h
-vm_trace.$(OBJEXT): {$(VPATH)}subst.h
-vm_trace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
-vm_trace.$(OBJEXT): {$(VPATH)}thread_native.h
-vm_trace.$(OBJEXT): {$(VPATH)}vm_core.h
-vm_trace.$(OBJEXT): {$(VPATH)}vm_debug.h
-vm_trace.$(OBJEXT): {$(VPATH)}vm_opts.h
-vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/compar.c b/compar.c
index 02529c9960..81dff38f49 100644
--- a/compar.c
+++ b/compar.c
@@ -10,22 +10,17 @@
 **********************************************************************/
 
 #include "ruby/ruby.h"
-#include "id.h"
 
 VALUE rb_mComparable;
 
-static VALUE
-rb_cmp(VALUE x, VALUE y)
-{
-    return rb_funcallv(x, idCmp, 1, &y);
-}
+static ID cmp;
 
 void
 rb_cmperr(VALUE x, VALUE y)
 {
     VALUE classname;
 
-    if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
+    if (SPECIAL_CONST_P(y)) {
 	classname = rb_inspect(y);
     }
     else {
@@ -39,7 +34,7 @@ static VALUE
 invcmp_recursive(VALUE x, VALUE y, int recursive)
 {
     if (recursive) return Qnil;
-    return rb_cmp(y, x);
+    return rb_check_funcall(y, cmp, 1, &x);
 }
 
 VALUE
@@ -59,7 +54,25 @@ static VALUE
 cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive)
 {
     if (recursive) return Qnil;
-    return rb_cmp(arg1, arg2);
+    return rb_funcallv(arg1, cmp, 1, &arg2);
+}
+
+static VALUE
+cmp_eq(VALUE *a)
+{
+    VALUE c = rb_exec_recursive_paired_outer(cmp_eq_recursive, a[0], a[1], a[1]);
+
+    if (NIL_P(c)) return Qfalse;
+    if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
+    return Qfalse;
+}
+
+static VALUE
+cmp_failed(void)
+{
+    rb_warn("Comparable#== will no more rescue exceptions of #<=> in the next release.");
+    rb_warn("Return nil in #<=> if the comparison is inappropriate or avoid such comparison.");
+    return Qfalse;
 }
 
 /*
@@ -69,25 +82,20 @@ cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive)
  *  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.
+ *
+ *  Even if _obj_ <=> _other_ raised an exception, the exception
+ *  is ignored and returns false.
  */
 
 static VALUE
 cmp_equal(VALUE x, VALUE y)
 {
-    VALUE c;
-    if (x == y) return Qtrue;
-
-    c = rb_exec_recursive_paired_outer(cmp_eq_recursive, x, y, y);
+    VALUE a[2];
 
-    if (NIL_P(c)) return Qfalse;
-    if (rb_cmpint(c, x, y) == 0) return Qtrue;
-    return Qfalse;
-}
+    if (x == y) return Qtrue;
 
-static int
-cmpint(VALUE x, VALUE y)
-{
-    return rb_cmpint(rb_cmp(x, y), x, y);
+    a[0] = x; a[1] = y;
+    return rb_rescue(cmp_eq, (VALUE)a, cmp_failed, 0);
 }
 
 /*
@@ -101,7 +109,9 @@ cmpint(VALUE x, VALUE y)
 static VALUE
 cmp_gt(VALUE x, VALUE y)
 {
-    if (cmpint(x, y) > 0) return Qtrue;
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (rb_cmpint(c, x, y) > 0) return Qtrue;
     return Qfalse;
 }
 
@@ -116,7 +126,9 @@ cmp_gt(VALUE x, VALUE y)
 static VALUE
 cmp_ge(VALUE x, VALUE y)
 {
-    if (cmpint(x, y) >= 0) return Qtrue;
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (rb_cmpint(c, x, y) >= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -131,7 +143,9 @@ cmp_ge(VALUE x, VALUE y)
 static VALUE
 cmp_lt(VALUE x, VALUE y)
 {
-    if (cmpint(x, y) < 0) return Qtrue;
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (rb_cmpint(c, x, y) < 0) return Qtrue;
     return Qfalse;
 }
 
@@ -146,7 +160,9 @@ cmp_lt(VALUE x, VALUE y)
 static VALUE
 cmp_le(VALUE x, VALUE y)
 {
-    if (cmpint(x, y) <= 0) return Qtrue;
+    VALUE c = rb_funcall(x, cmp, 1, y);
+
+    if (rb_cmpint(c, x, y) <= 0) return Qtrue;
     return Qfalse;
 }
 
@@ -168,45 +184,12 @@ cmp_le(VALUE x, VALUE y)
 static VALUE
 cmp_between(VALUE x, VALUE min, VALUE max)
 {
-    if (cmpint(x, min) < 0) return Qfalse;
-    if (cmpint(x, max) > 0) return Qfalse;
+    if (RTEST(cmp_lt(x, min))) return Qfalse;
+    if (RTEST(cmp_gt(x, max))) return Qfalse;
     return Qtrue;
 }
 
 /*
- *  call-seq:
- *     obj.clamp(min, max) ->  obj
- *
- * Returns <i>min</i> if <i>obj</i> <code><=></code> <i>min</i> is less
- * than zero, <i>max</i> if <i>obj</i> <code><=></code> <i>max</i> is
- * greater than zero and <i>obj</i> otherwise.
- *
- *     12.clamp(0, 100)         #=> 12
- *     523.clamp(0, 100)        #=> 100
- *     -3.123.clamp(0, 100)     #=> 0
- *
- *     'd'.clamp('a', 'f')      #=> 'd'
- *     'z'.clamp('a', 'f')      #=> 'f'
- */
-
-static VALUE
-cmp_clamp(VALUE x, VALUE min, VALUE max)
-{
-    int c;
-
-    if (cmpint(min, max) > 0) {
-	rb_raise(rb_eArgError, "min argument must be smaller than max argument");
-    }
-
-    c = cmpint(x, min);
-    if (c == 0) return x;
-    if (c < 0) return min;
-    c = cmpint(x, max);
-    if (c > 0) return max;
-    return x;
-}
-
-/*
  *  The <code>Comparable</code> mixin is used by classes whose objects
  *  may be ordered. The class must define the <code><=></code> operator,
  *  which compares the receiver against another object, returning -1, 0,
@@ -221,8 +204,8 @@ cmp_clamp(VALUE x, VALUE min, VALUE max)
  *     class SizeMatters
  *       include Comparable
  *       attr :str
- *       def <=>(other)
- *         str.size <=> other.str.size
+ *       def <=>(anOther)
+ *         str.size <=> anOther.str.size
  *       end
  *       def initialize(str)
  *         @str = str
@@ -258,5 +241,6 @@ Init_Comparable(void)
     rb_define_method(rb_mComparable, "<", cmp_lt, 1);
     rb_define_method(rb_mComparable, "<=", cmp_le, 1);
     rb_define_method(rb_mComparable, "between?", cmp_between, 2);
-    rb_define_method(rb_mComparable, "clamp", cmp_clamp, 2);
+
+    cmp = rb_intern("<=>");
 }
diff --git a/compile.c b/compile.c
index c8e8add49a..ac4e5bac22 100644
--- a/compile.c
+++ b/compile.c
@@ -9,9 +9,8 @@
 
 **********************************************************************/
 
+#include "ruby/ruby.h"
 #include "internal.h"
-#include "ruby/re.h"
-#include "encindex.h"
 #include <math.h>
 
 #define USE_INSN_STACK_INCREASE 1
@@ -19,15 +18,6 @@
 #include "iseq.h"
 #include "insns.inc"
 #include "insns_info.inc"
-#include "id_table.h"
-#include "gc.h"
-
-#ifdef HAVE_DLADDR
-# include <dlfcn.h>
-#endif
-
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
 
 #define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
 #define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
@@ -48,22 +38,13 @@ typedef struct iseq_link_anchor {
     LINK_ELEMENT *last;
 } LINK_ANCHOR;
 
-typedef enum {
-    LABEL_RESCUE_NONE,
-    LABEL_RESCUE_BEG,
-    LABEL_RESCUE_END,
-    LABEL_RESCUE_TYPE_MAX
-} LABEL_RESCUE_TYPE;
-
 typedef struct iseq_label_data {
     LINK_ELEMENT link;
     int label_no;
     int position;
     int sc_state;
+    int set;
     int sp;
-    int refcnt;
-    unsigned int set: 1;
-    unsigned int rescued: 2;
 } LABEL;
 
 typedef struct iseq_insn_data {
@@ -113,7 +94,7 @@ struct iseq_compile_data_ensure_node_stack {
 #if CPDEBUG >= 0
 #define compile_debug CPDEBUG
 #else
-#define compile_debug ISEQ_COMPILE_DATA(iseq)->option->debug_level
+#define compile_debug iseq->compile_data->option->debug_level
 #endif
 
 #if CPDEBUG
@@ -172,7 +153,6 @@ r_value(VALUE value)
 #endif
 
 #if CPDEBUG > 1 || CPDEBUG < 0
-#define printf ruby_debug_printf
 #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
@@ -180,19 +160,21 @@ r_value(VALUE value)
 #define debug_compile(msg, v) (v)
 #endif
 
-#define LVAR_ERRINFO (1)
 
 /* create new label */
 #define NEW_LABEL(l) new_label_body(iseq, (l))
 
-#define iseq_path(iseq) ((iseq)->body->location.path)
-#define iseq_absolute_path(iseq) ((iseq)->body->location.absolute_path)
+#define iseq_path(iseq) \
+  (((rb_iseq_t*)DATA_PTR(iseq))->location.path)
+
+#define iseq_absolute_path(iseq) \
+  (((rb_iseq_t*)DATA_PTR(iseq))->location.absolute_path)
 
-#define NEW_ISEQ(node, name, type, line_no) \
+#define NEW_ISEQVAL(node, name, type, line_no)       \
   new_child_iseq(iseq, (node), rb_fstring(name), 0, (type), (line_no))
 
-#define NEW_CHILD_ISEQ(node, name, type, line_no) \
-  new_child_iseq(iseq, (node), rb_fstring(name), iseq, (type), (line_no))
+#define NEW_CHILD_ISEQVAL(node, name, type, line_no)       \
+  new_child_iseq(iseq, (node), rb_fstring(name), iseq->self, (type), (line_no))
 
 /* add instructions */
 #define ADD_SEQ(seq1, seq2) \
@@ -202,24 +184,13 @@ r_value(VALUE value)
 #define ADD_INSN(seq, line, insn) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
 
-/* insert an instruction before prev */
-#define INSERT_BEFORE_INSN(prev, line, insn) \
-  INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
-
 /* 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)))
 
-/* insert an instruction with some operands (1, 2, 3, 5) before prev */
-#define INSERT_BEFORE_INSN1(prev, line, insn, op1) \
-  INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) \
-           new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
-
-#define LABEL_REF(label) ((label)->refcnt++)
-
 /* add an instruction with label operand (alias of ADD_INSN1) */
-#define ADD_INSNL(seq, line, insn, label) (ADD_INSN1(seq, line, insn, label), LABEL_REF(label))
+#define ADD_INSNL(seq, line, insn, label) ADD_INSN1(seq, line, insn, label)
 
 #define ADD_INSN2(seq, line, insn, op1, op2) \
   ADD_ELEM((seq), (LINK_ELEMENT *) \
@@ -231,50 +202,35 @@ r_value(VALUE value)
 
 /* Specific Insn factory */
 #define ADD_SEND(seq, line, id, argc) \
-  ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)INT2FIX(0), NULL)
-
-#define ADD_SEND_WITH_FLAG(seq, line, id, argc, flag) \
-  ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)(flag), NULL)
-
-#define ADD_SEND_WITH_BLOCK(seq, line, id, argc, block) \
-  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(0), NULL)
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0))
 
 #define ADD_CALL_RECEIVER(seq, line) \
   ADD_INSN((seq), (line), putself)
 
 #define ADD_CALL(seq, line, id, argc) \
-  ADD_SEND_R((seq), (line), (id), (argc), NULL, (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL))
 
 #define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
-  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
+  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL))
 
-#define ADD_SEND_R(seq, line, id, argc, block, flag, keywords) \
-  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (line), (id), (VALUE)(argc), (block), (VALUE)(flag), (keywords)))
+#define ADD_SEND_R(seq, line, id, argc, block, flag) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) \
+           new_insn_send(iseq, (line), \
+                         (id), (VALUE)(argc), (VALUE)(block), (VALUE)(flag)))
 
 #define ADD_TRACE(seq, line, event) \
   do { \
-      if ((event) == RUBY_EVENT_LINE && ISEQ_COVERAGE(iseq) && \
-	  (line) > 0 && \
-	  (line) != ISEQ_COMPILE_DATA(iseq)->last_coverable_line) { \
-	  RARRAY_ASET(ISEQ_COVERAGE(iseq), (line) - 1, INT2FIX(0)); \
-	  ISEQ_COMPILE_DATA(iseq)->last_coverable_line = (line); \
+      if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
+	  (line) != iseq->compile_data->last_coverable_line) { \
+	  RARRAY_ASET(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(iseq)->option->trace_instruction) { \
+      if (iseq->compile_data->option->trace_instruction) { \
 	  ADD_INSN1((seq), (line), trace, INT2FIX(event)); \
       } \
   } while (0)
 
-#define ADD_GETLOCAL(seq, line, idx, level) \
-  do { \
-      ADD_INSN2((seq), (line), getlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)); \
-  } while (0)
-
-#define ADD_SETLOCAL(seq, line, idx, level) \
-  do { \
-      ADD_INSN2((seq), (line), setlocal, INT2FIX((idx) + VM_ENV_DATA_SIZE - 1), INT2FIX(level)); \
-  } while (0)
-
 /* add label */
 #define ADD_LABEL(seq, label) \
   ADD_ELEM((seq), (LINK_ELEMENT *) (label))
@@ -288,15 +244,11 @@ r_value(VALUE value)
 #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) do {				\
-    VALUE _e = rb_ary_new3(5, (type),						\
-			   (VALUE)(ls) | 1, (VALUE)(le) | 1,			\
-			   (VALUE)(iseqv), (VALUE)(lc) | 1);			\
-    if (ls) LABEL_REF(ls);							\
-    if (le) LABEL_REF(le);							\
-    if (lc) LABEL_REF(lc);							\
-    rb_ary_push(ISEQ_COMPILE_DATA(iseq)->catch_table_ary, freeze_hide_obj(_e));	\
-} while (0)
+#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,	\
+			     (VALUE)(iseqv), (VALUE)(lc) | 1)))
 
 /* compile node */
 #define COMPILE(anchor, desc, node) \
@@ -304,14 +256,14 @@ r_value(VALUE value)
                  iseq_compile_each(iseq, (anchor), (node), 0)))
 
 /* compile node, this node's value will be popped */
-#define COMPILE_POPPED(anchor, desc, node)    \
+#define COMPILE_POPED(anchor, desc, node)    \
   (debug_compile("== " desc "\n", \
                  iseq_compile_each(iseq, (anchor), (node), 1)))
 
-/* compile node, which is popped when 'popped' is true */
-#define COMPILE_(anchor, desc, node, popped)  \
+/* 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), (popped))))
+                 iseq_compile_each(iseq, (anchor), (node), (poped))))
 
 #define COMPILE_RECV(anchor, desc, node) \
     (private_recv_p(node) ? \
@@ -324,78 +276,21 @@ r_value(VALUE value)
 #define INSN_OF(insn) \
   (((INSN*)(insn))->insn_id)
 
-#define IS_INSN(link) ((link)->type == ISEQ_ELEMENT_INSN)
-#define IS_LABEL(link) ((link)->type == ISEQ_ELEMENT_LABEL)
-#define IS_ADJUST(link) ((link)->type == ISEQ_ELEMENT_ADJUST)
-#define IS_INSN_ID(iobj, insn) (INSN_OF(iobj) == BIN(insn))
-
 /* error */
-typedef void (*compile_error_func)(rb_iseq_t *, int, const char *, ...);
-
-static void
-append_compile_error(rb_iseq_t *iseq, int line, const char *fmt, ...)
-{
-    VALUE err_info = ISEQ_COMPILE_DATA(iseq)->err_info;
-    VALUE file = iseq->body->location.path;
-    VALUE err = err_info;
-    va_list args;
-
-    va_start(args, fmt);
-    err = rb_syntax_error_append(err, file, line, -1, NULL, fmt, args);
-    va_end(args);
-    if (NIL_P(err_info)) {
-	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->err_info, err);
-	rb_set_errinfo(err);
-    }
-}
-
-static void
-compile_bug(rb_iseq_t *iseq, int line, const char *fmt, ...)
-{
-    va_list args;
-    va_start(args, fmt);
-    rb_report_bug_valist(iseq->body->location.path, line, fmt, args);
-    va_end(args);
-    abort();
-}
-
-NOINLINE(static compile_error_func prepare_compile_error(rb_iseq_t *iseq));
-
-static compile_error_func
-prepare_compile_error(rb_iseq_t *iseq)
-{
-    if (compile_debug) return &compile_bug;
-    return &append_compile_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;                           \
+  RB_OBJ_WRITE(iseq->self, &iseq->compile_data->err_info, GET_THREAD()->errinfo); \
+  GET_THREAD()->errinfo = tmp;                     \
+  ret = 0;                                         \
+  break;                                           \
 }
 
-#define COMPILE_ERROR prepare_compile_error(iseq)
-
-#define ERROR_ARGS_AT(n) iseq, nd_line(n),
-#define ERROR_ARGS ERROR_ARGS_AT(node)
-
-#define EXPECT_NODE(prefix, node, ndtype) \
-do { \
-    NODE *error_node = (node); \
-    enum node_type error_type = nd_type(error_node); \
-    if (error_type != (ndtype)) { \
-	compile_bug(ERROR_ARGS_AT(error_node) \
-		    prefix ": " #ndtype " is expected, but %s", \
-		    ruby_node_name(error_type)); \
-    } \
-} while (0)
-
-#define EXPECT_NODE_NONULL(prefix, parent, ndtype) \
-do { \
-    compile_bug(ERROR_ARGS_AT(parent) \
-		prefix ": must be " #ndtype ", but 0"); \
-} while (0)
+#define ERROR_ARGS ruby_sourcefile, nd_line(node),
 
-#define UNKNOWN_NODE(prefix, node) \
-do { \
-    NODE *error_node = (node); \
-    compile_bug(ERROR_ARGS_AT(error_node) prefix ": unknown node (%s)", \
-		ruby_node_name(nd_type(error_node))); \
-} while (0)
 
 #define COMPILE_OK 1
 #define COMPILE_NG 0
@@ -404,17 +299,11 @@ do { \
 /* leave name uninitialized so that compiler warn if INIT_ANCHOR is
  * missing */
 #define DECL_ANCHOR(name) \
-    LINK_ANCHOR name[1] = {{{0,},}}
+  LINK_ANCHOR *name, name##_body__ = {{0,},}
 #define INIT_ANCHOR(name) \
-    (name->last = &name->anchor)
+  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
 
-static inline VALUE
-freeze_hide_obj(VALUE obj)
-{
-    OBJ_FREEZE(obj);
-    RBASIC_CLEAR_CLASS(obj);
-    return obj;
-}
+#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC_CLEAR_CLASS(obj);} while (0)
 
 #include "optinsn.inc"
 #if OPT_INSTRUCTIONS_UNIFICATION
@@ -431,7 +320,10 @@ freeze_hide_obj(VALUE obj)
 #endif
 
 #if CPDEBUG
-#define gl_node_level ISEQ_COMPILE_DATA(iseq)->node_level
+#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);
@@ -443,17 +335,17 @@ static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type i
 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 *const anchor, NODE *n, int);
-static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
-static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
-static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+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, const ID *tbl);
+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 *const anchor, NODE *node);
+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 *const anchor);
-static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor);
+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);
 
@@ -462,7 +354,7 @@ static int iseq_set_optargs_table(rb_iseq_t *iseq);
  */
 
 static void
-verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
+verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
 {
 #if CPDEBUG
     int flag = 0;
@@ -497,7 +389,7 @@ verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *const anchor)
  * elem1, elem2 => elem1, elem2, elem
  */
 static void
-ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *elem)
+ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
 {
     elem->prev = anchor->last;
     anchor->last->next = elem;
@@ -509,7 +401,7 @@ ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *elem)
  * elem1, before, elem2 => elem1, before, elem, elem2
  */
 static void
-APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
+APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
 {
     elem->prev = before;
     elem->next = before->next;
@@ -520,11 +412,11 @@ APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor, LINK_ELEMENT *before, LI
 }
 #if CPDEBUG < 0
 #define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, (anchor), (elem))
-#define APPEND_ELEM(anchor, before, elem) APPEND_ELEM(iseq, (anchor), (before), (elem))
+#define APPEND_ELEM(anchor, before, elem) ADD_ELEM(iseq, (anchor), (before), (elem))
 #endif
 
 static int
-iseq_add_mark_object(const rb_iseq_t *iseq, VALUE v)
+iseq_add_mark_object(rb_iseq_t *iseq, VALUE v)
 {
     if (!SPECIAL_CONST_P(v)) {
 	rb_iseq_add_mark_object(iseq, v);
@@ -532,13 +424,13 @@ iseq_add_mark_object(const rb_iseq_t *iseq, VALUE v)
     return COMPILE_OK;
 }
 
-#define ruby_sourcefile		RSTRING_PTR(iseq->body->location.path)
+#define ruby_sourcefile		RSTRING_PTR(iseq->location.path)
 
 static int
-iseq_add_mark_object_compile_time(const rb_iseq_t *iseq, VALUE v)
+iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
 {
     if (!SPECIAL_CONST_P(v)) {
-	rb_ary_push(ISEQ_COMPILE_DATA(iseq)->mark_ary, v);
+	rb_ary_push(iseq->compile_data->mark_ary, v);
     }
     return COMPILE_OK;
 }
@@ -550,9 +442,10 @@ validate_label(st_data_t name, st_data_t label, st_data_t arg)
     LABEL *lobj = (LABEL *)label;
     if (!lobj->link.next) {
 	do {
-	    COMPILE_ERROR(iseq, lobj->position,
-			  "%"PRIsVALUE": undefined label",
-			  rb_id2str((ID)name));
+	    int ret;
+	    COMPILE_ERROR((ruby_sourcefile, lobj->position,
+			   "%s: undefined label", rb_id2name((ID)name)));
+	    if (ret) break;
 	} while (0);
     }
     return ST_CONTINUE;
@@ -562,17 +455,18 @@ static void
 validate_labels(rb_iseq_t *iseq, st_table *labels_table)
 {
     st_foreach(labels_table, validate_label, (st_data_t)iseq);
-    st_free_table(labels_table);
-    if (!NIL_P(ISEQ_COMPILE_DATA(iseq)->err_info)) {
-	rb_exc_raise(ISEQ_COMPILE_DATA(iseq)->err_info);
+    if (!NIL_P(iseq->compile_data->err_info)) {
+	rb_exc_raise(iseq->compile_data->err_info);
     }
 }
 
 VALUE
-rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
+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);
@@ -583,16 +477,13 @@ rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
 	iseq_set_local_table(iseq, node->nd_tbl);
 	iseq_set_arguments(iseq, ret, node->nd_args);
 
-	switch (iseq->body->type) {
+	switch (iseq->type) {
 	  case ISEQ_TYPE_BLOCK:
 	    {
-		LABEL *start = ISEQ_COMPILE_DATA(iseq)->start_label = NEW_LABEL(0);
-		LABEL *end = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(0);
-
-		start->rescued = LABEL_RESCUE_BEG;
-		end->rescued = LABEL_RESCUE_END;
+		LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
+		LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
 
-		ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_B_CALL);
+		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL);
 		ADD_LABEL(ret, start);
 		COMPILE(ret, "block body", node->nd_body);
 		ADD_LABEL(ret, end);
@@ -605,14 +496,14 @@ rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
 	    }
 	  case ISEQ_TYPE_CLASS:
 	    {
-		ADD_TRACE(ret, FIX2INT(iseq->body->location.first_lineno), RUBY_EVENT_CLASS);
+		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), 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->body->location.first_lineno), RUBY_EVENT_CALL);
+		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_CALL);
 		COMPILE(ret, "scoped node", node->nd_body);
 		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
 		break;
@@ -623,52 +514,49 @@ rb_iseq_compile_node(rb_iseq_t *iseq, NODE *node)
 	  }
 	}
     }
-    else if (RB_TYPE_P((VALUE)node, T_IMEMO)) {
-	const struct vm_ifunc *ifunc = (struct vm_ifunc *)node;
+    else if (nd_type(node) == NODE_IFUNC) {
 	/* user callback */
-	(*ifunc->func)(iseq, ret, ifunc->data);
+	(*node->nd_cfnc)(iseq, ret, node->nd_tval);
     }
     else {
-	switch (iseq->body->type) {
+	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:
-	    COMPILE_ERROR(ERROR_ARGS "compile/should not be reached: %s:%d",
-			  __FILE__, __LINE__);
-	    return COMPILE_NG;
+	    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_POPPED(ret, "ensure", node);
+	    COMPILE_POPED(ret, "ensure", node);
 	    break;
 	  case ISEQ_TYPE_DEFINED_GUARD:
-	    iseq_set_exception_local_table(iseq);
+	    iseq_set_local_table(iseq, 0);
 	    COMPILE(ret, "defined guard", node);
 	    break;
 	  default:
-	    compile_bug(ERROR_ARGS "unknown scope");
+	    rb_bug("unknown scope");
 	}
     }
 
-    if (iseq->body->type == ISEQ_TYPE_RESCUE || iseq->body->type == ISEQ_TYPE_ENSURE) {
-	ADD_GETLOCAL(ret, 0, LVAR_ERRINFO, 0);
+    if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
+	ADD_INSN2(ret, 0, getlocal, INT2FIX(2), INT2FIX(0));
 	ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
     }
     else {
-	ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, leave);
+	ADD_INSN(ret, iseq->compile_data->last_line, leave);
     }
 
 #if SUPPORT_JOKE
-    if (ISEQ_COMPILE_DATA(iseq)->labels_table) {
-	st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
-	ISEQ_COMPILE_DATA(iseq)->labels_table = 0;
-	validate_labels(iseq, labels_table);
+    if (iseq->compile_data->labels_table) {
+	validate_labels(iseq, iseq->compile_data->labels_table);
     }
 #endif
     return iseq_setup(iseq, ret);
@@ -680,12 +568,11 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
     const void * const *table = rb_vm_get_insns_address_table();
     unsigned int i;
-    VALUE *encoded = (VALUE *)iseq->body->iseq_encoded;
 
-    for (i = 0; i < iseq->body->iseq_size; /* */ ) {
-	int insn = (int)iseq->body->iseq_encoded[i];
+    for (i = 0; i < iseq->iseq_size; /* */ ) {
+	int insn = (int)iseq->iseq_encoded[i];
 	int len = insn_len(insn);
-	encoded[i] = (VALUE)table[insn];
+	iseq->iseq_encoded[i] = (VALUE)table[insn];
 	i += len;
     }
 #endif
@@ -709,118 +596,57 @@ rb_vm_insn_addr2insn(const void *addr) /* cold path */
 #endif
 
 VALUE *
-rb_iseq_original_iseq(const rb_iseq_t *iseq) /* cold path */
+rb_iseq_original_iseq(rb_iseq_t *iseq) /* cold path */
 {
-    VALUE *original_code;
+    if (iseq->iseq) return iseq->iseq;
+
+    iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
 
-    if (ISEQ_ORIGINAL_ISEQ(iseq)) return ISEQ_ORIGINAL_ISEQ(iseq);
-    original_code = ISEQ_ORIGINAL_ISEQ_ALLOC(iseq, iseq->body->iseq_size);
-    MEMCPY(original_code, iseq->body->iseq_encoded, VALUE, iseq->body->iseq_size);
+    MEMCPY(iseq->iseq, iseq->iseq_encoded, VALUE, iseq->iseq_size);
 
 #if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
     {
 	unsigned int i;
 
-	for (i = 0; i < iseq->body->iseq_size; /* */ ) {
-	    const void *addr = (const void *)original_code[i];
+	for (i = 0; i < iseq->iseq_size; /* */ ) {
+	    const void *addr = (const void *)iseq->iseq[i];
 	    const int insn = rb_vm_insn_addr2insn(addr);
 
-	    original_code[i] = insn;
+	    iseq->iseq[i] = insn;
 	    i += insn_len(insn);
 	}
     }
 #endif
-    return original_code;
+    return iseq->iseq;
 }
 
 /*********************************************/
 /* definition of data structure for compiler */
 /*********************************************/
 
-/*
- * On 32-bit SPARC, GCC by default generates SPARC V7 code that may require
- * 8-byte word alignment. On the other hand, Oracle Solaris Studio seems to
- * generate SPARCV8PLUS code with unaligned memory access instructions.
- * That is why the STRICT_ALIGNMENT is defined only with GCC.
- */
-#if defined(__sparc) && SIZEOF_VOIDP == 4 && defined(__GNUC__)
-  #define STRICT_ALIGNMENT
-#endif
-
-#ifdef STRICT_ALIGNMENT
-  #if defined(HAVE_TRUE_LONG_LONG) && SIZEOF_LONG_LONG > SIZEOF_VALUE
-    #define ALIGNMENT_SIZE SIZEOF_LONG_LONG
-  #else
-    #define ALIGNMENT_SIZE SIZEOF_VALUE
-  #endif
-  #define PADDING_SIZE_MAX    ((size_t)((ALIGNMENT_SIZE) - 1))
-  #define ALIGNMENT_SIZE_MASK PADDING_SIZE_MAX
-  /* Note: ALIGNMENT_SIZE == (2 ** N) is expected. */
-#else
-  #define PADDING_SIZE_MAX 0
-#endif /* STRICT_ALIGNMENT */
-
-#ifdef STRICT_ALIGNMENT
-/* calculate padding size for aligned memory access */
-static size_t
-calc_padding(void *ptr, size_t size)
-{
-    size_t mis;
-    size_t padding = 0;
-
-    mis = (size_t)ptr & ALIGNMENT_SIZE_MASK;
-    if (mis > 0) {
-        padding = ALIGNMENT_SIZE - mis;
-    }
-/*
- * On 32-bit sparc or equivalents, when a single VALUE is requested
- * and padding == sizeof(VALUE), it is clear that no padding is needed.
- */
-#if ALIGNMENT_SIZE > SIZEOF_VALUE
-    if (size == sizeof(VALUE) && padding == sizeof(VALUE)) {
-        padding = 0;
-    }
-#endif
-
-    return padding;
-}
-#endif /* STRICT_ALIGNMENT */
-
 static void *
 compile_data_alloc(rb_iseq_t *iseq, size_t size)
 {
     void *ptr = 0;
     struct iseq_compile_data_storage *storage =
-	ISEQ_COMPILE_DATA(iseq)->storage_current;
-#ifdef STRICT_ALIGNMENT
-    size_t padding = calc_padding((void *)&storage->buff[storage->pos], size);
-#else
-    const size_t padding = 0; /* expected to be optimized by compiler */
-#endif /* STRICT_ALIGNMENT */
+	iseq->compile_data->storage_current;
 
-    if (size >= INT_MAX - padding) rb_memerror();
-    if (storage->pos + size + padding > storage->size) {
+    if (size >= INT_MAX) rb_memerror();
+    if (storage->pos + size > storage->size) {
 	unsigned int alloc_size = storage->size;
 
-	while (alloc_size < size + PADDING_SIZE_MAX) {
+	while (alloc_size < size) {
 	    if (alloc_size >= INT_MAX / 2) rb_memerror();
 	    alloc_size *= 2;
 	}
 	storage->next = (void *)ALLOC_N(char, alloc_size +
 					SIZEOF_ISEQ_COMPILE_DATA_STORAGE);
-	storage = ISEQ_COMPILE_DATA(iseq)->storage_current = storage->next;
+	storage = iseq->compile_data->storage_current = storage->next;
 	storage->next = 0;
 	storage->pos = 0;
 	storage->size = alloc_size;
-#ifdef STRICT_ALIGNMENT
-        padding = calc_padding((void *)&storage->buff[storage->pos], size);
-#endif /* STRICT_ALIGNMENT */
     }
 
-#ifdef STRICT_ALIGNMENT
-    storage->pos += (int)padding;
-#endif /* STRICT_ALIGNMENT */
-
     ptr = (void *)&storage->buff[storage->pos];
     storage->pos += (int)size;
     return ptr;
@@ -858,8 +684,9 @@ INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
     }
 }
 
+#if 0 /* unused */
 /*
- * elem1, elemX => elemX, elem2, elem1
+ * elemX, elem1 => elemX, elem2, elem1
  */
 static void
 INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
@@ -871,8 +698,8 @@ INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 	elem2->prev->next = elem2;
     }
 }
+#endif
 
-#if 0
 /*
  * elemX, elem1, elemY => elemX, elem2, elemY
  */
@@ -888,7 +715,6 @@ REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 	elem1->next->prev = elem2;
     }
 }
-#endif
 
 static void
 REMOVE_ELEM(LINK_ELEMENT *elem)
@@ -900,19 +726,21 @@ REMOVE_ELEM(LINK_ELEMENT *elem)
 }
 
 static LINK_ELEMENT *
-FIRST_ELEMENT(LINK_ANCHOR *const anchor)
+FIRST_ELEMENT(LINK_ANCHOR *anchor)
 {
     return anchor->anchor.next;
 }
 
+#if 0 /* unused */
 static LINK_ELEMENT *
-LAST_ELEMENT(LINK_ANCHOR *const anchor)
+LAST_ELEMENT(LINK_ANCHOR *anchor)
 {
-    return anchor->last;
+  return anchor->last;
 }
+#endif
 
 static LINK_ELEMENT *
-POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
+POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 {
     LINK_ELEMENT *elem = anchor->last;
     anchor->last = anchor->last->prev;
@@ -924,8 +752,34 @@ POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *const anchor)
 #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_ZERO(LINK_ANCHOR *const anchor)
+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;
@@ -943,7 +797,7 @@ LIST_SIZE_ZERO(LINK_ANCHOR *const anchor)
  * anc2: e4, e5 (broken)
  */
 static void
-APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
+APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 {
     if (anc2->anchor.next) {
 	anc1->last->next = anc2->anchor.next;
@@ -964,7 +818,7 @@ APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
  * anc2: e4, e5 (broken)
  */
 static void
-INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
+INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 {
     if (anc2->anchor.next) {
 	LINK_ELEMENT *first = anc1->anchor.next;
@@ -985,9 +839,68 @@ INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *const anc1, LINK_ANCHOR *const anc2)
 #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 *const anchor)
+debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 {
     LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
     printf("----\n");
@@ -1016,12 +929,9 @@ new_label_body(rb_iseq_t *iseq, long line)
     labelobj->link.type = ISEQ_ELEMENT_LABEL;
     labelobj->link.next = 0;
 
-    labelobj->label_no = ISEQ_COMPILE_DATA(iseq)->label_no++;
+    labelobj->label_no = iseq->compile_data->label_no++;
     labelobj->sc_state = 0;
     labelobj->sp = -1;
-    labelobj->refcnt = 0;
-    labelobj->set = 0;
-    labelobj->rescued = LABEL_RESCUE_NONE;
     return labelobj;
 }
 
@@ -1033,7 +943,6 @@ new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
     adjust->link.next = 0;
     adjust->label = label;
     adjust->line_no = line;
-    if (label) LABEL_REF(label);
     return adjust;
 }
 
@@ -1072,61 +981,60 @@ new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int a
     return new_insn_core(iseq, line_no, insn_id, argc, operands);
 }
 
-static struct rb_call_info *
-new_callinfo(rb_iseq_t *iseq, ID mid, int argc, unsigned int flag, struct rb_call_info_kw_arg *kw_arg, int has_blockiseq)
+static rb_call_info_t *
+new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned int flag)
 {
-    size_t size = kw_arg != NULL ? sizeof(struct rb_call_info_with_kwarg) : sizeof(struct rb_call_info);
-    struct rb_call_info *ci = (struct rb_call_info *)compile_data_alloc(iseq, size);
-    struct rb_call_info_with_kwarg *ci_kw = (struct rb_call_info_with_kwarg *)ci;
-
+    rb_call_info_t *ci = (rb_call_info_t *)compile_data_alloc(iseq, sizeof(rb_call_info_t));
     ci->mid = mid;
     ci->flag = flag;
     ci->orig_argc = argc;
+    ci->argc = argc;
 
-    if (kw_arg) {
-	ci->flag |= VM_CALL_KWARG;
-	ci_kw->kw_arg = kw_arg;
-	ci->orig_argc += kw_arg->keyword_len;
-	iseq->body->ci_kw_size++;
+    if (block) {
+	GetISeqPtr(block, ci->blockiseq);
     }
     else {
-	iseq->body->ci_size++;
+	ci->blockiseq = 0;
+	if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG))) {
+	    ci->flag |= VM_CALL_ARGS_SKIP_SETUP;
+	}
     }
+    ci->method_state = 0;
+    ci->class_serial = 0;
+    ci->blockptr = 0;
+    ci->recv = Qundef;
+    ci->call = 0; /* TODO: should set default function? */
+
+    ci->aux.index = iseq->callinfo_size++;
 
-    if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) &&
-	kw_arg == NULL && !has_blockiseq) {
-	ci->flag |= VM_CALL_ARGS_SIMPLE;
-    }
     return ci;
 }
 
 static INSN *
-new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, const rb_iseq_t *blockiseq, VALUE flag, struct rb_call_info_kw_arg *keywords)
+new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, VALUE block, VALUE flag)
 {
-    VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 3);
-    operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), FIX2INT(flag), keywords, blockiseq != NULL);
-    operands[1] = Qfalse; /* cache */
-    operands[2] = (VALUE)blockiseq;
-    return new_insn_core(iseq, line_no, BIN(send), 3, operands);
+    VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 1);
+    operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), block, FIX2INT(flag));
+    return new_insn_core(iseq, line_no, BIN(send), 1, operands);
 }
 
-static rb_iseq_t *
+static VALUE
 new_child_iseq(rb_iseq_t *iseq, NODE *node,
-	       VALUE name, const rb_iseq_t *parent, enum iseq_type type, int line_no)
+	       VALUE name, VALUE parent, enum iseq_type type, int line_no)
 {
-    rb_iseq_t *ret_iseq;
+    VALUE ret;
 
     debugs("[new_child_iseq]> ---------------------------------------\n");
-    ret_iseq = rb_iseq_new_with_opt(node, name,
-				    iseq_path(iseq), iseq_absolute_path(iseq),
-				    INT2FIX(line_no), parent, type, ISEQ_COMPILE_DATA(iseq)->option);
+    ret = rb_iseq_new_with_opt(node, name,
+			       iseq_path(iseq->self), iseq_absolute_path(iseq->self),
+			       INT2FIX(line_no), parent, type, iseq->compile_data->option);
     debugs("[new_child_iseq]< ---------------------------------------\n");
-    iseq_add_mark_object(iseq, (VALUE)ret_iseq);
-    return ret_iseq;
+    iseq_add_mark_object(iseq, ret);
+    return ret;
 }
 
 static int
-iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
     /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
 
@@ -1139,14 +1047,14 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     if (compile_debug > 5)
 	dump_disasm_list(FIRST_ELEMENT(anchor));
 
-    if (ISEQ_COMPILE_DATA(iseq)->option->instructions_unification) {
+    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(iseq)->option->stack_caching) {
+    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)
@@ -1154,72 +1062,70 @@ iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
     }
 
     debugs("[compile step 4.1 (iseq_set_sequence)]\n");
-    if (!iseq_set_sequence(iseq, anchor)) return COMPILE_NG;
+    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");
-    if (!iseq_set_exception_table(iseq)) return COMPILE_NG;
+    iseq_set_exception_table(iseq);
 
     debugs("[compile step 4.3 (set_optargs_table)] \n");
-    if (!iseq_set_optargs_table(iseq)) return COMPILE_NG;
+    iseq_set_optargs_table(iseq);
 
     debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
-    if (!rb_iseq_translate_threaded_code(iseq)) return COMPILE_NG;
+    rb_iseq_translate_threaded_code(iseq);
 
     if (compile_debug > 1) {
-	VALUE str = rb_iseq_disasm(iseq);
+	VALUE str = rb_iseq_disasm(iseq->self);
 	printf("%s\n", StringValueCStr(str));
+	fflush(stdout);
     }
     debugs("[compile step: finish]\n");
 
-    return COMPILE_OK;
+    return 0;
 }
 
 static int
 iseq_set_exception_local_table(rb_iseq_t *iseq)
 {
-    /* TODO: every id table is same -> share it.
-     * Current problem is iseq_free().
-     */
     ID id_dollar_bang;
-    ID *ids = (ID *)ALLOC_N(ID, 1);
 
     CONST_ID(id_dollar_bang, "#$!");
-    iseq->body->local_table_size = 1;
-    ids[0] = id_dollar_bang;
-    iseq->body->local_table = ids;
+    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_lvar_level(const rb_iseq_t *iseq)
+get_lvar_level(rb_iseq_t *iseq)
 {
     int lev = 0;
-    while (iseq != iseq->body->local_iseq) {
+    while (iseq != iseq->local_iseq) {
 	lev++;
-	iseq = iseq->body->parent_iseq;
+	iseq = iseq->parent_iseq;
     }
     return lev;
 }
 
 static int
-get_dyna_var_idx_at_raw(const rb_iseq_t *iseq, ID id)
+get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
 {
-    unsigned int i;
+    int i;
 
-    for (i = 0; i < iseq->body->local_table_size; i++) {
-	if (iseq->body->local_table[i] == id) {
-	    return (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(const rb_iseq_t *iseq, ID id)
+get_local_var_idx(rb_iseq_t *iseq, ID id)
 {
-    int idx = get_dyna_var_idx_at_raw(iseq->body->local_iseq, id);
+    int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id);
 
     if (idx < 0) {
 	rb_bug("get_local_var_idx: %d", idx);
@@ -1229,7 +1135,7 @@ get_local_var_idx(const rb_iseq_t *iseq, ID id)
 }
 
 static int
-get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
+get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
 {
     int lv = 0, idx = -1;
 
@@ -1238,7 +1144,7 @@ get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
 	if (idx >= 0) {
 	    break;
 	}
-	iseq = iseq->body->parent_iseq;
+	iseq = iseq->parent_iseq;
 	lv++;
     }
 
@@ -1247,120 +1153,12 @@ get_dyna_var_idx(const rb_iseq_t *iseq, ID id, int *level, int *ls)
     }
 
     *level = lv;
-    *ls = iseq->body->local_table_size;
+    *ls = iseq->local_size;
     return idx;
 }
 
-static void
-iseq_calc_param_size(rb_iseq_t *iseq)
-{
-    if (iseq->body->param.flags.has_opt ||
-	iseq->body->param.flags.has_post ||
-	iseq->body->param.flags.has_rest ||
-	iseq->body->param.flags.has_block ||
-	iseq->body->param.flags.has_kw ||
-	iseq->body->param.flags.has_kwrest) {
-
-	if (iseq->body->param.flags.has_block) {
-	    iseq->body->param.size = iseq->body->param.block_start + 1;
-	}
-	else if (iseq->body->param.flags.has_kwrest) {
-	    iseq->body->param.size = iseq->body->param.keyword->rest_start + 1;
-	}
-	else if (iseq->body->param.flags.has_kw) {
-	    iseq->body->param.size = iseq->body->param.keyword->bits_start + 1;
-	}
-	else if (iseq->body->param.flags.has_post) {
-	    iseq->body->param.size = iseq->body->param.post_start + iseq->body->param.post_num;
-	}
-	else if (iseq->body->param.flags.has_rest) {
-	    iseq->body->param.size = iseq->body->param.rest_start + 1;
-	}
-	else if (iseq->body->param.flags.has_opt) {
-	    iseq->body->param.size = iseq->body->param.lead_num + iseq->body->param.opt_num;
-	}
-	else {
-	    rb_bug("unreachable");
-	}
-    }
-    else {
-	iseq->body->param.size = iseq->body->param.lead_num;
-    }
-}
-
-static void
-iseq_set_arguments_keywords(rb_iseq_t *iseq, LINK_ANCHOR *const optargs,
-			    const struct rb_args_info *args)
-{
-    NODE *node = args->kw_args;
-    struct rb_iseq_param_keyword *keyword;
-    const VALUE default_values = rb_ary_tmp_new(1);
-    const VALUE complex_mark = rb_str_tmp_new(0);
-    int kw = 0, rkw = 0, di = 0, i;
-
-    iseq->body->param.flags.has_kw = TRUE;
-    iseq->body->param.keyword = keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
-    keyword->bits_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
-
-    while (node) {
-	NODE *val_node = node->nd_body->nd_value;
-	VALUE dv;
-
-	if (val_node == (NODE *)-1) {
-	    ++rkw;
-	}
-	else {
-	    switch (nd_type(val_node)) {
-	      case NODE_LIT:
-		dv = val_node->nd_lit;
-		iseq_add_mark_object(iseq, dv);
-		break;
-	      case NODE_NIL:
-		dv = Qnil;
-		break;
-	      case NODE_TRUE:
-		dv = Qtrue;
-		break;
-	      case NODE_FALSE:
-		dv = Qfalse;
-		break;
-	      default:
-		COMPILE_POPPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
-		dv = complex_mark;
-	    }
-
-	    keyword->num = ++di;
-	    rb_ary_push(default_values, dv);
-	}
-
-	kw++;
-	node = node->nd_next;
-    }
-
-    keyword->num = kw;
-
-    if (args->kw_rest_arg->nd_cflag != 0) {
-	keyword->rest_start =  get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_cflag);
-	iseq->body->param.flags.has_kwrest = TRUE;
-    }
-    keyword->required_num = rkw;
-    keyword->table = &iseq->body->local_table[keyword->bits_start - keyword->num];
-
-    {
-	VALUE *dvs = ALLOC_N(VALUE, RARRAY_LEN(default_values));
-
-	for (i = 0; i < RARRAY_LEN(default_values); i++) {
-	    VALUE dv = RARRAY_AREF(default_values, i);
-	    if (dv == complex_mark) dv = Qundef;
-	    dvs[i] = dv;
-	}
-
-	keyword->default_values = dvs;
-    }
-}
-
 static int
-iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, NODE *node_args)
+iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 {
     debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
 
@@ -1370,11 +1168,14 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, NODE *node_args)
 	int last_comma = 0;
 	ID block_id = 0;
 
-	EXPECT_NODE("iseq_set_arguments", node_args, NODE_ARGS);
+	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)));
+	}
+
 
-	iseq->body->param.lead_num = (int)args->pre_args_num;
-	if (iseq->body->param.lead_num > 0) iseq->body->param.flags.has_lead = TRUE;
-	debugs("  - argc: %d\n", iseq->body->param.lead_num);
+	iseq->argc = (int)args->pre_args_num;
+	debugs("  - argc: %d\n", iseq->argc);
 
 	rest_id = args->rest_arg;
 	if (rest_id == 1) {
@@ -1384,23 +1185,21 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, NODE *node_args)
 	block_id = args->block_arg;
 
 	if (args->first_post_arg) {
-	    iseq->body->param.post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg);
-	    iseq->body->param.post_num = args->post_args_num;
-	    iseq->body->param.flags.has_post = TRUE;
+	    iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg);
+	    iseq->arg_post_len = args->post_args_num;
 	}
 
 	if (args->opt_args) {
 	    NODE *node = args->opt_args;
 	    LABEL *label;
 	    VALUE labels = rb_ary_tmp_new(1);
-	    VALUE *opt_table;
 	    int i = 0, j;
 
 	    while (node) {
 		label = NEW_LABEL(nd_line(node));
 		rb_ary_push(labels, (VALUE)label | 1);
 		ADD_LABEL(optargs, label);
-		COMPILE_POPPED(optargs, "optarg", node->nd_body);
+		COMPILE_POPED(optargs, "optarg", node->nd_body);
 		node = node->nd_next;
 		i += 1;
 	    }
@@ -1409,79 +1208,139 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *const optargs, NODE *node_args)
 	    label = NEW_LABEL(nd_line(node_args));
 	    rb_ary_push(labels, (VALUE)label | 1);
 	    ADD_LABEL(optargs, label);
+	    i += 1;
 
-	    opt_table = ALLOC_N(VALUE, i+1);
-
-	    MEMCPY(opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1);
-	    for (j = 0; j < i+1; j++) {
-		opt_table[j] &= ~1;
+	    iseq->arg_opts = i;
+	    iseq->arg_opt_table = ALLOC_N(VALUE, i);
+	    MEMCPY(iseq->arg_opt_table, RARRAY_CONST_PTR(labels), VALUE, i);
+	    for (j = 0; j < i; j++) {
+		iseq->arg_opt_table[j] &= ~1;
 	    }
 	    rb_ary_clear(labels);
-
-	    iseq->body->param.flags.has_opt = TRUE;
-	    iseq->body->param.opt_num = i;
-	    iseq->body->param.opt_table = opt_table;
+	}
+	else {
+	    iseq->arg_opts = 0;
 	}
 
 	if (args->kw_args) {
-	    iseq_set_arguments_keywords(iseq, optargs, args);
+	    NODE *node = args->kw_args;
+	    VALUE keywords = rb_ary_tmp_new(1);
+	    VALUE required = 0;
+	    int i = 0, j, r = 0;
+
+	    iseq->arg_keyword = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
+	    COMPILE(optargs, "kwarg", args->kw_rest_arg);
+	    while (node) {
+		VALUE list = keywords;
+		if (node->nd_body->nd_value == (NODE *)-1) {
+		    ++r;
+		    if (!required) required = rb_ary_tmp_new(1);
+		    list = required;
+		}
+		rb_ary_push(list, INT2FIX(node->nd_body->nd_vid));
+		COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
+		node = node->nd_next;
+		i += 1;
+	    }
+	    iseq->arg_keyword_check = args->kw_rest_arg->nd_cflag != 0;
+	    iseq->arg_keywords = i;
+	    iseq->arg_keyword_required = r;
+	    iseq->arg_keyword_table = ALLOC_N(ID, i);
+	    if (r) {
+		rb_ary_concat(required, keywords);
+		keywords = required;
+	    }
+	    for (j = 0; j < i; j++) {
+		iseq->arg_keyword_table[j] = FIX2INT(RARRAY_AREF(keywords, j));
+	    }
+	    ADD_INSN(optargs, nd_line(args->kw_args), pop);
 	}
 	else if (args->kw_rest_arg) {
-	    struct rb_iseq_param_keyword *keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
-	    keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
-	    iseq->body->param.keyword = keyword;
-	    iseq->body->param.flags.has_kwrest = TRUE;
+	    iseq->arg_keyword = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
+	    COMPILE(optargs, "kwarg", args->kw_rest_arg);
+	    ADD_INSN(optargs, nd_line(args->kw_rest_arg), pop);
+	}
+	else {
+	    iseq->arg_keyword = -1;
 	}
 
 	if (args->pre_init) { /* m_init */
-	    COMPILE_POPPED(optargs, "init arguments (m)", args->pre_init);
+	    COMPILE_POPED(optargs, "init arguments (m)", args->pre_init);
 	}
 	if (args->post_init) { /* p_init */
-	    COMPILE_POPPED(optargs, "init arguments (p)", args->post_init);
+	    COMPILE_POPED(optargs, "init arguments (p)", args->post_init);
 	}
 
 	if (rest_id) {
-	    iseq->body->param.rest_start = get_dyna_var_idx_at_raw(iseq, rest_id);
-	    iseq->body->param.flags.has_rest = TRUE;
-	    assert(iseq->body->param.rest_start != -1);
+	    iseq->arg_rest = get_dyna_var_idx_at_raw(iseq, rest_id);
+
+	    if (iseq->arg_rest == -1) {
+		rb_bug("arg_rest: -1");
+	    }
 
-	    if (iseq->body->param.post_start == 0) { /* TODO: why that? */
-		iseq->body->param.post_start = iseq->body->param.rest_start + 1;
+	    if (iseq->arg_post_start == 0) {
+		iseq->arg_post_start = iseq->arg_rest + 1;
 	    }
 	}
 
 	if (block_id) {
-	    iseq->body->param.block_start = get_dyna_var_idx_at_raw(iseq, block_id);
-	    iseq->body->param.flags.has_block = TRUE;
+	    iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
 	}
 
-	iseq_calc_param_size(iseq);
+	if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
+	    iseq->arg_rest != -1 || iseq->arg_block != -1 ||
+	    iseq->arg_keyword != -1) {
+	    iseq->arg_simple = 0;
 
-	if (iseq->body->type == ISEQ_TYPE_BLOCK) {
-	    if (iseq->body->param.flags.has_opt    == FALSE &&
-		iseq->body->param.flags.has_post   == FALSE &&
-		iseq->body->param.flags.has_rest   == FALSE &&
-		iseq->body->param.flags.has_kw     == FALSE &&
-		iseq->body->param.flags.has_kwrest == FALSE) {
+	    /* set arg_size: size of arguments */
+	    if (iseq->arg_keyword != -1) {
+		iseq->arg_size = iseq->arg_keyword + 1;
+	    }
+	    else 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->body->param.lead_num == 1 && last_comma == 0) {
+	if (iseq->type == ISEQ_TYPE_BLOCK) {
+	    if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 &&
+		iseq->arg_rest == -1 && iseq->arg_keyword == -1) {
+		if (iseq->argc == 1 && last_comma == 0) {
 		    /* {|a|} */
-		    iseq->body->param.flags.ambiguous_param0 = TRUE;
+		    iseq->arg_simple |= 0x02;
 		}
 	    }
 	}
     }
+    else {
+	iseq->arg_simple = 1;
+    }
 
     return COMPILE_OK;
 }
 
 static int
-iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
+iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
 {
-    unsigned int size;
+    int size;
 
     if (tbl) {
-	size = (unsigned int)*tbl;
+	size = (int)*tbl;
 	tbl++;
     }
     else {
@@ -1489,13 +1348,21 @@ iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
     }
 
     if (size > 0) {
-	ID *ids = (ID *)ALLOC_N(ID, size);
-	MEMCPY(ids, tbl, ID, size);
-	iseq->body->local_table = ids;
+	iseq->local_table = (ID *)ALLOC_N(ID, size);
+	MEMCPY(iseq->local_table, tbl, ID, size);
     }
-    iseq->body->local_table_size = size;
 
-    debugs("iseq_set_local_table: %u\n", iseq->body->local_table_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;
 }
 
@@ -1546,56 +1413,38 @@ cdhash_set_label_i(VALUE key, VALUE val, void *ptr)
     return ST_CONTINUE;
 }
 
-
-static inline VALUE
-get_ivar_ic_value(rb_iseq_t *iseq,ID id)
-{
-    VALUE val;
-    struct rb_id_table *tbl = ISEQ_COMPILE_DATA(iseq)->ivar_cache_table;
-    if (tbl) {
-	if (rb_id_table_lookup(tbl,id,&val)) {
-	    return val;
-	}
-    }
-    else {
-	tbl = rb_id_table_create(1);
-	ISEQ_COMPILE_DATA(iseq)->ivar_cache_table = tbl;
-    }
-    val = INT2FIX(iseq->body->is_size++);
-    rb_id_table_insert(tbl,id,val);
-    return val;
-}
-
 /**
   ruby insn object list -> raw instruction sequence
  */
 static int
-iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
+    LABEL *lobj;
+    INSN *iobj;
     struct iseq_line_info_entry *line_info_table;
     unsigned int last_line = 0;
     LINK_ELEMENT *list;
     VALUE *generated_iseq;
 
-    int insn_num, code_index, line_info_index, sp, stack_max = 0, line = 0;
+    int k, pos, sp, stack_max = 0, line = 0;
 
-    /* fix label position */
+    /* set label position */
     list = FIRST_ELEMENT(anchor);
-    insn_num = code_index = 0;
+    k = pos = 0;
     while (list) {
 	switch (list->type) {
 	  case ISEQ_ELEMENT_INSN:
 	    {
-		INSN *iobj = (INSN *)list;
+		iobj = (INSN *)list;
 		line = iobj->line_no;
-		code_index += insn_data_length(iobj);
-		insn_num++;
+		pos += insn_data_length(iobj);
+		k++;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
-		LABEL *lobj = (LABEL *)list;
-		lobj->position = code_index;
+		lobj = (LABEL *)list;
+		lobj->position = pos;
 		lobj->set = TRUE;
 		break;
 	    }
@@ -1608,32 +1457,30 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 	    {
 		ADJUST *adjust = (ADJUST *)list;
 		if (adjust->line_no != -1) {
-		    code_index += 2 /* insn + 1 operand */;
-		    insn_num++;
+		    pos += 2 /* insn + 1 operand */;
+		    k++;
 		}
 		break;
 	    }
 	  default:
 	    dump_disasm_list(FIRST_ELEMENT(anchor));
 	    dump_disasm_list(list);
-	    COMPILE_ERROR(iseq, line, "error: set_sequence");
-	    return COMPILE_NG;
+	    rb_compile_error(RSTRING_PTR(iseq->location.path), line,
+			     "error: set_sequence");
+	    break;
 	}
 	list = list->next;
     }
 
     /* make instruction sequence */
-    generated_iseq = ALLOC_N(VALUE, code_index);
-    line_info_table = ALLOC_N(struct iseq_line_info_entry, insn_num);
-    iseq->body->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->body->is_size);
-    iseq->body->ci_entries = (struct rb_call_info *)ruby_xmalloc(sizeof(struct rb_call_info) * iseq->body->ci_size +
-								 sizeof(struct rb_call_info_with_kwarg) * iseq->body->ci_kw_size);
-    iseq->body->cc_entries = ZALLOC_N(struct rb_call_cache, iseq->body->ci_size + iseq->body->ci_kw_size);
-
-    ISEQ_COMPILE_DATA(iseq)->ci_index = ISEQ_COMPILE_DATA(iseq)->ci_kw_index = 0;
+    generated_iseq = ALLOC_N(VALUE, pos);
+    line_info_table = ALLOC_N(struct iseq_line_info_entry, k);
+    iseq->is_entries = ZALLOC_N(union iseq_inline_storage_entry, iseq->is_size);
+    iseq->callinfo_entries = ALLOC_N(rb_call_info_t, iseq->callinfo_size);
+    /* MEMZERO(iseq->callinfo_entries, rb_call_info_t, iseq->callinfo_size); */
 
     list = FIRST_ELEMENT(anchor);
-    line_info_index = code_index = sp = 0;
+    k = pos = sp = 0;
 
     while (list) {
 	switch (list->type) {
@@ -1642,7 +1489,8 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		int j, len, insn;
 		const char *types;
 		VALUE *operands;
-		INSN *iobj = (INSN *)list;
+
+		iobj = (INSN *)list;
 
 		/* update sp */
 		sp = calc_sp_depth(sp, iobj);
@@ -1653,7 +1501,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
 		operands = iobj->operands;
 		insn = iobj->insn_id;
-		generated_iseq[code_index] = insn;
+		generated_iseq[pos] = insn;
 		types = insn_op_types(insn);
 		len = insn_len(insn);
 
@@ -1661,12 +1509,12 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		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->location.path), iobj->line_no,
+				     "operand size miss! (%d for %d)",
+				     iobj->operand_size, len - 1);
 		    xfree(generated_iseq);
 		    xfree(line_info_table);
-		    COMPILE_ERROR(iseq, iobj->line_no,
-				  "operand size miss! (%d for %d)",
-				  iobj->operand_size, len - 1);
-		    return COMPILE_NG;
+		    return 0;
 		}
 
 		for (j = 0; types[j]; j++) {
@@ -1676,16 +1524,15 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		      case TS_OFFSET:
 			{
 			    /* label(destination position) */
-			    LABEL *lobj = (LABEL *)operands[j];
+			    lobj = (LABEL *)operands[j];
 			    if (!lobj->set) {
-				COMPILE_ERROR(iseq, iobj->line_no,
-					      "unknown label");
-				return COMPILE_NG;
+				rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+						 "unknown label");
 			    }
 			    if (lobj->sp == -1) {
 				lobj->sp = sp;
 			    }
-			    generated_iseq[code_index + 1 + j] = lobj->position - (code_index + len);
+			    generated_iseq[pos + 1 + j] = lobj->position - (pos + len);
 			    break;
 			}
 		      case TS_CDHASH:
@@ -1693,102 +1540,87 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			    VALUE map = operands[j];
 			    struct cdhash_set_label_struct data;
                             data.hash = map;
-                            data.pos = code_index;
+                            data.pos = pos;
                             data.len = len;
 			    rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data);
 
-			    rb_hash_rehash(map);
-			    freeze_hide_obj(map);
-			    generated_iseq[code_index + 1 + j] = map;
+			    hide_obj(map);
+			    generated_iseq[pos + 1 + j] = map;
 			    break;
 			}
 		      case TS_LINDEX:
 		      case TS_NUM:	/* ulong */
-			generated_iseq[code_index + 1 + j] = FIX2INT(operands[j]);
+			generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
 			break;
 		      case TS_ISEQ:	/* iseq */
 			{
 			    VALUE v = operands[j];
-			    generated_iseq[code_index + 1 + j] = v;
+			    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[code_index + 1 + j] = v;
+			    generated_iseq[pos + 1 + j] = v;
 			    /* to mark ruby object */
 			    iseq_add_mark_object(iseq, v);
 			    break;
 			}
 		      case TS_IC: /* inline cache */
 			{
-			    unsigned int ic_index = FIX2UINT(operands[j]);
-			    IC ic = (IC)&iseq->body->is_entries[ic_index];
-			    if (UNLIKELY(ic_index >= iseq->body->is_size)) {
-				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->body->is_size);
+			    int ic_index = FIX2INT(operands[j]);
+			    IC ic = (IC)&iseq->is_entries[ic_index];
+			    if (UNLIKELY(ic_index >= iseq->is_size)) {
+				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->is_size);
 			    }
-			    generated_iseq[code_index + 1 + j] = (VALUE)ic;
+			    generated_iseq[pos + 1 + j] = (VALUE)ic;
 			    break;
 			}
 		      case TS_CALLINFO: /* call info */
 			{
-			    struct rb_call_info *base_ci = (struct rb_call_info *)operands[j];
-			    struct rb_call_info *ci;
-
-			    if (base_ci->flag & VM_CALL_KWARG) {
-				struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size];
-				struct rb_call_info_with_kwarg *ci_kw = &ci_kw_entries[ISEQ_COMPILE_DATA(iseq)->ci_kw_index++];
-				*ci_kw = *((struct rb_call_info_with_kwarg *)base_ci);
-				ci = (struct rb_call_info *)ci_kw;
-				assert(ISEQ_COMPILE_DATA(iseq)->ci_kw_index <= iseq->body->ci_kw_size);
-			    }
-			    else {
-				ci = &iseq->body->ci_entries[ISEQ_COMPILE_DATA(iseq)->ci_index++];
-				*ci = *base_ci;
-				assert(ISEQ_COMPILE_DATA(iseq)->ci_index <= iseq->body->ci_size);
-			    }
+			    rb_call_info_t *base_ci = (rb_call_info_t *)operands[j];
+			    rb_call_info_t *ci = &iseq->callinfo_entries[base_ci->aux.index];
+			    *ci = *base_ci;
 
-			    generated_iseq[code_index + 1 + j] = (VALUE)ci;
-			    break;
-			}
-		      case TS_CALLCACHE:
-			{
-			    struct rb_call_cache *cc = &iseq->body->cc_entries[ISEQ_COMPILE_DATA(iseq)->ci_index + ISEQ_COMPILE_DATA(iseq)->ci_kw_index - 1];
-			    generated_iseq[code_index + 1 + j] = (VALUE)cc;
+			    if (UNLIKELY(base_ci->aux.index >= iseq->callinfo_size)) {
+				rb_bug("iseq_set_sequence: ci_index overflow: index: %d, size: %d", base_ci->argc, iseq->callinfo_size);
+			    }
+			    generated_iseq[pos + 1 + j] = (VALUE)ci;
 			    break;
 			}
 		      case TS_ID: /* ID */
-			generated_iseq[code_index + 1 + j] = SYM2ID(operands[j]);
+			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[code_index + 1 + j] = (VALUE)entry;
+			    generated_iseq[pos + 1 + j] = (VALUE)entry;
 			}
 			break;
-		      case TS_FUNCPTR:
-			generated_iseq[code_index + 1 + j] = operands[j];
-			break;
 		      default:
+			rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+					 "unknown operand type: %c", type);
 			xfree(generated_iseq);
 			xfree(line_info_table);
-			COMPILE_ERROR(iseq, iobj->line_no,
-				      "unknown operand type: %c", type);
-			return COMPILE_NG;
+			return 0;
 		    }
 		}
 		if (last_line != iobj->line_no) {
-		    line_info_table[line_info_index].line_no = last_line = iobj->line_no;
-		    line_info_table[line_info_index].position = code_index;
-		    line_info_index++;
+		    line_info_table[k].line_no = last_line = iobj->line_no;
+		    line_info_table[k].position = pos;
+		    k++;
 		}
-		code_index += len;
+		pos += len;
 		break;
 	    }
 	  case ISEQ_ELEMENT_LABEL:
 	    {
-		LABEL *lobj = (LABEL *)list;
+		lobj = (LABEL *)list;
 		if (lobj->sp == -1) {
 		    lobj->sp = sp;
 		}
@@ -1812,27 +1644,25 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		if (adjust->line_no != -1) {
 		    if (orig_sp - sp > 0) {
 			if (last_line != (unsigned int)adjust->line_no) {
-			    line_info_table[line_info_index].line_no = last_line = adjust->line_no;
-			    line_info_table[line_info_index].position = code_index;
-			    line_info_index++;
+			    line_info_table[k].line_no = last_line = adjust->line_no;
+			    line_info_table[k].position = pos;
+			    k++;
 			}
-			generated_iseq[code_index++] = BIN(adjuststack);
-			generated_iseq[code_index++] = orig_sp - sp;
+			generated_iseq[pos++] = BIN(adjuststack);
+			generated_iseq[pos++] = orig_sp - sp;
 		    }
 		    else if (orig_sp - sp == 0) {
 			/* jump to next insn */
 			if (last_line != (unsigned int)adjust->line_no) {
-			    line_info_table[line_info_index].line_no = last_line = adjust->line_no;
-			    line_info_table[line_info_index].position = code_index;
-			    line_info_index++;
+			    line_info_table[k].line_no = last_line = adjust->line_no;
+			    line_info_table[k].position = pos;
+			    k++;
 			}
-			generated_iseq[code_index++] = BIN(nop);
-			generated_iseq[code_index++] = BIN(nop);
+			generated_iseq[pos++] = BIN(jump);
+			generated_iseq[pos++] = 0;
 		    }
 		    else {
-			compile_bug(iseq, adjust->line_no,
-				    "iseq_set_sequence: adjust bug %d < %d",
-				    orig_sp, sp);
+			rb_bug("iseq_set_sequence: adjust bug");
 		    }
 		}
 		break;
@@ -1844,13 +1674,20 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 	list = list->next;
     }
 
-    iseq->body->iseq_encoded = (void *)generated_iseq;
-    iseq->body->iseq_size = code_index;
-    iseq->body->stack_max = stack_max;
+#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_encoded = (void *)generated_iseq;
+    iseq->iseq_size = pos;
+    iseq->stack_max = stack_max;
 
-    REALLOC_N(line_info_table, struct iseq_line_info_entry, line_info_index);
-    iseq->body->line_info_table = line_info_table;
-    iseq->body->line_info_size = line_info_index;
+    REALLOC_N(line_info_table, struct iseq_line_info_entry, k);
+    iseq->line_info_table = line_info_table;
+    iseq->line_info_size = k;
 
     return COMPILE_OK;
 }
@@ -1871,53 +1708,50 @@ static int
 iseq_set_exception_table(rb_iseq_t *iseq)
 {
     const VALUE *tptr, *ptr;
-    unsigned int tlen, i;
+    int tlen, i;
     struct iseq_catch_table_entry *entry;
 
-    tlen = (int)RARRAY_LEN(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
-    tptr = RARRAY_CONST_PTR(ISEQ_COMPILE_DATA(iseq)->catch_table_ary);
+    tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
+    tptr = RARRAY_CONST_PTR(iseq->compile_data->catch_table_ary);
 
+    iseq->catch_table = 0;
     if (tlen > 0) {
-	struct iseq_catch_table *table = xmalloc(iseq_catch_table_bytes(tlen));
-	table->size = tlen;
-
-	for (i = 0; i < table->size; i++) {
-	    ptr = RARRAY_CONST_PTR(tptr[i]);
-	    entry = &table->entries[i];
-	    entry->type = (enum catch_type)(ptr[0] & 0xffff);
-	    entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
-	    entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
-	    entry->iseq = (rb_iseq_t *)ptr[3];
-
-	    /* register iseq as mark object */
-	    if (entry->iseq != 0) {
-		iseq_add_mark_object(iseq, (VALUE)entry->iseq);
-	    }
+	iseq->catch_table = xmalloc(iseq_catch_table_bytes(tlen));
+	iseq->catch_table->size = tlen;
+    }
 
-	    /* 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;
+    if (iseq->catch_table) for (i = 0; i < iseq->catch_table->size; i++) {
+	ptr = RARRAY_CONST_PTR(tptr[i]);
+	entry = &iseq->catch_table->entries[i];
+	entry->type = (enum catch_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--;
 	    }
 	}
-	iseq->body->catch_table = table;
-	RB_OBJ_WRITE(iseq, &ISEQ_COMPILE_DATA(iseq)->catch_table_ary, 0); /* free */
-    }
-    else {
-	iseq->body->catch_table = NULL;
+	else {
+	    entry->cont = 0;
+	}
     }
 
+    RB_OBJ_WRITE(iseq->self, &iseq->compile_data->catch_table_ary, 0); /* free */
     return COMPILE_OK;
 }
 
@@ -1934,11 +1768,11 @@ static int
 iseq_set_optargs_table(rb_iseq_t *iseq)
 {
     int i;
-    VALUE *opt_table = (VALUE *)iseq->body->param.opt_table;
 
-    if (iseq->body->param.flags.has_opt) {
-	for (i = 0; i < iseq->body->param.opt_num + 1; i++) {
-	    opt_table[i] = label_get_position((LABEL *)opt_table[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;
@@ -1952,7 +1786,7 @@ get_destination_insn(INSN *iobj)
 
     list = lobj->link.next;
     while (list) {
-	if (IS_INSN(list) || IS_ADJUST(list)) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
 	    break;
 	}
 	list = list->next;
@@ -1966,7 +1800,7 @@ get_next_insn(INSN *iobj)
     LINK_ELEMENT *list = iobj->link.next;
 
     while (list) {
-	if (IS_INSN(list) || IS_ADJUST(list)) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
 	    return list;
 	}
 	list = list->next;
@@ -1980,7 +1814,7 @@ get_prev_insn(INSN *iobj)
     LINK_ELEMENT *list = iobj->link.prev;
 
     while (list) {
-	if (IS_INSN(list) || IS_ADJUST(list)) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
 	    return list;
 	}
 	list = list->prev;
@@ -1988,66 +1822,12 @@ get_prev_insn(INSN *iobj)
     return 0;
 }
 
-static void
-unref_destination(INSN *iobj, int pos)
-{
-    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, pos);
-    --lobj->refcnt;
-    if (!lobj->refcnt) REMOVE_ELEM(&lobj->link);
-}
-
-static void
-replace_destination(INSN *dobj, INSN *nobj)
-{
-    VALUE n = OPERAND_AT(nobj, 0);
-    LABEL *dl = (LABEL *)OPERAND_AT(dobj, 0);
-    LABEL *nl = (LABEL *)n;
-    --dl->refcnt;
-    ++nl->refcnt;
-    OPERAND_AT(dobj, 0) = n;
-    if (!dl->refcnt) REMOVE_ELEM(&dl->link);
-}
-
-static int
-remove_unreachable_chunk(rb_iseq_t *iseq, LINK_ELEMENT *i)
-{
-    int removed = 0;
-    while (i) {
-	if (IS_INSN(i)) {
-	    struct rb_iseq_constant_body *body = iseq->body;
-	    VALUE insn = INSN_OF(i);
-	    int pos, len = insn_len(insn);
-	    for (pos = 0; pos < len; ++pos) {
-		switch (insn_op_types(insn)[pos]) {
-		  case TS_OFFSET:
-		    unref_destination((INSN *)i, pos);
-		    break;
-		  case TS_CALLINFO:
-		    if (((struct rb_call_info *)OPERAND_AT(i, pos))->flag & VM_CALL_KWARG)
-			--(body->ci_kw_size);
-		    else
-			--(body->ci_size);
-		    break;
-		}
-	    }
-	}
-	else if (IS_LABEL(i)) {
-	    if (((LABEL *)i)->refcnt > 0) break;
-	}
-	else break;
-	REMOVE_ELEM(i);
-	removed = 1;
-	i = i->next;
-    }
-    return removed;
-}
-
 static int
 iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
 {
     INSN *iobj = (INSN *)list;
   again:
-    if (IS_INSN_ID(iobj, jump)) {
+    if (iobj->insn_id == BIN(jump)) {
 	INSN *niobj, *diobj, *piobj;
 	/*
 	 *  useless jump elimination:
@@ -2069,16 +1849,15 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     * =>
 	     *   LABEL:
 	     */
-	    unref_destination(iobj, 0);
 	    REMOVE_ELEM(&iobj->link);
 	}
-	else if (iobj != diobj && IS_INSN_ID(diobj, jump) &&
-		 OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
-	    replace_destination(iobj, diobj);
-	    remove_unreachable_chunk(iseq, iobj->link.next);
-	    goto again;
+	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 (IS_INSN_ID(diobj, leave)) {
+	else if (diobj->insn_id == BIN(leave)) {
 	    /*
 	     *  jump LABEL
 	     *  ...
@@ -2090,14 +1869,14 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	     * 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 */
-	    unref_destination(iobj, 0);
-	    iobj->insn_id = BIN(leave);
-	    iobj->operand_size = 0;
-	    INSERT_ELEM_NEXT(&iobj->link, &popiobj->link);
-	    goto again;
+	    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):
@@ -2114,27 +1893,19 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	 * L2:
 	 */
 	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
-		 (IS_INSN_ID(piobj, branchif) ||
-		  IS_INSN_ID(piobj, branchunless))) {
+		 (piobj->insn_id == BIN(branchif) ||
+		  piobj->insn_id == BIN(branchunless))) {
 	    if (niobj == (INSN *)get_destination_insn(piobj)) {
-		piobj->insn_id = (IS_INSN_ID(piobj, branchif))
+		piobj->insn_id = (piobj->insn_id == BIN(branchif))
 		  ? BIN(branchunless) : BIN(branchif);
-		replace_destination(piobj, iobj);
+		OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0);
 		REMOVE_ELEM(&iobj->link);
 	    }
 	}
-	else if (remove_unreachable_chunk(iseq, iobj->link.next)) {
-	    goto again;
-	}
-    }
-
-    if (IS_INSN_ID(iobj, leave)) {
-	remove_unreachable_chunk(iseq, iobj->link.next);
     }
 
-    if (IS_INSN_ID(iobj, branchif) ||
-	IS_INSN_ID(iobj, branchnil) ||
-	IS_INSN_ID(iobj, branchunless)) {
+    if (iobj->insn_id == BIN(branchif) ||
+	iobj->insn_id == BIN(branchunless)) {
 	/*
 	 *   if L1
 	 *   ...
@@ -2144,144 +1915,12 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	 *   if L2
 	 */
 	INSN *nobj = (INSN *)get_destination_insn(iobj);
-	INSN *pobj = (INSN *)iobj->link.prev;
-	int prev_dup = 0;
-	if (pobj) {
-	    if (!IS_INSN(&pobj->link))
-		pobj = 0;
-	    else if (IS_INSN_ID(pobj, dup))
-		prev_dup = 1;
-	}
-
-	for (;;) {
-	    if (IS_INSN_ID(nobj, jump)) {
-		replace_destination(iobj, nobj);
-	    }
-	    else if (prev_dup && IS_INSN_ID(nobj, dup) &&
-		     !!(nobj = (INSN *)nobj->link.next) &&
-		     /* basic blocks, with no labels in the middle */
-		     nobj->insn_id == iobj->insn_id) {
-		/*
-		 *   dup
-		 *   if L1
-		 *   ...
-		 * L1:
-		 *   dup
-		 *   if L2
-		 * =>
-		 *   dup
-		 *   if L2
-		 *   ...
-		 * L1:
-		 *   dup
-		 *   if L2
-		 */
-		replace_destination(iobj, nobj);
-	    }
-	    else if (pobj) {
-		/*
-		 *   putnil
-		 *   if L1
-		 * =>
-		 *   # nothing
-		 *
-		 *   putobject true
-		 *   if L1
-		 * =>
-		 *   jump L1
-		 *
-		 *   putstring ".."
-		 *   if L1
-		 * =>
-		 *   jump L1
-		 *
-		 *   putstring ".."
-		 *   dup
-		 *   if L1
-		 * =>
-		 *   putstring ".."
-		 *   jump L1
-		 *
-		 */
-		int cond;
-		if (prev_dup && IS_INSN(pobj->link.prev)) {
-		    pobj = (INSN *)pobj->link.prev;
-		}
-		if (IS_INSN_ID(pobj, putobject)) {
-		    cond = (IS_INSN_ID(iobj, branchif) ?
-			    OPERAND_AT(pobj, 0) != Qfalse :
-			    IS_INSN_ID(iobj, branchunless) ?
-			    OPERAND_AT(pobj, 0) == Qfalse :
-			    FALSE);
-		}
-		else if (IS_INSN_ID(pobj, putstring)) {
-		    cond = IS_INSN_ID(iobj, branchif);
-		}
-		else if (IS_INSN_ID(pobj, putnil)) {
-		    cond = !IS_INSN_ID(iobj, branchif);
-		}
-		else break;
-		REMOVE_ELEM(iobj->link.prev);
-		if (cond) {
-		    iobj->insn_id = BIN(jump);
-		    goto again;
-		}
-		else {
-		    unref_destination(iobj, 0);
-		    REMOVE_ELEM(&iobj->link);
-		}
-		break;
-	    }
-	    else break;
-	    nobj = (INSN *)get_destination_insn(nobj);
+	if (nobj->insn_id == BIN(jump)) {
+	    OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0);
 	}
     }
 
-    if (IS_INSN_ID(iobj, pop)) {
-	/*
-	 *  putself / putnil / putobject obj / putstring "..."
-	 *  pop
-	 * =>
-	 *  # do nothing
-	 */
-	LINK_ELEMENT *prev = iobj->link.prev;
-	if (IS_INSN(prev)) {
-	    enum ruby_vminsn_type previ = ((INSN *)prev)->insn_id;
-	    if (previ == BIN(putobject) || previ == BIN(putnil) ||
-		previ == BIN(putself) || previ == BIN(putstring)) {
-		/* just push operand or static value and pop soon, no
-		 * side effects */
-		REMOVE_ELEM(prev);
-		REMOVE_ELEM(&iobj->link);
-	    }
-	}
-    }
-
-    if (IS_INSN_ID(iobj, newarray) ||
-	IS_INSN_ID(iobj, duparray) ||
-	IS_INSN_ID(iobj, expandarray) ||
-	IS_INSN_ID(iobj, concatarray) ||
-	IS_INSN_ID(iobj, splatarray) ||
-	0) {
-	/*
-	 *  newarray N
-	 *  splatarray
-	 * =>
-	 *  newarray N
-	 * newarray always puts an array
-	 */
-	LINK_ELEMENT *next = iobj->link.next;
-	if (IS_INSN(next) && IS_INSN_ID(next, splatarray)) {
-	    /* remove splatarray following always-array insn */
-	    REMOVE_ELEM(next);
-	}
-    }
-
-    if (do_tailcallopt &&
-	(IS_INSN_ID(iobj, send) ||
-	 IS_INSN_ID(iobj, opt_aref_with) ||
-	 IS_INSN_ID(iobj, opt_aset_with) ||
-	 IS_INSN_ID(iobj, invokesuper))) {
+    if (do_tailcallopt && iobj->insn_id == BIN(leave)) {
 	/*
 	 *  send ...
 	 *  leave
@@ -2289,75 +1928,34 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	 *  send ..., ... | VM_CALL_TAILCALL, ...
 	 *  leave # unreachable
 	 */
-	INSN *piobj = NULL;
-	if (iobj->link.next) {
-	    LINK_ELEMENT *next = iobj->link.next;
-	    do {
-		if (!IS_INSN(next)) {
-		    next = next->next;
-		    continue;
-		}
-		switch (INSN_OF(next)) {
-		  case BIN(nop):
-		  /*case BIN(trace):*/
-		    next = next->next;
-		    break;
-		  case BIN(jump):
-		    /* if cond
-		     *   return tailcall
-		     * end
-		     */
-		    next = get_destination_insn((INSN *)next);
-		    break;
-		  case BIN(leave):
-		    piobj = iobj;
-		  default:
-		    next = NULL;
-		    break;
-		}
-	    } while (next);
-	}
+	INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
+	enum ruby_vminsn_type previ = piobj->insn_id;
 
-	if (piobj) {
-	    struct rb_call_info *ci = (struct rb_call_info *)piobj->operands[0];
-	    if (IS_INSN_ID(piobj, send) || IS_INSN_ID(piobj, invokesuper)) {
-		if (piobj->operands[2] == 0) { /* no blockiseq */
-		    ci->flag |= VM_CALL_TAILCALL;
-		}
-	    }
-	    else {
+	if (previ == BIN(send) || previ == BIN(opt_send_simple) || previ == BIN(invokesuper)) {
+	    rb_call_info_t *ci = (rb_call_info_t *)piobj->operands[0];
+	    if (ci->blockiseq == 0) {
 		ci->flag |= VM_CALL_TAILCALL;
 	    }
 	}
     }
-
-    #define IS_TRACE_LINE(insn) \
-	(IS_INSN_ID(insn, trace) && \
-	 OPERAND_AT(insn, 0) == INT2FIX(RUBY_EVENT_LINE))
-    if (IS_TRACE_LINE(iobj) && iobj->link.prev && IS_INSN(iobj->link.prev)) {
-	INSN *piobj = (INSN *)iobj->link.prev;
-	if (IS_TRACE_LINE(piobj)) {
-	    REMOVE_ELEM(iobj->link.prev);
-	}
-    }
-
     return COMPILE_OK;
 }
 
 static int
 insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
 {
+    int old_opsize = iobj->operand_size;
     iobj->insn_id = insn_id;
     iobj->operand_size = insn_len(insn_id) - 1;
 
-    if (insn_id == BIN(opt_neq)) {
+    if (iobj->operand_size > old_opsize) {
 	VALUE *old_operands = iobj->operands;
-	iobj->operand_size = 4;
+	if (insn_id != BIN(opt_neq)) {
+	    rb_bug("insn_set_specialized_instruction: unknown insn: %d", insn_id);
+	}
 	iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size * sizeof(VALUE));
 	iobj->operands[0] = old_operands[0];
-	iobj->operands[1] = Qfalse; /* CALL_CACHE */
-	iobj->operands[2] = (VALUE)new_callinfo(iseq, idEq, 1, 0, NULL, FALSE);
-	iobj->operands[3] = Qfalse; /* CALL_CACHE */
+	iobj->operands[1] = (VALUE)new_callinfo(iseq, idEq, 1, 0, 0);
     }
 
     return COMPILE_OK;
@@ -2366,35 +1964,11 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
 static int
 iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 {
-    if (IS_INSN_ID(iobj, newarray) && iobj->link.next &&
-	IS_INSN(iobj->link.next)) {
-	/*
-	 *   [a, b, ...].max/min -> a, b, c, opt_newarray_max/min
-	 */
-	INSN *niobj = (INSN *)iobj->link.next;
-	if (IS_INSN_ID(niobj, send)) {
-	    struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(niobj, 0);
-	    if ((ci->flag & VM_CALL_ARGS_SIMPLE) && ci->orig_argc == 0) {
-		switch (ci->mid) {
-		  case idMax:
-		    iobj->insn_id = BIN(opt_newarray_max);
-		    REMOVE_ELEM(&niobj->link);
-		    return COMPILE_OK;
-		  case idMin:
-		    iobj->insn_id = BIN(opt_newarray_min);
-		    REMOVE_ELEM(&niobj->link);
-		    return COMPILE_OK;
-		}
-	    }
-	}
-    }
-
-    if (IS_INSN_ID(iobj, send)) {
-	struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, 0);
-	const rb_iseq_t *blockiseq = (rb_iseq_t *)OPERAND_AT(iobj, 2);
+    if (iobj->insn_id == BIN(send)) {
+	rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, 0);
 
 #define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
-	if (ci->flag & VM_CALL_ARGS_SIMPLE) {
+	if (ci->blockiseq == 0 && (ci->flag & ~VM_CALL_ARGS_SKIP_SETUP) == 0) {
 	    switch (ci->orig_argc) {
 	      case 0:
 		switch (ci->mid) {
@@ -2429,10 +2003,8 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 		break;
 	    }
 	}
-
-	if ((ci->flag & VM_CALL_ARGS_BLOCKARG) == 0 && blockiseq == NULL) {
-	    iobj->insn_id = BIN(opt_send_without_block);
-	    iobj->operand_size = insn_len(iobj->insn_id) - 1;
+	if (ci->flag & VM_CALL_ARGS_SKIP_SETUP) {
+	    iobj->insn_id = BIN(opt_send_simple);
 	}
     }
 #undef SP_INSN
@@ -2440,41 +2012,20 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
     return COMPILE_OK;
 }
 
-static inline int
-tailcallable_p(rb_iseq_t *iseq)
-{
-    switch (iseq->body->type) {
-      case ISEQ_TYPE_TOP:
-      case ISEQ_TYPE_EVAL:
-      case ISEQ_TYPE_MAIN:
-	/* not tail callable because cfp will be over popped */
-      case ISEQ_TYPE_RESCUE:
-      case ISEQ_TYPE_ENSURE:
-	/* rescue block can't tail call because of errinfo */
-	return FALSE;
-      default:
-	return TRUE;
-    }
-}
-
 static int
-iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
     LINK_ELEMENT *list;
-    const int do_peepholeopt = ISEQ_COMPILE_DATA(iseq)->option->peephole_optimization;
-    const int do_tailcallopt = tailcallable_p(iseq) &&
-	ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization;
-    const int do_si = ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction;
-    const int do_ou = ISEQ_COMPILE_DATA(iseq)->option->operands_unification;
-    int rescue_level = 0;
-    int tailcallopt = do_tailcallopt;
-
+    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 (IS_INSN(list)) {
+	if (list->type == ISEQ_ELEMENT_INSN) {
 	    if (do_peepholeopt) {
-		iseq_peephole_optimize(iseq, list, tailcallopt);
+		iseq_peephole_optimize(iseq, list, do_tailcallopt);
 	    }
 	    if (do_si) {
 		iseq_specialized_instruction(iseq, (INSN *)list);
@@ -2483,17 +2034,6 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		insn_operands_unification((INSN *)list);
 	    }
 	}
-	if (IS_LABEL(list)) {
-	    switch (((LABEL *)list)->rescued) {
-	      case LABEL_RESCUE_BEG:
-		rescue_level++;
-		tailcallopt = FALSE;
-		break;
-	      case LABEL_RESCUE_END:
-		if (!--rescue_level) tailcallopt = do_tailcallopt;
-		break;
-	    }
-	}
 	list = list->next;
     }
     return COMPILE_OK;
@@ -2541,7 +2081,7 @@ new_unified_insn(rb_iseq_t *iseq,
  * It's future work (if compile time was bottle neck).
  */
 static int
-iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
 #if OPT_INSTRUCTIONS_UNIFICATION
     LINK_ELEMENT *list;
@@ -2551,7 +2091,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 
     list = FIRST_ELEMENT(anchor);
     while (list) {
-	if (IS_INSN(list)) {
+	if (list->type == ISEQ_ELEMENT_INSN) {
 	    iobj = (INSN *)list;
 	    id = iobj->insn_id;
 	    if (unified_insns_data[id] != 0) {
@@ -2560,7 +2100,7 @@ iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 		    const int *unified = entry[j];
 		    LINK_ELEMENT *li = list->next;
 		    for (k = 2; k < unified[1]; k++) {
-			if (!IS_INSN(li) ||
+			if (li->type != ISEQ_ELEMENT_INSN ||
 			    ((INSN *)li)->insn_id != unified[k]) {
 			    goto miss;
 			}
@@ -2617,9 +2157,9 @@ insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
 		dump_disasm_list((LINK_ELEMENT *)iobj);
 		dump_disasm_list((LINK_ELEMENT *)lobj);
 		printf("\n-- %d, %d\n", lobj->sc_state, nstate);
-		COMPILE_ERROR(iseq, iobj->line_no,
-			      "insn_set_sc_state error\n");
-		return COMPILE_NG;
+		rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+				 "insn_set_sc_state error\n");
+		return 0;
 	    }
 	}
 	else {
@@ -2655,7 +2195,7 @@ label_set_sc_state(LABEL *lobj, int state)
 #endif
 
 static int
-iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
+iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 {
 #if OPT_STACK_CACHING
     LINK_ELEMENT *list;
@@ -2719,9 +2259,8 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 			  case SCS_XX:
 			    goto normal_insn;
 			  default:
-			    COMPILE_ERROR(iseq, iobj->line_no,
-					  "unreachable");
-			    return COMPILE_NG;
+			    rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+					     "unreachable");
 			}
 			/* remove useless pop */
 			REMOVE_ELEM(list);
@@ -2752,23 +2291,18 @@ iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *const anchor)
 }
 
 static int
-compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int *cntp)
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
 {
     NODE *list = node->nd_next;
     VALUE lit = node->nd_lit;
-    LINK_ELEMENT *first_lit = 0;
     int cnt = 0;
 
     debugp_param("nd_lit", lit);
     if (!NIL_P(lit)) {
 	cnt++;
-	if (!RB_TYPE_P(lit, T_STRING)) {
-	    compile_bug(ERROR_ARGS "dstr: must be string: %s",
-			rb_builtin_type_name(TYPE(lit)));
-	}
-	lit = node->nd_lit = rb_fstring(lit);
+	if (RB_TYPE_P(lit, T_STRING))
+	    lit = node->nd_lit = rb_fstring(node->nd_lit);
 	ADD_INSN1(ret, nd_line(node), putobject, lit);
-	if (RSTRING_LEN(lit) == 0) first_lit = LAST_ELEMENT(ret);
     }
 
     while (list) {
@@ -2776,7 +2310,6 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int
 	if (nd_type(node) == NODE_STR) {
 	    node->nd_lit = rb_fstring(node->nd_lit);
 	    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
-	    lit = Qnil;
 	}
 	else {
 	    COMPILE(ret, "each string", node);
@@ -2784,17 +2317,13 @@ compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int
 	cnt++;
 	list = list->nd_next;
     }
-    if (NIL_P(lit) && first_lit) {
-	REMOVE_ELEM(first_lit);
-	--cnt;
-    }
     *cntp = cnt;
 
     return COMPILE_OK;
 }
 
 static int
-compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
+compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
 {
     int cnt;
     compile_dstr_fragments(iseq, ret, node, &cnt);
@@ -2803,7 +2332,7 @@ compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
 }
 
 static int
-compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
 {
     int cnt;
     compile_dstr_fragments(iseq, ret, node, &cnt);
@@ -2812,40 +2341,7 @@ compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
 }
 
 static int
-compile_flip_flop(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int again,
-		  LABEL *then_label, LABEL *else_label)
-{
-    const int line = nd_line(node);
-    LABEL *lend = NEW_LABEL(line);
-    rb_num_t cnt = ISEQ_FLIP_CNT_INCREMENT(iseq->body->local_iseq)
-	+ VM_SVAR_FLIPFLOP_START;
-    VALUE key = INT2FIX(cnt);
-
-    ADD_INSN2(ret, line, getspecial, key, INT2FIX(0));
-    ADD_INSNL(ret, line, branchif, lend);
-
-    /* *flip == 0 */
-    COMPILE(ret, "flip2 beg", node->nd_beg);
-    ADD_INSNL(ret, line, branchunless, else_label);
-    ADD_INSN1(ret, line, putobject, Qtrue);
-    ADD_INSN1(ret, line, setspecial, key);
-    if (!again) {
-	ADD_INSNL(ret, line, jump, then_label);
-    }
-
-    /* *flip == 1 */
-    ADD_LABEL(ret, lend);
-    COMPILE(ret, "flip2 end", node->nd_end);
-    ADD_INSNL(ret, line, branchunless, then_label);
-    ADD_INSN1(ret, line, putobject, Qfalse);
-    ADD_INSN1(ret, line, setspecial, key);
-    ADD_INSNL(ret, line, jump, then_label);
-
-    return COMPILE_OK;
-}
-
-static int
-compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond,
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
 			 LABEL *then_label, LABEL *else_label)
 {
     switch (nd_type(cond)) {
@@ -2872,18 +2368,6 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond,
       case NODE_LIT:		/* NODE_LIT is always not true */
       case NODE_TRUE:
       case NODE_STR:
-      case NODE_DSTR:
-      case NODE_XSTR:
-      case NODE_DXSTR:
-      case NODE_DREGX:
-      case NODE_DREGX_ONCE:
-      case NODE_DSYM:
-      case NODE_ARRAY:
-      case NODE_ZARRAY:
-      case NODE_HASH:
-      case NODE_LAMBDA:
-      case NODE_DEFN:
-      case NODE_DEFS:
 	/* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
 	ADD_INSNL(ret, nd_line(cond), jump, then_label);
 	break;
@@ -2892,12 +2376,6 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond,
 	/* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
 	ADD_INSNL(ret, nd_line(cond), jump, else_label);
 	break;
-      case NODE_FLIP2:
-	compile_flip_flop(iseq, ret, cond, TRUE, then_label, else_label);
-	break;
-      case NODE_FLIP3:
-	compile_flip_flop(iseq, ret, cond, FALSE, then_label, else_label);
-	break;
       default:
 	COMPILE(ret, "branch condition", cond);
 	ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
@@ -2907,101 +2385,22 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *cond,
     return COMPILE_OK;
 }
 
-static int
-compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
-			  const NODE *const root_node,
-			  struct rb_call_info_kw_arg **const kw_arg_ptr)
-{
-    if (kw_arg_ptr == NULL) return FALSE;
-
-    if (nd_type(root_node) == NODE_HASH && root_node->nd_head && nd_type(root_node->nd_head) == NODE_ARRAY) {
-	NODE *node = root_node->nd_head;
-
-	while (node) {
-	    NODE *key_node = node->nd_head;
-
-	    assert(nd_type(node) == NODE_ARRAY);
-	    if (key_node && nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
-		/* can be keywords */
-	    }
-	    else {
-		return FALSE;
-	    }
-	    node = node->nd_next; /* skip value node */
-	    node = node->nd_next;
-	}
-
-	/* may be keywords */
-	node = root_node->nd_head;
-	{
-	    int len = (int)node->nd_alen / 2;
-	    struct rb_call_info_kw_arg *kw_arg  = (struct rb_call_info_kw_arg *)ruby_xmalloc(sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (len - 1));
-	    VALUE *keywords = kw_arg->keywords;
-	    int i = 0;
-	    kw_arg->keyword_len = len;
-
-	    *kw_arg_ptr = kw_arg;
-
-	    for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
-		NODE *key_node = node->nd_head;
-		NODE *val_node = node->nd_next->nd_head;
-		keywords[i] = key_node->nd_lit;
-		COMPILE(ret, "keyword values", val_node);
-	    }
-	    assert(i == len);
-	    return TRUE;
-	}
-    }
-    return FALSE;
-}
-
 enum compile_array_type_t {
     COMPILE_ARRAY_TYPE_ARRAY,
     COMPILE_ARRAY_TYPE_HASH,
     COMPILE_ARRAY_TYPE_ARGS
 };
 
-static inline int
-static_literal_node_p(NODE *node)
-{
-    node = node->nd_head;
-    switch (nd_type(node)) {
-      case NODE_LIT:
-      case NODE_NIL:
-      case NODE_TRUE:
-      case NODE_FALSE:
-	return TRUE;
-      default:
-	return FALSE;
-    }
-}
-
-static inline VALUE
-static_literal_value(NODE *node)
-{
-    node = node->nd_head;
-    switch (nd_type(node)) {
-      case NODE_NIL:
-	return Qnil;
-      case NODE_TRUE:
-	return Qtrue;
-      case NODE_FALSE:
-	return Qfalse;
-      default:
-	return node->nd_lit;
-    }
-}
-
 static int
-compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
-	       enum compile_array_type_t type, struct rb_call_info_kw_arg **keywords_ptr, int popped)
+compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
+	       enum compile_array_type_t type, int poped)
 {
     NODE *node = node_root;
     int line = (int)nd_line(node);
     int len = 0;
 
     if (nd_type(node) == NODE_ZARRAY) {
-	if (!popped) {
+	if (!poped) {
 	    switch (type) {
 	      case COMPILE_ARRAY_TYPE_ARRAY: ADD_INSN1(ret, line, newarray, INT2FIX(0)); break;
 	      case COMPILE_ARRAY_TYPE_HASH: ADD_INSN1(ret, line, newhash, INT2FIX(0)); break;
@@ -3021,51 +2420,41 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
 	    INIT_ANCHOR(anchor);
 
 	    for (i=0; i<max && node; i++, len++, node = node->nd_next) {
-		if (CPDEBUG > 0) {
-		    EXPECT_NODE("compile_array", node, NODE_ARRAY);
+		if (CPDEBUG > 0 && nd_type(node) != NODE_ARRAY) {
+		    rb_bug("compile_array: This node is not NODE_ARRAY, but %s", ruby_node_name(nd_type(node)));
 		}
 
-		if (type != COMPILE_ARRAY_TYPE_ARRAY && !node->nd_head) {
+		if (type == COMPILE_ARRAY_TYPE_HASH && !node->nd_head) {
+		    opt_p = 0;
 		    kw = node->nd_next;
-		    node = 0;
-		    if (kw) {
-			opt_p = 0;
-			node = kw->nd_next;
-			kw = kw->nd_head;
-		    }
+		    node = kw->nd_next;
+		    kw = kw->nd_head;
 		    break;
 		}
-		if (opt_p && !static_literal_node_p(node)) {
+		if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
 		    opt_p = 0;
 		}
 
-		if (type == COMPILE_ARRAY_TYPE_ARGS && node->nd_next == NULL /* last node */ && compile_array_keyword_arg(iseq, anchor, node->nd_head, keywords_ptr)) {
-		    len--;
-		}
-		else {
-		    COMPILE_(anchor, "array element", node->nd_head, popped);
-		}
+		COMPILE_(anchor, "array element", node->nd_head, poped);
 	    }
 
 	    if (opt_p && type != COMPILE_ARRAY_TYPE_ARGS) {
-		if (!popped) {
+		if (!poped) {
 		    VALUE ary = rb_ary_tmp_new(i);
 
 		    end_node = node;
 		    node = start_node;
 
 		    while (node != end_node) {
-			rb_ary_push(ary, static_literal_value(node));
+			rb_ary_push(ary, node->nd_head->nd_lit);
 			node = node->nd_next;
 		    }
-		    while (node && node->nd_next &&
-			   static_literal_node_p(node) &&
-			   static_literal_node_p(node->nd_next)) {
-			VALUE elem[2];
-			elem[0] = static_literal_value(node);
-			elem[1] = static_literal_value(node->nd_next);
-			rb_ary_cat(ary, elem, 2);
-			node = node->nd_next->nd_next;
+		    while (node && nd_type(node->nd_head) == NODE_LIT &&
+			   node->nd_next && nd_type(node->nd_next->nd_head) == NODE_LIT) {
+			rb_ary_push(ary, node->nd_head->nd_lit);
+			node = node->nd_next;
+			rb_ary_push(ary, node->nd_head->nd_lit);
+			node = node->nd_next;
 			len++;
 		    }
 
@@ -3090,20 +2479,15 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
 			    ADD_INSN(ret, line, concatarray);
 			}
 			else {
-#if 0
 			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 			    ADD_INSN1(ret, line, putobject, ary);
 			    ADD_SEND(ret, line, id_core_hash_merge_ary, INT2FIX(1));
-			    /* wrong number of arguments -----------------------^ */
-#else
-			    compile_bug(ERROR_ARGS "core#hash_merge_ary");
-#endif
 			}
 		    }
 		}
 	    }
 	    else {
-		if (!popped) {
+		if (!poped) {
 		    switch (type) {
 		      case COMPILE_ARRAY_TYPE_ARRAY:
 			ADD_INSN1(anchor, line, newarray, INT2FIX(i));
@@ -3146,7 +2530,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
 		    }
 		}
 		else {
-		    /* popped */
+		    /* poped */
 		    APPEND_LIST(ret, anchor);
 		}
 	    }
@@ -3156,13 +2540,13 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root,
 }
 
 static VALUE
-compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE* node_root, enum compile_array_type_t type)
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, enum compile_array_type_t type)
 {
-    return compile_array_(iseq, ret, node_root, type, NULL, 0);
+    return compile_array_(iseq, ret, node_root, type, 0);
 }
 
 static VALUE
-case_when_optimizable_literal(NODE *node)
+case_when_optimizable_literal(NODE * node)
 {
     switch (nd_type(node)) {
       case NODE_LIT: {
@@ -3177,12 +2561,6 @@ case_when_optimizable_literal(NODE *node)
 	}
 	break;
       }
-      case NODE_NIL:
-	return Qnil;
-      case NODE_TRUE:
-	return Qtrue;
-      case NODE_FALSE:
-	return Qfalse;
       case NODE_STR:
 	return node->nd_lit = rb_fstring(node->nd_lit);
     }
@@ -3190,8 +2568,7 @@ case_when_optimizable_literal(NODE *node)
 }
 
 static int
-when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, NODE *vals,
-	  LABEL *l1, int only_special_literals, VALUE literals)
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int only_special_literals, VALUE literals)
 {
     while (vals) {
 	NODE* val = vals->nd_head;
@@ -3202,8 +2579,7 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, NODE *vals,
 	}
 	else {
 	    if (rb_hash_lookup(literals, lit) != Qnil) {
-		rb_compile_warning(ruby_sourcefile, nd_line(val),
-				   "duplicated when clause is ignored");
+		rb_compile_warning(RSTRING_PTR(iseq->location.path), nd_line(val), "duplicated when clause is ignored");
 	    }
 	    else {
 		rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
@@ -3229,35 +2605,32 @@ when_vals(rb_iseq_t *iseq, LINK_ANCHOR *const cond_seq, NODE *vals,
 }
 
 static int
-compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
+compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
 {
     switch (nd_type(node)) {
       case NODE_ATTRASGN: {
 	INSN *iobj;
-	struct rb_call_info *ci;
+	rb_call_info_t *ci;
 	VALUE dupidx;
-	int line = nd_line(node);
 
-	COMPILE_POPPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
+	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
 
-	iobj = (INSN *)get_prev_insn((INSN *)LAST_ELEMENT(ret)); /* send insn */
-	ci = (struct rb_call_info *)iobj->operands[0];
-	ci->orig_argc += 1;
+	POP_ELEMENT(ret);        /* pop pop insn */
+	iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
+	ci = (rb_call_info_t *)iobj->operands[0];
+	ci->orig_argc += 1; ci->argc = ci->orig_argc;
 	dupidx = INT2FIX(ci->orig_argc);
 
-	INSERT_BEFORE_INSN1(iobj, line, topn, dupidx);
-	if (ci->flag & VM_CALL_ARGS_SPLAT) {
-	    --ci->orig_argc;
-	    INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1));
-	    INSERT_BEFORE_INSN(iobj, line, concatarray);
-	}
-	ADD_INSN(ret, line, pop);	/* result */
+	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_POPPED(anchor, "nest masgn lhs", node);
+	COMPILE_POPED(anchor, "nest masgn lhs", node);
 	REMOVE_ELEM(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
 	break;
@@ -3265,7 +2638,7 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
       default: {
 	DECL_ANCHOR(anchor);
 	INIT_ANCHOR(anchor);
-	COMPILE_POPPED(anchor, "masgn lhs", node);
+	COMPILE_POPED(anchor, "masgn lhs", node);
 	REMOVE_ELEM(FIRST_ELEMENT(anchor));
 	ADD_SEQ(ret, anchor);
       }
@@ -3275,7 +2648,7 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
 }
 
 static void
-compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *lhsn)
+compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
 {
     if (lhsn) {
 	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
@@ -3284,7 +2657,7 @@ compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *lhsn)
 }
 
 static int
-compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 		    NODE *rhsn, NODE *orig_lhsn)
 {
     VALUE mem[64];
@@ -3329,7 +2702,7 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 
     while (rhsn) {
 	if (llen <= rlen) {
-	    COMPILE_POPPED(ret, "masgn val (popped)", rhsn->nd_head);
+	    COMPILE_POPED(ret, "masgn val (popped)", rhsn->nd_head);
 	}
 	else {
 	    COMPILE(ret, "masgn val", rhsn->nd_head);
@@ -3348,28 +2721,16 @@ compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
     return 1;
 }
 
-static void
-adjust_stack(rb_iseq_t *iseq, LINK_ANCHOR *const ret, int line, int rlen, int llen)
-{
-    if (rlen < llen) {
-	do {ADD_INSN(ret, line, putnil);} while (++rlen < llen);
-    }
-    else if (rlen > llen) {
-	do {ADD_INSN(ret, line, pop);} while (--rlen > llen);
-    }
-}
-
 static int
-compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popped)
+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 (!popped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
+    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
 	int llen = 0;
-	int expand = 1;
 	DECL_ANCHOR(lhsseq);
 
 	INIT_ANCHOR(lhsseq);
@@ -3382,38 +2743,12 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popped)
 
 	COMPILE(ret, "normal masgn rhs", rhsn);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, nd_line(node), dup);
 	}
-	else if (!lhs_splat) {
-	    INSN *last = (INSN*)ret->last;
-	    if (IS_INSN(&last->link) &&
-		IS_INSN_ID(last, newarray) &&
-		last->operand_size == 1) {
-		int rlen = FIX2INT(OPERAND_AT(last, 0));
-		/* special case: assign to aset or attrset */
-		if (llen == 2) {
-		    POP_ELEMENT(ret);
-		    adjust_stack(iseq, ret, nd_line(node), rlen, llen);
-		    ADD_INSN(ret, nd_line(node), swap);
-		    expand = 0;
-		}
-		else if (llen > 2 && llen != rlen) {
-		    POP_ELEMENT(ret);
-		    adjust_stack(iseq, ret, nd_line(node), rlen, llen);
-		    ADD_INSN1(ret, nd_line(node), reverse, INT2FIX(llen));
-		    expand = 0;
-		}
-		else if (llen > 2) {
-		    last->insn_id = BIN(reverse);
-		    expand = 0;
-		}
-	    }
-	}
-	if (expand) {
-	    ADD_INSN2(ret, nd_line(node), expandarray,
-		      INT2FIX(llen), INT2FIX(lhs_splat));
-	}
+
+	ADD_INSN2(ret, nd_line(node), expandarray,
+		  INT2FIX(llen), INT2FIX(lhs_splat));
 	ADD_SEQ(ret, lhsseq);
 
 	if (lhs_splat) {
@@ -3445,8 +2780,8 @@ compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popped)
 }
 
 static int
-compile_colon2(rb_iseq_t *iseq, NODE *node,
-	       LINK_ANCHOR *const pref, LINK_ANCHOR *const body)
+compile_colon2(rb_iseq_t *iseq, NODE * node,
+	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
 {
     switch (nd_type(node)) {
       case NODE_CONST:
@@ -3472,7 +2807,7 @@ compile_colon2(rb_iseq_t *iseq, NODE *node,
 }
 
 static VALUE
-compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, NODE *cpath)
+compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
 {
     if (nd_type(cpath) == NODE_COLON3) {
 	/* toplevel class ::Foo */
@@ -3496,7 +2831,7 @@ compile_cpath(LINK_ANCHOR *const ret, rb_iseq_t *iseq, NODE *cpath)
 
 #define defined_expr defined_expr0
 static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	     NODE *node, LABEL **lfinish, VALUE needstr)
 {
     enum defined_type expr_type = 0;
@@ -3676,7 +3011,7 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 #undef defined_expr
 
 static int
-defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	     NODE *node, LABEL **lfinish, VALUE needstr)
 {
     LINK_ELEMENT *lcur = ret->last;
@@ -3685,13 +3020,11 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 	int line = nd_line(node);
 	LABEL *lstart = NEW_LABEL(line);
 	LABEL *lend = NEW_LABEL(line);
-	const rb_iseq_t *rescue = NEW_CHILD_ISEQ(NEW_NIL(),
-						 rb_str_concat(rb_str_new2
-							       ("defined guard in "),
-							       iseq->body->location.label),
-						 ISEQ_TYPE_DEFINED_GUARD, 0);
-	lstart->rescued = LABEL_RESCUE_BEG;
-	lend->rescued = LABEL_RESCUE_END;
+	VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
+					 rb_str_concat(rb_str_new2
+						       ("defined guard in "),
+						       iseq->location.label),
+					 ISEQ_TYPE_DEFINED_GUARD, 0);
 	APPEND_LABEL(ret, lcur, lstart);
 	ADD_LABEL(ret, lend);
 	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
@@ -3700,25 +3033,25 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *const ret,
 }
 
 static VALUE
-make_name_for_block(const rb_iseq_t *orig_iseq)
+make_name_for_block(rb_iseq_t *iseq)
 {
     int level = 1;
-    const rb_iseq_t *iseq = orig_iseq;
+    rb_iseq_t *ip = iseq;
 
-    if (orig_iseq->body->parent_iseq != 0) {
-	while (orig_iseq->body->local_iseq != iseq) {
-	    if (iseq->body->type == ISEQ_TYPE_BLOCK) {
+    if (iseq->parent_iseq != 0) {
+	while (ip->local_iseq != ip) {
+	    if (ip->type == ISEQ_TYPE_BLOCK) {
 		level++;
 	    }
-	    iseq = iseq->body->parent_iseq;
+	    ip = ip->parent_iseq;
 	}
     }
 
     if (level == 1) {
-	return rb_sprintf("block in %"PRIsVALUE, iseq->body->location.label);
+	return rb_sprintf("block in %"PRIsVALUE, ip->location.label);
     }
     else {
-	return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, iseq->body->location.label);
+	return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, ip->location.label);
     }
 }
 
@@ -3728,9 +3061,9 @@ push_ensure_entry(rb_iseq_t *iseq,
 		  struct ensure_range *er, NODE *node)
 {
     enl->ensure_node = node;
-    enl->prev = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;	/* prev */
+    enl->prev = iseq->compile_data->ensure_node_stack;	/* prev */
     enl->erange = er;
-    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enl;
+    iseq->compile_data->ensure_node_stack = enl;
 }
 
 static void
@@ -3752,10 +3085,10 @@ add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
 }
 
 static void
-add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
+add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 {
     struct iseq_compile_data_ensure_node_stack *enlp =
-	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack;
+	iseq->compile_data->ensure_node_stack;
     struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
     DECL_ANCHOR(ensure);
 
@@ -3769,9 +3102,9 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 
 	    add_ensure_range(iseq, enlp->erange, lstart, lend);
 
-	    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = enlp->prev;
+	    iseq->compile_data->ensure_node_stack = enlp->prev;
 	    ADD_LABEL(ensure_part, lstart);
-	    COMPILE_POPPED(ensure_part, "ensure part", enlp->ensure_node);
+	    COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
 	    ADD_LABEL(ensure_part, lend);
 	    ADD_SEQ(ensure, ensure_part);
 	}
@@ -3782,13 +3115,12 @@ add_ensure_iseq(LINK_ANCHOR *const ret, rb_iseq_t *iseq, int is_return)
 	}
 	enlp = enlp->prev;
     }
-    ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = prev_enlp;
+    iseq->compile_data->ensure_node_stack = prev_enlp;
     ADD_SEQ(ret, ensure);
 }
 
 static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, NODE *argn,
-	   unsigned int *flag, struct rb_call_info_kw_arg **keywords)
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag)
 {
     VALUE argc = INT2FIX(0);
     int nsplat = 0;
@@ -3808,7 +3140,6 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, NODE *argn,
 	switch (nd_type(argn)) {
 	  case NODE_SPLAT: {
 	    COMPILE(args, "args (splat)", argn->nd_head);
-	    ADD_INSN1(args, nd_line(argn), splatarray, nsplat ? Qtrue : Qfalse);
 	    argc = INT2FIX(1);
 	    nsplat++;
 	    *flag |= VM_CALL_ARGS_SPLAT;
@@ -3821,11 +3152,16 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, NODE *argn,
 
 	    INIT_ANCHOR(tmp);
 	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
-	    if (nd_type(argn) == NODE_ARGSCAT) {
-		ADD_INSN1(tmp, nd_line(argn), splatarray, nsplat ? Qtrue : Qfalse);
+	    if (next_is_array && nsplat == 0) {
+		/* none */
 	    }
 	    else {
-		ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
+		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++;
@@ -3840,13 +3176,12 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, NODE *argn,
 	    }
 	    break;
 	  }
-	  case NODE_ARRAY:
-	    {
-		argc = INT2FIX(compile_array_(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS, keywords, FALSE));
-		break;
-	    }
+	  case NODE_ARRAY: {
+	    argc = INT2FIX(compile_array(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS));
+	    break;
+	  }
 	  default: {
-	    UNKNOWN_NODE("setup_arg", argn);
+	    rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
 	  }
 	}
     }
@@ -3869,131 +3204,58 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *const args, NODE *argn,
 }
 
 static VALUE
-build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *body)
+build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *body)
 {
     int line = nd_line(body);
     VALUE argc = INT2FIX(0);
-    const rb_iseq_t *block = NEW_CHILD_ISEQ(body, make_name_for_block(iseq->body->parent_iseq), ISEQ_TYPE_BLOCK, line);
-
+    VALUE block = NEW_CHILD_ISEQVAL(body, make_name_for_block(iseq->parent_iseq), ISEQ_TYPE_BLOCK, line);
     ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
     ADD_CALL_WITH_BLOCK(ret, line, id_core_set_postexe, argc, block);
     iseq_set_local_table(iseq, 0);
     return Qnil;
 }
 
-static void
-compile_named_capture_assign(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node)
-{
-    NODE *vars;
-    LINK_ELEMENT *last;
-    int line = nd_line(node);
-    LABEL *fail_label = NEW_LABEL(line), *end_label = NEW_LABEL(line);
-
-#if !(defined(NAMED_CAPTURE_BY_SVAR) && NAMED_CAPTURE_BY_SVAR-0)
-    ADD_INSN1(ret, line, getglobal, ((VALUE)rb_global_entry(idBACKREF) | 1));
-#else
-    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */, INT2FIX(0));
-#endif
-    ADD_INSN(ret, line, dup);
-    ADD_INSNL(ret, line, branchunless, fail_label);
-
-    for (vars = node; vars; vars = vars->nd_next) {
-	INSN *cap;
-	if (vars->nd_next) {
-	    ADD_INSN(ret, line, dup);
-	}
-	last = ret->last;
-	COMPILE_POPPED(ret, "capture", vars->nd_head);
-	last = last->next; /* putobject :var */
-	cap = new_insn_send(iseq, line, idAREF, INT2FIX(1),
-			    NULL, INT2FIX(0), NULL);
-	INSERT_ELEM_PREV(last->next, (LINK_ELEMENT *)cap);
-#if !defined(NAMED_CAPTURE_SINGLE_OPT) || NAMED_CAPTURE_SINGLE_OPT-0
-	if (!vars->nd_next && vars == node) {
-	    /* only one name */
-	    DECL_ANCHOR(nom);
-
-	    INIT_ANCHOR(nom);
-	    ADD_INSNL(nom, line, jump, end_label);
-	    ADD_LABEL(nom, fail_label);
-# if 0				/* $~ must be MatchData or nil */
-	    ADD_INSN(nom, line, pop);
-	    ADD_INSN(nom, line, putnil);
-# endif
-	    ADD_LABEL(nom, end_label);
-	    (nom->last->next = cap->link.next)->prev = nom->last;
-	    (cap->link.next = nom->anchor.next)->prev = &cap->link;
-	    return;
-	}
-#endif
-    }
-    ADD_INSNL(ret, line, jump, end_label);
-    ADD_LABEL(ret, fail_label);
-    ADD_INSN(ret, line, pop);
-    for (vars = node; vars; vars = vars->nd_next) {
-	last = ret->last;
-	COMPILE_POPPED(ret, "capture", vars->nd_head);
-	last = last->next; /* putobject :var */
-	((INSN*)last)->insn_id = BIN(putnil);
-	((INSN*)last)->operand_size = 0;
-    }
-    ADD_LABEL(ret, end_label);
-}
-
-static int
-number_literal_p(NODE *n)
-{
-    return (n && nd_type(n) == NODE_LIT && RB_INTEGER_TYPE_P(n->nd_lit));
-}
-
 /**
   compile each node
 
   self:  InstructionSequence
   node:  Ruby compiled node
-  popped: This node will be popped
+  poped: This node will be poped
  */
 static int
-iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int popped)
+iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 {
     enum node_type type;
     LINK_ELEMENT *saved_last_element = 0;
     int line;
 
     if (node == 0) {
-	if (!popped) {
+	if (!poped) {
 	    debugs("node: NODE_NIL(implicit)\n");
-	    ADD_INSN(ret, ISEQ_COMPILE_DATA(iseq)->last_line, putnil);
+	    ADD_INSN(ret, iseq->compile_data->last_line, putnil);
 	}
 	return COMPILE_OK;
     }
 
-    line = (int)nd_line(node);
-
-    if (ISEQ_COMPILE_DATA(iseq)->last_line == line) {
-	/* ignore */
-    }
-    else {
-	if (node->flags & NODE_FL_NEWLINE) {
-	    ISEQ_COMPILE_DATA(iseq)->last_line = line;
-	    ADD_TRACE(ret, line, RUBY_EVENT_LINE);
-	    saved_last_element = ret->last;
-	}
-    }
-
+    iseq->compile_data->last_line = line = (int)nd_line(node);
     debug_node_start(node);
 
     type = nd_type(node);
 
+    if (node->flags & NODE_FL_NEWLINE) {
+	ADD_TRACE(ret, line, RUBY_EVENT_LINE);
+	saved_last_element = ret->last;
+    }
+
     switch (type) {
       case NODE_BLOCK:{
 	while (node && nd_type(node) == NODE_BLOCK) {
 	    COMPILE_(ret, "BLOCK body", node->nd_head,
-		     (node->nd_next == 0 && popped == 0) ? 0 : 1);
+		     (node->nd_next == 0 && poped == 0) ? 0 : 1);
 	    node = node->nd_next;
 	}
 	if (node) {
-	    COMPILE_(ret, "BLOCK next", node->nd_next, popped);
+	    COMPILE_(ret, "BLOCK next", node->nd_next, poped);
 	}
 	break;
       }
@@ -4012,8 +3274,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 	compile_branch_condition(iseq, cond_seq, node->nd_cond,
 				 then_label, else_label);
-	COMPILE_(then_seq, "then", node->nd_body, popped);
-	COMPILE_(else_seq, "else", node->nd_else, popped);
+	COMPILE_(then_seq, "then", node->nd_body, poped);
+	COMPILE_(else_seq, "else", node->nd_else, poped);
 
 	ADD_SEQ(ret, cond_seq);
 
@@ -4045,7 +3307,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	rb_hash_tbl_raw(literals)->type = &cdhash_type;
 
 	if (node->nd_head == 0) {
-	    COMPILE_(ret, "when", node->nd_body, popped);
+	    COMPILE_(ret, "when", node->nd_body, poped);
 	    break;
 	}
 	COMPILE(head, "case base", node->nd_head);
@@ -4055,9 +3317,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	line = nd_line(node);
 
 	if (type != NODE_WHEN) {
-	    COMPILE_ERROR(ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type));
-	    debug_node_end();
-	    return COMPILE_NG;
+	    COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)));
 	}
 
 	endlabel = NEW_LABEL(line);
@@ -4071,7 +3331,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    l1 = NEW_LABEL(line);
 	    ADD_LABEL(body_seq, l1);
 	    ADD_INSN(body_seq, line, pop);
-	    COMPILE_(body_seq, "when body", node->nd_body, popped);
+	    COMPILE_(body_seq, "when body", node->nd_body, poped);
 	    ADD_INSNL(body_seq, line, jump, endlabel);
 
 	    vals = node->nd_head;
@@ -4090,11 +3350,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		    ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
 		    break;
 		  default:
-		    UNKNOWN_NODE("NODE_CASE", vals);
+		    rb_bug("NODE_CASE: unknown node (%s)",
+			   ruby_node_name(nd_type(vals)));
 		}
 	    }
 	    else {
-		EXPECT_NODE_NONULL("NODE_CASE", node, NODE_ARRAY);
+		rb_bug("NODE_CASE: must be NODE_ARRAY, but 0");
 	    }
 
 	    node = node->nd_next;
@@ -4108,14 +3369,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	if (node) {
 	    ADD_LABEL(cond_seq, elselabel);
 	    ADD_INSN(cond_seq, line, pop);
-	    COMPILE_(cond_seq, "else", node, popped);
+	    COMPILE_(cond_seq, "else", node, poped);
 	    ADD_INSNL(cond_seq, line, jump, endlabel);
 	}
 	else {
 	    debugs("== else (implicit)\n");
 	    ADD_LABEL(cond_seq, elselabel);
 	    ADD_INSN(cond_seq, nd_line(tempnode), pop);
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(cond_seq, nd_line(tempnode), putnil);
 	    }
 	    ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
@@ -4126,7 +3387,6 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 	    ADD_INSN(ret, nd_line(tempnode), dup);
 	    ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch, literals, elselabel);
-	    LABEL_REF(elselabel);
 	}
 
 	ADD_SEQ(ret, cond_seq);
@@ -4147,12 +3407,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	while (node && nd_type(node) == NODE_WHEN) {
 	    LABEL *l1 = NEW_LABEL(line = nd_line(node));
 	    ADD_LABEL(body_seq, l1);
-	    COMPILE_(body_seq, "when", node->nd_body, popped);
+	    COMPILE_(body_seq, "when", node->nd_body, poped);
 	    ADD_INSNL(body_seq, line, jump, endlabel);
 
 	    vals = node->nd_head;
 	    if (!vals) {
-		compile_bug(ERROR_ARGS "NODE_WHEN: must be NODE_ARRAY, but 0");
+		rb_bug("NODE_WHEN: must be NODE_ARRAY, but 0");
 	    }
 	    switch (nd_type(vals)) {
 	      case NODE_ARRAY:
@@ -4172,12 +3432,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		ADD_INSNL(ret, nd_line(vals), branchif, l1);
 		break;
 	      default:
-		UNKNOWN_NODE("NODE_WHEN", vals);
+		rb_bug("NODE_WHEN: unknown node (%s)",
+		       ruby_node_name(nd_type(vals)));
 	    }
 	    node = node->nd_next;
 	}
 	/* else */
-	COMPILE_(ret, "else", node, popped);
+	COMPILE_(ret, "else", node, poped);
 	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
 
 	ADD_SEQ(ret, body_seq);
@@ -4188,23 +3449,22 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_OPT_N:
       case NODE_WHILE:
       case NODE_UNTIL:{
-	LABEL *prev_start_label = ISEQ_COMPILE_DATA(iseq)->start_label;
-	LABEL *prev_end_label = ISEQ_COMPILE_DATA(iseq)->end_label;
-	LABEL *prev_redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label;
-	int prev_loopval_popped = ISEQ_COMPILE_DATA(iseq)->loopval_popped;
+	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(iseq)->start_label = NEW_LABEL(line);	/* next  */
-	LABEL *redo_label = ISEQ_COMPILE_DATA(iseq)->redo_label = NEW_LABEL(line);	/* redo  */
-	LABEL *break_label = ISEQ_COMPILE_DATA(iseq)->end_label = NEW_LABEL(line);	/* break */
+	LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(line);	/* next  */
+	LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(line);	/* redo  */
+	LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(line);	/* break */
 	LABEL *end_label = NEW_LABEL(line);
-	LABEL *adjust_label = NEW_LABEL(line);
 
 	LABEL *next_catch_label = NEW_LABEL(line);
 	LABEL *tmp_label = NULL;
 
-	ISEQ_COMPILE_DATA(iseq)->loopval_popped = 0;
+	iseq->compile_data->loopval_popped = 0;
 	push_ensure_entry(iseq, &enl, 0, 0);
 
 	if (type == NODE_OPT_N || node->nd_state == 1) {
@@ -4214,7 +3474,6 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    tmp_label = NEW_LABEL(line);
 	    ADD_INSNL(ret, line, jump, tmp_label);
 	}
-	ADD_LABEL(ret, adjust_label);
 	ADD_INSN(ret, line, putnil);
 	ADD_LABEL(ret, next_catch_label);
 	ADD_INSN(ret, line, pop);
@@ -4222,7 +3481,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	if (tmp_label) ADD_LABEL(ret, tmp_label);
 
 	ADD_LABEL(ret, redo_label);
-	COMPILE_POPPED(ret, "while body", node->nd_body);
+	COMPILE_POPED(ret, "while body", node->nd_body);
 	ADD_LABEL(ret, next_label);	/* next */
 
 	if (type == NODE_WHILE) {
@@ -4242,11 +3501,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	}
 
 	ADD_LABEL(ret, end_label);
-	ADD_ADJUST_RESTORE(ret, adjust_label);
 
 	if (node->nd_state == Qundef) {
 	    /* ADD_INSN(ret, line, putundef); */
-	    compile_bug(ERROR_ARGS "unsupported: putundef");
+	    rb_bug("unsupported: putundef");
 	}
 	else {
 	    ADD_INSN(ret, line, putnil);
@@ -4254,7 +3512,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 	ADD_LABEL(ret, break_label);	/* break */
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 
@@ -4263,44 +3521,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	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(iseq)->redo_label);
+			iseq->compile_data->redo_label);
 
-	ISEQ_COMPILE_DATA(iseq)->start_label = prev_start_label;
-	ISEQ_COMPILE_DATA(iseq)->end_label = prev_end_label;
-	ISEQ_COMPILE_DATA(iseq)->redo_label = prev_redo_label;
-	ISEQ_COMPILE_DATA(iseq)->loopval_popped = prev_loopval_popped;
-	ISEQ_COMPILE_DATA(iseq)->ensure_node_stack = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->prev;
+	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_FOR:
-	if (node->nd_var) {
-	    /* massign to var in "for"
-	     * args.length == 1 && Array === (tmp = args[0]) ? tmp : args
-	     */
-	    NODE *var = node->nd_var;
-	    LABEL *not_single = NEW_LABEL(nd_line(var));
-	    LABEL *not_ary = NEW_LABEL(nd_line(var));
-	    COMPILE(ret, "for var", var);
-	    ADD_INSN(ret, line, dup);
-	    ADD_CALL(ret, line, idLength, INT2FIX(0));
-	    ADD_INSN1(ret, line, putobject, INT2FIX(1));
-	    ADD_CALL(ret, line, idEq, INT2FIX(1));
-	    ADD_INSNL(ret, line, branchunless, not_single);
-	    ADD_INSN(ret, line, dup);
-	    ADD_INSN1(ret, line, putobject, INT2FIX(0));
-	    ADD_CALL(ret, line, idAREF, INT2FIX(1));
-	    ADD_INSN1(ret, line, putobject, rb_cArray);
-	    ADD_INSN1(ret, line, topn, INT2FIX(1));
-	    ADD_CALL(ret, line, idEqq, INT2FIX(1));
-	    ADD_INSNL(ret, line, branchunless, not_ary);
-	    ADD_INSN(ret, line, swap);
-	    ADD_LABEL(ret, not_ary);
-	    ADD_INSN(ret, line, pop);
-	    ADD_LABEL(ret, not_single);
-	    break;
-	}
-      case NODE_ITER:{
-	const rb_iseq_t *prevblock = ISEQ_COMPILE_DATA(iseq)->current_block;
+      case NODE_ITER:
+      case NODE_FOR:{
+	VALUE prevblock = iseq->compile_data->current_block;
 	LABEL *retry_label = NEW_LABEL(line);
 	LABEL *retry_end_l = NEW_LABEL(line);
 
@@ -4308,22 +3540,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	if (nd_type(node) == NODE_FOR) {
 	    COMPILE(ret, "iter caller (for)", node->nd_iter);
 
-	    ISEQ_COMPILE_DATA(iseq)->current_block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
-							       ISEQ_TYPE_BLOCK, line);
-	    ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), ISEQ_COMPILE_DATA(iseq)->current_block);
+	    iseq->compile_data->current_block =
+		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
+				  ISEQ_TYPE_BLOCK, line);
+
+	    ADD_SEND_R(ret, line, idEach, INT2FIX(0),
+		       iseq->compile_data->current_block, INT2FIX(0));
 	}
 	else {
-	    ISEQ_COMPILE_DATA(iseq)->current_block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq),
-							       ISEQ_TYPE_BLOCK, line);
+	    iseq->compile_data->current_block =
+		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
+				  ISEQ_TYPE_BLOCK, line);
 	    COMPILE(ret, "iter caller", node->nd_iter);
 	}
 	ADD_LABEL(ret, retry_end_l);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 
-	ISEQ_COMPILE_DATA(iseq)->current_block = prevblock;
+	iseq->compile_data->current_block = prevblock;
 
 	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
 
@@ -4332,231 +3568,230 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_BREAK:{
 	unsigned long level = 0;
 
-	if (ISEQ_COMPILE_DATA(iseq)->redo_label != 0) {
+	if (iseq->compile_data->redo_label != 0) {
 	    /* while/until */
 	    LABEL *splabel = NEW_LABEL(0);
 	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	    COMPILE_(ret, "break val (while/until)", node->nd_stts, ISEQ_COMPILE_DATA(iseq)->loopval_popped);
+	    ADD_ADJUST(ret, line, 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, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->end_label);
 	    ADD_ADJUST_RESTORE(ret, splabel);
 
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(ret, line, putnil);
 	    }
 	}
-	else if (iseq->body->type == ISEQ_TYPE_BLOCK) {
+	else if (iseq->type == ISEQ_TYPE_BLOCK) {
 	  break_by_insn:
 	    /* escape from block */
 	    COMPILE(ret, "break val (block)", node->nd_stts);
-	    ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_BREAK));
-	    if (popped) {
+	    ADD_INSN1(ret, line, throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
+	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	}
-	else if (iseq->body->type == ISEQ_TYPE_EVAL) {
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
 	  break_in_eval:
-	    COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with break");
-	    debug_node_end();
-	    return COMPILE_NG;
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break"));
 	}
 	else {
-	    const rb_iseq_t *ip = iseq->body->parent_iseq;
-
+	    rb_iseq_t *ip = iseq->parent_iseq;
 	    while (ip) {
-		if (!ISEQ_COMPILE_DATA(ip)) {
+		if (!ip->compile_data) {
 		    ip = 0;
 		    break;
 		}
 
 		level++;
-		if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
-		    level = VM_THROW_NO_ESCAPE_FLAG;
+		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->body->type == ISEQ_TYPE_BLOCK) {
-		    level <<= VM_THROW_LEVEL_SHIFT;
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    level <<= 16;
 		    goto break_by_insn;
 		}
-		else if (ip->body->type == ISEQ_TYPE_EVAL) {
+		else if (ip->type == ISEQ_TYPE_EVAL) {
 		    goto break_in_eval;
 		}
 
-		ip = ip->body->parent_iseq;
+		ip = ip->parent_iseq;
 	    }
-	    COMPILE_ERROR(ERROR_ARGS "Invalid break");
-	    debug_node_end();
-	    return COMPILE_NG;
+	    COMPILE_ERROR((ERROR_ARGS "Invalid break"));
 	}
 	break;
       }
       case NODE_NEXT:{
 	unsigned long level = 0;
 
-	if (ISEQ_COMPILE_DATA(iseq)->redo_label != 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, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+	    ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->start_label);
 	    ADD_ADJUST_RESTORE(ret, splabel);
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(ret, line, putnil);
 	    }
 	}
-	else if (ISEQ_COMPILE_DATA(iseq)->end_label) {
+	else if (iseq->compile_data->end_label) {
 	    LABEL *splabel = NEW_LABEL(0);
 	    debugs("next in block\n");
 	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->start_label);
+	    ADD_ADJUST(ret, line, iseq->compile_data->start_label);
 	    COMPILE(ret, "next val", node->nd_stts);
 	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->end_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->end_label);
 	    ADD_ADJUST_RESTORE(ret, splabel);
 
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(ret, line, putnil);
 	    }
 	}
-	else if (iseq->body->type == ISEQ_TYPE_EVAL) {
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
 	  next_in_eval:
-	    COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with next");
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next"));
 	}
 	else {
-	    const rb_iseq_t *ip = iseq;
-
+	    rb_iseq_t *ip;
+	    ip = iseq;
 	    while (ip) {
-		if (!ISEQ_COMPILE_DATA(ip)) {
+		if (!ip->compile_data) {
 		    ip = 0;
 		    break;
 		}
 
-		level = VM_THROW_NO_ESCAPE_FLAG;
-		if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+		level = 0x8000 | 0x4000;
+		if (ip->compile_data->redo_label != 0) {
 		    /* while loop */
 		    break;
 		}
-		else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
 		    break;
 		}
-		else if (ip->body->type == ISEQ_TYPE_EVAL) {
+		else if (ip->type == ISEQ_TYPE_EVAL) {
 		    goto next_in_eval;
 		}
 
-		ip = ip->body->parent_iseq;
+		ip = ip->parent_iseq;
 	    }
 	    if (ip != 0) {
 		COMPILE(ret, "next val", node->nd_stts);
-		ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_NEXT));
+		ADD_INSN1(ret, line, throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
 
-		if (popped) {
+		if (poped) {
 		    ADD_INSN(ret, line, pop);
 		}
 	    }
 	    else {
-		COMPILE_ERROR(ERROR_ARGS "Invalid next");
+		COMPILE_ERROR((ERROR_ARGS "Invalid next"));
 	    }
 	}
 	break;
       }
       case NODE_REDO:{
-	if (ISEQ_COMPILE_DATA(iseq)->redo_label) {
+	if (iseq->compile_data->redo_label) {
 	    LABEL *splabel = NEW_LABEL(0);
 	    debugs("redo in while");
 	    ADD_LABEL(ret, splabel);
-	    ADD_ADJUST(ret, line, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	    ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
 	    add_ensure_iseq(ret, iseq, 0);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->redo_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->redo_label);
 	    ADD_ADJUST_RESTORE(ret, splabel);
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(ret, line, putnil);
 	    }
 	}
-	else if (iseq->body->type == ISEQ_TYPE_EVAL) {
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
 	  redo_in_eval:
-	    COMPILE_ERROR(ERROR_ARGS "Can't escape from eval with redo");
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo"));
 	}
-	else if (ISEQ_COMPILE_DATA(iseq)->start_label) {
+	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, line, ISEQ_COMPILE_DATA(iseq)->start_label);
-	    ADD_INSNL(ret, line, jump, ISEQ_COMPILE_DATA(iseq)->start_label);
+	    ADD_ADJUST(ret, line, iseq->compile_data->start_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->start_label);
 	    ADD_ADJUST_RESTORE(ret, splabel);
 
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(ret, line, putnil);
 	    }
 	}
 	else {
-	    const rb_iseq_t *ip = iseq;
-	    const unsigned long level = VM_THROW_NO_ESCAPE_FLAG;
-
+	    rb_iseq_t *ip;
+	    unsigned long level;
+	    level = 0x8000 | 0x4000;
+	    ip = iseq;
 	    while (ip) {
-		if (!ISEQ_COMPILE_DATA(ip)) {
+		if (!ip->compile_data) {
 		    ip = 0;
 		    break;
 		}
 
-		if (ISEQ_COMPILE_DATA(ip)->redo_label != 0) {
+		if (ip->compile_data->redo_label != 0) {
 		    break;
 		}
-		else if (ip->body->type == ISEQ_TYPE_BLOCK) {
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
 		    break;
 		}
-		else if (ip->body->type == ISEQ_TYPE_EVAL) {
+		else if (ip->type == ISEQ_TYPE_EVAL) {
 		    goto redo_in_eval;
 		}
 
-		ip = ip->body->parent_iseq;
+		ip = ip->parent_iseq;
 	    }
 	    if (ip != 0) {
 		ADD_INSN(ret, line, putnil);
-		ADD_INSN1(ret, line, throw, INT2FIX(level | TAG_REDO));
+		ADD_INSN1(ret, line, throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
 
-		if (popped) {
+		if (poped) {
 		    ADD_INSN(ret, line, pop);
 		}
 	    }
 	    else {
-		COMPILE_ERROR(ERROR_ARGS "Invalid redo");
+		COMPILE_ERROR((ERROR_ARGS "Invalid redo"));
 	    }
 	}
 	break;
       }
       case NODE_RETRY:{
-	if (iseq->body->type == ISEQ_TYPE_RESCUE) {
+	if (iseq->type == ISEQ_TYPE_RESCUE) {
 	    ADD_INSN(ret, line, putnil);
-	    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETRY));
+	    ADD_INSN1(ret, line, throw, INT2FIX(0x04) /* TAG_RETRY */ );
 
-	    if (popped) {
+	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid retry");
+	    COMPILE_ERROR((ERROR_ARGS "Invalid retry"));
 	}
 	break;
       }
       case NODE_BEGIN:{
-	COMPILE_(ret, "NODE_BEGIN", node->nd_body, popped);
+	COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
 	break;
       }
       case NODE_RESCUE:{
 	LABEL *lstart = NEW_LABEL(line);
 	LABEL *lend = NEW_LABEL(line);
 	LABEL *lcont = NEW_LABEL(line);
-	const rb_iseq_t *rescue = NEW_CHILD_ISEQ(node->nd_resq,
-						 rb_str_concat(rb_str_new2("rescue in "), iseq->body->location.label),
-						 ISEQ_TYPE_RESCUE, line);
+	VALUE rescue = NEW_CHILD_ISEQVAL(
+	    node->nd_resq,
+	    rb_str_concat(rb_str_new2("rescue in "), iseq->location.label),
+	    ISEQ_TYPE_RESCUE, line);
 
-	lstart->rescued = LABEL_RESCUE_BEG;
-	lend->rescued = LABEL_RESCUE_END;
 	ADD_LABEL(ret, lstart);
 	COMPILE(ret, "rescue head", node->nd_head);
 	ADD_LABEL(ret, lend);
@@ -4567,7 +3802,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	ADD_INSN(ret, line, nop);
 	ADD_LABEL(ret, lcont);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 
@@ -4590,7 +3825,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		switch (nd_type(narg)) {
 		  case NODE_ARRAY:
 		    while (narg) {
-			ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+			ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
 			COMPILE(ret, "rescue arg", narg->nd_head);
 			ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
 			ADD_INSNL(ret, line, branchif, label_hit);
@@ -4600,17 +3835,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		  case NODE_SPLAT:
 		  case NODE_ARGSCAT:
 		  case NODE_ARGSPUSH:
-		    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+		    ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
 		    COMPILE(ret, "rescue/cond splat", narg);
 		    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
 		    ADD_INSNL(ret, line, branchif, label_hit);
 		    break;
 		  default:
-		    UNKNOWN_NODE("NODE_RESBODY", narg);
+		    rb_bug("NODE_RESBODY: unknown node (%s)",
+			   ruby_node_name(nd_type(narg)));
 		}
 	    }
 	    else {
-		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+		ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
 		ADD_INSN1(ret, line, putobject, rb_eStandardError);
 		ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
 		ADD_INSNL(ret, line, branchif, label_hit);
@@ -4618,7 +3854,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_INSNL(ret, line, jump, label_miss);
 	    ADD_LABEL(ret, label_hit);
 	    COMPILE(ret, "resbody body", resq->nd_body);
-	    if (ISEQ_COMPILE_DATA(iseq)->option->tailcall_optimization) {
+	    if (iseq->compile_data->option->tailcall_optimization) {
 		ADD_INSN(ret, line, nop);
 	    }
 	    ADD_INSN(ret, line, leave);
@@ -4629,24 +3865,20 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       }
       case NODE_ENSURE:{
 	DECL_ANCHOR(ensr);
-	const rb_iseq_t *ensure = NEW_CHILD_ISEQ(node->nd_ensr,
-						 rb_str_concat(rb_str_new2 ("ensure in "), iseq->body->location.label),
-						 ISEQ_TYPE_ENSURE, line);
+	VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
+					 rb_str_concat(rb_str_new2
+						       ("ensure in "),
+						       iseq->location.label),
+					 ISEQ_TYPE_ENSURE, line);
 	LABEL *lstart = NEW_LABEL(line);
 	LABEL *lend = NEW_LABEL(line);
 	LABEL *lcont = NEW_LABEL(line);
-	LINK_ELEMENT *last;
-	int last_leave = 0;
 	struct ensure_range er;
 	struct iseq_compile_data_ensure_node_stack enl;
 	struct ensure_range *erange;
 
 	INIT_ANCHOR(ensr);
-	COMPILE_POPPED(ensr, "ensure ensr", node->nd_ensr);
-	last = ensr->last;
-	last_leave = last && IS_INSN(last) && IS_INSN_ID(last, leave);
-	if (!popped && last_leave)
-	    popped = 1;
+	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
 
 	er.begin = lstart;
 	er.end = lend;
@@ -4654,7 +3886,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
 
 	ADD_LABEL(ret, lstart);
-	COMPILE_(ret, "ensure head", node->nd_head, popped);
+	COMPILE_(ret, "ensure head", node->nd_head, poped);
 	ADD_LABEL(ret, lend);
 	if (ensr->anchor.next == 0) {
 	    ADD_INSN(ret, line, nop);
@@ -4663,18 +3895,15 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_SEQ(ret, ensr);
 	}
 	ADD_LABEL(ret, lcont);
-	if (last_leave) ADD_INSN(ret, line, pop);
-
-	erange = ISEQ_COMPILE_DATA(iseq)->ensure_node_stack->erange;
-	if (lstart->link.next != &lend->link) {
-	    while (erange) {
-		ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
-				ensure, lcont);
-		erange = erange->next;
-	    }
+
+	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(iseq)->ensure_node_stack = enl.prev;
+	iseq->compile_data->ensure_node_stack = enl.prev;
 	break;
       }
 
@@ -4682,7 +3911,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_OR:{
 	LABEL *end_label = NEW_LABEL(line);
 	COMPILE(ret, "nd_1st", node->nd_1st);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	if (type == NODE_AND) {
@@ -4691,55 +3920,56 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	else {
 	    ADD_INSNL(ret, line, branchif, end_label);
 	}
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, pop);
 	}
-	COMPILE_(ret, "nd_2nd", node->nd_2nd, popped);
+	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
 	ADD_LABEL(ret, end_label);
 	break;
       }
 
       case NODE_MASGN:{
-	compile_massign(iseq, ret, node, popped);
+	compile_massign(iseq, ret, node, poped);
 	break;
       }
 
       case NODE_LASGN:{
 	ID id = node->nd_vid;
-	int idx = iseq->body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
+	int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
 
-	debugs("lvar: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
+	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
 	COMPILE(ret, "rvalue", node->nd_value);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
-	ADD_SETLOCAL(ret, line, idx, get_lvar_level(iseq));
+	ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+
 	break;
       }
       case NODE_DASGN:
       case NODE_DASGN_CURR:{
 	int idx, lv, ls;
 	COMPILE(ret, "dvalue", node->nd_value);
-	debugi("dassn id", rb_id2str(node->nd_vid) ? node->nd_vid : '*');
+	debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 
 	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
 
 	if (idx < 0) {
-	    compile_bug(ERROR_ARGS "NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")",
-			rb_id2str(node->nd_vid));
+	    rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
 	}
-	ADD_SETLOCAL(ret, line, ls - idx, lv);
+
+	ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
 	break;
       }
       case NODE_GASGN:{
 	COMPILE(ret, "lvalue", node->nd_value);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN1(ret, line, setglobal,
@@ -4749,18 +3979,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_IASGN:
       case NODE_IASGN2:{
 	COMPILE(ret, "lvalue", node->nd_value);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN2(ret, line, setinstancevariable,
-		  ID2SYM(node->nd_vid),
-		  get_ivar_ic_value(iseq,node->nd_vid));
+		  ID2SYM(node->nd_vid), INT2FIX(iseq->is_size++));
 	break;
       }
       case NODE_CDECL:{
 	COMPILE(ret, "lvalue", node->nd_value);
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 
@@ -4777,7 +4006,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       }
       case NODE_CVASGN:{
 	COMPILE(ret, "cvasgn val", node->nd_value);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, dup);
 	}
 	ADD_INSN1(ret, line, setclassvariable,
@@ -4815,7 +4044,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	 *              nd_mid
 	 */
 
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	}
 	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
@@ -4827,12 +4056,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    boff = 1;
 	  default:
 	    INIT_ANCHOR(args);
-	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag, NULL);
+	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag);
 	    ADD_SEQ(ret, args);
 	}
 	ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
-	ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag));
 	flag |= asgnflag;
+	ADD_SEND_R(ret, line, idAREF, argc, Qfalse, INT2FIX(flag));
 
 	if (id == 0 || id == 1) {
 	    /* 0: or, 1: and
@@ -4859,7 +4088,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_INSN(ret, line, pop);
 
 	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    if (flag & VM_CALL_ARGS_SPLAT) {
@@ -4875,17 +4104,19 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		    ADD_INSN(ret, line, pop);
 		    ADD_INSN(ret, line, pop);
 		}
-		ADD_SEND_WITH_FLAG(ret, line, idASET, argc, INT2FIX(flag));
+		ADD_SEND_R(ret, line, idASET,
+			   argc, Qfalse, INT2FIX(flag));
 	    }
 	    else {
 		if (boff > 0)
 		    ADD_INSN(ret, line, swap);
-		ADD_SEND_WITH_FLAG(ret, line, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
+		ADD_SEND_R(ret, line, idASET,
+			   FIXNUM_INC(argc, 1), Qfalse, INT2FIX(flag));
 	    }
 	    ADD_INSN(ret, line, pop);
 	    ADD_INSNL(ret, line, jump, lfin);
 	    ADD_LABEL(ret, label);
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    ADD_INSN1(ret, line, adjuststack, FIXNUM_INC(argc, 2+boff));
@@ -4894,7 +4125,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	else {
 	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
 	    ADD_SEND(ret, line, id, INT2FIX(1));
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
 	    if (flag & VM_CALL_ARGS_SPLAT) {
@@ -4910,12 +4141,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		    ADD_INSN(ret, line, pop);
 		    ADD_INSN(ret, line, pop);
 		}
-		ADD_SEND_WITH_FLAG(ret, line, idASET, argc, INT2FIX(flag));
+		ADD_SEND_R(ret, line, idASET,
+			   argc, Qfalse, INT2FIX(flag));
 	    }
 	    else {
 		if (boff > 0)
 		    ADD_INSN(ret, line, swap);
-		ADD_SEND_WITH_FLAG(ret, line, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
+		ADD_SEND_R(ret, line, idASET,
+			   FIXNUM_INC(argc, 1), Qfalse, INT2FIX(flag));
 	    }
 	    ADD_INSN(ret, line, pop);
 	}
@@ -4924,11 +4157,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       }
       case NODE_OP_ASGN2:{
 	ID atype = node->nd_next->nd_mid;
-	ID vid = node->nd_next->nd_vid, aid = rb_id_attrset(vid);
 	VALUE asgnflag;
 	LABEL *lfin = NEW_LABEL(line);
 	LABEL *lcfin = NEW_LABEL(line);
-	LABEL *lskip = 0;
 	/*
 	  class C; attr_accessor :c; end
 	  r = C.new
@@ -4972,13 +4203,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	*/
 
 	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node);
-	if (node->nd_next->nd_aid) {
-	    lskip = NEW_LABEL(line);
-	    ADD_INSN(ret, line, dup);
-	    ADD_INSNL(ret, line, branchnil, lskip);
-	}
 	ADD_INSN(ret, line, dup);
-	ADD_SEND(ret, line, vid, INT2FIX(0));
+	ADD_SEND_R(ret, line, node->nd_next->nd_vid,
+		   INT2FIX(0), Qfalse, INT2FIX(asgnflag));
 
 	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
 	    ADD_INSN(ret, line, dup);
@@ -4992,7 +4219,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
 	    ADD_INSN(ret, line, swap);
 	    ADD_INSN1(ret, line, topn, INT2FIX(1));
-	    ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag));
+	    ADD_SEND_R(ret, line, node->nd_next->nd_aid,
+		       INT2FIX(1), Qfalse, INT2FIX(asgnflag));
 	    ADD_INSNL(ret, line, jump, lfin);
 
 	    ADD_LABEL(ret, lcfin);
@@ -5000,26 +4228,22 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 	    ADD_LABEL(ret, lfin);
 	    ADD_INSN(ret, line, pop);
-	    if (lskip) {
-		ADD_LABEL(ret, lskip);
-	    }
-	    if (popped) {
+	    if (poped) {
 		/* we can apply more optimize */
 		ADD_INSN(ret, line, pop);
 	    }
 	}
 	else {
 	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
-	    ADD_SEND(ret, line, atype, INT2FIX(1));
-	    if (!popped) {
+	    ADD_SEND(ret, line, node->nd_next->nd_mid,
+		     INT2FIX(1));
+	    if (!poped) {
 		ADD_INSN(ret, line, swap);
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    }
-	    ADD_SEND_WITH_FLAG(ret, line, aid, INT2FIX(1), INT2FIX(asgnflag));
+	    ADD_SEND_R(ret, line, node->nd_next->nd_aid,
+		       INT2FIX(1), Qfalse, INT2FIX(asgnflag));
 	    ADD_INSN(ret, line, pop);
-	    if (lskip) {
-		ADD_LABEL(ret, lskip);
-	    }
 	}
 	break;
       }
@@ -5036,9 +4260,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head);
 	    break;
 	  default:
-	    COMPILE_ERROR(ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
-			  ruby_node_name(nd_type(node->nd_head)));
-	    debug_node_end();
+	    do {
+		COMPILE_ERROR((ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
+			       ruby_node_name(nd_type(node->nd_head))));
+	    } while (0);
 	    return COMPILE_NG;
 	}
 	mid = node->nd_head->nd_mid;
@@ -5055,17 +4280,17 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 	if (node->nd_aid == 0 || node->nd_aid == 1) {
 	    lfin = NEW_LABEL(line);
-	    if (!popped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
+	    if (!poped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
 	    if (node->nd_aid == 0)
 		ADD_INSNL(ret, line, branchif, lfin);
 	    else
 		ADD_INSNL(ret, line, branchunless, lfin);
 	    /* cref [obj] */
-	    if (!popped) ADD_INSN(ret, line, pop); /* cref */
+	    if (!poped) ADD_INSN(ret, line, pop); /* cref */
 	    if (lassign) ADD_LABEL(ret, lassign);
 	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
 	    /* cref value */
-	    if (popped)
+	    if (poped)
 		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* cref value cref */
 	    else {
 		ADD_INSN1(ret, line, dupn, INT2FIX(2)); /* cref value cref value */
@@ -5073,7 +4298,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    }
 	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid)); /* cref [value] */
 	    ADD_LABEL(ret, lfin);			    /* cref [value] */
-	    if (!popped) ADD_INSN(ret, line, swap); /* [value] cref */
+	    if (!poped) ADD_INSN(ret, line, swap); /* [value] cref */
 	    ADD_INSN(ret, line, pop); /* [value] */
 	}
 	else {
@@ -5082,7 +4307,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_CALL(ret, line, node->nd_aid, INT2FIX(1));
 	    /* cref value */
 	    ADD_INSN(ret, line, swap); /* value cref */
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* value cref value */
 		ADD_INSN(ret, line, swap); /* value value cref */
 	    }
@@ -5125,7 +4350,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
 	ADD_LABEL(ret, lfin);
 
-	if (popped) {
+	if (poped) {
 	    /* we can apply more optimize */
 	    ADD_INSN(ret, line, pop);
 	}
@@ -5136,13 +4361,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	 *   "literal".freeze -> opt_str_freeze("literal")
 	 */
 	if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR &&
-	    node->nd_mid == idFreeze && node->nd_args == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+	    node->nd_mid == idFreeze && node->nd_args == NULL)
+	{
 	    VALUE str = rb_fstring(node->nd_recv->nd_lit);
 	    iseq_add_mark_object(iseq, str);
 	    ADD_INSN1(ret, line, opt_str_freeze, str);
-	    if (popped) {
+	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	    break;
@@ -5152,21 +4376,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	 */
 	if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args &&
 	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 1 &&
-	    nd_type(node->nd_args->nd_head) == NODE_STR &&
-	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+	    nd_type(node->nd_args->nd_head) == NODE_STR)
+	{
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
 	    node->nd_args->nd_head->nd_lit = str;
 	    COMPILE(ret, "recv", node->nd_recv);
-	    ADD_INSN3(ret, line, opt_aref_with,
-		      new_callinfo(iseq, idAREF, 1, 0, NULL, FALSE),
-		      NULL/* CALL_CACHE */, str);
-	    if (popped) {
+	    ADD_INSN2(ret, line, opt_aref_with,
+		      new_callinfo(iseq, idAREF, 1, 0, 0), str);
+	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
 	    break;
 	}
-      case NODE_QCALL:
       case NODE_FCALL:
       case NODE_VCALL:{		/* VCALL: variable or call */
 	/*
@@ -5176,13 +4397,11 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	*/
 	DECL_ANCHOR(recv);
 	DECL_ANCHOR(args);
-	LABEL *lskip = 0;
 	ID mid = node->nd_mid;
 	VALUE argc;
 	unsigned int flag = 0;
-	struct rb_call_info_kw_arg *keywords = NULL;
-	const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block;
-	ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+	VALUE parent_block = iseq->compile_data->current_block;
+	iseq->compile_data->current_block = Qfalse;
 
 	INIT_ANCHOR(recv);
 	INIT_ANCHOR(args);
@@ -5215,12 +4434,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		(mid == goto_id || mid == label_id)) {
 		LABEL *label;
 		st_data_t data;
-		st_table *labels_table = ISEQ_COMPILE_DATA(iseq)->labels_table;
+		st_table *labels_table = iseq->compile_data->labels_table;
 		ID label_name;
 
 		if (!labels_table) {
 		    labels_table = st_init_numtable();
-		    ISEQ_COMPILE_DATA(iseq)->labels_table = labels_table;
+		    iseq->compile_data->labels_table = labels_table;
 		}
 		if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
 		    SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
@@ -5236,7 +4455,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		    }
 		}
 		else {
-		    COMPILE_ERROR(ERROR_ARGS "invalid goto/label format");
+		    COMPILE_ERROR((ERROR_ARGS "invalid goto/label format"));
 		}
 
 
@@ -5251,13 +4470,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	}
 #endif
 	/* receiver */
-	if (type == NODE_CALL || type == NODE_QCALL) {
+	if (type == NODE_CALL) {
 	    COMPILE(recv, "recv", node->nd_recv);
-	    if (type == NODE_QCALL) {
-		lskip = NEW_LABEL(line);
-		ADD_INSN(recv, line, dup);
-		ADD_INSNL(recv, line, branchnil, lskip);
-	    }
 	}
 	else if (type == NODE_FCALL || type == NODE_VCALL) {
 	    ADD_CALL_RECEIVER(recv, line);
@@ -5265,7 +4479,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 	/* args */
 	if (nd_type(node) != NODE_VCALL) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+	    argc = setup_args(iseq, args, node->nd_args, &flag);
 	}
 	else {
 	    argc = INT2FIX(0);
@@ -5285,12 +4499,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    flag |= VM_CALL_FCALL;
 	}
 
-	ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
+	ADD_SEND_R(ret, line, mid,
+		   argc, parent_block, INT2FIX(flag));
 
-	if (lskip) {
-	    ADD_LABEL(ret, lskip);
-	}
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5300,110 +4512,92 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	DECL_ANCHOR(args);
 	int argc;
 	unsigned int flag = 0;
-	struct rb_call_info_kw_arg *keywords = NULL;
-	const rb_iseq_t *parent_block = ISEQ_COMPILE_DATA(iseq)->current_block;
+	VALUE parent_block = iseq->compile_data->current_block;
 
 	INIT_ANCHOR(args);
-	ISEQ_COMPILE_DATA(iseq)->current_block = NULL;
+	iseq->compile_data->current_block = Qfalse;
 	if (nd_type(node) == NODE_SUPER) {
-	    VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
+	    VALUE vargc = setup_args(iseq, args, node->nd_args, &flag);
 	    argc = FIX2INT(vargc);
 	}
 	else {
 	    /* NODE_ZSUPER */
 	    int i;
-	    const rb_iseq_t *liseq = iseq->body->local_iseq;
+	    rb_iseq_t *liseq = iseq->local_iseq;
 	    int lvar_level = get_lvar_level(iseq);
 
-	    argc = liseq->body->param.lead_num;
+	    argc = liseq->argc;
 
 	    /* normal arguments */
-	    for (i = 0; i < liseq->body->param.lead_num; i++) {
-		int idx = liseq->body->local_table_size - i;
-		ADD_GETLOCAL(args, line, idx, lvar_level);
-	    }
-
-	    if (liseq->body->param.flags.has_opt) {
-		/* optional arguments */
-		int j;
-		for (j = 0; j < liseq->body->param.opt_num; j++) {
-		    int idx = liseq->body->local_table_size - (i + j);
-		    ADD_GETLOCAL(args, line, idx, lvar_level);
-		}
-		i += j;
-		argc = i;
-	    }
-	    if (liseq->body->param.flags.has_rest) {
-		/* rest argument */
-		int idx = liseq->body->local_table_size - liseq->body->param.rest_start;
-		ADD_GETLOCAL(args, line, idx, lvar_level);
-
-		argc = liseq->body->param.rest_start + 1;
-		flag |= VM_CALL_ARGS_SPLAT;
+	    for (i = 0; i < liseq->argc; i++) {
+		int idx = liseq->local_size - i;
+		ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
 	    }
-	    if (liseq->body->param.flags.has_post) {
-		/* post arguments */
-		int post_len = liseq->body->param.post_num;
-		int post_start = liseq->body->param.post_start;
 
-		if (liseq->body->param.flags.has_rest) {
-		    int j;
-		    for (j=0; j<post_len; j++) {
-			int idx = liseq->body->local_table_size - (post_start + j);
-			ADD_GETLOCAL(args, line, idx, lvar_level);
-		    }
-		    ADD_INSN1(args, line, newarray, INT2FIX(j));
-		    ADD_INSN (args, line, concatarray);
-		    /* argc is settled at above */
-		}
-		else {
+	    if (!liseq->arg_simple) {
+		if (liseq->arg_opts) {
+		    /* optional arguments */
 		    int j;
-		    for (j=0; j<post_len; j++) {
-			int idx = liseq->body->local_table_size - (post_start + j);
-			ADD_GETLOCAL(args, line, idx, lvar_level);
+		    for (j = 0; j < liseq->arg_opts - 1; j++) {
+			int idx = liseq->local_size - (i + j);
+			ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
 		    }
-		    argc = post_len + post_start;
+		    i += j;
+		    argc = i;
 		}
-	    }
 
-	    if (liseq->body->param.flags.has_kw) { /* TODO: support keywords */
-		int local_size = liseq->body->local_table_size;
-		argc++;
+		if (liseq->arg_rest != -1) {
+		    /* rest argument */
+		    int idx = liseq->local_size - liseq->arg_rest;
+		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    argc = liseq->arg_rest + 1;
+		    flag |= VM_CALL_ARGS_SPLAT;
+		}
 
-		ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+		if (liseq->arg_post_len) {
+		    /* post arguments */
+		    int post_len = liseq->arg_post_len;
+		    int post_start = liseq->arg_post_start;
 
-		if (liseq->body->param.flags.has_kwrest) {
-		    int idx = liseq->body->local_table_size - liseq->body->param.keyword->rest_start;
-		    ADD_GETLOCAL(args, line, idx, lvar_level);
-		    ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
-		}
-		else {
-		    ADD_INSN1(args, line, newhash, INT2FIX(0));
-		}
-		for (i = 0; i < liseq->body->param.keyword->num; ++i) {
-		    ID id = liseq->body->param.keyword->table[i];
-		    int idx = local_size - get_local_var_idx(liseq, id);
-		    ADD_INSN1(args, line, putobject, ID2SYM(id));
-		    ADD_GETLOCAL(args, line, idx, lvar_level);
-		}
-		ADD_SEND(args, line, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
-		if (liseq->body->param.flags.has_rest) {
-		    ADD_INSN1(args, line, newarray, INT2FIX(1));
-		    ADD_INSN (args, line, concatarray);
-		    --argc;
-		}
-	    }
-	    else if (liseq->body->param.flags.has_kwrest) {
-		int idx = liseq->body->local_table_size - liseq->body->param.keyword->rest_start;
-		ADD_GETLOCAL(args, line, idx, lvar_level);
-
-		ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
-		if (liseq->body->param.flags.has_rest) {
-		    ADD_INSN1(args, line, newarray, INT2FIX(1));
-		    ADD_INSN (args, line, concatarray);
+		    if (liseq->arg_rest != -1) {
+			int j;
+			for (j=0; j<post_len; j++) {
+			    int idx = liseq->local_size - (post_start + j);
+			    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+			}
+			ADD_INSN1(args, line, newarray, INT2FIX(j));
+			ADD_INSN (args, line, concatarray);
+			/* argc is settled at above */
+		    }
+		    else {
+			int j;
+			for (j=0; j<post_len; j++) {
+			    int idx = liseq->local_size - (post_start + j);
+			    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+			}
+			argc = post_len + post_start;
+		    }
 		}
-		else {
+
+		if (liseq->arg_keyword >= 0) {
+		    int local_size = liseq->local_size;
+		    int idx = local_size - liseq->arg_keyword;
 		    argc++;
+		    ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
+		    for (i = 0; i < liseq->arg_keywords; ++i) {
+			ID id = liseq->arg_keyword_table[i];
+			idx = local_size - get_local_var_idx(liseq, id);
+			ADD_INSN1(args, line, putobject, ID2SYM(id));
+			ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    }
+		    ADD_SEND(args, line, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
+		    if (liseq->arg_rest != -1) {
+			ADD_INSN1(args, line, newarray, INT2FIX(1));
+			ADD_INSN (args, line, concatarray);
+			--argc;
+		    }
 		}
 	    }
 	}
@@ -5411,22 +4605,20 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	/* dummy receiver */
 	ADD_INSN1(ret, line, putobject, nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
 	ADD_SEQ(ret, args);
-	ADD_INSN3(ret, line, invokesuper,
-		  new_callinfo(iseq, 0, argc, flag | VM_CALL_SUPER | VM_CALL_FCALL, keywords, parent_block != NULL),
-		  Qnil, /* CALL_CACHE */
-		  parent_block);
+	ADD_INSN1(ret, line, invokesuper, new_callinfo(iseq, 0, argc, parent_block,
+								flag | VM_CALL_SUPER | VM_CALL_FCALL));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ARRAY:{
-	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, NULL, popped);
+	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, poped);
 	break;
       }
       case NODE_ZARRAY:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
 	}
 	break;
@@ -5438,7 +4630,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    n = n->nd_next;
 	}
 	ADD_INSN1(ret, line, newarray, INT2FIX(node->nd_alen));
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5459,11 +4651,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    break;
 
 	  default:
-	    compile_bug(ERROR_ARGS_AT(node->nd_head) "can't make hash with this node: %s",
-			ruby_node_name(type));
+	    rb_bug("can't make hash with this node: %s", ruby_node_name(type));
 	}
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5472,20 +4663,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	rb_iseq_t *is = iseq;
 
 	if (is) {
-	    enum iseq_type type = is->body->type;
-	    const rb_iseq_t *parent_iseq = is->body->parent_iseq;
-	    enum iseq_type parent_type = parent_iseq ? parent_iseq->body->type : type;
-
-	    if (type == ISEQ_TYPE_TOP || type == ISEQ_TYPE_MAIN ||
-		((type == ISEQ_TYPE_RESCUE || type == ISEQ_TYPE_ENSURE) &&
-		 (parent_type == ISEQ_TYPE_TOP || parent_type == ISEQ_TYPE_MAIN))) {
-		ADD_INSN(ret, line, putnil);
-		ADD_INSN(ret, line, leave);
+	    if (is->type == ISEQ_TYPE_TOP) {
+		COMPILE_ERROR((ERROR_ARGS "Invalid return"));
 	    }
 	    else {
 		LABEL *splabel = 0;
 
-		if (type == ISEQ_TYPE_METHOD) {
+		if (is->type == ISEQ_TYPE_METHOD) {
 		    splabel = NEW_LABEL(0);
 		    ADD_LABEL(ret, splabel);
 		    ADD_ADJUST(ret, line, 0);
@@ -5493,19 +4677,19 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 		COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
 
-		if (type == ISEQ_TYPE_METHOD) {
+		if (is->type == ISEQ_TYPE_METHOD) {
 		    add_ensure_iseq(ret, iseq, 1);
 		    ADD_TRACE(ret, line, RUBY_EVENT_RETURN);
 		    ADD_INSN(ret, line, leave);
 		    ADD_ADJUST_RESTORE(ret, splabel);
 
-		    if (!popped) {
+		    if (!poped) {
 			ADD_INSN(ret, line, putnil);
 		    }
 		}
 		else {
-		    ADD_INSN1(ret, line, throw, INT2FIX(TAG_RETURN));
-		    if (popped) {
+		    ADD_INSN1(ret, line, throw, INT2FIX(0x01) /* TAG_RETURN */ );
+		    if (poped) {
 			ADD_INSN(ret, line, pop);
 		    }
 		}
@@ -5517,76 +4701,71 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	DECL_ANCHOR(args);
 	VALUE argc;
 	unsigned int flag = 0;
-	struct rb_call_info_kw_arg *keywords = NULL;
 
 	INIT_ANCHOR(args);
-	if (iseq->body->type == ISEQ_TYPE_TOP) {
-	    COMPILE_ERROR(ERROR_ARGS "Invalid yield");
-	    debug_node_end();
-	    return COMPILE_NG;
+	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, &keywords);
+	    argc = setup_args(iseq, args, node->nd_head, &flag);
 	}
 	else {
 	    argc = INT2FIX(0);
 	}
 
 	ADD_SEQ(ret, args);
-	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), flag, keywords, FALSE));
+	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), 0, flag));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LVAR:{
-	if (!popped) {
+	if (!poped) {
 	    ID id = node->nd_vid;
-	    int idx = iseq->body->local_iseq->body->local_table_size - get_local_var_idx(iseq, id);
+	    int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
 
-	    debugs("id: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
-	    ADD_GETLOCAL(ret, line, idx, get_lvar_level(iseq));
+	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
+	    ADD_INSN2(ret, line, getlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
 	}
 	break;
       }
       case NODE_DVAR:{
 	int lv, idx, ls;
 	debugi("nd_vid", node->nd_vid);
-	if (!popped) {
+	if (!poped) {
 	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
 	    if (idx < 0) {
-		compile_bug(ERROR_ARGS "unknown dvar (%"PRIsVALUE")",
-			    rb_id2str(node->nd_vid));
+		rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
 	    }
-	    ADD_GETLOCAL(ret, line, ls - idx, lv);
+	    ADD_INSN2(ret, line, getlocal, INT2FIX(ls - idx), INT2FIX(lv));
 	}
 	break;
       }
       case NODE_GVAR:{
 	ADD_INSN1(ret, line, getglobal,
 		  ((VALUE)node->nd_entry | 1));
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_IVAR:{
 	debugi("nd_vid", node->nd_vid);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN2(ret, line, getinstancevariable,
-		      ID2SYM(node->nd_vid),
-		      get_ivar_ic_value(iseq,node->nd_vid));
+		      ID2SYM(node->nd_vid), INT2FIX(iseq->is_size++));
 	}
 	break;
       }
       case NODE_CONST:{
 	debugi("nd_vid", node->nd_vid);
 
-	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+	if (iseq->compile_data->option->inline_const_cache) {
 	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = iseq->body->is_size++;
+	    int ic_index = iseq->is_size++;
 
 	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
 	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
@@ -5598,31 +4777,27 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
 	}
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CVAR:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, getclassvariable,
 		      ID2SYM(node->nd_vid));
 	}
 	break;
       }
       case NODE_NTH_REF:{
-        if (!popped) {
-	    if (!node->nd_nth) {
-		ADD_INSN(ret, line, putnil);
-		break;
-	    }
+        if (!poped) {
 	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~'  */,
 		      INT2FIX(node->nd_nth << 1));
 	}
 	break;
       }
       case NODE_BACK_REF:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
 		      INT2FIX(0x01 | (node->nd_nth << 1)));
 	}
@@ -5652,7 +4827,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    break;
 	}
 
-	if (ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
+	if (iseq->compile_data->option->specialized_instruction) {
 	    /* TODO: detect by node */
 	    if (recv->last == recv->anchor.next &&
 		INSN_OF(recv->last) == BIN(putobject) &&
@@ -5664,7 +4839,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    else {
 		ADD_SEQ(ret, recv);
 		ADD_SEQ(ret, val);
-		ADD_INSN2(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, NULL, FALSE), Qnil);
+		ADD_INSN1(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, 0));
 	    }
 	}
 	else {
@@ -5673,60 +4848,32 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_SEND(ret, line, idEqTilde, INT2FIX(1));
 	}
 
-	if (node->nd_args) {
-	    compile_named_capture_assign(iseq, ret, node->nd_args);
-	}
-
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_LIT:{
 	debugp_param("lit", node->nd_lit);
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, putobject, node->nd_lit);
 	}
 	break;
       }
       case NODE_STR:{
+	node->nd_lit = rb_fstring(node->nd_lit);
 	debugp_param("nd_lit", node->nd_lit);
-	if (!popped) {
-	    node->nd_lit = rb_fstring(node->nd_lit);
-	    if (!ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-		ADD_INSN1(ret, line, putstring, node->nd_lit);
-	    }
-	    else {
-		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-		    VALUE debug_info = rb_ary_new_from_args(2, iseq->body->location.path, INT2FIX(line));
-		    VALUE str = rb_str_dup(node->nd_lit);
-		    rb_ivar_set(str, id_debug_created_info, rb_obj_freeze(debug_info));
-		    ADD_INSN1(ret, line, putobject, rb_obj_freeze(str));
-		    iseq_add_mark_object_compile_time(iseq, str);
-		}
-		else {
-		    ADD_INSN1(ret, line, putobject, node->nd_lit);
-		}
-	    }
+	if (!poped) {
+	    ADD_INSN1(ret, line, putstring, node->nd_lit);
 	}
 	break;
       }
       case NODE_DSTR:{
 	compile_dstr(iseq, ret, node);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
-	else {
-	    if (ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal) {
-		VALUE debug_info = Qnil;
-		if (ISEQ_COMPILE_DATA(iseq)->option->debug_frozen_string_literal || RTEST(ruby_debug)) {
-		    debug_info = rb_ary_new_from_args(2, iseq->body->location.path, INT2FIX(line));
-		    iseq_add_mark_object_compile_time(iseq, rb_obj_freeze(debug_info));
-		}
-		ADD_INSN1(ret, line, freezestring, debug_info);
-	    }
-	}
 	break;
       }
       case NODE_XSTR:{
@@ -5735,7 +4882,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	ADD_INSN1(ret, line, putobject, node->nd_lit);
 	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5745,7 +4892,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	compile_dstr(iseq, ret, node);
 	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5753,7 +4900,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_EVSTR:{
 	COMPILE(ret, "nd_body", node->nd_body);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	else {
@@ -5764,26 +4911,26 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_DREGX:{
 	compile_dregx(iseq, ret, node);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DREGX_ONCE:{
-	int ic_index = iseq->body->is_size++;
+	int ic_index = iseq->is_size++;
 	NODE *dregx_node = NEW_NODE(NODE_DREGX, node->u1.value, node->u2.value, node->u3.value);
 	NODE *block_node = NEW_NODE(NODE_SCOPE, 0, dregx_node, 0);
-	const rb_iseq_t * block_iseq = NEW_CHILD_ISEQ(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+	VALUE block_iseq = NEW_CHILD_ISEQVAL(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
 
 	ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_ARGSCAT:{
-	if (popped) {
+	if (poped) {
 	    COMPILE(ret, "argscat head", node->nd_head);
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
@@ -5799,15 +4946,15 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	break;
       }
       case NODE_ARGSPUSH:{
-	if (popped) {
+	if (poped) {
 	    COMPILE(ret, "arsgpush head", node->nd_head);
 	    ADD_INSN1(ret, line, splatarray, Qfalse);
 	    ADD_INSN(ret, line, pop);
-	    COMPILE_(ret, "argspush body", node->nd_body, popped);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
 	}
 	else {
 	    COMPILE(ret, "arsgpush head", node->nd_head);
-	    COMPILE_(ret, "argspush body", node->nd_body, popped);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
 	    ADD_INSN1(ret, line, newarray, INT2FIX(1));
 	    ADD_INSN(ret, line, concatarray);
 	}
@@ -5817,43 +4964,45 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	COMPILE(ret, "splat", node->nd_head);
 	ADD_INSN1(ret, line, splatarray, Qtrue);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DEFN:{
-	const rb_iseq_t *method_iseq = NEW_ISEQ(node->nd_defn,
-						rb_id2str(node->nd_mid),
-						ISEQ_TYPE_METHOD, line);
+	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
+				    rb_id2str(node->nd_mid),
+				    ISEQ_TYPE_METHOD, line);
 
-	debugp_param("defn/iseq", rb_iseqw_new(method_iseq));
+	debugp_param("defn/iseq", iseqval);
 
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
 	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, line, putiseq, method_iseq);
-	ADD_SEND (ret, line, id_core_define_method, INT2FIX(2));
+	ADD_INSN1(ret, line, putiseq, iseqval);
+	ADD_SEND (ret, line, id_core_define_method, INT2FIX(3));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 
+	debugp_param("defn", iseqval);
 	break;
       }
       case NODE_DEFS:{
-	const rb_iseq_t * singleton_method = NEW_ISEQ(node->nd_defn,
-						      rb_id2str(node->nd_mid),
-						      ISEQ_TYPE_METHOD, line);
+	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
+				    rb_id2str(node->nd_mid),
+				    ISEQ_TYPE_METHOD, line);
 
-	debugp_param("defs/iseq", rb_iseqw_new(singleton_method));
+	debugp_param("defs/iseq", iseqval);
 
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	COMPILE(ret, "defs: recv", node->nd_recv);
 	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
-	ADD_INSN1(ret, line, putiseq, singleton_method);
+	ADD_INSN1(ret, line, putiseq, iseqval);
 	ADD_SEND (ret, line, id_core_define_singleton_method, INT2FIX(3));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5865,7 +5014,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	COMPILE(ret, "alias arg2", node->u2.node);
 	ADD_SEND(ret, line, id_core_set_method_alias, INT2FIX(3));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5876,7 +5025,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	ADD_INSN1(ret, line, putobject, ID2SYM(node->u2.id));
 	ADD_SEND(ret, line, id_core_set_variable_alias, INT2FIX(2));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5887,57 +5036,61 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	COMPILE(ret, "undef arg", node->u2.node);
 	ADD_SEND(ret, line, id_core_undef_method, INT2FIX(2));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_CLASS:{
-	const rb_iseq_t *class_iseq = NEW_CHILD_ISEQ(node->nd_body,
-						     rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)),
-						     ISEQ_TYPE_CLASS, line);
+	VALUE iseqval =
+	    NEW_CHILD_ISEQVAL(
+		node->nd_body,
+		rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+		ISEQ_TYPE_CLASS, line);
 	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
 	int flags = VM_DEFINECLASS_TYPE_CLASS;
-
 	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
 	if (node->nd_super) flags |= VM_DEFINECLASS_FLAG_HAS_SUPERCLASS;
 	COMPILE(ret, "super", node->nd_super);
-	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), class_iseq, INT2FIX(flags));
+	ADD_INSN3(ret, line, defineclass,
+		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_MODULE:{
-        const rb_iseq_t *module_iseq = NEW_CHILD_ISEQ(node->nd_body,
-						      rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)),
-						      ISEQ_TYPE_CLASS, line);
+	VALUE iseqval = NEW_CHILD_ISEQVAL(
+	    node->nd_body,
+	    rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+	    ISEQ_TYPE_CLASS, line);
+
 	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
 	int flags = VM_DEFINECLASS_TYPE_MODULE;
-
 	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
 	ADD_INSN (ret, line, putnil); /* dummy */
-	ADD_INSN3(ret, line, defineclass, ID2SYM(node->nd_cpath->nd_mid), module_iseq, INT2FIX(flags));
-
-	if (popped) {
+	ADD_INSN3(ret, line, defineclass,
+		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags));
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_SCLASS:{
 	ID singletonclass;
-	const rb_iseq_t *singleton_class = NEW_ISEQ(node->nd_body, rb_str_new2("singleton class"),
-						    ISEQ_TYPE_CLASS, line);
+	VALUE iseqval =
+	    NEW_ISEQVAL(node->nd_body, rb_str_new2("singleton class"),
+			ISEQ_TYPE_CLASS, line);
 
 	COMPILE(ret, "sclass#recv", node->nd_recv);
 	ADD_INSN (ret, line, putnil);
 	CONST_ID(singletonclass, "singletonclass");
 	ADD_INSN3(ret, line, defineclass,
-		  ID2SYM(singletonclass), singleton_class,
+		  ID2SYM(singletonclass), iseqval,
 		  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -5946,7 +5099,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	if (rb_is_const_id(node->nd_mid)) {
 	    /* constant */
 	    LABEL *lend = NEW_LABEL(line);
-	    int ic_index = iseq->body->is_size++;
+	    int ic_index = iseq->is_size++;
 
 	    DECL_ANCHOR(pref);
 	    DECL_ANCHOR(body);
@@ -5955,7 +5108,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    INIT_ANCHOR(body);
 	    compile_colon2(iseq, node, pref, body);
 	    if (LIST_SIZE_ZERO(pref)) {
-		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+		if (iseq->compile_data->option->inline_const_cache) {
 		    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
 		}
 		else {
@@ -5964,7 +5117,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 
 		ADD_SEQ(ret, body);
 
-		if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+		if (iseq->compile_data->option->inline_const_cache) {
 		    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
 		    ADD_LABEL(ret, lend);
 		}
@@ -5978,21 +5131,22 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    /* function call */
 	    ADD_CALL_RECEIVER(ret, line);
 	    COMPILE(ret, "colon2#nd_head", node->nd_head);
-	    ADD_CALL(ret, line, node->nd_mid, INT2FIX(1));
+	    ADD_CALL(ret, line, node->nd_mid,
+		     INT2FIX(1));
 	}
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_COLON3:{
 	LABEL *lend = NEW_LABEL(line);
-	int ic_index = iseq->body->is_size++;
+	int ic_index = iseq->is_size++;
 
 	debugi("colon3#nd_mid", node->nd_mid);
 
 	/* add cache insn */
-	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+	if (iseq->compile_data->option->inline_const_cache) {
 	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
 	    ADD_INSN(ret, line, pop);
 	}
@@ -6000,33 +5154,22 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	ADD_INSN1(ret, line, putobject, rb_cObject);
 	ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
 
-	if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) {
+	if (iseq->compile_data->option->inline_const_cache) {
 	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
 	    ADD_LABEL(ret, lend);
 	}
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       case NODE_DOT2:
       case NODE_DOT3:{
-	int excl = type == NODE_DOT3;
-	VALUE flag = INT2FIX(excl);
-	NODE *b = node->nd_beg;
-	NODE *e = node->nd_end;
-	if (number_literal_p(b) && number_literal_p(e)) {
-	    if (!popped) {
-		VALUE val = rb_range_new(b->nd_lit, e->nd_lit, excl);
-		iseq_add_mark_object_compile_time(iseq, val);
-		ADD_INSN1(ret, line, putobject, val);
-	    }
-	    break;
-	}
+	VALUE flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1);
 	COMPILE(ret, "min", (NODE *) node->nd_beg);
 	COMPILE(ret, "max", (NODE *) node->nd_end);
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	    ADD_INSN(ret, line, pop);
 	}
@@ -6038,59 +5181,85 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
       case NODE_FLIP2:
       case NODE_FLIP3:{
 	LABEL *lend = NEW_LABEL(line);
+	LABEL *lfin = NEW_LABEL(line);
 	LABEL *ltrue = NEW_LABEL(line);
-	LABEL *lfalse = NEW_LABEL(line);
-	compile_branch_condition(iseq, ret, node, ltrue, lfalse);
-	ADD_INSNL(ret, line, jump, lend);
+	rb_iseq_t *local_iseq = iseq->local_iseq;
+	rb_num_t cnt;
+	VALUE key;
+
+	cnt = local_iseq->flip_cnt++ + DEFAULT_SPECIAL_VAR_COUNT;
+	key = INT2FIX(cnt);
+
+	ADD_INSN2(ret, line, getspecial, key, INT2FIX(0));
+	ADD_INSNL(ret, line, branchif, lend);
+
+	/* *flip == 0 */
+	COMPILE(ret, "flip2 beg", node->nd_beg);
+	ADD_INSN(ret, line, dup);
+	ADD_INSNL(ret, line, branchunless, lfin);
+	if (nd_type(node) == NODE_FLIP3) {
+	    ADD_INSN(ret, line, dup);
+	    ADD_INSN1(ret, line, setspecial, key);
+	    ADD_INSNL(ret, line, jump, lfin);
+	}
+	else {
+	    ADD_INSN1(ret, line, setspecial, key);
+	}
+
+	/* *flip == 1 */
+	ADD_LABEL(ret, lend);
+	COMPILE(ret, "flip2 end", node->nd_end);
+	ADD_INSNL(ret, line, branchunless, ltrue);
+	ADD_INSN1(ret, line, putobject, Qfalse);
+	ADD_INSN1(ret, line, setspecial, key);
+
 	ADD_LABEL(ret, ltrue);
 	ADD_INSN1(ret, line, putobject, Qtrue);
-	ADD_INSNL(ret, line, jump, lend);
-	ADD_LABEL(ret, lfalse);
-	ADD_INSN1(ret, line, putobject, Qfalse);
-	ADD_LABEL(ret, lend);
+
+	ADD_LABEL(ret, lfin);
 	break;
       }
       case NODE_SELF:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putself);
 	}
 	break;
       }
       case NODE_NIL:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	}
 	break;
       }
       case NODE_TRUE:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, putobject, Qtrue);
 	}
 	break;
       }
       case NODE_FALSE:{
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN1(ret, line, putobject, Qfalse);
 	}
 	break;
       }
       case NODE_ERRINFO:{
-	if (!popped) {
-	    if (iseq->body->type == ISEQ_TYPE_RESCUE) {
-		ADD_GETLOCAL(ret, line, LVAR_ERRINFO, 0);
+	if (!poped) {
+	    if (iseq->type == ISEQ_TYPE_RESCUE) {
+		ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
 	    }
 	    else {
-		const rb_iseq_t *ip = iseq;
+		rb_iseq_t *ip = iseq;
 		int level = 0;
 		while (ip) {
-		    if (ip->body->type == ISEQ_TYPE_RESCUE) {
+		    if (ip->type == ISEQ_TYPE_RESCUE) {
 			break;
 		    }
-		    ip = ip->body->parent_iseq;
+		    ip = ip->parent_iseq;
 		    level++;
 		}
 		if (ip) {
-		    ADD_GETLOCAL(ret, line, LVAR_ERRINFO, level);
+		    ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(level));
 		}
 		else {
 		    ADD_INSN(ret, line, putnil);
@@ -6100,7 +5269,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	break;
       }
       case NODE_DEFINED:{
-	if (popped) break;
+	if (poped) break;
 	if (!node->nd_head) {
 	    VALUE str = rb_iseq_defined_string(DEFINED_NIL);
 	    ADD_INSN1(ret, nd_line(node), putobject, str);
@@ -6124,51 +5293,58 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	/* compiled to:
 	 *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
 	 */
-	int is_index = iseq->body->is_size++;
-	const rb_iseq_t *once_iseq = NEW_CHILD_ISEQ((NODE *)IFUNC_NEW(build_postexe_iseq, node->nd_body, 0),
-						    make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+	int is_index = iseq->is_size++;
+	VALUE once_iseq = NEW_CHILD_ISEQVAL(
+	    NEW_IFUNC(build_postexe_iseq, node->nd_body),
+	    make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
 
 	ADD_INSN2(ret, line, once, once_iseq, INT2FIX(is_index));
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
-      case NODE_KW_ARG:
-	{
-	    LABEL *end_label = NEW_LABEL(nd_line(node));
-	    NODE *default_value = node->nd_body->nd_value;
-
-	    if (default_value == (NODE *)-1) {
-		/* required argument. do nothing */
-		compile_bug(ERROR_ARGS "unreachable");
-	    }
-	    else if (nd_type(default_value) == NODE_LIT ||
-		     nd_type(default_value) == NODE_NIL ||
-		     nd_type(default_value) == NODE_TRUE ||
-		     nd_type(default_value) == NODE_FALSE) {
-		compile_bug(ERROR_ARGS "unreachable");
-	    }
-	    else {
-		/* if keywordcheck(_kw_bits, nth_keyword)
-		 *   kw = default_value
-		 * end
-		 */
-		int kw_bits_idx = iseq->body->local_table_size - iseq->body->param.keyword->bits_start;
-		int keyword_idx = iseq->body->param.keyword->num;
-
-		ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx + VM_ENV_DATA_SIZE - 1), INT2FIX(keyword_idx));
-		ADD_INSNL(ret, line, branchif, end_label);
-		COMPILE_POPPED(ret, "keyword default argument", node->nd_body);
-		ADD_LABEL(ret, end_label);
-	    }
+      case NODE_KW_ARG:{
+	LABEL *default_label = NEW_LABEL(line);
+	LABEL *end_label = 0;
+	int idx, lv, ls;
+	ID id = node->nd_body->nd_vid;
 
+	ADD_INSN(ret, line, dup);
+	ADD_INSN1(ret, line, putobject, ID2SYM(id));
+	ADD_SEND(ret, line, rb_intern("key?"), INT2FIX(1));
+	ADD_INSNL(ret, line, branchunless, default_label);
+	ADD_INSN(ret, line, dup);
+	ADD_INSN1(ret, line, putobject, ID2SYM(id));
+	ADD_SEND(ret, line, rb_intern("delete"), INT2FIX(1));
+	switch (nd_type(node->nd_body)) {
+	  case NODE_LASGN:
+	    idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+	    ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
 	    break;
+	  case NODE_DASGN:
+	  case NODE_DASGN_CURR:
+	    idx = get_dyna_var_idx(iseq, id, &lv, &ls);
+	    ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
+	    break;
+	  default:
+	    rb_bug("iseq_compile_each (NODE_KW_ARG): unknown node: %s", ruby_node_name(nd_type(node->nd_body)));
+	}
+	if (node->nd_body->nd_value != (NODE *)-1) {
+	    end_label = NEW_LABEL(nd_line(node));
+	    ADD_INSNL(ret, nd_line(node), jump, end_label);
 	}
+	ADD_LABEL(ret, default_label);
+	if (node->nd_body->nd_value != (NODE *)-1) {
+	    COMPILE_POPED(ret, "keyword default argument", node->nd_body);
+	    ADD_LABEL(ret, end_label);
+	}
+	break;
+      }
       case NODE_DSYM:{
 	compile_dstr(iseq, ret, node);
-	if (!popped) {
+	if (!poped) {
 	    ADD_SEND(ret, line, idIntern, INT2FIX(0));
 	}
 	else {
@@ -6180,52 +5356,41 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	DECL_ANCHOR(recv);
 	DECL_ANCHOR(args);
 	unsigned int flag = 0;
-	ID mid = node->nd_mid;
-	LABEL *lskip = 0;
 	VALUE argc;
+	int asgnflag;
 
 	/* optimization shortcut
 	 *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
 	 */
-	if (mid == idASET && !private_recv_p(node) && node->nd_args &&
+	if (node->nd_mid == idASET && !private_recv_p(node) && node->nd_args &&
 	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 2 &&
-	    nd_type(node->nd_args->nd_head) == NODE_STR &&
-	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
-	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
+	    nd_type(node->nd_args->nd_head) == NODE_STR)
 	{
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
 	    node->nd_args->nd_head->nd_lit = str;
 	    iseq_add_mark_object(iseq, str);
 	    COMPILE(ret, "recv", node->nd_recv);
 	    COMPILE(ret, "value", node->nd_args->nd_next->nd_head);
-	    if (!popped) {
+	    if (!poped) {
 		ADD_INSN(ret, line, swap);
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    }
-	    ADD_INSN3(ret, line, opt_aset_with,
-		      new_callinfo(iseq, idASET, 2, 0, NULL, FALSE),
-		      NULL/* CALL_CACHE */, str);
+	    ADD_INSN2(ret, line, opt_aset_with,
+		      new_callinfo(iseq, idASET, 2, 0, 0), str);
 	    ADD_INSN(ret, line, pop);
 	    break;
 	}
 
 	INIT_ANCHOR(recv);
 	INIT_ANCHOR(args);
-	argc = setup_args(iseq, args, node->nd_args, &flag, NULL);
+	argc = setup_args(iseq, args, node->nd_args, &flag);
 
-	flag |= COMPILE_RECV(recv, "recv", node);
+	flag |= (asgnflag = COMPILE_RECV(recv, "recv", node));
 
 	debugp_param("argc", argc);
-	debugp_param("nd_mid", ID2SYM(mid));
+	debugp_param("nd_mid", ID2SYM(node->nd_mid));
 
-	if (!rb_is_attrset_id(mid)) {
-	    /* safe nav attr */
-	    mid = rb_id_attrset(mid);
-	    ADD_INSN(recv, line, dup);
-	    lskip = NEW_LABEL(line);
-	    ADD_INSNL(recv, line, branchnil, lskip);
-	}
-	if (!popped) {
+	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
@@ -6234,7 +5399,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 		if (flag & VM_CALL_ARGS_SPLAT) {
 		    ADD_INSN1(ret, line, putobject, INT2FIX(-1));
-		    ADD_SEND(ret, line, idAREF, INT2FIX(1));
+		    ADD_SEND_R(ret, line, idAREF, INT2FIX(1), Qfalse, INT2FIX(asgnflag));
 		}
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
 		ADD_INSN (ret, line, pop);
@@ -6242,7 +5407,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    else if (flag & VM_CALL_ARGS_SPLAT) {
 		ADD_INSN(ret, line, dup);
 		ADD_INSN1(ret, line, putobject, INT2FIX(-1));
-		ADD_SEND(ret, line, idAREF, INT2FIX(1));
+		ADD_SEND_R(ret, line, idAREF, INT2FIX(1), Qfalse, INT2FIX(asgnflag));
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
 		ADD_INSN (ret, line, pop);
 	    }
@@ -6254,44 +5419,35 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
 	}
-	ADD_SEND_WITH_FLAG(ret, line, mid, argc, INT2FIX(flag));
-	if (lskip) ADD_LABEL(ret, lskip);
+	ADD_SEND_R(ret, line, node->nd_mid, argc, 0, INT2FIX(flag));
 	ADD_INSN(ret, line, pop);
 
 	break;
       }
       case NODE_PRELUDE:{
-	const rb_compile_option_t *orig_opt = ISEQ_COMPILE_DATA(iseq)->option;
-	if (node->nd_orig) {
-	    rb_compile_option_t new_opt = *orig_opt;
-	    rb_iseq_make_compile_option(&new_opt, node->nd_orig);
-	    ISEQ_COMPILE_DATA(iseq)->option = &new_opt;
-	}
-	COMPILE_POPPED(ret, "prelude", node->nd_head);
-	COMPILE_(ret, "body", node->nd_body, popped);
-	ISEQ_COMPILE_DATA(iseq)->option = orig_opt;
+	COMPILE_POPED(ret, "prelude", node->nd_head);
+	COMPILE_(ret, "body", node->nd_body, poped);
 	break;
       }
       case NODE_LAMBDA:{
 	/* compile same as lambda{...} */
-	const rb_iseq_t *block = NEW_CHILD_ISEQ(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
 	VALUE argc = INT2FIX(0);
-
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_CALL_WITH_BLOCK(ret, line, idLambda, argc, block);
 
-	if (popped) {
+	if (poped) {
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
       }
       default:
-	UNKNOWN_NODE("iseq_compile_each", node);
+	rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type));
 	return COMPILE_NG;
     }
 
     /* check & remove redundant trace(line) */
-    if (saved_last_element &&
+    if (saved_last_element && ret /* ret can be 0 when error */ &&
 	ret->last == saved_last_element &&
 	((INSN *)saved_last_element)->insn_id == BIN(trace)) {
 	POP_ELEMENT(ret);
@@ -6361,7 +5517,7 @@ insn_data_to_s_detail(INSN *iobj)
 		    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
 		    VALUE val = Qnil;
 		    if (0 && iseq) { /* TODO: invalidate now */
-			val = (VALUE)iseq;
+			val = iseq->self;
 		    }
 		    rb_str_concat(str, opobj_inspect(val));
 		}
@@ -6381,7 +5537,7 @@ insn_data_to_s_detail(INSN *iobj)
 		{
 		    struct rb_global_entry *entry = (struct rb_global_entry *)
 		      (OPERAND_AT(iobj, j) & (~1));
-		    rb_str_append(str, rb_id2str(entry->id));
+		    rb_str_cat2(str, rb_id2name(entry->id));
 		    break;
 		}
 	      case TS_IC:	/* inline cache */
@@ -6389,33 +5545,13 @@ insn_data_to_s_detail(INSN *iobj)
 		break;
 	      case TS_CALLINFO: /* call info */
 		{
-		    struct rb_call_info *ci = (struct rb_call_info *)OPERAND_AT(iobj, j);
-		    rb_str_cat2(str, "<callinfo:");
-		    if (ci->mid) rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid));
-		    rb_str_catf(str, ", %d>", ci->orig_argc);
-		    break;
-		}
-	      case TS_CALLCACHE: /* call cache */
-		{
-		    rb_str_catf(str, "<call cache>");
+		    rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, j);
+		    rb_str_catf(str, "<callinfo:%s, %d>", ci->mid ? rb_id2name(ci->mid) : "", ci->orig_argc);
 		    break;
 		}
 	      case TS_CDHASH:	/* case/when condition cache */
 		rb_str_cat2(str, "<ch>");
 		break;
-	      case TS_FUNCPTR:
-		{
-		    rb_insn_func_t func = (rb_insn_func_t)OPERAND_AT(iobj, j);
-#ifdef HAVE_DLADDR
-		    Dl_info info;
-		    if (dladdr(func, &info) && info.dli_sname) {
-			rb_str_cat2(str, info.dli_sname);
-			break;
-		    }
-#endif
-		    rb_str_catf(str, "<%p>", func);
-		}
-		break;
 	      default:{
 		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
 	      }
@@ -6444,7 +5580,7 @@ dump_disasm_list(struct iseq_link_element *link)
 	    {
 		iobj = (INSN *)link;
 		str = insn_data_to_s_detail(iobj);
-		printf("%04d %-65s(%4u)\n", pos, StringValueCStr(str), iobj->line_no);
+		printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str), iobj->line_no);
 		pos += insn_data_length(iobj);
 		break;
 	    }
@@ -6472,7 +5608,6 @@ dump_disasm_list(struct iseq_link_element *link)
 	link = link->next;
     }
     printf("---------------------\n");
-    fflush(stdout);
 }
 
 const char *
@@ -6506,7 +5641,6 @@ register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
     else {
 	label = (LABEL *)tmp;
     }
-    LABEL_REF(label);
     return label;
 }
 
@@ -6515,6 +5649,7 @@ 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;
 
@@ -6533,7 +5668,9 @@ get_exception_sym2type(VALUE sym)
     if (sym == symBreak)  return CATCH_TYPE_BREAK;
     if (sym == symRedo)   return CATCH_TYPE_REDO;
     if (sym == symNext)   return CATCH_TYPE_NEXT;
-    rb_raise(rb_eSyntaxError, "invalid exception symbol: %+"PRIsVALUE, sym);
+    sym_inspect = rb_inspect(sym);
+    rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
+	     StringValuePtr(sym_inspect));
     return 0;
 }
 
@@ -6544,13 +5681,12 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
     int i;
 
     for (i=0; i<RARRAY_LEN(exception); i++) {
-	const rb_iseq_t *eiseq;
-	VALUE v, type;
+	VALUE v, type, eiseqval;
 	const VALUE *ptr;
 	LABEL *lstart, *lend, *lcont;
-	unsigned int sp;
+	int sp;
 
-	v = rb_convert_type(RARRAY_AREF(exception, i), T_ARRAY,
+	RB_GC_GUARD(v) = rb_convert_type(RARRAY_AREF(exception, i), T_ARRAY,
 					 "Array", "to_ary");
 	if (RARRAY_LEN(v) != 6) {
 	    rb_raise(rb_eSyntaxError, "wrong exception entry");
@@ -6558,22 +5694,20 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
 	ptr  = RARRAY_CONST_PTR(v);
 	type = get_exception_sym2type(ptr[0]);
 	if (ptr[1] == Qnil) {
-	    eiseq = NULL;
+	    eiseqval = 0;
 	}
 	else {
-	    eiseq = rb_iseqw_to_iseq(rb_iseq_load(ptr[1], (VALUE)iseq, Qnil));
+	    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     = NUM2UINT(ptr[5]);
+	sp     = NUM2INT(ptr[5]);
 
 	(void)sp;
 
-	ADD_CATCH_ENTRY(type, lstart, lend, eiseq, lcont);
-
-	RB_GC_GUARD(v);
+	ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
     }
     return COMPILE_OK;
 }
@@ -6592,74 +5726,32 @@ insn_make_insn_table(void)
     return table;
 }
 
-static const rb_iseq_t *
-iseq_build_load_iseq(const rb_iseq_t *iseq, VALUE op)
+static VALUE
+iseq_build_load_iseq(rb_iseq_t *iseq, VALUE op)
 {
-    VALUE iseqw;
-    const rb_iseq_t *loaded_iseq;
-
+    VALUE iseqval;
     if (RB_TYPE_P(op, T_ARRAY)) {
-	iseqw = rb_iseq_load(op, (VALUE)iseq, Qnil);
+	iseqval = rb_iseq_load(op, iseq->self, Qnil);
     }
     else if (CLASS_OF(op) == rb_cISeq) {
-	iseqw = op;
+	iseqval = op;
     }
     else {
 	rb_raise(rb_eSyntaxError, "ISEQ is required");
     }
-
-    loaded_iseq = rb_iseqw_to_iseq(iseqw);
-    iseq_add_mark_object(iseq, (VALUE)loaded_iseq);
-    return loaded_iseq;
-}
-
-static VALUE
-iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
-{
-    ID mid = 0;
-    int orig_argc = 0;
-    unsigned int flag = 0;
-    struct rb_call_info_kw_arg *kw_arg = 0;
-
-    if (!NIL_P(op)) {
-	VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
-	VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
-	VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
-	VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern("kw_arg")));
-
-	if (!NIL_P(vmid)) mid = SYM2ID(vmid);
-	if (!NIL_P(vflag)) flag = NUM2UINT(vflag);
-	if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
-
-	if (!NIL_P(vkw_arg)) {
-	    int i;
-	    int len = RARRAY_LENINT(vkw_arg);
-	    size_t n = rb_call_info_kw_arg_bytes(len);
-
-	    kw_arg = xmalloc(n);
-	    kw_arg->keyword_len = len;
-	    for (i = 0; i < len; i++) {
-		VALUE kw = RARRAY_AREF(vkw_arg, i);
-		SYM2ID(kw);	/* make immortal */
-		kw_arg->keywords[i] = kw;
-	    }
-	}
-    }
-
-    return (VALUE)new_callinfo(iseq, mid, orig_argc, flag, kw_arg, (flag & VM_CALL_ARGS_SIMPLE) == 0);
+    iseq_add_mark_object(iseq, iseqval);
+    return iseqval;
 }
 
 static int
-iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
-			 VALUE body, VALUE labels_wrapper)
+iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
+		VALUE body, struct st_table *labels_table)
 {
     /* TODO: body should be frozen */
     const VALUE *ptr = RARRAY_CONST_PTR(body);
     long i, len = RARRAY_LEN(body);
-    struct st_table *labels_table = DATA_PTR(labels_wrapper);
     int j;
     int line_no = 0;
-    int ret = COMPILE_OK;
 
     /*
      * index -> LABEL *label
@@ -6689,17 +5781,14 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 	    insn = (argc < 0) ? Qnil : RARRAY_AREF(obj, 0);
 	    if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 0) {
 		/* TODO: exception */
-		COMPILE_ERROR(iseq, line_no,
-			      "unknown instruction: %+"PRIsVALUE, insn);
-		ret = COMPILE_NG;
-		break;
+		RB_GC_GUARD(insn) = rb_inspect(insn);
+		rb_compile_error(RSTRING_PTR(iseq->location.path), line_no,
+				 "unknown instruction: %s", RSTRING_PTR(insn));
 	    }
 
 	    if (argc != insn_len((VALUE)insn_id)-1) {
-		COMPILE_ERROR(iseq, line_no,
-			      "operand size mismatch");
-		ret = COMPILE_NG;
-		break;
+		rb_compile_error(RSTRING_PTR(iseq->location.path), line_no,
+				 "operand size mismatch");
 	    }
 
 	    if (argc > 0) {
@@ -6724,7 +5813,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 		      case TS_ISEQ:
 			{
 			    if (op != Qnil) {
-				argv[j] = (VALUE)iseq_build_load_iseq(iseq, op);
+				argv[j] = iseq_build_load_iseq(iseq, op);
 			    }
 			    else {
 				argv[j] = 0;
@@ -6737,15 +5826,30 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 			break;
 		      case TS_IC:
 			argv[j] = op;
-			if (NUM2UINT(op) >= iseq->body->is_size) {
-			    iseq->body->is_size = NUM2INT(op) + 1;
+			if (NUM2INT(op) >= iseq->is_size) {
+			    iseq->is_size = NUM2INT(op) + 1;
 			}
 			break;
 		      case TS_CALLINFO:
-			argv[j] = iseq_build_callinfo_from_hash(iseq, op);
-			break;
-		      case TS_CALLCACHE:
-			argv[j] = Qfalse;
+			{
+			    ID mid = 0;
+			    int orig_argc = 0;
+			    VALUE block = 0;
+			    unsigned int flag = 0;
+
+			    if (!NIL_P(op)) {
+				VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
+				VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
+				VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
+				VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("blockptr")));
+
+				if (!NIL_P(vmid)) mid = SYM2ID(vmid);
+				if (!NIL_P(vflag)) flag = NUM2UINT(vflag);
+				if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
+				if (!NIL_P(vblock)) block = iseq_build_load_iseq(iseq, vblock);
+			    }
+			    argv[j] = (VALUE)new_callinfo(iseq, mid, orig_argc, block, flag);
+			}
 			break;
 		      case TS_ID:
 			argv[j] = rb_convert_type(op, T_SYMBOL,
@@ -6754,30 +5858,16 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 		      case TS_CDHASH:
 			{
 			    int i;
-			    VALUE map = rb_hash_new();
-
-			    rb_hash_tbl_raw(map)->type = &cdhash_type;
 			    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 key = RARRAY_AREF(op, i);
-				VALUE sym = RARRAY_AREF(op, i+1);
+				VALUE sym = rb_ary_entry(op, i+1);
 				LABEL *label =
 				  register_label(iseq, labels_table, sym);
-				rb_hash_aset(map, key, (VALUE)label | 1);
+				rb_ary_store(op, i+1, (VALUE)label | 1);
 			    }
-			    RB_GC_GUARD(op);
-			    argv[j] = map;
-			    rb_iseq_add_mark_object(iseq, map);
-			}
-			break;
-		      case TS_FUNCPTR:
-			{
-#if SIZEOF_VALUE <= SIZEOF_LONG
-			    long funcptr = NUM2LONG(op);
-#else
-			    LONG_LONG funcptr = NUM2LL(op);
-#endif
-			    argv[j] = (VALUE)funcptr;
+			    argv[j] = op;
+			    iseq_add_mark_object_compile_time(iseq, op);
 			}
 			break;
 		      default:
@@ -6793,1829 +5883,143 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *const anchor,
 	    rb_raise(rb_eTypeError, "unexpected object for instruction");
 	}
     }
-    DATA_PTR(labels_wrapper) = 0;
     validate_labels(iseq, labels_table);
-    if (!ret) return ret;
-    return iseq_setup(iseq, anchor);
+    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) {(void)NUM2LONG(v); return v;}
 
-static int
-int_param(int *dst, VALUE param, VALUE sym)
-{
-    VALUE val = rb_hash_aref(param, sym);
-    switch (TYPE(val)) {
-      case T_NIL:
-	return FALSE;
-      case T_FIXNUM:
-	*dst = FIX2INT(val);
-	return TRUE;
-      default:
-	rb_raise(rb_eTypeError, "invalid %+"PRIsVALUE" Fixnum: %+"PRIsVALUE,
-		 sym, val);
-    }
-    return FALSE;
-}
-
-static const struct rb_iseq_param_keyword *
-iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
-{
-    int i, j;
-    int len = RARRAY_LENINT(keywords);
-    int default_len;
-    VALUE key, sym, default_val;
-    VALUE *dvs;
-    ID *ids;
-    struct rb_iseq_param_keyword *keyword = ZALLOC(struct rb_iseq_param_keyword);
-
-    iseq->body->param.flags.has_kw = TRUE;
-
-    keyword->num = len;
-#define SYM(s) ID2SYM(rb_intern(#s))
-    (void)int_param(&keyword->bits_start, params, SYM(kwbits));
-    i = keyword->bits_start - keyword->num;
-    ids = (VALUE *)&iseq->body->local_table[i];
-#undef SYM
-
-    /* required args */
-    for (i = 0; i < len; i++) {
-	VALUE val = RARRAY_AREF(keywords, i);
-
-	if (!SYMBOL_P(val)) {
-	    goto default_values;
-	}
-	ids[i] = SYM2ID(val);
-	keyword->required_num++;
-    }
-
-  default_values: /* note: we intentionally preserve `i' from previous loop */
-    default_len = len - i;
-    if (default_len == 0) {
-	return keyword;
-    }
-
-    dvs = ALLOC_N(VALUE, default_len);
-
-    for (j = 0; i < len; i++, j++) {
-	key = RARRAY_AREF(keywords, i);
-	CHECK_ARRAY(key);
-
-	switch (RARRAY_LEN(key)) {
-	  case 1:
-	    sym = RARRAY_AREF(key, 0);
-	    default_val = Qundef;
-	    break;
-	  case 2:
-	    sym = RARRAY_AREF(key, 0);
-	    default_val = RARRAY_AREF(key, 1);
-	    break;
-	  default:
-	    rb_raise(rb_eTypeError, "keyword default has unsupported len %+"PRIsVALUE, key);
-	}
-	ids[i] = SYM2ID(sym);
-	dvs[j] = default_val;
-    }
-
-    keyword->table = ids;
-    keyword->default_values = dvs;
-
-    return keyword;
-}
-
-void
-rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
+VALUE
+rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
 			 VALUE exception, VALUE body)
 {
-#define SYM(s) ID2SYM(rb_intern(#s))
-    int i, len;
+    int i;
     ID *tbl;
     struct st_table *labels_table = st_init_numtable();
-    VALUE labels_wrapper = Data_Wrap_Struct(0, 0, st_free_table, labels_table);
-    VALUE arg_opt_labels = rb_hash_aref(params, SYM(opt));
-    VALUE keywords = rb_hash_aref(params, SYM(keyword));
-    VALUE sym_arg_rest = ID2SYM(rb_intern("#arg_rest"));
     DECL_ANCHOR(anchor);
     INIT_ANCHOR(anchor);
 
-    len = RARRAY_LENINT(locals);
-    iseq->body->local_table_size = len;
-    iseq->body->local_table = tbl = len > 0 ? (ID *)ALLOC_N(ID, iseq->body->local_table_size) : NULL;
+    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 < len; i++) {
+    for (i=0; i<RARRAY_LEN(locals); i++) {
 	VALUE lv = RARRAY_AREF(locals, i);
+	tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
+    }
 
-	if (sym_arg_rest == lv) {
-	    tbl[i] = 0;
+    /* 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 {
-	    tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
+	    iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
 	}
-    }
-
-    /*
-     * we currently ignore misc params,
-     * local_size, stack_size and param.size are all calculated
-     */
-
-#define INT_PARAM(F) int_param(&iseq->body->param.F, params, SYM(F))
-    if (INT_PARAM(lead_num)) {
-	iseq->body->param.flags.has_lead = TRUE;
-    }
-    if (INT_PARAM(post_num)) iseq->body->param.flags.has_post = TRUE;
-    if (INT_PARAM(post_start)) iseq->body->param.flags.has_post = TRUE;
-    if (INT_PARAM(rest_start)) iseq->body->param.flags.has_rest = TRUE;
-    if (INT_PARAM(block_start)) iseq->body->param.flags.has_block = TRUE;
-#undef INT_PARAM
-
-    switch (TYPE(arg_opt_labels)) {
-      case T_ARRAY:
-	len = RARRAY_LENINT(arg_opt_labels);
-	iseq->body->param.flags.has_opt = !!(len - 1 >= 0);
-
-	if (iseq->body->param.flags.has_opt) {
-	    VALUE *opt_table = ALLOC_N(VALUE, len);
-
-	    for (i = 0; i < len; i++) {
-		VALUE ent = RARRAY_AREF(arg_opt_labels, i);
-		LABEL *label = register_label(iseq, labels_table, ent);
-		opt_table[i] = (VALUE)label;
-	    }
 
-	    iseq->body->param.opt_num = len - 1;
-	    iseq->body->param.opt_table = opt_table;
+	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));
 	}
-      case T_NIL:
-	break;
-      default:
-	rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
-		 arg_opt_labels);
-    }
-
-    switch (TYPE(keywords)) {
-      case T_ARRAY:
-	iseq->body->param.keyword = iseq_build_kw(iseq, params, keywords);
-      case T_NIL:
-	break;
-      default:
-	rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
-		 keywords);
-    }
 
-    if (Qtrue == rb_hash_aref(params, SYM(ambiguous_param0))) {
-	iseq->body->param.flags.ambiguous_param0 = TRUE;
-    }
-
-    if (int_param(&i, params, SYM(kwrest))) {
-	struct rb_iseq_param_keyword *keyword = (struct rb_iseq_param_keyword *)iseq->body->param.keyword;
-	if (keyword == NULL) {
-	    iseq->body->param.keyword = keyword = ZALLOC(struct rb_iseq_param_keyword);
-	}
-	keyword->rest_start = i;
-	iseq->body->param.flags.has_kwrest = TRUE;
+	iseq->arg_simple = NUM2INT(arg_simple);
     }
-#undef SYM
-    iseq_calc_param_size(iseq);
 
     /* exception */
     iseq_build_from_ary_exception(iseq, labels_table, exception);
 
     /* body */
-    iseq_build_from_ary_body(iseq, anchor, body, labels_wrapper);
+    iseq_build_from_ary_body(iseq, anchor, body, labels_table);
+    return iseq->self;
 }
 
 /* for parser */
 
 int
-rb_dvar_defined(ID id, const struct rb_block *base_block)
+rb_dvar_defined(ID id)
 {
-    const rb_iseq_t *iseq;
-
-    if (base_block && (iseq = vm_block_iseq(base_block)) != NULL) {
-	while (iseq->body->type == ISEQ_TYPE_BLOCK ||
-	       iseq->body->type == ISEQ_TYPE_RESCUE ||
-	       iseq->body->type == ISEQ_TYPE_ENSURE ||
-	       iseq->body->type == ISEQ_TYPE_EVAL ||
-	       iseq->body->type == ISEQ_TYPE_MAIN
+    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
 	       ) {
-	    unsigned int i;
+	    int i;
 
-	    for (i = 0; i < iseq->body->local_table_size; i++) {
-		if (iseq->body->local_table[i] == id) {
+	    for (i = 0; i < iseq->local_table_size; i++) {
+		if (iseq->local_table[i] == id) {
 		    return 1;
 		}
 	    }
-	    iseq = iseq->body->parent_iseq;
+	    iseq = iseq->parent_iseq;
 	}
     }
     return 0;
 }
 
 int
-rb_local_defined(ID id, const struct rb_block *base_block)
-{
-    const rb_iseq_t *iseq;
-
-    if (base_block && (iseq = vm_block_iseq(base_block)) != NULL) {
-	unsigned int i;
-	iseq = iseq->body->local_iseq;
-
-	for (i=0; i<iseq->body->local_table_size; i++) {
-	    if (iseq->body->local_table[i] == id) {
-		return 1;
-	    }
-	}
-    }
-    return 0;
-}
-
-static int
-caller_location(VALUE *path, VALUE *absolute_path)
-{
-    const rb_thread_t *const th = GET_THREAD();
-    const rb_control_frame_t *const cfp =
-	rb_vm_get_ruby_level_next_cfp(th, th->cfp);
-
-    if (cfp) {
-	int line = rb_vm_get_sourceline(cfp);
-	*path = cfp->iseq->body->location.path;
-	*absolute_path = cfp->iseq->body->location.absolute_path;
-	return line;
-    }
-    else {
-	*path = rb_fstring_cstr("<compiled>");
-	*absolute_path = *path;
-	return 1;
-    }
-}
-
-typedef struct {
-    VALUE arg;
-    rb_insn_func_t func;
-    int line;
-} accessor_args;
-
-static const rb_iseq_t *
-method_for_self(VALUE name, VALUE arg, rb_insn_func_t func,
-		VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *, VALUE))
-{
-    VALUE path, absolute_path;
-    accessor_args acc;
-
-    acc.arg = arg;
-    acc.func = func;
-    acc.line = caller_location(&path, &absolute_path);
-    return rb_iseq_new_with_opt((NODE *)IFUNC_NEW(build, (VALUE)&acc, 0),
-				rb_sym2str(name), path, absolute_path,
-				INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0);
-}
-
-static VALUE
-for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *const ret, VALUE a)
-{
-    const accessor_args *const args = (void *)a;
-    const int line = args->line;
-
-    iseq_set_local_table(iseq, 0);
-    iseq->body->param.lead_num = 0;
-    iseq->body->param.size = 0;
-
-    ADD_INSN1(ret, line, putobject, args->arg);
-    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
-    return Qnil;
-}
-
-static VALUE
-for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *const ret, VALUE a)
-{
-    const accessor_args *const args = (void *)a;
-    const int line = args->line;
-    static const ID vars[] = {1, idUScore};
-
-    iseq_set_local_table(iseq, vars);
-    iseq->body->param.lead_num = 1;
-    iseq->body->param.size = 1;
-
-    ADD_GETLOCAL(ret, line, numberof(vars)-1, 0);
-    ADD_INSN1(ret, line, putobject, args->arg);
-    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
-    ADD_INSN(ret, line, pop);
-    return Qnil;
-}
-
-/*
- * func (index) -> (value)
- */
-const rb_iseq_t *
-rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func)
-{
-    return method_for_self(name, arg, func, for_self_aref);
-}
-
-/*
- * func (index, value) -> (index, value)
- */
-const rb_iseq_t *
-rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func)
+rb_local_defined(ID id)
 {
-    return method_for_self(name, arg, func, for_self_aset);
-}
-
-/* ISeq binary format */
-
-typedef unsigned int ibf_offset_t;
-#define IBF_OFFSET(ptr) ((ibf_offset_t)(VALUE)(ptr))
-
-struct ibf_header {
-    char magic[4]; /* YARB */
-    unsigned int major_version;
-    unsigned int minor_version;
-    unsigned int size;
-    unsigned int extra_size;
-
-    unsigned int iseq_list_size;
-    unsigned int id_list_size;
-    unsigned int object_list_size;
-
-    ibf_offset_t iseq_list_offset;
-    ibf_offset_t id_list_offset;
-    ibf_offset_t object_list_offset;
-};
-
-struct ibf_id_entry {
-    enum {
-	ibf_id_enc_ascii,
-	ibf_id_enc_utf8,
-	ibf_id_enc_other
-    } enc : 2;
-    char body[1];
-};
-
-struct ibf_dump {
-    VALUE str;
-    VALUE iseq_list;      /* [iseq0 offset, ...] */
-    VALUE obj_list;       /* [objs] */
-    st_table *iseq_table; /* iseq -> iseq number */
-    st_table *id_table;   /* id -> id number */
-};
-
-rb_iseq_t * iseq_alloc(void);
-
-struct ibf_load {
-    const char *buff;
-    const struct ibf_header *header;
-    ID *id_list;     /* [id0, ...] */
-    VALUE iseq_list; /* [iseq0, ...] */
-    VALUE obj_list;  /* [obj0, ...] */
-    VALUE loader_obj;
-    VALUE str;
+    rb_thread_t *th = GET_THREAD();
     rb_iseq_t *iseq;
-};
-
-static ibf_offset_t
-ibf_dump_pos(struct ibf_dump *dump)
-{
-    return (unsigned int)rb_str_strlen(dump->str);
-}
-
-static ibf_offset_t
-ibf_dump_write(struct ibf_dump *dump, const void *buff, unsigned long size)
-{
-    ibf_offset_t pos = ibf_dump_pos(dump);
-    rb_str_cat(dump->str, (const char *)buff, size);
-    /* TODO: overflow check */
-    return pos;
-}
-
-static void
-ibf_dump_overwrite(struct ibf_dump *dump, void *buff, unsigned int size, long offset)
-{
-    VALUE str = dump->str;
-    char *ptr = RSTRING_PTR(str);
-    if ((unsigned long)(size + offset) > (unsigned long)RSTRING_LEN(str))
-	rb_bug("ibf_dump_overwrite: overflow");
-    memcpy(ptr + offset, buff, size);
-}
-
-static void *
-ibf_load_alloc(const struct ibf_load *load, ibf_offset_t offset, int size)
-{
-    void *buff = ruby_xmalloc(size);
-    memcpy(buff, load->buff + offset, size);
-    return buff;
-}
-
-#define IBF_W(b, type, n) (type *)(VALUE)ibf_dump_write(dump, (b), sizeof(type) * (n))
-#define IBF_WV(variable)   ibf_dump_write(dump, &(variable), sizeof(variable))
-#define IBF_WP(b, type, n) ibf_dump_write(dump, (b), sizeof(type) * (n))
-#define IBF_R(val, type, n) (type *)ibf_load_alloc(load, IBF_OFFSET(val), sizeof(type) * (n))
-
-static int
-ibf_table_lookup(struct st_table *table, st_data_t key)
-{
-    st_data_t val;
-
-    if (st_lookup(table, key, &val)) {
-	return (int)val;
-    }
-    else {
-	return -1;
-    }
-}
-
-static int
-ibf_table_index(struct st_table *table, st_data_t key)
-{
-    int index = ibf_table_lookup(table, key);
-
-    if (index < 0) { /* not found */
-	index = (int)table->num_entries;
-	st_insert(table, key, (st_data_t)index);
-    }
-
-    return index;
-}
-
-/* dump/load generic */
-
-static VALUE ibf_load_object(const struct ibf_load *load, VALUE object_index);
-static rb_iseq_t *ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq);
-
-static VALUE
-ibf_dump_object(struct ibf_dump *dump, VALUE obj)
-{
-    long index = RARRAY_LEN(dump->obj_list);
-    long i;
-    for (i=0; i<index; i++) {
-	if (RARRAY_AREF(dump->obj_list, i) == obj) return (VALUE)i; /* dedup */
-    }
-    rb_ary_push(dump->obj_list, obj);
-    return (VALUE)index;
-}
-
-static VALUE
-ibf_dump_id(struct ibf_dump *dump, ID id)
-{
-    return (VALUE)ibf_table_index(dump->id_table, (st_data_t)id);
-}
-
-static ID
-ibf_load_id(const struct ibf_load *load, const ID id_index)
-{
-    ID id;
-
-    if (id_index == 0) {
-	id = 0;
-    }
-    else {
-	id = load->id_list[(long)id_index];
-
-	if (id == 0) {
-	    long *indices = (long *)(load->buff + load->header->id_list_offset);
-	    VALUE str = ibf_load_object(load, indices[id_index]);
-	    id = NIL_P(str) ? 0 : rb_intern_str(str); /* str == nil -> internal junk id */
-	    load->id_list[(long)id_index] = id;
-	}
-    }
-
-    return id;
-}
-
-/* dump/load: code */
-
-static VALUE
-ibf_dump_callinfo(struct ibf_dump *dump, const struct rb_call_info *ci)
-{
-    return (ci->flag & VM_CALL_KWARG) ? Qtrue : Qfalse;
-}
-
-static ibf_offset_t ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq);
-
-static rb_iseq_t *
-ibf_dump_iseq(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    if (iseq == NULL) {
-	return (rb_iseq_t *)-1;
-    }
-    else {
-	int iseq_index = ibf_table_lookup(dump->iseq_table, (st_data_t)iseq);
-	if (iseq_index < 0) {
-	    iseq_index = ibf_table_index(dump->iseq_table, (st_data_t)iseq);
-	    rb_ary_store(dump->iseq_list, iseq_index, LONG2NUM(ibf_dump_iseq_each(dump, rb_iseq_check(iseq))));
-	}
-	return (rb_iseq_t *)(VALUE)iseq_index;
-    }
-}
-
-static VALUE
-ibf_dump_gentry(struct ibf_dump *dump, const struct rb_global_entry *entry)
-{
-    return (VALUE)ibf_dump_id(dump, entry->id);
-}
 
-static VALUE
-ibf_load_gentry(const struct ibf_load *load, const struct rb_global_entry *entry)
-{
-    ID gid = ibf_load_id(load, (ID)(VALUE)entry);
-    return (VALUE)rb_global_entry(gid);
-}
-
-static VALUE *
-ibf_dump_code(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    const int iseq_size = iseq->body->iseq_size;
-    int code_index;
-    VALUE *code;
-    const VALUE *orig_code = rb_iseq_original_iseq(iseq);
-
-    code = ALLOCA_N(VALUE, iseq_size);
-
-    for (code_index=0; code_index<iseq_size;) {
-	const VALUE insn = orig_code[code_index];
-	const char *types = insn_op_types(insn);
-	int op_index;
-
-	code[code_index++] = (VALUE)insn;
-
-	for (op_index=0; types[op_index]; op_index++, code_index++) {
-	    VALUE op = orig_code[code_index];
-	    switch (types[op_index]) {
-	      case TS_CDHASH:
-	      case TS_VALUE:
-		code[code_index] = ibf_dump_object(dump, op);
-		break;
-	      case TS_ISEQ:
-		code[code_index] = (VALUE)ibf_dump_iseq(dump, (const rb_iseq_t *)op);
-		break;
-	      case TS_IC:
-		{
-		    unsigned int i;
-		    for (i=0; i<iseq->body->is_size; i++) {
-			if (op == (VALUE)&iseq->body->is_entries[i]) {
-			    break;
-			}
-		    }
-		    code[code_index] = i;
-		}
-		break;
-	      case TS_CALLINFO:
-		code[code_index] = ibf_dump_callinfo(dump, (const struct rb_call_info *)op);
-		break;
-	      case TS_CALLCACHE:
-		code[code_index] = 0;
-		break;
-	      case TS_ID:
-		code[code_index] = ibf_dump_id(dump, (ID)op);
-		break;
-	      case TS_GENTRY:
-		code[code_index] = ibf_dump_gentry(dump, (const struct rb_global_entry *)op);
-		break;
-	      case TS_FUNCPTR:
-		rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
-		break;
-	      default:
-		code[code_index] = op;
-		break;
-	    }
-	}
-	assert(insn_len(insn) == op_index+1);
-    }
-
-    return IBF_W(code, VALUE, iseq_size);
-}
-
-static VALUE *
-ibf_load_code(const struct ibf_load *load, const rb_iseq_t *iseq, const struct rb_iseq_constant_body *body)
-{
-    const int iseq_size = body->iseq_size;
-    int code_index;
-    VALUE *code = IBF_R(body->iseq_encoded, VALUE, iseq_size);
-
-    struct rb_call_info *ci_entries = iseq->body->ci_entries;
-    struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&iseq->body->ci_entries[iseq->body->ci_size];
-    struct rb_call_cache *cc_entries = iseq->body->cc_entries;
-    union iseq_inline_storage_entry *is_entries = iseq->body->is_entries;
-
-    for (code_index=0; code_index<iseq_size;) {
-	const VALUE insn = code[code_index++];
-	const char *types = insn_op_types(insn);
-	int op_index;
-
-	for (op_index=0; types[op_index]; op_index++, code_index++) {
-	    VALUE op = code[code_index];
-
-	    switch (types[op_index]) {
-	      case TS_CDHASH:
-	      case TS_VALUE:
-		code[code_index] = ibf_load_object(load, op);
-		break;
-	      case TS_ISEQ:
-		code[code_index] = (VALUE)ibf_load_iseq(load, (const rb_iseq_t *)op);
-		break;
-	      case TS_IC:
-		code[code_index] = (VALUE)&is_entries[(int)op];
-		break;
-	      case TS_CALLINFO:
-		code[code_index] = op ? (VALUE)ci_kw_entries++ : (VALUE)ci_entries++; /* op is Qtrue (kw) or Qfalse (!kw) */
-		break;
-	      case TS_CALLCACHE:
-		code[code_index] = (VALUE)cc_entries++;
-		break;
-	      case TS_ID:
-		code[code_index] = ibf_load_id(load, (ID)op);
-		break;
-	      case TS_GENTRY:
-		code[code_index] = ibf_load_gentry(load, (const struct rb_global_entry *)op);
-		break;
-	      case TS_FUNCPTR:
-		rb_raise(rb_eRuntimeError, "TS_FUNCPTR is not supported");
-		break;
-	      default:
-		/* code[code_index] = op; */
-		break;
-	    }
-	}
-	assert(insn_len(insn) == op_index+1);
-    };
-
-
-    return code;
-}
-
-static VALUE *
-ibf_dump_param_opt_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    int opt_num = iseq->body->param.opt_num;
-
-    if (opt_num > 0) {
-	return IBF_W(iseq->body->param.opt_table, VALUE, opt_num + 1);
-    }
-    else {
-	return NULL;
-    }
-}
-
-static VALUE *
-ibf_load_param_opt_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    int opt_num = body->param.opt_num;
-
-    if (opt_num > 0) {
-	ibf_offset_t offset = IBF_OFFSET(body->param.opt_table);
-	VALUE *table = ALLOC_N(VALUE, opt_num+1);
-	MEMCPY(table, load->buff + offset, VALUE, opt_num+1);
-	return table;
-    }
-    else {
-	return NULL;
-    }
-}
-
-static struct rb_iseq_param_keyword *
-ibf_dump_param_keyword(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    const struct rb_iseq_param_keyword *kw = iseq->body->param.keyword;
-
-    if (kw) {
-	struct rb_iseq_param_keyword dump_kw = *kw;
-	int dv_num = kw->num - kw->required_num;
-	ID *ids = kw->num > 0 ? ALLOCA_N(ID, kw->num) : NULL;
-	VALUE *dvs = dv_num > 0 ? ALLOCA_N(VALUE, dv_num) : NULL;
-	int i;
-
-	for (i=0; i<kw->num; i++) ids[i] = (ID)ibf_dump_id(dump, kw->table[i]);
-	for (i=0; i<dv_num; i++) dvs[i] = (VALUE)ibf_dump_object(dump, kw->default_values[i]);
-
-	dump_kw.table = IBF_W(ids, ID, kw->num);
-	dump_kw.default_values = IBF_W(dvs, VALUE, dv_num);
-	return IBF_W(&dump_kw, struct rb_iseq_param_keyword, 1);
-    }
-    else {
-	return NULL;
-    }
-}
-
-static const struct rb_iseq_param_keyword *
-ibf_load_param_keyword(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    if (body->param.keyword) {
-	struct rb_iseq_param_keyword *kw = IBF_R(body->param.keyword, struct rb_iseq_param_keyword, 1);
-	ID *ids = IBF_R(kw->table, ID, kw->num);
-	int dv_num = kw->num - kw->required_num;
-	VALUE *dvs = IBF_R(kw->default_values, VALUE, dv_num);
+    if (th->base_block && th->base_block->iseq) {
 	int i;
+	iseq = th->base_block->iseq->local_iseq;
 
-	for (i=0; i<kw->num; i++) {
-	    ids[i] = ibf_load_id(load, ids[i]);
-	}
-	for (i=0; i<dv_num; i++) {
-	    dvs[i] = ibf_load_object(load, dvs[i]);
-	}
-
-	kw->table = ids;
-	kw->default_values = dvs;
-	return kw;
-    }
-    else {
-	return NULL;
-    }
-}
-
-static struct iseq_line_info_entry *
-ibf_dump_line_info_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    return IBF_W(iseq->body->line_info_table, struct iseq_line_info_entry, iseq->body->line_info_size);
-}
-
-static struct iseq_line_info_entry *
-ibf_load_line_info_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    return IBF_R(body->line_info_table, struct iseq_line_info_entry, body->line_info_size);
-}
-
-static ID *
-ibf_dump_local_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    const int size = iseq->body->local_table_size;
-    ID *table = ALLOCA_N(ID, size);
-    int i;
-
-    for (i=0; i<size; i++) {
-	table[i] = ibf_dump_id(dump, iseq->body->local_table[i]);
-    }
-
-    return IBF_W(table, ID, size);
-}
-
-static ID *
-ibf_load_local_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    const int size = body->local_table_size;
-
-    if (size > 0) {
-	ID *table = IBF_R(body->local_table, ID, size);
-	int i;
-
-	for (i=0; i<size; i++) {
-	    table[i] = ibf_load_id(load, table[i]);
-	}
-	return table;
-    }
-    else {
-	return NULL;
-    }
-}
-
-static struct iseq_catch_table *
-ibf_dump_catch_table(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    const struct iseq_catch_table *table = iseq->body->catch_table;
-
-    if (table) {
-	int byte_size = iseq_catch_table_bytes(iseq->body->catch_table->size);
-	struct iseq_catch_table *dump_table = (struct iseq_catch_table *)ALLOCA_N(char, byte_size);
-	unsigned int i;
-	dump_table->size = table->size;
-	for (i=0; i<table->size; i++) {
-	    dump_table->entries[i] = table->entries[i];
-	    dump_table->entries[i].iseq = ibf_dump_iseq(dump, table->entries[i].iseq);
-	}
-	return (struct iseq_catch_table *)(VALUE)ibf_dump_write(dump, dump_table, byte_size);
-    }
-    else {
-	return NULL;
-    }
-}
-
-static struct iseq_catch_table *
-ibf_load_catch_table(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    if (body->catch_table) {
-	struct iseq_catch_table *table;
-	unsigned int i;
-	unsigned int size;
-	size = *(unsigned int *)(load->buff + IBF_OFFSET(body->catch_table));
-	table = ibf_load_alloc(load, IBF_OFFSET(body->catch_table), iseq_catch_table_bytes(size));
-	for (i=0; i<size; i++) {
-	    table->entries[i].iseq = ibf_load_iseq(load, table->entries[i].iseq);
-	}
-	return table;
-    }
-    else {
-	return NULL;
-    }
-}
-
-static struct rb_call_info *
-ibf_dump_ci_entries(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    const unsigned int ci_size = iseq->body->ci_size;
-    const unsigned int ci_kw_size = iseq->body->ci_kw_size;
-    const struct rb_call_info *ci_entries = iseq->body->ci_entries;
-    struct rb_call_info *dump_ci_entries;
-    struct rb_call_info_with_kwarg *dump_ci_kw_entries;
-    int byte_size = ci_size * sizeof(struct rb_call_info) +
-                    ci_kw_size * sizeof(struct rb_call_info_with_kwarg);
-    unsigned int i;
-
-    dump_ci_entries = (struct rb_call_info *)ALLOCA_N(char, byte_size);
-    dump_ci_kw_entries = (struct rb_call_info_with_kwarg *)&dump_ci_entries[ci_size];
-    memcpy(dump_ci_entries, ci_entries, byte_size);
-
-    for (i=0; i<ci_size; i++) { /* conver ID for each ci */
-	dump_ci_entries[i].mid = ibf_dump_id(dump, dump_ci_entries[i].mid);
-    }
-    for (i=0; i<ci_kw_size; i++) {
-	const struct rb_call_info_kw_arg *kw_arg = dump_ci_kw_entries[i].kw_arg;
-	int j;
-	VALUE *keywords = ALLOCA_N(VALUE, kw_arg->keyword_len);
-	for (j=0; j<kw_arg->keyword_len; j++) {
-	    keywords[j] = (VALUE)ibf_dump_object(dump, kw_arg->keywords[j]); /* kw_arg->keywords[n] is Symbol */
-	}
-	dump_ci_kw_entries[i].kw_arg = (struct rb_call_info_kw_arg *)(VALUE)ibf_dump_write(dump, &kw_arg->keyword_len, sizeof(int));
-	ibf_dump_write(dump, keywords, sizeof(VALUE) * kw_arg->keyword_len);
-
-	dump_ci_kw_entries[i].ci.mid = ibf_dump_id(dump, dump_ci_kw_entries[i].ci.mid);
-    }
-    return (struct rb_call_info *)(VALUE)ibf_dump_write(dump, dump_ci_entries, byte_size);
-}
-
-static struct rb_call_info *
-ibf_load_ci_entries(const struct ibf_load *load, const struct rb_iseq_constant_body *body)
-{
-    unsigned int i;
-    const unsigned int ci_size = body->ci_size;
-    const unsigned int ci_kw_size = body->ci_kw_size;
-    struct rb_call_info *ci_entries = ibf_load_alloc(load, IBF_OFFSET(body->ci_entries),
-						     sizeof(struct rb_call_info) * body->ci_size +
-						     sizeof(struct rb_call_info_with_kwarg) * body->ci_kw_size);
-    struct rb_call_info_with_kwarg *ci_kw_entries = (struct rb_call_info_with_kwarg *)&ci_entries[ci_size];
-
-    for (i=0; i<ci_size; i++) {
-	ci_entries[i].mid = ibf_load_id(load, ci_entries[i].mid);
-    }
-    for (i=0; i<ci_kw_size; i++) {
-	int j;
-	ibf_offset_t kw_arg_offset = IBF_OFFSET(ci_kw_entries[i].kw_arg);
-	const int keyword_len = *(int *)(load->buff + kw_arg_offset);
-	const VALUE *keywords = (VALUE *)(load->buff + kw_arg_offset + sizeof(int));
-	struct rb_call_info_kw_arg *kw_arg = ruby_xmalloc(sizeof(struct rb_call_info_kw_arg) + sizeof(VALUE) * (keyword_len - 1));
-	kw_arg->keyword_len = keyword_len;
-	for (j=0; j<kw_arg->keyword_len; j++) {
-	    kw_arg->keywords[j] = (VALUE)ibf_load_object(load, keywords[j]);
-	}
-	ci_kw_entries[i].kw_arg = kw_arg;
-	ci_kw_entries[i].ci.mid = ibf_load_id(load, ci_kw_entries[i].ci.mid);
-    }
-
-    return ci_entries;
-}
-
-static ibf_offset_t
-ibf_dump_iseq_each(struct ibf_dump *dump, const rb_iseq_t *iseq)
-{
-    struct rb_iseq_constant_body dump_body;
-    dump_body = *iseq->body;
-
-    dump_body.location.path = ibf_dump_object(dump, dump_body.location.path);
-    dump_body.location.absolute_path = ibf_dump_object(dump, dump_body.location.absolute_path);
-    dump_body.location.base_label = ibf_dump_object(dump, dump_body.location.base_label);
-    dump_body.location.label = ibf_dump_object(dump, dump_body.location.label);
-
-    dump_body.iseq_encoded =    ibf_dump_code(dump, iseq);
-    dump_body.param.opt_table = ibf_dump_param_opt_table(dump, iseq);
-    dump_body.param.keyword =   ibf_dump_param_keyword(dump, iseq);
-    dump_body.line_info_table = ibf_dump_line_info_table(dump, iseq);
-    dump_body.local_table =     ibf_dump_local_table(dump, iseq);
-    dump_body.catch_table =     ibf_dump_catch_table(dump, iseq);
-    dump_body.parent_iseq =     ibf_dump_iseq(dump, iseq->body->parent_iseq);
-    dump_body.local_iseq =      ibf_dump_iseq(dump, iseq->body->local_iseq);
-    dump_body.is_entries =      NULL;
-    dump_body.ci_entries =      ibf_dump_ci_entries(dump, iseq);
-    dump_body.cc_entries =      NULL;
-    dump_body.mark_ary =        ISEQ_FLIP_CNT(iseq);
-
-    return ibf_dump_write(dump, &dump_body, sizeof(dump_body));
-}
-
-static VALUE
-ibf_load_location_str(const struct ibf_load *load, VALUE str_index)
-{
-    VALUE str = ibf_load_object(load, str_index);
-    if (str != Qnil) {
-	str = rb_fstring(str);
-    }
-    return str;
-}
-
-static void
-ibf_load_iseq_each(const struct ibf_load *load, rb_iseq_t *iseq, ibf_offset_t offset)
-{
-    struct rb_iseq_constant_body *load_body = iseq->body = ZALLOC(struct rb_iseq_constant_body);
-    const struct rb_iseq_constant_body *body = (struct rb_iseq_constant_body *)(load->buff + offset);
-
-    /* memcpy(load_body, load->buff + offset, sizeof(*load_body)); */
-    load_body->type = body->type;
-    load_body->stack_max = body->stack_max;
-    load_body->iseq_size = body->iseq_size;
-    load_body->param = body->param;
-    load_body->local_table_size = body->local_table_size;
-    load_body->is_size = body->is_size;
-    load_body->ci_size = body->ci_size;
-    load_body->ci_kw_size = body->ci_kw_size;
-    load_body->line_info_size = body->line_info_size;
-
-    RB_OBJ_WRITE(iseq, &load_body->mark_ary, iseq_mark_ary_create((int)body->mark_ary));
-
-    RB_OBJ_WRITE(iseq, &load_body->location.path,          ibf_load_location_str(load, body->location.path));
-    RB_OBJ_WRITE(iseq, &load_body->location.absolute_path, ibf_load_location_str(load, body->location.absolute_path));
-    RB_OBJ_WRITE(iseq, &load_body->location.base_label,    ibf_load_location_str(load, body->location.base_label));
-    RB_OBJ_WRITE(iseq, &load_body->location.label,         ibf_load_location_str(load, body->location.label));
-    load_body->location.first_lineno = body->location.first_lineno;
-
-    load_body->is_entries      = ZALLOC_N(union iseq_inline_storage_entry, body->is_size);
-    load_body->ci_entries      = ibf_load_ci_entries(load, body);
-    load_body->cc_entries      = ZALLOC_N(struct rb_call_cache, body->ci_size + body->ci_kw_size);
-    load_body->param.opt_table = ibf_load_param_opt_table(load, body);
-    load_body->param.keyword   = ibf_load_param_keyword(load, body);
-    load_body->line_info_table = ibf_load_line_info_table(load, body);
-    load_body->local_table     = ibf_load_local_table(load, body);
-    load_body->catch_table     = ibf_load_catch_table(load, body);
-    load_body->parent_iseq     = ibf_load_iseq(load, body->parent_iseq);
-    load_body->local_iseq      = ibf_load_iseq(load, body->local_iseq);
-
-    load_body->iseq_encoded    = ibf_load_code(load, iseq, body);
-
-    rb_iseq_translate_threaded_code(iseq);
-}
-
-
-static void
-ibf_dump_iseq_list(struct ibf_dump *dump, struct ibf_header *header)
-{
-    const long size = RARRAY_LEN(dump->iseq_list);
-    ibf_offset_t *list = ALLOCA_N(ibf_offset_t, size);
-    long i;
-
-    for (i=0; i<size; i++) {
-	list[i] = (ibf_offset_t)NUM2LONG(rb_ary_entry(dump->iseq_list, i));
-    }
-
-    header->iseq_list_offset = ibf_dump_write(dump, list, sizeof(ibf_offset_t) * size);
-    header->iseq_list_size = (unsigned int)size;
-}
-
-struct ibf_dump_id_list_i_arg {
-    struct ibf_dump *dump;
-    long *list;
-    int current_i;
-};
-
-static int
-ibf_dump_id_list_i(st_data_t key, st_data_t val, st_data_t ptr)
-{
-    struct ibf_dump_id_list_i_arg *arg = (struct ibf_dump_id_list_i_arg *)ptr;
-    int i = (int)val;
-    ID id = (ID)key;
-    assert(arg->current_i == i);
-    arg->current_i++;
-
-    if (rb_id2name(id)) {
-	arg->list[i] = (long)ibf_dump_object(arg->dump, rb_id2str(id));
-    }
-    else {
-	arg->list[i] = 0;
-    }
-
-    return ST_CONTINUE;
-}
-
-static void
-ibf_dump_id_list(struct ibf_dump *dump, struct ibf_header *header)
-{
-    const long size = dump->id_table->num_entries;
-    struct ibf_dump_id_list_i_arg arg;
-    arg.list = ALLOCA_N(long, size);
-    arg.dump = dump;
-    arg.current_i = 0;
-
-    st_foreach(dump->id_table, ibf_dump_id_list_i, (st_data_t)&arg);
-
-    header->id_list_offset = ibf_dump_write(dump, arg.list, sizeof(long) * size);
-    header->id_list_size = (unsigned int)size;
-}
-
-#define IBF_OBJECT_INTERNAL FL_PROMOTED0
-
-/*
- * Binary format
- * - ibf_object_header
- * - ibf_object_xxx (xxx is type)
- */
-
-struct ibf_object_header {
-    unsigned int type: 5;
-    unsigned int special_const: 1;
-    unsigned int frozen: 1;
-    unsigned int internal: 1;
-};
-
-enum ibf_object_class_index {
-    IBF_OBJECT_CLASS_OBJECT,
-    IBF_OBJECT_CLASS_ARRAY,
-    IBF_OBJECT_CLASS_STANDARD_ERROR
-};
-
-struct ibf_object_string {
-    long encindex;
-    long len;
-    char ptr[1];
-};
-
-struct ibf_object_regexp {
-    long srcstr;
-    char option;
-};
-
-struct ibf_object_array {
-    long len;
-    long ary[1];
-};
-
-struct ibf_object_hash {
-    long len;
-    long keyval[1];
-};
-
-struct ibf_object_struct_range {
-    long class_index;
-    long len;
-    long beg;
-    long end;
-    int excl;
-};
-
-struct ibf_object_bignum {
-    ssize_t slen;
-    BDIGIT digits[1];
-};
-
-enum ibf_object_data_type {
-    IBF_OBJECT_DATA_ENCODING
-};
-
-struct ibf_object_complex_rational {
-    long a, b;
-};
-
-struct ibf_object_symbol {
-    long str;
-};
-
-#define IBF_OBJHEADER(offset)     (struct ibf_object_header *)(load->buff + (offset))
-#define IBF_OBJBODY(type, offset) (type *)(load->buff + sizeof(struct ibf_object_header) + (offset))
-
-static void
-ibf_dump_object_unsupported(struct ibf_dump *dump, VALUE obj)
-{
-    rb_obj_info_dump(obj);
-    rb_bug("ibf_dump_object_unsupported: unsupported");
-}
-
-static VALUE
-ibf_load_object_unsupported(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    rb_bug("unsupported");
-    return Qnil;
-}
-
-static void
-ibf_dump_object_class(struct ibf_dump *dump, VALUE obj)
-{
-    enum ibf_object_class_index cindex;
-    if (obj == rb_cObject) {
-	cindex = IBF_OBJECT_CLASS_OBJECT;
-    }
-    else if (obj == rb_cArray) {
-	cindex = IBF_OBJECT_CLASS_ARRAY;
-    }
-    else if (obj == rb_eStandardError) {
-	cindex = IBF_OBJECT_CLASS_STANDARD_ERROR;
-    }
-    else {
-	rb_obj_info_dump(obj);
-	rb_p(obj);
-	rb_bug("unsupported class");
-    }
-    ibf_dump_write(dump, &cindex, sizeof(cindex));
-}
-
-static VALUE
-ibf_load_object_class(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    enum ibf_object_class_index *cindexp = IBF_OBJBODY(enum ibf_object_class_index, offset);
-    enum ibf_object_class_index cindex = *cindexp;
-
-    switch (cindex) {
-      case IBF_OBJECT_CLASS_OBJECT:
-	return rb_cObject;
-      case IBF_OBJECT_CLASS_ARRAY:
-	return rb_cArray;
-      case IBF_OBJECT_CLASS_STANDARD_ERROR:
-	return rb_eStandardError;
-    }
-
-    rb_bug("ibf_load_object_class: unknown class (%d)", (int)cindex);
-}
-
-
-static void
-ibf_dump_object_float(struct ibf_dump *dump, VALUE obj)
-{
-    double dbl = RFLOAT_VALUE(obj);
-    ibf_dump_write(dump, &dbl, sizeof(dbl));
-}
-
-static VALUE
-ibf_load_object_float(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    double *dblp = IBF_OBJBODY(double, offset);
-    return DBL2NUM(*dblp);
-}
-
-static void
-ibf_dump_object_string(struct ibf_dump *dump, VALUE obj)
-{
-    long encindex = (long)rb_enc_get_index(obj);
-    long len = RSTRING_LEN(obj);
-    const char *ptr = RSTRING_PTR(obj);
-
-    if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) {
-	rb_encoding *enc = rb_enc_from_index((int)encindex);
-	const char *enc_name = rb_enc_name(enc);
-	encindex = RUBY_ENCINDEX_BUILTIN_MAX + ibf_dump_object(dump, rb_str_new2(enc_name));
-    }
-
-    IBF_WV(encindex);
-    IBF_WV(len);
-    IBF_WP(ptr, char, len);
-}
-
-static VALUE
-ibf_load_object_string(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_string *string = IBF_OBJBODY(struct ibf_object_string, offset);
-    VALUE str = rb_str_new(string->ptr, string->len);
-    int encindex = (int)string->encindex;
-
-    if (encindex > RUBY_ENCINDEX_BUILTIN_MAX) {
-	VALUE enc_name_str = ibf_load_object(load, encindex - RUBY_ENCINDEX_BUILTIN_MAX);
-	encindex = rb_enc_find_index(RSTRING_PTR(enc_name_str));
-    }
-    rb_enc_associate_index(str, encindex);
-
-    if (header->internal) rb_obj_hide(str);
-    if (header->frozen)   str = rb_fstring(str);
-
-    return str;
-}
-
-static void
-ibf_dump_object_regexp(struct ibf_dump *dump, VALUE obj)
-{
-    struct ibf_object_regexp regexp;
-    regexp.srcstr = RREGEXP_SRC(obj);
-    regexp.option = (char)rb_reg_options(obj);
-    regexp.srcstr = (long)ibf_dump_object(dump, regexp.srcstr);
-    IBF_WV(regexp);
-}
-
-static VALUE
-ibf_load_object_regexp(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_regexp *regexp = IBF_OBJBODY(struct ibf_object_regexp, offset);
-    VALUE srcstr = ibf_load_object(load, regexp->srcstr);
-    VALUE reg = rb_reg_compile(srcstr, (int)regexp->option, NULL, 0);
-
-    if (header->internal) rb_obj_hide(reg);
-    if (header->frozen)   rb_obj_freeze(reg);
-
-    return reg;
-}
-
-static void
-ibf_dump_object_array(struct ibf_dump *dump, VALUE obj)
-{
-    long i, len = (int)RARRAY_LEN(obj);
-    IBF_WV(len);
-    for (i=0; i<len; i++) {
-	long index = (long)ibf_dump_object(dump, RARRAY_AREF(obj, i));
-	IBF_WV(index);
-    }
-}
-
-static VALUE
-ibf_load_object_array(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_array *array = IBF_OBJBODY(struct ibf_object_array, offset);
-    VALUE ary = rb_ary_new_capa(array->len);
-    int i;
-
-    for (i=0; i<array->len; i++) {
-	rb_ary_push(ary, ibf_load_object(load, array->ary[i]));
-    }
-
-    if (header->internal) rb_obj_hide(ary);
-    if (header->frozen)   rb_obj_freeze(ary);
-
-    return ary;
-}
-
-static int
-ibf_dump_object_hash_i(st_data_t key, st_data_t val, st_data_t ptr)
-{
-    struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    long key_index = (long)ibf_dump_object(dump, (VALUE)key);
-    long val_index = (long)ibf_dump_object(dump, (VALUE)val);
-    IBF_WV(key_index);
-    IBF_WV(val_index);
-    return ST_CONTINUE;
-}
-
-static void
-ibf_dump_object_hash(struct ibf_dump *dump, VALUE obj)
-{
-    long len = RHASH_SIZE(obj);
-    IBF_WV(len);
-    if (len > 0) st_foreach(RHASH(obj)->ntbl, ibf_dump_object_hash_i, (st_data_t)dump);
-}
-
-static VALUE
-ibf_load_object_hash(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_hash *hash = IBF_OBJBODY(struct ibf_object_hash, offset);
-    VALUE obj = rb_hash_new();
-    int i;
-
-    for (i=0; i<hash->len; i++) {
-	VALUE key = ibf_load_object(load, hash->keyval[i*2  ]);
-	VALUE val = ibf_load_object(load, hash->keyval[i*2+1]);
-	rb_hash_aset(obj, key, val);
-    }
-    rb_hash_rehash(obj);
-
-    if (header->internal) rb_obj_hide(obj);
-    if (header->frozen)   rb_obj_freeze(obj);
-
-    return obj;
-}
-
-static void
-ibf_dump_object_struct(struct ibf_dump *dump, VALUE obj)
-{
-    if (rb_obj_is_kind_of(obj, rb_cRange)) {
-	struct ibf_object_struct_range range;
-	VALUE beg, end;
-	range.len = 3;
-	range.class_index = 0;
-
-	rb_range_values(obj, &beg, &end, &range.excl);
-	range.beg = (long)ibf_dump_object(dump, beg);
-	range.end = (long)ibf_dump_object(dump, end);
-
-	IBF_WV(range);
-    }
-    else {
-	rb_bug("ibf_dump_object_struct: unsupported class");
-    }
-}
-
-static VALUE
-ibf_load_object_struct(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_struct_range *range = IBF_OBJBODY(struct ibf_object_struct_range, offset);
-    VALUE beg = ibf_load_object(load, range->beg);
-    VALUE end = ibf_load_object(load, range->end);
-    VALUE obj = rb_range_new(beg, end, range->excl);
-    if (header->internal) rb_obj_hide(obj);
-    if (header->frozen)   rb_obj_freeze(obj);
-    return obj;
-}
-
-static void
-ibf_dump_object_bignum(struct ibf_dump *dump, VALUE obj)
-{
-    ssize_t len = BIGNUM_LEN(obj);
-    ssize_t slen = BIGNUM_SIGN(obj) > 0 ? len : len * -1;
-    BDIGIT *d = BIGNUM_DIGITS(obj);
-
-    IBF_WV(slen);
-    IBF_WP(d, BDIGIT, len);
-}
-
-static VALUE
-ibf_load_object_bignum(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_bignum *bignum = IBF_OBJBODY(struct ibf_object_bignum, offset);
-    int sign = bignum->slen > 0;
-    ssize_t len = sign > 0 ? bignum->slen : -1 * bignum->slen;
-    VALUE obj = rb_integer_unpack(bignum->digits, len * 2, 2, 0,
-				  INTEGER_PACK_LITTLE_ENDIAN | (sign == 0 ? INTEGER_PACK_NEGATIVE : 0));
-    if (header->internal) rb_obj_hide(obj);
-    if (header->frozen)   rb_obj_freeze(obj);
-    return obj;
-}
-
-static void
-ibf_dump_object_data(struct ibf_dump *dump, VALUE obj)
-{
-    if (rb_data_is_encoding(obj)) {
-	rb_encoding *enc = rb_to_encoding(obj);
-	const char *name = rb_enc_name(enc);
-	enum ibf_object_data_type type = IBF_OBJECT_DATA_ENCODING;
-	long len = strlen(name) + 1;
-	IBF_WV(type);
-	IBF_WV(len);
-	IBF_WP(name, char, strlen(name) + 1);
-    }
-    else {
-	ibf_dump_object_unsupported(dump, obj);
-    }
-}
-
-static VALUE
-ibf_load_object_data(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const enum ibf_object_data_type *typep = IBF_OBJBODY(enum ibf_object_data_type, offset);
-    /* const long *lenp = IBF_OBJBODY(long, offset + sizeof(enum ibf_object_data_type)); */
-    const char *data = IBF_OBJBODY(char, offset + sizeof(enum ibf_object_data_type) + sizeof(long));
-
-    switch (*typep) {
-      case IBF_OBJECT_DATA_ENCODING:
-	{
-	    VALUE encobj = rb_enc_from_encoding(rb_enc_find(data));
-	    return encobj;
-	}
-    }
-
-    return ibf_load_object_unsupported(load, header, offset);
-}
-
-static void
-ibf_dump_object_complex_rational(struct ibf_dump *dump, VALUE obj)
-{
-    long real = (long)ibf_dump_object(dump, RCOMPLEX(obj)->real);
-    long imag = (long)ibf_dump_object(dump, RCOMPLEX(obj)->imag);
-
-    IBF_WV(real);
-    IBF_WV(imag);
-}
-
-static VALUE
-ibf_load_object_complex_rational(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    const struct ibf_object_complex_rational *nums = IBF_OBJBODY(struct ibf_object_complex_rational, offset);
-    VALUE a = ibf_load_object(load, nums->a);
-    VALUE b = ibf_load_object(load, nums->b);
-    VALUE obj = header->type == T_COMPLEX ?
-      rb_complex_new(a, b) : rb_rational_new(a, b);
-
-    if (header->internal) rb_obj_hide(obj);
-    if (header->frozen)   rb_obj_freeze(obj);
-    return obj;
-}
-
-static void
-ibf_dump_object_symbol(struct ibf_dump *dump, VALUE obj)
-{
-    VALUE str = rb_sym2str(obj);
-    long str_index = (long)ibf_dump_object(dump, str);
-    IBF_WV(str_index);
-}
-
-static VALUE
-ibf_load_object_symbol(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t offset)
-{
-    /* const struct ibf_object_header *header = IBF_OBJHEADER(offset); */
-    const struct ibf_object_symbol *symbol = IBF_OBJBODY(struct ibf_object_symbol, offset);
-    VALUE str = ibf_load_object(load, symbol->str);
-    ID id = rb_intern_str(str);
-    return ID2SYM(id);
-}
-
-typedef void (*ibf_dump_object_function)(struct ibf_dump *dump, VALUE obj);
-static ibf_dump_object_function dump_object_functions[RUBY_T_MASK+1] = {
-    ibf_dump_object_unsupported, /* T_NONE */
-    ibf_dump_object_unsupported, /* T_OBJECT */
-    ibf_dump_object_class,       /* T_CLASS */
-    ibf_dump_object_unsupported, /* T_MODULE */
-    ibf_dump_object_float,       /* T_FLOAT */
-    ibf_dump_object_string,      /* T_STRING */
-    ibf_dump_object_regexp,      /* T_REGEXP */
-    ibf_dump_object_array,       /* T_ARRAY */
-    ibf_dump_object_hash,        /* T_HASH */
-    ibf_dump_object_struct,      /* T_STRUCT */
-    ibf_dump_object_bignum,      /* T_BIGNUM */
-    ibf_dump_object_unsupported, /* T_FILE */
-    ibf_dump_object_data,        /* T_DATA */
-    ibf_dump_object_unsupported, /* T_MATCH */
-    ibf_dump_object_complex_rational, /* T_COMPLEX */
-    ibf_dump_object_complex_rational, /* T_RATIONAL */
-    ibf_dump_object_unsupported, /* 0x10 */
-    ibf_dump_object_unsupported, /* 0x11 T_NIL */
-    ibf_dump_object_unsupported, /* 0x12 T_TRUE */
-    ibf_dump_object_unsupported, /* 0x13 T_FALSE */
-    ibf_dump_object_symbol,      /* 0x14 T_SYMBOL */
-    ibf_dump_object_unsupported, /* T_FIXNUM */
-    ibf_dump_object_unsupported, /* T_UNDEF */
-    ibf_dump_object_unsupported, /* 0x17 */
-    ibf_dump_object_unsupported, /* 0x18 */
-    ibf_dump_object_unsupported, /* 0x19 */
-    ibf_dump_object_unsupported, /* T_IMEMO 0x1a */
-    ibf_dump_object_unsupported, /* T_NODE 0x1b */
-    ibf_dump_object_unsupported, /* T_ICLASS 0x1c */
-    ibf_dump_object_unsupported, /* T_ZOMBIE 0x1d */
-    ibf_dump_object_unsupported, /* 0x1e */
-    ibf_dump_object_unsupported  /* 0x1f */
-};
-
-static ibf_offset_t
-lbf_dump_object_object(struct ibf_dump *dump, VALUE obj)
-{
-    struct ibf_object_header obj_header;
-    ibf_offset_t current_offset = ibf_dump_pos(dump);
-    obj_header.type = TYPE(obj);
-
-    if (SPECIAL_CONST_P(obj)) {
-	if (RB_TYPE_P(obj, T_SYMBOL) ||
-	    RB_TYPE_P(obj, T_FLOAT)) {
-	    obj_header.internal = FALSE;
-	    goto dump_object;
-	}
-	obj_header.special_const = TRUE;
-	obj_header.frozen = TRUE;
-	obj_header.internal = TRUE;
-	IBF_WV(obj_header);
-	IBF_WV(obj);
-    }
-    else {
-	obj_header.internal = (RBASIC_CLASS(obj) == 0) ? TRUE : FALSE;
-      dump_object:
-	obj_header.special_const = FALSE;
-	obj_header.frozen = FL_TEST(obj, FL_FREEZE) ? TRUE : FALSE;
-	IBF_WV(obj_header);
-	(*dump_object_functions[obj_header.type])(dump, obj);
-    }
-
-    return current_offset;
-}
-
-typedef VALUE (*ibf_load_object_function)(const struct ibf_load *load, const struct ibf_object_header *header, ibf_offset_t);
-static ibf_load_object_function load_object_functions[RUBY_T_MASK+1] = {
-    ibf_load_object_unsupported, /* T_NONE */
-    ibf_load_object_unsupported, /* T_OBJECT */
-    ibf_load_object_class,       /* T_CLASS */
-    ibf_load_object_unsupported, /* T_MODULE */
-    ibf_load_object_float,       /* T_FLOAT */
-    ibf_load_object_string,      /* T_STRING */
-    ibf_load_object_regexp,      /* T_REGEXP */
-    ibf_load_object_array,       /* T_ARRAY */
-    ibf_load_object_hash,        /* T_HASH */
-    ibf_load_object_struct,      /* T_STRUCT */
-    ibf_load_object_bignum,      /* T_BIGNUM */
-    ibf_load_object_unsupported, /* T_FILE */
-    ibf_load_object_data,        /* T_DATA */
-    ibf_load_object_unsupported, /* T_MATCH */
-    ibf_load_object_complex_rational, /* T_COMPLEX */
-    ibf_load_object_complex_rational, /* T_RATIONAL */
-    ibf_load_object_unsupported, /* 0x10 */
-    ibf_load_object_unsupported, /* T_NIL */
-    ibf_load_object_unsupported, /* T_TRUE */
-    ibf_load_object_unsupported, /* T_FALSE */
-    ibf_load_object_symbol,
-    ibf_load_object_unsupported, /* T_FIXNUM */
-    ibf_load_object_unsupported, /* T_UNDEF */
-    ibf_load_object_unsupported, /* 0x17 */
-    ibf_load_object_unsupported, /* 0x18 */
-    ibf_load_object_unsupported, /* 0x19 */
-    ibf_load_object_unsupported, /* T_IMEMO 0x1a */
-    ibf_load_object_unsupported, /* T_NODE 0x1b */
-    ibf_load_object_unsupported, /* T_ICLASS 0x1c */
-    ibf_load_object_unsupported, /* T_ZOMBIE 0x1d */
-    ibf_load_object_unsupported, /* 0x1e */
-    ibf_load_object_unsupported  /* 0x1f */
-};
-
-static VALUE
-ibf_load_object(const struct ibf_load *load, VALUE object_index)
-{
-    if (object_index == 0) {
-	return Qnil;
-    }
-    else if (object_index >= load->header->object_list_size) {
-	rb_raise(rb_eIndexError, "object index out of range: %"PRIdVALUE, object_index);
-    }
-    else {
-	VALUE obj = rb_ary_entry(load->obj_list, (long)object_index);
-	if (obj == Qnil) { /* TODO: avoid multiple Qnil load */
-	    ibf_offset_t *offsets = (ibf_offset_t *)(load->header->object_list_offset + load->buff);
-	    ibf_offset_t offset = offsets[object_index];
-	    const struct ibf_object_header *header = IBF_OBJHEADER(offset);
-
-	    if (header->special_const) {
-		VALUE *vp = IBF_OBJBODY(VALUE, offset);
-		obj = *vp;
-	    }
-	    else {
-		obj = (*load_object_functions[header->type])(load, header, offset);
-	    }
-
-	    rb_ary_store(load->obj_list, (long)object_index, obj);
-	}
-	iseq_add_mark_object(load->iseq, obj);
-	return obj;
-    }
-}
-
-static void
-ibf_dump_object_list(struct ibf_dump *dump, struct ibf_header *header)
-{
-    VALUE list = rb_ary_tmp_new(RARRAY_LEN(dump->obj_list));
-    int i, size;
-
-    for (i=0; i<RARRAY_LEN(dump->obj_list); i++) {
-	VALUE obj = RARRAY_AREF(dump->obj_list, i);
-	ibf_offset_t offset = lbf_dump_object_object(dump, obj);
-	rb_ary_push(list, UINT2NUM(offset));
-    }
-    size = i;
-    header->object_list_offset = ibf_dump_pos(dump);
-
-    for (i=0; i<size; i++) {
-	ibf_offset_t offset = NUM2UINT(RARRAY_AREF(list, i));
-	IBF_WV(offset);
-    }
-
-    header->object_list_size = size;
-}
-
-static void
-ibf_dump_mark(void *ptr)
-{
-    struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    rb_gc_mark(dump->str);
-    rb_gc_mark(dump->iseq_list);
-    rb_gc_mark(dump->obj_list);
-}
-
-static void
-ibf_dump_free(void *ptr)
-{
-    struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    if (dump->iseq_table) {
-	st_free_table(dump->iseq_table);
-	dump->iseq_table = 0;
-    }
-    if (dump->id_table) {
-	st_free_table(dump->id_table);
-	dump->id_table = 0;
-    }
-    ruby_xfree(dump);
-}
-
-static size_t
-ibf_dump_memsize(const void *ptr)
-{
-    struct ibf_dump *dump = (struct ibf_dump *)ptr;
-    size_t size = sizeof(*dump);
-    if (dump->iseq_table) size += st_memsize(dump->iseq_table);
-    if (dump->id_table) size += st_memsize(dump->id_table);
-    return size;
-}
-
-static const rb_data_type_t ibf_dump_type = {
-    "ibf_dump",
-    {ibf_dump_mark, ibf_dump_free, ibf_dump_memsize,},
-    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-static void
-ibf_dump_setup(struct ibf_dump *dump, VALUE dumper_obj)
-{
-    RB_OBJ_WRITE(dumper_obj, &dump->str, rb_str_new(0, 0));
-    RB_OBJ_WRITE(dumper_obj, &dump->iseq_list, rb_ary_tmp_new(0));
-    RB_OBJ_WRITE(dumper_obj, &dump->obj_list, rb_ary_tmp_new(1));
-    rb_ary_push(dump->obj_list, Qnil); /* 0th is nil */
-    dump->iseq_table = st_init_numtable(); /* need free */
-    dump->id_table = st_init_numtable();   /* need free */
-
-    ibf_table_index(dump->id_table, 0); /* id_index:0 is 0 */
-}
-
-VALUE
-iseq_ibf_dump(const rb_iseq_t *iseq, VALUE opt)
-{
-    struct ibf_dump *dump;
-    struct ibf_header header = {{0}};
-    VALUE dump_obj;
-    VALUE str;
-
-    if (iseq->body->parent_iseq != NULL ||
-	iseq->body->local_iseq != iseq) {
-	rb_raise(rb_eRuntimeError, "should be top of iseq");
-    }
-    if (RTEST(ISEQ_COVERAGE(iseq))) {
-	rb_raise(rb_eRuntimeError, "should not compile with coverage");
-    }
-
-    dump_obj = TypedData_Make_Struct(0, struct ibf_dump, &ibf_dump_type, dump);
-    ibf_dump_setup(dump, dump_obj);
-
-    ibf_dump_write(dump, &header, sizeof(header));
-    ibf_dump_write(dump, RUBY_PLATFORM, strlen(RUBY_PLATFORM) + 1);
-    ibf_dump_iseq(dump, iseq);
-
-    header.magic[0] = 'Y'; /* YARB */
-    header.magic[1] = 'A';
-    header.magic[2] = 'R';
-    header.magic[3] = 'B';
-    header.major_version = ISEQ_MAJOR_VERSION;
-    header.minor_version = ISEQ_MINOR_VERSION;
-    ibf_dump_iseq_list(dump, &header);
-    ibf_dump_id_list(dump, &header);
-    ibf_dump_object_list(dump, &header);
-    header.size = ibf_dump_pos(dump);
-
-    if (RTEST(opt)) {
-	VALUE opt_str = opt;
-	const char *ptr = StringValuePtr(opt_str);
-	header.extra_size = RSTRING_LENINT(opt_str);
-	ibf_dump_write(dump, ptr, header.extra_size);
-    }
-    else {
-	header.extra_size = 0;
-    }
-
-    ibf_dump_overwrite(dump, &header, sizeof(header), 0);
-
-    str = dump->str;
-    ibf_dump_free(dump);
-    DATA_PTR(dump_obj) = NULL;
-    RB_GC_GUARD(dump_obj);
-    return str;
-}
-
-static const ibf_offset_t *
-ibf_iseq_list(const struct ibf_load *load)
-{
-    return (ibf_offset_t *)(load->buff + load->header->iseq_list_offset);
-}
-
-void
-ibf_load_iseq_complete(rb_iseq_t *iseq)
-{
-    struct ibf_load *load = RTYPEDDATA_DATA(iseq->aux.loader.obj);
-    rb_iseq_t *prev_src_iseq = load->iseq;
-    load->iseq = iseq;
-    ibf_load_iseq_each(load, iseq, ibf_iseq_list(load)[iseq->aux.loader.index]);
-    ISEQ_COMPILE_DATA(iseq) = NULL;
-    FL_UNSET(iseq, ISEQ_NOT_LOADED_YET);
-    load->iseq = prev_src_iseq;
-}
-
-#if USE_LAZY_LOAD
-const rb_iseq_t *
-rb_iseq_complete(const rb_iseq_t *iseq)
-{
-    ibf_load_iseq_complete((rb_iseq_t *)iseq);
-    return iseq;
-}
-#endif
-
-static rb_iseq_t *
-ibf_load_iseq(const struct ibf_load *load, const rb_iseq_t *index_iseq)
-{
-    int iseq_index = (int)(VALUE)index_iseq;
-
-    if (iseq_index == -1) {
-	return NULL;
-    }
-    else {
-	VALUE iseqv = rb_ary_entry(load->iseq_list, iseq_index);
-
-	if (iseqv != Qnil) {
-	    return (rb_iseq_t *)iseqv;
-	}
-	else {
-	    rb_iseq_t *iseq = iseq_imemo_alloc();
-	    FL_SET(iseq, ISEQ_NOT_LOADED_YET);
-	    iseq->aux.loader.obj = load->loader_obj;
-	    iseq->aux.loader.index = iseq_index;
-	    rb_ary_store(load->iseq_list, iseq_index, (VALUE)iseq);
-
-#if !USE_LAZY_LOAD
-	    ibf_load_iseq_complete(iseq);
-#endif /* !USE_LAZY_LOAD */
-
-	    if (load->iseq) {
-		iseq_add_mark_object(load->iseq, (VALUE)iseq);
+	for (i=0; i<iseq->local_table_size; i++) {
+	    if (iseq->local_table[i] == id) {
+		return 1;
 	    }
-	    return iseq;
 	}
     }
+    return 0;
 }
 
-static void
-ibf_load_setup(struct ibf_load *load, VALUE loader_obj, VALUE str)
-{
-    rb_check_safe_obj(str);
-
-    if (RSTRING_LENINT(str) < (int)sizeof(struct ibf_header)) {
-	rb_raise(rb_eRuntimeError, "broken binary format");
-    }
-    RB_OBJ_WRITE(loader_obj, &load->str, str);
-    load->loader_obj = loader_obj;
-    load->buff = StringValuePtr(str);
-    load->header = (struct ibf_header *)load->buff;
-    RB_OBJ_WRITE(loader_obj, &load->iseq_list, rb_ary_tmp_new(0));
-    RB_OBJ_WRITE(loader_obj, &load->obj_list, rb_ary_tmp_new(0));
-    load->id_list = ZALLOC_N(ID, load->header->id_list_size);
-    load->iseq = NULL;
-
-    if (RSTRING_LENINT(str) < (int)load->header->size) {
-	rb_raise(rb_eRuntimeError, "broken binary format");
-    }
-    if (strncmp(load->header->magic, "YARB", 4) != 0) {
-	rb_raise(rb_eRuntimeError, "unknown binary format");
-    }
-    if (load->header->major_version != ISEQ_MAJOR_VERSION ||
-	load->header->minor_version != ISEQ_MINOR_VERSION) {
-	rb_raise(rb_eRuntimeError, "unmatched version file (%u.%u for %u.%u)",
-		 load->header->major_version, load->header->minor_version, ISEQ_MAJOR_VERSION, ISEQ_MINOR_VERSION);
-    }
-    if (strcmp(load->buff + sizeof(struct ibf_header), RUBY_PLATFORM) != 0) {
-	rb_raise(rb_eRuntimeError, "unmatched platform");
-    }
-}
-
-static void
-ibf_loader_mark(void *ptr)
-{
-    if (ptr) {
-	struct ibf_load *load = (struct ibf_load *)ptr;
-	rb_gc_mark(load->str);
-	rb_gc_mark(load->iseq_list);
-	rb_gc_mark(load->obj_list);
-    }
-}
-
-static void
-ibf_loader_free(void *ptr)
-{
-    if (ptr) {
-	struct ibf_load *load = (struct ibf_load *)ptr;
-	ruby_xfree(load->id_list);
-	ruby_xfree(load);
-    }
-}
-
-static size_t
-ibf_loader_memsize(const void *ptr)
-{
-    struct ibf_load *load = (struct ibf_load *)ptr;
-    return sizeof(struct ibf_load) + load->header->id_list_size * sizeof(ID);
-}
-
-static const rb_data_type_t ibf_load_type = {
-    "ibf_loader",
-    {ibf_loader_mark, ibf_loader_free, ibf_loader_memsize,},
-    0, 0, RUBY_TYPED_WB_PROTECTED | RUBY_TYPED_FREE_IMMEDIATELY
-};
-
-const rb_iseq_t *
-iseq_ibf_load(VALUE str)
+int
+rb_parse_in_eval(void)
 {
-    struct ibf_load *load;
-    const rb_iseq_t *iseq;
-    VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load);
-
-    ibf_load_setup(load, loader_obj, str);
-    iseq = ibf_load_iseq(load, 0);
-
-    RB_GC_GUARD(loader_obj);
-    return iseq;
+    return GET_THREAD()->parse_in_eval > 0;
 }
 
-VALUE
-iseq_ibf_load_extra_data(VALUE str)
+int
+rb_parse_in_main(void)
 {
-    struct ibf_load *load;
-    VALUE loader_obj = TypedData_Make_Struct(0, struct ibf_load, &ibf_load_type, load);
-    VALUE extra_str;
-
-    ibf_load_setup(load, loader_obj, str);
-    extra_str = rb_str_new(load->buff + load->header->size, load->header->extra_size);
-    RB_GC_GUARD(loader_obj);
-    return extra_str;
+    return GET_THREAD()->parse_in_eval < 0;
 }
diff --git a/complex.c b/complex.c
index 4737891270..b65bc8a61c 100644
--- a/complex.c
+++ b/complex.c
@@ -5,38 +5,24 @@
   which is written in ruby.
 */
 
-#include "ruby/config.h"
-#if defined _MSC_VER
-/* Microsoft Visual C does not define M_PI and others by default */
-# define _USE_MATH_DEFINES 1
-#endif
-#include <math.h>
+#include "ruby.h"
 #include "internal.h"
+#include <math.h>
 
 #define NDEBUG
-#include "ruby_assert.h"
+#include <assert.h>
 
 #define ZERO INT2FIX(0)
 #define ONE INT2FIX(1)
 #define TWO INT2FIX(2)
-#define RFLOAT_0 DBL2NUM(0)
-#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
-    !defined(signbit)
-extern int signbit(double);
-#endif
 
 VALUE rb_cComplex;
 
-static VALUE nucomp_abs(VALUE self);
-static VALUE nucomp_arg(VALUE self);
-
-static ID id_abs, id_arg,
-    id_denominator, id_expt, id_fdiv,
+static ID id_abs, id_arg, id_convert,
+    id_denominator, id_eqeq_p, id_expt, id_fdiv,
     id_negate, id_numerator, id_quo,
     id_real_p, id_to_f, id_to_i, id_to_r,
-    id_i_real, id_i_imag,
-    id_finite_p, id_infinite_p, id_rationalize,
-    id_PI;
+    id_i_real, id_i_imag;
 
 #define f_boolcast(x) ((x) ? Qtrue : Qfalse)
 
@@ -81,9 +67,9 @@ inline static VALUE
 f_add(VALUE x, VALUE y)
 {
 #ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y) && FIXNUM_ZERO_P(y))
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
 	return x;
-    else if (FIXNUM_P(x) && FIXNUM_ZERO_P(x))
+    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
 	return y;
 #endif
     return rb_funcall(x, '+', 1, y);
@@ -97,21 +83,12 @@ f_div(VALUE x, VALUE y)
     return rb_funcall(x, '/', 1, y);
 }
 
-inline static int
+inline static VALUE
 f_gt_p(VALUE x, VALUE y)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-        if (FIXNUM_P(x) && FIXNUM_P(y))
-            return (SIGNED_VALUE)x > (SIGNED_VALUE)y;
-        return RTEST(rb_int_gt(x, y));
-    }
-    else if (RB_FLOAT_TYPE_P(x))
-        return RTEST(rb_float_gt(x, y));
-    else if (RB_TYPE_P(x, T_RATIONAL)) {
-        int const cmp = rb_cmpint(rb_rational_cmp(x, y), x, y);
-        return cmp > 0;
-    }
-    return RTEST(rb_funcall(x, '>', 1, y));
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
+    return rb_funcall(x, '>', 1, y);
 }
 
 inline static VALUE
@@ -121,7 +98,7 @@ f_mul(VALUE x, VALUE y)
     if (FIXNUM_P(y)) {
 	long iy = FIX2LONG(y);
 	if (iy == 0) {
-	    if (RB_INTEGER_TYPE_P(x))
+	    if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM))
 		return ZERO;
 	}
 	else if (iy == 1)
@@ -130,7 +107,7 @@ f_mul(VALUE x, VALUE y)
     else if (FIXNUM_P(x)) {
 	long ix = FIX2LONG(x);
 	if (ix == 0) {
-	    if (RB_INTEGER_TYPE_P(y))
+	    if (FIXNUM_P(y) || RB_TYPE_P(y, T_BIGNUM))
 		return ZERO;
 	}
 	else if (ix == 1)
@@ -144,7 +121,7 @@ inline static VALUE
 f_sub(VALUE x, VALUE y)
 {
 #ifndef PRESERVE_SIGNEDZERO
-    if (FIXNUM_P(y) && FIXNUM_ZERO_P(y))
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
 	return x;
 #endif
     return rb_funcall(x, '-', 1, y);
@@ -153,27 +130,7 @@ f_sub(VALUE x, VALUE y)
 fun1(abs)
 fun1(arg)
 fun1(denominator)
-
-static VALUE nucomp_negate(VALUE self);
-
-inline static VALUE
-f_negate(VALUE x)
-{
-    if (RB_INTEGER_TYPE_P(x)) {
-        return rb_int_uminus(x);
-    }
-    else if (RB_FLOAT_TYPE_P(x)) {
-        return rb_float_uminus(x);
-    }
-    else if (RB_TYPE_P(x, T_RATIONAL)) {
-        return rb_rational_uminus(x);
-    }
-    else if (RB_TYPE_P(x, T_COMPLEX)) {
-        return nucomp_negate(x);
-    }
-    return rb_funcall(x, id_negate, 0);
-}
-
+fun1(negate)
 fun1(numerator)
 fun1(real_p)
 
@@ -194,70 +151,122 @@ f_to_f(VALUE x)
 
 fun1(to_r)
 
-inline static int
+inline static VALUE
 f_eqeq_p(VALUE x, VALUE y)
 {
     if (FIXNUM_P(x) && FIXNUM_P(y))
-	return x == y;
-    else if (RB_FLOAT_TYPE_P(x) || RB_FLOAT_TYPE_P(y))
-	return NUM2DBL(x) == NUM2DBL(y);
-    return (int)rb_equal(x, y);
+	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
+    return rb_funcall(x, id_eqeq_p, 1, y);
 }
 
 fun2(expt)
 fun2(fdiv)
 fun2(quo)
 
-inline static int
+inline static VALUE
 f_negative_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x))
-        return INT_NEGATIVE_P(x);
-    else if (RB_FLOAT_TYPE_P(x))
-        return RFLOAT_VALUE(x) < 0.0;
-    else if (RB_TYPE_P(x, T_RATIONAL))
-        return INT_NEGATIVE_P(RRATIONAL(x)->num);
-    return rb_num_negative_p(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 int
+inline static VALUE
 f_zero_p(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x)) {
-        return FIXNUM_ZERO_P(x);
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 0);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
     }
     else if (RB_TYPE_P(x, T_RATIONAL)) {
-        const VALUE num = RRATIONAL(x)->num;
-        return FIXNUM_ZERO_P(num);
+	VALUE num = RRATIONAL(x)->num;
+
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
     }
-    return (int)rb_equal(x, ZERO);
+    return rb_funcall(x, id_eqeq_p, 1, ZERO);
 }
 
 #define f_nonzero_p(x) (!f_zero_p(x))
 
-inline static int
+inline static VALUE
+f_one_p(VALUE x)
+{
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 1);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
+    }
+    else if (RB_TYPE_P(x, 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 (int)rb_obj_is_kind_of(x, c);
+    return rb_obj_is_kind_of(x, c);
 }
 
-inline static int
+inline static VALUE
 k_numeric_p(VALUE x)
 {
     return f_kind_of_p(x, rb_cNumeric);
 }
 
-#define k_exact_p(x) (!RB_FLOAT_TYPE_P(x))
+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 = RCOMPLEX(x)
+    struct RComplex *dat;\
+    dat = ((struct RComplex *)(x))
 
 #define get_dat2(x,y) \
-    struct RComplex *adat = RCOMPLEX(x), *bdat = RCOMPLEX(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)
@@ -303,15 +312,15 @@ nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
 inline static VALUE
 f_complex_new_bang1(VALUE klass, VALUE x)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
+    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(!RB_TYPE_P(x, T_COMPLEX));
-    assert(!RB_TYPE_P(y, T_COMPLEX));
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
     return nucomp_s_new_internal(klass, x, y);
 }
 
@@ -327,15 +336,14 @@ nucomp_canonicalization(int f)
 {
     canonicalization = f;
 }
-#else
-#define canonicalization 0
 #endif
 
 inline static void
 nucomp_real_check(VALUE num)
 {
-    if (!RB_INTEGER_TYPE_P(num) &&
-	!RB_FLOAT_TYPE_P(num) &&
+    if (!RB_TYPE_P(num, T_FIXNUM) &&
+	!RB_TYPE_P(num, T_BIGNUM) &&
+	!RB_TYPE_P(num, T_FLOAT) &&
 	!RB_TYPE_P(num, T_RATIONAL)) {
 	if (!k_numeric_p(num) || !f_real_p(num))
 	    rb_raise(rb_eTypeError, "not a real");
@@ -411,12 +419,10 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 inline static VALUE
 f_complex_new2(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
+    assert(!k_complex_p(x));
     return nucomp_s_canonicalize_internal(klass, x, y);
 }
 
-static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
-
 /*
  * call-seq:
  *    Complex(x[, y])  ->  numeric
@@ -453,7 +459,7 @@ static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
 static VALUE
 nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
 {
-    return nucomp_s_convert(argc, argv, rb_cComplex);
+    return rb_funcall2(rb_cComplex, id_convert, argc, argv);
 }
 
 #define imp1(n) \
@@ -463,9 +469,20 @@ m_##n##_bang(VALUE x)\
     return rb_math_##n(x);\
 }
 
+#define imp2(n) \
+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))
 
 static VALUE
 m_log_bang(VALUE x)
@@ -509,21 +526,6 @@ m_sin(VALUE x)
 #if 0
 imp1(sqrt)
 
-VALUE
-rb_complex_sqrt(VALUE x)
-{
-    int pos;
-    VALUE a, re, im;
-    get_dat1(x);
-
-    pos = f_positive_p(dat->imag);
-    a = f_abs(x);
-    re = m_sqrt_bang(f_div(f_add(a, dat->real), TWO));
-    im = m_sqrt_bang(f_div(f_sub(a, dat->real), TWO));
-    if (!pos) im = f_negate(im);
-    return f_complex_new2(rb_cComplex, re, im);
-}
-
 static VALUE
 m_sqrt(VALUE x)
 {
@@ -532,48 +534,26 @@ m_sqrt(VALUE x)
 	    return m_sqrt_bang(x);
 	return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x)));
     }
-    return rb_complex_sqrt(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
 
-static VALUE
+inline static VALUE
 f_complex_polar(VALUE klass, VALUE x, VALUE y)
 {
-    assert(!RB_TYPE_P(x, T_COMPLEX));
-    assert(!RB_TYPE_P(y, T_COMPLEX));
-    if (f_zero_p(x) || f_zero_p(y)) {
-	if (canonicalization) return x;
-	return nucomp_s_new_internal(klass, x, RFLOAT_0);
-    }
-    if (RB_FLOAT_TYPE_P(y)) {
-	const double arg = RFLOAT_VALUE(y);
-	if (arg == M_PI) {
-	    x = f_negate(x);
-	    if (canonicalization) return x;
-	    y = RFLOAT_0;
-	}
-	else if (arg == M_PI_2) {
-	    y = x;
-	    x = RFLOAT_0;
-	}
-	else if (arg == M_PI_2+M_PI) {
-	    y = f_negate(x);
-	    x = RFLOAT_0;
-	}
-	else if (RB_FLOAT_TYPE_P(x)) {
-	    const double abs = RFLOAT_VALUE(x);
-	    const double real = abs * cos(arg), imag = abs * sin(arg);
-	    x = DBL2NUM(real);
-	    if (canonicalization && imag == 0.0) return x;
-	    y = DBL2NUM(imag);
-	}
-	else {
-	    y = f_mul(x, DBL2NUM(sin(arg)));
-	    x = f_mul(x, DBL2NUM(cos(arg)));
-	    if (canonicalization && f_zero_p(y)) return x;
-	}
-	return nucomp_s_new_internal(klass, x, 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)));
@@ -598,8 +578,8 @@ nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
     switch (rb_scan_args(argc, argv, "11", &abs, &arg)) {
       case 1:
 	nucomp_real_check(abs);
-	if (canonicalization) return abs;
-	return nucomp_s_new_internal(klass, abs, ZERO);
+	arg = ZERO;
+	break;
       default:
 	nucomp_real_check(abs);
 	nucomp_real_check(arg);
@@ -657,28 +637,17 @@ nucomp_negate(VALUE self)
 			f_negate(dat->real), f_negate(dat->imag));
 }
 
-/*
- * call-seq:
- *    cmp + numeric  ->  complex
- *
- * Performs addition.
- *
- *    Complex(2, 3)  + Complex(2, 3)   #=> (4+6i)
- *    Complex(900)   + Complex(1)      #=> (901+0i)
- *    Complex(-2, 9) + Complex(-9, 2)  #=> (-11+11i)
- *    Complex(9, 8)  + 4               #=> (13+8i)
- *    Complex(20, 9) + 9.8             #=> (29.8+9i)
- */
-VALUE
-rb_complex_plus(VALUE self, VALUE other)
+inline static VALUE
+f_addsub(VALUE self, VALUE other,
+	 VALUE (*func)(VALUE, VALUE), ID id)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	VALUE real, imag;
 
 	get_dat2(self, other);
 
-	real = f_add(adat->real, bdat->real);
-	imag = f_add(adat->imag, bdat->imag);
+	real = (*func)(adat->real, bdat->real);
+	imag = (*func)(adat->imag, bdat->imag);
 
 	return f_complex_new2(CLASS_OF(self), real, imag);
     }
@@ -686,9 +655,27 @@ rb_complex_plus(VALUE self, VALUE other)
 	get_dat1(self);
 
 	return f_complex_new2(CLASS_OF(self),
-			      f_add(dat->real, other), dat->imag);
+			      (*func)(dat->real, other), dat->imag);
     }
-    return rb_num_coerce_bin(self, other, '+');
+    return rb_num_coerce_bin(self, other, id);
+}
+
+/*
+ * call-seq:
+ *    cmp + numeric  ->  complex
+ *
+ * Performs addition.
+ *
+ *    Complex(2, 3)  + Complex(2, 3)   #=> (4+6i)
+ *    Complex(900)   + Complex(1)      #=> (901+0i)
+ *    Complex(-2, 9) + Complex(-9, 2)  #=> (-11+11i)
+ *    Complex(9, 8)  + 4               #=> (13+8i)
+ *    Complex(20, 9) + 9.8             #=> (29.8+9i)
+ */
+static VALUE
+nucomp_add(VALUE self, VALUE other)
+{
+    return f_addsub(self, other, f_add, '+');
 }
 
 /*
@@ -706,36 +693,7 @@ rb_complex_plus(VALUE self, VALUE other)
 static VALUE
 nucomp_sub(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
-	VALUE real, imag;
-
-	get_dat2(self, other);
-
-	real = f_sub(adat->real, bdat->real);
-	imag = f_sub(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),
-			      f_sub(dat->real, other), dat->imag);
-    }
-    return rb_num_coerce_bin(self, other, '-');
-}
-
-static VALUE
-safe_mul(VALUE a, VALUE b, int az, int bz)
-{
-    double v;
-    if (!az && bz && RB_FLOAT_TYPE_P(a) && (v = RFLOAT_VALUE(a), !isnan(v))) {
-	a = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0);
-    }
-    if (!bz && az && RB_FLOAT_TYPE_P(b) && (v = RFLOAT_VALUE(b), !isnan(v))) {
-	b = signbit(v) ? DBL2NUM(-1.0) : DBL2NUM(1.0);
-    }
-    return f_mul(a, b);
+    return f_addsub(self, other, f_sub, '-');
 }
 
 /*
@@ -750,24 +708,18 @@ safe_mul(VALUE a, VALUE b, int az, int bz)
  *    Complex(9, 8)  * 4               #=> (36+32i)
  *    Complex(20, 9) * 9.8             #=> (196.0+88.2i)
  */
-VALUE
-rb_complex_mul(VALUE self, VALUE other)
+static VALUE
+nucomp_mul(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	VALUE real, imag;
-	VALUE areal, aimag, breal, bimag;
-	int arzero, aizero, brzero, bizero;
 
 	get_dat2(self, other);
 
-	arzero = f_zero_p(areal = adat->real);
-	aizero = f_zero_p(aimag = adat->imag);
-	brzero = f_zero_p(breal = bdat->real);
-	bizero = f_zero_p(bimag = bdat->imag);
-	real = f_sub(safe_mul(areal, breal, arzero, brzero),
-		     safe_mul(aimag, bimag, aizero, bizero));
-	imag = f_add(safe_mul(areal, bimag, arzero, bizero),
-		     safe_mul(aimag, breal, aizero, brzero));
+	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);
     }
@@ -780,18 +732,17 @@ rb_complex_mul(VALUE self, VALUE other)
     }
     return rb_num_coerce_bin(self, other, '*');
 }
-#define nucomp_mul rb_complex_mul
 
 inline static VALUE
 f_divide(VALUE self, VALUE other,
 	 VALUE (*func)(VALUE, VALUE), ID id)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	int flo;
 	get_dat2(self, other);
 
-	flo = (RB_FLOAT_TYPE_P(adat->real) || RB_FLOAT_TYPE_P(adat->imag) ||
-	       RB_FLOAT_TYPE_P(bdat->real) || RB_FLOAT_TYPE_P(bdat->imag));
+	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;
@@ -892,17 +843,17 @@ nucomp_expt(VALUE self, VALUE other)
     if (k_numeric_p(other) && k_exact_zero_p(other))
 	return f_complex_new_bang1(CLASS_OF(self), ONE);
 
-    if (RB_TYPE_P(other, T_RATIONAL) && RRATIONAL(other)->den == LONG2FIX(1))
-	other = RRATIONAL(other)->num; /* c14n */
+    if (k_rational_p(other) && f_one_p(f_denominator(other)))
+	other = f_numerator(other); /* c14n */
 
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	get_dat1(other);
 
 	if (k_exact_zero_p(dat->imag))
 	    other = dat->real; /* c14n */
     }
 
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	VALUE r, theta, nr, ntheta;
 
 	get_dat1(other);
@@ -916,7 +867,7 @@ nucomp_expt(VALUE self, VALUE other)
 		       f_mul(dat->imag, m_log_bang(r)));
 	return f_complex_polar(CLASS_OF(self), nr, ntheta);
     }
-    if (FIXNUM_P(other)) {
+    if (k_fixnum_p(other)) {
 	if (f_gt_p(other, ZERO)) {
 	    VALUE x, z;
 	    long n;
@@ -948,12 +899,12 @@ nucomp_expt(VALUE self, VALUE other)
 	    }
 	    return z;
 	}
-	return f_expt(f_reciprocal(self), rb_int_uminus(other));
+	return f_expt(f_reciprocal(self), f_negate(other));
     }
     if (k_numeric_p(other) && f_real_p(other)) {
 	VALUE r, theta;
 
-	if (RB_TYPE_P(other, T_BIGNUM))
+	if (k_bignum_p(other))
 	    rb_warn("in a**b, b may be too big");
 
 	r = f_abs(self);
@@ -980,7 +931,7 @@ nucomp_expt(VALUE self, VALUE other)
 static VALUE
 nucomp_eqeq_p(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	get_dat2(self, other);
 
 	return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
@@ -991,7 +942,7 @@ nucomp_eqeq_p(VALUE self, VALUE other)
 
 	return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
     }
-    return f_boolcast(f_eqeq_p(other, self));
+    return f_eqeq_p(other, self);
 }
 
 /* :nodoc: */
@@ -1003,8 +954,8 @@ nucomp_coerce(VALUE self, VALUE other)
     if (RB_TYPE_P(other, T_COMPLEX))
 	return rb_assoc_new(other, self);
 
-    rb_raise(rb_eTypeError, "%"PRIsVALUE" can't be coerced into %"PRIsVALUE,
-	     rb_obj_class(other), rb_obj_class(self));
+    rb_raise(rb_eTypeError, "%s can't be coerced into %s",
+	     rb_obj_classname(other), rb_obj_classname(self));
     return Qnil;
 }
 
@@ -1025,17 +976,17 @@ nucomp_abs(VALUE self)
 
     if (f_zero_p(dat->real)) {
 	VALUE a = f_abs(dat->imag);
-	if (RB_FLOAT_TYPE_P(dat->real) && !RB_FLOAT_TYPE_P(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 (!RB_FLOAT_TYPE_P(dat->real) && RB_FLOAT_TYPE_P(dat->imag))
+	if (!k_float_p(dat->real) && k_float_p(dat->imag))
 	    a = f_to_f(a);
 	return a;
     }
-    return rb_math_hypot(dat->real, dat->imag);
+    return m_hypot(dat->real, dat->imag);
 }
 
 /*
@@ -1069,7 +1020,7 @@ static VALUE
 nucomp_arg(VALUE self)
 {
     get_dat1(self);
-    return rb_math_atan2(dat->imag, dat->real);
+    return m_atan2_bang(dat->imag, dat->real);
 }
 
 /*
@@ -1224,7 +1175,7 @@ nucomp_hash(VALUE self)
 static VALUE
 nucomp_eql_p(VALUE self, VALUE other)
 {
-    if (RB_TYPE_P(other, T_COMPLEX)) {
+    if (k_complex_p(other)) {
 	get_dat2(self, other);
 
 	return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
@@ -1235,27 +1186,30 @@ nucomp_eql_p(VALUE self, VALUE other)
     return Qfalse;
 }
 
-inline static int
+inline static VALUE
 f_signbit(VALUE x)
 {
-    if (RB_FLOAT_TYPE_P(x)) {
+#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
+    !defined(signbit)
+    extern int signbit(double);
+#endif
+    if (RB_TYPE_P(x, T_FLOAT)) {
 	double f = RFLOAT_VALUE(x);
-	return !isnan(f) && signbit(f);
+	return f_boolcast(!isnan(f) && signbit(f));
     }
     return f_negative_p(x);
 }
 
-inline static int
+inline static VALUE
 f_tpositive_p(VALUE x)
 {
-    return !f_signbit(x);
+    return f_boolcast(!f_signbit(x));
 }
 
 static VALUE
 f_format(VALUE self, VALUE (*func)(VALUE))
 {
-    VALUE s;
-    int impos;
+    VALUE s, impos;
 
     get_dat1(self);
 
@@ -1314,66 +1268,6 @@ nucomp_inspect(VALUE self)
     return s;
 }
 
-#define FINITE_TYPE_P(v) (RB_INTEGER_TYPE_P(v) || RB_TYPE_P(v, T_RATIONAL))
-
-/*
- * call-seq:
- *    cmp.finite?  ->  true or false
- *
- * Returns +true+ if +cmp+'s magnitude is finite number,
- * oterwise returns +false+.
- */
-static VALUE
-rb_complex_finite_p(VALUE self)
-{
-    VALUE magnitude = nucomp_abs(self);
-
-    if (FINITE_TYPE_P(magnitude)) {
-	return Qtrue;
-    }
-    else if (RB_FLOAT_TYPE_P(magnitude)) {
-	const double f = RFLOAT_VALUE(magnitude);
-	return isinf(f) ? Qfalse : Qtrue;
-    }
-    else {
-	return rb_funcall(magnitude, id_finite_p, 0);
-    }
-}
-
-/*
- * call-seq:
- *    cmp.infinite?  ->  nil or 1 or -1
- *
- * Returns values corresponding to the value of +cmp+'s magnitude:
- *
- * +finite+::    +nil+
- * ++Infinity+:: ++1+
- *
- *  For example:
- *
- *     (1+1i).infinite?                   #=> nil
- *     (Float::INFINITY + 1i).infinite?   #=> 1
- */
-static VALUE
-rb_complex_infinite_p(VALUE self)
-{
-    VALUE magnitude = nucomp_abs(self);
-
-    if (FINITE_TYPE_P(magnitude)) {
-	return Qnil;
-    }
-    if (RB_FLOAT_TYPE_P(magnitude)) {
-	const double f = RFLOAT_VALUE(magnitude);
-	if (isinf(f)) {
-	    return INT2FIX(f < 0 ? -1 : 1);
-	}
-	return Qnil;
-    }
-    else {
-	return rb_funcall(magnitude, id_infinite_p, 0);
-    }
-}
-
 /* :nodoc: */
 static VALUE
 nucomp_dumper(VALUE self)
@@ -1437,6 +1331,8 @@ 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)
 {
@@ -1456,16 +1352,10 @@ rb_complex_set_real(VALUE cmp, VALUE r)
 VALUE
 rb_complex_set_imag(VALUE cmp, VALUE i)
 {
-    RCOMPLEX_SET_IMAG(cmp, i);
+    RCOMPLEX_SET_REAL(cmp, i);
     return cmp;
 }
 
-VALUE
-rb_complex_abs(VALUE cmp)
-{
-    return nucomp_abs(cmp);
-}
-
 /*
  * call-seq:
  *    cmp.to_i  ->  integer
@@ -1482,7 +1372,7 @@ nucomp_to_i(VALUE self)
 {
     get_dat1(self);
 
-    if (!k_exact_zero_p(dat->imag)) {
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
 	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer",
 		 self);
     }
@@ -1505,7 +1395,7 @@ nucomp_to_f(VALUE self)
 {
     get_dat1(self);
 
-    if (!k_exact_zero_p(dat->imag)) {
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
 	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float",
 		 self);
     }
@@ -1530,7 +1420,7 @@ nucomp_to_r(VALUE self)
 {
     get_dat1(self);
 
-    if (!k_exact_zero_p(dat->imag)) {
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
 	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
 		 self);
     }
@@ -1557,11 +1447,11 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "01", NULL);
 
-    if (!k_exact_zero_p(dat->imag)) {
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
        rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
                 self);
     }
-    return rb_funcallv(dat->real, id_rationalize, argc, argv);
+    return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv);
 }
 
 /*
@@ -1744,6 +1634,8 @@ isimagunit(int c)
 	    c == 'j' || c == 'J');
 }
 
+VALUE rb_cstr_to_rat(const char *, int);
+
 static VALUE
 str2num(char *s)
 {
@@ -2055,6 +1947,8 @@ numeric_abs2(VALUE self)
     return f_mul(self, self);
 }
 
+#define id_PI rb_intern("PI")
+
 /*
  * call-seq:
  *    num.arg    ->  0 or float
@@ -2067,8 +1961,8 @@ static VALUE
 numeric_arg(VALUE self)
 {
     if (f_positive_p(self))
-        return INT2FIX(0);
-    return DBL2NUM(M_PI);
+	return INT2FIX(0);
+    return rb_const_get(rb_mMath, id_PI);
 }
 
 /*
@@ -2084,8 +1978,6 @@ numeric_rect(VALUE self)
     return rb_assoc_new(self, INT2FIX(0));
 }
 
-static VALUE float_arg(VALUE self);
-
 /*
  * call-seq:
  *    num.polar  ->  array
@@ -2095,25 +1987,7 @@ static VALUE float_arg(VALUE self);
 static VALUE
 numeric_polar(VALUE self)
 {
-    VALUE abs, arg;
-
-    if (RB_INTEGER_TYPE_P(self)) {
-        abs = rb_int_abs(self);
-        arg = numeric_arg(self);
-    }
-    else if (RB_FLOAT_TYPE_P(self)) {
-        abs = rb_float_abs(self);
-        arg = float_arg(self);
-    }
-    else if (RB_TYPE_P(self, T_RATIONAL)) {
-        abs = rb_rational_abs(self);
-        arg = numeric_arg(self);
-    }
-    else {
-        abs = f_abs(self);
-        arg = f_arg(self);
-    }
-    return rb_assoc_new(abs, arg);
+    return rb_assoc_new(f_abs(self), f_arg(self));
 }
 
 /*
@@ -2153,10 +2027,9 @@ float_arg(VALUE self)
  * and i is imaginary unit.  Real a equals complex a+0i
  * mathematically.
  *
- * Complex object can be created as literal, and also by using
- * Kernel#Complex, Complex::rect, Complex::polar or to_c method.
+ * In ruby, you can create complex object with Complex, Complex::rect,
+ * Complex::polar or to_c method.
  *
- *    2+1i                 #=> (2+1i)
  *    Complex(1)           #=> (1+0i)
  *    Complex(2, 3)        #=> (2+3i)
  *    Complex.polar(2, 3)  #=> (-1.9799849932008908+0.2822400161197344i)
@@ -2191,7 +2064,9 @@ Init_Complex(void)
 
     id_abs = rb_intern("abs");
     id_arg = rb_intern("arg");
+    id_convert = rb_intern("convert");
     id_denominator = rb_intern("denominator");
+    id_eqeq_p = rb_intern("==");
     id_expt = rb_intern("**");
     id_fdiv = rb_intern("fdiv");
     id_negate = rb_intern("-@");
@@ -2203,10 +2078,6 @@ Init_Complex(void)
     id_to_r = rb_intern("to_r");
     id_i_real = rb_intern("@real");
     id_i_imag = rb_intern("@image"); /* @image, not @imag */
-    id_finite_p = rb_intern("finite?");
-    id_infinite_p = rb_intern("infinite?");
-    id_rationalize = rb_intern("rationalize");
-    id_PI = rb_intern("PI");
 
     rb_cComplex = rb_define_class("Complex", rb_cNumeric);
 
@@ -2226,9 +2097,13 @@ Init_Complex(void)
 
     rb_define_global_function("Complex", nucomp_f_complex, -1);
 
-    rb_undef_methods_from(rb_cComplex, rb_mComparable);
     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");
@@ -2240,12 +2115,16 @@ Init_Complex(void)
     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, "+", rb_complex_plus, 1);
+    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);
@@ -2287,12 +2166,6 @@ Init_Complex(void)
     rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
     rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
 
-    rb_undef_method(rb_cComplex, "positive?");
-    rb_undef_method(rb_cComplex, "negative?");
-
-    rb_define_method(rb_cComplex, "finite?", rb_complex_finite_p, 0);
-    rb_define_method(rb_cComplex, "infinite?", rb_complex_infinite_p, 0);
-
     rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
     compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); /* :nodoc: */
     rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
diff --git a/configure.in b/configure.in
index c5132dc97f..d2373ed2b6 100644
--- a/configure.in
+++ b/configure.in
@@ -11,10 +11,6 @@ AC_DEFUN([RUBY_PREREQ_AC],
 
 AC_DISABLE_OPTION_CHECKING
 
-AC_ARG_VAR([cflags], [additional CFLAGS])
-AC_ARG_VAR([cppflags], [additional CPPFLAGS])
-AC_ARG_VAR([cxxflags], [additional CXXFLAGS])
-
 AC_DEFUN([RUBY_RM_RECURSIVE], [
 m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
 # suppress error messages, rm: cannot remove 'conftest.dSYM', from
@@ -43,20 +39,21 @@ AC_ARG_WITH(baseruby,
 		AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)])
 	],
 	[
-		AC_PATH_PROG([BASERUBY], [ruby], [false])
+		BASERUBY="ruby"
 	])
-if test "`RUBYOPT=- $BASERUBY -e 'print 42' 2>/dev/null`" = 42; then
-    if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'print 42' 2>/dev/null`" = 42; then
+if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then
+    if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'p 42' 2>/dev/null`" = 42; then
 	BASERUBY="$BASERUBY --disable=gems"
     fi
-    $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
-    HAVE_BASERUBY=yes
 else
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
-    HAVE_BASERUBY=no
 fi
 AC_SUBST(BASERUBY)
-AC_SUBST(HAVE_BASERUBY)
+
+for conf in config.guess config.sub; do
+    test -f "$srcdir/tool/$conf" && continue
+    $BASERUBY -C "$srcdir/tool" get-config_files $conf
+done
 
 AC_DEFUN([RUBY_MINGW32],
 [AS_CASE(["$host_os"],
@@ -102,15 +99,8 @@ AC_DEFUN([RUBY_NACL],
                        [no], [nacl_cv_build_variant=glibc],
                        [yes], [nacl_cv_build_variant=newlib])])
 
-  AS_CASE(["$target_cpu"],
-          [x86_64], [nacl_cv_cpu_nick=x86
-                     nacl_cv_cpu_nick2=x86_64],
-          [i?86], [nacl_cv_cpu_nick=x86
-                   nacl_cv_cpu_nick2=x86_32],
-          [le32], [nacl_cv_cpu_nick=pnacl
-                   nacl_cv_cpu_nick2=pnacl
-                   ac_cv_exeext=.pexe],
-          [nacl_cv_cpu_nick=$target_cpu])
+  AS_CASE(["$build_cpu"],
+          [x86_64|i?86], [nacl_cv_cpu_nick=x86], [nacl_cv_cpu_nick=$build_cpu])
   AS_CASE(["$build_os"],
           [linux*], [nacl_cv_os_nick=linux],
           [darwin*], [nacl_cv_os_nick=mac],
@@ -121,15 +111,9 @@ AC_DEFUN([RUBY_NACL],
   ac_tool_prefix="$host_cpu-nacl-"
 
   AC_MSG_CHECKING([NativeClient toolchain])
-  if test x"$nacl_cv_cpu_nick" = xpnacl; then
-    NACL_TOOLCHAIN="${nacl_cv_os_nick}_pnacl"
-    ac_tool_prefix=pnacl-
-  elif test -d \
+  if test -d \
     "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"; then
     NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"
-  elif test -d \
-    "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_x86_${nacl_cv_cpu_nick}/${nacl_cv_build_variant}"; then
-    NACL_TOOLCHAIN="${nacl_cv_os_nick}_x86_${nacl_cv_cpu_nick}/${nacl_cv_build_variant}"
   else
     AS_CASE(
       ["${nacl_cv_build_variant}"],
@@ -157,32 +141,10 @@ AC_DEFUN([RUBY_NACL],
   if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
     PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
   fi
-  AC_MSG_RESULT(${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin)
-
-  RUBY_APPEND_OPTIONS(XCFLAGS, '-I$(NACL_SDK_ROOT)/include')
-  if test x"${nacl_cv_cpu_nick}" = xpnacl; then
-    RUBY_APPEND_OPTIONS(XCFLAGS, '-isystem $(NACL_SDK_ROOT)/include/pnacl')
-  elif test x"${nacl_cv_build_variant}" = xnewlib; then
-    RUBY_APPEND_OPTIONS(XCFLAGS, '-isystem $(NACL_SDK_ROOT)/include/newlib')
-  fi
-
-  AC_MSG_CHECKING([nacl library path])
-  if test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}/Release"; then
-    nacl_cv_libpath="${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}"
-  elif test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_cpu_nick2}/Release"; then
-    nacl_cv_libpath="${nacl_cv_cpu_nick2}"
-  else
-    AC_MSG_ERROR([not found])
-  fi
-  AC_MSG_RESULT([${nacl_cv_libpath}])
-  RUBY_APPEND_OPTIONS(XLDFLAGS, '-L$(NACL_SDK_ROOT)/'"lib/${nacl_cv_libpath}/Release")
 
   AC_SUBST(NACL_TOOLCHAIN)
   AC_SUBST(NACL_SDK_ROOT)
-  AC_SUBST(NACL_SDK_VARIANT, "${nacl_cv_build_variant}")
-  AC_SUBST(NACL_LIB_PATH, "${nacl_cv_libpath}")
-  AC_CHECK_TOOLS(CC, [clang gcc])
-  AC_CHECK_TOOLS(CXX, [clang++ g++])
+  AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant)
 ])])
 
 AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
@@ -224,22 +186,16 @@ fi
 GNU_LD=$rb_cv_prog_gnu_ld
 AC_SUBST(GNU_LD)])
 
-eval `sed -n ['s/^@%:@define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/API_\1=\2/p'] $srcdir/include/ruby/version.h`
-RUBY_PROGRAM_VERSION=`sed -n 's/^@%:@define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
-MAJOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f1`
-MINOR=`echo $RUBY_PROGRAM_VERSION | cut -d. -f2`
-TEENY=`echo $RUBY_PROGRAM_VERSION | cut -d. -f3`
+eval `sed -n 's/^#define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/include/ruby/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
-AS_IF([test "$MAJOR.$MINOR" != "$API_MAJOR.$API_MINOR"], [
-    AC_MSG_ERROR([API version $API_MAJOR.$API_MINOR differs from program version $MAJOR.$MINOR])
-])
 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_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
 AC_DEFINE(CANONICALIZATION_FOR_MATHN)
@@ -259,7 +215,16 @@ 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
+AS_CASE(["$build_os"],
+  [darwin1*.*], [
+    AS_CASE(["x$CC"],
+      [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
+      [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
+      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
+      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
+  ])
 test -z "$CC" || ac_cv_prog_CC="$CC"
+test -z "$CXX" || ac_cv_prog_CXX="$CXX"
 
 if test "$program_prefix" = NONE; then
   program_prefix=
@@ -311,7 +276,7 @@ AS_IF([test -z "$target_alias" -a -n "$os_version_style_transform"],
 AC_DEFUN([RUBY_APPEND_OPTION],
 	[# RUBY_APPEND_OPTION($1)
 	AS_CASE([" [$]{$1-} "],
-	[*" $2 "*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])
+	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])
 AC_DEFUN([RUBY_APPEND_OPTIONS],
 	[# RUBY_APPEND_OPTIONS($1)
 	for rb_opt in $2; do
@@ -321,7 +286,7 @@ AC_DEFUN([RUBY_APPEND_OPTIONS],
 AC_DEFUN([RUBY_PREPEND_OPTION],
 	[# RUBY_PREPEND_OPTION($1)
 	AS_CASE([" [$]{$1-} "],
-	[*" $2 "*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])
+	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])
 AC_DEFUN([RUBY_PREPEND_OPTIONS],
 	[# RUBY_PREPEND_OPTIONS($1)
 	unset rb_opts; for rb_opt in $2; do
@@ -351,11 +316,9 @@ AC_MSG_RESULT([$ARCH_FLAG])
 
 AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
 # RUBY_UNIVERSAL_ARCH begin
-ARCH_FLAG=`expr " $CXXFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
-test ${CXXFLAGS+set} && CXXFLAGS=`echo "$CXXFLAGS" | sed [-e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']`
 ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
-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']`
+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 universal_binary universal_archnames
 if test ${target_archs+set}; then
     AC_MSG_CHECKING([target architectures])
@@ -433,8 +396,8 @@ else
     rb_cv_target_archs=${target_archs}
 fi
 if test "x${ARCH_FLAG}" != x; then
-    CFLAGS="${CFLAGS:+$CFLAGS }${ARCH_FLAG}"
-    LDFLAGS="${LDFLAGS:+$LDFLAGS }${ARCH_FLAG}"
+    CFLAGS="$CFLAGS ${ARCH_FLAG}"
+    LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
 fi
 # RUBY_UNIVERSAL_ARCH end
 ])
@@ -468,7 +431,7 @@ fi
 RUBY_NACL
 AS_CASE(["$host_os:$build_os"],
 [darwin*:darwin*], [
-    AC_CHECK_TOOLS(CC, [clang gcc cc])
+    AC_CHECK_TOOLS(CC, [gcc-4.2 clang gcc cc])
     # Following Apple deployed clang are broken
     # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
     # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
@@ -486,19 +449,6 @@ if test x"${build}" != x"${host}"; then
 fi
 
 AC_PROG_CC
-
-dnl Select the appropriate C++ compiler in OS X
-AS_CASE(["$build_os"],
-  [darwin1*.*], [
-    AS_CASE(["x$CC"],
-      [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
-      [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
-      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
-      [xicc],                       [: ${CXX=icpc}],
-      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
-  ])
-test -z "$CXX" || ac_cv_prog_CXX="$CXX"
-
 AC_PROG_CXX
 RUBY_MINGW32
 AC_PROG_GCC_TRADITIONAL
@@ -511,9 +461,7 @@ if test "$GCC" = yes; then
     linker_flag=-Wl,
     : ${optflags=-O3}
     gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
-    gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
     test -n "$gcc_major" || gcc_major=0
-    test -n "$gcc_minor" || gcc_minor=0
     # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
 else
     linker_flag=
@@ -524,10 +472,8 @@ RUBY_CPPOUTFILE
 
 : ${OUTFLAG='-o '}
 : ${COUTFLAG=${OUTFLAG}}
-: ${CSRCFLAG=''}
 AC_SUBST(OUTFLAG)
 AC_SUBST(COUTFLAG)
-AC_SUBST(CSRCFLAG)
 
 cc_version=
 for option in --version -v -V -qversion; do
@@ -536,10 +482,8 @@ for option in --version -v -V -qversion; do
     AS_CASE($cc_version_status, [0], [:], [continue])
     AS_CASE($cc_version_message, [*Warning*], [continue])
     cc_version='$(CC) '$option
-    break
 done
 AC_SUBST(CC_VERSION, $cc_version)
-AC_SUBST(CC_VERSION_MESSAGE, $cc_version_message)
 
 RUBY_UNIVERSAL_ARCH
 if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
@@ -574,12 +518,6 @@ AC_CHECK_TOOL(AR, ar)
 if test -z "$AR"; then
   AC_CHECK_PROGS(AR, aal, ar)
 fi
-AC_CACHE_CHECK([for $AR D option], [rb_cv_ar_D_option], [
-    AS_IF([$AR rcD conftest.a > /dev/null 2>&1 && rm conftest.a],
-	[rb_cv_ar_D_option=yes], [rb_cv_ar_D_option=no])
-])
-AS_IF([test "$rb_cv_ar_D_option" = yes], [ARFLAGS='rcD '], [ARFLAGS='rcu '])
-AC_SUBST(ARFLAGS)
 
 AC_CHECK_TOOL(AS, as)
 ASFLAGS=$ASFLAGS
@@ -640,47 +578,38 @@ AC_DEFUN([RUBY_DTRACE_AVAILABLE],
 [AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
 [
     echo "provider conftest{ probe fire(); };" > conftest_provider.d
-    rb_cv_dtrace_available=no
-    AS_FOR(opt, rb_dtrace_opt, ["-xnolibs" ""], [dnl
-	AS_IF([$DTRACE opt -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null],
-	    [], [continue])
-	AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();],
-	    [], [continue])
-	# DTrace is available on the system
-	rb_cv_dtrace_available=yes${rb_dtrace_opt:+"(opt)"}
-	break
-    ])
+    if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
+      # DTrace is available on the system
+      rb_cv_dtrace_available=yes
+    else
+      # DTrace is not available while dtrace command exists
+      # for example FreeBSD 8 or FreeBSD 9 without DTrace build option
+      rb_cv_dtrace_available=no
+    fi
     rm -f conftest.[co] conftest_provider.[dho]
 ])
-AS_CASE(["$rb_cv_dtrace_available"], ["yes("*")"],
-    [DTRACE_OPT=`expr "$rb_cv_dtrace_available" : "yes(\(.*\))"`])
 ])
 
 AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
 [AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g,
 [
-  rb_cv_prog_dtrace_g=no
   if {
     cat >conftest_provider.d <<_PROBES &&
     provider conftest {
       probe fire();
     };
 _PROBES
-    $DTRACE ${DTRACE_OPT} -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
-    :
+    $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
+    cat >conftest.c <<_CONF &&
+    @%:@include "conftest_provider.h"
+    int main(void){ CONFTEST_FIRE(); return 0; }
+_CONF
+    $CC $CFLAGS $CPPFLAGS -c -o conftest.o conftest.c &&
+    $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null
   }; then
-    AC_TRY_COMPILE([@%:@include "conftest_provider.h"], [CONFTEST_FIRE();], [
-	if {
-	    cp -p conftest.${ac_objext} conftest.${ac_objext}.save &&
-	    $DTRACE ${DTRACE_OPT} -G -s conftest_provider.d conftest.${ac_objext} 2>/dev/null &&
-	    :
-	}; then
-	    if cmp -s conftest.o conftest.${ac_objext}.save; then
-		rb_cv_prog_dtrace_g=yes
-	    else
-		rb_cv_prog_dtrace_g=rebuild
-	    fi
-	fi])
+    rb_cv_prog_dtrace_g=yes
+  else
+    rb_cv_prog_dtrace_g=no
   fi
   rm -f conftest.[co] conftest_provider.[dho]
 ])
@@ -769,7 +698,7 @@ RUBY_WERROR_FLAG([
 	cp ../confdefs.h . &&
 	echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
 	:
-    } || AC_MSG_ERROR([failed to make temporary directory])
+    } || AC_MSG_ERROR([faild to make temporary directory])
     AC_TRY_LINK([], [],
 	[AC_MSG_RESULT(yes)],
 	[
@@ -808,8 +737,6 @@ AC_DEFUN([RUBY_TRY_LDFLAGS], [
     save_LDFLAGS=
 ])
 
-: ${DLDFLAGS="$LDFLAGS"}
-
 AS_CASE([$RUBY_PATCHLEVEL], [-*],
 	[particular_werror_flags=yes], [particular_werror_flags=no])
 AC_ARG_ENABLE(werror,
@@ -826,18 +753,9 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
     else
 	extra_warning=
     fi
-    if test $gcc_major -ge 5 -a $gcc_major -le 6; then
-	extra_warning="$extra_warning -Wno-maybe-uninitialized"
-    fi
     for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
-                 -diag-disable=2259 \
 		 -Wno-missing-field-initializers \
-		 -Wno-tautological-compare \
-		 -Wno-parentheses-equality \
-		 -Wno-constant-logical-operand \
-		 -Wno-self-assign \
 		 -Wunused-variable \
-		 -Werror=implicit-int \
 		 -Werror=pointer-arith \
 		 -Werror=write-strings \
 		 -Werror=declaration-after-statement \
@@ -846,9 +764,6 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
 		 -Werror=division-by-zero \
 		 -Werror=deprecated-declarations \
 		 -Wno-packed-bitfield-compat \
-		 -Wsuggest-attribute=noreturn \
-		 -Wsuggest-attribute=format \
-		 -Wimplicit-fallthrough=0 \
 		 $extra_warning \
 		 ; do
 	if test "$particular_werror_flags" != yes; then
@@ -876,40 +791,17 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
 fi
 RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)])
 
-for n in infinity nan; do
-    m=AS_TR_CPP($n)
-    AC_CACHE_CHECK([whether $m is available without C99 option], rb_cv_$n,
-	[AC_COMPILE_IFELSE(
-	    [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([@%:@include <math.h>
-@%:@ifndef $m
-@%:@error no $m
-@%:@endif
-]), [1])], [eval rb_cv_$n=yes], [eval rb_cv_$n=no])])
-    if eval test '"$rb_cv_'$n'"' = yes; then
-	AC_DEFINE_UNQUOTED([HAVE_]$m)
-    fi
-done
-
-AC_ARG_WITH(compress-debug-sections,
-	AS_HELP_STRING([--with-compress-debug-sections=type],
-	    [enable debug section compression]),
-	[compress_debug_sections=$withval], [compress_debug_sections=])
-
 if test "$GCC" = yes; then
-    # NaCl's glibc build generates undefined references to __memset_chk.
-    # TODO(sbc): Remove this once NaCl's glibc is fixed.
-    AS_CASE(["$target_os"], [nacl], [], [
-      # -D_FORTIFY_SOURCE
-      # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
-      # argument check. The performance drop is very little and Ubuntu enables
-      # _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
-      # a mistake of silly C extensions.
-      RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
-   ])
+    # -D_FORTIFY_SOURCE
+    # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
+    # argument check. The performance drop is very little and Ubuntu enables
+    # _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
+    # a mistake of silly C extensions.
+    RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
 
     # -fstack-protector
     AS_CASE(["$target_os"],
-    [mingw*|nacl], [
+    [mingw*|nacl|haiku], [
 	stack_protector=no
     ])
     if test -z "${stack_protector+set}"; then
@@ -924,16 +816,6 @@ if test "$GCC" = yes; then
 	RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
     fi
 
-    AS_CASE("${compress_debug_sections:-zlib}",
-    [none|no], [], [
-    RUBY_TRY_LDFLAGS(${linker_flag}--compress-debug-sections=${compress_debug_sections:-zlib},
-		     [compress_debug_sections=${compress_debug_sections:-zlib}],
-		     [compress_debug_sections=no])
-    ])
-    if test "x$compress_debug_sections" != xno; then
-	RUBY_APPEND_OPTION(DLDFLAGS, ${linker_flag}--compress-debug-sections=$compress_debug_sections)
-    fi
-
     AS_CASE(["$target_os"],[mingw*], [
       # On  Windows  platforms,   system  provided  headers  are  VC++
       # optimized.  That  is, C++  habits are often  contaminated into
@@ -941,12 +823,17 @@ if test "$GCC" = yes; then
       # comments.   We  bypass  ANSI   C  mode  for  them.   Otherwise
       # extension libs cannot include those headers.
     ],
-    [cygwin*|darwin*|netbsd*|nacl], [
+    [cygwin*|darwin*|netbsd*], [
       # need lgamma_r(), finite()
     ],
+    [haiku], [
+      # Haiku R1/alpha3 uses gcc-4.4.4 which can not handle anonymous union
+      # with ANSI standard flags. Anonumous union is required to compile
+      # socket extension where <net/if.h> uses anonymous union.
+    ],
     [
       # ANSI (no XCFLAGS because this is C only)
-	for ansi_options in -std=gnu99; do
+	for ansi_options in -std=iso9899:1999 "-ansi -std=iso9899:199409"; do
 	    RUBY_TRY_CFLAGS(${ansi_options}, [
 		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
 		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
@@ -987,19 +874,12 @@ if test "$GCC" = yes; then
 
     AS_CASE(["$target_os"], [mingw*], [
 	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
-	RUBY_TRY_CFLAGS(-static-libgcc, [static_libgcc=yes], [static_libgcc=no])
-	if test "$static_libgcc" = yes; then
-	    RUBY_APPEND_OPTION(EXTLDFLAGS, -static-libgcc)
-	fi
     ])
 
     # disable fast-math
     for oflag in -fno-fast-math; do
 	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
     done
-    for oflag in -fexcess-precision=standard -fp-model\ precise; do
-	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(XCFLAGS, $oflag)])
-    done
 fi
 
 AC_ARG_WITH(opt-dir,
@@ -1080,65 +960,42 @@ AS_CASE(["$target_os"],
 		    AC_DEFINE(BROKEN_SETREUID, 1)
 		    AC_DEFINE(BROKEN_SETREGID, 1)
 		fi
-		incs=`$CC -v -E -xc - < /dev/null 2>&1 | sed ['1,/^@%:@include </d;s/^ *//;s|[^./][^/]*/\.\./||g;/\/include$/!d;s||/lib|;/\/usr\/lib/d']`
-		for d in `$CC -print-search-dirs | sed -e '/^libraries: */!d;s///' | tr : '\012' | fgrep -v /../ | sed -n 's|^\(/.*/lib\)/$|\1|p'`; do
-		    incs=`echo "$incs" | fgrep -v "$d"`
-		done
-		for d in $incs; do
-		    test -d "$d" && RUBY_APPEND_OPTIONS(LDFLAGS, "-L$d")
-		done
 		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
 		ac_cv_func_vfork=no
-		if test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \); then
-		    ac_cv_func___builtin_setjmp=no
-		fi
-		AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
-		    [AC_TRY_RUN([
+                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>
 
-void
-broken_crypt(const char *salt, const char *buf1, const char *buf2)
-{
-#if 0
-    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
-	   buf1+2, buf2+2);
-#endif
-}
-
 int
 main()
 {
     int i;
-    char salt[2], buf[256], *s;
     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))) {
-	    broken_crypt(salt, buf, s);
+#if 0
+	    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
+		   buf+2, s+2);
+#endif
 	    return 1;
 	}
     }
-    salt[0] = salt[1] = ' ';
-    strcpy(buf, crypt("", salt));
-    salt[0] = salt[1] = 0x80 | ' ';
-    if (strcmp(buf, s = crypt("", salt))) {
-	broken_crypt(salt, buf, s);
-	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
+	            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
 		AC_CHECK_PROGS(codesign, codesign)
 		if test -n "$codesign"; then
 		    POSTLINK="test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@"
@@ -1151,63 +1008,16 @@ main()
 		],
 [hpux*], [	LIBS="-lm $LIBS"
 		ac_cv_c_inline=no],
-[solaris*], [	LIBS="-lm $LIBS"
-		ac_cv_func_vfork=no
-		AC_MSG_CHECKING(whether _XOPEN_SOURCE is already given)
-		AC_TRY_COMPILE([#include <unistd.h>
-		    #ifndef _XOPEN_SOURCE
-		    #error _XOPEN_SOURCE is not defined
-		    #endif
-		    ], [],
-		    [given_xopen_source=yes], [given_xopen_source=no])
-		AC_MSG_RESULT($given_xopen_source)
-		if test $given_xopen_source = no; then
-		  # On Solaris, with gcc, -std=iso9899:1999 in $ansi_options
-		  # is often also needed in CPPFLAGS, because some feature
-		  # definitions vary depending on such standards options.
-		  AS_CASE(["${ansi_options}"],
-		  [*-std=iso9899:1999*], [
-		    RUBY_APPEND_OPTIONS(CPPFLAGS, ${ansi_options})
-		  ])
-		  AC_MSG_CHECKING(appropriate _XOPEN_SOURCE value to define)
-		  define_xopen_source=""
-		  for tmp_xpg in 7 6 5; do
-		    if test x"$define_xopen_source" != x; then
-		        break
-		    fi
-		    # Both AC_TRY_CPP and AC_TRY_COMPILE should pass
-		    # because some options may not be set to CPPFLAGS.
-		    AC_TRY_CPP([
-			#define _XOPEN_SOURCE ${tmp_xpg}00
-			#include <unistd.h>
-			#ifndef _XPG${tmp_xpg}
-			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
-			#endif
-			], [
-			AC_TRY_COMPILE([
-			#define _XOPEN_SOURCE ${tmp_xpg}00
-			#include <unistd.h>
-			#ifndef _XPG${tmp_xpg}
-			#error _XPG${tmp_xpg} should be defined by _XOPEN_SOURCE=${tmp_xpg}00
-			#endif
-			], [],
-			[define_xopen_source=${tmp_xpg}00], [])
-			], [])
-		  done
-		  if test x"$define_xopen_source" = x; then
-		    define_xopen_source=no
-		  fi
-		  AC_MSG_RESULT($define_xopen_source)
-		  if test x"$define_xopen_source" != xno; then
-		    RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE=$define_xopen_source)
-		  fi
-		fi
-		],
-[haiku*], [
-		LIBS="$LIBS" # m lib is include in root
+[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
-		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_GNU_SOURCE)
 		AC_CHECK_FUNCS(cygwin_conv_path)
 		AC_LIBOBJ([langinfo])
 		],
@@ -1222,7 +1032,6 @@ main()
 		ac_cv_header_sys_time_h=no
 		ac_cv_header_sys_times_h=no
 		ac_cv_header_sys_socket_h=no
-		ac_cv_func_lstat=yes
 		ac_cv_func_times=yes
 		ac_cv_func_waitpid=yes
 		ac_cv_func_fsync=yes
@@ -1231,10 +1040,7 @@ main()
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		ac_cv_func_finite=yes
-		ac_cv_func_lchown=yes
 		ac_cv_func_link=yes
-		ac_cv_func_readlink=yes
-		ac_cv_func_symlink=yes
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_getpgrp_void=no
 		ac_cv_func_memcmp_working=yes
@@ -1249,20 +1055,18 @@ main()
                 ac_cv_func_clock_gettime=yes
                 ac_cv_func_clock_getres=yes
 		ac_cv_func_malloc_usable_size=no
-		AS_IF([test "$target_cpu" = x64], [
-		    ac_cv_func___builtin_setjmp=no
-		    ac_cv_func_round=no
-		])
+		{ test "$target_cpu" = x64 && ac_cv_func___builtin_setjmp=no; }
 		AC_CHECK_TYPE([NET_LUID], [], [],
-			      [@%:@include <winsock2.h>
+			      [@%:@include <windows.h>
 			      @%:@include <iphlpapi.h>])
 		if test x"$ac_cv_type_NET_LUID" = xyes; then
 		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
 		fi
 		AC_CHECK_FUNCS(_gmtime64_s)
-		AC_CHECK_FUNCS(_wfreopen_s)
 		AC_LIBOBJ([langinfo])
 		],
+[os2-emx*], [	LIBS="-lm $LIBS"
+		ac_cv_lib_dir_opendir=no],
 [bsdi*], [	LIBS="-lm $LIBS"
 		AC_DEFINE(BROKEN_SETREUID, 1)
 		AC_DEFINE(BROKEN_SETREGID, 1)
@@ -1280,16 +1084,16 @@ main()
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		],
-[aix*],[	LIBS="-lm $LIBS"
-		ac_cv_func_round=no
-		],
 [nacl], [
   LIBS="-lm $LIBS"
   if test "${nacl_cv_build_variant}" = "newlib"; then
     RUBY_APPEND_OPTION(CPPFLAGS, -DNACL_NEWLIB)
+    RUBY_APPEND_OPTION(LIBS, '-lnosys')
   else
     RUBY_APPEND_OPTION(XCFLAGS, -fPIC)
   fi
+  ac_cv_func_shutdown=no
+  ac_cv_func_fcntl=no
   ],
 [	LIBS="-lm $LIBS"])
 
@@ -1303,47 +1107,46 @@ AC_HEADER_DIRENT
 dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
 AC_HEADER_STDBOOL
 AC_HEADER_SYS_WAIT
-
-AC_CHECK_HEADERS(a.out.h)
-AC_CHECK_HEADERS(atomic.h)
-AC_CHECK_HEADERS(direct.h)
-AC_CHECK_HEADERS(grp.h)
-AC_CHECK_HEADERS(fcntl.h)
-AC_CHECK_HEADERS(float.h)
-AC_CHECK_HEADERS(ieeefp.h)
-AC_CHECK_HEADERS(intrinsics.h)
-AC_CHECK_HEADERS(langinfo.h)
-AC_CHECK_HEADERS(limits.h)
-AC_CHECK_HEADERS(locale.h)
-AC_CHECK_HEADERS(malloc.h)
-AC_CHECK_HEADERS(malloc/malloc.h)
-AC_CHECK_HEADERS(malloc_np.h)
-AC_CHECK_HEADERS(net/socket.h)
-AC_CHECK_HEADERS(process.h)
-AC_CHECK_HEADERS(pwd.h)
-AC_CHECK_HEADERS(setjmpex.h)
-AC_CHECK_HEADERS(sys/attr.h)
-AC_CHECK_HEADERS(sys/fcntl.h)
-AC_CHECK_HEADERS(sys/file.h)
-AC_CHECK_HEADERS(sys/id.h)
-AC_CHECK_HEADERS(sys/ioctl.h)
-AC_CHECK_HEADERS(sys/mkdev.h)
-AC_CHECK_HEADERS(sys/param.h)
-AC_CHECK_HEADERS(sys/prctl.h)
-AC_CHECK_HEADERS(sys/resource.h)
-AC_CHECK_HEADERS(sys/select.h)
-AC_CHECK_HEADERS(sys/sendfile.h)
-AC_CHECK_HEADERS(sys/socket.h)
-AC_CHECK_HEADERS(sys/syscall.h)
-AC_CHECK_HEADERS(sys/sysmacros.h)
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_HEADERS(sys/times.h)
-AC_CHECK_HEADERS(sys/uio.h)
-AC_CHECK_HEADERS(sys/utime.h)
-AC_CHECK_HEADERS(syscall.h)
-AC_CHECK_HEADERS(time.h)
-AC_CHECK_HEADERS(ucontext.h)
-AC_CHECK_HEADERS(utime.h)
+AC_CHECK_HEADERS( \
+  limits.h \
+  sys/file.h \
+  sys/ioctl.h \
+  sys/syscall.h \
+  fcntl.h \
+  sys/fcntl.h \
+  sys/param.h \
+  sys/select.h \
+  sys/time.h \
+  sys/times.h \
+  syscall.h \
+  pwd.h \
+  grp.h \
+  a.out.h \
+  utime.h \
+  direct.h \
+  sys/resource.h \
+  sys/mkdev.h \
+  sys/utime.h \
+  float.h \
+  ieeefp.h \
+  ucontext.h \
+  intrinsics.h \
+  langinfo.h \
+  locale.h \
+  sys/sendfile.h \
+  time.h \
+  net/socket.h \
+  sys/socket.h \
+  process.h \
+  sys/prctl.h \
+  sys/uio.h \
+  atomic.h \
+  malloc.h \
+  malloc_np.h \
+  malloc/malloc.h \
+  setjmpex.h \
+  sys/id.h
+)
 
 AC_ARG_WITH([gmp],
   [AS_HELP_STRING([--without-gmp],
@@ -1359,7 +1162,7 @@ AS_IF([test "x$with_gmp" != xno],
 
 AC_ARG_WITH([jemalloc],
   [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
-  [with_jemalloc=$withval], [with_jemalloc=no])
+  [with_jemalloc=yes], [with_jemalloc=no])
 AS_IF([test "x$with_jemalloc" = xyes],[
   AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
   AC_CHECK_HEADER(jemalloc/jemalloc.h, [
@@ -1380,6 +1183,7 @@ AS_IF([test "x$with_jemalloc" = xyes],[
   AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
     AC_DEFINE(JEMALLOC_MANGLE)
     with_jemalloc=yes
+    LIBS="-ljemalloc $LIBS"
   ])
   AS_IF([test "x$with_jemalloc" = xyes],
     [
@@ -1393,24 +1197,6 @@ dnl check for large file stuff
 mv confdefs.h confdefs1.h
 : > confdefs.h
 AC_SYS_LARGEFILE
-# On 32-bit Solaris, it is safe to define _LARGEFILE_SOURCE
-# which is not added by AC_SYS_LARGEFILE.
-if test x"$enable_largefile" != xno; then
-  AS_CASE(["$target_os"], [solaris*], [
-    AC_MSG_CHECKING([wheather _LARGEFILE_SOURCE should be defined])
-    AS_CASE(["${ac_cv_sys_file_offset_bits}:${ac_cv_sys_large_files}"],
-      ["64:"|"64:no"|"64:unknown"], [
-	# insert _LARGEFILE_SOURCE before _FILE_OFFSET_BITS line
-	# that is the same order as "getconf LFS_CFLAGS" output
-	mv confdefs.h largefile0.h
-	: > confdefs.h
-	AC_DEFINE(_LARGEFILE_SOURCE)
-	cat largefile0.h >> confdefs.h
-	rm largefile0.h
-	AC_MSG_RESULT([yes])
-      ], [AC_MSG_RESULT([no])])
-  ])
-fi
 mv confdefs.h largefile.h
 mv confdefs1.h confdefs.h
 cat largefile.h >> confdefs.h
@@ -1424,7 +1210,7 @@ AS_CASE(["$target_os"],
 	[
 	    # AIX currently does not support a 32-bit call to posix_fadvise()
 	    # if _LARGE_FILES is defined.
-	    ac_cv_func_posix_fadvise=no
+	    ac_cv_posix_fadvise=no
 	])
     ])
 
@@ -1448,12 +1234,6 @@ AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
 
 dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
 AC_DEFUN([RUBY_CHECK_SIZEOF],
-[dnl
-AS_VAR_PUSHDEF([rbcv_var], [rbcv_sizeof_var])dnl
-AS_VAR_PUSHDEF([cond], [rbcv_sizeof_cond])dnl
-AS_VAR_PUSHDEF([t], [rbcv_sizeof_type])dnl
-AS_VAR_PUSHDEF([s], [rbcv_sizeof_size])dnl
-]
 [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)
@@ -1471,12 +1251,7 @@ static ac__type_sizeof_ *rbcv_ptr;
 		AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t)
 		break])
     done
-    }], [
-	AC_COMPUTE_INT([AS_TR_SH(ac_cv_sizeof_$1)], [AS_TR_CPP(SIZEOF_$1)],
-	    [AC_INCLUDES_DEFAULT([$4])
-$rbcv_var],
-	    [AS_TR_SH(ac_cv_sizeof_$1)=])
-    ])
+    }])
     unset cond
     m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
     for s in 32 64 128; do
@@ -1492,22 +1267,11 @@ $rbcv_var],
 	    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}"; continue])
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
-[
-@%:@if AS_TR_CPP(HAVE_$1)
-$rbcv_var
-@%:@else
-@%:@define AS_TR_CPP(SIZEOF_$1) 0
-@%:@endif
-],
-		    [AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == (m4_bmatch([$2], [^[0-9][0-9]*$], [$2], [($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}m4_bmatch([$2], [^[0-9][0-9]*$], [:$2])"])
+				[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
     }])
-    test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@@<:@1-9@:>@}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" &&
     m4_ifval([$2][$3],
 	[test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@SIZEOF_}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" && ]){
     test "$universal_binary" = yes && cross_compiling=yes
@@ -1532,14 +1296,13 @@ ${cond+@%:@endif}
 	AS_CASE(["$t"],
 	[[[0-9]*|SIZEOF_*]], [
 	    ${cond+echo "@%:@else"}
-	    echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) $t"
+	    echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]"
 	    break
 	    ],
 	[
 	    s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']`
-	    AS_CASE([$t], [*:*], [t="${t%:*}"], [s=`expr $s / $rb_cv_char_bit`])
 	    echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)"
-	    echo "@%:@define AS_TR_CPP(SIZEOF_$1) $s"
+	    echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]"
 	    cond=1
 	    ])
     done
@@ -1548,18 +1311,14 @@ ${cond+@%:@endif}
 m4_bmatch([$1], [\.], [], [else
 AC_CHECK_SIZEOF([$1], 0, [$4])
 fi])
-AS_VAR_POPDEF([rbcv_var])dnl
-AS_VAR_POPDEF([cond])dnl
-AS_VAR_POPDEF([t])dnl
-AS_VAR_POPDEF([s])dnl
 ])
 
 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, [8], [ILP LP])
-RUBY_CHECK_SIZEOF(__int128, [16], [ILP LP])
+RUBY_CHECK_SIZEOF(__int64)
+RUBY_CHECK_SIZEOF(__int128)
 RUBY_CHECK_SIZEOF(off_t)
 RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
 RUBY_CHECK_SIZEOF(float)
@@ -1616,7 +1375,7 @@ elif test "x$ac_cv_type___int64" = xyes; then
     RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
 fi
 
-dnl RUBY_CHECK_SIGNEDNESS [typename] [if-signed] [if-unsigned] [included]
+dnl RUBY_CHECK_SIZEOF [typename] [if-signed] [if-unsigned] [included]
 AC_DEFUN([RUBY_CHECK_SIGNEDNESS], [dnl
     AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($1)-1 > 0])],
 		      [$3], [$2])])
@@ -1657,16 +1416,7 @@ AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
 	  [
 	    t=INT])
 	rb_cv_[$1]_convertible=${u}${t}])
-    if test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes"; then
-	n="$1"
-    else
-	AS_CASE(["${rb_cv_[$1]_convertible}"],
-		[*LL], [n="long long"],
-		[*LONG], [n="long"],
-		[n="int"])
-	AS_CASE(["${rb_cv_[$1]_convertible}"],
-		[U*], [n="unsigned $n"])
-    fi
+    test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes" && n="$1"
     AS_CASE("${rb_cv_[$1]_convertible}", [U*], [u=+1], [u=-1])
     AC_DEFINE_UNQUOTED(rb_[$1], $n)
     AC_DEFINE_UNQUOTED([SIGNEDNESS_OF_]AS_TR_CPP($1), $u)
@@ -1788,20 +1538,19 @@ EOH
 ])dnl
 ])dnl
 
-dnl RUBY_DECL_ATTRIBUTE(attrib, macroname, cachevar, condition, type, code)
-AC_DEFUN([RUBY_DECL_ATTRIBUTE], [dnl
+dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
+AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
 m4_ifval([$2], dnl
-  [AS_VAR_PUSHDEF([attrib], m4_bpatsubst([$2], [(.*)], []))], dnl
-  [AS_VAR_PUSHDEF([attrib], m4_toupper(m4_format(%.4s, [$5]))[_]AS_TR_CPP($1))] dnl
+  [AS_VAR_PUSHDEF([attrib],[$2])], dnl
+  [AS_VAR_PUSHDEF([attrib],[FUNC_]AS_TR_CPP($1))] dnl
 )dnl
 m4_ifval([$3], dnl
   [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
-  [AS_VAR_PUSHDEF([rbcv],[rb_cv_]m4_format(%.4s, [$5])[_][$1])]dnl
+  [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
 )dnl
-m4_pushdef([attrib_code],[m4_bpatsubst([$1],["],[\\"])])dnl
-m4_pushdef([attrib_params],[m4_bpatsubst([$2(x)],[^[^()]*(\([^()]*\)).*],[\1])])dnl
+m4_pushdef([attrib_code],[m4_bpatsubst([$1],["],[\\"])])
 m4_ifval([$4], [rbcv_cond=["$4"]; test "$rbcv_cond" || unset rbcv_cond])
-AC_CACHE_CHECK(for m4_ifval([$2],[m4_bpatsubst([$2], [(.*)], [])],[$1]) [$5] attribute, rbcv, dnl
+AC_CACHE_CHECK(for m4_ifval([$2],[$2],[$1]) function attribute, rbcv,
 [rbcv=x
 RUBY_WERROR_FLAG([
 for mac in \
@@ -1812,64 +1561,31 @@ for mac in \
   m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
   AC_TRY_COMPILE(
     m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
-[@%:@define ]attrib[](attrib_params)[ $mac]
+[@%:@define ]attrib[(x) $mac]
 m4_ifval([$4],${rbcv_cond+[@%:@else]}
-${rbcv_cond+[@%:@define ]attrib[](attrib_params)[ x]}
+${rbcv_cond+[@%:@define ]attrib[(x) x]}
 ${rbcv_cond+[@%:@endif]})
-$6
-@%:@define mesg ("")
-    attrib[](attrib_params)[;], [],
+    attrib[(void conftest_attribute_check(void));], [],
     [rbcv="$mac"; break])
 done
 ])])
 if test "$rbcv" != x; then
-    RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[](attrib_params)[], $rbcv)
+    RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[(x)], $rbcv)
 fi
 m4_ifval([$4], [unset rbcv_cond]) dnl
-m4_popdef([attrib_params])dnl
-m4_popdef([attrib_code])dnl
 AS_VAR_POPDEF([attrib])dnl
 AS_VAR_POPDEF([rbcv])dnl
 ])
 
-dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
-AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
-    RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4],
-	[function], [@%:@define x int conftest_attribute_check(void)]
-    )
-])
-
-dnl RUBY_TYPE_ATTRIBUTE(attrib, macroname, cachevar, condition)
-AC_DEFUN([RUBY_TYPE_ATTRIBUTE], [dnl
-    RUBY_DECL_ATTRIBUTE([$1], [$2], [$3], [$4],
-	[type], [
-@%:@define x struct conftest_attribute_check {int i;}
-])
-])
-
-RUBY_FUNC_ATTRIBUTE(__const__, CONSTFUNC)
-RUBY_FUNC_ATTRIBUTE(__pure__, PUREFUNC)
-RUBY_FUNC_ATTRIBUTE(__noreturn__, NORETURN)
-RUBY_FUNC_ATTRIBUTE(__deprecated__, DEPRECATED)
-RUBY_FUNC_ATTRIBUTE(__deprecated__("by "@%:@n), DEPRECATED_BY(n,x), rb_cv_func_deprecated_by)
-RUBY_TYPE_ATTRIBUTE(__deprecated__ mesg, DEPRECATED_TYPE(mesg,x), rb_cv_type_deprecated)
-RUBY_FUNC_ATTRIBUTE(__noinline__, NOINLINE)
-RUBY_FUNC_ATTRIBUTE(__always_inline__, ALWAYS_INLINE)
-RUBY_FUNC_ATTRIBUTE(__warn_unused_result__, WARN_UNUSED_RESULT)
-RUBY_FUNC_ATTRIBUTE(__unused__, MAYBE_UNUSED)
-RUBY_FUNC_ATTRIBUTE(__error__ mesg, ERRORFUNC(mesg,x), rb_cv_func___error__)
-RUBY_FUNC_ATTRIBUTE(__warning__ mesg, WARNINGFUNC(mesg,x), rb_cv_func___warning__)
-RUBY_FUNC_ATTRIBUTE(__weak__, WEAK, rb_cv_func_weak)
-if test "$rb_cv_func_weak" != x; then
-   AC_DEFINE(HAVE_FUNC_WEAK)
-fi
+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__,  FUNC_STDCALL,  rb_cv_func_stdcall,  ${if_i386})
-RUBY_FUNC_ATTRIBUTE(__cdecl__,    FUNC_CDECL,    rb_cv_func_cdecl,    ${if_i386})
-RUBY_FUNC_ATTRIBUTE(__fastcall__, FUNC_FASTCALL, rb_cv_func_fastcall, ${if_i386})
-RUBY_FUNC_ATTRIBUTE(__optimize__("O0"), FUNC_UNOPTIMIZED, rb_cv_func_unoptimized)
-RUBY_FUNC_ATTRIBUTE(__optimize__("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized)
+RUBY_FUNC_ATTRIBUTE(stdcall,  [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(cdecl,    [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(optimize("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized)
 
 if test "$GCC" = yes; then
     AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
@@ -1894,7 +1610,6 @@ if test "$GCC" = yes; then
 			__atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST);
 			__atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST);
 			__atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST);
-			__atomic_or_fetch(&atomic_var, 1, __ATOMIC_SEQ_CST);
 		    ],
 		    [rb_cv_gcc_atomic_builtins=yes],
 		    [rb_cv_gcc_atomic_builtins=no])])
@@ -1909,8 +1624,6 @@ if test "$GCC" = yes; then
 			__sync_lock_test_and_set(&atomic_var, 1);
 			__sync_fetch_and_add(&atomic_var, 1);
 			__sync_fetch_and_sub(&atomic_var, 1);
-			__sync_or_and_fetch(&atomic_var, 1);
-			__sync_val_compare_and_swap(&atomic_var, 0, 1);
 		    ],
 		    [rb_cv_gcc_sync_builtins=yes],
 		    [rb_cv_gcc_sync_builtins=no])])
@@ -1934,7 +1647,7 @@ fi
 AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
 rb_cv_func_exported=no
 RUBY_WERROR_FLAG([
-for mac in '__attribute__ ((__visibility__("default")))' '__declspec(dllexport)'; do
+for mac in '__attribute__ ((visibility("default")))' '__declspec(dllexport)'; do
   AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern
     RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [],
     [rb_cv_func_exported="$mac"; break])
@@ -1962,32 +1675,6 @@ if test "$rb_cv_function_name_string" != no; then
     AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string])
 fi
 
-AC_CACHE_CHECK(if enum over int is allowed, rb_cv_enum_over_int, [
-    rb_cv_enum_over_int=no
-    if test "x$ac_cv_type_long_long" = xyes; then
-	type="unsigned long long" max="ULLONG_MAX"
-    else
-	type="unsigned long" max="ULONG_MAX"
-    fi
-    RUBY_WERROR_FLAG([
-        AC_COMPILE_IFELSE([
-            AC_LANG_BOOL_COMPILE_TRY([
-                    @%:@include <limits.h>
-                    enum {conftest_max = $max};
-                ], [
-                    (conftest_max == $max) &&
-                    (sizeof(conftest_max) == sizeof($type))
-                ]
-	    )],
-	    [rb_cv_enum_over_int=yes],
-	    [rb_cv_enum_over_int=no]
-	)
-    ])
-])
-if test $rb_cv_enum_over_int = yes; then
-    AC_DEFINE(ENUM_OVER_INT, 1)
-fi
-
 dnl Check whether we need to define sys_nerr locally
 AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
 @%:@include <errno.h>])
@@ -2021,11 +1708,10 @@ RUBY_CHECK_PRINTF_PREFIX(ptrdiff_t, t)
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
 AC_STRUCT_ST_RDEV
-RUBY_CHECK_SIZEOF([struct stat.st_size], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
+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], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
+    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>])
 fi
-RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
 AC_CHECK_MEMBERS([struct stat.st_atim])
 AC_CHECK_MEMBERS([struct stat.st_atimespec])
 AC_CHECK_MEMBERS([struct stat.st_atimensec])
@@ -2089,10 +1775,8 @@ if test "$rb_cv_large_fd_select" = yes; then
     AC_DEFINE(HAVE_RB_FD_INIT, 1)
 fi
 
-dnl RUBY_DEFINT TYPENAME, SIZE, [UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
+dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
 AC_DEFUN([RUBY_DEFINT], [dnl
-AS_VAR_PUSHDEF([cond], [rb_defint_cond])dnl
-AS_VAR_PUSHDEF([type], [rb_defint_type])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;])],
@@ -2103,30 +1787,19 @@ typedef $1 t; int s = sizeof(t) == 42;])],
     ["$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"],
-    ["${ac_cv_sizeof___int128@%:@*:}"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"],
+    ["$ac_cv_sizeof___int64"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64"],
+    ["$ac_cv_sizeof___int128"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"],
     [ rb_cv_type_$1=no])])])
 if test "${rb_cv_type_$1}" != no; then
-    type="${rb_cv_type_$1@%:@@%:@unsigned }"
-    AS_IF([test "$type" != yes && eval 'test -n "${ac_cv_sizeof_'$type'+set}"'], [
-	eval cond='"${ac_cv_sizeof_'$type'}"'
-	AS_CASE([$cond], [*:*], [
-	    cond=AS_TR_CPP($type)
-	    echo "@%:@if defined SIZEOF_"$cond" && SIZEOF_"$cond" > 0" >> confdefs.h
-	], [cond=])
-    ], [cond=])
     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([$type]))
+	AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1]))
     fi
-    test -n "$cond" && echo "@%:@endif /* $cond */" >> confdefs.h
 fi
-AS_VAR_POPDEF([cond])dnl
-AS_VAR_POPDEF([type])dnl
 ])
 
 RUBY_DEFINT(int8_t, 1)
@@ -2254,7 +1927,6 @@ AC_REPLACE_FUNCS(cbrt)
 AC_REPLACE_FUNCS(crypt)
 AC_REPLACE_FUNCS(dup2)
 AC_REPLACE_FUNCS(erf)
-AC_REPLACE_FUNCS(explicit_bzero)
 AC_REPLACE_FUNCS(ffs)
 AC_REPLACE_FUNCS(finite)
 AC_REPLACE_FUNCS(flock)
@@ -2292,46 +1964,17 @@ else
   AC_LIBOBJ([signbit])
 fi
 
-AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [
-    AC_TRY_RUN([
-@%:@include <string.h>
-
-int
-main(int argc, char **argv)
-{
-    const char *str = "hogefugafoobar";
-    const char *rs = "foo";
-    const char *empty = "";
-    char *p;
-
-    p = memmem(str, strlen(str), rs, strlen(rs));
-    if (p == str+8) {
-	p = memmem(str, strlen(str), empty, strlen(empty));
-	if (p == str)
-	    return 0;
-    }
-    return 1;
-}
-    ],
-    rb_cv_broken_memmem=no,
-    rb_cv_broken_memmem=yes,
-    rb_cv_broken_memmem=yes)
-])
-test x"$rb_cv_broken_memmem" = xyes && ac_cv_func_memmem=no
-
 AC_FUNC_FORK
 
 AC_CHECK_FUNCS(__syscall)
 AC_CHECK_FUNCS(_longjmp)		# used for AC_ARG_WITH(setjmp-type)
-# we don't use _setjmp if _longjmp doesn't exist.
-test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
-AC_CHECK_FUNCS(arc4random_buf)
+AC_CHECK_FUNCS(_setjmp)			# used for AC_ARG_WITH(setjmp-type)
+AC_CHECK_FUNCS(_setjmpex)		# used for AC_ARG_WITH(setjmp-type)
 AC_CHECK_FUNCS(atan2l atan2f)
 AC_CHECK_FUNCS(chroot)
 AC_CHECK_FUNCS(chsize)
 AC_CHECK_FUNCS(clock_gettime)
 AC_CHECK_FUNCS(cosh)
-AC_CHECK_FUNCS(crypt_r)
 AC_CHECK_FUNCS(daemon)
 AC_CHECK_FUNCS(dirfd)
 AC_CHECK_FUNCS(dl_iterate_phdr)
@@ -2345,15 +1988,12 @@ AC_CHECK_FUNCS(fchmod)
 AC_CHECK_FUNCS(fchown)
 AC_CHECK_FUNCS(fcntl)
 AC_CHECK_FUNCS(fdatasync)
-AC_CHECK_FUNCS(fgetattrlist)
 AC_CHECK_FUNCS(fmod)
 AC_CHECK_FUNCS(fsync)
 AC_CHECK_FUNCS(ftruncate)
 AC_CHECK_FUNCS(ftruncate64)		# used for Win32 platform
-AC_CHECK_FUNCS(getattrlist)
 AC_CHECK_FUNCS(getcwd)
 AC_CHECK_FUNCS(getgidx)
-AC_CHECK_FUNCS(getgrnam)
 AC_CHECK_FUNCS(getgrnam_r)
 AC_CHECK_FUNCS(getgroups)
 AC_CHECK_FUNCS(getpgid)
@@ -2383,12 +2023,9 @@ AC_CHECK_FUNCS(malloc_usable_size)
 AC_CHECK_FUNCS(malloc_size)
 AC_CHECK_FUNCS(mblen)
 AC_CHECK_FUNCS(memalign)
-AC_CHECK_FUNCS(memset_s)
 AC_CHECK_FUNCS(writev)
 AC_CHECK_FUNCS(memrchr)
 AC_CHECK_FUNCS(memmem)
-AC_CHECK_FUNCS(mkfifo)
-AC_CHECK_FUNCS(mknod)
 AC_CHECK_FUNCS(mktime)
 AC_CHECK_FUNCS(pipe2)
 AC_CHECK_FUNCS(poll)
@@ -2397,10 +2034,8 @@ AC_CHECK_FUNCS(posix_memalign)
 AC_CHECK_FUNCS(ppoll)
 AC_CHECK_FUNCS(pread)
 AC_CHECK_FUNCS(qsort_r)
-AC_CHECK_FUNCS(qsort_s)
 AC_CHECK_FUNCS(readlink)
 AC_CHECK_FUNCS(round)
-AC_CHECK_FUNCS(sched_getaffinity)
 AC_CHECK_FUNCS(seekdir)
 AC_CHECK_FUNCS(select_large_fdset)
 AC_CHECK_FUNCS(sendfile)
@@ -2441,9 +2076,6 @@ AC_CHECK_FUNCS(utimes)
 AC_CHECK_FUNCS(wait4)
 AC_CHECK_FUNCS(waitpid)
 
-AS_IF([test "$ac_cv_func_memset_s" = yes],
-    [RUBY_DEFINE_IF([!defined __STDC_WANT_LIB_EXT1__], [__STDC_WANT_LIB_EXT1__], 1)])
-
 AS_IF([test "$ac_cv_func_getcwd" = yes], [
     AC_CACHE_CHECK(if getcwd allocates buffer if NULL is given, [rb_cv_getcwd_malloc],
 	[AC_TRY_RUN([
@@ -2475,16 +2107,10 @@ main(int argc, char **argv)
     AS_IF([test "$rb_cv_getcwd_malloc" = no], [AC_DEFINE(NO_GETCWD_MALLOC, 1)])
 ])
 
-AS_IF([test "$ac_cv_func_crypt_r" = yes],
-    [AC_CHECK_HEADERS(crypt.h)])
-AS_IF([test "$ac_cv_func_crypt_r:$ac_cv_header_crypt_h" = yes:yes],
-    [AC_CHECK_MEMBERS([struct crypt_data.initialized], [], [],
-		      [AC_INCLUDES_DEFAULT([@%:@include <crypt.h>])])])
-
 AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl
 AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1),
   [AC_LINK_IFELSE(
-    [AC_LANG_PROGRAM([int foo;], [$2;])],
+    [AC_LANG_PROGRAM([], [$2;])],
     [AS_TR_SH(rb_cv_builtin_$1)=yes],
     [AS_TR_SH(rb_cv_builtin_$1)=no])])
 if test "${AS_TR_SH(rb_cv_builtin_$1)}" != no; then
@@ -2493,24 +2119,10 @@ fi])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap16, [__builtin_bswap16(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap32, [__builtin_bswap32(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap64, [__builtin_bswap64(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_popcount, [__builtin_popcount(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_popcountll, [__builtin_popcountll(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_ctz, [__builtin_ctz(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_ctzll, [__builtin_ctzll(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_constant_p, [__builtin_constant_p(0)])
-RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [
-    [int x[__extension__(__builtin_choose_expr(1, 1, -1))]];
-    [int y[__extension__(__builtin_choose_expr(0, -1, 1))]];
-    ])
-if test x$rb_cv_builtin___builtin_choose_expr = xyes; then
-    RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [
-    [int x[__extension__(__builtin_choose_expr(__builtin_constant_p(1), 1, -1))]];
-    [int y[__extension__(__builtin_choose_expr(__builtin_constant_p(foo), -1, 1))]];
-    ])
-fi
+RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [__builtin_choose_expr(0, 0, 0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)])
 
 if test "$ac_cv_func_qsort_r" != no; then
@@ -2536,9 +2148,6 @@ void qsort_r(void *base, size_t nmemb, size_t size,
   AS_CASE("$rb_cv_gnu_qsort_r:$rb_cv_bsd_qsort_r",
   [yes:no], [
     AC_DEFINE(HAVE_GNU_QSORT_R, 1)
-  ],
-  [no:yes], [
-    AC_DEFINE(HAVE_BSD_QSORT_R, 1)
   ])
 fi
 
@@ -2571,47 +2180,6 @@ main(int argc, char **argv)
 ])
 AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)])
 
-AS_IF([test "x$ac_cv_func_lgamma_r" = xyes], [
-    AC_CACHE_CHECK(whether lgamma_r handles +0.0 and -0.0, rb_cv_lgamma_r_pm0, [
-	AC_TRY_RUN([
-@%:@include <math.h>
-@%:@ifdef HAVE_UNISTD_H
-@%:@include <unistd.h>
-@%:@endif
-@%:@ifndef EXIT_SUCCESS
-@%:@define EXIT_SUCCESS 0
-@%:@endif
-@%:@ifndef EXIT_FAILURE
-@%:@define EXIT_FAILURE 1
-@%:@endif
-
-int
-main(int argc, char **argv)
-{
-    int sign = 0;
-    double x = lgamma_r(-0.0, &sign);
-
-    /* should be [+inf, -1] */
-    if (x <= 0) return EXIT_FAILURE;
-    if (!isinf(x)) return EXIT_FAILURE;
-    if (sign != -1) return EXIT_FAILURE;
-
-    /* should be [+inf, 1] */
-    x = lgamma_r(+0.0, &sign);
-    if (x <= 0) return EXIT_FAILURE;
-    if (!isinf(x)) return EXIT_FAILURE;
-    if (sign != 1) return EXIT_FAILURE;
-    return EXIT_SUCCESS;
-}
-],
-	[rb_cv_lgamma_r_pm0=yes],
-	[rb_cv_lgamma_r_pm0=no],
-	[rb_cv_lgamma_r_pm0=yes]
-	)
-    ])
-    AS_IF([test "x$rb_cv_lgamma_r_pm0" = xno], [AC_DEFINE(LGAMMA_R_PM0_FIX)])
-])
-
 # Some platform need -lrt for clock_gettime, but the other don't.
 if test x"$ac_cv_func_clock_gettime" != xyes; then
     # glibc 2.17 moves clock_* functions from librt to the main C library.
@@ -2634,21 +2202,12 @@ if test "$rb_cv_unsetenv_return_value" = no; then
 fi
 
 # used for AC_ARG_WITH(setjmp-type)
-AC_DEFUN([RUBY_CHECK_SETJMP], [
-AC_CACHE_CHECK([for ]$1[ as a macro or function], ac_cv_func_$1,
+AC_CACHE_CHECK(for sigsetjmp as a macro or function, ac_cv_func_sigsetjmp,
   [AC_TRY_COMPILE([
-@%:@include <setjmp.h>
-]AC_INCLUDES_DEFAULT([$3])[
-@%:@define JMPARGS_1 env
-@%:@define JMPARGS_2 env,1
-@%:@define JMPARGS JMPARGS_]m4_ifval($2,2,1)[
-],
-    m4_ifval($2,$2,jmp_buf)[ env; $1(JMPARGS);],
-    ac_cv_func_$1=yes,
-    ac_cv_func_$1=no)]
-)
-AS_IF([test "$ac_cv_func_]$1[" = yes], [AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)])
-])
+#include <setjmp.h>
+], [sigjmp_buf env; sigsetjmp(env,1);],
+	ac_cv_func_sigsetjmp=yes,
+	ac_cv_func_sigsetjmp=no)])
 
 AC_DEFUN([RUBY_CHECK_BUILTIN_SETJMP], [
 if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
@@ -2662,9 +2221,6 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
 	[AC_TRY_LINK([@%:@include <setjmp.h>
 	    @%:@include <stdio.h>
 	    jmp_buf jb;
-	    @%:@ifdef NORETURN
-	    NORETURN(void t(void));
-	    @%:@endif
 	    void t(void) {__builtin_longjmp($cast jb, 1);}
 	    int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}],
 	    [
@@ -2677,11 +2233,11 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
     done])
 ])
 
+# we don't use _setjmp if _longjmp doesn't exist.
+test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
+
 AC_DEFUN([RUBY_SETJMP_TYPE], [
 RUBY_CHECK_BUILTIN_SETJMP
-RUBY_CHECK_SETJMP(_setjmpex, [], [@%:@include <setjmpex.h>])
-RUBY_CHECK_SETJMP(_setjmp)
-RUBY_CHECK_SETJMP(sigsetjmp, [sigjmp_buf])
 AC_MSG_CHECKING(for setjmp type)
 setjmp_suffix=
 AC_ARG_WITH(setjmp-type,
@@ -2700,7 +2256,7 @@ if test ${setjmp_prefix+set}; then
     if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp${setjmp_suffix} = no; then
 	AC_MSG_ERROR(${setjmp_prefix}setjmp${setjmp_suffix} is not available)
     fi
-elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]) }; then
+elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]); }; then
     setjmp_cast=`expr "$ac_cv_func___builtin_setjmp" : "yes with cast (\(.*\))"`
     setjmp_prefix=__builtin_
     setjmp_suffix=
@@ -2726,7 +2282,6 @@ AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cas
 AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
 AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
 AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
-AS_IF([test x$setjmp_suffix = xex], [AC_DEFINE_UNQUOTED(RUBY_USE_SETJMPEX, 1)])
 ])
 # End of setjmp check.
 
@@ -2739,11 +2294,7 @@ if test "$use_setreuid" = yes; then
 fi
 AC_STRUCT_TIMEZONE
 AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
-  [AC_TRY_COMPILE([
-@%:@define _BSD_SOURCE
-@%:@define _DEFAULT_SOURCE
-@%:@include <time.h>
-   ],
+  [AC_TRY_COMPILE([@%:@include <time.h>],
     [struct tm t; t.tm_gmtoff = 3600;],
   [rb_cv_member_struct_tm_tm_gmtoff=yes],
   [rb_cv_member_struct_tm_tm_gmtoff=no])])
@@ -2915,8 +2466,6 @@ main()
   fi
 fi
 
-AC_CHECK_TYPES([sig_t],[],[],[@%:@include <signal.h>])
-
 if test "$ac_cv_func_getpgid" = no; then
   # AC_FUNC_GETPGRP fails when cross-compiling with old autoconf.
   # autoconf is changed between 2.52d and 2.52f?
@@ -2931,14 +2480,6 @@ if test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes; then
 AC_FUNC_SETPGRP
 fi
 
-if test x"$ac_cv_func_dirfd" = xno; then
-  AS_CASE(["$target_os"],[solaris*],
-          [AC_CHECK_MEMBERS([DIR.d_fd, DIR.dd_fd],,,[
-#include <sys/types.h>
-#include <dirent.h>
-])])
-fi
-
 if test x"$target_cpu" = xia64; then
     AC_LIBOBJ([ia64])
     AC_CACHE_CHECK(for __libc_ia64_register_backing_store_base,
@@ -2968,6 +2509,8 @@ if test x"$ac_cv_func_gettimeofday" != xyes; then
     AC_MSG_ERROR(gettimeofday() must exist)
 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
   AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
@@ -3080,18 +2623,16 @@ if test x"$enable_pthread" = xyes; then
 	AC_DEFINE(NON_SCALAR_THREAD_ID)
     fi
     AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
-	pthread_attr_get_np pthread_attr_getstack\
+	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 \
 	pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
-	pthread_sigmask pthread_setname_np pthread_set_name_np)
-    AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)])
+	pthread_sigmask pthread_setname_np)
     if test "${host_os}" = "nacl"; then
       ac_cv_func_pthread_attr_init=no
     else
       AC_CHECK_FUNCS(pthread_attr_init)
     fi
-    set_current_thread_name=
     if test "$ac_cv_func_pthread_setname_np" = yes; then
 	AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments],
 	    [rb_cv_func_pthread_setname_np_arguments=
@@ -3117,46 +2658,13 @@ if test x"$enable_pthread" = xyes; then
 	    ]
 	)
 	if test -n "${rb_cv_func_pthread_setname_np_arguments}"; then
-	    set_current_thread_name="pthread_setname_np${rb_cv_func_pthread_setname_np_arguments}"
+	    AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), pthread_setname_np${rb_cv_func_pthread_setname_np_arguments})
+	else
+	    AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), (void)0)
 	fi
-    elif test "$ac_cv_func_pthread_set_name_np" = yes; then
-	set_current_thread_name="pthread_set_name_np(pthread_self(), name)"
-    fi
-    AS_IF([test -n "$set_current_thread_name"], [
-	AC_DEFINE_UNQUOTED(SET_CURRENT_THREAD_NAME(name), $set_current_thread_name)
-	AS_CASE([$set_current_thread_name],
-	    [*'pthread_self()'*], [
-		set_another_thread_name=`echo "$set_current_thread_name" | sed 's/pthread_self()/thid/'`
-		AC_DEFINE_UNQUOTED(SET_ANOTHER_THREAD_NAME(thid,name), $set_another_thread_name)
-	    ])
-    ])
-fi
-
-if test x"$ac_cv_header_ucontext_h" = xno; then
-    AC_CACHE_CHECK([if signal.h defines ucontext_t], [rb_cv_ucontext_in_signal_h],
-	[AC_TRY_COMPILE([@%:@include <signal.h>],
-	[size_t size = sizeof(ucontext_t);],
-	[rb_cv_ucontext_in_signal_h=yes], [rb_cv_ucontext_in_signal_h=no])])
-    if test x"$rb_cv_ucontext_in_signal_h" = xyes; then
-	    AC_DEFINE_UNQUOTED(UCONTEXT_IN_SIGNAL_H, 1)
     fi
 fi
-if test x"$ac_cv_header_ucontext_h" = xyes -o x"$rb_cv_ucontext_in_signal_h" = xyes; then
-    AC_CACHE_CHECK([if mcontext_t is a pointer], [rb_cv_mcontext_t_ptr],
-	[AC_TRY_COMPILE([
-	    @%:@include <signal.h>
-	    @%:@ifdef HAVE_UCONTEXT_H
-	    @%:@include <ucontext.h>
-	    @%:@endif
-        mcontext_t test(mcontext_t mc) {return mc+1;}
-	],
-	[test(0);],
-	[rb_cv_mcontext_t_ptr=yes], [rb_cv_mcontext_t_ptr=no])])
-    if test x"$rb_cv_mcontext_t_ptr" = xyes; then
-	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t mc = (uc)->uc_mcontext)
-    else
-	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t *mc = &(uc)->uc_mcontext)
-    fi
+if test x"$ac_cv_header_ucontext_h" = xyes; then
     if test x"$rb_with_pthread" = xyes; then
 	AC_CHECK_FUNCS(getcontext setcontext)
     fi
@@ -3246,8 +2754,8 @@ AC_ARG_WITH(dln-a-out,
 
 AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
 [AC_TRY_LINK([],[], [
-AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
-[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+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
@@ -3280,7 +2788,6 @@ AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
 AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
-AC_SUBST(ASMEXT, S)dnl
 
 STATIC=
 : ${PATHFLAG=''}
@@ -3299,7 +2806,7 @@ if test "$with_dln_a_out" != yes; then
       # 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)],
-    [bsdi*|cygwin*|mingw*|aix*|interix*], [ ],
+    [bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ],
     [
       RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
   else
@@ -3336,10 +2843,6 @@ if test "$with_dln_a_out" != yes; then
 			fi
 			if test "$ac_cv_sizeof_voidp" = 8; then
 			    : ${LIBPATHENV=LD_LIBRARY_PATH_64}
-			    : ${PRELOADENV=LD_PRELOAD_64}
-			else
-			    : ${LIBPATHENV=LD_LIBRARY_PATH_32}
-			    : ${PRELOADENV=LD_PRELOAD_32}
 			fi
 			rb_cv_dlopen=yes],
 	[sunos*], [	: ${LDSHARED='$(LD) -assert nodefinitions'}
@@ -3357,7 +2860,7 @@ if test "$with_dln_a_out" != yes; then
 	[bsdi3*], [	AS_CASE(["$CC"],
 			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
 					rb_cv_dlopen=yes])],
-	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu | haiku*], [
+	[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"
@@ -3384,7 +2887,14 @@ if test "$with_dln_a_out" != yes; then
 	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
-			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
+			# /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 2>/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
 			rb_cv_dlopen=yes],
         [aix*], [	: ${LDSHARED='$(CC)'}
 			LDSHARED="$LDSHARED ${linker_flag}-G"
@@ -3397,6 +2907,31 @@ if test "$with_dln_a_out" != yes; then
 			: ${LIBPATHENV=LIBPATH}
 			RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
 			rb_cv_dlopen=yes],
+	[beos*], [	AS_CASE(["$target_cpu"],
+			  [powerpc*], [
+			    : ${LDSHARED='$(LD) -xms'}
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
+			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+			    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_ -lroot"
+			    LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lroot"
+			    ])
+			: ${LIBPATHENV=LIBRARY_PATH}
+			rb_cv_dlopen=yes],
+	[haiku*], [	AS_CASE(["$target_cpu"],
+			  [powerpc*], [
+			    : ${LDSHARED='$(LD) -xms'}
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
+			    DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+                            ],
+			  [i586*], [
+			    : ${LDSHARED='$(CC) -shared'}
+			    ])
+			: ${LIBPATHENV=LIBRARY_PATH}
+			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"
@@ -3406,11 +2941,12 @@ if test "$with_dln_a_out" != yes; then
 			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
 			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
 			: ${LIBPATHENV=""}
-			: ${PRELOADENV=""}
 			rb_cv_dlopen=yes],
 	[hiuxmpp], [	: ${LDSHARED='$(LD) -r'}],
 	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
 			rb_cv_dlopen=yes],
+	[os2-emx*], [	LDFLAGS="$LDFLAGS -Zomf"
+			],
         [nacl], [ LDSHARED='$(CC) -shared' ],
 	[	: ${LDSHARED='$(LD)'}])
   AC_MSG_RESULT($rb_cv_dlopen)
@@ -3422,7 +2958,7 @@ if test "$with_dln_a_out" != yes; then
 	  "-undefined dynamic_lookup" \
 	  "-multiply_defined suppress" \
 	  ; do
-	  test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
+	  test "x${linker_flag}" = x || flag="${linker_flag}${flag// /,}"
 	  RUBY_TRY_LDFLAGS([$flag], [], [flag=])
 	  if test "x$flag" != x; then
 	    RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
@@ -3467,7 +3003,6 @@ AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
 AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
-AC_SUBST(PRELOADENV, "${PRELOADENV-LD_PRELOAD}")
 AC_SUBST(TRY_LINK)
 
 if test "x$OPT_DIR" != x; then
@@ -3477,29 +3012,23 @@ if test "x$OPT_DIR" != x; then
         for dir in $OPT_DIR; do
             echo x ${LIBPATHFLAG} ${RPATHFLAG} |
             sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
-        done | tr '\012' ' ' | sed 's/ *$//'`
-    if test x"$val" != x; then
-	test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
-	LDFLAGS="$LDFLAGS$val"
-	test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
-	DLDFLAGS="$DLDFLAGS$val"
-    fi
+        done | tr '\012' ' '`
+    test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
+    LDFLAGS="$LDFLAGS$val"
+    test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
+    DLDFLAGS="$DLDFLAGS$val"
     LDFLAGS_OPTDIR="$val"
 fi
 
 AS_CASE(["$target_os"],
 [freebsd*], [
     AC_CHECK_LIB([procstat], [procstat_open_sysctl])
-    if test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes; then
-	AC_CHECK_FUNCS(procstat_getvmmap)
-    fi
     ])
 AS_CASE(["$target_cpu-$target_os"],
 [*-darwin*], [
     AC_CHECK_HEADERS([execinfo.h])
     if test "x$ac_cv_header_execinfo_h" = xyes; then
 	AC_CHECK_LIB([execinfo], [backtrace])
-	AC_CHECK_HEADERS([libunwind.h])
     fi],
 [*-freebsd*|x86_64-netbsd*], [
     AC_CHECK_HEADERS([execinfo.h])
@@ -3607,6 +3136,9 @@ else
     [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],
@@ -3660,21 +3192,11 @@ AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
   EXTOBJS='ext/extinit.$(OBJEXT)'
   AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
   AC_SUBST(ENCSTATIC, static)
-], [
-  ENCOBJS='dmyenc.$(OBJEXT)'
-  EXTOBJS='dmyext.$(OBJEXT)'
 ])
 AC_SUBST(ENCOBJS)
 AC_SUBST(EXTOBJS)
 
-AC_ARG_WITH(setup,
-	    AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
-	    [setup=$withval])
-if test -n "$setup"; then
-    if ! test -f "ext/$setup" -o -f "$srcdir/ext/$setup"; then
-	AC_MSG_ERROR(Setup file $setup not found under ext or $srcdir/ext)
-    fi
-elif test -f "$srcdir/ext/Setup.$target_os"; then
+if test -f "$srcdir/ext/Setup.$target_os"; then
     setup="Setup.$target_os"
 else
     setup=
@@ -3728,7 +3250,6 @@ if test x"$cross_compiling" = xyes; then
   RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
   RUNRUBY='$(RUNRUBY_COMMAND)'
   XRUBY='$(MINIRUBY)'
-  BOOTSTRAPRUBY='$(BASERUBY)'
   TEST_RUNNABLE=no
   CROSS_COMPILING=yes
 
@@ -3752,7 +3273,6 @@ else
   RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
   RUNRUBY='$(RUNRUBY_COMMAND) --'
   XRUBY='$(RUNRUBY)'
-  BOOTSTRAPRUBY='$(MINIRUBY)'
   TEST_RUNNABLE=yes
   CROSS_COMPILING=no
 fi
@@ -3764,7 +3284,6 @@ AC_SUBST(PREP)
 AC_SUBST(RUNRUBY_COMMAND)
 AC_SUBST(RUNRUBY)
 AC_SUBST(XRUBY)
-AC_SUBST(BOOTSTRAPRUBY)
 AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
@@ -3775,7 +3294,7 @@ LIBRUBYARG='$(LIBRUBYARG_STATIC)'
 SOLIBS=
 
 AS_CASE(["$target_os"],
-  [cygwin*|mingw*|haiku*|darwin*], [
+  [cygwin*|mingw*|beos*|haiku*|darwin*|os2-emx*], [
     : ${DLDLIBS=""}
     ],
   [
@@ -3800,7 +3319,7 @@ AC_ARG_WITH(soname,
 
 LIBRUBY_LDSHARED=$LDSHARED
 LIBRUBY_DLDFLAGS=$DLDFLAGS
-LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(RUBY_PROGRAM_VERSION)'
+LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
 LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
 ENABLE_SHARED=no
 
@@ -3843,8 +3362,8 @@ AS_CASE("$enable_shared", [yes], [
     [sunos4*], [
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	],
-    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu | haiku*], [
-	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)' "$LDFLAGS_OPTDIR"])
+    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
 	if test "$load_relative" = yes; then
 	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
@@ -3863,7 +3382,7 @@ AS_CASE("$enable_shared", [yes], [
     [netbsd*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' "$LDFLAGS_OPTDIR"])
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
 	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
 	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
 	else	# a.out platforms
@@ -3877,7 +3396,7 @@ AS_CASE("$enable_shared", [yes], [
     [solaris*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(RUBY_PROGRAM_VERSION) lib$(RUBY_SO_NAME).so'
+	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
 	if test "$GCC" = yes; then
 	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
 	else
@@ -3887,27 +3406,32 @@ AS_CASE("$enable_shared", [yes], [
 	],
     [hpux*], [
 	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(RUBY_PROGRAM_VERSION)'
+	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*], [
-	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-bnoentry" "$XLDFLAGS" "$LDFLAGS_OPTDIR"])
+	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 	SOLIBS='-lm -lc'
 	],
+    [beos*], [
+	AS_CASE(["$target_cpu"],
+	[powerpc*], [
+	    LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
+	    ])
+	],
     [darwin*], [
-	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(RUBY_PROGRAM_VERSION)'
+	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
 	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
 	if test "$load_relative" = yes; then
 	    libprefix="@executable_path/../${libdir_basename}"
 	    LIBRUBY_RELATIVE=yes
 	fi
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(MAJOR).$(MINOR)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(RUBY_PROGRAM_VERSION)'
+	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,_ruby_static_id_*'
 	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
 	fi
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
@@ -3929,6 +3453,10 @@ AS_CASE("$enable_shared", [yes], [
           AS_HELP_STRING([--disable-pie], [disable PIE feature]),
           [pie=$enableval], [pie=])
   AS_CASE(["$target_os"],
+  [haiku], [
+    # gcc supports PIE, but doesn't work correctly in Haiku
+    pie=no
+  ],
   [nacl], [
     # -pie implies -shared for NaCl.
     pie=no
@@ -3978,60 +3506,50 @@ if test "$EXEEXT" = .exe; then
     AC_SUBST(EXECUTABLE_EXTS)
 fi
 
-AS_CASE("$cross_compiling:${LIBPATHENV}", [yes:* | no:], [], [
-    AC_MSG_CHECKING(whether wrapper for $LIBPATHENV is needed)
-    AS_IF([env ${LIBPATHENV}=/lib /bin/sh -c ': ${'${LIBPATHENV}'?}' 2>/dev/null],
-	[AC_MSG_RESULT(no)],
-	[PREP="$PREP"' ruby-runner$(EXEEXT)'
-	AC_MSG_RESULT(yes)]
-    )
-])
-
 AC_ARG_ENABLE(dtrace,
         AS_HELP_STRING([--enable-dtrace],
         [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
         [enable_dtrace=$enableval], [enable_dtrace=auto])
 
+if test "${enable_dtrace}" = "auto"; then
+    if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then
+        RUBY_DTRACE_AVAILABLE()
+        enable_dtrace=$rb_cv_dtrace_available
+    else
+        enable_dtrace=no
+    fi
+fi
+
 LIBRUBY_A_OBJS='$(OBJS)'
-DTRACE_REBUILD=
-AS_CASE(["${enable_dtrace}"],
-[yes|auto], [
-    RUBY_DTRACE_AVAILABLE()
-], [
-    rb_cv_dtrace_available=no
-])
-AS_IF([test "${enable_dtrace}" = yes], [dnl
-    AS_IF([test -z "$DTRACE"], [dnl
-	AC_MSG_ERROR([dtrace(1) is missing])
-    ], [test "$cross_compiling" = yes], [dnl
-	AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
-    ], [test "${rb_cv_dtrace_available}" = "no"], [dnl
-       AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
-    ])
-])
-AS_CASE([$rb_cv_dtrace_available],
-[yes*], [dnl
-    RUBY_DTRACE_POSTPROCESS()
-    AS_IF([test "$rb_cv_prog_dtrace_g" != no], [dnl
-	DTRACE_OBJ='probes.$(OBJEXT)'
-    ])
-    AS_IF([test "$rb_cv_prog_dtrace_g" = rebuild], [dnl
-	DTRACE_REBUILD=yes
-	LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
-    ])
-    AS_CASE("${target_os}", [freebsd*], [dnl
-        # FreeBSD's dtrace requires libelf
-        LIBS="-lelf $LIBS"
-    ])
+if test "${enable_dtrace}" = "yes"; then
+    if test -z "$DTRACE"; then
+        AC_MSG_ERROR([dtrace(1) is missing])
+    elif test "$cross_compiling" = yes; then
+        AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
+    else
+        RUBY_DTRACE_AVAILABLE()
+        enable_dtrace=$rb_cv_dtrace_available
+        if test "${enable_dtrace}" = "no"; then
+            AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
+        fi
+        RUBY_DTRACE_POSTPROCESS()
+        if test "$rb_cv_prog_dtrace_g" = 'yes'; then
+            DTRACE_OBJ='probes.$(OBJEXT)'
+            DTRACE_GLOMMED_OBJ='ruby-glommed.$(OBJEXT)'
+            LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
+        fi
+        AS_CASE("${target_os}", [freebsd*], [
+            # FreeBSD's dtrace requires libelf
+            LIBS="-lelf $LIBS"
+        ])
+    fi
     DTRACE_EXT=d
-], [dnl
-    enable_dtrace=no
+else
     DTRACE_EXT=dmyh
-])
+fi
 AC_SUBST(DTRACE_EXT)
 AC_SUBST(DTRACE_OBJ)
-AC_SUBST(DTRACE_REBUILD)
-AC_SUBST(DTRACE_OPT)
+AC_SUBST(DTRACE_GLOMMED_OBJ)
 AC_SUBST(LIBRUBY_A_OBJS)
 
 RUBY_SETJMP_TYPE
@@ -4042,7 +3560,7 @@ dnl build rdoc index if requested
 RDOCTARGET=""
 CAPITARGET=""
 AC_ARG_ENABLE(install-doc,
-       AS_HELP_STRING([--disable-install-doc], [do not install either rdoc indexes or C API documents during install]),
+       AS_HELP_STRING([--disable-install-doc], [do not install neither rdoc indexes nor C API documents during install]),
        [install_doc=$enableval], [install_doc=yes])
 AC_ARG_ENABLE(install-rdoc,
       AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
@@ -4073,14 +3591,6 @@ AC_SUBST(CAPITARGET)
 AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
 AC_SUBST(INSTALLDOC)
 
-AC_ARG_ENABLE(install-static-library,
-	AS_HELP_STRING([--disable-install-static-library], [do not install static ruby library]),
-	[INSTALL_STATIC_LIBRARY=$enableval],
-	AS_IF([test x"$enable_shared" = xyes],
-	    [INSTALL_STATIC_LIBRARY=no],
-	    [INSTALL_STATIC_LIBRARY=yes]))
-AC_SUBST(INSTALL_STATIC_LIBRARY)
-
 if test "$rb_with_pthread" = "yes"; then
     THREAD_MODEL=pthread
 fi
@@ -4112,6 +3622,13 @@ AS_CASE(["$target_os"],
 	RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation])
 	RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation])
 	],
+    [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*], [
 	if test "$GCC" != "yes" ; then
 	  # compile something small: taint.c is fine for this.
@@ -4127,8 +3644,12 @@ AS_CASE(["$target_os"],
 	  CFLAGS="$CFLAGS -std"
 	fi
 	],
+    [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)0'
+	RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
 	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
 	AS_CASE(["$target_os"],
 	[cygwin*], [
@@ -4179,9 +3700,6 @@ AS_CASE(["$target_os"],
 AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [],
 	[SOLIBS="-lgmp $SOLIBS"])
 
-AS_CASE(["$with_jemalloc: $LIBS "], [no:* | *' -ljemalloc '*], [],
-	[LIBS="-ljemalloc $LIBS"])
-
 MINIOBJS="$MINIDLNOBJ"
 
 AS_CASE(["$THREAD_MODEL"],
@@ -4266,6 +3784,40 @@ if test "${universal_binary-no}" = yes ; then
 		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
 fi
 
+if test "$ac_cv_func_memmem" = yes; then
+  AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [
+    AC_TRY_RUN([
+#include <string.h>
+
+int
+main()
+{
+  char *str = "hogefugafoobar";
+  char *rs = "foo";
+  char *empty = "";
+  char *p;
+
+  p = memmem(str, strlen(str), rs, strlen(rs));
+  if (p == str+8) {
+    p = memmem(str, strlen(str), empty, strlen(empty));
+    if (p == str)
+      return 0;
+    else
+      return 1;
+  }
+  else {
+    return 1;
+  }
+}
+    ],
+    rb_cv_broken_memmem=no,
+    rb_cv_broken_memmem=yes,
+    rb_cv_broken_memmem=yes)
+  ])
+  test x"$rb_cv_broken_memmem" = xyes && ac_cv_func_memmem=no
+fi
+
+
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
 if test -n "${cflags+set}"; then
@@ -4284,8 +3836,8 @@ if test "${ARCH_FLAG}"; then
 fi
 warnflags="$rb_cv_warnflags"
 AC_SUBST(cppflags)dnl
-AC_SUBST(cflags, ["${orig_cflags:+$orig_cflags }"'${optflags} ${debugflags} ${warnflags}'])dnl
-AC_SUBST(cxxflags, ["${orig_cxxflags:+$orig_cxxflags }"'${optflags} ${debugflags} ${warnflags}'])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
@@ -4380,15 +3932,17 @@ 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 "verconf.h"'
     echo '#include "version.h"'
     echo 'ruby_version=RUBY_LIB_VERSION'
     } > conftest.c
+    test -f verconf.h || > verconf.h
     ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
     eval $ruby_version
 elif test -z "${ruby_version}"; then
     AC_MSG_ERROR([No ruby version, No place for bundled libraries])
 else
-    RUBY_LIB_VERSION="${ruby_version}"
+    RUBY_LIB_VERSION="\"${ruby_version}\""
 fi
 AC_SUBST(RUBY_LIB_VERSION_STYLE)
 AC_SUBST(RUBY_LIB_VERSION)
@@ -4441,7 +3995,6 @@ AC_SUBST(vendordir)dnl
 AC_SUBST(vendorlibdir)dnl
 AC_SUBST(vendorarchdir)dnl
 
-AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl
 AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
 
 if test "${universal_binary-no}" = yes ; then
@@ -4464,8 +4017,7 @@ if test "${universal_binary-no}" = yes ; then
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
 else
     arch="${target_cpu}-${target_os}"
-    AS_CASE(["$arch"], [le32-nacl], [arch="pnacl"])
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
 fi
 
 unset sitearch
@@ -4523,7 +4075,7 @@ AC_ARG_WITH(mantype,
 	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
 		[
 			AS_CASE(["$withval"],
-			[man|man.gz|man.bz2|doc|doc.gz|doc.bz2], [MANTYPE=$withval],
+			[man|doc], [MANTYPE=$withval],
 			[AC_MSG_ERROR(invalid man type: $withval)])
 		])
 if test -z "$MANTYPE"; then
@@ -4557,10 +4109,7 @@ guard=INCLUDE_RUBY_CONFIG_H
   grep -v "^#define PACKAGE_" confdefs.h
   echo "#endif /* $guard */"
 } | tr -d '\015' |
-(
-  if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi
-  exec ${srcdir}/tool/ifchange $color "${config_h}" -
-) || AC_MSG_ERROR([failed to create ${config_h}])
+${srcdir}/tool/ifchange "${config_h}" -
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
 
@@ -4568,7 +4117,7 @@ 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 "`echo $e | sed 's/\.c$/.$(OBJEXT)/'`; done
+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[ 	]*=/{' \
@@ -4577,15 +4126,15 @@ BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
 BUILTIN_TRANSSRCS=
 BUILTIN_TRANSOBJS=
 for e in $BUILTIN_TRANSES; do
-  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS "`echo $e | sed 's/\.trans$/.c/'`
-  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS "`echo $e | sed 's/\.trans$/.$(OBJEXT)/'`
+  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)
-AS_MESSAGE([$PACKAGE library version = $ruby_version])
+AC_MSG_RESULT($PACKAGE library version = $ruby_version)
 
 AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
 
@@ -4599,12 +4148,10 @@ AC_CONFIG_FILES(Makefile, [
 	    :
 	elif svn info "$srcdir" > /dev/null 2>&1; then
 	    VCS='svn'
-	elif git_dir=`git --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then
-	    if test -d "$git_dir/svn"; then
-		VCS='git svn'
-	    else
-		VCS='git'
-	    fi
+	elif test -d "$srcdir/.git/svn"; then
+	    VCS='git svn'
+	elif test -d "$srcdir/.git"; then
+	    VCS='git'
 	else
 	    VCS='echo cannot'
 	fi
@@ -4613,12 +4160,7 @@ AC_CONFIG_FILES(Makefile, [
 		["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
 		[git],       [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
 		[VCSUP='$(VCS)'])
-	sed -n \
-	    -e '[/^@%:@define \(RUBY_RELEASE_[A-Z]*\) \([0-9][0-9]*\)/]{' \
-	    -e   's//\1 = \2/' \
-	    -e   '[s/ \([0-9]\)$/ 0\1/]' \
-	    -e   p \
-	    -e '}' "$srcdir/version.h"
+	sed -n 's/^@%:@define \(RUBY_RELEASE_DATE\) "\(.*\)"/\1 = \2/p' "$srcdir/version.h"
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	if test "$gnumake" != yes; then
@@ -4644,7 +4186,7 @@ AC_CONFIG_FILES(Makefile, [
 [EXEEXT='$EXEEXT' gnumake='$gnumake'])
 
 AC_ARG_WITH([ruby-pc],
-	    AC_HELP_STRING([--with-ruby-pc=FILENAME], [pc file basename]),
+	    AC_HELP_STRING([pc file basename]),
 	    [ruby_pc="$withval"],
 	    [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
 AC_SUBST(ruby_pc)
@@ -4673,48 +4215,3 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
 AC_OUTPUT
 }
 }
-
-AS_IF([${FOLD+:} false], [], [
-AS_IF([test "`echo abcdefg hijklmno | fold -s -w10 | sed 1d`" = hijklmno], [FOLD="fold"], [FOLD=])
-])
-AS_REQUIRE_SHELL_FN([config_summary],
-    [AS_FUNCTION_DESCRIBE([config_summary], [NAME, VAL], [configuration summary])],
-    [AS_IF([test -z "$2"], [], [
-	AS_ECHO_N(["   * $1:                     "]) | head -c26
-	AS_IF([test "$FOLD"], [
-	    echo "$2" | fold -s -w50 |
-	    sed '1!s/^/                          /;$!s/$/\\/'
-	], [echo "$2"])
-    ])]
-)
-
-echo "---"
-echo "Configuration summary for $RUBY_BASE_NAME version $RUBY_PROGRAM_VERSION"
-echo ""
-config_summary "Installation prefix" "$prefix"
-config_summary "exec prefix"         "$exec_prefix"
-config_summary "arch"                "$arch"
-config_summary "site arch"           "$sitearch"
-config_summary "RUBY_BASE_NAME"      "$RUBY_BASE_NAME"
-config_summary "enable shared"       "$enable_shared"
-config_summary "ruby lib prefix"     "$rubylibprefix"
-config_summary "site libraries path" "$rubysitearchprefix"
-config_summary "vendor path"         "$vendordir"
-config_summary "target OS"           "$target_os"
-config_summary "compiler"            "$CC"
-config_summary "with pthread"        "$enable_pthread"
-config_summary "enable shared libs"  "$ENABLE_SHARED"
-config_summary "dynamic library ext" "$DLEXT"
-config_summary "CFLAGS"              "$cflags"
-config_summary "CPPFLAGS"            "$cppflags"
-config_summary "LDFLAGS"             "$LDFLAGS"
-config_summary "optflags"            "$optflags"
-config_summary "debugflags"          "$debugflags"
-config_summary "warnflags"           "$warnflags"
-config_summary "strip command"       "$STRIP"
-config_summary "install doc"         "$install_doc"
-config_summary "man page type"       "$MANTYPE"
-config_summary "search path"         "$search_path"
-config_summary "static-linked-ext"   ${EXTSTATIC:+"yes"}
-echo ""
-echo "---"
diff --git a/constant.h b/constant.h
index 76b59fa047..8c854bfffa 100644
--- a/constant.h
+++ b/constant.h
@@ -12,22 +12,10 @@
 #define CONSTANT_H
 
 typedef enum {
-    CONST_DEPRECATED = 0x100,
-
-    CONST_VISIBILITY_MASK = 0xff,
     CONST_PUBLIC    = 0x00,
-    CONST_PRIVATE,
-    CONST_VISIBILITY_MAX
+    CONST_PRIVATE   = 0x01
 } rb_const_flag_t;
 
-#define RB_CONST_PRIVATE_P(ce) \
-    (((ce)->flag & CONST_VISIBILITY_MASK) == CONST_PRIVATE)
-#define RB_CONST_PUBLIC_P(ce) \
-    (((ce)->flag & CONST_VISIBILITY_MASK) == CONST_PUBLIC)
-
-#define RB_CONST_DEPRECATED_P(ce) \
-    ((ce)->flag & CONST_DEPRECATED)
-
 typedef struct rb_const_entry_struct {
     rb_const_flag_t flag;
     int line;
@@ -37,8 +25,7 @@ typedef struct rb_const_entry_struct {
 
 VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj);
 VALUE rb_mod_public_constant(int argc, const VALUE *argv, VALUE obj);
-VALUE rb_mod_deprecate_constant(int argc, const VALUE *argv, VALUE obj);
-void rb_free_const_table(struct rb_id_table *tbl);
+void rb_free_const_table(st_table *tbl);
 VALUE rb_public_const_get(VALUE klass, ID id);
 VALUE rb_public_const_get_at(VALUE klass, ID id);
 VALUE rb_public_const_get_from(VALUE klass, ID id);
diff --git a/cont.c b/cont.c
index b7ef391581..2ff2cbb98c 100644
--- a/cont.c
+++ b/cont.c
@@ -9,6 +9,7 @@
 
 **********************************************************************/
 
+#include "ruby/ruby.h"
 #include "internal.h"
 #include "vm_core.h"
 #include "gc.h"
@@ -54,7 +55,13 @@
 #     define FIBER_USE_NATIVE 1
 #   endif
 # elif defined(_WIN32)
-#  define FIBER_USE_NATIVE 1
+#   if _WIN32_WINNT >= 0x0400
+/* only when _WIN32_WINNT >= 0x0400 on Windows because Fiber APIs are
+ * supported only such building (and running) environments.
+ * [ruby-dev:41192]
+ */
+#     define FIBER_USE_NATIVE 1
+#   endif
 # endif
 #endif
 #if !defined(FIBER_USE_NATIVE)
@@ -100,7 +107,7 @@ typedef struct rb_context_struct {
 	int register_stack_size;
 #endif
     } machine;
-    rb_thread_t saved_thread; /* selected properties of GET_THREAD() (see cont_save_thread) */
+    rb_thread_t saved_thread;
     rb_jmpbuf_t jmpbuf;
     rb_ensure_entry_t *ensure_array;
     rb_ensure_list_t *ensure_list;
@@ -123,16 +130,18 @@ static machine_stack_cache_t machine_stack_cache[MAX_MACHINE_STACK_CACHE];
 static machine_stack_cache_t terminated_machine_stack;
 #endif
 
-struct rb_fiber_struct {
+typedef struct rb_fiber_struct {
     rb_context_t cont;
-    struct rb_fiber_struct *prev;
+    VALUE prev;
     enum fiber_status status;
     /* If a fiber invokes "transfer",
      * then this fiber can't "resume" any more after that.
      * You shouldn't mix "transfer" and "resume".
      */
-    int transferred;
+    int transfered;
 
+    struct rb_fiber_struct *prev_fiber;
+    struct rb_fiber_struct *next_fiber;
 #if FIBER_USE_NATIVE
 #ifdef _WIN32
     void *fib_handle;
@@ -146,7 +155,7 @@ struct rb_fiber_struct {
     size_t ss_size;
 #endif
 #endif
-};
+} rb_fiber_t;
 
 static const rb_data_type_t cont_data_type, fiber_data_type;
 static VALUE rb_cContinuation;
@@ -161,7 +170,7 @@ static VALUE rb_eFiberError;
     if (!(ptr)) rb_raise(rb_eFiberError, "uninitialized fiber"); \
 } while (0)
 
-NOINLINE(static VALUE cont_capture(volatile int *volatile stat));
+NOINLINE(static VALUE cont_capture(volatile int *stat));
 
 #define THREAD_MUST_BE_RUNNING(th) do { \
 	if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread");	\
@@ -174,7 +183,6 @@ cont_mark(void *ptr)
     if (ptr) {
 	rb_context_t *cont = ptr;
 	rb_gc_mark(cont->value);
-
 	rb_thread_mark(&cont->saved_thread);
 	rb_gc_mark(cont->saved_thread.self);
 
@@ -199,7 +207,7 @@ cont_mark(void *ptr)
 		rb_thread_t *th;
                 rb_fiber_t *fib = (rb_fiber_t*)cont;
 		GetThreadPtr(cont->saved_thread.self, th);
-		if ((th->fiber != fib) && fib->status == RUNNING) {
+		if ((th->fiber != cont->self) && fib->status == RUNNING) {
 		    rb_gc_mark_locations(cont->machine.stack,
 					 cont->machine.stack + cont->machine.stack_size);
 		}
@@ -221,7 +229,7 @@ cont_free(void *ptr)
     RUBY_FREE_ENTER("cont");
     if (ptr) {
 	rb_context_t *cont = ptr;
-	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack);
+	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout);
 #if FIBER_USE_NATIVE
 	if (cont->type == CONTINUATION_CONTEXT) {
 	    /* cont */
@@ -230,17 +238,17 @@ cont_free(void *ptr)
 	}
 	else {
 	    /* fiber */
-	    rb_fiber_t *fib = (rb_fiber_t*)cont;
-	    const rb_thread_t *const th = GET_THREAD();
 #ifdef _WIN32
-	    if (th && th->fiber != fib && cont->type != ROOT_FIBER_CONTEXT) {
+	    if (GET_THREAD()->fiber != cont->self && cont->type != ROOT_FIBER_CONTEXT) {
 		/* don't delete root fiber handle */
+		rb_fiber_t *fib = (rb_fiber_t*)cont;
 		if (fib->fib_handle) {
 		    DeleteFiber(fib->fib_handle);
 		}
 	    }
 #else /* not WIN32 */
-	    if (th && th->fiber != fib) {
+	    if (GET_THREAD()->fiber != cont->self) {
+                rb_fiber_t *fib = (rb_fiber_t*)cont;
                 if (fib->ss_sp) {
                     if (cont->type == ROOT_FIBER_CONTEXT) {
 			rb_bug("Illegal root fiber parameter");
@@ -275,48 +283,63 @@ cont_memsize(const void *ptr)
 {
     const rb_context_t *cont = ptr;
     size_t size = 0;
-
-    size = sizeof(*cont);
-    if (cont->vm_stack) {
+    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);
+	    size_t n = (cont->vm_stack_slen + cont->vm_stack_clen);
 #else
-	size_t n = cont->saved_thread.stack_size;
+	    size_t n = cont->saved_thread.stack_size;
 #endif
-	size += n * sizeof(*cont->vm_stack);
-    }
+	    size += n * sizeof(*cont->vm_stack);
+	}
 
-    if (cont->machine.stack) {
-	size += cont->machine.stack_size * sizeof(*cont->machine.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);
-    }
+	if (cont->machine.register_stack) {
+	    size += cont->machine.register_stack_size * sizeof(*cont->machine.register_stack);
+	}
 #endif
+    }
     return size;
 }
 
-void
-rb_fiber_mark_self(rb_fiber_t *fib)
-{
-    if (fib)
-	rb_gc_mark(fib->cont.self);
-}
-
 static void
 fiber_mark(void *ptr)
 {
     RUBY_MARK_ENTER("cont");
     if (ptr) {
 	rb_fiber_t *fib = ptr;
-	rb_fiber_mark_self(fib->prev);
+	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");
@@ -326,6 +349,7 @@ fiber_free(void *ptr)
 	    fib->cont.saved_thread.local_storage) {
 	    st_free_table(fib->cont.saved_thread.local_storage);
 	}
+	fiber_link_remove(fib);
 
 	cont_free(&fib->cont);
     }
@@ -337,13 +361,14 @@ fiber_memsize(const void *ptr)
 {
     const rb_fiber_t *fib = ptr;
     size_t size = 0;
-
-    size = sizeof(*fib);
-    if (fib->cont.type != ROOT_FIBER_CONTEXT &&
-	fib->cont.saved_thread.local_storage != NULL) {
-	size += st_memsize(fib->cont.saved_thread.local_storage);
+    if (ptr) {
+	size = sizeof(*fib);
+	if (fib->cont.type != ROOT_FIBER_CONTEXT &&
+	    fib->cont.saved_thread.local_storage != NULL) {
+	    size += st_memsize(fib->cont.saved_thread.local_storage);
+	}
+	size += cont_memsize(&fib->cont);
     }
-    size += cont_memsize(&fib->cont);
     return size;
 }
 
@@ -405,40 +430,21 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 static const rb_data_type_t cont_data_type = {
     "continuation",
     {cont_mark, cont_free, cont_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static inline void
+static void
 cont_save_thread(rb_context_t *cont, rb_thread_t *th)
 {
-    rb_thread_t *sth = &cont->saved_thread;
-
     /* save thread context */
-    sth->stack = th->stack;
-    sth->stack_size = th->stack_size;
-    sth->local_storage = th->local_storage;
-    sth->cfp = th->cfp;
-    sth->safe_level = th->safe_level;
-    sth->raised_flag = th->raised_flag;
-    sth->state = th->state;
-    sth->status = th->status;
-    sth->tag = th->tag;
-    sth->protect_tag = th->protect_tag;
-    sth->errinfo = th->errinfo;
-    sth->first_proc = th->first_proc;
-    sth->root_lep = th->root_lep;
-    sth->root_svar = th->root_svar;
-    sth->ensure_list = th->ensure_list;
-
-    sth->trace_arg = th->trace_arg;
-
+    cont->saved_thread = *th;
     /* saved_thread->machine.stack_(start|end) should be NULL */
     /* because it may happen GC afterward */
-    sth->machine.stack_start = 0;
-    sth->machine.stack_end = 0;
+    cont->saved_thread.machine.stack_start = 0;
+    cont->saved_thread.machine.stack_end = 0;
 #ifdef __ia64
-    sth->machine.register_stack_start = 0;
-    sth->machine.register_stack_end = 0;
+    cont->saved_thread.machine.register_stack_start = 0;
+    cont->saved_thread.machine.register_stack_end = 0;
 #endif
 }
 
@@ -447,12 +453,7 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
 {
     /* save thread context */
     cont_save_thread(cont, th);
-    cont->saved_thread.self = th->self;
-    cont->saved_thread.machine.stack_maxsize = th->machine.stack_maxsize;
-    cont->saved_thread.fiber = th->fiber;
     cont->saved_thread.local_storage = 0;
-    cont->saved_thread.local_storage_recursive_hash = Qnil;
-    cont->saved_thread.local_storage_recursive_hash_for_trace = Qnil;
 }
 
 static rb_context_t *
@@ -470,19 +471,20 @@ cont_new(VALUE klass)
 }
 
 static VALUE
-cont_capture(volatile int *volatile stat)
+cont_capture(volatile int *stat)
 {
-    rb_context_t *volatile cont;
-    rb_thread_t *th = GET_THREAD();
+    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->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);
@@ -491,7 +493,7 @@ cont_capture(volatile int *volatile stat)
     cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
     MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
 #endif
-    cont->saved_thread.stack = NULL;
+    sth->stack = 0;
 
     cont_save_machine_stack(th, cont);
 
@@ -512,7 +514,7 @@ cont_capture(volatile int *volatile stat)
     }
 
     if (ruby_setjmp(cont->jmpbuf)) {
-	VALUE value;
+	volatile VALUE value;
 
 	VAR_INITIALIZED(cont);
 	value = cont->value;
@@ -527,7 +529,7 @@ cont_capture(volatile int *volatile stat)
     }
 }
 
-static inline void
+static void
 cont_restore_thread(rb_context_t *cont)
 {
     rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
@@ -535,14 +537,16 @@ cont_restore_thread(rb_context_t *cont)
     /* restore thread context */
     if (cont->type == CONTINUATION_CONTEXT) {
 	/* continuation */
-	rb_fiber_t *fib;
+	VALUE fib;
 
 	th->fiber = sth->fiber;
 	fib = th->fiber ? th->fiber : th->root_fiber;
 
-	if (fib && fib->cont.saved_thread.stack) {
-	    th->stack_size = fib->cont.saved_thread.stack_size;
-	    th->stack = fib->cont.saved_thread.stack;
+	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);
@@ -555,12 +559,9 @@ cont_restore_thread(rb_context_t *cont)
     else {
 	/* fiber */
 	th->stack = sth->stack;
-	sth->stack = NULL;
 	th->stack_size = sth->stack_size;
 	th->local_storage = sth->local_storage;
-	th->local_storage_recursive_hash = sth->local_storage_recursive_hash;
-	th->local_storage_recursive_hash_for_trace = sth->local_storage_recursive_hash_for_trace;
-	th->fiber = (rb_fiber_t*)cont;
+	th->fiber = cont->self;
     }
 
     th->cfp = sth->cfp;
@@ -575,6 +576,7 @@ cont_restore_thread(rb_context_t *cont)
     th->root_lep = sth->root_lep;
     th->root_svar = sth->root_svar;
     th->ensure_list = sth->ensure_list;
+
 }
 
 #if FIBER_USE_NATIVE
@@ -652,10 +654,6 @@ fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
     rb_thread_t *sth = &fib->cont.saved_thread;
 
 #ifdef _WIN32
-# if defined(_MSC_VER) && _MSC_VER <= 1200
-#   define CreateFiberEx(cs, stacksize, flags, entry, param) \
-    CreateFiber((stacksize), (entry), (param))
-# endif
     fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
     if (!fib->fib_handle) {
 	/* try to release unnecessary fibers & retry to create */
@@ -724,10 +722,11 @@ fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
     /* oldfib->machine.stack_end should be NULL */
     oldfib->cont.saved_thread.machine.stack_end = 0;
 #ifndef _WIN32
-    if (!newfib->context.uc_stack.ss_sp && th->root_fiber != newfib) {
+    if (!newfib->context.uc_stack.ss_sp && th->root_fiber != newfib->cont.self) {
 	rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL");
     }
 #endif
+
     /* swap machine context */
 #ifdef _WIN32
     SwitchToFiber(newfib->fib_handle);
@@ -885,24 +884,6 @@ cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
  *     Ron
  *     Max
  *
- *  Also you can call callcc in other methods:
- *
- *     require "continuation"
- *
- *     def g
- *       arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
- *       cc = callcc { |cc| cc }
- *       puts arr.shift
- *       return cc, arr.size
- *     end
- *
- *     def f
- *       c, size = g
- *       c.call(c) if size > 1
- *     end
- *
- *     f
- *
  *  This (somewhat contrived) example allows the inner loop to abandon
  *  processing early:
  *
@@ -1073,6 +1054,9 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
 	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");
 	}
@@ -1084,6 +1068,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
 
     /* restore `tracing' context. see [Feature #4347] */
     th->trace_arg = cont->saved_thread.trace_arg;
+
     cont_restore_0(cont, &contval);
     return Qnil; /* unreachable */
 }
@@ -1105,7 +1090,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *  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
+ *  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
@@ -1157,7 +1142,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
 static const rb_data_type_t fiber_data_type = {
     "fiber",
     {fiber_mark, fiber_free, fiber_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
@@ -1181,7 +1166,7 @@ fiber_t_alloc(VALUE fibval)
     fib->cont.self = fibval;
     fib->cont.type = FIBER_CONTEXT;
     cont_init(&fib->cont, th);
-    fib->prev = NULL;
+    fib->prev = Qnil;
     fib->status = CREATED;
 
     DATA_PTR(fibval) = fib;
@@ -1189,56 +1174,47 @@ fiber_t_alloc(VALUE fibval)
     return fib;
 }
 
-rb_control_frame_t *
-rb_vm_push_frame(rb_thread_t *th,
-		 const rb_iseq_t *iseq,
-		 VALUE type,
-		 VALUE self,
-		 VALUE specval,
-		 VALUE cref_or_me,
-		 const VALUE *pc,
-		 VALUE *sp,
-		 int local_size,
-		 int stack_max);
-
 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;
-    rb_thread_t *cth = GET_THREAD();
 
     /* initialize cont */
     cont->vm_stack = 0;
 
-    th->stack = NULL;
+    th->stack = 0;
     th->stack_size = 0;
 
-    th->stack_size = cth->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
-    th->stack = ALLOC_N(VALUE, th->stack_size);
-    th->cfp = (void *)(th->stack + th->stack_size);
+    fiber_link_join(fib);
 
-    rb_vm_push_frame(th,
-		     NULL,
-		     VM_FRAME_MAGIC_DUMMY | VM_ENV_FLAG_LOCAL | VM_FRAME_FLAG_FINISH | VM_FRAME_FLAG_CFRAME,
-		     Qnil, /* self */
-		     VM_BLOCK_HANDLER_NONE,
-		     0, /* specval */
-		     NULL, /* pc */
-		     th->stack, /* sp */
-		     0, /* local_size */
-		     0);
+    th->stack_size = th->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
+    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;
+#if VM_DEBUG_BP_CHECK
+    th->cfp->bp_check = 0;
+#endif
+    th->cfp->ep = th->stack;
+    *th->cfp->ep = VM_ENVVAL_BLOCK_PTR(0);
+    th->cfp->self = Qnil;
+    th->cfp->klass = 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->local_storage_recursive_hash = Qnil;
-    th->local_storage_recursive_hash_for_trace = Qnil;
 
     th->first_proc = proc;
 
 #if !FIBER_USE_NATIVE
-    MEMCPY(&cont->jmpbuf, &cth->root_jmpbuf, rb_jmpbuf_t, 1);
+    MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
 #endif
 
     return fibval;
@@ -1257,16 +1233,58 @@ rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
     return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
 }
 
-static void rb_fiber_terminate(rb_fiber_t *fib);
+static VALUE
+return_fiber(void)
+{
+    rb_fiber_t *fib;
+    VALUE curr = rb_fiber_current();
+    VALUE prev;
+    GetFiberPtr(curr, fib);
+
+    prev = fib->prev;
+    if (NIL_P(prev)) {
+	const VALUE root_fiber = GET_THREAD()->root_fiber;
+
+	if (root_fiber == curr) {
+	    rb_raise(rb_eFiberError, "can't yield from root fiber");
+	}
+	return root_fiber;
+    }
+    else {
+	fib->prev = Qnil;
+	return prev;
+    }
+}
+
+VALUE rb_fiber_transfer(VALUE fib, int argc, const VALUE *argv);
+
+static void
+rb_fiber_terminate(rb_fiber_t *fib)
+{
+    VALUE value = fib->cont.value;
+    fib->status = TERMINATED;
+#if FIBER_USE_NATIVE && !defined(_WIN32)
+    /* Ruby must not switch to other thread until storing terminated_machine_stack */
+    terminated_machine_stack.ptr = fib->ss_sp;
+    terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
+    fib->ss_sp = NULL;
+    fib->context.uc_stack.ss_sp = NULL;
+    fib->cont.machine.stack = NULL;
+    fib->cont.machine.stack_size = 0;
+#endif
+    rb_fiber_transfer(return_fiber(), 1, &value);
+}
 
 void
 rb_fiber_start(void)
 {
     rb_thread_t *th = GET_THREAD();
-    rb_fiber_t *fib = th->fiber;
+    rb_fiber_t *fib;
     rb_proc_t *proc;
     int state;
 
+    GetFiberPtr(th->fiber, fib);
+
     TH_PUSH_TAG(th);
     if ((state = EXEC_TAG()) == 0) {
 	rb_context_t *cont = &VAR_FROM_MEMORY(fib)->cont;
@@ -1276,12 +1294,11 @@ rb_fiber_start(void)
 	argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args;
 	cont->value = Qnil;
 	th->errinfo = Qnil;
-	th->root_lep = rb_vm_ep_local_ep(vm_block_ep(&proc->block));
-	th->root_svar = Qfalse;
-	fib->status = RUNNING;
+	th->root_lep = rb_vm_ep_local_ep(proc->block.ep);
+	th->root_svar = Qnil;
 
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
-	cont->value = rb_vm_invoke_proc(th, proc, argc, argv, VM_BLOCK_HANDLER_NONE);
+	fib->status = RUNNING;
+	cont->value = rb_vm_invoke_proc(th, proc, argc, argv, 0);
     }
     TH_POP_TAG();
 
@@ -1314,117 +1331,90 @@ root_fiber_alloc(rb_thread_t *th)
 #endif
 #endif
     fib->status = RUNNING;
+    fib->prev_fiber = fib->next_fiber = fib;
 
     return fib;
 }
 
-static inline rb_fiber_t*
-fiber_current(void)
+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;
+	th->root_fiber = th->fiber = fib->cont.self;
     }
     return th->fiber;
 }
 
-static inline rb_fiber_t*
-return_fiber(void)
-{
-    rb_fiber_t *fib = fiber_current();
-    rb_fiber_t *prev = fib->prev;
-
-    if (!prev) {
-	rb_fiber_t *root_fiber = GET_THREAD()->root_fiber;
-
-	if (root_fiber == fib) {
-	    rb_raise(rb_eFiberError, "can't yield from root fiber");
-	}
-	return root_fiber;
-    }
-    else {
-	fib->prev = NULL;
-	return prev;
-    }
-}
-
-VALUE
-rb_fiber_current(void)
-{
-    return fiber_current()->cont.self;
-}
-
-static inline VALUE
-fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)
+static VALUE
+fiber_store(rb_fiber_t *next_fib)
 {
+    rb_thread_t *th = GET_THREAD();
     rb_fiber_t *fib;
 
     if (th->fiber) {
-	fib = th->fiber;
+	GetFiberPtr(th->fiber, fib);
 	cont_save_thread(&fib->cont, th);
     }
     else {
 	/* create current fiber */
 	fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib;
+	th->root_fiber = th->fiber = fib->cont.self;
     }
 
+#if !FIBER_USE_NATIVE
+    cont_save_machine_stack(th, &fib->cont);
+#endif
+
+    if (FIBER_USE_NATIVE || ruby_setjmp(fib->cont.jmpbuf)) {
 #if FIBER_USE_NATIVE
-    fiber_setcontext(next_fib, fib);
-    /* restored */
+	fiber_setcontext(next_fib, fib);
 #ifndef _WIN32
-    if (terminated_machine_stack.ptr) {
-	if (machine_stack_cache_index < MAX_MACHINE_STACK_CACHE) {
-	    machine_stack_cache[machine_stack_cache_index].ptr = terminated_machine_stack.ptr;
-	    machine_stack_cache[machine_stack_cache_index].size = terminated_machine_stack.size;
-	    machine_stack_cache_index++;
-	}
-	else {
-	    if (terminated_machine_stack.ptr != fib->cont.machine.stack) {
-		munmap((void*)terminated_machine_stack.ptr, terminated_machine_stack.size * sizeof(VALUE));
+	if (terminated_machine_stack.ptr) {
+	    if (machine_stack_cache_index < MAX_MACHINE_STACK_CACHE) {
+		machine_stack_cache[machine_stack_cache_index].ptr = terminated_machine_stack.ptr;
+		machine_stack_cache[machine_stack_cache_index].size = terminated_machine_stack.size;
+		machine_stack_cache_index++;
 	    }
 	    else {
-		rb_bug("terminated fiber resumed");
+		if (terminated_machine_stack.ptr != fib->cont.machine.stack) {
+		    munmap((void*)terminated_machine_stack.ptr, terminated_machine_stack.size * sizeof(VALUE));
+		}
+		else {
+		    rb_bug("terminated fiber resumed");
+		}
 	    }
+	    terminated_machine_stack.ptr = NULL;
+	    terminated_machine_stack.size = 0;
 	}
-	terminated_machine_stack.ptr = NULL;
-	terminated_machine_stack.size = 0;
-    }
-#endif /* not _WIN32 */
-    fib = th->fiber;
-    if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
-    return fib->cont.value;
-
-#else /* FIBER_USE_NATIVE */
-    cont_save_machine_stack(th, &fib->cont);
-    if (ruby_setjmp(fib->cont.jmpbuf)) {
+#endif
+#endif
 	/* restored */
-	fib = th->fiber;
+	GetFiberPtr(th->fiber, fib);
 	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
-	if (next_fib->cont.value == Qundef) {
-	    cont_restore_0(&next_fib->cont, &next_fib->cont.value);
-	    rb_bug("rb_fiber_resume: unreachable");
-	}
 	return fib->cont.value;
     }
+#if !FIBER_USE_NATIVE
     else {
-	VALUE undef = Qundef;
-	cont_restore_0(&next_fib->cont, &undef);
-	rb_bug("rb_fiber_resume: unreachable");
+	return Qundef;
     }
-#endif /* FIBER_USE_NATIVE */
+#endif
 }
 
 static inline VALUE
-fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
+fiber_switch(VALUE fibval, int argc, const VALUE *argv, int is_resume)
 {
     VALUE value;
-    rb_context_t *cont = &fib->cont;
+    rb_fiber_t *fib;
+    rb_context_t *cont;
     rb_thread_t *th = GET_THREAD();
 
-    if (th->fiber == fib) {
+    GetFiberPtr(fibval, fib);
+    cont = &fib->cont;
+
+    if (th->fiber == fibval) {
 	/* ignore fiber context switch
          * because destination fiber is same as current fiber
 	 */
@@ -1439,25 +1429,34 @@ fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
     }
     else if (fib->status == TERMINATED) {
 	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
-
-	if (th->fiber->status != TERMINATED) rb_exc_raise(value);
-
-	/* th->fiber is also dead => switch to root fiber */
-	/* (this means we're being called from rb_fiber_terminate, */
-	/* and the terminated fiber's return_fiber() is already dead) */
-	cont = &th->root_fiber->cont;
+	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;
 #if FIBER_USE_NATIVE
-	fiber_setcontext(th->root_fiber, th->fiber);
+	{
+	    VALUE oldfibval;
+	    rb_fiber_t *oldfib;
+	    oldfibval = rb_fiber_current();
+	    GetFiberPtr(oldfibval, oldfib);
+	    fiber_setcontext(fib, oldfib);
+	}
 #else
 	cont_restore_0(cont, &value);
 #endif
-	/* unreachable */
     }
 
     if (is_resume) {
-	fib->prev = fiber_current();
+	fib->prev = rb_fiber_current();
     }
     else {
 	/* restore `tracing' context. see [Feature #4347] */
@@ -1467,69 +1466,56 @@ fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
     cont->argc = argc;
     cont->value = make_passing_arg(argc, argv);
 
-    value = fiber_store(fib, th);
+    value = fiber_store(fib);
+#if !FIBER_USE_NATIVE
+    if (value == Qundef) {
+	cont_restore_0(cont, &value);
+	rb_bug("rb_fiber_resume: unreachable");
+    }
+#endif
     RUBY_VM_CHECK_INTS(th);
 
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_FIBER_SWITCH, th->self, 0, 0, 0, Qnil);
-
     return value;
 }
 
 VALUE
-rb_fiber_transfer(VALUE fibval, int argc, const VALUE *argv)
+rb_fiber_transfer(VALUE fib, int argc, const VALUE *argv)
 {
-    rb_fiber_t *fib;
-    GetFiberPtr(fibval, fib);
     return fiber_switch(fib, argc, argv, 0);
 }
 
-static void
-rb_fiber_terminate(rb_fiber_t *fib)
-{
-    VALUE value = fib->cont.value;
-    fib->status = TERMINATED;
-#if FIBER_USE_NATIVE && !defined(_WIN32)
-    /* Ruby must not switch to other thread until storing terminated_machine_stack */
-    terminated_machine_stack.ptr = fib->ss_sp;
-    terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
-    fib->ss_sp = NULL;
-    fib->context.uc_stack.ss_sp = NULL;
-    fib->cont.machine.stack = NULL;
-    fib->cont.machine.stack_size = 0;
-#endif
-    fiber_switch(return_fiber(), 1, &value, 0);
-}
-
 VALUE
 rb_fiber_resume(VALUE fibval, int argc, const VALUE *argv)
 {
     rb_fiber_t *fib;
     GetFiberPtr(fibval, fib);
 
-    if (fib->prev != 0 || fib->cont.type == ROOT_FIBER_CONTEXT) {
+    if (fib->prev != Qnil || fib->cont.type == ROOT_FIBER_CONTEXT) {
 	rb_raise(rb_eFiberError, "double resume");
     }
-    if (fib->transferred != 0) {
+    if (fib->transfered != 0) {
 	rb_raise(rb_eFiberError, "cannot resume transferred Fiber");
     }
 
-    return fiber_switch(fib, argc, argv, 1);
+    return fiber_switch(fibval, argc, argv, 1);
 }
 
 VALUE
 rb_fiber_yield(int argc, const VALUE *argv)
 {
-    return fiber_switch(return_fiber(), argc, argv, 0);
+    return rb_fiber_transfer(return_fiber(), argc, argv);
 }
 
 void
 rb_fiber_reset_root_local_storage(VALUE thval)
 {
     rb_thread_t *th;
+    rb_fiber_t	*fib;
 
     GetThreadPtr(thval, th);
     if (th->root_fiber && th->root_fiber != th->fiber) {
-	th->local_storage = th->root_fiber->cont.saved_thread.local_storage;
+	GetFiberPtr(th->root_fiber, fib);
+	th->local_storage = fib->cont.saved_thread.local_storage;
     }
 }
 
@@ -1621,8 +1607,8 @@ rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval)
 {
     rb_fiber_t *fib;
     GetFiberPtr(fibval, fib);
-    fib->transferred = 1;
-    return fiber_switch(fib, argc, argv, 0);
+    fib->transfered = 1;
+    return rb_fiber_transfer(fibval, argc, argv);
 }
 
 /*
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 2f93102efe..5bd414d786 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,11 +1,8 @@
-override MFLAGS := $(filter-out -j%,$(MFLAGS))
-override MAKEFLAGS := $(filter-out -j%,$(MAKEFLAGS))
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
 DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
 WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
-STRIP = @STRIP@
 
 ifeq (@target_os@,cygwin)
   DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
@@ -13,6 +10,9 @@ else
   DLL_BASE_NAME := $(RUBY_SO_NAME)
   DLLWRAP += -mno-cygwin
   VPATH := $(VPATH):$(srcdir)/win32
+  STUBPROGRAM = rubystub$(EXEEXT)
+  IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
+  SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))
 endif
 
 ifneq ($(ENABLE_SHARED),yes)
@@ -32,15 +32,20 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 
 -include uncommon.mk
 
-include $(srcdir)/defs/gmake.mk
-
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(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)
+stub: $(STUBPROGRAM)
+scriptbin: $(SCRIPTPROGRAMS)
+
+%$(EXEEXT): bin/% $(STUBPROGRAM)
+	$(ECHO) generating $@
+	$(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
+	$(Q) chmod +x $@
 
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
@@ -49,11 +54,11 @@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 	$(ECHO) compiling $@
 	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-%.rc: $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
 	$(ECHO) generating $@
 	$(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-	  -so_name=$(DLL_BASE_NAME) -output=$(*F) \
+	  -so_name=$(DLL_BASE_NAME) \
 	  . $(icondirs) $(srcdir)/win32
 
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
@@ -62,7 +67,11 @@ $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	$(ECHO) linking $@
 	$(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
-$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
+$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@
+	@rm -f $@
+	$(ECHO) linking $@
+	$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
+	  stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 $(RUBY_EXP): $(LIBRUBY_A)
 	$(ECHO) creating $@
@@ -77,15 +86,7 @@ GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 ifeq (@target_os@,mingw32)
 $(OBJS) $(MAINOBJ): win32.h
 
-dir.$(OBJEXT) win32/win32.$(OBJEXT): win32/dir.h
-file.$(OBJEXT) win32/win32.$(OBJEXT): win32/file.h
-
-MSYS2_ARG_CONV_EXCL_PARAM = --exclude=;--name=
-
-yes-test-ruby:	 export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
-yes-test-all:	 export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
-yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM)
-
+dir.$(OBJEXT) win32.$(OBJEXT): win32/dir.h
 endif
 
 $(LIBRUBY_SO): $(RUBYDEF)
@@ -98,7 +99,7 @@ clean-local::
 	@$(RM) $(RUBYDEF)
 
 ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)0.dll: $(LIBRUBY_A) $(RUBYDEF)
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
 	$(ECHO) generating $@
 	$(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
 endif
diff --git a/debug.c b/debug.c
index 8a5e69bbf5..15c1ea8b9e 100644
--- a/debug.c
+++ b/debug.c
@@ -25,11 +25,42 @@ const union {
     enum node_type              node_type;
     enum ruby_method_ids        method_ids;
     enum ruby_id_types          id_types;
-    enum ruby_fl_type           fl_types;
-    enum ruby_encoding_consts   encoding_consts;
-    enum ruby_coderange_type    enc_coderange_types;
-    enum ruby_econv_flag_type   econv_flag_types;
     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_PROMOTED0   = FL_PROMOTED0,
+        RUBY_FL_PROMOTED1   = FL_PROMOTED1,
+        RUBY_FL_PROMOTED    = FL_PROMOTED0|FL_PROMOTED1,
+        RUBY_FL_FINALIZE    = FL_FINALIZE,
+        RUBY_FL_TAINT       = FL_TAINT,
+        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,
@@ -37,7 +68,9 @@ const union {
     } 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)
@@ -59,16 +92,14 @@ ruby_debug_printf(const char *format, ...)
     va_end(ap);
 }
 
-#include "gc.h"
-
 VALUE
 ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
 {
     if (level < debug_level) {
-	char buff[0x100];
-	rb_raw_obj_info(buff, 0x100, obj);
-
-	fprintf(stderr, "DBG> %s: %s\n", header, buff);
+	VALUE str;
+	str = rb_inspect(obj);
+	fprintf(stderr, "DBG> %s: %s\n", header,
+		obj == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str));
 	fflush(stderr);
     }
     return obj;
@@ -109,20 +140,18 @@ ruby_debug_breakpoint(void)
 static void
 set_debug_option(const char *str, int len, void *arg)
 {
-#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
-    extern int ruby_w32_rtc_error;
-#endif
-#define SET_WHEN(name, var, val) do {	    \
+#define SET_WHEN(name, var) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
-	    (var) = (val);		    \
+	    extern int var;	    \
+	    var = 1;		    \
 	    return;			    \
 	}				    \
     } while (0)
-    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
-    SET_WHEN("core", ruby_enable_coredump, 1);
-#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
-    SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
+    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);
 }
diff --git a/defs/default_gems b/defs/default_gems
new file mode 100644
index 0000000000..ce9010910a
--- /dev/null
+++ b/defs/default_gems
@@ -0,0 +1,4 @@
+# gem		base directory		versioning file			[executable files under bin]
+rake		lib/rake		lib/rake.rb			[rake]
+rdoc		lib/rdoc		lib/rdoc.rb			[rdoc ri]
+json		ext/json		ext/json/lib/json/version.rb
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 2233627f8c..f5033b2245 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -1,26 +1,17 @@
 # -*- makefile-gmake -*-
 gnumake = yes
 
-CHECK_TARGETS := exam love check%
 TEST_TARGETS := $(filter check test check% test% btest%,$(MAKECMDGOALS))
 TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS)))
 TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS)))
 TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS)))
-TEST_DEPENDS += $(if $(filter $(CHECK_TARGETS),$(MAKECMDGOALS)),main)
-TEST_DEPENDS += $(if $(filter main,$(TEST_DEPENDS)),$(if $(filter all,$(INSTALLDOC)),docs))
+TEST_DEPENDS += $(TEST_DEPENDS) $(if $(filter check%,$(MAKECMDGOALS)),main)
+TEST_DEPENDS += $(if $(filter all,$(INSTALLDOC)),docs)
 
 ifneq ($(filter -O0 -Od,$(optflags)),)
 override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
 endif
 
-ifeq ($(if $(filter all main exts enc trans libencs libenc libtrans \
-		    prog program ruby ruby$(EXEEXT) \
-		    wprogram rubyw rubyw$(EXEEXT) \
-		    miniruby$(EXEEXT) mini,\
-	     $(MAKECMDGOALS)),,$(MAKECMDGOALS)),)
--include $(SHOWFLAGS)
-endif
-
 ifneq ($(filter universal-%,$(arch)),)
 define archcmd
 %.$(1).S: %.c
@@ -40,18 +31,16 @@ $(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\
 	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
 endif
 
-ifneq ($(filter $(CHECK_TARGETS) test,$(MAKECMDGOALS)),)
-yes-test-basic: $(TEST_DEPENDS) yes-test-knownbug
+ifneq ($(filter love check% test,$(MAKECMDGOALS)),)
 yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby
-yes-btest-ruby: $(TEST_DEPENDS)
+yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample
+yes-test-sample: $(TEST_DEPENDS)
 endif
-ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS)) $(filter yes-test-all,$(TEST_TARGETS)),)
-yes-test-testframework yes-test-almost yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS)) \
-	yes-test-basic
+ifneq ($(filter love check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
+yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
 endif
-ifneq ($(filter $(CHECK_TARGETS),$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
-yes-test-testframework yes-test-almost yes-test-ruby: yes-test-knownbug
-yes-test-almost: yes-test-testframework
+ifneq ($(filter love check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
+yes-test-all yes-test-ruby: yes-test-knownbug
 endif
 
 $(TEST_TARGETS): $(TEST_DEPENDS)
@@ -66,62 +55,9 @@ install-prereq: uninstall
 uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs)
 endif
 
-ifneq ($(filter exam,$(MAKECMDGOALS)),)
-test-rubyspec: check
-yes-test-all no-test-all: test
-endif
-
 ifneq ($(filter love,$(MAKECMDGOALS)),)
 showflags: up
-sudo-precheck: test yes-test-testframework no-test-testframework
+sudo-precheck: test
 install-prereq: sudo-precheck
 yes-test-all no-test-all: install
-yes-test-almost no-test-almost: install
-endif
-
-$(srcdir)/missing/des_tables.c: $(srcdir)/missing/crypt.c
-ifeq ($(if $(filter yes,$(CROSS_COMPILING)),,$(CC)),)
-	touch $@
-else
-	@$(ECHO) building make_des_table
-	$(CC) $(CPPFLAGS) -DDUMP $(LDFLAGS) $(XLDFLAGS) $(LIBS) -omake_des_table $(srcdir)/missing/crypt.c
-	@[ -x ./make_des_table ]
-	@$(ECHO) generating $@
-	$(Q) $(MAKEDIRS) $(@D)
-	$(Q) ./make_des_table > $@.new
-	$(Q) mv $@.new $@
-	$(Q) $(RMALL) make_des_table*
-endif
-
-STUBPROGRAM = rubystub$(EXEEXT)
-IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
-SCRIPTBINDIR := $(if $(EXEEXT),,exec/)
-SCRIPTPROGRAMS = $(addprefix $(SCRIPTBINDIR),$(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*)))))
-
-stub: $(STUBPROGRAM)
-scriptbin: $(SCRIPTPROGRAMS)
-ifneq ($(STUBPROGRAM),rubystub)
-rubystub: $(STUBPROGRAM)
 endif
-
-$(SCRIPTPROGRAMS): $(STUBPROGRAM)
-
-$(STUBPROGRAM): rubystub.$(OBJEXT) $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
-
-rubystub$(EXEEXT):
-	@rm -f $@
-	$(ECHO) linking $@
-	$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) rubystub.$(OBJEXT) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
-	$(Q) $(POSTLINK)
-	$(if $(STRIP),$(Q) $(STRIP) $@)
-
-$(SCRIPTBINDIR)%$(EXEEXT): bin/% $(STUBPROGRAM) \
-			   $(if $(SCRIPTBINDIR),$(TIMESTAMPDIR)/.exec.time)
-	$(ECHO) generating $@
-	$(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
-	$(Q) chmod +x $@
-	$(Q) $(POSTLINK)
-
-$(TIMESTAMPDIR)/.exec.time:
-	$(Q) mkdir exec
-	$(Q) exit > $@
diff --git a/defs/id.def b/defs/id.def
index 4fe9d3ccd8..f7fffbde3c 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -1,7 +1,5 @@
 # -*- mode: ruby; coding: us-ascii -*-
 firstline, predefined = __LINE__+1, %[\
-  max
-  min
   freeze
   inspect
   intern
@@ -40,9 +38,6 @@ firstline, predefined = __LINE__+1, %[\
   to_i
   bt
   bt_locations
-  call
-  mesg
-  exception
 
   _                                                     UScore
   "/*NULL*/"                                            NULL
@@ -62,47 +57,6 @@ firstline, predefined = __LINE__+1, %[\
   core#hash_merge_ary
   core#hash_merge_ptr
   core#hash_merge_kwd
-
-  -                                                     debug#created_info
-
-  $_                                                    LASTLINE
-  $~                                                    BACKREF
-]
-
-# VM ID         OP      Parser Token
-token_ops = %[\
-  Dot2          ..      DOT2
-  Dot3          ...     DOT3
-  UPlus         +@      UPLUS
-  UMinus        -@      UMINUS
-  Pow           **      POW
-  DSTAR         **
-  Cmp           <=>     CMP
-  PLUS          +
-  MINUS         -
-  MULT          *
-  DIV           /
-  MOD           %
-  LTLT          <<      LSHFT
-  GTGT          >>      RSHFT
-  LT            <
-  LE            <=      LEQ
-  GT            >
-  GE            >=      GEQ
-  Eq            ==      EQ
-  Eqq           ===     EQQ
-  Neq           !=      NEQ
-  Not           !
-  Backquote     `
-  EqTilde       =~      MATCH
-  NeqTilde      !~      NMATCH
-  AREF          []
-  ASET          []=
-  COLON2        ::
-  COLON3        ::
-  ANDOP         &&
-  OROP          ||
-  ANDDOT        &.
 ]
 
 class KeywordError < RuntimeError
@@ -118,8 +72,6 @@ instance_ids = []
 global_ids = []
 const_ids = []
 class_ids = []
-attrset_ids = []
-token_op_ids = []
 names = {}
 predefined.split(/^/).each_with_index do |line, num|
   next if /^#/ =~ line
@@ -136,10 +88,6 @@ predefined.split(/^/).each_with_index do |line, num|
     token.sub!(/\A@/, "_I_")
     token.gsub!(/\W+/, "")
   end
-  if name == '-'
-    preserved_ids << token
-    next
-  end
   if prev = names[name]
     KeywordError.raise("#{name} is already registered at line #{prev+firstline}", firstline+num)
   end
@@ -150,30 +98,21 @@ predefined.split(/^/).each_with_index do |line, num|
   case name
   when /\A[A-Z]\w*\z/; const_ids
   when /\A(?!\d)\w+\z/; local_ids
-  when /\A\$(?:\d+|(?!\d)\w+|\W)\z/; global_ids
+  when /\A\$(?:\d+|(?!\d)\w+)\z/; global_ids
   when /\A@@(?!\d)\w+\z/; class_ids
   when /\A@(?!\d)\w+\z/; instance_ids
-  when /\A((?!\d)\w+)=\z/; attrset_ids
+  when /\A((?!\d)\w+)=\z/
+    KeywordError.raise("use ID2ATTRSET(#{$1}) instead of ATTRSET #{name}", firstline+num)
   else preserved_ids
   end << token
   predefined_ids[token] = name
 end
-token_ops.split(/^/).each do |line|
-  next if /^#/ =~ line
-  line.sub!(/\s+#.*/, '')
-  id, op, token = line.split
-  next unless id and op
-  token ||= (id unless /\A\W\z/ =~ op)
-  token_op_ids << [id, op, token]
-end
 {
   "LOCAL" => local_ids,
   "INSTANCE" => instance_ids,
   "GLOBAL" => global_ids,
   "CONST" => const_ids,
   "CLASS" => class_ids,
-  "ATTRSET" => attrset_ids,
   :preserved => preserved_ids,
   :predefined => predefined_ids,
-  :token_op => token_op_ids,
 }
diff --git a/defs/keywords b/defs/keywords
index e0d931cd1f..1b5719aa85 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -1,5 +1,5 @@
 %{
-struct kwtable {int name, id[2], state;};
+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);
@@ -13,7 +13,7 @@ __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|EXPR_FITEM
+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
@@ -43,7 +43,7 @@ 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|EXPR_FITEM
+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
diff --git a/defs/known_errors.def b/defs/known_errors.def
index b9c490d3a2..3cebe90a8e 100644
--- a/defs/known_errors.def
+++ b/defs/known_errors.def
@@ -143,6 +143,3 @@ EPROGMISMATCH
 EPROGUNAVAIL
 ERPCMISMATCH
 EIPSEC
-EHWPOISON
-ECAPMODE
-ENOTCAPABLE
diff --git a/defs/lex.c.src b/defs/lex.c.src
index e0d931cd1f..1b5719aa85 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -1,5 +1,5 @@
 %{
-struct kwtable {int name, id[2], state;};
+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);
@@ -13,7 +13,7 @@ __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|EXPR_FITEM
+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
@@ -43,7 +43,7 @@ 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|EXPR_FITEM
+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
diff --git a/defs/opt_insn_unif.def b/defs/opt_insn_unif.def
index 31ae2eb6a1..1ac613dbea 100644
--- a/defs/opt_insn_unif.def
+++ b/defs/opt_insn_unif.def
@@ -8,10 +8,12 @@ __END__
 putobject putobject
 putobject putstring
 putobject setlocal
+putobject setdynamic
 
 putstring putstring
 putstring putobject
 putstring setlocal
+putstring setdynamic
 
 # putnil end
 
diff --git a/defs/separated_version.mk b/defs/separated_version.mk
deleted file mode 100644
index f086f4b24a..0000000000
--- a/defs/separated_version.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# ******** FOR DEVELEPERS ONLY ********
-# Separate version.o into a shared library which varies every
-# revisions, in order to make the rest sharable.
-
-include $(firstword $(wildcard GNUmakefile Makefile))
-
-ifneq ($(filter @executable_path/%,$(DLDFLAGS)),)
-RUBY_VERSION_SO = $(subst ruby,ruby_version,$(LIBRUBY_SO))
-RUBY_VERSION_DLDFLAGS := $(patsubst @executable_path/%/$(LIBRUBY_SO),@loader_path/$(RUBY_VERSION_SO),$(DLDFLAGS)) -exported_symbol=Init_version
-else ifneq ($(findstring -soname,$(DLDFLAGS)),)
-RUBY_VERSION_SO = $(subst ruby,ruby_version,$(LIBRUBY_SO))
-RUBY_VERSION_DLDFLAGS := $(subst ruby,ruby_version,$(DLDFLAGS)) -Wl,-rpath-link,'$${ORIGIN}'
-else
-ERROR
-endif
-
-ifneq ($(RUBY_VERSION_SO),)
-
-version.$(OBJEXT): XCFLAGS := $(subst -fvisibility=hidden,,$(XCFLAGS))
-
-MINIOBJS += version.$(OBJEXT)
-DLDOBJS += $(RUBY_VERSION_SO)
-LIBRUBYARG_SHARED := -lruby_version $(LIBRUBYARG_SHARED)
-$(LIBRUBY_SO): COMMONOBJS := $(filter-out version.$(OBJEXT),$(COMMONOBJS))
-$(LIBRUBY_A): COMMONOBJS := $(sort version.$(OBJEXT) $(COMMONOBJS))
-
-$(LIBRUBY_SO): $(RUBY_VERSION_SO)
-
-$(RUBY_VERSION_SO): version.$(OBJEXT)
-	$(ECHO) linking shared-library $@
-	$(LDSHARED) $(RUBY_VERSION_DLDFLAGS) version.$(OBJEXT) $(OUTFLAG)$@
-	-$(Q) $(MINIRUBY) -e 'ARGV.each{|link|' \
-		-e   'File.delete link rescue nil' \
-		-e   'File.symlink "$(RUBY_VERSION_SO)", link' \
-		-e '}' \
-		$(subst ruby,ruby_version,$(LIBRUBY_ALIASES)) || true
-
-endif
diff --git a/dir.c b/dir.c
index f701fe928c..09b78c6b4b 100644
--- a/dir.c
+++ b/dir.c
@@ -11,8 +11,9 @@
 
 **********************************************************************/
 
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
 #include "internal.h"
-#include "encindex.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -21,7 +22,6 @@
 #include <unistd.h>
 #endif
 
-#undef HAVE_DIRENT_NAMLEN
 #if defined HAVE_DIRENT_H && !defined _WIN32
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
@@ -31,7 +31,6 @@
 #else
 # define dirent direct
 # define NAMLEN(dirent) (dirent)->d_namlen
-# define HAVE_DIRENT_NAMLEN 1
 # if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
 # endif
@@ -74,68 +73,24 @@ char *strchr(char*,char);
 #define rmdir(p) rb_w32_urmdir(p)
 #undef opendir
 #define opendir(p) rb_w32_uopendir(p)
-#define IS_WIN32 1
-#else
-#define IS_WIN32 0
-#endif
-
-#ifdef HAVE_SYS_ATTR_H
-#include <sys/attr.h>
-#endif
-
-#define USE_NAME_ON_FS_REAL_BASENAME 1	/* platform dependent APIs to
-					 * get real basenames */
-#define USE_NAME_ON_FS_BY_FNMATCH 2	/* select the matching
-					 * basename by fnmatch */
-
-#ifdef HAVE_GETATTRLIST
-# define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME
-# define RUP32(size) ((size)+3/4)
-# define SIZEUP32(type) RUP32(sizeof(type))
-#elif defined _WIN32
-# define USE_NAME_ON_FS USE_NAME_ON_FS_REAL_BASENAME
-#elif defined DOSISH
-# define USE_NAME_ON_FS USE_NAME_ON_FS_BY_FNMATCH
-#else
-# define USE_NAME_ON_FS 0
 #endif
 
 #ifdef __APPLE__
-# define NORMALIZE_UTF8PATH 1
+# define HAVE_HFS 1
 #else
-# define NORMALIZE_UTF8PATH 0
+# define HAVE_HFS 0
 #endif
-
-#if NORMALIZE_UTF8PATH
+#if HAVE_HFS
 #include <sys/param.h>
 #include <sys/mount.h>
-#include <sys/vnode.h>
 
-# if defined HAVE_FGETATTRLIST || !defined HAVE_GETATTRLIST
-#   define need_normalization(dirp, path) need_normalization(dirp)
-# else
-#   define need_normalization(dirp, path) need_normalization(path)
-# endif
 static inline int
-need_normalization(DIR *dirp, const char *path)
-{
-# if defined HAVE_FGETATTRLIST || defined HAVE_GETATTRLIST
-    u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
-    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
-#   if defined HAVE_FGETATTRLIST
-    int ret = fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), 0);
-#   else
-    int ret = getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0);
-#   endif
-    if (!ret) {
-	const fsobj_tag_t *tag = (void *)(attrbuf+1);
-	switch (*tag) {
-	  case VT_HFS:
-	  case VT_CIFS:
-	    return TRUE;
-	}
+is_hfs(DIR *dirp)
+{
+    struct statfs buf;
+    if (fstatfs(dirfd(dirp), &buf) == 0) {
+	return buf.f_type == 17; /* HFS on darwin */
     }
-# endif
     return FALSE;
 }
 
@@ -150,31 +105,11 @@ has_nonascii(const char *ptr, size_t len)
     return 0;
 }
 
-# define IF_NORMALIZE_UTF8PATH(something) something
+# define IF_HAVE_HFS(something) something
 #else
-# define IF_NORMALIZE_UTF8PATH(something) /* nothing */
-#endif
-
-#ifndef IFTODT
-# define IFTODT(m)	(((m) & S_IFMT) / ((~S_IFMT & S_IFMT-1) + 1))
+# define IF_HAVE_HFS(something) /* nothing */
 #endif
 
-typedef enum {
-#ifdef DT_UNKNOWN
-    path_exist     = DT_UNKNOWN,
-    path_directory = DT_DIR,
-    path_regular   = DT_REG,
-    path_symlink   = DT_LNK,
-#else
-    path_exist,
-    path_directory = IFTODT(S_IFDIR),
-    path_regular   = IFTODT(S_IFREG),
-    path_symlink   = IFTODT(S_IFLNK),
-#endif
-    path_noent = -1,
-    path_unknown = -2
-} rb_pathtype_t;
-
 #define FNM_NOESCAPE	0x01
 #define FNM_PATHNAME	0x02
 #define FNM_DOTMATCH	0x04
@@ -185,11 +120,6 @@ typedef enum {
 #else
 #define FNM_SYSCASE	0
 #endif
-#if _WIN32
-#define FNM_SHORTNAME	0x20
-#else
-#define FNM_SHORTNAME	0
-#endif
 
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
@@ -266,7 +196,7 @@ bracket(
     return ok == not ? NULL : (char *)p + 1;
 }
 
-/* If FNM_PATHNAME is set, only path element will be matched. (up to '/' or '\0')
+/* If FNM_PATHNAME is set, only path element will be matched. (upto '/' or '\0')
    Otherwise, entire string will be matched.
    End marker itself won't be compared.
    And if function succeeds, *pcur reaches end marker.
@@ -445,13 +375,13 @@ dir_free(void *ptr)
 static size_t
 dir_memsize(const void *ptr)
 {
-    return sizeof(struct dir_data);
+    return ptr ? sizeof(struct dir_data) : 0;
 }
 
 static const rb_data_type_t dir_data_type = {
     "dir",
     {dir_mark, dir_free, dir_memsize,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE dir_close(VALUE);
@@ -495,10 +425,9 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
     rb_encoding  *fsenc;
     VALUE dirname, opt, orig;
     static ID keyword_ids[1];
-    const char *path;
 
     if (!keyword_ids[0]) {
-	keyword_ids[0] = rb_id_encoding();
+	keyword_ids[0] = rb_intern("encoding");
     }
 
     fsenc = rb_filesystem_encoding();
@@ -523,25 +452,14 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
     dp->dir = NULL;
     dp->path = Qnil;
     dp->enc = fsenc;
-    path = RSTRING_PTR(dirname);
-    dp->dir = opendir(path);
+    dp->dir = opendir(RSTRING_PTR(dirname));
     if (dp->dir == NULL) {
-	int e = errno;
-	if (rb_gc_for_fd(e)) {
-	    dp->dir = opendir(path);
+	if (errno == EMFILE || errno == ENFILE) {
+	    rb_gc();
+	    dp->dir = opendir(RSTRING_PTR(dirname));
 	}
-#ifdef HAVE_GETATTRLIST
-	else if (e == EIO) {
-	    u_int32_t attrbuf[1];
-	    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
-	    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
-		dp->dir = opendir(path);
-	    }
-	}
-#endif
 	if (dp->dir == NULL) {
-	    RB_GC_GUARD(dirname);
-	    rb_syserr_fail_path(e, orig);
+	    rb_sys_fail_path(orig);
 	}
     }
     dp->path = orig;
@@ -586,16 +504,11 @@ dir_closed(void)
 }
 
 static struct dir_data *
-dir_get(VALUE dir)
-{
-    rb_check_frozen(dir);
-    return rb_check_typeddata(dir, &dir_data_type);
-}
-
-static struct dir_data *
 dir_check(VALUE dir)
 {
-    struct dir_data *dirp = dir_get(dir);
+    struct dir_data *dirp;
+    rb_check_frozen(dir);
+    dirp = rb_check_typeddata(dir, &dir_data_type);
     if (!dirp->dir) dir_closed();
     return dirp;
 }
@@ -623,22 +536,9 @@ dir_inspect(VALUE dir)
 	rb_str_cat2(str, ">");
 	return str;
     }
-    return rb_funcallv(dir, rb_intern("to_s"), 0, 0);
+    return rb_funcall(dir, rb_intern("to_s"), 0, 0);
 }
 
-/* Workaround for Solaris 10 that does not have dirfd.
-   Note: Solaris 11 (POSIX.1-2008 compliant) has dirfd(3C).
- */
-#if defined(__sun) && !defined(HAVE_DIRFD)
-# if defined(HAVE_DIR_D_FD)
-#  define dirfd(x) ((x)->d_fd)
-#  define HAVE_DIRFD 1
-# elif defined(HAVE_DIR_DD_FD)
-#  define dirfd(x) ((x)->dd_fd)
-#  define HAVE_DIRFD 1
-# endif
-#endif
-
 #ifdef HAVE_DIRFD
 /*
  *  call-seq:
@@ -691,43 +591,10 @@ dir_path(VALUE dir)
 }
 
 #if defined _WIN32
-static int
-fundamental_encoding_p(rb_encoding *enc)
-{
-    switch (rb_enc_to_index(enc)) {
-      case ENCINDEX_ASCII:
-      case ENCINDEX_US_ASCII:
-      case ENCINDEX_UTF_8:
-	return TRUE;
-      default:
-	return FALSE;
-    }
-}
 # define READDIR(dir, enc) rb_w32_readdir((dir), (enc))
 #else
 # define READDIR(dir, enc) readdir((dir))
 #endif
-static int
-to_be_skipped(const struct dirent *dp)
-{
-    const char *name = dp->d_name;
-    if (name[0] != '.') return FALSE;
-#ifdef HAVE_DIRENT_NAMLEN
-    switch (NAMLEN(dp)) {
-      case 2:
-	if (name[1] != '.') return FALSE;
-      case 1:
-	return TRUE;
-      default:
-	break;
-    }
-#else
-    if (!name[1]) return TRUE;
-    if (name[1] != '.') return FALSE;
-    if (!name[2]) return TRUE;
-#endif
-    return FALSE;
-}
 
 /*
  *  call-seq:
@@ -753,8 +620,7 @@ dir_read(VALUE dir)
 	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else {
-	int e = errno;
-	if (e != 0) rb_syserr_fail(e, 0);
+	if (errno != 0) rb_sys_fail(0);
 	return Qnil;		/* end of stream */
     }
 }
@@ -784,18 +650,18 @@ dir_each(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
-    IF_NORMALIZE_UTF8PATH(int norm_p);
+    IF_HAVE_HFS(int hfs_p);
 
     RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
-    IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir, RSTRING_PTR(dirp->path)));
+    IF_HAVE_HFS(hfs_p = is_hfs(dirp->dir));
     while ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
 	const char *name = dp->d_name;
 	size_t namlen = NAMLEN(dp);
 	VALUE path;
-#if NORMALIZE_UTF8PATH
-	if (norm_p && has_nonascii(name, namlen) &&
+#if HAVE_HFS
+	if (hfs_p && has_nonascii(name, namlen) &&
 	    !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
 	    path = rb_external_str_with_enc(path, dirp->enc);
 	}
@@ -915,8 +781,8 @@ dir_rewind(VALUE dir)
  *  call-seq:
  *     dir.close -> nil
  *
- *  Closes the directory stream.
- *  Calling this method on closed Dir object is ignored since Ruby 2.3.
+ *  Closes the directory stream. Any further attempts to access
+ *  <em>dir</em> will raise an <code>IOError</code>.
  *
  *     d = Dir.new("testdir")
  *     d.close   #=> nil
@@ -926,8 +792,7 @@ dir_close(VALUE dir)
 {
     struct dir_data *dirp;
 
-    dirp = dir_get(dir);
-    if (!dirp->dir) return Qnil;
+    GetDIR(dir, dirp);
     closedir(dirp->dir);
     dirp->dir = NULL;
 
@@ -1016,6 +881,7 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path = Qnil;
 
+    rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
 	FilePathValue(path);
 	path = rb_str_encode_ospath(path);
@@ -1052,17 +918,10 @@ rb_dir_getwd(void)
 {
     char *path;
     VALUE cwd;
-    int fsenc = rb_enc_to_index(rb_filesystem_encoding());
 
-    if (fsenc == ENCINDEX_US_ASCII) fsenc = ENCINDEX_ASCII;
     path = my_getcwd();
-#ifdef __APPLE__
-    cwd = rb_str_normalize_ospath(path, strlen(path));
-    OBJ_TAINT(cwd);
-#else
     cwd = rb_tainted_str_new2(path);
-#endif
-    rb_enc_associate_index(cwd, fsenc);
+    rb_enc_associate(cwd, rb_filesystem_encoding());
 
     xfree(path);
     return cwd;
@@ -1086,14 +945,15 @@ dir_s_getwd(VALUE dir)
     return rb_dir_getwd();
 }
 
-static VALUE
-check_dirname(VALUE dir)
+static void
+check_dirname(volatile VALUE *dir)
 {
-    VALUE d = dir;
+    VALUE d = *dir;
     char *path, *pend;
     long len;
     rb_encoding *enc;
 
+    rb_secure(2);
     FilePathValue(d);
     enc = rb_enc_get(d);
     RSTRING_GETMEM(d, path, len);
@@ -1101,9 +961,8 @@ check_dirname(VALUE dir)
     pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc);
     if (pend - path < len) {
 	d = rb_str_subseq(d, 0, pend - path);
-	StringValueCStr(d);
     }
-    return rb_str_encode_ospath(d);
+    *dir = rb_str_encode_ospath(d);
 }
 
 #if defined(HAVE_CHROOT)
@@ -1119,7 +978,7 @@ check_dirname(VALUE dir)
 static VALUE
 dir_s_chroot(VALUE dir, VALUE path)
 {
-    path = check_dirname(path);
+    check_dirname(&path);
     if (chroot(RSTRING_PTR(path)) == -1)
 	rb_sys_fail_path(path);
 
@@ -1157,7 +1016,7 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 	mode = 0777;
     }
 
-    path = check_dirname(path);
+    check_dirname(&path);
     if (mkdir(RSTRING_PTR(path), mode) == -1)
 	rb_sys_fail_path(path);
 
@@ -1176,56 +1035,26 @@ dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 static VALUE
 dir_s_rmdir(VALUE obj, VALUE dir)
 {
-    dir = check_dirname(dir);
+    check_dirname(&dir);
     if (rmdir(RSTRING_PTR(dir)) < 0)
 	rb_sys_fail_path(dir);
 
     return INT2FIX(0);
 }
 
-struct warning_args {
-#ifdef RUBY_FUNCTION_NAME_STRING
-    const char *func;
-#endif
-    const char *mesg;
-    rb_encoding *enc;
-};
-
-#ifndef RUBY_FUNCTION_NAME_STRING
-#define sys_enc_warning_in(func, mesg, enc) sys_enc_warning(mesg, enc)
-#endif
-
 static VALUE
 sys_warning_1(VALUE mesg)
 {
-    const struct warning_args *arg = (struct warning_args *)mesg;
-#ifdef RUBY_FUNCTION_NAME_STRING
-    rb_sys_enc_warning(arg->enc, "%s: %s", arg->func, arg->mesg);
-#else
-    rb_sys_enc_warning(arg->enc, "%s", arg->mesg);
-#endif
+    rb_sys_warning("%s:%s", strerror(errno), (const char *)mesg);
     return Qnil;
 }
 
-static void
-sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc)
-{
-    struct warning_args arg;
-#ifdef RUBY_FUNCTION_NAME_STRING
-    arg.func = func;
-#endif
-    arg.mesg = mesg;
-    arg.enc = enc;
-    rb_protect(sys_warning_1, (VALUE)&arg, 0);
-}
-
 #define GLOB_VERBOSE	(1U << (sizeof(int) * CHAR_BIT - 1))
-#define sys_warning(val, enc) \
-    ((flags & GLOB_VERBOSE) ? sys_enc_warning_in(RUBY_FUNCTION_NAME_STRING, (val), (enc)) :(void)0)
+#define sys_warning(val) \
+    (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_REALLOC(ptr, size) realloc((ptr), (size))
 #define GLOB_FREE(ptr) free(ptr)
 #define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status))
 
@@ -1233,39 +1062,33 @@ sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc)
  * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
  * is not a directory.
  */
-ALWAYS_INLINE(static int to_be_ignored(int e));
-static inline int
-to_be_ignored(int e)
-{
-    return e == ENOENT || e == ENOTDIR;
-}
+#define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
 
 #ifdef _WIN32
 #define STAT(p, s)	rb_w32_ustati64((p), (s))
-#undef lstat
-#define lstat(p, s)	rb_w32_ulstati64((p), (s))
 #else
 #define STAT(p, s)	stat((p), (s))
 #endif
 
 /* System call with warning */
 static int
-do_stat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
+do_stat(const char *path, struct stat *pst, int flags)
+
 {
     int ret = STAT(path, pst);
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path, enc);
+	sys_warning(path);
 
     return ret;
 }
 
 #if defined HAVE_LSTAT || defined lstat
 static int
-do_lstat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
+do_lstat(const char *path, struct stat *pst, int flags)
 {
     int ret = lstat(path, pst);
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path, enc);
+	sys_warning(path);
 
     return ret;
 }
@@ -1278,30 +1101,18 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
 {
     DIR *dirp;
 #ifdef _WIN32
-    VALUE tmp = 0;
-    if (!fundamental_encoding_p(enc)) {
+    volatile VALUE tmp;
+    if (enc != rb_usascii_encoding() &&
+	enc != rb_ascii8bit_encoding() &&
+	enc != rb_utf8_encoding()) {
 	tmp = rb_enc_str_new(path, strlen(path), enc);
 	tmp = rb_str_encode_ospath(tmp);
 	path = RSTRING_PTR(tmp);
     }
 #endif
     dirp = opendir(path);
-    if (!dirp) {
-	int e = errno;
-	switch (rb_gc_for_fd(e)) {
-	  default:
-	    dirp = opendir(path);
-	    if (dirp) break;
-	    e = errno;
-	    /* fallback */
-	  case 0:
-	    if (to_be_ignored(e)) break;
-	    sys_warning(path, enc);
-	}
-    }
-#ifdef _WIN32
-    if (tmp) rb_str_resize(tmp, 0); /* GC guard */
-#endif
+    if (dirp == NULL && !to_be_ignored(errno))
+	sys_warning(path);
 
     return dirp;
 }
@@ -1326,23 +1137,14 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 	    return MAGICAL;
 
 	  case '\\':
-	    if (escape && p++ >= pend)
-		continue;
-	    break;
-
-#ifdef _WIN32
-	  case '.':
-	    break;
+	    if (escape && !(c = *p++))
+		return PLAIN;
+	    continue;
 
-	  case '~':
-	    hasalpha = 1;
-	    break;
-#endif
 	  default:
-	    if (IS_WIN32 || ISALPHA(c)) {
+	    if (ISALPHA(c)) {
 		hasalpha = 1;
 	    }
-	    break;
 	}
 
 	p = Next(p-1, pend, enc);
@@ -1441,7 +1243,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 	else {
 	    const char *m = find_dirsep(p, e, flags, enc);
 	    const enum glob_pattern_type magic = has_magic(p, m, flags, enc);
-	    const enum glob_pattern_type non_magic = (USE_NAME_ON_FS || FNM_SYSCASE) ? PLAIN : ALPHA;
+	    const enum glob_pattern_type non_magic = (HAVE_HFS || FNM_SYSCASE) ? PLAIN : ALPHA;
 	    char *buf;
 
 	    if (!(FNM_SYSCASE || magic > non_magic) && !recursive && *m) {
@@ -1515,155 +1317,7 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle
     return buf;
 }
 
-#ifdef HAVE_GETATTRLIST
-static int
-is_case_sensitive(DIR *dirp)
-{
-    struct {
-	u_int32_t length;
-	vol_capabilities_attr_t cap[1];
-    } __attribute__((aligned(4), packed)) attrbuf[1];
-    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, 0, ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES};
-    const vol_capabilities_attr_t *const cap = attrbuf[0].cap;
-    const int idx = VOL_CAPABILITIES_FORMAT;
-    const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE;
-
-    if (fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
-	return -1;
-    if (!(cap->valid[idx] & mask))
-	return -1;
-    return (cap->capabilities[idx] & mask) != 0;
-}
-
-static char *
-replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type)
-{
-    struct {
-	u_int32_t length;
-	attrreference_t ref[1];
-	fsobj_type_t objtype;
-	char path[MAXPATHLEN * 3];
-    } __attribute__((aligned(4), packed)) attrbuf[1];
-    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME|ATTR_CMN_OBJTYPE};
-    const attrreference_t *const ar = attrbuf[0].ref;
-    const char *name;
-    long len;
-    char *tmp;
-    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
-
-    *type = path_noent;
-    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW)) {
-	if (!to_be_ignored(errno))
-	    sys_warning(path, enc);
-	return path;
-    }
-
-    switch (attrbuf[0].objtype) {
-      case VREG: *type = path_regular; break;
-      case VDIR: *type = path_directory; break;
-      case VLNK: *type = path_symlink; break;
-      default: *type = path_exist; break;
-    }
-    name = (char *)ar + ar->attr_dataoffset;
-    len = (long)ar->attr_length - 1;
-    if (name + len > (char *)attrbuf + sizeof(attrbuf))
-	return path;
-
-# if NORMALIZE_UTF8PATH
-    if (norm_p && has_nonascii(name, len)) {
-	if (!NIL_P(utf8str = rb_str_normalize_ospath(name, len))) {
-	    RSTRING_GETMEM(utf8str, name, len);
-	}
-    }
-# endif
-
-    tmp = GLOB_REALLOC(path, base + len + 1);
-    if (tmp) {
-	path = tmp;
-	memcpy(path + base, name, len);
-	path[base + len] = '\0';
-    }
-    IF_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
-    return path;
-}
-#elif defined _WIN32
-VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
-int rb_w32_reparse_symlink_p(const WCHAR *path);
-
-static char *
-replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p, int flags, rb_pathtype_t *type)
-{
-    char *plainname = path;
-    volatile VALUE tmp = 0;
-    WIN32_FIND_DATAW fd;
-    WIN32_FILE_ATTRIBUTE_DATA fa;
-    WCHAR *wplain;
-    HANDLE h = INVALID_HANDLE_VALUE;
-    long wlen;
-    int e = 0;
-    if (!fundamental_encoding_p(enc)) {
-	tmp = rb_enc_str_new_cstr(plainname, enc);
-	tmp = rb_str_encode_ospath(tmp);
-	plainname = RSTRING_PTR(tmp);
-    }
-    wplain = rb_w32_mbstr_to_wstr(CP_UTF8, plainname, -1, &wlen);
-    if (tmp) rb_str_resize(tmp, 0);
-    if (!wplain) return path;
-    if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa)) {
-	h = FindFirstFileW(wplain, &fd);
-	e = rb_w32_map_errno(GetLastError());
-    }
-    if (fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-	if (!rb_w32_reparse_symlink_p(wplain))
-	    fa.dwFileAttributes &= ~FILE_ATTRIBUTE_REPARSE_POINT;
-    }
-    free(wplain);
-    if (h == INVALID_HANDLE_VALUE) {
-	*type = path_noent;
-	if (e && !to_be_ignored(e)) {
-	    errno = e;
-	    sys_warning(path, enc);
-	}
-	return path;
-    }
-    FindClose(h);
-    *type =
-	(fa.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ? path_symlink :
-	(fa.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ? path_directory :
-	path_regular;
-    if (tmp) {
-	char *buf;
-	tmp = rb_w32_conv_from_wchar(fd.cFileName, enc);
-	wlen = RSTRING_LEN(tmp);
-	buf = GLOB_REALLOC(path, base + wlen + 1);
-	if (buf) {
-	    path = buf;
-	    memcpy(path + base, RSTRING_PTR(tmp), wlen);
-	    path[base + wlen] = 0;
-	}
-	rb_str_resize(tmp, 0);
-    }
-    else {
-	char *utf8filename;
-	wlen = WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, NULL, 0, NULL, NULL);
-	utf8filename = GLOB_REALLOC(0, wlen);
-	if (utf8filename) {
-	    char *buf;
-	    WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, utf8filename, wlen, NULL, NULL);
-	    buf = GLOB_REALLOC(path, base + wlen + 1);
-	    if (buf) {
-		path = buf;
-		memcpy(path + base, utf8filename, wlen);
-		path[base + wlen] = 0;
-	    }
-	    GLOB_FREE(utf8filename);
-	}
-    }
-    return path;
-}
-#elif USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
-# error not implemented
-#endif
+enum answer {UNKNOWN = -1, NO, YES};
 
 #ifndef S_ISDIR
 #   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
@@ -1695,24 +1349,12 @@ glob_func_caller(VALUE val)
     return Qnil;
 }
 
-static inline int
-dirent_match(const char *pat, rb_encoding *enc, const char *name, const struct dirent *dp, int flags)
-{
-    if (fnmatch(pat, enc, name, flags) == 0) return 1;
-#ifdef _WIN32
-    if (dp->d_altname && (flags & FNM_SHORTNAME)) {
-	if (fnmatch(pat, enc, dp->d_altname, flags) == 0) return 1;
-    }
-#endif
-    return 0;
-}
-
 static int
 glob_helper(
     const char *path,
-    long pathlen,
     int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
-    rb_pathtype_t pathtype, /* type of '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,
@@ -1725,6 +1367,7 @@ glob_helper(
     struct glob_pattern **cur, **new_beg, **new_end;
     int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
     int escape = !(flags & FNM_NOESCAPE);
+    long pathlen;
 
     for (cur = beg; cur < end; ++cur) {
 	struct glob_pattern *p = *cur;
@@ -1737,11 +1380,7 @@ glob_helper(
 	    plain = 1;
 	    break;
 	  case ALPHA:
-#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
-	    plain = 1;
-#else
 	    magical = 1;
-#endif
 	    break;
 	  case MAGICAL:
 	    magical = 2;
@@ -1757,28 +1396,33 @@ glob_helper(
 	}
     }
 
+    pathlen = strlen(path);
     if (*path) {
-	if (match_all && pathtype == path_unknown) {
-	    if (do_lstat(path, &st, flags, enc) == 0) {
-		pathtype = IFTODT(st.st_mode);
+	if (match_all && exist == UNKNOWN) {
+	    if (do_lstat(path, &st, flags) == 0) {
+		exist = YES;
+		isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
 	    }
 	    else {
-		pathtype = path_noent;
+		exist = NO;
+		isdir = NO;
 	    }
 	}
-	if (match_dir && pathtype == path_unknown) {
-	    if (do_stat(path, &st, flags, enc) == 0) {
-		pathtype = IFTODT(st.st_mode);
+	if (match_dir && isdir == UNKNOWN) {
+	    if (do_stat(path, &st, flags) == 0) {
+		exist = YES;
+		isdir = S_ISDIR(st.st_mode) ? YES : NO;
 	    }
 	    else {
-		pathtype = path_noent;
+		exist = NO;
+		isdir = NO;
 	    }
 	}
-	if (match_all && pathtype > path_noent) {
+	if (match_all && exist == YES) {
 	    status = glob_call_func(func, path, arg, enc);
 	    if (status) return status;
 	}
-	if (match_dir && pathtype == path_directory) {
+	if (match_dir && isdir == YES) {
 	    char *tmp = join_path(path, pathlen, dirsep, "", 0);
 	    if (!tmp) return -1;
 	    status = glob_call_func(func, tmp, arg, enc);
@@ -1787,16 +1431,16 @@ glob_helper(
 	}
     }
 
-    if (pathtype == path_noent) return 0;
+    if (exist == NO || isdir == NO) return 0;
 
     if (magical || recursive) {
 	struct dirent *dp;
 	DIR *dirp;
-# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
+# ifdef DOSISH
 	char *plainname = 0;
 # endif
-	IF_NORMALIZE_UTF8PATH(int norm_p);
-# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
+	IF_HAVE_HFS(int hfs_p);
+# ifdef DOSISH
 	if (cur + 1 == end && (*cur)->type <= ALPHA) {
 	    plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
 	    if (!plainname) return -1;
@@ -1807,7 +1451,7 @@ glob_helper(
 # endif
 	dirp = do_opendir(*path ? path : ".", flags, enc);
 	if (dirp == NULL) {
-# if FNM_SYSCASE || NORMALIZE_UTF8PATH
+# if FNM_SYSCASE || HAVE_HFS
 	    if ((magical < 2) && !recursive && (errno == EACCES)) {
 		/* no read permission, fallback */
 		goto literally;
@@ -1815,25 +1459,22 @@ glob_helper(
 # endif
 	    return 0;
 	}
-	IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
+	IF_HAVE_HFS(hfs_p = is_hfs(dirp));
 
-# if NORMALIZE_UTF8PATH
-	if (!(norm_p || magical || recursive)) {
+# if HAVE_HFS
+	if (!(hfs_p || magical || recursive)) {
 	    closedir(dirp);
 	    goto literally;
 	}
-# endif
-# ifdef HAVE_GETATTRLIST
-	if (is_case_sensitive(dirp) == 0)
-	    flags |= FNM_CASEFOLD;
+	flags |= FNM_CASEFOLD;
 # endif
 	while ((dp = READDIR(dirp, enc)) != NULL) {
 	    char *buf;
-	    rb_pathtype_t new_pathtype = path_unknown;
+	    enum answer new_isdir = UNKNOWN;
 	    const char *name;
 	    size_t namlen;
 	    int dotfile = 0;
-	    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
+	    IF_HAVE_HFS(VALUE utf8str = Qnil);
 
 	    if (recursive && dp->d_name[0] == '.') {
 		++dotfile;
@@ -1850,33 +1491,30 @@ glob_helper(
 
 	    name = dp->d_name;
 	    namlen = NAMLEN(dp);
-# if NORMALIZE_UTF8PATH
-	    if (norm_p && has_nonascii(name, namlen)) {
+# if HAVE_HFS
+	    if (hfs_p && has_nonascii(name, namlen)) {
 		if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
 		    RSTRING_GETMEM(utf8str, name, namlen);
 		}
 	    }
 # endif
 	    buf = join_path(path, pathlen, dirsep, name, namlen);
-	    IF_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
+	    IF_HAVE_HFS(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
 	    if (!buf) {
 		status = -1;
 		break;
 	    }
 	    name = buf + pathlen + (dirsep != 0);
 	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) {
-#ifdef DT_UNKNOWN
-		if ((new_pathtype = dp->d_type) != (rb_pathtype_t)DT_UNKNOWN)
-		    /* Got it. We need nothing more. */
-		    ;
-		else
-		    /* fall back to call lstat(2) */
-#endif
 		/* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
-		if (do_lstat(buf, &st, flags, enc) == 0)
-		    new_pathtype = IFTODT(st.st_mode);
+#ifndef _WIN32
+		if (do_lstat(buf, &st, flags) == 0)
+		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
 		else
-		    new_pathtype = path_noent;
+		    new_isdir = NO;
+#else
+		new_isdir = dp->d_isdir ? (!dp->d_isrep ? YES : UNKNOWN) : NO;
+#endif
 	    }
 
 	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
@@ -1889,14 +1527,13 @@ glob_helper(
 	    for (cur = beg; cur < end; ++cur) {
 		struct glob_pattern *p = *cur;
 		if (p->type == RECURSIVE) {
-		    if (new_pathtype == path_directory || /* not symlink but real directory */
-			new_pathtype == path_exist)
+		    if (new_isdir == YES) /* not symlink but real directory */
 			*new_end++ = p; /* append recursive pattern */
 		    p = p->next; /* 0 times recursion */
 		}
 		switch (p->type) {
 		  case ALPHA:
-# if USE_NAME_ON_FS == USE_NAME_ON_FS_BY_FNMATCH
+# ifdef DOSISH
 		    if (plainname) {
 			*new_end++ = p->next;
 			break;
@@ -1904,15 +1541,14 @@ glob_helper(
 # endif
 		  case PLAIN:
 		  case MAGICAL:
-		    if (dirent_match(p->str, enc, name, dp, flags))
+		    if (fnmatch(p->str, enc, name, flags) == 0)
 			*new_end++ = p->next;
 		  default:
 		    break;
 		}
 	    }
 
-	    status = glob_helper(buf, name - buf + namlen, 1,
-				 new_pathtype, new_beg, new_end,
+	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
 				 flags, func, arg, enc);
 	    GLOB_FREE(buf);
 	    GLOB_FREE(new_beg);
@@ -1924,7 +1560,7 @@ glob_helper(
     else if (plain) {
 	struct glob_pattern **copy_beg, **copy_end, **cur2;
 
-# if FNM_SYSCASE || NORMALIZE_UTF8PATH
+# if FNM_SYSCASE || HAVE_HFS
       literally:
 # endif
 	copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
@@ -1934,7 +1570,6 @@ glob_helper(
 
 	for (cur = copy_beg; cur < copy_end; ++cur) {
 	    if (*cur) {
-		rb_pathtype_t new_pathtype = path_unknown;
 		char *buf;
 		char *name;
 		size_t len = strlen((*cur)->str) + 1;
@@ -1968,16 +1603,8 @@ glob_helper(
 		    status = -1;
 		    break;
 		}
-#if USE_NAME_ON_FS == USE_NAME_ON_FS_REAL_BASENAME
-		if ((*cur)->type == ALPHA) {
-		    long base = pathlen + (dirsep != 0);
-		    buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0,
-						flags, &new_pathtype);
-		}
-#endif
-		status = glob_helper(buf, pathlen + strlen(buf + pathlen), 1,
-				     new_pathtype, new_beg, new_end,
-				     flags, func, arg, enc);
+		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;
@@ -2005,7 +1632,7 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
     root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
 #endif
 
-    if (*root == '/') root++;
+    if (root && *root == '/') root++;
 
     n = root - start;
     buf = GLOB_ALLOC_N(char, n + 1);
@@ -2018,8 +1645,7 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco
 	GLOB_FREE(buf);
 	return -1;
     }
-    status = glob_helper(buf, n, 0, path_unknown, &list, &list + 1,
-			 flags, func, arg, enc);
+    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
     glob_free_pattern(list);
     GLOB_FREE(buf);
 
@@ -2044,33 +1670,36 @@ rb_glob_caller(const char *path, VALUE a, void *enc)
     return status;
 }
 
-void
-rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
+static int
+rb_glob2(const char *path, int flags,
+	 void (*func)(const char *, VALUE, void *), VALUE arg,
+	 rb_encoding* enc)
 {
     struct glob_args args;
-    int status;
 
     args.func = func;
     args.value = arg;
-    args.enc = rb_ascii8bit_encoding();
+    args.enc = enc;
 
-    status = ruby_glob0(path, GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
-			args.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,
+		      enc);
+}
+
+void
+rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE 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, void *enc)
 {
-#if defined _WIN32 || defined __APPLE__
-    VALUE name = rb_utf8_str_new_cstr(path);
-    rb_encoding *eenc = rb_default_internal_encoding();
-    OBJ_TAINT(name);
-    name = rb_str_conv_enc(name, NULL, eenc ? eenc : enc);
-#else
-    VALUE name = rb_external_str_new_with_enc(path, strlen(path), enc);
-#endif
-    rb_ary_push(ary, name);
+    rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc));
 }
 
 static int
@@ -2088,7 +1717,7 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	if (*p == '{' && nest++ == 0) {
 	    lbrace = p;
 	}
-	if (*p == '}' && lbrace && --nest == 0) {
+	if (*p == '}' && --nest <= 0) {
 	    rbrace = p;
 	    break;
 	}
@@ -2146,12 +1775,12 @@ glob_brace(const char *path, VALUE val, void *enc)
     return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
 }
 
-int
-ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+static int
+ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+		 rb_encoding* enc)
 {
     struct brace_args args;
 
-    flags &= ~GLOB_VERBOSE;
     args.func = func;
     args.value = arg;
     args.flags = flags;
@@ -2161,47 +1790,37 @@ ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE
 int
 ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_brace_glob_with_enc(str, flags, func, arg, rb_ascii8bit_encoding());
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
+			    rb_ascii8bit_encoding());
 }
 
-struct push_glob_args {
-    struct glob_args glob;
-    int flags;
-};
-
-static int
-push_caller(const char *path, VALUE val, void *enc)
+int
+ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
 {
-    struct push_glob_args *arg = (struct push_glob_args *)val;
-
-    return ruby_glob0(path, arg->flags, rb_glob_caller, (VALUE)&arg->glob, enc);
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, enc);
 }
 
 static int
 push_glob(VALUE ary, VALUE str, int flags)
 {
-    struct push_glob_args args;
-    rb_encoding *enc = rb_enc_get(str);
+    struct glob_args args;
+#ifdef __APPLE__
+    rb_encoding *enc = rb_utf8_encoding();
 
-#if defined _WIN32 || defined __APPLE__
     str = rb_str_encode_ospath(str);
+#else
+    rb_encoding *enc = rb_enc_get(str);
+
+    if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
+    if (enc == rb_usascii_encoding()) enc = rb_ascii8bit_encoding();
 #endif
-    if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
-	enc = rb_filesystem_encoding();
-    if (rb_enc_to_index(enc) == ENCINDEX_US_ASCII)
-	enc = rb_ascii8bit_encoding();
-    flags |= GLOB_VERBOSE;
-    args.glob.func = push_pattern;
-    args.glob.value = ary;
-    args.glob.enc = enc;
-    args.flags = flags;
-#if defined _WIN32 || defined __APPLE__
-    enc = rb_utf8_encoding();
-#endif
+    args.func = push_pattern;
+    args.value = ary;
+    args.enc = enc;
 
     RB_GC_GUARD(str);
-    return ruby_brace_expand(RSTRING_PTR(str), flags,
-			     push_caller, (VALUE)&args, enc);
+    return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
+			    rb_glob_caller, (VALUE)&args, enc);
 }
 
 static VALUE
@@ -2250,9 +1869,11 @@ dir_globs(long argc, const VALUE *argv, int flags)
 
 /*
  *  call-seq:
+ *     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>string,...</i><code>],0)</code>.
  *
  */
@@ -2371,7 +1992,7 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 static VALUE
 dir_open_dir(int argc, VALUE *argv)
 {
-    VALUE dir = rb_funcallv(rb_cDir, rb_intern("open"), argc, argv);
+    VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
 
     rb_check_typeddata(dir, &dir_data_type);
     return dir;
@@ -2627,7 +2248,7 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
  *
  */
 VALUE
-rb_file_directory_p(void)
+rb_file_directory_p()
 {
 }
 #endif
@@ -2646,72 +2267,6 @@ rb_dir_exists_p(VALUE obj, VALUE fname)
 }
 
 /*
- * call-seq:
- *   Dir.empty?(path_name)  ->  true or false
- *
- * Returns <code>true</code> if the named file is an empty directory,
- * <code>false</code> if it is not a directory or non-empty.
- */
-static VALUE
-rb_dir_s_empty_p(VALUE obj, VALUE dirname)
-{
-    DIR *dir;
-    struct dirent *dp;
-    VALUE result = Qtrue, orig;
-    const char *path;
-    enum {false_on_notdir = 1};
-
-    GlobPathValue(dirname, FALSE);
-    orig = rb_str_dup_frozen(dirname);
-    dirname = rb_str_encode_ospath(dirname);
-    dirname = rb_str_dup_frozen(dirname);
-    path = RSTRING_PTR(dirname);
-
-#if defined HAVE_GETATTRLIST && defined ATTR_DIR_ENTRYCOUNT
-    {
-	u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
-	struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
-	if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) != 0)
-	    rb_sys_fail_path(orig);
-	if (*(const fsobj_tag_t *)(attrbuf+1) == VT_HFS) {
-	    al.commonattr = 0;
-	    al.dirattr = ATTR_DIR_ENTRYCOUNT;
-	    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0) == 0) {
-		if (attrbuf[0] >= 2 * sizeof(u_int32_t))
-		    return attrbuf[1] ? Qfalse : Qtrue;
-		if (false_on_notdir) return Qfalse;
-	    }
-	    rb_sys_fail_path(orig);
-	}
-    }
-#endif
-
-    dir = opendir(path);
-    if (!dir) {
-	int e = errno;
-	switch (rb_gc_for_fd(e)) {
-	  default:
-	    dir = opendir(path);
-	    if (dir) break;
-	    e = errno;
-	    /* fall through */
-	  case 0:
-	    if (false_on_notdir && e == ENOTDIR) return Qfalse;
-	    rb_syserr_fail_path(e, orig);
-	}
-    }
-    errno = 0;
-    while ((dp = READDIR(dir, NULL)) != NULL) {
-	if (!to_be_skipped(dp)) {
-	    result = Qfalse;
-	    break;
-	}
-    }
-    closedir(dir);
-    return result;
-}
-
-/*
  *  Objects of class <code>Dir</code> are directory streams representing
  *  directories in the underlying file system. They provide a variety of
  *  ways to list directories and their contents. See also
@@ -2762,7 +2317,6 @@ Init_Dir(void)
     rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
     rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1);
     rb_define_singleton_method(rb_cDir,"exists?", rb_dir_exists_p, 1);
-    rb_define_singleton_method(rb_cDir,"empty?", rb_dir_s_empty_p, 1);
 
     rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
     rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
@@ -2806,11 +2360,4 @@ Init_Dir(void)
      *  0.
      */
     rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
-
-    /*  Document-const: File::Constants::FNM_SHORTNAME
-     *
-     *  Makes patterns to match short names if existing.  Valid only
-     *  on Microsoft Windows.
-     */
-    rb_file_const("FNM_SHORTNAME", INT2FIX(FNM_SHORTNAME));
 }
diff --git a/dln.c b/dln.c
index f52fc9f021..2b6a82f063 100644
--- a/dln.c
+++ b/dln.c
@@ -85,6 +85,10 @@ char *getenv();
 # endif
 #endif
 
+#if defined(__BEOS__) || defined(__HAIKU__)
+# include <image.h>
+#endif
+
 #ifndef dln_loaderror
 static void
 dln_loaderror(const char *format, ...)
@@ -102,12 +106,13 @@ dln_loaderror(const char *format, ...)
 # define USE_DLN_DLOPEN
 #endif
 
-#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(NeXT) || defined(MACOSX_DYLD)
-# define EXTERNAL_PREFIX "_"
-#else
-# define EXTERNAL_PREFIX ""
+#ifndef FUNCNAME_PATTERN
+# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
+#  define FUNCNAME_PREFIX "_Init_"
+# else
+#  define FUNCNAME_PREFIX "Init_"
+# endif
 #endif
-#define FUNCNAME_PREFIX EXTERNAL_PREFIX"Init_"
 
 #if defined __CYGWIN__ || defined DOSISH
 #define isdirsep(x) ((x) == '/' || (x) == '\\')
@@ -1113,12 +1118,12 @@ dln_sym(const char *name)
 #endif
 #endif
 
-#ifdef _WIN32
+#if defined _WIN32 && !defined __CYGWIN__
 #include <windows.h>
 #include <imagehlp.h>
 #endif
 
-#ifdef _WIN32
+#if defined _WIN32 && !defined __CYGWIN__
 static const char *
 dln_strerror(char *message, size_t size)
 {
@@ -1245,15 +1250,12 @@ rb_w32_check_imported(HMODULE ext, HMODULE mine)
 void*
 dln_load(const char *file)
 {
-#if (defined _WIN32 || defined USE_DLN_DLOPEN) && defined RUBY_EXPORT
-    static const char incompatible[] = "incompatible library version";
-#endif
 #if !defined(_AIX) && !defined(NeXT)
     const char *error = 0;
 #define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
 #endif
 
-#if defined _WIN32
+#if defined _WIN32 && !defined __CYGWIN__
     HINSTANCE handle;
     WCHAR *winfile;
     char message[1024];
@@ -1281,7 +1283,7 @@ dln_load(const char *file)
 #if defined _WIN32 && defined RUBY_EXPORT
     if (!rb_w32_check_imported(handle, rb_libruby_handle())) {
 	FreeLibrary(handle);
-	error = incompatible;
+	error = "incompatible library version";
 	goto failed;
     }
 #endif
@@ -1323,31 +1325,28 @@ dln_load(const char *file)
 # define RTLD_GLOBAL 0
 #endif
 
+#ifdef __native_client__
+	char* p, *orig;
+        if (file[0] == '.' && file[1] == '/') file+=2;
+	orig = strdup(file);
+	for (p = file; *p; ++p) {
+	    if (*p == '/') *p = '_';
+	}
+#endif
 	/* Load file */
 	if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
+#ifdef __native_client__
+            free(orig);
+#endif
 	    error = dln_strerror();
 	    goto failed;
 	}
-# if defined RUBY_EXPORT
-	{
-	    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
-	    if (ex && ex != ruby_xmalloc) {
-
-#   if defined __APPLE__ && \
-    defined(MAC_OS_X_VERSION_MIN_REQUIRED) && \
-    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_11)
-		/* dlclose() segfaults */
-		rb_fatal("%s - %s", incompatible, file);
-#   else
-		dlclose(handle);
-		error = incompatible;
-		goto failed;
-#   endif
-	    }
-	}
-# endif
 
 	init_fct = (void(*)())(VALUE)dlsym(handle, buf);
+#ifdef __native_client__
+	strcpy(file, orig);
+	free(orig);
+#endif
 	if (init_fct == NULL) {
 	    error = DLN_ERROR();
 	    dlclose(handle);
@@ -1442,6 +1441,54 @@ dln_load(const char *file)
     }
 #endif
 
+#if defined(__BEOS__) || defined(__HAIKU__)
+# define DLN_DEFINED
+    {
+      status_t err_stat;  /* BeOS error status code */
+      image_id img_id;    /* extension module unique id */
+      void (*init_fct)(); /* initialize function for extension module */
+
+      /* load extension module */
+      img_id = load_add_on(file);
+      if (img_id <= 0) {
+	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
+	 B_SYMBOL_TYPE_CODE. Why ? */
+      /* strcat(init_fct_symname, "__Fv"); */  /* parameter nothing. */
+      /* "__Fv" dont need! The Be Book Bug ? */
+      err_stat = get_image_symbol(img_id, buf,
+				  B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
+
+      if (err_stat != B_NO_ERROR) {
+	char real_name[MAXPATHLEN];
+
+	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);
+	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);
+	dln_loaderror(errmsg, strerror(err_stat), buf);
+      }
+
+      /* call module initialize function. */
+      (*init_fct)();
+      return (void*)img_id;
+    }
+#endif /* __BEOS__ || __HAIKU__ */
+
 #ifndef DLN_DEFINED
     dln_notimplement();
 #endif
diff --git a/dln_find.c b/dln_find.c
index b08612764e..56a19818cf 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -48,6 +48,13 @@ char *dln_argv0;
 #   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
@@ -269,15 +276,13 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
 	    }
 	    goto next;
 	}
-#endif
+#endif /* _WIN32 or __EMX__ */
 
-#ifndef S_ISREG
-# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-#endif
-	if (stat(fbuf, &st) == 0 && S_ISREG(st.st_mode)) {
+	if (stat(fbuf, &st) == 0) {
 	    if (exe_flag == 0) return fbuf;
 	    /* looking for executable */
-	    if (eaccess(fbuf, X_OK) == 0) return fbuf;
+	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
+		return fbuf;
 	}
       next:
 	/* if not, and no other alternatives, life is bleak */
diff --git a/dmydln.c b/dmydln.c
index 0fc0a5325e..25872efc98 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -1,6 +1,5 @@
 #include "ruby/ruby.h"
 
-NORETURN(void *dln_load(const char *));
 void*
 dln_load(const char *file)
 {
diff --git a/dmyenc.c b/dmyenc.c
deleted file mode 100644
index 7e006e826c..0000000000
--- a/dmyenc.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#define require(name) ruby_require_internal(name, (unsigned int)sizeof(name)-1)
-int ruby_require_internal(const char *, int);
-
-void
-Init_enc(void)
-{
-    if (require("enc/encdb.so") == 1) {
-	require("enc/trans/transdb.so");
-    }
-}
diff --git a/dmyext.c b/dmyext.c
index 4d273f7faf..34ea7a02f4 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -2,3 +2,8 @@ void
 Init_ext(void)
 {
 }
+
+void
+Init_enc(void)
+{
+}
diff --git a/doc/ChangeLog-0.06_to_0.52 b/doc/ChangeLog-0.06_to_0.52
deleted file mode 100644
index 63826081b3..0000000000
--- a/doc/ChangeLog-0.06_to_0.52
+++ /dev/null
@@ -1,1147 +0,0 @@
-Fri Oct 14 13:22:18 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.52: ……なんてこったい.
-
-	* eval.c(rb_call): returnの処理が間違っていたので, マシンによって
-	  はreturnで関数を終了するだけでなくtoplevelまでつき抜けていた.
-
-	* object.c: Builtinクラスを新設. 組み込み関数をKernelから移した.
-	  nilが組み込み関数を理解するとトラブルの元である.
-
-	* dbm.c: Dictと同様にeachが[key,value]を返すように.
-
-	* version 0.51
-
-Thu Oct 13 12:13:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(SETUP_ARGS): 付加演算子が配列でない時には配列に変換する.
-
-	* parse.y: 括弧なしのメソッド呼び出しでも`*'による付加引数が使える
-	  ようにした. ただし, 通常引数が一つもない場合は乗算演算子と区別が
-	  つかないので, 必ず括弧が必要.
-
-Wed Oct 12 10:09:07 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(rb_call): キャッシュの計算をinline化. キャッシュミスがあ
-	  れば関数呼び出しでメソッドを検索する. methods.cはなくなった.
-
-	* eval.c(rb_eval): ローカル変数用の領域をalloca()するように変更.
-	  サイズの変更が必要になれば改めてmalloc()するように.
-
-	* parse.y: error recoveryの際にlex_stateを更新しておくように.
-
-Tue Oct 11 17:10:46 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* socket.c(for_fd): ファイル記述子(Fixnum)からソケットインスタンス
-	  を得るメソッド. たとえばinetdから起動されたサーバで標準入出力に
-	  ソケット操作を行なうために使う. つまりSocket.for_fd($stdin)で標
-	  準入力に対応するソケットオブジェクトが得られる.
-
-	* io.c(to_i): IOクラスのインスタンスを整数に変換するとそのファイル
-	  記述子を返すように.
-
-	* numeric.c(num2int): to_iメソッドを使ってできる限り整数に変換する.
-	  以前はnum2fixだけが全てのオブジェクトに対してto_iメソッドを適用
-	  していた.
-
-	* sprintf.c(Fsprintf): 整数表示の際, オブジェクトをできる限り整数
-	  に変換するように(to_iメソッドを使う).
-
-Fri Oct  7 14:06:32 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(Fcaller): 必要性がよく分からないのでドキュメントから削除.
-	  将来デバッガを作る時に復活させよう.
-
-	* eval.c(rb_call): Cで記述されたメソッド呼び出しでは環境をスタック
-	  にセーブしないことによって高速化.
-
-Wed Oct  5 15:00:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby.h: 一時env.hに移動してたQselfの定義を復活. ただし今回は関数
-	  として実現(env.hでは変数として再定義してある).
-
-	* ruby.h: TRUEでsyntax errorにならないよう#undefを追加.
-
-	* eval.c(rb_eval): thread化に挑戦したが, 失敗(速くならなかった).
-	  が, Scopingなどの無駄なコードの削除とメソッド呼び出しの引数セッ
-	  トのinline化で若干の高速化を実現した. 副作用として, argc, argv形
-	  式の関数呼び出しの仕様が変化した(argvにselfを含まなくなった).
-
-	* eval.c(rb_call): メソッド呼び出しの高速化.
-
-Tue Oct  4 11:40:53 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby-mode.el: 修飾子に対応した.
-
-	* parse.y: 多重代入にrestをつけた. この機能を使えばoptional引数の
-	  解析が簡単にできる(はず).
-
-	* pack.c(unpack): uuencode形式のdecodeの際に文字列の長さが間違って
-	  いた.
-
-Mon Oct  3 15:58:41 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* file.c(type): ファイルタイプを文字列で返すメソッド.
-
-Fri Sep 30 11:36:07 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* object.c: デフォルトの真の値である%TRUEの値を1(Fixnum)からtに変
-	  更した. to_sで文字列に変換した時にも`t'と表示される. 更に踏み込
-	  んで`t'を予約語にしてlispのようにしようかとも思ったが, そこまで
-	  は決心できなかった. 一文字のローカル変数はかなり使いそうな気がす
-	  るので….
-
-	* array.c,dict.c: equalを再定義しているクラスで, hashを正しく定義
-	  した.
-
-Wed Sep 28 23:30:28 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c(Ffail): 今までfailはカーネルクラスのメソッドであったが,
-	  構文に組み込んだ. この変更によって, 1)`fail'は予約語となり, ロー
-	  カル変数に用いることができなくなった. 2)`fail'単体で例外を発生す
-	  るようになった. 3)failはメソッドではなくなったので再定義される可
-	  能性がなくなった.
-
-	* dic.c, dbm.c(indexes): Arrayのindexesと同様の機能を持つメソッド
-	  を追加.
-
-	* array.c(indexes): 引数をインデックスとする要素の配列を返す. 整数
-	  の配列を引数とする時には引数の要素をインデックスとする要素の配列
-	  を返す.
-
-Mon Sep 19 13:42:31 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* array.c(aset): 部分配列に対する代入で配列以外のオブジェクトが指
-	  定された場合に多重代入と同じルールで配列化するようにした.
-
-	* io.c(print): 引数として与えられた各オブジェクトにprint_onメッセー
-	  ジを与えるように. 実行速度は落ちるが柔軟性は増す.
-
-Fri Sep 16 14:59:18 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* glob.c: ワイルドカードの導入. bashに使われているGNUのglobルーチ
-	  ンを流用した.
-
-Mon Sep 12 18:36:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(value_expr): 式がnilの時に対応.
-
-	* class.c: ICLASSのclassが必ずClass/Moduleを指すように.
-
-Tue Sep  6 16:23:28 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c:	正規表現内で「\数字」形式が指定できるように.
-
-	* parse.y:「do expr using var ... end」形式はなくなった. 寂しい気
-	  もする. *BACKWARD INCOMPATIBILITY*
-
-Mon Sep  5 10:59:01 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* numeric.c(next): Numericクラスにもnextを提供.
-
-	* string.c(upto): uptoを提供.
-
-	* range.c(each): nextを使ったインタフェースからuptoを使うように変
-	  更した. この方が一つのメソッドで処理をまとめで行なうことができる.
-
-Fri Sep  2 15:25:39 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* dict.c(each): 戻り値を[key, value]のペアに変更. 今までのeachは
-	  each_valueとして残る. *BACKWARD INCOMPATIBILITY*
-
-Thu Sep  1 10:49:04 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 成功した(特別な戻り値を持たない)システムコールは`0'を返すように.
-
-Wed Aug 31 00:26:51 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* string.c: チェックサムを得るメソッド`sum'を作った.
-
-	* class.c(include_class_new): ICLASSのclassをもとのクラスにした.
-	  gcの際に元クラスをマークする必要があるのが, フィールドを増やす余
-	  地が無いので, classフィールドを流用した. 私の見積りが間違ってい
-	  て, ICLASSのインスタンスにメッセージを送る事があれば, おかしな動
-	  作をするだろう.
-
-	* eval.c(masign): 式(a,b = nil)の値を[nil]からnilに変更した.
-
-Mon Aug 29 11:56:09 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* class.c: rb_define_mfuncを無くして, メタクラスにモジュールをイン
-	  クルードするようにした.
-
-	* error.c(yyerror): 同じ行で複数のsyntax errorをリポートしないよう
-	  にした.
-
-	* file.c: FileTestモジュールにファイルテストメソッドを分離した.
-
-	* parse.y: 演算子を指定する時のlex_stateを正しく設定した.
-
-Sat Aug 27 01:23:34 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: if/whileなどの複合式をprimaryに移動した. これによって例
-	  えば「if cond then a else b end.message()」のような式が書けるよ
-	  うになった.
-
-Fri Aug 26 10:46:30 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* spec: 整理された文法にしたがって書き直した.
-
-	* parse.y: ここ数日で混乱していた文法を整理した. 括弧を省略したメ
-	  ソッド呼び出しができるようになったこと, modifierが付けられるよう
-	  になったこと, returnにリストが渡せるようになったことが主な変更点
-	  である.
-
-	* process周りが怪しいがとにかくSolaris 2.3で動くように.
-
-	* parse.y: 曖昧性がない場合にはメソッド呼び出しの引数の括弧を省略
-	  できるように. 省略できるメソッド呼び出しの条件は, 1)かならず1個
-	  以上の引数を必要とすること, 2)第1引数が`+', `-', `(', `[', `{',
-	  `/'など, 式の始まりに置かれた時と途中に現れた時とで解釈が違う記
-	  号で始まらないこと, である.
-
-Thu Aug 25 13:54:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(cond): 条件式の展開部にbugがあった.
-
-Wed Aug 24 00:01:15 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: returnはコンマで区切ったリストも受け取るように. つまり,
-	  return a, b, cはreturn [a, b, c]と同じ意味になる.
-
-	* parse.y: yield以外の大域脱出制御式をexprからexpr0に移した. よっ
-	  てメソッドの引数に制御式を使えなくなる(これで困る人はいないはず).
-
-	* parse.y: `+'の定数展開の際に演算子の優先順位を忘れていた.
-
-	* eval.c: untilの戻り値はnilになった.
-
-	* parse.y: modifierとしてのif/unless/while/untilを追加.
-
-	* parse.y: 文法からendの後ろにつけるキーワードを削除. ほとんど使わ
-	  なかった上に, emacsではruby-modeがあれば対応のチェックが機械的に
-	  出来るため.
-
-Tue Aug 23 18:08:33 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: スクリプト実行開始前に例外が発生した時にcore dumpした.
-	  組み込み用にコードを変更した時にenbugしてしまった.
-
-Tue Aug 23 00:07:17 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c: doの戻り値がいつもnilになっていた.
-
-	* parse.y: loop制御変数の多重代入化にbugがあった.
-
-	* parse.y(expand_op): 文字列も畳み込みの対象に.
-
-Mon Aug 22 10:50:01 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(expand_op): `+'に関しては結合則を使って, より多く定数畳
-	  み込みを行なうように.
-
-	* ruby.c(proc_options): argcが0の時にも対応.
-
-	* parse.y: forなどの制御変数に多重代入も使えるように.
-
-Sat Aug 20 00:59:40 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y(call_op): 演算子`~'の取り扱いをルール部へ移動.
-
-Fri Aug 19 11:44:13 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* main.c: rubyをほかのプログラムに組み込めるようにmain()を分割した.
-	  それにともない, プログラムの呼び出し構造を修正した.
-
-	* parse.y: 条件式の定義を変更. ifなどの条件式の中でだけ`&&'や`||'
-	  および`!'の引数が条件式になるように. この変更により条件式以外の
-	  場所での `&&', `||', `!'演算子の動作が直観に一致する.
-
-	* parse.y: 実引数の`*'の後に続く引数はexprに制限した. 今までは全て
-	  の文が有効であったが, ここで定義文があってもしょうがない.
-
-Thu Aug 18 10:21:45 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c: 正規表現ルーチンの初期化部分を削除してしまっていた. これで
-	  はemacsの正規表現になってしまう.
-
-	* version.c: copyright表示を追加.
-
-	* version.c: バージョン表示をstderrに.
-
-	* configure.in: gccがない場合testに失敗していた.
-
-Fri Aug 12 14:12:23 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* array.c(astore): 配列の拡大する時にある程度の大きさをまとめて拡
-	  大するように.
-
-	* io.c(Fprint): 配列に対しては一度文字列に変換することなく, 直接内
-	  容を出力するように.
-
-	* string.c(str_new): memmoveからmemcpyへ置き換えた. これでもかなり
-	  速度が違う.
-
-	* ruby.h: データメンバの取り出しで名前を文字列からIDで指定するよう
-	  にした. かなりの高速化になる.
-
-	* io.c: $ARGFという変数で引数列からなる仮想ファイルをオブジェクト
-	  として扱えるようにした. 今まではトップレベルのgets()などを使って
-	  アクセスしていたが, どうもオブジェクト指向的ではなかった.
-
-Thu Aug 11 11:43:15 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* gc.c: mark_location()の間違った呼び出し方の行が残っていた.
-
-	* method.c: プロトタイプ宣言が足りなかった.
-
-Wed Aug 10 15:54:46 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* variable.c: -vオプションが指定されている時は初期化されていない,
-	  大域変数, インスタンス変数, ローカル変数を参照した時点でwarning
-	  を出すようにした.
-
-Tue Aug  9 11:50:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* bignum.c: 冪乗に関しても多倍長演算を行なうように. 特に浮動小数点
-	  数の範囲を越えた時の処理を的確に行なうように.
-
-	* eval.c: メソッド定義後は構文木から, メソッド定義部分を外す. 無駄
-	  な再定義が起こらないようにするためと2重にfree()されないため.
-
-	* array.c(Fary_aref): 引数が1つでFixnumの時, Range checkを行なわな
-	  いように修正.
-
-	* eval.c: メソッドの引数の数をコンパイル時に計算して若干の高速化.
-
-Mon Aug  8 13:06:24 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* object.c: nilによる比較連鎖をなくした.
-
-	* parse.y: bit演算子の優先順位を比較演算子よりも強くした.  Cとは異
-	  なることになるが, 直観には合致する.
-
-	* gc.c: クラスを解放する時, 個々のメソッド毎にキャッシュをクリアす
-	  るのではなく, クラス単位でクリアするように.
-
-Thu Aug  4 18:45:09 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* methods.c(method_free): 解放されたメソッドに関してキャッシュをク
-	  リアしておく必要があった.
-
-	* gc.c: Dataクラスのデータ部分をfree()し忘れていた.
-
-Wed Aug  3 09:58:14 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: def func .. end形式による関数メソッドの定義はなくなった.
-
-	* methods.c: func形式のメソッドをなくした. あっても, あまり意味が
-	  ないので.
-
-	* eval.c: $0への代入でps(1)の出力が変化するように.
-
-	* io.c(Fsyscall): syscall()を実現.
-
-Mon Aug  1 13:41:11 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: ダブルクォートで囲まれた文字列や正規表現中で"#{変数名}"
-	  または"#変数名"という形式で変数の内容を埋め込むことができるよう
-	  になった.
-
-	* io.c: 関数メソッドsystem2()はなくなった. 今はバッククォートがあ
-	  るからね.
-
-	* parse.y: `cmd`によってコマンドを文字列に展開することができるよう
-	  になった.
-
-	* parse.y: __FILE__, __LINE__を追加. それぞれファイル名(文字列),
-	  行番号(整数)を値とする疑似変数.
-
-Fri Jul 29 13:16:07 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* methods.h: メソッドをオブジェクトとして扱うのをやめる. メソッド
-	  のメモリ管理にはリファレンスカウントを使うことにした. これでオブ
-	  ジェクトの数が減ってほんの少しだけGCが速くなる(かな).
-
-	* purifyによってメモリ関係のバグを検査した(見つかる,見つかる…).
-
-	* gc.c: GCをプログラマが変数をマークする形式から, スタックとレジス
-	  タからマークする方法に変更. 移植性が下がるような気もするが, siod
-	  やscmでも採用されているから多分大丈夫だろう. Linux on i486でも動
-	  作を確認した.
-
-Wed Jul 27 16:13:13 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(Eval): トップレベルでは構造木をfreeしないように. どうせ解
-	  放されるから時間の無駄である.
-
-	* array.c, dict.c: "=="を構造一致に変更.
-
-Fri Jul 22 10:14:09 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* error.c: 組み込みタイプの名前を登録し忘れていた.
-
-Thu Jul 21 14:06:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(freenode),eval.c(Eval): 解析木を解放し忘れていた.
-
-Mon Jul 18 10:19:15 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: 多重代入を処理するルールにバグがあって, 3要素以上の多重
-	  代入に失敗していた.
-
-	* eval.c(rb_eval): 多重代入で, 右辺が配列でない時には`to_a'メソッ
-	  ドで配列に変換して代入するようにした. 今までの仕様だと右辺値が第
-	  1要素にそのまま代入されていたが, structなど配列に変換できるもの
-	  は変換した方が嬉しい気がする.
-
-	* dbm.c,dict.c(delete_if): メソッド追加.
-
-	* process.c(wait,waitpid): システムコールwaitpidまたはwait4がある
-	  時はそちらを使うように. configureもそれらをチェックするように変更.
-
-	* dbm.c, dict.c(clear): メソッド追加.
-
-Fri Jul 15 10:54:45 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* array.c(Fary_fill,Fary_clear): メソッドを追加.
-
-	* string.c(Fstr_split): $;の値が長さ1の文字列である時, これを正規
-	  表現化しないで, 単なる文字として分割する.
-
-	* string.c(Fstr_aset/Fstr_aref): インデックスが文字列の範囲外だっ
-	  た時の動作をArrayを参考に修正した.
-
-	* array.c(astore,Fary_aset): 領域をreallocした後, ゼロでクリアする
-	  ように. 今まで配列にゴミが入っていた.
-
-	* array.c: []/[]=でのインデックス関係を整理. 基本的に負のインデッ
-	  クスに代入しない限り例外は起きないように変更した. 必要に応じて適
-	  当に解釈して, 必要ならば領域を拡張するように.
-
-Thu Jul 14 11:18:07 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* autoexec.c: 削除. autoload関係の機能は今後検討しよう.
-
-	* dict.c: 辞書クラスの正式名称をDictに変更した. 別名としてHashを用
-	  意した. 今までDictionaryなどと長い名前にしていたが誰も使っていな
-	  かったしね. *BACKWARD INCOMPATIBILITY*
-
-	* parse.y: Dictを生成する構文を追加. こちらを{..}にした.
-
-	* parse.y: 配列を生成する構文を[..]に変更した. 過去のRubyスクリプ
-	  トとの互換性が保てないが, Dictを生成する構文を導入するに当たり,
-	  perl5に合わせて(意識して), 変更する時期は今しかないと考えた.
-	  *BACKWARD INCOMPATIBILITY*
-
-	* eval.c(Feval): eval()でメソッドを定義する時, 定義されるクラスを
-	  メソッドの所属するクラスにした. 今まではObjectクラスに定義されて
-	  いた.
-
-	* parse.y: ローカル引数がない時のeval()で落ちていた.
-
-Tue Jul 12 09:41:28 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* pack.c: uuencode形式のサポート.
-
-	* `-0'を`-R'に. 出力レコードセパレータをコマンドラインから指定する
-	  方法はなくなった. どうも, 仕様がゆれるなあ.
-
-Mon Jul 11 09:51:24 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby.c: `-r'オプションは`-0'オプションになった. 当面は`-r'も有効
-	  だが変更される可能性がある. `-R'は当面はそのまま.
-
-	* version.c: version表示に日付を含めた.
-
-	* parse.y: private methodの復活. RubyのprivateメソッドはC++におけ
-	  るprotected methodに該当するもので, `@'で始まる名前を持つ.
-
-	* env.h: struct ENVIRONの定義を分離.
-
-	* parse.y: `\$var', `\@var', `%var'も許すように.
-
-	* variable.c(Fdefined): idも引数として受け付けるように.
-
-	* parse.y: if文/unless文にキーワードthenを追加. thenなしというのは,
-	  意外と間違いが多いので. もちろん省略できる.
-
-Sat Jul  9 02:16:04 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c(rb_eval): class/moduleの評価で新しいスコープを割り当てて
-	  いなかった. スコープ割り当て部分をrb_call()からrb_eval()に移した.
-
-	* eval.c(rb_call): realloc()に渡される事のある, ローカル変数用の領
-	  域をalloca()していた. たまに落ちるわけだ.
-
-	* string.c(Fstr_times): 割り当てた領域を越えた部分を変更していた.
-
-Wed Jul  6 15:52:42 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* socket.c: Socket -> BasicSocket, RawSocket -> Socket に改名.
-
-	* string.c(ucfirst,lcfirst): 最初の1文字だけの大文字/小文字変換.
-
-	* numeric.c(chr): 整数の文字列化メソッド.
-
-	* inits.c, dbm.c: DBMが使えない時はクラスそのものを定義しないよう
-	  にした.  利用できないクラスはnilとすることを今後のポリシーとしよ
-	  う(いままではアクセスした時点でエラーが発生していた). autoexec()
-	  のあり方も検討が必要になりそうだ.
-
-	* bignum.c(bigadd): バグ修正.
-
-Thu Jul  7 11:12:18 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(Fload,Feval): eval_treeをクリアし忘れていた.
-
-	* _inspect: オブジェクトを可読形式の文字列に変換する(主にデバッグ
-	  出力用).
-
-Wed Jul  6 00:57:18 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* numeric.c, bignum.c: 整数に対する`[]'演算子. nビット目がセットさ
-	  れているかどうかを返す.
-
-Tue Jul  5 12:48:39 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* io.c(Feof): 追加. コマンドラインからなる仮想ファイルについても
-	  EOFが検出できるように.
-
-	* ruby.c: -l/-r/-R/-Xオプションの追加.
-
-	* ruby.c: -n/-pオプションのloopの付加などをメインルーチンに移動し
-	  た. これで, オプションの解析途中で(`-c'オプションのせいで)終了な
-	  どといったことはない.
-
-	* io.c(Fgets): 高速化. 凝ったことをしない方が速かった. 虚しい.
-
-Mon Jul  4 15:55:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* Socket:getsockname/getpeername - ようやく仕様が安定した.
-
-	* io.c(Fgets): eachでgetsを記述するのではなく, getsでeachを記述す
-	  るようにした.
-
-Fri Jul  1 10:35:49 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* $ENV[env] = nil/$ENV.delete(env)で環境変数を削除できるようになっ
-	  た. $ENV.deleteは環境変数の以前の値を返す.
-
-	* !~の定義が間違っていた.
-
-	* Dict,DBM:[]= - nilの代入によって要素を削除できるようになった. こ
-	  れにともないnilはDictの要素になれなくなった.
-
-	* ソースの整理. 盲腸のような使われていないコードをなくしたり, 変数
-	  名を付け変えたりした.
-
-Fri Jul  1 00:21:29 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* Array:join() - 要素数0の配列に対して空文字列を返す.
-
-	* RawSocket:open(),socketpair() - 文字列で指定できるドメインとタイ
-	  プをいくつか追加した.
-
-Thu Jun 30 13:51:29 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* -fオプションをなくした. 昔(loadのなかった頃)の名残なので, 今となっ
-	  ては必要ないだろう.
-
-	* -sオプションを追加. perlの-sオプションと同じ動きをする.
-
-	* RawSocketクラスを提供する. Socketに対するシステムコールレベルの
-	  アクセスが可能になった.
-
-Thu Jun 30 00:27:19 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* Socket - bug fixes.
-
-	* linuxではsyscall(SYS_select)が正常に動作しない.
-
-	* Socket:addr,peeraddr - 配列としてsockaddrの情報を返す.
-
-Wed Jun 29 00:14:20 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* Socket:setopt,getopt - setsockopt(2), getsockopt(2)へのアクセス
-	  を実現.
-
-	* sprintf() - rubyにはunsignedは無いので, %uを取り除いた.
-
-	* sprintf() - %b, %x, %oでは2の補数表現, %B, %X, %Oでは符号付き表
-	  現で出力するように. ここ数日でsprintf()の仕様がゆらいでいたが,
-	  これで落ち着きそうだ.
-
-Tue Jun 28 14:42:03 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* Bignum:<<,>> - 2の補数をとる処理を除いた. シフト演算には関係ない
-	  処理だった.
-
-	* Bignum:^ - bug fix. 符合が反対だった.
-
-	* sprintf() - 2進出力子"%b"を追加.
-
-	* sprintf() - %x, %oでFixnumを出力する時, 2の補数表示を行なわない.
-
-	* sprintf() - %x, %oはやはり負の数の時は`-'を出力するように.
-
-Mon Jun 27 14:56:13 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* sprintf() - Bignumについても%d, %oは(2の補数表現に変換して)正の
-	  整数を表示するようにした.
-
-	* Bignumに対する論理演算の定義を修正した. 負の数は2の補数表現であ
-	  るとみなし, かつ仮想的に左側に無限に1が連続しているような演算結
-	  果を得る.
-
-	* Fixnum:<<,>> - 符合付シフトに変更.
-
-	* Bignum:>> - 負の整数のシフトに対応した.
-
-	* __END__, ^D, ^Zでスクリプトを終了できる.
-
-	* -xオプションを追加. #! ..rubyなる行まで読み飛ばす.
-
-	* -cオプションを追加. コンパイルのみを行う.
-
-Sat Jun 25 01:37:21 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* Fixnum:<< - 必要に応じてBignumに拡張して左シフトするように. よっ
-	  て, シフト幅が32を越えるとCやPerlとは違った値を返す.
-
-Fri Jun 24 10:01:28 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ioctl()/fcntl() - システムコールを呼び出す前にバッファの大きさを
-	  調節するようにした.
-
-	* String:toupper/tolower - 文字列を置き換えたコピーを作るのではな
-	  く, 元の文字列の内容を変更するようにした.
-
-	* inplace editを実現した. perlと同じように`-i'オプションで指定する.
-	  もっとも, こちらはMS-DOSのこととか考えてないけど.
-
-	* デフォルトの出力先を追加した. 今までは$stdoutに代入するしか方法
-	  はなかった.
-
-Fri Jun 17 10:55:08 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 環境変数にアクセスする方法としてgetenv()/setenv()以外に$ENVを用
-	  意した. $ENVは文字列-文字列の辞書であるかのように動作するEnvDict
-	  オブジェクトが代入されている(eachはassocを与える).
-
-	* nilに代入するとcore dumpした. コンパイル時のチェックを強化.
-
-	* Struct: struct_new()の引数をGCプロテクトする必要がある. せめてス
-	  タック領域だけでもスキャンできるようにしなければいけないんだろう
-	  か? でも, 移植性がなあ.
-
-Fri Jun 17 01:01:46 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* Time::asctime() - 日付のフォーマットで日が落ちていた.
-
-	* Stat: StatはEtcなどと同様にStructで実現したので, Statクラスは無
-	  くなった.
-
-Thu Jun 16 10:32:23 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* bignum.c: いくつかのバグを修正した. Fixnumを渡すべきところで普通
-	  のintを渡していた. 失敗.
-
-	* big2str() - 1桁ずつbaseで割る代わりに, 4桁ずつ割算を行なうように
-	  した. これで多倍長割算の回数が1/4になる. さらに整数->数(文字)へ
-	  の変換をテーブルを用いるようにした.
-
-	* rb_ivar_get_1() - すでに何らかのインスタンス変数を持つオブジェク
-	  トでは, 未定義のインスタンス変数の値が不定値になっていた.
-
-	* yylex() - インスタンス変数の認識に失敗していた. attr()は正しく動
-	  作していたので, 混用すると動作しなかった. 全部違っていたから動い
-	  ていたのね.
-
-	* Object:attr() - すでにアクセスメソッドが定義されている時にはデフォ
-	  ルトのアクセスメソッドを定義しないようにした. もっともアクセスメ
-	  ソッドと同名のメソッドの区別はRubyには存在しないけど, それは仕方
-	  がないよね.
-
-	* pack.c: エンディアンをautoconfで判定するようにしたので, v/Vが使
-	  えるようになった. またntoh?()/hton?()も自前で用意した.
-
-	* Stat: st_rdevをアクセスするメソッドを追加. さらにシステムがstat
-	  構造体にst_blksize, st_blockを持っているかをautoconfでチェックす
-	  るようにした.
-
-	* ドキュメントを少し整備した.
-
-	* INT2FIX()のうち, 31bit幅が保証できないものは, int2inum()に置き換
-	  えた.
-
-Wed Jun 15 10:18:27 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* sprintf() - bignumの出力の時, 出力幅を正しく計算するようにした.
-
-	* str2inum() - baseが0の時, baseを自動判定するように(0xで始まる時
-	  16 進, 0で始まる時8進).
-
-Tue Jun 14 16:08:42 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* gc.c: Bignum型を追加するのを忘れていた. 組み込み型を追加した時に
-	  は必ずmark()とsweep()にその型に関する処理を追加する必要がある.
-
-	* bignum: 割算も動いたような気がする. アルゴリズムを理解していない
-	  ので, 自信がない.
-
-Mon Jun 13 14:36:55 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* まだサポートしていないメソッドなどがあるが, 曲がりなりにもBignum
-	  が使えるようになる. これでioctlも使える.
-
-Fri Jun 10 17:26:42 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* Comparable: 基礎となるメソッドを`=='と`>'から`<=>'に変更した. 今
-	  後Comparableのサブクラスは`<=>'だけを再定義する必要がある.
-
-Wed Jun  8 13:12:18 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* Need_Fixnum()をほとんどなくして, NUM2INT()で直接intに変換するこ
-	  とにした. これで31bitに丸めて桁落ちをおこす問題がなくなる.
-
-Tue Jun  7 09:45:31 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby.h: マクロFIXABLE(n)を追加. ついでにFIXNUM周りの定義を変更し
-	  て, 移植性を高めた(つもり).
-
-	* C++の予約語であるnewを削除した. しかし, もうひとつの予約語である
-	  classに関しては, 置き換える単語が思いつかないこともあってそのま
-	  まになっている.
-
-	* 31bitを越えそうなINT2FIX()を関数呼び出しに変えた. 将来bignumが導
-	  入された時には自動的にbignumを返すようにする.
-
-	* readline() - 引数の`-'は標準入力を意味するようになった.
-
-	* ruby.h: 右シフトが論理シフトか算術シフトかは処理系依存のようなの
-	  で, ruby.hでcppを使ってチェックするようにした. これでうまくいく
-	  と思うのだが, 手元に符合付intを論理シフトする処理系がないので確
-	  認できない. NEWS-OSのCCは確か右シフトはいつも論理シフトだったよ
-	  うな気がするんだけど….
-
-Mon Jun  6 10:10:22 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* FIX2INT()の定義を変更した. どうして昔はうまく動かなかったんだろ
-	  うか? もしかして, 右シフトの符号拡張は処理系依存?
-
-	* FIX2INT()とFIX2UINT()を使い分けるようにした. もっともfixnumは31
-	  ビットしかないので, 本質的な解決にはならないのだが(ioctlが組み込
-	  みたかった).
-
-	* printを関数的メソッドから通常メソッドに変更. 引数が与えられない
-	  時にはレシーバをプリントするようにした. これでprintをメッセージ
-	  形式でも実行できるようになった. 例:
-
-		ruby -e 'readlines().sort.print'
-
-	  上のスクリプトは, 引数として与えられた(あるいは標準入力から読み
-	  込まれた)文字列を各行毎にソートして表示する.
-
-	* eval.c: argc,argvパターンで引数を受けるメソッドに引数が一つも与
-	  えられない時, argvがnilになっていた(argv[0]にアクセスすると落ち
-	  てしまう).
-
-	* _exit()を追加. こちらは例外処理など行なわない.
-
-	* dbmクラス: クラス名称をDBM(大文字)に統一した.
-
-Sat Jun  4 00:51:04 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* ループ変数にも属性や配列要素を指定できるようにした.
-
-Fri Jun  3 09:49:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 多重代入において, 属性代入, 配列要素への代入も行なえるようにした.
-
-	* Need_Fixnum(): nilを0に変換するように.
-
-	* Enumerable:min, max, index, includes - 追加. min, maxは要素が
-	  `<=>'メソッドを持つことを仮定している.
-
-	* Dict/Dbm:length - 要素数を返すメソッド.
-
-	* Dbmクラスにto_aメソッドを追加.
-
-	* Sunにおけるsortの誤動作の件, 昨日の修正でfixされた. しかし, それ
-	  でなぜ動かなかったのかは明らかではないが…. 比較関数がどんな値を
-	  返しても指定した領域外をアクセスするのはバグではないか.
-
-	* ファイルの全内容を読んで, 各行を配列として返すメソッドはpythonを
-	  参考にして`readlines'という名前にした. それにともないgetsに対し
-	  てreadlineという別名を用意した.
-
-Fri Jun  3 00:08:38 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* Array:sort - 判別関数の戻り値はFixnumではなく, Intであるべきだっ
-	  た. 間違い. Sunで動作がおかしかったのはこのせいかも知れない.
-
-Thu Jun  2 11:48:37 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* IO:read_all() - ストリームの最後まで入力して, 各行を要素とする配
-	  列を返すメソッドを追加. また関数メソッド read_all()も追加した.
-  	  これは引数のファイルから読み込んで各行を要素とする配列を返す. 意
-	  味的には
-
-		def read_all()
-	  	  ary = {}
-	  	  while gets()
-		    ary.push($_)
-		  end
-		end
-
-	  とほぼ等価である.
-
-	* String:atoiメソッドを削除. to_aメソッドからaが配列であるとの連想
-	  を呼んで, 混乱を招かないため. 代わりにto_iメソッドを使うこと.
-
-	* 配列への変換メソッドto_aを導入した. 通常のオブジェクトは自分自身
-	  を唯一の要素とする長さ1の配列を返す. 配列は自分自身を, 辞書はキー
-	  と値のペアの配列を返す. Enumeratedをincludeしたクラスは, eachが
-	  返す各要素を含む配列を返す.
-
-	* file.c: 不定個の引数を受けとるメソッド(chmod,chown,utimes)を書き
-	  換えて, 整理した. それに伴い, 最初に全ての引数の型チェックを行な
-	  うようにした. 型チェックに失敗すると処理を行なわずに例外を発生さ
-	  せる.
-
-	* configure.in: 不必要なテストを行なわないように修正した.
-
-Tue May 31 10:41:08 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* String:pack(): 2進数の文字列変換(B,b)で0と1が逆だった.
-
-	* Math.c: 実数系のメソッドに引数として整数が渡された時に自動的に変
-	  換するようにした.
-
-	* toupper(), tolower(): 文字列の判定ミスで変換されていなかった.
-
-	* getopt_long()の仕様によって, スクリプトへの引数がインタプリタの
-	  引数だと解釈されていた. 引数パターン文字列の先頭に`+'を追加.
-
-	* config.hを削除した. DEFINEはMakefileで与えられる.
-
-	* sprintf(): "%d"に文字列が与えられた時にはアドレスではなく内容を
-	  整数に変換するようにした. ついでに浮動小数点数も変換するように変
-	  更した.
-
-	* regexp.c: rubyの拡張正規表現(\d, \D, \s, \S)の処理で割り当てた領
-	  域を越えてバッファに書き込んでいた. 処理前にバッファをきちんと拡
-	  張するようにした. これで昨日問題にしていたメモリの問題は解決でき
-	  たと思う.
-
-	* yylex(): ダブルクォート文字列中でダブルクォートを表現するため
-	  のバックスラッシュ表現ができなかった.
-
-Mon May 30 10:07:42 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 演算子`!'の右辺も条件式であるとした. これによって, この演算子を
-	  再定義する人は混乱するかも知れないが, 大多数のこの演算子を使う人
-	  は混乱を避けることができると思う.
-
-	* autoconfを使って, 自動的にMakefile, config.hを生成するようにした.
-	  これで, 多くのマシンでは`configure'を実行した後, `make'一発でコ
-	  ンパイルできると思う.
-
-	* clone: サブクラスに対して用いられた場合, 元のオブジェクトと同じ
-	  クラスのインスタンスを返すように(以前はビルトインクラスの場合を
-	  考えてなかった).
-
-	* ビルトインクラスのサブクラスも作れるように, リテラルのあるクラス
-	  にもnewメソッドを追加した.
-
-	* malloc()で落ちる. purifyが必要かも知れない.
-
-	* re.c: rb_global_variable()の呼びだし形式の間違い. 変数へのポイン
-	  タを渡さなければいけない.
-
-	* parse.y: ローカル変数の扱いに引数の評価順に依存する移植性のない
-	  部分があった.
-
-	* attr(): 属性設定のバグを直した. いつ内部仕様が変わったんだろう…?
-
-Sat May 28 23:08:18 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* 正規表現キャッシュの文字列一致判定をポインタ一致から内容一致に変
-	  更した. そういえば文字列リテラルは一回毎に新しくオブジェクトが生
-	  成されるのだった.
-
-Fri May 27 11:42:00 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* trから文字削除(delete), 文字圧縮(squeeze)を分離した. それにとも
-	  ないtrのオプション引数はなくなった.
-
-Thu May 26 10:32:55 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* スクリプト読み込みルーチンを書き直して, 通常ファイル以外のファイ
-	  ル名や空文字列がスクリプトとして与えられた場合に対応した. また,
-	  標準入力からスクリプトを読み込む時に, 一時ファイルが/tmpに残らな
-	  いようにした.
-
-	* Fixnum:id2name - IDから文字列に戻す関数. String:internの逆.
-
-	* Array: 配列の範囲外の要素をアクセスした時に例外を発生させずに,
-	  nilを返すようにした. 配列は自動的に拡張される.
-
-	* string:stripを追加.
-
-	* -nオプションが-eオプションを複数指定した時も動作するように.
-
-	* parse.yで<sys/types.h>もインクルードするようにした.
-
-	* fname周りの細かいbugを修正.
-
-Wed May 26 11:45:10 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* 定数をキャッシュするようにした. 繰り返しが多い場合には有効のはず
-	  だが, 一度しかアクセスしない場合は遅くなるなあ.
-
-Wed May 25 00:42:24 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* 多重代入文(foo, bar = 1, 2)の採用.
-
-	* 条件式部に文字列あるいは正規表現リテラルをおくと`=~'演算子によっ
-	  て`$_'と比較される. 更に`...'の両辺では整数リテラルが`$.'と比較
-	  される.
-
-Mon May 23 23:27:03 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* &式 形式はなくなった. 代わりにkernel:apply(id, args..)を導入.
-
-	* def op () ..形式の導入. opは再定義可能な演算子.
-
-	* constantの代入時チェック. 既に初期化されている定数に代入した場合
-	  は例外が発生する.
-
-	* 多重代入文.
-
-Thu May 19 22:57:07 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* 複合文でもvoid valueのチェックを行うようにした.
-
-	* untilの動作の修正(do..until型だった).
-
-Wed May 18 01:06:25 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* 移植に関する若干の問題を修正.
-
-	* 別名の構文を「def a b」にした.
-
-	* until/unless: 演算子から制御文へ. 例外を捕捉する機能はそのまま.
-
-	* 選択可能な機能をconfig.hからdefines.hに移動.
-
-Fri May 13 23:20:21 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* -yオプションを新設. -dオプションからコンパイラのデバッグ部分を分
-	  離した.
-
-Tue Apr 25 20:17:33 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* マルチバイト文字列を識別子に使えるように. 個人的には使いたくは無
-	  いけどなあ.
-
-	* `-v'フラグの状態を$verboseでアクセスできるように.
-
-	* CVSの導入に伴い, バージョン管理の方法を変更.
-
-	* 真面目にChangeLogをつける事にした.
-
-Tue Mar  8 10:09:25 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* %変数名 によるクラス定数を導入.
-
-	* undef メソッド によるメソッド定義の取り消しを導入.
-
-	* rb_get_method_bodyではthe_envを変更せず, rb_call()で明示的に変更
-	  するように. これでresponds_toなどで環境が破壊されない.
-
-Mon Mar  7 17:46:15 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* 「&文字列」形式. 「式.文字列」型のメッセージセンドはなくなった.
-
-	* 自己代入形式(+=. -=, ...)
-
-	* obj.attr = expr形式の採用.
-
-Thu Feb 24 16:23:28 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* toint, tofloat, print_stringをそれぞれto_i, to_f, to_sに変更.
-
-	* String:clone - Copy on Writeの実現.
-
-Tue Feb 22 11:11:44 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* re.c: マッチした文字列の保存に失敗していた.
-
-	* trap: 可能ならば処理に時間のかかるシステムコール(read, wait,
-	  sigpause, select)をフックして割り込み処理の即答性を高める(DOSな
-	  どでは無理だなあ).
-
-	* trap: 割り込みをその場で処理するか(迅速だが危険), 安全なタイミン
-	  グで処理するかを選択できるように.
-
-Tue Feb 17 11:11:12 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* trap: 割り込みハンドラ.
-
-Wed Feb 16 12:29:12 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* String:crypt: 暗号化ルーチン
-
-	* "::"演算子の追加. a::b は {a, b}と同義. a::b::c は {a, {b, c}}と
-	  同義(右結合). 同義とはいうものの, "::"演算子を使った方が少しだけ
-	  メモリ効率が良い.
-
-	* Dir.rmdir(), File.unlink(), File.utime() -- 各システムコールへの
-	  インタフェース.
-
-	* kill -- kill(2) I/F
-
-	* select(): readのチェックではstdioにバッファリングされているかど
-	  うかをチェックするように.
-
-Tue Feb 15 15:08:31 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* file.c: statをキャッシュするように.
-
-	* File:utime()を追加.
-
-	* unliteralize(): フラグを破壊していた.
-
-	* Bug(): coreを吐くように.
-
-	* String:tr -- tr(1)互換. 引数パターンがちょっと違うけど….
-
-Mon Feb 14 18:24:13 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* unless, untilが例外も偽と見なすように.
-
-	* select() -- select(2) I/F
-
-	* Array:pack, String:unpack: perlのpack/unpackの同等品
-
-Tue Feb  8 17:11:10 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* setenv()のないシステムのためにputenv()を使ったコードも用意した.
-
-Mon Feb  7 09:52:44 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* 引数の一番最後に`*'を置けるようにした. これでrest引数のリストを
-	  操作する必要が少なくなる.
-
-Fri Feb  4 18:23:26 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* ruby-mode.elを書き直す. ずいぶんましになったと思う.
-
-	* 文字列リテラルのCopy on Writeを実現. これで文字列がリテラルであ
-	  るからといっていちいちcloneしなくても済む.
-
-Tue Feb  1 09:21:09 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* sub(), gsub()で, マッチした文字列を$&, $1..$9でアクセスできるよ
-	  うにした. 同時にマッチした部分文字列をコピーしておくように(元の
-	  文字列が変更されても状態を保存するため).
-
-Mon Jan 31 15:16:58 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* プライベートメソッドの仕様を変更. 今までは同じクラスのメソッドか
-	  らしかアクセスできなかったが, サブクラスのメソッドからもアクセス
-	  できるようにした(C++におけるprotected メンバ関数).
-
-	* メソッドサーチのアルゴリズムを改善し, 10%程度の高速化を行なった.
-
-	* 高速化. Cで記述されたメソッドを呼び出す時にはsetjmpを呼ばないよ
-	  うにした. これでCメソッドを多用する場合には3倍程度高速になった.
-
-Fri Jan 28 15:44:04 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* sh-modeを元にruby-mode.elを作る. 演算子で終る, 2行に渡る文には対
-	  応していないけど….
-
-Thu Jan 27 11:35:19 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* freenode(): NODE_NILの解放忘れ.
-
-	* 字句解析部のバグ修正(コメントの後の状態を戻し忘れ).
-
-	* protect .. endのバグ修正. GC_LINKのネストが不正だった.
-
-	* joinのバグ修正(使っているオブジェクトをfreeしていた).
-
-	* splitのバグ修正(アルゴリズムがおかしかった).
-
-	* fork()を追加.
-
-Wed Jan 26 17:09:56 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* ファイルテストメソッドの追加.
-
-	* rb_autoexec(): クラスを初めてアクセスした時の挙動を制御できるよ
-	  うにした. これでautoloadも実現できる. これにともないメソッド
-	  unknownはなくなった.
-
-Tue Jan 25 15:51:36 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* Dbmクラス, Mathモジュールを作成.
-
-	* -Iオプションでサーチパスに追加できるように.
-
-	* サーチパスを変数$load_pathに設定できるように.
-
-	* load(): ダイナミックロードを使えるようにした.
-
-Tue Jan 18 14:14:01 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* Comparable:"<=>"
-
-	* Float,Fixnum:"**"
-
-	* Array:sort
-
-Fri Jan 14 16:53:37 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* version 0.07
-
-	* メソッドに関するドキュメントを充実させた.
-
-	* String:index(): 引数positionを増やした.
-
-Thu Jan 13 15:13:52 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* 未初期化の変数アクセスをなくした.
-
-	* 無駄なhash tableのアロケーションを削除.
-
-	* Purify'd(on Sun)
-
-	* ~RE と ~STRのコンパイル時展開の抑制.
-
-	* Sunへ移植. signal()の戻り値. RDataのbug修正.
-
-	* parse.y: nlsルールを削除.
-
-	* yylex(): 改行と符合の解析部分を変更.
-
-	* missing/strftime.c: 移植用.
-
-	* Time:strftime: その他のメソッドもstrftimeを利用するように.
-
-	* メソッド再定義時にメソッドキャッシュをクリアする.
-
-Fri Jan  7 15:23:20 1994  Yukihiro Matsumoto  (matz at nws119)
-
-	* Float:coerce(): FixnumとFloat以外の引数を与えられるた時には例外
-	  を発生するように.
-
-	* Stat: stat構造体の全てのメンバに対するアクセスメソッドを用意.
-
-	* 未定義のクラス/モジュールへの参照がunknownメソッドを呼び出すよう
-	  にした.
-
-	* baseline - version 0.06.
diff --git a/doc/ChangeLog-0.50_to_0.60 b/doc/ChangeLog-0.50_to_0.60
deleted file mode 100644
index 5f5b03ff40..0000000000
--- a/doc/ChangeLog-0.50_to_0.60
+++ /dev/null
@@ -1,462 +0,0 @@
-Thu Dec  8 00:32:21 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* io.c($<.file,$<.filename): きちんと初期化．
-
-	* parse.y(rb_class2name): includeしているクラス名を正常に表示でき
-	  なかった．
-
-Wed Dec  7 15:40:36 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* dln.c: config.hをincludeしていなかった．
-
-	* missing/strdup.c: 忘れていた．
-
-Fri Dec  2 15:21:44 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 関数の命名ルールを変えた(クラスメソッド: Sxxx_xxx，ユーティリティ
-	  メソッドxxx_xxxなど)．
-
-	* re.c(casefold): 個々の正規表現オブジェクトが大文字小文字を無視す
-	  るかどうかを設定できるようにした．
-
-Thu Dec  1 01:44:51 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* missing.c: システムで提供されないファイルの扱いを変更した．
-
-	* io.c($<): 変数`$<'が指しているものを現在読み込み中のファイル名か
-	  ら仮想ファイル($ARGF)に変更した．また，現在読み込み中のファイル
-	  名とファイルオブジェクトにアクセスするメソッドも用意した．
-
-	* ruby.h(data_new): Dataオブジェクトの割り当て方法を改善した．
-
-Wed Nov 30 15:36:13 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* Makefile: ルールを整理した．
-
-Tue Nov 29 00:09:26 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* array.c(`|'): 引数が配列でなく，かつそのオブジェクトが要素として
-	  含まれていない時，そのオブジェクトを追加する．あればなにもしない．
-
-	* process.c(gid,egid): GIDをアクセスするメソッド．
-
-	* io.c(print): 文字列と配列に対する処理を組み込んで若干の高速化を
-	  図った．出力が多い場合に効いてくるようだ．
-
-	* parse.y(parse_string): ""で囲まれた文字列内では対応するエスケー
-	  プがない`\'を残さないように．つまり，今後は"\k" -> "k"である(以
-	  前は"\k"だった)．
-
-Mon Nov 28 18:02:31 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c(re_regsub): 置換文字列の置換えが不完全だった．
-
-	* 一時オブジェクトの解放をすべてGCに任せた．今のままではまずいタイ
-	  ミングでオブジェクトを解放する可能性があった．昔のGCの時にはこれ
-	  でも良かったのだが．
-
-Tue Nov 22 00:15:24 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c($"): 既にロードしたファイル名の配列．
-
-Mon Nov 21 01:09:50 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* array.c(&,|): 集合としての積演算と和演算．
-
-	* io.c($<): 文字列を代入した時には自動的にopenするように．IOのサブ
-	  クラスかどうかのチェックも行う．
-
-Sun Nov 19 23:02:27 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c($:): $LOAD_PATHの別名．
-
-	* io.c($>): デフォルト出力先．IO.defaultは無くなった．
-
-	* io.c($<): $FILENAMEの別名
-
-	* glob.c(each): ワイルドカードにマッチするものがない場合，パターン
-	  そのものを与えるように．
-
-	* file.c(chmod,chown,unlink,utime): `\'でワイルドカードをエスケー
-	  プできるように．
-
-Fri Nov 18 00:20:42 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.55 released
-
-	* file.c(chmod,chown,unlink,utime): 引数として与えられた文字列にワ
-	  イルドカードが含まれている場合にはGlobオブジェクトに変換する.
-
-Wed Nov 16 17:33:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* file.c(chmod,chown,unlink,utime): 引数としてワイルドカードも受け
-	  付けるように. その場合はマッチするファイル全体に適用される.
-
-Fri Nov 11 00:07:28 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* string.c(strip): 文字列そのものを変更するように.
-
-	* eval.c(rb_cal): 環境をスタックに積むタイミングが間違っていたので，
-	  不適切なエラーメッセージが出る時があった．
-
-	* eval.c(rb_undefined): メソッドが無い時とメソッドにアクセスできな
-	  い時とでメッセージを替えた．
-
-	* string.c: toupper/tolowerはupcase/downcaseを使って実現．
-
-	* string.c: lcfirst/ucfirstは削除．
-
-Thu Nov 10 16:15:16 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* string.c: sub/gsubは置換後の文字列を返すようにした.
-
-	* string.c: toupper/tolower/lcfirstなどを文字列を変更するものとし
-	  ないものの2 種類を提供するようにした.
-
-Tue Nov  1 17:52:09 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: 変数展開にバグがあって元の文字列を破壊していた.
-
-Thu Oct 27 09:56:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: rest引数の処理が間違っていた.
-
-	* env.c(rb_yield): ローカル変数の設定が間違っていた.
-
-Wed Oct 26 19:01:43 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: 引数セットの高速化.
-
-	* process.c: sleepのバグ.
-
-	* parse.y, gnuglob.c: Sunのccでもコンパイルできるように.
-
-Tue Oct 25 00:36:16 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: 若干の高速化. スタックの処理によってrb_call()が少し遅く
-	  なった分の穴埋めくらいか.
-
-	* eval.c: blockをenvから外すなどしてスタックを軽くした.
-
-Mon Oct 24 11:47:54 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c: 正規表現アクセス用の変数($`, $', $+)を追加.
-
-	* re.c($KANJI): 処理する漢字コードをrubyプログラム内から設定できる
-	  ようにした.
-
-Sat Oct 22 00:42:41 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c: イテレータ内のredoとretryの処理にバグがあった．
-
-Fri Oct 21 00:53:21 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* string.c(swapcase): 文字列の大文字小文字を置き換える.
-
-	* string.c(ljust,rjust,center): 文字列のレイアウト用メソッド.
-	  sprintf()でも同じようなことはできるが.
-
-	* socket.c(recv,recvfrom): flags引数を省略可能にした. 省略時の値は
-	  0である.
-
-	* socket.c(recvfrom): recvと同様だが, データと相手アドレスのペアを
-	  返す.
-
-	* socket.c(accept): 戻り値をつながったソケットから, ソケットとアド
-	  レスのペアに変更した.
-
-	* eval.c(eval): the_classをセットする時に, last_moduleがincludeさ
-	  れているモジュール(T_ICLASS)であれば, 定義元のモジュールの方をセッ
-	  トするように. この修正がないとICLASSに対してメソッドが呼ばれる可
-	  能性があり, 不審な動作をする(はず).
-
-	* class.c: オブジェクトのcloneの際に特異クラス(特異メソッド用のク
-	  ラス)をきちんとコピーするようにした. 今までは個々のメソッドのコ
-	  ピーを忘れていた.
-
-	* numeric.c: Numericのnewとcloneをundefした.
-
-Thu Oct 20 11:30:00 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.53 released.
-
-	* parse.y: TopLevelのdef文は関数メソッドを定義するようにした.
-
-	* parse.y: def文のprivate指定はなくなった. export/noexportメソッド
-	  を使ってもらうことにした.
-
-	* parse.y: case文にthenを含むことができるようになった.
-
-Wed Oct 19 13:09:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* object.c(export,unexport): 関数メソッドの設定用メソッド.
-
-	* eval.c, class.c: 関数的メソッドを復活させ(またか…), `@'による
-	  privateメソッドをなくした. やはり, 関数的なものは関数的に呼びた
-	  い気がしてきた. こう仕様が変動しててはいけないような気もするなあ.
-	   *BACKWARD INCOMPATIBILITY*
-
-	* eval.c: メソッドの構成を変更し, 別名管理と関数メソッドの管理を分
-	  離した.
-
-	* eval.c: the_env->last_funcをCメソッドの時にも更新する. これがな
-	  いとStructのアクセスが動作しない.
-
-Fri Oct 14 13:22:18 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.52 released: ……なんてこったい.
-
-	* eval.c(rb_call): returnの処理が間違っていたので, マシンによって
-	  はreturnで関数を終了するだけでなくtoplevelまでつき抜けていた.
-
-	* dbm.c: Dictと同様にeachが[key,value]を返すように.
-
-	* version 0.51 released
-
-Thu Oct 13 12:13:48 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(SETUP_ARGS): 付加引数が配列でない時には配列に変換する.
-
-	* parse.y: 括弧なしのメソッド呼び出しでも`*'による付加引数が使える
-	  ようにした. ただし, 通常引数が一つもない場合は乗算演算子と区別が
-	  つかないので, 必ず括弧が必要.
-
-Wed Oct 12 10:09:07 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(rb_call): キャッシュの計算をinline化. キャッシュミスがあ
-	  れば関数呼び出しでメソッドを検索する. methods.cはなくなった.
-
-	* eval.c(rb_eval): ローカル変数用の領域をalloca()するように変更.
-	  サイズの変更が必要になれば改めてmalloc()するように.
-
-	* parse.y: error recoveryの際にlex_stateを更新しておくように.
-
-Tue Oct 11 17:10:46 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* socket.c(for_fd): ファイル記述子(Fixnum)からソケットインスタンス
-	  を得るメソッド. たとえばinetdから起動されたサーバで標準入出力に
-	  ソケット操作を行なうために使う. つまりSocket.for_fd($stdin)で標
-	  準入力に対応するソケットオブジェクトが得られる.
-
-	* io.c(to_i): IOクラスのインスタンスを整数に変換するとそのファイル
-	  記述子を返すように.
-
-	* numeric.c(num2int): to_iメソッドを使ってできる限り整数に変換する.
-	  以前はnum2fixだけが全てのオブジェクトに対してto_iメソッドを適用
-	  していた.
-
-	* sprintf.c(Fsprintf): 整数表示の際, オブジェクトをできる限り整数
-	  に変換するように(to_iメソッドを使う).
-
-Fri Oct  7 14:06:32 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(Fcaller): 必要性がよく分からないのでドキュメントから削除.
-	  将来デバッガを作る時に復活させよう.
-
-	* eval.c(rb_call): Cで記述されたメソッド呼び出しでは環境をスタック
-	  にセーブしないことによって高速化.
-
-Wed Oct  5 15:00:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby.h: 一時env.hに移動してたQselfの定義を復活. ただし今回は関数
-	  として実現(env.hでは変数として再定義してある).
-
-	* ruby.h: TRUEでsyntax errorにならないよう#undefを追加.
-
-	* eval.c(rb_eval): thread化に挑戦したが, 失敗(速くならなかった).
-	  が, Scopingなどの無駄なコードの削除とメソッド呼び出しの引数セッ
-	  トのinline化で若干の高速化を実現した. 副作用として, argc, argv形
-	  式の関数呼び出しの仕様が変化した(argvにselfを含まなくなった).
-
-	* eval.c(rb_call): メソッド呼び出しの高速化.
-
-Tue Oct  4 11:40:53 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby-mode.el: 修飾子に対応した.
-
-	* parse.y: 多重代入にrestをつけた. この機能を使えばoptional引数の
-	  解析が簡単にできる(はず).
-
-	* pack.c(unpack): uuencode形式のdecodeの際に文字列の長さが間違って
-	  いた.
-
-Mon Oct  3 15:58:41 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* file.c(type): ファイルタイプを文字列で返すメソッド.
-
-Fri Sep 30 11:36:07 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* object.c: デフォルトの真の値である%TRUEの値を1(Fixnum)からtに変
-	  更した. to_sで文字列に変換した時にも`t'と表示される. 更に踏み込
-	  んで`t'を予約語にしてlispのようにしようかとも思ったが, そこまで
-	  は決心できなかった. 一文字のローカル変数はかなり使いそうな気がす
-	  るので….
-
-	* array.c,dict.c: equalを再定義しているクラスで, hashを正しく定義
-	  した.
-
-Wed Sep 28 23:30:28 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c(Ffail): 今までfailはカーネルクラスのメソッドであったが,
-	  構文に組み込んだ. この変更によって, 1)`fail'は予約語となり, ロー
-	  カル変数に用いることができなくなった. 2)`fail'単体で例外を発生す
-	  るようになった. 3)failはメソッドではなくなったので再定義される可
-	  能性がなくなった.
-
-	* dic.c, dbm.c(indexes): Arrayのindexesと同様の機能を持つメソッド
-	  を追加.
-
-	* array.c(indexes): 引数をインデックスとする要素の配列を返す. 整数
-	  の配列を引数とする時には引数の要素をインデックスとする要素の配列
-	  を返す.
-
-Mon Sep 19 13:42:31 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* array.c(aset): 部分配列に対する代入で配列以外のオブジェクトが指
-	  定された場合に多重代入と同じルールで配列化するようにした.
-
-	* io.c(print): 引数として与えられた各オブジェクトにprint_onメッセー
-	  ジを与えるように. 実行速度は落ちるが柔軟性は増す.
-
-Fri Sep 16 14:59:18 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* glob.c: ワイルドカードの導入. bashに使われているGNUのglobルーチ
-	  ンを流用した.
-
-Mon Sep 12 18:36:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(value_expr): 式がnilの時に対応.
-
-	* class.c: ICLASSのclassが必ずClass/Moduleを指すように.
-
-Tue Sep  6 16:23:28 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c:	正規表現内で「\数字」形式が指定できるように.
-
-	* parse.y:「do expr using var ... end」形式はなくなった. 寂しい気
-	  もする. *BACKWARD INCOMPATIBILITY*
-
-Mon Sep  5 10:59:01 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* numeric.c(next): Numericクラスにもnextを提供.
-
-	* string.c(upto): uptoを提供.
-
-	* range.c(each): nextを使ったインタフェースからuptoを使うように変
-	  更した. この方が一つのメソッドで処理をまとめで行なうことができる.
-
-Fri Sep  2 15:25:39 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* dict.c(each): 戻り値を[key, value]のペアに変更. 今までのeachは
-	  each_valueとして残る. *BACKWARD INCOMPATIBILITY*
-
-Thu Sep  1 10:49:04 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 成功した(特別な戻り値を持たない)システムコールは`0'を返すように.
-
-Wed Aug 31 00:26:51 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* string.c: チェックサムを得るメソッド`sum'を作った.
-
-	* class.c(include_class_new): ICLASSのclassをもとのクラスにした.
-	  gcの際に元クラスをマークする必要があるのが, フィールドを増やす余
-	  地が無いので, classフィールドを流用した. 私の見積りが間違ってい
-	  て, ICLASSのインスタンスにメッセージを送る事があれば, おかしな動
-	  作をするだろう.
-
-	* eval.c(masign): 式(a,b = nil)の値を[nil]からnilに変更した.
-
-Mon Aug 29 11:56:09 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* class.c: rb_define_mfuncを無くして, メタクラスにモジュールをイン
-	  クルードするようにした.
-
-	* error.c(yyerror): 同じ行で複数のsyntax errorをリポートしないよう
-	  にした.
-
-	* file.c: FileTestモジュールにファイルテストメソッドを分離した.
-
-	* parse.y: 演算子を指定する時のlex_stateを正しく設定した.
-
-Sat Aug 27 01:23:34 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: if/whileなどの複合式をprimaryに移動した. これによって例
-	  えば「if cond then a else b end.message()」のような式が書けるよ
-	  うになった.
-
-Fri Aug 26 10:46:30 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* spec: 整理された文法にしたがって書き直した.
-
-	* parse.y: ここ数日で混乱していた文法を整理した. 括弧を省略したメ
-	  ソッド呼び出しができるようになったこと, modifierが付けられるよう
-	  になったこと, returnにリストが渡せるようになったことが主な変更点
-	  である.
-
-	* process周りが怪しいがとにかくSolaris 2.3で動くように.
-
-	* parse.y: 曖昧性がない場合にはメソッド呼び出しの引数の括弧を省略
-	  できるように. 省略できるメソッド呼び出しの条件は, 1)かならず1個
-	  以上の引数を必要とすること, 2)第1引数が`+', `-', `(', `[', `{',
-	  `/'など, 式の始まりに置かれた時と途中に現れた時とで解釈が違う記
-	  号で始まらないこと, である.
-
-Thu Aug 25 13:54:58 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(cond): 条件式の展開部にbugがあった.
-
-Wed Aug 24 00:01:15 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: returnはコンマで区切ったリストも受け取るように. つまり,
-	  return a, b, cはreturn [a, b, c]と同じ意味になる.
-
-	* parse.y: yield以外の大域脱出制御式をexprからexpr0に移した. よっ
-	  てメソッドの引数に制御式を使えなくなる(これで困る人はいないはず).
-
-	* parse.y: `+'の定数展開の際に演算子の優先順位を忘れていた.
-
-	* eval.c: untilの戻り値はnilになった.
-
-	* parse.y: modifierとしてのif/unless/while/untilを追加.
-
-	* parse.y: 文法からendの後ろにつけるキーワードを削除. ほとんど使わ
-	  なかった上に, emacsではruby-modeがあれば対応のチェックが機械的に
-	  出来るため.
-
-Tue Aug 23 18:08:33 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: スクリプト実行開始前に例外が発生した時にcore dumpした.
-	  組み込み用にコードを変更した時にenbugしてしまった.
-
-Tue Aug 23 00:07:17 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c: doの戻り値がいつもnilになっていた.
-
-	* parse.y: loop制御変数の多重代入化にbugがあった.
-
-	* parse.y(expand_op): 文字列も畳み込みの対象に.
-
-Mon Aug 22 10:50:01 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(expand_op): `+'に関しては結合則を使って, より多く定数畳
-	  み込みを行なうように.
-
-	* ruby.c(proc_options): argcが0の時にも対応.
-
-	* parse.y: forなどの制御変数に多重代入も使えるように.
-
-Sat Aug 20 00:59:40 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y(call_op): 演算子`~'の取り扱いをルール部へ移動.
-
-Fri Aug 19 11:44:13 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* main.c: rubyをほかのプログラムに組み込めるようにmain()を分割した.
-	  それにともない, プログラムの呼び出し構造を修正した.
-
-	* parse.y: 条件式の定義を変更. ifなどの条件式の中でだけ`&&'や`||'
-	  および`!'の引数が条件式になるように. この変更により条件式以外の
-	  場所での `&&', `||', `!'演算子の動作が直観に一致する.
-
-	* parse.y: 実引数の`*'の後に続く引数はexprに制限した. 今までは全て
-	  の文が有効
diff --git a/doc/ChangeLog-0.60_to_1.1 b/doc/ChangeLog-0.60_to_1.1
deleted file mode 100644
index 33b0326892..0000000000
--- a/doc/ChangeLog-0.60_to_1.1
+++ /dev/null
@@ -1,3955 +0,0 @@
-Tue Aug 12 16:02:18 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c: option variables: $-0, $-p(readonly), $-v,
-	  $-I(load_path), $-a(readonly), $-K, $-d, $-F, $-i, $-l.
-
-	* parse.y (yylex): ignore rd (ruby document) in the code.
-
-Mon Aug 11 12:37:58 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* re.c (Init_Regexp): $-K as alias to the $KCODE.
-
-	* io.c (Init_IO): new virtual variable $-i for the value of -i
- 	  option.
-
-	* enum.c (Init_Enumerable): include? as alias of member?
-
-Fri Aug  8 11:16:50 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* io.c (io_foreach): now the record separator can be specified.
-
-	* io.c (io_s_readlines): new method to read in whole file (or
- 	  command output) from path.
-
-	* ext/socket/socket.c (Init_socket): recvfrom did not work.
-
-	* ext/socket/socket.c (sock_send): forgot to check nil for false
-	  value.
-
-Thu Aug  7 11:40:01 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* variable.c (mod_constants): lists constants defiend in the
-	  modules/classes.
-
-	* variable.c (rb_const_set): no longer warns about constant
-	  overriding by subclasses.
-
-	* eval.c (mod_eval): does eval() on module's context. local
-	  variables are shared with outer scope.
-
-	* object.c (Init_Object): remove private_attr/public_attr.
-
-Wed Aug  6 14:21:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (mod_attr): forgot to check nil for false value.
-
-Mon Aug  4 11:50:28 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* object.c (class_s_new): need not to specify names to create
-	  classes (or modules) dynamically.
-
-	* variable.c (rb_class_path): scan class constants for anonymous
-	  classes/modules to make up pathes.
-
-Wed Jul 30 08:45:12 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (rb_eval): stop to cache const value in nodes.
-
-Sat Jul 26 03:17:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* numeric.c (flo_to_s): wrong .0 at end.
-
-Sat Jul 26 00:36:36 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* eval.c (error_print): always print exception type in the
- 	  toplevel exception handler.
-
-	* string.c (str_hash): wrong hash value.
-
-Thu Jul 24 11:05:51 1997  Yukihiro Matsumoto  <matz@netlab.co.jp>
-
-	* string.c (uscore_get): proper error message for unset $_.
-
-Wed Jul 23 09:56:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (obj_methods): returns list of method names of the
-	  specified object.
-
-	* class.c (mod_instance_methods): returns list of method names of
-	  the class instnace.
-
-Fri Jul 11 22:38:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (class_superclass): returns class's superclass
- 	  itself. (1.1)
-
-	* object.c (obj_type): returns object's class itself. (1.1)
-
-	* class.c (mod_included_modules): list included modules.
-
-	* object.c (class_superclass): raises error for Object.
-
-Thu Jul  3 09:54:02 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (SETUP_ARGS): save source position, remove nd_line().
-
-	* eval.c (rb_call): replace modulo by bit-masking.
-
-	* eval.c (POP_SCOPE): force recycle scope object to reduce gc rate.
-
-	* gc.c (obj_free): aboid calling run_final() when no finalizer is set.
-
-	* eval.c (PUSH_VARS): do not allocate the dynamic scope's end-mark
-	  object.
-
-Wed Jul  2 14:25:07 1997  KIMURA Koichi  <kkimura@pure.cpdc.canon.co.jp>
-
-	* Native mswin32 support.
-
-Tue Jul  1 09:59:00 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970701
-
-	* parse.y (mrhs): allow rest-star(*) in right hand side.
-
-Tue Jun 24 19:04:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970624
-
-Sat Jun 20 22:22:51 1997  Michio "Karl" Jinbo  <karl@marcer.nagaokaut.ac.jp>
-
-	* eval.c: freebsd 3.0 <sys/select.h> support.
-
-Fri Jun 20 01:24:45 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970620
-
-	* gc.c: eliminate uninitilalized field of Hash, Array etc., to
-	  avoid dumping core.
-
-Thu Jun 19 01:29:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970619
-
-	* string.c (str_split_method): wrong limit.
-
-Sat Jun 14 01:54:16 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* class.c (rb_singleton_class): no singleton for special
-	  constants (now raises exception).
-
-	* eval.c (ruby_init): cbase in TOPLEVEL_BINDING need to be
-	  initialized.
-
-Sat Jun 14 01:01:16 1997  maeda shugo  <shugo@po.aianet.ne.jp>
-
-	* array.c (sort_2): wrong comparison.
-
-Sat Jun 14 00:53:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* hash.c (hash_foreach): safe iteration.
-
-Fri Jun 13 14:04:56 1997  Michio "Karl" Jinbo  <karl@marcer.nagaokaut.ac.jp>
-
-	* configure.in: -Bshareable option for netbsd.
-
-Fri Jun 13 01:16:22 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (pipe_open): call io_unbuffered() only for writable pipes.
-
-Thu Jun 12 01:14:15 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970612
-
-	* ext/socket/socket.c (sock_new): use io_unbuffered().
-
-	* ext/marshal/marshal.c (w_long): compact long format, which
-	  supports 64 bit architectures (unless longs are >32 bit size).
-
-	* ext/marshal/marshal.c: allows recursive data for marshaling.
-
-	* parse.y (rb_intern): raise exception for non-internable string.
-
-	* ext/marshal/marshal.c (marshal_load): allows direct loading from
- 	  strings.
-
-	* ext/marshal/marshal.c (marshal_dump): allows direct dump to strings.
-
-	* ext/marshal/marshal.c (marshal_dump): interface changed.
-
-Wed Jun 11 18:26:00 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gc.c (rb_newobj): remove needless memset().
-
-Mon Jun  9 13:03:43 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): reduce condition checks from while/until loop.
-
-	* eval.c (rb_eval): wrong jump point for `next'.
-
-Fri Jun  6 11:47:39 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c (ruby_set_argv): initialize dln_argv0 for dln_a_out.
-
-	* ext/socket/socket.c (open_unix): display path name for exceptions.
-
-	* ruby.c (proc_options): option -S did not work well.
-
-Fri May 30 02:14:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970530
-
-	* eval.c (eval): set $! properly if exception raised in eval().
-
-	* io.c (io_write): now handles non T_FILE object.
-
-	* io.c (io_defset): $< can be anything which has `write' method.
-
-Thu May 29 15:40:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (eval): $@ is always an array (not string).
-
-	* pack.c (pack_unpack): avoid corrupting memory for unexpected
-	  input strings.
-
-Wed May 28 12:46:13 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970528
-
-	* process.c (rb_waitpid): do not block other threads.
-
-Tue May 27 12:02:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (ruby_init): split initialize and processing command line
-	  options.
-
-	* ruby.c (ruby_options): ruby_init(0, 0, envp) dumps core.
-
-Tue May 20 18:59:45 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* variable.c (rb_ivar_set): invalid instance variable access for
-	  built-in object raises TypeError.
-
-Fri May 16 17:32:21 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970516
-
-	* dir.c (push_globs): was freeing non heap pointer.
-
-	* gc.c: remove some duplicated prototypes.
-
-	* ext/kconv/kconv.c: fix prototypes.
-
-Fri May  9 11:38:59 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970509
-
-	* gc.c (obj_free): avoid free(NULL).
-
-	* eval.c (rb_check_safe_str): argument missing for TypeError().
-
-Thu May  8 01:14:28 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_s_dirname): need to return "." for path without
-	  slashes.
-
-Wed May  7 19:18:48 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* process.c (f_fork): child processe does not inherit parent's
- 	  itimer setting on linux.  call setitimer() again in the child
-	  process.
-
-Sat May  3 02:49:43 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/curses/curses.c: modified for portability and add to the
- 	  standard distribution.
-
-Wed Apr 30 00:34:00 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_s_size): returns 0 for empty files (not FALSE).
-
-Fri Apr 25 02:17:50 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970425
-
-	* eval.c (f_load): free unused name-table.
-
-	* eval.c (f_load): copy local variable name-table.
-
-	* gc.c (obj_free): avoid free(NULL).
-
-	* eval.c (rb_eval): forgot to make link from the scope object to
-	  NODE_SCOPE.  It may crash the interpreter.
-
-Thu Apr 24 00:35:09 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* random.c (f_srand): save old seed anyway.  srand() returns no
- 	  value on some systems.
-
-	* gc.c (obj_free): avoid double free of the local variable name
-	  table.
-
-	* parse.y (top_local_setup): modify realloc to handle offset.
-
-Tue Apr 22 12:58:26 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970422
-
-Thu Apr 17 00:40:51 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* configure.in (rb_cv_bsdpgrp): proper check for BSD
-	  setpgrp/setpgrp.
-
-Wed Apr 16 16:14:02 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (proc_call): proc called in other thread must be orphan.
-
-Tue Apr 15 10:46:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970415
-
-	* gc.c (obj_free): NODE_SCOPE marked from SCOPE object.
-
-	* gc.c (gc_mark): some nodes marked wrong.
-
-	* process.c (proc_getpgrp): wrong argument
-
-Fri Apr 14 18:32:42 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970414
-
-Fri Apr 12 01:20:12 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.h: String pointer changed to unsigned char.
-
-Fri Apr 11 10:27:29 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970411
-
-	* Makefile.in: create libruby.a before linking ruby.
-
-	* string.c (str_strip_bang): >0x80 characters for isspace().
-
-	* eval.c (proc_call): set safe-level temporally
-
-	* eval.c (proc_s_new): save safe-level in the proc context.
-
-	* eval.c (rb_eval): no class/module extension in safe mode.
-
-Thu Apr 10 02:10:41 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gc.c (gc_mark): remove some pointer checks for speeding up.
-
-	* ruby.c (ruby_options): set $0 temporally for -r option.
-
-	* eval.c: built-in security feature.
-
-	* gc.c (gc_sweep): do not free nodes during compile.
-
-	* parse.y (yycompile): set flag when compiling.
-
-Wed Apr  9 10:19:02 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c: forgot to include <ctype.h> for isspace().
-
-	* file.c: provide S_ISREG for some platforms.
-
-	* io.c (Init_IO): added some $< operations.
-
-	* lib/ping.rb: check host upness using TCP echo.
-
-Tue Apr  8 00:10:15 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (arg_read): bug with 0 length input.
-
-Mon Apr  7 11:36:16 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/fcntl/fcntl.c: module for fcntl constants.
-
-	* eval.c (rb_alias): bug when original was an alias.
-
-	* parse.y (primary): syntax to access singleton class.
-
-	* eval.c (mod_public_method): method's to specify visibitily of
-	  the class methods.  make_method_{public,private} removed.
-
-Fri Apr  4 21:43:57 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970404
-
-	* gc.c (obj_free): finalizer added for experiment.
-
-Thu Apr  3 02:12:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_schedule): make Fatal rise on main_thread on
-	  deadlocks.
-
-	* eval.c (thread_join): raise ThreadError instead of Fatal, in
-	  case of deadlock.
-
-	* regex.c (re_compile_fastmap): uninitialized local variable.
-
-	* parse.y (parse_regx): new option //[nes] to specify character
-	  code for regexp literals.  Last specified code option is valid.
-
-	* re.c (reg_s_new): additional 3rd argument to specify compiled
- 	  regexp's character code.
-
-	* re.c (reg_new_1): regexp character code can be specified for
-	  each regexp object.
-
-Wed Apr  2 14:51:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_create): handle uncaught throw.
-
-	* eval.c (thread_create): halt on some deadlock conditions.
-
-	* regex.c (is_in_list): wrong result for non-mbc higher-byte
-	  characters.
-
-	* regex.c (re_match): wrong skip for multi-byte characters.
-
-	* regex.c (re_compile_fastmap): wrong fastmap in non-mbc mode.
-
-	* hash.c (Init_Hash): hash compatible features added to ENV.
-
-Tue Apr  1 15:24:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (obj_extend): remove Object#extend as an iterator which
- 	  is in experimental state, since it unveils internal singleton
- 	  classes.
-
-Mon Mar 31 14:29:39 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970331
-
-Sun Mar 30 19:40:57 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* parse.y (terms): avoided win32 gcc's optimization bug.
-
-Sat Mar 29 11:21:58 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* struct.c (make_struct): St[val,..] creates new structure.
-
-Fri Mar 28 11:24:51 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (obj_make_private): new method make_method_{public,private}
-	  to change visibility of singleton methods.
-
-	* regex.c (re_compile_pattern): enables numeric literal >= 0x80 in
-	  the character class.
-
-	* regex.c (re_compile_pattern): enabled numeric literal >= 0x80,
-	  in multibyte mode.
-
-	* regex.c (re_compile_fastmap): modified exantn and charset(_not)
-	  to set fastmap for higher bytes properly.
-
-	* regex.c (is_in_list): now matches numeric literals.
-
-Thu Mar 27 13:34:20 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* pack.c (pack_unpack): extra null byte after unpacked string.
-
-Wed Mar 26 15:20:34 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* regex.c (re_compile_pattern): register numbers must be fit in a
- 	  byte (0 <= regnum <= 0xff).
-
-	* regex.c (re_compile_fastmap): forgot to set mbchar map for
- 	  charset_not if RE_MBCTYPE is on.
-
-	* regex.c (re_compile_pattern): set list bits for multi-byte
-	  characters for \W, \S, \D in range expression.
-
-	* object.c (obj_is_kind_of): defined that nil itself is kind of
- 	  nil.  TRUE is kind of TRUE, FALSE is kind of FALSE likewise.
-  	  This change makes `obj.kind_of?(eval(obj.type))' always true.
-
-Tue Mar 25 14:08:43 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/English.rb: provides nicer English alias for the variables.
-
-	* parse.y (expr): alias $var1 $var2 makes alias of the global
-	  variable.
-
-Mon Mar 24 18:23:20 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970324
-
-Thu Mar 20 22:04:59 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (mod_modfunc): forget to clear method cache.
-
-Wed Mar 19 17:06:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (program): set methods' default private/public status
-	  correctly under eval().
-
-	* eval.c (eval): set the_class correctly while evaluating string.
-
-Tue Mar 18 12:23:53 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (eval): yield can be called from eval().
-
-	* version 1.0-970318
-
-	* parse.y (program): regexp in condition expression should do
-	  matching operation with $_.
-
-	* re.c (reg_regsub): wrong substitution.
-
-Fri Mar 14 14:36:28 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* hash.c (hash_invert): returns value to key mapping of the
-	  associative array.
-
-	* ext/socket/extconf.rb: set environment variable SOCKS_SERVER to
-	  compile with libsocks.a.
-
-	* ext/socket/socket.c (socks_s_open): SOCKSsocket class to access
-	  internet via SOCKS library.
-
-	* sprintf.c (f_sprintf): unsigned formats display leading double
- 	  dots for imaginary sequence of signed bit to the left.
-
-	* sprintf.c (f_sprintf): correct width and precision formatting
-	  for big integers.
-
-	* parse.y (yylex): enables negative hex/octal numbers and `_' in
-	  non-decimal numbers.
-
-	* sprintf.c (f_sprintf): %u added for unsigned decimal format.
-
-Thu Mar 13 10:24:27 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sprintf.c (f_sprintf): wrong output for bignums.
-
-	* array.c (ary_reverse_each): iterates in reverse order.
-
-	* pack.c (pack_unpack): L unpacked signed long.
-
-	* io.c (f_backquote): now returns an empty string for no output.
-
-Wed Mar 12 10:20:30 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/socks/socks.c: socket module with socks library.
-
-Mon Mar 10 20:44:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* re.c (reg_regsub): \& for substitution.  \`, \', and \+ are
-	  avaiable also.
-
-Thu Mar  6 01:47:03 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970306
-
-	* sample/rubydb.el (gud): ruby debugger emacs interface
-
-	* lib/debug.rb: ruby debugger
-
-	* parse.y (exprs): more accurate line number display.
-
-Wed Mar  5 21:31:46 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970305
-
-Tue Mar  4 12:28:32 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c (proc_options): search through RUBYPATH and PATH for
-	  option -S.
-
-Mon Mar  3 22:44:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_status): returns nil for exception terminated
-	  threads.
-
-	* eval.c (thread_value): re-raise exceptions.
-
-Sat Mar  1 00:59:47 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): restore $! value after rescue clause, to
-	  re-raise exceptions correctly.
-
-Fri Feb 28 16:43:38 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970228
-
-Thu Feb 27 11:23:41 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_yield_0): redo raises exception
-
-	* eval.c (thread_schedule): bug in interrupt handling by rescue.
-
-Wed Feb 26 00:55:36 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (eval): forgot to restore dynamic local variable
-	  bindings.
-
-Tue Feb 25 11:22:08 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/aix_ld.rb: AIX dynamic load support (not tested).
-
-	* eval.c (rb_eval): wrong return value for defined? super.
-
-	* error.c (exception): more error check.
-
-	* re.c (reg_regsub): wrong substitution when sub expanded to null
- 	  string.
-
-Fri Feb 21 13:01:47 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970221
-
-	* eval.c (f_require): volatile added.  register variable was
- 	  recycled, so that GC did not mark that variable.
-
-	* object.c (Init_Object): forget to mark main object (was mostly
-	  ok, but made trouble with early GC.)
-
-Thu Feb 20 11:50:50 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970220
-
-Thu Feb 20 11:25:50 1997  Yasuo OHBA  <jammy@shljapan.co.jp>
-
-	* lib/date.rb: update
-
-Thu Feb 20 08:25:57 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (yylex): forgot tokfix() before rb_intern().
-
-	* lib/tk.rb (TkVariable): give up using trace_var.
-
-Wed Feb 19 00:24:35 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970219
-
-	* pack.c (pack_pack): packed by null for A specifier. must be
-	  space filled.
-
-	* pack.c (pack_unpack): bug in skipping spaces
-
-	* gc.c (xmalloc): garbage collect for every 4 Meg. allocation.
-
-	* string.c (str_split_method): limit worked wrong way.
-
-	* io.c (io_gets_method): misunderstand 0xff in binary files when
-	  $/ == nil.
-
-	* re.c (reg_regsub): re-implement.
-
-	* ext/socket/socket.c (thread_connect): remove O_NONBLOCK, which
-	  is not defined on some platform like NeXT.
-
-Mon Feb 17 13:08:30 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970217
-
-	* object.c (mod_eqq): === extended for subclass check (to use case
-	  as typecase).
-
-Sat Feb 15 02:07:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* regex.c (re_compile_pattern): wrong match backref at end of pattern.
-
-	* io.c (arg_read): now works beyond end of file.
-
-Thu Feb 13 16:21:24 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (expr): return/yield now accept normal argument format.
-
-	* parse.y (yylex): a star in `yield *x' must not be multiplication
-	  operator.
-
-Wed Feb 12 15:06:44 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* time.c (time_plus): bug in simple addition.
-
-	* eval.c (thread_raise): raise exceptions from outside.
-
-	* eval.c (Init_Thread): Thread#alive? -- alias for Thread#status.
-
-Mon Feb 10 00:38:55 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.h (Data_Make_Struct): rename macros.
-
-Sun Feb  8 11:48:13 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (f_syscall): argument offset was wrong.
-
-Fri Feb  7 18:01:17 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970207
-
-	* eval.c: add volatiles to avoid variable crobbering by longjmp().
-
-	* eval.c (f_raise): 1st argument can be the GlobalExit object now.
-
-	* array.c (ary_unshift): no longer accept more than 2 args.
-
-	* eval.c (f_raise): bug if 2nd argument is the exception.
-
-Tue Feb  4 00:37:29 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970204
-
-	* eval.c (eval): check compile errors by nerrs.
-
-	* eval.c (rb_eval): check syntax error by nerrs, not by the return
- 	  value, which may be NULL.
-
-	* eval.c (compile): Do not clear errinfo.
-
-Mon Feb  3 10:13:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (obj_extend): move real inclusion to Module#extend_object
-	  to allow redfinition.
-
-	* object.c (Init_Object): Kernel class is now Module. Object class
-	  became the true root class.
-
-	* object.c (obj_inspect): remove useless buffer.
-
-	* hash.c (any_cmp): disable interrupts and context switching.
-
-	* st.c: remove ALLOW_INTS to disable interrupt during operations.
-
-Fri Jan 31 22:10:08 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* hash.c (hash_rehash): re-register all key-value.
-
-Thu Jan 30 02:14:49 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (io_reopen): re-implement according to clone() way.
-
-	* io.c (io_clone): copy IO object.
-
-	* struct.c (struct_eql): compare elements by eql?.
-
-	* io.c (io_mode_flags): detect "rb", "wb" etc.
-
-	* io.h (FMODE_BINMODE): added.
-
-	* ext/socket/socket.c (Init_socket): undef BasicSocket.new
-
-	* file.c (Init_File): File.new(path[,mode])
-
-	* io.c (Init_IO): IO.new(fd[,mode])
-
-	* eval.c (rb_method_boundp): forgot to enable priv argument.
-
-	* object.c (Init_Object): remove `=~' from Kernel class.
-
-	* ext/socket/socket.c (open_inet): initialize sockaddr before
-	  calling bind(2).
-
-	* sample/ruby-mode.el (ruby-calculate-indent): skip comment lines
-
-Wed Jan 29 18:43:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (Init_Thread): DEFER_INTS during initializing threads.
-
-	* hash.c (Init_Hash): Hash#eql? checks for object identity.
-
-	* eval.c (thread_set_critical): wrong value assigned.
-
-Mon Jan 27 16:10:51 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (io_print): remove print_on().
-
-	* eval.c (f_missing): proper error message for undefined method
-	  without argument
-
-Sat Jan 25 23:32:32 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_sub_s): false alert - sub() does not modify string.
-
-	* array.c (ary_times): negative multiplication detected
-
-	* string.c (str_times): negative multiplication detected
-
-Fri Jan 24 10:51:39 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* time.c (time_arg): month -> 0 == "jan" == "1" == "01", little bit
-	  confusing but wanted to conform japanese style.
-
-	* version 1.0-970124
-
-Fri Jan 24 09:52:49 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* util.c (_fixpath): supports SJIS filenames on DJGPP.
-
-Thu Jan 23 16:52:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* README.EXT: update. partially translated into English.
-
-	* ext/extmk.rb.in: inherit $LDFLAGS to the final link.
-
-	* ext/socket/socket.c (Init_socket): add various constants.
-
-Mon Jan 23 11:40:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* eval.c (Init_Thread): allocate main_thread first to avoid crash.
-
-Thu Jan 23 02:09:26 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gc.c (ObjectSpace): API modified. each_object method will do all
- 	  the iteration.
-
-	* eval.c (proc_call): wrong return from nested lambda.
-
-	* ext/GD/GD.c: debugged.
-
-Wed Jan 22 16:12:25 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970122
-
-	* gc.c (gc_mark): forgot to mark match->str.
-
-	* ext/GD/GD.c: GD interface module.
-
-	* eval.c (PUSH_BLOCK): wrong value pushed as the block level.
-
-Mon Jan 20 14:01:31 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_run): no context switch in the critical section.
-
-Mon Jan 20 09:40:59 1997  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* utils.c: supports 8+3 filenames
-
-Sat Jan 18 01:23:03 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970118
-
-	* regex.c (PATFETCH): need cast to unsigned char.
-
-	* io.c (io_ctl): bug in case when arg is not a string.
-
-	* lib/tk.rb: forgot that Kernel#type returns the class name now.
-
-	* regex.c (re_search): "abc\n" =~ "^$" should not match.
-
-Fri Jan 17 12:31:37 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970117
-
-	* ruby.c (ruby_options): constant PLATFORM, which is in the {cpu}-{os}
-	  form, defined.
-
-	* configure.in: platform information embedded in the interpreter.
-
-	* regex.c (re_search): /^$/ did not match to "" by wrong exit condition.
-
-	* lib/thread.rb: re-write Mutex/Queue based on Thread.critical.
-
-	* eval.c (thread_set_critical): remove Thread.exclusive, add
-	  Thread.critical = TRUE/FALSE instead.
-
-	* re.c (reg_search): re-compile pattern if needed
-
-	* regex.c (PATFETCH): do translate at compile time
-
-Thu Jan 16 00:49:10 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gc.c (gc_mark_frame): forgot to mark frame->cbase.
-
-	* regex.c (re_compile_pattern): /a$|b)/ causes error.
-
-	* regex.c (re_compile_pattern): /(^|b)/ causes error.
-
-	* version 1.0-970116
-
-	* re.c (Init_Regexp): set RE_CONTEXTUAL_INVALID_OPS flag.
-
-Tue Jan 14 02:09:06 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (proc_call): Proc#callをイテレータとして呼んだ時に対応
-
-	* configure.in: nextstep対応？
-
-	* eval.c (rb_eval): a[b]=cで無駄な配列を割り当てない
-
-	* eval.c (f_send): イテレータとして呼ばれたらイテレータとしてメソッ
-	  ドを呼ぶ．
-
-	* string.c (str_new4): match共有用の生成関数
-
-	* re.c (reg_search): matchの実体(文字列)をマッチを行った文字列と
-	  copy-on-writeで共有
-
-	* string.c (str_hash): toupperをかける条件が違っていた
-
-	* array.c (sort_2): FixnumとStringを特別扱いして高速化
-
-Mon Jan 13 11:03:53 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_create): threadが生成されるまで割込みを設定しない
-
-	* eval.c (Init_Thread): 割込みタイミングを100msecに
-
-Sat Jan 11 00:17:05 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* regex.c (re_search): マッチに失敗する場合があった(本当に直ったか？)
-
-	* io.c (io_ioctl,io_fcntl): 第2引数を省略可能に
-
-	* io.c (io_ioctl,io_fcntl): 戻り値がIOだった．整数(システムコール
-	  の戻り値)を返すようにした．
-
-	* io.c (io_ctl): 引数が整数の時に対応
-
-	* io.c (io_fcntl): file.cから移動
-
-Fri Jan 10 17:01:47 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-970110
-
-	* ext/socket/socket.c (thread_connect): open(connect(2))で他の
-	  threadをブロックしないように
-
-	* eval.c (thread_create): exitでないときにexitだと思い込む
-
-Mon Jan  6 17:42:22 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_sub_s): 文字列長より長いoffsetの検出
-
-	* regex.c (re_search): 空にマッチするパターン後の$で失敗
-
-Thu Jan  2 16:36:23 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_reopen): Fileのreopen(pathまたはIOで指定)．
-
-	* io.c (io_reopen): IOのreopen(IOで指定) -- change classつき
-
-Wed Jan  1 11:09:01 1997  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (f_select): timeoutでnilを返す
-
-Fri Dec 27 13:06:44 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_s_open): サブクラスではそのクラスのインスタンスを返
-	  すように．
-
-Fri Dec 27 08:58:27 1996  <ono@isl.nara.sharp.co.jp>
-
-	* numeric.c (flo_to_s): index()を使わない．strstr()に．
-
-Thu Dec 26 01:34:17 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/tk.rb: placeが使えるように
-
-	* pack.c (endian): マクロDYNAMIC_ENDIANを指定すると実行時にendian
-	  を判定するように．
-
-	* eval.c (thread_alloc): 初期化忘れのメンバがあった．
-
-Wed Dec 25 00:33:19 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 1.0-961225
-
-	* io.c (Init_IO): newを無効化
-
-	* lib/tkthcore.rb: tk_call "global $foo; set foo 5"などもできるように
-
-	* eval.c (thread_restore_context): $~, $_でスタックを壊していた
-
-	* process.c (rb_waitpid): threadに一応対応
-
-Tue Dec 24 15:20:58 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.4-961224
-
-	* configure.in: charがunsignedかどうかもチェック
-
-	* regex.c (SIGN_EXTEND_CHAR): __CHAR_UNSIGNED__にも対応
-
-	* pack.c (pack_unpack): 明示的にsigned charを指定．
-
-Mon Dec 23 14:41:23 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c (load_file): 標準入力からのスクリプトで一時ファイルを使わ
-	  ないように
-
-	* object.c (f_integer): `0x', `0'などでbaseを解釈するように．
-
-Fri Dec 20 01:44:39 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* Makefile.in (flock.o): flockに対応
-
-Thu Dec 19 20:13:32 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.4-961219
-
-Wed Dec 18 00:06:48 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* glob.c (glob_filename): strrchrがマクロの場合に対応
-
-	* configure.in: <sys/select.h>をチェック
-
-	* ext/kconv/kconv.c: 1.62ベースに
-
-	* ext/kconv/kconv.c: Kconvモジュール
-
-	* string.c (str_substr): lenが元の文字列より長い時に対応
-
-	* parse.y (iterator): 「$bar do .. end」などは許さないように
-
-	* parse.y (iterator): FID(foo!,foo?)をdo形式のイテレータにできる．
-
-	* missing/flock.c (flock): lockf()を使って代替
-
-	* file.c (file_flock): flockを実装
-
-Tue Dec 17 12:13:38 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.4-961217
-
-Fri Dec 13 02:05:03 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* configure.in: RUBYLIBのカレントを後回し(@mix/awk offline)
-
-	* dln.c: AIXに対応した？(@mix/awk offline)
-
-	* eval.c (thread_schedule): critical sectionでも明示的なコンテキス
-	  トスイッチは起きないとまずい
-
-	* re.c (reg_search): matchに失敗した時に$~をnilに．
-
-	* re.c (reg_search): 毎回matchを生成するように
-
-Thu Dec 12 17:03:30 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* numeric.c (flo_to_s): 2.0.to_s -> 2.0に
-
-	* eval.c (thread_save_context): $_, $~をthread毎に保存
-
-	* eval.c (thread_kill): main threadではexit(0)
-
-	* string.c (str_split_method): 間違った結果を返していた
-
-Thu Dec 12 15:32:48 1996  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* dir.c: CYGWIN32対応
-
-	* ext/socket/socket.c: CYGWIN32対応
-
-	* io.c: CYGWIN32対応
-
-Thu Dec 12 14:43:51 1996  Jun Kuroda  <j_kuro@pluto.ai.kutech.ac.jp>
-
-	* lib/tk.rb: wish4.2も探索候補に含める
-
-	* config.guess: JCC対応
-
-Thu Dec 12 00:41:17 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.4-961212
-
-	* parse.y (parse_string): """..."""はやはり無くすことにした
-
-	* parse.y (parse_regx): %r|...|でterminatorを \ でエスケープできる
-	  ように
-
-	* signal.c (posix_signal): sigactionを使うsignal
-
-	* configure.in: posix signal/bsd signalの検出
-
-Wed Dec 11 17:47:35 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_schedule): critical sectionではコンテキストスイッ
-	  チが起きないように
-
-	* lib/thread.rb: SharedMutexクラス
-
-	* lib/jcode.rb: String#scanを使うように
-
-Tue Dec 10 12:21:28 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961210
-
-	* string.c (str_split_method): 正規表現に()を含む時にバグ
-
-	* lib/jcode.rb: ちょっとましになった
-
-	* string.c (tr_setup_table): 置換文字が短すぎる(2文字)のときのバグ
-
-Mon Dec  9 11:38:04 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_scan): 文字列のマッチを行う．イテレータとしても動
-	  作する
-
-	* regex.c (re_copy_registers): allocatedが初期化されていなかった
-
-	* re.c (match_to_s): $~の文字列化
-
-	* re.c (match_to_a): $~を配列化できるように
-
-	* re.c (match_getter): レジスタが初期化されていなかった
-
-Thu Dec  5 11:06:10 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_split_method): マッチしなかった括弧は空文字列を
-	  pushするべきではない
-
-	* string.c (str_succ): アルファベットを含まない文字に対応
-
-Wed Dec  4 10:48:09 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961204
-
-	* io.c (io_binmode): DJGPPでのbinmode対応
-
-	* sprintf.c (f_sprintf): intの範囲の数値は直接sprintfで変換する
-
-	* sprintf.c (f_sprintf): "%02s"に頼らない
-
-	* re.c (reg_search): indexでSEGV
-
-Tue Dec  3 10:09:36 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961203
-
-	* ext/extmk.rb.in (install): INSTALL_DATAからINSTALLに変更
-
-	* dln.c: hpux対応
-
-	* string.c (str_aset_method): 負の値を含む範囲でも例外を起こさない
-
-	* array.c (ary_replace): 負の値を含む範囲でも例外を起こさない
-
-	* array.c (beg_len): beg==endの時，長さ0に
-
-Mon Dec  2 14:07:12 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* configure.in: HP shl対応
-
-	* string.c (str_upto): beg > endの時無限ループに落ちるのを止めた
-
-	* range.c (range_each): String#uptoが再定義された場合に対応
-
-	* string.c (str_split_method): "ABC".split(/(B)/)が誤動作
-
-Sat Nov 30 01:43:52 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): undefでSEGV
-
-Fri Nov 29 12:17:59 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-parse-region): %Q#..#などに対応．しか
-	  し，区切り文字が演算子で行末にある場合には対応できなかった．
-
-	* re.c (reg_raise): 例外でもスラッシュをエスケープ
-
-	* re.c (reg_inspect): スラッシュをエスケープ
-
-	* parse.y (parse_string): `%[QqXxRr](.)..\1'なる文字列形式(テスト
-	  採用)
-
-	* parse.y (parse_qstring): '''...'''の形式
-
-	* ext/dbm/dbm.c (Init_dbm): 述語key?,value?の追加
-
-	* ext/dbm/dbm.c (Init_dbm): includes->include?
-
-	* hash.c (Init_Hash): 述語key?,value?,include?の追加
-
-	* eval.c (rb_eval): unlessでelse節が実行されない(うーん)
-
-	* string.c (str_sub_iter_s): イテレータブロック内でマッチが行われ
-	  ると位置がずれる(時に無限ループに落ちる)
-
-	* string.c (str_resize): lenが0の時sizeの調整が行われなかった
-
-Thu Nov 28 00:59:54 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961128
-
-	* parse.y (parse_string): 3-quote styleの文字列(例:"""abc"d"e""")
-
-	* configure.in (EXTSTATIC): extを静的にリンクする時にはrubyはdllを
-	  使うように
-
-	* io.c (Init_IO): getsの引数が間違っていた
-
-	* string.c (str_each_line): RSを明示的に指定できるように
-
-Wed Nov 27 12:37:46 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961127
-
-	* eval.c (rb_eval): iver defined? でselfを指定するのを忘れた
-
-	* io.c: gets等でRSを明示的に指定できるように
-
-	* ext/extmk.rb.in (install): static linkに失敗
-
-Tue Nov 26 10:33:04 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961126
-
-	* string.c (str_sub_s): 置換後の文字列長さが間違っていた
-
-Mon Nov 25 09:11:22 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* numeric.c (fix_rshift): 32以上の右シフトで0を返すように(Cの
-	  rshiftは(x>>(y%32))を返していた)．
-
-	* string.c (str_gsub): 置換が行われない場合があった
-
-	* string.c (str_resize): 本当に必要な時だけrealloc
-
-Thu Nov 21 04:13:21 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* configure.in (EXTSTATIC): --with-static-linked-extで全てのモジュー
-	  ルを静的リンクするように
-
-	* pack.c (pack_unpack): 行末の改行がない時にもチェックサムをスキッ
-	  プするように
-
-Wed Nov 20 21:42:51 1996  Yasuo OHBA  <jammy@shljapan.co.jp>
-
-	* configure.in: freebsd対応
-
-Wed Nov 20 10:24:24 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/extmk.rb.in (install): 通常リンク用のLDFLAGSとダイナミックリ
-	  ンク用のDLDFALGSを分離
-
-	* ext/extmk.rb.in (install): コンパイルの成功したものを静的リンク
-	  のリストに追加する
-
-	* eval.c (f_missing): オブジェクトの文字列表現が長すぎる時バッファ
-	  を書き潰していた
-
-	* process.c (proc_exec_v): forkした後例外を発生させてはいけない
-
-Tue Nov 19 13:28:15 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961119
-
-	* eval.c (mod_method_defined): Module#method_defined? の追加
-
-	* parse.y (call_args): 引数が唯一のコマンドコールである時のバグ(戻
-	  り値が展開されてしまう)
-
-Mon Nov 18 13:28:18 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_sub): 失敗した時にnilを返していた
-
-	* string.c (str_split_method): 検索開始位置が移動してなかった
-
-	* ext/socket/socket.c (sock_s_getservbyaname): まだ間違っていた
-
-	* version 0.99.3-961118
-
-	* string.c (str_sub_s): 元の文字列を置換するのを止めた
-
-	* pack.c (encodes): 領域外をアクセスしていた
-
-Fri Nov 15 17:10:35 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* bignum.c (big_divmod): Bignumが引数の場合の対応忘れ
-
-	* sample/ruby-mode.el (ruby-expr-beg): word?形式への対応が不完全
-
-Wed Nov 13 15:42:40 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_tr_s_bang): tr_sでtrが行われていなかった
-
-	* eval.c (rb_eval): autoloadクラスのチェック
-
-	* string.c (f_sub): subがsub!と同じ動作になっていた
-
-	* eval.c (thread_sleep): stopとsleepの分離
-
-Mon Nov 11 13:53:19 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961111
-
-	* numeric.c (fix_step): to, stepが整数以外の場合に対応
-
-	* eval.c (rb_call): dynamic varがdynamic scopingになっていた(これ
-	  はまずい)
-
-	* string.c (str_chop_bang): 長さ0の文字列のchopで，領域外のアクセ
-	  スが発生していた．
-
-	* parse.y (yyerror): 割り当てた領域外をアクセスしていた
-
-Fri Nov  8 11:54:46 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_yield): scopeをheapにコピー
-
-Thu Nov  7 09:56:53 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* numeric.c (num_coerce): とりあえず両辺をFloatに変換することに
-
-Wed Nov  6 10:45:13 1996  Yasuo OHBA  <jammy@shljapan.co.jp>
-
-	* lib/parsearg.rb: 第2引数を変更．
-
-Tue Nov  5 14:21:09 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961105
-
-Sat Nov  2 01:11:40 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* bignum.c (big_pow): typo (dy -> dx)
-
-	* bignum.c (big_divmod): 知らない型はfloatに変換してみる
-
-	* numeric.c (fix_lshift): 境界条件のバグ(負になっていた)
-
-	* bignum.c (big_pow): 無駄なfloatへの変換をなくした
-
-	* math.c (math_atan2): typo(x -> y)
-
-Fri Nov  1 15:30:59 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/socket/socket.c (sock_gethostname): gethostnameがない時には
-	  unameを使ってホスト名を得る
-
-	* ext/etc/etc.c (etc_getlogin): getloginがNULLを返しても環境変数を
-	  調べるように
-
-	* object.c (krn_clone): オブジェクトのフラグもコピー
-
-	* hash.c (rb_cmp): ハッシュの比較を`=='でなく`eql?'に変更
-
-	* math.c (Need_Float): Float()を使って変換する
-
-	* compar.c (cmp_gt): 以前の右辺を返す仕様の名残が残っていた
-
-Thu Oct 31 12:55:51 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961031
-
-	* numeric.c (Init_Numeric): typo
-
-	* eval.c (error_print): 長すぎるtrace backを途中省略する
-
-	* regex.c (re_compile_pattern): 全角のrangeに対応
-
-Wed Oct 30 03:03:18 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.3-961030
-
-	* io.c (f_ungetc): 関数を追加
-
-	* eval.c (dyna_var_asgn): return値忘れ
-
-Tue Oct 29 10:05:28 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (f_split): 関数splitを追加
-
-	* eval.c (rb_call): ネストした外側のクラス/モジュールの定数を参照
-	  できるように
-
-Mon Oct 28 09:51:03 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_sub): offsetが文字の末尾にある時のチェック
-
-	* regex.c (re_match): 割り当てるレジスタの数が1多かった
-
-	* io.c (io_gets): $/ = ""の動作をperlに合わせる(awkとはちょっと違
-	  うらしい)
-
-	* io.c (io_gets): $/ = nilの時少し高速化
-
-	* string.c (str_split_method): 括弧がnullにマッチした時にも無視し
-	  ないように
-
-	* string.c (str_split_method): 括弧にマッチした分はlimitの数に含め
-	  ないように．
-
-	* numeric.c (num_coerce_bin): coerceの定義を変更，2要素の配列
-	  [x,y]を返すように
-
-	* sample/ruby-mode.el (ruby-calculate-indent): "do |aa|"の対応を改
-	  善した．
-
-Sat Oct 26 01:43:51 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/marshal/marshal.c (w_object): ビルトインクラスのサブクラスを
-	  正しく復旧できるように
-
-	* ext/marshal/marshal.c (w_object): ユーザ定義dumpの優先
-
-	* numeric.c (flo_coerce): Float()を使って定義
-
-	* numeric.c (Init_Numeric): Numericのnewのundefはまずい
-
-	* ext/marshal/marshal.c (w_symbol): シンボルの内容(文字列)は一度し
-	  かファイルに書き出さない．
-
-	* sample/ruby-mode.el (ruby-parse-region): if/while修飾子に対応し
-	  なくなっていた
-
-	* bignum.c (Init_Bignum): Bignum.newを除く
-
-	* eval.c (rb_eval): 引数評価後にファイル名と行番号を再設定
-
-	* numeric.c (flo_div): typo
-
-	* sample/ruby-mode.el (ruby-parse-region): def /, def `に対応
-
-Fri Oct 25 09:26:29 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-calculate-indent): "do |aa|"に対応
-
-	* array.c (ary_aset): indexがfixnumの場合ちょっと高速化
-
-	* eval.c (thread_fd_writable): 書き込み前のselectチェック
-
-	* array.c (ary_assoc): 無限ループに落ちた
-
-	* eval.c (thread_wait_for): selectがエラー終了した時，linux以外で
-	  の動作が正しくなかった．
-
-Thu Oct 24 08:26:48 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (backtrace): `$@'を文字列から配列に変更した．
-
-	* eval.c (eval): eval中の例外発生位置を保存する
-
-	* bignum.c (bigsub): オペランドの大小比較の失敗
-
-	* re.c (reg_search): 直接参照がない時にも`$~'がセットされるように
-
-Wed Oct 23 10:40:10 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-961023
-
-	* ext/marshal/marshal.c (r_bytes): mallocをやめ，allocaを使う
-
-	* sample/ruby-mode.el (ruby-calculate-indent): 括弧の対応を変更．
-	  ()内ではインデントをレベルを合わせるように
-
-Tue Oct 22 12:59:11 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* hash.c (hash_s_new): sizeを指定できるように
-
-	* ext/marshal/marshal.c (w_object): dumpする深さ制限を指定できるよ
-	  うに
-
-	* array.c (ary_s_new): sizeを指定した時の初期化忘れ
-
-	* object.c (f_float): big2dblの宣言忘れ．
-
-	* bignum.c (bigsub): 大きさの近いBignum同士の演算で結果が負になる
-	  場合に間違いがあった．
-
-	* array.c (ary_aset): 置換先と置換元が同じ長さの時内容を
-	  shift(memmove)しないように．
-
-	* ext/marshal/marshal.c (marshal_dump): ファイルフォーマットにバー
-	  ジョンを埋め込むように
-
-	* ext/marshal/marshal.c (tmpnam): linux-aout-dln用に定義
-
-Mon Oct 21 08:40:20 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/socket/socket.c (sock_s_gethostbyname): hostent構造体の情報
-	  を返す
-	  (sock_s_gethostbyaddr): IPアドレスからhostent構造体を得る
-	  (sock_s_getservbyaname): getservbyname(3)
-
-Fri Oct 18 10:37:36 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-indent-to): 移動先カラムが負になるバグ
-
-	* eval.c (compile): evalで元ソースの行番号でエラーを表示する
-
-Thu Oct 17 09:52:28 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (eval): evalで文法エラーがあった時にSEGV
-
-	* lib/safe.rb: Restricted.evalの中だけ制限を加える．
-
-	* eval.c (error_print): バックトレースの出力．callerで例外発生位置
-	  を調整した時に問題が出る(そんなことをしなければ良いのだが…)
-
-	* eval.c (make_backtrace): バックトレースの生成
-
-Wed Oct 16 12:56:22 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby-man-0.99.2-jp/index.html: 日本語版ドキュメントの完成(長かった…)
-
-	* re.c (reg_regcomp): $=がnilの時の処理
-
-	* string.c (f_chop): $_に対するchop
-
-Tue Oct 15 11:04:23 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-961015
-
-Mon Oct 14 18:22:38 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_schedule): BOW対応．selectが-1を返した時にバグ(実
-	  はdo .. whileがcontinueで先頭にジャンプすると思い込んでいた．条
-	  件の直前だったのね ^^);;;;;
-
-	* sample/ruby-mode.el (ruby-mode-syntax-table): ?のsyntaxが"/"では
-	  まずいらしい
-
-	* hash.c (rb_hash): name conflict
-
-Fri Oct 11 00:23:05 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-961011
-
-	* ext/marshal/marshal.c (w_object): 結局動いていなかった循環オブジェ
-	  クト対応を外した．
-
-	* hash.c (rb_hash): Fixnumと文字列の高速化
-
-	* ext/marshal/marshal.c (w_object): 無駄なデータの削除(フォーマッ
-	  トの非互換性)
-
-	* io.c (io_readline): 戻り値の不備
-
-	* ext/marshal/marshal.c (marshal_dumps): MSDOS対応
-
-	* ruby.c (load_file): MSDOS対応
-
-Wed Oct  9 17:46:27 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/extmk.rb.in (install): 無駄なコピーを避ける
-
-	* string.c (str_sub_method): マッチがなかった時のString#subの値が
-	  違っていた．
-
-	* eval.c (obj_extend): extendした時にobject_extendedを呼ぶように
-
-Tue Oct  8 00:55:38 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_alloc): 割当の平均化
-
-	* eval.c (thread_schedule): joinのバグを修正
-
-	* eval.c (thread_wait_for): selectへの割込みなどに対応
-
-	* eval.c (thread_select): linuxのselectの挙動に対応(timeoutが変化
-	  する)
-
-Mon Oct  7 09:47:19 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-961007
-
-	* eval.c (PUSH_BLOCK): the_classの保存を忘れていた．
-
-	* ext/dbm/dbm.c (fdbm_store): sizeの保存する場所が間違っていた
-
-	* ext/socket/socket.c (s_accept): thread対応していなかった
-
-Sat Oct  5 01:32:27 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (io_readchar): EOFで例外を発生させる
-
-Fri Oct  4 11:59:54 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/marshal/marshal.c (w_object): HashとObjectの復旧に必要なハッ
-	  シュテーブルが渡されていなかった．
-
-	* variable.c (rb_path2class): ユーザ定義クラスの復旧に失敗していた
-
-	* variable.c (rb_path2class): クラスが存在しない時のエラーをFatal
-	  からNameErrorへ．
-
-	* range.c (range_s_new): first,lastが両方Numericの時エラーになって
-	  いた．
-
-	* range.c: start->first, end->last
-
-Wed Oct  2 02:02:46 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c: DJGPPでchmod,chownを使えるように(ってDOSにchownがあるのか?)
-
-	* class.c (rb_singleton_class): ビルトインクラスもextendしたり特異
-	  メソッドを追加したりできるように
-
-	* variable.c (rb_set_class_path): ユーザ定義のトップレベルクラスに
-	  pathを設定しない
-
-	* eval.c (eval): 例外がRuntimeErrorに化けていた
-
-	* eval.c (eval): eval中の例外の表現の改善
-
-	* eval.c (eval): eval_with_bindingとの一本化
-
-	* eval.c (rb_eval): クラス/モジュール定義の中から定義中のクラス/モ
-	  ジュールが参照できるように
-
-Tue Oct  1 01:40:09 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-961001
-
-	* parse.y: cur_crefが2度宣言されていた
-
-	* signal.c (trap): SIGSEGV，SIGBUSのない機種に対応
-
-	* io.c (Init_IO): 引数タイプの指定間違い
-
-Mon Sep 30 15:28:00 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-960930
-
-	* config.guess,config.sub: $host_osが正しく設定されない
-
-	* eval.c (rb_eval): yieldで正しくないselfが設定されていた
-
-	* eval.c (ruby_run): toplevelの例外処理のバグ
-
-Mon Sep 30 09:13:26 1996  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* djgpp対応
-
-Sat Sep 28 02:45:10 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-960928
-
-	* sample/ruby-mode.el (ruby-beginning-of-block): ブロックの先頭に
-	  移動(正しくインデントしていないと動作しない)
-	  (ruby-end-of-block): 同上
-
-	* eval.c (class_s_new): Class#newがイテレータとして呼ばれた時は
-	  initializeもイテレータとして呼ばれるように
-
-	* signal.c (sigsegv): SEGVでbacktraceを表示するように
-
-Fri Sep 27 09:51:07 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-960927
-
-	* eval.c (error_print): 引数のないraiseでメッセージが正しく表示さ
-	  れるように．
-
-	* eval.c (rb_longjmp): mesgがnilの時RuntimeErrorを生成する．
-
-	* eval.c (f_raise): 引数がない時に対応
-
-	* eval.c (thread_mark): stack上にないデータのアドレス変換を行って
-	  いた．
-
-	* eval.c (Init_Thread): 割込みの間隔が1秒と長すぎた．
-
-Thu Sep 26 16:02:45 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_schedule): 一度ペンディングになるとフラグがクリア
-	  されていなかった．
-
-	* process.c (rb_proc_exec): system/execの引数が空文字列であった場
-	  合，例外を発生すべきだった．
-
-	* config.sub/config.guess: 新しいものに置き換え
-
-Thu Sep 26 15:41:35 1996  WATANABE Hirofumi  <watanabe@ase.ptg.sony.co.jp>
-
-	* io.c (next_argv): -i.bakをBOWとDOSに対応．
-
-Thu Sep 26 01:31:43 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (io_sysread): EOFで例外
-
-	* io.c (f_readline): EOFで例外を発生するように．getsは互換性のため
-	  nilを返すままにする
-
-	* eval.c (proc_call): lambdaからのreturnでIN_BLOCKフラグが立ったま
-	  まだった
-
-	* eval.c (PUSH_BLOCK2): threadに対応するためBlockを一度stackにコピー
-
-Wed Sep 25 11:54:11 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (method_call): Const::method()形式を使えるようにしてみた．
-	  引数括弧は省略できない．
-
-	* sample/test.rb: Process.killの存在を確かめてからテストを行う
-
-	* eval.c (eval_with_binding): 第2引数としてbinding(またはlambda)を
-	  与えるとその環境でevalを実行するようにした
-
-	* eval.c (f_binding): 現在のbindingを返す関数
-
-	* eval.c: block構造体にthe_classを保存するメンバを追加
-
-	* process.c (Init_process): kill,wait,waitpidをProcessに移動
-
-Tue Sep 24 02:44:43 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el: いろいろ問題が多いので以前の高速化は破棄．
-	  別のアプローチを使った．
-
-	* lib/tk.rb (Tk.pack): 複数のウィンドウを受け付けるpack
-
-Sat Sep 21 11:08:09 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (exprs): 空文も受け付けるように文法を変更．今までは改行
-	  の連続だけが許されていた．
-
-Fri Sep 20 11:39:18 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* Failの大半を名前つき例外に変更．
-
-	* re.c (Init_Regexp): 名前つき例外を導入．
-
-	* eval.c (f_missing): Objectはinspectしない．
-
-	* object.c (inspect_i): Object#inspectでloopに対応．
-
-	* regex.c (re_search): /^$/が""にマッチしなかった．
-
-Thu Sep 19 19:25:12 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* regex.c (re_search): /^$/が非空行にマッチしていた．
-
-Tue Sep 17 10:28:11 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-960917
-
-Mon Sep 16 10:47:56 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-calculate-indent): 演算子継続の場合の
-	  文字列の判定のバグ
-
-	* sample/ruby-mode.el (ruby-calculate-indent): elseなどの次の行の
-	  インデント計算を正しく．
-
-Sat Sep 14 08:37:19 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.2-960914
-
-Fri Sep 13 08:06:03 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/socket/socket.c (tcpaddr): port番号にntohsをつけ忘れ
-
-	* dln.c (link_undef): テーブルの種類が間違っていた．
-
-	* bignum.c (bigadd): 引き算が発生する時に計算違いが起きていた．
-
-	* parse.y (iter_do_block): do..endでもdynamic variableを．
-
-	* bignum.c (big_pow): より正確な計算を(整数同士ではfloatに変換しな
-	  い)．
-
-Thu Sep 12 13:11:55 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* variable.c (rb_set_class_path): Stringクラスが初期化される前に
-	  Stringを作っていた．組込みクラスにはpathはいらない
-
-	* parse.y (yylex): 0.1が0になっていた
-
-	* parse.y (yylex): 行番号の不整合
-
-	* gc.c (oblist_live_obj): 今「生きている」全部のオブジェクトを返す
-	  イテレータ．そのクラス(またはサブクラス)の全部のインスタンスを返
-	  すeach_object_ofも定義した．
-
-	* class.c (rb_define_class_id): 無駄なクラスを割り当てていた．結果
-	  として未初期化のクラスオブジェクトが存在していた．
-
-Wed Sep 11 00:56:23 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (yylex): octalの定数の検出をより正確に(090はエラーとか)．
-
-	* bignum.c (big_minus): yがxより大きい場合にエラー．
-
-	* parse.y (yylex): エラー行番号の表示をより正確に
-
-	* sample/ruby-mode.el (ruby-expr-beg): 変数名が1文字の時誤動作して
-	  いた．
-
-	* sample/ruby-mode.el (ruby-calculate-indent): ?/でループに落ちい
-	  たバグを修正．
-
-	* enum.c (enum_min,enum_max): sortのようにイテレータとしても動作す
-	  るように．
-
-	* enum.c (enum_find_all): typo
-
-Tue Sep 10 12:07:12 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* node.h (nd_line): NODEのlineをflagsに押し込めてオブジェクトサイ
-	  ズを小さくした．制限:32bit intのマシンの場合，ファイルの行数が
-	  32767を越えると正常に表示されない．
-
-	* st.c: hashとcompareの関数メンバを構造体にパック，クラス的な使い
-	  方を行う．1 tableあたり4 byteの節約．
-
-Mon Sep  9 16:35:54 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_truncate): 提供されない時には特別な例外を発生するよ
-	  うに．
-
-	* eval.c (Init_Proc): 不適切な位置のlocal-jumpを例外に．
-
-Sat Sep  7 17:06:15 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (proc_call): まだスコープがスタック上にある時には局所脱出
-	  を有効にする．これで，procを生成してcallすることは，スコープを脱
-	  出しない限り，yieldと同じ意味を持つことになる．
-
-Fri Sep  6 13:30:59 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-indent-to): インデントが変わらない時に
-	  はバッファを変更しない．
-	  (ruby-calculate-indent): まず文字列の内部か判断してから，前の行
-	  からパーズを行う．defunが大きくなった時の高速化．
-	  (ruby-in-string-p): 文字列の内部かどうかを判断する関数(以前の
-	  parseから分離)
-	  (ruby-parse-region): 文字列に対する処理をはずす．
-	  (ruby-beginning-of-block): ブロックの先頭に
-	  (ruby-end-of-block): ブロックの末尾に(遅い…)
-
-Thu Sep  5 14:23:07 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_s_split): [dirname,basename]にsplitする．
-
-	* eval.c (rb_eval): evalの中でも定数の値が正しくなるように．これで
-	  定数に関しては静的なスコープが保証されるようになった．
-
-	* st.c (rehash): ハッシュ拡大の系数を2から1.79に．割算がより良い値
-	  を返すように．
-
-Thu Sep  5 00:32:07 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (class_superclass) クラスのスーパークラスを返すメソッド．
-
-Wed Sep  4 16:54:56 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* random.c (f_rand): Bignumやlongの範囲を越えるFloatに対する乱数も
-	  発生できるように．
-
-	* struct.c (struct_alloc): Fatalではなく例外を発生させるように(通
-	  常の使用で発生しうる)．
-
-	* struct.c (struct_s_members): Structの特異メソッドではなく，生成
-	  されたStructクラスの特異メソッドにした．
-
-	* st.c (st_init_table): ruby専用にパラメタを固定にした(サイ
-	  ズが減った)
-
-Mon Sep  2 11:37:59 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* array.c (ary_shift): capaがあまりにも大きい時には領域をREALLOC
-	(ary_pop): 同上
-
-	* string.c (str_inspect): multibyte character 対応にミス．
-	(str_inspect): unsigned charにしないと符号展開されてしまう
-
-	* parse.y (primary): `::'をprimaryに移動 Foo::Bar.Bazがエラーにな
-	  らないように．
-
-	* parse.y (primary): オペレータ形式の特異メソッドが定義できない
-
-	* random.c (f_rand): maxが0の時に対応
-
-	* io.c (io_printf): 関数を定義していたがインタプリタに登録していな
-	  かった．
-
-	* file.c (file_s_basename): 第2引数が無い時にエラー．
-
-Thu Aug 29 10:49:40 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (expr): イテレータの新形式に「method do .. end」形式を採
-	  用した．もちろん昔の形式も有効．
-
-	* sample/ruby-mode.el (ruby-calculate-indent): endの数の方が多い場
-	  合にもエラーを起こさないように．
-
-Wed Aug 28 09:41:36 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* numeric.c (upto,downto,step,times): 対象がfixnumの範囲を越えても
-	  動作するように．
-
-Mon Aug 26 10:04:37 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* missing/setenv.c (envix): typo(missing `== 0' for memcmp)
-
-	* dir.c (dir_foreach): foreach(dir open -> read loop -> closeまで)
-
-	* io.c (io_foreach): foreach(file open -> read loop -> closeまで)
-
-	* Fatalのうち捕捉可能ないくつかを例外に．
-
-Sat Aug 24 23:56:37 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* bignum.c (bigdivmod): FIX2INT -> INT2FIX 大間違い
-
-Fri Aug 23 18:13:03 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* regex.c (re_free_registers): allocateしていない時には当然 free
-	  してはいけない．
-
-Thu Aug 22 01:20:35 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_create): 外側から強制終了させられたthreadは
-	  cleanupする必要が無い．
-
-Wed Aug 21 09:57:28 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_create): threadを終了させた大域脱出の情報を
-	  main_threadに渡すように．
-
-	* parse.y (call_args): 最終引数に括弧を省略したメソッド呼出しを置
-	  けるように(例: print foo bar, baz == print(foo(bar,baz)))
-
-Tue Aug 20 13:37:16 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (masign): 多重代入とrest引数の動作を合わせて空の配列を代
-	  入するように．
-
-	* parse.y (arg): defined?の強度をもうちょっと強く
-
-	* eval.c (error_print): -wで例外名も表示するように
-
-	* eval.c (rb_eval): 新構文に対応
-	(handle_rescue): 捕捉する例外を kind_of? で同定
-
-	* parse.y (primary): rescueの構文を変更(同定引数の追加，複数rescue)
-
-	* Fail()のかなりを適当な例外を使うように
-
-	* eval.c (thread_interrupt): Interrupt(今はnon-local jump)は
-	  main-threadに送られるように．
-
-	* eval.c (rb_longjmp): $! の内容を文字列から例外クラスに変更
-	(rb_raise): rb_fail から名称変更
-	(rb_interrupt): 例外化
-	(rb_exit): 例外化
-
-	* error.c (Init_Exception): 例外クラスの新設(文字列のサブクラス)
-
-Mon Aug 19 19:40:52 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* signal.c (trap): 古いハンドラを返すように．
-
-Wed Aug 14 00:07:18 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_trap_eval): ハンドラのためにthreadをforkすることを止
-	  めた．
-
-	* eval.c (thread_mark): thread毎の $!, $@ をマークし忘れ
-
-	* ext/dbm/dbm.c (fdbm_delete): イテレータとして呼ばれた場合，要素
-	  が無ければブロックを評価する．
-
-	* hash.c (hash_delete): イテレータとして呼ばれた場合，要素が無けれ
-	  ばブロックを評価する．
-
-	* array.c (ary_delete): イテレータとして呼ばれた場合，要素が無けれ
-	  ばブロックを評価する．
-
-	* eval.c (rb_interrupt): SIGINTのデフォルトをexitから特別な大域脱
-	  出に．やはり割り込まれた位置の表示が無いのは寂しいので．
-
-Tue Aug 13 01:34:00 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_exit): sub-thread内でのexitもstatusを保存するように
-	(thread_create): 自thread内のexitに対応
-
-	* signal.c (sighandle): SIGINTのデフォルトハンドラはexitするように
-	  (以前は例外を発生していた)．
-
-	* 例外の一部をFatalに．
-
-	* string.c (str_aset): 文字列の置換の対象が部分文字列でなかった時，
-	  例外を発生させないように
-
-	* eval.c (proc_call): Procの中からbreak/nextは通し，他のものは通さ
-	  ないように
-
-Mon Aug 12 14:15:09 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (krn_type): 文字列を返す
-
-	* eval.c (thread_create): sub-thread内でのexitに対応
-
-	* numeric.c (fix_type): 文字列を返す
-
-	* io.c (f_p): デバッグ用データ表示メソッド
-
-	* eval.c (f_missing): nil/TRUE/FALSEを特別扱い
-
-	* string.c (str_inspect): 長い文字列を短縮表示．inspectの働きを
-	  human readable stringの生成に統一(re-generatable string は正式に
-	  無くなった)．
-
-Sat Aug 10 16:54:21 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (Init_Object): kernel/nil/false/trueのクラス名を変更(小
-	  文字に)，rubyスクリプトからアクセスできないように．
-
-	* eval.c (rb_eval): CONSTANTのアクセス先を単純化．crefを使わない．
-
-	* eval.c (f_eval): 特異メソッド内でも定数の値が正しくなるように
-
-Fri Aug  9 12:23:17 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* array.c (ary_concat): append -> concat Stringに合わせた
-
-	* parse.y (yylex): `$;'が使えなかった．
-
-	* array.c (ary_push_method): 複数引数を受け付けるように．
-	(ary_unshift): 複数引数を受け付けるように．
-
-	* io.c (io_popen): IO.popenでcommand pipeが開けるように．
-
-	* object.c (Init_Object): KernelとNilをruby scriptからアクセスでき
-	  ないように．
-
-Thu Aug  8 01:21:47 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (f_integer): 整数への変換関数
-	(f_float): 実数への変換関数
-	(f_string): 文字列への変換関数
-	(f_array): 配列への変換関数
-
-	* bignum.c (big_to_i): FIXNUMの範囲でない時はBignumのまま返すよう
-	  に変更．
-
-Wed Aug  7 09:28:38 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99.1-960807
-
-	* parse.y (mlhs): 「*foo = 1,2,3」タイプの多重代入も可能に．
-
-	* object.c (Init_Object): クラスTrue/Falseをruby scriptからアクセ
-	  スできないように．
-
-	* object.c (nil_inspect): inspect表現は"nil"に
-
-	* io.c (io_print): nilのprintをnilに．
-
-	* object.c (nil_to_s): nilの文字列表現を""に．
-
-Tue Aug  6 01:12:32 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* dir.c (dir_s_open): file descripterが足りない時にはgcしてからも
-	  う一度openしてみる．
-
-	* io.c (rb_fopen): すべてのfopen()についてfile descripterが足りな
-	  い時にはgcしてからもう一度openしてみる．
-
-	* ext/socket/socket.c (Init_socket): 定数の追加．
-
-	* sample/ruby-mode.el (ruby-indent-to): インデント後のカーソル位置
-	  の調整を正しく．
-
-	* gc.c (gc): 割込みチェックを行わない(Cコードの中で安心して
-	  malloc()が使えなくなるので)．
-
-	* st.c (call_hash_func): signalとthreadによる割込みに対応．
-
-	* sig.h (DEFER_INTS): 割込み禁止区間の指定
-
-	* eval.c (f_require): threadによるrequireの競合に対応(最初の
-	  requireが終了するまで他のthreadは待つ)．
-
-	* bignum.c (str2inum): 0x80000000の値が負になっていた
-
-	* sprintf.c (f_sprintf): 文字列末尾，行末の単独の`%'に対応
-
-	* bignum.c (big_cmp): 比較の結果が逆になる時があった．
-
-Mon Aug  5 10:58:13 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* process.c (proc_exec_v): 例外のメッセージを分かりやすく．
-
-	* ext/dbm/dbm.c (fdbm_store): nilを格納すると要素の削除になる
-
-	* ext/dbm/dbm.c: サイズをキャッシュ．
-
-Sat Aug  3 01:52:52 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_fail): `fail'が引数無しで呼ばれた時だけ以前の`$@'を保
-	  存するように．
-
-	* eval.c (f_fail): frameの調整
-
-Fri Aug  2 11:26:21 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/socket/socket.c (bsock_setopt): valとしてTRUE/FALSE/Fixnumも
-	  受け付けるように．
-
-	* ext/socket/socket.c (Init_socket): SO_REUSEADDR等の定数の追加
-
-	* ext/md5/md5init.c: md5モジュール(初の複数ファイルからなるモジュー
-	  ルでもある)
-
-	* ruby.h (Make_Data_Struct): Data: objectのinstance変数に格納 ->
-	  Data型のObjectに(Dir,Time,Proc,Thread,DBM)
-
-Thu Aug  1 11:38:44 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/dbm/dbm.c (fdbm_store): valueが文字で無い時に対応
-
-Wed Jul 31 10:53:42 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/socket/socket.c (open_inet): htonsが必要であった
-	(tcpaddr): ntohlで変換した
-
-	* process.c (rb_proc_exec): execvp -> execv
-
-Tue Jul 30 17:48:33 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c: `$?'をthread localに
-
-	* Makefile.in (install): install時にstripを行う
-
-	* configure.in: install時のstripの検出
-
-	* configure.in: NEXTSTEP対応
-
-	* version 0.99.1-960730
-
-Tue Jul 30 16:40:35 1996  SHIROYAMA Takayuki  <psi@fortune.nest.or.jp>
-
-	* dln.c (dln_load): NeXT dln(mach-o)対応．configureは未対応
-
-Tue Jul 30 09:46:51 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* process.c (f_system): 複数引数もとれるように
-
-	* process.c (f_exec): 複数引数もとれるように
-
-	* array.c (ary_append): 配列(またはEnum)の要素を破壊的に追加
-
-	* array.c (ary_plus): Enumはその要素を追加
-
-	* file.c (file_s_open): File.openを追加
-
-	* struct.c (struct_new): FIX2INTを忘れていた
-
-	* file.c (Init_File): exists? -> exist?
-
-	* object.c (obj_is_kind_of): is_kind_of? -> kind_of?, is_a?
-
-	* object.c (obj_is_instance_of): is_instance_of? -> instance_of?
-
-Mon Jul 29 16:40:02 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (parse_regx): 式展開を行った場合，casefoldの設定ができて
-	  いなかった．
-
-	* object.c (true_type): TRUE/FALSEにtypeを実装．
-
-	* parse.y (read_escape): 3文字以内のoctalに対応(\0とか)
-
-Fri Jul 26 00:31:45 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* array.c (ary_reverse_bang): in-placeで配列を反転させる
-	(ary_sort_bang): in-placeでsortする
-	(ary_sort): sortした配列を返すように
-	(ary_delete_at): 指定した位置の要素を削除する
-
-	* eval.c (rb_call): stack深さチェックを毎回は行わないように
-
-	* error.c (Warning): 実行中のwarningが表示されていなかった
-
-	* eval.c (compile): 例外発生を分離．
-
-	* eval.c (f_eval): 変数rb_in_evalを正しく管理するように
-
-	* ext/dbm/dbm.c (fdbm_store): 格納するkeyを文字列に変換
-
-	* eval.c (rb_call): 無限再帰のチェックを大域脱出を行うC methodにも
-	  対応させた．threadのstack深さチェックルーチンを流用．
-
-	* parse.y (yylex): 第1引数のunary -/+の判定が間違っていた．
-
-	* parse.y (yylex): unary +で数字を余計に読んでいた(ex. +5 -> 55)
-
-Thu Jul 25 12:15:04 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (yylex): 曖昧でない引数に対して警告を出していた．
-
-	* eval.c (iterator_p): 引数で呼んでも正しい結果を返すように．
-
-	* parse.y: break/next/redo/retryのメソッド化．
-
-	* sample/ruby-mode.el (ruby-calculate-indent): nestのチェックミス
-
-	* sample/ruby-mode.el (ruby-parse-region): 予約語のチェックを強化
-
-	* parse.y (primary): unless/untilの復活
-
-Tue Jul 23 18:50:10 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* array.c (Array#empty?), Hash.c (Hash#empty?), ext/dbm/dbm.c (DBM#empty?):
-	  空の判定述語
-
-	* eval.c (f_unless): ifの逆をするイテレータ
-
-	* eval.c (f_until): whileの逆をするイテレータ
-
-	* parse.y: notの優先順位をand/orより高く
-
-	* parse.y (expr): `!'を引数括弧を省略したcallでも有効に
-
-Mon Jul 22 10:15:38 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960722
-
-	* array.c (ary_print_on): OFSのNILチェックが不完全
-
-	* ruby.c  (load_file): 標準入力からのスクリプトが空の時に対応．
-
-	* ruby.c (proc_options): -wでは引数無しの時には標準入力からスクリ
-	  プトをとる(-vではたんに終了する)．
-
-	* array.c (ary_compact): nilの要素を取り除くメソッド
-
-	* array.c (ary_nitems): nilでない要素を数えるメソッド
-
-Sun Jul 20 00:51:53 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c (proc_options): -w optionを追加
-
-	* parse.y: {}が閉じていない時には展開しない文字列を
-
-Fri Jul 19 16:16:05 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960719
-
-	* lib/find.rb: 石塚版(pruneの拡張付き)
-
-	* file.c (test_l): lstatで調べないとね．
-
-	* eval.c (f_throw): 第2引数を省略可能に．
-
-	* parse.y (str_extend): {}のネストに対応
-
-Thu Jul 18 18:25:46 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960718
-
-	* parse.y (str_extend): 文字列中の式展開に \" ' ` / を含む事ができ
-	  るように．
-
-Tue Jul 16 15:55:31 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-parse-region): 正規表現内のエスケープ
-	  に対応
-
-	* version 0.99-960716
-
-Fri Jul 12 10:06:19 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (f_select): 引数のclose check.
-
-	* ruby.c (load_file): #!行の引数チェックを第1引数に限定(実をいうと
-	  DOS改行対策)
-
-Wed Jul 10 17:18:35 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960710
-
-	* time.c (time_s_timegm/time_s_timelocal): 時間を生成するメソッド
-
-Mon Jun 17 15:59:20 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960617
-
-	* parse.y (yyerror): エラー表示の簡略化．
-
-Wed Jun 12 14:11:01 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* signal.c (rb_trap_exit): trap 0はthreadを生成せずに処理する．
-
-Fri Jun  7 10:17:01 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* array.c/hash.c (indexes): 配列1引数のパターンを無くした．配列の
-	  場合は`*ary'を使ってもらおう．
-
-	* eval.c (thread_wait_threads): main_threadが終了する前に他の
-	  threadを待つ(強制的には終了させない)．
-	  (ruby_run): 他のthreadを待っている間にシグナルが来たら，全thread
-	  を強制終了させる．
-
-	* eval.c (rb_fail): メソッド名を`$!'に埋め込む．
-
-	* eval.c (thread_create): main_threadのコンテクストがセーブされな
-	  い場合があった．
-
-	* process.c (f_sleep): 時間を指定せず，threadがひとつしかない状況
-	  にも対応．
-
-	* eval.c (thread_create): create後，fnを呼び出す前にcontext switch
-	  が起きると違うcontextでfnが実行されてしまうバグ．
-
-Mon Jun  3 08:03:17 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* struct.c (struct_s_def): メンバの指定を文字列，シンボル(FIXNUM)
-	  双方で可能にした．
-
-	* ext/etc/etc.c (Init_etc): 構造体オブジェクトをGCから保護した．
-
-	* error.c (rb_sys_fail): nil/FALSEを引数として受け付けるように．
-
-Thu May 30 16:19:08 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_select): EINTRに対応．
-
-Wed May 29 11:04:51 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (f_catch): catch/throwを実装した．
-
-Tue May 28 13:30:52 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960528
-
-	* eval.c (thread_cleanup): main threadが終了すると他のthreadも終了
-	  することの明確化．
-
-	* signal.c (trap): SIGINTのデフォルトの設定ミス(本当にSIG_DFLでは
-	  まずかった)．rubyではちゃんとハンドルしないと．
-
-	* eval.c (thread_interrupt): SIGINTはmain_threadに例外を発生させる
-	  ように．
-
-Mon May 27 15:13:31 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_status): threadの状態を返すメソッド．threadの終了
-	  を待たない．
-
-	* eval.c (thread_value): 一種のpromiseを実装するためのメソッド．
-
-	* eval.c (thread_join): 待っているthreadが例外を起こした時には，
-	  joinがその例外を発生するように．
-
-	* eval.c (thread_create): threadでの例外をpropagateしないように．
-
-Fri May 24 10:47:53 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* enum.c (Init_Enumerable): `size' as alias to the `length'
-
-	* eval.c (thread_save_context): `$@', `$!'をスレッド毎にセーブ．
-
-	* eval.c (superclass): エラー表示をより親切に．
-
-Thu May 23 10:38:41 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.99-960523
-
-	* eval.c (superclass): エラー時にスーパークラス名を(分かれば)表示
-	  するように．
-
-Wed May 22 19:48:42 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (superclass): スーパークラスの指定子を`:'から`<'に変更．
-
-Tue May 21 09:27:59 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/thread.rb: threadをサポートするクラス(Mutex, Queue)．
-
-Mon May 20 09:39:49 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* time.c (time_cmp): 浮動小数点数も扱えるように．
-	(time_minus): Time - Timeが浮動小数点数を返すように．
-
-Fri May 17 15:40:10 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* process.c (rb_proc_exec): Thread対応時にexecの直前に
-	  ITIMER_VIRTUALをリセットする．
-
-Tue May 14 02:12:44 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* signal.c (sighandle): SIGINTに対してデフォルトで例外を発生させる
-	  のをやめ，status 130でexitするようにした．
-
-	* eval.c (thread_schedule): Threadのバグはほとんどとれたようだ．
-
-Fri May 10 11:21:08 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (thread_schedule): ユーザレベルThread機能．効率はともかく
-	  移植性はある．今後，thread間の通信機能を実装する予定．
-
-Thu May  2 21:22:31 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* time.c (time_timeval): struct timevalを直接返すように(static変数
-	  を使わない)．
-
-Wed May  1 17:27:32 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* process.c (f_sleep): 整数以外のtimeを指定できるように．
-
-Thu Apr 25 08:19:15 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (file_s_dirname): ファイル名が"/"を含まない時，"."を返す
-	  ように(GNU dirnameの仕様)．
-
-	* file.c (file_s_basename): まだnilと0を混同しているソースが残って
-	  いた．
-
-	* parse.y (exprs): エラーリカバリを追加．
-
-Wed Apr 24 15:51:05 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_chop_bang): CRLFの場合2 bytesをchop!するように．
-
-	* ext/socket/socket.c (tcp_svr_s_open): まだnilと0を混同しているソー
-	  スが残っていた．
-
-Tue Apr 23 18:14:25 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* pack.c (pack_pack): "A/a"のバグ．余計なpaddingが入っていた．
-
-Thu Apr 18 13:02:11 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* configure.in: アーキテクチャ依存部を別ディレクトリにインストール
-	  するように．
-
-	* parse.y (yyerror): エラー発生時にエラー行とその位置を表示するよ
-	  うに．
-
-Wed Apr 17 14:22:42 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* defines.h: SAFE_SIGHANDLEを無くし，危険な選択はできないように．
-
-	* io.c (io_ungetc): 新機能．
-
-	* ruby.c (load_file): ファイルからの読み込み方式が変わったのに対応．
-
-	* parse.y (compile_file): ファイルからの入力を一度全部読み込むのを
-	  止めて，getsを使うことにした．
-
-Wed Apr 10 17:40:11 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.98
-
-Tue Apr  9 09:54:30 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (iter_block): イテレータブロックの指定をメソッド呼び出し
-	  に限定．文法の明確化．
-
-	* eval.c (rb_eval): 条件式の正規表現の比較をinline化．
-
-	* eval.c (rb_eval): defined? の 定義情報(種別)を文字列で返す．
-
-	* node.h: NODE_BEGIN -> NODE_RESCUE, NODE_ENSUREに分離．
-
-	* eval.c (rb_eval): option -n/-pのトップレベルループのinline展開．
-
-	* parse.y (cond0): 条件式中の文字列は比較の対象としない
-
-Wed Mar 27 12:33:54 1996  Tairo Nomura  <tairo@hucom.tp.titech.ac.jp>
-
-	* defines.h: NeXT対応
-
-Wed Mar 27 10:02:44 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y: 予約語の変更 continue -> next
-
-Mon Mar 25 07:34:37 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (parse_regx): o(once)オプションを追加．
-
-Fri Mar 22 14:25:35 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.97d
-
-	* eval.c (dyna_var_defined): 動的ローカル変数の定義チェック用ルー
-	  チン．
-
-	* parse.y (gettable): eval()の中での動的ローカル変数(既に値を持っ
-	  ているもの)の検出に失敗していた．
-
-Tue Mar 19 10:46:47 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.97c
-
-	* re.c (reg_s_new): compile時にsegmentation fault．
-
-	* parse.y (str_extend): いつもevalするように．
-
-Wed Mar 13 11:00:42 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (str_extend): 文字列中の式展開の不備を無くした．
-
-	* parse.y: 下手なエラーリカバリを外した．
-
-Tue Mar 12 12:30:20 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rescue): 間違ってensureでも例外を捕捉していた．
-
-Wed Mar  6 12:11:03 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (var_extend): 変数展開"#{}"で，任意の式を書けるようにし
-	  た，これで「変数」展開では無くなっちゃったなあ．
-
-	* regex.c (init_syntax_once): `_'をwordに追加．
-
-	* regex.c (re_compile_pattern): `\w',`\W'の判定をsyntax tableを使
-	  うように．
-
-Tue Feb 27 10:15:32 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (obj_inspect): 表示するインスタンス変数が無い時には，
-	  to_sを使う．
-
-	* configure.in: dlnの検出を自動的に．
-
-Mon Feb 26 19:55:33 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c (readin): read(2)で一度にファイルが読み込めない場合に対応．
-
-Sat Feb 24 14:47:18 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.97b
-
-Fri Feb 23 11:26:02 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* class.c (rb_define_module): C言語で定義されたモジュールのPATHの
-	  設定忘れ．文字列化でcore dump．
-
-	* eval.c (mod_include): 戻り値をnilに．
-
-	* version 0.97a
-
-Thu Feb 22 21:03:42 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* array.c (ary_times): 「配列*文字列」がjoinと同じ働きをするように．
-
-Wed Feb 21 11:18:09 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* configure.in : fileCountをcache．
-
-	* configure.in : LinuxでELF環境を自動的に検出できるよう．
-
-Tue Feb 20 11:18:09 1996  Mitsuhide Satou  <mit-sato@aries.bekkoame.or.jp>
-
-	* FreeBSD dynamic link対応．
-
-Fri Feb 16 08:50:01 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (obj_inspect): インスタンス変数を持たないオブジェクトも
-	  正しく表示されるように．
-
-Wed Feb 14 16:56:44 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): 条件式の`2..2'など左辺成立直後に右辺が成立する
-	  パターンにバグ．
-
-Tue Feb 13 18:22:22 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.97
-
-Fri Feb  9 21:32:55 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/tkscrollbox.rb: スクロールでtclの設定を行い，ruby<->wishの不
-	  要な通信を無くした．
-
-Wed Feb  7 10:26:52 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_aref): indexをunsigned intでとっていた．
-
-	* string.c (str_aref): 範囲外のindexに対してnilを返す．
-
-	* parse.y (special_local_set): `$_'が宣言無しに使われた場合に対応．
-	  関数をvariable.cから移動．
-
-	* string.c (str_sub): 置換開始位置が間違っていた．
-
-Tue Feb  6 16:17:31 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-parse-region): コメントの読み飛ばしの
-	  バグ．
-
-Fri Feb  2 18:35:28 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* variable.c (lastline_get): `$_'を`$~'と同じようにSCOPEローカルな
-	  変数にした．
-
-Thu Feb  1 14:14:07 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c: statのcacheをやめた．
-
-Wed Jan 31 07:13:08 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (proc_s_new): procの中でyieldを呼ばれた時にcore dumpして
-	  いた．とりあえず例外を発生させる．
-
-	* variable.c (rb_class2path): singleton classに対応．
-
-	* ext/etc/etc.c (Init_etc): struct_defineのターミネータがnilだった
-	  (0でなければならない)．
-
-	* ext/marshal/marshal.c: TRUE/FALSEを吐き出せるように．
-
-	* eval.c (rb_get_method_body): キャッシュのalias対応，いままでは
-	  aliasはキャッシュに入っていなかった．
-
-Tue Jan 30 09:55:13 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): NODE_BLOCK - tail recursive(というほどでもない
-	  が)．
-
-	* io.c (io_pipe): pipe(2)を実装した．
-
-	* eval.c (rb_eval): Qselfをなくした．thread対応への第一歩．先は遠
-	  いが…．
-
-	* eval.c (proc_call): procの中でのreturnはprocの終了を意味するよう
-	  に．ただし，procからのyieldの中でのreturnは例外を発生する．
-
-Wed Jan 24 11:33:48 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.96a
-
-	* dir.c (dir_each): `$_'の値を変更するのをやめた．
-
-	* io.c (f_readlines): nilとFALSEの分離のあおりで無限ループに落ちて
-	  いた．
-
-	* ruby.c (ruby_options): $0の設定ミス．
-
-Tue Jan 23 15:28:21 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): ``は文字列を引数とするメソッド(`)呼び出しのシ
-	  ンタックスシュガーであるとした．
-
-	* ruby.c (addpath): `-I'オプションでディレクトリが「前に」追加され
-	  るように変更．
-
-Fri Jan 19 11:23:12 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* dln.c (load_1): N_INDR対応(出来たような気がする)．
-
-Thu Jan 18 18:14:20 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.texi: FALSEとnilの分離を反映した．
-
-Tue Jan 16 17:39:23 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.96 - とりあえずnilとFALSEを区別する版
-
-Wed Jan 10 15:31:48 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* re.c (reg_match): マッチしなかった時の戻り値はFALSE．
-
-	* object.c (rb_equal): `0 == nil'がTRUEになるバグ．
-
-Tue Jan  9 00:44:58 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* nilとFALSEが分離可能に変更．
-
-	* nilとFALSEと0の区別を厳密に．
-
-	* struct.c (struct_new): 引数を0で終る必要が無くなった．
-
-	* object.c (inspect_i): オブジェクトのチェックのバグ(Fixnumでcore
-	  dumpしていた)．
-
-	* range.c (range_to_s): Rangeの表示を改善．
-
-	* object.c (true_inspect): TRUEの表示を`TRUE'に．
-
-Mon Jan  8 15:02:33 1996  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* numeric.c (fix_mul): divide by zero errorが発生した(オーバーフロー
-	  検出のバグ)
-
-	* texinfo.texをパッケージに含めた．
-
-Sun Dec 31 00:08:49 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): `::'では，そのクラスで定義された定数を参照する
-	  ように変更．
-
-	* string.c (Init_String): eachをeach_lineに戻した．
-
-Thu Dec 28 12:31:55 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): caseの演算子を`=~'から`==='に．
-
-	* variable.c (rb_const_set): クラス定数の再定義を許す(同じクラスで
-	  は不可)．警告は出す．
-
-Wed Dec 27 13:27:52 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.95c
-
-	* ext/tkutil/tkutil.c: wishがあってもなくても一応コンパイルだけは
-	  するように．
-
-	* lib/tk.rb: 環境変数PATHから{wish|wish4.0}を探すように．
-
-Tue Dec 26 01:03:42 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-parse-region): 正規表現の検出強化．
-
-	* numeric.c (fix_mul): 乗算のオーバーフロー検出アルゴリズムのバグ．
-
-	* ext/extmk.rb.in: ./install-shを使う場合のPATHを調整．
-
-	* Makefile.in (install): lib/*.rbを一つずつインストール．
-
-	* io.c (io_each_line): イテレータの戻り値をnilで統一．
-
-Fri Dec 22 10:34:32 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.95b
-
-	* variable.c (f_untrace_var): 第2引数を指定すると特定のtraceを削除
-	  できるように．
-
-	* variable.c (f_trace_var): 第2引数がnilの時，traceを削除する．
-
-	* lib/tk.rb (file_readable/file_writable): 第2引数をnilにすること
-	  によるevent handlerの削除．
-
-	* parse.y (variable): ドキュメントに`__FILE__'と`__LINE__'が残って
-	  いた．`caller(0)'で代用したはずだったのに．
-
-	* eval.c (f_eval): $!のリセット．
-
-	* error.c (err_sprintf): 勝手に"\n"を付加するのを止めた．
-
-	* parse.y (f_arglist): 引数リスト直後のif/whileの読み間違い．
-	  lex_stateの値が設定されていなかった．
-
-Thu Dec 21 00:56:57 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.95a - ^^;;;
-
-	* lib/tkscrollbox.rb: パッケージに入ってなかった．
-
-	* configure.in: FILE structureのチェックにバグ．
-
-	* Makefile.in (clean): ext以下をinstallしていた．
-
-	* ext/socket/extconf.rb: Solarisにおける-lnlsのチェック．
-
-	* array.c (beg_len): バグがあった…．悲しい．
-
-	* version 0.95 - fj.sourcesに
-
-	* eval.c (rb_eval): rescueのロジックをrb_rescue()に一元化．
-
-Wed Dec 20 19:30:58 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* Makefile.in: 不要なコンパイルの回避(より完全に)．
-
-	* class.c (singleton_class_new): `single'->`singleton'
-
-Tue Dec 19 07:14:33 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* io.c (closed?): IOがcloseされているかどうかを知る述語．
-
-	* parse.y (primary): 特異メソッドの引数のlex_stateが不適切．
-
-	* lib/tk.rb: tcl->rubyの変換関数の用意．
-
-	* ext/extmk.rb.in (install): installの2重コンパイルの回避．
-
-	* array.c (range_beg_len): range指定の不適切なエラーを訂正．
-
-	* string.c (str_aref): range指定のバグを削除．
-
-	* lib/tk.rb (tk_split_list): Tclのリストに対応．
-
-Mon Dec 18 09:58:12 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.94
-
-	* dln.c (dln_load): HP対応(未確認)
-
-	* eval.c (Init_Proc): BlockをProcに改名．
-
-Sat Dec 16 13:46:14 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): retryでイテレータの再実行ができるように．
-
-Fri Dec 15 17:14:30 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c: proc:lambdaの親しみやすい別名
-
-Thu Dec 14 17:21:55 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (dyna_var_asgn): イテレータブロック内で最初に初期化された
-	  ローカル変数の有効範囲をそのブロック内に限定．これでlambdaと呼べ
-	  ないことはない．
-
-Wed Dec 13 02:30:58 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gc.c: autoloadのマークミス．
-
-	* lib/tk.rb: wishからの複数行の戻り値に対応
-
-	* lib/tkcomposite.rb: 複合widget
-
-	* variable.c (rb_class2path): ICLASSに対応してなかった．
-
-	* eval.c (ruby_run): exit(0)のバグ
-
-Sat Dec  9 01:21:24 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/marshal/marshal.c (dumps|load): 文字列に対する入出力を可能に
-	  した(ただし実はファイル経由なのだ)．
-
-Fri Dec  8 18:29:11 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/marshal/marshal.c: シンボルを一度だけ初期化する．
-
-Thu Dec  7 07:58:50 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (yylex): 第1引数の正規表現の認識にエラーがあった．同時に
-	  状態数を減らした．
-
-	* string.c (str_sub): 置換でスキップ幅が大きすぎた．
-
-Wed Dec  6 15:14:23 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_sub_method): sub/gsub(!なし)は置換が行なわれなかっ
-	  た時，置換前の文字列を返す．
-
-Tue Dec  5 00:55:15 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (yylex): 括弧を省略した時の引数展開の`*'に対応．
-
-	* eval.c (ruby_run): EXITハンドラ内での例外に対応．
-
-	* bignum.c (big_cmp): BignumとFixnumの比較で落ちる．
-
-Mon Dec  4 14:21:18 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (call_op): コンパイル時の定数式の展開をやめた．労多くし
-	  て益少ないと判断したので．
-
-Thu Nov 30 01:35:15 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/tk.rb: {Radio,Check}Buttonのvariableの実装．
-
-	* eval.c (rb_yield_0): Block.callがネストした時のバグ．
-
-	* io.c (f_select): 常に配列3つをふくむ配列を返すように
-
-	* lib/tk.rb: fileeventをruby側で実装．
-
-Wed Nov 29 17:53:23 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* variable.c (rb_ivar_get): selfを常に指定するように．
-
-Tue Nov 14 00:07:29 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/tk.rb: Tk4.0対応
-
-Mon Nov 13 16:23:32 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.93
-
-Thu Nov  9 23:26:01 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gc.c (gc_mark): モジュールのMixinのマーク忘れ．
-
-	* parse.y (f_arglist): メソッド定義の引数を括弧で括らなくても良い
-	  ようにした．
-
-Wed Nov  8 00:17:51 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_yield_0): 未初期化のローカル変数があった．
-
-	* eval.c (rb_eval): pendig signalのチェックをeval実行後に行うよう
-	  にした．でないとシグナルの発生と検出が遠く離れてしまう事がある．
-
-	* parse.y: class文のsuperclass部を定数から式に拡張した．
-
-	* lib/tk.rb: Tkのほぼ全ウィンドウクラスに対応．キャンバスとテキス
-	  ト上のオブジェクトが残っている．
-
-Tue Nov  7 08:18:37 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* signal.c (trap): ブロックを指定できるように．
-
-Mon Nov  6 16:44:00 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (f_caller): 呼出元の情報を得る．
-
-	* ext/tkutil/tkutil.c: wishのstderr出力を監視することで，エラー処
-	  理を行う．
-
-	* ext/tkutil/tkutil.c: wishとの通信部をCで記述．
-
-Sat Nov  4 01:12:59 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el (ruby-calculate-indent): インデントの計算を
-	  もう少しスマートにした(正規表現のチェック，継続行のチェック)．
-
-	* eval.c (rb_call): 無限再帰を避けるため，関数のネストレベルの制限
-	  を行なう．
-
-	* lib/tk.rb: Tkインターフェース．まだ不完全だが．
-
-	* eval.c (rb_yield_0): 空のBlockのバグ．
-
-	* sample/ruby-mode.el (ruby-calculate-indent): 行末の演算子による
-	  行継続に対応．
-
-Fri Nov  3 12:56:21 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_call): 本体が空の関数の実行にバグ．
-
-	* parse.y (var_extend): 文字列の末尾の変数展開のバグ．
-
-	* variable.c (rb_gvar_set): traceの評価時にに変数値を与えるように．
-
-	* eval.c (f_require): ruby scriptのrequireにbug．
-
-	* variable.c (rb_const_get): モジュールのinclude対策．
-
-Thu Oct 19 13:56:06 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* dln.c (dln_load): HP対応でのtypo.
-
-Wed Oct 18 17:39:39 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.92
-
-	* object.c (krn_type): オブジェクトの動的な型を返すメソッド．
-
-Tue Oct 17 00:48:18 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.c (proc_options): -X オプション．chdirだけを行う．
-
-	* re.c (reg_search): 漢字コードを途中で変更できるように．コンパイ
-	  ル時のコードが変更された時にはマッチの直前に正規表現の再コンパイ
-	  ルを行う．定数KCODEから変数$KCODEへ．
-
-	* parse.y: ()のなかにcompexprを許す．
-
-	* re.c (reg_search): メモリリークを直した．
-
-Fri Oct 13 13:19:19 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (str_sub): 文字列置換にバグ．
-
-	* string.c (str_strip_bang): 文字列の後ろの長さの調整が行われてい
-	  なかった．
-
-	* re.c (reg_search): $&, $1...はローカルに束縛するようになった．呼
-	  び出したメソッドでのマッチは現スコープの$&などの値に影響しない．
-	  マッチの情報をスコープ外で得たいときには$~を使って束縛情報を持ち
-	  出す必要がある．
-
-Thu Oct 12 00:33:33 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* re.c (reg_search): String:split, String:indexでは$&, $1...が変化
-	  しないようにした．
-
-	* io.c (rb_str_setter): setterの仕様が変更になっていた．
-
-	* variable.c (f_trace_var): 第2引数を省略してイテレータとして呼べ
-	  るように．
-
-Wed Oct 11 11:50:59 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.91
-
-	* variable.c (var_setter): 引数が間違っていた．致命的バグ．
-
-	* io.c (pipe_open): $stderrの値が変更されている時にはそちらを
-	  子プロセスのstderrに設定する．
-
-Mon Oct  9 13:06:33 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (mod_to_s): モジュール内のモジュールは`::'を使った表現
-	  で表示されるように．
-
-	* variable.c (rb_gvar_set): 代入によるループが発生しないように，
-	  trace内での代入ではtraceを評価しない．
-
-	* struct.c (struct_equal): structのequal判定にクラスの一致を含めた．
-
-Sat Oct  7 00:18:32 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_eval): defined?の機能を拡張(yieldのチェック，superの
-	  存在など)．
-
-Fri Oct  6 12:06:47 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.90
-
-	* st.c (st_foreach): 要素を削除した時に要素数が変化していなかった．
-
-	* hash.c (hash_values): バグ修正．keysを返していた…．
-
-	* parse.y (call_op): defined? の引数では定数の畳み込みを行わない
-	  (チェックする前にコンパイルエラーになっては困る)．
-
-	* スコープ生成の一部見直し．
-
-Thu Oct  5 00:29:43 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* 関数とクラスの命名規則を変更した．関数名，変数名の全面書き換え．
-
-	* gc.c (looks_pointerp): ヒープチェックの高速化．
-
-	* struct.c (Fstruct_aset): 構造体に対する`[]='．
-	(struct_set): 構造体メンバに対する代入．
-
-Wed Oct  4 09:54:07 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.89
-
-	* eval.c (Frequire): ダイナミックロードのエラーチェックを厳しく．
-
-	* struct.c: structの構造を完全に書き換えた．以前は順序付きの
-	  id->valueの連想配列であったが，今度は構造体毎に新しいクラスを生
-	  成するようにした．
-
-	* parse.y: `::'の意味をAssocの生成からクラス(モジュール)内の定数ア
-	  クセスへ変更．
-
-	* assoc.c: なくす．
-
-Tue Oct  3 13:31:08 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* variable.c (Ftrace_var): trace_var, 大域変数への書き込みhookを設
-	  定する．
-
-	* variable.c: global_entryの構成を書き換えた．これでtrace_varを実
-	  装できる．
-
-	* file.c (Ffile_stat): "&"で直前のfstatの結果も参照できるように．
-
-Fri Sep 29 14:15:13 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.88
-
-	* dln.c (dln_load): AIXとHPに対応したコードを入れた(動作は未確認)．
-
-	* ext/extmk.rb.in: 必要に応じて，定数EXTLIBを定義するように．
-
-	* dln.c (dln_load): dln独立に書き換える．将来の拡張用．
-	(load_1): dln_a_outにおいてソースコードでライブラリを明示的にロー
-	ドする必要がないように変更した．
-
-Thu Sep 28 13:31:37 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/ruby-mode.el: もっとましなhilit19対応(正規表現)．
-
-Wed Sep 27 04:12:44 1995  Takahasi Mamoru  <taka@soum.co.jp>
-
-	* sample/test.rb: echoで-nを使わないように(SysV対策)．
-
-	* ext/extmk.rb.in: sub -> sub!
-
-Tue Sep 26 19:12:42 1995  Yasuo OHBA  <jammy@csg.mes.co.jp>
-
-	* dln.c (dln_find_1): `.', `..'から始まるパスに対応した.
-
-Mon Sep 25 12:33:03 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.87
-
-Sat Sep 23 10:00:18 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (Fmod_modfunc): メソッドをprivateにし，同時に特異メソッド
-	  も定義するメソッド．パッケージ的使い方のモジュール用．
-
-Fri Sep 22 11:02:44 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* lib/find.rb: findを提供するライブラリ
-
-	* variable.c (rb_define_variable): hookの設定を分離．
-	(add_hook): 1変数に対して複数のhookを設定できるように．
-
-Thu Sep 21 00:22:11 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (Fstr_frozen): 文字列が更新不可かどうかをチェックする述
-	  語メソッド．
-
-	* hash.c (Fhash_aset): keyが文字列の時，キーの内容が変化しないよう
-	  に，dupしてfreezeする．
-
-Wed Sep 20 16:12:44 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.86
-
-	* ext/extmk.rb.in (have_header): キャッシュにバグ．
-
-	* ext/extmk.rb.in (have_library): 引数の順序が変わった．
-
-Thu Sep 14 18:00:59 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* object.c (obj_is_instance_of): is_member_ofから名称変更．
-
-	Wed Sep 13 15:44:35 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (Fstr_tr_bang): 範囲外の文字に対する変換バグ．
-
-Tue Sep 12 14:27:58 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (Sfile_expand_path): expand_file_name -> expand_pathに名
-	  称変更．
-
-	* enum.c (Fenum_member): includes? -> member? に名称変更．
-
-	* string.c (Fstr_each_byte): StringはByteArrayであるという基本に戻っ
-	  て，eachの定義をeach_byteに変更した．今までのeachはeach_lineでア
-	  クセスできる．
-
-Mon Sep 11 18:31:17 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (cache_stat): ファイル名として"&"を指定すると直前の
-	  stat(2)の結果を再利用するように．
-
-Fri Sep  8 14:18:51 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ruby.texi: `!', `?'に対応してアップデート．
-
-	* parse.y: defined -> defined?
-
-	* file.c: FileOpの一文字メソッドをなくす．一文字テストはtestメソッ
-	  ドにまかせる．
-
-	* parse.y (yylex): 変数名の後ろに`?'も許す．述語メソッドの後ろに
-	  `?'を追加する．
-
-Thu Sep  7 20:01:33 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c: 文字列の中身を更新するメソッドの名前の終りに`!'を付加．
-	  `!'の無いバージョンも用意した．
-
-	* parse.y: 変数名の後ろに`!'を許す．
-
-Wed Sep  6 14:12:19 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.85
-
-	* string.c (Fstr_dup): 文字列の複製を作る
-	(Fstr_freeze): 文字列の更新不可属性を設定できるように．
-	(Fsub/Fgsub): $_の内容をdupしてから置換を行うように．
-
-	* ruby.h (CLONESETUP): flagsの状態もコピー
-
-Tue Sep  5 01:27:50 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* sample/test.rb: 失敗の検出を厳しく．
-
-Fri Aug 25 14:31:02 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* process.c (Ffork): イテレータとしても動作するように．
-
-	* version 0.84
-
-	* signal.c (sig_beg): ハンドラが設定されている時には再設定しない．
-
-	* ext/extmk.rb.in (create_makefile): shared objectのリンクの際に
-	  `-l'オプションを指定するように．
-
-	* signal.c (trap): `EXIT'で終了処理を行う設定が出来る．
-
-Wed Aug 16 00:13:22 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* signal.c (sig_beg): デフォルトではbegin節の中でだけSIGINTを捕捉
-	  するように変更．
-
-	* io.c (io_ctl): fcntlを持たないシステムにも対応．
-
-	* 各ディレクトリに分散していたMANIFESTをまとめた．拡張モジュール毎
-	  には必要．
-
-	* string.c (Sstr_new,str_sub,Fstr_crypt): 引数を自動的に文字列に変
-	  換するように．
-
-Sat Aug 12 00:44:02 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* string.c (Fstr_crypt): PD cryptを用意した．
-
-Fri Aug 11 14:37:03 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* assoc.c (Fassoc_clone): assocもcloneできるように．
-
-	* io.c: マクロREAD_DATA_PENDINGの定義を変更(Linux対応)
-
-	* io.c (io_fptr_finalize): fptrの開放時の処理を指定できるように．
-
-Wed Aug  9 16:52:41 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* eval.c (rb_provided): 複数のfeatureをロードすると無限ループに落
-	  ちるという単純な(しかし凶悪な)ミス．
-
-	* ext/extmk.rb.in (install): dlopen対応を行った．今までdlnにしか十
-	  分に対応していなかった．
-
-Tue Aug  8 14:17:06 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.83
-
-Mon Aug  7 12:47:41 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y: resque -> rescue．恥ずかしいがtypoを残しておくわけには
-	  いかないよなあ．なんで今まで気がつかなかったのか…．
-
-Thu Aug  3 18:18:05 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* missing/nt.c: NT移植用の関数群をまとめた．
-
-	* variable.c (rb_const_get): また例外を発生するようにした．defined
-	  がある以上例外を発生させない理由がないので(例外が発生した方がタ
-	  イプミスの検出などの点で有利)．
-
-	* variable.c (Fautoload): autoloadを実装．今度は使えるか．
-
-Mon Jul 31 15:44:21 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (arg_ambiguous): 第1引数のあいまいさを警告(-vオプション
-	  で有効)．
-
-	* eval.c (rb_eval): `-v'オプションをつけて`def'が呼ばれると不必要
-	  なエラーメッセージが出た．
-
-	* parse.y (yylex): メソッドの第1引数の判定をもうちょっと賢くした．
-
-Fri Jul 28 19:04:43 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (yylex): `+/-/['の直前に空白が来るかどうかで動作を変更し
-	  た(混乱のもとか?)
-
-Wed Jul 26 09:21:23 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.82a
-
-	* sprintf.c (Fsprintf): `%s'で'\0'を含む文字列に対応．
-
-	* pack.c (Fpck_pack): packの要素確保のバグ．
-
-	* eval.c (Floop): 無限ループのイテレータ．
-
-	* io.c (next_argv): 存在しないファイル名が指定された時のエラー処理
-	  が行われていなかった．
-
-Mon Jul 24 17:37:34 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.82
-
-	* ext/extmk.rb.in (install): 拡張モジュールをstatic linkする場合は
-	  そのモジュールが既にrequireされたのと同じようにfeatureを設定する．
-	  これで拡張モジュールの機能が必要な時には(static linkされているか
-	  どうかにかかわらず)requireすればよくなる．
-
-	* eval.c (Frequire): `$"'に格納する文字列をフルパスでなくフィーチャ
-	  名とする．rubyスクリプトをロードした時には`.rb'，オブジェクトを
-	  ロードした時には`.o'をフィーチャ名に付加する．lispのrequireと
-	  provideの働きに(少し)近い．
-
-Thu Jul 20 12:50:05 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* Makefile.in (test): make testができるように．
-
-	* struct.c (struct_new): typo.
-
-	* eval.c (rb_eval): `defined'を追加．メソッド/変数/定数の定義状態
-	  を知る事が出来る．
-
-Wed Jul 19 18:04:01 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.81
-
-Mon Jul 17 14:53:51 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* variable.c (rb_const_get): 未初期化のCONSTANTの値をnilにした．し
-	  かし，今後また例外に戻す可能性はある．要はoptionalなクラス/モジュー
-	  ルが存在するかチェックしたいだけなんだな．
-
-	* st.c (int): grow_factorを固定にした(大嶋さんのマシンに対応)．
-
-Fri Jul 14 00:48:40 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* ext/extmk.rb.in: キャッシュのバグを修正．
-
-	* parse.y (var_extend): #{$数字}に対応した．
-
-	* dln.c (dln_load_1): `Init_FILENAME'だけを有効に．`init_*'は今後
-	  実行しない．
-
-	* ext/etc/etc.c : Etcモジュールを拡張モジュールとして分離．実はNT
-	  対応への布石だったりするかもしれない．
-
-Tue Jul 11 17:12:48 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* gcc -Wallで出たwarningを元にソースを変更．
-
-	* signal.c (trap): typo.
-
-Fri Jul  7 10:08:51 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.80
-
-	* ruby.texi: texinfo documentを提供．specとruby.1は無くなった．
-
-	* signal.c (Ftrap): 割込み禁止中の例外発生に対応．
-
-	* eval.c (Flambda): Blockオブジェクトを返す．Block.newと同義．
-
-Thu Jul  6 00:35:03 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* signal.c (Ftrap): SIG_DFLの処理を変更．SIGINTへのデフォルトハン
-	ドラを用意(例外を発生する)．
-
-	* file.c (Sfile_expand_fname): パス名を絶対パスに展開するメソッド．
-	(Sfile_basename): basenameを得るメソッド．拡張子も外せる．
-	(Sfile_dirname): basenameの反対．
-
-	* eval.c (rb_call): argument評価中の例外発生に対応．
-
-	* file.c (Ftest): `M', `A', `C'を追加.
-
-Tue Jul  4 12:36:33 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* file.c (Ftest): ファイルテスト用メソッド．
-
-	* ruby.c (proc_options): `-r'オプションを追加．
-
-	* parse.y (f_args): デフォルト引数を追加．
-
-	* eval.c (rb_call): 該当する引数が無い時，rest引数の値をnilに．
-
-	* numeric.c (num_equal): 数値以外との比較で例外が発生していた．
-	  FALSEを返すように．
-
-	* eval.c (masign): 多重代入のrest部の動作がおかしかった．
-
-Sat Jun 17 01:03:16 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* parse.y (gettable): 未初期化のローカル変数の参照(独立した識別子)
-	  は正式にメソッド呼び出しとした．
-
-	* parse.y (read_escape): tokenbufを使わないように修正．それにとも
-	  ない，`\C-x',`\M-x'などのエスケープ表現を復活．これでドキュメン
-	  トと実際の処理系が一致した．
-
-Thu Jun 15 15:42:00 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* re.c (re_regcomp): cacheのチェックを改善．
-
-Mon Jun 12 18:50:51 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* version 0.79
-
-Sat Jun 10 00:25:01 1995  Yukihiro Matsumoto  <matz@caelum.co.jp>
-
-	* re.c (re_regcomp): cache判定に`$='の値も反映させた．
-
-	* sample/test.rb: test suite作成．
-
-Fri Jun  9 15:58:34 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* re.c (re_regcomp): cacheの判定が間違っていた．
-
-Fri Jun  9 00:01:35 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c (rb_yield): block構造体に初期化していないメンバ(iter)があっ
-	  たのでイテレータのネストが正しく動作しなかった．
-
-Thu Jun  8 00:59:03 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* re.c (=~): String以外との比較がFALSEを返すように(例外を発生して
-	  いた)．
-
-	* extmk.rb.in: 判定した値をファイルにキャッシュするようにした．
-
-	* assoc.c (to_a): to_aメソッドが再定義されていなかった．
-
-	* eval.c (rb_eval): 初期化されていないローカル変数へのアクセスを引
-	  数の無いメソッド呼び出しと解釈する．ただし，(現状では)メソッドが
-	  定義されていない場合，エラーにせず変数未初期化のwaringを出して
-	  nilを返している．「ruby -pe print」などが実行できるという意味で
-	  はありがたいこの仕様は，しかし今後の検討が必要である．-- メソッ
-	  ド呼び出しとするのを止めるか(以前の仕様)，いつもメソッド呼び出し
-	  とする(未定義ならばエラー)か，今の仕様で行くか．
-
-	* eval.c (rb_eval): 初期化されていないローカル変数へのアクセスで
-	  (evalなどで)初期化された事が分かった時には以後初期化されたローカ
-	  ル変数とみなす．
-
-Wed Jun  7 11:58:12 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* eval.c (rb_fail): 例外処理後も`$!'をクリアしないように．
-	  (rb_fail): `$!'変数に最後に改行を追加しない．
-
-	* io.c (Fprint): privateメソッドに変更．引数を取らない時の動作を変
-	  更(`$_'を出力する)．
-	  (Fio_print): 出力先指定のprintメソッド．
-	  (Fio_printf): 出力先指定のprintfメソッド．
-
-	* parse.y: not演算子の追加．優先順位の低い`!'演算子．
-
-Mon Jun  5 19:00:55 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* version 0.78
-
-Fri Jun  2 17:52:03 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* ruby.c (proc_options): -Iオプションで`$:'への追加される順番を修
-	  正した．
-
-Fri Jun  2 00:36:34 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: while修飾子の動作を通常のwhileと同じにした．ただし，
-	  begin式へのwhile修飾子だけはdo..while型のループとなる．
-
-Wed May 31 18:36:30 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* version 0.77
-
-Mon May 29 18:39:37 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* ext/extmk.rb.in (install): 拡張モジュールもインストールできるよ
-	  うに．
-
-Fri May 26 14:43:01 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* process.c (Fsystem): 戻り値をサブプロセスの失敗/成功を表す真偽値
-	  にした．終了ステータスは`$?'で得る．
-
-Tue May 23 10:58:11 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* string.c (Fstr_upto): 無限ループに陥らないように．
-
-	* parse.y (cond): `||'などの右辺に制御式が書けるように，条件式がか
-	  ならずしも値を持たなくても良いようにした．
-
-	* ext/marshal/marshal.c: オブジェクトの読み書きをメソッドの再定義
-	  でコントロールできるように．インスタンスが`_dump_to'というメソッ
-	  ドを定義している時はそちらを使うように．
-
-	* ext/extmk.rb.in: static linkも設定できるような仕様にした．
-	  ext/Setupというファイルにディレクトリ名を記述するとそのディレク
-	  トリに存在するモジュールはstatic linkされる(はず)．
-
-	* eval.c (rb_eval): `..'を文法に組み込み，`..'と`...'の動作をperl
-	  に合わせた．
-
-Sat May 20 01:22:48 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* io.c (select): timeout時と割込み時の動作の明確化．
-
-Fri May 19 15:33:23 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* version 0.76
-
-Fri May 19 00:48:08 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* string.c (Fstr_each): イテレータブロック中で文字列の変更が行われ
-	  たかどうかをチェック．ポインタの値が変わっていれば例外を発生する．
-
-	* ruby-mode.el: ruby-electric-braceの新設．
-
-Thu May 18 12:27:23 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* string.c (Fstr_tr): trの置換対象に`\0'を含む時に正しく置換を行わ
-	  ないバグがあった．更に置換文字列をASCII順に指定しないと動作しな
-	  い問題もあった．結果としてtrを書き換えたので，copyrightの問題は
-	  無くなった(と思う)．
-
-	* gc.c (gc): the_scopeをマークしていなかったので，ローカル変数の指
-	  しているオブジェクトが間違って開放される場合があった．
-
-	* gc.c (mark_locations_array): 若干の高速化．
-
-Mon May 15 11:43:49 1995  Yukihiro Matsumoto  <matz@ix-02>
-
-	* ext/extmk.rb.in: Dynamic Loadモジュールのコンパイル用チェックを
-	  行うruby script．autoconfに近い感覚で使える．新しいモジュールを
-	  提供したい人はextの下にディレクトリを作るだけで良い．必須のファ
-	  イルはファイル名の一覧を記録した`MANIFEST'というファイルのみ．必
-	  要に応じて`depend'(ファイルの依存関係を記述するファイル gcc -MM
-	  の出力)，`extconf.rb'(コンパイル用にライブラリと関数の存在チェッ
-	  クするファイル)を用意できる．
-
-	* eval.c (rb_call): rubyメソッドの引数チェック時に未初期化の
-	  jmp_bufを使用していた．
-
-	* parse.y: `or'と`and'の優先順位を同じにした．
-
-Wed May  3 18:21:36 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* dln.c: Linuxでは`__.SYMDEF/'であった．
-
-	* dln.c: system callのエラーチェックを忘れていた．
-
-Wed Apr 26 09:50:56 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: イテレータブロックの変数宣言を`|'で括るようにした．これ
-	  でイテレータ変数がない時は宣言そのものを省略できる．文法の変更は
-	  久しぶりだ．
-
-Tue Apr 25 12:04:17 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(require): loadからダイナミックロードの機能を移してきた．
-	  さらに拡張子の補完機能を追加してユーザがdln/dlopenの差を意識する
-	  必要のないようにした．
-
-	* string.c(sub,sub): イテレータとしても動作するように．
-
-	* object.c: init_object -> initialize.
-
-Mon Apr 24 14:22:39 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* NEWS-OS 3.4対応
-
-	* io.c: Solarisのstdioの動作が違うようだ．signalでEOFを返してしま
-	  う…．perlでも同様の問題がある．
-
-Fri Apr 21 20:04:39 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.75
-
-	* signal.c: trapがなくなっていた．うーむ．
-
-	* configure: Solaris 2.3対応．
-
-	* io.c: #elifのないcppもある．
-
-	* dir.c: autoconf 2.xへの対応が不十分
-
-Thu Apr 20 12:31:24 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.74
-
-	* env.h, gc.c, regex.c: IRIXへの移植対応
-
-	* configure: dlopen用にpicを生成するoptionの検出のため，システムタ
-	  イプをチェックするように．
-
-Tue Apr 18 19:08:17 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* gc.c(xrealloc): ptr=nilの時，malloc()と同じ働きを
-
-	* array.c(astore): 空の配列の0番目の要素に代入するとsize=0で
-	  realloc()を呼んでいた．
-
-	* configure, glob.c: Solaris 2.xでコンパイルできるように
-
-Mon Apr 10 18:36:06 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.73
-
-Fri Apr  7 13:51:08 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* cons.c->assoc.c: consの余計な機能は外してpairとしての機能だけを
-	  残した．Enumerableをincludeするのもやめた．
-
-	* string.c(esub): 文字列置換イテレータ．perlのs///eの相当する．
-
-Wed Apr  5 11:35:21 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.72
-
-	* EWS4800対応
-
-	* file.c: utimesがない時はutimeを使うように．
-
-Mon Apr  3 15:19:41 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.71
-
-	* regexp.c(re_match): バグがあった．match_2を削除した時にenbugして
-	  いたのだった．
-
-Mon Mar 27 15:41:43 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* dict.c: Dict->Hashに全面的に移行．
-
-Thu Mar 23 20:30:00 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* dbm.c,socket.c: extディレクトリに分離．
-
-	* configure: dln周りのチェックの強化
-
-	* dln.c: initの呼び出しをdlopen()版に合わせた．
-
-Mon Mar 20 17:45:08 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* configure: autoconf 2.2に対応(一部)．
-
-Fri Mar 17 15:56:44 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* dln.c: dlopenのあるマシンではそちらを使うように．ただし，ちゃん
-	  と動いているかどうかは自信がない．
-
-	* regex.c: virtual concatinationをやめた．
-
-Thu Mar 16 11:32:57 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.70
-
-	* eval.c,regex.c: gccでのコンパイルエラー．
-
-	* io.c: inplace-editで拡張子が指定されない場合，もとのファイルを削
-	  除する．
-
-Wed Mar 15 14:59:18 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.69
-
-	* eval.c(method_missing): unknownから名称変更．
-
-	* eval.c(single_method_added): 特異メソッドが定義された時に呼ばれ
-	  るメソッド．hookとして使える．実際に定義される直前に呼ばれる．
-
-Tue Mar 14 14:46:44 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby.c(proc_options): 引数の解析を自分でやることにより引数指定の
-	  方法がperlに近付いた．getopt_longはもう使わない．
-
-	* dir.c(glob): `{}'のネストを許すようにした．
-
-Mon Mar 13 17:56:25 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* glob.c: Glob(ワイルドカードオブジェクト)はなくなった．ワイルドカー
-	  ドの展開はDir.glob(文字列)を使う．ワイルドカードのマッチは正規表
-	  現で代用．
-
-Fri Mar 10 18:35:46 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: Mathのようなモジュールは自分自身でextendする．
-
-	* eval.c: クラスやモジュールを定義する時，既に同名のものがあれば追
-	  加定義となるように．ただし．superクラスの違いなどはチェックする．
-
-	* regex.c: debug.
-
-	* math.c: 定数PIとEを定義．
-
-Thu Mar  9 21:35:12 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* regex.c: EUC,SJISモードでは0x80以上の8進，16進リテラルを禁止．
-
-	* regex.c: クラス内でも数値リテラル・文字クラスが使えるようした．
-
-Wed Mar  8 17:39:05 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* regex.c: \200など括弧の数以上の表現は8進リテラルと解釈する．ただ
-	  し，\1から\9までは例外．
-
-	* regex.c: \9以上のリファレンスも有効にした．
-
-Tue Mar  7 14:26:01 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(public/private): スコープ制御メソッドの名称変更．静的なア
-	  クセスも出来るようにしてみたが，不採用．
-
-Mon Mar  6 19:34:32 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c(inlcude): メソッド化．動的にモジュールをインクルードでき
-	  るように．さらに任意のオブジェクトにもモジュールをインクルードで
-	  きるメソッド `extend'も用意した．
-
-	* parse.y: 文法からincludeを削除．メソッド化．
-
-Tue Feb 28 15:35:10 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: 配列，連想配列の最後に`,'をおけるように．
-
-Fri Feb 24 13:15:43 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.68
-
-Thu Feb 23 11:19:19 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: resque節のselfの値が間違っていた．
-
-	* eval.c(rb_clear_cache): キャッシュのクリアし忘れがあった．
-
-	* eval.c: 定数のスコープをクラス内の静的スコープに変更した．これに
-	  よって，特異メソッドから参照される定数は，レシーバのクラスではな
-	  く，定義されたスコープのクラスの定数となる．
-
-Wed Feb 22 00:51:38 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* regex.c: ignorecaseを正規表現のコンパイル前に指定しないと正しく
-	  動作しない．修正．
-
-	* string.c(toupper,tolower): bug fix.
-
-	* ENV,VERSION: readonly変数から定数へ．
-
-Tue Feb 21 18:56:56 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* io.c(STDIN, STDOUT, STDERR): 定数として定義．
-
-	* io.c(select): bug fix.
-
-	* version 0.67
-
-Mon Feb 20 16:10:14 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(yylex): 定数を`%識別子'から，第1文字が大文字の識別子に変
-	  更．それにともないクラスは定数となった．
-
-	* eval.c: クラス定義内のselfがクラス定義外部のthe_classだった．
-
-	* variable.c(rb_name_class): クラス名をインスタンス変数に格納する．
-
-Thu Feb 16 15:36:17 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: BLOCKをbraceで表現する文法に変更したものを作ってみる．
-	  MLに提示してみるが反応がない．
-
-	* object.c(do,forever): なくした．
-
-Wed Feb 15 13:20:49 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c(new): 第2引数が与えられて，かつnilでないときだけ設定するよ
-	  うに(以前はnilの時にも設定を行なっていた)．
-
-	* parse.y(parse_regexp): 正規表現リテラルで大文字小文字を無視する
-	  かどうか指定できるように．
-
-Tue Feb 14 00:55:33 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: (compexpr) -> (expr).
-
-Fri Feb 10 16:30:00 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* ruby.c(load_file): scriptを読み込む時だけ"#!"の解析を行うように．
-
-	* ruby.c(readin): ファイル読み込み時に先頭に"#!"があり，その行が
-	  "ruby"という文字列を含む時，rubyに引数が与えられていれば，その引
-	  数も有効になる．
-
-	* parse.y(yylex): コメント行の終りが`\'であった時，次の行に継続し
-	  ているとみなすようにした．
-
-Thu Feb  9 16:18:37 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.66
-
-	* parse.y: protectをbeginに変更．begin..endは例外処理だけでなく，
-	  文括弧としても働くことになった．
-
-Wed Feb  1 19:48:24 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* version 0.65
-
-	* string.c(str_replace): 置き換える文字列の長さが等しい時メモリコ
-	  ピーをしない．
-
-	* string.c(rindex): バグ修正．
-
-Mon Jan 30 11:23:05 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(value_expr): ifのチェックを追加．
-
-	* gc.c(gc_mark): free cellの扱いにバグ．
-
-	* parse.y: 文法の変更(よりシンプルに)．例外を減らした．
-
-Thu Jan 26 00:52:55 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* parse.y: 引数として連想配列を置くことができるように．この場合，
-	  連想配列リテラルが最終引数となる．
-
-	* parse.y: 配列参照の`[]'内が空でもよいことにした．
-
-Tue Jan 24 14:45:15 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* class.c(rb_include_module): `-v'を指定した時にはincludeしたモジュー
-	  ルとクラス定数が衝突していないかチェックする．
-
-Mon Jan 23 10:42:09 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(rb_class2name): メタクラスに関するbug fix.
-
-	* dict.c: Dict[..]で辞書の生成が出来るように．
-
-	* array.c: Array[..]で配列の生成が出来るように．
-
-	* parse.y: 辞書の表現として{a,b,..}という形式も許すように．
-
-Fri Jan 20 10:28:38 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* re.c(Regexp.quote): 正規表現をエスケープするメソッド．
-
-	* 無駄なrb_intern()を減らした．
-
-	* parse.y: `!', `!=', `!~'を特殊演算子にする．よってこれらは再定義
-	  できなくなった．
-
-Wed Jan 18 13:20:41 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: 文法の整理(unless,untilをなくした)．
-
-Tue Jan 17 11:11:27 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: defでメソッド再定義時にはスーパークラスのメソッドの可視
-	  性を継承する．最初の定義の時は今までと同じデフォルト(トップレベ
-	  ルで関数的，クラス定義内で通常メソッド)．
-
-	* object.c(Class#new): オブジェクトの生成時に関数的メソッド
-	  init_objectが必ず呼ばれるように変更．
-
-	* eval.c: 未定義のメソッドに対してunknownメソッドが呼ばれるように
-	  なった．エラー表示が今までと同じになるようにenvを調節している．
-
-Fri Jan 13 14:40:30 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* gc.c: gcを若干書き換えて整理した．が，あまり変化はなかったようだ．
-
-	* parse.y(yylex): symbolを\symから:symに変更した．
-
-Thu Jan 12 01:39:28 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c: 新規関数 rb_eval_string()．
-
-	* gc.c: gc_mark()を一部非再帰化．
-
-	* variable.c(rb_ivar_{get,set}): インスタンス変数のアクセス周りで
-	  チェックが足りなかった．
-
-	* variable.c: クラス定数とインスタンス変数でハッシュテーブルを共有
-	  するようにした．
-
-	* ruby.h: iv_tblをRBasicからRObjectとRClassへ移動した．これにより，
-	  ObjectとClass,Moduleしかインスタンス変数を持てなくなる．が，メモ
-	  リ効率は若干向上する．
-
-Tue Jan 10 00:58:20 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* 0.64 released
-
-	* eval.c: レシーバと引数は常にiterではない．
-
-	* cons.c(aref,aset): negative offset対応．
-
-Mon Jan  9 14:40:39 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: foo{..}の形式において，fooをローカル変数やクラス名では
-	  なく，引数なしの関数型メソッド呼び出しとみなすようにした．
-
-	* list.c -> cons.c: 名称変更(クラス名も)．
-
-	* list.c: a::b::c::nilをリスト(a b c)とみなすlisp形式から，a::b::c
-	  をリスト(a b c)とみなすruby形式に変更．[], []=, eachもそれに会わ
-	  せた仕様とする．
-
-	* list.c: consペアとしての機能を強調．仕様変更．
-
-Sat Jan  7 01:26:26 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c: 自己代入の不具合修正．
-
-	* eval.c(masign): 多重代入が配列もリストもとれるようにした．
-
-	* list.c: assocを2要素の配列からList(CONSペア)に変更した．
-
-Fri Jan  6 13:42:12 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: a[b]+=cやa.b+=cなどの自己代入形式で，aやbを2度評価しな
-	  くなった．
-
-	* eval.c: iterator設定のバグフィックス．
-
-	* list.c: Listクラスを新設．
-
-Thu Jan  5 13:55:00 1995  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: SCOPEのメモリリークをなくした．
-
-	* eval.c: built-inメソッドへの引数の引き渡し方を変更して，配列の生
-	  成数を減らした．
-
-	* re.c: match-dataを毎回生成することをやめた．`$~'をアクセスした時
-	  にon-demandで生成する．
-
-	* string.c etc: 不必要なmemmoveをmemcpyに置換．
-
-	* parse.y: =~, !~は副作用があるのでコンパイル時に展開できない．
-
-Tue Jan  3 02:04:36 1995  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c: rest引数のbug fix.
-
-	* eval.c,gc.c: scopeをオブジェクトにした．
-
-	* eval.c: envとscopeの扱いを変更した．
-
-Wed Dec 28 09:46:57 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: evalでローカル変数が追加された場合に対応した．
-
-	* parse.y: 演算子を含むaliasのbug fix.
-
-Tue Dec 27 16:45:20 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: def A Bをalias A Bに変更．
-
-	* eval.c: alias関係のbug修正．nodeをオブジェクト化した時にenbugし
-	  たようだ．
-
-	* signal.c: システムコールの再定義を止めた．
-
-	* io.c(select): write/exceptのフラグ設定にバグ．
-
-	* Makefile.in: static link用オプションをMake変数として独立させた．
-
-Tue Dec 20 00:46:19 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* 0.63 released
-
-	* eval.c(rb_call): superの呼び出しで落ちる．argc, argvの設定を忘れ
-	  ていた．
-
-	* parse.y(read_escape): 展開エラー．
-
-	* variable.c: 定義済みの変数のhookを変更しないように．
-
-Mon Dec 19 12:01:10 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y(cond): 条件式に代入式が置かれた場合，`-v'オプションで警
-	  告が出るように．
-
-	* parse.y(**): 冪乗演算子`**'の優先順位を単項演算子より高くした．
-
-	* parse.y(and,or): 優先順位の低い演算子`and', `or'.
-
-	* 0.62 released.
-
-	* eval.c: 不必要になったPUSH_ENV, POP_ENVを減らした．
-
-	* env.h: ENVIONからselfをはずした．PUSH_ENVはsuperの準備のためだけ
-	  に用いることにした．
-
-	* eval.c: 下記のオブジェクト化で遅くなった実行速度をもとに戻した．
-
-Mon Dec 17 23:01:10 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* eval.c: env.{argv,argc}とscope.local_varsのオブジェクト化．
-
-	* eval.c: 1スコープ内で複数Blockを生成したときのバグを修正．
-
-Fri Dec 16 15:52:06 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* parse.y: `&&'と`||'の両辺はいつでも条件式とした．
-
-Thu Dec 15 00:16:04 1994  Yukihiro Matsumoto  (matz@dyna)
-
-	* eval.c(Block): Blockオブジェクトを実現．
-
-	* node.h: NODE_QLISTはなくなった．
-
-	* eval.c(rb_call): 引数への代入を名前で一つずつ代入するのをやめて，
-	  一度にコピーするようにした．
-
-	* eval.c(rb_call): rubyで記述されたメソッドへの引数渡しをinline化．
-
-	* eval.c: イテレータ判定処理の全面書き換え．不適切なイテレータ呼び
-	  出しをなくした．例えば「[foo(),bar()]{i|baz(i)}」でfooもbarもイ
-	  テレータとして呼び出され*ない*．
-
-	* eval.c(rb_call): SCOPE処理をinline化．メソッド呼び出しの若干の高
-	  速化．
-
-Wed Dec 14 18:09:33 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* node.h: nodeもオブジェクトにする．よってGCで回収される．
-
-Thu Dec  8 14:17:29 1994  Yukihiro Matsumoto  (matz@ix-02)
-
-	* 0.60 released - alpha test baseline.
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
index 3f7d6bfb3c..07d7c6b165 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -1454,7 +1454,7 @@ Fri Jun 27 03:24:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 Thu Jun 26 21:34:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* class.c (class_instance_method_list): get rid of warning about
-	  argument type mismatch, and inline method_list().
+	  arguement type mismatch, and inline method_list().
 	  [ruby-core:01198]
 
 Wed Jun 25 14:40:33 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -3361,7 +3361,7 @@ Fri Apr 11 02:41:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 Thu Apr 10 21:12:19 2003  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/pop.rb: Exception line was accidentally removed.
+	* lib/net/pop.rb: Exception line was accidentaly removed.
 	  [ruby-dev:19989]
 
 Thu Apr 10 18:42:13 2003  Tadayoshi Funaba  <tadf@dotrb.org>
@@ -5986,7 +5986,7 @@ Thu Nov  7 09:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 Wed Nov  6 16:57:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* class.c (rb_define_method): do not set NOEX_CFUNC if klass is
-	  really a module, whose methods must be safe for receiver's type.
+	  really a module, whose methods must be safe for reciever's type.
 
 	* eval.c (rb_eval): nosuper should not be inherited unless the
 	  overwritten method is an undef placeholder.
@@ -21236,7 +21236,7 @@ Sun Jan  3 01:37:58 1999  Takao KAWAMURA  <kawamura@ike.tottori-u.ac.jp>
 Sat Jan  2 17:09:06 1999  Yukihiro Matsumoto  <matz@netlab.co.jp>
 
 	* eval.c (rb_jump_tag): new api to invoke JUMP_TAG.  tag values
-	  can be obtained from rb_eval_string_protect()/rb_load_protect().
+	  can obtained from rb_eval_string_protect()/rb_load_protect().
 
 	* eval.c (rb_rescue): now catches all exceptions but SystemExit.
 
diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
index 9461209291..e9ede641f5 100644
--- a/doc/ChangeLog-1.9.3
+++ b/doc/ChangeLog-1.9.3
@@ -3541,7 +3541,7 @@ Sun May 15 23:45:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 Sun May 15 22:26:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* signal.c (rb_f_kill): accept '-SIGXXX' style signal with Symbol or
-	  implicit conversion with #to_str. [ruby-dev:43169] fixes #4362
+	  implicit convertion with #to_str. [ruby-dev:43169] fixes #4362
 	* test/ruby/test_signal.rb (test_signal_process_group): add a test
 	  for send signal to process group.
 
@@ -8041,7 +8041,7 @@ Sat Dec 25 17:33:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  anonymous classes.
 
 	* lib/csv.rb (CSV#init_separators): use IO#gets with length
-	  parameter to get rid of wrong conversion.
+	  parameter to get rid of wrong convertion.
 
 	* lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
 
@@ -8382,7 +8382,7 @@ Tue Dec 14 14:24:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 	  to 'test_io' because the old one is meaningless and inconvenient.
 
 	* test/ruby/test_io.rb (test_binmode_after_closed): the temporary file
-	  made by make_temfile is already closed.
+	  maked by make_temfile is already closed.
 
 Tue Dec 14 13:52:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -12814,7 +12814,7 @@ Thu Aug  5 22:09:30 2010  Tanaka Akira  <akr@fsij.org>
 Thu Aug  5 21:20:31 2010  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* compile.c (NODE_ARGSCAT, NODE_ARGSPUSH): drop unused ARGSCAT
-	  results when popped is true.  [ruby-dev:41933], [Bug #3658]
+	  results when poped is true.  [ruby-dev:41933], [Bug #3658]
 	  This is retry of r28870 and r28873 which were reverted.
 
 Thu Aug  5 20:13:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
@@ -22363,7 +22363,7 @@ Tue Sep 29 22:19:36 2009  Tanaka Akira  <akr@fsij.org>
 
 Tue Sep 29 21:16:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* io.c (rb_scan_open_args): add UTF8-MAC to no-conversion encoding.
+	* 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>
 
@@ -33712,7 +33712,7 @@ Thu Dec 25 14:51:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 Thu Dec 25 14:32:23 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_insnhelper.c (vm_method_search): fix control flow bug.
-	  (committed at r20981)
+	  (commited at r20981)
 
 Thu Dec 25 13:28:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -71774,7 +71774,7 @@ Wed Mar  1 17:13:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Thu Mar  2 17:54:45 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* gc.c: committed magic for reducing RVALUE size on windows. (24->20byte)
+	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
 	  [ruby-core:7474]
 
 Thu Mar  2 14:12:26 2006  Tanaka Akira  <akr@m17n.org>
@@ -73761,7 +73761,7 @@ Fri Oct 21 15:42:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/socket/extconf.rb: BeOS is only one platform should call
 	  closesocket, so check __BEOS__ macro directly. (I was worried
-	  accidentally HAVE_CLOSESOCKET is defined on windows again because
+	  accidently HAVE_CLOSESOCKET is defined on windows again because
 	  it has it)
 
 	* ext/socket/{getaddrinfo.c,socket.c}: ditto.
@@ -73770,7 +73770,7 @@ Fri Oct 21 15:42:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 Fri Oct 21 15:23:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* bignum.c (bignew_1): conversion from `int' to `char' discards
+	* bignum.c (bignew_1): convertion from `int' to `char' discards
 	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
 	  nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
 	  (but I believe this won't cause actual bug in current implementation)
@@ -74937,7 +74937,7 @@ Mon Sep 12 20:32:00 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 Mon Sep 12 19:58:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* dln.c: avoid warning of const to non-const conversion.
+	* dln.c: avoid warning of const to non-const convertion.
 	  [ruby-dev:27041]
 
 	* eval.c, io.c, ruby.c: ditto.
@@ -77162,7 +77162,7 @@ Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
 
 Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#initialize):
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
 	  should initialize session id context. [ruby-core:4663]
 
 	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
@@ -83155,7 +83155,7 @@ 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.
 
-	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion information.
+	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
 
 	* ext/tk/lib/menu.rb: typo bug.
 
@@ -83584,7 +83584,7 @@ Wed Jul 14 18:05:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 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 omitted. [ruby-dev:23883]
+	  "-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.
 
@@ -84298,7 +84298,7 @@ Sat May 22 11:54:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sat May 22 05:37:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/remote-tk.rb: (NEW library) control Tk interpreters
+	* ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
 	  on the other processes by Tcl/Tk's 'send' command
 
 Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
@@ -85607,10 +85607,10 @@ Wed Mar 17 00:22:03 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 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 compatibility)
+	  (Rev1.112 lost compatiblity)
 
 	* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
-	  should return true. (Rev1.112 lost compatibility)
+	  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.
@@ -86434,7 +86434,7 @@ Mon Feb 16 22:22:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 Mon Feb 16 20:28:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* bcc32/Makefile.sub: show more warnings. (referring to mingw)
+	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
 
 	* bcc32/setup.mak: ditto.
 
@@ -86492,7 +86492,7 @@ Mon Feb 16 12:29:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 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 achieved by calling downcase() for single-byte
+	  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>
@@ -86561,7 +86561,7 @@ Sat Feb 14 11:14:12 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 Fri Feb 13 21:51:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* lib/fileutils.rb: slightly improved documentation (sync with 1.8)
+	* lib/fileutils.rb: slighly improved documentation (sync with 1.8)
 
 Fri Feb 13 19:57:01 2004  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -89179,7 +89179,7 @@ Thu Nov 27 22:05:48 2003  Akinori MUSHA  <knu@iDaemons.org>
 Thu Nov 27 17:36:42 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode).
-	  TkTimer#wait receives the exception of the callback.
+	  TkTimer#wait recieves the exception of the callback.
 	  The exception is kept on @return_value.
 
 Thu Nov 27 16:58:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
diff --git a/doc/ChangeLog-2.1.0 b/doc/ChangeLog-2.1.0
index 76edfd3ce7..f80b2d6bd1 100644
--- a/doc/ChangeLog-2.1.0
+++ b/doc/ChangeLog-2.1.0
@@ -2948,7 +2948,7 @@ Tue Nov  5 03:31:23 2013  Koichi Sasada  <ko1@atdot.net>
 	  Young objects will be promoted to old objects after one GC.
 	  Old objects are not collect until major (full) GC.
 
-	  The issue of this approach is some objects can promote as old
+	  The issue of this approach is some objects can promoted as old
 	  objects accidentally and not freed until major GC.
 	  Major GC is not frequently so short-lived but accidentally becoming
 	  old objects are not freed.
diff --git a/doc/ChangeLog-2.2.0 b/doc/ChangeLog-2.2.0
deleted file mode 100644
index 5a7dbf826d..0000000000
--- a/doc/ChangeLog-2.2.0
+++ /dev/null
@@ -1,12157 +0,0 @@
-Thu Dec 25 16:01:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_expand_path_internal): drop characters ignored
-	  by filesystem on Mac OS X.
-
-Thu Dec 25 15:36:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (replace_real_basename): get the real name and replace the
-	  base name with it by getattrlist(2) if available.
-	  suggested by Matthew Draper at [ruby-core:67116].  [Bug #10015]
-
-	* dir.c (glob_helper): get the real name of the whole path, not
-	  only the last name.
-
-Thu Dec 25 13:59:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (NET_LUID): include also ifdef.h as a workaround of
-	  a bug in mingw-w64 header.  [ruby-core:67103] [Bug #10640]
-
-Thu Dec 25 12:47:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (gettable_gen): warn possible reference to a local
-	  variable defined in a past scope.
-
-Thu Dec 25 10:09:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): id_console is not a
-	  constant name, use rb_const_remove() to get rid of NameError.
-
-Thu Dec 25 09:18:55 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address):
-	  set timeout for recvfrom because if client thread is crashed, it
-	  waits infinity.
-
-Thu Dec 25 08:42:11 2014  Eric Wong  <e@80x24.org>
-
-	* lib/uri/generic.rb (split_userinfo): fstring for 1-byte split
-	  (set_port): reduce bytecode size
-	  (check_path): reduce garbage via opt_str_freeze
-	  (query=): ditto
-	  (fragment=): ditto
-	  [misc #10628]
-	* lib/uri/rfc3986_parser.rb (regexp): cache as attr
-	  (initialize): setup and freeze regexp attr once
-	  (split): reduce bytecode size, use opt_str_freeze
-	  (parse): minor bytecode and garbage reduction
-	  (default_regexp): rename for initialize
-
-Wed Dec 24 20:38:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_make_pattern): restrict searching case-insensitive
-	  name from the filesystem to only last part, for the performance.
-	  [ruby-core:63591] [Bug #10015]
-
-Wed Dec 24 18:21:27 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove unused rb_objspace_t::rgengc::old_objects_at_gc_start.
-
-Wed Dec 24 13:25:22 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: require view_changesets permission.
-
-Wed Dec 24 13:00:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/downloader.rb (Downloader.download): fix the exception to
-	  re-raise.  initialize methods of subclasses of Exception may
-	  have different parameters.  [ruby-core:67086] [Bug #10639]
-
-Wed Dec 24 12:16:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.h (rb_data_type_t): revert r48647 and revise parent member.
-	  [ruby-core:66969] [Bug #10621]
-
-Wed Dec 24 05:40:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/downloader.rb: use config.guess in gcc repo.
-
-Wed Dec 24 11:50:19 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* hash.c (rb_hash_delete): return Qnil if there are no corresponding
-	  entry. [Bug #10623]
-
-	* hash.c (rb_hash_delete_entry): try delete and return Qundef if there
-	  are no corresponding entry.
-
-	* internal.h: add rb_hash_delete_entry()'s declaration.
-
-	* symbol.c: use rb_hash_delete_entry().
-
-	* thread.c: use rb_hash_delete_entry().
-
-	* ext/-test-/hash/delete.c: use rb_hash_delete_entry().
-
-Wed Dec 24 09:35:11 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/fiddle/extconf.rb: remove ffitarget.h generated by configure on
-	  mswin, because it's not normal file (cygwin's symlink) and have
-	  system attribute.
-
-Wed Dec 24 05:40:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/downloader.rb: support ruby 1.8.
-
-Wed Dec 24 02:44:06 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/response.rb (Net::HTTPResponse): require one or more
-	  spaces [Bug #10591].
-	  by leriksen <leif.eriksen.au@gmail.com>
-	  https://github.com/ruby/ruby/pull/782 fix GH-782
-	  NOTE: graph.facebook.com returns without SP Reason-Phrase.
-
-Wed Dec 24 02:12:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot (package): VCS#branch_list expects glob a
-	  pattern string but not a regexp.  based on the patch by Vit
-	  Ondruch.  in [ruby-core:67064].  [Bug #10636]
-
-	* tool/vcs.rb (VCS::SVN#branch_list): strip newlines.
-
-	* tool/vcs.rb (VCS::GIT.get_revisions): retrieve modified time
-	  from toplevel log too.
-
-	* tool/vcs.rb (VCS::GIT#branch_list): yield for each lines.
-
-Wed Dec 24 00:23:13 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/extlibs.rb (do_extract): the pipe should be binmode.
-
-Wed Dec 24 00:21:44 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* Makefile.in, common.mk: move common-srcs to Makefile.in because
-	  it breaks build on mswin.
-
-Wed Dec 24 00:04:45 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/open-uri.rb (OpenURI.open_http): accept multiple certs path in
-	  ssl_ca_certs.
-
-	* tool/downloader.rb: use certs of rubygems for downloading gems.
-
-Tue Dec 23 22:39:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/extlibs: libffi-3.2.1 and patch for mswin.
-
-Tue Dec 23 22:04:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#query=): don't escape [\]^
-	  on both rfc2396 and rfc3986. [Bug #10619]
-
-Tue Dec 23 16:03:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/lib/win32/registry.rb (Win32::Registry::Error#initialize):
-	  try en_US message if the default message cannot be encoded to
-	  locale.  [ruby-core:65295] [Bug #10300]
-
-Tue Dec 23 11:42:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge
-	  data gradually not to exceed INT_MAX.  workaround of OpenSSL API
-	  limitation.  [ruby-core:67043] [Bug #10633]
-
-Mon Dec 22 21:30:16 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_event.rb: some tests are
-	  executed on standard Windows OS without ADO.
-
-Mon Dec 22 14:08:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (received_signal): fix condition to define.
-	  [ruby-core:67032] [Bug #10629]
-
-Sun Dec 21 10:51:51 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_event.rb: test_s_new_exception is
-	  executed on standard Windows OS without ADO.
-
-Sun Dec 21 08:35:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (jemalloc): fix option argument, should use
-	  `$withval` but not `yes` always.  [ruby-core:66994] [Bug #10625]
-
-	* configure.in (jemalloc): defer adding the liner option to get
-	  rid of linking contest against jemalloc, so that it works
-	  without runtime dynamic load path.
-
-Sat Dec 20 17:49:03 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.
-	  [ruby-core:66943] [Bug #10616] Fixed by Alex Slynko.
-
-Sat Dec 20 11:22:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/depend, ext/fiddle/extconf.rb: try to build bundled
-	  libffi if existing.
-
-Sat Dec 20 05:21:00 2014  Eric Wong  <e@80x24.org>
-
-	* test/test_weakref.rb (test_repeated_object_leak): increase timeout
-	  [Bug #10618]
-
-Fri Dec 19 22:33:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: Use $(hdrdir) if possible.
-
-Fri Dec 19 22:10:00 2014  Kenta Murata  <mrkn@cookpad.com>
-
-	* ext/bigdecimal/depend: Fix dependencies to make bigdecimal
-	  installable by rubygems.
-
-	* ext/bigdecimal/bigdecimal.gemspec: version 1.2.6.
-
-Fri Dec 19 20:00:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (PRIsVALUE): put a space after string
-	  literals not to be confused with C++11 string literal suffix.
-	  https://github.com/ruby/ruby/commit/a9f3eb7#commitcomment-9040169
-
-Fri Dec 19 15:36:02 2014  Simon Genier  <simon.genier@shopify.com>
-
-	* hash.c (hash_equal): prefer true than the result of implicit
-	  conversion from int returned by rb_eql() to VALUE.  [Fix GH-789]
-
-Thu Dec 18 17:45:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_binary_elf): get rid of -e option of cat
-	  which is not available on BusyBox, use tr instead.
-	  [ruby-core:64824] [Bug #10210]
-
-Thu Dec 18 14:25:17 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
-	  should be treated before calling signal(3).
-	  [Bug #10615]
-
-Wed Dec 17 12:20:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (rb_method_for_self_aref, rb_method_for_self_aset):
-	  move from iseq.c to build from node instead of arrays.
-
-Wed Dec 17 10:50:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/gdbm/test_gdbm.rb: Added test for each_key called without a block.
-	  Patch by @joeyates [fix GH-783]
-
-Wed Dec 17 10:18:42 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): check
-	  iseq->compile_data->option->specialized_instruction for opt_* insn.
-
-	* test/ruby/test_iseq.rb: check no specialized_instructions option.
-
-Wed Dec 17 09:48:57 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (iseq_compile_each): only emit opt_str_freeze,
-	  opt_aref_with, and opt_aset_with insn when no block is given
-	  [Bug #10557] [ruby-core:66595]
-	* test/ruby/test_optimization.rb (test_block_given_aset_aref):
-	  new test for bug thanks to Bartosz Kopinski.
-	  (test_string_freeze): additional assertion for object_id
-
-Wed Dec 17 01:06:47 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32/lib/Win32API.rb (Win32API#call): need to splat.  hmm, when
-	  was this broken?
-
-Tue Dec 16 15:18:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_method_for_self_aref, rb_method_for_self_aset): call
-	  accessor functions directly, not to be affected by [] and []=
-	  methods.  [ruby-core:66846] [Bug #10601]
-
-	* struct.c (define_aref_method, define_aset_method): ditto.
-
-	* vm_insnhelper.c (rb_vm_opt_struct_aref, rb_vm_opt_struct_aset):
-	  direct accessors of Struct.
-
-Tue Dec 16 12:01:29 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  extend timeout seconds to 60 for RGENGC_CHECK_MODE > 0 environment.
-
-Tue Dec 16 08:53:12 2014  Eric Wong  <e@80x24.org>
-
-	* tool/vcs.rb: fix Ruby 1.8 compatibility harder
-
-Tue Dec 16 07:37:18 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (GC_HEAP_FREE_SLOTS): move definition to match use order
-	  (RUBY_GC_HEAP_GROWTH_SLOTS): s/factor/number of slots/
-
-	* man/ruby.1: add section for GC environment variables
-	  [Feature #10197]
-
-Tue Dec 16 05:41:46 2014  Eric Wong  <e@80x24.org>
-
-	* tool/vcs.rb: fix Ruby 1.8 compatibility
-
-Mon Dec 15 17:51:28 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c: ObjectSpace.memsize_of(obj) returns
-	  with sizeof(RVALUE). [Bug #8984]
-
-	* gc.c (obj_memsize_of): ditto.
-
-	* NEWS: add a NEWS entry.
-
-	* test/objspace/test_objspace.rb: catch up this fix.
-
-	* test/ruby/test_file_exhaustive.rb: ditto.
-
-Mon Dec 15 16:19:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_enc_str_coderange): dummy wchar, non-endianness
-	  encoding string cannot be ascii only.
-	  [ruby-core:66835] [Bug #10598]
-
-Sun Dec 14 20:11:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (primary): restore current_arg so that circular
-	  reference after a method definition is also warned.
-	  [ruby-core:61299] [Bug #9593]
-
-Sat Dec 13 20:41:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_trace.c (rb_postponed_job_flush): mask signal trap interrupt
-	  too to defer handling after finalizers finished.
-	  [ruby-core:66825] [Bug #10595]
-
-Sat Dec 13 18:33:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_pkey_ec.rb: ignored tests with old OpenSSL.
-
-Sat Dec 13 18:01:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (check_stack_overflow): check sp also on i386/x86_64
-	  FreeBSD.
-
-Sat Dec 13 09:58:41 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (define_final0): avoid duplicate blocks
-	  [Bug #10537]
-	* test/test_weakref.rb (test_repeated_object_leak): new test
-
-Sat Dec 13 04:59:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bin/erb (ERB::Main#run): get rid of shadowing outer local
-	  variables.  [ruby-core:65772] [Feature #10395]
-
-Fri Dec 12 21:56:44 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* gems/bundled_gems: Upgrade to test-unit 3.0.8. assert_throw and
-	  assert_nothing_thrown in test-unit 3.0.7 were broken by
-	  UncaughtThrowError change introduced in Ruby 2.2.0
-	  preview2. These assertions in test-unit 3.0.8 work well with
-	  UncaughtThrowError in Ruby 2.2.0 preview2.
-
-Fri Dec 12 19:48:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bin/erb (ARGV.switch, ERB::Main#run): allow variables to be set
-	  from the command line.  [ruby-core:65772] [Feature #10395]
-
-Fri Dec 12 19:31:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/erb.rb (ERB#lineno): accessor for line number to eval.
-
-	* lib/erb.rb (ERB#location=): setter of file name and line number.
-
-Fri Dec 12 13:09:13 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_latest_gc_info): return :state field to show current
-	  GC state (none/marking/sweeping).
-	  [Feature #10590]
-
-Fri Dec 12 10:49:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_crypt): check arguments more strictly.
-	  * crypt() is not for wide char strings
-	  * salt bytes should not be NUL
-
-Fri Dec 12 08:16:01 2014  Matt Hoyle  <matt@deployable.co>
-
-	* io.c (io_read) Fix spelling in docco for read.  [Fix GH-781]
-	  try > tries
-
-Thu Dec 11 19:06:01 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (class_alloc): Start from age == 2.
-	  Class and Module objects can be living long life.
-
-	* iseq.c: Same for ISeq objects.
-
-	* gc.c (RVALUE_AGE_RESET): added.
-
-	* gc.c (newobj_of): allow to generate (age != 0) objects.
-
-	* gc.c (rb_copy_wb_protected_attribute): reset age for wb unprotected
-	  objects.
-
-	* include/ruby/ruby.h: add RUBY_TYPED_PROMOTED1 as an unrecommended
-	  flag.
-
-Thu Dec 11 05:37:52 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Remove useless loop and block capture.
-	  See [#10354]
-
-Thu Dec 11 04:27:24 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: introduce new field
-	  rb_thread_t::local_storage_recursive_hash_for_trace to store
-	  recursive hash to avoid creating new recursive (nested) hashes
-	  for each trace events.
-	  [Bug #10511]
-
-	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): use it.
-
-	* cont.c: catch up this fix.
-
-	* vm.c (rb_thread_mark): ditto.
-
-Wed Dec 10 13:39:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (define_aref_method, define_aset_method): use iseq
-	  VALUE instead of rb_iseq_t to prevent from GC, as RB_GC_GUARD
-	  makes sense only for local variables.  [Feature #10575]
-
-Wed Dec 10 09:38:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (exec_recursive): use the same last method name as
-	  recursive_push in the error message when recursive_pop failed.
-	  [ruby-core:66742] [Bug #10579]
-
-Wed Dec 10 02:48:46 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/net/http/test_https.rb
-	  (TestNetHTTPS#test_certificate_verify_failure): on Windows,
-	  Errno::ECONNRESET will be raised when the verify is failure at the
-	  client side, and it'll be eaten by WEBrick.
-
-	* test/open-uri/test_ssl.rb (TestOpenURISSL#test_validation_failure):
-	  ditto.
-
-Wed Dec 10 00:42:13 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (rb_method_for_self_aref, rb_method_for_self_aset):
-	  new methods to generate bytecode for struct.c
-	  [Feature #10575]
-	* struct.c (rb_struct_ref, rb_struct_set): remove
-	  (define_aref_method, define_aset_method): new functions
-	  (setup_struct): use new functions
-	* test/ruby/test_struct.rb: add test for struct >10 members
-	* benchmark/bm_vm2_struct_big_aref_hi.rb: new benchmark
-	* benchmark/bm_vm2_struct_big_aref_lo.rb: ditto
-	* benchmark/bm_vm2_struct_big_aset.rb: ditto
-	* benchmark/bm_vm2_struct_small_aref.rb: ditto
-	* benchmark/bm_vm2_struct_small_aset.rb: ditto
-
-Tue Dec  9 20:24:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* string.c: [DOC] Add missing documentation around String#chomp.
-	  Patch by @stderr [ci skip][fix GH-780]
-
-Tue Dec  9 18:20:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c: [DOC] Revise documentation by Marcus Stollsteimer at
-	  [ruby-core:66368].  [Bug #10526]
-
-	  * #inspect: be more specific about generated string, remove
-	    obsolete example.
-	  * #nil?: use code examples instead of different call-seq's.
-	  * #tap: clarify what is yielded.
-	  * Integer(): be more specific about to_int and to_i, remove
-	    reference to Ruby 1.8.
-	  * Array(): fix error.
-	  * Class: fix variable name style and indentation in example.
-	  * improve consistency, fix typos and formatting.
-
-Tue Dec  9 12:48:32 2014  Josef Simanek  <josef.simanek@gmail.com>
-
-	* vm_eval.c (rb_eval_string_wrap): [DOC] Fix `rb_eval_string_wrap`
-	  documentation.  It is referencing `require` instead of `load`.
-	  The former does not have the optional argument.  [Fix GH-779]
-
-Tue Dec  9 10:16:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_frame_last_func): return the most recent frame method
-	  name.
-
-	* thread.c (recursive_list_access): use the last method name,
-	  instead of the current method name which can be unset in some
-	  cases, not to use a symbol by the invalid ID.
-	  [ruby-core:66742] [Bug #10579]
-
-Sun Dec  7 19:36:12 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* ext/socket/basicsocket.c, ext/socket/sockssocket.c:
-	  remove code for $SAFE=4.
-
-Sun Dec  7 10:20:55 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc:  Update to RDoc 4.2.0.
-	* test/rdoc:  ditto.
-
-Sun Dec  7 09:52:30 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems 2.4.5.
-	* test/rubygems:  ditto.
-
-Sat Dec  6 10:05:08 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: Fix undefined variable usage & refactor/DRY
-	  code.  Patch by @aledovsky. [Fixes GH-770]
-
-	* test/net/test_imap.rb: related test.
-
-Sat Dec  6 10:09:44 2014  Eric Wong  <e@80x24.org>
-
-	* thread.c (do_select): rename parameters to avoid shadowing
-
-Sat Dec  6 09:22:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rake:  Update to rake 10.4.2
-	* test/rake: ditto.
-
-Sat Dec  6 06:48:03 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (rb_iseq_build_from_ary): remove misc handling
-
-Sat Dec  6 06:14:23 2014  Vit Ondruch  <vondruch@redhat.com>
-
-	* configure.in (RUBY_LIB_VERSION): Fix --with-ruby-version
-	  configuration option.  get rid of quoting in config.status.
-
-	* template/verconf.h.tmpl: quote RUBY_LIB_VERSION here.
-	  [ruby-core:66724] [Bug #10572]
-
-Sat Dec  6 04:33:52 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/pp.rb (File::Stat#pretty_print): some platforms (such as Windows)
-	  does not have major/minor parts of device.
-
-Fri Dec  5 22:43:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/psych/lib/psych.rb: bump version to 2.0.8
-	* ext/psych/psych.gemspec: ditto.
-	* ext/psych/psych_emitter.c: ditto.
-	* ext/psych/psych_parser.c: ditto.
-
-Fri Dec  5 17:09:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (inet_ntop): link aliased inet_ntop in
-	  libruby on mswin not rb_w32_inet_ntop which fails to link for
-	  unknown reason.
-
-Fri Dec  5 11:09:54 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (prepare_iseq_build): remove unused block_opt param
-	  (rb_iseq_new_with_bopt_and_opt): remove
-	  (rb_iseq_new_with_opt): inline removed function
-	  (rb_iseq_new_with_bopt): remove
-	  (iseq_load): adjust prepare_iseq_build call
-	  [Feature #10565]
-
-Fri Dec  5 09:46:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): fix lex_state after tLABEL_END, should
-	  be EXPR_LABELARG to be followed by "paren with arg".
-	  [ruby-core:66705] [Feature #4935]
-
-Fri Dec  5 02:27:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: as all extension objects including initializations
-	  of ext and enc should be linked to libruby if enable-shared,
-	  EXTOBJS should not be linked to main programs.
-	  [ruby-core:66675] [Bug #10566]
-
-Thu Dec  4 07:06:02 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (rb_iseq_build_from_exception): entry->sp is unsigned
-	  (iseq_build_callinfo_from_hash): account for kw_arg
-	  (iseq_build_from_ary_body): update for r35459
-	  (CHECK_STRING, CHECK_INTEGER): remove unused checks
-	  (int_param): new function for checking new `params' hash
-	  (iseq_build_kw): new function for loading rb_iseq_param_keyword
-	  (rb_iseq_build_from_ary): account for `misc' entry and general
-	   structure changes
-	  [Feature #8543]
-	* iseq.c (CHECK_HASH): new macro (for `misc' and `param' entries)
-	  (iseq_load): account for `misc' and `params' hashes
-	  (iseq_data_to_ary): add final opt to arg_opt_labels,
-	   fix kw support, account for unsigned entry->sp
-	* ext/-test-/iseq_load/iseq_load.c: new ext for test
-	* ext/-test-/iseq_load/extconf.rb: ditto
-	* test/-ext-/iseq_load/test_iseq_load.rb: new test
-
-Thu Dec  4 06:56:57 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_free): avoid segfault on incomplete iseq
-	* test/ruby/test_syntax.rb (test_invalid_next): new test
-	  for syntax error, not segfault
-
-Thu Dec  4 04:20:34 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (ruby_require_internal): ignore error detail, just return
-	  an error.
-
-Wed Dec  3 17:13:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (load_encoding): use rb_require_internal instead of
-	  calling rb_require_safe with protection.
-
-Wed Dec  3 16:47:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (register_init_ext, ruby_init_ext): defer running the
-	  registered initialization function until required, not to enable
-	  extensions which have global effects just by loading, e.g.,
-	  mathn/complex and mathn/rational.  fix `make test` with
-	  --with-static-linked-ext.
-
-	* enc/encinit.c.erb (Init_enc): initialize encdb and transdb
-	  directly.
-
-Wed Dec  3 14:51:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (ruby_require_internal): separate from rb_require_safe,
-	  not to raise exceptions.
-
-	* ruby.c (process_options): remove unnatural encoding search.
-
-Wed Dec  3 14:34:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (setup_fake_str): fake string does not share another
-	  string, but just should not free.
-
-Wed Dec  3 11:14:14 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also
-	  `cmd`, so must not free before using `cmd`.
-	  [ruby-core:66648] [Bug #10563]
-
-Wed Dec  3 09:48:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/racc/cparse/cparse.c (cparse_params_type): use typed data.
-
-Tue Dec  2 21:33:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: use typed data for com_hash.
-
-Tue Dec  2 15:30:30 2014  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* array.c (rb_ary_plus): in documentation, added note about
-	  inefficiency of repeated += operations.
-
-Tue Dec  2 07:20:21 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_data_to_ary): keep hidden variables
-	  Thanks to wanabe [ruby-core:66566]
-
-Tue Dec  2 06:46:57 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: bumping version
-
-	* ext/psych/psych.gemspec: ditto
-
-Tue Dec  2 06:34:08 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: support objects that are
-	  marshalable, but inherit from basic object.
-	  Thanks Sean Griffin <sean@thoughtbot.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
-
-	* test/psych/test_marshalable.rb: test for fix
-
-Tue Dec  2 06:32:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (ripper_flush_string_content): preserve the dispatched
-	  results at tSTRING_CONTENT.  [ruby-dev:48714] [Bug #10437]
-
-	* parse.y (regexp_contents): check in ripper only if the whole
-	  content is a single regexp without interpolation.
-	  [ruby-dev:48714] [Bug #10437]
-
-Tue Dec  2 06:30:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_region_copy): new function to try with GC if copy
-	  failed and return the error.
-
-Tue Dec  2 04:43:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (CHECK_REGION_COPIED): onig_region_copy() can fail when
-	  memory exhausted but returns nothing, so check by if allocated.
-
-Tue Dec  2 02:53:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (magic_comment_encoding): enable in ripper, since the
-	  encoding is necessary to parse non-default encoding scripts.
-
-Tue Dec  2 02:30:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic.build):
-	  use hostname= to detect and wrap IPv6 hosts.
-	  Build is accepting URI components and users may not expect
-	  that a host component needs to be wrapped with square brackets
-	  since it's not providing a URI.
-	  Note: initialize with arg_check => true does not wrap IPv6 hosts.
-	  by Joe Rafaniello <jrafanie@redhat.com>
-	  https://github.com/ruby/ruby/pull/765 fix GH-765
-
-	* test/uri/test_generic.rb: Add more tests
-
-Mon Dec  1 20:01:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: use typed data for WIN32OLE.
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_event.c: ditto.
-
-Mon Dec  1 17:20:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (verconf.h): so depends on verconf.mk, which
-	  is rebuilt by setup.mak.
-
-Mon Dec  1 11:05:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* proc.c: fix grammar by @BenMorganIO [fix GH-764][ci skip]
-
-Mon Dec  1 10:49:53 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* man/rake.1: Update latest man content by @aledovsky
-	  [fix GH-771][ci skip]
-
-Mon Dec  1 10:42:31 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/syntax/refinements.rdoc: refinements are no longer experimental.
-	  patch by @gaurish [fix GH-775][ci skip]
-
-Sun Nov 30 20:05:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (regexp_contents): fix a typo.  pointed out by wanabe.
-	  [ruby-dev:48741] [Bug #10543]
-
-Sun Nov 30 18:55:32 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  Don't raise Interrupt.
-
-Sun Nov 30 17:11:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use
-	  assert_separately.
-
-Sun Nov 30 00:02:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options, ruby_script): transcode script name and
-	  program name to locale encoding as well as argv.
-	  [ruby-dev:48752] [Bug #10555]
-
-	* ruby.c (translit_char_bin): should not use code page dependent
-	  CharNext on UTF-8 string.  [ruby-dev:48752] [Bug #10555]
-
-Sat Nov 29 16:53:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_set_argv): convert argv from UTF-8.
-
-	* win32/win32.c (rb_w32_sysinit, cmdglob, w32_cmdvector): convert
-	  wide char command line to UTF-8 argv, and glob in UTF-8 so that
-	  metacharacters would match multibyte characters.
-	  [ruby-dev:48752] [Bug #10555]
-
-Sat Nov 29 10:49:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (win32_direct_conv, rb_w32_readdir): convert UTF-8
-	  and filesystem code page by using Win32 API directly.
-
-Sat Nov 29 09:37:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (syserr_initialize): simplify message building and get
-	  rid of potential invalid byte sequence.
-
-Sat Nov 29 06:09:44 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval_error.c (error_print): respect the encoding of the message.
-
-	* io.c (rb_write_error_str): use rb_w32_write_console() on Windows
-	  if stderr is a tty.
-
-Fri Nov 28 05:10:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (--with-setup): add option to select ext/Setup file.
-
-Fri Nov 28 05:02:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dmyenc.c (Init_enc): separate from dmyext.c for statically
-	  linked extension excluding encoding libraries.
-
-Thu Nov 27 21:58:30 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (miniprelude.c): It does not depend on prelude.rb now.
-
-Thu Nov 27 21:49:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: List up files built always in the source directory
-	  and source files built always in the build directory.
-
-Thu Nov 27 21:24:55 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add obsolete callcc.
-
-Thu Nov 27 19:59:49 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): remove duplicated line event.
-	  [Bug #10449]
-
-	* test/ruby/test_settracefunc.rb: add and fix tests.
-
-Thu Nov 27 19:04:50 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_args.c: fix backtrace location for keyword related exceptions.
-
-	  For example, the following program
-	    def foo(k1: 1); end # line 1
-	    foo(k2: 2)          # line 2
-	  causes "unknown keyword: k2 (ArgumentError)".
-
-	  Before this patch, the backtrace location is only line 2.
-	  However, error should be located at line 1 (over line 2 in
-	  stack trace). This patch fix this problem.
-
-	* class.c (rb_keyword_error_new): separate exception creation logic
-	  from rb_keyword_error(), to use in vm_args.c.
-
-	* vm_insnhelper.c (rb_arg_error_new): rename to rb_arity_error_new().
-
-	* vm_args.c (argument_arity_error): rename to argument_arity_error().
-
-	* vm_args.c (argument_kw_error): added to fix backtrace.
-
-	* test/ruby/test_keyword.rb: add tests.
-
-Thu Nov 27 17:31:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (prelude.c): no longer depends on miniruby, since not
-	  depending on rbconfig.rb.
-
-Thu Nov 27 17:12:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (miniprelude.c): miniruby needs no preludes.
-
-Thu Nov 27 17:10:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/prelude.c.tmpl: no code if no prelude code is given.
-
-Thu Nov 27 13:11:00 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (objspace_malloc_increase): enable lazy sweep on GC by malloc()
-	  (malloc_increase) to make GC incrementally.
-
-	  This change can increase memory consumption. Report us if you find
-	  any problem.
-
-Thu Nov 27 12:46:38 2014  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_s_mkutc): [DOC] Time.utc's 10 arguments form
-	  doesn't examine wday, yday, isdst and tz.
-	  (time_s_mktime): [DOC] Time.mktime's 10 arguments form
-	  doesn't examine wday, yday and tz.
-	  Suggested by naruse.
-
-Thu Nov 27 11:45:33 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_data_to_ary): add missing GC guard
-
-Thu Nov 27 10:51:59 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: add rb_thread_t::local_storage_recursive_hash
-	  to speed up Thread#[:__recursive_key__] access.
-	  [Bug #10511]
-
-	* thread.c (threadptr_local_aref): add fast path for
-	  :__recursive_data__.
-
-	* thread.c (threadptr_recursive_hash, threadptr_recursive_hash_set):
-	  add special accessor for recursive hash.
-
-	* cont.c: store/restore local_storage_recursive_hash.
-
-	* vm.c: init and mark local_storage_recursive_hash.
-
-	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear and restore
-	  local_storage_recursive_hash directly.
-
-Thu Nov 27 07:11:00 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (iseq_calc_param_size): hoist out of iseq_set_arguments
-
-Wed Nov 26 22:28:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_get_kwargs, rb_extract_keywords): export
-	  keyword argument functions.
-
-Wed Nov 26 21:18:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/inlinetest.rb: removed unused test helper.
-
-Wed Nov 26 20:47:28 2014  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* ext/continuation/continuation.c (Init_continuation): obsolete callcc.
-	  first step of [Feature #10548].
-
-Wed Nov 26 19:57:54 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb (test_latest_gc_info): do test separately
-	  to avoid mysterious behavior.
-
-Wed Nov 26 19:54:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (constat_reset): do nothing on non-standard
-	  console emulators.  [ruby-core:66471] [Bug #10546]
-
-Wed Nov 26 19:44:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tsort.rb: Returns an enumerator if no block is given.
-	  [ruby-core:66270] [Feature #10508] Proposed by Andrey Savchenko.
-
-Wed Nov 26 17:25:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_label, f_kw, formal_argument_gen): ignore invalid
-	  formal argument in keyword argument definition.
-	  [ruby-dev:48742] [Bug #10545]
-
-Wed Nov 26 15:32:06 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_set_sequence): use "nop" insn instead of
-	  "jump to next insn".
-	  https://bugs.ruby-lang.org/issues/8543#change-50085
-
-Wed Nov 26 11:01:35 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_s_compile_file): close IO when done
-
-Wed Nov 26 06:06:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: encdb.h and transdb.h depends on $(PREP).
-	  So prebuild files for them in tarball are useless.
-
-Wed Nov 26 02:08:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/make-snapshot: Don't generate enc/trans/newline.c in tarball.
-
-Wed Nov 26 00:41:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (prereq): Don't depends on prelude.c and golf_prelude.c.
-	  Since they depend on $(PREP) which is miniruby, they are rebuilt
-	  after miniruby is built, even if tarball contains them.
-
-Wed Nov 26 00:20:48 2014  Tanaka Akira  <akr@fsij.org>
-
-	* template/prelude.c.tmpl: Don't expand RbConfig::Config[...].
-	  It is not used now.
-
-	* common.mk: prelude.c and golf_prelude.c doesn't depend on rbconfig.
-
-Tue Nov 25 17:07:06 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* NEWS: add an "Implementation changes" section.
-
-Tue Nov 25 16:09:28 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Do not attempt SSL session resumption when the
-	  session is expired.  [Bug #10533]
-
-Tue Nov 25 15:59:46 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake:  Update to rake 10.4.0
-	* test/rake:  ditto.
-	* NEWS:  ditto.
-
-	* test/lib/minitest/unit.rb:  Add compatibility shim for minitest 5.
-	  This only provides minitest 5 unit test naming compatibility.
-
-Tue Nov 25 15:26:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/vcs.rb (get_revisions): use Time.new instead of Time.mktime
-	  which does not accept UTC offset, and offset manually for older
-	  versions than 1.9.
-
-Tue Nov 25 12:14:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (Init_process): initialize static IDs before constant
-	  definitions.  [ruby-core:66445]
-
-Tue Nov 25 10:32:23 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (iseq_build_callinfo_from_hash): hoist out
-	  (iseq_build_from_ary_body): shorten callinfo case
-
-Mon Nov 24 23:03:21 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* gems/bundled_gems: Update to test-unit 3.0.7.
-
-Mon Nov 24 12:44:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (check_exec_redirect_fd, check_exec_redirect),
-	  (rb_execarg_addopt): get rid of inadvertent ID pindown.
-
-Mon Nov 24 02:03:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_setter): preserve encoding of global variable
-	  name in error message.
-
-Mon Nov 24 02:03:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_insn_operand_intern): preserve encoding of method
-	  name in CALL_INFO at disassembling.
-
-Mon Nov 24 02:02:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (must_respond_to): preserve encodings of variable name and
-	  class name in warning message.
-
-Sun Nov 23 10:46:23 2014  Eric Wong  <e@80x24.org>
-
-	* internal.h (struct rb_execarg): 160 => 144 bytes on x86-64
-	* ruby.c (struct load_file_arg): 48 => 40 bytes on x86-64
-	* vm_args.c (struct args_info): ditto
-
-Sun Nov 23 07:46:54 2014  Andy Maloney  <asmaloney@gmail.com>
-
-	* io.c (rb_io_sysread): Remove redundant assignment of 'n'.
-	  [Fix GH-767]
-
-Sat Nov 22 09:48:33 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/make-snapshot: Specify PWD macro for make.
-	  PWD environment variable may not exist.
-
-Fri Nov 21 11:58:58 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/resolv.rb: fall back if canonicalization fails.
-	  Thanks Vit Ondruch for the patch!  [ruby-core:65836]
-
-	* test/resolv/test_dns.rb: test for patch
-
-Sat Nov 22 01:11:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_const_get, rb_mod_const_defined): ditto.
-
-	* variable.c (rb_const_missing, rb_mod_const_missing): call
-	  const_missing without new ID to get rid of inadvertent ID
-	  creation.
-
-Fri Nov 21 19:32:57 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
-
-	* common.mk (ext/ripper/ripper.c): use $(PWD) for Unix,
-	  $(MAKEDIR) for Windows.
-
-Fri Nov 21 18:12:37 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: Refactored.
-
-Fri Nov 21 14:25:40 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (top_srcdir): added because lacking this macro
-	  causes build error at r48526.
-
-Fri Nov 21 12:00:58 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps (in_makefile): Use FILES_NEED_VPATH and
-	  FILES_CONFUSING.
-
-	* ext/objspace/extconf.rb: Add VPATH for id.h
-
-Fri Nov 21 09:10:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ext/ripper/ripper.c): fix dependencies for the case
-	  to make ripper.y and id.h under the build directory.
-
-Fri Nov 21 08:42:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (ext/ripper/ripper.c): id.h in VPATH may exist in the build
-	  directory.
-
-	* common.mk (ext/ripper/ripper.c): $(RM) was not defined.
-
-Fri Nov 21 00:36:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/x509.rb
-	  (OpenSSL::X509::Name::RFC2253DN::StringChar): get rid of a false
-	  positive assertion in ripper's test.
-
-Fri Nov 21 00:29:51 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/net/imap.rb (Net::IMAP::ResponseParser::BEG_REGEXP): no need to
-	  use embed string.
-
-Fri Nov 21 00:19:17 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/uri/mailto.rb (URI::MailTo::EMAIL_REGEXP): should escape `#`.
-
-Thu Nov 20 23:17:11 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: Insert all dependencies found by compiler.
-
-Thu Nov 20 15:51:01 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/depend (nkf.o): add nkf.c as dependency.
-	  bsdmake tries to make nkf.o with nkf-utf8/nkf.c without this.
-
-Thu Nov 20 08:54:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (struct parser_params): reduce size by reordering
-	  members and an unused member.
-
-Thu Nov 20 02:44:27 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Vector#independent? and associated class method
-	  patch by gogo tanaka [#10451]
-
-Thu Nov 20 02:32:34 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Vector#angle_with
-	  Patch by Egunov Dmitriy [#10442]
-
-Thu Nov 20 02:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (ripper_flush_string_content, parser_parse_string):
-	  preserve parsed string content.  [ruby-dev:48714] [Bug #10437]
-
-	* parse.y (ripper_new_yylval): abstract function to create ripper
-	  wrapper, and make it able to hold another object.
-
-Thu Nov 20 01:00:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_named_capture_assign_gen): use predefined ID
-	  instead of rb_intern.
-
-Thu Nov 20 00:54:57 2014  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h (ruby_init_setproctitle): Declare here.
-
-Thu Nov 20 00:26:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): append byte sequence directly to
-	  the delayed content instead of creating an intermediate string
-	  object.
-
-Wed Nov 19 21:11:01 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (ext/json/parser/parser.c): don't touch parse.c,
-	  ruby repo is a downstream.
-
-Wed Nov 19 20:38:11 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (ext/ripper/ripper.c): use $(PWD) to get
-	  <build-directory>/ext/ripper.
-
-Wed Nov 19 18:12:17 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/downloader.rb (RubyGems.download): Don't download gem if the
-	  version is already downloaded. A gem file is versioned and
-	  it must be identical if the version is the same.
-
-Wed Nov 19 17:59:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (ext/ripper/ripper.c): pass build directory as VPATH.
-
-	* ext/ripper/depend (.y.c): use VPATH for y.tab.c.
-
-Wed Nov 19 10:07:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/prelude.c.tmpl (Prelude#translate): strip VPATH prefix
-	  from prelude names, so that srcdir differences do not make the
-	  generated code different.
-
-Wed Nov 19 07:45:11 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write): should set the error of
-	  GetOverlappedResult()'s, not WriteFile()'s (it's always
-	  ERROR_IO_PENDING, of course).
-
-Tue Nov 18 14:16:47 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_record): add information for debug print.
-
-Wed Nov 19 04:49:07 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* debug.c (set_debug_option): need the declaration.
-
-	* debug.c (set_debug_option): use the same macro with the implementation
-	  at win32/win32.c.
-
-Wed Nov 19 04:16:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (symbol_list): fix the node type of literal symbol list
-	  with no interpolation.  [ruby-core:66343]
-
-Wed Nov 19 00:26:15 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: Sort dependencies.
-
-Wed Nov 19 00:24:18 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enc/encdb.c: Include internal.h.
-
-Tue Nov 18 23:23:45 2014  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: Gather declarations in non-header files.
-
-Tue Nov 18 23:45:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* debug.c (SET_WHEN): Don't declare debug variables here.
-	  ruby_initial_gc_stress_ptr is changed int* to VALUE* at r41406.
-
-	* internal.h (ruby_initial_gc_stress_ptr): Declared.
-	  (ruby_enable_coredump): Ditto.
-
-Tue Nov 18 18:06:43 2014  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/io.h (FMODE_WSPLIT): Removed.  The write() system call
-	  is not required to split.  It was useful to avoid whole process
-	  blocking in Ruby 1.8 but not useful since write() is invoked without
-	  GVL.
-	  (FMODE_WSPLIT_INITIALIZED): Ditto.
-
-	* io.c (wsplit_p): Removed.
-	  (io_writable_length): Removed.
-	  (rb_fcntl): Don't update the removed flags.
-
-Tue Nov 18 03:23:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (check_setter_id): show the original argument instead
-	  of nil on TypeError.
-
-Tue Nov 18 03:20:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.h (is_{local,global,instance,attrset,const,class,junk}_sym):
-	  fix ID type names.
-
-Mon Nov 17 20:17:59 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_event.c: use typed data.
-
-Mon Nov 17 12:54:56 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/*, test/rubygems/*: Update to RubyGems 2.4.4
-	  master (2f6e42e).
-
-Mon Nov 17 06:13:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_binding): use the original iseq on a binding from
-	  proc from method object to get the location.
-
-Sun Nov 16 19:38:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_current_receiver): new function to return the
-	  receiver in the current control frame.  [Feature #10195]
-
-Sun Nov 16 19:11:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout::ExitException#exception): rescue
-	  UncaughtThrowError which is specific for throw, instead of
-	  ArgumentError.
-
-Sun Nov 16 18:22:18 2014  Eric Wong  <e@80x24.org>
-
-	* tool/update-deps: warning to disable ccache
-
-Sun Nov 16 13:11:35 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (CCAN_LIST_INCLUDES): Unused variable removed.
-	  (ENCODING_H_INCLUDES): Ditto.
-	  (PROBES_H_INCLUDES): Ditto.
-	  (VM_CORE_H_INCLUDES): Ditto.
-
-Sun Nov 16 11:07:25 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_io.rb (test_readpartial_locktmp):
-	  remove unnecessary begin/end
-
-Sun Nov 16 00:45:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: Specify dependencies for generated C sources.
-
-Sat Nov 15 23:10:45 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: No need to declare dependencies which
-	  will be detected by inference rules.
-
-Sat Nov 15 20:34:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: Include ruby.h and ruby/encoding.h to be
-	  includable without prior inclusion.
-
-Sat Nov 15 20:46:44 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb
-	  (REXMLTests::TestDocument::EntityExpansionLimitTest):
-	  Group tests by general entity and parameter entity.
-
-Sat Nov 15 20:43:31 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb
-	  (REXMLTests::TestDocument::EntityExpansionLimitTest): Define
-	  test XML in each test method because (1) each XML in used only
-	  one test and (2) related data and code should be close.
-
-Sat Nov 15 20:39:06 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb
-	  (REXMLTests::TestDocument::EntityExpansionLimitTest): Use
-	  one test method for one test.
-
-Sat Nov 15 20:16:59 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb
-	  (REXMLTests::TestDocument::EntityExpansionLimitTest): Use
-	  setup and teardown instead of ensure in test.
-
-Sat Nov 15 20:11:34 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb (REXMLTests::TestDocument): Group
-	  entity expansion limit related tests.
-
-Sat Nov 15 20:09:00 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb (REXMLTests::TestDocument::BomTest):
-	  Fix wrong parent class. It doesn't need inherit tests in
-	  TestDocument class.
-
-Sat Nov 15 19:48:59 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (depend_rules): support comments during a line.
-
-	* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
-	  file contains path.
-
-Sat Nov 15 19:25:46 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: Remove comments in Dependency lines.
-	  Notified by usa.
-
-	* enc/depend: Ditto.
-
-	* ext/**/depend: Ditto.
-
-Sat Nov 15 16:28:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_throw_obj): throw UncaughtThrowError instead of
-	  ArgumentError.  [Feature #10480]
-
-Sat Nov 15 14:13:38 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: Extend to fix dependencies.
-
-	* common.mk: Dependencies updated by tool/update-deps.
-
-	* enc/depend: Ditto.
-
-	* ext/**/depend: Ditto.
-
-Fri Nov 14 17:36:48 2014  Tanaka Akira  <akr@fsij.org>
-
-	* tool/update-deps: Support GNU Make 4.0.
-
-Fri Nov 14 16:59:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (default_proc_for_compat_func): check arguments number and
-	  type, and get rid of reentering this default proc.
-
-Fri Nov 14 16:33:06 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): support compatible layer for
-	  GC.stat(symbol) type access.
-
-Fri Nov 14 16:19:08 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): add compatible layer.
-	  From Ruby 2.2, keys of GC.stat are changed [Feature #9924].
-	  To provide compatible layer, GC.stat add a default_proc
-	  (if default_proc of given Hash object is not set).
-
-	  At first use of this compatible layer of interpreter process,
-	  show a warning message like that:
-	  program: GC.stat[:total_allocated_object]
-	  warning message: "warning: GC.stat keys were changed from Ruby
-	  2.1. In this case, you refer to obsolete `total_allocated_object'
-	  (new key is `total_allocated_objects').
-	  Please check <https://bugs.ruby-lang.org/issues/9924>
-	  for more information."
-
-	  Please correct my English message :)
-
-	* hash.c (rb_hash_set_default_proc): export (in internal).
-
-	* internal.h: ditto.
-
-Fri Nov 14 10:41:25 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: guard by #if/#endif with GC_ENABLE_INCREMENTAL_MARK
-	  to hide unused codes.
-
-	* gc.c: similar to GC_ENABLE_LAZY_SWEEP.
-
-Fri Nov 14 10:23:35 2014  Eric Wong  <e@80x24.org>
-
-	* vm_eval.c (rb_eval_cmd): use pre-defined idCall
-
-Fri Nov 14 09:25:44 2014  Eric Wong  <e@80x24.org>
-
-	* vm_eval.c (rb_yield_splat): add missing GC guard
-	  [Bug #10509]
-
-Fri Nov 14 08:12:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gc.c: fix build error caused by implicit conversion with clang.
-
-Fri Nov 14 06:54:06 2014  Eric Wong  <e@80x24.org>
-
-	* insns.def (opt_succ): remove Time#succ optimization
-	  [Feature #10501]
-
-Fri Nov 14 05:29:46 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: refactoring.
-
-	* gc.c: use GC_ENABLE_INCREMENTAL_MARK instead of USE_RINCGC.
-
-	* gc.c (gc_start): check FORCE_MAJOR_GC.
-
-Fri Nov 14 04:51:18 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: Tuning RincGC parameters.
-
-	  Before this patch, gc_marks_step() marks (white -> grey) fixed
-	  number objects. However, this strategy does not fit practical
-	  cases, for example too slow to make progress.
-
-	  This patch changes this strategy how many objects the
-	  gc_marks_step() should handle.
-
-	  We can estimate how many times gc_marks_step() is called during
-	  this major marking (== C) with the free slot number in pooled
-	  pages. We also can estimate the living object number (== L)
-	  using last marked_slots value. We can solve this problem (how
-	  many objects should be process in gc_marks_step()) by L/C.
-
-	* gc.c (rb_objspace_t): add rb_objspace_t::rincgc::pooled_slots and
-	  step_slots.
-
-Fri Nov 14 01:26:47 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (search_response): parse MODSEQ in SEARCH
-	  responses properly.  [ruby-core:64203] [Bug #10112]
-
-Fri Nov 14 01:03:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/envutil.rb: Moved from test/ruby/.
-
-	* test/lib/find_executable.rb: Ditto.
-
-	* test/lib/memory_status.rb: Ditto.
-
-	* test/lib/test/unit.rb: require envutil.
-
-	* test/: Don't require envutil in test files.
-
-Thu Nov 13 21:59:58 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* lib/rexml/document.rb: add REXML::Document#document.
-	  reported by Tomas Hoger <thoger@redhat.com> and patched by nahi.
-
-Thu Nov 13 21:51:56 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/monitor/test_monitor.rb: Use assert_join_threads.
-
-Thu Nov 13 21:45:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl: Don't specify port number.
-
-Thu Nov 13 21:22:35 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/ssl_server.rb: Unused file removed.
-	  It is not used since r16111, Ruby 1.9.1.
-
-Thu Nov 13 18:50:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_ensure): remove obsolete prot_tag comment.  patch by
-	  Jack Danger at [ruby-core:66238].  [misc #10502]
-
-Thu Nov 13 18:10:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (rb_vm_make_proc_lambda): similar to rb_vm_make_proc() with
-	  is_lambda argument.
-
-Thu Nov 13 12:11:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_fstat{,i64}): speed up.  adjusting
-	  timestamps in this function is to get rid of the side effect of
-	  ENV["TZ"].  then, if ENV["TZ"] is not set, no need to adjust.
-	  this change makes File#stat about 60% faster.
-
-Thu Nov 13 11:56:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.c: include "internal.h" for STATIC_ASSERT.
-
-Thu Nov 13 03:56:38 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (struct heap_page): trivial packing
-	  304 => 296 bytes on x86-64
-
-Wed Nov 12 22:50:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gems/bundled_gems: Update to test-unit 3.0.6 and minitest 5.4.3.
-
-Wed Nov 12 22:30:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/*: Update to RubyGems 2.4.3 master (7b1f684).
-
-Wed Nov 12 00:26:37 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_object.rb: Specify an exception class for rescue clause.
-
-	* test/dbm/test_dbm.rb: Ditto.
-
-	* test/gdbm/test_gdbm.rb: Ditto.
-
-	* test/sdbm/test_sdbm.rb: Ditto.
-
-Tue Nov 11 23:43:51 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/fileutils/test_fileutils.rb: Use assert_join_threads.
-
-Tue Nov 11 22:51:14 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/resolv/test_dns.rb: Use assert_join_threads.
-
-Tue Nov 11 22:33:08 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/net/pop/test_pop.rb: Use assert_join_threads.
-
-Tue Nov 11 22:07:20 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/net/http/test_https_proxy.rb: Use assert_join_threads.
-
-Tue Nov 11 18:09:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/prelude.c.tmpl: move from tool/compile_prelude.rb and
-	  expand by generic_erb.rb.
-
-Tue Nov 11 13:01:31 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rubygems/commands/contents_command.rb (files_in_default_gem):
-	  remove useless sort. show_files will sort the result and
-	  another branch, files_in_gem, doesn't sort.
-	  it should be removed for consistency.
-
-	* test/rubygems/test_gem_commands_contents_command.rb
-	  (test_execute_default_gem): adjust the sort algorithm with
-	  Gem::Commands::ContentsCommand#show_files, which sort items
-	  as array of [prefix, basename] not strings.
-
-Tue Nov 11 10:37:09 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (sym_equal): use rb_obj_equal().
-	  rb_obj_equal() is specially optimized in
-	  opt_eq_func()@vm_insnhelper.c.
-
-	  This fix is made from this discussion:
-	  https://www.omniref.com/ruby/2.1.4/symbols/Symbol/%3D%3D#line=8361.
-
-Tue Nov 11 09:38:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rdoc/known_classes.rb: reverted regression changes of
-	  rdoc known class.
-
-Tue Nov 11 00:21:50 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/net/imap/test_imap.rb: Don't ignore exceptions on server
-	  threads.
-
-Mon Nov 10 23:34:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/net/ftp/test_ftp.rb (create_ftp_server): Don't ignore
-	  exceptions on server thread.
-	  Delete read_timeout method call to fix NoMethodError.
-
-Mon Nov 10 20:20:53 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_read): retry with reduced length if cannot to
-	  write any data but no error occurs.
-
-Mon Nov 10 20:04:16 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb: Setup shutdown pipe in listen method.
-
-Mon Nov 10 19:37:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c, include/win32/win32.h (rb_w32_set_nonblock): new
-	  function to support nonblock-mode of pipes.
-
-	* win32/win32.c (rb_w32_read): nonblock-mode pipe returns ERROR_NO_DATA
-	  if there is no data, but also returns it if remote-end is closed.
-
-	* win32/win32.c (rb_w32_write): if cannot to write any data, it may be
-	  blocking.
-
-	* io.c (rb_io_set_nonblock): use rb_w32_set_nonblock for Windows.
-
-	* ext/io/nonblock/nonblock.c (rb_io_nonblock_set): use ruby's API when
-	  setting nonblock-mode.
-
-	* test/ruby/test_io.rb: test nonblock pipes on Windows.
-
-Mon Nov 10 17:24:34 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_getlogin): set login name encoding properly.
-	  [ruby-core:66163] [Bug #10493]
-
-Mon Nov 10 16:20:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/*.rb: Update to RubyGems master(3e36528).
-
-Mon Nov 10 16:09:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_f_kill): [DOC] mention known signal list.
-	  [ruby-core:66162] [Bug #10492]
-
-Mon Nov 10 14:17:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rdoc/*.rb: Update to RDoc 4.2.0.alpha(579a11c)
-
-Mon Nov 10 12:44:39 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb: Less instance variables.
-
-Mon Nov 10 12:19:43 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb (shutdown): Use close() on @shutdown_pipe_w to
-	  notify readability on the read side of the pipe.
-	  write_nonblock() is not usable for pipe on Windows.
-	  (cleanup_shutdown_pipe): Rescue IOError for @shutdown_pipe_w.close.
-
-Mon Nov 10 07:31:59 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb (initialize): Initialize shutdown pipe here
-	  to avoid race condition.
-	  (cleanup_shutdown_pipe): New private method.
-	  (cleanup_listener): Extracted from shutdown method.
-	  Call this method from start method to avoid race condition.
-
-Mon Nov 10 05:57:53 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/webrick/webrick.cgi: Don't use debug mode.
-
-	* test/webrick/webrick_long_filename.cgi: Ditto.
-
-Sun Nov  9 23:25:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (vm_call_super): allow bound proc method to call super
-	  method.
-
-	* vm_insnhelper.c (vm_yield_with_cfunc): push defined class and
-	  bound proc method entry to the control frame.
-
-Sun Nov  9 22:46:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/open-uri: Test server log in server thread.
-
-	* test/webrick: Ditto.
-
-Sun Nov  9 22:28:34 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/httpstatus.rb: require webrick/accesslog for AccessLog.
-
-Sun Nov  9 21:03:59 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/webrick: Fix the argument order of assert_equal.
-
-Sun Nov  9 20:29:01 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/webrick: Store log in an array.
-
-	* test/net/http: Ditto.
-
-	* test/open-uri: Ditto.
-
-Sun Nov  9 18:35:36 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/xmlrpc: Refine log test.
-
-Sun Nov  9 18:33:33 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: Replaced if-else by
-	  case in self.normalized? in parallel to r48309.
-
-Sun Nov  9 18:07:00 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/xmlrpc: Use assert_join_threads.
-
-Sun Nov  9 14:06:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/xmlrpc: Test webrick error log is empty.
-
-Sun Nov  9 13:47:02 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (is_incremental_marking): use #if/#else because
-	  rb_objspace_t::flags::during_incremental_marking is not defined
-	  when GC_ENABLE_INCREMENTAL_MARK is 0.
-
-	* gc.c (will_be_incremental_marking, is_full_marking): similar fix.
-
-Sun Nov  9 12:16:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/securerandom.rb (SecureRandom.gen_random): separate
-	  implementation details and select at the load time.
-
-Sun Nov  9 12:09:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/lib/win32/registry.rb (Win32::Registry::API#Enum{Value,Key):
-	  ditto.
-
-Sun Nov  9 11:48:40 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/net/http: Examine webrick log.
-
-Sun Nov  9 11:45:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gems/bundled_gems: upgraded to test-unit 3.0.5.
-
-Sun Nov  9 11:40:50 2014  Tanaka Akira  <akr@fsij.org>
-
-	* defs/known_errors.def: More errors for FreeBSD.
-
-Sun Nov  9 11:25:11 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gems/bundled_gems: upgraded to power_assert 0.2.0.
-
-Sun Nov  9 10:31:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/securerandom.rb: set the script encoding to make a string
-	  literal in SecureRandom::Kernel32.last_error_message single byte
-	  encoding so msg[] works in bytes, since FormatMessage() returns
-	  the size in TCHARs, not in characters.
-
-Sun Nov  9 09:50:22 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/webrick: Refine log tests.
-
-Sun Nov  9 08:58:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* defs/known_errors.def (EHWPOISON): New errno symbol.
-	  It is defined by glibc-2.16.
-
-Sun Nov  9 05:00:23 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/securerandom.rb (initialize): call the special method for Win32
-	  before checking `/dev/urandom` because we know windows doesn't have it.
-
-Sun Nov  9 04:01:46 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/securerandom.rb (SecureRandom::AdvApi32): split from `initialize`.
-	  thanks @zzak to remember it.
-
-Sun Nov  9 02:05:33 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/net/http/utils.rb: Don't connect to spawned server
-	  before actual test.
-
-Sun Nov  9 01:51:50 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* object.c (Module#const_defined?): [DOC] Revise the documentation.
-	  Patch by Xavier Noria.
-	  [Fixes GH-754] https://github.com/ruby/ruby/pull/754
-
-Sun Nov  9 00:37:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/webrick: Examine log and use assert_join_threads.
-
-Fri Nov  7 00:00:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/unicode_norm_gen.tmpl: expand kompatible_table so that
-	  recursive expansion is not needed at runtime.
-
-Thu Nov  6 23:58:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (pack_pack): escape unprintable characters and preserve
-	  the encoding of warning message.
-
-Thu Nov  6 23:55:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_printable): QUOTE() should not raise an exception
-	  even on invalid byte sequence.
-
-Thu Nov  6 21:44:36 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/test_unicode_normalize.rb: Rename TestNormalize to
-	  TestUnicodeNormalize.
-	  Define constants under TestUnicodeNormalize.
-
-Thu Nov  6 21:22:59 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/open-uri/test_open-uri.rb: Check empty webrick log.
-
-Thu Nov  6 19:27:34 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (unescape_nonascii): cast -1 for the case char is unsigned char.
-	  If char is signed char, for example gcc for ARM or ppc64, it caused
-	  infinite loop.
-	  http://kmuto.jp/build-ruby/arm/ruby-trunk/log/20141106T013005Z.fail.html.gz
-	  http://rubyci.blob.core.windows.net/f19p8/ruby-trunk/log/20141106T090217Z.fail.html.gz
-
-Thu Nov  6 09:53:18 2014  Eric Wong  <e@80x24.org>
-
-	* lib/uri/rfc2396_parser.rb (initialize): reduce bytecode size
-	  2088 => 1332 bytes on 32-bit x86
-
-Thu Nov  6 08:49:49 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: Comment clarification.
-
-Wed Nov  5 23:43:24 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* compile.c (compile_data_alloc): add padding when strict alignment
-	  is required for memory access. Currently, the padding is enabled
-	  only when the CPU is 32-bit SPARC and the compiler is GCC.
-	  [Bug #9681] [ruby-core:61715]
-
-	* compile.c (STRICT_ALIGNMENT): defined if strict alignment is required
-
-	* compile.c (ALIGNMENT_SIZE, ALIGNMENT_SIZE_MASK, PADDING_SIZE_MAX):
-	  new macros for alignment word size, bit mask, max size of padding.
-
-	* compile.c (calc_padding): new function to calculate padding size.
-
-Wed Nov  5 23:24:45 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/open-uri/test_open-uri.rb: Don't ignore webrick's log.
-
-Wed Nov  5 19:20:08 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb: Stop listener loop properly.
-	  [ruby-core:66085] [Bug #10478] Fixed by Charles Nutter.
-
-Wed Nov  5 17:20:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_disable_super, rb_enable_super): warn
-	  as deprecated at build time, instead of ignoring silently or
-	  warning at runtime only.
-
-Wed Nov  5 16:55:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_f_lambda): remove deprecated function, which has been
-	  unavailable from extension libraries.
-
-Wed Nov  5 16:26:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_clear_cache): mark as deprecated, not
-	  only warnings at runtime.
-
-Wed Nov  5 15:05:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_{,l,r}strip_bang): rb_str_subseq() will not
-	  NUL-terminate the result string, in the future, so it will not
-	  be needed in other cases.
-
-Wed Nov  5 14:11:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (lib/unicode_normalize/tables.rb): do nothing unless
-	  BASERUBY is available.  MINIRUBY cannot load extension libraries,
-	  so cannot update Unicode data.
-
-Wed Nov  5 12:13:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by
-	  copying necessary part only.
-
-	* string.c (rb_str_strip_bang, rb_str_strip): ditto.
-
-Wed Nov  5 12:13:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by
-	  copying necessary part only.
-
-	* string.c (rb_str_strip_bang, rb_str_strip): ditto.
-
-Wed Nov  5 10:54:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): terminate
-	  wchar strings with wchar 0.
-
-Tue Nov  4 21:23:22 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32/lib/Win32API.rb: Fiddle::Importer is defined in
-	  fiddle/import.rb and it's not loaded implicitly.
-
-	* ext/win32/lib/Win32API.rb (Win32API#initialize): `import` is a string.
-
-	* ext/win32/lib/Win32API.rb (Win32API#initialize):
-	  Fiddle::Importer::CALL_TYPE_TO_ABI is private constant.
-
-Tue Nov  4 21:20:07 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/securerandom.rb (SecureRandom.random_bytes): use fiddle directly
-	  instead of using Win32API.
-
-Tue Nov  4 21:04:30 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem_request_set_lockfile.rb
-	  (test_relative_path_from): driveletter support.
-
-Tue Nov  4 16:23:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rubygems/test_gem_remote_fetcher.rb (RemoteFetcherCleanup):
-	  close all pooled connections for each tests to fix leaked file
-	  descriptors.
-
-Tue Nov  4 12:51:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (PRIsVALUE), vsnprintf.c (BSD_vfprintf): add
-	  RUBY_PRI_VALUE_MARK to reduce danger of accidental conflict with
-	  plain "%i".  binary incompatible with extension libraries using
-	  PRIsVALUE and built for 2.1 and earlier.  [EXPERIMENTAL]
-
-Tue Nov  4 12:33:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* object.c: fix document of Kernel#String by @suzukaze
-	  [fix GH-743][ci skip]
-
-Tue Nov  4 12:21:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/csv.rb: added documentation for skip_blanks option by @decasia
-	  [fix GH-744][ci skip]
-
-Tue Nov  4 12:09:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/open3.rb: fix code formatting in documentation by @JoshCheek
-	  [fix GH-747][ci skip]
-
-Tue Nov  4 08:57:37 2014  Eric Wong  <e@80x24.org>
-
-	* encoding.c (enc_memsize): remove unnecessary function
-	  [ruby-core:65304]
-
-Mon Nov  3 18:09:39 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/utils.rb: The default of :ignore_listener_error is
-	  changed to false.
-
-Mon Nov  3 14:42:37 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_free): resolve memory leak.
-
-Mon Nov  3 13:49:18 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_memsize): catch up recent changes.
-
-Mon Nov  3 13:38:28 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: change semantics of opt_num and opt_table.
-	  `opt_num' was the number of optional parameters + 1.
-	  `opt_table' has "opt_num" entries.
-
-	  Change them to:
-	  `opt_num' is the number of optional parameters.
-	  `opt_table' has "opt_num + 1" entries.
-
-	  This change simplify parameter fitting logics.
-
-	* compile.c: catch up this change.
-
-	* iseq.c: ditto.
-
-	* proc.c: ditto.
-
-	* vm_args.c: ditto.
-
-Mon Nov  3 11:47:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* NEWS: added period into Matrix section. [ci skip]
-	  [misc #10446][ruby-core:65987]
-
-Mon Nov  3 09:43:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* vm_args.c: fixed build error with clang
-
-Mon Nov  3 09:32:46 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/rfc3986_parser.rb (URI::RFC3986_Parser::RFC3986_URI):
-	  allow '[' and ']' for URI input (and escape). [Bug #10402]
-
-	* lib/uri/generic.rb (URI#query=): escape '[', '\', and ']'.
-
-Mon Nov  3 07:49:34 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: change iseq parameter data structure.
-	  https://bugs.ruby-lang.org/issues/10440#change-49694
-
-	  * change terminology `arg' to `param'.
-	  * move rb_iseq_t::arg_* to rb_iseq_t::param.
-	  * move rb_iseq_t::arg_size to rb_iseq_t::param::size.
-	  * move rb_iseq_t::argc to rb_iseq_t::param::lead_num.
-	  * move rb_iseq_t::arg_opts to rb_iseq_t::param::opt_num.
-	  * move rb_iseq_t::arg_rest to rb_iseq_t::param::rest_start.
-	  * move rb_iseq_t::arg_post_num to rb_iseq_t::param::post_num.
-	  * move rb_iseq_t::arg_post_start to rb_iseq_t::param::post_start.
-	  * move rb_iseq_t::arg_block to rb_iseq_t::param::block_start.
-	  * move rb_iseq_t::arg_keyword* to rb_iseq_t::param::keyword.
-	    rb_iseq_t::param::keyword is allocated only when keyword
-	    parameters are available.
-	  * introduce rb_iseq_t::param::flags to represent parameter
-	    availability. For example, rb_iseq_t::param::flags::has_kw
-	    represents that this iseq has keyword parameters and
-	    rb_iseq_t::param::keyword is allocated.
-	    We don't need to compare with -1 to check availability.
-	  * remove rb_iseq_t::arg_simple.
-
-	* compile.c: catch up this change.
-
-	* iseq.c: ditto.
-
-	* proc.c: ditto.
-
-	* vm.c, vm_args.c, vm_dump.c, vm_insnhelper.c: ditto.
-
-	* iseq.c (iseq_data_to_ary): support keyword argument.
-
-Mon Nov  3 03:39:04 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_method.rb: r48239 makes this test green.
-
-Mon Nov 03 03:02:38 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* rewrite method/block parameter fitting logic to optimize
-	  keyword arguments/parameters and a splat argument.
-	  [Feature #10440] (Details are described in this ticket)
-
-	  Most of complex part is moved to vm_args.c.
-
-	  Now, ISeq#to_a does not catch up new instruction format.
-
-	* vm_core.h: change iseq data structures.
-
-	  * introduce rb_call_info_kw_arg_t to represent keyword arguments.
-	  * add rb_call_info_t::kw_arg.
-	  * rename rb_iseq_t::arg_post_len to rb_iseq_t::arg_post_num.
-	  * rename rb_iseq_t::arg_keywords to arg_keyword_num.
-	  * rename rb_iseq_t::arg_keyword to rb_iseq_t::arg_keyword_bits.
-	    to represent keyword bitmap parameter index.
-	    This bitmap parameter shows that which keyword parameters are given
-	    or not given (0 for given).
-	    It is referred by `checkkeyword' instruction described bellow.
-	  * rename rb_iseq_t::arg_keyword_check to rb_iseq_t::arg_keyword_rest
-	    to represent keyword rest parameter index.
-	  * add rb_iseq_t::arg_keyword_default_values to represent default
-	    keyword values.
-	  * rename VM_CALL_ARGS_SKIP_SETUP to VM_CALL_ARGS_SIMPLE
-	    to represent
-	      (ci->flag & (SPLAT|BLOCKARG)) &&
-	      ci->blockiseq == NULL &&
-	      ci->kw_arg == NULL.
-
-	* vm_insnhelper.c, vm_args.c: rewrite with refactoring.
-
-	  * rewrite splat argument code.
-	  * rewrite keyword arguments/parameters code.
-	  * merge method and block parameter fitting code into one code base.
-
-	* vm.c, vm_eval.c: catch up these changes.
-
-	* compile.c (new_callinfo): callinfo requires kw_arg parameter.
-
-	* compile.c (compile_array_): check the last argument Hash object or
-	  not. If Hash object and all keys are Symbol literals, they are
-	  compiled to keyword arguments.
-
-	* insns.def (checkkeyword): add new instruction.
-	  This instruction check the availability of corresponding keyword.
-
-	  For example, a method "def foo k1: 'v1'; end" is compiled to the
-	  following instructions.
-
-	    0000 checkkeyword     2, 0  # check k1 is given.
-	    0003 branchif         9     # if given, jump to address #9
-	    0005 putstring        "v1"
-	    0007 setlocal_OP__WC__0 3   # k1 = 'v1'
-	    0009 trace            8
-	    0011 putnil
-	    0012 trace            16
-	    0014 leave
-
-	* insns.def (opt_send_simple): removed and add new instruction
-	  "opt_send_without_block".
-
-	* parse.y (new_args_tail_gen): reorder variables.
-	  Before this patch, a method "def foo(k1: 1, kr1:, k2: 2, **krest, &b)"
-	  has parameter variables "k1, kr1, k2, &b, internal_id, krest",
-	  but this patch reorders to "kr1, k1, k2, internal_id, krest, &b".
-	  (locate a block variable at last)
-
-	* parse.y (vtable_pop): added.
-	  This function remove latest `n' variables from vtable.
-
-	* iseq.c: catch up iseq data changes.
-
-	* proc.c: ditto.
-
-	* class.c (keyword_error): export as rb_keyword_error().
-
-	* common.mk: depend vm_args.c for vm.o.
-
-	* hash.c (rb_hash_has_key): export.
-
-	* internal.h: ditto.
-
-Mon Nov  3 02:35:32 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* sample/simple-bench.rb: added to measure performance of simple
-	  lines.
-
-Mon Nov  3 02:33:43 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): show T_STRING more details.
-
-Sun Nov  2 01:30:32 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/test_ssl.rb: Don't ignore errors on listener threads,
-	  as much as possible.
-
-	* test/openssl/test_ssl_session.rb: Ditto.
-
-	* test/openssl/test_partial_record_read.rb: Ditto.
-
-Sat Nov  1 23:11:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/utils.rb (start_server): Don't close sockets before
-	  threads finished.
-
-Sat Nov  1 22:06:24 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/test_ssl_session.rb (test_ctx_client_session_cb): Don't
-	  ignore errors of SSL accept.
-	  (test_ctx_server_session_cb): Ditto.
-
-	* test/openssl/utils.rb (server_loop): Add ignore_ssl_accept_error
-	  argument.
-	  (start_server): Refine threads waits.
-
-	* test/ruby/envutil.rb (assert_join_threads): Show a thread before
-	  backtrace.
-
-Sat Nov  1 20:40:18 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl/utils.rb (start_server, server_loop): Use a
-	  pipe to stop server instead of shutdown/close a listening socket.
-
-Sat Nov  1 19:24:59 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_join_threads): New assertion to
-	  join multiple threads without exceptions.
-
-Sat Nov  1 17:09:32 2014  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (bary_mul_balance_with_mulfunc): Fix free work area
-	  location.
-	  [ruby-dev:48723] [Bug #10464]
-	  [ruby-core:66044] [Bug #10465]
-	  Reported by Kohji Nishihama.
-
-Sat Nov  1 15:45:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parse_atmark): mere atmark and two atmarks without
-	  succeeding identifiers are invalid as instance/class variable
-	  names.
-
-Sat Nov  1 06:31:41 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_variant.c: use typed data.
-
-Fri Oct 31 13:55:28 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/dl/*: remove DL as it is replaced by Fiddle.
-	  [Feature #5458] Thanks to Jonan Scheffler <jonanscheffler@gmail.com>
-	  for this patch
-
-	* test/dl/*: ditto.
-
-Fri Oct 31 15:26:02 2014  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/openssl/test_ssl.rb: Add certificate verification chain
-	  test from JRuby community.
-
-Fri Oct 31 18:58:02 2014  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/psych/test_emitter.rb: Fix line_width test...initial value
-	  is impl-specific and attr assignment always returns LHS.
-
-Fri Oct 31 22:19:30 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest.rb (Digest()): This function should now be
-	  thread-safe.  If you have a problem with regard to on-demand
-	  loading under a multi-threaded environment, preload "digest/*"
-	  modules on boot or use this method instead of directly
-	  referencing Digest::*. [Bug #9494]
-	  cf. https://github.com/aws/aws-sdk-ruby/issues/525
-
-Fri Oct 31 21:33:17 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* test/digest/test_digest.rb: Drop #!.  This no longer runs
-	  stand-alone because it depends on ruby/envutil.
-
-Fri Oct 31 17:22:19 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak: $(APPEND) with some arguments insert a space before
-	  the arguments, so it causes error if the arguments are expected to be
-	  a macro definition.  this fix resolve the build error introduced at
-	  r48210.
-
-Fri Oct 31 16:47:35 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/syslog/lib/syslog/logger.rb (Syslog::Logger::VERSION): Bump
-	  the VERSION to 2.1.0. [ruby-core:64483] [Bug #10159]
-
-Fri Oct 31 16:33:46 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/net/imap.rb (Net::IMAP#fetch): [DOC] Document that
-	  Net::IMAP#fetch will return nil instead of an empty array.
-
-Fri Oct 31 12:54:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (.unicode-tables.time): needs Unicode files always,
-	  and should update after downloading these files.
-	  [ruby-core:66026] [Bug #10461]
-
-Fri Oct 31 10:16:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: reverted r48199, it's unrelated configuration.
-
-Fri Oct 31 09:58:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_unicode_normalize.rb: added unicode version number to
-	  test data location.
-
-Fri Oct 31 09:56:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .gitignore: ignored unicode data with version directories.
-
-Fri Oct 31 09:35:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: tweak build scripts for unicode_normalize.rb.
-
-Thu Oct 30 18:47:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk: fix for the case ALWAYS_UPDATE_UNICODE=no
-
-Thu Oct 30 13:23:23 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: changed Unicode data download location
-	  from latest Unicode version to Unicode 7.0.0.
-
-Thu Oct 30 11:16:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_callee_setup_arg{_complex,}): try conversion
-	  by to_ary for a lambda, as well as a proc.
-	  [ruby-core:65887] [Bug #9605]
-
-Wed Oct 29 21:13:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (gettable_gen): warn circular argument reference, for
-	  transition from 2.1 and earlier.  [ruby-core:65990] [Bug #10314]
-
-Wed Oct 29 20:41:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_params): remove unused member `cur_mid`.
-	  this has been taken over by `in_def` since 1.6.
-
-Wed Oct 29 14:44:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_f_load): path name needs to be transcoded to OS path
-	  encoding.  [ruby-list:49994]
-
-Wed Oct 29 11:48:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (__builtin_setjmp): disable with gcc/clang earlier
-	  than 4.3 on Mac OS X.  [ruby-core:65174] [Bug #10272]
-
-Wed Oct 29 11:43:43 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Generalize Vector#cross_product to arbitrary
-	  dimensions
-	  based on a patch by gogo tanaka [#10074]
-
-Wed Oct 29 11:43:11 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Matrix#adjucate
-	  patch by gogo tanaka [#10056]
-
-Wed Oct 29 11:42:33 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add aliases for Vector#cross & dot
-	  patch by gogo tanaka [#10352]
-
-Wed Oct 29 10:00:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gems/bundled_gems: Update latest version of bundled gems.
-
-Tue Oct 28 16:52:07 2014  Eric Wong  <e@80x24.org>
-
-	* signal.c (install_sighandler): remove rb_disable_interrupt and
-	  rb_enable_interrupt calls
-	  (init_sigchld): ditto
-	  (Init_signal): disable and enable interrupt once around all
-	  install_sighandler and init_sigchld to reduce syscalls at start
-	  [Feature #9345] [ruby-core:59480]
-
-Tue Oct 28 16:22:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options, load_file_internal2): should not
-	  require other files when dump option is given.
-	  [ruby-dev:48712] [Bug #10435]
-
-Tue Oct 28 14:51:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: remove apple-gcc4.2 from CC candidates.
-
-Mon Oct 27 20:13:37 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rexml/entity.rb: keep the entity size within the limitation.
-	  reported by Willis Vandevanter <will@silentrobots.com> and
-	  patched by nahi.
-
-Mon Oct 27 17:17:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (method_proc): the receiver of binding from method should
-	  be same as the receiver of the method.
-	  [ruby-core:65917] [Bug #10432]
-
-Mon Oct 27 16:26:37 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_super.rb: add a test to check block passing.
-
-Mon Oct 27 15:59:26 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: is_incremental_marking(), will_be_incremental_marking():
-	  use `&&' with GC_ENABLE_INCREMENTAL_MARK instead of using
-	  #if/#else/#endif.
-
-Mon Oct 27 13:40:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (gc_sweep_rest): sweep rest pages regardless of whether
-	  lazy sweep is enabled or not.  based on the patch by Masahiro
-	  Ide at [ruby-dev:48706].  [Bug #10431]
-
-Mon Oct 27 11:18:32 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  reduce garbage during forks
-
-Sun Oct 25 12:26:26 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* template/insns.inc.tmpl, insns_info.inc.tmpl, known_errors.inc.tmpl,
-	  minsns.inc.tmpl: fixed path of generating script.
-
-Sun Oct 26 12:24:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/ripper/lib/ripper/sexp.rb (Ripper.sexp, Ripper.sexp_raw):
-	  return nil on error.  [ruby-dev:48678] [Bug #10405]
-
-Sun Oct 25 11:24:24 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* string.c: improved comment.
-
-Sun Oct 26 07:40:11 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_val2variant, ole_invoke): refactoring.
-	  use ole_variant2variant to convert WIN32OLE_VARIANT object to
-	  VARIANT object.
-
-	* ext/win32ole/win32ole_variant.c: refactoring. add
-	  ole_variant2variant.
-	* ext/win32ole/win32ole_variant.h: ditto.
-
-Sat Oct 25 22:28:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (io_binwrite_string): Test writev() failure.
-
-Sat Oct 25 20:19:19 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* test/test-unicode_normalize.rb: added test_us_ascii.
-
-Sat Oct 25 20:09:09 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: added US_ASCII
-	  as trivially supported encoding (is always normalized,
-	  and may appear mixed in with UTF-8 or other Unicode
-	  encodings).
-
-Sat Oct 25 20:01:01 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* test/test-unicode_normalize.rb: added
-	  test_raise_exception_for_non_unicode_encoding.
-
-Sat Oct 25 19:30:30 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* test/test-unicode_normalize.rb: removed unused function.
-
-Sat Oct 25 18:41:41 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* template/unicode_norm_gen.tmpl: Adjusted name of generating file.
-
-Fri Oct 24 22:49:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): dispatch newline and space at fluent
-	  interface, so that the following identifier does not include the
-	  space.  [ruby-dev:48684] [Bug #10411]
-
-Fri Oct 24 20:41:36 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* signal.c (check_reserved_signal_): fix write count since r47991.
-
-Thu Oct 23 21:42:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_delete): now does not call the block given to
-	  the current method.  [ruby-core:65861] [Bug #10413]
-
-Thu Oct 23 19:13:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (rb_method_entry_make): warn redefinition only for
-	  already defined methods, but not for undefined methods.
-	  [ruby-dev:48691] [Bug #10421]
-
-Thu Oct 23 17:19:04 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/source.rb (REXML::IOSource#encoding_updated): Fix a
-	  bug that can't parse XML correctly when
-	  Encoding.default_internal is different with XML
-	  encoding. REXML::Source converts XML encoding on read. So IO
-	  should not convert XML encoding.
-	  Based on patch by NAKAMURA Usaku.
-	  [ruby-dev:48686] [Bug #10418]
-
-	* test/rexml/test_encoding.rb
-	  (REXMLTests::EncodingTester#test_parse_utf16_with_utf8_default_internal):
-	  Add the for the above case.
-
-Thu Oct 23 16:29:02 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_encoding.rb
-	  (REXMLTests::EncodingTester#test_parse_utf16): Use meaningful
-	  test name. "ticket" in the old test name means the ticket in
-	  REXML's issue tracker. The REXML's issue tracker was gone. So
-	  "ticket" is meaningless.
-
-	* test/rexml/data/ticket_110_utf16.xml: Rename to ...
-	* test/rexml/data/utf16.xml: ... this.
-
-Thu Oct 23 16:18:11 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_encoding.rb
-	  (REXMLTests::EncodingTester#test_ticket_110): Fix expected and
-	  actual order.
-	  Patch by NAKAMURA Usaku. Thanks!!!
-
-Thu Oct 23 10:47:16 2014  Eric Wong  <e@80x24.org>
-
-	* insns.def (getlocal,setlocal): add comment to def/opt_operand.def
-
-Thu Oct 23 10:22:41 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  use IO#wait_readable instead of timeout
-
-Thu Oct 23 10:22:24 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  ensure exit! during fork failure
-
-Thu Oct 23 10:21:21 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* NEWS: Added String#unicode_normalize(|!|d?) [ci skip]
-
-Thu Oct 23 03:41:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (unknown_keyword_error): delete expected keywords
-	  directly from raw table, so that the given block is not called.
-	  [ruby-core:65837] [Bug #10413]
-
-Thu Oct 23 02:33:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (update-unicode): invert dependency to run every times.
-	  [ruby-core:65842] [Bug #10415]
-
-	* common.mk (after-update): update files under source tree.
-	  [ruby-core:65840] [Bug #10414]
-
-Wed Oct 22 22:38:59 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override
-	  options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
-	  this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]
-
-Wed Oct 22 21:31:56 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (prelude.c): add dependency to LIB_SRCS because
-	  enc/prelude.rb requires lib/unicode_normalize.rb, and it's also
-	  requires lib/unicode_normalize/tables.rb (=LIB_SRCS).
-
-Wed Oct 22 21:09:51 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* configure.in (nacl_cv_cpu_nick): fix typo in PNaCl.
-	  (XCFLAGS) Add -isystem flag to pnacl and nacl-newlib
-	  (CXX): added
-
-	* nacl/GNUmakefile.in (CXX): Added
-	  (PPROGRAM): Use clang++ instead of clang because libnacl_io
-	  depends on c++ std lib.
-
-Wed Oct 22 21:07:32 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* common.mk (build-ext): avoid trying to build dynamic libraries
-	  if configured --with-static-linked-ext.
-
-Wed Oct 22 20:33:33 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Fixed grammar in comment [ci skip]
-
-Wed Oct 22 19:18:18 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.rb: Fixed escaping of backslash and
-	  double quote ('\\\&' -> "\\\\\\\&"; double quoted string
-	  is needed to make \& mean last match; double double
-	  backslashes are needed because of two layers of escaping).
-
-Wed Oct 22 18:13:29 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/test-unicode_normalize.rb: as often said, ruby is sometimes built
-	  at non-srcdir.
-
-Wed Oct 22 18:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* test/test-unicode_normalize.rb: Adjusted path for test
-	  data file (now ../enc/unicode/data/NormalizationTest.txt).
-
-Wed Oct 22 18:07:07 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* test/test-unicode_normalize.rb: Removed explicit require,
-	  changed method names, adjusted copyright.
-
-Wed Oct 22 18:00:00 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* test/test-unicode_normalize.rb: Importing from
-	  https://github.com/duerst/eprun/blob/master/test/test_normalize.rb.
-	  (removing trailing whitespace, fixing EOLs and adding EOL property)
-
-Wed Oct 22 08:21:09 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* nacl/pepper_main.c (Instance_DidCreate): mount devfs and rebind fd 0
-	  .. 2 so that stderr goes to the console of the browser.
-
-Wed Oct 22 03:47:43 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/etc/etc.c (etc_nprocessors_affin): maximum "n" should be 16384.
-
-Wed Oct 22 03:37:00 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/etc/etc.c (etc_nprocessors_affin): minor spell fix.
-
-Wed Oct 22 03:33:58 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/etc/etc.c (etc_nprocessors_affin): optimize memory usage a
-	  bit. Typical rubyist never use 8k cpus machine.
-
-Wed Oct 22 00:01:09 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* configure.in (XCFLAGS): Add include path for NaCl libraries.
-	  (XLDFLAGS): ditto.
-	  (NACL_LIB_PATH): new substitution
-
-	* nacl/nacl-config.rb: support NACL_LIB_PATH
-
-	* nacl/package.rb: ditto.
-
-	* nacl/pepper_main.c: replace old implementations with nacl_io.
-
-	* nacl/GNUmakefile.in: link nacl_io to pepper_ruby
-
-	* ruby.c (rb_load_file): remove __attribute__((weak)) because the old
-	  override hack was replaced with nacl_io.
-
-	* file.c (rb_file_load_ok): ditto.
-
-Tue Oct 21 17:32:32 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Adding explicit creation of directory
-	  enc/unicode/data because git doesn't handle empty
-	  directories. [patch by Masahiro Ide, filed with r48073]
-
-Tue Oct 21 17:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/tables.rb: Committing to make version
-	  update easier and more predictable, and reducing compilation
-	  time.
-
-Tue Oct 21 15:56:56 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: Added comment to point to
-	  relevant portion of Unicode standard for Hangul (de)composition
-	  identifiers and algorithm.
-
-Tue Oct 21 11:49:16 2014  Andreas Schwab  <schwab@suse.de>
-
-	* gc.c (mark_current_machine_context) [__mc68000__]: Update stack
-	  marking.
-	  (rb_gc_mark_machine_stack) [__mc68000__]: Also handle it here.
-
-Mon Oct 20 23:59:38 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* enc/prelude.rb: we sometimes run ruby without library path (especially
-	  for test), so should permit to run ruby if unicode_normalize.rb is
-	  missing.
-
-Mon Oct 20 23:57:58 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (lib/unicode_normalize/tables.rb): enable running (n)make
-	  in non-srcdir.
-
-Mon Oct 20 23:58:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/downloader.rb: add -a option to always download regardless
-	  existing files.
-
-Mon Oct 20 23:18:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb: no need to convert path separator for COPY because it's
-	  ruby -run cp and it can treat '/' on any platform.
-
-Mon Oct 20 19:54:54 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* config.mk: Added missing data files as targets for
-	  prerequisite update_unicode.
-
-Mon Oct 20 19:06:06 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: revert r48046. The s in sIndex
-	  is not hungarian notation. The variable name sIndex is
-	  directly taken from the relevant part of the Unicode
-	  Standard, where it is written SIndex and stands for
-	  'syllable index'. See pp. 144/145 of
-	  http://www.unicode.org/versions/Unicode7.0.0/ch03.pdf.
-
-Mon Oct 20 12:46:46 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: removing unnecessary 'self'.
-
-Mon Oct 20 12:37:37 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: change method names
-	  in commented-out code. Followup to r48027.
-
-Mon Oct 20 02:23:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_ivar_get), vm_insnhelper.c (vm_getivar): improve
-	  instance variable retrieval performance by checking ruby_verbose
-	  before call of rb_warning and evaluation of its argument.
-	  [ruby-core:65786] [Feature #10396]
-
-Sun Oct 19 23:31:29 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* lib/unicode_normalize.rb: (unicode_normalize!): change method name.
-	  catch up the method name change at r48014. [Feature #10084]
-
-Sun Oct 19 20:05:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/tk/lib/tkextlib/tile/treeview.rb: fix syntax error.
-
-Sun Oct 19 18:39:39 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* enc/prelude.rb: Added automatic loading of
-	  lib/unicode_normalize.rb. This makes sure that all
-	  the methods that are available on String are
-	  available without explicit require.
-
-Sun Oct 19 18:35:35 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: Added a missing
-	  file extension in require statement.
-
-Sun Oct 19 18:13:13 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added a rule to generate
-	  lib/unicode_normalize/tables.rb. This rule still
-	  needs to be integrated into the overall make process.
-
-Sun Oct 19 17:53:53 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Changed to dynamic
-	  loading of actual normalization code and tables.
-
-Sun Oct 19 17:37:37 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Small documentation fix.
-
-Sun Oct 19 17:26:26 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Added documentation.
-
-Sun Oct 19 11:09:09 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.rb, lib/unicode_normalize.rb:
-	  File name change from lib/unicode_normalize/normalize_tables.rb
-	  to lib/unicode_normalize/tables.rb.
-
-Sun Oct 19 10:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Changing method names, see
-	  https://bugs.ruby-lang.org/issues/10084#note-7
-
-Sun Oct 19 10:10:10 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Changing module name.
-
-Sun Oct 19 10:08:08 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Changing require statement,
-	  adjusting copyright.
-
-Sun Oct 19 10:04:04 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize.rb: Importing from
-	  https://github.com/duerst/eprun/blob/master/lib/string_normalize.rb.
-	  (removing trailing whitespace, fixing EOLs and adding EOL property)
-
-Sun Oct 19 09:56:56 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.rb: Changed module name.
-
-Sun Oct 19 09:48:48 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: Changed module name,
-	  adjusted copyright.
-
-Sun Oct 19 09:38:38 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/normalize.rb: Importing from
-	  https://github.com/duerst/eprun/blob/master/lib/normalize.rb.
-
-Sat Oct 18 20:40:52 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_core.h, proc.c, vm_backtrace.c, vm_trace.c:
-	  remove rb_binding_new_with_cfp, and use rb_vm_make_binding instead.
-
-Sat Oct 18 20:38:48 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_core.h, vm.c, proc.c: fix GC mark miss on bindings.
-	  [ruby-dev:48616] [Bug #10368]
-
-	* test/ruby/test_eval.rb: add a test code.
-
-Fri Oct 17 22:47:11 2014  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (pack_unpack): Add casts for char references for 'u'.
-	  Fix line ending recognition algorithm.
-
-Fri Oct 17 21:49:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (pack_unpack): Add casts for char references for 'b' and 'h'.
-
-Fri Oct 17 17:50:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* Avoid undefined behaviors found by gcc -fsanitize=undefined.
-	  gcc (Debian 4.9.1-16) 4.9.1
-
-	* string.c (rb_str_sum): Avoid undefined behavior.
-
-Fri Oct 17 17:43:50 2014  Tanaka Akira  <akr@fsij.org>
-
-	* Avoid undefined behaviors found by gcc -fsanitize=undefined.
-	  gcc (Debian 4.9.1-16) 4.9.1
-
-	* include/ruby/ruby.h (INT2FIX): Avoid undefined behavior.
-
-	* node.h (nd_set_line): Ditto.
-
-	* pack.c (encodes): Ditto.
-	  (pack_unpack): Ditto.
-
-	* regint.h (BIT_STATUS_AT): Ditto.
-	  (BS_BIT): Ditto.
-
-	* time.c (time_mdump): Ditto.
-	  (time_mload): Ditto.
-
-	* vm_core.h (VM_FRAME_MAGIC_MASK): Ditto.
-
-	* vm_trace.c (recalc_add_ruby_vm_event_flags): Ditto.
-
-Fri Oct 17 15:06:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (unescape_nonascii): make dynamically compiled US-ASCII
-	  regexps ASCII-8BIT encoding if binary (hexadecimal, control,
-	  meta) escapes are contained, as well as literal regexps.
-	  [ruby-dev:48626] [Bug #10382]
-
-Fri Oct 17 03:05:08 2014  Eric Wong  <e@80x24.org>
-
-	* test/-ext-/bug_reporter/test_bug_reporter.rb
-	  (test_bug_reporter_add): revert r47972
-	* test/ruby/test_rubyoptions.rb (test_segv_test): revert r47971
-	  [ruby-core:65764]
-
-Thu Oct 16 23:17:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_sigaltstack_size): double default size to get rid
-	  of heap corruption by alternate stack overflow in SEGV handler.
-	  typically happened at fprintf() in control_frame_dump().
-
-Thu Oct 16 22:43:12 2014  Tanaka Akira  <akr@fsij.org>
-
-	* vm_backtrace.c (id2str): Fix a variable name.
-	  [ruby-dev:48642] [Bug #10389]
-
-Thu Oct 16 20:01:26 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_pattern_list): Show number of matched
-	  patterns and characters.
-
-Thu Oct 16 16:26:09 2014  Eric Wong  <e@80x24.org>
-
-	* cont.c (fiber_store): fix WIN32 fibers
-	  [ruby-core:65745] [ruby-core:65758]
-
-Thu Oct 16 15:05:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): do not append already appended
-	  and disposed code fragment.  [ruby-dev:48647] [Bug #10392]
-
-Thu Oct 16 10:35:33 2014  Eric Wong  <e@80x24.org>
-
-	* test/-ext-/bug_reporter/test_bug_reporter.rb
-	  (test_bug_reporter_add): fix race
-
-Thu Oct 16 10:09:02 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_rubyoptions.rb (test_segv_test): fix race
-
-Thu Oct 16 09:17:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cont.c (rb_fiber_t): fix compile error caused by move to
-	  vm_core.h at r47964.  [Feature #10341]
-
-Thu Oct 16 08:58:11 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  avoid killing wrong parent
-
-Thu Oct 16 08:40:04 2014  Eric Wong  <e@80x24.org>
-
-	* cont.c (fiber_store): restore references to next_fib (fix typo)
-
-Thu Oct 16 08:26:08 2014  Eric Wong  <e@80x24.org>
-
-	* cont.c (fiber_store): remove references to nextfib
-	  fix build when FIBER_USE_NATIVE is 0
-
-Thu Oct 16 06:51:35 2014  Knut Franke  <Knut.Franke@gmx.de>
-
-	* vm_core.h: declare rb_fiber_t typedef
-	  (rb_thread_t): fiber and root_fiber become rb_fiber_t * (from VALUE)
-	* vm.c (rb_thread_mark): use rb_fiber_mark_self
-	* cont.c (rb_fiber_t): prev becomes rb_fiber_t * (from VALUE)
-	  (cont_mark, cont_free): simplify conditions
-	  (rb_fiber_mark_self): new function
-	  (fiber_mark): use rb_fiber_mark_self
-	  (cont_save_thread, cont_restore_thread): inline
-	  (cont_restore_thread): simplify
-	  (fiber_setcontext): simplify conditions
-	  (rb_cont_call): remove dereference
-	  (fiber_t_alloc): update for rb_fiber_t->prev type change
-	  (rb_fiber_start): ditto
-	  (fiber_current): extract from rb_fiber_current
-	  (return_fiber): move, simplify type checks
-	  (rb_fiber_current): use fiber_current
-	  (fiber_store): simplify type checks
-	  (fiber_switch): ditto, simplify call to fiber_setcontext,
-	   use fiber_current
-	  (rb_fiber_transfer): update for type changes
-	  (rb_fiber_terminate): move, use fiber_switch
-	  (rb_fiber_resume): update for type changes
-	  (rb_fiber_reset_root_local_storage): ditto
-	  (rb_fiber_yield): use rb_fiber_switch instead of rb_fiber_transfer
-	  (rb_fiber_m_transfer): ditto
-	  [ruby-core:65518] [Feature #10341]
-
-Thu Oct 16 06:25:29 2014  Knut Franke  <Knut.Franke@gmx.de>
-
-	* cont.c (rb_context_t): comment on saved_thread
-	  (cont_save_thread): sparse copy
-	  (cont_init): copy extra fields
-	  (fiber_init): use current thread VM stack size
-	  [ruby-core:65518] [Feature #10341]
-
-Thu Oct 16 06:13:09 2014  Knut Franke  <Knut.Franke@gmx.de>
-
-	* cont.c (cont_capture): remove unnecessary variable
-	  [ruby-core:65518] [Feature #10341]
-
-Thu Oct 16 05:02:31 2014  Knut Franke  <Knut.Franke@gmx.de>
-
-	* cont.c (fiber_store, fiber_switch): simplify
-	  [ruby-core:65518] [Feature #10341]
-
-Thu Oct 16 04:28:41 2014  Knut Franke  <Knut.Franke@gmx.de>
-
-	* cont.c (rb_fiber_t): remove prev_fiber/next_fiber
-	  (fiber_link_join, fiber_link_remove): remove functions
-	  (fiber_free, fiber_init, root_fiber_alloc):
-	   remove references to removed fields and functions
-	  [ruby-core:65518] [Feature #10341]
-
-Wed Oct 15 22:08:37 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/etc/etc.c (etc_nprocessors_affin): Test CPU_ALLOC availability.
-	  CentOS 5 don't have CPU_ALLOC().
-
-Wed Oct 15 18:26:19 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/etc/etc.c (etc_nprocessors_affinity): use sched_getaffinity
-	  for getting precious number of available cpus.
-
-	* ext/etc/etc.c (etc_nprocessors): use etc_nprocessors_affinity if
-	  possible.
-
-	  [Feature #10267] etc-nprocessors-kosaki2.patch
-
-Wed Oct 15 17:53:28 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_pattern_list) Renamed from
-	  assert_regexp_list.
-	  Show multiline string in multi lines.
-
-	* test/-ext-/bug_reporter/test_bug_reporter.rb: Use
-	  assert_pattern_list.
-
-Wed Oct 15 12:26:58 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (assert_regexp_list): New assertion method.
-
-	* test/ruby/test_rubyoptions.rb: Use assert_regexp_list.
-
-Wed Oct 15 07:21:09 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c: min(n) drops elements bigger than the n-th maximum element.
-	  (struct nmin_data): New field to record the n-th maximum element, limit
-	  (nmin_filter): Update limit field.
-	  (nmin_i): Drop too big elements.
-	  (nmin_run): Initialize limit field.
-
-Wed Oct 15 07:00:14 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_optimization.rb (test_string_size): new test
-
-Wed Oct 15 06:51:13 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_optimization.rb (test_string_eq_neq): new test
-	  (test_string_ltlt): ditto
-
-Wed Oct 15 06:50:29 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_optimization.rb (test_hash_aset_with):
-	  assert assignment
-
-Wed Oct 15 04:56:27 2014  Zachary Scott  <e@zzak.io>
-
-	* gc.c (rb_obj_id): [DOC] Fix typo, clean up sentence, and wrap cols
-
-Wed Oct 15 04:53:30 2014  Zachary Scott  <e@zzak.io>
-
-	* error.c: [DOC] Fix case of type in exception message by @tricknotes
-	  [Fixes GH-740] https://github.com/ruby/ruby/pull/740
-
-	* object.c: ditto
-
-Tue Oct 14 21:39:16 2014  Vit Ondruch  <vondruch@redhat.com>
-
-	* tool/rbinstall.rb (gem): Fix permissions of bundled gems
-	  specification files.  [ruby-core:65700] [Bug #10383]
-
-Tue Oct 14 19:15:31 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_record.c: use typed data.
-
-Tue Oct 14 16:23:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (global_symbols): make ids two-dimensional array of
-	  strings and symbols, for write-barrier.
-
-	* symbol.c (global_symbols): make IDs immortal always, instead
-	  of treating dynamic symbols as IDs.
-
-	* iseq.c, marshal.c, string.c: use rb_str_intern instead of
-	  rb_str_dynamic_intern.
-
-	* symbol.c (rb_str_intern): rename rb_str_dynamic_intern.
-
-Tue Oct 14 10:19:10 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_optimization.rb (test_string_freeze): new test
-	  (test_hash_aref_with): ditto
-	  (test_hash_aset_with): ditto
-
-Tue Oct 14 01:27:54 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (nmin_run): max(n) and max_by(n) returns an array in
-	  descending order.
-	  [ruby-core:65452] Suggested by David Grayson.
-
-Mon Oct 13 20:44:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (update-gems): chdir to the target directory and then
-	  add the tool directory to load paths, for older BASERUBY.
-	  [Bug #10372][ruby-core:65630]
-
-Mon Oct 13 17:53:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem.
-	  [Feature #9379][ruby-core:59633]
-	* lib/xmlrpc/config.rb: ditto.
-
-Mon Oct 13 16:32:56 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/find.rb (Find.find): Call to_path for arguments to obtain
-	  strings.
-	  [ruby-core:63713] [Bug #10035] Reported by Herwin.
-
-Mon Oct 13 15:42:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* common.mk: use relative load path for bundled_gems directory.
-	  [Bug #10372][ruby-core:65630]
-
-Mon Oct 13 08:44:06 2014  Zachary Scott  <e@zzak.io>
-
-	* README.EXT: [DOC] fix example missing typedef with patch by
-	  @steveklabnik [Fixes GH-739] https://github.com/ruby/ruby/pull/739
-
-	* README.EXT.ja: ditto.
-
-Mon Oct 13 06:52:09 2014  Eric Wong  <e@80x24.org>
-
-	* array.c (ary_recycle_hash): add RB_GC_GUARD
-	  (rb_ary_diff): remove volatile
-	  [Bug #10369]
-
-Mon Oct 13 03:20:23 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/date/date_core.c: [DOC] Clean up whitespace, examples, and typos
-	  in date_core based on a patch by @vipulnsward [Fixes GH-724]
-	  https://github.com/ruby/ruby/pull/724
-
-Mon Oct 13 02:39:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (remove_duplicate_keys): should not simply eliminate all
-	  value nodes, which may have side effects.
-	  [ruby-core:65625] [Bug #10315]
-
-Sun Oct 12 10:39:16 2014  Zachary Scott  <e@zzak.io>
-
-	* vm.c: [DOC] fix typo by @yui-knk [Fixes GH-738]
-	  https://github.com/ruby/ruby/pull/738
-
-Sun Oct 12 09:24:15 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/test/unit.rb: Hide skips by default.
-
-Sun Oct 12 01:37:11 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* file.c: include sys/time.h only if HAVE_SYS_TIME_H
-
-Sat Oct 11 22:29:40 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* file.c (HAVE_UTIMENSAT): disabled for NativeClient.
-	  Fixes build error.
-
-Sat Oct 11 22:11:58 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* ext/extmk.rb: generates the rule for extinit.$(OBJEXT).
-	  extinit.$(OBJEXT) used to be generated by the builtin rule, thus
-	  didn't accept custom $(CC) and caused linkage error for cross
-	  compiling.
-
-Sat Oct 11 18:46:50 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* include/ruby/intern.h (rb_fd_select): declare struct timeval, or the
-	  struct gets local to the function in C99.
-
-	* file.c (#include): add nacl/stat.h for PNaCl.
-	  (utimes): added a declaration for PNaCl.
-	  (stat_atimespec): stat::st_atimensec is long long but
-	  timespec::tv_nsec is long in PNaCl.
-	  (stat_mtimespec, stat_ctimespec): ditto.
-	  (rb_group_member): disable getgroups unless HAVE_GETGROUPS.
-	  (eaccess): unify the fallback to generic defined(USE_GETEUID).
-
-	* io.c: include sys/time.h for struct timeval.
-	  (rb_close_before_exec): nothing we can do if F_GETFD is not
-	  available.
-	  (ioctl): pnacl newlib actually doesn't have ioctl.
-
-	* process.c (maxgroups): it is used iff
-	   defined(_SC_NGROUPS_MAX) || defined(NGROUPS_MAX) but not
-	   defined(HAVE_GETGROUPS) || defined(HAVE_SETGROUPS).
-	  (obj2gid): fail unless the object is a Fixnum if getgrnam is not
-	  available.
-	  (disable_child_handler_fork_child): sigaction is not available in
-	  PNaCl newlib.
-
-	* configure.in (warnflags, strict_warnflags): avoid -ansi for strlcpy.
-	  (rb_cv_gcc_atomic_builtins): also check
-	  __atomic_or_etch because it is used in ruby_atomic.h.
-	  (rb_cv_gcc_sync_builtins): ditto.
-	  (HAVE_GETGRNAM): added.
-
-Sat Oct 11 15:32:08 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (iseq_build_from_ary_exception): move RB_GC_GUARD
-	  (iseq_build_from_ary_body): use PRIsVALUE instead of RB_GC_GUARD
-
-Sat Oct 11 14:57:08 2014  Eric Wong  <e@80x24.org>
-
-	* string.c (rb_str_intern): remove unnecessary RB_GC_GUARD
-
-Sat Oct 11 13:47:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (remove_duplicate_keys): remove duplicate literal keys,
-	  i.e., symbols and strings.  [ruby-core:65368] [Bug #10315]
-
-	* vm.c (kwmerge_i): override existing keys by new keys.
-	  [ruby-core:65368] [Bug #10315]
-
-	* parse.y (assocs): concatenate splatted literal hashes.  the
-	  former key has precedence even if duplicated literal keys
-	  follow.  [ruby-core:65368] [Bug #10315]
-
-Sat Oct 11 12:27:03 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* configure.in (RUBY_NACL): automatically locate pnacl-clang.
-	  (RUBY_PLATFORM): pnacl instead of le32-nacl.
-
-Sat Oct 11 11:27:14 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* io.c: fix issues in the last two commits. don't disable cloexec for
-	  platforms other than NativeClient.
-
-	* ChangeLog: ditto. add entries for the last two commits.
-
-Sat Oct 11 11:12:00 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* signal.c (install_signalhandler, init_sigchld): allow failure because it
-	  always fails with ENOSYS on NaCl.
-
-Sat Oct 11 11:11:53 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* configure.in (RUBY_NACL and others): merge patch from naclports. Supports PNaCl.
-
-	* dln.c: ditto. replace the old hacky dynamic loading over HTTP with nacl_io.
-
-	* file.c: ditto. tentatively use access(2) instead of eaccess.
-	  (rb_file_load_ok): weaken with attribute but not by postprocess.
-
-	* io.c: ditto.
-	  (socket.h): now NaCl has socket.h
-	  (flock): disable here instead of nacl/ioctl.h
-
-	* nacl/GNUmakefile.in: ditto.
-	  (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY):
-	  respect path to them if they are absolute.
-	  This helps naclports to build ruby in their source tree.
-	  (PROGRAM_NMF, .SUFFIXES): support .pnexe for PNaCl.
-	  (ruby.o, file.o): move the hack to attributes in ruby.c and file.c
-
-	* nacl/ioctl.h: ditto. removed. move the hack to io.c.
-
-	* nacl/nacl-config.rb: ditto. support arm, pnacl and others.
-
-	* nacl/pepper_main.c: ditto. support build in a naclports tree.
-
-	* ruby.c (rb_load_file): ditto. weaken with attribute but not by postprocess.
-
-Sat Oct 11 09:32:00 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/socket/unixsocket.c: [DOC] Fix example to render in HTML
-	  properly, with a patch by @eval [Fixes GH-733]
-	  https://github.com/ruby/ruby/pull/733
-
-Sat Oct 11 04:14:41 2014  Kir Shatrov  <shatrov@me.com>
-
-	* lib/open-uri.rb (OpenURI::Options): add :open_timeout default
-	* (def OpenURI.open_http): check :open_timeout option
-	* (module OpenURI): rdoc for :open_timeout
-	* test/open-uri/test_open-uri.rb (test_open_timeout): new test
-	  [Feature #10361]
-
-Fri Oct 10 11:27:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/io.h (rb_io_mode_flags, rb_io_modenum_flags):
-	  deprecate old macros for compatibility for ruby 1.8 and older.
-
-Thu Oct  9 23:31:47 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* bignum.c (absint_numwords_generic): set an array element after
-	  definition of a variable to fix compile error with older version
-	  of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc.
-	  [Bug #10350] [ruby-dev:48608]
-
-Thu Oct  9 16:15:26 2014  Eric Wong  <e@80x24.org>
-
-	* ext/-test-/st/foreach/extconf.rb: new file
-	* ext/-test-/st/foreach/foreach.c: ditto
-	* test/-ext-/st/test_foreach.rb: ditto
-	  [Feature #10321]
-
-Thu Oct  9 12:40:28 2014  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_hash_aref_sym*.rb: force static symbols
-
-Thu Oct  9 12:38:28 2014  Eric Wong  <e@80x24.org>
-
-	* hash.c (rb_any_hash): remove unnecessary dsym check
-
-Thu Oct  9 07:20:30 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* missing/setproctitle.c: Avoid invalidating argv[1], argv[2],
-	  etc. until the first call to Process.setproctitle, because
-	  the ps command of AIX refers to the argv array.
-	  [Bug #10090]
-
-Thu Oct  9 00:53:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
-	  `Dir[]` not.  the former accepts an optional parameter `flags`,
-	  while the latter accepts arbitrary number of arguments but no
-	  `flags`.  [ruby-core:65265] [Bug #10294]
-
-Wed Oct  8 21:44:10 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_variable.c: use typed data.
-
-Wed Oct  8 16:36:47 2014  gogo tanaka  <mail@tanakakazuki.com>
-
-	* test/ruby/test_syntax.rb: added syntax tests of underscore
-	  arguments.  [Feature #10340][ruby-core:65496]
-
-Wed Oct  8 07:42:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI#inspect): remove Object id.
-	  URI is considered that it doesn't require id.
-
-Wed Oct  8 05:22:42 2014  Eric Wong  <e@80x24.org>
-
-	* ext/etc/etc.c (etc_systmpdir): set default tmplen correctly
-	  Fixup r47826
-
-Wed Oct  8 05:16:32 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add @- and @+ for Matrix and Vector.
-	  patch by gogo tanaka [#10068] [#10069]
-
-Wed Oct  8 04:58:48 2014  John Bachir  <j@jjb.cc>
-
-	* bootstraptest/test_io.rb (assert_finish):
-	  normalize rescue for Timeout::Error
-	* lib/net/ftp.rb (Net#read_timeout): ditto for doc
-	* lib/resolv.rb (Resolv::ResolvTimeout): ditto for subclass
-	* lib/webrick/httprequest.rb (_read_data): ditto for rescue
-	* sample/timeout.rb (p timeout): ditto for call
-	* test/drb/drbtest.rb (test_06_timeout): ditto
-	* test/ruby/test_readpartial.rb (test_open_pipe): ditto
-	* test/thread/test_queue.rb (test_queue_thread_raise): ditto
-	* thread.c (rb_thread_s_handle_interrupt): ditto for doc
-	  [ruby-core:65481] [misc #10339]
-
-Wed Oct  8 04:38:29 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/ruby/test_process.rb (TestProcess#test_setsid): AIX
-	  does not allow Process::getsid(pid) when pid is in a
-	  different session.
-
-Wed Oct  8 04:33:04 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_encoding):
-	  On AIX, locale_charmap is ISO-8859-1 with LANG=C.  This means
-	  the source encoding of stdin is ISO-8859-1, so "invalid
-	  multibyte char" error does not occur.
-
-Wed Oct  8 04:30:29 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Matrix#laplace_expansion.
-	  patch by gogo tanaka [#10073]
-
-Wed Oct  8 04:29:21 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Vector.basis.
-	  Based on patch by gogo tanaka [#10072]
-
-Tue Oct  7 23:40:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_f_kill): get rid of deadlock as unhandled and
-	  discarded signals do not make interrupt_cond signaled.
-	  based on the patch by Kazuki Tsujimoto at [ruby-dev:48606].
-	  [Bug #9820]
-
-Tue Oct  7 22:43:44 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_method.c: use typed data.
-
-Tue Oct  7 21:47:05 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_param.c: refactoring.
-
-Tue Oct  7 21:40:17 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_method.c: refactoring. add
-	  olemethod_data_get_struct to wrap Data_Get_Struct.
-	* ext/win32ole/win32ole_method.h: ditto.
-
-	* ext/win32ole/win32ole_param.c (oleparam_ole_param):
-	  call olemethod_data_get_struct instead of Data_Get_Struct.
-
-Tue Oct  7 11:17:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_systmpdir): try user temporary directory by
-	  confstr() on Mac OS X.
-	  c.f. http://www.opensource.apple.com/source/ruby/ruby-104/patches/ext_etc_etc.c.diff
-
-Tue Oct  7 10:48:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (struct stat.st_size): prefer off_t over int, long,
-	  and so on.  inspired by
-	  http://www.opensource.apple.com/source/ruby/ruby-104/patches/config.h.ed
-
-Tue Oct  7 10:37:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_UNIVERSAL_ARCH): fix missing quoting
-	  brackets.  incorporated from
-	  http://www.opensource.apple.com/source/ruby/ruby-104/patches/configure.diff
-
-Mon Oct  6 23:34:42 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_param.c: use typed data.
-
-Mon Oct  6 22:37:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.h (struct RSymbol): move from internal.h.
-
-Mon Oct  6 21:43:03 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* error.c: update exception tree. [DOC]
-	  reported by @hemge via twitter.
-
-Mon Oct  6 18:43:03 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in: Fix typo. [Bug #9914]
-
-Mon Oct  6 16:23:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_f_kill): should not ignore signal unless the
-	  default handler is registered.  [ruby-dev:48592] [Bug #9820]
-
-Mon Oct  6 16:07:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_string.rb (test_LSHIFT_neary_long_max): enable
-	  only on platforms where string size range is smaller than memory
-	  space.  this test does not make sense but just wastes memory and
-	  time on other platforms, as it is hardly possible that a string
-	  size becomes neary LONG_MAX if long size equals pointer size.
-	  [ruby-core:65410] [Bug #10325]
-
-Mon Oct  6 11:21:21 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.rb: Adding/tweaking comments.
-
-Mon Oct  6 10:57:57 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.rb: Adjusted directory paths.
-
-Mon Oct  6 10:27:27 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.rb: Data generation script imported from
-	  https://github.com/duerst/eprun/blob/master/lib/generate.rb
-
-Mon Oct  6 10:15:15 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Adjust example in documentation for
-	  Downloader.download.
-
-Mon Oct  6 10:07:07 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize: New folder for Unicode normalization
-	  functionality
-
-Sun Oct  5 11:04:13 2014  Luiz Angelo Daros de Luca  <luizluca@gmail.com>
-
-	* ext/digest/{md5,rmd160,sha1,sha2}/extconf.rb: configure OpenSSL
-	  only if bundled libraries is not used, so that OpenSSL is not
-	  linked unnecessarily.  [ruby-core:65404] [Bug #10324]
-
-Sun Oct  5 10:39:11 2014  Luiz Angelo Daros de Luca  <luizluca@gmail.com>
-
-	* ext/digest/rmd160/extconf.rb: fix transform function name to
-	  check.  [ruby-core:65091] [Bug #10252]
-
-Sun Oct  5 05:46:00 2014  Eric Wong  <e@80x24.org>
-
-	* ext/zlib/zlib.c (zstream_mark, zstream_free): update signature
-	  (gzfile_mark, gzfile_free): ditto
-	  (zstream_memsize): new function for rb_data_type->dsize
-	  (gzfile_memsize): ditto
-	  (zstream_data_type, gzfile_data_type): new data types
-	  (zstream_new): Data_Make_Struct => TypedData_Make_Struct
-	  (gzfile_new): ditto
-	  (get_zstream, get_gzfile): Data_Get_Struct => TypedData_Get_Struct
-	  (rb_zstream_flush_next_in): ditto
-	  (rb_zstream_flush_next_out): ditto
-	  (rb_zstream_avail_out): ditto
-	  (rb_zstream_avail_in): ditto
-	  (rb_zstream_closed_p): ditto
-	  (rb_deflate_initialize): ditto
-	  (rb_deflate_init_copy): ditto
-	  (rb_inflate_initialize): ditto
-	  (gzfile_ensure_close): ditto
-	  (rb_gzfile_closed_p): ditto
-	  (rb_gzfile_path): ditto
-	  (rb_gzwriter_initialize): ditto
-	  (rb_gzreader_initialize): ditto
-	  (rb_gzreader_unused): ditto
-	  [ruby-core:65377] [Feature #10319]
-
-Sat Oct  4 16:24:41 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/test_syslog.rb (TestSyslog#test_log): In AIX, each output
-	  line of LOG_PERROR to stderr has an additional empty line appended,
-	  so skip that line.
-
-Sat Oct  4 16:05:49 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/socket/test_unix.rb (TestSocket_UNIXSocket#test_too_long_path):
-	  sockaddr_un.sun_path in AIX is defined as char[1024],
-	  so "a" * 300 is not too long. "a" * 3000 would be enough.
-
-Sat Oct  4 09:12:03 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/win32ole/sample/example*.rb: Add wait input to quit for examples
-	  with patch provided by @windwiny [Fixes GH-705]
-	  https://github.com/ruby/ruby/pull/705
-
-Sat Oct  4 09:08:18 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/win32ole/win32ole.c: [DOC] Fix typo in :nodoc: reported by
-	  @windwiny to [Fix GH-705] https://github.com/ruby/ruby/pull/705
-
-	* ext/pty/pty.c: ditto
-
-Sat Oct  4 08:59:45 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/openssl/ossl_rand.c: [DOC] Add call signature for pseudo_bytes
-	  and random_bytes, wrap lines at 80 chars, and remove useless
-	  comments.
-
-Sat Oct  4 08:49:34 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/openssl/ossl_rand.c: [DOC] Add rdoc for method descriptions
-	  By @vipulnsward [Fixes GH-657] https://github.com/ruby/ruby/pull/657
-
-Sat Oct  4 08:23:48 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/openssl/ossl_rand.c: Use rb_define_module_function instead of
-	  macro. [Fixes GH-686] https://github.com/ruby/ruby/pull/686
-
-Sat Oct  4 06:04:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_method.c(olemethod_set_member): remove
-	  redundant NULL check.
-	* ext/win32ole/win32ole_type.c(oletype_set_member): ditto.
-
-Sat Oct  4 00:25:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: removed needless preparation for gcc.
-
-Fri Oct  3 23:41:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: enabled gcc build with osx on travis.
-
-Fri Oct  3 23:22:23 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* template/fake.rb.in: fix make install failure due to MSYS path
-	  with mingw on MSYS environment.
-	  [ruby-core:64965] [Bug #10230]
-
-Fri Oct  3 21:02:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_io.rb (TestIO#test_advise): avoid to infinite loop.
-
-Fri Oct  3 19:26:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: enabled test results of linux.
-
-Fri Oct  3 18:52:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_io.rb (TestIO#test_advise): added workaround of fadvise(2)
-	  with tmpfs and old linux kernel. [ruby-core:65355][Bug #10313]
-
-Fri Oct  3 18:22:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: Disabled to generate document on travis.
-	  Reduce test running time.
-
-Fri Oct  3 12:42:15 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add hstack & vstack methods.
-	  Based on a patch by creasywuqiong. [Fix GH-344]
-
-Fri Oct  3 12:37:48 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Fix Matrix.rows copy bug.
-	  Patch by Arron Mabrey. [Fix GH-707]
-
-Fri Oct  3 06:06:28 2014  Eric Wong  <e@80x24.org>
-
-	* st.c (next_pow2): new function (from old bignum.c)
-	  (new_size): use next_pow2 function
-
-Fri Oct  3 05:58:58 2014  Eric Wong  <e@80x24.org>
-
-	* vm_trace.c (rb_tp_t): pack 56 => 48 bytes on 64-bit
-
-Thu Oct  2 18:41:45 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_nprocessors): Windows support.
-	  see [Feature #10267]
-
-Thu Oct  2 12:21:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/etc/etc.c (etc_nprocessors): New method.
-	  Accepted by matz at RubyKaigi 2014.
-	  [ruby-core:65142] [Feature #10267]
-
-Thu Oct  2 07:56:49 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (rb_iseq_line_trace_each): explicit cast
-	  Fix https://travis-ci.org/ruby/ruby/jobs/36814282
-
-Thu Oct  2 05:40:05 2014  Eric Wong  <e@80x24.org>
-
-	* ruby.h: set rb_event_flag_t to uint32_t
-	  [ruby-core:65315] [misc #10249]
-
-Thu Oct  2 05:32:17 2014  Eric Wong  <e@80x24.org>
-
-	* io.c (fptr_finalize): free memory before GC sweep
-	  [ruby-core:65269] [Feature #10295]
-
-Thu Oct  2 05:27:24 2014  Eric Wong  <e@80x24.org>
-
-	* marshal.c (w_class): check dump_arg->compat_tbl before lookup
-	  (w_object): lazy init ->compat_tbl before insert
-	  (obj_alloc_by_class): ditto
-	  (clear_dump_arg): free only non-NULL ->compat_tbl
-	  (clear_load_arg): ditto for ->compat_tbl
-	  (marshal_dump): ->compat_tbl defaults to zero
-	  (marshal_load): ditto for ->compat_tbl
-	  (r_entry0): check l->compat_tbl before lookup
-	  (r_fixup_compat): ditto
-	  [ruby-core:65305] [Feature #10302]
-
-Wed Oct  1 21:14:34 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_type.c: use typed data.
-
-Wed Oct  1 18:15:42 2014  Nolan Evans  <nolane@gmail.com>
-
-	* compile.c: remove commented out code.
-
-Wed Oct  1 17:38:53 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/fileutils/test_fileutils.rb: AIX does not allow
-	  a sticky bit on a regular file.
-
-Wed Oct  1 17:31:41 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* NEWS:  Add RubyGems update.
-
-Wed Oct  1 17:28:58 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems 2.4.2.
-	* test/rubygems:  ditto.
-
-Tue Sep 30 22:25:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_data_type): separate ripper data type for from
-	  parser.
-
-Tue Sep 30 18:46:31 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_typelib.c: use typed data.
-
-Tue Sep 30 09:51:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* common.mk: fixed broken reference of update-config_files task
-
-Mon Sep 29 22:54:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (append_wstr): set expanded length, not length of
-	  appended string.  fix "probable buffer overflow" bug.
-	  [ruby-core:65317] [Bug #10304]
-
-	* string.c (str_make_independent_expand): drop NOFREE flag after
-	  reallocation, static buffer is not pointed anymore.
-	  [ruby-core:65317] [Bug #10304]
-
-Sun Sep 28 23:59:17 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gc.c (rb_gcdebug_print_obj_condition): use RVALUE_REMEMBERED
-	  because GET_HEAP_REMEMBERSET_BITS is obsoleted.
-
-Sun Sep 28 11:14:14 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Created new target update-unicode to download
-	  some Unicode data files.
-
-Fri Sep 26 15:03:19 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/uri/rfc3986_parser.rb: raise URI::InvalidURIError when
-	  uri doesn't respond to #to_str. [ruby-core:64453] [Bug #10150]
-
-	* test/uri/test_parser.rb: test for above.
-
-Sat Sep 27 10:31:48 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gems/bundled_gems: upgraded to power_assert 0.1.4.
-
-Fri Sep 26 12:52:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO
-	  should be writable any encoding strings, without conversion.
-	  [ruby-core:65240] [Bug #10285]
-
-Fri Sep 26 05:21:01 2014  Eric Wong  <e@80x24.org>
-
-	* object.c (rb_class_real): do not dereference 0 VALUE
-
-	* test/ruby/test_module.rb (test_inspect_segfault):
-	  Test case and bug report by Thomas Stratmann.
-	  [ruby-core:65214] [Bug #10282]
-
-Fri Sep 26 05:12:10 2014  Eric Wong  <e@80x24.org>
-
-	* man/ruby.1: document stack size env variables
-	  [Feature #10197]
-
-Thu Sep 25 19:37:34 2014  Eric Wong  <e@80x24.org>
-
-	* io.c (free_io_buffer): new function for a common pattern
-	  (clear_readconv): use free_io_buffer
-	  (rb_io_fptr_finalize): ditto
-
-Thu Sep 25 07:51:07 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* lib/matrix.rb: Fix docs. Patched by Ben Woodall. [GH-726]
-
-Wed Sep 24 19:04:04 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/data: New directory for downloaded Unicode
-	  data files.
-
-Wed Sep 24 18:59:59 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Adjusting example for
-	  Downloader.download to implementation changes in r47693.
-
-Wed Sep 24 18:06:06 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Removing unused method
-	  Downloader.download_if_modified_since.
-	  (if ever used, just replace with Downloader.download)
-
-Wed Sep 24 17:59:59 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Fixing raise after return.
-
-Wed Sep 24 17:55:55 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Made Unicode data file location available
-	  via :unicode Symbol.
-
-Wed Sep 24 10:45:45 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Small fix to documentation comment.
-
-Tue Sep 23 22:00:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parse_ident): just after a label, new expression should
-	  start, cannot be a modifier.  [ruby-core:65211] [Bug #10279]
-
-Tue Sep 23 16:07:07 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: added Downloader.download_if_modified_since
-	  to reduce downloads of large files that change only rarely.
-	  [ruby-core:65164] [CommonRuby - Feature #10084]
-
-Tue Sep 23 11:55:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: added rubyspec into travis tasks and eliminate to stdout.
-
-Mon Sep 22 20:00:29 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_variant.rb
-	  (test_conversion_time2date_with_msec): test by using only
-	  assert_in_delta  to avoid to fail when converting Time object with
-	  999999999 nanoseconds into VT_DATE Variant.
-
-Mon Sep 22 19:49:12 2014  Zachary Scott  <e@zzak.io>
-
-	* doc/syntax/methods.rdoc: [DOC] [] and []= methods by @process
-	  [Fixes GH-662] https://github.com/ruby/ruby/pull/662
-
-Mon Sep 22 18:21:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: Only osx build is enabled. linux builds is random failure
-	  and test results of major linux is covered by rubyci.
-
-Mon Sep 22 12:10:29 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
-	  [ruby-core:65058] [Bug #10245] Reported by Vit Ondruch.
-
-Mon Sep 22 09:28:43 2014  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c ({send,recv}msg_args_struct): 24 => 16 bytes
-	* ext/socket/init.c (connect_arg): ditto
-	* ext/socket/raddrinfo.c (getnameinfo_arg): 56 => 48 bytes
-	  (reductions only for 64-bit systems)
-
-Mon Sep 22 02:04:25 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/drb/drb.rb: Support graceful shutdown.
-	  (DRbTCPSocket#initialize): Create a pipe for shutdown notification.
-	  (DRbTCPSocket#close): Invoke close_shutdown_pipe.
-	  (DRbTCPSocket#close_shutdown_pipe): New private method.
-	  (DRbTCPSocket#accept): Use accept_or_shutdown.
-	  (DRbTCPSocket#accept_or_shutdown): New private method which returns
-	  nil on shutdown.
-	  (DRbServer#stop_service): Use shutdown instead of Thread#kill.
-	  (DRbServer#run): Break infinite loop when main_loop returns nil.
-	  (DRbServer#main_loop): @protocol.accept may return nil.
-
-	* lib/drb/ssl.rb: Follow above change.
-
-	* lib/drb/unix.rb: Ditto.
-
-Sun Sep 21 13:54:36 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* time.c: raise exception when minutes of utc_offset is out of 00-59.
-	  patch is from Kenichi Kamiya.
-	  [ruby-dev:47539] [Bug #8679]
-
-	* test/ruby/test_time.rb: test for above.
-	  patch is from Kenichi Kamiya.
-
-Sun Sep 21 19:04:08 2014  Narihiro Nakamura <authornari@gmail.com>
-
-	* st.c (do_hash_bin): unused macro.
-
-Sun Sep 21 18:45:01 2014  Narihiro Nakamura <authornari@gmail.com>
-
-	* parse.y (parser_class_nest): unused variable after YARV
-	  merged (r11439).
-
-Sun Sep 21 18:14:03 2014  Narihiro Nakamura <authornari@gmail.com>
-
-	* st.c (numberof): unused. internal.h has same macro.
-
-	* node.c (F_CUSTOM2): unused.
-
-Sun Sep 21 14:11:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* thread_pthread.c (native_set_thread_name): New function to
-	  set thread name visible with ps command on GNU/Linux.
-	  Ex. ps -o %c -L
-
-	* thread.c (thread_start_func_2): Call native_set_thread_name at
-	  beginning.
-	  (rb_thread_inspect_msg): Extract from rb_thread_inspect.
-
-Sun Sep 21 12:49:11 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.c (rb_iseq_defined_string): trim redundant semi-colon
-
-Sun Sep 21 12:19:29 2014  Eric Wong  <e@80x24.org>
-
-	* file.c (rb_find_file_ext_safe): clear tmp buffer on failure
-	  (rb_find_file_safe): ditto
-
-Sat Sep 20 04:42:18 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/csv.rb: avoid unnecessary object allocations.
-	  patch is from Andrew Vit. [ruby-core:63215] [Feature #9952]
-
-Sun Sep 21 12:10:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rexml/**/*.rb: removed commented-out code.
-
-Sat Sep 20 03:46:58 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* array.c: use rb_equal_opt() for performance improvement.
-	  [ruby-core:64954] [Feature #10227]
-
-Sun Sep 21 11:16:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (rbtime2vtdate, vtdate2rbtime): fix
-	  the bug in conversion of milliseconds. [Bug #10258]
-
-	* test/win32ole/test_win32ole_variant.rb
-	  (test_conversion_dbl2date_with_msec,
-	  test_conversion_time2date_with_msec): use assert_in_delta instead
-	  of assert_equal to treat an acceptable error range.
-
-Sun Sep 21 11:03:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (ruby_signal): although "EINVAL from sigaction(2) is
-	  not a bug", but even it is a failure.  pointed at toRuby/guRuby
-	  in RubyHiroba.
-
-Sat Sep 20 03:00:26 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/tempfile.rb: define parameters appropriately and some
-	  refactoring.
-
-	* lib/tmpdir.rb: ditto.
-
-Sat Sep 20 23:58:21 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_chunk): Deprecate the state management.
-	  (enum_slice_before): Ditto.
-
-Sat Sep 20 15:39:11 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_slice_when): New method: Enumerable#slice_when.
-	  (slicewhen_i): New function.
-	  (slicewhen_ii): New function.
-
-	* enumerator.c (InitVM_Enumerator): New method:
-	  Enumerator::Lazy#slice_when.
-
-	  [ruby-core:62499] [Feature #9826]
-
-Sat Sep 20 11:55:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: added new configurations for osx on travis ci.
-	  [fix GH-723]
-	* test/ruby/test_object.rb: tweaked to memory leak limit for osx build.
-
-Sat Sep 20 10:48:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (assoc): allow quoted ID as a key of a hash literal.
-	  [ruby-core:34453] [Feature #4276]
-
-Sat Sep 20 10:23:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_set_arguments): store local variable IDs in
-	  temporary list as Symbols.  previously these are stored as
-	  Fixnums to prevent from GC, but IDs of dynamic symbols can
-	  exceed Fixnum range and cause RangeError at inverting from
-	  Fixnum.  [ruby-dev:48564] [Bug #10266]
-
-Sat Sep 20 10:02:51 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#pretty_print):
-	  New method.
-	  (OpenSSL::X509::Certificate#pretty_print): Ditto.
-
-	* ext/openssl/lib/openssl/bn.rb (OpenSSL::BN#pretty_print): Ditto.
-
-Sat Sep 20 07:55:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (eval_string_with_cref): fix super from eval with
-	  scope.  set klass in the current control frame to the class of
-	  the receiver in the context to be evaluated, this class/module
-	  must match the actual receiver to call super.
-	  [ruby-core:65122] [Bug #10263]
-
-Fri Sep 19 20:06:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (rb_str_dynamic_intern): check if the stem ID of
-	  attrset ID is already registered as a static ID.
-	  [ruby-dev:48559] [Bug #10259]
-
-Fri Sep 19 15:48:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
-	  under any VCS (it means that the worktree may be from the release
-	  package).
-
-Fri Sep 19 10:47:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_math.rb (TestMath#assert_infinity): Float#finite?
-	  returns true also for NaN, so use Float#infinite? instead.
-	  [ruby-core:65117] [Feature #10261]
-
-Fri Sep 19 05:36:16 2014  Eric Wong  <e@80x24.org>
-
-	* NEWS: note --with-jemalloc option [ci skip]
-
-Thu Sep 18 16:26:27 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem_commands_setup_command.rb: @ui uses StringIO
-	  as its streams, and Encoding.default_external does not effect to
-	  StringIOs already exist.  so, we need to set external_encoding of
-	  @ui.outs directly.  this problem (test failure) does not appear in
-	  the environments default_external is us-ascii or utf-8.
-
-Thu Sep 18 15:02:15 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem_specification.rb: '/' is not always the root.
-
-Thu Sep 18 09:36:37 2014  Scott Francis  <scott.francis@shopify.com>
-
-	* vm_method.c (Init_Method): make global method cache size
-	  configurable by environment variable
-	  "RUBY_GLOBAL_METHOD_CACHE_SIZE"  [Fix GH-719]
-
-Thu Sep 18 07:03:36 2014  Eric Wong  <e@80x24.org>
-
-	* test/-ext-/string/test_modify_expand.rb: increase limit
-	  for {je,tc}malloc [Bug #10236]
-
-Thu Sep 18 06:41:18 2014  Eric Wong  <e@80x24.org>
-
-	* ext/zlib/zlib.c (struct gzfile): pack (288 => 272 bytes) on 64-bit
-
-Thu Sep 18 05:44:05 2014  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_connect): refactor for blocking
-	  (wait_connectable): clear error before wait
-	  [Bug #9356]
-
-Wed Sep 17 23:12:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/rfc3986_parser.rb: specify a regexp for :OPAQUE; generic.rb
-	  assumes it is present, and will refuse all values otherwise.
-	  by Matthew Draper <matthew@trebex.net>
-	  https://github.com/ruby/ruby/pull/718 fix GH-718
-
-Wed Sep 17 16:22:58 2014  Eric Wong  <e@80x24.org>
-
-	* ext/zlib/zlib.c (zlib_mem_alloc): check overflow
-
-Wed Sep 17 11:33:35 2014  Laurent Arnoud  <laurent@spkdev.net>
-
-	* test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof):
-	  added test for long long [fix GH-716]
-
-Wed Sep 17 11:09:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/rbinstall.rb: fixed invalid options with latest rubygems.
-	  https://github.com/rubygems/rubygems/issues/1013
-
-Tue Sep 16 19:19:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* benchmark/bm_app_aobench.rb: update outdated links to the
-	  original program.  [ruby-dev:48550] [Feature #10247]
-
-Tue Sep 16 01:06:40 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* reg*.c: Merge Onigmo 5.15.0 38a870960aa7370051a3544
-
-Mon Sep 15 16:21:10 2014  Eric Wong  <e@80x24.org>
-
-	* io.c (struct io_advise_struct): 32 => 24 bytes on 64-bit
-	* io.c (struct io_internal_writev_struct): 24 => 16 bytes on 64-bit
-	* process.c (struct waitpid_arg): ditto
-
-Mon Sep 15 10:29:25 2014  Natalie Weizenbaum  <nweiz@google.com>
-
-	* ext/pathname/lib/pathname.rb (SAME_PATHS):
-	  Pathname#relative_path_from uses String#casecmp to compare strings
-	  on case-insensitive filesystem platforms (e.g., Windows). This can
-	  return nil for strings with different encodings, and the code
-	  previously assumed that it always returned a Fixnum.  [Fix GH-713]
-
-Mon Sep 15 09:43:18 2014  Sho Hashimoto  <sho.hsmt@gmail.com>
-
-	* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo,
-	  SIZEOF_LONG_LON.  [Fix GH-714]
-
-Mon Sep 15 08:13:40 2014  Matthew Draper  <matthew@trebex.net>
-
-	* sprintf.c (rb_str_format): rational 'f' format works for more
-	  values.  [fix GH-717]
-
-Sun Sep 14 16:57:27 2014  Eric Wong  <e@80x24.org>
-
-	* template/vm.inc.tmpl: "insns.c" => "insns.def"
-	* tool/instruction.rb: typo fix
-
-Sun Sep 14 12:29:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_tracer.rb: fixed testcase for rubygems update.
-
-Sun Sep 14 12:29:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems:  Update to RubyGems 2.4.1 master(713ab65)
-	  Complete history at:
-	  https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216
-
-	* test/rubygems:  ditto.
-
-Sun Sep 14 11:03:24 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: update version
-	* ext/psych/psych.gemspec: ditto
-
-Sun Sep 14 08:43:37 2014  Eric Wong  <e@80x24.org>
-
-	* ccan/container_of/container_of.h (container_of_or_null): added
-	  [ccan 7ec5b8e06b2fd5fa98b1fcde1158c286d2d429d8] (David Gibson)
-
-Sun Sep 14 08:41:44 2014  Eric Wong  <e@80x24.org>
-
-	* ccan/list/list.h (list_del_init, list_node_init): new functions
-	  for multiple list_del() calls
-	  [ccan ec8654d94d3c5c47aa5f82698f7e8048c79765b1] (Rusty Russell)
-
-Sat Sep 13 22:19:26 2014  Bernard Potocki  <bernard.potocki@imanel.org>
-
-	* hash.c (rb_hash_aset): fix misleading example which may suggest
-	  that Hash.store will return self instead of value - Hash#store
-	  is returning value and update itself, as well as Hash#[]=.
-	  [Fix GH-715]
-
-Sat Sep 13 15:16:31 2014  Eric Wong  <e@80x24.org>
-
-	* class.c: use ALLOC(rb_subclass_entry_t)
-
-Sat Sep 13 14:14:00 2014  Eric Wong  <e@80x24.org>
-
-	* process.c (free_exec_arg): remove
-	  (memsize_exec_arg): ptr is never NULL
-	  (exec_arg_data_type): use RUBY_TYPED_DEFAULT_FREE
-
-	* variable.c (autoload_i_free): remove
-	  (autoload_data_i_type): use RUBY_TYPED_DEFAULT_FREE
-	  (autoload_memsize): ptr is never NULL
-
-	* vm_backtrace.c (location_free): remove
-	  (location_mark): ptr is never NULL
-	  (location_data_type): use RUBY_TYPED_DEFAULT_FREE
-	  (backtrace_mark): ditto
-	  (backtrace_free): ditto
-
-Sat Sep 13 13:43:07 2014  Eric Wong  <e@80x24.org>
-
-	* doc/NEWS-2.0.0: fix typo for default RUBY_FIBER_MACHINE_STACK_SIZE
-	  [ci skip]
-
-Sat Sep 13 11:16:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_event.c(ev_advise, ole_event_free,
-	  fev_s_allocate, fev_unadvise): avoid segmentation fault when COM
-	  server freed before calling Unadvise from WIN32OLE_EVENT object.
-	* ext/win32ole/win32ole.c: ditto.
-
-Sat Sep 13 09:47:44 2014  Eric Wong  <e@80x24.org>
-
-	* man/ruby.1: use https for *.ruby-lang.org links
-
-Sat Sep 13 06:31:23 2014  Eric Wong  <e@80x24.org>
-
-	* vm.c (thread_alloc): remove needless volatile
-
-Sat Sep 13 06:13:55 2014  Eric Wong  <e@80x24.org>
-
-	* proc.c (proc_free): remove, use RUBY_TYPED_DEFAULT_FREE
-	  (proc_mark, proc_memsize): remove needless branching
-
-	* vm.c (env_free): remove, use RUBY_TYPED_DEFAULT_FREE
-	  (env_mark, env_memsize): remove needless branching
-
-Sat Sep 13 05:52:15 2014  Eric Wong  <e@80x24.org>
-
-	* proc.c (rb_proc_alloc): inline and move to vm.c
-	  (rb_proc_wrap): new wrapper function used by rb_proc_alloc
-	  (proc_dup): simplify alloc + copy + wrap operation
-	  [ruby-core:64994]
-
-	* vm.c (rb_proc_alloc): new inline function
-	  (rb_vm_make_proc): call rb_proc_alloc
-
-	* vm_core.h: remove rb_proc_alloc, add rb_proc_wrap
-
-	* benchmark/bm_vm2_newlambda.rb: short test to show difference
-
-Sat Sep 13 04:40:04 2014  Eric Wong  <e@80x24.org>
-
-	* process.c (Init_process): subclass Thread as Process::Waiter
-	  (rb_detach_process): use Process::Waiter instead of singleton class
-	  Thanks to headius and nobu. [Bug #10231]
-
-	* test/ruby/test_process.rb (test_process_detach): new test
-
-	* inits.c (rb_call_inits): call Init_Thread before Init_process to
-	  ensure Process::Waiter may be a subclass of Thread
-
-Fri Sep 12 18:14:28 2014  Eric Wong  <e@80x24.org>
-
-	* vm.c (env_alloc): inline to avoid extra zeroing
-	  tiny speedup [ruby-core:64980]
-
-Fri Sep 12 17:13:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (rb_method_entry_make, remove_method): ditto.
-
-Fri Sep 12 14:39:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gems/bundled_gems: Upgraded to test-unit-3.0.1 and minitest-5.4.1
-
-Fri Sep 12 06:55:40 2014  Eric Wong  <e@80x24.org>
-
-	* string.c (Init_frozen_strings): use st_init_table_with_size
-
-Fri Sep 12 06:15:37 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (sym_find): remove Symbol.find because we have Symbol GC now.
-	  https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20140904Japan
-	  If you still want this, request again on Redmine. [Feature #7854]
-	  https://bugs.ruby-lang.org/issues/7854
-
-	* ext/-test-/symbol/init.c (sym_find): moved from string.c for tests.
-
-Fri Sep 12 04:24:03 2014  Eric Wong  <e@80x24.org>
-
-	* insns.def (once): define and use fake RUNNING_THREAD_ONCE_DONE
-	  pointer to indicate is->once.running_thread is done.
-
-	* vm_core.h (iseq_inline_storage_entry): remove done field,
-	  allowing the union to be reduced from 24=>16 bytes on 64-bit
-	  [Feature #10187]
-
-Thu Sep 11 20:10:00 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_thread_mark): use rb_gc_mark_values() to mark VM stack.
-
-Thu Sep 11 19:50:57 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_vm_register_special_exception): make new function to
-	  make and register special exceptions.
-
-	* vm.c (rb_vm_mark): do not need to mark special exceptions
-	  because they are registered by rb_gc_register_mark_object().
-
-	* eval.c (Init_eval): use rb_vm_register_special_exception().
-
-	* gc.c (Init_GC): ditto.
-
-	* proc.c (Init_Proc): ditto.
-
-	* thread.c (Init_Thread): ditto.
-
-Thu Sep 11 19:32:30 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_gc_mark_values): added.
-	  This function is similar to rb_gc_mark_locations(), but not
-	  conservative.
-
-	* internal.h: ditto.
-
-	* vm.c (env_mark): use rb_gc_mark_values() because env values should
-	  be Ruby VALUEs.
-
-Thu Sep 11 19:16:39 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_ptr): rename to gc_mark_set.
-
-	* gc.c (gc_mark): add gc_mark_ptr() to skip is_markable_object()
-	  check. gc_mark_maybe() can use gc_mark_ptr() directly because
-	  passed pointer is checked by is_pointer_to_heap().
-
-Thu Sep 11 18:40:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .gitignore: ignored temporary files and coverage results.
-
-Thu Sep 11 18:15:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .gitignore: ignored only simplecov.
-	* coverage/README: Added coverage docs.
-
-Thu Sep 11 17:25:31 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h, gc.c: add new internal events
-	  RUBY_INTERNAL_EVENT_GC_ENTER and
-	  RUBY_INTERNAL_EVENT_GC_EXIT.
-
-	  When invoking GC process, GC_ENTER event is called.
-	  When exiting from GC process, GC_EXIT event is called.
-
-	  Incremental GC (incremental marking and lazy sweep) can call
-	  these events many times.
-
-	  For example (minor marking):
-	  (1) GC_ENTER
-	  - (2) GC_START (minor GC)
-	    (minor marking)
-	  - (3) GC_END_MARK
-	    (start lazy sweep)
-	  (4) GC_EXIT
-	    (ruby process)
-	  (5) GC_ENTER
-	    (lazy sweep)
-	  (6) GC_EXIT
-	    (ruby process)
-	    (... repeat (5), (6))
-	  (7) GC_ENTER
-	      (finish lazy sweep)
-	    - (8) GC_END_SWEEP
-	  (9) GC_EXIT
-
-	  2nd example (incremental major marking):
-	  (1) GC_ENTER
-	  - (2) GC_START (minor GC)
-	    (start incremental marking)
-	  (3) GC_EXIT
-	    (ruby process)
-	  (4) GC_ENTER
-	    (incremental marking)
-	  (5) GC_EXIT
-	     (ruby process)
-	     (... repeat (4), (5))
-	  (6) GC_ENTER
-	    (finish incremental marking)
-	  - (7) GC_END_MARK
-	    (start lazy sweep)
-	  (8) GC_EXIT
-	    (ruby process)
-	  (9) GC_ENTER
-	    (lazy sweep)
-	  (10) GC_EXIT
-	    (ruby process)
-	    (... repeat (9), (10))
-	  (11) GC_ENTER
-	    (finish lazy marking)
-	  - (12) GC_STOP_SWEEP
-	  (13) GC_EXIT
-
-	  These internal events enable to measure GC pause time completely.
-
-Thu Sep 11 17:04:54 2014  Eric Wong  <e@80x24.org>
-
-	* lib/benchmark.rb: remove CLOCK_MONOTONIC_RAW support
-	  Thanks to Vit Ondruch for reporting the issue on ARM.
-	  [Bug #10202]
-
-Thu Sep 11 14:31:57 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h: freeze nil/true/false.
-	  [Feature #8923]
-
-	* gc.c (should_be_finalizable): check frozen after checkin FL_ABLE.
-
-	* object.c (rb_obj_taint): check
-	  OBJ_TAINTABLE(obj).
-
-	* object.c (rb_obj_freeze): remove immediate_frozen_tbl
-	  because all of immediate values are frozen. YAY!
-
-	* object.c (rb_obj_frozen_p): ditto.
-
-	* test/ruby/test_eval.rb: skip instance_variable_set for
-	  frozen objects.
-
-	* test/ruby/test_weakmap.rb: check ArgumentError instead of
-	  RuntimeError.
-
-Thu Sep 11 10:03:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(21b241a)
-
-Wed Sep 10 17:52:25 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (rb_vm_addr2insn): rename to rb_vm_insn_addr2insn
-	  to clear what address.
-
-Wed Sep 10 16:22:26 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb: fix condition.
-
-Wed Sep 10 15:29:46 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_call_info_t): ci->flag becomes 32-bit unsigned int
-	  ci->index becomes a 32-bit signed int (from signed long).
-	  Reorder for better packing on 64-bit, giving an 8 byte reduction
-	  from 104 to 96 bytes for each ci.
-	  [Feature #10187]
-
-	* compile.c (new_callinfo, setup_args, iseq_compile_each,
-	  iseq_build_from_ary_body): adjust for type changes
-
-	* vm_insnhelper.c (vm_getivar): ditto
-
-Wed Sep 10 15:07:35 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (rb_iseq_translate_threaded_code):
-	  modify in-place w/o copy
-	  (rb_vm_addr2insn): new function for debug
-	  (rb_iseq_original_iseq): ditto
-	  (iseq_set_sequence): assign iseq_encoded directly
-	  [Feature #10185]
-
-	* vm_core (rb_iseq_t): move original ->iseq to bottom
-
-	* iseq.c (iseq_free, iseq_free): adjust for new layout
-	  (rb_iseq_disasm): use original iseq for dump
-	  (iseq_data_to_ary): ditto
-	  (rb_iseq_line_trace_each): ditto
-	  (rb_iseq_build_for_ruby2cext): use iseq_encoded directly
-
-	* vm_dump.c (rb_vmdebug_debug_print_pre): use original iseq
-
-Wed Sep 10 15:00:11 2014  Eric Wong  <e@80x24.org>
-
-	* time.c (time_mark): remove NULL check
-	  (time_memsize): ditto
-	  (time_free): remove, use RUBY_TYPED_DEFAULT_FREE instead
-	  [Feature #10219]
-
-Wed Sep 10 14:14:57 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (encs enc trans libencs libenc libtrans): force to run
-	  enk.mk because common.mk does not know the dependency, but enk.mk
-	  knows. [ruby-dev:48530] [Bug #10220]
-
-Wed Sep 10 11:59:10 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat): update rdoc.
-
-Wed Sep 10 11:52:08 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): rename:
-	  * malloc_increase -> malloc_increase_bytes
-	  * malloc_limit -> malloc_increase_bytes_limit
-	  * oldmalloc_increase -> oldmalloc_increase_bytes
-	  * oldmalloc_limit -> oldmalloc_increase_bytes_limit
-	  ref: [Feature #9924]
-
-Wed Sep 10 11:45:40 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): rename `heap_used' to `heap_allocated_pages'.
-	  ref: [Feature #9924]
-
-	* test/ruby/test_gc.rb: add constraints test for gc stat information.
-
-Wed Sep 10 11:31:16 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): rename:
-	  * remembered_shady_object -> remembered_wb_unprotected_objects
-	  * remembered_shady_object_limit -> remembered_wb_unprotected_objects_limit
-	  * old_object -> old_objects
-	  * old_object_limit -> old_objects_limit
-	  ref: [Feature #9924]
-
-Wed Sep 10 11:12:25 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): support:
-	  * total_allocated_pages
-	  * total_freed_pages
-	  ref: [Feature #9924]
-
-Wed Sep 10 10:48:04 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb: catch up last fix.
-
-Wed Sep 10 10:36:08 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (objspace_total_slot): rename objspace_available_slots.
-
-	* gc.c (objspace_live_slot, objspace_free_slot): rename
-	  ..._slot() to ..._slots().
-
-	* gc.c (objspace_free_slot): should subtract heap_pages_final_slots.
-
-	* gc.c (gc_stat_internal):
-	  * add `heap_available_slots' field
-	  * rename heap_live_slot to heap_live_slots
-	  * rename heap_free_slot to heap_free_slots
-	  ref: [Feature #9924]
-
-Wed Sep 10 07:22:53 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: refactoring for RGENGC_PROFILE > 0.
-
-	  * rename rb_objspace_t::profile::..._count
-	    to rb_objspace_t::profile::total_..._count
-	  * rename promote_infant_types to promote_types
-
-	* gc.c (gc_remember_unprotected): count remembered shady objects here.
-
-Wed Sep 10 03:12:12 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* gc.c (init_mark_stack): MEMZERO() receive type as 2nd argument instead
-	  of size.
-	  Coverity Scan found this bug.
-
-Tue Sep  9 21:55:39 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/sample/excel2.rb: remove some commented-out code.
-	  rotate graph more slowly to see graph clearly.
-
-Tue Sep  9 19:52:33 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename rb_objspace_t::marked_objects to marked_slots.
-
-	* gc.c (gc_marks_start): should be clear first.
-
-	* gc.c (gc_marks_start): remembered shady objects are also marked.
-
-	* gc.c (gc_stat_internal): add heap_marked_slots.
-
-Tue Sep  9 18:58:48 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename
-	  * total_allocated_object_num -> total_allocated_objects
-	  * total_allocated_object_num_at_gc_start -> total_allocated_objects_at_gc_start
-	  * total_freed_object_num -> total_freed_objects
-
-	* gc.c (gc_stat_internal):
-	  * rename total_allocated_object -> total_allocated_objects
-	  * rename total_freed_object -> total_freed_objects
-
-Tue Sep  9 18:51:36 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): fix symbol names
-	  * heap_final_slot -> heap_final_slots
-	  * heap_swept_slot -> heap_swept_slots
-
-Tue Sep  9 18:18:07 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_objspace_t::heap_pages): rename field names:
-	  * used -> allocated_pages
-	  * increment -> allocatable_pages
-	  * length -> sorted_length
-	  And remove unused `limit' field.
-
-	* gc.c: rename macros:
-	  * heap_pages_used -> heap_allocated_pages
-	  * heap_pages_length -> heap_pages_sorted_length
-	  * heap_pages_increment -> heap_allocatable_pages
-
-	* gc.c (gc_stat_internal): fix symbol names
-	  * heap_used -> heap_allocated_pages
-	  * heap_eden_page_length -> heap_eden_pages
-	  * heap_tomb_page_length -> heap_tomb_pages
-	  * heap_increment -> heap_allocatable_pages
-	  * heap_length -> heap_sorted_length
-
-	  ref: [Feature #9924]
-	  https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
-	  Yellow color fields in this table are changed.
-
-	* test/ruby/test_gc.rb: catch up this change.
-
-Tue Sep  9 14:56:03 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: continue layout changing.
-
-	  newobj_of() also touch:
-	  (4) increment total_allocated_object_num
-	  (5) check hook_events
-
-	  And gather fields related to marking phase.
-
-Tue Sep  9 14:21:50 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: fix layout of rb_objspace_t to improve cache locality.
-
-	  newobj_of() accesses:
-	  (1) rb_objspace_t::flags
-	  (2) rb_objspace_t::eden_heap::freelist
-	  (3) and rb_objspace_t::eden_heap::free_pages if freelist is NULL.
-
-Tue Sep  9 14:09:36 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: move rb_objspace_t::flags::gc_stressful after during_gc
-	  to make accessing both parameters easy.
-
-	* gc.c (heap_get_freeobj): add LIKELY() hint.
-
-	* gc.c (heap_get_freeobj_from_next_freepage): ditto.
-
-	* gc.c (newobj_of): check both parameters at once for exceptional
-	  case.
-
-Tue Sep  9 13:51:32 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add rb_objspace_t::flags::gc_stressful and
-	  ruby_gc_stressful macro.
-	  Rename objspace->gc_stress to objspace->gc_stress_mode.
-
-	  If objspace->gc_stress_mode is true (!nil and !false) then
-	  ruby_gc_stressful becomes TRUE.
-
-	  ruby_gc_stressful will speedup newobj_of() slightly.
-
-	* gc.c: initialize ruby_gc_stress(full|_mode) by gc_params.gc_stress
-	  even if ENABLE_VM_OBJSPACE is false.
-
-Tue Sep  9 13:05:50 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove ruby_disable_gc_stress and add ruby_disable_gc
-	  to speed-up newobj_of().
-
-	* gc.c (ready_to_gc): check ruby_disable_gc.
-
-	* signal.c: use ruby_disable_gc.
-
-Tue Sep  9 12:11:41 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename gc_stat entries and check stat transition.
-
-Tue Sep  9 12:06:03 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_sweep_rest): remove wrong modification of during_gc flag.
-
-Tue Sep  9 11:39:41 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: pack boolean values into rb_objspace_t::flags with bit fields
-	  to improve cache locality.
-
-Tue Sep  9 11:11:05 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_object.rb: extend timeout.
-
-Tue Sep  9 09:02:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
-	  $CXXFLAGS, as they are often used by C++ compiler.
-	  [ruby-core:54532] [Bug #8315]
-
-Tue Sep  9 07:03:22 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c: remove needless SYM2ID <-> ID2SYM conversions
-	  [misc #10207]
-
-Tue Sep  9 05:48:42 2014  Eric Wong  <e@80x24.org>
-
-	* symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return
-	  This is not a complete fix for bug 10206, but seems to reduce
-	  that crash and also looks correct.
-
-Tue Sep  9 04:36:24 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_env_t): use flexible array
-	  This reduces allocations and speeds up the lambda calculus
-	  fizzbuzz (bm_app_lc_fizzbuzz.rb) benchmark [ruby-core:64858]
-	* proc.c (get_local_variable_ptr): deconst to adjust for flex array
-	* vm.c (env_mark, env_free, env_memsize): remove check for env->env
-	* vm.c (env_alloc): single allocation for flex array
-	* vm.c (vm_make_env_each): adjust env_alloc call
-
-Mon Sep  8 16:08:22 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_app_lc_fizzbuzz.rb: should skip output on benchmark.
-
-Mon Sep  8 16:04:02 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_app_lc_fizzbuzz.rb: `answer.to_a' does not return
-	  a string, but an array.
-
-Mon Sep  8 13:18:37 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_app_lc_fizzbuzz.rb: added.
-
-	  This program is described closely in "Understanding Computation"
-	  chapter 6 by Tom Stuart. <http://computationbook.com/>
-
-	  Japanese translation will be published soon.
-	  <http://www.oreilly.co.jp/books/9784873116976/>
-
-Mon Sep  8 12:01:39 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add incremental GC algorithm. [Feature #10137]
-
-	  Please refer this ticket for details.
-
-	  This change also introduces the following changes.
-
-	  * Remove RGENGC_AGE2_PROMOTION and introduce object age (0 to 3).
-	    Age can be count with FL_PROMOTE0 and FL_PROMOTE1 flags in
-	    RBasic::flags (2 bit). Age == 3 objects become old objects.
-	  * WB_PROTECTED flag in RBasic to WB_UNPROTECTED bitmap.
-	  * LONG_LIVED bitmap to represent living objects while minor GCs
-	    It specifies (1) Old objects and (2) remembered shady objects.
-	  * Introduce rb_objspace_t::marked_objects which counts marked
-	    objects in current marking phase. marking count is needed to
-	    introduce incremental marking.
-	  * rename mark related function and sweep related function to
-	    gc_(marks|sweep)_(start|finish|step|rest|continue).
-	  * rename rgengc_report() to gc_report().
-	  * Add obj_info() function to get cstr of object details.
-	  * Add MEASURE_LINE() macro to measure execution time of specific line.
-	  * and many small fixes.
-
-	* include/ruby/ruby.h: add flag USE_RINCGC.
-	  Now USE_RINCGC can be set only with USE_RGENGC.
-
-	* include/ruby/ruby.h: introduce FL_PROMOTED0 and add FL_PROMOTED1
-	  to count object age.
-
-	* include/ruby/ruby.h: rewrite write barriers for incremental marking.
-
-	* debug.c: catch up flag name changes.
-
-	* internal.h: add rb_gc_writebarrier_remember() instead of
-	  rb_gc_writebarrier_remember_promoted().
-
-	* array.c (ary_memcpy0): use rb_gc_writebarrier_remember().
-
-	* array.c (rb_ary_modify): ditto.
-
-	* hash.c (rb_hash_keys): ditto.
-
-	* hash.c (rb_hash_values): ditto.
-
-	* object.c (init_copy): use rb_copy_wb_protected_attribute() because
-	  FL_WB_PROTECTED is moved from RBasic::flags.
-
-	* test/objspace/test_objspace.rb: catch up ObjectSpace.dump() changes.
-
-Sun Sep  7 12:47:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: PTHREAD_CANCEL_DISABLE is not defined on Android.
-
-Sat Sep  6 20:59:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (has_privilege): The gid zero is not a privilege.
-
-Sat Sep  6 20:19:16 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (struct child_handler_disabler_state): cancelstate field
-	  added.
-	  (disable_child_handler_before_fork): Record cancelstate.
-	  (disable_child_handler_fork_parent): Restore cancelstate.
-
-Sat Sep  6 19:27:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (struct child_handler_disabler_state): Defined.
-
-Sat Sep  6 18:31:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rake.rb, lib/rake/*, test/rake/*: Update latest rake master(e47d023)
-
-Sat Sep  6 16:38:08 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_variant.c (ole_val2variant_err,
-	  ole_val2variantdata, Init_win32ole_variant): support VT_ERROR
-	  variant with error code. add WIN32OLE_VARIANT::NoParam.
-	* test/win32ole/test_win32ole_variant.rb(test_c_noparam,
-	  test_vt_error_noparam): ditto.
-	* ext/win32ole/win32ole.c: ditto.
-
-Sat Sep  6 11:08:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (arg_ambiguous_gen): fix warning message, "even" does
-	  not mean the number of spaces here.  state the place to put a
-	  space and the operator.  [ruby-core:64790] [Bug #10204]
-
-Sat Sep  6 08:44:40 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
-	  rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
-
-Sat Sep  6 08:10:44 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_io.rb (test_readpartial_locktmp): use IO#nonblock=
-	  Old fcntl invocation may drop necessary flags on some platforms.
-
-Sat Sep  6 07:46:51 2014  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_io.rb (test_readpartial_locktmp): avoid EBADF
-	  [ruby-core:64773] [ruby-core:64775]
-
-Sat Sep  6 01:34:31 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rb_f_exec): Call before_exec_async_signal_safe and
-	  after_exec_async_signal_safe around rb_exec_async_signal_safe.
-	  (rb_exec_async_signal_safe): Don't call
-	  before_exec_async_signal_safe and after_exec_async_signal_safe.
-	  (rb_exec_without_timer_thread): Call before_exec and
-	  after_exec.
-	  (disable_child_handler_fork_child): Make SIGPIPE handler SIG_DFL.
-
-Sat Sep  6 00:49:41 2014  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c (ruby_signal): Don't set SA_SIGINFO for SIG_IGN and
-	  SIG_DFL.
-
-Fri Sep  5 21:45:33 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (disable_child_handler_before_fork): New function.
-	  (disable_child_handler_fork_parent): Ditto.
-	  (disable_child_handler_fork_child): Ditto.
-	  (retry_fork_async_signal_safe): Call above functions to disable
-	  signal handlers in child process.
-
-Fri Sep  5 21:02:54 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (handle_fork_error): Make try_gc_p argument volatile to
-	  suppress "clobbered" warning.
-
-Fri Sep  5 20:48:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (handle_fork_error): Don't need state_p argument.
-
-Fri Sep  5 20:35:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (has_privilege): Fix a return value.
-
-Fri Sep  5 19:00:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/shellwords.rb: proofreading documentation.
-	  [Bug #10155][ruby-core:64471]
-
-Fri Sep  5 18:34:33 2014  Laurent Arnoud  <laurent@spkdev.net>
-
-	* test/csv/test_row.rb: Added some missing tests in CSV.
-	  [fix GH-710]
-	* test/csv/test_table.rb: ditto.
-
-Fri Sep  5 12:57:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (has_privilege): Refine uid/gid check.
-
-Fri Sep  5 12:40:55 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: Check sys/id.h, getuidx and getgidx for AIX.
-
-	* process.c (getresuid): Defined for AIX.
-	  (getresgid): Ditto
-	  AIX don't have getresuid/getresgid but getuidx/getgidx.
-
-Fri Sep  5 12:28:21 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (has_privilege): Fix assignments.
-
-Fri Sep  5 11:10:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rdoc/generator/pot/po.rb: fixed broken tests for trailing whitespace.
-	* test/rdoc/test_rdoc_generator_pot.rb: ditto.
-	* test/rdoc/test_rdoc_generator_pot_po.rb: ditto.
-
-Fri Sep  5 10:41:07 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/rdoc/test_rdoc_rdoc.rb (TestRDocRDoc#test_parse_file_encoding):
-	  typofix.
-
-Fri Sep  5 10:39:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(313287)
-
-Fri Sep  5 06:04:22 2014  Eric Wong  <e@80x24.org>
-
-	* vm.c: remove unused USE_THREAD_RECYCLE [misc #10198]
-
-Fri Sep  5 00:29:08 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in (dirfd): Check function.
-
-	* dir.c (dir_fileno): New method.
-	  [ruby-dev:48265] [Feature #9880]
-
-Thu Sep  4 23:39:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (has_privilege): New function.
-	  (retry_fork_async_signal_safe): Don't use vfork() for privileged
-	  process.
-
-	* configure.in (getresuid): Check function.
-	  (getresgid): Ditto.
-
-Thu Sep  4 20:22:14 2014  Laurent Arnoud  <laurent@spkdev.net>
-
-	* test/pathname/test_pathname.rb: added testcase for Pathname#mountpoint?.
-	  [fix GH-709]
-
-Thu Sep  4 20:09:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* symbian/*: removed Symbian support.
-	  [Feature #10199][ruby-core:64725]
-	* dln.c: ditto.
-	* include/ruby/defines.h: ditto.
-	* thread_pthread.c: ditto.
-	* vm.c: ditto.
-
-Thu Sep  4 17:44:40 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* dir.c (glob_helper): use #ifdef instead of #if.
-	  gcc's -Wundef option shows warning for undefined macro.
-
-	* numeric.c (flo_is_finite_p): ditto.
-
-	* vm_dump.c (rb_vmdebug_thread_dump_state): ditto.
-
-	* vm_core.h: define VM_DEBUG_VERIFY_METHOD_CACHE to 0.
-
-Thu Sep  4 03:57:46 2014  Eric Wong  <e@80x24.org>
-
-	* man/ruby.1: spelling fix ("bellow" => "below") [ci-skip]
-
-Thu Sep  4 03:52:16 2014  Eric Wong  <e@80x24.org>
-
-	* man/ruby.1: add trailing slash to URLs [ci-skip]
-
-Wed Sep  3 19:10:28 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (before_fork_ruby): Renamed from before_fork.
-	  (after_fork_ruby): Renamed from after_fork.
-
-Wed Sep  3 18:56:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (forked_child): Removed.
-
-Wed Sep  3 16:56:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_obj_copy_ivar): allocate no memory for empty
-	  instance variables.  [ruby-core:64700] [Bug #10191]
-
-Wed Sep  3 12:05:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (retry_fork_async_signal_safe): Use vfork() if available.
-	  vfork() is still faster than fork() especially when the parent
-	  process uses big memory.
-
-	  ruby -rbenchmark -e 'a = "a" * 1_000_000_000; puts Benchmark.measure { system("true") }'
-	  fork:   0.000000   0.010000   0.010000 (  0.014968)
-	  vfork:  0.000000   0.000000   0.000000 (  0.000912)
-	  on Debian sid.
-
-Wed Sep  3 11:33:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
-	  added timeout into testcase for low performance environment.
-	  [Bug #9984][ruby-core:63367]
-
-Wed Sep  3 07:50:15 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: Use AC_FUNC_FORK.
-
-	* io.c: Use HAVE_WORKING_FORK instead of HAVE_FORK.
-
-	* process.c: Ditto.
-
-Wed Sep  3 00:12:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (retry_fork_async_signal_safe): Don't return on in child
-	  process.
-
-Tue Sep  2 23:47:35 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (retry_fork_async_signal_safe): Specialized version of
-	  retry_fork respect to rb_fork_async_signal_safe.
-	  (retry_fork_ruby): Specialized version of retry_fork respect to
-	  rb_fork_ruby.
-	  (rb_fork_ruby): Removed.
-
-Tue Sep  2 23:26:26 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (send_child_error): Simplified.
-	  (recv_child_error): Ditto.
-
-Tue Sep  2 22:56:25 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rb_fork_async_signal_safe): Inline rb_fork_internal.
-	  (rb_fork_ruby): Ditto.
-	  (rb_fork_internal): Removed.
-	  (chfunc_protect): Removed.
-
-Tue Sep  2 22:43:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io.rb (test_new_with_block): Set autoclose to avoid
-	  EBADF.
-
-Tue Sep  2 22:01:51 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* Makefile.in (update-coverage): Remove a never executed line.
-
-Tue Sep  2 19:48:26 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (handle_fork_error): Extracted from retry_fork.
-
-Tue Sep  2 17:02:53 2014  Vit Ondruch  <v.ondruch@tiscali.cz>
-
-	* tool/rbinstall.rb: fixed error of local installation.
-	  [Bug #10192][ruby-core:64702]
-
-Tue Sep  2 16:58:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/runner.rb: reporting test coverage for test-all with COVERAGE env.
-	  [Feature #10189][ruby-core:64681][fix GH-708]
-	* Makefile.in: added task for coverage report.
-	* common.mk: added definition of forked simplecov url.
-	* .gitignore: ignored coverage directory.
-
-Mon Sep  1 20:11:02 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (rbtime2vtdate): try to convert millisecond
-	  of Time object to millisecond of VT_DATE VARIANT.
-	* test/win32ole/test_win32ole_variant.rb
-	  (test_conversion_time2date_with_msec): ditto.
-
-Sun Aug 31 16:58:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/benchmark.rb: Fix a syntax error.
-
-Sun Aug 31 08:46:44 2014  Eric Wong  <e@80x24.org>
-
-	* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE
-	  [Bug #10101]
-
-	* test/zlib/test_zlib.rb (test_rewind): test each_byte
-
-Sat Aug 30 19:22:47 2014  Eric Wong  <e@80x24.org>
-
-	* symbol.c (rb_sym2id): do not return garbage object
-
-Sat Aug 30 06:39:48 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and
-	  loading. Fixes GH #85. Thanks @brentdax for the patch!
-	* test/psych/test_exception.rb: test for fix
-
-Sat Aug 30 06:23:40 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that
-	  look like integers but have a newline. Fixes GH #189
-	* test/psych/test_string.rb: test for fix
-
-Sat Aug 30 06:10:39 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash
-	  should merge the hash in to the parent.
-	* test/psych/test_merge_keys.rb: test for change. Fixes GH #202
-
-Sat Aug 30 06:00:26 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings
-	  should not be treated as merge keys.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys
-	  containing "<<" should roundtrip.
-	* test/psych/test_merge_keys.rb: test for change. Fixes GH #203
-
-Fri Aug 29 17:56:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/net/imap/test_imap_response_parser.rb: removed needless code.
-
-Fri Aug 29 17:36:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/rinda/test_rinda.rb: removed useless assignment variables.
-	* test/rss/rss-assertions.rb: ditto.
-	* test/rss/test_maker_itunes.rb: ditto.
-
-Fri Aug 29 16:18:26 2014  Eric Wong  <e@80x24.org>
-
-	* string.c: revert part of r47311, add rb_vm_fstring_table(),
-	  remove vm_core.h dependency. [ruby-core:64627]
-
-Fri Aug 29 15:17:13 2014  Eric Wong  <e@80x24.org>
-
-	* string.c: remove static frozen_strings
-	* string.c (Init_frozen_strings): new function
-	* string.c (rb_fstring): remove check for frozen strings,
-	  use per-VM table
-	* string.c (rb_str_free): use per-VM table
-	* string.c (Init_String): use per-VM table
-	* vm_core.h (rb_vm_t): add frozen_strings table
-	* internal.h (Init_frozen_strings): new function prototype
-	* eval.c (ruby_setup): call Init_frozen_strings
-	  [Feature #10182]
-
-Wed Aug 27 23:10:24 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/tempfile.rb: remove "require 'thread'". its features are no
-	  longer used.
-
-Wed Aug 27 21:19:40 2014  gogo tanaka  <mail@tanakakazuki.com>
-
-	* lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation.
-	  [Feature #10174][ruby-core:64584]
-	* lib/erb.rb: ditto.
-	* lib/observer.rb: ditto.
-	* lib/rake/invocation_chain.rb: ditto.
-	* lib/rubygems/command_manager.rb: ditto.
-	* lib/rubygems/config_file.rb: ditto.
-	* lib/uri/common.rb: ditto.
-
-Wed Aug 27 21:08:20 2014  gogo tanaka  <mail@tanakakazuki.com>
-
-	* lib/drb/drb.rb: use attr_reader instead of Module#attr.
-	  [Feature #10172][ruby-core:64582]
-	* lib/irb/ruby-token.rb: ditto.
-	* lib/net/telnet.rb: ditto.
-	* lib/rdoc/ruby_token.rb: ditto.
-	* lib/thwait.rb: ditto.
-
-Wed Aug 27 19:52:33 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecond
-	  of VT_DATE VARIANT to nsec of Time object.
-	* test/win32ole/test_win32ole_variant.rb
-	  (test_conversion_dbl2date_with_msec): ditto.
-
-Wed Aug 27 09:57:29 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_complex.rb: removed unreachable code.
-	* test/ruby/test_rational.rb: ditto.
-
-Wed Aug 27 07:59:17 2014  Eric Wong  <e@80x24.org>
-
-	* compile.c (iseq_set_sequence): check for multiplication overflow
-
-Tue Aug 26 22:07:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_complex.rb: cherry-picked working assertions from r47251.
-	* test/ruby/test_rational.rb: cherry-picked working assertions from r47263.
-
-Tue Aug 26 21:07:56 2014  gogo tanaka  <mail@tanakakazuki.com>
-
-	* lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**):
-	  remove as these are now built-in.  [ruby-core:63973] [Bug #10086]
-
-Tue Aug 26 20:46:55 2014  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (rb_time_unmagnify_to_float): Avoid double rounding.
-	  Reported by Tsuyoshi Sawada.
-	  https://bugs.ruby-lang.org/issues/10135#note-1
-
-Tue Aug 26 17:12:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_close): ignore only "closed stream" IOError and
-	  NoMethodError, do not swallow other exceptions at the end of
-	  block.  [ruby-core:64463] [Bug #10153]
-
-Tue Aug 26 13:46:33 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* template/fake.rb.in: fix failed to make install when @srcdir@ is
-	  absolute path.
-
-Tue Aug 26 13:43:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_range.rb: added workaround for VERBOSE message.
-
-Tue Aug 26 12:38:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_mathn.rb: added workaround for VERBOSE messages.
-
-Tue Aug 26 11:44:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/shell/process-controller.rb: removed commented-out code.
-
-Tue Aug 26 11:39:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/thwait.rb (ThreadsWait): removed needless constant.
-
-Tue Aug 26 09:27:10 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/mathn.rb: mathn library is deprecated on ruby 2.2.
-	  [Feature #10169][ruby-core:64553]
-
-Tue Aug 26 09:25:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/mathn.rb: removed commented-out code.
-
-Mon Aug 25 20:15:50 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(fole_s_connect, fole_initialize): raise a
-	  security error with the tainted string object.
-	* ext/win32ole/win32ole_event.c(ev_advise): ditto.
-	* test/win32ole/test_win32ole.rb(test_s_new_exc_svr_tainted,
-	  test_s_new_exc_host_tainted): ditto.
-	* test/win32ole/test_win32ole_event.rb(test_s_new_exc_tainted): ditto.
-
-Mon Aug 25 12:56:54 2014  Ivan Korunkov  <ivankorunkov@ya.ru>
-
-	* lib/logger.rb (format_datetime): use "%6N" to show microsecond.
-	  [Fix GH-704]
-
-Mon Aug 25 11:02:07 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_iseq_location_t): change first_lineno type to VALUE
-	* iseq.c (rb_iseq_build_for_ruby2cext): update based on argument
-
-Sun Aug 24 16:14:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/e2mmap.rb: remove needless instance variables.
-	* lib/irb.rb: ditto.
-	* lib/irb/**/*.rb: ditto.
-	* lib/shell.rb: ditto.
-
-Sun Aug 24 12:44:26 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_complex.rb: removed needless conditions.
-	* test/ruby/test_rational.rb: ditto.
-
-Sun Aug 24 11:47:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_rational.rb: fixed indent.
-
-Sun Aug 24 11:44:11 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_rational.rb: remove commented-out code.
-
-Sun Aug 24 11:09:29 2014  Eric Wong  <e@80x24.org>
-
-	* lib/benchmark.rb (measure): reduce allocations as in r47260
-
-Sun Aug 24 10:35:54 2014  Pete Higgins  <pete@peterhiggins.org>
-
-	* lib/benchmark.rb (module Benchmark): define BENCHMARK_CLOCK
-	  (realtime): use Process.clock_gettime(BENCHMARK_CLOCK)
-	  Reduces allocations to improve performance [Feature #10165]
-
-	* test/benchmark/test_benchmark.rb (test_realtime_output): new test
-
-Fri Aug 22 20:23:54 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (rb_fstring): fix condition (easy to cause infinite loop!).
-
-Fri Aug 22 20:07:43 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (rb_fstring, fstr_update_callback): simply delete garbage
-	  key first.
-
-	  Garbage keys can be swept by lazy sweeping invoked by creating new
-	  fstring.  So that simply do:
-	  (1) delete garbage key and return `fstr_update_callback' immediately
-	  (2) try again `fstr_update_callback()' to create a new fstr.
-
-	  This bug can be cause memory corruption, reported by
-	  http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20140821T220302Z.fail.html.gz
-
-Fri Aug 22 19:30:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_complex.rb: removed commented-out code.
-
-Fri Aug 22 19:25:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_complex.rb: fixed broken tests. Math is not
-	  compatible CMath now.
-
-Fri Aug 22 15:36:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (Doxyfile): revert r43888, not to require preinstalled
-	  ruby.  [ruby-core:64488] [Bug #10161]
-
-Fri Aug 22 12:32:15 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/shell.rb: removed commented-out code.
-	* lib/shell/builtin-command.rb: ditto.
-	* lib/shell/command-processor.rb: ditto.
-
-Fri Aug 22 12:21:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/complex.rb: removed deprecated library.
-	* lib/rational.rb: ditto.
-
-Fri Aug 22 11:38:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/prettyprint.rb: removed PrettyPrint#first?
-	  because it is obsoleted method since Ruby 1.8.2
-
-Thu Aug 21 17:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (constat_attr): manage reverse video internally
-	  since Windows console window does not manage it.  based on the
-	  patch by white leaf in [ruby-dev:48483].  [Bug #10158]
-
-Thu Aug 21 14:45:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/e2mmap.rb: removed commented-out code.
-
-Thu Aug 21 13:23:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rinda/ring.rb: split executable code into sample directory.
-	* sample/rinda-ring.rb: ditto.
-
-Thu Aug 21 13:21:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/drb/acl.rb: split executable code into sample directory.
-	* sample/drb/acl.rb: ditto.
-
-Thu Aug 21 12:55:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .gitignore: ignored temporary file for Changelog.
-	  http://mkosaki.blog46.fc2.com/blog-entry-1284.html
-
-Thu Aug 21 12:40:22 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/net/imap.rb: split executable code into sample directory.
-	* sample/net-imap.rb: ditto.
-
-Thu Aug 21 12:23:56 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/net/imap.rb: removed commented-out code.
-
-Wed Aug 20 17:27:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_TRY_CFLAGS, RUBY_TRY_LDFLAGS),
-	  (RUBY_CHECK_BUILTIN_SETJMP, RUBY_SETJMP_TYPE),
-	  (RUBY_STACK_GROW_DIRECTION): quote defun names, for some
-	  versions of autoconf possibly.  [ruby-core:64473] [Bug #10156]
-
-Tue Aug 19 22:28:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): fix condition to round.
-	  [ruby-core:64454] [Bug #10151]
-
-Tue Aug 19 22:22:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
-	  registered signs.  [ruby-core:64452] [Bug #10149]
-
-Tue Aug 19 13:59:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compar.c (rb_cmperr): preserve encodings of arguments in the
-	  message.
-
-Tue Aug 19 10:13:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/thread/thread.c (get_array): check instance variables are
-	  initialized properly.  [ruby-core:63826][Bug #10062]
-
-Mon Aug 18 17:06:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): support rational 'f' format.
-	  [ruby-core:64382] [Bug #10136]
-
-Mon Aug 18 08:03:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* spec/default.mspec: use 2.2 definition.
-
-Sun Aug 17 19:41:40 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gc.c (obj_memsize_of): don't calculate memsize of T_NODE
-	  when called from check_gen_consistency. It fixes segmentation
-	  fault on RGENGC_CHECK_MODE >= 1 introduced by r47188.
-
-Sun Aug 17 17:08:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): use RHASH_SIZE instead of
-	  calling Hash#length method.
-
-Sat Aug 16 19:32:06 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_event.c (evs_length): use RARRAY_LEN instead
-	  of calling Array#length method.
-
-Sat Aug 16 10:20:17 2014  Eric Wong  <e@80x24.org>
-
-	* time.c (time_timespec): fix tv_nsec overflow
-	  [Bug #10144]
-
-Fri Aug 15 20:34:17 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_EVENT src from
-	  win32ole.c.
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_event.c: ditto.
-	* ext/win32ole/win32ole_event.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Fri Aug 15 19:38:00 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (rb_iseq_clone): Should not insert write barrier from
-	  non-RVALUE data (to non-RVALUE data, of course).
-
-	  Ruby 2.1 also has a same problem.
-
-Fri Aug 15 19:34:33 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (setup_fake_str): fake strings should not set class by
-	  RBASIC_SET_CLASS() because it insert write barriers to fake
-	  (non-RVALUE) structure.
-
-	  It can cause unexpected behaviour.
-
-	  Ruby 2.1 also have a same problem (setup_fake_str() in parse.y).
-
-	* symbol.c (setup_fake_str): ditto.
-
-Fri Aug 15 19:27:25 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c (rb_ary_tmp_new_fill): added.
-	  This function creates internal use only array (which is completely
-	  hided by ObjectSpace.each_object) with filling nil.
-
-	  Otherwise, it can be includes strange VALUEs.
-
-	* internal.h: added.
-
-	* node.h: use rb_ary_tmp_new_fill() for MEMO.
-
-Fri Aug 15 10:13:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/gserver.rb: removed unmaintained code.
-	  [ruby-core:40313][Feature #5480]
-	* lib/xmlrpc/httpserver.rb: ditto.
-
-Fri Aug 15 09:22:12 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_thread_struct): reorder to pack
-	* cont.c (rb_context_struct, rb_fiber_struct): ditto
-	  On x86-64, these changes reduces:
-	  rb_thread_struct to 1000 bytes (from 1016)
-	  rb_context_struct to 1288 bytes (from 1312)
-	  rb_fiber_struct to 2272 bytes (from 2304)
-
-Fri Aug 15 09:06:31 2014  Eric Wong  <e@80x24.org>
-
-	* thread_pthread.h: define RB_NATIVETHREAD_LOCK_INIT and
-	  RB_NATIVETHREAD_COND_INIT macros
-
-	* thread_pthread.c (native_mutex_lock, native_mutex_unlock,
-	  native_mutex_trylock, native_mutex_initialize,
-	  native_mutex_destroy, native_cond_wait):
-	  use rb_nativethread_lock_t instead of pthread_mutex_t
-	  [Feature #10134]
-
-	* thread_pthread.c (native_mutex_debug): make argument type-agnostic
-	  to avoid later cast.
-
-	* thread_pthread.c (register_cached_thread_and_wait):
-	  replace PTHREAD_COND_INITIALIZER with RB_NATIVETHREAD_COND_INIT,
-	  use native_mutex_{lock,unlock}
-
-	* thread_pthread.c (use_cached_thread):
-	  use native_mutex_{lock,unlock}
-
-	* thread_pthread.c (native_sleep):
-	  use rb_nativethread_lock_t to match th->interrupt_lock,
-	  use native_mutex_{lock,unlock}
-
-	* thread_pthread.c (timer_thread_lock): use rb_nativethread_lock_t type
-
-Fri Aug 15 08:10:29 2014  Eric Wong  <e@80x24.org>
-
-	* cont.c (cont_mark): fix typo in unused path [ci skip]
-
-Fri Aug 15 06:00:56 2014  Eric Wong  <e@80x24.org>
-
-	* vm.c (rb_thread_mark): update comment about marking `me'
-	  [ruby-core:64340] [ruby-core:64341]
-
-Fri Aug 15 05:53:59 2014  Eric Wong  <e@80x24.org>
-
-	* README.EXT: preliminary documentation for RB_GC_GUARD
-	  [Bug #10100] [ruby-core:60741]
-
-Thu Aug 14 00:26:19 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_RECORD src from
-	  win32ole.c
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_record.c: ditto.
-	* ext/win32ole/win32ole_record.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Wed Aug 13 21:41:04 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_VARIANT src from
-	  win32ole.c.
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_variant.c: ditto.
-	* ext/win32ole/win32ole_variant.c: ditto.
-	* ext/win32ole/depend: ditto.
-
-Wed Aug 13 20:09:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: remove unused variable.
-
-Wed Aug 13 19:31:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_search_handler_method, rescue_callback,
-	  folerecord_inspect): use PRIsVALUE in rb_sprintf.
-
-	* ext/win32ole/win32ole_param.c (foleparam_inspect): ditto.
-
-	* ext/win32ole/win32ole_variable.c (folevariable_inspect): use
-	  PRIsVALUE in rb_sprintf, use rb_inspect.
-
-Wed Aug 13 11:54:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/irb/completion.rb: reverted r47163.
-	  because another case can't be show completion target.
-
-Wed Aug 13 11:17:00 2014  Shimpei Makimoto  <github@makimoto.org>
-
-	* lib/irb.rb: Prevent irb from crashing when exception with
-	  nil backtrace is raised.
-	  [fix GH-434][ruby-core:58078][Bug #9063]
-	* test/irb/test_raise_no_backtrace_exception.rb: ditto.
-
-Wed Aug 13 11:08:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/irb/completion.rb: fixed broken completion list with
-	  String including spaces. Contributed from @dunric. [fix GH-465]
-
-Wed Aug 13 00:07:01 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_PARAM src from win32ole.c
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_param.c: ditto.
-	* ext/win32ole/win32ole_param.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Tue Aug 12 23:17:47 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: refactoring. move some methods
-	  into win32ole_type.c / win32ole_method.c
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_method.c: ditto.
-	* ext/win32ole/win32ole_method.h: ditto.
-	* ext/win32ole/win32ole_type.h: ditto.
-	* ext/win32ole/win32ole_type.h: ditto.
-
-Tue Aug 12 22:59:48 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: refactoring. move
-	  ole_typelib_from_itypeinfo into win32ole_typelib.c.
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_typelib.h: ditto.
-	* ext/win32ole/win32ole_typelib.h: ditto.
-
-Tue Aug 12 21:49:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_create_dcom): use the converted
-	  result if the argument can be converted to a string, to get rid
-	  of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127]
-
-Tue Aug 12 14:22:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* configure.in: ignored working directory same as prefix value.
-	  [ruby-core:54999] [Bug #8409]
-
-Tue Aug 12 13:34:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/fileutils.rb: enable to remove with non-owner directory.
-	  [ruby-dev:45976] [Bug #6756]
-	* test/fileutils/test_fileutils.rb: add testcase for #6756.
-
-Tue Aug 12 12:57:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* vm_exec.c: improve performance in ppc64 arch.
-	  [ruby-core:63437] [Feature #9997]
-
-Tue Aug 12 12:14:52 2014  Akira Matsuda <ronnie@dio.jp>
-
-	* lib/fileutils.rb: fix typo.
-	  [ruby-dev:47831] [Bug #9180]
-
-Tue Aug 12 10:10:42 2014  Eric Wong  <e@80x24.org>
-
-	* vm_method.c (release_method_definition): use rb_free_method_entry
-
-Tue Aug 12 06:16:09 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_METHOD src from
-	  win32ole.c.
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_method.c: ditto.
-	* ext/win32ole/win32ole_method.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Mon Aug 11 22:19:15 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_variable.c (folevariable_inspect): refactoring.
-
-Mon Aug 11 20:47:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_VARIABLE src from
-	  win32ole.c
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_variable.c: ditto.
-	* ext/win32ole/win32ole_variable.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Mon Aug 11 16:17:21 2014  Tony Miller  <mcfiredrill@gmail.com>
-
-	* dir.c (rb_dir_exists_p): [DOC] Document that Dir.exists? is
-	  deprecated.  [ruby-core:64135] [Bug #10102]
-
-Mon Aug 11 11:26:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tempfile.rb: start rdoc parsing inside singleton class
-	  definition to include the document there.
-	  [ruby-core:64157] [Bug #10105]
-
-Sun Aug 10 12:22:43 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_type.c: refactoring.
-
-Sun Aug 10 10:34:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/cgi/session/pstore.rb: separated sample code.
-	* lib/open3.rb: ditto.
-
-Sun Aug 10 10:03:24 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/irb/ext/multi-irb.rb: removed commented-out code.
-
-Sat Aug  9 11:02:07 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/irb.rb: removed commented-out code.
-	* lib/irb/**/*.rb: ditto.
-
-Sat Aug  9 10:35:30 2014  Laurent Arnoud  <laurent@spkdev.net>
-
-	* lib/cmath.rb: fixed indent. [fix GH-696]
-	* lib/drb/ssl.rb: ditto.
-	* lib/irb/**/*.rb: ditto.
-
-Sat Aug  9 10:28:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/minitest/test_minitest_unit.rb: removed obsoleted condition
-	  for Ruby 1.8.
-	* test/ruby/test_time_tz.rb: ditto.
-
-Sat Aug  9 10:18:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/cgi/test_cgi_core.rb: removed obsoleted condition for Ruby 1.8.
-	* test/cgi/test_cgi_header.rb: ditto.
-	* test/cgi/test_cgi_multipart.rb: ditto.
-	* test/cgi/test_cgi_tag_helper.rb: ditto.
-
-Sat Aug  9 00:34:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE_TYPE src from win32ole.c.
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_type.c: ditto.
-	* ext/win32ole/win32ole_type.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Fri Aug  8 01:53:37 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/securerandom.rb: use OpenSSL::BN for performance improvement.
-
-	* benchmark/bm_securerandom.rb: benchmark script.
-
-Fri Aug  8 17:19:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/open-uri.rb: remove needless condition for old ruby version.
-	* test/open-uri/test_open-uri.rb: ditto.
-
-Fri Aug  8 16:40:59 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/irb/init.rb: removed unreachable code.
-
-Fri Aug  8 16:34:22 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/drb/drb.rb: removed unreachable code.
-
-Fri Aug  8 14:33:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/webrick/httpproxy.rb: remove needless condition
-	  for old ruby version.
-
-Fri Aug  8 01:07:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): fix invalid char in eval, should raise
-	  an syntax error too, as well as directly coded.
-	  [ruby-core:64243] [Bug #10117]
-
-Thu Aug  7 23:25:29 2014  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/open3.rb: avoid unnecessary write if stdin_data is empty.
-
-Thu Aug  7 21:42:49 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole_typelib.c (foletypelib_version): return
-	  version string.
-
-	* test/win32ole/test_win32ole_typelib.rb (test_version): ditto.
-
-Thu Aug  7 15:13:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/cgi.rb: remove needless condition for old ruby version.
-
-Thu Aug  7 06:04:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yyerror): preserve source code encoding in
-	  syntax error messages.  [ruby-core:64228] [Bug #10114]
-
-Wed Aug  6 20:56:02 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate src of WIN32OLE_TYPELIB from
-	  win32ole.c
-
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_typelib.c: ditto.
-	* ext/win32ole/win32ole_typelib.h: ditto.
-	* ext/win32ole/depend: ditto.
-
-Wed Aug  6 20:44:07 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enum.c (enum_one): [DOC] Move enum.one? documentation before the
-	  relevant method.  Submitted by @vipulnsward. [Fixes GH-687]
-	  https://github.com/ruby/ruby/pull/687
-
-Wed Aug  6 20:25:47 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#replace): Check if an object given is enumerable
-	  before clearing self.  Reported by yui-knk. [GH-675]
-	  https://github.com/ruby/ruby/pull/675
-
-Wed Aug  6 20:07:26 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (olerecord_ivar_set): remove rb_str_subseq.
-
-Wed Aug  6 19:09:27 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set): Implement Set#clone by splitting
-	  initialize_copy into initialize_dup and initialize_clone.
-	  Submitted by yui-knk. [Fixes GH-661]
-	  https://github.com/ruby/ruby/pull/661
-
-Wed Aug  6 18:42:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate src of WIN32OLERuntimeError
-	  from win32ole.c.
-
-	* ext/win32ole/win32ole.h: ditto
-	* ext/win32ole/depend: ditto.
-	* ext/win32ole/win32ole_error.c: ditto.
-	* ext/win32ole/win32ole_error.h: ditto.
-
-Wed Aug  6 04:33:58 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
-	  of parser to handle IPv6 address. [Bug #9129]
-
-Wed Aug  6 04:16:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/requests.rb (Net::HTTP::Options::RESPONSE_HAS_BODY):
-	  OPTIONS requests may have response bodies. [Feature #8429]
-	  http://tools.ietf.org/html/rfc7231#section-4.3.7
-
-Wed Aug  6 03:18:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/generic_request.rb (Net::HTTP::GenericRequest#exec):
-	  handle req['host'] in update_uri.
-
-	* lib/net/http/generic_request.rb
-	  (Net::HTTP::GenericRequest#update_uri):
-	  use req['host'] if it is explicitly set. Even if URI is given,
-	  it is already used for the initial value of req['host'].
-	  Therefore overwritten value should be respected. [Bug #10054]
-
-Wed Aug  6 03:17:34 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/generic_request.rb
-	  (Net::HTTP::GenericRequest#update_uri):
-	  handle scheme, host, and port to reflect connection to @uri.
-
-	* lib/net/http.rb (Net::HTTP#begin_transport): move trivial handling
-	  to Net::HTTP::GenericRequest#update_uri.
-
-
-Wed Aug  6 02:16:43 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/generic_request.rb
-	  (Net::HTTP::GenericRequest#initialize):
-	  optimize object allocation.
-
-Wed Aug  6 01:16:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#path_query): remove a private method.
-
-Wed Aug  6 01:15:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#normalize!): use String#empty?
-
-	* lib/uri/generic.rb (URI::Generic#path_query): optimized.
-
-	* lib/uri/generic.rb (URI::Generic#to_s): optimized.
-
-Wed Aug  6 00:15:10 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/http.rb (URI::HTTP#request_uri): optimized.
-	  decrease object allocation, and ensure always create at least one new
-	  object for return value.
-
-Wed Aug  6 03:41:21 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for
-	  hashes emitted by Syck. Github #198
-	* test/psych/test_hash.rb: test for change.
-
-Tue Aug  5 19:27:59 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): skip VariantClear when
-	  argument is VT_RECORD variant.
-
-Tue Aug  5 15:52:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gems/bundled_gems: Upgrade to test-unit-3.0.0 and minitest-5.4.0.
-
-Mon Aug  4 21:50:09 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_record.rb: add for WIN32OLE_RECORD
-	  test(need .NET Framework 3.5 to run test).
-
-Mon Aug  4 19:49:34 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): call rb_hash_foreach instead
-	  of rb_block_call.
-
-	* ext/win32ole/win32ole.c: add comment for rdoc of WIN32OLE_VARIANT
-	  class.
-
-Mon Aug  4 09:12:47 2014  Eric Wong  <e@80x24.org>
-
-	* variable.c: cleanup to use rb_const_lookup
-	  [Feature #10107]
-
-	* vm_insnhelper.c: ditto
-
-Sun Aug  3 10:55:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_check_symbol_cstr): ditto.
-
-Sun Aug  3 10:43:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): unusable super class should cause
-	  method missing when BasicObject is refined but not been using.
-	  [ruby-core:64166] [Bug #10106]
-
-Sat Aug  2 23:47:45 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: separate WIN32OLE::VARIANT src file
-	  from win32ole.c
-	* ext/win32ole/win32ole.h: ditto.
-	* ext/win32ole/win32ole_variant_m.c: ditto.
-	* ext/win32ole/win32ole_variant_m.h: ditto.
-	* ext/win32ole/depend: ditto.
-	* ext/.document: ditto.
-
-Sat Aug  2 14:34:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add comments for rdoc.
-
-Sat Aug  2 10:26:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_obj_itself): new method Object#itself.  based on the
-	  patch by Rafael Franca in [ruby-core:64156].
-	  [EXPERIMENTAL] this method may be renamed due to compatibilities.
-	  [ruby-core:44704] [Feature #6373]
-
-Fri Aug  1 22:30:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (folerecord_initialize): accept
-	  only 2 arguments. The 2nd argument should be WIN32OLE object or
-	  WIN32OLE_RECORD object.
-
-Fri Aug  1 20:17:33 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): call
-	  folerecord_s_allocate instead of WIN32OLE_RECORD.new.
-
-Fri Aug  1 18:39:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/date/test_date.rb: remove commented-out code.
-	* test/date/test_date_arith.rb: ditto.
-	* test/date/test_date_attr.rb: ditto.
-	* test/date/test_date_parse.rb: ditto.
-
-Fri Aug  1 16:35:32 2014  Evan Miller  <evan@squareup.com>
-
-	* numeric.c (flodivmod): all results are NaN if divisor is NaN.
-	  [fix GH-692]
-
-Thu Aug 01 07:28:12 2014  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c: [DOC] Add description of
-	  `BigDecimal.new` exceptions.  Patched by @joker1007 and
-	  @prathamesh-sonpatki [Fixes GH-690]
-	  https://github.com/ruby/ruby/pull/690
-
-Thu Jul 31 22:20:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_RECORD#inspect.
-
-Thu Jul 31 20:35:32 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add
-	  WIN32OLE_RECORD#ole_instance_variable_set and
-	  WIN32OLE_RECORD#ole_instance_variable_get
-
-Wed Jul 30 23:28:10 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* sprintf.c (rb_str_format): like r47006, get rid of
-	  function calls in RSTRING_PTR().
-
-Wed Jul 30 22:10:29 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* process.c (rlimit_resource_type, rlimit_resource_value):
-	  get rid of inadvertent dynamic symbol pin-down.
-
-	* re.c (match_backref_number): ditto.
-
-	* signal.c (esignal_init, rb_f_kill, trap_signm): ditto.
-
-	* transcode.c (econv_opts): ditto.
-
-	* vm_trace.c (symbol2event_flag): ditto.
-
-Wed Jul 30 21:29:39 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): pass WIN32OLE_RECORD variant
-	  by reference when invoke OLE methods at first.
-
-	* ext/win32ole/win32ole.c (olerecord_set_ivar): release
-	  IRecordInfo interface before setting another IRecordInfo interface.
-
-Wed Jul 30 13:17:35 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove unused macros.
-
-Tue Jul 29 22:21:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (hash2olerec): ignore WIN32OLE_RECORD
-	  instance variable if the variable is nil.
-
-Tue Jul 29 19:43:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (folerecord_method_missing): refactoring.
-	  divide functionality of folerecord_method_missing into
-	  olerecord_ivar_set and olerecord_ivar_get.
-
-Mon Jul 28 20:20:08 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win23ole.c (folerecord_method_missing): support
-	  setter of member of WIN32OLE_RECORD object.
-
-Mon Jul 28 06:37:19 2014  Zachary Scott  <e@zzak.io>
-
-	* vm_eval.c: [DOC] Fix rdoc formatting of patch from [Bug #9551]
-
-Mon Jul 28 06:34:43 2014  Zachary Scott  <e@zzak.io>
-
-	* vm_eval.c: [DOC] [Bug #9551] Improve clarity of Kernel::catch
-	  documentation, patch by Jesse Sielaff.
-
-Mon Jul 28 06:24:54 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/uri/common.rb: [DOC] [Bug #9563] Recommend using URI.escape
-	  before parsing a uri to avoid invalid characters. Reported by
-	  Evgeniy Serykh.
-
-Mon Jul 28 05:55:56 2014  Zachary Scott  <e@zzak.io>
-
-	* time.c: [DOC] Clarify %Y in strftime, which can accept any digits
-	  and will output at least 4 digits as the year. Reported by Yury
-	  Trofimenko [Bug #10049]
-
-	* lib/time.rb: ditto
-
-Mon Jul 28 05:32:06 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments
-	  are handled by RFC3986, originally reported by John Feminella.
-
-Mon Jul 28 05:21:41 2014  Zachary Scott  <e@zzak.io>
-
-	* file.c: [DOC] Clarify how File.file? handles symbolic links. Also
-	  cleaned up the rdoc style for this method, more to follow.
-	  Originally reported by Michael Renner [Bug #10067]
-
-Mon Jul 28 05:12:22 2014  Zachary Scott  <e@zzak.io>
-
-	* time.c: [DOC] Remove dead link and old bug report, which hasn't been
-	  reproduced in a few years. Reported by Federico Builes [Bug #10071]
-
-Mon Jul 28 04:39:58 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/zlib/zlib.c: [DOC] Remove default value of Zlib constants, as
-	  they may change in the implementation without notice. Patched by
-	  @robin850 [Fixes GH-682] https://github.com/ruby/ruby/pull/682
-
-Mon Jul 28 04:35:35 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/openssl/ossl_hmac.c: Fix NO_HMAC warning [Fixes GH-665]
-	  Patched by @vipulnsward https://github.com/ruby/ruby/pull/665
-
-Sun Jul 27 19:49:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/cgi/core.rb: remove unused variables.
-	* lib/erb.rb: ditto.
-	* lib/mkmf.rb: ditto.
-	* lib/net/http/response.rb: ditto.
-	* lib/optparse/version.rb: ditto.
-	* lib/prime.rb: ditto.
-	* lib/racc/parser.rb: ditto.
-	* lib/rexml/document.rb: ditto.
-	* lib/rexml/dtd/dtd.rb: ditto.
-	* lib/rexml/element.rb: ditto.
-	* lib/rexml/functions.rb: ditto.
-	* lib/rexml/parsers/xpathparser.rb: ditto.
-
-Sun Jul 27 05:11:21 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/irb.rb: [DOC] PROMPT_I cannot be nil, patch by @hgillane
-	  Fixes documenting-ruby/ruby#37
-	  https://github.com/documenting-ruby/ruby/pull/37
-
-Sun Jul 27 02:41:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/shell/command-processor.rb: remove unused variable.
-	* lib/shell/system-command.rb: ditto.
-	* lib/tmpdir.rb: ditto.
-	* lib/uri/generic.rb: ditto.
-
-Sun Jul 27 02:08:31 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/weakref.rb: split executable code into sample directory.
-	* sample/weakref.rb: ditto.
-
-Sun Jul 27 02:06:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/delegate.rb: split executable code into sample directory.
-	* sample/delegate.rb: ditto.
-
-Sun Jul 27 01:46:34 2014  Zachary Scott  <e@zzak.io>
-
-	* proc.c (method_super_method): [DOC] Method#super_method
-
-Sun Jul 27 01:22:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (method_super_method): new method Method#super_method,
-	  which returns a method object of the method to be called by
-	  `super` in the receiver method object.
-	  [ruby-core:62202] [Feature #9781]
-
-Sat Jul 26 17:22:14 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* ext/objspace/objspace_dump.c (dump_append): avoid fflush.
-
-	  because dump_append_string_value() iterates over each chars,
-	  fflush()-ing here effectively issues system calls on every single
-	  bytes exist in a ruby process.
-
-Sat Jul 26 16:55:18 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.h (struct iseq_compile_data_storage): reduce overhead
-	  to 16 bytes (from 32) on 64-bit
-
-Sat Jul 26 16:28:06 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (struct rb_iseq_struct): reduce to 280 bytes
-	  (from 288 bytes) on 64-bit
-
-Sat Jul 26 06:44:43 2014  Eric Wong  <e@80x24.org>
-
-	* parse.y (struct parse_params): shrink to 320 to 304 bytes on 64-bit
-
-Sat Jul 26 05:58:35 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/ruby.h (ZALLOC, ZALLOC_N): implement
-	  (Data_Make_Struct, TypedData_Make_Struct):
-	  ZALLOC replaces ALLOC+memset
-	  [ruby-core:63951][Feature #10082]
-	* compile.c (iseq_seq_sequence): ZALLOC_N replaces ALLOC_N+MEMZERO
-	* cont.c (fiber_t_alloc): ZALLOC replaces ALLOC+MEMZERO
-	* io.c (rb_io_reopen): ditto
-	* iseq.c (prepare_iseq_build): ditto
-	* parse.y (new_args_tail_gen, parser_new, ripper_s_allocate): ditto
-	* re.c (match_alloc): ditto
-	* variable.c (rb_const_set): ditto
-	* ext/socket/raddrinfo.c (get_addrinfo): ditto
-	* ext/strscan/strscan.c (strscan_s_allocate): ditto
-	* gc.c (rb_objspace_alloc): calloc replaces malloc+MEMZERO
-
-Sat Jul 26 05:54:54 2014  Eric Wong  <e@80x24.org>
-
-	* symbol.c (dsymbol_check): remove unneeded semi-colon
-
-Fri Jul 25 14:07:27 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change objspace::rgengc::parent_object_is_old (boolean)
-	  to objspace::rgengc::parent_object (VALUE).
-	  Use Qfalse or RVALUE pointer instead of FALSE and TRUE.
-
-	* gc.c (gc_marks_body): should clear parent_object just before
-	  gc_mark_roots() because there are no parents objects
-	  for root objects.
-
-Fri Jul 25 13:45:39 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_gc_writebarrier_remember_promoted): should remember only
-	  OLD objects on RGENGC_AGE2_PROMOTION.
-
-Fri Jul 25 13:42:02 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_stacked_objects): fix error message.
-
-Fri Jul 25 13:18:00 2014  Will Farrington  <wfarrington@digitalocean.com>
-
-	* ext/socket/socket.c (sock_gethostname): Use NI_MAXHOST to support
-	  hostnames longer than 64 characters if the system supports it.
-	  [fixes GH-683]
-
-Fri Jul 25 12:21:11 2014  Santiago Pastorino  <santiago@wyeworks.com>
-
-	* compile.c (defined_expr): make the condition if the receiver
-	  is explicit or implicit cleaner.  [fix GH-681]
-
-Fri Jul 25 03:53:52 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* doc/keywords.rdoc:  [DOC] Describe each keyword.
-
-Thu Jul 24 22:40:24 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_RECORD#initialize
-	  method.
-
-	* ext/win32ole/win32ole.c (ole_val2variant): convert WIN32OLE_RECORD
-	  object to VT_RECORD variant.
-
-Thu Jul 24 20:10:59 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: fix major GC flags.
-	  * add GPR_FLAG_MAJOR_BY_FORCE, which indicates
-	    major GC by METHOD, CAPI and so on (see GC_BY).
-	  * remove GPR_FLAG_MAJOR_BY_RESCAN because not used.
-	  * remove GPR_FLAG_MAJOR_BY_STRESS, use FORCE instead.
-
-	* test/ruby/test_gc.rb: catch up.
-
-Thu Jul 24 15:55:02 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/io.h (struct rb_io_buffer_t): PACKED_STRUCT should not
-	  be used for platform-specific optimization. PACKED_STRUCT_UNALIGNED
-	  should be used. [ruby-core:63988] [Bug #10088]
-
-Thu Jul 24 04:42:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/benchmark.rb: split executable code into sample directory.
-	* sample/benchmark.rb: ditto.
-
-Thu Jul 24 04:36:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/tempfile.rb: split executable code into sample directory.
-	* sample/tempfile.rb: ditto.
-
-Thu Jul 24 04:29:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/pstore.rb: split executable code into sample directory.
-	* sample/pstore.rb: ditto.
-
-Wed Jul 23 23:50:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/defines.h, siphash.c, st.c (UNALIGNED_WORD_ACCESS):
-	  add PowerPC64 too, which is capable to access unaligned words.
-	  patched by Gustavo Frederico Temple Pedrosa in [ruby-core:63937].
-	  [Feature #10081]
-
-	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): ditto.
-
-Wed Jul 23 04:04:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/drb/extserv.rb: remove duplicate code with sample directory.
-	  contributed from @vipulnsward. [fix GH-679]
-
-Tue Jul 22 12:56:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_count): fix wrong single-byte optimization.
-	  7bit ascii can be a trailing byte in Shift_JIS.
-	  [ruby-dev:48442] [Bug #10078]
-
-Tue Jul 22 01:48:38 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/io.h (rb_io_buffer_t): fix packing on gcc
-	  r46892 caused packing to be a no-op on gcc (4.7.2-5, Debian)
-	  [Bug #10079][ruby-core:63912]
-
-Mon Jul 21 15:55:42 2014  fuji70  <fujifuji70@gmail.com>
-
-	* lib/optparse.rb (getopts): print default values and descriptions
-	  in the help message.  [fix GH-676]
-
-Sun Jul 20 14:26:27 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_proc_t): reduce to 64 bytes from 72 on 64-bit
-
-Sun Jul 20 13:50:34 2014  Eric Wong  <e@80x24.org>
-
-	* transcode.c (rb_econv_t): reduce to 184 bytes from 200 on 64-bit
-
-Sun Jul 20 12:44:23 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/io.h (rb_io_buffer_t): pack structure
-	  Reduces rb_io_t from 200 to 192 bytes, allowing rb_io_t to
-	  occupy one less cache line.
-	  [Feature #10050]
-
-Sun Jul 20 12:41:53 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/io.h (rb_io_t): shrink to 200 bytes from 216 on 64-bit
-	  This puts us within 8 bytes of being three cache lines instead of
-	  four lines on x86-64.  This breaks the ABI.
-	  [Feature #10050]
-
-Sun Jul 20 12:36:46 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/oniguruma.h (struct re_pattern_buffer): shrink to 448
-	  bytes from 464 bytes on 64-bit.  This breaks the ABI.
-	  [Feature #10034]
-
-Sun Jul 20 01:06:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/openssl/ossl.c: use encryptor instead of encrypter in doc.
-	  contributed from @vipulnsward. [fix GH-663]
-
-Sun Jul 20 00:32:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_initialize): [DOC] fix rdoc of append mode.  it does
-	  not move the pointer at open.  [ruby-core:63747] [Bug #10039]
-
-Sat Jul 19 12:40:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): allow to access private attribute
-	  reader in op_assign.  [ruby-core:63817] [Bug #10060]
-
-Sat Jul 19 11:56:36 2014  Grey Baker  <greysteil@gmail.com>
-
-	* lib/time.rb (Time#apply_offset): Guards against a `nil` return
-	  value from `Time.month_days` when offsetting date.  Out of range
-	  values are then caught when `Time.utc` is called (as usual).
-
-	  Previously a `nil` return value from `Time.month_days` would
-	  have the `<` operator called on it, and raise `NoMethodError`.
-	  [fix GH-667]
-
-	* lib/rdoc/parser/changelog.rb (RDoc#parse_entries): fix dirty hack.
-
-Sat Jul 19 06:19:01 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: refactoring.
-
-Fri Jul 18 22:34:41 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (folevariant_initialize): WIN32OLE_VARIANT
-	  does not support VT_RECORD. VT_RECORD should be supported in
-	  WIN32OLE_RECORD.
-
-	* test/win32ole/test_win32ole_variant.rb (test_s_new_vt_record_exc):
-	  ditto.
-
-Fri Jul 18 19:54:03 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (folevariant_initialize): remove unnecessary
-	  code.
-
-Fri Jul 18 19:11:03 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix/eigenvalue_decomposition: Style fix
-	  Patch by Gogo Tanaka [#10058]
-
-Fri Jul 18 19:03:53 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Avoid using `and`.
-	  Patch by gogo tanaka [#10058]
-
-Fri Jul 18 17:41:54 2014  GoGo tanaka  <qlli.illb@gmail.com>
-
-	* test/matrix/test_matrix.rb: Add tests for Matrix class.
-	  [Feature #10057][ruby-core:63809]
-
-Fri Jul 18 10:14:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/fileutils.rb: added missing options of FileUtils.touch by @Domon.
-	  [fix GH-669]
-
-Thu Jul 17 19:57:27 2014  Herwin  <herwin@quarantainenet.nl>
-
-	* ext/thread/thread.c (rb_szqueue_push): add optional parameter,
-	  non_block defaulted to false.  [ruby-core:63794] [Feature #10052]
-
-Wed Jul 16 23:01:43 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): support array of
-	  VT_RECORD variant.
-
-Wed Jul 16 20:21:49 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* vm_core.h (struct rb_iseq_struct): stack_max is changed to int
-	  because all calculations related to stack_max in compile.c
-	  (iseq_set_sequence) and vm_insnhelper.c (vm_push_frame) are
-	  conducted by using int. This partly reverts r23945.
-	* vm_insnhelper.c (vm_push_frame): ditto. This reverts r42401.
-
-Wed Jul 16 19:55:32 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* vm_core.h (struct rb_iseq_struct): temporal workaround of [Bug 10037].
-	  Add padding on big-endian 64-bit architecture (e.g. sparc64).
-
-Wed Jul 16 19:32:23 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_record_method_missing): call
-	  rb_hash_fetch instead of rb_hash_aref.
-
-Wed Jul 16 18:08:47 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (rb_iseq_defined_string): use rb_gc_mark_object() instead of
-	  marking from vm_mark().
-
-	* vm.c (rb_vm_mark): ditto.
-
-Wed Jul 16 18:03:50 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_roots): call rb_vm_mark directly.
-
-	* vm.c: remove mark function for RubyVM object because
-	  RubyVM object marked manually.
-
-Wed Jul 16 12:25:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09.
-	  this includes Support for Unicode 7.0 [Bug #9092].
-
-Tue Jul 15 23:59:27 2014  Jared Jennings  <jared.jennings.ctr@us.af.mil>
-
-	* ext/digest: make built-in digest function implementations
-	  indicate success or failure of init and final functions.
-	  [ruby-core:61614] [Bug #9659]
-
-	* ext/digest/digest.c: expect digest init and finish functions to
-	  indicate success or failure; raise exception on failure.
-	  [ruby-core:61614] [Bug #9659]
-
-Tue Jul 15 20:31:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: modify document for WIN32OLE_RECORD.
-
-Tue Jul 15 12:42:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* defs/default_gems: change version definition file of rake.
-
-Tue Jul 15 12:00:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rake.rb, lib/rake/*.rb: Upgrade to rake-10.3.2
-	  [fix GH-668]
-	* test/rake/*.rb: ditto.
-
-Mon Jul 14 19:14:51 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: modify WIN32OLE class document and
-	  add comment for constants of WIN32OLE.
-
-Mon Jul 14 16:38:45 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (struct rb_iseq_struct): reduce to 288 bytes
-	  on x86-64 (from 296 bytes)
-
-Mon Jul 14 16:07:25 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.h (struct iseq_catch_table_entry): shrink to 32 bytes
-	  on x86-64 (from 48 bytes)
-
-Mon Jul 14 16:04:41 2014  Eric Wong  <e@80x24.org>
-
-	* iseq.h (struct iseq_catch_table): new flexible array struct
-		 (iseq_catch_table_bytes): allocated size function
-	* vm_core.h (struct rb_iseq_struct): update catch_table member
-	  This reduces the struct from 304 to 296 bytes on x86-64.
-	* compile.c (iseq_set_exception_table): update for struct changes
-	* iseq.c (iseq_free): ditto
-	* iseq.c (iseq_memsize): ditto
-	* iseq.c (rb_iseq_disasm): ditto
-	* iseq.c (iseq_data_to_ary): ditto
-	* iseq.c (rb_iseq_build_for_ruby2cext): ditto (untested)
-	* vm.c (vm_exec): ditto
-	* vm_core.h (struct rb_iseq_struct): ditto
-	* vm_insnhelper.c (vm_throw): ditto
-
-Sun Jul 13 17:49:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/openssl/ossl_cipher.c: Fix call to ciphers class method and
-	  spell out `encryption` by @vipulnsward [fix GH-664]
-
-Sun Jul 13 17:31:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro.
-	* ext/sdbm/init.c: ditto.
-
-Sun Jul 13 17:25:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/dbm/dbm.c: fix wrong arguments in GetDBM2 macro by @v2e4lisp.
-	  [fix GH-655]
-
-Sun Jul 13 16:44:56 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (struct rb_call_info_struct): improve packing
-	  This reduces the struct from 112 to 104 bytes on x86-64.
-
-Sun Jul 13 15:53:25 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (struct rb_iseq_struct): stack_max is uint32_t
-	  This reduces the struct from 312 to 304 bytes on x86-64.
-
-Sun Jul 13 10:56:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_broken_backtrace): exit with failure
-	  normally, no needs to abort.  [ruby-core:63678] [Bug #10008]
-
-Sat Jul 12 15:10:22 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_record_method_missing): correct
-	  fields Hash key.
-
-Sat Jul 12 04:17:40 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/net/smtp.rb (Net::SMTP#data): enable buffering while
-	  'data' send for optimizing Net::SMTP#send_message.
-	  [ruby-dev:48329] [misc #9981]
-	  patch by Masahiro Tomita.
-
-Sat Jul 12 01:13:45 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/ruby/envutil.rb (assert_no_memory_leak): On Solaris 9 or later,
-	  if possible, execute child ruby with environment variables
-	  LD_PRELOAD=libumem.so UMEM_OPTIONS="backend=mmap". With these
-	  variables, freed memory is immediately returned to the OS.
-	  [Bug #10020] [ruby-dev:48391]
-
-Fri Jul 11 20:49:10 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add WIN32OLE_RECORD class to support
-	  VT_RECORD OLE variables.
-
-Fri Jul 11 17:15:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/abbrev.rb: remove executable.
-
-Fri Jul 11 16:45:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/fileutils.rb: handle ENOENT error with symlink targeted to
-	  non-exists file. [ruby-dev:45933] [Bug #6716]
-
-Fri Jul 11 15:59:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* array.c: Clarify documentation for Array#insert.
-	  [ruby-core:62934] [Bug #9901]
-
-Fri Jul 11 15:39:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* io.c: Improve Documentation by @dapplebeforedawn.
-	  [fix GH-658] [ruby-core:63579] [Bug #10012]
-
-Fri Jul 11 14:19:14 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Fix sign for cross_product [#9499]
-
-Fri Jul 11 11:11:50 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/prepare_so_k_nucleotide.rb: use require_relative.
-
-	* benchmark/prepare_so_reverse_complement.rb: ditto.
-
-Fri Jul 11 10:09:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (encodes): fix buffer overrun by tail_lf.  Thanks to
-	  Mamoru Tasaka and Tomas Hoger.  [ruby-core:63604] [Bug #10019]
-
-Thu Jul 10 23:51:36 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* hash.c (ruby_setenv): Fix TestEnv#test_aset failure on Solaris 9.
-	  When name contains '=', ruby_setenv raises Errno::EINVAL.
-	  That is the same behavior as Solaris 10.
-	  NULL check for malloc return value is also added.
-
-Thu Jul 10 15:02:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_callee_setup_keyword_arg): adjust VM stack
-	  pointer to get rid of overwriting splat arguments by arguments
-	  for `to_hash` conversion.  [ruby-core:63593] [Bug #10016]
-
-Thu Jul 10 01:09:57 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* symbol.c: remove rb_gc_mark_symbols().
-
-	  fstrings referred by static symbols and pinned dynamic symbols
-	  are registered by rb_gc_register_mark_object().
-
-	  fstrings referred by dynamic symbols (not pinned symbols)
-	  are referred from global_symbols.dsymbol_fstr_hash (Hash object).
-
-	  Note that fstrings referred from dynamic symbols must live logger
-	  than symbol objects themselves because rb_gc_free_dsymbol() uses
-	  fstrings to remove from symbol tables.
-	  This is why we can not mark fstrings from dynamic symbols.
-
-	  This technique reduces root objects for GC marking.
-
-	* gc.c (gc_mark_roots): ditto.
-
-	* internal.h: ditto.
-
-Thu Jul 10 00:24:18 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* common.mk (DTRACE_DEPENDENT_OBJS): fix build failure on Solaris
-	  introduced in r46768. Object files containing dtrace probes should
-	  be listed in DTRACE_DEPENDENT_OBJS.
-
-Wed Jul  9 17:07:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c, symbol.h: Symbol class implementation and internals,
-	  split from parse.y.
-
-Wed Jul  9 14:45:39 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: change Symbol <-> ID relationship to avoid
-	  exposing IDs from collectable symbols.
-	  [Bug #10014]
-
-	  Now, rb_check_id() returns 0 if corresponding symbol is
-	  pinned dynamic symbol.
-
-	  There is remaining intern_cstr_without_pindown(), it can return
-	  IDs from collectable symbols. We must be careful to use it
-	  (only used in parse.y).  I think it should be removed if
-	  it does not have impact for performance.
-
-	* parse.y:
-	  add:
-	  * STATIC_SYM2ID()
-	  * STATIC_ID2SYM()
-	  rename:
-	  * rb_pin_dynamic_symbol() -> dsymbol_pindown()
-
-	* internal.h:
-	  remove:
-	  * rb_check_id_without_pindown()
-	  * rb_sym2id_without_pindown()
-	  add:
-	  * rb_check_symbol()
-	  * rb_check_symbol_cstr()
-
-	* load.c: use rb_check_id() or rb_check_id_cstr().
-
-	* object.c: ditto.
-
-	* struct.c: ditto.
-
-	* thread.c: ditto.
-
-	* vm_method.c: ditto.
-
-	* string.c (sym_find): use only rb_check_symbol().
-
-	* sprintf.c (rb_str_format): use rb_check_symbol_cstr().
-
-Wed Jul  9 12:21:55 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (symbols_i): delete garbage symbols for Symbol.all_symbols.
-
-Wed Jul  9 05:49:08 2014  Eric Wong  <e@80x24.org>
-
-	* thread_pthread.h (struct rb_global_vm_lock_struct):
-	  do not expose pthread type for lock
-
-Wed Jul  9 05:41:40 2014  Eric Wong  <e@80x24.org>
-
-	* thread_pthread.h: remove unneeded semaphore.h include
-
-Wed Jul  9 00:12:28 2014  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/ruby-lex.rb: fix counting indent in identify_string_dvar.
-
-Tue Jul  8 16:58:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/memory_status.rb (Memory::PSCMD): use ps command which
-	  outputs expected result.  [ruby-dev:48370] [Bug #10010]
-
-Tue Jul  8 14:45:17 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (dsymbol_alloc): set global_symbols.minor_marked to 0.
-
-	* parse.y (dsymbol_check): set RSYMBOL(sym)->fstr to 0
-	  because we should not touch fstr after that.
-
-	* parse.y (rb_gc_free_dsymbol): skip deleting str and sym
-	  from tables if fstr == 0.
-
-Mon Jul  7 14:31:52 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: remove global_symbols::pinned_dsym
-	  (and ::pinned_dsym_minor_marked).
-
-	  Mark pinned dsymbols by rb_gc_register_mark_object() because
-	  they are immortal.
-
-	* parse.y (rb_gc_free_dsymbol): rename parameter name `ptr' to `sym'.
-
-Mon Jul  7 12:45:51 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: revert miss-commit.
-
-Mon Jul  7 12:40:59 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: need to use updated (re-created) symbols.
-
-Mon Jul  7 11:02:55 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/mkconfig.rb: remove not to require rbconfig/obsolete.rb.
-
-	* lib/rbconfig/obsolete.rb: removed.
-
-Mon Jul  7 10:52:03 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: do not use rb_gc_resurrect(), but create a new dynamic
-	  symbol for garbage dynamic symbol.
-
-	* common.mk: use gc.h by parse.y.
-
-Mon Jul  7 02:18:42 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (fstr_update_callback): do not use rb_gc_resurrect()
-	  any more.
-
-	  Make new frozen string and replace with garbage frozen string.
-
-	* common.mk: use gc.h from string.c.
-
-Mon Jul  7 00:36:13 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename is_dying_object() to is_garbage_object().
-
-	* gc.h: rb_objspace_garbage_object_p() as an exported function.
-
-Sun Jul  6 21:30:35 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (is_dying_object): fix missed condition.
-
-	* gc.c (is_live_object): move frequent path first.
-
-Sun Jul  6 21:00:11 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename is_dead_object() to is_dying_object().
-	  This function is not opposite against is_live_object()
-	  because is_dying_object() does *not* check object type.
-
-	* gc.c (is_dying_object): change condition.
-
-	* gc.c (is_live_object): use T_NONE instead of 0.
-
-	* gc.c (rb_objspace_dying_object_p): added.
-
-Sun Jul  6 13:37:27 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_gc_register_mark_object): change data structure.
-	  From single array, to array of arrays. Each array only has 1024
-	  entries.
-
-	* vm.c (Init_vm_objects): change default capa from 1 to 128.
-
-Sat Jul  5 05:05:53 2014  Vipul A M  <vipulnsward@gmail.com>
-
-	* lib/irb/locale.rb (IRB::Locale#modifier): fix wrong attr_reader
-	  `modifieer` => `modifier` from irb locale.  [fix GH-656]
-
-Fri Jul  4 20:45:26 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: rename symbols::sym_id to symbols::str_id.
-	  This table is not {Symbol => ID} table, but
-	  {String => ID} table.
-
-	* parse.y (lookup_sym_id): also rename lookup_sym_id() to
-	  lookup_str_id() because key is not Symbol, but String.
-
-Fri Jul  4 18:42:04 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (must_be_dynamic_symbol): fix missed-condition.
-
-Fri Jul  4 18:38:11 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (rb_pin_dynamic_symbol): should be `static' function.
-
-Fri Jul  4 18:03:35 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y (must_be_dynamic_symbol): refactoring.
-	  * add `inline'.
-	  * use UNLIKELY().
-	  * check only DYNAMIC_SYM_P(), otherwise it is a bug.
-	  * lookup_id_str() is not needed in second condition.
-
-Fri Jul  4 11:53:56 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* parse.y: remove unused code
-	  surrounded by `#if ENABLE_SELECTOR_NAMESPACE'
-
-Fri Jul  4 10:08:24 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/rubygems/test_gem_package.rb: avoid tempfile leaks using Tempfile#close!
-	* test/rubygems/test_gem_request_set.rb: ditto.
-	* test/rubygems/test_gem_request_set_gem_dependency_api.rb: ditto.
-
-Fri Jul  4 04:42:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/response.rb (Net::Inflater#inflate_adapter):
-	  prevent automatic encoding conversion.
-
-Fri Jul  4 04:39:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/response.rb (Net::HTTPResponse.each_response_header):
-	  raise first exception even if inflate_body_io.finish raises error.
-	  when begin block raises error, finish usually raises error too.
-
-Fri Jul  4 02:56:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#query=): remove validation, just
-	  escape. [Feature #2542]
-
-	* lib/uri/generic.rb (URI::Generic#fragment=): ditto.
-
-	* lib/uri/generic.rb (URI::Generic#check_query): removed.
-
-	* lib/uri/generic.rb (URI::Generic#set_query): ditto.
-
-	* lib/uri/generic.rb (URI::Generic#check_fragment): ditto.
-
-	* lib/uri/generic.rb (URI::Generic#set_fragment): ditto.
-
-Thu Jul  3 12:40:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (--with-static-linked-ext): fix for extensions to
-	  be linked statically.
-
-	* Makefile.in, common.mk: use ENCSTATIC for enc directory.
-
-	* ext/extmk.rb: supply dependencies of statically linked extension
-	  libraries.
-
-Wed Jul  2 15:45:49 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_heap_lazy_sweep): simplify logic.
-
-	* gc.c (gc_page_sweep): return TRUE if empty slots are available.
-
-Wed Jul  2 09:48:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* logger.rb: removed unmaintained code.
-	  [Feature #9860][ruby-core:62724]
-	* test/logger/test_application.rb: ditto.
-
-Wed Jul  2 03:20:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
-
-	* node.c (dump_node): handle nd_value == (NODE *)-1 to mean this
-	  keyword argument is required
-
-Wed Jul  2 02:57:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (rb_vm_env_local_variables): returns array of local
-	  variable name symbols in the environment by envval.
-
-	* proc.c (bind_local_variables): use rb_vm_env_local_variables.
-
-Wed Jul  2 02:23:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (bind_receiver): new method to return the bound receiver
-	  of the binding object.  [ruby-dev:47613] [Feature #8779]
-
-Wed Jul  2 02:14:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (bind_local_variables): update env from envval for each
-	  iterations.  [ruby-dev:48351] [Bug #10001]
-
-Tue Jul  1 23:46:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* NEWS: [DOC] mention about Binding#local_variables, introduced at
-	  r44392 (see [Feature #8773]).
-
-Tue Jul  1 23:30:51 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* numeric.c (num_step_scan_args): table argument of rb_get_kwargs() is
-	  array of IDs, not Symbols. [ruby-dev:48353] [Bug #9811]
-
-Tue Jul  1 16:18:22 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/lib/digest/hmac.rb, test/digest/test_digest_hmac.rb:
-	  Digest::HMAC is finally removed as previously noticed.
-	  [fix GH-648]
-
-Tue Jul  1 11:13:43 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/date/lib/date/format.rb: removed empty file by @vipulnsward.
-	* ext/date/lib/date.rb: removed needless require.
-	  [fix GH-647]
-
-Mon Jun 30 16:42:52 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_stat_internal): return size_t value instead of VALUE
-	  and remove `out' parameter.
-
-	* gc.c: add braces for `if' statements.
-
-	* gc.c (gc_stat_internal): fix comment.
-
-Mon Jun 30 15:07:34 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: support `USE_RGENGC == 0'.
-
-	* test/ruby/test_gc.rb: ditto.
-
-Mon Jun 30 11:36:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* file.c: [DOC] document File.join returns a string.
-	  Contributed by @dapplebeforedawn. [fix GH-646]
-
-Sat Jun 28 22:57:01 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/pathname/pathname.c (path_birthtime): Windows support.
-	  see [Feature #9857] [ruby-dev:48339]
-
-Sat Jun 28 22:44:16 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (path_birthtime): New method,
-	  Pathname#birthtime.
-	  Proposed by Kazuhiro NISHIYAMA.  [ruby-dev:48232] [Feature #9857]
-
-Sat Jun 28 20:29:03 2014  Simon Baird  <simon.baird@gmail.com>
-
-	* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#PI): change error
-	  message about zero or negative precision for clarity and
-	  consistency with other methods.  [GH-644]
-
-Sat Jun 28 15:32:57 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/utils.rb (create_listeners): Close socket objects.
-
-Sat Jun 28 13:58:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): should not overwrite SystemStackError
-	  backtrace if set already.  [ruby-core:63377] [Feature #6216]
-
-	* eval.c (setup_exception): get rid of method calls before raising
-	  stack overflow, not to cause stack overflow again.
-
-	* defs/id.def: add IDs for backtraces.
-
-Sat Jun 28 04:08:22 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/mailto.rb: update to latest specs, RFC 6068 and HTML5.
-
-	* lib/uri/mailto.rb (HEADER_PATTERN): removed.
-
-	* lib/uri/mailto.rb (HEADER_REGEXP): use RFC 6068 hfields.
-
-	* lib/uri/mailto.rb (EMAIL_REGEXP): use HTML5 email regexp.
-
-	* lib/uri/mailto.rb (URI::MailTo.build): support multiple to addresses.
-
-	* lib/uri/mailto.rb (URI::MailTo#initialize): Support multiple to
-	  addresses. Don't check with regexp, only split.
-
-	* lib/uri/mailto.rb (URI::MailTo#check_to): verify by matching
-	  URI path-rootless and HTML5 email regexp with unescaped one.
-
-	* lib/uri/mailto.rb (URI::MailTo#check_headers): verify only by
-	  HEADER_REGEXP.
-
-	* lib/uri/mailto.rb (URI::MailTo#set_headers): don't check by
-	  HEADER_REGEXP, only split it.
-
-Sat Jun 28 00:35:10 2014  Lauri Tirkkonen  <lotheac@iki.fi>
-
-	* tool/mkconfig.rb: fix empty RbConfig::CONFIG["prefix"] when
-	  configured --with-rubyarchprefix, remove prefix from rubyarchdir
-	  after expansion for the case it does not start with '$(prefix)'.
-	  [fix GH-643]
-
-Fri Jun 27 15:20:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase.
-	  because it's effected by removing minitest from stdlib.
-
-Fri Jun 27 12:29:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/specification.rb: fixed broken condition caused
-	  by removing YAML::ENGINE.
-	* lib/rubygems/package/old.rb: ditto.
-
-Fri Jun 27 05:33:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_shift): fix memory leak on Windows, free environment
-	  strings block always.  [ruby-dev:48332] [Bug #9983]
-
-Fri Jun 27 03:41:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (GETASTER): should not use the numbered argument to be
-	  formatted, raise ArgumentError instead.
-	  [ruby-dev:48330] [Bug #9982]
-
-Thu Jun 26 18:18:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/with_different_ofs.rb: move into test library directory.
-	* test/csv/base.rb: fix require path for with_different_ofs.rb.
-	* test/digest/test_digest_extend.rb: ditto.
-
-Thu Jun 26 18:06:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/profile_test_all.rb: move into test library directory.
-	* test/runner.rb: fix require path for profile_test_all.rb.
-
-Thu Jun 26 17:57:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/webrick/httpproxy.rb: remove useless assigned variables.
-	* lib/webrick/httpservlet/cgihandler.rb: ditto.
-	* lib/webrick/httpservlet/erbhandler.rb: ditto.
-	* lib/webrick/server.rb: ditto.
-
-Thu Jun 26 08:28:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_select): fix memory leak and crash on Windows, make
-	  keys array first instead of iterating on environ directly.
-	  [ruby-dev:48325] [Bug #9978]
-
-Thu Jun 26 02:45:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_error.c (error_print): put a newline after an anonymous
-	  exception class name.
-
-Wed Jun 25 22:31:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (ruby_setenv): fix memory leak on Windows, free
-	  environment strings block after check for the size.
-	  [ruby-dev:48323] [Bug #9977]
-
-Wed Jun 25 15:44:12 2014  Eric Wong  <e@80x24.org>
-
-	* ccan/container_of/container_of.h (container_off_var):
-	  avoid warning with -Wcast-qual
-	  [ccan ba5ad771af4aa9e085498de6c3c665c52694460f (Rusty Russell)]
-
-Wed Jun 25 10:19:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_aset, env_has_key, env_assoc, env_has_value),
-	  (env_rassoc, env_key): prohibit tainted strings if $SAFE is
-	  non-zero.  [Bug #9976]
-
-Tue Jun 24 14:46:17 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/gserver.rb: remove redundant use of to_s in interpolation.
-	* lib/logger.rb: ditto.
-	* lib/optparse.rb: ditto.
-	* lib/rbconfig/obsolete.rb: ditto.
-	* lib/resolv.rb: ditto.
-	* lib/webrick/httpresponse.rb: ditto.
-
-Tue Jun 24 10:50:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_path_str_new): make PATH environment variable
-	  string, to be frozen.
-
-Tue Jun 24 10:40:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/make-snapshot: download bundle gems when package making.
-	  [Feature #9852][ruby-core:62676]
-	* gems/bundled_gems: listed bundled gems for Ruby 2.2.
-
-Tue Jun 24 10:20:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/downloader.rb: make Downloader class to general download utility.
-	  It can be used without config.guess and config.sub.
-	* tool/get-config_files: ditto.
-	* tool/make-snapshot: ditto.
-
-Tue Jun 24 06:17:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* eval.c (setup_exception): "mesg == sysstack_error" and
-	  sysstack_error_p(mesg) are duplicated.
-	  r46502 seems to want to use latter.
-
-Tue Jun 24 06:15:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tcltklib.c: fix format specifiers for VALUE and
-	  Tcl_Interp*.  [ruby-core:63283] [Bug #9972]
-
-Tue Jun 24 05:40:41 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* nacl/nacl-config.rb: Use File.exist? instead of executable?
-	  for irt_core. Recent nacl_sdk has non-executable irt_core.
-	  Patch by Shinichiro Hamaji.
-	  [Fixes GH-529] https://github.com/ruby/ruby/pull/529
-
-Mon Jun 23 18:44:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/config_files.rb: rename class ConfigFiles to Downloader.
-	* tool/get-config_files: ditto.
-	* tool/make-snapshot: ditto.
-
-Mon Jun 23 18:03:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/rbinstall.rb: support to install bundle gems.
-
-Mon Jun 23 17:33:11 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/net/imap.rb (Net::IMAP#fetch): [DOC] Describe how a range in
-	  +set+ is interpreted, and mention -1 which can be used for '*'.
-
-Mon Jun 23 16:22:50 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* include/ruby/ruby.h (struct RHash): no longer. [Feature #9889]
-
-	* include/ruby/ruby.h (RHASH): ditto.
-
-	* include/ruby/ruby.h (RHASH_ITER_LEV): deprecated.  Will be deleted later.
-
-	* include/ruby/ruby.h (RHASH_IFNONE): ditto.
-
-	* internal.h (struct RHash): moved here.
-
-	* internal.h (RHASH): ditto.
-
-	* hash.c (rb_hash_iter_lev): do not use this.
-
-	* hash.c (rb_hash_ifnone): ditto.
-
-Mon Jun 23 13:30:11 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* include/ruby/ruby.h (struct RComplex): no longer. [Feature #9888]
-
-	* include/ruby/ruby.h (RCOMPLEX): ditto.
-
-	* include/ruby/ruby.h (RCOMPLEX_SET_REAL): deprecated.  Will be deleted later.
-
-	* include/ruby/ruby.h (RCOMPLEX_SET_IMAG): ditto.
-
-	* internal.h (struct RFloat): moved here.
-
-	* internal.h (RCOMPLEX): ditto.
-
-	* complex.c (rb_complex_set_real): do not use this.
-
-	* complex.c (rb_complex_set_imag): ditto.
-
-Mon Jun 23 13:10:15 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* include/ruby/ruby.h (struct RFloat): no longer.  [Feature #9863]
-
-	* include/ruby/ruby.h (RFLOAT): ditto.
-
-	* internal.h (struct RFloat): moved here.
-
-	* internal.h (RFLOAT): ditto.
-
-Mon Jun 23 12:01:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (check_port): allow strings for port= as
-	  described in rdoc.
-
-	* lib/uri/rfc3986_parser.rb (regexp): implementation detail of above.
-
-Mon Jun 23 11:35:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): set backtrace in system stack error
-	  other than the pre-allocated sysstack_error.  [Feature #6216]
-
-	* proc.c (Init_Proc): freeze the pre-allocated sysstack_error.
-
-	* vm_insnhelper.c (vm_stackoverflow): raise new instance for each
-	  times without calling any methods to keep the backtrace with no
-	  further stack overflow.
-
-	* object.c (rb_obj_copy_ivar): extract function to copy instance
-	  variables only for T_OBJECT from init_copy.
-
-Mon Jun 23 11:11:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (check_stack_overflow): drop the last tag too close to
-	  the fault page, to get rid of stack overflow deadlock.
-	  [Bug #9971]
-
-Sun Jun 22 09:11:15 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb: remove registry.
-	  'registry' is not used and RFC3986 doesn't use it.
-
-Sun Jun 22 09:10:09 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/rfc3986_parser.rb: raise exception when given a URI string
-	  has non ASCII in order to keep the regexp compiled for US-ASCII.
-
-Sun Jun 22 09:05:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/common.rb (URI::REGEXP): move to lib/uri/rfc2396_parser.rb.
-
-	* lib/uri/common.rb (URI::Parser): ditto.
-
-	* lib/uri/common.rb (URI.split): use RFC3986_Parser. [Feature #2542]
-
-	* lib/uri/common.rb (URI.parse): ditto.
-
-	* lib/uri/common.rb (URI.join): ditto.
-
-	* lib/uri/common.rb (URI.extract): deprecated.
-
-	* lib/uri/common.rb (URI.regexp): ditto.
-
-	* lib/uri/rfc2396_parser.rb: added.
-
-	* lib/uri/rfc3986_parser.rb: added.
-
-Sun Jun 22 09:04:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/mailto.rb (initialize): as previous commit, fix arg_check
-
-Sun Jun 22 09:01:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/ftp.rb (initialize): argument checking flag is arg_check,
-	  but arg[-1] is fragment.
-
-	* lib/uri/ftp.rb (initialize): explicitly specify arguments.
-
-Sat Jun 21 12:50:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
-	  with 3-digit.  libffi 3.1 returns just 2-digit.
-	  [ruby-core:62920] [Bug #9897]
-
-Sat Jun 21 07:06:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_find): [DOC] never accepted a symbol.
-	  [ruby-dev:48308] [Bug #9966]
-
-Fri Jun 20 17:15:43 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/lib/tracepointchecker.rb: add to check TracePoint healthiness.
-
-	* test/runner.rb: use it.
-
-Fri Jun 20 07:26:44 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_settracefunc.rb: rewrite tests with
-	  assert_consistent_call_return().
-
-	  assert_consistent_call_return() is also modified to check
-	  consistency.
-
-Fri Jun 20 07:07:28 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (rb_iseq_compile_node): put start label of block after
-	  trace (b_call).
-	  [Bug #9964]
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-	  added assert_consistent_call_return() method check call/return
-	  consistency.
-
-Fri Jun 20 05:26:27 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_eval.c (rb_catch_protect): fix same problem of [Bug #9961].
-
-	* vm_eval.c (rb_iterate): ditto.
-
-Thu Jun 19 21:41:30 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_vm_rewind_cfp): add new function to rewind specified cfp
-	  with invoking RUBY_EVENT_C_RETURN.
-	  [Bug #9961]
-
-	* vm_core.h: ditto.
-
-	* eval.c (rb_protect): use it.
-
-	* eval.c (rb_rescue2): ditto.
-
-	* vm_eval.c (rb_iterate): ditto.
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-	* vm_core.h (rb_vm_rewind_cfp): add the prototype declaration.
-
-Thu Jun 19 19:47:21 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (invoke_block_from_c): move call/return event timing for
-	  bmethod. It can invoke inconsistent call event if this call raises
-	  argument error.
-	  [Bug #9959]
-
-	* vm_insnhelper.c (vm_call_bmethod_body): ditto.
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-Thu Jun 19 18:14:47 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or
-	  rescue clause.
-
-	* vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at rescue/ensure.
-
-	* test/ruby/test_settracefunc.rb: should not invoke b_return at rescue
-	  clause.
-	  [Bug #9957]
-
-	* vm_dump.c (control_frame_dump): check VM_FRAME_MAGIC_RESCUE.
-
-	* vm_dump.c (vm_stack_dump_each): ditto.
-
-Thu Jun 19 13:39:11 2014  Arne Brasseur  <arne@arnebrasseur.net>
-
-	* proc.c (rb_method_curry): Implement Method#curry, which delegates
-	  to to_proc.curry.  [ruby-core:62212] [Feature #9783]
-
-Tue Jun 17 16:41:49 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (gets, readline): read lines without LF properly.
-	  [ruby-core:63205] [Bug #9949]
-
-	* test/net/ftp/test_buffered_socket.rb: related test.
-
-Tue Jun 17 12:35:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (extract_raise_opts): pass unknown options to the
-	  exception, so that exception class can receive a hash argument.
-	  [ruby-core:63203] [Feature #8257]
-
-Tue Jun 17 12:24:57 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_memsize_of): memsize_of(T_ZOMBIE) returns 0, not a rb_bug.
-	  ObjectSpace.count_objects_size() uses memsize_of(T_ZOMBIE).
-
-	  This bug introduced at r46348.
-
-Mon Jun 16 19:00:11 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/runner.rb: failure message should be passed as an argument.
-
-Mon Jun 16 18:42:57 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/runner.rb: capture TracePoint stat before setup and compare
-	  it after teardown.
-
-Mon Jun 16 14:33:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (open): use UTF-8 version function to support
-	  non-ascii path properly.  [ruby-core:63185] [Bug #9946]
-
-Sat Jun 14 10:54:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rcombinate0): remove recursion, by looping with indexes
-	  stored in `p`.
-
-	* array.c (rpermute0): remove recursion, by looping with indexes
-	  stored in `p`.
-
-	* array.c (permute0): remove recursion, by looping with indexes
-	  stored in `p`.  [ruby-core:63103] [Bug #9932]
-
-Sat Jun 14 10:52:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resize): update capa only when buffer get
-	  reallocated.
-	  http://d.hatena.ne.jp/nagachika/20140613/ruby_trunk_changes_46413_46420#r46413
-
-Sat Jun 14 08:28:59 2014  Zachary Scott  <e@zzak.io>
-
-	* man/rake.1: [DOC] Update links for Rake, patch by @hsbt [Bug #9904]
-	  [Fixes GH-628] https://github.com/ruby/ruby/pull/628
-
-Fri Jun 13 17:58:58 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_trace.c: add new method TracePoint.stat to debug
-	  TracePoint mechanism.
-
-	  Ruby users should not use this method. So I don't note this method
-	  in the NEWS file.
-
-	* test/runner.rb: detect zombie active TracePoints with
-	  TracePoint.stat.
-
-Fri Jun 13 17:46:31 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_trace.c: clear and restore recursive checking thread local data
-	  to avoid unexpected throw from TracePoint.
-	  [Bug #9940]
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-	* thread.c: added
-	  * rb_threadptr_reset_recursive_data(rb_thread_t *th);
-	  * rb_threadptr_restore_recursive_data(rb_thread_t *th, VALUE old);
-
-	* vm_core.h: ditto.
-
-Fri Jun 13 17:33:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_combination): iterate on a shared copy, and use
-	  array of indexes instead of array of chosen objects.
-	  [ruby-core:63149] [Bug #9939]
-
-	* array.c (yield_indexed_values): extract from permute0(),
-	  rpermute0(), and rcombinate0().
-
-Fri Jun 13 13:42:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_permutation): `p` is the array of size `r`, as
-	  commented at permute0().  since `n >= r` here, buffer overflow
-	  never happened, just reduce unnecessary allocation though.
-
-Thu Jun 12 20:32:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resize): should consider the capacity instead
-	  of the old length, as pointed out by nagachika.
-
-Thu Jun 12 18:31:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/net/http/responses.rb: added Net::HTTPPermanentRedirect(308)
-	  Contributed by @yorkie [fix GH-638]
-
-Thu Jun 12 13:27:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_freeze): shrink the buffer before freezing, as
-	  pointed out by Eric Wong at [ruby-core:63119].
-
-Thu Jun 12 13:09:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (expand_path): shrink expanded path which no longer needs
-	  rooms to append.  [ruby-core:63114] [Bug #9934]
-
-Wed Jun 11 17:37:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_scalar_pthread_t): pthread_t is not required
-	  to be a scalar type.
-
-	* thread.c (fill_thread_id_string, thread_id_str): dump pthread_t
-	  in hexadecimal form if it is not a scalar type, assume it can be
-	  represented in a pointer form otherwise.  based on the patch by
-	  Rei Odaira at [ruby-core:62867].  [ruby-core:62857] [Bug #9884]
-
-	* thread_pthread.c (Init_native_thread, thread_start_func_1),
-	  (native_thread_create): set thread_id_str if needed.
-
-	* vm_core.h (rb_thread_t): add thread_id_string if needed.
-
-Wed Jun 11 01:53:22 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: invoke GC before memory allocation (xmalloc/xrealloc)
-	  when GC.stress = true.
-	  [Bug #9859]
-
-	* test/ruby/test_gc.rb: add a test.
-
-Tue Jun 10 13:20:14 2014  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
-
-	* lib/cgi/core.rb: Provide a mechanism to specify the
-	  max_multipart_length of multipart data.
-	  [Feature #8370] patch by Leif Eriksen <leif.eriksen.au@gmail.com>
-
-Tue Jun 10 10:57:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/csv.rb (CSV#<<): honor explicitly given encoding.  based on
-	  the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
-	  [ruby-core:62113].  [Bug #9766]
-
-Mon Jun  9 20:40:48 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change full GC timing to keep lower memory usage.
-
-	  Extend heap only at
-	  (1) after major GC
-	  or
-	  (2) after several (two times, at current) minor GC
-
-	  Details in https://bugs.ruby-lang.org/issues/9607#note-9
-	  [Bug #9607]
-
-Mon Jun  9 16:01:41 2014  Masahiro Ide  <imasahiro9@gmail.com>
-
-	* gc.c (gcdebug_sentinel): fix typo, "sentinel" not "sential".
-	  [fix GH-634]
-
-Mon Jun  9 00:04:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (posix_fadvise): disable use of posix_fadvise
-	  itself on 32-bit AIX.  [ruby-core:62968] [Bug #9914]
-
-Sun Jun  8 23:28:00 2014    <kanemoto@ruby-lang.org>
-
-	* io.c (rb_io_advise): AIX currently does not support a 32-bit call to
-	  posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira.
-	  [ruby-core:62968] [Bug #9914]
-
-Sun Jun  8 04:52:40 2014  Jun Hiroe  <Jun.Hiroe@gmail.com>
-
-	* string.c (rb_str_slice_bang): [DOC] update return value against
-	  a fixnum, which has changed because of M17N.  [fix GH-631]
-
-Sat Jun  7 22:13:42 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* numeric.c (do_coerce): Add a warning when an exception is raised
-	  or an invalid value is returned in #coerce called by
-	  numeric comparison operators and the exception
-	  thrown by the caller has no information on the failure.
-	  In the next release such exception should not be rescued or
-	  should be the cause of the caller exception. nil is accepted
-	  as the "no possible coercion" return value. See #7688.
-
-	* test/ruby/test_numeric.rb: Add corresponding test.
-
-Sat Jun  7 18:15:33 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* numeric.c (bit_coerce): remove constant parameter `err'
-	  (always TRUE) of bit_coerce().
-
-Sat Jun  7 16:01:57 2014  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size
-	  for later use. Patch by Rei Odaira. [ruby-core:62945] [Bug #9905]
-
-Sat Jun  7 12:51:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (read_all): truncate the buffer before appending read data,
-	  instead of truncating before reading.
-	  [ruby-core:55951] [Bug #8625]
-
-Sat Jun  7 12:28:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/digest/digest.c (rb_digest_instance_equal): no need to call
-	  `to_s` twice.  [Bug #9913]
-
-Sat Jun  7 11:35:01 2014  Tanaka Akira  <akr@fsij.org>
-
-	* object.c (rb_mod_initialize_clone): Override Kernel#initialize_clone
-	  to avoid an exception on Class.new.freeze.clone.to_s.
-	  Reported by Andrew Grimm.  [ruby-core:41858] [Bug #5828]
-
-Sat Jun  7 06:03:11 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* ext/digest/digest.c (rb_digest_instance_equal):
-	  fix #== for non-string arguments. [ruby-core:62967] [Bug #9913]
-
-	* test/digest/test_digest.rb: add test for above.
-
-Fri Jun  6 22:19:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (private_recv_p): check by node type, instead of a
-	  magic number.
-
-	* node.h (NODE_PRIVATE_RECV), parse.y (attrset_gen): remove
-
-Fri Jun  6 17:07:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each), parse.y (new_attr_op_assign_gen):
-	  allow op assign to a private attribute.
-	  [ruby-core:62949] [Bug #9907]
-
-Fri Jun  6 13:39:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_setstrbuf, io_read): should not shorten the given buffer until
-	  read succeeds.  [ruby-core:55951] [Bug #8625]
-
-Fri Jun  6 07:41:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with a
-	  tag so that they can be parsed on input. [Bug #9873] [ruby-core:62825]
-	* test/psych/test_symbol.rb: test for change
-
-Thu Jun  5 16:08:39 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_page_sweep): refactoring.
-
-	* gc.c (gc_page_sweep): should not set, but add final_slots into
-	  sweep_page->final_slots.
-
-Thu Jun  5 14:36:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (jemalloc): check for the header regardless drop-in
-	  libjemalloc is found, for `malloc_conf` declaration.
-
-	* version.c (ruby_show_version): show `malloc_conf` if set.
-	  [Feature #9113]
-
-	* configure.in (with-jemalloc): also check for header, for ABIs
-	  which JEMALLOC_MANGLE is needed, i.e., Mach-O and PE-COFF
-	  platforms.  [ruby-core:62939] [Feature #9113]
-
-	* include/ruby/missing.h: include alternative malloc header to
-	  replace memory management functions.
-
-	* dln.c, io.c, parse.y, st.c: undef malloc family before
-	  re-definition to suppress warnings.
-
-Thu Jun  5 12:52:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* man/ruby.1: remove rubyforge entry.
-
-Thu Jun  5 12:45:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* misc/README: use github link instead of rubyforge.
-
-Thu Jun  5 10:03:29 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_free): check also FL_PROMOTED bit by RVALUE_OLD_P().
-
-Thu Jun  5 03:45:28 2014  Eric Wong  <e@80x24.org>
-
-	* configure.in: add --with-jemalloc option
-	  [ruby-core:62912]
-
-Wed Jun  4 22:28:14 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: introduce RZombie to manage zombie objects.
-	  Rewrite finalizing logics with this type.
-
-	* gc.c (gc_verify_internal_consistency): verify zombie (finalizing)
-	  objects count.
-
-Wed Jun  4 22:09:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (match_aref, rb_reg_regsub): consider encoding of captured
-	  names, encoding-incompatible should not match.
-	  [ruby-dev:48278] [Bug #9903]
-
-Wed Jun  4 21:23:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (match_aref): should not ignore name after NUL byte.
-	  [ruby-dev:48275] [Bug #9902]
-
-Wed Jun  4 04:08:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (core_hash_merge_kwd): should return the result hash, which
-	  may be converted from and differ from the given argument.
-	  [ruby-core:62921] [Bug #9898]
-
-Tue Jun  3 23:32:34 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c (load_file_internal2): Extracted from load_file_internal.
-	  (load_file_internal): Invoke load_file_internal2 using rb_protect.
-	  Close an opened FD if load_file_internal2 raises an exception.
-
-Tue Jun  3 19:11:45 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_objspace_free): should not rest_sweep() here.
-	  Some data structures are already freed.
-
-Tue Jun  3 18:43:51 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb: allocate more objects to invoke GC by newobj.
-	  GC allows extending pages depends on heap_increment.
-
-Tue Jun  3 18:01:27 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_gc_call_finalizer_at_exit): add
-	  gc_verify_internal_consistency() when RGENGC_CHECK_MODE >= 2.
-
-Tue Jun  3 17:54:21 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change the counting method for young objects.
-	  clear counter at the beginning of every GC and
-	  count promoted (infant->young) objects.
-
-	  Some promotions (infant->young) are transition of promoting to old
-	  objects. We should not count such promotions.
-
-	  With this technique, we don't need to check young objects
-	  at obj_free().
-
-Tue Jun  3 16:38:19 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add verifying counters code in gc_verify_internal_consistency().
-	  gc_verify_internal_consistency() counts all
-	  - live objects
-	  - young objects (if age2 promotion)
-	  - old objects
-	  in all pages and compares with objspace managing counters.
-
-	* gc.c (gc_after_sweep): do gc_verify_internal_consistency()
-	  when RGENGC_CHECK_MODE >= 2.
-
-Tue Jun  3 13:14:04 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body
-	  type as "MIXED" followed immediately by params
-	  [ruby-core:62864] [Bug #9885]
-	  Patch by @rayners (David Raynes). [Fixes GH-622]
-	  https://github.com/ruby/ruby/pull/622
-
-Tue Jun  3 13:18:24 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (objspace_live_slot): live slot count should not include final
-	  slot (contains T_ZOMBIE) count.
-
-Tue Jun  3 13:03:21 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_free): fix spacing.
-
-Tue Jun  3 12:59:32 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (check_gen_consistency): fix error message.
-
-Tue Jun  3 12:40:23 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: count old/young objects more correctly.
-
-	* gc.c (RVALUE_DEMOTE_FROM_OLD): decrement old object count.
-
-	* gc.c (RVALUE_DEMOTE_FROM_YOUNG): decrement young object count.
-
-	* gc.c (rb_gc_resurrect): increment old object count.
-
-	* gc.c (gc_marks_body): should not add old object count.
-	  This code is completely my misunderstanding.
-
-	* gc.c (rb_gc_force_recycle): decrement young or old object count
-	  correctly.
-
-Tue Jun  3 12:26:47 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit
-	  correctly for fiddle/import unavailable environments.
-
-Tue Jun  3 09:45:13 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result):
-	  shouldn't use same server for respective tests, because the 1st
-	  test sometimes kills the server main loop silently.
-	  [Bug #9881] [ruby-dev:48266]
-
-Tue Jun  3 01:34:59 2014  Zachary Scott  <e@zzak.io>
-
-	* README.EXT: [DOC] Add rb_call_super when subclassing from @robin850
-	  [Fixes GH-623] https://github.com/ruby/ruby/pull/623
-
-Mon Jun  2 17:14:49 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (ruby_vm_destruct): remove useless call of
-	  rb_gc_force_recycle().
-
-	  At this line, a VM object is already freed
-	  (is changed to T_NONE) by rb_gc_call_finalizer_at_exit().
-
-Mon Jun  2 15:50:24 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (rb_using_refinement): add write-barriers for
-	  cref->nd_refinements.
-
-Mon Jun  2 12:26:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* CONTRIBUTING.md: added contributing guide for github. [fix GH-625]
-
-Mon Jun  2 07:30:33 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/envutil.rb (default_warning): New method.
-
-	* test/ruby/test_autoload.rb: Use EnvUtil.default_warning.
-
-Mon Jun  2 07:05:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h: constify `rb_encoding` arguments.
-
-	* include/ruby/oniguruma.h: constify `OnigEncoding` arguments.
-
-Sun Jun  1 12:05:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/drb: Wrap tests definitions by DRbTests module.  This makes
-	  several tests (ACLEntryTest, TestBug4409, etc.) easier to understand
-	  that they are tests for DRb.
-
-Sun Jun  1 11:36:25 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rinda/ring.rb (RingFinger#make_socket): Close the socket on
-	  exception.
-
-Sun Jun  1 06:55:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (intern_str): dynamic attrset ID is registered by
-	  `rb_id_attrset()` already, so no further registration is needed.
-	  [ruby-core:62861]
-
-Sun Jun  1 04:52:47 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/English.rb: [DOC] $LOADED_FEATURES moved to load.c [Fixes GH-620]
-	  Patch submitted by @leafac in https://github.com/ruby/ruby/pull/620
-	* doc/globals.rdoc: Added $LOADED_FEATURES to list
-
-Sat May 31 22:30:14 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/leakchecker.rb: Leak checker extracted from
-	  test/lib/minitest/unit.rb.
-
-Sat May 31 21:15:43 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* thread.c (rb_thread_atfork_internal): My compiler complains
-	  about this variable being used before initialized. I looked at
-	  the code and expanded the macro and turned out it was actually
-	  USED for pointer arithmetic, not dereferenced.  So this was
-	  never a serious bug.  But is annoying indeed to see warnings
-	  every time.  I added `=0` and all went healthy.
-
-	* configure.in: Also, I found that the problematic macro expansion
-	  only happens when we lack __typeof__ C extension, which shall
-	  not be the case of my compiler.  I added AC_C_TYPEOF to kick ass.
-
-Sat May 31 16:32:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/ipaddr.rb: extracted inline tests into test dir.
-	* test/test_ipaddr.rb: ditto.
-
-Sat May 31 16:29:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/digest/lib/digest/hmac.rb: extracted inline tests into test dir.
-	* test/digest/test_digest_hmac.rb: ditto.
-
-Sat May 31 16:02:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_syslog.rb: remove executable.
-
-Sat May 31 08:58:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/unicode.c (init_case_fold_table): no longer need to
-	  initialize tables at runtime.
-
-	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
-	  lookup case unfolding table 3.
-
-	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
-	  lookup case unfolding table 2.
-
-	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
-	  lookup case unfolding table 1.
-
-	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
-	  lookup case folding table.
-
-	* enc/unicode/case-folding.rb (print_table): merge non-locale and
-	  locale tables, and reduce initializing loops.
-
-	* enc/unicode/case-folding.rb (CaseFolding): modularize, and add
-	  --output-file option.
-
-	* enc/unicode/case-folding.rb: script to convert CaseFolding.txt,
-	  translated from CaseFolding.py.
-
-Sat May 31 08:31:41 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Check Tempfile leaks for each test method
-	  again.
-
-Sat May 31 03:50:50 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/delegate.rb: [DOC] Document raise in Delegator class
-	  Patch by @lucasmazza. [Fixes GH-621]
-	  https://github.com/ruby/ruby/pull/621
-
-Fri May 30 21:23:26 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb: Use a pipe to detect server shutdown.
-	  shutdown() or close() for listening socket is not a reliable.
-	  Actually, both doesn't work (doesn't wake up select()) on
-	  DragonFly BSD 3.6.2.
-
-	* test/webrick/utils.rb: :ShutdownSocketWithoutClose is not required
-	  now to immediate server shutdown detection.
-	  This fixes fd leaks.
-
-	* test/net/http/utils.rb: Ditto.
-
-Fri May 30 20:58:37 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb (check_fd_leak): Sort the inspected
-	  objects list for a FD.
-
-Fri May 30 18:06:55 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb (check_fd_leak): Try GC to delete leaked
-	  FDs.
-
-Fri May 30 12:05:59 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/lib/test/unit/parallel.rb (_run_suite): orig_stdout may be nil
-	  though I don't know the reason.
-
-Fri May 30 11:33:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_substr): need to reset code range for shared
-	  string too, not only copied string.
-	  [ruby-core:62842] [Bug #9882]
-
-Fri May 30 10:22:21 2014  Mark Lorenz  <mlorenz@covermymeds.com>
-
-	* lib/erb.rb (result): [DOC] no longer accepts a Proc, as
-	  Kernel.eval does not.  [fix GH-619]
-
-Fri May 30 07:25:46 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/-test-/dir: Dir#fileno implemented.
-
-	* test/lib/minitest/unit.rb (find_fds): Don't return the fd used to
-	  scan /proc/$$/fd.
-
-Fri May 30 04:48:00 2014  Eric Wong  <e@80x24.org>
-
-	* parse.y (rb_gc_mark_parser): remove, empty since r8758
-	* internal.h: ditto, not usable from extensions since 2.0.0
-	* gc.c (gc_mark_roots): remove checkpoint for parser
-
-Thu May 29 23:27:50 2014  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* signal.c (ruby_signal): should return either `old.sa_sigaction`
-	  or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
-	  `old.sa_flags`, because they may not be a union.
-	  [ruby-core:62836] [Bug #9878]
-
-Thu May 29 23:11:20 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (pipe_open): Close pipes when rb_execarg_fixup() raises
-	  an exception.
-	  (rb_execarg_fixup_v): New function.
-
-Thu May 29 22:18:57 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb (capture_subprocess_io): Close fds.
-
-Thu May 29 19:47:08 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_io_s_pipe): Close pipes if io_encoding_set() raises an
-	  exception.
-	  (io_encoding_set_v): New function.
-
-Thu May 29 19:42:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/csv.rb (CSV.open): Close the opened file when an exception
-	  occur.
-
-Thu May 29 19:31:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
-	  if any exception occur.
-
-Thu May 29 05:05:29 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/ruby.h: Hide Symbol internals.
-	  (struct RSymbol): moved to internal.h
-	  (RSYMBOL): ditto
-
-Thu May 29 00:28:56 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/unixsocket.c (rsock_init_unixsock): Open a socket
-	  after path length check.
-	  This fixes a fd leak by TestSocket_UNIXSocket#test_too_long_path.
-
-Wed May 28 23:04:35 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io.rb (test_flush_in_finalizer1): Use
-	  ObjectSpace.each_object to close files.
-	  GC.start is not reliable.
-
-Wed May 28 19:00:31 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/net/imap.rb (Net::IMAP#initialize): Close the opened socket when
-	  any exception occur.
-	  This fixes a fd leak by IMAPTest#test_imaps_post_connection_check
-	  which start_tls_session() raises an exception.
-
-Wed May 28 18:06:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work
-	  when SSL is not started.
-	  This fix the fd leak by test_https_proxy_authentication in
-	  test/net/http/test_https_proxy.rb.
-
-Wed May 28 10:29:28 2014  Eric Wong  <e@80x24.org>
-
-	* vm.c (rb_vm_living_threads_foreach): remove function
-	  [ruby-core:62745]
-	* thread.c (terminate_i): remove
-	* thread.c (terminate_all): implement (inlines old terminate_i)
-	* thread.c (rb_thread_terminate_all): use terminate_all
-	* thread.c (rb_thread_fd_close_i): remove
-	* thread.c (rb_thread_fd_close): iterate inline
-	* thread.c (thread_list_i): remove
-	* thread.c (rb_thread_list): iterate inline
-	* thread.c (rb_thread_atfork_internal): iterate inline
-	* thread.c (terminate_atfork_i): update types to remove casts
-	* thread.c (terminate_atfork_before_exec_i): ditto
-	* thread.c (struct thgroup_list_params): remove definition
-	* thread.c (thgroup_list_i): remove
-	* thread.c (thgroup_list): iterate inline
-	* thread.c (check_deadlock_i): remove
-	* thread.c (debug_deadlock_check): implement (inlines check_deadlock_i)
-	* thread.c (debug_i): remove
-	* thread.c (rb_check_deadlock): iterate inline
-	* vm.c (vm_mark_each_thread_func): remove
-	* vm.c (rb_vm_mark): iterate inline
-	* vm_core.h (rb_vm_living_threads_remove): remove
-	* vm_trace.c (clear_trace_func_i): remove
-	* vm_trace.c (rb_clear_trace_func): iterate inline
-
-Wed May 28 09:30:51 2014  Eric Wong  <e@80x24.org>
-
-	* signal.c (signal_exec): ignore immediate cmd for SIG_IGN
-	* signal.c (trap_handler): set cmd to true for SIG_IGN
-	* signal.c (trap): handle nil and true values for oldcmd
-	  [Bug #9835]
-
-Wed May 28 01:02:54 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tempfile.rb (Tempfile#inspect): Show "(closed)" if the tempfile
-	  is closed.
-
-Wed May 28 00:38:09 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Use Tempfile#close! instead of
-	  Tempfile#unlink to close file descriptors.
-
-	* test/openssl/test_config.rb: Ditto.
-
-	* test/ruby/test_io.rb: Ditto.
-
-Wed May 28 00:06:18 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
-	  exception occur.
-
-Tue May 27 23:50:07 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/cgi/core.rb: Use Tempfile#close! instead of Tempfile#unlink
-	  to close file descriptors.
-
-Tue May 27 23:06:46 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_number_literal_suffix): refine error message for
-	  extra dot and digits.
-
-Tue May 27 22:44:20 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/rexml: Avoid fd leaks.
-
-Tue May 27 22:24:25 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb: Indent.
-
-Tue May 27 22:15:29 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_document.rb: Wrap by REXMLTests module.
-
-Tue May 27 22:11:10 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_encoding_2.rb: Remove a needless file.
-
-Tue May 27 22:10:30 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_contrib.rb: Indent.
-
-Tue May 27 21:28:16 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/socket/ifaddr.c (ifaddr_inspect_flags): support IFF_SIMPLEX.
-
-Tue May 27 21:03:03 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/: Use REXMLTests as wrapping module for REXML tests.
-	  I avoid using the same module for library in test because
-	  it provides "include REXML" environment in test. Normally,
-	  users don't use REXML on "include REXML" environment. So I
-	  don't want to write tests on "include REXML" environment.
-
-Tue May 27 20:59:37 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_comment.rb: Remove needless REXML module wrapping.
-
-Tue May 27 20:56:49 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/openssl/test_pkcs7.rb: Fix inverted expected and actual values.
-
-Tue May 27 20:26:06 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (test_flush_in_finalizer1): some opened fds are
-	  remain before GC, so unlink the tempfile is failed.
-
-Tue May 27 19:07:26 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_io_autoclose_p): Don't raise on frozen IO.
-
-	* test/lib/minitest/unit.rb: IO#autoclose? may raise IOError.
-
-Tue May 27 19:01:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_pair.rb: Modify TestSSL#test_read_and_write
-	  to handle partial sysreads. [Bug #7398][ruby-core:49563]
-	* test/openssl/test_ssl.rb: ditto.
-
-Tue May 27 18:46:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_pkcs7.rb: Add tests for PKCS7#type= and add_data.
-	  [Feature #7399][ruby-core:49565]
-
-Tue May 27 17:45:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_hmac.rb (test_binary_update): Added Test for
-	  HMAC signing with UTF-8 String. [Bug #7512][ruby-core:50559]
-
-Tue May 27 17:10:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/runner.rb: fixed randomly test failure.
-	  [Bug #6573][ruby-core:45563]
-
-Tue May 27 16:58:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_timeout.rb (test_timeout): inverted test condition.
-	  [Bug #8523]
-
-Tue May 27 12:24:22 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Show leaked file descriptors.
-
-Tue May 27 11:12:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_fileno, rb_io_inspect): non-modification does not
-	  error on frozen IO.  [ruby-dev:48241] [Bug #9865]
-
-Tue May 27 00:00:21 2014  yui-knk  <spiketeika@gmail.com>
-
-	* insns.def (defineclass): fix typo in the instruction comment.
-	  [fix GH-618]
-
-Mon May 26 16:33:15 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_file.rb: skip the test of atime on Windows, because
-	  Windows delays updating atime about 1 hour.
-	  see more details:
-	    http://msdn.microsoft.com/en-us/library/windows/desktop/ms724290%28v=vs.85%29.aspx
-
-Mon May 26 12:25:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optionparser.rb, lib/optparse.rb (OptParse): aliases.
-	  [ruby-core:62751] [Feature #9864]
-
-Mon May 26 07:59:34 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Show Finished threads line-by-line.
-
-Mon May 26 01:39:02 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/csv.rb: Reject nil as data source for CSV.new, patch by @Peeja.
-	  [Fixes GH-580] https://github.com/ruby/ruby/pull/580
-
-Mon May 26 01:07:51 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Show leaked threads and tempfiles
-	  line-by-line.
-
-Sun May 25 23:02:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb (MiniTest::Assertions#diff): Remove
-	  tempfiles.
-
-Sun May 25 22:42:27 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Check tempfile leak for each test class.
-
-Sun May 25 20:31:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_cv_func_{getcontext,setcontext}): do not
-	  disable ucontext.h entirely, but disable use of functions only.
-	  `ucontext_t` is necessary in the signal handler now.
-
-Sun May 25 20:00:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (check_stack_overflow): revert part of r46100, the
-	  previous condition was correct, and fix compilation error on
-	  other architecture linux.  [ruby-core:62746] [Bug #9862]
-
-Sun May 25 17:09:13 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Less ObjectSpace.each_object(Tempfile)
-	  invocation.
-
-Sun May 25 16:54:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Use Thread.list instead of
-	  ObjectSpace.each_object(Thread).
-
-Sun May 25 15:53:54 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
-	  threads.
-
-Sun May 25 15:26:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/utils.rb: Override the inspect method of the thread
-	  used in WEBrick::Utils::TimeoutHandler.
-
-Sun May 25 14:22:30 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/openssl: Join threads.
-
-Sun May 25 12:46:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_bug_context): new function to report bug with
-	  context.
-
-	* vm_dump.c (rb_vm_bugreport): accepts `ucontext_t` argument to
-	  dump machine registers.  based on [GH-584].
-
-	* signal.c (sigbus, sigsegv): dump machine registers if available.
-
-Sun May 25 12:32:42 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Sort leaked threads and tempfiles.
-
-Sun May 25 12:15:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (check_stack_overflow): fix condition to use ucontext
-	  register, mcontext_t dereference, and its member names, on Mac
-	  OS X.
-
-Sun May 25 11:58:26 2014  Zachary Scott  <e@zzak.io>
-
-	* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
-	  Patch by Erik Hollembeak [Bug #9814]
-
-Sun May 25 11:56:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): fix string width when precision is
-	  given.  as the result of `memchr` is NULL or its offset from the
-	  start cannot exceed the size, the comparison was always false.
-	  [ruby-core:62737] [Bug #9861]
-
-Sun May 25 11:32:42 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/yaml.rb: Remove Psych::EngineManager [Bug #8344]
-	* test/psych/*: ditto.
-
-Sun May 25 10:34:15 2014  Zachary Scott  <e@zzak.io>
-
-	* doc/regexp.rdoc: [DOC] Clarify whitespace matching by @allolex
-	  [Fixes GH-606] https://github.com/ruby/ruby/pull/606
-
-Sun May 25 10:19:34 2014  Zachary Scott  <e@zzak.io>
-
-	* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
-	  Patch submitted via documenting-ruby/ruby#34
-
-Sun May 25 10:16:43 2014  Zachary Scott  <e@zzak.io>
-
-	* cont.c: [DOC] Fix rdoc in example for Fiber#transfer by @majjoha
-	  Patch submitted via documenting-ruby/ruby#33
-
-Sun May 25 10:01:11 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/irb.rb: [DOC] Fixed syntax error in example by @jasdeepsingh.
-	  Patch submitted via documenting-ruby/ruby#32
-
-Sun May 25 09:58:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/fileutils/test_fileutils.rb (test_chown_R): Add tests for
-	  chown_R. [Feature #9383][ruby-core:59641]
-
-Sun May 25 09:57:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/fileutils/test_fileutils.rb: Added recursively chown tests.
-	  [Feature #9303][ruby-core:59325]
-
-Sun May 25 09:41:56 2014  Zachary Scott  <e@zzak.io>
-
-	* class.c: [DOC] Fixed grammar and examples of instance_methods.
-	  By @alex-frost via documenting-ruby/ruby#31
-
-Sun May 25 09:40:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb: Show leaked threads and tempfiles.
-
-Sun May 25 08:54:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_partial_record_read.rb: Testing read_nonblock on
-	  a partial TLS record results in IO::WaitReadable by @mohamedhafez.
-	  [fix GH-547]
-
-Sun May 25 08:43:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/logger.rb: refactored to include Logger::Period.
-
-Sun May 25 06:50:19 2014  Zachary Scott  <e@zzak.io>
-
-	* vm_eval.c: [DOC] Improve instance_eval description when given a
-	  block or String arguments. By @nathanl via documenting-ruby/ruby#28
-
-Sun May 25 06:29:39 2014  Zachary Scott  <e@zzak.io>
-
-	* array.c: [DOC] Clarify default argument for Array.new.
-	  By @Elffers [Fixes GH-610]
-
-Sat May 24 22:37:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* array.c: [DOC] Add more documents to shuffle! and shuffle.
-	  Contributed by @JuanitoFatas [ci skip][fix GH-612]
-
-Sat May 24 22:28:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/lib/minitest/.document: removed unused configuration.
-
-Sat May 24 19:08:47 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/spec.rb: Unused file removed.
-
-	* test/lib/minitest/autorun.rb: Don't require minitest/spec.
-
-	* test/lib/minitest/benchmark.rb: Ditto.
-
-Sat May 24 18:45:30 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/benchmark/test_benchmark.rb: Use test/unit.
-
-Sat May 24 16:20:59 2014  Eric Wong  <e@80x24.org>
-
-	* process.c (proc_getgroups, proc_setgroups): use ALLOCV_N
-	  [Bug #9856]
-
-Sat May 24 15:49:39 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/unit.rb (parallelize_me!): Removed.
-	  This fixes the line-by-line structure of the test result in verbose
-	  mode.  [ruby-core:54905]
-
-	* test/lib/minitest/parallel_each.rb: Removed.
-
-	* test/minitest/test_minitest_mock.rb: Don't call parallelize_me!.
-
-	* test/minitest/test_minitest_spec.rb: Ditto.
-
-	* test/minitest/test_minitest_unit.rb: Ditto.
-	  Tests for parallel feature removed.
-
-Sat May 24 15:29:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest/hell.rb: Unused file removed.
-
-	* test/lib/minitest/pride.rb: Ditto.
-
-Sat May 24 15:05:32 2014  yui-knk  <spiketeika@gmail.com>
-
-	* enumerator.c (yielder_yield_push): Insert a break after the
-	  method return value.  [fix GH-617]
-
-Sat May 24 14:59:12 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/minitest: Remove comments not appropriate now.
-
-	* test/minitest: Ditto.
-
-Sat May 24 14:02:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* NEWS: added minitest changes.
-
-Sat May 24 13:42:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/lib/test/unit/test-unit.gemspec: removed needless gemspec file.
-
-Sat May 24 09:39:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* defs/default_gems: removed minitest entry.
-
-Sat May 24 06:17:33 2014  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	*  lib/minitest: minitest 4.7.5 removed. Need to support proper
-	  gem packaging / installation before minitest 5 can be added.
-
-Sat May 24 05:54:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: More constants
-
-Sat May 24 00:25:34 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* NEWS: add information of incompatibility about Prime.prime?
-	* lib/prime.rb: fix docs.
-
-Fri May 23 21:36:28 2014  Josh Goebel  <dreamer3@gmail.com>
-
-	* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
-	  for messages not ending with a new-line.
-	  [ruby-core:61441] [Bug #9627] [fix GH-616]
-
-Fri May 23 03:48:08 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (rb_free_m_tbl): mark function as static
-
-	* method.h (rb_free_m_tbl): remove prototype
-
-Thu May 22 22:58:27 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: More TCP option constants.
-	  Describe Linux and glibc versions.
-
-Thu May 22 20:38:10 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (stat_birthtime): add birthtime support [Feature #9647]
-
-	* file.c (rb_stat_birthtime): add File::Stat.birthtime
-
-	* file.c (rb_file_s_birthtime): add File.birthtime
-
-	* file.c (rb_file_birthtime): add File#birthtime
-
-	* configure.in: check struct stat.st_birthtimespec.
-
-Thu May 22 19:38:14 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c: remove IO::Statfs because of reject. [Feature #9772]
-
-Thu May 22 14:02:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/jis/props.kwd: constify character property tables of JIS
-	  based encodings by perfect hash.
-
-	* enc/euc_jp.c, enc/shift_jis.c: use character property functions.
-
-Wed May 21 12:21:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: Fix compilation error on Android.
-	  Bionic doesn't define TCP state constants.
-
-Wed May 21 11:42:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: workaround for Info.plist to get rid of `dsymutil`
-	  crash by wrong files in parent directories.
-	  [ruby-core:62594] [Bug #9840]
-
-Tue May 20 20:57:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_dir.rb (test_glob): added testcase of double
-	  slash path.
-
-Tue May 20 04:58:54 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: Don't check fields of struct tcp_info if the
-	  structure is not available.
-
-Mon May 19 23:13:33 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_tcp_info): Permit longer data.  (glibc
-	  2.7 adds tcpi_rcv_rtt, tcpi_rcv_space and tcpi_total_retrans to
-	  struct tcp_info.)
-
-Mon May 19 20:49:07 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_tcp_info): New function to inspect
-	  struct tcp_info.
-	  (sockopt_inspect): Use inspect_tcp_info.
-
-	* ext/socket/extconf.rb: Check tcp_info related things.
-
-	* ext/socket/rubysocket.h: Include netinet/tcp_fsm.h if available.
-
-Mon May 19 19:36:39 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/dbm/test_dbm.rb: Use Etc.uname.
-
-	* test/gdbm/test_gdbm.rb: Ditto.
-
-Mon May 19 16:54:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (etc_uname): add support for Windows using
-	  GetVersionExW(), GetSystemInfo(), and GetComputerNameExW() with
-	  `ComputerNameDnsHostname`.  [Feature #9842]
-
-Mon May 19 16:29:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_pat_search): advance by byte offset but not by char
-	  offset.  [ruby-core:62669] [Bug #9849]
-
-Mon May 19 14:06:18 2014  Shota Fukumori  <her@sorah.jp>
-
-	* bin/testrb: Removed. Forgot to remove in r45971.
-	  [Feature #9711] [ruby-core:62620]
-
-Sun May 18 16:42:08 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_m17n_comb.rb (test_str_crypt): Use Etc.confstr to
-	  detect the glibc version.
-	  libc.so is not an executable on Debian GNU/kFreeBSD 7.0 (wheezy).
-
-Sun May 18 12:15:54 2014  Jonathan Mukai-Heidt  <johnnymukai@gmail.com>
-
-	* io.c (argf_each_line, argf_inplace_mode_set): [DOC] Update ARGF
-	  documentation examples.  `ARGF.lines` has been deprecated in
-	  favor of `ARGF.each_line`.  [Fixes GH-615]
-
-Sun May 18 11:59:25 2014  Tanaka Akira  <akr@fsij.org>
-
-	* missing/nextafter.c: Include ruby/missing.h.
-
-Sun May 18 11:09:28 2014  Tanaka Akira  <akr@fsij.org>
-
-	* win32/Makefile.sub: Add nextafter.obj to MISSING.
-
-Sun May 18 10:46:04 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/etc/etc.c: Etc.sysconf, Etc.confstr and IO#pathconf implemented.
-
-	* ext/etc/extconf.rb: Check sysconf(), confstr() and fpathconf().
-
-	* ext/etc/mkconstants.rb: New file.
-
-	   [ruby-core:62600] [Feature #9842]
-
-Sun May 18 09:58:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/etc/etc.c: Etc.uname method implemented.
-
-	* ext/etc/extconf.rb: Check uname() function.
-
-	  [ruby-core:62139] [Feature #9770]
-
-Sun May 18 09:16:33 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: Check nextafter() availability.
-
-	* include/ruby/missing.h (nextafter): New optional declaration.
-
-	* missing/nextafter.c: New file.
-
-	* numeric.c: Float#next_float and Float#prev_float implemented.
-
-	   [ruby-core:62562] [Feature #9834]
-
-Sun May 18 09:02:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c: Enumerable#slice_after implemented.
-
-	* enumerator.c: Enumerator::Lazy#slice_after implemented.
-
-	  Requested by Tsuyoshi Sawada.  [ruby-core:58123] [Feature #9071]
-
-Sun May 18 08:22:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_setstrbuf): always check if the buffer is modifiable.
-	  [ruby-core:62643] [Bug #9847]
-
-Sun May 18 01:21:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h: Hide Rational internal.
-	  (RRational): Moved to internal.h
-	  (RRATIONAL): Ditto.
-	  (RRATIONAL_SET_NUM): Moved to rational.c.
-	  (RRATIONAL_SET_DEN): Ditto.
-
-	* rational.c (rb_rational_num): New function.
-	  (rb_rational_den): Ditto.
-
-	* include/ruby/intern.h (rb_rational_num): Declared.
-	  (rb_rational_den): Ditto.
-
-	* ext/bigdecimal/bigdecimal.c: Follow the above change.
-
-	* ext/date/date_core.c: Ditto.
-
-	  [ruby-core:60665] [Feature #9513]
-
-Sat May 17 17:04:32 2014  Shota Fukumori  <her@sorah.jp>
-
-	* NEWS: Add news about removal of lib/test/**/*.rb.
-
-Sat May 17 16:57:33 2014  Shota Fukumori  <her@sorah.jp>
-
-	* lib/test: Removed because ruby's test cases now independent to
-	  lib/test by r45970. [Feature #9711] [ruby-core:62620]
-
-	  I'm still considering about the future of lib/minitest, lib/test.
-	  (bundling gems?)
-
-Sat May 17 15:06:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/runner.rb: remove dependency test-unit and minitest
-	  from stdlib when running with test-all.
-	  [Feature #9711][ruby-core:61890]
-	* test/testunit/*.rb: ditto.
-	* test/lib: ditto.
-
-Sat May 17 11:02:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): try match PLAIN as well as ALPHA, which are
-	  separated by previous commits.  [ruby-core:61552] [Bug #9648]
-
-	* dir.c (glob_make_pattern): set PLAIN for non-magical path to
-	  skip parts which not need to glob.
-	  [ruby-core:61552] [Bug #9648]
-
-	* dir.c (has_magic): return ALPHA at alphabetical name regardless
-	  FNM_CASEFOLD flag.
-
-	* dir.c (glob_helper): fix conditions for ALPHA.
-	  [ruby-core:61552] [Bug #9648]
-
-Sat May 17 01:49:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): reduce matching at non-magical path on
-	  Windows.
-
-Sat May 17 01:49:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_pattern_type): separate names with alphabet but no
-	  magical from plain.
-
-	* dir.c (glob_helper): match plain names as-is to treat super-root
-	  same as the root.  [ruby-core:61552] [Bug #9648]
-
-Fri May 16 17:38:22 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_marks, gc_marks_body): increase the counter of young objects
-	  at the major GC because AGE2Promotion changes all old objects into
-	  young objects at major GC.
-
-Fri May 16 17:26:24 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_before_sweep): heap_pages_swept_slots should contains
-	  heap_pages_increment.
-
-	  For example, GC by exceeding malloc_limit can remain
-	  heap_pages_increment.
-
-Thu May 15 21:18:43 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
-	  [ruby-core:62095] [Bug #8358]
-
-Thu May 15 21:04:06 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
-	  is skipped after raise.
-	  DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
-	  But it causes Marshal.load failure due to undefined class/module
-	  DL::DLError when doing test-all parallel and test-all doesn't
-	  complete. We create new MiniTest::Skip object to avoid Marshal.load
-	  failure.
-	  [ruby-core:62133] [Bug #9767]
-
-	* test/testunit/test_parallel.rb (TestParallel): add a test.
-
-	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
-
-Thu May 15 18:57:23 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (garbage_collect_body): move gc_heap_prepare_minimum_pages()
-	  from gc_sweep().
-
-Thu May 15 18:51:25 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (heap_extend_pages): calculate next growing heap size.
-
-	* gc.c (heap_set_increment): accept addition pages instead of
-	  minimum pages.
-
-	* gc.c (gc_after_sweep): use heap_etend_pages().
-
-	* gc.c (gc_heap_prepare_minimum_pages): add only 1 page.
-
-	* gc.c (heap_ready_to_gc): add only 1 page.
-
-Thu May 15 18:42:49 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: introduce macros to remove magic number.
-
-	  GC_HEAP_FREE_SLOTS_MIN_RATIO = 0.3: guarantee minimum empty slots
-	                                      ratio after sweep.
-	  GC_HEAP_FREE_SLOTS_MAX_RATIO = 0.8: allow to free pages 0.2 (= 1-0.8)
-	                                      of current existing slots.
-
-Thu May 15 17:32:51 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* thread_win32.c (rb_w32_stack_overflow_handler): use Structured
-	  Exception Handling by AddVectoredExceptionHandler() for machine
-	  stack overflow on mingw.
-	  This would be equivalent to the handling using __try and __except
-	  on mswin introduced by r43748.
-
-Wed May 14 19:31:03 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/openssl/depend: remove dependency from internal headers.
-	  [Feature #9612]
-
-	* ext/openssl/ossl.c (ossl_fips_mode_set): ditto.
-
-	* ext/coverage/depend: ditto.
-
-	* include/ruby/thread_native.h: added.
-
-	  This header file only provides wrapper functions to control
-	  native threads. These wrapper functions are used by MRI
-	  implementation.
-
-	* vm_core.h: use include/ruby/thread_native.h.
-
-	* thread.c: ditto.
-
-	* thread_pthread.h: ditto.
-
-	* thread_win32.h: ditto.
-
-	* thread_native.h: removed.
-
-Wed May 14 18:03:28 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: enable RGENGC_AGE2_PROMOTION.
-
-Wed May 14 18:02:30 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rgengc_rememberset_mark): promote remembered object earlier.
-
-Mon May 12 23:57:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_atan2_inf_c99): check whether runtime atan2
-	  handles Inf as C99. [ruby-core:62536] [Bug #9831]
-
-Mon May 12 20:33:01 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: Invoke AC_REPLACE_FUNCS for each function.
-
-Mon May 12 19:52:11 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: count young object correctly and show it in GC.stat
-	  on RGENGC_AGE2_PROMOTION.
-
-	* gc.c (RVALUE_PROMOTE_YOUNG): decrement young object count on
-	  YOUNG->OLD.
-
-	* gc.c (obj_free): decrement young object count when young object
-	  freed.
-
-	* gc.c (gc_marks): should not clear young object count.
-
-	* gc.c (gc_stat_internal): GC.stat :young_object information.
-
-Mon May 12 01:30:59 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ifaddr.c (IS_IFADDRS): Unused macro removed.
-
-	* ext/strscan/strscan.c (BUFSIZE): Ditto.
-
-	* ext/zlib/zlib.c (OBJ_IS_FREED): Ditto.
-
-Sun May 11 22:27:18 2014  Tanaka Akira  <akr@fsij.org>
-
-	* compile.c (BUFSIZE): Unused macro removed.
-
-	* vm.c (BUFSIZE): Ditto.
-
-	* pack.c (INT64toNUM): Ditto.
-	  (UINT64toNUM): Ditto.
-	  (BYTEWIDTH): Ditto.
-
-	* time.c (lshift): Ditto.
-	  (UINT64toNUM): Ditto.
-	  (id_lshift): Unused variable removed.
-
-Sun May 11 21:23:27 2014  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (swaps): Unused macro removed.
-	  (swapi): Ditto.
-	  (swapl): Ditto.
-	  (swapll): Ditto.
-
-Sun May 11 08:02:49 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_vm_t): list_head and counter for living_threads
-	  (rb_thread_t): vmlt_node for living_threads linkage
-	  (rb_vm_living_threads_init): new function wrapper
-	  (rb_vm_living_threads_insert): ditto
-	  (rb_vm_living_threads_remove): ditto
-	* vm.c (rb_vm_living_threads_foreach): new function wrapper
-	* thread.c (terminate_i, thread_start_func_2, thread_create_core,
-	  thread_fd_close_i, thread_fd_close): update to use new APIs
-	* vm.c (vm_mark_each_thread_func, rb_vm_mark, ruby_vm_destruct,
-	  vm_memsize, vm_init2, Init_VM): ditto
-	* vm_trace.c (clear_trace_func_i, rb_clear_trace_func): ditto
-	* benchmark/bm_vm_thread_close.rb: added to show improvement
-	* ccan/build_assert/build_assert.h: added as a dependency of list.h
-	* ccan/check_type/check_type.h: ditto
-	* ccan/container_of/container_of.h: ditto
-	* ccan/licenses/BSD-MIT: ditto
-	* ccan/licenses/CC0: ditto
-	* ccan/str/str.h: ditto (stripped of unused macros)
-	* ccan/list/list.h: ditto
-	* common.mk: add CCAN_LIST_INCLUDES
-	  [ruby-core:61871][Feature #9632 (part 1)]
-
-Sun May 11 01:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_f_kill): directly enqueue an ignored signal to self,
-	  except for SIGSEGV and SIGBUS.  [ruby-dev:48203] [Bug #9820]
-
-Sat May 10 22:37:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_glob): match in UTF-8 on Mac OS X.
-	  [ruby-dev:48213] [Bug #9825]
-
-Sat May 10 13:32:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): stop if forked in a sub-thread,
-	  the thread has become the main thread.
-	  [ruby-core:62070] [Bug #9751]
-
-Sat May 10 09:32:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]
-
-Sat May 10 08:47:36 2014  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c (trap): Return "SYSTEM_DEFAULT" if SIG_DFL is set.
-
-Fri May  9 14:27:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
-	  CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
-	  affected.  [ruby-core:62469] [Bug #9818]
-
-Fri May  9 03:59:06 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* lib/delegate.rb: Fix example of using delegator.
-	  patched from Andrey Koleshko. [Fixes GH-505]
-
-Fri May  9 03:42:43 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* lib/shell.rb: add documentation in lib/shell.rb
-	  patched from reprah. [Fixes GH-516]
-
-Fri May  9 03:28:04 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* lib/fileutils.rb: show fileutils require at top.
-	  patched from Richard Schneeman. [Fixes GH-604]
-
-Fri May  9 03:07:09 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* lib/prime.rb (Prime#prime?): negative numbers can't be primes
-	  by definition. reported by Ivan Kataitsev. [Bug #7395]
-	* test/test_prime.rb: add test.
-
-Thu May  8 14:34:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_mod_init_copy): always clear instance variable,
-	  constant and method tables first, regardless the source tables.
-	  [ruby-dev:48182] [Bug #9813]
-
-Thu May  8 10:53:14 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: OpenBSD needs to include sys/param.h before include
-	  sys/mount.h. [ruby-dev:48167]
-
-Thu May  8 10:17:04 2014  Karsten Sperling  <karsten@sperling.co.nz>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): stop
-	  handling requests on shutdown, even if the socket is readable
-	  and IO.select() returns true.  [Fixes GH-607]
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): IO.select()
-	  raises ENOTSOCK on shutdown on Windows.
-
-Wed May  7 21:45:00 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):
-	  Consider Socket#accept as well as TCPServer#accept.
-	  Reported by Sam Stelfox.  [ruby-core:62064] [Bug #9750]
-
-Wed May  7 17:24:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_step_scan_args): check keyword arguments and fail
-	  if they conflict with positional arguments.
-	  [ruby-dev:48177] [Bug #9811]
-
-Wed May  7 12:06:14 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: remove debug output and output results into
-	  specified file.
-
-Wed May  7 11:55:40 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: add '--rawdata-output=[FILE] option to output
-	  raw results into FILE.
-
-Wed May  7 11:25:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_f_local_variables): exclude variables hidden by
-	  shadowing.  [ruby-core:60501] [Bug #9486]
-
-	* vm.c (collect_local_variables_in_iseq): ditto.
-
-Tue May  6 23:29:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (new_bv_gen): no duplicated names, if already added in
-	  shadowing_lvar().
-
-	* parse.y (local_tbl_gen): remove local variables duplicated with
-	  arguments.
-	  [ruby-core:60501] [Bug #9486]
-
-Tue May  6 18:48:50 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.make_time): Adjust the time zone of "now".
-
-Tue May  6 18:33:12 2014  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* io.c (io_{read,write}_nonblock): use rb_get_kwargs instead of
-	  rb_hash_aref.
-
-Tue May  6 18:03:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.make_time): Argument validation code moved from
-	  Time.parse and Time.strptime.
-
-Tue May  6 17:27:06 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation
-	  to use EST.
-	  Reported by Marcus Stollsteimer.
-	  [ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682]
-
-Tue May  6 04:31:48 2014  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* file.c (rb_f_test): removed meaningless "case 'a'".
-
-Tue May  6 01:28:14 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb (OpenURI.open_uri): Call StringIO#close only if
-	  the StringIO object is not closed yet.
-	  Reported by Jordi Massaguer Pla.  [ruby-core:42538] [Bug #6010]
-
-Tue May  6 01:08:01 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: define File::NULL if not defined and /dev/null
-	  is available to run benchmark driver on ruby 1.9.2.
-
-Mon May  5 23:53:24 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: Add IP_TRANSPARENT.
-	  IP_TRANSPARENT is provieded since glibc-2.12.
-	  Reported by Eliezer Croitoru.  [ruby-core:50372] [Bug #7476]
-
-Mon May  5 22:29:47 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (check_exec_redirect): Open the file in write mode for
-	  redirect from [:out, :err].
-	  Proposed and implemented by Yusuke Endoh.
-	  [ruby-dev:41430] [Feature #3348]
-
-Mon May  5 21:52:35 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all
-	  separators File::SEPARATOR from File::ALT_SEPARATOR.
-	  Reported by Daniel Rikowski.
-	  Fixed by Nobuyoshi Nakada.  [Bug #9618]
-
-	* ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto.
-
-Mon May  5 21:48:04 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/lib/pathname.rb (Pathname#/): Aliased to Pathname#+.
-	  Suggested by Alexey Muranov.  [ruby-core:61432] [Feature #9625]
-
-Mon May  5 17:26:09 2014  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* math.c (rb_math_sqrt): omitted exporting an unused function,
-	  anyway.
-	* internal.h: follows the above change.
-
-Mon May  5 11:44:03 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.strptime): Raise ArgumentError if Date._strptime
-	  doesn't extract date information.
-	  Reported by tadayoshi funaba.  [ruby-core:62349]
-
-Mon May  5 01:12:27 2014  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (rt_rewrite_frags): a new feature (not a
-	  bug fix) of strptime.  applies offset even if the given date is
-	  not local time (%s and %Q).  This is an exceptional feature and
-	  I do NOT recommend to use this at all.  Thank you git community.
-
-Sun May  4 20:51:32 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.force_zone!): Use usual local time if it has
-	  expected offset from UTC.
-
-Sun May  4 17:58:12 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.force_zone!): New private method.
-	  (Time.make_time): Use Time.force_zone!.
-	  (Time.strptime): Ditto.
-	  (Time.rfc2822): Ditto.
-	  (Time.xmlschema): Ditto.
-
-	* lib/rss/rss.rb (Time.w3cdtf): Use Time.force_zone!.
-
-Sun May  4 10:22:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* math.c (math_atan2): return values like as expected by C99 if
-	  both two arguments are infinity.  based on the patch by cremno
-	  phobia <cremno AT mail.ru> in [ruby-core:62310].  [Feature #9799]
-
-Sun May  4 03:46:42 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.httpdate): Always return a UTC Time object.
-
-Sun May  4 03:26:39 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.make_time): Refactored.
-
-Sun May  4 02:53:17 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.rfc2822): Fix year completion.
-	  Produce fixed-offset time object if appropriate.
-	  (Time.xmlschema): Produce fixed-offset time object if appropriate.
-
-Sat May  3 23:52:20 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (make_time): Produce fixed-offset time object if
-	  appropriate.
-	  (Time.strptime): Use d[:zone] instead of d[:offset].
-
-	* lib/rss/rss.rb (Time.w3cdtf): Produce fixed-offset time object if
-	  appropriate.
-
-Sat May  3 20:21:38 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (Time.strptime): Use d[:offset] if d[:seconds] is not
-	  given.
-	  Reported by tadayoshi funaba.  [ruby-core:62322]
-
-Sat May  3 04:04:16 2014  Eric Wong  <e@80x24.org>
-
-	* complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END
-	  [Bug #9608]
-	* rational.c (read_digits): ditto
-
-Sat May  3 00:06:30 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename
-	  is supported on AIX, HP-UX, and Solaris, by using the value of
-	  struct statvfs.f_basetype.
-
-	* configure.in (HAVE_STRUCT_STATVFS_F_BASETYPE): check struct
-	  statvfs.f_basetype which is available on AIX, HP-UX, and Solaris.
-
-Fri May  2 21:04:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (next_id): no reason to set ID_STATIC_SYM here, as ID
-	  returned by rb_intern3 can be a dynamic symbol and the static
-	  symbol flag is set otherwise.  [Bug #9787]
-
-Fri May  2 11:32:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_io.rb (test_seek, test_seek_symwhence): defer
-	  File::Statfs#type call which may not be implemented, to mitigate
-	  errors on platforms where SEEK_DATA is available but f_type in
-	  struct statfs is not.  [ruby-dev:48154] [Bug #9789]
-
-Fri May  2 10:37:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_id_attrset): turn dynamically interned Symbol into
-	  an ID, since rb_str_dynamic_intern returns a Symbol but not an
-	  ID.  [ruby-core:62226] [Bug #9787]
-
-Thu May  1 22:19:34 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* file.c: Change AND condition to nested condition.
-
-Thu May  1 00:36:26 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* file.c (FSTATFS): check availability of struct statfs and
-	  struct statvfs in addition to fstatfs(2) and fstatvfs(2).
-	  This fixes error in Solaris. [Bug #9788] [ruby-dev:48145]
-
-Wed Apr 30 19:46:23 2014  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c (gc_after_sweep): suppress unnecessary expanding heap.
-	  Tomb heap pages are freed pages here, so expanding heap is
-	  not required.
-
-Wed Apr 30 17:58:40 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record
-	  it is bmethod frame.
-
-	* vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame
-	  is VM_FRAME_FLAG_BMETHOD.
-	  [Bug #9759]
-
-	* test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func.
-
-	* vm_core.h: rename rb_thread_t::passed_me to
-	  rb_thread_t::passed_bmethod_me to clarify the usage.
-
-	* vm_insnhelper.c (vm_call_bmethod_body): use renamed member.
-
-Wed Apr 30 17:06:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_id_attrset): pin down dynamic symbol only. it is
-	  possible that attrset ID can be registered as a static symbol
-	  after the corresponding attrget ID has been registered as a
-	  dynamic, and then the latter may be collected.
-	  [ruby-core:62226] [Bug #9787]
-
-Tue Apr 29 14:17:57 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb: Rescue LoadError on etc.so for miniruby.
-	  Revert r45707, r45711, r45717.
-
-Tue Apr 29 12:50:02 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in
-	  rescue LoadError on 'etc'.
-
-Tue Apr 29 10:21:38 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* parse.y (symbols_i): like r45492, call rb_gc_resurrect().
-
-Tue Apr 29 04:29:05 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* file.c (HAVE_STRUCT_STATFS_T_F_FSTYPENAME): Add new macro for
-	  statfs_t.
-	* file.c (HAVE_STRUCT_STATFS_T_F_TYPE): ditto.
-
-	* file.c (rb_io_statfs): check FSTATFS macro only instead of
-	  HAVE_FSTATFS and HAVE_FSTATVFS.
-
-	* file.c (statfs_type): use new macro.
-	* file.c (statfs_fstypename): ditto.
-	* file.c (statfs_inspect): ditto.
-
-Tue Apr 29 00:20:26 2014  Rajarshi Das  <rajarshid@cybage.com>
-
-	* bootstraptest/test_literal.rb: fix typo of "dynamic".  [ci skip]
-
-	* regexp.rdoc: fix typo of "organized".  [ci skip]
-
-	* lib/session.rb: fix typo of "recognized".  [ci skip]
-
-Mon Apr 28 21:40:27 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (HAVE_STRUCT_STATFS_F_TYPE): check struct statfs.f_type
-	  to support OpenBSD.
-
-	* file.c (statfs_type): use above macro to switch.
-
-	* file.c (statfs_inspect): ditto.
-
-Mon Apr 28 18:06:08 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: check struct statvfs and struct statvfs.f_fstypename.
-
-	* configure.in: on NetBSD fstatfs is obsoleted.
-
-	* file.c: support NetBSD for File::Statfs.
-
-Mon Apr 28 17:42:42 2014  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c: This argument must be a pointer.
-
-Mon Apr 28 17:40:15 2014  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c: Fix typos. These are undefined variables.
-
-Sun Apr 27 19:39:42 2014  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strptime.c (date__strptime_internal): do not
-	  overwrite century.
-
-Sat Apr 26 11:50:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_enum.rb (test_flat_map): Added test for flat_map.
-	  Contribute from @igaiga. [fix GH-598]
-
-Sat Apr 26 10:55:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_array_): make copy a first hash not to modify
-	  the argument itself.  keyword splat should be non-destructive.
-	  [ruby-core:62161] [Bug #9776]
-
-Sat Apr 26 08:05:36 2014  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb (test_rlimit_nofile): Don't limit
-	  RLIMIT_NOFILE too small.
-	  This fix sporadic "[ASYNC BUG] thread_timer: select" on GNU/Linux.
-
-Fri Apr 25 22:54:34 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
-	  ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
-	  directory is not an empty directory, rmdir() shall fail and set
-	  errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
-	  [Bug #9571] [ruby-dev:48017]
-
-Fri Apr 25 19:16:30 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension.
-
-Fri Apr 25 14:55:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_func___builtin_unreachable): try with an
-	  external variable not only by a warning, which might not be
-	  shown due to the optimization.  [ruby-core:61647] [Bug #9665]
-
-Fri Apr 25 13:11:49 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: NetBSD's ksh, used by configure, needs escapes.
-
-Fri Apr 25 12:51:08 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: correct pthread_setname_np's prototype on NetBSD.
-	  [Bug #9586]
-
-Thu Apr 24 23:17:25 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/fileutils.rb (fu_get_uid, fu_get_gid): Etc.getpwnam/getgrnam may
-	  returns nil.
-
-	* lib/webrick/utils.rb (su): ditto.
-
-Thu Apr 24 22:55:22 2014  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/test_io.rb: Add etc.so to $" before require 'tmpdir'.
-
-Thu Apr 24 21:09:55 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* man/ruby.1: fix broken link.
-
-Thu Apr 24 20:53:02 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb: Don't need to rescue LoadError for etc.so.
-
-Thu Apr 24 17:39:53 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (statfs_inspect): suppress warnings.
-	  assume those values won't be larger than LONG_LONG_MAX.
-
-Thu Apr 24 11:53:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
-	  other than Symbol is an undefined behavior.  fix up r31699.
-	  [ruby-core:62142] [Bug #9771]
-
-Thu Apr 24 11:21:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for
-	  non-symbol values, for the time being.
-
-Thu Apr 24 05:50:13 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (dsym_node_gen): like r45492, call rb_gc_resurrect().
-
-Wed Apr 23 20:36:22 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/etc/extconf.rb: Build ext/etc unconditionally.
-
-Wed Apr 23 14:10:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (statfs_fsid): remove statfs.f_fsid because it doesn't return
-	  meaningful value portably. http://togetter.com/li/658517
-
-Wed Apr 23 11:03:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_write): use rb_str_append to
-	  reuse coderange bits other than ASCII-8BIT, and keep
-	  taintedness.  [ruby-dev:48118] [Bug #9769]
-
-Wed Apr 23 00:43:00 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c, include/ruby/win32.h (ustatfs): implementation of
-	  statfs(2) clone. [EXPERIMENTAL]
-
-	* file.c (rb_io_statfs): use above function.
-
-	* configure.in, win32/Makefile.sub (struct statfs): available.
-
-Tue Apr 22 23:56:24 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_io_stafs): use statfs(2) if fstatfs(2) is unavailable.
-
-	* configure.in (fstatfs): check it.
-
-Tue Apr 22 22:15:51 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_io_statfs): need to define even if the system doesn't have
-	  fstatfs(2).
-
-	* test/ruby/test_file.rb (TestFile#test_statfs): skip if IO#stafs is not
-	  implemented.
-
-Tue Apr 22 19:32:48 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c: newly added a class File::Statfs. (experimental)
-
-Tue Apr 22 08:22:33 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (objspace_malloc_increase): don't cause GC by malloc_increase
-	  when memop type is MEMOP_TYPE_REALLOC.
-
-	  GC at realloc is not well maintained.
-	  We need a time to make it safe.
-	  [ruby-dev:48117]
-
-Tue Apr 22 06:54:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (objspace_malloc_increase): run full mark if 0x04 bit is
-	  set in ruby_gc_stress.  [ruby-core:62103] [Feature #9761]
-
-	* gc.c (objspace_malloc_increase): run GC after realloc not only
-	  malloc and calloc by GC.stress.  [ruby-core:62103] [Feature #9761]
-
-Mon Apr 21 19:12:20 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_coderange_scan_restartable): coderange is always
-	  ENC_CODERANGE_VALID if the string is ASCII-8BIT and already has a non
-	  ASCII character.
-
-Mon Apr 21 19:02:44 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (coderange_scan): remove useless condition `p < e` after
-	  search_nonascii.
-
-	* string.c (rb_str_coderange_scan_restartable): ditto.
-
-Mon Apr 21 18:55:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/-test-/string/coderange.c: add Bug::String.new#coderange_scan
-	  to explicitly scan coderange.
-
-Mon Apr 21 18:19:35 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (coderange_scan): remove unused logic.
-
-	* string.c (rb_str_coderange_scan_restartable): ditto.
-
-Mon Apr 21 14:11:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_putc): fix for non-ascii
-	  encoding, like as IO#putc.  [ruby-dev:48114] [Bug #9765]
-
-Sun Apr 20 12:57:15 2014  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* st.c (st_foreach_check): change start point of search at check
-	  from top to current. [ruby-dev:48047] [Bug #9646]
-
-Sun Apr 20 08:41:33 2014  Andrew DeMaria  <ademariad@gmail.com>
-
-	* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
-	  user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
-	  [ruby-trunk - Bug #9760]
-
-Sun Apr 20 06:01:18 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (rb_gc_writebarrier): drop special case for big hash/array
-	  [Bug #9518]
-
-Sat Apr 19 15:38:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (primary): flush cmdarg flags inside left-paren in a
-	  command argument, to allow parenthesed do-block as an argument
-	  without arguments parentheses.  [ruby-core:61950] [Bug #9726]
-
-Sat Apr 19 10:07:24 2014  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h (struct RBignum): Use size_t for len.
-
-	* include/ruby/intern.h (rb_big_new): Use size_t instead of long to
-	  specify the size of bignum.
-	  (rb_big_resize): Ditto.
-
-	* bignum.c: Follow above changes.
-
-	* rational.c: Follow above changes.
-
-	* marshal.c: Follow above changes.
-
-Sat Apr 19 00:32:07 2014  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_num2long): Returns a long.
-	  (rb_num2ulong): Returns a unsigned long.
-
-	* bignum.c (rb_big2long): Returns a long.
-	  (rb_big2ulong): Returns a unsigned long.
-
-	* include/ruby/intern.h: Follow above changes.
-
-	* include/ruby/ruby.h: Follow above changes.
-	  (rb_num2long_inline): No need to cast.
-	  (rb_num2ulong_inline): Ditto.
-
-Sat Apr 19 00:17:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (SHARABLE_SUBSTRING_P): predicate if substring can be
-	  shared with the original string.  true if just at the end of the
-	  original string, for the time being.  all substring will be able to
-	  be shared in the future.
-
-Fri Apr 18 21:48:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_new_frozen): consider the shared string at
-	  middle.
-
-	* string.c (rb_str_subseq, rb_str_substr, str_byte_substr): share
-	  middle of a string.
-
-Fri Apr 18 15:40:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c: use uintptr_t instead of VALUE because they are not ruby
-	  object.
-
-Fri Apr 18 14:51:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c: check str_strlen's argument, and add comment or
-	  use NULL if simply it uses str's enc.
-
-Fri Apr 18 14:32:40 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_strlen): use enc_strlen if the coderange is known.
-
-Fri Apr 18 14:21:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (enc_strlen): move UTF-8 optimization from str_strlen to
-	  enc_strlen.
-
-Fri Apr 18 08:50:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_getcwd_malloc): check if getcwd allocates
-	  buffer if NULL is given [ruby-core:62072] [Bug #9752]
-
-Thu Apr 17 16:28:10 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* prelude.rb: [DOC] Update Thread::exclusive docs by @stevenharman.
-
-Thu Apr 17 10:03:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils#copy_entry): update rdoc about
-	  preserve option and permissions, following r31123.
-	  [ruby-core:62065] [Bug #9748]
-
-Wed Apr 16 23:47:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (dont_recycle_block_arg): fix condition to recycle block
-	  argument.  lambda with rest can get internal array directly.
-	  [ruby-core:62060] [Bug #9749]
-
-Wed Apr 16 09:51:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
-	  finalizes only a copy of the digest context, the context must be
-	  cleaned up after initialization by EVP_MD_CTX_cleanup() or a
-	  memory leak will occur.  [ruby-core:62038] [Bug #9743]
-
-Tue Apr 15 19:36:42 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h (rb_w32_cmdvector): removed.
-
-	* win32/win32.c (rb_w32_sysinit): use WCHAR version of GetCommandLine()
-	  internally.
-
-	* win32/win32.c (w32_cmdvector): renamed from rb_w32_cmdvector.  use
-	  WCHAR* instead of char* internally.
-
-	these changes are expected to not changing the behavior yet.
-
-Tue Apr 15 19:26:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/extmk.rb: Re-generate extmk.mk and dummy makefiles only if
-	  really required.
-	  This fixes a problem to run multiple test-all concurrently as:
-	  make test-all & make test-all & make test-all & ...
-
-Tue Apr 15 12:49:53 2014  Sam Rawlins  <sam.rawlins@gmail.com>
-
-	* enum.c (enum_each_slice, enum_each_cons): make more efficient by
-	  allocating less and recycling block argument arrays if possible.
-	  [Fixes GH-596]
-
-Mon Apr 14 18:44:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): get base addrs in fill_lines to use it
-	  with dladdr_fbases introduced at r45563.
-	  it didn't get before if the executable is not pie.
-
-Mon Apr 14 18:05:48 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (main_exe_path): support FreeBSD.
-	  At least sh, csh, tcsh, bash, and zsh sets realpath of the main
-	  executable for dladdr, but gdb doesn't.
-
-Mon Apr 14 17:20:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (umethod_bind): use the ancestor iclass instead of new
-	  iclass to get rid of infinite recursion, if the defined module
-	  is already included.  [ruby-core:62014] [Bug #9721]
-
-Sun Apr 13 12:46:58 2014  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (SIZEOF_BDIGIT): Renamed from SIZEOF_BDIGITS.
-
-	* internal.h: Ditto.
-
-	* marshal.c: Ditto.
-
-	* rational.c: Ditto.
-
-Sun Apr 13 10:18:09 2014  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: Unused target, $(MKMAIN_CMD), removed.
-
-	* Makefile.in (MKMAIN_CMD): Unused macro removed.
-
-	* win32/Makefile.sub (MKMAIN_CMD): Ditto.
-
-Sat Apr 12 22:11:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear
-	  caller's self which is useless, so that it can get collected.
-	  [Fixes GH-592]
-
-Sat Apr 12 09:26:48 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/openssl/ossl_ocsp.c:  [DOC] Document OpenSSL::OCSP.
-
-Fri Apr 11 18:52:38 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c (ARY_SET): added.
-
-	  ARY_SET() is same functionality of RARRAY_ASET(), but
-	  it has an assertion (`ary' doesn't have shared array).
-
-Fri Apr 11 16:54:26 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c: make shared arrays WB-protected objects.
-
-	  Shared arrays were WB-unprotected object because
-	  sharing array can modify shared array's buffer
-	  if it occupied shared array.
-
-	  [sharing array (ary)] -> [shared array (shared)] -> <buff>
-	                |                                       A
-	                +---------------------------------------+
-	             write `buff' with WB(ary, &buff[i], obj)
-	             -> if `ary' and `shared' are old, then only `ary'
-	                will be remembered.
-	             -> traverse from `ary'. But `shared' is old, so
-	                that written `obj' is not marked.
-
-	  It cause WB miss so that shared arrays were WB-unprotected.
-	  (WB-unprotected objects are marked everytime if it is living)
-
-	  This patch insert WB() for `shared' if it is needed.
-
-Fri Apr 11 15:05:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_method_call_with_block, umethod_bind): call with
-	  IClass including the module for a module instance method.
-	  [ruby-core:61936] [Bug #9721]
-
-	* vm_insnhelper.c (vm_search_super_method): allow bound
-	  UnboundMethod case.
-
-Fri Apr 11 12:02:30 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (rb_dump_backtrace_with_lines): set base address
-	  which is retrieved from dladdr to dladdr_fbases, to skip already
-	  parsed objects.
-
-Fri Apr 11 12:44:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (ary_reject): may be turned into a shared array during
-	  the given block.  [ruby-dev:48101] [Bug #9727]
-
-Thu Apr 10 23:41:21 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/net/ftp.rb (Net::FTP#login): [DOC] The default password for
-	  anonymous login was changed to "anonymous@" in r25313.
-
-Thu Apr 10 19:22:58 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_array.rb: remove useless `assert'.
-
-Thu Apr 10 19:11:11 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* array.c (rb_ary_modify): remember shared array owner if a shared
-	  array owner is promoted and a shared array is not promoted.
-
-	  Now, shared array is WB-unprotected so that shared arrays are not
-	  promoted.  All objects referred from shared array should be marked
-	  correctly.
-
-	  [ruby-core:61919] [ruby-trunk - Bug #9718]
-
-	* test/ruby/test_array.rb: add a test for above.
-
-Thu Apr 10 18:57:12 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_verify_internal_consistency): move lines and enable
-	  allrefs_dump() on RGENGC_CHECK_MODE >= 4.
-
-Thu Apr 10 15:01:06 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (append_obj): clear allocated memory.
-
-	* addr2line.c (rb_dump_backtrace_with_lines): free `base_addrs'.
-
-Thu Apr 10 14:40:18 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_gc_writebarrier_unprotect_promoted): disable to dump debug
-	  message when RGENGC_CHECK_MODE == 0.
-
-Thu Apr 10 08:13:47 2014  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h
-	  is not available.
-	  Fixes build on Android (x86).
-
-Wed Apr  9 23:22:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (mark_current_machine_context): Call SET_STACK_END.
-	  This reverts a hunk of r40703 by ko1.
-	  This fixes [ruby-dev:48098] [Bug #9717].
-
-Wed Apr  9 21:02:04 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (OBJ2UID1): Defined even if getpwnam_r is not usable.
-	  (OBJ2GID1): Defined even if getgrnam_r is not usable.
-	  This fixes compilation error on Android.
-
-Wed Apr  9 15:16:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_enc_default_internal): fix rdoc.  `__FILE__` is
-	  in filesystem encoding but not `default_internal`.
-	  [ruby-core:61894] [Bug #9713]
-
-Wed Apr  9 14:43:00 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb: more long timeout.
-	  This test failed under RGENGC_CHECK_MODE >= 2.
-
-Wed Apr  9 13:07:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
-	  x64-mingw, which causes SEGV with callcc.
-	  [ruby-core:61887] [Bug #9710]
-
-Wed Apr  9 12:44:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_buf_cat): should round up the capacity by 4KiB,
-	  but not number of rooms.  [ruby-core:61886] [Bug #9709]
-
-Tue Apr  8 22:55:32 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb (MakeMakefile#dir_config): [DOC] Improve
-	  documentation.
-
-Tue Apr  8 22:31:44 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename `RGENGC_THREEGEN' to `RGENGC_AGE2_PROMOTION'.
-
-	* gc.c (rgengc_rememberset_mark): don't promote, but remain in
-	  remember set for infant objects.
-
-	* gc.c (RVALUE_PROMOTE_INFANT, RVALUE_PROMOTE_YOUNG): count numbers
-	  in these functions.
-
-Mon Apr  7 21:11:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
-	  Reported by Saravana kumar.  [ruby-core:61820] [Bug #9697]
-	  Fixed by Heesob Park.  [ruby-core:61868]
-
-Mon Apr  7 07:20:23 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/xmlrpc/client.rb (do_rpc): don't check body length.
-	  If HTTP content-encoding is used, the length may be different.
-	  [Bug #8182] [ruby-core:53811]
-
-Mon Apr  7 02:39:48 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Matrix#cofactor [fix GH-568]
-	  Add first_minor [fix GH-568]
-	  Handle empty diagonal matrix case [fix GH-576]
-	  Patches by gogotanaka
-
-Sun Apr  6 08:52:50 2014  Bugra Barin  <bugrabarin@hotmail.com>
-
-	* dln.c (dln_load): use wchar version to load a library in
-	  non-ascii path on Windows.  based on the patch by Bugra Barin
-	  <bugrabarin AT hotmail.com> in [ruby-core:61845].  [Bug #9699]
-
-Sat Apr  5 19:36:33 2014  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
-
-Sat Apr  5 00:31:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
-	  [ruby-dev:48089] [Bug #9702]
-
-Fri Apr  4 07:13:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_cv_func___builtin_setjmp): should not skip
-	  flags restoration in RUBY_WERROR_FLAG by `break`.
-	  [ruby-dev:48086] [Bug #9698]
-
-Wed Apr  2 21:50:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp()
-	  in Apple LLVM 5.1 (LLVM 3.4svn) uses `void**`, not `jmp_buf`.
-	  [Bug #9692]
-
-Wed Apr  2 20:57:15 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c, gc.h (rb_objspace_each_objects_without_setup):
-	  Add a new (hidden) C-API to iterate objspace snapshot.
-
-	  This API is not safe to call any C-APIs in a given callback
-	  function. Be careful to use this C-API.
-
-Wed Apr  2 17:43:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_cv_func___builtin_setjmp): gcc 4.9 disallows a
-	  variable as the second argument of __builtin_longjmp().
-	  [ruby-core:61800] [Bug #9692]
-
-Wed Apr  2 15:12:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* common.mk: Use redmine-2.x url for DeveloperHowto wiki.
-	  [ruby-core:60657] [Bug #9511]
-
-Wed Apr  2 11:46:29 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/pathname/lib/pathname.rb (Pathname#join): Fix error with
-	  empty args. Reported by ko1 via IRC.
-
-	* test/pathname/test_pathname.rb (TestPathname#test_join): Add the
-	  test for above case.
-
-Tue Apr  1 11:39:57 2014  James Edward Gray II  <james@graysoftinc.com>
-
-	* lib/csv.rb: Symbol HeaderConverter: strip leading/trailing space.
-	  Reported by Skye Shaw
-	  [Fixes GH-575]
-
-Tue Apr  1 11:34:04 2014  James Edward Gray II  <james@graysoftinc.com>
-
-	* lib/csv.rb: Don't attempt to convert nil headers.
-	  Reported by Skye Shaw
-
-Tue Apr  1 17:29:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/config_files.rb (ConfigFiles.download): show failed URI.
-	  [ruby-core:61792] [Bug #9690]
-
-Tue Apr  1 12:06:49 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (rb_dump_backtrace_with_lines): don't depend hard coded
-	  symbol '_start'.
-
-	* addr2line.c (fill_lines): instead of above, get a dynamic symbol
-	  in the main executable and use it to know the base address.
-
-	* addr2line.c (follow_debuglink0): use obj_info_t instead of
-	  line_info_t to handle object related data.
-
-	* addr2line.c (main_exe_path): defined for Linux.
-
-Tue Apr  1 08:58:39 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* parse.y (rb_str_dynamic_intern): set mark bit if dynamic symbol
-	  is before sweeping.
-
-Tue Apr  1 07:37:00 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): use dynsym, which is used for dynamic
-	  linking and always exists, if there's no symtab.
-
-Tue Apr  1 07:27:15 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_dump.c (rb_print_backtrace): current implementation
-	  uses dladdr to get the path of objects.
-
-Mon Mar 31 23:57:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
-	  [ruby-core:61756] [Bug #9578]
-
-Mon Mar 31 17:23:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/memory_status.rb: require envutil before accessing EnvUtil
-	  module.  reported by ko1 via twitter.
-
-Mon Mar 31 10:28:01 2014  Eric Wong  <e@80x24.org>
-
-	* st.c (st_init_table_with_size): update comment
-	  [Feature #9425]
-
-Sun Mar 30 23:39:26 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal):
-	  reset inherit flag of socket to avoid unintentional inheritance of
-	  socket.  note that the return value of SetHandleInformation() is not
-	  verified intentionally because old Windows may return an error.
-	  [Bug #9688] [ruby-core:61754]
-
-Sat Mar 29 13:04:22 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_before_sweep): cap `malloc_limit' to
-	  gc_params.malloc_limit_max.  It can grow and grow with such case:
-	    `loop{"a" * (1024 ** 2)}'
-	  [Bug #9687]
-
-	  This issue is pointed by Tim Robertson.
-	  http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
-
-Fri Mar 28 19:32:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (not_a_member): extract name error and use same error
-	  messages.  based on the patch by Marcus Stollsteimer <sto.mar AT
-	  web.de> at [ruby-core:61721].  [Bug #9684]
-
-Fri Mar 28 09:21:54 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5
-
-Fri Mar 28 09:11:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
-	  libyaml-0.1.6 for CVE-2014-2525.
-	* ext/psych/yaml/config.h: ditto.
-	* ext/psych/yaml/scanner.c: ditto.
-	* ext/psych/yaml/yaml_private.h: ditto.
-
-Thu Mar 27 18:58:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (match_regexp): set regexp for MatchData from string.
-
-	* re.c (rb_backref_set_string): create MatchData from string and
-	  set backref.
-
-	* string.c (rb_pat_search, rb_str_sub, rb_str_sub_bang, str_gsub),
-	  (scan_once, rb_str_scan, rb_str_partition): use rb_str_index
-	  instead of rb_reg_search() when pattern is a String.  based on
-	  the patch by Sam Rawlins <sam.rawlins@gmail.com> [Fixes GH-579]
-
-Thu Mar 27 11:58:55 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): check shdr[i].sh_type because even if
-	  .symtab section exists, the section's type can be SHT_NOBITS and
-	  actual data doesn't exist in the file.
-	  revert r45441.
-
-Wed Mar 26 14:57:35 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* parse.y: inline must be static (for mswin).
-	  fixed build error introduced at r45426.
-
-Wed Mar 26 14:33:00 2014  Narihiro Nakamura  <authornari@gmail.com>
-
-	* internal.h (USE_SYMBOL_GC): enable Symbol GC by default (USE_SYMBOL_GC == 1).
-
-Tue Mar 25 22:57:11 2014  Narihiro Nakamura  <authornari@gmail.com>
-
-	* parse.y: support Symbol GC. [ruby-trunk Feature #9634]
-	  See this ticket about Symbol GC.
-
-	* include/ruby/ruby.h:
-	  Declare few functions.
-	  * rb_sym2id: almost same as old SYM2ID but support dynamic symbols.
-	  * rb_id2sym: almost same as old ID2SYM but support dynamic symbols.
-	  * rb_sym2str: almost same as `rb_id2str(SYM2ID(sym))` but not
-	    pin down a dynamic symbol.
-	  Declare a new struct.
-	  * struct RSymbol: represents a dynamic symbol as object in
-	    Ruby's heaps.
-	  Add few macros.
-	  * STATIC_SYM_P: check a static symbol.
-	  * DYNAMIC_SYM_P: check a dynamic symbol.
-	  * RSYMBOL: cast to RSymbol
-
-	* gc.c: declare RSymbol. support T_SYMBOL.
-
-	* internal.h: Declare few functions.
-	  * rb_gc_free_dsymbol: free up a dynamic symbol. GC call this
-	    function at a sweep phase.
-	  * rb_str_dynamic_intern: convert a string to a dynamic symbol.
-	  * rb_check_id_without_pindown: not pinning function.
-	  * rb_sym2id_without_pindown: ditto.
-	  * rb_check_id_cstr_without_pindown: ditto.
-
-	* string.c (Init_String): String#intern and String#to_sym use
-	  rb_str_dynamic_intern.
-
-	* template/id.h.tmpl: use LSB of ID as a flag for determining a
-	  static symbol, so we shift left other ruby_id_types.
-
-	* string.c: use rb_sym2str instead `rb_id2str(SYM2ID(sym))` to
-	  avoid pinning.
-
-	* load.c: use xx_without_pindown function at creating temporary ID
-	  to avoid pinning.
-
-	* object.c: ditto.
-
-	* sprintf.c: ditto.
-
-	* struct.c: ditto.
-
-	* thread.c: ditto.
-
-	* variable.c: ditto.
-
-	* vm_method.c: ditto.
-
-Wed Mar 26 13:25:54 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): loop reverse order not to overwrite
-	  the basis of base addresses comparison.
-
-	* addr2line.c: use uintptr_t instead of intptr_t for pointers.
-
-	* addr2line.c (rb_dump_backtrace_with_lines): don't use syms.
-
-	* vm_dump.c (rb_print_backtrace): ditto.
-
-	* addr2line.h: ditto.
-
-Wed Mar 26 11:20:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_object): internal objects are not dumpable.
-	  [ruby-core:61677] [Bug #9674]
-
-	* ext/thread/thread.c (undumpable): ConditionVariable and Queue
-	  are not dumpable.  [ruby-core:61677] [Bug #9674]
-
-Wed Mar 26 10:36:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (follow_debuglink): show message if it closes opened
-	  (and maybe used) elf binary.
-
-Wed Mar 26 10:34:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_line): pass and use offset instead of
-	  curobj_baseaddr.
-
-Wed Mar 26 09:07:48 2014  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* configure.in: add --disable-pie. [Feature #9673]
-
-Wed Mar 26 08:47:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): don't run fill_lines multiple times.
-
-Wed Mar 26 08:45:00 2014  Sam Rawlins  <sam.rawlins@gmail.com>
-
-	* internal.h: add prototype for rb_reg_search0
-
-	* re.c: rename rb_reg_search to rb_reg_search0, add set_backref_str
-	  argument to allow callers to indicate that they don't require the
-	  backref string to be allocated.
-
-	* string.c: don't allocate backref str if replacement string is provided
-
-	[GH-578] [Bug #9676] [ruby-core:61682]
-
-Wed Mar 26 08:29:43 2014  mo khan  <mo@mokhan.ca>
-
-	* lib/rubygems.rb: fix spelling of Jim Weirich.  [Fixes GH-577]
-
-Wed Mar 26 01:55:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (rb_dump_backtrace_with_lines): a function to get must
-	  be a function in the main executable, whose absolute path is not
-	  available by dladdr, and ruby get it by /proc/self/exe on Linux.
-
-Wed Mar 26 01:34:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): skip if path is NULL.
-
-Tue Mar 25 23:57:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): only a newline after label should be
-	  significant.  [ruby-core:61658] [Bug #9669]
-
-Tue Mar 25 23:32:25 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/pathname/lib/pathname.rb (Pathname#join): remove unnecessary
-	  unshift.
-
-	* test/pathname/test_pathname.rb (TestPathname#test_join): add tests.
-
-Tue Mar 25 16:47:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lex_state_e, parser_params, f_arglist, parser_yylex):
-	  separate EXPR_LABELARG from EXPR_BEG and let newline significant,
-	  so that required keyword argument can place at the end of
-	  argument list without parentheses.  [ruby-core:61658] [Bug #9669]
-
-Mon Mar 24 22:19:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (ripper_initialize): filename can not be modified.
-
-Mon Mar 24 15:19:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (rb_dump_backtrace_with_lines): fetch path of the
-	  executable from /proc/self/exe on Linux.
-
-Mon Mar 24 14:14:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gc.c: Fix up default GC params by @csfrancis [fix GH-556]
-
-Mon Mar 24 13:13:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (parse_debug_line_cu): explicitly specify signed char
-	  because DWARF's line_Base is signed char and char maybe unsigned.
-	  patched by Rei Odaira. [ruby-dev:48068] [Bug #9654]
-
-Sun Mar 23 11:03:50 2014  Kohei Suzuki  <eagletmt@gmail.com>
-
-	* vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
-	  for a method aliased in a module.  [ruby-core:61636] [Bug #9663]
-
-Sun Mar 23 08:12:27 2014  Eric Wong  <e@80x24.org>
-
-	* st.c (hash_pos): use bitwise AND to avoid slow modulo op
-	  (new_size): power-of-two sizes for hash_pos change
-	  (st_numhash): adjust for common keys due to lack of prime modulo
-	  [Feature #9425]
-	* hash.c (rb_any_hash): right shift for symbols
-	* benchmark/bm_hash_aref_miss.rb: added to show improvement
-	* benchmark/bm_hash_aref_sym_long.rb: ditto
-	* benchmark/bm_hash_aref_str.rb: ditto
-	* benchmark/bm_hash_aref_sym.rb: ditto
-	* benchmark/bm_hash_ident_num.rb: added to prevent regression
-	* benchmark/bm_hash_ident_obj.rb: ditto
-	* benchmark/bm_hash_ident_str.rb: ditto
-	* benchmark/bm_hash_ident_sym.rb: ditto
-
-Sat Mar 22 22:56:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): compare the file names of object in which
-	  symbols exist. [Bug #9654] [ruby-dev:48058]
-
-Sat Mar 22 06:46:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/util.rb (escape_html, unescape_html): make synonyms
-	  aliases instead of wrapper methods.
-
-	* lib/cgi/util.rb (escape_element, unescape_element): ditto.
-	  [Fixes GH-573]
-
-Fri Mar 21 21:57:34 2014  Akinori MUSHA  <knu@iDaemons.org>
-
-	* configure.in: Fix a build problem with clang and --with-opt-dir.
-	  If ruby is configured with --with-opt-dir=dir when using clang
-	  as compiler, a warning `clang: warning: argument unused during
-	  compilation: '-I dir'` is emitted almost every time clang
-	  compiles a file.  Unfortunately, RUBY_CHECK_PRINTF_PREFIX takes
-	  any output from the compiler as fatal error, and the check thus
-	  fails due to the warning.  This is an attempt to fix the problem
-	  by adding a flag -Qunused-arguments to CFLAGS locally in the
-	  function to suppress the warning. [ruby-dev:48062] [Bug #9658]
-	  [Fixes GH-571] https://github.com/ruby/ruby/pull/571
-
-Fri Mar 21 16:31:56 2014  Zachary Scott  <e@zzak.io>
-
-	* gc.c: [DOC] Fix call-seq for GC.start by @jasonrclark [Fixes GH-572]
-	  https://github.com/ruby/ruby/pull/572
-
-Thu Mar 20 11:37:28 2014  James Edward Gray II  <james@graysoftinc.com>
-
-	* lib/csv.rb: Fixed a broken regular expression that was causing
-	  CSV to miss escaping some special meaning characters when used
-	  in parsing.
-	  Reported by David Unric
-	  [ruby-core:54986] [Bug #8405]
-
-Thu Mar 20 16:53:07 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (objspace_malloc_increase): should not invoke
-	  garbage_collect_with_gvl() here on non-ruby threads.
-
-	  Should just ignore the malloc_increase.
-
-	  This issue is pointed by Eric Wong [ruby-core:61519].
-
-Thu Mar 20 13:05:16 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of
-	  RARRAY_PTR().
-
-Thu Mar 20 12:59:39 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/intern.h (rb_obj_call_init, rb_class_new_instance):
-	  constify a parameter (VALUE *).
-	  I believe this incompatibility doesn't break any code.
-	  However, if you have trouble, please tell us.
-
-	* eval.c, object.c: ditto.
-
-Thu Mar 20 12:31:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (rb_method_entry_get_without_cache): get rid of
-	  infinite recursion at aliases in a subclass and a superclass.
-	  return actually defined class for other than singleton class.
-	  [ruby-core:60431] [Bug #9475]
-
-Wed Mar 19 17:13:06 2014  Eric Wong  <e@80x24.org>
-
-	* time.c (time_mload): freeze and preserve marshal-loaded time zone
-	* test/ruby/test_time.rb: add test for GC on loaded object
-	  [Bug #9652]
-
-Tue Mar 18 23:20:12 2014  Shota Fukumori  <her@sorah.jp>
-
-	* vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
-
-Tue Mar 18 22:03:41 2014  Shota Fukumori  <her@sorah.jp>
-
-	* vm_eval.c (eval_string_with_cref): Use file path even if scope is
-	  given. Related to [ruby-core:56099] [Bug #8662] and r42103.
-
-Mon Mar 17 13:17:47 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* enumerator.c (enumerator_block_call): use RARRAY_CONST_PTR()
-	  instead of RARRAY_PTR().
-
-	* io.c (rb_io_s_popen): ditto.
-
-	* numeric.c (num_step_size): ditto.
-
-	* vm_eval.c (rb_apply): ditto.
-
-	* vm_eval.c (rb_eval_cmd): ditto.
-
-Mon Mar 17 10:11:59 2014  Eric Wong  <e@80x24.org>
-
-	* variable.c (rb_const_set): delete existing entry on redefinition
-	  [Bug #9645]
-	* test/ruby/test_const.rb (test_redefinition): test for leak
-
-Sun Mar 16 21:33:01 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]
-	  Based on patch by @stomar
-
-Sun Mar 16 13:21:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (DLDFLAGS): insert a space between option and its
-	  argument for non-GCC compilers.  [ruby-core:61429] [Bug #9624]
-
-Sun Mar 16 08:05:06 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (objspace_xcalloc): fix GC accounting
-
-Sun Mar 16 06:33:35 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): return address is just after calling
-	  address. Therefore noreturn function with tail call's return
-	  address may be in another function.
-
-Sun Mar 16 05:51:55 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]
-
-Sat Mar 15 18:54:03 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* ext/.document: remove refinement from documentable directories.
-
-Sat Mar 15 11:02:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (DLDFLAGS): check for each options to control
-	  symbol resolution.  [ruby-core:61429] [Bug #9624]
-
-Sat Mar 15 07:02:35 2014  Eric Wong  <e@80x24.org>
-
-	* st.c (st_update): remove unnecessary assignment
-
-Fri Mar 14 14:58:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c (fill_lines): fetch symbol names from ELF binary's
-	  symbol table if it is built with cc -g and not stripped.
-	  Now ruby can show static symbols on Linux though glibc's
-	  backtrace_symbols(3) don't show them.
-
-	* addr2line.c (rb_dump_backtrace_with_lines): use dladdr(3) to
-	  detect what object file declares the symbol because
-	  dl_iterate_phdr can't detect the main executable file
-	  and codes on the stack.
-	  NOTE: signal trampolines sometimes on the user stack. (FreeBSD)
-
-	* addr2line.c (rb_dump_backtrace_with_lines): stop showing
-	  backtrace if the function's name is main.
-	  NOTE: FreeBSD's backtrace (libexecinfo) shows _start and
-	  an additional address. Why it doesn't remove them on dladdr phase
-	  is, dladdr may fail to detect the main function but detect
-	  as _start function. Therefore it must be after scanning
-	  the symbol table and getting correct name.
-
-
-Fri Mar 14 12:07:46 2014  Zachary Scott  <e@zzak.io>
-
-	* doc/syntax/literals.rdoc: [DOC] Single quote strings allows escape
-	  of backslash as well, patch by @idupree [Fixes GH-553]
-	  https://github.com/ruby/ruby/pull/553
-
-Fri Mar 14 01:18:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (invoke_block_from_c): add splattable argument.
-
-	* vm.c (vm_invoke_proc): disallow to splat when directly invoked.
-
-	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_callee_setup_arg):
-	  relax arity check of yielded lambda.  [ruby-core:61340] [Bug #9605]
-
-	* test/ruby/test_yield.rb (TestRubyYieldGen#emu_bind_params): no
-	  longer raise ArgumentError when splatting to lambda.
-
-Thu Mar 13 23:51:02 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/-test-/win32/dln/libdlntest.c (dlntest_ordinal): no need to
-	  specify export in the source file because .def file do it.
-	  get rid of warning on linking.
-
-Wed Mar 12 11:19:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat
-	  argument, since argc may differ for each calls.
-	  [ruby-core:61422] [Bug #9622]
-
-	* vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an
-	  inline function.
-
-Wed Mar 12 07:26:05 2014  Eric Wong  <e@80x24.org>
-
-	* insns.def (opt_regexpmatch2): respect redefined match op
-	  Thanks to Sam Rawlins for the fix.
-	* test/ruby/test_string.rb: test based on Tsuyoshi Sawada's report
-	  [Bug #9581]
-
-Tue Mar 11 22:31:25 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* ext/.document: add objspace/objspace_dump.c to document file.
-
-Tue Mar 11 22:22:38 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* test/objspace/test_objspace.rb (TestObjSpace#test_dump_uninitialized_file):
-	  remove dependency on json library.
-
-Tue Mar 11 10:55:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* README.EXT{,.ja} (Appendix B): update contents of `ruby_options`
-	  and replace `ruby_run` with `ruby_run_node`.  based on the patch
-	  by Kaneko Yuichiro at [ruby-dev:48030] [Bug #9619].
-
-Tue Mar 11 06:54:00 2014  Scott Francis  <scott.francis@shopify.com>
-
-	* ext/objspace/objspace_dump.c: Check fptr before trying to dump RFILE
-	  object fd. [GH-562]
-
-	* test/objspace/test_objspace.rb: add test
-
-Tue Mar 11 02:04:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD.
-
-	* vm_dump.c (procstat_vm): copied from FreeBSD.
-	  http://svnweb.freebsd.org/base/head/usr.bin/procstat/procstat_vm.c?revision=261780
-
-Mon Mar 10 12:14:26 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: always check dladdr(1).
-
-	* addr2line.c (fill_lines): show the line number in C backtrace if
-	  ruby is built without --enable-shared (PIE) on Linux.
-	  patch is originally by Shinichiro Hamaji
-	  https://twitter.com/shinh/status/441957774264504321
-	  NOTE: ld doesn't insert __executable_start for PIE.
-	  dladdr(3)'s argument must be a function pointer.
-
-Mon Mar 10 10:51:17 2014  ksss  <co000ri@gmail.com>
-
-	* test/ruby/test_enumerator.rb (test_iterators): fix test for hash
-	  iterators.  [Fixes GH-558]
-
-Sun Mar  9 14:14:49 2014  Eric Wong  <e@80x24.org>
-
-	* class.c (rb_class_subclass_add): use xmalloc
-	* class.c (rb_module_add_to_subclasses_list): ditto
-	* class.c (rb_class_remove_from_super_subclasses): use xfree
-	* class.c (rb_class_remove_from_module_subclasses): ditto
-	  [Bug #9616]
-
-Sun Mar  9 13:51:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/function.c (function_call): fix memory leak when an
-	  exception occurs at argument conversion or the function call.
-
-Sun Mar  9 06:42:40 2014  Eric Wong  <e@80x24.org>
-
-	* variable.c (struct global_variable): shrink by 8 bytes on 64-bit
-
-Sat Mar  8 17:42:51 2014  Eric Wong  <e@80x24.org>
-
-	* vm.c (add_opt_method): cleanup to use rb_method_entry_at
-
-Sat Mar  8 13:46:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
-	  ext/fiddle/handle.c (fiddle_handle_free),
-	  ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
-	  based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].
-
-Sat Mar  8 13:30:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (obj2uid, obj2gid): now getpwnam_r() and getgrnam_r()
-	  may need larger buffers than sysconf values, so retry with
-	  expanding the buffer when ERANGE is returned.
-	  [ruby-core:61325] [Bug #9600]
-
-Fri Mar  7 19:29:13 2014  Eric Wong  <e@80x24.org>
-
-	* vm_eval.c (vm_call0_body): use RARRAY_CONST_PTR
-	  (check_funcall_exec): ditto
-	  [ruby-core:61360]
-
-Fri Mar  7 19:14:11 2014  Eric Wong  <e@80x24.org>
-
-	* vm_eval.c (vm_call0_body): fix RB_GC_GUARD location
-	  (check_funcall_exec): ditto
-	  [Bug #9609]
-
-Fri Mar  7 14:48:17 2014  Narihiro Nakamura  <authornari@gmail.com>
-
-	* parse.y (ENC_SINGLE): Unused macro removed.
-
-Fri Mar  7 12:06:19 2014  Martin Bosslet  <Martin.Bosslet@gmail.com>
-
-	* test/openssl/test_ssl.rb: Reuse TLS default options from
-	  OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
-
-Thu Mar  6 15:15:24 2014  Zachary Scott  <e@zzak.io>
-
-	* doc/syntax/assignment.rdoc: [DOC] Fix assignment directions
-	  By @idupree [Fixes GH-555] https://github.com/ruby/ruby/pull/555
-
-Thu Mar  6 15:07:18 2014  Zachary Scott  <e@zzak.io>
-
-	* doc/syntax/methods.rdoc: [DOC] Fix example for block arguments
-	  By @idupree [Fixes GH-554] https://github.com/ruby/ruby/pull/554
-
-Thu Mar  6 10:33:31 2014  Martin Bosslet  <Martin.Bosslet@gmail.com>
-
-	* lib/openssl/ssl.rb: Explicitly whitelist the default
-	  SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable
-	  compression by default.
-	  Reported by Jeff Hodges.
-	  [ruby-core:59829] [Bug #9424]
-
-Wed Mar  5 15:56:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_arg_asgn): define optional arguments as argument
-	  variables in the rhs default expressions.
-	  [ruby-core:61299] [Bug #9593]
-
-Wed Mar  5 11:58:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
-	  error reasons with old OpenSSL, and insert a colon iff formatted
-	  message is not empty.
-
-Wed Mar  5 00:42:00 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* ext/pathname/lib/pathname.rb (Pathname#find): add "ignore_error"
-	  keyword argument defaulted to true as well as Find#find.
-
-Tue Mar  4 23:00:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_eval.rb (TestEval#make_test_binding): renamed.
-	  it's not test method.
-
-Tue Mar  4 20:50:59 2014  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* st.c (st_foreach): fix type of hash. not st_data_t but st_index_t.
-
-Tue Mar  4 19:41:40 2014  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in: ".DEFAULT" target removed because it is not for
-	  specifying default target.
-
-Tue Mar  4 00:25:35 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/find.rb (Find#find): should pass ignore_error option to enumerators.
-
-Mon Mar  3 13:27:35 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/test_find.rb (TestFind#test_unsearchable_dir): ruby cannot make
-	  directory unreachable by owner on Windows.
-
-Mon Mar  3 08:10:04 2014  Eric Wong  <e@80x24.org>
-
-	* vm_method.c (rb_method_entry_get_without_cache): disable GMC
-	  writing if GMC is disabled.
-	  [ruby-core:61218]
-
-Mon Mar  3 07:47:17 2014  Eric Wong  <e@80x24.org>
-
-	* README.EXT: wrap GetDBM with do/while(0)
-	* README.EXT.ja: ditto
-	* ext/dbm/dbm.c: ditto, likewise for GetDBM2
-	* ext/gdbm/gdbm.c: ditto
-	* ext/sdbm/init.c: ditto
-	  [ruby-core:61217]
-
-Mon Mar  3 07:17:31 2014  Zachary Scott  <e@zzak.io>
-
-	* NEWS: [DOC] Update doc regarding filesystem load when flushing IO
-
-Mon Mar  3 04:37:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_fsync): need to fsync even if on Windows.  fixed mistake
-	  of r45254 and r45256.
-
-Mon Mar  3 04:21:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/win32ole: get rid of warnings (unused variable).
-
-Mon Mar  3 02:53:53 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_flush_raw): [EXPERIMENTAL] remove force syncing for Win32
-	  to speed up IO.  this may break some tests, and they'll be fixed
-	  later.
-	  [ruby-core:58570] [Bug #9153]
-
-Mon Mar  3 00:17:43 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_backtrace.rb: get rid of warnings.  unused variable,
-	  shadowing.
-
-Sun Mar  2 11:15:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/find.rb (Find#find): add "ignore_error" keyword argument
-	  defaulted to true.  [ruby-core:51025] [Feature #7596]
-
-Sun Mar  2 11:13:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/extconf.rb (rl_hook_func_t): define as Function for
-	  very old readline versions.  [ruby-core:61209] [Bug #9578]
-
-Sun Mar  2 10:47:58 2014  Eric Wong  <e@80x24.org>
-
-	* load.c (ruby_init_ext): make idempotent to suppress warnings
-
-Sat Mar  1 19:51:42 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open3.rb (Open3.capture3): Ignore Errno::EPIPE for writing
-	  stdin_data.
-	  (Open3.capture2): Ditto.
-	  (Open3.capture2e): Ditto.
-
-Sat Mar  1 19:06:47 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (ruby_gc_set_params): simplify condition
-
-Sat Mar  1 16:18:40 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
-	  of Function to support readline-6.3.  (rl_hook_func_t is available
-	  since readline-4.2.)
-	  Reported by Dmitry Medvinsky.  [ruby-core:61141] [Bug #9578]
-
-Sat Mar  1 16:05:58 2014  Eric Wong  <e@80x24.org>
-
-	* gc.c (ruby_gc_set_params): fix building without RGenGC
-
-Sat Mar  1 11:08:00 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
-	  objects.
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
-	  objects.
-
-	* test/psych/test_encoding.rb: add test
-
-	* ext/psych/lib/psych.rb: add version
-
-Sat Mar  1 10:52:34 2014  Zachary Scott  <e@zzak.io>
-
-	* README.EXT.ja: [DOC] Fix typo "macro macro" @utenmiki [Fixes GH-551]
-	  https://github.com/ruby/ruby/pull/551
-
-Fri Feb 28 11:16:55 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* numeric.c: Fix Numeric#step with 0 unit [Bug #9575]
-
-Thu Feb 27 17:59:01 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/optparse.rb: [DOC] Add example of generating help with optparse.
-	  Patch by @joelmccracken documenting-ruby/ruby#19
-	  https://github.com/documenting-ruby/ruby/pull/19
-
-Thu Feb 27 12:10:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (ruby_num_interval_step_size): check signs and get rid
-	  of implementation dependent behavior of negative division.
-	  [ruby-core:61106] [Bug #9570]
-
-Thu Feb 27 03:55:45 2014  Zachary Scott  <e@zzak.io>
-
-	* thread.c: [DOC] Typo in comment for _FORTIFY_SOURCE [Fixes GH-548]
-	  Patch by @qnet-herwin https://github.com/ruby/ruby/pull/548
-
-Wed Feb 26 18:43:43 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (heap_pages_free_unused_pages): check tomb page availability
-	  at first.
-	  And return immediately if we don't touch sorted list any more.
-
-Wed Feb 26 14:10:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): preserve exception class name encoding
-	  in debug mode messages.
-
-	* eval.c (setup_exception): preserve errinfo across calling #to_s
-	  method on the exception.  [ruby-core:61091] [Bug #9568]
-
-Wed Feb 26 01:29:27 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (sym_find): Add Symbol.find(str), which returns whether given
-	  string is defined as symbol or not. [Feature #7854]
-
-Tue Feb 25 22:52:02 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/dl/dl.c (rb_dl_realloc): use NUM2SIZET instead of NUM2INT.
-
-	* ext/fiddle/fiddle.c (rb_fiddle_realloc): ditto.
-
-Tue Feb 25 22:49:30 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/dl/dl.c (rb_dl_malloc): use NUM2SIZET instead of NUM2INT.
-	  Coverity Scan found this bug.
-
-	* ext/fiddle/fiddle.c (rb_fiddle_malloc): ditto.
-
-Tue Feb 25 12:06:13 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/Makefile.sub: define PACKED_STRUCT.
-
-Mon Feb 24 21:41:56 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* README.md, README.ja.md: removed (wrong) mode setting for emacs.
-
-Mon Feb 24 20:05:41 2014  Eric Wong  <e@80x24.org>
-
-	* configure.in: define PACKED_STRUCT_UNALIGNED for x86*
-	* timev.h (struct vtm): use PACKED_STRUCT_UNALIGNED
-	* time.c (struct time_object): ditto
-	  [Bug #9558] non-x86 cannot safely access unaligned addresses
-
-Mon Feb 24 18:10:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/fiddle/test_function.rb: remove unused variables.
-	* test/fileutils/test_fileutils.rb: ditto.
-	* test/io/console/test_io_console.rb: ditto.
-
-Mon Feb 24 12:37:51 2014  Eric Wong  <e@80x24.org>
-
-	* configure.in: use -Wno-packed-bitfield-compat for GCC 4.4+
-	  use __attribute__((packed)) if available
-	* timev.h: shrink and pack struct vtm
-	* time.c: pack struct time_object and adjust/introduce helpers
-	  [ruby-core:60794]
-
-Sun Feb 23 17:55:50 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/xmltokens.rb: Add missing non ASCII valid characters
-	  to element name characters. Now, REXML name tokens exactly
-	  match "[5] Name" in the XML spec and "[4] NCName" in the
-	  Namespaces in XML spec. See comment about the details.
-	  [Bug #9539]  [ruby-core:60901]
-	  Reported by Mario Barcala. Thanks!!!
-
-	* test/rexml/xpath/test_node.rb: Add tests for the above case.
-
-Sun Feb 23 12:18:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/raddrinfo.c (inet_pton): use rb_w32_inet_pton, instead of
-	  inet_pton directly, which is unavailable on older version Windows.
-
-	* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a
-	  wrapper function for inet_pton minimum supported client is
-	  Vista, as well as inet_ntop.
-
-Sun Feb 23 11:33:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/net/imap/test_imap.rb: remove unused variables.
-	* test/net/imap/test_imap_response_parser.rb: ditto.
-	* test/net/pop/test_pop.rb: ditto.
-
-Sun Feb 23 02:19:51 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
-	  security.mac.portacl.port_high is changed.
-	  See mac_portacl(4) for details.
-	  Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]
-
-Sat Feb 22 23:17:01 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/xpath_parser.rb: Fix indent.
-
-Sat Feb 22 23:15:35 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/xpath/test_attribute.rb: Simplify.
-
-Sat Feb 22 20:28:47 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: more friendly.
-
-Sat Feb 22 20:24:43 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_xpath*.rb: Move to ...
-	* test/rexml/xpath/*.rb: ... here.
-
-Sat Feb 22 20:04:41 2014  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/listener.rb: Untabify.
-
-Sat Feb 22 19:07:31 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): need read access for conout$
-	  because some functions need it.  [Bug#9554]
-
-Sat Feb 22 18:40:58 2014  Eric Wong  <e@80x24.org>
-
-	* .gitignore: ignore benchmark files
-
-Sat Feb 22 01:22:24 2014  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* bignum.c (bary_mul_precheck): fix a copy-paste error.
-	  Coverity Scan found this bug.
-
-Sat Feb 22 00:58:51 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/socket/raddrinfo.c (rb_getaddrinfo): second argument of
-	  MEMZERO is type.  Coverity Scan found this bug.
-
-Fri Feb 21 23:47:24 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/socket/init.c (wait_connectable): break if the socket is
-	  writable to avoid infinite loops on FreeBSD and other platforms
-	  which conforms to SUSv3.  This problem cannot be reproduced with
-	  loopback interfaces, so it's hard to write test code.
-	  rsock_connect() and wait_connectable() are overly complicated, so
-	  they should be refactored, but I commit this fix as a workaround
-	  for the release of Ruby 1.9.3 scheduled on Feb 24.
-	  [ruby-core:60940] [Bug #9547]
-
-Fri Feb 21 23:03:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: added to handle redmine tickets.
-
-Fri Feb 21 20:42:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_mod_init_copy): do nothing if copying self.
-	  [ruby-dev:47989] [Bug #9535]
-
-	* hash.c (rb_hash_initialize_copy): ditto.
-
-Fri Feb 21 16:45:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/logger.rb (next_rotate_time, previous_period_end): consider
-	  DST change.
-
-	* lib/logger.rb (Logger::LogDevice#check_shift_log): compare the
-	  current time with the time for the next rotation to fix rotation
-	  miss when date changed between the comparison and log writing.
-	  based on the patch by megayu <yuhg2310 AT gmail.com>.
-	  [Fixes GH-539]
-
-Fri Feb 21 10:39:33 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	*  test/monitor/test_monitor.rb: remove unused variables.
-	*  test/resolv/test_dns.rb: ditto.
-	*  test/rexml/test_functions.rb: ditto.
-	*  test/rss/test_setup_maker_itunes.rb: ditto.
-
-Fri Feb 21 09:48:56 2014  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
-	  (bsock_recvmsg_internal): ditto
-	* test/socket/test_unix.rb: test above for infinite loop
-
-Fri Feb 21 08:27:19 2014  Eric Wong  <e@80x24.org>
-
-	* include/ruby/ruby.h (RB_GC_GUARD):
-	  use rb_gc_guarded_ptr_val on non-GCC/MSC
-	* gc.c (rb_gc_guarded_ptr_val): rename and adjust argument.
-	  RB_GC_GUARD should be robust enough for any compiler.
-	  [ruby-core:60816] [Bug #7805]
-
-Thu Feb 20 22:21:26 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc.
-	  Suggested by Eric Wong.
-	  https://bugs.ruby-lang.org/issues/9525#note-14
-
-Thu Feb 20 11:21:13 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* hash.c (rb_hash_flatten): fix behavior of flatten(-1).
-	  [ruby-dev:47988] [Bug #9533]
-
-	* test/ruby/test_array.rb: test for above.
-
-Wed Feb 19 18:57:02 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket: Bypass getaddrinfo() if node and serv are numeric.
-	  Reporeted by Naotoshi Seo.  [ruby-core:60801] [Bug #9525]
-
-	* ext/socket/extconf.rb: Detect struct sockaddr_in6.sin6_len.
-
-	* ext/socket/sockport.h (SET_SIN6_LEN): New macro.
-	  (INIT_SOCKADDR_IN6): Ditto.
-
-	* ext/socket/rubysocket.h (struct rb_addrinfo): Add
-	  allocated_by_malloc field.
-
-	* ext/socket/raddrinfo.c (numeric_getaddrinfo): New function.
-	  (rb_getaddrinfo): Call numeric_getaddrinfo at first.
-	  (rb_freeaddrinfo): Free struct addrinfo properly when it is
-	  allocated by numeric_getaddrinfo.
-
-Wed Feb 19 18:31:48 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket: Wrap struct addrinfo by struct rb_addrinfo.
-
-Wed Feb 19 17:47:01 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory.
-
-Wed Feb 19 11:39:41 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: it must see rb_cv_broken_memmem not rb_cv_func_memmem.
-
-Tue Feb 18 23:18:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/socket/test_socket.rb: unix socket is required by test case.
-
-Tue Feb 18 20:48:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/socket/test_addrinfo.rb: remove unused variables.
-	* test/socket/test_nonblock.rb: ditto.
-	* test/socket/test_socket.rb: ditto.
-	* test/socket/test_unix.rb: ditto.
-	* test/testunit/test_parallel.rb: ditto.
-	* test/webrick/test_filehandler.rb: ditto.
-	* test/xmlrpc/test_features.rb: ditto.
-	* test/zlib/test_zlib.rb: ditto.
-
-Tue Feb 18 14:27:18 2014  Shota Fukumori  <her@sorah.jp>
-
-	* lib/test/unit.rb: Requires minitest < 5.0.0 if Gem is available.
-
-Tue Feb 18 14:24:07 2014  Shota Fukumori  <her@sorah.jp>
-
-	* lib/test/unit/test-unit.gemspec: Add minitest < 5.0.0 dependency
-
-	* tool/rbinstall.rb: Add empty implementations for `add_dependency`,
-	  `add_runtime_dependency`, `add_development_dependency` for
-	  Gem::Specification.
-
-Tue Feb 18 12:06:39 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in (FILE_COUNT): Removed.  (win32.c defines it in itself.)
-	  (FILE_READPTR): Ditto.
-
-Tue Feb 18 09:35:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test/psych/test_string.rb: remove unused variables.
-	* test/test/psych/test_yaml.rb: ditto.
-
-Mon Feb 17 21:31:31 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb: ignore warning messages for running with -w
-	  option such as chkbuild.
-
-Mon Feb 17 20:00:27 2014  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: Move BDIGIT and related definitions from
-	  include/ruby/defines.h.
-
-Mon Feb 17 17:41:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (marshal_dump, marshal_load): do not recycle wrapper
-	  objects, to prevent from segfault with continuation.
-	  [ruby-dev:47970] [Bug #9523]
-
-Mon Feb 17 15:43:59 2014  Zachary Scott  <e@zzak.io>
-
-	* doc/keywords.rdoc: [DOC] Add keywords doc by documenting-ruby/ruby#29
-	  https://github.com/documenting-ruby/ruby/pull/29
-
-Mon Feb 17 12:31:31 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (get_envparam_double): fix a warning message.
-
-Mon Feb 17 12:09:52 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: introduce new environment variable
-	  "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
-	  frequency.
-
-	  Do full GC when the number of old objects is more than R * N
-	  where R is this factor and
-                N is the number of old objects just after last full GC.
-
-	* test/ruby/test_gc.rb: add a test.
-
-Mon Feb 17 11:28:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_pty.rb: ignore warnings to unused variables.
-
-Mon Feb 17 11:27:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_find.rb: remove unused variables.
-
-Sun Feb 17 02:12:00 2014  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto.
-
-Sun Feb 16 15:53:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_securerandom.rb: File.exists? is deprecated. use File.exist?
-
-Sun Feb 16 15:05:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/pathname/test_pathname.rb: File.exists? is deprecated. use File.exist?
-
-Sun Feb 16 15:00:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/net/ftp/test_ftp.rb: remove unused variables.
-	* test/logger/test_logger.rb: ditto.
-
-Sun Feb 16 14:52:46 2014  Eric Wong  <e@80x24.org>
-
-	* dir.c (dir_s_glob): RB_GC_GUARD instead of volatile
-
-Sun Feb 16 14:33:52 2014  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h (RBIGNUM_SIGN): Defined for compatibility.
-	  (RBIGNUM_POSITIVE_P): Ditto.
-	  (RBIGNUM_NEGATIVE_P): Ditto.
-
-Sun Feb 16 12:46:47 2014  Eric Wong  <e@80x24.org>
-
-	* io.c (rb_f_backquote): trade volatile for manual recycle
-	  rb_gc_force_recycle ensures object is visible until recycle
-
-Sun Feb 16 11:55:14 2014  Eric Wong  <e@80x24.org>
-
-	* marshal.c (marshal_dump): use rb_gc_force_recycle for GC-safety
-	  (marshal_load): ditto
-	  [ruby-core:60730] [Bug #7805]
-
-Sun Feb 16 08:11:23 2014  Zachary Scott  <e@zzak.io>
-
-	* README.EXT.ja: [DOC] Fix typo by @utenmiki [Fixes GH-534]
-	  https://github.com/ruby/ruby/pull/534
-
-Sun Feb 16 07:48:20 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/bigdecimal/bigdecimal.c (BIGNUM_ZERO_P): Unused macro removed.
-
-Sun Feb 16 06:12:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: Rename macro names: RBIGNUM_FOO to BIGNUM_FOO.
-	  (BIGNUM_EMBED_LEN_NUMBITS): Renamed from RBIGNUM_EMBED_LEN_NUMBITS.
-	  (BIGNUM_EMBED_LEN_MAX): Renamed from RBIGNUM_EMBED_LEN_MAX.
-	  (BIGNUM_SIGN_BIT): Renamed from RBIGNUM_SIGN_BIT.
-	  (BIGNUM_SIGN): Renamed from RBIGNUM_SIGN.
-	  (BIGNUM_SET_SIGN): Renamed from RBIGNUM_SET_SIGN.
-	  (BIGNUM_POSITIVE_P): Renamed from RBIGNUM_POSITIVE_P.
-	  (BIGNUM_NEGATIVE_P): Renamed from RBIGNUM_NEGATIVE_P.
-	  (BIGNUM_EMBED_FLAG): Renamed from RBIGNUM_EMBED_FLAG.
-	  (BIGNUM_EMBED_LEN_MASK): Renamed from RBIGNUM_EMBED_LEN_MASK.
-	  (BIGNUM_EMBED_LEN_SHIFT): Renamed from RBIGNUM_EMBED_LEN_SHIFT.
-	  (BIGNUM_LEN): Renamed from RBIGNUM_LEN.
-	  (RBIGNUM_DIGITS): Renamed from RBIGNUM_DIGITS.
-	  (BIGNUM_LENINT): Renamed from RBIGNUM_LENINT.
-
-	* bignum.c: Follow the above change.
-
-	* gc.c: Ditto.
-
-	* marshal.c: Ditto.
-
-	* math.c: Ditto.
-
-	* numeric.c: Ditto.
-
-	* random.c: Ditto.
-
-	* rational.c: Ditto.
-
-	* sprintf.c: Ditto.
-
-	* ext/-test-/bignum/bigzero.c: Ditto.
-
-	* ext/-test-/bignum/intpack.c: Ditto.
-
-	* ext/bigdecimal/bigdecimal.c: Ditto.
-
-Sat Feb 15 20:48:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in (FILE_READEND): Don't detect it because it is not used.
-
-Sat Feb 15 13:22:28 2014  Eric Wong  <e@80x24.org>
-
-	* probes_helper.h (RUBY_DTRACE_HOOK): correct type for _id
-
-Sat Feb 15 11:47:47 2014  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (rb_big_cmp): Avoid bignum allocation for comparison
-	  between bignum and fixnum.
-
-Sat Feb 15 10:55:12 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* ext/-test-/win32/fd_setsize/depend: fix wrong dependencies.
-	  [ruby-dev:47253]
-
-Sat Feb 15 00:38:54 2014  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c: Enumerable#{min,min_by,max,max_by} extended to take an
-	  optional argument.
-	  (nmin_cmp): New function.
-	  (nmin_block_cmp): Ditto
-	  (nmin_filter): Ditto.
-	  (nmin_i): Ditto.
-	  (nmin_run): Ditto.
-	  (enum_min): Call nmin_run if the optional argument is given.
-	  (nmin_max): Ditto.
-	  (nmin_min_by): Ditto.
-	  (nmin_max_by): Ditto.
-
-	* range.c: Range#{min,max} extended to take an optional argument.
-	  (range_min): Call range_first if the optional argument is given.
-	  (range_max): Call rb_call_super if the optional argument is given.
-
-	[ruby-core:57111] [Feature #8887]
-
-Sat Feb 15 00:27:46 2014  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/ruby.h,
-	  internal.h,
-	  ext/-test-/bignum/bigzero.c: Hide a Bignum definition.
-	  [ruby-core:42891] [Feature #6083]
-
-Sat Feb 15 00:13:14 2014  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/intern.h,
-	  include/ruby/io.h,
-	  include/ruby/ruby.h,
-	  include/ruby/win32.h,
-	  include/ruby/backward/rubysig.h,
-	  bignum.c,
-	  gc.c,
-	  io.c,
-	  process.c,
-	  safe.c,
-	  struct.c,
-	  thread.c,
-	  ext/socket/rubysocket.h,
-	  ext/-test-/old_thread_select: Remove deprecated definitions
-	  [ruby-core:60581] [Feature #9502]
-
-Fri Feb 14 18:38:46 2014  Eric Wong  <e@80x24.org>
-
-	* string.c (rb_str_format_m): trade volatile for RB_GC_GUARD
-	  RB_GC_GUARD meaning is clear and has better code generation.
-	  [ruby-core:60688]
-
-Thu Feb 13 23:30:30 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): should check ci->me->flag of
-	  a refining method in case the method is private.
-	  [ruby-core:60111] [Bug #9452]
-
-	* vm_method.c (make_method_entry_refined): set me->flag of a refined
-	  method entry to NOEX_PUBLIC in case the original method is private
-	  and it is refined as a public method.  The original flag is stored
-	  in me->def->body.orig_me, so it's OK to make a refined method
-	  entry public.  [ruby-core:60111] [Bug #9452]
-
-	* test/ruby/test_refinement.rb: related tests.
-
-Thu Feb 13 18:38:15 2014  Eric Wong  <e@80x24.org>
-
-	* re.c (rb_reg_raise): remove volatile
-	  Unnecessary since r41597
-
-Thu Feb 13 18:28:51 2014  Eric Wong  <e@80x24.org>
-
-	* re.c (rb_reg_regcomp): remove volatile
-	  Unnecessary since r13261
-
-Thu Feb 13 16:54:32 2014  Zachary Scott  <e@zzak.io>
-
-	* test/ruby/test_array.rb: Ensure flatten! is used for test_flatten
-	  Patch by @ksss [Fixes GH-530] https://github.com/ruby/ruby/pull/530
-
-Thu Feb 13 15:43:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (IDSET_ATTRSET_FOR_INTERN): fix off-by-one bug.
-
-	* parse.y (rb_enc_symname_type): junk ID succeeded by '=' is also
-	  attrset ID.  [ruby-core:60668] [Bug #8756]
-
-Thu Feb 13 11:06:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check if pthread_setname_np is available.
-
-	* thread_pthread.c: pthread_setname_np is not available on old
-	  Darwins.  [ruby-core:60524] [Bug #9492]
-
-Thu Feb 13 00:56:59 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* configure.in: revert r44922. I should have used AC_CHECK_FUNCS()
-	  to just define a symbol if the function is available.
-
-Thu Feb 13 00:20:58 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* configure.in: use AC_CHECK_FUNC instead of AC_CHECK_FUNCS
-	  if available.
-
-Thu Feb 13 00:15:10 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* configure.in: fix to undefine HAVE_MEMMEM correctly if it is broken.
-
-Tue Feb 11 23:54:40 2014  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (rb_big_cmp): Specialize a comparison to zero.
-
-	* ext/bigdecimal/bigdecimal.c (is_negative): Use rb_big_cmp instead of
-	  RBIGNUM_NEGATIVE_P.
-	  (BigMath_s_log): Ditto.
-
-Tue Feb 11 22:59:10 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_bn.c (ossl_bn_initialize): Use rb_integer_pack.
-	  Fix SEGV by OpenSSL::BN.new(1 << (2**34)).
-
-Tue Feb 11 17:00:38 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/tk/README.tcltklib: [DOC] Fix typo by @xta [Fixes GH-532]
-
-Sun Feb  9 13:59:29 2014  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: Fix compilation error.
-	  https://bugs.ruby-lang.org/issues/8358#note-16
-
-Sun Feb  9 05:20:24 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (rb_cv_gnu_qsort_r): use compile error "conflicting
-	  types for 'qsort_r'" instead of AC_RUN_IFELSE.
-
-Sun Feb  9 04:07:34 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/yaml.rb: [DOC] Add links to syck and psych on github [Bug #9501]
-	  Based on a patch by Giorgos Tsiftsis
-
-Sun Feb  9 02:13:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (OBJ_TAINTABLE, OBJ_TAINT, OBJ_INFECT),
-	  marshal.c (r_entry0): all Numerics never be tainted now.
-	  [ruby-core:57346] [Bug #8945]
-
-Sat Feb  8 23:40:35 2014  Vit Ondruch  <vondruch@redhat.com>
-
-	* configure.in: add quoting brackets and append wildcard for the
-	  rest after target_cpu, to properly detect platform for SSE2
-	  instructions.  [ruby-core:60576] [Bug #8358]
-
-Sat Feb  8 21:44:07 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* configure.in: check qsort_r(3) and whether it is GNU version.
-	  BSD version has different prototype.
-
-	* util.h: use qsort_r() as ruby_qsort() if it is GNU version.
-
-	* util.c: define ruby_qsort() if needed.
-
-Sat Feb  8 16:34:36 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder#get_labels):
-	  Make it iterative.
-
-Sat Feb  8 15:54:12 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c, gc.h (rb_objspace_marked_object_p): added.
-	  This function *ONLY* works just after marking phase,
-	  before any sweeping.
-	  This function is highly depending current GC implementation
-	  and can be removed future version.
-
-Sat Feb  8 15:41:37 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb: Don't set CLOEXEC flag explicitly.  (Ruby set it by
-	  default.)
-
-Sat Feb  8 15:27:02 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Message::MessageDecoder): Raise
-	  DecodeError if no data before the limit.
-	  Reported by Will Bryant.  [ruby-core:60557] [Bug #9498]
-
-Sat Feb  8 15:11:21 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (SMALLBUF): Unused macro removed.
-
-Fri Feb  7 23:37:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb: Ignore name servers which cause EAFNOSUPPORT on
-	  socket creation.
-	  Reported by Bjoern Rennhak.  [ruby-core:60442] [Bug #9477]
-
-Fri Feb  7 21:58:48 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/open-uri.rb: [DOC] use lower case version of core classes, same
-	  as commit r44878, based on patch by Jonathan Jackson [Bug #9483]
-
-Fri Feb  7 21:54:53 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/ripper/lib/ripper/lexer.rb: [DOC] use lower case version of core
-	  classes when referring to return value, since we aren't directly
-	  talking about the class. Patch by Jonathan Jackson [Bug #9483]
-
-Fri Feb 7 05:28:38 2014  Eric Wong  <e@80x24.org>
-
-	* constant.h: reduce rb_const_entry_t size on 64-bit
-	  Patch by Adam Avilla [ruby-core:60542] [Feature #9496]
-
-Thu Feb  6 15:27:46 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (get_envparam_int): correct warning messages.
-
-	* gc.c (get_envparam_double): ditto.
-
-Thu Feb  6 15:17:30 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (get_envparam_int): don't accept a value equals to lowerbound
-	  (changed by last commit) because "" or "foo" (not a number) strings
-	  are parsed as 0. They should be rejected.
-
-	* gc.c (get_envparam_double): ditto.
-
-Thu Feb  6 09:00:35 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (ruby_gc_set_params): if RUBY_GC_OLDMALLOC_LIMIT is provided,
-	  then set objspace->rgengc.oldmalloc_increase_limit.
-	  Without this fix, the env variable RUBY_GC_OLDMALLOC_LIMIT
-	  does not work.
-
-	* gc.c (get_envparam_int): accept a value equals to lowerbound.
-
-	* gc.c (get_envparam_double): ditto.
-
-Thu Feb 6 08:23:28 2014  Eric Wong  <e@80x24.org>
-
-	* ext/thread/thread.c (rb_szqueue_max_set): use correct queue and
-	  limit wakeups.  [Bug #9343][ruby-core:60517]
-	* test/thread/test_queue.rb (test_sized_queue_assign_max):
-	  test for bug
-
-Thu Feb  6 07:18:01 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems 2.2.2.  Complete history at:
-
-	  http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.2.2+%2F+2014-02-05
-
-	* test/rubygems:  ditto.
-
-Wed Feb  5 20:56:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (to_be_skipped_id): ignore anonymous attributes.
-
-	* pack.c (Init_pack): use anonymous ID so that associated objects
-	  do not appear in the packed result.
-
-	* parse.y (rb_make_internal_id): return an anonymous ID for
-	  internal use.
-
-Wed Feb  5 14:41:56 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vsnprintf.c: remove duplicated def of `UNINITIALIZED_VAR()'.
-
-Wed Feb  5 14:40:16 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace_dump.c (dump_object): use STR_SHARED_P()
-	  instead of removed STR_NOCAPA_P() macro.
-
-Wed Feb  5 13:51:33 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h, vm_core.h: move LIKELY/UNLIKELY/UNINITIALIZED_VAR()
-	  macros from vm_core.h to internal.h.
-
-	* string.c: remove dependency to "vm_core.h".
-
-	* common.mk: ditto.
-
-Wed Feb  5 13:29:01 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (rb_str_free): use FL_TEST(str, STR_SHARED) directly
-	  because str is not embed.
-
-	* string.c (str_replace): remove `FL_SET(str, STR_SHARED)' line
-	  because STR_SET_SHARED() set STR_SHARED.
-
-Wed Feb  5 13:18:08 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: remove macros STR_NOCAPA and STR_NOCAPA_P().
-
-	* string.c (rb_str_resize): remove `STR_SET_NOEMBED(str)' because
-	  str_make_independent_expand() set NOEMBED flag.
-
-	* string.c (rb_str_resize): remove `STR_NOCAPA_P(str)' check because
-	  `str' is independent (not shared).
-
-Wed Feb  5 12:54:25 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: refactoring, especially about string flags.
-
-	* string.c (STR_UNSET_NOCAPA): removed.
-	  Use FL_UNSET() with STR_SHARED.
-
-	* string.c (rb_str_capacity): check STR_SHARED directly
-	  because it is not a embed string.
-
-	* string.c (rb_str_modify_expand): ditto.
-
-	* string.c (rb_str_shared_replace): use STR_SET_SHARED().
-
-	* string.c (str_make_independent_expand): remove STR_UNSET_NOCAPA()
-	  because `str' is not shared string.
-
-Wed Feb  5 12:11:04 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (RESIZE_CAPA): should not resize shared string.
-
-Wed Feb  5 11:46:42 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_children): STR_ASSOC is no longer available.
-	  Reported by @nagachika.
-	  http://d.hatena.ne.jp/nagachika/20140204
-
-Wed Feb  5 11:27:22 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c (rb_str_new_frozen): refactoring code.
-	  * Move code from str_new_frozen_with_klass() (and remove it)
-	  * `aux.shared' should not be 0 for STR_SHARED strings.
-
-Wed Feb  5 04:23:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: New release of psych.
-	* ext/psych/psych.gemspec: ditto
-
-Wed Feb  5 04:16:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/yaml/emitter.c: merge libyaml 0.1.5
-	* ext/psych/yaml/loader.c: ditto
-	* ext/psych/yaml/parser.c: ditto
-	* ext/psych/yaml/reader.c: ditto
-	* ext/psych/yaml/scanner.c: ditto
-	* ext/psych/yaml/writer.c: ditto
-	* ext/psych/yaml/yaml_private.h: ditto
-
-Tue Feb  4 19:10:29 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: use long allocator names instead of numbered
-	  allocator names.
-	  * rb_str_new2 -> rb_str_new_cstr
-	  * rb_str_new4 -> rb_str_new_frozen
-	  * rb_str_new5 -> rb_str_new_with_class
-	  * str_new3 -> str_new_shared
-	  * str_new4 -> str_new_frozen_with_klass
-
-Tue Feb  4 17:20:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): return the filename with actual cases on
-	  the filesystem if it is case-insensitive.  [ruby-core:42469]
-	  [Feature #5994]
-
-Tue Feb  4 16:16:58 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: use STR_SHARED instead of ELTS_SHARED.
-	  (same value, but more clear meaning)
-
-Tue Feb  4 16:09:14 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: remove STR_ASSOC related code.
-	  By r44804, string objects can not have STR_ASSOC flag.
-
-	* internal.h: ditto.
-
-	* ext/objspace/objspace_dump.c (dump_object): ditto.
-
-Tue Feb  4 14:07:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (str_associate, str_associated): keep associated objects
-	  in an instance variables, instead of in the internal structure.
-
-	* string.c (rb_str_associate, rb_str_associated): deprecate.
-
-Tue Feb  4 12:55:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_modify_expand): enable capacity and disable
-	  association with packed objects when setting capa, so that
-	  pack("p") string fails to unpack properly after modified.
-
-Tue Feb  4 12:45:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_make_pattern): all alphabets are magic characters on
-	  case-insensitive filesystems.  [ruby-core:42469] [Feature #5994]
-
-Tue Feb  4 09:47:57 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems 2.2.2 prerelease to check fixes to
-	  CI.
-	* test/rubygems:  ditto.
-
-Mon Feb  3 12:04:47 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* error.c: [DOC] Exception#cause may return nil. [ci skip]
-
-Sun Feb 2 05:48:42 2014  Eric Wong <e@80x24.org>
-
-	* io.c (rb_io_syswrite): add RB_GC_GUARD
-	  [Bug #9472][ruby-core:60407]
-
-Sat Feb  1 15:09:16 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_typedesc2val): add VT_RECORD case.
-
-Sat Feb  1 06:38:51 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/drb/drb.rb: [DOC] Add note about start_service for each process
-	  Based on a patch by @rosenfeld [Fixes GH-514] [ci skip]
-	  https://github.com/ruby/ruby/pull/514
-
-Sat Feb  1 06:30:20 2014  Zachary Scott  <e@zzak.io>
-
-	* error.c: [DOC] Document Exception#cause by @jasonrclark [ci skip]
-	  [Fixes GH-519] https://github.com/ruby/ruby/pull/519
-
-Sat Feb  1 06:10:49 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/securerandom.rb: [DOC] Add note on require for examples
-	  Based on a patch by @schneems [Fixes GH-518] [ci skip]
-	  https://github.com/ruby/ruby/pull/518
-
-Sat Feb  1 06:04:56 2014  Zachary Scott  <e@zzak.io>
-
-	* numeric.c: [DOC] Fix typo in example for #step [ci skip]
-	  Patch by @ksss [Fixes GH-522] https://github.com/ruby/ruby/pull/522
-
-Fri Jan 31 17:01:47 2014  Eric Wong <e@80x24.org>
-
-	* ext/socket/init.c (rsock_socket0): split out SOCK_CLOEXEC version
-	* ext/socket/socket.c (rsock_socketpair0): ditto
-	  [ruby-core:60377]
-
-Fri Jan 31 03:48:40 2014  Eric Wong <e@80x24.org>
-
-	* benchmark/driver: avoid large alloc in driver process
-	  [ruby-core:59869] [Bug #9430]
-
-Thu Jan 30 14:45:49 2014  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* configure.in: use $@ instead of $(.TARGET) because .TARGET is not
-	  supported by GNU make.
-
-Thu Jan 30 08:26:21 2014  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
-	  [ruby-core:57599] [Bug #8978].
-
-Wed Jan 29 20:08:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (nogvl_copy_stream_sendfile): check socket on other than
-	  linux, as sendfile(2) on non-socket fd works only on linux.
-	  [Feature #9427]
-
-Wed Jan 29 18:09:48 2014  Eric Wong <e@80x24.org>
-
-	* io.c (nogvl_copy_stream_sendfile): remove socket check
-	  [ruby-core:59856][Feature #9427]
-
-Wed Jan 29 04:29:54 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/openssl/ossl_ssl.c: pass read_nonblock options to underlying IO
-	  when SSL session has not been started.
-
-	* test/openssl/test_ssl.rb: test for change.
-
-Wed Jan 29 03:49:36 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/fiddle/closure.c: use sizeof(*pcl) for correct sizeof value.
-	  [ruby-core:57599] [Bug #8978].  Thanks mame!
-
-Wed Jan 29 03:36:42 2014  Eric Wong <e@80x24.org>
-
-	* doc/contributing.rdoc: allow/encourage other git hosts
-	  [ruby-core:59807][misc #9421]
-
-Tue Jan 28 23:36:01 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket: Avoid redundant fcntl/fstat syscalls for cloexec
-	  sockets.
-	  Patch by Eric Wong.  [ruby-core:59429] [Feature #9330]
-
-Tue Jan 28 20:51:07 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (READ_FROM_CHILD): Apply the last hunk of
-	  0001-process.c-avoid-EINTR-from-Process.spawn.patch written by
-	  Eric Wong in [Bug #8770].
-
-Tue Jan 28 16:31:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (ruby_init_stack, ruby_stack_overflowed_p):
-	  place get_stack above others to get stack boundary information.
-	  [ruby-core:60113] [Bug #9454]
-
-Tue Jan 28 15:27:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c: rlimit is only available on Linux.
-	  At least r44712 breaks FreeBSD.
-	  [ruby-core:60113] [Bug #9454]
-
-Tue Jan 28 15:17:59 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/set.rb: [DOC] Add examples for Set#intersect? and Set#disjoint?
-	  Patch by xavier nayrac [Bug #9331] [ci skip]
-
-Tue Jan 28 15:12:22 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/zlib/zlib.c (rb_zlib_adler32): [DOC] Add example for adler32
-	  Patch by Vajrasky Kok [Bug #9307] [ci skip]
-
-Tue Jan 28 08:56:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
-
-	* compile.c (iseq_build_from_ary_body): Use :blockptr instead of :block
-	  as hash key when loading serialized instruction sequences from arrays.
-	  [Bug #9455] [ruby-core:60146]
-
-Mon Jan 27 21:52:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c: get current main thread stack size, which may
-	  be expanded than allocated size at initialization, by rlimit().
-	  [ruby-core:60113] [Bug #9454]
-
-Sat Jan 25 22:17:02 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* README.ja.md, README.md: update the controller address of
-	  mailing lists.
-
-Sat Jan 25 14:50:42 2014  Eric Wong  <normalperson@yhbt.net>
-
-	* process.c (send_child_error): retry write on EINTR to fix
-	  occasional Errno::EINTR from Process.spawn.
-
-	* process.c (recv_child_error): retry read on EINTR to fix
-	  occasional Errno::EINTR from Process.spawn.
-
-Sat Jan 25 14:21:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): result of assignment should be
-	  its rhs instead of returned value from a method.
-	  [ruby-core:60071] [Bug #9448]
-
-Sat Jan 25 11:16:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_extract_keywords): treat nil keyword_hash same as 0,
-	  for the case rb_scan_args returns nil if no keyword hash.
-
-Fri Jan 24 15:13:20 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/racc/rdoc/grammar.en.rdoc: [DOC] Correct grammar and typos
-	  Patch by Giorgos Tsiftsis [Bug #9429] [ci skip]
-
-Thu Jan 23 20:20:17 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/envutil.rb: try to wait a bit (0.1sec) when ruby process
-	  exits by signals because some SEGV tests fail because of not enough
-	  error output.
-
-Thu Jan 23 20:06:27 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_settracefunc.rb: check the target thread.
-
-Thu Jan 23 19:59:16 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_settracefunc.rb: check the target thread.
-
-Thu Jan 23 14:26:44 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/fileutils.rb: [DOC] Fix typo in options_of() example [Bug #9392]
-	  Patch by Giorgos Tsiftsis
-
-Thu Jan 23 13:56:16 2014  Zachary Scott  <e@zzak.io>
-
-	* README -> README.md: [DOC] Format README with Markdown [Bug #9255]
-	* README.ja -> README.ja.md: ditto
-
-Wed Jan 22 15:59:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/thread/thread.c (Init_thread): ConditionVariable and Queue
-	  are not able to copy.  [ruby-core:59961] [Bug #9440]
-
-Tue Jan 21 20:14:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (rb_thread_create_timer_thread): fix for platforms
-	  where PTHREAD_STACK_MIN is a dynamic value and not a compile-time
-	  constant.  [ruby-dev:47911] [Bug #9436]
-
-Tue Jan 21 17:55:09 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/uri/common.rb: [DOC] Use static w3.org uri [ci skip]
-	  Patch by @ykzts [Fix GH-484] https://github.com/ruby/ruby/pull/484
-
-Tue Jan 21 16:43:22 2014  Zachary Scott  <e@zzak.io>
-
-	* enum.c: [DOC] Add simple example of Enumerable#zip [ci skip]
-	  Patch by @nruth on documenting-ruby/ruby#22
-	  https://github.com/documenting-ruby/ruby/pull/22
-
-Tue Jan 21 16:26:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (rb_thread_create_timer_thread): expand timer
-	  thread stack size to get rid of segfault on FreeBSD/powerpc64.
-	  based on the patch by Steve Wills at [ruby-core:59923].
-	  [ruby-core:56590] [Bug #8783]
-
-Tue Jan 21 04:31:23 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: Use "int" for IP_MULTICAST_LOOP and
-	  IP_MULTICAST_TTL on Mac OS X and Windows.
-
-Tue Jan 21 00:39:15 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: Use "byte" as default argument for
-	  IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket option to follow
-	  the original multicast implementation.
-
-Mon Jan 20 20:20:27 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: Use preprocessor macros to avoid repeated
-	  conditionals.
-
-Mon Jan 20 13:55:03 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/rubygems/version.rb: [DOC] Use gender-neutral pronouns [ci skip]
-	* lib/rubygems/security.rb: ditto
-
-Sun Jan 19 06:38:48 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* compar.c (cmp_equal): warn for this release and still rescue
-	  standard exceptions for a nicer transition. See #7688.
-	  Partly reverts r44502.
-
-	* test/ruby/test_comparable.rb: adapt assertion to match new behavior.
-
-Sun Jan 19 06:27:18 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/ruby/test_comparable.rb: specify behavior for the different
-	  kind of exceptions rescued (or not) by Comparable#==.
-
-Sat Jan 18 23:12:19 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket: Avoid unnecessary ppoll/select on Linux.
-	  Patch by Eric Wong.  [ruby-core:57950] [Bug #9039]
-
-Sat Jan 18 22:57:44 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
-	  string.
-	  Patch by Ryan Brunner.  [ruby-core:58220] [Bug #9093]
-
-Sat Jan 18 22:35:15 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_update_max_fd): Return immediately if the given fd is small
-	  enough.
-
-Sat Jan 18 22:25:53 2014  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: Test O_CLOEXEC only once.
-	  Patch by Eric Wong.  [ruby-core:59419] [Feature #9328]
-
-Sat Jan 18 21:24:49 2014  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket
-	  option takes a byte on OpenBSD.
-	  Fixed by Jeremy Evans.  [ruby-core:59496] [Bug #9350]
-
-Sat Jan 18 21:19:04 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb: Make proxy disabling working again.
-	  Fixed by Christophe Philemotte.   [ruby-core:59650] [Bug #9385]
-
-Fri Jan 17 20:05:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator): keep source information methods
-	  which start and end with '__'.  [ruby-core:59718] [Bug #9403]
-
-Fri Jan 17 17:58:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_mod_s_constants): return its own constants for other
-	  than Module itself.  [ruby-core:59763] [Bug #9413]
-
-Tue Jan 16 00:17:00 2014  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.5.
-
-Wed Jan 15 20:30:31 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* io.c (io_binwrite): use writev(2) to avoid double write if available.
-
-	* configure.in: check writev(2)
-
-Wed Jan 15 14:04:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (get_encoding): respect BOM on pseudo encodings.
-	  [ruby-dev:47895] [Bug #9415]
-
-Wed Jan 15 14:03:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (get_actual_encoding): get actual encoding according to
-	  the BOM if exists.
-
-	* string.c (rb_str_inspect): use according encoding, instead of
-	  pseudo encodings, UTF-{16,32}.  [ruby-core:59757] [Bug #8940]
-
-Tue Jan 14 21:07:22 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* ext/thread/thread.c (rb_szqueue_clear): notify SZQUEUE_WAITERS
-	  on SizedQueue#clear. [ruby-core:59462] [Bug #9342]
-
-	* test/thread/test_queue.rb: add test. the patch is from
-	  Justin Collins.
-
-Tue Jan 14 15:58:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (CLASS_NAME): macro to wrap
-	  depending on PRIsVALUE for 1.9.  [Backport #9406]
-
-	* ext/bigdecimal/bigdecimal.c (DECIMAL_SIZE_OF_BITS): fallback
-	  definition for 2.1 or older.  [ruby-core:59750] [Backport #9406]
-
-Tue Jan 14 11:28:44 2014  Yuki Yugui Sonoda  <yugui@google.com>
-
-	* vm_exec.c (cfp): Fixes a SEGV issue in r44554.
-	  r11 can be broken by subroutine and sometimes causes SEGV at
-	  runtime.  Use r13 instead.
-
-Tue Jan 14 02:20:00 2014  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Add an additional
-	  digit for the quotient to be compatible with bigdecimal 1.2.1 and
-	  the former.  [ruby-core:59365] [#9316] [#9305]
-
-	* test/bigdecimal/test_bigdecimal.rb: tests for the above change.
-
-	* ext/bigdecimal/bigdecimal.gemspec: bigdecimal version 1.2.4.
-
-Mon Jan 13 14:55:31 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/xmlrpc/client.rb: [DOC] Remove note about SSL package on RAA
-	  Since RAA has been deprecated, and the SSL package has been replaced
-	  with net/https this statement is entirely false and should be
-	  deleted. [Bug #9152]
-
-Mon Jan 13 14:47:07 2014  Zachary Scott  <e@zzak.io>
-
-	* lib/net/smtp.rb: [DOC] Remove dead link to RAA by Giorgos Tsiftsis
-	  Fixes the following bugs: [Bug #9152] [Bug #9268] [Bug #9394]
-	* lib/open-uri.rb: ditto
-
-Mon Jan 13 14:25:55 2014  Zachary Scott  <e@zzak.io>
-
-	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
-
-Mon Jan 13 12:03:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
-
-	* ext/thread/thread.c (rb_szqueue_push): check GET_SZQUEUE_WAITERS
-	  instead of GET_QUEUE_WAITERS to prevent deadlock. Patch by Eric Wong.
-	  [Bug #9302] [ruby-core:59324]
-
-	* test/thread/test_queue.rb: add test
-
-Sun Jan 12 16:41:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (iseq_load): keep type_map to get rid of memory leak.
-	  based on a patch by Eric Wong at [ruby-core:59699].  [Bug #9399]
-
-Sun Jan 12 09:21:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/util.h (DECIMAL_SIZE_OF_BITS): a preprocessor
-	  constant macro to approximate decimal representation size of n-bits
-	  integer.
-
-	* iseq.c (register_label): use DECIMAL_SIZE_OF_BITS for better
-	  approximation.
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto.
-
-	* common.mk (iseq.o), ext/bigdecimal/depend (bigdecimal.o): add
-	  dependency to ruby/util.h for DECIMAL_SIZE_OF_BITS.
-
-Fri Jan 10 16:27:20 2014  Yuki Yugui Sonoda  <yugui@google.com>
-
-	* vm_exec.c (cfp): Avoid generating invalid binary for
-	  NativeClient.
-	  r15 on x86_64 is reserved by NativeClient.  So r15 to cfp used to
-	  generate invalid binary under some combinations of compiler
-	  optimization flags.
-
-Fri Jan 10 18:01:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_search_super_method): allow bound method from a
-	  module, yet another method transplanting.
-
-Fri Jan 10 13:34:04 2014  Aman Gupta <ruby@tmm1.net>
-
-	* insns.def (opt_aref_with): new instruction to optimize Hash#[],
-	  removing any allocation overhead when used with a string literal
-	  key. Patch by normalperson (Eric Wong). [ruby-core:59640] [Bug #9382]
-	* insns.def (opt_aset_with): new instruction to optimize Hash#[]=
-	* compile.c (iseq_compile_each): compiler shortcuts for new
-	  instructions
-	* hash.c (static VALUE rb_hash_compare_by_id_p): fix documentation for
-	  Hash#compare_by_identity to reflect frozen string sharing
-	* test/ruby/test_hash.rb (class TestHash): test for new behavior
-
-Fri Jan 10 06:23:21 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* range.c (Range#size): [DOC] improve description and add examples.
-	  Patch by @skade. [Fixes GH-501]
-
-Fri Jan 10 00:47:52 2014  Josef Stribny  <strzibny@gmail.com>
-
-	* ext/tk/extconf.rb: fix to pass arrays instead of strings to
-	  libpathflag.  patch at [ruby-core:59665].  [Bug #9386]
-
-Thu Jan  9 20:49:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: -mstackrealign is necessary for -msse2 working.
-	  [ruby-core:54716] [Bug #8349]
-
-	* configure.in: use SSE2 instructions to drop unexpected precisions on
-	  other than mingw.  [ruby-core:59472] [Bug #8358]
-
-Thu Jan  9 20:31:10 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (rb_objid_hash): should return `long'.  brushup r44534.
-
-	* object.c (rb_obj_hash): follow above change.
-
-Thu Jan  9 19:12:37 2014  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_vm_pop_cfunc_frame): added.  It cares c_return event.
-	  The patch base by drkaes (Stefan Kaes).
-	  [Bug #9321]
-
-	* variable.c (rb_mod_const_missing): use rb_vm_pop_cfunc_frame()
-	  instead of rb_frame_pop().
-
-	* vm_eval.c (raise_method_missing): ditto.
-
-	* vm_eval.c (rb_iterate): ditto.
-
-	* internal.h (rb_vm_pop_cfunc_frame): add decl.
-
-	* test/ruby/test_settracefunc.rb: add tests.
-	  provided by drkaes (Stefan Kaes).
-
-	* vm.c, eval.c, include/ruby/intern.h (rb_frame_pop):
-	  move definition of rb_frame_pop() and deprecate it.
-	  It doesn't care about `return' events.
-
-Thu Jan  9 17:40:28 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (rb_any_hash): should treat the return value of rb_objid_hash()
-	  as `long', because ruby assumes the hash value of the object id of
-	  an object is `long'.
-	  this fixes test failures on mswin64 introduced at r44525.
-
-Thu Jan  9 09:55:20 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: dumping strings with
-	  quotes should not have changed.  [ruby-core:59316] [Bug #9300]
-
-	* ext/psych/lib/psych.rb: fixed missing require.
-
-	* test/psych/test_string.rb: test
-
-Thu Jan  9 09:51:00 2014  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: anonymous structs
-	  should be able to roundtrip.  Thanks @splattael!
-
-	* test/psych/test_object_references.rb: test for change
-
-Wed Jan  8 22:53:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_search_super_method): when super called in a
-	  bound UnboundMethod generated from a module, no superclass is
-	  found since the current defined class is the module, then call
-	  method_missing in that case.  [ruby-core:59619] [Bug #9377]
-
-Wed Jan  8 15:55:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_objid_hash): return hash value from object ID with a
-	  salt, extract from rb_any_hash().
-
-	* object.c (rb_obj_hash): return same value as rb_any_hash().
-	  fix r44125.  [ruby-core:59638] [Bug #9381]
-
-Wed Jan  8 13:12:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout::ExitException.catch): pass arguments
-	  for new instance.
-
-	* lib/timeout.rb (Timeout::ExitException#exception): fallback to
-	  Timeout::Error if couldn't throw.  [ruby-dev:47872] [Bug #9380]
-
-	* lib/timeout.rb (Timeout#timeout): initialize ExitException with
-	  message for the fallback case.
-
-Tue Jan  7 12:43:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout#timeout): should not rescue ordinarily
-	  raised ExitException, which should not be thrown.
-
-	* lib/timeout.rb (Timeout::ExitException.catch): set @thread only if
-	  it ought to be caught.
-
-	* lib/timeout.rb (Timeout#timeout): when a custom exception is given,
-	  no instance is needed to be caught, so defer creating new instance
-	  until it is raised.  [ruby-core:59511] [Bug #9354]
-
-Tue Jan  7 10:16:02 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems master 21e409d / RubyGems 2.2.1.
-
-	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html
-	  for a list of bug fixes.
-
-	* test/rubygems:  ditto.
-
-Tue Jan  7 10:10:46 2014  Eric Wong <e@80x24.org>
-
-	* ext/json/generator/depend: add build dependencies for json extension
-	  [Bug #9374] [ruby-core:59609]
-	* ext/json/parser/depend: ditto
-
-Tue Jan  7 04:35:46 2014  Aman Gupta <ruby@tmm1.net>
-
-	* array.c (ary_add_hash): Fix consistency issue between Array#uniq and
-	  Array#uniq! [Bug #9340] [ruby-core:59457]
-	* test/ruby/test_array.rb (class TestArray): regression test for above.
-
-Mon Jan  6 21:28:48 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* .gitignore: ignore *-fake.rb generated even when CROSS_COMPILING = no
-	  since r42862.
-
-Sun Jan  5 20:14:14 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* compar.c (cmp_equal): remove error hiding in Comparable#==.
-	  Comparable#== no longer rescues exceptions silently.
-	  This was the cause of quite a couple bugs. See #7688. [EXPERIMENTAL]
-
-	* test/ruby/test_comparable.rb: adapt assertion to match new behavior.
-
-	* lib/rdoc/method_attr.rb: fix bugs discovered by this change.
-
-	* test/rdoc/test_rdoc_normal_class.rb: fix bugs in tests.
-
-Sat Jan  4 22:44:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
-
-	* struct.c (rb_struct_set): return assigned value from setter method
-	  rather than struct object. [Bug #9353] [ruby-core:59509]
-
-	* test/ruby/test_struct.rb (test_setter_method_returns_value): add test
-
-Sat Jan  4 21:44:31 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_gc.rb (TestGc#test_latest_gc_info): use
-	  GC.stat(:key) instead of GC.stat.
-
-Sat Jan  4 19:15:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (rsock_syserr_fail_host_port): use format flags,
-	  '+' to inspect, ' ' to quote unprintables.
-
-	* ext/socket/socket.c (rsock_syserr_fail_path): ditto.
-
-	* ext/socket/socket.c (rsock_syserr_fail_raddrinfo): ditto.
-
-	* ext/socket/socket.c (rsock_syserr_fail_host_port): add errno
-	  argument version and use rb_syserr_fail_str() instead of
-	  rb_sys_fail_str() with restoring errno.
-
-	* ext/socket/socket.c (rsock_syserr_fail_path): ditto, and
-	  rb_syserr_fail().
-
-	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto, use
-	  rsock_syserr_fail_raddrinfo().
-
-	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto.
-
-	* ext/socket/socket.c (setup_domain_and_type): ditto.
-
-Sat Jan  4 17:18:58 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm.c (RubyVM::OPTS): get rid of a garbage character.
-
-Sat Jan  4 10:17:54 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
-	  ipv4_multicast_ttl option for portability.
-
-Sat Jan  4 10:15:47 2014  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
-	  ipv4_multicast_loop option for portability.  Patch by Jeremy Evans.
-	  [ruby-trunk - Bug #9351]
-
-Fri Jan  3 19:09:00 2014  Eric Wong  <normalperson@yhbt.net>
-
-	* ext/socket/socket.c (rsock_sys_fail_host_port): save and restore errno
-	  before calling rb_sys_fail_str to prevent [BUG] errno == 0.
-	  Patch by Eric Wong. [ruby-core:59498] [Bug #9352]
-
-	* ext/socket/socket.c (rsock_sys_fail_path): ditto
-	* ext/socket/socket.c (rsock_sys_fail_sockaddr): ditto
-	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): ditto
-	* ext/socket/socket.c (rsock_sys_fail_raddrinfo_or_sockaddr): ditto
-
-Fri Jan  3 10:43:57 2014  Aman Gupta <ruby@tmm1.net>
-
-	* test/net/imap/cacert.pem: generate new CA cert, since the last one
-	  expired. [Bug #9341] [ruby-core:59459]
-	* test/net/imap/server.crt: new server cert signed with updated CA.
-	* test/net/imap/Makefile: add `make regen_certs` to automate this
-	  process.
-
-Fri Jan  3 00:09:54 2014  Benoit Daloze  <eregontp@gmail.com>
-
-	* ext/bigdecimal: update class method call style from :: to .
-	  in documentation and usage.
-
-	* ext/bigdecimal/lib/bigdecimal/math.rb: [DOC] fix examples values.
-	  Computations were made using ruby 2.0.0p247 to ensure
-	  no effect of the recent BigDecimal bug.
-
-	* ext/bigdecimal/sample/nlsolve.rb: fix indent.
-
-Thu Jan  2 16:07:21 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* io.c (io_fwrite): freeze converted str.
-
-Thu Jan  2 04:15:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_longjmp): remove an extra modifier from the forward
-	  declaration to match the actual definition.  [ruby-core:59451]
-	  [Bug #9338]
-
-Thu Jan  2 01:23:30 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* vm_eval.c (method_missing): use ALLOCV_N() instead of
-	  ALLOCA_N() and rb_ary_tmp_new().
-
-Thu Jan  2 00:53:16 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* array.c (rb_ary_zip): use ALLOCV_N() instead of ALLOCA_N().
-
-Thu Jan  2 00:04:29 2014  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* hash.c (rb_hash_keys): make rb_hash_keys() static.
-	  it is no longer used from array.c since r43969.
-	  the patch is from normalperson (Eric Wong).
-	  [ruby-core:59449] [Feature #9336]
-
-	* internal.h: remove definition of rb_hash_keys().
-
-Wed Jan  1 18:19:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after
-	  LIBPATHFLAG and RPATHFLAG are set.  [ruby-dev:47868] [Bug #9317]
-
-Wed Jan  1 11:12:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: use SSE2 instructions for drop unexpected
-	  precisions.  [ruby-core:54738] [Bug #8358]
-
-Tue Dec 31 23:49:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_f_raise): add cause: optional keyword argument.
-	  [ruby-core:58610] [Feature #8257] [EXPERIMENTAL]
-
-Tue Dec 31 21:44:17 2013  Akio Tajima <artonx@yahoo.co.jp>
-
-	* win32/Makefile.sub: remove HAVE_FSEEKO because fseeko removed from win32/win32.c
-	  Fixed [Bug #9333].
-
-Tue Dec 31 21:02:27 2013  Masaki Matsushita  <glass.saga@gmail.com>
-
-	* io.c (io_fwrite): allocate frozen str only when str is not converted.
-
-Tue Dec 31 15:44:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (RbConfig): expand RUBY_SO_NAME for extensions
-	  backward compatibility.  [ruby-core:59426] [Bug #9329]
-
-Mon Dec 30 23:33:07 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* variable.c: [DOC] adding extra example in docs.
-	  patched by Steve Klabnik. [Bug #9210]
-
-Mon Dec 30 18:34:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (must_encindex, rb_enc_from_index, rb_obj_encoding): mask
-	  encoding index and ignore dummy flags.  [ruby-core:59354] [Bug #9314]
-
-Mon Dec 30 16:11:52 2013  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* tool/make-snapshot: needs CXXFLAGS.  [ruby-core:59393][Bug #9320]
-
-Sun Dec 29 18:36:54 2013  Shota Fukumori  <her@sorah.jp>
-
-	* lib/mkmf.rb (configuration): Make CXXFLAGS customizable.
-	  Patch by Kohei Suzuki (eagletmt). [Fixes GH-492]
-
-Sun Dec 29 12:11:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (mnew_from_me): keep iclass as-is, to make inheritance
-	  chain consistent.  [ruby-core:59358] [Bug #9315]
-
-	* proc.c (method_owner): return the original defined_class from
-	  prepended iclass, instead.
-
-Sun Dec 29 08:47:24 2013  Lucas Allan Amorim  <lucas.allan@gmail.com>
-
-	* test/ruby/test_sprintf.rb (test_hash): Added tests for sprintf
-	  with a hash as parameter.  [Fixes GH-491]
-
-Sun Dec 29 07:27:51 2013  Benoit Daloze  <eregontp@gmail.com>
-
-	* compar.c (cmp_eq_recursive): Fix the return value, the value for
-	  failed #<=> should be nil. It was raising a NoMethodError for
-	  the test case TestComparable#test_no_cmp (undefined method `>'
-	  for false:FalseClass). Yet one more reason for #7688.
-
-Sat Dec 28 22:21:59 2013  Benoit Daloze  <eregontp@gmail.com>
-
-	* object.c (Kernel#<=>) surround Comparable operators with <code> tags.
-	  The #== method was hidden in ri/rdoc's output and was highlighting
-	  the line instead.
-
-Sat Dec 28 17:24:00 2013  DV Suresh  <e@dvsuresh.me>
-
-	* benchmark/bm_so_meteor_contest.rb: [DOC] Fix a few typos
-	* ext/fiddle/lib/fiddle/import.rb: ditto
-	* ext/psych/lib/psych.rb: ditto
-	* ext/psych/lib/psych/nodes/sequence.rb: ditto
-	* ext/tk/lib/multi-tk.rb: ditto
-	* ext/tk/lib/tcltk.rb: ditto
-
-Sat Dec 28 00:42:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (local_push_gen, local_pop_gen): save cmdarg_stack to
-	  isolate command argument state from outer scope.
-	  [ruby-core:59342] [Bug #9308]
-
-Fri Dec 27 13:25:03 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{setup.mak,Makefile.sub}: update fake.rb like
-	  template/fake.rb.in.
-
-Thu Dec 26 16:10:41 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (fake.rb): should depend on version.h because
-	  if RUBY_VERSION is updated, fake.rb need to say the new version
-	  to avoid install error in rbconfig.rb.
-
-Thu Dec 26 14:25:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (HASH_REJECT_COPY_EXTRA_STATES): turn off the old
-	  behavior, copying extra states by accident.
-
-Thu Dec 26 10:49:14 2013  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* version.h (RUBY_VERSION): 2.2.0 development has started.
-
-Thu Dec 26 10:27:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0
-	  explicit tagging.
-
-Thu Dec 26 06:35:25 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* proc.c: Having any mandatory keyword argument increases min arity
-	  [#9299]
-
-Thu Dec 26 06:27:08 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* proc.c: Having optional keyword arguments makes maximum arity +1,
-	  not unlimited [#8072]
-
-Thu Dec 26 01:09:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/release.sh: make symbolic links.
-
-Thu Dec 26 00:45:33 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/make-snapshot: support new version scheme.
-
-Wed Dec 25 22:44:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_set_arguments): set arg_keyword_check from
-	  nd_cflag, which is set by parser.  internal ID is used for
-	  unnamed keyword rest argument, which should be separated from no
-	  keyword check.
-
-	* iseq.c (rb_iseq_parameters): if no keyword check, keyword rest is
-	  present.
-
-	* parse.y (new_args_tail_gen): set keywords check to nd_cflag, which
-	  equals to that keyword rest is not present.
-
-Wed Dec 25 22:32:19 2013  Zachary Scott  <e@zzak.io>
-
-	* lib/abbrev.rb: [DOC] rdoc format patch by Giorgos Tsiftsis [Bug #9146]
-
-Wed Dec 25 20:30:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_parameters): push argument type symbol only for
-	  unnamed rest keywords argument.
-
-Wed Dec 25 20:28:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_iseq_min_max_arity): maximum argument is unlimited if
-	  having rest keywords argument.  [ruby-core:53298] [Bug #8072]
-
-Wed Dec 25 18:29:22 2013  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (argument_error): insert dummy frame to make
-	  a backtrace object intead of modify backtrace string array.
-	  [Bug #9295]
-
-	* test/ruby/test_backtrace.rb: add a test for this patch.
-	  fix test to compare a result of Exception#backtrace with
-	  a result of Exception#backtrace_locations.
-
-Wed Dec 25 13:00:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: let mingw do something black-magic, and check if
-	  _gmtime64_s() is available actually.
-
-	* win32/win32.c (gmtime_s, localtime_s): use _gmtime64_s() and
-	  _localtime64_s() if available, not depending on very confusing
-	  mingw variants macros.  based on the patch by phasis68 (Heesob
-	  Park) at [ruby-core:58764].  [ruby-core:58391] [Bug #9119]
-
-Wed Dec 25 12:33:41 2013  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* sample/trick2013/: added the award-winning entries of TRICK 2013.
-	  See https://github.com/tric/trick2013 for the contest outline.
-	  (Matz has approved the attachment.)
-
-Wed Dec 25 10:42:02 2013  Yamashita Yuu  <yamashita@geishatokyo.com>
-
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Declare a constant
-	  `OP_MSIE_SSLV2_RSA_PADDING` only if the macro is defined.  The
-	  `SSL_OP_MSIE_SSLV2_RSA_PADDING` has been removed from latest
-	  snapshot of OpenSSL 1.0.1.  [Fixes GH-488]
-
-Wed Dec 25 01:03:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (bind_local_variables): allowing binding to list its
-	  local variables.  patch by Jack Danger Canty <jackdanger AT
-	  squareup.com> at [ruby-core:56543].  [Feature #8773]
-
-Tue Dec 24 23:20:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/fileutils/fileasserts.rb (assert_ownership_user): new
-	  assertion for user ownership.
-
-	* test/fileutils/test_fileutils.rb (test_chown_error),
-	  (test_chown_without_permission, test_chown_with_root):
-	  based on the patch by vajrasky (Vajrasky Kok) at
-	  [ruby-core:59298].  [Feature #9292]
-
-Tue Dec 24 16:28:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_mod_define_method): consider visibility only if self
-	  in the caller is same as the receiver, otherwise make public as
-	  well as old behavior.  [ruby-core:57747] [Bug #9005]
-	  [ruby-core:58497] [Bug #9141]
-
-	* vm.c (rb_vm_cref_in_context): return ruby level cref if self is
-	  same.
-
-Tue Dec 24 14:13:14 2013  Koichi Sasada  <ko1@atdot.net>
-
-	* README.EXT: add a refer to URL.
-
-Tue Dec 24 13:48:45 2013  Koichi Sasada  <ko1@atdot.net>
-
-	* README.EXT: add a document about RGenGC.
-	  Reviewed by havenwood.
-	  [misc #8962]
-
-	* README.EXT.ja: ditto.
-
-Tue Dec 24 12:11:43 2013  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h (RARRAY_ASET): try to avoid compiler warning.
-	  [Bug #9287]
-
-Tue Dec 24 05:04:56 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/fileutils/test_fileutils.rb (setup): should not call
-	  Process.groups for Windows.  get rid of many errors introduced by
-	  r44364.
-
-Mon Dec 23 18:37:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/fileutils/fileasserts.rb (assert_ownership_group): new
-	  assertion for group ownership.
-
-	* test/fileutils/test_fileutils.rb (test_chown{,_verbose,_noop}):
-	  based on the patch by vajrasky (Vajrasky Kok) at
-	  [ruby-core:59281].  [Feature #9286]
-
-Mon Dec 23 15:53:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (HAS_EXTRA_STATES): warn extra states only when something
-	  differ.  [ruby-core:59254] [Bug #9275]
-
-Mon Dec 23 12:42:13 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* array.c: Have to_h raise on elements that are not key-value pairs
-	  [#9239]
-
-	* enum.c: ditto
-
-Mon Dec 23 05:01:55 2013  Zachary Scott  <e@zzak.io>
-
-	* doc/syntax/methods.rdoc: [DOC] Added example for underscore
-	  conventions in method names. Also added doc to clarify encoding
-	  character set support for Ruby programs and elaborated on defining
-	  predicate and bang methods. Based on a patch by @gaurish
-	  [Fixes GH-477] https://github.com/ruby/ruby/pull/477
-
-Mon Dec 23 03:18:09 2013  Zachary Scott  <e@zzak.io>
-
-	* doc/ChangeLog-1.9.3: [DOC] Fix typos by @dvsuresh
-	  [Fixes GH-485] https://github.com/ruby/ruby/pull/485
-	* ext/openssl/ossl_config.c: ditto
-	* lib/rss/utils.rb, lib/time.rb: ditto
-	* test/ruby/envutil.rb: ditto
-
-Sun Dec 22 23:56:56 2013  Zachary Scott  <e@zzak.io>
-
-	* lib/{rake,rdoc,rss}/*, test/rexml/test_listener.rb: [DOC] Fix typos
-	  by @dvsuresh [Fixes GH-486] https://github.com/ruby/ruby/pull/486
-
-Sun Dec 22 11:08:47 2013  Eric Hodel  <drbrain@segment7.net>
-
-	* test/rubygems/test_gem_ext_builder.rb:  Fix warning due to ambiguous
-	  expression.
-
-Sun Dec 22 11:05:53 2013  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/install_command.rb:  Restore gem install
-	  --ignore-dependencies for remote gems
-	* test/rubygems/test_gem_commands_install_command.rb:  Test for the
-	  above.
-
-Sun Dec 22 10:23:40 2013  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc.rb:  Set RDoc to release version.
-
-Sun Dec 22 10:19:07 2013  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb:  Set RubyGems to release version.
-
-Sun Dec 22 10:16:08 2013  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems.rb (module Gem):  Fix comment for
-	  Gem::load_path_insert_index.
-
-Sun Dec 22 04:07:55 2013  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (ruby_gc_set_params): don't show obsolete warnings for
-	  RUBY_FREE_MIN/RUBY_HEAP_MIN_SLOTS if
-	  RUBY_GC_HEAP_FREE_SLOTS/RUBY_GC_HEAP_INIT_SLOTS are given.
-	  [Bug #9276]
-
-Sat Dec 21 13:00:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c: remove unnecessary the source path from EEXIST error
-	  messages and show the destination path only.  [ruby-core:59202]
-	  [Feature #9263]
-
-Sat Dec 21 12:37:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
-	  consider encodings in hosts file.  [ruby-core:59239] [Bug #9273]
-
-	* lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.
-
-Sat Dec 21 05:43:27 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/make-snapshot: replace RUBY_PATCHLEVEL_STR in version.h to
-	  show users that this ruby is a preview/rc version.
-
-Sat Dec 21 05:03:49 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (fake.rb): fixed wrong RUBY_PLATFORM, to correctly
-	  install win32.h.
-	  [ruby-core:58801][Bug #9199] reported by arton.
-
-For the changes before 2.1.0, see doc/ChangeLog-2.1.0
-For the changes before 2.0.0, see doc/ChangeLog-2.0.0
-For the changes before 1.9.3, see doc/ChangeLog-1.9.3
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
-
-Local variables:
-coding: us-ascii
-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))))
-  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-change-log-indent-text: 2
-end:
-vim: tabstop=8 shiftwidth=2
diff --git a/doc/ChangeLog-2.3.0 b/doc/ChangeLog-2.3.0
deleted file mode 100644
index 7f3c4e672a..0000000000
--- a/doc/ChangeLog-2.3.0
+++ /dev/null
@@ -1,12187 +0,0 @@
-Thu Dec 24 23:01:57 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: added entry for CGI.escapeHTML optimization.
-
-Thu Dec 24 18:43:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_compile_error_with_enc, rb_compile_error),
-	  (rb_compile_bug): deprecate internal functions.
-
-	* parse.y (parser_yyerror): construct exception message with
-	  source code and caret.
-
-Thu Dec 24 17:25:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (append_compile_error), parse.y (compile_error):
-	  preserve encoding of source file name in exceptions.
-
-	* error.c (rb_compile_error_str, rb_compile_bug_str): add.
-
-Thu Dec 24 16:17:47 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (fake.rb): $(arch)-fake.rb must depend on miniruby because
-	  it may depend on miniruby.
-
-Thu Dec 24 16:13:05 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (ripper.c): r50045 wrongly replace $(PWD) with ../..
-	  It is the top of build directory, not topsrcdir.
-
-Thu Dec 24 15:02:42 2015  sorah (Shota Fukumori)  <her@sorah.jp>
-
-	* tool/vcs.rb (IO.popen): Refactor. Avoid assigning in condition.
-
-Thu Dec 24 15:01:38 2015  sorah (Shota Fukumori)  <her@sorah.jp>
-
-	* tool/file2lastrev.rb: Fix ArgumentError to work on Ruby 1.8.7.
-
-Thu Dec 24 14:44:08 2015  sorah (Shota Fukumori)  <her@sorah.jp>
-
-	* tool/vcs.rb (IO.popen): Enable on Ruby 1.9 where chdir option is not
-	  supported on IO.popen
-
-	* tool/vcs.rb (IO.popen): Fix NoMethodError. I guess r49705 was not
-	  tested... :/
-
-Thu Dec 24 14:57:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* NEWS: rename
-	  "Implementation changes" section to
-	  "Supported platform changes" section.
-
-	* NEWS: add "Implementation improvements" and add several entries.
-
-	* NEWS: add NEWS entries by Eric Wong. [ruby-core:72450]
-
-Thu Dec 24 00:26:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/extconf.rb: fix gem build failure on Windows.
-	  only win32_vk.inc is included in the gem and no dependencies for
-	  the header, so that gperf will not be mandatory.
-	  [ruby-core:72453] [Bug #11866]
-
-	* ext/io/console/io-console.gemspec: include depend file and
-	  win32_vk header.
-
-Wed Dec 23 23:58:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_readwrite_syserr_fail): works with the given errno than
-	  thread local errno.
-
-Wed Dec 23 17:57:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c, io.c, util.c: prefer rb_syserr_fail with saved errno
-	  over setting errno then call rb_sys_fail, not to be clobbered
-	  potentially and to reduce thread local errno accesses.
-
-Wed Dec 23 11:58:52 2015  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* string.c: Fix document. Default value of the first
-	  argument of `String#split` is not `$;` but `nil`.
-	  When `nil` is passed as first argument, `$;` is used.
-	  [ci skip] [Bug #11729] [ruby-dev:49378]
-
-Wed Dec 23 07:15:17 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_init_sock): reject reserved FDs
-	  [ruby-core:72445] [Bug #11862]
-
-Wed Dec 23 02:59:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (__STDC_WANT_LIB_EXT1__): necessary to use memset_s
-	  in strict C99 mode.
-
-Wed Dec 23 02:34:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regexec.c (match_at): move direct threaded VM code to get rid of
-	  mixed declarations and code, and enable it only for gcc since it
-	  depends on a gcc extension.
-
-Wed Dec 23 02:23:19 2015  Yuki Nishijima  <mail@yukinishijima.net>
-
-	* gems/bundled_gems: Upgrade the did_you_mean gem to 1.0.0
-
-	* NEWS: Add news about the did_you_mean gem
-
-Wed Dec 23 02:18:57 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* doc/contributing.rdoc: [DOC] remove an extra word "here".
-	  [Fix GH-1169]
-
-Wed Dec 23 01:58:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regexec.c (USE_DIRECT_THREADED_VM): enable direct threaded VM by
-	  the default.
-
-Tue Dec 22 22:15:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (internal_object_p): should not expose singleton classes
-	  without a metaclass.  based on patches by ko1 and shugo.
-	  [Bug #11740]
-
-	* class.c (rb_singleton_class_object_p): added.
-
-Tue Dec 22 22:15:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/io-console.gemspec: bump up to 0.4.4.
-
-Tue Dec 22 22:11:06 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: Added news entry of Psych 2.0.17
-
-Tue Dec 22 22:09:01 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: Added news entry of RDoc 4.2.1
-
-Tue Dec 22 21:20:00 2015  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.gemspec: bump version to 1.2.8.
-
-Tue Dec 22 21:08:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc.rb: bump version to 4.2.1. It contains following fixes.
-	  https://github.com/rdoc/rdoc/pull/340
-	  https://github.com/rdoc/rdoc/pull/341
-	  https://github.com/rdoc/rdoc/pull/367
-	  https://github.com/rdoc/rdoc/pull/368
-	* lib/rdoc/*: ditto.
-	* test/rdoc/*: ditto.
-
-Tue Dec 22 20:25:33 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/lib/psych.rb: bump version to 2.0.17
-	* ext/psych/psych.gemspec: ditto.
-
-Tue Dec 22 20:14:47 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c: move vm_callee_setup_block_arg() (and related
-	  functions) to the latter location.
-	  This moving recovers performance a little.
-	  [Bug #11829]
-
-Tue Dec 22 15:21:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_compat_and_valid): as scrub does nothing for dummy
-	  encoding string now, incompatible encoding is not a matter.
-
-Tue Dec 22 14:31:28 2015  Toru Iwase  <tietew@tietew.net>
-
-	* ext/cgi/escape/escape.c (optimized_escape_html): CGI.escapeHTML
-	  should return unfrozen new string.
-	  [ruby-core:72426] [Bug #11858]
-
-Tue Dec 22 05:39:58 2015  Takashi Kokubun  <takashikkbn@gmail.com>
-
-	* ext/cgi/escape/escape.c (preserve_original_state): Preserve
-	  original state for tainted and frozen.  [Fix GH-1166]
-	  [ruby-dev:49451] [Bug #11855]
-
-Tue Dec 22 03:57:20 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_init_sock): check FD after validating
-	* test/socket/test_basicsocket.rb (test_for_fd): new
-	  [ruby-core:72418] [Bug #11854]
-
-Mon Dec 21 21:29:45 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* variable.c (struct ivar_update): rename "extended" to "iv_extended"
-	  to avoid name conflict with /usr/include/floatingpoint.h on
-	  Solaris. [Bug #11853] [ruby-dev:49448]
-
-Mon Dec 21 12:15:32 2015  Kimura Wataru  <kimuraw@i.nifty.jp>
-
-	* test/ruby/test_io.rb: handled rlimit value same as r52277
-	  [Bug #11852][ruby-dev:49446]
-
-Mon Dec 21 10:21:22 2015  Ilya Vassilevsky <vassilevsky@gmail.com>
-
-	* lib/net/http.rb (open_timeout): update default value in RDoc
-	  [ruby-core:72413]
-
-Mon Dec 21 10:18:46 2015  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* vm_backtrace.c (rb_profile_frames): ignore ifunc frames as it
-	  did before.  [ruby-core:72409] [Bug #11851]
-
-Mon Dec 21 09:33:17 2015  Karol Bucek  <kares@users.noreply.github.com>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket): fix
-	  NotImplementedError typo.  [Fix GH-1165]
-
-Sun Dec 20 20:54:51 2015  Takashi Kokubun  <takashikkbn@gmail.com>
-
-	* cgi/escape/escape.c: Optimize CGI.escapeHTML for
-	  ASCII-compatible encodings.  [Fix GH-1164]
-
-Sun Dec 20 15:36:46 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/erb.rb: revert r53123. It breaks compatibility like thor and
-	  rspec-rails.
-	  We should try with Ruby 2.4 or 3.0.
-	  [Bug #11842][ruby-core:72374]
-	* lib/rdoc/erb_partial.rb: ditto.
-	* template/verconf.h.tmpl: ditto.
-
-Sun Dec 20 11:43:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): allow here documents in labeled
-	  argument.  [ruby-core:72396] [Bug #11849]
-
-Sun Dec 20 11:14:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (rb_mod_define_method): should check Symbol or not.
-	  [Bug #11850]
-
-	* test/ruby/test_method.rb: add a test.
-
-Sun Dec 20 11:01:57 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (rb_mod_define_method): fix notation.
-
-Sun Dec 20 10:54:15 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (proc_new): fix notation.
-
-Sun Dec 20 00:29:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_proc_get_iseq): proc made from symbol does not have
-	  iseq.  fix infinite loop.  [ruby-core:72381] [Bug #11845]
-
-Sat Dec 19 20:06:10 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* enc/windows_1250.c: Should not use C++ style comments (C99 feature).
-	  [Bug #11843]
-
-Sat Dec 19 17:17:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
-	  use WEBrick::Utils::TimeoutHandler::Thread, which is ignored by
-	  LeakChecker#find_threads, instead of ::Thread to get rid of
-	  thread leak checker.  since this TimeoutHandler is resident
-	  during tests because of Singleton, it waits for the next timeout
-	  if it has any schedules.  in the case of nested timeouts, inner
-	  timeout does not cancel outer timeouts and then those schedules
-	  still remain.
-
-Sat Dec 19 14:28:01 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* ext/zlib/zlib.c (Init_zlib): [DOC] Fix double-word typo and
-	  grammatical error.  [Fix GH-1162]
-
-Sat Dec 19 14:23:59 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* lib/csv.rb (CSV#initialize): [DOC] Fix double-word typo.
-	  [Fix GH-1161]
-
-Sat Dec 19 10:33:33 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_2.c, enc/windows_1250.c: separate Windows-1250
-	  from ISO-8859-2 to fix 0x80..0x9e range (from Kimihito Matsui)
-
-Fri Dec 18 21:26:54 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): To prevent
-	  potential deadlocks, Queue is used to tell update of @timeout_info
-	  instead of sleep and wakeup. [Bug #11742] [ruby-dev:49387]
-
-Fri Dec 18 17:24:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (ibf_load_object_string): use fstring if frozen string.
-
-Fri Dec 18 16:54:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_set_encoding): add StringIO's own
-	  encoding and separate it from the buffer string to override the
-	  encoding of string when reading.  [ruby-core:72189] [Bug #11827]
-	  note that setting the encoding of its buffer string directly
-	  without StringIO#set_encoding may cause unpredictable behavior.
-
-Fri Dec 18 16:50:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (ibf_load_setup): check tainted string argument.
-
-Fri Dec 18 16:12:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: define USE_LAZY_LOAD if it is not defined.
-
-Fri Dec 18 15:40:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_unget_bytes): extract from
-	  strio_ungetbyte to share with strio_ungetc.
-
-Fri Dec 18 12:39:42 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/syntax/*.rdoc: separated modifier at sentence.
-	  [ci skip][fix GH-1121] Patch by @clandry94
-
-Fri Dec 18 12:09:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_ungetbyte): pad with \000 when
-	  the current position is after the end.
-
-Fri Dec 18 11:24:48 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_method.c (rb_method_entry_make, check_override_opt_method):
-	  should check whether a newly created method overrides an optimize
-	  method in case the method is defined in a prepended module of a
-	  built-in class.
-	  [ruby-core:72226] [Bug #11836]
-
-Fri Dec 18 11:09:38 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c (vm_exec): call RUBY_DTRACE_CMETHOD_RETURN_HOOK instead of
-	  RUBY_DTRACE_METHOD_RETURN_HOOK.
-
-Fri Dec 18 10:24:44 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb: fixed parse error for striped heredocument syntax.
-	  [fix GH-1127] Patch by @koic
-
-Fri Dec 18 09:44:47 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/pty/pty.c: fix double words typo.
-	  [ci skip][fix GH-1157] Patch by @jwworth
-
-Fri Dec 18 09:42:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/utf8tbl.c: fix a typo.
-	  [ci skip][fix GH-1159] Patch by @akshay-vishnoi
-	* ext/nkf/nkf-utf8/utf8tbl.h: ditto.
-
-Fri Dec 18 07:39:01 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm.c (rb_vm_check_redefinition_opt_method): should check the real
-	  class instead of the origin iclass.
-	  [ruby-core:72188] [Bug #11826]
-
-Thu Dec 17 22:13:10 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_args.c (vm_caller_setup_arg_block): remove code for ifunc
-	  because it was made unnecessary by r52138.
-
-Thu Dec 17 16:13:10 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* proc.c (rb_block_arity): should not call GetProcPtr() for symbols.
-	  [ruby-core:72205] [Bug #11830]
-
-Thu Dec 17 14:16:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_scrub): the result should be infected by the
-	  original string.
-
-Thu Dec 17 13:35:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (rb_econv_substr_append, econv_primitive_convert):
-	  the result should be infected by the original string.
-
-Thu Dec 17 09:46:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (reg_names_iter): should consider encoding of regexp.
-	  [ruby-core:72185] [Bug #11825]
-
-Thu Dec 17 03:52:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_make_env_each): should not compare with Qfalse and FALSE.
-	  Pointed at http://d.hatena.ne.jp/nagachika/20151216/ruby_trunk_changes_53128_53163
-
-Thu Dec 17 03:15:25 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_call_method_each_type): should not set fastpath
-	  with keyword arguments for VM_METHOD_TYPE_ATTRSET type methods.
-
-	  Normally, we can not use keyword arguments for this kind of methods,
-	  (obj.foo = 1), but we can set alias names for them.
-	  [Bug #11657]
-
-	* test/ruby/test_keyword.rb: add a test for this fix.
-
-Wed Dec 16 20:32:43 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/fiddle/handle.c: check tainted string arguments.
-	  Patch provided by tenderlove and nobu.
-
-	* test/fiddle/test_handle.rb (class TestHandle): add test for above.
-
-
-Wed Dec 16 19:30:56 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm.c (vm_make_proc_from_block): should convert a Symbol to a Proc.
-	  [ruby-core:72083] [Bug #11811]
-
-Wed Dec 16 16:17:34 2015  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_io.rb: fix spelling errors
-
-Wed Dec 16 16:04:49 2015  Eric Wong  <e@80x24.org>
-
-	* NEWS: note IO#advise change [ruby-core:72168]
-
-Wed Dec 16 15:35:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: fix mark miss for proc given as passed block.
-	  [Bug #11750]
-
-	* vm.c (vm_make_proc_from_block): should return a Proc object
-	  if block is given. Previous implementation returns
-	  a Proc object only when corresponding Proc object is not
-	  available.
-
-	* vm.c (vm_make_env_each): ditto.
-
-	* test/ruby/test_proc.rb: add a test for this bug.
-
-Wed Dec 16 12:24:59 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* test_struct.rb: Test that initialize is overridable [#11708]
-
-Wed Dec 16 10:49:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (block_command, block_call): fix `&.` calls after
-	  block_call.  [Feature #11537]
-
-Wed Dec 16 00:53:45 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): Acquire
-	  TimeoutMutex only when accessing @timeout_info for avoiding
-	  potential deadlock. [Bug #11742] [ruby-dev:49387]
-
-Wed Dec 16 00:39:27 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* doc/extension.rdoc: [DOC] fix double-word typo.  [Fix GH-1153]
-
-Wed Dec 16 00:25:41 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
-	  TimeoutMutex should be acquired when accessing @timeout_info.
-	  To avoid deadlock, interrupt() calls are delayed.
-	  Due to the mutex, it is safe to treat ary without ary.dup.
-	  [Bug #11742] [ruby-dev:49387]
-
-Tue Dec 15 23:13:10 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* gc.c: Delete excess semicolon after RUBY_ALIAS_FUNCTION().
-	  Suppress "syntax error:  empty declaration" warnings by
-	  Oracle Solaris Studio 12.x on Solaris. [Bug #11821]
-
-	* hash.c: ditto, after NOINSERT_UPDATE_CALLBACK().
-
-Tue Dec 15 18:04:04 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* NEWS: added news about EBCDIC encoding
-
-Tue Dec 15 17:57:57 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/ebcdic.h, enc/trans/ebcdic.trans,
-	  test/ruby/test_transcode.rb: Fixed encoding name
-	  to the correct one in the IANA registry (IBM037)
-	  and added an alias (ebcdic-cp-us)
-
-Tue Dec 15 16:19:26 2015  Takashi Kokubun  <takashikkbn@gmail.com>
-
-	* lib/erb.rb: Render erb with array buffer for function call optimization.
-	  [fix GH-1143]
-	* lib/rdoc/erb_partial.rb: ditto.
-	* template/verconf.h.tmpl: ditto.
-
-Tue Dec 15 13:50:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_oct): [DOC] mention radix indicators.
-	  [ruby-core:71310] [Bug #11648]
-
-Tue Dec 15 12:20:30 2015  Takashi Kokubun  <takashikkbn@gmail.com>
-
-	* lib/erb.rb: Simplify regexp to optimize erb scanner.
-	  [fix GH-1144]
-
-Tue Dec 15 11:56:24 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/uri/common.rb: make code block for rdoc.
-	  [ci skip][fix GH-1152] Patch by @Tonkpils
-
-Tue Dec 15 11:55:08 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/zlib/zlib.c: fix a typo.
-	  [ci skip][fix GH-1149] Patch by @crismali
-
-Tue Dec 15 09:14:14 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* tool/transcode_tablegen.rb: detailed documentation
-	  for transcode_tblgen function [ci skip]
-
-Mon Dec 14 22:11:11 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/ebcdic.h: new dummy encoding EBCDIC-US
-	* enc/trans/ebcdic.trans: transcodings between EBCDIC-US
-	  and iso-8859-1 [with code from Andrea Ribuoli]
-	* test/ruby/test_transcode.rb: tests for above
-	* tool/transcode_tablegen.rb: additional argument for
-	  method transcode_tblgen
-
-Mon Dec 14 17:04:14 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/socket/lib/socket.rb: use safe navigation operator.
-	  [fix GH-1142] Patch by @mlarraz
-	* lib/drb/extservm.rb: ditto.
-	* lib/net/http.rb: ditto.
-	* lib/net/http/response.rb: ditto.
-	* lib/scanf.rb: ditto.
-	* lib/uri/generic.rb: ditto.
-
-Mon Dec 14 17:03:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* bootstraptest/runner.rb: use safe navigation operator.
-	  [fix GH-1142] Patch by @mlarraz
-	* test/openssl/test_pair.rb: ditto.
-	* test/ruby/test_econv.rb: ditto.
-	* test/ruby/test_settracefunc.rb: ditto.
-	* test/thread/test_queue.rb: ditto.
-
-Mon Dec 14 14:33:35 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/xmlrpc.rb: added documentation for parser details.
-	  [ci skip][fix GH-1124] Patch by @jrafanie
-
-Mon Dec 14 11:46:52 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enum.c: fix a typo in documentation.
-	  [ci skip][fix GH-1140] Patch by @jutaz
-	* io.c: ditto.
-	* iseq.c: ditto.
-	* numeric.c: ditto.
-	* process.c: ditto.
-	* string.c: ditto.
-	* vm_trace.c: ditto.
-
-Mon Dec 14 11:41:59 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/cgi.rb: fix a typo in documentation.
-	  [ci skip][fix GH-1140] Patch by @jutaz
-
-Mon Dec 14 11:31:00 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* compile.c: fix typos.
-	  [ci skip][fix GH-1140] Patch by @jutaz
-	* dir.c: ditto.
-	* gc.c: ditto.
-	* io.c: ditto.
-	* node.h: ditto.
-	* thread_pthread.c: ditto.
-	* vm_insnhelper.c: ditto.
-	* vsnprintf.c: ditto.
-
-Mon Dec 14 11:27:01 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enc/iso_2022_jp.h: fix typos.
-	  [ci skip][fix GH-1140] Patch by @jutaz
-	* enc/utf_16_32.h: ditto.
-	* enc/utf_7.h: ditto.
-
-Mon Dec 14 11:25:57 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* benchmark/bm_app_aobench.rb: fix typos.
-	  [ci skip][fix GH-1140] Patch by @jutaz
-	* benchmark/bm_vm_thread_pipe.rb: ditto.
-
-Sun Dec 13 23:46:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (trace_lex_state): trace lex_state changes if yydebug is
-	  set, and send the messages to rb_stdout.
-
-	* parse.y (rb_parser_printf): store YYPRINTF messages per lines
-	  so that lex_state traces do not mix.
-
-	* tool/ytab.sed: add parser argument to yy_stack_print too.
-
-Sun Dec 13 20:41:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (build_lex_state_name, trace_lex_state): lex_state is
-	  now bit flags and can be set 2 bits or more.
-
-Sun Dec 13 20:26:30 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* test/ruby/test_syntax.rb: fix typo in test
-
-Sun Dec 13 20:12:14 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* parse.y (parse_percent): Allow %-literals in labeled arg as
-	  r51624 did for parentheses.
-	  Fixes [ruby-core:72084] [Bug #11812].
-
-Sun Dec 13 20:02:15 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: fix a typo
-
-Sun Dec 13 19:54:26 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/lib/envutil.rb: move envutil's assertions under Test::Unit::Assertion.
-	* test/lib/test/unit/assertions.rb: ditto.
-
-Sun Dec 13 19:24:20 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* parse.y (lex_state_name): Make it return the correct names.
-	  Add new names to follow r51617; Indices ffs(2) returns are 1-origin.
-
-Sun Dec 13 18:40:45 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* parse.y: debug output of lex_state transition if PARSER_DEBUG
-
-Sun Dec 13 18:49:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (parse_mode_enc): preserve encoding of mode string in
-	  warnings.
-
-	* io.c (io_encname_bom_p): check BOM prefix only, not including
-	  UTF prefix.
-
-	* io.c (parse_mode_enc): warn BOM with non-UTF encoding.
-
-	* io.c (parse_mode_enc): fix buffer overflow.
-
-Sun Dec 13 18:35:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/function.c (initialize): check all arguments first.
-	  reported by Marcin 'Icewall' Noga of Cisco Talos.
-
-	* ext/fiddle/conversions.h (PTR2NUM): use signed integer to make
-	  Fixnum for negative values.
-
-Sun Dec 13 18:33:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (pack_pack): always check index range against the
-	  receiver array length, which can be shortened by elements
-	  conversion.  reported by Marcin 'Icewall' Noga of Cisco Talos.
-
-Sun Dec 13 18:28:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/psych/psych_emitter.c (start_document): should not exceed
-	  tags array range.
-
-	* ext/psych/psych_emitter.c (start_document): ensure string before
-	  encoding conversion.
-
-Sun Dec 13 18:26:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tkutil/tkutil.c (tk_hash_kv): check types of array
-	  argument.  reported by Marcin 'Icewall' Noga of Cisco Talos.
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): check length of
-	  argument arrays for each access, as callback methods can modify
-	  them.  reported by Marcin 'Icewall' Noga of Cisco Talos.
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): check types of
-	  argument elements.  reported by Marcin 'Icewall' Noga of Cisco
-	  Talos.
-
-Sun Dec 13 18:19:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c (ole_vstr2wc): check argument type, vstr
-	  must be a String here.  reported by Marcin 'Icewall' Noga of
-	  Cisco Talos.
-
-Sun Dec 13 16:41:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (BOOTSTRAPRUBY): make BASERUBY full path before
-	  building ruby to get rid of unexpectedly invoking built ruby.
-	  [ruby-core:72065] [Bug #11807]
-
-	* configure.in (BOOTSTRAPRUBY): use MINIRUBY but not BASERUBY
-	  unless cross compiling.  [ruby-core:72065] [Bug #11807]
-
-Sun Dec 13 14:17:19 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* test/test_shellwords.rb (TestShellwords): Add many more tests
-	  for handling whitespace characters and frozenness.
-
-Sun Dec 13 14:16:09 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb (Shellwords#shellsplit): Document that this
-	  method does not treat shell metacharacters as such.
-
-Sun Dec 13 12:17:43 2015  Eric Wong  <e@80x24.org>
-
-	* lib/shellwords.rb (shellescape): duplicate frozen literal
-	* test/test_shellwords.rb (test_stringification): new test
-
-Sun Dec 13 11:47:35 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* object.c (rb_inspect): check the default internal encoding as
-	  String#inspect do.
-	  [ruby-dev:49415] [Bug #11787]
-
-Sun Dec 13 11:38:12 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb: Turn on frozen-string-literal after fixing
-	  shellsplit.
-
-Sun Dec 13 10:44:44 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* KNOWNBUGS.rb: Fixed typo, made more explicit [ci skip]
-
-Sun Dec 13 10:26:47 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): fix parsing
-	  protocol list.
-	  The protocol list from OpenSSL is not null-terminated.
-	  patched by Kazuki Yamaguchi [Bug #11810] [ruby-core:72082]
-
-Sun Dec 13 06:40:30 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb: Have OpenStruct#dig raise if argument is not a
-	  symbol
-	  nor a string. See [#11762]
-
-Sun Dec 13 00:05:42 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method_missing): method_missing should
-	  not be refined.
-	  [ruby-core:72080] [Bug #11809]
-
-Sat Dec 12 23:00:17 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: Merge nkf 2.1.4.
-
-Sat Dec 12 18:52:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_obj_dig): raise TypeError if an element does not
-	  have #dig method.  [ruby-core:71798] [Bug #11762]
-
-Sat Dec 12 17:59:07 2015  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* test/ruby/test_regexp.rb: Add test cases for `$KCODE` and `$=` warning
-	  [Misc #11770][ruby-dev:49398]
-
-Sat Dec 12 17:11:57 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* doc/NEWS-0.2.2: add description about incompatible change in Hash
-	  duplicated key overriding policy. [Bug #10315] [Bug #11501]
-
-Sat Dec 12 07:44:38 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (do_io_advise): do not raise on ENOSYS
-	* test/ruby/test_io.rb (test_advise): do not skip on Errno::ENOSYS
-	  (test_advise_pipe): ditto
-	  [ruby-core:72066] [Feature #11806]
-
-Sat Dec 12 07:05:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/windows_1252.c: separate from ISO-8859-1 to fix 0x80..0x9e
-	  range.  [ruby-core:64049] [Bug #10097]
-
-Fri Dec 11 23:33:40 2015  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* sample/trick2015/: added the award-winning entries of TRICK 2015.
-	  See https://github.com/tric/trick2015 for the contest outline.
-
-Fri Dec 11 17:59:05 2015  Eric Wong  <e@80x24.org>
-
-	* insns.def (opt_case_dispatch): avoid converting Infinity
-	* test/ruby/test_optimization.rb (test_opt_case_dispatch_inf): new
-	  [ruby-dev:49423] [Bug #11804]'
-
-Fri Dec 11 16:48:57 2015  Eric Wong  <e@80x24.org>
-
-	* hash.c (rb_num_hash_start): avoid pathological behavior
-	  [ruby-core:72028] [Feature #11405]
-
-Fri Dec 11 11:58:46 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: Mentioned rubygems-2.5.1
-
-Fri Dec 11 11:52:39 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems 2.5.1
-	* test/rubygems: ditto.
-
-Fri Dec 11 11:38:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each, ibf_load_object_hash): rehash
-	  case-dispatch hash to reduce collisions.
-	  http://d.hatena.ne.jp/ku-ma-me/20151210
-
-Fri Dec 11 03:44:43 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* object.c (rb_inspect): dump inspected result with rb_str_escape()
-	  instead of raising Encoding::CompatibilityError. [Feature #11801]
-
-	* string.c (rb_str_escape): added to dump given string like
-	  rb_str_inspect without quotes and always dump in US-ASCII
-	  like rb_str_dump.
-
-Thu Dec 10 14:59:59 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb (test_expand_heap): relax condition (1->2).
-
-Thu Dec 10 14:15:59 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* cont.c: fix a double word typo.
-	  [Bug #11313][ruby-core:69749]
-
-Thu Dec 10 14:13:34 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/tk/lib/multi-tk.rb: fix typos.
-	  [Bug #11764][ruby-core:71800]
-
-Thu Dec 10 11:33:34 2015  Eric Wong  <e@80x24.org>
-
-	* compile.c (iseq_compile_each): reduce needless rb_str_dup
-	  [ruby-core:72018] <5668DB6E.8000101@ruby-lang.org>
-
-Thu Dec 10 09:32:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb, lib/shellwords.rb: disable frozen-string-literal.
-	  [ruby-core:72011] [Bug #11800]
-
-Thu Dec 10 06:33:39 2015  Eric Wong  <e@80x24.org>
-
-	* marshal.c (memsize_dump_arg): remove NULL check
-	  (memsize_load_arg): ditto
-
-Thu Dec 10 05:53:18 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb: rbconfig must not be frozen-string-literal to
-	  expand CONFIG hash.  [ruby-core:72006] [Bug #11798]
-
-Thu Dec 10 05:03:51 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ifaddr.c (ifaddr_mark): remove empty function
-	  (ifaddr_type): pass zero to rb_data_type_t.function.dmark
-
-Thu Dec 10 04:49:16 2015  Eric Wong  <e@80x24.org>
-
-	* proc.c (bm_free): remove, use default free
-	  (method_data_type): use RUBY_TYPED_DEFAULT_FREE
-
-Thu Dec 10 02:01:41 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): do not add debug information
-	  without --debug or --debug=frozen-string-literal option
-	  because String#dup slows down with debug information.
-	  [Feature #11725]
-
-	* NEWS: apply about it.
-
-	* test/ruby/test_rubyoptions.rb: catch up this fix with refactoring.
-
-Thu Dec 10 00:06:56 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c: rename methods
-	  RubyVM::InstructionSequence#to_binary_format -> #to_binary
-	  RubyVM::InstructionSequence.from_binary_format -> .load_from_binary
-	  RubyVM::InstructionSequence.from_binary_format_extra_data ->
-	                             .load_from_binary_extra_data
-
-	* iseq.c: fix document of iseq.to_binary.
-	  [Fix GH-1134]
-
-	* sample/iseq_loader.rb: catch up this change.
-
-	* test/lib/iseq_loader_checker.rb: ditto.
-
-Wed Dec  9 17:02:03 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regparse.h (SET_NTYPE): get rid of breaking strict aliasing.
-	  patch by Zarko Todorovski in [ruby-core:71953].  [Bug #11790]
-
-Wed Dec  9 16:10:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_vm_cref_in_context): Module#define_method in non-class
-	  expression should be public.
-	  [Bug #11754]
-
-	* test/ruby/test_method.rb: add a test.
-
-Wed Dec  9 14:45:27 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_stacked_objects): fix typo.
-	  reported by XIE Zhibang. [Bug #11763]
-
-Wed Dec  9 14:37:51 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* doc/syntax/refinements.rdoc: remove outdated description.
-
-Wed Dec  9 09:58:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/**/*.c (*_memsize): same as r52986 for extensions.
-
-Wed Dec  9 09:46:19 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* .gitignore: ignored ISeq binary format.
-
-Wed Dec  9 09:34:41 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* *.c (*_memsize): do not check ptr.
-	  NULL checking is finished Before call of memsize functions.
-	  See r52979.
-
-Wed Dec  9 09:25:29 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/net/smtp/test_response.rb: use Test::Unit. We should use Test::Unit
-	  without rubygems and rdoc.
-
-Wed Dec  9 06:26:23 2015  Colin Kelley <colindkelley@gmail.com>
-
-	* lib/uri/generic.rb: enable frozen_string_literal
-	  (split_userinfo): remove explicit .freeze for string literals
-	  (check_path): ditto
-	  (query): ditto
-	  (fragment): ditto
-	  (to_s): ditto
-	  [ruby-core:71910] [Bug #11759]
-
-Wed Dec  9 06:25:47 2015  Eric Wong  <e@80x24.org>
-
-	* test/uri/test_generic.rb (to_s): new test
-	  [ruby-core:71820]
-
-Wed Dec  9 02:18:52 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (ibf_dump_memsize): should check NULL.
-
-Wed Dec  9 01:46:35 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_init): now accepts new option parameter `encoding'.
-	  [Feature #11785]
-
-Wed Dec  9 00:52:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_stat_wr, rb_stat_ww): call get_stat only once and
-	  reduce checking struct.  patch by Yuki Kurihara in
-	  [ruby-core:71949].  [Misc #11789]
-
-Wed Dec  9 00:24:33 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_ibf_dump): dump extra data just string length.
-
-	* sample/iseq_loader.rb: add using
-	  RubyVM::InstructionSequence.from_binary_format_extra_data method
-	  (commented out).
-
-Mon Dec  9 00:21:19 2015  Yuki Nishijima  <mail@yukinishijima.net>
-
-	* gems/bundled_gems: Upgrade the did_you_mean gem to 1.0.0.rc1
-
-Wed Dec  9 00:17:49 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (ibf_load_setup): cast to int.
-
-Wed Dec  9 00:13:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (ibf_setup_load): rename to ibf_load_setup().
-
-	* compile.c (iseq_load_setup): check binary format.
-
-Tue Dec  8 23:30:07 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/io/console/test_io_console.rb (run_pty): Avoid waiting twice
-	  for a process. Fix Errno::ECHILD in TestIO_Console#test_close and
-	  TestIO_Console#test_sync.
-
-Tue Dec  8 23:05:47 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_ibf_dump): fix for clang type checker.
-
-Tue Dec  8 23:04:02 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_s_load): fix mysterious bug.
-
-Tue Dec  8 22:31:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* introduce new ISeq binary format serializer/de-serializer
-	  and a pre-compilation/runtime loader sample.
-	  [Feature #11788]
-
-	* iseq.c: add new methods:
-	  * RubyVM::InstructionSequence#to_binary_format(extra_data = nil)
-	  * RubyVM::InstructionSequence.from_binary_format(binary)
-	  * RubyVM::InstructionSequence.from_binary_format_extra_data(binary)
-
-	* compile.c: implement body of this new feature.
-
-	* load.c (rb_load_internal0), iseq.c (rb_iseq_load_iseq):
-	  call RubyVM::InstructionSequence.load_iseq(fname) with
-	  loading script name if this method is defined.
-
-	  We can return any ISeq object as a result value.
-	  Otherwise loading will be continue as usual.
-
-	  This interface is not matured and is not extensible.
-	  So that we don't guarantee the future compatibility of this method.
-	  Basically, you shouldn't use this method.
-
-	* iseq.h: move ISEQ_MAJOR/MINOR_VERSION (and some definitions)
-	  from iseq.c.
-
-	* encoding.c (rb_data_is_encoding), internal.h: added.
-
-	* vm_core.h: add several supports for lazy load.
-	  * add USE_LAZY_LOAD macro to specify enable or disable of
-	    this feature.
-	  * add several fields to rb_iseq_t.
-	  * introduce new macro rb_iseq_check().
-
-	* insns.def: some check for lazy loading feature.
-
-	* vm_insnhelper.c: ditto.
-
-	* proc.c: ditto.
-
-	* vm.c: ditto.
-
-	* test/lib/iseq_loader_checker.rb: enabled iff suitable
-	  environment variables are provided.
-
-	* test/runner.rb: enable lib/iseq_loader_checker.rb.
-
-	* sample/iseq_loader.rb: add sample compiler and loader.
-
-	    $ ruby sample/iseq_loader.rb [dir]
-
-	  will compile all ruby scripts in [dir].
-	  With default setting, this compile creates *.rb.yarb files
-	  in same directory of target .rb scripts.
-
-	    $ ruby -r sample/iseq_loader.rb [app]
-
-	  will run with enable to load compiled binary data.
-
-Tue Dec  8 21:21:16 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention about Enumerator::Lazy#grep_v.
-	  [ruby-core:71845] [Feature #11773]
-
-Tue Dec  8 17:36:36 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: removed unused variable
-
-Tue Dec  8 16:23:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (lazy_grep_v): add Enumerator::Lazy#grep_v as well
-	  as Enumerable, to enumerate lazily.
-	  [ruby-core:71845] [Feature #11773]
-
-Tue Dec  8 14:27:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_local_variables): new method
-	  NameError#local_variables for internal use only.
-	  [Feature #11777]
-
-Tue Dec  8 14:20:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_objivar): skip internal instance variables in
-	  T_OBJECT too.
-
-Tue Dec  8 12:58:04 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/io/console/test_io_console.rb (test_getpass): s.getpass
-	  should be tested. Narrow ensure block. This reverts r52911.
-	  [Bug #11780] [ruby-dev:49412]
-
-Tue Dec  8 10:40:21 2015  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_vm2_case_lit.rb: new benchmark
-	* compile.c (case_when_optimizable_literal): add nil/true/false
-	* insns.def (opt_case_dispatch): ditto
-	* vm.c (vm_redefinition_check_flag): ditto
-	* vm.c (vm_init_redefined_flag): ditto
-	* vm_core.h: ditto
-	* object.c (InitVM_Object): define === explicitly for nil/true/false
-	* test/ruby/test_case.rb (test_deoptimize_nil): new test
-	* test/ruby/test_optimization.rb (test_opt_case_dispatch): update
-	  (test_eqq): new test
-	  [ruby-core:71923] [Feature #11769]
-	  Original patch by Aaron Patterson <tenderlove@ruby-lang.org>
-
-Tue Dec  8 10:19:02 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* lib/optparse.rb: fix double word typo in the document.
-	  [Misc #10608] [Fix GH-1126]
-
-Tue Dec  8 09:03:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (d_lite_lshift): should check the argument
-	  before negation.
-
-Tue Dec  8 08:56:16 2015  Eric Wong  <e@80x24.org>
-
-	* insns.def (opt_case_dispatch): check Float#=== redefinition
-	* test/ruby/test_optimization.rb (test_opt_case_dispatch): new
-	  [ruby-core:71920] [Bug #11784]
-
-Tue Dec  8 03:56:05 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/lib/iseq_loader_checker.rb: add iseq dumper/loader checker.
-	  If you enable this checker (remove `#' in test/runner.rb),
-	  you can see comparison results between an original iseq disassembed
-	  result and dumped and loaded iseq disassembed result.
-
-	  There are several bugs around there, because of inexact stack depth
-	  calculation. Now, I leave these bugs because they are not critical
-	  and difficult to solve completely.
-
-	* test/runner.rb: require test/lib/iseq_loader_checker.rb but
-	  disabled at default (commented out).
-
-Tue Dec  8 03:45:47 2015  Eric Wong  <e@80x24.org>
-
-	* doc/extension.rdoc: warn about kwargs performance in C
-	  [Feature #11339] [ci skip]
-
-Tue Dec  8 03:44:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_load): disable peephole optimization option
-	  because apply it multiple times change the sequence.
-	  (iseq != peephole_optimize(load(iseq.to_a)))
-
-Tue Dec  8 03:43:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (rb_iseq_build_from_ary): do not allocate table
-	  if table_size is 0.
-
-Tue Dec  8 03:30:34 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/unixsocket.c (unix_send_io): document args
-	  (unix_recv_io): ditto
-	* test/socket/test_unix.rb (test_fd_passing_class_mode): added
-
-Tue Dec 08 02:21:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_translate): at the end of constructing an iseq,
-	  call RubyVM::InstructionSequence.translate(iseq) if this method
-	  is defined. If the return value is also an object of
-	  RubyVM::InstructionSequence, then use it instead of created one.
-
-	  For example, this method is useful to test iseq dumper/loader
-	  such as RubyVM::InstructionSequence#to_a and rb_iseq_load().
-
-	  Because this method is for such internal experimental usage,
-	  the interface is not matured. For example, this interface has
-	  no extensibility. Two or more translators can not run
-	  simultaneously.
-
-	  So that we don't guarantee future compatibility of this method.
-	  Basically, do not use this method.
-
-Tue Dec  8 01:57:13 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/psych/*: update psych to 2.0.16
-	* test/psych/*: ditto
-
-Mon Dec  7 23:45:20 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: introduce String#+@ and String#-@ to control
-	  String mutability.
-	  [Feature #11782]
-
-Mon Dec  7 23:39:49 2015  Ben Miller  <bjmllr@gmail.com>
-
-	* parse.y: add heredoc <<~ syntax.  [Feature #9098]
-
-Mon Dec  7 23:06:16 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* prelude.rb (IO#read_nonblock): [DOC] add missing options to
-	  call-seq.  [ruby-core:71627] [Bug #11730]
-
-Mon Dec  7 15:50:50 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* .gitignore: added cygruby*.def for Cygwin
-
-Sun Dec  6 19:52:31 2015  Eric Wong  <e@80x24.org>
-
-	* include/ruby/intern.h (rb_autoload): deprecate
-	* internal.h (rb_autoload_str): declare
-	* load.c (rb_mod_autoload): use rb_autoload_str
-	* variable.c (rb_autoload): become compatibility wrapper
-	  (rb_autoload_str): hoisted out from old rb_autoload
-	  [ruby-core:71369] [Feature #11664]
-
-Sun Dec  6 18:25:22 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/webrick/test_cgi.rb (TestWEBrickCGI#test_cgi): gave up the test
-	  of binary path info test on Windows because the test had passed
-	  occasionally as the comment said.
-
-Sun Dec  6 15:25:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_getpass): add IO#getpass
-	  method.
-
-Sun Dec  6 08:39:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/json/json.gemspec: bump version to json 1.8.3. CRuby already contained
-	  upstream changes.
-
-	  https://github.com/ruby/ruby/commit/4d059bf9f5f10f3d3088de49fc87e5555db7770d
-	  https://github.com/flori/json/commit/d4c99de78905d96c3f301f48b2c789943bb3f098
-
-	* ext/json/lib/json/version.rb: ditto.
-
-Sat Dec  5 17:48:25 2015  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* tool/fake.rb: Fix cross build when srcdir is an absolute path.
-
-	* Makefile.in: PREP dependency is needed when cross build too, not
-	  "-r$(arch)-fake" to be  used before created.  [Fix GH-1125]
-
-Sat Dec  5 17:26:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_str_new, env_path_str_new): make default string
-	  UTF-8 for the case conversion is not possible.  [Bug #8822]
-
-	* hash.c (get_env_cstr): convert non-ASCII string to UTF-8 string.
-
-	* hash.c (ruby_setenv): use wide char version to put environment
-	  variable to deal with non-ASCII value.
-
-Sat Dec  5 09:56:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby_atomic.h (ATOMIC_CAS): old value to be swapped should be
-	  same as the destination.  immediate value may need type
-	  promotion.
-
-	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of
-	  InterlockedCompareExchange64.  new value and then old value is
-	  the last.
-
-Sat Dec  5 09:23:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (fill_random_seed): fix the size to be filled, not the
-	  size of element, but the whole size of array.
-
-Sat Dec  5 06:03:54 2015  Eric Wong  <e@80x24.org>
-
-	* vm.c (ruby_vm_verbose_ptr): make static
-	  (ruby_vm_debug_ptr): ditto
-
-Sat Dec  5 00:56:29 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/ruby.h (RB_OBJ_TAINT): follow-up of r52881.
-	  Turn into void expression not to use unexpected result.
-	  Fix "operands have incompatible types" error with
-	  Oracle Solaris Studio 12.x on Solaris.
-
-Fri Dec  4 19:52:52 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_13.c: Added three missing lower/upper-case
-	  character pairs (from Kimihito Matsui)
-
-Fri Dec  4 18:57:57 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_4.c: Added missing lower/upper-case character
-	  pair (U+014A and U+014B, LATIN CAPITAL/SMALL LETTER ENG)
-	  (from Kimihito Matsui)
-
-Fri Dec  4 16:48:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_obj_as_string): fstring should not be infected.
-	  re-apply r52872 and fix a typo.
-	  TODO: other frozen strings also may not be.
-
-Fri Dec  4 15:21:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems 2.5.0+ HEAD(fdab4c4).
-	  this version includes #1396, #1397, #1398, #1399
-	* test/rubygems: ditto.
-
-Fri Dec  4 11:22:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_setname): name must be ascii-compatible, as
-	  pthread APIs do not accept legacy wide char strings.
-
-Thu Dec  3 15:39:21 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/scanf.rb: fixed double words typo.
-	  [ci skip][fix GH-1123] Patch by @jwworth
-
-Thu Dec  3 15:37:56 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_mixed_unicode_escapes.rb: fixed typo.
-	  [fix GH-1122] Patch by @davydovanton
-	* test/ruby/test_object.rb: ditto.
-	* test/socket/test_tcp.rb: ditto.
-
-Thu Dec  3 15:33:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): fix wrong shifting position in
-	  Rational conversion when not at the beginning of the result.
-	  [ruby-core:71806] [Bug #11766]
-
-Thu Dec  3 14:22:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (range_to_s): should be infected by the receiver.
-	  str2 infects by appending.  [ruby-core:71811] [Bug #11767]
-
-Thu Dec  3 11:57:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: separate SET_CURRENT_THREAD_NAME, which can set
-	  the name of current thread only, and SET_ANOTHER_THREAD_NAME,
-	  which can set the name of other threads.
-
-	* thread.c (rb_thread_setname): use SET_ANOTHER_THREAD_NAME.  OS X
-	  is not possible to set another thread name.
-
-	* thread_pthread.c (native_set_thread_name, thread_timer): use
-	  SET_CURRENT_THREAD_NAME.
-
-Wed Dec 02 22:57:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, iseq.h: remove rb_iseq_t::variable_body.
-	  Fields in rb_iseq_t::variable_body are contained by
-	  rb_iseq_t::body::mark_ary (hidden Array object).
-
-	  Index 0 to 2 of mark_ary are reserved by these objects.
-
-	* iseq.c: catch up this fix.
-
-	* compile.c (rb_iseq_original_iseq): trivial rewrite.
-
-Wed Dec  2 17:19:02 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.h: introduce ISEQ_ORIGINAL_ISEQ() and
-	  ISEQ_ORIGINAL_ISEQ_ALLOC() macro.
-
-	* compile.c: use them to access original iseq buffer.
-
-	* iseq.c: ditto.
-
-	* vm_core.h: rename iseq field to support this fix.
-
-Wed Dec  2 17:10:32 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.h: introduce ISEQ_FLIP_CNT_INCREMENT() macro.
-
-	* compile.c (iseq_compile_each): use it.
-
-	* vm_core.h: rename flip_cnt field to support this fix.
-
-Wed Dec  2 17:05:15 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.h: introduce ISEQ_COVERAGE() and ISEQ_COVERAGE_SET() macro.
-
-	* compile.c: use them.
-
-	* iseq.c: ditto.
-
-	* iseq.c (rb_iseq_coverage): added.
-
-	* thread.c (update_coverage): use rb_iseq_coverage().
-
-	* vm_core.h: rename coverage field name to support this fix.
-
-Wed Dec  2 17:00:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_name, rb_enc_name_list_i, rb_enc_aliases_enc_i):
-	  make fstring instead of making each copies.
-
-Wed Dec  2 16:32:08 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.h: introduce ISEQ_COMPILE_DATA() macro.
-
-	* compile.c, iseq.c: use ISEQ_COMPILE_DATA().
-
-	* vm_core.h: rename compile_data field to support this fix.
-
-Wed Dec  2 16:27:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_m_loader): defer finding encoding object not to
-	  be infected by marshal source.  [ruby-core:71793] [Bug #11760]
-
-	* marshal.c (r_object0): enable compatible loader on USERDEF
-	  class.  the loader function is called with the class itself,
-	  instead of an allocated object, and the loaded data.
-
-	* marshal.c (compat_allocator_table): initialize
-	  compat_allocator_tbl on demand.
-
-	* object.c (rb_undefined_alloc): extract from rb_obj_alloc.
-
-Wed Dec  2 15:12:43 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* configure.in: Fixed double negative comments.
-	  [Bug #11698][ruby-core:71506]
-
-Wed Dec  2 14:55:01 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/ruby/test_string.rb: removed non executing tests.
-	  [Misc #11757][ruby-dev:49397]
-
-Wed Dec  2 11:23:06 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/csv.rb: enable frozen_string_literal.
-	  [fix GH-1116] Patch by @marshall-lee
-
-Wed Dec  2 10:36:25 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c: Fix double word typo.
-	  [ci skip][fix GH-1120] Patch by @jwworth
-
-Wed Dec  2 07:43:51 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (mSSLExtConfig): make static
-	  (eSSLError): ditto
-	  (ID_callback_state): ditto
-	  (ossl_ssl_ex_vcb_idx): ditto
-	  (ossl_ssl_ex_store_p): ditto
-	  (ossl_ssl_ex_ptr_idx): ditto
-	* ext/openssl/ossl_ssl.h: remove extern declarations for
-	  mSSLExtConfig and eSSLError
-
-Wed Dec  2 07:41:08 2015  Eric Wong  <e@80x24.org>
-
-	* missing/explicit_bzero.c (explicit_bzero): fixup r52839
-	  for compilers with "weak" attribute
-
-Wed Dec  2 06:47:25 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/explicit_bzero.c: add ruby_explicit_bzero_hook_unused
-	  for preventing optimization. Inspired from OpenBSD.
-
-Tue Dec  1 23:36:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_setname): allow to reset thread name.
-
-Tue Dec  1 23:14:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_setname): check the argument if valid
-	  string.  [ruby-core:71774] [Bug #11756]
-
-Tue Dec  1 17:13:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_string_value_cstr): should not raise on frozen
-	  string.
-
-Tue Dec  1 09:35:29 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/explicit_bzero.c: add a few comment.
-
-Tue Dec  1 09:31:19 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/explicit_bzero.c: add disabling optimization on gcc.
-
-Tue Dec  1 07:50:33 2015  Eric Wong  <e@80x24.org>
-
-	* missing/explicit_bzero.c: new file. define explicit_bzero.
-	  Fixup r52806
-
-Thu Oct 22 12:54:43 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (register_ubf_list): renamed from
-	  add_signal_thread_list.
-	* thread_pthread.c (unregister_ubf_list): renamed
-	  from remove_signal_thread_list.
-	* thread_pthread.c (ubf_wakeup_all_threads): renamed from
-	  ping_signal_thread_list.
-	* thread_pthread.c (ubf_wakeup_thread): renamed from
-	  ubf_select_each.
-	* thread_pthread.c (ubf_threads_empty): renamed from
-	  check_signal_thread_list().
-	* thread_pthread.c (ubf_list_lock): renamed from
-	  signal_thread_list_lock.
-
-	* thread_pthread.c (register_ubf_list): large simplification
-	  by using ccan/list.h.
-	  bonus: removed malloc() and exit(EXIT_FAILURE).
-	* thread_pthread.c (unregister_ubf_list): ditto.
-	* thread_pthread.c (ubf_threads_empty): ditto.
-	* thread_pthread.c (ubf_wakeup_all_threads): ditto.
-
-	* thread_pthread.c (print_signal_list): removed.
-
-Thu Oct 22 08:03:49 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_rand.rb (TestRand#test_default_seed): add
-	  srand case.
-
-Thu Oct 22 06:33:38 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c (InitVM_Random): move Random::DEFAULT initialization
-	  bits to Init_Random_default.
-	* random.c (Init_Random_default): renamed from Init_RandomSeed2.
-	* random.c (Init_RandomSeedCore): renamed from Init_RandomSeed.
-
-Thu Oct 22 06:20:48 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c (Init_RandomSeed): move all Random::DEFAULT
-	  construction bits to Init_RandomSeed2. Random::DEFAULT
-	  and Ruby internal hashes are no longer shared their seed.
-	* random.c (Init_RandomSeed2): ditto. And, kill evil
-	  rb_obj_reveal() stuff.
-
-	* random.c (init_hashseed): add MT argument.
-	* random.c: (init_siphash): ditto.
-
-	* test/ruby/test_rand.rb (TestRand#test_default_seed): new
-	  test for Random::DEFAULT::seed.
-
-Thu Oct 22 05:23:48 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c (init_hashseed, init_siphash): extract initialize
-	  functions.
-
-Thu Oct 22 01:01:34 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: sort AC_CHECK_HEADERS() by alphabetical order.
-
-Thu Oct 22 00:19:07 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c (init_randomseed): remove "initial" argument. It never
-	  be used from outside of this function.
-
-Thu Oct 22 00:12:33 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/securerandom.rb (SecureRandom::gen_random): use /dev/urandom
-	  for initialize OpenSSL's rand.
-
-Wed Oct 21 12:10:04 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/openssl/ossl_rand.c (ossl_rand_bytes): RAND_bytes could
-	  be return -1 as an error. Therefore, added error handling.
-	* ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto.
-
-Wed Oct 21 09:04:09 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/util.h: remove a warning suppression C4723
-	  (potential divide by zero) for VisualC++. It's meaningless.
-	  Before r26197, there is ruby_div0() in this place and it
-	  actually made divide by zero. But now it's just garbage.
-
-Wed Oct 21 08:23:36 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c: random_raw_seed don't use GRND_NONBLOCK. GRND_NONBLOCK
-	  mean the result might not have an enough cryptic strength and
-	  easy predictable. That's no good for SecureRandom.
-
-Sun Oct 18 17:26:53 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* common.mk: add a rule for explicit_bzero.o.
-	* configure.in: detect explicit_bzero and memset_s.
-	* include/ruby/missing.h: add explicit_bzero.
-	* random.c (init_randomseed): use explicit_bzero() instead of
-	  memset(). memset could be eliminated by compiler optimization.
-
-Mon Nov 30 18:46:44 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/readline/extconf.rb: call dir_config("libedit")
-	  if --enable-libedit is specified. [Bug #11751]
-	  patched by John Hein
-
-Mon Nov 30 08:44:29 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c: remove spurious #define for globals
-	  [ruby-core:71735] [Feature #11749]
-
-Sun Nov 29 09:13:03 2015  Conor Landry  <clandry94@gmail.com>
-
-	* NEWS: [DOC] Various grammar corrections and clarifications to
-	  increase readability.  [Fix GH-1115]
-
-Sat Nov 28 19:33:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): store dispatched result of
-	  on_tstring_content at the last fragment of a here document.
-
-Fri Nov 27 19:19:44 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (connect): detect closed connection and reconnect
-	  If the server closes a keep-alive http connection, the client socket
-	  reaches EOF. To avoid an EOFError, detect the closed connection and
-	  reconnect.
-	  Added test to ensure HTTP#post succeeds even if the
-	  keep-alive-connection has been closed by the server.
-	  by Kristian Hanekamp <kris.hanekamp@gmail.com>
-	  https://github.com/ruby/ruby/pull/1089 fix GH-1089
-
-Thu Nov 26 21:36:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): enable tail call
-	  optimization for specialized indexers.
-
-	* compile.c (iseq_compile_each): blockiseq should be NULL, but not
-	  Qnil.
-
-Thu Nov 26 17:22:53 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c, regenc.c, regexec.c, regint.h, enc/unicode.c:
-	  Merge Onigmo 58fa099ed1a34367de67fb3d06dd48d076839692
-	  + https://github.com/k-takata/Onigmo/pull/52
-
-Thu Nov 26 09:50:02 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/coverage/test_coverage.rb: Added test-case for Coverage.restart.
-	  [Misc #11732][ruby-dev:49379]
-
-Thu Nov 26 09:46:36 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/coverage/test_coverage.rb: Added test-case for Coverage.peek_result
-	  without Coverage.start. [Misc #11726][ruby-core:71622]
-
-Thu Nov 26 07:22:55 2015  Eric Wong  <e@80x24.org>
-
-	* test/openssl/test_ssl.rb (test_copy_stream): new test
-
-Wed Nov 25 21:23:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (copy_stream_body): try to_io conversion before read,
-	  readpartial, and write methods.  [ruby-dev:49008] [Bug #11199]
-
-Wed Nov 25 10:55:21 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* io.c (argf_getpartial): should not resize str if the second
-	  argument is not given.
-	  [ruby-core:71668] [Bug #11738]
-
-Tue Nov 24 23:56:25 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: On Solaris, it is safe to define _LARGEFILE_SOURCE
-	  when _FILE_OFFSET_BITS=64 is defined (= when 32-bit compile).
-
-Tue Nov 24 10:00:10 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems/installer.rb: Fix two double-word typos.
-	  [ci skip][fix GH-1108] Patch by @jwworth
-
-Tue Nov 24 09:17:02 2015  Alexander von Gluck IV  <kallisti5@unixzen.com>
-
-	* beos: Drop support for BeOS now that Haiku is stable.
-	  [Fix GH-1112]
-
-Tue Nov 24 09:16:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (rb_gc_for_fd): move to export, as referred by
-	  ext/socket.
-
-Tue Nov 24 09:04:29 2015  David Rodriguez  <deivid.rodriguez@gmail.com>
-
-	* file.c: [DOC] add a missing period to File docs, to terminate
-	  the sentence and separate from the next sentence.  [Fix GH-1111]
-
-Tue Nov 24 08:30:06 2015  JuanitoFatas  <katehuang0320@gmail.com>
-
-	* NEWS: Fix the issue number of `Struct#dig`, which should be
-	  [Feature #11688].  [Fix GH-1110]
-
-Tue Nov 24 07:56:54 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_s_accept): handle ENOMEM
-
-Tue Nov 24 07:50:15 2015  Eric Wong  <e@80x24.org>
-
-	* dir.c (dir_initialize): use rb_gc_for_fd for ENOMEM
-	* ext/socket/init.c (rsock_socket): ditto
-	* ext/socket/socket.c (rsock_socketpair): ditto
-	* internal.h (rb_gc_for_fd): prototype
-	* io.c (rb_gc_for_fd): remove static
-	  [ruby-core:71623] [Feature #11727]
-
-Tue Nov 24 06:46:27 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (rb_gc_for_fd): new helper function
-	  (ruby_dup): use rb_gc_for_fd
-	  (rb_sysopen): ditto
-	  (rb_fdopen): ditto
-	  (rb_pipe): ditto
-	  [ruby-core:71623] [Feature #11727]
-
-Tue Nov 24 05:13:35 2015  Eric Wong  <e@80x24.org>
-
-	* ext/fiddle/function.c (struct nogvl_ffi_call_args):
-	  new struct for GVL release
-	  (nogvl_ffi_call): new function
-	  (function_call): adjust for GVL release
-	  [ruby-core:71642] [Feature #11607]
-	* ext/fiddle/closure.c (struct callback_args):
-	  new struct for GVL acquire
-	  (with_gvl_callback): adjusted original callback function
-	  (callback): wrapper for conditional GVL acquire
-	* ext/fiddle/depend: add dependencies
-	* ext/fiddle/extconf.rb: include top_srcdir for internal.h
-	* internal.h (ruby_thread_has_gvl_p): expose for fiddle
-	* vm_core.h (ruby_thread_has_gvl_p): moved to internal.h
-	* test/fiddle/test_function.rb (test_nogvl_poll): new test
-
-Mon Nov 23 19:53:12 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: On Solaris, with gcc, "-std=iso9899:1999"
-	  in $ansi_options is often also needed in CPPFLAGS,
-	  because some feature definitions vary depending on such
-	  standards options.
-
-Mon Nov 23 12:54:39 2015  Hamish Morrison  <hamishm53@gmail.com>
-
-	* configure.in: remove obsolete workarounds for Haiku.
-
-	* dln.c, file.c, io.c: remove obsolete Haiku workarounds.
-
-	* thread_pthread.c: add stack bounds detection for Haiku.
-
-	* signal.c: get stack pointer from signal context on Haiku.
-	  [ruby-core:67923] [Bug #10811] [Fix GH-1109]
-
-Mon Nov 23 11:44:11 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: bump version to minitest-5.8.3
-
-Mon Nov 23 08:55:00 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: fix wrong reference for r52714
-
-Sun Nov 22 22:23:37 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* gc.c (rb_raw_obj_info): fix compile errors when USE_RGENGC
-	  is 0.
-
-Sun Nov 22 21:58:09 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* lib/cmath.rb: methods which has suffix '!' are now deprecated.
-	  Re-apply r52469 made by Kazuki Tanaka, with fixing bug about
-	  mathn.rb compatibility. [ruby-core:68528] [Feature #10974]
-
-Sun Nov 22 19:36:51 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/openssl/ossl.c: fix brew command for installation of openssl.
-	  [ci skip][fix GH-1107] Patch by @arthurnn
-
-Sun Nov 22 17:59:50 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: On Solaris, add -D_XOPEN_SOURCE=n only when both
-	  AC_TRY_CPP and AC_TRY_COMPILE pass, because some options
-	  (e.g. -std=iso9899:1999) are not set when running C preprocessor
-	  or building ext.
-
-Sun Nov 22 16:53:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): remove unreachable code
-	  chunk after jump/leave.
-
-	* parse.y: move dead code elimination of logical operation to
-	  compile.c.  not to warn logical operation of literal constants.
-
-Sun Nov 22 16:37:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): eliminate always/never
-	  branches after a literal object and when the value is used after
-	  the branch.
-
-Sun Nov 22 01:23:43 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: Add -D_XOPEN_SOURCE=500 (or 600 or 700) on Solaris
-	  if available, mainly for enabling some features in sockets.
-
-Sun Nov 22 00:17:22 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/socket/test_socket.rb (test/socket/test_socket.rb): skip
-	  the test when Socket::SO_TIMESTAMP is not defined. Fix error
-	  on Solaris 10. [Bug #11728] [ruby-dev:49377]
-
-Sat Nov 21 18:57:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (need_argument): move frozen-string-literal-debug option
-	  from --enable to --debug.  [Feature #11725]
-
-	* ruby.c (proc_options): fix pointer overrun. do not advance argv
-	  until it is valid.
-
-Sat Nov 21 13:59:09 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/digest/sha1/extconf.rb: OpenSSL's struct name for SHA1 is
-	  SHA_CTX. http://openssl.org/docs/man0.9.8/crypto/SHA1.html
-
-Sat Nov 21 13:31:52 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid
-	  including ext/digest/extconf.h. [Bug #3231]
-	  https://msdn.microsoft.com/library/36k2cdd4.aspx
-
-	* ext/digest/*/extconf.rb: remove ext/digest from include search path
-	  to avoid confusion of cl.exe.
-
-	* ext/digest/*/*.[ch]: explicitly specify def.h's path.
-
-Sat Nov 21 13:05:16 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl.h: LibreSSL doesn't have and need e_os2.h.
-
-Sat Nov 21 09:18:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_sync.c: reduce the specification of Queue#close.
-	  * Queue#close accepts no arguments.
-	  * deq'ing on closed queue returns nil, always.
-	  [Feature #10600]
-
-	* test/thread/test_queue.rb: catch up this fix.
-
-Sat Nov 21 08:44:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): add debug information to NODE_STR
-	  strings as default.
-	  [Feature #11725]
-
-	* insns.def (freezestring): add new instruction to support adding
-	  debug information for dynamically constructed strings.
-
-	* compile.c (iseq_compile_each): support adding debug information
-	  for NODE_DSTR with freezestring instruction.
-
-	* error.c (rb_error_frozen): change the debug information ID name
-	  id_debug_created_info and this field should have a 2 element array
-	  containing path and line information.
-
-	* defs/id.def: ditto.
-
-	* test/ruby/test_rubyoptions.rb: catch up this fix.
-
-	* test/ruby/test_iseq.rb: now frozen strings are not same.
-
-Sat Nov 21 04:34:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (rb_str_intern): should not freeze the receiver itself
-	  unexpectedly.  [ruby-core:71611] [Bug #11721]
-
-Fri Nov 20 23:15:18 2015  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: expose logger mutex
-	  [fix GH-541] Patch by @arthurnn
-
-Fri Nov 20 15:05:28 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* Added missing reference of GitHub
-
-Fri Nov 20 14:57:01 2015  Trevor Rowe  <trevorrowe@gmail.com>
-
-	* lib/net/http.rb: Fixed regression for Net::HTTP::PUT with "Expect-100"
-	  header. [fix GH-949]
-	* test/net/http/test_http.rb: added test.
-
-Fri Nov 20 14:39:56 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http.rb: set hostname before call ossl_ssl_set_session.
-	  [Bug #11401][ruby-core:70152][fix GH-964] Patch by @mkarnebeek
-
-Fri Nov 20 12:53:19 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* array.c: clarify docs for take_while/drop_while samples.
-	  [ci skip][fix GH-1028] Patch by @leriksen
-
-Fri Nov 20 12:48:04 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/socket/socket.c: remove mention of :UNIX in getaddrinfo().
-	  It's typically not a support option.
-	  [ci skip][fix GH-990] Patch by @eam
-
-Fri Nov 20 12:44:06 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rss/syndication.rb: Add nodoc marker for #validate_sy_updatePeriod.
-	  [ci skip][fix GH-1105] Patch by @davydovanton
-
-Fri Nov 20 09:05:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_vm_cref_replace_with_duplicated_cref): added.
-
-	  CREFs should not be shared by methods between `using'.
-	  [Bug #11247]
-
-	* vm_insnhelper.c (vm_cref_replace_with_duplicated_cref): ditto.
-
-	* vm.c (vm_cref_dup): should copy refinements correctly.
-
-	* eval.c: use rb_vm_cref_replace_with_duplicated_cref().
-
-	* eval_intern.h: add a decl. of
-	  rb_vm_cref_replace_with_duplicated_cref().
-
-	* vm_eval.c (eval_string_with_cref): do not need to pass
-	  scope's CREF because VM can find out CREF from stack frames.
-
-	* test/ruby/test_refinement.rb: add a test.
-
-Fri Nov 20 06:52:53 2015  Eric Wong  <e@80x24.org>
-
-	* .gitattributes: new file for git users
-	  [ruby-core:71578] [Feature #11713]
-
-Thu Nov 19 22:35:31 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ancdata.c: Check buffer full and ignore MSG_TRUNC flag.
-	  buffer fullness is more robust to detect the message is too big for
-	  the buffer.
-	  AIX 7.1 recvmsg doesn't set MSG_TRUNC for rflags when MSG_PEEK is
-	  given.
-
-Thu Nov 19 21:55:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_start): force to invoke GC by GC.start
-	  even if it is GC.disable'd.
-
-	* test/ruby/test_gc.rb: add a test.
-
-Thu Nov 19 20:08:59 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: trivial performance improvements.
-
-	    name    modified
-	    vm1_gc_short_lived*                1.015
-	    vm1_gc_short_with_complex_long*    1.014
-	    vm1_gc_short_with_long*            1.000
-	    vm1_gc_short_with_symbol*          1.016
-	    vm1_gc_wb_ary*                     1.002
-	    vm1_gc_wb_ary_promoted*            0.996
-	    vm1_gc_wb_obj*                     1.045
-	    vm1_gc_wb_obj_promoted*            1.014
-	    vm3_gc                             1.021
-
-	* gc.c (gc_writebarrier_generational): reorder parameters to optimize
-	  register passing function call.
-
-	* gc.c (gc_writebarrier_incremental): ditto.
-
-	* gc.c (rb_gc_writebarrier): remove LIKELY().
-	  LIKELY() seems to move related functions not better places.
-
-Thu Nov 19 19:45:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_prog_init): [DOC] ARGV does not contain the name of
-	  the executable.  [ruby-core:71561] [Bug #11711]
-
-Thu Nov 19 15:53:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* signal.c: should also clear ruby_disable_gc.
-	  [Bug #11692]
-
-Thu Nov 19 15:31:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_compile_each): T_IMEMO/iseq objects should be
-	  wrap with ISeq wrappers. [Bug #11676]
-
-Thu Nov 19 15:16:12 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems 2.5.0+ HEAD(c6b4946).
-	  this version includes #1114, #1314, #1322, #1375, #1383, #1387
-	* test/rubygems: ditto.
-
-Thu Nov 19 14:14:37 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (finish_overlapped_socket): return value of this
-	  function should be only 0 or SOCKET_ERROR.
-
-Thu Nov 19 14:12:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_tailcall_optimize): apply tail call optimization
-	  before conversion to specialized instructions.  when looking
-	  back from `leave` instruction, `send` instructions have been
-	  translated already.
-
-Thu Nov 19 13:57:58 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input,
-	  because POSIX platforms just do so.  fixes test errors revealed by
-	  r52647.
-
-Thu Nov 19 02:52:30 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size
-	  only when vmaxdatlen is nil.
-
-Thu Nov 19 02:20:11 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/socket/test_socket.rb (test_udp_recvmsg_truncation): rflags is
-	  nil on Solaris 10 which have no HAVE_STRUCT_MSGHDR_MSG_CONTROL.
-	  Reported by Naohisa Goto. [ruby-core:71557] [Bug #11709]
-
-Thu Nov 19 01:48:05 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in: add -static-libgcc for mingw automatically if available.
-
-Thu Nov 19 00:53:26 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/extmk.rb (--extflags): new option to pass EXTLDFLAGS to children,
-	  especially exts.mk.
-
-	* common.mk (EXTMK_ARGS): use above option.
-
-Wed Nov 18 22:50:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_class_clear_method_cache): should clear all
-	  RCLASS_CALLABLE_M_TBLs of all sub-classes (T_ICLASS).
-
-	  RCLASS_CALLABLE_M_TBL() caches complemented method entries.
-	  It should be cleared when the modules are cleared.
-	  On previous version clears only for direct children.
-	  It is enough for normal modules because corresponding T_ICLASSes
-	  are direct children.
-
-	  However, refinements create complex data structure. So that
-	  we need to clear all children (and descendants).
-	  [ruby-core:71423] [Bug #11672]
-
-	* vm_method.c (rb_clear_method_cache_by_class): rb_mKernel
-	  doesn't call rb_class_clear_method_cache, so that
-	  clear child T_ICLASSes.
-
-	* test/ruby/test_refinement.rb: enable disabled test.
-
-Wed Nov 18 21:09:08 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (prepare_callable_method_entry): use
-	  RCLASS_CALLABLE_M_TBL() instead of accessing a filed directly.
-
-Wed Nov 18 17:08:18 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: introduce the following field and macros.
-
-	  * rb_method_definition_t::complemented_count to count shared method
-	    entries because of complemented method entries and separate from
-	    alias_count.
-
-	    Shared `def' only by complemented method entries should not prevent
-	    method re-definition warning.
-
-	  * METHOD_ENTRY_COMPLEMENTED(me) to represent complemented method entry.
-	  * METHOD_ENTRY_COMPLEMENTED_SET(me) to check it as  complemented me.
-
-	* vm_insnhelper.c (aliased_callable_method_entry): should also
-	  check me->def->complemented_count.
-
-	* vm_method.c (method_definition_addref_complement): add to count
-	  complemented method entries number.
-
-	* vm_method.c (rb_method_definition_release): release `def' iff
-	  alias_count == 0 and complemented_count == 0.
-
-	* test/ruby/test_module.rb: add a test.
-
-Wed Nov 18 17:06:19 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_raw_obj_info): fix trivial issues.
-
-	  * support SPECIAL_CONSTs.
-	  * fix IMEMO/ment outputs.
-
-Wed Nov 18 11:32:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): eliminate always/never
-	  branches after a literal object.  this sequence typically
-	  appears by defined? operator for a method call on a local
-	  variable.
-
-Wed Nov 18 10:33:06 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size
-	  when EMSGSIZE occurs on non HAVE_STRUCT_MSGHDR_MSG_CONTROL platforms
-	  (such as, Windows).  fixes a test error revealed by r52625.
-
-Wed Nov 18 10:12:36 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): use 4096 as
-	  default size to match pre-r52610, which also maps to a common
-	  page size.
-
-Wed Nov 18 10:05:25 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* doc/syntax/refinements.rdoc: update documentation to reflect
-	  recent changes.
-	  [ci skip] [ruby-core:71466] [Misc #11681] Patch by James Adam
-
-Wed Nov 18 09:50:21 2015  Naotoshi Seo  <sonots@gmail.com>
-
-	* test/logger/test_logdevice.rb: Fix tests of logger to make it work on
-	  windows (windows can not remove opened file) [Bug #11702]
-
-Wed Nov 18 06:59:52 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): grow buffer
-	  on unspecified maxdatlen
-	  [ruby-core:71517] [Bug #11701]
-	* ext/socket/lib/socket.rb (Socket#recvmsg): nil default for dlen
-	  (Socket#recvmsg_nonblock): ditto
-	* test/socket/test_socket.rb (test_recvmsg_udp_no_arg): new test
-
-Tue Nov 17 19:50:06 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (fstat): declare for mingw.
-
-Tue Nov 17 19:02:59 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in (BASERUBY): use Kernel#print instead of Kernel#p because
-	  the baseruby may output CRLF as end of line.
-
-Tue Nov 17 15:34:34 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-	* NEWS: Added update from Unicode 7.0.0 to 8.0.0 [ci skip]
-
-Tue Nov 17 15:30:30 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-	* enc/unicode/casefold.h, name2ctype.h: Change Unicode
-	  Version for regular expressions from 7.0.0 to
-	  8.0.0 (with help from Kimihito Matsui) [Feature #11563]
-
-Tue Nov 17 14:36:00 2015  Kenichi Kamiya  <kachick1@gmail.com>
-
-	* lib/ostruct.rb (dig): Implement OpenStruct#dig
-	  [Feature #11688]
-
-Tue Nov 17 14:04:14 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/lib/socket.rb (Socket#recvmsg{,_nonblock}): default values
-	  of clen must be nil.
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): handle nil of clen.
-	  fixes test errors introduced at r52602.
-
-Tue Nov 17 13:43:46 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/lib/socket.rb: UNIXSocket is not always exists.  fixes
-	  install error on Windows, introduced at r52601.
-
-Tue Nov 17 11:27:23 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/lib/socket.rb (Socket#recvfrom_nonblock):
-	  UDPSocket#recvfrom_nonblock):
-	  update doc for `exception: false` and destination buffer
-	  [ruby-core:69542] [Feature #11229]
-	  [ruby-core:69543] [Feature #11242]
-
-Tue Nov 17 11:25:05 2015  Eric Turner  <ericturnerdev@gmail.com>
-
-	* array.c (rb_ary_dig), hash.c (rb_hash_dig): [DOC] Update
-	  comments describing dig methods.  [Fix GH-1103]
-
-	* struct.c (rb_struct_dig): [DOC] add rdoc.
-
-Tue Nov 17 11:22:22 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-	* NEWS: Small grammatical fix [ci skip]
-
-Tue Nov 17 10:12:30 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/lib/socket.rb (Socket.accept_loop): avoid exceptions
-	  (Socket.udp_server_recv): ditto
-
-Tue Nov 17 09:59:00 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): avoid arg parsing
-	  [ruby-core:71439] [Feature #11339]
-	  (rsock_bsock_sendmsg): make private, adjust for above
-	  (rsock_bsock_sendmsg_nonblock): ditto
-	* ext/socket/rubysocket.h: adjust prototypes
-	  (rsock_opt_false_p): remove
-	* ext/socket/basicsocket.c (rsock_init_basicsocket):
-	  define private methods
-	* ext/socket/lib/socket.rb (BasicSocket#sendmsg): new wrapper
-	  (BasicSocket#sendmsg_nonblock): ditto
-
-Tue Nov 17 09:45:18 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): avoid arg parsing
-	  (rsock_bsock_recvmsg): adjust for above change
-	  (rsock_bsock_recvmsg_nonblock): ditto
-	  [ruby-core:71439] [Feature #11339]
-	* ext/socket/rubysocket.h: adjust prototypes for above
-	* ext/socket/basicsocket.c (rsock_init_basicsocket):
-	  adjust private methods
-	* ext/socket/lib/socket.rb (BasicSocket#recvmsg): wrapper method
-	  (BasicSocket#recvmsg_nonblock): ditto
-
-Tue Nov 17 08:36:34 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_s_accept_nonblock): avoid parsing args
-	  [ruby-core:71439] [Feature #11339]
-	* ext/socket/rubysocket.h: adjust prototype
-	* ext/socket/socket.c (sock_accept_nonblock): make private
-	* ext/socket/tcpserver.c (tcp_accept_nonblock): ditto
-	* ext/socket/unixserver.c (unix_accept_nonblock): ditto
-	* ext/socket/lib/socket.rb (Socket#accept_nonblock):
-	  implement as wrapper, move RDoc
-	  (TCPServer#accept_nonblock): ditto
-	  (UNIXServer#accept_nonblock): ditto
-
-Tue Nov 17 08:25:57 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/socket.c (sock_connect_nonblock):
-	  avoid argument parsing in C.
-	  [ruby-core:71439] [Feature #11339]
-	* ext/socket/lib/socket.rb (Socket#connect_nonblock):
-	  new wrapper for private method, move RDoc
-
-Tue Nov 17 08:16:09 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_s_recvfrom_nonblock):
-	  avoid arg parsing with C API
-	  [ruby-core:71439] [Feature #11339]
-	* ext/socket/basicsocket.c (bsock_recv_nonblock):
-	  adjust for above change, make private
-	* ext/socket/socket.c (sock_recvfrom_nonblock): ditto
-	* ext/socket/udpsocket.c (udp_recvfrom_nonblock): ditto
-	* ext/socket/lib/socket.rb (BasicSocket#recv_nonblock):
-	  new wrapper for private method, move RDoc
-	  (Socket#recvfrom_nonblock): ditto
-	  (UDPSocket#recvfrom_nonblock): ditto
-
-Mon Nov 16 21:27:54 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/dtrace/helper.rb (Dtrace::TestCase#trap_probe): dtrace buffer
-	  size is set as 8m on Solaris (default 4m). [Bug #11697]
-
-Mon Nov 16 20:03:14 2015  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Add Logger#reopen
-
-Mon Nov 16 18:21:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_obj_dig): dig in nested structs too.
-
-	* struct.c (rb_struct_dig): new method Struct#dig.
-	  [Feature #11688]
-
-Mon Nov 16 17:41:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): optimize tail calls on aref
-	  and aset specialized instructions.
-
-	* compile.c (iseq_peephole_optimize): optimize replaced leave
-	  instruction copied to jump instruction too.
-
-Mon Nov 16 16:39:38 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Enable frozen_string_literal.
-
-	* lib/set.rb: Move << out of the begin block that ensures pop.
-
-Mon Nov 16 16:28:30 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Hash#flatten!, #add?, #delete?, #collect!, #reject!,
-	  #select!, #^, #classify): Micro-optimize some methods for
-	  performance and readability.
-
-Mon Nov 16 16:17:58 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: fixed accidentally commit.
-
-Mon Nov 16 16:10:51 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* mkconfig.rb: Add some high-level documentation.
-	  [ci skip][fix GH-1081] Patch by @ulfalizer
-
-Mon Nov 16 15:59:14 2015  yui-knk  <spiketeika@gmail.com>
-
-	* proc.c: Add call-seq of `Method#super_method`
-	  [ci skip][fix GH-1094]
-
-Mon Nov 16 15:58:39 2015  Kenichi Kamiya  <kachick1@gmail.com>
-
-	* struct.c: Standardize a method signature of Struct#[]=.
-	  [ci skip][fix GH-1095]
-
-Mon Nov 16 15:42:36 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (#>=, #>, #<=, #<): Make use of Hash#>=, #>, #<, and
-	  #<= when comparing against an instance of the same kind.
-
-Mon Nov 16 15:37:11 2015  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Support symbol and string log level setting
-
-Mon Nov 16 15:33:11 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* tool/rbinstall.rb: fix wrong permission for gem specification without
-	  zlib runtime. [Bug #11685][ruby-dev:49343]
-
-Mon Nov 16 12:11:11 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/httpauth/basicauth.rb: fix a typo.
-	  [ci skip][fix GH-1099] Patch by @jwworth
-	* lib/webrick/httpauth/digestauth.rb: ditto.
-
-Sun Nov 15 18:28:43 2015  Kenichi Kamiya  <kachick1@gmail.com>
-
-	* vm_method.c (set_method_visibility): should fail if the receiver
-	  is frozen.  [ruby-core:71489] [Bug #11687]
-
-Sat Nov 14 22:15:07 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/lib/socket.rb: Specify frozen_string_literal: true.
-
-Sat Nov 14 21:44:56 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb: Use "<<" to reduce string allocation.
-
-Sat Nov 14 17:45:49 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tsort.rb: Specify frozen_string_literal: true.
-
-Sat Nov 14 17:25:15 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv-replace.rb: Specify frozen_string_literal: true.
-
-Sat Nov 14 17:00:13 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb: Specify frozen_string_literal: true.
-
-Sat Nov 14 16:43:02 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open3.rb: Specify frozen_string_literal: true.
-
-Sat Nov 14 05:04:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* node.h: remove old comments.
-
-Sat Nov 14 04:55:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* refactoring CREF related code.
-
-	* eval_intern.h: remove unused setter functions.
-	  CREF_CLASS_SET()
-	  CREF_NEXT_SET()
-	  CREF_SCOPE_VISI_COPY()
-
-	* eval_intern.h: rename flags:
-	  * NODE_FL_CREF_PUSHED_BY_EVAL_ -> CREF_FL_PUSHED_BY_EVAL
-	  * NODE_FL_CREF_OMOD_SHARED_ -> CREF_FL_OMOD_SHARED
-	  and use IMEMO_FL_USER1/2.
-
-	* vm.c (vm_cref_new): accept push_by_eval parameter.
-
-	* vm.c (vm_cref_new_use_prev): added for rb_vm_rewrite_cref().
-
-	* vm_insnhelper.c (vm_cref_push): accept pushed_by_eval parameter.
-
-	* vm_insnhelper.h: remove unused macros:
-	  COPY_CREF_OMOD() and COPY_CREF().
-
-	* vm_eval.c, insns.def: catch up this fix.
-
-Sat Nov 14 02:58:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_define_method): refactoring.
-	  * get CREF in this function.
-	  * cbase is no longer needed (CREF_CLASS(cref) is enough).
-
-	* compile.c: RubyVM::FrozenCore.define_method only accept 2 args.
-
-Sat Nov 14 02:34:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_define_method): do not use current CREF immediately,
-	  but check CREF in environment or methods. Methods defined in methods
-	  should be public.
-	  [Bug #11571]
-
-	* vm_method.c (rb_scope_module_func_check): check CREF in env or me.
-	  if CREF is contained by `me', then return FALSE.
-
-	* test/ruby/test_method.rb: add a test.
-
-Sat Nov 14 02:19:16 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: constify rb_cref_t::scope_visi;
-
-	* eval_intern.h (CREF_SCOPE_VISI_COPY): catch up this fix.
-
-	* vm_method.c: ditto.
-
-Sat Nov 14 01:53:52 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* pack.c (pack_unpack, AVOID_CC_BUG): Very ugly workaround for
-	  optimization bug of Oracle Solaris Studio 12.4 on Solaris
-	  with -xO4 optimization option. [Bug #11684]
-
-Fri Nov 13 23:00:23 2015  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* configure.in: unset LD_PRELOAD on mingw. msys2 child processes
-	  crash at make test-all with LD_PRELOAD.
-	  [ruby-core:71461] [Bug #11680]
-
-Fri Nov 13 14:00:43 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735]
-
-Fri Nov 13 13:09:16 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c: Merge ruby/openssl@81e1a30
-
-	* test/openssl/test_ssl.rb: ditto
-
-Fri Nov 13 13:05:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* prelude.rb (Thread.exclusive): warn as deprecated.
-
-Fri Nov 13 10:36:39 2015  Victor Nawothnig  <Victor.Nawothnig@gmail.com>
-
-	* parse.y (new_unless): optimize constant condition for `unless`
-	  as well as `if`.  [Fix GH-1092]
-
-Fri Nov 13 10:08:41 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/psych.gemspec: bump version to 2.0.15
-
-Thu Nov 12 18:44:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_magic_comment): should match exactly.
-	  [ruby-core:71460] [Bug #11679]
-
-Thu Nov 12 16:16:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/prelude.c.tmpl: enable tail call optimization.
-
-Thu Nov 12 14:17:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): ANDDOT at the head of the line denote
-	  line continuation from previous one to support fluent interface,
-	  as well as single dot.
-
-Thu Nov 12 13:49:50 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems 2.5.0+ HEAD(db78980).
-	  this version includes #1367 , #1373 , #1375
-	* test/rubygems: ditto.
-
-Thu Nov 12 10:53:41 2015  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_io_nonblock_noex2.rb: new benchmark based
-	  on bm_io_nonblock_noex.rb
-	* io.c (io_read_nonblock): move documentation to prelude.rb
-	  (io_write_nonblock): ditto
-	  (Init_io): private, internal methods for prelude.rb use only
-	* prelude.rb (IO#read_nonblock): wrapper + documentation
-	  (IO#write_nonblock): ditto
-	  [ruby-core:71439] [Feature #11339]
-
-Wed Nov 11 18:30:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): look up the key, then get default
-	  value and raise KeyError if the returned value is nil.
-	  [ruby-dev:49338] [Ruby trunk - Bug #11677]
-
-Wed Nov 11 17:38:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (local_var_list_add): skip internal local variable
-	  name by its type but not if it has a name.  internal local
-	  variable names are just unique per frame, not globally.
-	  [ruby-core:71437] [Bug #11674]
-
-Wed Nov 11 14:14:33 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* transcode.c: fix a typo
-	[ci skip][fix GH-1091] Patch by @jwworth
-
-Wed Nov 11 11:58:38 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (initialize): Connections are in passive mode per
-	  default now.  The default mode can be changed by
-	  Net::FTP.default_passive=.
-	  [ruby-core:71146] [Feature #11612]
-
-	* lib/net/ftp.rb (default_passive=, default_passive): new methods.
-
-Wed Nov 11 09:03:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): respect default value of a hash.  no
-	  longer raises KeyError unless the default value of the hash is
-	  nil.  [ruby-core:71354] [Bug #11661]
-
-Tue Nov 10 20:35:12 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb: Remove indicator for "frozen_string_literal: true".
-
-	* lib/pp.rb: Ditto.
-
-	* lib/prettyprint.rb: Ditto.
-
-	* lib/resolv.rb: Ditto.
-
-	* lib/securerandom.rb: Ditto.
-
-	* lib/tmpdir.rb: Ditto.
-
-	* lib/unicode_normalize/tables.rb: Ditto.
-
-	* test/net/ftp/test_buffered_socket.rb: Ditto.
-
-	* test/net/ftp/test_mlsx_entry.rb: Ditto.
-
-	* test/open-uri/test_open-uri.rb: Ditto.
-
-	* test/open-uri/test_ssl.rb: Ditto.
-
-	* test/pathname/test_pathname.rb: Ditto.
-
-	* test/test_pp.rb: Ditto.
-
-	* test/test_prettyprint.rb: Ditto.
-
-	* tool/transcode-tblgen.rb: Ditto.
-
-	* ext/pathname/lib/pathname.rb: Ditto.
-
-Tue Nov 10 18:42:24 2015  Aleksandrs Ledovskis  <aleksandrs@ledovskis.lv>
-
-	* defs/id.def, parse.y: Switch internal token name to reflect
-	  current form of safe-call operator.  [Fix GH-1090]
-
-Tue Nov 10 18:25:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_to_proc): use rb_func_proc_new to make light
-	  weight proc.  [Feature #11653]
-
-Tue Nov 10 18:23:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (cfunc_proc_t): add room for me.
-
-	* proc.c (cfunc_proc_new): generalise for cfunc proc without env.
-
-	* proc.c (rb_func_proc_new, rb_func_lambda_new): new functions to
-	  make proc/lambda without env from cfunc.
-
-Tue Nov 10 17:32:35 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* bootstraptest/test_fork.rb ([ruby-dev:37934]): :NPROC (RLIMIT_NPROC)
-	  is not supported on some platforms (e.g. Solaris 10).
-
-Tue Nov 10 16:57:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_to_proc): new method Hash#to_proc.
-	  [Feature #11653]
-
-Tue Nov 10 14:34:09 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (rb_time_timespec_new): swap utc and localtime
-	  to generate gmt flag by INT_MAX - gmtoff.
-
-Tue Nov 10 14:01:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_{le,lt,ge,gt}): new methods, Hash#<=, Hash#<,
-	  Hash#>=, Hash#>, to test if all elements of a hash are also
-	  included in another hash, and vice versa.
-	  [ruby-core:68561] [Feature #10984]
-
-Tue Nov 10 11:25:29 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (rb_timespec_now): added.  [Feature #11558]
-
-	* time.c (rb_time_timespec_new): added.  [Feature #11558]
-
-Tue Nov 10 06:17:17 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (rb_autoload_load): allow recursive calls
-	  [ruby-core:71345] [Bug #11658]
-	* test/ruby/test_autoload.rb (test_autoload_while_autoloading):
-	  new test by: Hiroshi Shirosaki <h.shirosaki@gmail.com>
-	  [ruby-core:71390]
-
-Tue Nov 10 00:36:46 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Message::MessageEncoder#put_labels):
-	  Prevent overflow of pointer to labels.
-	  Patch by Hannes Georg.  [ruby-core:71248] [Bug #11632]
-
-Tue Nov 10 00:25:41 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gems/bundled_gems: update to power_assert 0.2.6.
-
-Mon Nov  9 21:48:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_check_funcall_default): split from
-	  rb_check_funcall to return the given fallback value.
-
-	* object.c (rb_obj_dig): use rb_check_funcall_default so that tail
-	  call optimization will be possible.  [Feature #11643]
-
-Mon Nov  9 21:27:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_dig): new method Array#dig.
-
-	* hash.c (rb_hash_dig): new method Hash#dig.
-
-	* object.c (rb_obj_dig): dig in nested arrays/hashes.
-	  [Feature #11643]
-
-Mon Nov  9 18:00:47 2015  Yuki Nishijima  <mail@yukinishijima.net>
-
-	* gems/bundled_gems: Upgrade the did_you_mean gem to 1.0.0.beta3
-
-Mon Nov  9 17:38:14 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/runner.rb: use official repository for coverage tool.
-	* Makefile.in: ditto.
-	* common.mk: ditto.
-	* .gitignore: ignored third party repositories.
-
-Mon Nov  9 17:29:09 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): Dynamic string literals should be
-	  frozen.
-	  [ruby-core:57574] [Feature #8976]
-
-Mon Nov  9 15:56:07 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: Use ruby organization url for simplecov repository.
-
-Sun Nov  8 16:24:09 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* NEWS: describe addition of File::TMPFILE
-
-Sun Nov  8 15:19:17 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* file.c: Add O_TMPFILE.
-
-Sun Nov  8 14:24:43 2015  windwiny  <windwiny.ubt@gmail.com>
-
-	* method.h (METHOD_ENTRY_{VISI,BASIC,FLAGS}_SET): suppress
-	  shift-op-parentheses warnings.  [Fix GH-1082]
-
-Sun Nov  8 14:01:22 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/psych_emitter.c: backport 5bd7744 from tenderlove/psych.
-	  support backward compatibility of Ruby 2.0
-
-Sun Nov  8 10:55:10 2015  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* io.c (rb_io_gets_m): Update IO#gets doc for characters more than
-	  1 byte.  [Fix GH-1085]
-
-Sun Nov  8 10:37:58 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/uri/ftp.rb: fix a typo.
-	  [fix GH-1084][ci skip] Patch by @windwiny
-
-Sun Nov  8 08:10:31 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_trace.c (exec_hooks_precheck): check need_clean everytime
-	  to clean-up unused hooks.
-
-	* vm_trace.c (list->need_clean): use as boolean value.
-
-Sun Nov  8 01:31:27 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP#initialize):
-	  default value of Net::HTTP#open_timeout is now 60 (was nil).
-
-Sat Nov  7 12:18:05 2015  Eric Wong  <e@80x24.org>
-
-	* string.c (id_to_s): remove redundant variable
-	  (rb_obj_as_string): trade id_to_s for idTo_s
-	  (rb_str_equal): replace rb_intern(...) with pre-defined ID
-	  (rb_str_cmp_m): ditto
-	  (rb_str_match): ditto
-	  (str_upto_each): ditto
-	  (rb_str_sum): ditto
-	  (Init_String): remove id_to_s initialization
-
-Sat Nov  7 11:40:05 2015  Eric Wong  <e@80x24.org>
-
-	* thread.c (rb_cThreadShield): make static
-
-Sat Nov  7 09:51:38 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
-	  maintain trace_running counter on internal events.
-
-	  This patch is made by Takashi Kokubun <takashikkbn@gmail.com>.
-	  [Bug #11603] https://github.com/ruby/ruby/pull/1059
-
-Sat Nov  7 03:32:27 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h (RSTRUCT_PTR): need a close parenthesis.
-
-Sat Nov  7 01:32:06 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* dir.c (dir_fileno, dirfd): support of Dir#fileno on Solaris 10.
-	  Solaris 10 does not have dirfd, but the file descriptor of a
-	  directory is stored in the d_fd or dd_fd member in the DIR struct.
-	  Note that Solaris 11 has dirfd(3C).
-
-	* configure.in: checks for DIR.d_fd and DIR.dd_fd on Solaris 10.
-
-Fri Nov  6 23:13:53 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* array.c: clarifies Array#reject! documentation.
-	  [fix GH-894][ci skip] Patch by @GxSplinter
-
-Fri Nov  6 20:18:25 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/runner.rb: extracted test helper.
-	* test/lib/zombie_hunter.rb: ditto.
-
-Fri Nov  6 18:07:47 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/ruby.h (rb_array_const_ptr, rb_struct_const_ptr):
-	  Suppress pointer type mismatch warnings occurred with old version
-	  of Fujitsu C Compiler (fcc) on Solaris 10. The warnings cause
-	  failure of TestMkmf::TestConvertible. [Bug #11644] [ruby-dev:49326]
-	* include/ruby/ruby.h (FIX_CONST_VALUE_PTR): macro for the above,
-	  only effective with fcc.
-
-Fri Nov  6 12:39:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/id.def (token_ops), parse.y (parser_yylex): change DOTQ
-	  from ".?" to "&.".  [ruby-core:71363] [Feature #11537]
-
-Fri Nov  6 09:01:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (kwd_append): fix segv after invalid keyword argument,
-	  preceding keyword list is NULL when syntax error is there.
-	  [ruby-core:71356] [Bug #11663]
-
-Fri Nov  6 06:59:37 2015  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_autoload: hoist out ruby_impl_require
-
-Thu Nov  5 13:03:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/id.def (token_ops): gather associations between IDs,
-	  operators, and parser tokens.
-
-Thu Nov  5 10:17:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (make_addrinfo): use RARRAY_ASET for
-	  write-barrier.
-
-	* ext/tk/tcltklib.c ({call,eval,invoke}_queue_handler): ditto.
-
-	* ext/tk/tkutil/tkutil.c (ary2list, ary2list2): ditto.
-
-Thu Nov  5 10:09:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/**/*.c: prefer RARRAY_AREF to indexing RARRAY_CONST_PTR.
-	  pointed out by hanmac.
-	  https://github.com/ruby/ruby/commit/3553a86#commitcomment-14187670
-
-Wed Nov  4 17:33:24 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/debug.rb: Add documentation for #thread_list_all.
-	  [Misc #11580][ci skip]
-
-Wed Nov  4 15:45:59 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* class.c: fix documentation for rb_define_class{_id}_under.
-	  [fix GH-991][ci skip] Patch by @kachick
-
-Wed Nov  4 15:40:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* method.h: fix typo. Patch by @davydovanton
-	  [fix GH-1076][ci skip]
-
-Wed Nov  4 15:39:32 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* hash.c: use correct grammar. Patch by @tveastman
-	  [fix GH-1079][ci skip]
-
-Wed Nov  4 11:38:23 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* process.c (proc_getsid): [DOC] Fix double word 'for' and typo.
-	  [Fix GH-1080]
-
-Wed Nov  4 06:01:52 2015  Eric Wong  <e@80x24.org>
-
-	* include/ruby/ruby.h (struct RObject): hide iv_index_tbl type
-	  [ruby-core:71306] [Feature #11647]
-
-Tue Nov  3 06:48:58 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (find_class_path): remove cast for rb_class_ivar_set
-	  (rb_ivar_set): ditto
-	  (rb_cvar_set): ditto
-
-Tue Nov  3 06:18:21 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (rb_global_tbl): convert to id_table
-
-Tue Nov  3 01:58:46 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* parse.y (NO_QCALL): fix type mismatch of operands that causes
-	  compile error with Oracle Solaris Studio on Solaris.
-	  [Bug #11645] [ruby-dev:49327]
-
-Sun Nov  1 17:14:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* id_table.c (mix_id_table_insert): do not touch list during
-	  list->hash transition because GC can run during transition.
-
-Sun Nov  1 11:07:31 2015  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_memsize): account for rb_call_cache entries
-
-Sun Nov  1 09:12:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_yylex): ':' separated by a comment and a newline
-	  is not valid as symbol.
-
-Sat Oct 31 20:15:48 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/openssl/test_pair.rb: skipped tests if openssl doesn't support
-	  ECDH cipher.
-
-Sat Oct 31 14:58:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* man/ruby.1 (SYNOPSIS): remove extraneous space for -F option as
-	  it does not allow spaces before its argument.
-	  [ruby-core:71283] [Bug #11641]
-
-Sat Oct 31 14:58:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* man/ruby.1 (SYNOPSIS): remove extraneous space for -F option as
-	  it does not allow spaces before its argument.
-	  [ruby-core:71283] [Bug #11641]
-
-Sat Oct 31 10:22:49 2015  yui-knk  <spiketeika@gmail.com>
-
-	* eval_error.c (undef_mesg_for): fix typo.  Before this commit
-	  `ArgumentError: malformed format string - %$` was raised when
-	  `NameError#message` is called.  [ruby-core:71282] [Bug #11640]
-	  [Fix GH-1077]
-
-Fri Oct 30 21:12:45 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gems/bundled_gems: update to power_assert 0.2.5.
-
-Fri Oct 30 19:29:52 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (newobj_slowpath): do not need to use flags hack (commit miss).
-
-Fri Oct 30 19:08:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (heap_get_freeobj_from_next_freepage): not so UNLIKELY.
-
-Fri Oct 30 18:09:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (newobj_slowpath): reduce 1 parameter to use only registers
-	  for performance.
-
-	  On my laptop, 'N.times{x = []}' (where N = 29_000_000) is
-	  1.86 sec -> 1.74 sec.
-
-Fri Oct 30 12:53:21 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/ruby/test_call.rb: added test for safe navigation operator.
-	  [fix GH-1066]
-
-Fri Oct 30 12:47:34 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: fix wrong commit name.
-
-Fri Oct 30 12:36:16 2015  yui-knk  <spiketeika@gmail.com>
-
-	* vm_method.c: added documentation of protected/private methods.
-	  [fix GH-1072]
-	* test/ruby/test_module.rb: added testcase for method_defined?
-	  [fix GH-1071]
-
-Fri Oct 30 12:06:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_class_ivar_set): rename as class specific ivar
-	  setter, and st_table is no longer involved.
-
-Fri Oct 30 11:36:33 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (generic_ivar_remove): adjust type, set valp
-	  (rb_obj_remove_instance_variable): simplify call
-	* test/ruby/test_object.rb (test_remove_instance_variable):
-	  expand for implementation details
-
-Fri Oct 30 10:37:56 2015  Eric Wong  <e@80x24.org>
-
-	* internal.h (rb_st_insert_id_and_value): update prototype
-	* variable.c (rb_st_insert_id_and_value): reduce args
-	  (find_class_path): adjust call for less args
-	  (rb_ivar_set): ditto
-	  (rb_cvar_set): ditto
-	* class.c (rb_singleton_class_attached): ditto
-
-Fri Oct 30 09:57:22 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: update latest gems.
-	  test-unit-3.1.5 and minitest-5.8.2
-
-Fri Oct 30 09:54:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems HEAD(60d7972).
-	  this version contains pull requests number of #1343, #1356, #1357, #1363
-	  at https://github.com/rubygems/rubygems/pulls
-	* test/rubygems: ditto.
-
-Fri Oct 30 07:38:29 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (getinlinecache/setinlinecache): compare ic->ic_cref and
-	  current cref only when cached CREF list includes singleton class.
-
-	  Singleton classes have own namespaces, so that we need to check
-	  cref as a key (#10943).
-
-	  However, if current CREF list does not include singleton class,
-	  no need to check CREF because it should be same name space.
-
-	* vm_insnhelper.c (vm_get_const_key_cref): add a function returns
-	  CREF only when it includes singleton class.
-
-	* vm_core.h: constify iseq_inline_cache_entry::ic_cref.
-
-Fri Oct 30 06:43:50 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_env_cref): make it inline for performance.
-
-	* vm_insnhelper.c (rb_vm_get_cref): use NULL instead of 0.
-
-Fri Oct 30 06:20:40 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def: nobody set ic->ic_value.value to Qundef.
-
-Fri Oct 30 06:15:50 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: add ifndef guard for VM_CHECK_MODE.
-
-Fri Oct 30 06:13:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_check_frame_detail): should require me for
-	  VM_FRAME_FLAG_BMETHOD type frame.
-
-Thu Oct 29 18:42:30 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_ptr): specify NOINLINE so that gc_mark() can return
-	  immediately when obj is not a markable object.
-
-Thu Oct 29 18:05:22 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* encoding.c (rb_enc_check_str): add for performance.
-	  This function only accepts T_STRING (and T_REGEXP).
-
-	  This patch improves performance of a tiny_segmenter benchmark
-	  (num=2) 2.54sec -> 2.42sec on my machine.
-	  https://github.com/chezou/TinySegmenter.jl/blob/master/benchmark/benchmark.rb
-
-	* encoding.c: add ENC_DEBUG and ENC_ASSERT() macros.
-
-	* internal.h: add a decl. of rb_enc_check_str().
-
-	* string.c (rb_str_plus): use rb_enc_check_str().
-
-	* string.c (rb_str_subpat_set): ditto.
-
-Thu Oct 29 17:16:40 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: export rb_wb_(un)protected_newobj_of()
-	  because some extensions include internal.h.
-
-Thu Oct 29 16:42:19 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_imemo_new): should not pass FL_WB_PROTECTED flag.
-
-	* gc.c (rb_wb_protected_newobj_of): add more assertions.
-
-	* gc.c (rb_wb_unprotected_newobj_of): ditto.
-
-Thu Oct 29 16:20:26 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: introduce rb_wb_unprotected_newobj_of() and
-	  rb_wb_protected_newobj_of(), pass the WB_PROTECTED
-	  information explicitly.
-
-	* internal.h: use introduced functions by NEWOBJ_OF().
-	  `flag' is immediate value, so that C compilers can
-	  solve them at compile time.
-
-	* include/ruby/ruby.h: add a comment about that.
-
-Thu Oct 29 14:52:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add rb_objspace::flags::has_hook to represent hook availability.
-
-	* gc.c: add gc_event_hook_available_p(objspace) to check that flag.
-
-	* gc.c (newobj_of): use gc_event_hook_available_p() instead of
-	  checking gc_event_hook_needed_p(objspace, RUBY_INTERNAL_EVENT_NEWOBJ).
-	  for performance.
-
-	* gc.c (newobj_init): add UNLIKELY() for FL_WB_PROTECTED flag.
-
-	* gc.c (newobj_init): change parameters order (trivial change).
-
-Thu Oct 29 14:45:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_thread_struct): move forward declarations before
-	  used.
-
-Thu Oct 29 14:07:54 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_ptr): remove debug code for #11244.
-
-Thu Oct 29 10:08:33 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (struct autoload_state): usable as wait-queue head
-	  (struct autoload_data_i): remove 2 words of overhead
-	  (autoload_i_mark): remove marking for thread
-	  (autoload_reset): adjust for struct changes
-	  (rb_autoload): ditto
-	  (rb_autoloading_value): ditto
-	  (rb_autoload_load): ditto
-	  (const_update): ditto
-
-Thu Oct 29 08:48:05 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (struct autoload_data_i): add waitq_head
-	  (struct autoload_state): new struct
-	  (autoload_require): save result in autoload_state for use
-	    in autoload_reset
-	  (autoload_reset): wake up other waiters with open-coded
-	    wait-queues
-	  (rb_autoload_load): add ensure autoload_const_set happens
-	    atomically w.r.t. autoload-triggered "require"
-	  [ruby-core:70075] [ruby-core:71239] [Bug #11384]
-
-Wed Oct 29 00:39:50 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/rubygems/test_gem_commands_server_command.rb
-	  (test_handle_options_port): change port from http to discard.
-	  Solaris does not include "http 80/tcp" in its default
-	  /etc/inet/services. AFAIK, discard (9/tcp) is older than http
-	  and it is expected that all OS can resolve the service name.
-	  [Bug #10004] [ruby-core:63518]
-
-Wed Oct 28 23:52:48 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* probes_helper.h (RUBY_DTRACE_HOOK): add RB_GC_GUARD, though paranoic.
-
-Wed Oct 28 15:36:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_name_err_new): store the receiver directly.
-
-	* error.c (name_err_receiver): return directly stored receiver.
-	  [Feature #10881]
-
-	* error.c (name_err_mesg_to_str): quote the name if unprintable.
-
-	* object.c (check_setter_id): use rb_check_id to convert names.
-
-	* variable.c (uninitialized_constant): use NameError::message to
-	  keep the receiver of uninitialized constant.  [Feature #10881]
-
-	* error.c (rb_name_err_new): new function to create NameError
-	  exception instance.  [Feature #10881]
-
-Wed Oct 28 13:29:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (new_attr_op_assign): fix op_assign type, which is
-	  already an ID since r52284.  [Feature #11537]
-
-Tue Oct 27 23:14:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/id.def: enable anonymous IDs not to expose internal IDs for
-	  frozen-string-literal-debug by Marshal.dump.
-
-Tue Oct 27 17:06:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/id.def: move internal IDs for frozen-string-literal-debug.
-
-Tue Oct 27 16:41:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_error_frozen_object): use rb_attr_get instead of
-	  rb_ivar_get to get rid of warnings for string objects created
-	  when frozen-string-literal-debug is disabled.
-
-Tue Oct 27 16:18:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/logger.rb (Logger::Period#previous_period_end): as weekly
-	  rotation shifts the log file on Sundays, the end date of the
-	  previous period should be Saturdays.  fix r45072.
-	  [ruby-dev:49314] [Bug #11622]
-
-Tue Oct 27 16:12:37 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_dump.c (rb_print_backtrace): our addr2line doesn't work on sparc.
-	  http://rubyci.s3.amazonaws.com/unstable11s/ruby-trunk/log/20151027T043311Z.log.html.gz
-
-Tue Oct 27 12:00:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/logger.rb (Logger::Period#next_rotate_time): get rid of
-	  adding to mday not to exceed the days of the month.
-	  [ruby-core:71185] [Bug #11620]
-
-Mon Oct 26 22:43:03 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/ruby/test_module.rb (test_method_defined): Add test cases
-	  for `public/protected/private _method_defined?`
-	  These methods accept string as argument, so add string argument
-	  cases.  [Fix GH-1067]
-
-Mon Oct 26 22:23:30 2015  SimonDKnight  <simondknight@hotmail.com>
-
-	* lib/racc/rdoc/grammar.en.rdoc: Grammatical errors fixed.
-	  [Fix GH-1070]
-
-Mon Oct 26 18:36:43 2015  Shota Fukumori (sora_h) <her@sorah.jp>
-
-	* vm_method.c(rb_method_entry_make):
-	  [DOC] [ci skip] Remove a needless space from comment
-	  [Fixes GH-1069] Patch by @yui-knk
-
-Mon Oct 26 17:30:13 2015  Ryan Hosford  <tad.hosford@gmail.com>
-
-	* lib/fileutils.rb: rename tailing to trailing.
-	  [Misc #11548]
-
-Mon Oct 26 17:11:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (call_op, call_op2): fix values on ripper.  [Feature #11537]
-
-Mon Oct 26 12:55:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (call_op2): separate from call_op and also allow "::",
-	  while dot_or_colon should not allow ".?".  [Feature #11537]
-
-Mon Oct 26 01:03:23 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* thread_pthread.c: fix compile errors when
-	  USE_SLEEPY_TIMER_THREAD is disabled.
-
-Sun Oct 25 10:12:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (op_tbl): add DOTQ for ripper.  [Feature #11537]
-
-Sat Oct 24 22:51:18 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* configure.in: fixed build failure of Haiku.
-	  [fix GH-984] Patch by @kallisti5
-	* ext/socket/getaddrinfo.c: ditto.
-	* ext/socket/getnameinfo.c: ditto.
-	* ext/socket/rubysocket.h: ditto.
-
-Sat Oct 24 21:16:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/fileutils/test_fileutils.rb (test_uptodate): relax error
-	  message format.  [Feature #9025], [ruby-core:71178] [Bug #11617]
-
-Sat Oct 24 21:06:43 2015  Shota Fukumori (sora_h)  <her@sorah.jp>
-
-	* lib/mkmf.rb: Revert r45640 because it may lead to link
-	  with different libruby. [Bug #9760]
-
-Sat Oct 24 15:42:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/test_method.rb: relax error message format.
-
-	* test/ruby/test_arity.rb (err_mess): ditto.
-	  [Feature #9025], [ruby-core:71178] [Bug #11617]
-
-Sat Oct 24 12:47:47 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* vm_insnhelper.c: improved error message for "wrong number
-	  of arguments", distinguishing given and expected argument
-	  numbers clearly. [Feature #9025]
-
-Sat Oct 24 11:57:59 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.c: remove the typedef redeclaration of
-	  vm_call_handler.
-
-Sat Oct 24 07:29:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (def_instance_delegator, def_single_delegator):
-	  match backtraces against ::Forwardable in case the target class
-	  is a subclass of BasicObject and does not include Kernel.
-	  [ruby-core:71176] [Bug #11616]
-
-Sat Oct 24 04:10:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (make_compile_option_value): include frozen_string_literal*
-	  in a made option value.
-
-	* vm_opts.h: forgot to add OPT_FROZEN_STRING_LITERAL_DEBUG
-	  at last commit.
-
-Sat Oct 24 03:58:02 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ruby.c: introduce --enable-frozen-string-literal-debug option.
-	  If this option is enabled, the modify error will be:
-	    can't modify frozen String (RuntimeError) =>
-	    can't modify frozen String, created at test.rb:3 (RuntimeError)
-
-	* iseq.h: add compile option frozen_string_literal_debug.
-
-	* compile.c: catch up this fix.
-
-	* error.c (rb_error_frozen): ditto.
-
-	* iseq.c (set_compile_option_from_hash): ditto.
-
-	* test/ruby/test_rubyoptions.rb: add a test for this fix.
-
-Sat Oct 24 02:02:24 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c: introduce new call handler for simple ISeqs.
-
-	  vm_call_iseq_setup_normal_0start() is simple, however it has
-	  some loops/conditions depends on ISeq::param.size and
-	  ISeq::local_size (in vm_push_frame(), inlined into this function).
-
-	  There are many simple methods which has a few parameters and local
-	  variables. So that this patch introduces several special functions
-	  generated in vm_call_iseq_optimized.inc by
-	  tool/mk_call_iseq_optimized.rb.
-
-	  This script makes
-	    vm_call_iseq_setup_normal_0start_Xparams_Ylocals()
-	  where X is 0 to 3 and Y is 1 to 6 (as current setting).
-	  In this case, X * Y = 24 functions are created.
-
-	  These functions creates fast method dispatch by inlining
-	  vm_push_frame() with immediate params/locals sizes.
-
-	  On my laptop, we can have the following results.
-
-	  vm2_method*       1.083 (8.3% faster)
-	  vm2_poly_method*  0.961 (3.4% slower)
-
-	  It shows 8.3% faster for inner loop method dispatch (hit inline
-	  cache), but 3.4% slower when inline cache miss because we need
-	  to find a suitable call handler.
-
-	* common.mk: add a rule for vm_call_iseq_optimized.inc.
-
-	* tool/mk_call_iseq_optimized.rb: added.
-
-	* vm.c: include vm_call_iseq_optimized.inc.
-
-Sat Oct 24 01:58:50 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: define vm_call_handler.
-
-Sat Oct 24 01:56:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, vm_insnhelper.h: move definition of VMDEBUG
-	  from vm_insnhelper.h to vm_core.h.
-
-Sat Oct 24 01:51:01 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* NEWS: [DOC] In the new safe call syntax, arguments are evaluated
-	  only if a call is made.
-
-	* doc/syntax/calling_methods.rdoc: Fix a typo.
-
-Sat Oct 24 00:38:34 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/forwardable (def_instance_delegator, def_single_delegator):
-	  rescue ::Exception instead of Exception in case Exception is
-	  defined under the target class.
-	  [ruby-core:71175] [Ruby trunk - Bug #11615]
-
-Fri Oct 23 21:10:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_mesg_to_str): separate class names from the
-	  receiver description.
-
-	* vm_eval.c (make_no_method_exception, raise_method_missing): add
-	  format specifiers for class names.
-
-Fri Oct 23 18:10:32 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* .gitignore: ignored environmental wrapper files.
-
-Fri Oct 23 17:55:29 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/irb.rb: Ignored assignment of STDOUT.sync = true
-	  when irb.rb loaded. It's affected to IDE such as Jetbrain.
-	  [fix GH-864] Patch by @os97673
-
-Fri Oct 23 16:35:08 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/ipaddr.rb, test/test_ipaddr.rb: Reject invalid address contained
-	  EOL string. Patch by @kachick [fix GH-942][Bug #11513]
-
-Fri Oct 23 16:03:26 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* file.c: fix indent style. [fix GH-977]
-	* test/ruby/test_string.rb: indent. [fix GH-975]
-	  [ci skip] These patches are contributed from @yui-knk
-
-Fri Oct 23 15:46:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* string.c: Added method signature to include hash. It's inconsistency
-	  with `gsub` method signature.
-	  [ci skip][fix GH-1023] Patch by @danielevans
-
-Fri Oct 23 15:25:51 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: remove an empty comment line and -*-.
-
-Fri Oct 23 15:20:02 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (gettextfile, getbinaryfile): use the safe
-	  navigation operator.
-
-Fri Oct 23 13:51:33 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test_call.rb (test_safe_call): Add test cases for safe
-	  navigation operator assignment.  [Fix GH-1064]
-	  Validate:
-	  * can assign an attribute which is `nil`
-	  * can "or assign" an attribute which is `nil`
-
-Fri Oct 23 11:58:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): optimize lengthy safe
-	  navigation method chain.  [Feature #11537]
-
-Fri Oct 23 10:58:41 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/matrix/eigenvalue_decomposition.rb (tridiagonalize): fix
-	  indentation to avoid a warning when the command line option -w of
-	  ruby is specified.
-
-	* lib/matrix/eigenvalue_decomposition.rb (hessenberg_to_real_schur):
-	  change the name of a block parameter to avoid a warning when the
-	  command line option -w of ruby is specified.
-
-Fri Oct 23 10:49:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): support safe navigation of simple
-	  attribute assignment.  [Feature #11537]
-
-	* parse.y (mlhs_node, lhs, attrset_gen): ditto.  keep mid
-	  non-attrset as the sign of safe navigation.
-
-Fri Oct 23 07:17:11 2015  Eric Wong  <e@80x24.org>
-
-	* test/io/wait/test_io_wait.rb (test_wait_eof): test return value
-
-Fri Oct 23 00:32:02 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ssl_npn_select_cb): explicitly raise error
-	  in ext/openssl instead of OpenSSL itself because LibreSSL
-	  silently truncate the selected protocol name by casting the length
-	  from int to unsigned char. [Bug #11369]
-	  Patch by Jeremy Evans <merch-redmine@jeremyevans.net>
-
-Fri Oct 23 00:49:45 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/un.rb (help): change the name of a block parameter to avoid
-	  a warning when the command line option -w of ruby is specified.
-
-Fri Oct 23 00:22:20 2015  Josef Simanek  <josef.simanek@gmail.com>
-
-	* string.c (rb_str_tr): [DOC] Escape backslash in String#tr
-	  documentation.  [Fix GH-1063]
-
-Fri Oct 23 00:19:04 2015  yui-knk  <spiketeika@gmail.com>
-
-	* array.c (rb_ary_collect): [DOC] Fix space of code example of
-	  Array#map.  [Fix GH-1062]
-
-Thu Oct 22 18:52:53 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* vm_eval.c (rb_f_loop): When a loop is stopped by a StopIteration
-	  exception, return what the enumerator has returned instead of
-	  nil. [ruby-core:71133] [Feature #11498]
-
-Thu Oct 22 18:25:10 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (idle): add a new argument timeout for keep-alive.
-	  [ruby-core:63693] [Bug #10031]
-
-Thu Oct 22 15:30:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): peephole optimization for
-	  branchnil jumps.
-
-	* compile.c (iseq_compile_each): generate save navigation operator
-	  code.
-
-	* insns.def (branchnil): new opcode to pop the tos and branch if
-	  it is nil.
-
-	* parse.y (NEW_QCALL, call_op, parser_yylex): parse token '.?'.
-	  [Feature #11537]
-
-Thu Oct 22 13:16:19 2015  Guilherme Reis Campos  <guilhermekbsa@gmail.com>
-
-	* dir.c (ruby_brace_expand): glob brace expansion edge case fix.
-	  When there are closing braces '}' before a open brace '{' it
-	  must be ignored and considered as literal.
-	  [ruby-core:71138] [Bug #11609]
-
-Thu Oct 22 13:13:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_next_argv): check ARGV element type, and try
-	  conversion if necessary.  [ruby-core:71140] [Bug #11610]
-
-Thu Oct 22 11:11:16 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/net/ftp/test_ftp.rb: add tests for getbinaryfile and
-	  gettextfile.
-
-Wed Oct 21 18:34:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_magic_comment): allow a sole magic comment without
-	  indicators, neither other non-space comments.  [Feature #8976]
-
-Tue Oct 20 12:17:56 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Add basic argument checking to Prime.prime?
-	  [Bug #11606]
-
-Tue Oct 20 12:17:50 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Optimize Integer#prime?
-	  Patch by Nick Slocum [Bug #10354]
-
-Tue Oct 20 08:12:47 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in: pthread_getattr_np is broken on AIX.
-	  More specifically, the stack address and size returned are
-	  not correct.
-
-Tue Oct 20 05:54:46 2015  Eric Wong  <e@80x24.org>
-
-	* ext/fiddle/closure.c (callback): static function
-
-Mon Oct 19 10:33:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/init.c (rsock_raise_socket_error): get rid of a glibc
-	  bug.  [ruby-core:71100] [Bug #11600]
-
-Mon Oct 19 01:26:26 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_identical_p): not necessary to compare the paths after
-	  comparing the file indexes on Windows.  designate by kosaki.
-
-Sun Oct 18 21:17:27 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb: Specify frozen_string_literal: true.
-
-Sun Oct 18 14:37:56 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c (fill_random_bytes_urandom): add a comment why using
-	  O_NONBLOCK and O_NOCTTY.
-
-Sun Oct 18 13:24:17 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* random.c (fill_random_bytes_syscall): use ATOMIC_SET() for
-	  updating try_syscall.
-
-Sun Oct 18 13:03:52 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/backward/util.h: Good-by Borland-C.
-
-Sun Oct 18 13:03:09 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* common.mk: add a comment how to use "make test-all"
-
-Sun Oct 18 12:59:22 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* common.mk: add comments how to use "make benchmark"
-
-Sun Oct 18 12:58:15 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb: Specify frozen_string_literal: true.
-
-Sun Oct 18 11:22:52 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* dln.c: remove defined(__WATCOMC__).
-
-Sun Oct 18 11:16:33 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/mkmf.rb: Good-by Borland-C.
-
-Sun Oct 18 11:04:36 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* numeric.c: Good-by Borland-C.
-	* include/ruby/backward/rubyio.h: ditto.
-	* include/ruby/backward/st.h: ditto.
-	* include/ruby/backward/util.h: ditto.
-	* include/ruby/backward/rubysig.h: ditto.
-	* include/ruby/backward/classext.h: ditto.
-	* dln.c: ditto.
-	* gc.c: ditto.
-	* win32/resource.rb: ditto.
-	* win32/dir.h: ditto.
-	* ext/tk/tcltklib.c: ditto.
-	* NEWS: announce that Borland-C is no longer supported.
-
-Sun Oct 18 10:54:52 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* dln.c: simplify #ifdef. _WIN32 and __CYGWIN__ are exclusive.
-	  see include/ruby/defines.h
-	* gc.c: ditto.
-	* ext/sdbm/_sdbm.c: ditto.
-
-Sun Oct 18 10:42:19 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ruby.c (open_load_file): add a comment.
-
-Sun Oct 18 10:12:46 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* file.c (rb_file_identical_p): simplify ifdefs
-
-Sun Oct 18 10:01:40 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ChangeLog: Good-bye OS/2.
-	* common.mk: ditto.
-	* configure.in: ditto.
-	* dln_find.c: ditto.
-	* ext/Setup.emx: ditto.
-	* ext/extmk.rb: ditto.
-	* ext/socket/extconf.rb: ditto.
-	* ext/zlib/extconf.rb: ditto.
-	* file.c: ditto.
-	* include/ruby/defines.h: ditto.
-	* io.c: ditto.
-	* lib/mkmf.rb: ditto.
-	* missing/os2.c: ditto.
-	* process.c: ditto.
-	* ruby.c: ditto.
-	* NEWS: announce OS/2 is no longer supported.
-
-Sun Oct 18 08:50:15 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/defines.h (DOSISH): add comments.
-
-Sun Oct 18 08:26:51 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (fptr_finalize): don't release gvl if fptr is not writable.
-	  writable fd may block on close(2) when it's on NFS. But readonly
-	  fd doesn't. [Bug #11559]
-	  result: make benchmark OPTS="-p bm_require_t -e ruby-trunk -e ruby-2.2.2"
-	    build-ruby:             0.171
-	    ruby 2.3.0dev(r52151):  0.659
-	    ruby 2.2.0p95 (r50295): 0.834
-
-Sun Oct 18 09:32:58 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* file.c (ruby_is_fd_loadable): this should be fail if st_mode is
-	  not regular file nor FIFO.
-
-Sun Oct 18 09:20:17 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ruby.c (open_load_file): use rb_thread_wait_fd() instead of reopen.
-
-Sun Oct 18 05:11:22 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ruby.c (open_load_file): reset O_NONBLOCK after open.
-	  Even if S_ISREG() is true, the file may be file on FUSE filesystem
-	  or something. We can't assume O_NONBLOCK is safe.
-	  Moreover, we should wait if the path is point to FIFO. That's
-	  FIFO semantics. GVL should be transparent from ruby script.
-	  Thus, just reopen without O_NONBLOCK for filling the requirements.
-	  [Bug #11060][Bug #11559]
-
-	* ruby.c (loadopen_func): new for the above.
-
-	* file.c (ruby_is_fd_loadable): new. for checks loadable file type
-	  of not.
-	* file.c (rb_file_load_ok): use ruby_is_fd_loadble()
-	* internal.h: add ruby_is_fd_loadble()
-
-	* common.mk: now, ruby.o depend on thread.h.
-
-	* test/ruby/test_require.rb
-	(TestRequire#test_loading_fifo_threading_success): new test.
-	  This test successful case that loading from FIFO.
-
-	* test/ruby/test_require.rb
-	(TestRequire#test_loading_fifo_threading_raise): rename from
-	  test_loading_fifo_threading. You shouldn't rescue an exception
-	  if you test raise or not.
-	  Moreover, this case should be caught IOError because load(FIFO)
-	  should be blocked until given any input.
-
-Sat Oct 17 13:55:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_expand_path_internal): concatenate converted
-	  string to the result instead of making converted string and
-	  append it.
-
-	* string.c (rb_str_cat_conv_enc_opts): from rb_str_conv_enc_opts,
-	  separate function to concatenate with transcoding.
-
-Sat Oct 17 13:19:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (load_file): unify each preparations and clean-ups by
-	  merging load_file_internal and load_file_internal2, and remove
-	  nested rb_protect and rb_ensure.
-
-Sat Oct 17 05:28:32 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up
-	  code and check RSS to avoid false positive on AIX and false
-	  negative on Mac OS X. [Bug #10686]
-
-Fri Oct 16 15:54:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_load_ok): open in non-blocking mode withoout
-	  releasing GVL.  don't care about others than regular files and
-	  directories.  [ruby-dev:49272] [Bug #11559]
-
-	* ruby.c (load_file_internal): ditto.
-
-Thu Oct 15 23:56:03 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_sym_to_proc): make void env.
-
-Thu Oct 15 13:37:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_sym_to_proc): move from string.c and create a Proc
-	  with no environments.  [ruby-core:71088] [Bug #11594]
-
-Thu Oct 15 01:57:03 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* test/objspace/test_objspace.rb
-	  (test_trace_object_allocations_start_stop_clear): clear object
-	  allocation table first to get rid of erroneous detection for obj3.
-	  [ruby-dev:49095] [Bug #11271]
-
-Thu Oct 15 01:53:38 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/ostruct/test_ostruct.rb: Add tests for OpenStruct#respond_to.
-	  Patch by @jeremy in [GH-1041]: https://github.com/ruby/ruby/pull/1041
-
-Thu Oct 15 01:49:25 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* lib/ostruct.rb: Finish defining OpenStruct attributes lazily.
-	  Patch by @sferik in [GH-1037]: https://github.com/ruby/ruby/pull/1037
-	  This commit is an addendum to https://github.com/ruby/ruby/pull/1033.
-	  It:
-	  1. lazily defines attribute accessors for copied and marshaled objects,
-	  2. returns nil when an attribute reader is not defined, and
-	  3. defines respond_to_missing? to maintain the same respond_to? behavior
-
-Wed Oct 14 16:56:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check for libunwind.h, which is not available in
-	  very old OS X SDK.  [ruby-core:71080] [Bug #11591]
-
-Wed Oct 14 14:11:42 2015  Brian Black  <bblack@veracode.com>
-
-	* iseq.c (rb_insn_operand_intern): change kw in callinfo disasm from the
-	  number of keyword arguments to an ordered list of the keywords used.
-	  [Feature #11589]
-
-Wed Oct 14 13:58:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_nextc): send a warning to ripper, not to STDERR
-	  always.
-
-	* parse.y (rb_warn1, rb_warning1): move argument conversions to
-	  callers.  PRIsVALUE is not valid in String#%.
-
-Wed Oct 14 13:37:23 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/racc/rdoc/grammar.en.rdoc: fix spell error.
-	  [fix GH-1053][ci skip] Patch by @Matrixbirds
-
-Tue Oct 13 22:06:50 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/raddrinfo.c (rsock_fd_family): Check sa_len.
-
-Tue Oct 13 12:14:10 2015  Craig Davison  <craig65535@gmail.com>
-
-	* ext/socket/rsock_addrinfo (rsock_addrinfo): specify address
-	  family.  [Fix GH-1052]
-
-	* ext/socket/udpsocket.c (udp_connect, udp_bind, udp_send):
-	  address family by the receiver.
-
-Sun Oct 11 07:09:19 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_push_frame): initialize other than sp (and ep)
-	  first for performance.
-
-Sun Oct 11 06:21:50 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_eval.c, internal.h (rb_yield_1): added for performance which
-	  doesn't check Qundef.
-
-	* numeric.c (int_dotimes): use rb_yield_1.
-
-Sun Oct 11 06:19:49 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_call_iseq_setup_normal): setup sp first
-	  for performance.
-
-Sun Oct 11 05:29:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (invoke_block_from_c): split this function into several
-	  functions.
-
-	* vm_insnhelper.c (vm_yield_callee_setup_arg): remove this function
-	  because it is only delegation function.
-
-Sun Oct 11 03:48:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (newobj_of_slowpass): fix typo (pass -> path).
-	  Pointed out by Yukihiro Matsumoto  <matz@ruby-lang.org>.
-
-	* gc.c (newobj_of_...): `of' is unnecessary.
-
-Sat Oct 10 19:04:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/udpsocket.c (udp_connect, udp_bind): get open files
-	  inside ensure functions.
-
-Sat Oct 10 18:35:12 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_call_method0): do not propagate enable_fastpath,
-	  but pass dummy CC to prevent wrong caching.
-
-Sat Oct 10 15:28:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* import a github pull request
-	  https://github.com/ruby/ruby/pull/1050
-	  by Kazuho Oku <kazuho@natadeco.co>.
-
-	  This pull request has the following commits.
-
-	* gc.c: reduce # of args to 6 (max. of register args on x86-64) so
-	  that the `newobj_of_slowpass` can be called via TCO.
-
-	* gc.c (newobj_of), string.c (str_duplicate): for performance,
-	  the hot functions must be inlined.
-
-	* gc.c: for performance, preceding arguments of `.*newobj_of.*`
-	  must be same, so that the arg registers can be reused in case of
-	  TCO.
-
-Sat Oct 10 08:52:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/udpsocket.c (udp_connect, udp_bind, udp_send): fix
-	  memory leaks at closed socket.
-
-Fri Oct  9 17:29:07 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (parse257): refactor.
-
-Fri Oct  9 16:42:26 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: use frozen_string_literal: true.
-
-	* test/net/imap/test_imap.rb: ditto.
-
-	* test/net/imap/test_imap_response_parser.rb: ditto.
-
-Fri Oct  9 15:52:28 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb: use frozen_string_literal: true.
-
-	* test/net/ftp/test_buffered_socket.rb: ditto.
-
-	* test/net/ftp/test_ftp.rb: ditto.
-
-	* test/net/ftp/test_mlsx_entry.rb: ditto.
-
-Fri Oct  9 14:12:35 2015  Shota Fukumori (sora_h)  <her@sorah.jp>
-
-	* ext/openssl/lib/openssl/ssl.rb: Revert r52082 because it was
-	  dropping TLS v1.1 support too. Supporting only TLS v1.2 is too
-	  early, because many popular websites still don't support it.
-
-	  For instance, Servers where aws-sdk connects to still don't support
-	  TLS v1.2 and it became broken.
-
-	  We should consider more carefully about this.
-
-	  [Fix GH-873] [Feature #11524]
-
-Fri Oct  9 12:52:08 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): Dynamic string literals (e.g.,
-	  "#{x}") should not be frozen because they don't literally
-	  represent strings.
-	  https://twitter.com/shugomaeda/status/651937650027401216
-	  https://twitter.com/yukihiro_matz/status/651942882312482817
-	  https://twitter.com/yukihiro_matz/status/651980835181096960
-
-Fri Oct  9 06:52:49 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/prepare_require.rb: skip file creation if it already
-	  exist. Suggested by ko1.
-
-Fri Oct  9 06:18:04 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	* benchmark/bm_require.rb: new benchmark for require.
-	* benchmark/bm_require_thread.rb: new benchmark for conflicting
-	  require vs thread. like [Bug #11559]
-	* prepare_require.rb: new file for preparing above tests.
-	* prepare_require.rb: ditto.
-
-Thu Oct  8 14:10:45 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb: Default to TLSv1.2 and drop TLS v1
-	  Patch provided by @claudijd [Fixes GH-873] [Feature #11524]:
-	  https://github.com/ruby/ruby/pull/873
-
-Wed Oct  7 22:55:02 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/minitest/metametameta.rb (with_output): restore output to
-	  fix mixing test result output in worker responses.
-
-Wed Oct  7 21:32:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_duplicate): move from rb_str_resurrect to short
-	  circuit initialization.
-
-Wed Oct  7 20:43:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resurrect): fix resurrection of short enough to
-	  be embedded but not embedded string.
-
-Wed Oct  7 20:17:29 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (newobj_of): divide fast path and slow path
-	  to avoid register savings for fast path.
-
-	  This idea is given by Kazuho Oku <kazuho@natadeco.co>.
-
-Wed Oct  7 17:30:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_times): optimize for the argument 0 and 1.
-
-Wed Oct  7 01:20:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.h, gc.c: introduce new debug function rb_obj_info_dump(VALUE obj)
-	  which prints the result of rb_raw_obj_info(..., obj).
-
-Wed Oct  7 01:16:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_args.c: remove an unused field args_info::calling.
-
-Tue Oct  6 23:43:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (rb_method_entry_min_max_arity): should support
-	  OPTIMIZED_METHOD_TYPE_CALL.
-
-Tue Oct  6 21:29:08 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/tmpdir.rb (Dir.tmpdir): return duplicated string to be
-	  modify safely even when $SAFE > 0.
-
-Tue Oct  6 19:24:38 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_call_method0): use switch() for visibilities
-	  (for readability).
-
-Tue Oct  6 19:23:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (Init_Proc): Proc#call and others should be public.
-
-Tue Oct  6 18:51:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: IMEMO_FL_USER3 and IMEMO_FL_USER4 is not needed any more.
-
-Tue Oct  6 18:47:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: remove METHOD_ENTRY_SAFE(me) and related code
-	  because $SAFE = 3 and 4 is not available.
-	  Now, $SAFE is not checked on method dispatch at all.
-
-	* vm_eval.c, vm_insnhelper.c, vm_method.c: ditto.
-
-Tue Oct  6 13:56:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h: turn function macros into inline functions,
-	  for debuggers.
-
-	* include/ruby/ruby.h: turn constant macros into enums, for
-	  debuggers.
-
-Tue Oct  6 13:48:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* method.h: typo fix. Patch by @davydovanton [fix GH-1032][ci skip]
-
-Tue Oct  6 06:54:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (rb_iseq_free): free iseq::variable_body to avoid memory
-	  leak.
-
-Tue Oct  6 06:32:52 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: enable optimization of Proc#call.
-	  [Feature #11569]
-
-	* NEWS: write about this optimization and incompatibilities.
-
-	* test/ruby/test_backtrace.rb: catch up this fix.
-
-Tue Oct  6 04:41:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c: solve goto spaghetti.
-
-	  Change all goto statement across blocks to tail call functions.
-
-Tue Oct  6 02:29:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_resurrect): optimize by short circuit to copy
-	  hidden string without checking length, encoding and so on.
-
-Mon Oct  5 23:08:17 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* test/ruby/test_thread.rb (test_handle_interrupt_blocking): check if
-	  exception handling was postponed until sleep.
-
-Mon Oct  5 22:25:49 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb: Use frozen_string_literal: true.
-
-	* lib/prettyprint.rb: Ditto.
-
-	* lib/resolv.rb: Ditto.
-
-	* lib/tmpdir.rb: Ditto.
-
-	* test/test_pp.rb: Ditto.
-
-	* test/test_prettyprint.rb: Ditto.
-
-	* tool/transcode-tblgen.rb: Ditto.
-
-Mon Oct  5 20:39:32 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/ruby/test_thread.rb: fix potential race condition.
-	  The thread could have a "sleep" status because it tries
-	  to acquire the mutex, but does not have it yet.
-
-Mon Oct  5 15:39:30 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* numeric.c: [DOC] Overview for Numeric class by Joe Corcoran
-	  This patch was created at ROSSConf Berlin 2015 [Bug #11555]
-
-Mon Oct  5 15:34:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_new): link ep to calling block.
-	  [ruby-core:70980] [Bug #11566]
-
-Mon Oct  5 00:53:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_dir_getwd): make ASCII-8BIT if filesystem encoding is
-	  US-ASCII, like as Dir.glob.
-
-Sun Oct  4 23:39:09 2015  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (nmin_filter): Fix limit value.
-	  patch by Helder Pereira.
-	  [Bug #11471] [ruby-core:70477]
-
-Sun Oct  4 15:11:48 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/euc_jp.c (mbc_case_fold): check given string is valid or not,
-	  and if invalid, return 1. [Bug #11486]
-
-Sun Oct  4 10:09:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_dir_getwd): normalize OS path to UTF-8 on OS X.
-
-Sun Oct  4 00:09:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/ruby-runner.c.in: wrapper to set dynamic loading path
-	  environment variable.  /bin/sh on Mac OS X 10.11 (El Capitan)
-	  clears DYLD_LIBRARY_PATH.
-
-	  it must:
-	  - do nothing even if current directory is not present
-	  - do not set other environment variables, e.g. PWD, SHLVL, etc
-	  - do not open other FDs, e.g. pipes for timer thread
-
-Sun Oct 2 10:59:00 2015  schneems  <richard.schneeman@gmail.com>
-
-	* ext/pathname/lib/pathname.rb: freeze string literals for
-	  reduced object allocation.
-	  [Feature #11375] [ruby-core:70043]
-
-Fri Oct  2 09:20:20 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk, lib/unicode_normalize/tables.rb: Change Unicode
-	  Version for character normalization data from 7.0.0 to
-	  8.0.0.
-
-Fri Oct  2 00:18:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_mark): block.ep of Proc from Symbol is now NULL.
-	  [ruby-core:70961] [Bug #11560]
-
-Wed Sep 30 15:47:13 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_args.c (vm_caller_setup_arg_block): bypass Symbol#to_proc
-	  call to optimize symbol block passing.
-
-Wed Sep 30 01:34:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_free): fix memory leak at syntax error when
-	  warn-indent is enabled.
-
-Tue Sep 29 22:27:50 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* parse.y: fix minor typo. [ci skip][fix GH-1038].
-	  Patch by @ltratt.
-
-Tue Sep 29 16:53:53 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* tool/unicode_norm_gen.tmpl, lib/unicode_normalize/tables.rb:
-	  get rid of many .freeze commands by using frozen_string_literal
-	  pragma.
-
-Tue Sep 29 16:37:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_dstr_fragments): fix performance by omitting
-	  the first empty string only for keeping literal encoding if
-	  other literals are too.  [ruby-core:70930] [Bug #11556]
-
-	* string.c (rb_str_append_literal): append but keep encoding non
-	  US-ASCII.
-
-Mon Sep 28 17:40:17 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (mtime): use usec instead of fractions to parse
-	  decimal fractions of a second correctly when the number of digits
-	  is not 6.
-
-Mon Sep 28 16:07:08 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (mtime): parse decimal fractions of a second as
-	  specified in RFC 3659.
-
-Mon Sep 28 10:31:12 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/test_forwardable.rb: Write basic tests for lib/forwardable.
-	  [fix GH-1035] Patch by @kachick
-
-Sun Sep 27 23:32:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_define_class, rb_define_class_id_under): refine
-	  error messages.
-
-	* class.c (rb_define_module, rb_define_module_id_under): ditto,
-	  and make consistent with class.
-
-Sun Sep 27 18:44:43 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: removed duplicated message.
-
-Sun Sep 27 15:46:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): add an option to enable/disable
-	  frozen-string-literal.  [Feature #8976]
-
-	* compile.c (iseq_compile_each): override compile option by option
-	  given by pragma.
-
-	* iseq.c (rb_iseq_make_compile_option): extract a function to
-	  overwrite rb_compile_option_t.
-
-	* parse.y (parser_set_compile_option_flag): introduce pragma to
-	  override compile options.
-
-	* parse.y (magic_comments): new pragma "frozen-string-literal".
-	  [Feature #8976]
-
-Sun Sep 27 08:16:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (delete_field): do not raise NameError for
-	  existing keys.  [Fix GH-1033]
-
-Sun Sep 27 00:34:31 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* lib/ostruct.rb: Move method definitions for getter/setter to be lazy
-	  Patch by @sferik in [GH-1033]: https://github.com/ruby/ruby/pull/1033
-
-Fri Sep 25 10:07:25 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http.rb: removed unused variable. It's removed at r13648.
-	  [fix GH-1022] Patch by @nkondratyev
-
-Fri Sep 25 09:48:27 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: upgrade to minitest-5.8.1
-
-Fri Sep 25 09:47:12 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* id_table.c: fix typo. [ci skip][fix GH-1031] Patch @davydovanton
-
-Fri Sep 25 07:54:05 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip
-	  this test on AIX. The issue is the same as on Solaris.
-	  [ruby-dev:47631]
-
-Thu Sep 24 17:25:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (paren_args): fix separator token at `foo::bar()` in
-	  ripper.
-
-Thu Sep 24 00:00:17 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* complex.c: ruby/config.h must be included before math.h
-	  because it defines _LARGE_FILES on AIX and _LARGE_FILES
-	  must be defined before sys/types.h is included from math.h.
-	  [Bug #11483]
-
-Wed Sep 23 22:22:38 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/openssl/ossl_pkcs12*: Remove svn commit id macro
-
-Wed Sep 23 01:11:28 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/openssl/*: Remove svn commit id macros to make sync easier
-
-Tue Sep 22 04:20:01 2015  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
-	  patch by voxik.
-
-	* test/rinda/test_rinda.rb: ditto
-
-Mon Sep 21 20:53:39 2015  tbpgr  <tbpgr@tbpgr.jp>
-
-	* test/win32ole/test_win32ole_event.rb: fix typo.
-	  swbemsink_avairable? => swbemsink_available?  [Fix GH-1025]
-
-Sun Sep 20 10:07:35 2015  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* cont.c (rb_callcc): [DOC] append continuations example across
-	  methods.  [Fix GH-1026]
-
-Sun Sep 20 03:20:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (rb_iseq_free): free rb_iseq_t::body::cc_entries.
-
-Sun Sep 20 02:46:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: split rb_call_info_t into several structs.
-	  * rb_call_info (ci) has compiled fixed information.
-	  * if ci->flag & VM_CALL_KWARG, then rb_call_info is
-	    also rb_call_info_with_kwarg. This technique reduce one word
-	    for major rb_call_info data.
-	  * rb_calling_info has temporary data (argc, blockptr, recv).
-	    for each method dispatch. This data is allocated only on
-	    machine stack.
-	  * rb_call_cache is for inline method cache.
-
-	  Before this patch, only rb_call_info_t data is passed.
-	  After this patch, above three structs are passed.
-
-	  This patch improves:
-	  * data locality (rb_call_info is now read-only data).
-	  * reduce memory consumption (rb_call_info_with_kwarg,
-	    rb_calling_info).
-
-	* compile.c: use above data.
-
-	* insns.def: ditto.
-
-	* iseq.c: ditto.
-
-	* vm_args.c: ditto.
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-	* vm_insnhelper.h: ditto.
-
-	* iseq.h: add iseq_compile_data::ci_index and
-	  iseq_compile_data::ci_kw_index.
-
-	* tool/instruction.rb: introduce TS_CALLCACHE operand type.
-
-Sun Sep 20 02:18:10 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/envutil.rb: mkfifo command based File.mkfifo method
-	  definition removed.
-
-Fri Sep 18 20:11:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_mkfifo): implement File.mkfifo.
-	  [Feature #11536]
-
-Fri Sep 18 16:56:19 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* NEWS: add Net::FTP#mlst and Net::FTP#mlsd.
-
-Fri Sep 18 07:39:22 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/objspace/objspace_dump.c (obj_type): add IMEMO types to the heap
-	  dump information.
-
-Thu Sep 17 22:33:07 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: fix command error with outside builddir.
-
-Thu Sep 17 17:42:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: separated test for test-framework from test-all task.
-	  They should be invoke at first before tests of test-all.
-
-Thu Sep 17 12:05:54 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_dir.rb (TestDir#test_fileno): s/?x/"x"/. Don't
-	  use tricky code, please.
-
-Wed Sep 16 20:49:56 2015  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* encindex.h: fix typo of last #endif comment. [ci skip]
-
-Wed Sep 16 20:39:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (set_const_visibility): fail if the class/module is
-	  frozen.  [ruby-core:70828] [Bug #11532]
-
-Wed Sep 16 17:16:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (ENABLE_VM_OBJSPACE): enable per-VM object space on
-	  Windows by default, as rb_w32_sysinit() no longer depends on
-	  ruby_xmalloc.
-
-Wed Sep 16 15:08:17 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/syntax/literals.rdoc (Strings): [DOC] Revise the character
-	  literal part.
-
-Wed Sep 16 14:55:33 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/syntax/literals.rdoc (Strings): [DOC] Document the full list
-	  of supported escape sequences in string literals.
-
-Wed Sep 16 14:49:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_setbyte): keep the code range as possible.
-
-Wed Sep 16 13:23:48 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* doc/syntax/literals.rdoc (Strings): mention about ?a literal.
-
-Wed Sep 16 12:06:53 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* dir.c (glob_helper): check pathtype once again by lstat(2) if
-	  dp->d_type is DT_UNKNOWN. XFS may return DT_UNKNOWN.
-
-Wed Sep 16 03:49:19 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_mutex_synchronize):
-	  insert waste loop for invoking preemptive thread context switch.
-	  [Bug #11496]
-
-Tue Sep 15 19:38:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_objspace_alloc, rb_objspace_free): define always
-	  regardless ENABLE_VM_OBJSPACE, and free heap pages.
-
-Tue Sep 15 15:15:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_sysinit, rb_w32_readdir): compare by
-	  encoding index to get rid of encoding initialization before VM
-	  object space allocation.
-
-	* dir.c (fundamental_encoding_p, push_glob): compare by encoding
-	  index immediately.
-
-	* enc/{ascii,us_ascii,utf_8}.c: set encoding indexes of
-	  fundamental built-in encodings so that usable as well as
-	  allocated rb_encoding before rb_enc_init().
-
-	* encindex.h: separate encoding index constants from internal.h.
-
-Tue Sep 15 13:13:13 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang, rb_ary_sort): [DOC] correct block
-	  return values, which may be a negative or positive integer, not
-	  only -1 or +1.
-
-Tue Sep 15 12:49:10 2015  Jason Barnabe  <jason.barnabe@gmail.com>
-
-	* array.c (rb_ary_sort_bang, rb_ary_sort): [DOC] Correct
-	  description of array sort block return values.  And also fix up
-	  the grammar a bit.  [Fix GH-1020]
-
-Tue Sep 15 12:44:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_qsort): use BSD-style qsort_r if available.
-
-Mon Sep 14 19:26:34 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (parse_mlsx_entry): parse pathnames including
-	  space correctly.
-
-Mon Sep 14 11:12:10 2015  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* lib/racc/rdoc/grammar.en.rdoc: [DOC] fix typo, "convertion" to
-	  "conversion".  [Fix GH-1016]
-
-Sun Sep 13 11:03:13 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h: prefix RUBY or RB to global symbols to get
-	  rid of name conflicts with other headers.
-
-	* include/ruby/encoding.h, include/ruby/intern.h: ditto.
-
-Sun Sep 13 09:38:51 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (size, modify, create, type, unique, perm, lang,
-	  media_type, charset): new methods to return standard facts.
-
-Sat Sep 12 19:43:49 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_call_iseq_setup_normal): do not clear local
-	  variables here. vm_push_frame() clears.
-
-	* vm_insnhelper.c (vm_call_iseq_setup_tailcall): ditto.
-
-	* vm_insnhelper.c (vm_push_frame): move check code to
-	  vm_check_frame().
-
-	  Reorder initialization timing to reuse same values (sp).
-
-	* compile.c (rb_iseq_compile_node): use
-	  iseq_set_exception_local_table() for ISEQ_TYPE_DEFINED_GUARD.
-
-Sat Sep 12 23:06:51 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (file?, directory?, appendable?, creatable?,
-	  deletable?, enterable?, renamable?, listable?, directory_makable?,
-	  purgeable?, readable?, writable?): new methods.
-
-Sat Sep 12 21:27:22 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (FACT_PARSERS): support system dependent facts
-	  UNIX.mode, UNIX.owner, UNIX.group, UNIX.ctime, and UNIX.atime.
-
-Sat Sep 12 19:08:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_dup2): should return the new fd on
-	  success, while msvcrt returns 0 wrongly.
-
-Sat Sep 12 18:14:11 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (parse_mlsx_entry, mlst) raise an FTPProtoError
-	  when parsing failed.
-
-Sat Sep 12 18:00:35 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (TIME_PARSER): use "Z" instead of "+00:00" to
-	  get UTC time.  Thanks, Wilson Bilkovich.
-
-Sat Sep 12 17:55:24 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (mlst, mlsd): support new commands MLST and MLSD
-	  specified in RFC 3659.
-
-Sat Sep 12 16:14:31 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* file.c: access()/eaccess() wrapping methods check more than just uid.
-	  [fix GH-1007][ci skip] Patch by @eam
-
-Sat Sep 12 16:07:01 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* README.md: improve markdown rendering for readability.
-	  [fix GH-1015][ci skip] Patch by @Matrixbirds
-
-Sat Sep 12 14:30:03 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (save_redirect_fd): make saved FDs close-on-exec not
-	  to be inherited.
-
-	* process.c (run_exec_dup2): restore close-on-exec flags too.
-
-	* win32/win32.c (fcntl): implement F_GETFD, F_SETFD, and
-	  F_DUPFD_CLOEXEC.
-
-Sat Sep 12 05:35:24 2015  Eric Wong  <e@80x24.org>
-
-	* rational.c (string_to_r_strict): preserve encoding in exception
-
-Fri Sep 11 20:23:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove rb_call_info_t::aux.opt_pc.
-
-	* vm_insnhelper.c: introduce shortcut functions for opt_pc == 0
-	  because opt_pc is always 0 on shortcut function.
-
-Fri Sep 11 17:49:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c: disable ISeq.load. It enabled accidentally at r51794.
-
-Fri Sep 11 11:15:12 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (size, mdtm, system): parse responses according to
-	  RFC 959 and 3659, where reply codes must be followed by SP.
-
-	* lib/net/ftp.rb (system): remove LF from the return value.
-
-Thu Sep 10 22:48:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
-	  encoding beginning with an interpolation same as the source file
-	  encoding.  [ruby-core:70703] [Bug #11519]
-
-Thu Sep 10 22:15:51 2015  Joe Rafaniello  <jrafanie@redhat.com>
-
-	* process.c (rb_f_spawn): Be more specific regarding "other
-	  values" by having "non-zero positive integers" Add nil, the
-	  default value, as a possible value and what it means.
-
-	  Try to use more consistent language.
-	  [Fix GH-1008]
-
-Thu Sep 10 15:16:02 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (getmultiline): refactor.
-
-Thu Sep 10 12:17:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_build_from_ary_body): register cdhash to the
-	  iseq constant body instead of compile time mark array, not to
-	  get GCed.  [ruby-core:70708] [Feature #8543]
-
-Wed Sep  9 18:16:14 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/rubygems/stub_specification.rb (Gem::StubSpecification#data):
-	  should not change the value of $. when `require`ing gems.
-	  this fixed test failures introduced by r51813.
-
-Wed Sep  9 16:55:45 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (usage, enable_option, disable_option, process_options): new
-	  option `--disable-did_you_mean`.
-
-	* gem_prelude.rb: now requires did_you_mean gem by default if available.
-
-Wed Sep  9 13:38:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/extlibs.rb (do_patch): let "patch" command change the
-	  working directory and open the patch file there, instead of
-	  spawn options, so that proper error message will be shown by the
-	  command not just "chdir" or "open".
-
-Wed Sep  9 11:33:05 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
-
-Wed Sep  9 11:08:59 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* lib/delegate.rb: Remove backtrace cleaning for delegated methods
-	  This patch was provided by Rafael Franca and greatly improves
-	  performance when an exception is raised. [Bug #11461]
-
-Wed Sep  9 10:05:41 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/rubygems/test_config.rb: fix broken tests for Windows platform.
-
-Wed Sep  9 07:46:32 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems HEAD(fe61e4c112).
-	  this version contains new feature that warn invalid SPDX license
-	  identifiers. https://github.com/rubygems/rubygems/pull/1249
-	  and #1032, #1023, #1332, #1328, #1306, #1321, #1324
-	* test/rubygems: ditto.
-
-Tue Sep  8 23:17:36 2015  Yuki Nishijima  <mail@yukinishijima.net>
-
-	* gems/bundled_gems: Upgrade the did_you_mean gem to 1.0.0.beta2.
-
-Tue Sep  8 23:09:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_s_popen): do not wait the child process during being
-	  killed.  [ruby-core:70671] [Bug #11510]
-
-Tue Sep  8 22:18:04 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gems/bundled_gems: revert because ruby trunk never be able to install
-	  the did_you_mean gem.  retry after enough test.
-
-Tue Sep  8 21:48:22 2015  Yuki Nishijima  <mail@yukinishijima.net>
-
-	* gems/bundled_gems: Automatically install the did_you_mean gem
-	  as a bundled gem.  [Feature #11252]
-
-Tue Sep  8 17:17:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove rb_call_info_t::blockiseq.
-
-	* insns.def (send, invokesuper): pass blockiseq explicitly.
-
-	* compile.c: catch up this fix.
-
-	* iseq.c: ditto.
-
-	* vm_args.c: ditto.
-
-	* iseq.c (ISEQ_MINOR_VERSION): 2->3 because instruction spec was
-	  changed.
-
-Tue Sep  8 15:01:19 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (list): fetch all the lines before yielding a block
-	  to allow other commands in the block.  [Feature #11454]
-	  Patched by Srikanth Shreenivas.
-
-Tue Sep  8 12:05:00 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_read_reparse_point): return correct required
-	  buffer size for IO_REPARSE_TAG_MOUNT_POINT.
-
-Tue Sep  8 00:14:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_execarg_parent_start1): raise with the target path
-	  name when open() failed.
-
-Mon Sep  7 23:45:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_exec_fail): raise with the target directory name
-	  when chdir() failed.  pointed out by sorah.
-
-Mon Sep  7 22:05:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (insert): should use plain strdup() instead of
-	  ruby_strdup() at startup time, and plain free()ed in cmdglob().
-
-Mon Sep  7 16:49:30 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_vm_struct): define objspace always regardless
-	  ENABLE_VM_OBJSPACE.
-
-Mon Sep  7 15:54:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby_atomic.h (ATOMIC_VALUE_CAS): fix typo.
-	  TODO: make arguments of all CAS macros consistent.
-
-Sun Sep  6 16:07:22 2015  Eric Wong  <e@80x24.org>
-
-	* ccan/list/list.h: suppress unused argument warnings
-	  [ccan commit 6aaca17e07588997417a73fac19dcf0ff17ed81b]
-
-Sat Sep  5 11:39:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction
-	  digits.  [ruby-core:70667] [Bug #11509]
-
-Sat Sep  5 08:28:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_equal, rb_hash_eql): [DOC] the orders of each
-	  hashes are not compared.  [Bug #11508]
-
-Fri Sep  4 23:26:22 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/win32.h: fix macro name for VC runtime version,
-	  RT_VER is only in Makefile.
-
-Fri Sep  4 17:46:17 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/contributing.rdoc: fix configuration option.
-	  [ci skip] [fix GH-1009]
-
-Fri Sep  4 04:46:54 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_memsize): functions for wrapper object should have
-	  iseqw_ prefix.
-
-Thu Sep  3 21:12:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/session.rb (create_new_id): use SHA512 instead of MD5.
-	  pointed out by SARWAR JAHAN.
-
-Thu Sep  3 20:29:18 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_raw_obj_info): iseq->body->location.first_lineno is Fixnum.
-
-Thu Sep  3 17:54:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (raise_method_missing): "names" should be singular.
-	  pointed out by Filip Bartuzi.
-
-Thu Sep  3 17:50:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_raw_obj_info): should support IMEMO/iseq.
-
-Thu Sep  3 10:07:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (raise_method_missing): refine error messages when a
-	  symbol is not given.  [Fix GH-1013]
-
-Wed Sep  2 18:49:55 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/*: merge psych master(8737e5b). It contains following fixes.
-	  https://github.com/tenderlove/psych/pull/242
-	  https://github.com/tenderlove/psych/pull/246 [ruby-list:50219]
-	* test/psych/*: ditto.
-
-Wed Sep  2 18:04:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h (GET_PC_COUNT): remove unused macro.
-
-Wed Sep  2 17:18:37 2015  Chris Schneider  <chris@christopher-schneider.com>
-
-	* process.c (proc_detach): [DOC] fix typo "intent" as "intend" in
-	  rdoc.  [Fix GH-1011]
-
-Wed Sep  2 16:58:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_realpath_internal): use filesystem encoding if the
-	  argument is in ASCII encodings.
-
-	* win32/file.c (rb_readlink): needs the result encoding.
-
-Tue Sep  1 18:37:15 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/thread/test_queue.rb: catch up last commit.
-
-Tue Sep  1 18:16:32 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_sync.c (queue_do_close): ignore multiple close to allow
-	  multiple producers.
-	  https://bugs.ruby-lang.org/issues/10600#note-14
-
-Tue Sep  1 18:06:26 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_tools.c: rename thread_tools.c to thread_sync.c.
-
-Mon Aug 31 17:04:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (move_refined_method): should insert a write barrier
-	  from an original class to a created (cloned) method entry.
-
-	* test/ruby/test_refinement.rb: add a test.
-
-Sun Aug 30 02:42:22 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support
-	  if the SSL library supports it.  Thanks Kurt Roeckx <kurt@roeckx.be>
-	  [Bug #11376]
-
-	* ext/openssl/extconf.rb: check for SSLv3 support in the SSL
-	  implementation.
-
-	* test/openssl/test_ssl.rb (class OpenSSL): Skip tests that need SSLv3
-	  if there is no support.
-
-Fri Aug 28 16:05:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc/*: Update rdoc master(cfffed5)
-	  https://github.com/rdoc/rdoc/pull/337
-	  https://github.com/rdoc/rdoc/pull/367
-
-Fri Aug 28 10:16:20 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (hook_before_rewind): prevent kicking :return event while
-	  finishing vm_exec func because invoke_block_from_c() kick a :return
-	  event for bmethods.
-	  [Bug #11492]
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-Thu Aug 27 18:05:42 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/server.rb: use IO::NULL instead of '/dev/null'
-	* test/ruby/test_string.rb: ditto.
-
-Thu Aug 27 15:24:57 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c (iseq_set_sequence): rename variable names
-	  to make it readable.
-
-Thu Aug 27 07:45:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_tools.c: add Queue#close(exception=false) and
-	  SizedQueue#close(exception=false).
-	  [Feature #10600]
-
-	  Trying to deq from a closed empty queue return nil
-	  if exception parameter equals to false (default).
-
-	  If exception parameter is truthy, it raises
-	  ClosedQueueError (< StopIteration).
-	  ClosedQueueError inherits StopIteration so that you can write:
-
-	    loop{ e = q.deq; (using e) }
-
-	  Trying to close a closed queue raises ClosedQueueError.
-
-	  Blocking threads to wait deq for Queue and SizedQueue will be
-	  restarted immediately by returning nil (exception=false) or
-	  raising a ClosedQueueError (exception=true).
-
-	  Blocking threads to wait enq for SizedQueue will be
-	  restarted by raising a ClosedQueueError immediately.
-
-	  The above specification is not proposed specification, so that
-	  we need to continue discussion to conclude specification this
-	  method.
-
-	* test/thread/test_queue.rb: add tests originally written by
-	  John Anderson and modify detailed behavior.
-
-Wed Aug 26 10:52:02 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching
-	  till the end of string.  [ruby-core:70592] [Bug #11488]
-
-	* test/ruby/test_m17n.rb (test_include?, test_index): add tests by
-	  Tom Stuart.
-
-Wed Aug 26 09:26:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* id_table.c (list_table_extend, hash_table_extend): remove C99
-	  features.  [ruby-dev:49239] [Bug #11487]
-
-Tue Aug 25 06:34:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (w32_symlink): implement symlink().
-
-Mon Aug 24 16:01:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (rb_locale_encindex): find encoding index without
-	  making a string object every time.  [ruby-core:58160] [Bug #9080]
-
-Sat Aug 22 15:43:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (check_funcall_failed, check_funcall_missing): cache
-	  results of respond_to? and respond_to_missing?, and search a
-	  public method only for compatibility with rb_respond_to.
-
-Sat Aug 22 08:23:32 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/thread/thread.c: move definitions of Queue, SizedQueue
-	  and ConditionalVariables to thread_tools.c. In other words,
-	  such classes are built-in.
-	  [Feature #8919]
-
-	  At first, I planned to embed only a Queue class.
-	  However, rubygems requires 'thread.rb' (rubygems are
-	  required at first, when launch MRI without --disable-gems).
-	  So most of people require 'thread.rb' as an embedded library.
-
-	  Now, ext/thread/thread.c is empty, only for a dummy for
-	  compatibility.
-
-	* thread.c: move a definition of Mutex class to thread_tools.c.
-
-	  And define Mutex class under Thread (so now Mutex is Thread::Mutex).
-	  Because other thread related classes are also defined under Thread.
-	  We remain ::Mutex as Thread::Mutex. Only an inspect result is changed.
-
-	* common.mk: add dependency from thread.o to thread_tools.c.
-
-Sat Aug 22 05:31:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_opts.h, iseq.c, iseq.h: add compile option to force frozen
-	  string literals.
-	  [Feature #11473]
-
-	  This addition is not specification change, but to try frozen
-	  string literal world discussed on [Feature #11473].
-
-	  You can try frozen string literal world using this magical line:
-
-	    RubyVM::InstructionSequence.compile_option =
-	      {frozen_string_literal: true}
-
-	  Note that this is a global compilation option, so that you need to
-	  compile another script like that:
-
-	    p 'foo'.frozen? #=> false
-	    RubyVM::InstructionSequence.compile_option =
-	      {frozen_string_literal: true}
-	    p 'foo'.frozen? #=> false, because this line is already compiled.
-	    p eval("'foo'.frozen?") #=> true
-
-	  Details:
-	    * String literals are deduped by rb_fstring().
-	    * Dynamic string literals ("...#{xyz}...") is now only frozen,
-	      not deduped. Maybe you have other ideas.
-
-	  Now, please do not use this option on your productions :)
-	  Of course, current specification can be changed.
-
-	* compile.c: ditto.
-
-	* test/ruby/test_iseq.rb: add a test.
-
-Sat Aug 22 02:53:12 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/psych/*: update to Psych 2.0.14
-
-	* test/psych/*: ditto
-
-Fri Aug 21 19:58:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c: add a new method ObjectSpace.count_symbols.
-	  [Feature #11158]
-
-	* symbol.c (rb_sym_immortal_count): added to count immortal symbols.
-
-	* symbol.h: ditto.
-
-	* test/objspace/test_objspace.rb: add a test for this method.
-
-	* NEWS: describe about this method.
-
-Fri Aug 21 19:48:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub ($(LIBRUBY_SO)): needs additional libraries
-	  for extension libraries to link statically.
-	  [ruby-core:70499] [Feature #9018]
-
-Fri Aug 21 18:49:22 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h, cont.c, vm_trace.c: add a new event
-	  fiber_switch. We need more discussion about this feature
-	  so that I don't write it on NEWS.
-	  [Feature #11348]
-
-	* test/ruby/test_settracefunc.rb: add tests.
-
-Fri Aug 21 17:32:42 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is
-	  stable after invoking a block. [Bug #11451]
-
-	* test/ruby/test_yield.rb: add a test. This test script is given by
-	  Alex Dowad.
-
-Fri Aug 21 06:35:50 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
-	  account OpenSSL installations that have SSLv3 disabled by default.
-	  Thanks Jeremy Evans <code@jeremyevans.net> for the patches.
-	  [Bug #11366] [Bug #11367]
-
-Thu Aug 20 22:19:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (basic_obj_respond_to): call respond_to_missing?
-	  only when redefined.  [ruby-core:70460] [Bug #11465]
-
-Thu Aug 20 14:13:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (check_funcall_respond_to): share the behavior with
-	  rb_obj_respond_to.  [ruby-core:70460] [Bug #11465]
-
-	* vm_method.c (vm_respond_to): extract from rb_obj_respond_to and
-	  merge r39881.
-
-Thu Aug 20 08:53:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (rb_obj_respond_to): reuse found method entry
-	  instead of searching same entry repeatedly.
-
-Thu Aug 20 08:31:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (replace_real_basename), win32/win32.c (opendir_internal):
-	  check reparse point tags and treat supported tags only as
-	  symbolic links.  [ruby-core:70454] [Bug #11462]
-
-Wed Aug 19 23:59:28 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): add OP_ALL to
-	  existing options rather than just setting it.  Some vendors apply
-	  custom patches to their versions of OpenSSL that set default values
-	  for options.  This commit respects the custom patches they've
-	  applied.
-
-	* test/openssl/test_ssl.rb (class OpenSSL): check that OP_ALL has been
-	  added to the options.
-
-Wed Aug 19 23:55:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_f_spawn): [DOC] elaborate environment variable
-	  values.  [ruby-core:70456] [Bug #11463]
-
-Wed Aug 19 23:48:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (winnt_lstat): check reparse point tags and treat
-	  supported tags only as symbolic links.
-	  [ruby-core:70454] [Bug #11462]
-
-Tue Aug 18 20:05:49 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c (reserve_stack): ensure the memory is really
-	  allocated. [Bug #11457]
-
-Tue Aug 18 17:19:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (IS_BEG): include labeled argument state, which was
-	  EXPR_LABELARG.  [ruby-dev:49221] [Bug #11456]
-
-Tue Aug 18 16:16:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RClass): define only in C, `__attribute__`
-	  between `struct` and the name can't compile with g++.
-	  [ruby-core:70297] [Bug #11426]
-
-Mon Aug 17 20:56:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y: fix syntax error at do-block after a conditional
-	  operator.  separate label-allowed and after-a-label states from
-	  others as bit flags.  [ruby-dev:48790] [Bug #10653]
-
-Mon Aug 17 11:57:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_each_codepoint): raise an exception at incomplete
-	  character before EOF when conversion takes place.  [Bug #11444]
-
-Sun Aug 16 17:33:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: update latest version of bundled gems.
-	  It includes minitest-5.8.0 and test-unit 3.1.3.
-
-Sun Aug 16 17:24:10 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gc.c (gc_mark_children): check if RCLASS_EXT is valid
-	  before marking. This fixes the following test failure
-	  introduced in r51126:
-
-	    make test-all TESTOPTS='--gc-stress ruby/test_refinement.rb'
-
-Sat Aug 15 10:51:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/lib/win32/registry.rb (API#SetValue): data size should
-	  be in bytes, not in chars.  [ruby-core:70365] [Bug #11439]
-
-Sat Aug 15 10:15:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_each_codepoint): read more data when read partially.
-	  [ruby-core:70379] [Bug #11444]
-
-Sat Aug 15 04:33:39 2015  Eric Wong  <e@80x24.org>
-
-	* hash.c (any_hash): skip rb_objid_hash for static syms
-	  (rb_num_hash_start): extract from rb_ident_hash
-	  (rb_objid_hash): call rb_num_hash_start
-	  (rb_ident_hash): ditto
-	  [ruby-core:70181] [Feature #11405]
-
-Sat Aug 15 04:16:13 2015  Eric Wong  <e@80x24.org>
-
-	* iseq.c (rb_iseq_mark): reduce NULL checks
-
-Fri Aug 14 18:50:57 2015  Eric Wong  <e@80x24.org>
-
-	* method.h (METHOD_ENTRY_VISI_SET): cast visi to int
-	  (METHOD_ENTRY_FLAGS_SET): ditto
-
-Fri Aug 14 18:43:11 2015  Eric Wong  <e@80x24.org>
-
-	* process.c (close_unless_reserved): add extra check
-	  (dup2_with_divert): remove
-	  (redirect_dup2): use dup2 without divert
-	  (before_exec_non_async_signal_safe): adjust call + comment
-	  (rb_f_exec): stop timer thread for all OSes
-	  (rb_exec_without_timer_thread): remove
-	* eval.c (ruby_cleanup): adjust call
-	* thread.c (rb_thread_stop_timer_thread): always close pipes
-	* thread_pthread.c (struct timer_thread_pipe): add writing field,
-	  mark owner_process volatile for signal handlers
-	  (rb_thread_wakeup_timer_thread_fd): check valid FD
-	  (rb_thread_wakeup_timer_thread): set writing flag to prevent close
-	  (rb_thread_wakeup_timer_thread_low): ditto
-	  (CLOSE_INVALIDATE): new macro
-	  (close_invalidate): new function
-	  (close_communication_pipe): removed
-	  (setup_communication_pipe_internal): make errors non-fatal
-	  (setup_communication_pipe): ditto
-	  (thread_timer): close reading ends inside timer thread
-	  (rb_thread_create_timer_thread): make errors non-fatal
-	  (native_stop_timer_thread): close write ends only, always,
-	   wait for signal handlers to finish
-	  (rb_divert_reserved_fd): remove
-	* thread_win32.c (native_stop_timer_thread): adjust (untested)
-	  (rb_divert_reserved_fd): remove
-	* vm_core.h: adjust prototype
-	  [ruby-core:70386] [Bug #11336]
-
-Fri Aug 14 18:40:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator
-	  size, not 1 byte.  [ruby-core:70365] [Bug #11439]
-
-Thu Aug 13 22:49:42 2015  Juanito Fatas  <katehuang0320@gmail.com>
-
-	* lib/timeout.rb (Timeout#timeout): freeze a string message to
-	  reduce string allocations.  [Fix GH-996]
-
-Thu Aug 13 17:42:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h (rb_call_info_kw_arg_bytes): move the definition
-	  to iseq.h because this function is shared with iseq.c and compile.c.
-
-Thu Aug 13 14:36:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_num_to_dbl): move from num2dbl_with_to_f in math.c.
-
-Thu Aug 13 09:01:25 2015  Eric Wong  <e@80x24.org>
-
-	* load.c (features_index_add): avoid repeat calculation
-
-Wed Aug 12 21:57:31 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* id_table.c: IMPL() macro accept op as _opname instead of opname
-	  because jemalloc seems to replace the word `free' to `je_free'.
-
-Wed Aug 12 21:51:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* id_table.c (mix_id_table_insert): fix memory leak.
-
-Wed Aug 12 21:17:38 2015  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_memsize): reimplement for wrapper
-	  (param_keyword_size): extracted from iseq_memsize
-	  (iseqw_mark): new mark function
-	  (iseqw_data_type): new data type
-	  (iseqw_new): wrap as iseqw_data_type
-	  (iseqw_check): adjust for wrapper
-	  (Init_ISeq): remove iseqw_iseq_key initialization
-	* test/objspace/test_objspace.rb: new test
-	  [ruby-core:70344] [Feature #11435]
-
-Wed Aug 12 21:15:27 2015  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_call_info_kw_arg_bytes): extract from compile.c
-	* compile.c (iseq_build_callinfo_from_hash): use above function
-
-Wed Aug 12 18:00:17 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (move_refined_method): same as the last commit.
-
-Wed Aug 12 17:57:53 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c, gc.c vm.c: use ID_TABLE_* instead of ST_*
-	  (such as ST_CONTINUE) for enum rb_id_table_iterator_result.
-
-Wed Aug 12 17:05:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* id_table.h: introduce ID key table.
-	  [Feature #11420]
-
-	  This table only manage ID->VALUE table to reduce overhead of st.
-
-	  Some functions prefixed rb_id_table_* are provided.
-
-	* id_table.c: implement rb_id_table_*.
-
-	  There are several algorithms to implement it.
-
-	  Now, there are roughly 4 types:
-
-	    * st
-	    * array
-	    * hash (implemented by  Yura Sokolov)
-	    * mix of array and hash
-
-	  The macro ID_TABLE_IMPL can choose implementation.
-	  You can see detailes about them at the head of id_table.c.
-
-	  At the default, I choose 34 (mix of list and hash).
-	  This is not final decision.
-	  Please report your suitable parameters or
-	  your data structure.
-
-	  * symbol.c: introduce rb_id_serial_t and rb_id_to_serial()
-	    to represent ID by serial number.
-
-	  * internal.h: use id_table for method tables.
-
-	  * class.c, gc.c, marshal.c, vm.c, vm_method.c: ditto.
-
-Wed Aug 12 05:19:11 2015  Eric Wong  <e@80x24.org>
-
-	* parse.y (rb_parser_compile_cstr): remove volatile arg
-	  (rb_parser_compile_string): ditto
-	  (rb_parser_compile_file): ditto
-	  (rb_parser_compile_string_path): ditto
-	  (rb_parser_compile_file_path): ditto
-	  [ruby-core:70323] [Misc #11431]
-
-Tue Aug 11 22:59:57 2015  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (Init_Numeric): Fix document for Float::MIN and
-	  Float::EPSILON.
-
-Tue Aug 11 15:22:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (ALLOCV_N): check integer overflow, as well
-	  as ruby_xmalloc2.  pointed out by Paul <pawlkt AT gmail.com>.
-
-Tue Aug 11 14:57:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N
-	  already multiplies element size.
-
-Tue Aug 11 12:13:20 2015  Jeremy Evans  <merch-redmine@jeremyevans.net>
-
-	* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
-	  in OpenSSL tests. [ruby-core:70020][Bug #11368]
-
-Tue Aug 11 11:54:13 2015  Alexey Lipnyagov  <liptonshmidt@gmail.com>
-
-	* string.c: Fix documentation for String#slice
-	  [ruby-core:70298][Bug #11427]
-
-Tue Aug 11 11:53:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (superclass): make superclass rule optional and allow
-	  any contents without a terminator.  [EXPERIMENTAL]
-
-Tue Aug 11 10:58:42 2015  Juanito Fatas  <juanitofatas@gmail.com>
-
-	* string.c: [DOC] Make #end_with? example doc symmetry
-	  with #start_with? [fix GH-992][ci skip]
-
-Tue Aug 11 10:51:19 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_array.rb: Add test for `Array#flatten` with level 1
-	  [fix GH-986] Patch @yui-knk
-
-Tue Aug 11 10:48:16 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enum.c: added doc for Enumerable#zip
-	  [fix GH-985] Patch by @yui-knk
-	* test/ruby/test_enum.rb: added tests for Enumerable#zip
-	  [fix GH-985] Patch @yui-knk
-
-Tue Aug 11 10:33:26 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* vm_method.c: typo fix [fix GH-993][ci skip] Patch by @0x0dea
-	* test/ruby/test_refinement.rb: ditto.
-
-Sun Aug  9 14:15:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (Init_vm_objects, rb_vm_fstring_table): use frozen_strings
-	  table in rb_vm_t.  [ruby-core:70274] [Bug #11423]
-
-Sat Aug  8 03:59:51 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* object.c: [DOC] Improve grammar for Module#===
-	  Patch by @SkyBirdSoar in documenting-ruby/ruby#52:
-	  https://github.com/documenting-ruby/ruby/pull/52
-
-Sat Aug  8 03:39:33 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* hash.c: [DOC] Improve description of symbol key syntax
-	  Patch by Raphael Das Gupta in documenting-ruby/ruby#51:
-	  https://github.com/documenting-ruby/ruby/pull/51
-
-Fri Aug  7 21:04:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_params): turn in_def and in_single into bit
-	  flags and reduce the size by 2-words.
-
-	* parse.y (parser_params): remove redundant prefixes.
-
-	* parse.y (yylex): non-pure parser has not been supported since
-	  merger of ripper.  change argument types from void pointers.
-
-Fri Aug  7 17:07:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (method_super_method): uncallable method entry does not
-	  have the defined class, use the owner instead.
-	  [ruby-core:70254] [Bug #11419]
-
-	* test/ruby/test_method.rb (test_super_method_unbound): add test
-	  by Akira Matsuda.
-
-Thu Aug  6 10:49:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (rb_alloc_tmp_buffer): round up the size and check the
-	  range.
-
-	* ruby_atomic.h (ATOMIC_VALUE_EXCHANGE, ATOMIC_VALUE_CAS): add
-	  atomic operations for VALUE.
-
-Thu Aug  6 08:15:49 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move
-	  SSLSocket#sysclose to Ruby.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_close): ditto
-
-Thu Aug  6 07:57:21 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move nonblock
-	  enable to SSLSocket#initialize and remove Nonblock module.
-
-Thu Aug  6 07:53:47 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move
-	  OpenSSL::SSL::SSLSocket#initialize to Ruby.
-
-	* ext/openssl/ossl_ssl.c: ditto
-
-Thu Aug  6 02:25:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (rb_alloc_tmp_buffer): use NODE_ALLOCA to mark locations
-	  like as builtin alloca.  [ruby-core:70251] [Bug #11418]
-
-Wed Aug  5 14:37:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (rb_econv_open0): rb_econv_t::source_encoding_name
-	  and rb_econv_t::destination_encoding_name should refer static
-	  strings always or NULL.  [ruby-core:70247] [Bug #11416]
-
-Tue Aug  4 16:53:43 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): extract callback
-	  lookup to private Ruby methods. This means we can keep the default
-	  DH callback logic hidden from consumers.  Also, since the SSLSocket
-	  always has a context, we can remove conditionals about that
-	  instance.
-
-	* ext/openssl/ossl_ssl.c: move callback lookup methods to private Ruby
-	  methods.
-
-Tue Aug  4 16:40:26 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_module.rb: should not expect a method table ordering.
-	  [Feature #11414]
-
-Tue Aug 04 15:30:04 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (rb_block_clear_env_self): clear by Qfalse instead of Qnil.
-	  [Bug #11409]
-
-	* test/ruby/test_eval.rb: add tests for this issue,
-	  written by @0x0dea.
-	  https://github.com/ruby/ruby/pull/988
-
-Tue Aug  4 12:12:14 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c: wrap long lines
-
-Tue Aug  4 09:32:30 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* proc.c: Removing duplicate doc [fix GH-987][ci skip]
-	  Patch by @ronakjangir47
-
-Tue Aug  4 09:21:58 2015  Richard Schneeman  <richard.schneeman+foo@gmail.com>
-
-	* doc/contributing.rdoc: fixed wrong instructions with OS X
-	  [fix GH-989][ci skip] Patch by @schneems
-
-Mon Aug  3 10:08:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_memsearch): should match only char boundaries in wide
-	  character encodings.  [ruby-core:70220] [Bug #11413]
-
-Sun Aug  2 07:01:17 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/lib/openssl/buffering.rb (gets):
-	  avoid comparing fixnum with nil
-	* test/openssl/test_pair.rb: test gets with limit when EOF is hit
-	  Thanks to Bar Hofesh <bar.hofesh@safe-t.com> for the bug report
-	  and testing.
-	  [ruby-core:70149] [Bug #11400]
-
-Sat Aug  1 17:13:15 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish):
-	  fix a bug that empty gzipped response body causes Zlib::BufError.
-	  [ruby-core:68846] [Bug #11058]
-
-	* test/net/http/test_httpresponse.rb: tests for the above.
-
-Sat Aug  1 17:05:18 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/net/http/response.rb (Net::HTTPResponse#inflater):
-	  fix TypeError. An exception object might be nil.
-	  [ruby-core:68846] [Bug #11058]
-
-Sat Aug  1 09:09:46 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): Implement
-	  SSLContext#options and options= using SSL_CTX_set_options and
-	  SSL_CTX_get_options. This reduces the number of ivars we need and
-	  simplifies `ossl_sslctx_setup`.
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): Default `options`
-	  to SSL_OP_ALL
-
-Sat Aug  1 06:54:36 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): OpenSSL declares these
-	  constants as longs, so we should follow that and use LONG2NUM.
-	  http://git.io/vOqxD
-
-Sat Aug  1 04:06:29 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): change callback
-	  to return the Ruby dh (or ecdh) object that the caller cares about
-	  instead of doing rb_iv_get / set to communicate.  This means we can
-	  remove an rb_iv_get call, and only use the set calls for their
-	  intended purpose (to prevent the object from being GC'd).
-
-	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto
-	* ext/openssl/ossl_ssl.c (ossl_call_tmp_ecdh_callback): ditto
-	* ext/openssl/ossl_ssl.c (ossl_tmp_ecdh_callback): ditto
-
-Sat Aug  1 03:49:31 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): Similarly to the
-	  tmp_ecdh_callback, the SSLSocket instance always holds a reference
-	  to the SSLContext object (it's always set in `initialize`).  The
-	  SSLContext holds a reference to the tmp_dh_callback.  Ask the
-	  context for the callback instead of storing the callback in two
-	  places.
-
-Sat Aug  1 03:43:10 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_call_tmp_dh_callback): create an array
-	  and use `rb_apply` to clean up calls to `rb_protect`.
-
-	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto
-
-Sat Aug  1 03:27:12 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_call_tmp_ecdh_callback): The SSL socket
-	  always holds a reference to the SSLContext object, which will have
-	  the callback object.  Ask the context for the callback instead of
-	  storing the callback in two places.
-
-Sat Aug  1 03:14:07 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): convert
-	  `tmp_dh_callback` to Ruby, and call it when setting up an SSL
-	  connection.  This allows us to move the "default" behavior to the
-	  reader method.
-
-	* ext/openssl/ossl_ssl.c: call the tmp_dh_callback instead of
-	  accessing the SSLContext's internals.
-
-Fri Jul 31 23:34:27 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* .travis.yml: update libssl before running tests.
-	  Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the
-	  travis settings!
-
-Fri Jul 31 21:34:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_require_internal): use rb_load_internal0 not to raise
-	  a exception to be caught.
-
-Thu Jul 30 13:19:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_const_get_0): warn deprecated constant reference.
-
-	* variable.c (rb_mod_deprecate_constant): mark constants to be
-	  warned as deprecated.  [Feature #11398]
-
-Thu Jul 30 11:53:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_s_handle_interrupt): make identity hash, to
-	  compare masking classes just by their IDs.
-
-Thu Jul 30 11:52:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_load_internal0): stop separating exits at loading
-	  from exits from execution.  TAG_FATAL is the only case that
-	  `errinfo` is a Fixnum, and should continue to exit by JUMP_TAG
-	  but not raising as an ordinary exception.
-	  [ruby-core:70169] [Bug #11404]
-
-Thu Jul 30 10:42:27 2015  Alex Dowad  <alexinbeijing@gmail.com>
-
-	* load.c (rb_load_internal0): extra check before returning
-	  TAG_RAISE when a non-local transfer of control happens while
-	  loading and parsing a Ruby source file.
-	  [ruby-core:70169] [Bug #11404]
-
-Thu Jul 30 08:48:42 2015  Eric Wong  <e@80x24.org>
-
-	* st.c (find_entry): constify st_table*
-	  (find_packed_index_from): ditto
-	  (find_packed_index): ditto
-	  (get_keys): ditto
-	  (get_values): ditto
-
-Thu Jul 30 04:29:25 2015  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_hash_aref_dsym.rb: new benchmark
-	* benchmark/bm_hash_aref_dsym_long.rb: ditto
-	* benchmark/bm_hash_aref_fix.rb: ditto
-
-Wed Jul 29 21:38:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (any_hash), symbol.c (dsymbol_alloc): fix dynamic symbol
-	  hash value by restricting in Fixnum range, that is `long`.
-
-Wed Jul 29 17:25:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_obj_hash): move in order to share with rb_any_hash.
-
-Wed Jul 29 16:00:22 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_buf_cat): consider empty non-embed string case,
-	  not to loop infinitely.  [ruby-core:70074] [Bug #11383]
-
-Wed Jul 29 15:25:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (send_internal): set method_missing_reason before
-	  invoking overriding method_missing method so that the default
-	  method_missing can achieve it properly.
-	  [ruby-core:68515] [Bug #10969]
-
-Wed Jul 29 14:54:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_sym_hash): return same value as rb_any_hash() of
-	  Symbol.  [Bug #9381]
-
-	* hash.c (rb_any_hash): fix Float hash.  rb_dbl_hash() returns a
-	  Fixnum, but not a long.  [Bug #9381]
-
-Wed Jul 29 11:07:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (LIKELY, UNLIKELY): make a boolean to enforce 1 or 0.
-
-Wed Jul 29 10:44:43 2015  Alex Dowad  <alexinbeijing@gmail.com>
-
-	* gc.c: document argument passed to finalizer proc.
-	  [fix GH-976][ci skip] Patch by @alexdowad
-
-Wed Jul 29 10:36:58 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_io_extract_modeenc): add option parameter `flags'
-	  to append extra oflags to normal mode.
-	  [Feature #11253] [ruby-core:69539]
-
-Wed Jul 29 04:54:47 2015  Eric Wong  <e@80x24.org>
-
-	* test/rubygems/test_gem_remote_fetcher.rb: pre-generate test key
-	  [ruby-core:70151] [Bug #11397]
-
-Tue Jul 28 10:32:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (struct RClass): moved from ruby/ruby.h to hide the
-	  internals.
-
-Tue Jul 28 08:48:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_TYPE_ATTRIBUTE): attribute declaration for
-	  types.
-
-Tue Jul 28 07:23:03 2015  Eric Wong  <e@80x24.org>
-
-	* symbol.h (struct RSymbol): add hashval field
-	* symbol.c (dsymbol_alloc): setup hashval field once
-	* hash.c (rb_any_hash): return RSymbol->hashval directly
-	* common.mk: hash.o depends on symbol.h
-	  Thanks to Bruno Escherl <bruno@escherl.net> for the bug report
-	  [ruby-core:70129] [Bug #11396]
-
-Tue Jul 28 03:26:15 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): raise a more
-	  helpful exception when verifying the peer connection and an
-	  anonymous cipher has been selected. [ruby-core:68330] [Bug #10910]
-	  Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for the patch.
-
-	* test/openssl/test_ssl.rb (class OpenSSL): test for change
-
-Mon Jul 27 13:24:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* template/id.h.tmpl (ID2ATTRSET): remove an unused macro.
-
-Mon Jul 27 12:21:15 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/openssl/test_ssl.rb: run tests on non-Unix platforms.
-
-Sun Jul 26 19:21:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_alpn_protocol): fix condition
-	  to compile, needs ALPN to be available.  [Feature #9390]
-
-Sun Jul 26 11:29:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (default_handler, Init_signal): discard SIGSYS, ENOSYS
-	  should raise a SystemCallError always instead.
-
-Sun Jul 26 10:26:35 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_call_servername_cb): set the ssl context
-	  object returned by the servername callback on to the socket as an
-	  instance variable.  If the callback allocated a new context object
-	  and didn't keep a reference to it, it could be GC'd out from under
-	  the socket object.
-
-	* test/openssl/test_ssl.rb (class OpenSSL): test for change.
-
-Sun Jul 26 10:07:26 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* test/openssl/test_ssl.rb (class OpenSSL): add test coverage around
-	  OpenSSL::SSL::SSLContext#servername_cb
-
-Sun Jul 26 09:10:32 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: update latest version of bundled power_assert.
-
-Sun Jul 26 08:49:28 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/rubygems/test_gem_remote_fetcher.rb: backport rubygems upstream
-	  change for OpenSSL key length. see detail to
-	  https://github.com/rubygems/rubygems/pull/1290
-
-Sun Jul 26 08:33:03 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/pkey.rb: implement DEFAULT_512 and
-	  DEFAULT_1024 constants in Ruby.
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): Ask PKey for the
-	  default DH callback since it already must check whether openssl has
-	  been compiled with DH support.
-
-	* ext/openssl/ossl_pkey_dh.c (OSSL_PKEY_BN): Remove C definitions of
-	  DEFAULT_512 and DEFAULT_1024
-
-	* ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): ditto
-
-	* test/openssl/test_pkey_dh.rb (class OpenSSL): add test to ensure the
-	  Ruby definitions are the same as the C definitions were.
-
-Sun Jul 26 08:14:59 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): support
-	  specifically setting the tmp_dh_callback to nil.
-
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): ditto
-
-	* test/openssl/test_pair.rb (module OpenSSL): add a test
-
-Sun Jul 26 07:47:14 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move the default
-	  tmp_dh_callback Ruby code and set it as a default in `initialize`.
-
-	* ext/openssl/ossl_pkey_dh.c (static unsigned char DEFAULT_DH_512_GEN):
-	  move this constant to Ruby.
-
-	* ext/openssl/ossl_pkey_dh.c (static unsigned char DEFAULT_DH_1024_GEN):
-	  ditto
-
-	* ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): ditto
-
-	* ext/openssl/ossl_ssl.c (ossl_tmp_dh_callback): ditto
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): tmp_dh_callback should
-	  always be set, so we can remove this conditional
-
-Sun Jul 26 06:22:24 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* test/openssl/test_pair.rb: add a test ensuring that the default DH
-	  callback is used when no DH callback is specified.
-
-Sun Jul 26 04:08:27 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): add missing
-	  instance variables to squash warnings with alpn.
-
-Sun Jul 26 03:42:19 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): move
-	  OpenSSL::SSL::SSLContext#initialize implementation to pure Ruby.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): ditto
-
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): ditto
-
-Sat Jul 25 21:03:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (fill_random_bytes_syscall): get rid of blocking when
-	  no entropy is available.  based on the patch by mame in
-	  [ruby-core:70114].  [Bug #11395]
-
-Sat Jul 25 11:05:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_replace_shared_without_enc): fill the terminator
-	  of embedded strings in wide char encodings.
-
-Sat Jul 25 06:38:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: size should be unsigned.
-	  * rb_call_info_t::index
-	  * rb_iseq_constant_body::stack_max
-	  * rb_iseq_constant_body::local_size
-	  * rb_iseq_constant_body::param::size
-	  * rb_iseq_constant_body::local_table_size
-	  * rb_iseq_constant_body::is_size
-	  * rb_iseq_constant_body::callinfo_size
-
-	* iseq.h: same for iseq_catch_table::size.
-
-	* compile.c: catch up these fix.
-
-	* iseq.c: ditto.
-
-	* proc.c: ditto.
-
-	* vm.c: ditto.
-
-	* vm_args.c: ditto.
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-Sat Jul 25 06:00:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_iseq_constant_body::line_info_table.
-
-	* iseq.c: catch up this fix.
-
-Sat Jul 25 05:56:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_iseq_constant_body::param::opt_table and
-	  rb_iseq_constant_body::param::keyword.
-
-	* compile.c: catch up this fix.
-
-Sat Jul 25 04:47:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_iseq_constant_body::catch_table.
-
-	* compile.c (iseq_set_exception_table): catch up this fix.
-
-	* iseq.c: ditto.
-
-	* vm.c (vm_exec): ditto.
-
-Fri Jul 24 21:29:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.c (EQUAL, st_delete_safe): fix arguments order to compare
-	  function, searching key is the first and stored key is the
-	  second always.
-
-Fri Jul 24 21:27:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (fstr_update_callback): fstring must not be a shared
-	  string, or the content without RSTRING_FSTR may be freed.
-	  [ruby-dev:49188] [Bug #11386]
-
-Fri Jul 24 20:09:43 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6): prevent to use
-	  IPv6 loopback interface for
-	  Rinda::TestRingFinger#test_make_socket_ipv6_multicast and
-	  Rinda::TestRingFinger#test_make_socket_ipv6_multicast_hops.
-	  The tests are skipped if there are no IPv6 devices other than the
-	  loopback device. [Bug #11394] [ruby-dev:49199]
-
-	* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast): ditto
-	  for Rinda::TestRingServer#test_make_socket_ipv6_multicast.
-
-	* test/rinda/test_rinda.rb (test_ring_server_ipv6_multicast): ditto
-	  for Rinda::TestRingServer#test_ring_server_ipv6_multicast.
-
-Fri Jul 24 16:35:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (fstr_update_callback): pool bare strings only.
-
-	* string.c (rb_fstring): return the original string with sharing a
-	  fstring if it has extra attributes, not the fstring itself.
-	  [ruby-dev:49188] [Bug #11386]
-
-Fri Jul 24 16:35:34 2015  yui-knk  <spiketeika@gmail.com>
-
-	* file.c (rb_file_s_extname): [DOC] add an example.
-
-	* test/ruby/test_path.rb (test_extname): add tests.  [Fix GH-978]
-	  * path starts with dot ('.a.rb')
-	  * path includes dir name ('a/b/d/test.rb')
-	  * path includes dir name and dir name starts with dot
-	    ('.a/b/d/test.rb')
-
-Thu Jul 23 18:50:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_iseq_constant_body::local_table and
-	  rb_iseq_param_keyword::table and
-	  rb_iseq_param_keyword::default_values.
-
-	* compile.c: catch up this fix.
-
-	* iseq.c: ditto.
-
-Thu Jul 23 17:30:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_iseq_constant_body::iseq_encoded and
-	  rb_control_frame_t::pc.
-
-	* compile.c (rb_iseq_translate_threaded_code): catch up this fix.
-
-	* iseq.c: ditto.
-
-	* vm_exec.c (vm_exec_core): ditto.
-
-Thu Jul 23 10:25:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h: add raw FL macros, which assume always the
-	  argument object is not a special constant.
-
-	* internal.h (STR_EMBED_P, STR_SHARED_P): valid only for T_STRING.
-
-	* string.c: deal with taint flags directly across String instances.
-
-Thu Jul 23 09:05:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lambda_body): pop cmdarg stack for lookahead
-	  token.  [ruby-core:70067] [Bug #11380]
-
-Thu Jul 23 04:03:03 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c: fix tests by not setting the instance
-	  variable on the frozen ssl instance.
-
-Thu Jul 23 03:32:26 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c: add ECDH callback support. [Feature #11356]
-
-	* test/openssl/test_pair.rb: test for ECDH callback support
-
-Thu Jul 23 03:29:49 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl.c: add ALPN support. [Feature #9390]
-
-	* ext/openssl/extconf.rb: detect ALPN support in OpenSSL
-
-	* test/openssl/test_ssl.rb: test for ALPN
-
-Wed Jul 22 23:44:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_reverse): reversed string is not a substring,
-	  and should not set coderange of the original string.
-	  [ruby-dev:49189] [Bug #11387]
-
-Wed Jul 22 20:17:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: modify layout of rb_iseq_constant_body.
-
-	  Move frequent accessing fields to upper part.
-
-Wed Jul 22 19:57:47 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove unused declaration of
-	  iseq_compile_data_ensure_node_stack.
-
-Wed Jul 22 19:52:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: separate rb_iseq_body into rb_iseq_constant_body and
-	  rb_iseq_variable_body (rb_iseq_t::variable_body).
-
-	  rb_iseq_variable_body can be modified after compilation.
-
-	* compile.c: use rb_iseq_t::variable_body.
-
-	* iseq.c: ditto.
-
-	* thread.c: ditto.
-
-Wed Jul 22 17:50:35 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/matrix/eigenvalue_decomposition.rb: refine code style.
-	  [fix GH-959][ci skip] Patch by @bogdanvlviv
-
-Wed Jul 22 15:48:47 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_range.rb: Add test case for Range#end with
-	  exclude_end true case. [fix GH-968] Patch by @yui-knk
-
-Wed Jul 22 09:45:31 2015  Maksim Sitnikov  <sitnikovme@undev.ru>
-
-	* numeric.c (num_coerce): [DOC] fix doc for Numeric#coerce,
-	  missing '+'.  [Fix GH-974]
-
-Wed Jul 22 07:24:18 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* make rb_iseq_t T_IMEMO object (type is imemo_iseq).
-
-	  All contents of previous rb_iseq_t is in rb_iseq_t::body.
-	  Remove rb_iseq_t::self because rb_iseq_t is an object.
-
-	  RubyVM::InstructionSequence is wrapper object points T_IMEMO/iseq.
-	  So RubyVM::ISeq.of(something) method returns different wrapper
-	  objects but they point the same T_IMEMO/iseq object.
-
-	  This patch is big, but most of difference is replacement of
-	  iseq->xxx to iseq->body->xxx.
-
-	  (previous) rb_iseq_t::compile_data is also located to
-	  rb_iseq_t::compile_data.
-	  It was moved from rb_iseq_body::compile_data.
-
-	  Now rb_iseq_t has empty two pointers.
-	  I will split rb_iseq_body data into static data and dynamic data.
-
-	* compile.c: rename some functions/macros.
-	  Now, we don't need to separate iseq and iseqval (only VALUE).
-
-	* eval.c (ruby_exec_internal): `n' is rb_iseq_t (T_IMEMO/iseq).
-
-	* ext/objspace/objspace.c (count_imemo_objects): count T_IMEMO/iseq.
-
-	* gc.c: check T_IMEMO/iseq.
-
-	* internal.h: add imemo_type::imemo_iseq.
-
-	* iseq.c: define RubyVM::InstructionSequence as T_OBJECT.
-	  Methods are implemented by functions named iseqw_....
-
-	* load.c (rb_load_internal0): rb_iseq_new_top() returns
-	  rb_iseq_t (T_IMEMO/iesq).
-
-	* method.h (rb_add_method_iseq): accept rb_iseq_t (T_IMEMO/iseq).
-
-	* vm_core.h (GetISeqPtr): removed because it is not T_DATA now.
-
-	* vm_core.h (struct rb_iseq_body): remove padding for
-	  [Bug #10037][ruby-core:63721].
-
-Wed Jul 22 07:15:33 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (total_i): no need to skip singleton classes.
-
-Wed Jul 22 06:37:54 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_call_info_t::kw_arg,
-	  rb_control_frame_t::iseq and rb_control_frame_t::block_iseq.
-
-	* iseq.c (iseq_free): catch up this fix.
-
-	* vm.c: ditto.
-
-	* vm_dump.c: ditto.
-
-Wed Jul 22 06:25:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_call_info_t::blockiseq and rb_block_t::iseq.
-
-	* vm.c, vm_insnhelper.c: catch up this fix.
-
-	* iseq.c (iseq_data_to_ary): constify the first iseq parameter.
-
-	* vm_insnhelper.c (vm_make_proc_with_iseq): ditto.
-
-Wed Jul 22 06:17:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: constify rb_method_iseq_t::iseqptr.
-
-	* proc.c (rb_method_entry_min_max_arity): catch up this fix.
-
-	* vm_insnhelper.c (def_iseq_ptr): constify.
-
-Wed Jul 22 03:37:39 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (internal_object_p): Now a singleton classes appear by
-	  ObjectSpace.each_object. [Bug #11360]
-
-	* test/ruby/test_objectspace.rb: add a test about it.
-
-Tue Jul 21 21:21:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (do_select): replace switch and goto with a loop to
-	  suppress maybe-uninitialized warnings by gcc6.
-
-	* thread.c (set_unblock_function, rb_wait_for_single_fd): ditto.
-
-Tue Jul 21 20:32:33 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_range.rb: Add test for Range#hash
-	  [fix GH-969] Patch by @yui-knk
-
-Tue Jul 21 19:43:20 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* compile.c: constify the first parameter (iseq).
-	  * iseq_add_mark_object()
-	  * iseq_add_mark_object_compile_time()
-
-	* iseq.c, iseq.h (rb_iseq_add_mark_object): ditto.
-
-Tue Jul 21 16:18:48 2015  Eric Wong  <e@80x24.org>
-
-	* test/socket/test_nonblock.rb: increase buffer sizes
-	  to OpenBSD limits. Thanks to Jeremy Evans <code@jeremyevans.net>
-	  [ruby-core:70058]
-
-Tue Jul 21 16:08:53 2015  Eric Wong  <e@80x24.org>
-
-	* load.c (ruby_dln_librefs): make static
-
-Tue Jul 21 13:36:54 2015  yuuji.yaginuma  <yuuji.yaginuma@gmail.com>
-
-	* lib/optparse.rb (complete): [DOC] fix typo.  [Fix GH-973]
-
-Tue Jul 21 05:20:21 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (nogvl_wait_for_single_fd): new function for Linux
-	  (maygvl_copy_stream_wait_read): Linux-specific version
-	  (nogvl_copy_stream_wait_write): use nogvl_wait_for_single_fd
-	  [ruby-core:70051] [Feature #11377]
-
-Mon Jul 20 15:04:30 2015  Eric Wong  <e@80x24.org>
-
-	* parse.y (parser_initialize): avoid redundant zero-ing
-
-Mon Jul 20 12:12:05 2015  Eric Wong  <e@80x24.org>
-
-	* parse.y (struct parser_params): pack: 88 => 256 bytes on 64-bit
-	  [ruby-core:70034] [Feature #11371]
-
-Sun Jul 19 14:29:18 2015  windwiny  <windwiny.ubt@gmail.com>
-
-	* ext/pty/pty.c: [DOC] fix example typo, an old name at move from
-	  PTY.open.  [Fix GH-972]
-
-Sat Jul 18 21:29:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (vm_check_ints_blocking): gather common statements at
-	  the end, and prefer LIKELY for Visual C optimization.
-
-Sat Jul 18 20:44:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_load_internal0): do not raise any exceptions but
-	  return the result tag state.
-
-	* load.c (rb_load_protect): reduce nested EXEC_TAGs.
-
-Sat Jul 18 19:52:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (run_finalizer): set and restore safe level here to reduce
-	  nested EXEC_TAGs.
-
-Sat Jul 18 18:45:22 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): error_handle() returns exit status to the
-	  system, not internal error state, do not convert the exit status
-	  again.
-
-Sat Jul 18 10:29:03 2015  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_process.rb: test thread+sigs work after failed exec
-
-Sat Jul 18 07:20:18 2015  Jeremy Evans  <code@jeremyevans.net>
-
-	* test/socket/test_nonblock: use smaller buffer for sendmsg
-	  [ruby-core:70016] [Bug #11364]
-
-Sat Jul 18 07:04:24 2015  Eric Wong  <e@80x24.org>
-
-	* signal.c (trap_handler): cleanup to use RSTRING_GETMEM + memcmp
-
-Sat Jul 18 02:53:06 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (argf_read_nonblock): support `exception: false'
-	  (io_nonblock_eof): new function
-	  (io_read_nonblock): use io_nonblock_eof
-	  (argf_getpartial): accept kwargs hash for `exception: false'
-	* test/ruby/test_argf.rb (test_read_nonblock): new test
-	* NEWS: add item for ARGF.read_nonblock
-	  [ruby-core:70000] [Feature #11358]
-
-Fri Jul 17 23:51:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_eval_cmd): $SAFE=4 has been deprecated.
-
-Fri Jul 17 22:18:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): use enum ruby_tag_type names.
-
-	* vm_core.h (ruby_tag_type): move from eval_intern.h for compiling
-	  break/next/redo/return.
-
-Fri Jul 17 15:39:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h (ENC_CODERANGE_CLEAN_P): predicate that
-	  tells if the coderange is clean, that is 7bit or valid, and no
-	  needs to scrub.
-
-	* re.c (rb_reg_expr_str): use ENC_CODERANGE_CLEAN_P.
-
-	* string.c (enc_strlen, rb_enc_cr_str_buf_cat, rb_str_scrub):
-	  ditto.
-
-	* string.c (rb_str_enumerate_chars): ditto, and suppress a warning
-	  by gcc6.
-
-Fri Jul 17 15:36:52 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/ruby/test_range.rb (test_first_last): Add test for
-	  `Range.new`.  [Fix GH-971]
-
-Fri Jul 17 15:36:40 2015  yui-knk  <spiketeika@gmail.com>
-
-	* test/ruby/test_range.rb (test_first_last): Add assertions to
-	  test of `Range#last` with exclude_end true case.  [Fix GH-970]
-
-Fri Jul 17 09:59:14 2015  Eric Wong  <e@80x24.org>
-
-	* thread.c (rb_thread_alone): simplify
-
-Fri Jul 17 09:58:32 2015  Eric Wong  <e@80x24.org>
-
-	* lib/rinda/tuplespace.rb: remove enumerator require
-	* test/pathname/test_pathname.rb: ditto
-
-Fri Jul 17 05:33:58 2015  Eric Wong  <e@80x24.org>
-
-	* iseq.c (rb_iseq_compile_with_option): reuse result of previous
-	  GET_THREAD() call
-	* thread.c (thread_create_core): ditto
-	  (rb_mutex_trylock): ditto
-	  (rb_mutex_lock): ditto
-	* process.c (rb_waitpid): avoid multiple eval from RUBY_VM_CHECK_INTS
-	* thread.c (rb_thread_check_ints): ditto
-
-Thu Jul 16 19:12:30 2015  Eric Wong  <e@80x24.org>
-
-	* thread.c (mutex_alloc): remove needless volatile
-
-Thu Jul 16 22:05:29 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: constify rb_iseq_t::parent_iseq.
-
-	  rb_iseq_t::local_iseq is not constant data because
-	  local_iseq::flip_cnt can be modified (commented).
-
-	* compile.c: catch up this fix.
-
-	* iseq.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-Thu Jul 16 21:47:47 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* process.c (redirect_dup2): when the new FD of dup2() conflicts
-	  with one of the timer thread FDs, the internal FD is diverted.
-	  [Bug #11336] [ruby-core:69886] [Bug #11350] [ruby-core:69961]
-
-	* process.c (dup2_with_divert): new function for the above purpose.
-
-	* thread_pthread.c (rb_divert_reserved_fd): new function for
-	  diverting reserved FD. If the given FD is the same as one of the
-	  reserved FDs, the reserved FD number is internally changed.
-	  It returns -1 when error. Otherwise, returns 0. It also returns
-	  0 if there is no need to change reserved FD number.
-
-	* thread_win32.c (rb_divert_reserved_fd): always returns 0 because
-	  of no reserved FDs.
-
-	* internal.h (rb_divert_reserved_fd): prototype declaration.
-	  It is Ruby internal use only.
-
-Thu Jul 16 21:47:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (rb_iseq_disasm): rename rb_iseq_t *iseqdat to iseq
-	  and VALUE *iseq to code.
-
-	* iseq.c (rb_iseq_disasm_insn): ditto.
-
-Thu Jul 16 14:34:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (REWIND_CFP): keep the arguments region inside the valid
-	  value stack.  [ruby-core:69969] [Bug #11352]
-
-Thu Jul 16 11:38:21 2015  Eric Wong  <e@80x24.org>
-
-	* process.c (close_unless_reserved): declare type of `fd' arg
-
-Thu Jul 16 08:47:29 2015  Eric Wong  <e@80x24.org>
-
-	* load.c (rb_construct_expanded_load_path): fstring expanded path
-	  (get_loaded_features_index): fstring feature path
-	  (rb_provide_feature): ditto
-	  [ruby-core:69871] [Feature #11331]
-
-Thu Jul 16 02:56:14 2015  Eric Wong  <e@80x24.org>
-
-	* thread.c (thread_initialize): avoid RSTRING_PTR and NUMT2INT
-
-Thu Jul 16 01:00:46 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/ruby/test_process.rb (test_exec_close_reserved_fd): test for
-	  [Bug #11353]
-
-Thu Jul 16 00:35:42 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* .gitignore: ignore version.i.
-
-Wed Jul 15 23:40:32 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
-	  use RUBY (= EnvUtil.rubybin)
-
-Wed Jul 15 23:01:22 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* process.c (redirect_close, parent_redirect_close): should not close
-	  reserved FD. It should be closed in the exec system call due to the
-	  O_CLOEXEC or FD_CLOEXEC flag. [Bug #11353] [ruby-core:69977]
-
-	* process.c (close_unless_reserved): new function to close FD unless
-	  it is reserved for internal communication.
-
-	* thread_pthread.c (rb_reserved_fd_p): should check owner_process pid
-	  to avoid false positive in forked child process.
-
-Wed Jul 15 18:31:18 2015  Eric Wong  <e@80x24.org>
-
-	* proc.c (proc_mark): remove redundant check
-	* vm.c (env_mark): ditto
-
-Wed Jul 15 17:27:40 2015  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_mark): remove check for data pointer
-	* proc.c (binding_mark): ditto
-	* vm.c (rb_thread_mark): ditto
-	* vm_trace.c (tp_mark): ditto
-
-Wed Jul 15 16:55:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_autoload): drop dummy encoding flag from
-	  the loaded encoding index.  this flag is used only in this
-	  source.
-
-Wed Jul 15 14:39:29 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_make_env_each): add comments about env layout.
-	  Do not use `i' to specify `new_ep'.
-
-	* vm.c (rb_proc_create, rb_vm_make_proc_lambda): envval is not used.
-
-Wed Jul 15 08:59:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.h (RUBY_MARK_UNLESS_NULL): evaluate the argument only once
-	  to get rid of inadvertent side effects.
-
-Wed Jul 15 02:53:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, vm.c: remove rb_proc_t::envval because we can know it via
-	  rb_proc_t::block::ep.
-
-	  rb_vm_proc_envval(const rb_proc_t *proc) returns an Env object which
-	  the Proc object use.
-
-	* proc.c: catch up this fix.
-
-	* vm_dump.c (rb_vmdebug_proc_dump_raw): ditto.
-
-Wed Jul 15 02:27:22 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, vm.c: remove rb_env_t::prev_envval because we can know it
-	  via env->ep.
-
-	  rb_vm_env_prev_envval(env) returns prev_envval via env->ep.
-
-	* vm_core.h (rb_vm_env_local_variables): change parameter type
-	  from VALUE (T_DATA/env) to `const rb_env_t *' to make same as
-	  rb_vm_env_prev_envval().
-
-	* proc.c: catch up these changes.
-
-	* vm_dump.c: ditto.
-
-	* vm.c: rename macros.
-
-	  * ENV_IN_HEAP_P() to VM_EP_IN_HEAP_P() because it uses ep.
-	  * ENV_VAL() to VM_ENV_EP_ENVVAL() because it is too short.
-
-Wed Jul 15 01:09:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: refactoring Proc/Env related code.
-
-	* vm_core.h: remove blockprocval field from rb_proc_t and rb_binding_t.
-	  Instead of this field, mark given block in Proc at rb_env_t::env.
-
-	* vm.c (vm_make_env_each): make an Env object with this layout.
-	  And also simplify parameters.
-
-	* proc.c: catch up this fix.
-
-	* vm_core.h: remove rb_env_t::local_size because it is not used.
-
-	* vm_dump.c (rb_vmdebug_env_dump_raw): catch up this fix.
-
-	* vm_core.h (rb_vm_make_env_object): remove rb_vm_make_env_object()
-	  because it is only referred from vm.c.
-
-	* vm_eval.c (eval_string_with_cref): catch up this fix.
-
-Wed Jul 15 00:03:36 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* gc.c (__has_feature): move into internal.h.
-
-	* internal.h (__has_feature): ditto.
-
-	* internal.h (__has_extension): new macro.
-
-	* internal.h (STATIC_ASSERT): use _Static_assert with
-	  clang. [ruby-core:69931] [Bug #11343]
-
-Wed Jul 15 00:00:00 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* random.c (fill_random_bytes_syscall): fix compile error with
-	  clang. [ruby-core:69931] [Bug #11343]
-
-Tue Jul 14 11:22:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#register):
-	  notify the handler thread of new timeout registration.
-
-	* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler#initialize):
-	  make sleep intervals adaptive than fixed period intervals.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): flush
-	  shutdown pipe.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#stop): request the
-	  server to stop immediately by sending data via shutdown pipe.
-
-Mon Jul 13 23:58:08 2015  Stefano Tortarolo  <stefano.tortarolo@gmail.com>
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#do_CONNECT):
-	  fix typos in debugger statements.  [Fix GH-967]
-
-Mon Jul 13 19:11:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (timeout): warn as deprecated for a long time.
-
-Mon Jul 13 01:37:27 2015  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/openssl/ossl.c: [DOC] Backport ruby/openssl@dbb3fdb [Bug #11345]
-	  Thanks to Tomoya Chiba for the report and help with patch.
-
-Sun Jul 12 09:20:02 2015  Shota Fukumori  <her@sorah.jp>
-
-	* ext/socket/basicsocket.c: [DOC] typo (Errno::AGAIN -> Errno::EAGAIN)
-
-	* ext/socket/socket.c: ditto
-
-	* ext/socket/tcpserver.c: ditto
-
-	* ext/socket/udpsocket.c: ditto
-
-	* ext/socket/unixserver.c: ditto
-
-	* io.c: ditto
-
-Sun Jul 12 06:42:23 2015  ksss  <co000ri@gmail.com>
-
-	* test/stringio/test_stringio.rb (test_sysread): add a test for
-	  StringIO#sysread.  [Fix GH-966]
-
-Sat Jul 11 21:16:34 2015  ksss  <co000ri@gmail.com>
-
-	* ext/stringio/stringio.c (Init_stringio): [DOC] Fix an example,
-	  StringIO#puts should be set "\n" at last.  [Fix GH-965]
-
-Sat Jul 11 12:45:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout#timeout): remove regexp with wrong line
-	  number and fix caller depth.
-
-Fri Jul 10 22:05:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (ExitException): removed internal exception class
-	  and use Timeout::Error instead, as using throw/catch to isolate
-	  each timeouts now.  [ruby-dev:49179] [Bug #11344]
-
-Fri Jul 10 17:41:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (is_case_sensitive): get attributes by the file descriptor
-	  of open directory, instead of using mount point name.
-
-Fri Jul 10 10:46:02 2015  ksss  <co000ri@gmail.com>
-
-	* ext/stringio/stringio.c (writable): remove unnecessary check for
-	  deprecated safe level 4.  [Fix GH-963]
-
-Thu Jul  9 15:07:12 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (waitpid): return immediately if interrupted.
-	  reported by <takkanm AT gmail.com> [ruby-dev:49176] [Bug #11340]
-
-Thu Jul  9 13:03:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_search_super_method): use CI_SET_FASTPATH().
-
-Thu Jul  9 11:07:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove rb_call_info_t::klass because
-	  rb_callable_method_entry_t has information about defined class.
-
-	* vm_insnhelper.c (vm_search_method): don't set ci->klass because
-	  it is removed.
-
-	* vm_insnhelper.c (rb_equal_opt): ditto.
-
-	* vm_insnhelper.c (vm_search_superclass): removed because it is too
-	  simple to write code directly.
-
-	* vm_insnhelper.c (vm_defined): don't use vm_search_superclass().
-	  This fix avoid searching current callable `me' twice.
-
-	* vm_insnhelper.c (vm_search_super_method): ditto.
-
-Thu Jul  9 10:03:10 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http/responses.rb: Added 308 status to CODE_TO_OBJ list.
-	  [fix GH-961] Patch by @billinghamj
-
-Thu Jul  9 09:34:14 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h (rb_control_frame_t): fix comments (layout index).
-
-Thu Jul  9 09:25:50 2015  Zachary Scott  <e@zzak.io>
-
-	* parse.y: Improve duplicate key warning with patch by @andremedeiros
-	  [Fix GH-938] https://github.com/ruby/ruby/pull/938 [Bug #11327]
-
-Wed Jul  8 07:43:01 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/csv.rb: typo fix [ci skip][fix GH-958] Patch by @henrik
-
-Wed Jul  8 04:42:27 2015  Eric Wong  <e@80x24.org>
-
-	* iseq.c (iseq_data_to_ary): dump kw_arg as symbol
-	* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
-	  [ruby-core:69891] [Bug #11338]
-
-Tue Jul  7 18:18:41 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* random.c (fill_random_bytes_syscall): fix compile error.
-
-Tue Jul  7 16:47:30 2015  Eric Wong  <e@80x24.org>
-
-	* compile.c (COMPILE_ERROR): reduce GET_THREAD() calls
-
-Tue Jul  7 16:39:04 2015  Eric Wong  <e@80x24.org>
-
-	* random.c (fill_random_bytes_syscall): return -1 for error
-	* random.c (fill_random_bytes): try urandom on syscall failure
-
-Tue Jul  7 15:02:18 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_str_normalize_ospath): skip invalid byte sequence not
-	  to loop infinitely.  this case usually does not happen as the
-	  input name should come from real file systems.
-
-Tue Jul  7 14:40:08 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_backtrace.c: remove debug flag introduced accidentally.
-
-Tue Jul  7 12:05:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (cont_free): remove mysterious fflush()
-	  introduced at r19890, maybe accidentally.
-
-Tue Jul  7 11:45:14 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (rb_method_call): because data->me should be non-NULL,
-	  do not check data->me
-
-	* proc.c (method_inspect): ditto.
-
-Tue Jul  7 11:37:25 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove rb_iseq_t::orig because rb_iseq_clone()
-	  no longer exists.
-
-	* iseq.c: don't use rb_iseq_t::orig.
-
-Tue Jul 07 11:25:57 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c, internal.h (rb_iseq_clone): removed because we don't need to
-	  clone iseq any more.
-
-	* class.c (clone_method): share iseq between cloned methods. All of
-	  method dependent information are able to refer from method entry.
-
-Tue Jul  7 04:42:25 2015  Eric Wong  <e@80x24.org>
-
-	* string.c (Init_String): use rb_str_freeze for String#freeze
-	  to resize internal buffer
-	  [ruby-core:69870] [Feature #11330]
-
-Tue Jul  7 04:12:32 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_define_method): remove an unused local variable.
-
-Tue Jul  7 03:57:28 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove rb_iseq_t::defined_method_id because it is not
-	  needed.
-
-	* eval.c (frame_func_id): simplify. rb_callable_method_entry_t
-	  has enough information.
-
-	* eval.c (frame_called_id): ditto.
-
-	* iseq.c (prepare_iseq_build): catch up this fix.
-
-	* proc.c (rb_mod_define_method): ditto.
-
-	* vm.c (vm_define_method): ditto.
-
-Tue Jul  7 03:47:26 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove a useless declaration.
-
-Tue Jul  7 03:33:20 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: remove rb_iseq_t::klass to reduce dynamic data.
-
-	* internal.h, iseq.c (rb_iseq_klass): remove it because
-	  rb_iseq_t::klass is removed.
-
-	* vm_insnhelper.c (vm_super_outside): do not see cfp->iseq, but
-	  check callable method entry on a frame.
-	  This fix simplify the logic to search super class.
-
-	* test/ruby/test_method.rb: support super() from Proc.
-	  Now, [Bug #4881] and [Bug #3136] was solved.
-
-	* proc.c (rb_mod_define_method): catch up this change.
-
-	* vm.c (vm_define_method): ditto.
-
-	* vm_backtrace.c (rb_profile_frames): now, each `frame' objects
-	  are rb_callable_method_entry_t data or iseq VALUEs.
-
-	  This fix introduce minor compatibility issue that
-	  rb_profile_frame_label() always returns
-	  rb_profile_frame_base_label().
-
-	* test/-ext-/debug/test_profile_frames.rb: catch up this change.
-
-Tue Jul  7 01:52:14 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* cont.c (fiber_init): initialize control frame correctly.
-	  This fix does not affect any ordinal execution, but
-	  affects debug prints.
-
-Mon Jul  6 17:59:05 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_search_super_method): do not skip calling
-	  same methods in super.
-	  [Bug #3351]
-
-	* test/ruby/test_super.rb: fix a test.
-
-Mon Jul  6 17:59:11 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/tk/tcltklib.c: removed deprecated safe level.
-
-Mon Jul  6 17:16:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h, proc.c (rb_method_entry_location): make it static
-	  and remove prefix `rb_' because it is used only in proc.c.
-
-Mon Jul  6 16:42:10 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/lib/memory_status.rb: removed redundant path.
-
-Mon Jul  6 01:18:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit/parallel.rb: make @@project_dir one level
-	  upper as this file had moved one level deeper.
-
-Sun Jul  5 23:54:10 2015  mizokami  <suzunatsu@yahoo.com>
-
-	* lib/optparse.rb: [DOC] Fix typo.
-
-Sun Jul  5 18:25:37 2015  Eric Wong  <e@80x24.org>
-
-	* gc.c (gc_profile_record_get): fix spelling error in keys
-
-Sun Jul  5 14:49:01 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* README.md: fix a typo pointed out by raoulvdberge.
-	  https://github.com/ruby/ruby/pull/953#commitcomment-11998186
-
-Sun Jul  5 12:56:20 2015  Irvi Firqotul Aini  <viarc7@gmail.com>
-
-	* README.md: Added link HowToReport bugs.
-
-Sun Jul  5 10:51:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): the original array may not be
-	  embedded even if a substitution array is embedded, as it is
-	  embedded when the original array is short enough but not
-	  embedded.  [ruby-dev:49166] [Bug #11332]
-
-Sun Jul  5 09:31:40 2015  Eric Wong  <e@80x24.org>
-
-	* test/ruby/test_process.rb: test for fd=3 usability in child
-
-Sat Jul  4 19:43:31 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* Add test case for empty array and first method with args.
-	  Patch by @yui-knk [fix GH-955]
-
-Sat Jul  4 19:39:08 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* Add test for `Enumerable#sort` with block. Patch by @yui-knk
-	  [fix GH-954]
-
-Sat Jul  4 14:38:43 2015  Eric Wong  <e@80x24.org>
-
-	* enum.c (zip_ary): remove volatile, use RB_GC_GUARD
-	  (zip_i): ditto
-
-Sat Jul  4 10:42:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rubygems/test_case.rb (teardown): do not delete features
-	  loaded from the original load paths, the same libraries should
-	  be loaded again when the same features are required.
-	  [ruby-dev:49031] [Bug #11222]
-
-Sat Jul  4 09:38:52 2015  Eric Wong  <e@80x24.org>
-
-	* vm.c (rb_vm_mark): reduce branches for always-set VM fields
-	  (rb_vm_add_root_module): ditto
-
-Fri Jul 03 20:05:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: introduce rb_callable_method_entry_t to remove
-	  rb_control_frame_t::klass.
-	  [Bug #11278], [Bug #11279]
-
-	  rb_method_entry_t data belong to modules/classes.
-	  rb_method_entry_t::owner points defined module or class.
-
-	    module M
-	      def foo; end
-	    end
-
-	  In this case, owner is M.
-
-	  rb_callable_method_entry_t data belong to only classes.
-	  For modules, MRI creates corresponding T_ICLASS internally.
-	  rb_callable_method_entry_t can also belong to T_ICLASS.
-
-	  rb_callable_method_entry_t::defined_class points T_CLASS or
-	  T_ICLASS.
-	  rb_method_entry_t data for classes (not for modules) are also
-	  rb_callable_method_entry_t data because it is completely same data.
-	  In this case, rb_method_entry_t::owner == rb_method_entry_t::defined_class.
-
-	  For example, there are classes C and D, and includes M,
-
-	    class C; include M; end
-	    class D; include M; end
-
-	  then, two T_ICLASS objects for C's super class and D's super class
-	  will be created.
-
-	  When C.new.foo is called, then M#foo is searched and
-	  rb_callable_method_t data is used by VM to invoke M#foo.
-
-	  rb_method_entry_t data is only one for M#foo.
-	  However, rb_callable_method_entry_t data are two (and can be more).
-	  It is proportional to the number of including (and prepending)
-	  classes (the number of T_ICLASS which point to the module).
-
-	  Now, created rb_callable_method_entry_t are collected when
-	  the original module M was modified. We can think it is a cache.
-
-	  We need to select what kind of method entry data is needed.
-	  To operate definition, then you need to use rb_method_entry_t.
-
-	  You can access them by the following functions.
-
-	  * rb_method_entry(VALUE klass, ID id);
-	  * rb_method_entry_with_refinements(VALUE klass, ID id);
-	  * rb_method_entry_without_refinements(VALUE klass, ID id);
-	  * rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me);
-
-	  To invoke methods, then you need to use rb_callable_method_entry_t
-	  which you can get by the following APIs corresponding to the
-	  above listed functions.
-
-	  * rb_callable_method_entry(VALUE klass, ID id);
-	  * rb_callable_method_entry_with_refinements(VALUE klass, ID id);
-	  * rb_callable_method_entry_without_refinements(VALUE klass, ID id);
-	  * rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me);
-
-	  VM pushes rb_callable_method_entry_t, so that rb_vm_frame_method_entry()
-	  returns rb_callable_method_entry_t.
-	  You can check a super class of current method by
-	  rb_callable_method_entry_t::defined_class.
-
-	* method.h: renamed from rb_method_entry_t::klass to
-	  rb_method_entry_t::owner.
-
-	* internal.h: add rb_classext_struct::callable_m_tbl to cache
-	  rb_callable_method_entry_t data.
-
-	  We need to consider about this field again because it is only
-	  active for T_ICLASS.
-
-	* class.c (method_entry_i): ditto.
-
-	* class.c (rb_define_attr): rb_method_entry() does not takes
-	  defined_class_ptr.
-
-	* gc.c (mark_method_entry): mark RCLASS_CALLABLE_M_TBL() for T_ICLASS.
-
-	* cont.c (fiber_init): rb_control_frame_t::klass is removed.
-
-	* proc.c: fix `struct METHOD' data structure because
-	  rb_callable_method_t has all information.
-
-	* vm_core.h: remove several fields.
-	  * rb_control_frame_t::klass.
-	  * rb_block_t::klass.
-
-	  And catch up changes.
-
-	* eval.c: catch up changes.
-
-	* gc.c: ditto.
-
-	* insns.def: ditto.
-
-	* vm.c: ditto.
-
-	* vm_args.c: ditto.
-
-	* vm_backtrace.c: ditto.
-
-	* vm_dump.c: ditto.
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-	* vm_method.c: ditto.
-
-Fri Jul  3 14:30:18 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c: some mingw compilers need a tweek for the
-	  declarations of _wfreopen_s.  [Bug #11320]
-
-Fri Jul  3 12:25:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (rb_econv_set_replacement): target encoding name can
-	  be empty now.  [ruby-core:69841] [Bug #11324]
-
-Fri Jul  3 07:21:06 2015  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_io_nonblock_noex.rb: new benchmark
-	* ext/openssl/ossl_ssl.c (no_exception_p): new function
-	  (ossl_start_ssl): adjust for no_exception_p
-	  (ossl_ssl_connect): adjust ossl_start_ssl call
-	  (ossl_ssl_connect_nonblock): ditto
-	  (ossl_ssl_accept): ditto
-	  (ossl_ssl_accept_nonblock): ditto
-	  (ossl_ssl_read_internal): adjust for no_exception_p
-	  (ossl_ssl_write_internal): ditto
-	  (ossl_ssl_write): adjust ossl_write_internal call
-	  (ossl_ssl_write_nonblock): ditto
-	* ext/stringio/stringio.c (strio_read_nonblock):
-	  delay exception check
-	* io.c (no_exception_p): new function
-	  (io_getpartial): call no_exception_p
-	  (io_readpartial): adjust for io_getpartial
-	  (get_kwargs_exception): remove
-	  (io_read_nonblock): adjust for io_getpartial,
-	  check no_exception_p on EOF
-	  (io_write_nonblock): call no_exception_p
-	  (rb_io_write_nonblock): do not check `exception: false'
-	  (argf_getpartial): adjust for io_getpartial
-	  [ruby-core:69778] [Feature #11318]
-
-Fri Jul  3 07:13:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (replace_real_basename): Win32 API does not set errno, get
-	  the last error by GetLastError() and map to errno.  [Bug #10015]
-
-Thu Jul  2 21:32:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (replace_real_basename): show warnings at errors.
-	  [Bug #10015]
-
-Thu Jul  2 18:39:20 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove `#define RGENGC_OBJ_INFO 1' line introduced to
-	  debug Bug #11244.
-
-Thu Jul  2 18:34:26 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_raw_obj_info): separated from rb_obj_info().
-	  Fill internal object information into passed buffer.
-
-	* gc.h: declare rb_raw_obj_info().
-
-Thu Jul  2 16:15:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (replace_real_basename): update path type by the target
-	  attributes if possible, to improve the performance.  [Bug #10015]
-
-Thu Jul  2 14:45:53 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* st.c: get rid of VC++'s warnings of C4700 (uninitialized local
-	  variable used).  I think that these are wrong, but should shut them
-	  up.
-
-Thu Jul  2 14:15:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rubygems.rb (Gem.load_path_insert_index): search
-	  @gem_prelude_index first.
-
-	* lib/rubygems/test_case.rb (Gem::TestCase#setup): keep already
-	  expanded paths to preserve instance variables.
-
-Thu Jul  2 14:12:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): also copy initial load path marks at
-	  setting load paths encoding.
-
-Thu Jul  2 12:26:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rubygems/test_gem_server.rb (process_based_port): use
-	  dynamically chosen port numbers to get rid of conflicts.
-
-Thu Jul  2 11:58:59 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem_specification.rb: skip tests which the
-	  platform does not permit the filename of its test file.
-
-Thu Jul  2 11:36:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rubygems/test_gem_resolver_git_specification.rb: require
-	  rubygems/installer.rb before Gem::TestCase#setup runs, otherwise
-	  as Gem::TestCase#teardown restores $LOADED_FEATURES to the state
-	  at that time, the requiring the file in GitSpecification#install
-	  method causes a lot of constant redefinitions.
-
-Thu Jul  2 10:43:36 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/rubysocket.h: flags for common socket families
-	  (rsock_getfamily): update signature
-	* include/ruby/io.h: comment socket FMODE flags
-	* ext/socket/init.c (rsock_getfamily): memoize family
-	* ext/socket/basicsocket.c: adjust rsock_getfamily calls
-	* ext/socket/ancdata.c: ditto
-	  [ruby-core:69713] [Feature #11298]
-
-Thu Jul  2 10:30:01 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems/resolver.rb: fixed NameError of Gem::Util::NULL_DEVICE.
-
-Thu Jul  2 09:51:44 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems/resolver.rb: fix error of null device reference with DOSISH
-	  platform.
-
-Thu Jul  2 06:49:44 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems: Update to RubyGems HEAD(c202db2).
-	  this version contains many enhancements see http://git.io/vtNwF
-	* test/rubygems: ditto.
-
-Wed Jul  1 23:50:34 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/net/http/test_httpresponse.rb
-	(HTTPResponseTest#test_read_body_content_encoding_deflate_uppercase):
-	fix a failure without zlib.
-
-Wed Jul  1 10:54:56 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* Add test for Enumerable#none? [fix GH-950] Patch by @yui-knk
-
-Wed Jul  1 09:30:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (struct_set_members): hide internal back_members
-	  object, and members object does not need to be duped as it
-	  should be frozen and hidden.
-
-Wed Jul  1 09:28:47 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (struct_member_pos): revert r51080 to fix other
-	  implicit conversions but cast the return value to fix the
-	  previous implicit conversion.
-
-Wed Jul  1 08:47:24 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* struct.c (struct_member_pos): avoid implicit conversion loses
-	  integer precision: 'long' to 'int'.
-
-Wed Jul  1 05:57:03 2015  Eric Wong  <e@80x24.org>
-
-	* vm_method.c (rb_add_method_iseq): add RB_GC_GUARD
-	* class.c (clone_method): remove RB_GC_GUARD
-	* struct.c (define_aref_method): ditto
-	  (define_aset_method): ditto
-	* vm.c (vm_define_method):
-	* iseq.c (rb_iseq_clone): add RB_GC_GUARD
-
-Wed Jul  1 05:43:58 2015  Eric Wong  <e@80x24.org>
-
-	* struct.c (AREF_HASH_THRESHOLD): new macro
-	  (id_back_members): new ID
-	  (struct_member_pos_ideal): new function
-	  (struct_member_pos_probe): ditto
-	  (struct_set_members): ditto
-	  (struct_member_pos): ditto
-	  (rb_struct_getmember): use struct_member_pos for O(1) access
-	  (rb_struct_aref_sym): ditto
-	  (rb_struct_aset_sym): ditto
-	  (setup_struct): call struct_set_members
-	  (struct_define_without_accessor): ditto
-	  (Init_Struct): initialize __members_back__
-	  [ruby-core:66851] [ruby-core:69705] [ruby-core:69821]
-
-Tue Jun 30 23:12:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_reopen): FilePathValue() ensures the path
-	  NUL-terminated and frozen, so it is unnecessary to make it shared.
-
-Tue Jun 30 23:11:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (check_dirname): ensure path name NUL-terminated for
-	  SHARABLE_MIDDLE_SUBSTRING.
-
-	* io.c (rb_sysopen): ditto.
-
-Tue Jun 30 18:38:16 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/file.c (rb_freopen): need to terminate by NUL.
-
-Tue Jun 30 17:28:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_reopen): freopen(3) with OS encoding path.
-	  [ruby-core:69780] [Bug #11320]
-
-	* win32/file.c (rb_freopen): wrapper of wchar version freopen(3).
-	  use _wfreopen_s() if available.
-
-Tue Jun 30 08:24:08 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (rb_io_oflags_modestr): handle O_TRUNC correctly
-	* test/ruby/test_io.rb (test_reopen_stdio): new test
-	  Patch-by: cremno phobia <cremno@mail.ru>
-	  [ruby-core:69779] [Bug #11319]
-
-Tue Jun 30 02:47:02 2015  Eric Wong  <e@80x24.org>
-
-	* include/ruby/st.h (struct st_table): hide struct list_head
-	* st.c (struct st_table_entry): adjust struct
-	  (head, tail): remove shortcut macros
-	  (st_head): new wrapper function
-	  (st_init_table_with_size): adjust to new struct and API
-	  (st_clear): ditto
-	  (add_direct): ditto
-	  (unpack_entries): ditto
-	  (rehash): ditto
-	  (st_copy): ditto
-	  (remove_entry): ditto
-	  (st_shift): ditto
-	  (st_foreach_check): ditto
-	  (st_foreach): ditto
-	  (get_keys): ditto
-	  (get_values): ditto
-	  (st_values_check): ditto
-	  (st_reverse_foreach_check): ditto (unused)
-	  (st_reverse_foreach): ditto (unused)
-	  [ruby-core:69726] [Misc #10278]
-
-Mon Jun 29 17:38:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (defineclass): do not quote unprintable characters at
-	  raising an exception.
-
-Mon Jun 29 16:01:24 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper
-	  case. [ruby-core:69670] [Bug #11285] patched by Andy Chu
-
-Mon Jun 29 14:50:08 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (add_activated_refinement): should not include the original
-	  class.
-
-Mon Jun 29 12:09:10 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* README.md: tweak styles. [fix GH-945][ci skip] Patch by @bryndyment
-
-Mon Jun 29 07:23:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/sizes.c.tmpl: extract RUBY_DEFINT to define sizes of
-	  types checked by configure.in, and fix size of intptr_t in
-	  universal binary.
-
-Mon Jun 29 02:10:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (defineclass): preserve encoding of name in error
-	  messages for super class mismatch.
-
-	* insns.def (defineclass): preserve encoding of name in error
-	  messages for non-class super.
-
-	* insns.def (defineclass): preserve encoding of name in error
-	  messages when already defined but type mismatch.
-
-Sun Jun 28 12:07:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_define_class_id_under): raise TypeError exception
-	  same as ruby level class definition when superclass mismatch.
-
-Sun Jun 14 19:02:03 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* lib/net/ftp.rb (makeport): close the TCPServer
-	  when sending the port fails.
-
-	* test/net/ftp/test_ftp.rb: test for above.
-
-Fri Jun 26 12:48:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (load_transcoder_entry): fix transcoder loading race
-	  condition, by waiting in require.  [ruby-dev:49106] [Bug #11277]
-
-Fri Jun 26 07:53:56 2015  Eric Wong  <e@80x24.org>
-
-	* enum.c (enum_minmax): simplify return value creation
-	* test/ruby/test_enum.rb: test behavior on empty
-	* hash.c (rb_hash_fetch_m): remove unnecessary volatile since r41597
-	  (env_reject_bang): trade volatile for GC guard
-	  (env_select): ditto
-	  (env_select_bang): ditto
-	  (env_keep_if): ditto
-	  (rb_env_clear): ditto
-
-Thu Jun 25 21:24:28 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/-ext-/popen_deadlock/test_popen_deadlock.rb: test [Bug #11265]
-
-	* ext/-test-/popen_deadlock/infinite_loop_dlsym.c: new ext to call
-	  dlsym(3) infinitely without GVL, used in the above test.
-
-	* ext/-test-/popen_deadlock/extconf.rb: extconf.rb for the above
-	  ext. Currently, only enabled on Solaris (main target) and Linux
-	  (as a reference platform and for debugging the ext).
-
-Thu Jun 25 19:24:25 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: not to use vfork on Solaris to avoid deadlock
-	  occurred in vfork(2) with multi-threading and dynamic linker
-	  on Solaris. [Bug #11265] [ruby-dev:49089]
-
-Thu Jun 25 18:25:41 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/lib/envutil.rb (Test::Unit::Assertions#assert_no_memory_leak):
-	  NO_MEMORY_LEAK_ENVS is moved to Memory::NO_MEMORY_LEAK_ENVS
-	  to reduce child executions during test-all on Solaris.
-
-	* test/lib/memory_status.rb (Memory::NO_MEMORY_LEAK_ENVS): ditto.
-
-Thu Jun 25 17:32:33 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_method_entry_create): need to call
-	  method_definition_reset() if def is given.
-
-	  Actually, `me' is a new object, so we don't need to call it.
-	  It is just to make sure.
-
-	* vm_method.c (method_definition_reset): remove duplicated insertion.
-
-	* vm_method.c (rb_method_entry_clone): assign dst->def here,
-	  not in method_definition_reset().
-
-Thu Jun 25 16:44:54 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c: make a rb_method_definition_t data (def) *after* making
-	  a rb_method_entry_t data (me).
-
-	  Normally, `me' points `def'. Some Ruby objects pointed from `def'
-	  and objects are marked by `me' (mark_method_entry() in gc.c).
-	  However, `def' is built before making a `me', then nobody can mark
-	  objects pointed from `def' before making (and pointing from) `me'.
-
-	  I hope this patch solve #11244.
-
-	* vm_method.c: remove `rb_' prefix from some static functions.
-
-	* method.h (rb_method_entry_create): constify
-
-	* gc.c (mark_method_entry): add checking `def' and
-	  `def->body.iseq.iseqptr' availability because they can be NULL.
-
-Thu Jun 25 14:14:16 2015  takiy33  <takiy33@gmail.com>
-
-	* test/test_prime.rb (test_eratosthenes_works_fine_after_timeout):
-	  use spaces instead of TABs in ruby codes.  [Fix GH-944]
-
-Thu Jun 25 07:08:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info, method_type_name): show method type name in a string
-	  instead of a number.
-
-Thu Jun 25 06:49:25 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): show more details for T_IMEMO/imemo_ment.
-
-Thu Jun 25 06:40:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_method_definition_reset): need a WB for
-	  VM_METHOD_TYPE_ATTRSET.
-
-Thu Jun 25 03:33:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (RGENGC_OBJ_INFO, obj_info): add a macro to enable/disable
-	  rich obj_info() output.
-
-	  At the default, the value of RGENGC_OBJ_INFO is
-	  (RGENGC_DEBUG | RGENGC_CHECK_MODE).
-
-	* gc.c (RGENGC_OBJ_INFO): force enable it to debug #11244.
-
-	* gc.c (gc_mark_ptr): print more details with obj_info().
-
-	* gc.c (gc_mark_children): remove useless debug prints.
-
-Thu Jun 25 02:40:33 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal):
-	  do not process kwargs in blocking mode
-	* test/openssl/test_ssl.rb: test sysread
-
-Wed Jun 24 16:54:11 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_children): add additional debug code for #11244.
-
-Wed Jun 24 16:05:42 2015  Eric Wong  <e@80x24.org>
-
-	* string.c (rb_str_justify): use RB_GC_GUARD
-
-Wed Jun 24 14:25:17 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_ptr): add a check code for #11244.
-
-	  It should be removed later. But we can remain this check
-	  because it is only a branch.
-
-Wed Jun 24 12:49:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_fstring_cstr): new function to make a fstring from
-	  a string literal.
-
-	* internal.h (rb_fstring_lit): new macro to make a fstring from a
-	  string literal.
-
-	* include/ruby/intern.h (rb_strlen_lit): new macro to get the
-	  length of a string literal, borrowed from mruby/mruby@e4afd53.
-
-Wed Jun 24 12:21:16 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* re.c: Update documentation for Regexp class.
-	  [fix GH-937][ci skip] Patch by @davydovanton
-
-Wed Jun 24 09:23:03 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (generic_ivar_set): remove FL_ABLE check
-	  (gen_ivar_copy): ditto
-	  [ruby-core:69715]
-
-Wed Jun 24 08:28:15 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): reduce stack use
-	  [ruby-core:69595] [Feature #11263]
-
-Tue Jun 23 14:32:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_receiver): raise ArgumentError if no receiver
-	  is available on this exception object.  [Feature #10881]
-
-Tue Jun 23 09:48:34 2015  Eric Wong  <e@80x24.org>
-
-	* dir.c (check_dirname): avoid volatile, use return value
-	  (dir_s_chroot, dir_s_mkdir, dir_s_rmdir): adjust callers
-
-Tue Jun 23 06:37:10 2015  Eric Wong  <e@80x24.org>
-
-	* struct.c (struct_ivar_get): cache member definition in a subclass
-	  Thanks to Sokolov Yura aka funny_falcon <funny.falcon@gmail.com>
-	  in https://bugs.ruby-lang.org/issues/10585
-
-Tue Jun 23 04:58:06 2015  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_vm2_struct_big_href_hi.rb: new benchmark
-	* benchmark/bm_vm2_struct_big_href_lo.rb: ditto
-	* benchmark/bm_vm2_struct_big_hset.rb: ditto
-	* benchmark/bm_vm2_struct_small_href.rb: ditto
-	* benchmark/bm_vm2_struct_small_hset.rb: ditto
-	  Thanks to Sokolov Yura aka funny_falcon <funny.falcon@gmail.com>
-	  in https://bugs.ruby-lang.org/issues/10585
-
-Mon Jun 22 18:08:48 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/lib/test/unit.rb (Test::Unit::Parallel#start_watchdog): removed
-	  because it has been meaningless since r36385. [Bug #11288]
-
-	* test/lib/test/unit.rb (Test::Unit::Parallel#_run_parallel): delete
-	  lines related to the removed start_watchdog method
-
-Sun Jun 21 23:52:46 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention about Array#bsearch_index and Hash#fetch_values.
-
-Sun Jun 21 23:46:27 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add a reference to a ticket.
-
-Sun Jun 21 20:28:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (roomof): extract from type_roomof, and move from
-	  bignum.c.
-
-Sun Jun 21 18:32:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby_atomic.h (ATOMIC_PTR_CAS): define by generic CAS macro, not
-	  via size_t, to suppress a warning by mingw gcc.
-
-Sun Jun 21 05:31:41 2015  Shota Fukumori  <her@sorah.jp>
-
-	* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when
-	  passed object is a special const, instead of SEGV.
-	  Based patch by Kohei Suzuki (eagletmt). [ruby-core:69692] [Bug #11291]
-
-	* test/objspace/test_objspace.rb(test_dump_special_consts): Test for above fix.
-
-
-Sat Jun 20 03:56:58 2015  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* enc/make_encmake.rb: the list of encoding extension libraries must
-	  not include encinit.c itself.  It caused "undefined reference to
-	  Init_encinit".
-
-Sat Jun 20 02:03:53 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* process.c (rb_execarg_parent_start1): new macro ALWAYS_NEED_ENVP
-	  to generate envp_str anytime on Solaris 10 (or earlier version
-	  of Solaris) to avoid calling execv() which is async-signal unsafe
-	  on Solaris 10. [Bug #11265] [ruby-dev:49089]
-
-	* process.c (exec_with_sh, proc_exec_cmd): On Solaris 10,
-	  because ALWAYS_NEED_ENVP is 1 and envp_str is always generated,
-	  execv() in exec_with_sh() and proc_exec_cmd() are never called.
-	  To guarantee this, execv() is replaced by a macro to print
-	  out error message on Solaris 10.
-
-	* process.c (proc_exec_sh): Because proc_exec_sh() may be called
-	  by rb_proc_exec() with envp_str = Qfalse, execl() is replaced
-	  by a macro that calls execle() with "extern char **environ"
-	  traditional global variable on Solaris 10.
-	  TODO: This may be unsafe and should be changed in the future.
-	  Although rb_proc_exec() is not used from inside current version
-	  of ruby, it may be called by third-party extensions.
-
-Sat Jun 20 01:10:13 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention about $SAFE.
-
-Fri Jun 19 14:53:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_mod_define_method): now requires a block direct to
-	  this method call.  [ruby-core:69655] [Bug #11283]
-
-Fri Jun 19 13:54:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (rb_mod_define_method): get rid of inadvertent ID
-	  creations at error.
-
-Fri Jun 19 07:58:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: if no with-ext option is given, default to
-	  enable everything.  [ruby-dev:49108] [Bug #11280]
-
-Fri Jun 19 06:30:07 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* bootstraptest/test_method.rb: remove a test because $SAFE=2 was
-	  obsolete.
-
-	  Please check btest, too.
-
-Thu Jun 18 23:51:51 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* bin/erb: $SAFE=3 is obsolete.
-
-Thu Jun 18 23:45:11 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* safe.c: removed needless doc related $SAFE=2
-
-Thu Jun 18 23:38:07 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (rb_thread_safe_level): fix document.  $SAFE=3 is obsolete.
-	  [ci skip]
-
-Thu Jun 18 23:25:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: configure intersection of with-ext and not
-	  without-ext, as withouts is no longer true by default if
-	  with-ext option is given.  [ruby-dev:49108] [Bug #11280]
-
-Thu Jun 18 23:20:46 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* include/ruby/ruby.h: $SAFE=2 is now obsolete.
-
-	* dir.c, ext/fiddle/handle.c, ext/socket/basicsocket.c, file.c
-	  gc.c, io.c, process.c, safe.c, signal.c, win32/file.c:
-	  removed code for $SAFE=2
-
-	* test/erb/test_erb.rb, test/fiddle/test_handle.rb
-	  test/ruby/test_env.rb: removed tests for $SAFE=2.
-
-Thu Jun 18 22:50:07 2015  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* enc/make_encmake.rb: added --transes and --no-transes options.
-
-Thu Jun 18 18:24:12 2015  Eric Wong  <e@80x24.org>
-
-	* test/socket/test_unix.rb: replace sleep with select
-
-Thu Jun 18 17:59:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (rb_vm_control_frame_id_and_class): remove useless codes.
-	  `me' knows ID and owner class.
-
-Thu Jun 18 16:58:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: constify rb_method_alias_struct::original_me and
-	  rb_method_refined_struct::orig_me.
-
-	* class.c (move_refined_method): use RB_OBJ_WRITE() for
-	  me->def->body.refined.orig_me.
-
-Thu Jun 18 14:35:28 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (count_imemo_objects): support imemo_ment.
-
-Thu Jun 18 13:32:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_receiver): add NameError#receiver method.
-	  [Feature #10881]
-
-Thu Jun 18 10:00:06 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* safe.c: removed needless doc related $SAFE=3
-
-Thu Jun 18 09:59:23 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* safe.c: rename old method name for $SAFE=3
-
-Thu Jun 18 06:02:42 2015  Eric Wong  <e@80x24.org>
-
-	* compile.c (get_exception_sym2type, iseq_build_from_ary_body):
-	  rely on %+PRIsVALUE instead of calling rb_inspect directly
-
-Wed Jun 17 20:59:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ENC_MK): needs fake.rb if cross compilation.
-	  [ruby-dev:49098] [Bug #11272]
-
-Wed Jun 17 20:23:29 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/rbconfig/sizeof/extconf.rb: Check __float80.
-
-Wed Jun 17 15:15:53 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* safe.c (safe_setter): of course, don't have to warn the limitation of
-	  $SAFE=3 after it's removed.
-
-Wed Jun 17 14:29:43 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* include/ruby/ruby.h: $SAFE=3 is now obsolete.
-
-	* ext/socket/init.c, ext/socket/socket.c, ext/socket/tcpsocket.c
-	  ext/socket/udpsocket.c, gc.c, object.c, re.c, safe.c: removed code
-	  for $SAFE=3
-
-	* bootstraptest/test_method.rb, test/erb/test_erb.rb, test/ruby/test_dir.rb
-	  test/ruby/test_file.rb, test/ruby/test_method.rb, test/ruby/test_regexp.rb
-	  test/ruby/test_thread.rb: remove tests for $SAFE=3
-
-Wed Jun 17 12:13:33 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: added contributor name.
-
-Wed Jun 17 10:57:28 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/csv.rb: accept to use Range object for row selection.
-	  contributed by Mitsutaka Mimura.
-	  [Feature #11267][ruby-dev:49091]
-
-Wed Jun 17 09:50:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/servlet.rb (documentation_search, root_search):
-	  requires json for JSON.dump and fix sporadic failures due to
-	  the loading order.
-
-Tue Jun 16 19:19:53 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/rbconfig/sizeof/extconf.rb: Check several types defined in C99
-	  and x86_64 ABI.
-
-	* template/sizes.c.tmpl: Relax a pattern for types.
-
-Tue Jun 16 17:37:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/objspace/test_objspace.rb: relax pattern because uncollectible
-	  flag and marked flag can be false at major GC.
-	  [Bug #10852]
-
-Tue Jun 16 04:50:44 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/basicsocket.c (bsock_recv): document outbuf
-	* ext/socket/unixsocket.c (unix_recvfrom): ditto
-	* ext/socket/init.c (rsock_strbuf, recvfrom_locktmp): new functions
-	  (rsock_s_recvfrom): support destination buffer as 3rd arg
-	  (rsock_s_recvfrom_nonblock): ditto
-	* string.c (rb_str_locktmp_ensure): export for internal ext
-	* test/socket/test_nonblock.rb: test recv_nonblock
-	* test/socket/test_unix.rb: test recv
-	  [ruby-core:69543] [Feature #11242]
-
-Tue Jun 16 04:38:02 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal,
-	  bsock_recvmsg_internal):
-	  support "exception: false" kwarg
-	* ext/socket/init.c (rsock_s_recvfrom_nonblock):
-	  ditto
-	* ext/socket/init.c (rsock_s_recvfrom_nonblock): use rsock_opt_false_p
-	* ext/socket/socket.c (sock_connect_nonblock): ditto
-	* ext/socket/rubysocket.h (rsock_opt_false_p): new function
-	* ext/socket/basicsocket.c (bsock_recv_nonblock): update rdoc
-	* ext/socket/udpsocket.c (udp_recvfrom_nonblock): ditto
-	* test/socket/test_nonblock.rb: new tests
-	  [ruby-core:69542] [Feature #11229]
-
-Mon Jun 15 14:33:02 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb: Make Set#each and SortedSet#each generate a sized
-	  enumerator. [GH-931] by kachick (Kenichi Kamiya)
-
-	* test/test_set.rb: Import tests from Set into SortedSet. [GH-931]
-	  by kachick (Kenichi Kamiya)
-
-Mon Jun 15 02:26:34 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP#connect): use connect_nonblock and
-	  io/wait to eliminate timeout use. fix GH-899
-
-Sat Jun 13 07:21:18 2015  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_start_func_2): don't interrupt when last thread
-	  exit unless main thread is already exited. Otherwise main thread
-	  could be wrongly interrupted when it uses rb_thread_call_without_gvl().
-	  Patch by Takehiro Kubo. [Bug #11237][ruby-dev:49044][GH-898]
-
-	* test/-ext-/gvl/test_last_thread.rb: new test for the above fix.
-
-	* ext/-test-/gvl/call_without_gvl/call_without_gvl.c: new ext for
-	  the above test.
-	* ext/-test-/gvl/call_without_gvl/extconf.rb: ditto.
-
-Mon Jun 15 00:14:33 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/lib/pathname.rb (descend): Blockless form supported.
-	  (ascend): Ditto.
-	  [ruby-core:68820] [Feature #11052] Patch by Piotr Szotkowski.
-
-Sun Jun 14 20:09:25 2015  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (time_getlocaltime): [DOC] Add examples of valid utc_offset
-	  formats.
-	  [ruby-core:68306] [Misc #10905] Patch by Charles Korn.
-
-Sun Jun 14 18:49:56 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/raddrinfo.c (parse_numeric_port): Detect
-	  port overflow.
-	  (numeric_getaddrinfo): Use parse_numeric_port.
-	  numeric_getaddrinfo fails if port is too big now.
-	  This makes rb_getaddrinfo invokes the real getaddrinfo()
-	  on such condition.
-	  This change is related to [ruby-core:69355] [Bug #11179].
-
-Sun Jun 14 17:26:03 2015  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_chunk_while): New method Enumerable#chunk_while.
-	  [ruby-core:67738] [Feature #10769] proposed by Tsuyoshi Sawada.
-
-Sun Jun 14 17:20:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_load_ok): try opening file without gvl not to
-	  lock entire process.  [Bug #11060]
-
-Sun Jun 14 10:43:50 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/runruby.rb: just remove the lines of RUBY_VERSION check and raise
-	  instead of replacing the check to `true`, for getting rid of a
-	  warning `possibly useless use of true in void context`.
-
-Sun Jun 14 10:13:55 2015  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/source.rb (REXML::IOSource#scan): Fix a typo in
-	  document. [fix GH-934]
-	  Patch by Anton Davydov. Thanks!!!
-
-Sun Jun 14 10:09:48 2015  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/attlistdecl.rb (REXML::AttlistDecl): Fix a typo in
-	  document. [fix GH-934]
-	  Patch by Anton Davydov. Thanks!!!
-
-Sun Jun 14 06:24:57 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/ruby/test_io.rb: add test for IO.binread fd leak.
-	  See r50881.
-
-Sun Jun 14 05:23:51 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* io.c (rb_io_s_binread): close fd if seek offset is invalid.
-
-Sun Jun 14 04:40:32 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/lib/leakchecker.rb (check): refactor.
-
-Sun Jun 14 04:34:14 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/lib/leakchecker.rb: Return false for no leaks.
-	  Otherwise the GC could run for nothing.
-
-Sun Jun 14 04:15:40 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* lib/delegate.rb: [DOC] Update SimpleDelegator example. [ci skip]
-
-Sat Jun 13 20:28:14 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (rb_stat_ino): get inode from the interval of struct st.
-
-	* win32/win32.c (stati64_set_inode): get nFileIndexHigh/Low, and set it
-	  to the interval of struct st as inode.
-	  [Feature #11216]
-
-	* win32/win32.c (stati64_set_inode_handle): call stati64_set_inode.
-
-	* win32/win32.c (rb_w32_fstati64): call stati64_set_inode_handle.
-
-	* win32/win32.c (stati64_handle): call stati64_set_inode.
-
-Sat Jun 13 19:44:53 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/io/console/depend (.list.chksum): revert a part of r50859, because
-	  it was not mentioned at its commit log and it caused a build error on
-	  Windows ($(MAKE) is already quoted).
-
-Sat Jun 13 17:35:11 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_core.h (rb_thread_t): add th->name.
-
-	* vm.c (th_init): initialize th->name.
-
-	* thread.c (Init_Thread): add Thread.name and name=. [Feature #11251]
-
-	* thread.c (rb_thread_inspect): show thread's name if set.
-
-	* thread.c (rb_thread_getname): defined.
-
-	* thread.c (rb_thread_setname): ditto.
-
-Sat Jun 13 11:39:43 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/tempfile.rb: Fix typo. [fix GH-933] Patch by @Zorbash
-
-Sat Jun 13 11:38:00 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/openssl/ossl_ocsp.c: fix documentation on ocsp response cert status.
-	  [fix GH-932] Patch by @chrisholmes
-
-Sat Jun 13 11:35:19 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem.
-	  [fix GH-929] Patch by @voxik
-	* ext/io/console/io-console.gemspec: ditto.
-
-Sat Jun 13 00:45:08 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Return sized enumerators.
-	  Patch by Kenichi Kamiya [GH-931]
-
-Sat Jun 13 00:45:06 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Fix with_object with no block given
-
-Sat Jun 13 00:44:59 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Have with_index accept an offset parameter.
-	  Based on patch by T Yamada. [#11007]
-
-Fri Jun 12 22:21:12 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_extlibs.rb (TestExtLibs::check_existence): fix
-	  error. [Bug #11255] [ruby-dev:49079]
-
-Fri Jun 12 21:17:46 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* pack.c (pack_{un,}pack): new template character `j` and `J`, pointer
-	  with signed and unsigned integers.
-
-	* NEWS: mention about this feature.
-	  [Feature #11215] [ruby-dev:49015]
-
-Fri Jun 12 21:01:44 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (File::SHARE_DELETE): new flag to be able to delete opened file
-	  on Windows.
-
-	* include/win32/win32.c (O_SHARE_DELETE): new pseudo file mode flag.
-
-	* win32/win32.c (rb_w32_{w,}open): support above flag.  [EXPERIMENTAL]
-
-	* NEWS: mention about this feature.
-	  [Feature #11218] [ruby-dev:49022]
-
-Fri Jun 12 18:21:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: added missing commit message.
-
-Fri Jun 12 18:20:37 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* sample/exyacc.rb: Fix some typos. [fix GH-927] Patch by @davydovanton
-	* sample/list.rb: ditto.
-	* sample/trick2013/kinaba/remarks.markdown: ditto.
-
-Fri Jun 12 17:34:14 2015  Wojciech Mach  <wojtek@wojtekmach.pl>
-
-	* hash.c (rb_hash_fetch_values): add `Hash#fetch_values`.
-	  [Feature #10017] [Fix GH-776]
-
-Fri Jun 12 16:28:17 2015  Radan Skoric  <radan.skoric@gmail.com>
-
-	* array.c (rb_ary_bsearch_index): Implement Array#bsearch_index
-	  method, which is similar to bsearch and returns the index or
-	  nil.  [Feature #10730]
-
-Thu Jun 11 19:11:22 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/zlib/zlib.c: Fix indentation for rdoc.
-	  [Bug #11221][ruby-core:69465]
-
-Thu Jun 11 16:23:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h (METHOD_ENTRY_BASIC_SET): fix last commit (unbalanced parens).
-
-Thu Jun 11 15:14:16 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: define SET_THREAD_NAME if it has pthread_set_name_np
-	  for FreeBSD, and don't define it if both pthread_setname_np
-	  and pthread_set_name_np don't exist.
-
-	* thread_pthread.c (SET_THREAD_NAME): don't define if they don't exist.
-
-	* thread_pthread.c (native_set_thread_name): run if SET_THREAD_NAME
-	  is defined.
-
-Thu Jun 11 15:53:31 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h (METHOD_ENTRY_BASIC_SET): should clear last bit.
-
-Thu Jun 11 14:34:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb: bump version to 2.4.7 and 2.4.8. these versions fixed
-	  CVE-2015-3900.
-	* lib/rubygems/remote_fetcher.rb: ditto.
-	* test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900
-
-Thu Jun 11 14:18:51 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb: bump version to 2.4.6. It's missing change at r49774.
-
-Thu Jun 11 13:50:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (ary_ensure_room_for_push): check if array size will
-	  exceed maximum size to get rid of buffer overflow.
-	  [ruby-dev:49043] [Bug #11235]
-
-	* array.c (ary_ensure_room_for_unshift, rb_ary_splice): ditto.
-
-Thu Jun 11 13:17:34 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/test_cmath.rb (TestCMath#test_trigonometric_functions): should
-	  not compare float values (in complex values) by `==`.
-
-Thu Jun 11 08:52:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: embed rb_method_entry_t::attr::flags (5 bits) into
-	  rb_method_entry_t::flags to make one word spare space.
-
-	  Add some macros to access these flags.
-
-	* vm_method.c: use these macros.
-
-	* internal.h: define IMEMO_FL_USHIFT and IMEMO_FL_USER[0-4]
-	  for T_IMEMO local flags.
-
-Thu Jun 11 08:27:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c: use VM_ASSERT instead of assert().
-
-	* vm_args.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-	* vm_method.c: ditto.
-
-Thu Jun 11 08:16:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: define VM_ASSERT() for assertion
-	  enabled only when (VM_CHECK_MODE > 0).
-
-	* vm_insnhelper.c: move definition VM_CHECK_MODE
-	  from vm_insnhelper.c to vm_core.h.
-
-	* vm.c: remove <assert.h>
-
-Thu Jun 11 06:46:07 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (check_frame): check type of cref_or_me first.
-
-Thu Jun 11 04:34:39 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* test/test_cmath.rb: Add some assertions.
-
-Thu Jun 11 00:34:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/fake.rb.in: expanded macro result may have spaces
-	  between tokens.  [ruby-dev:49047] [Bug #11243]
-
-Wed Jun 10 22:27:32 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* lib/mkmf.rb: revert r50804 because of build failure when specifying
-	  LDFLAGS during configure, observed on Solaris with GCC 4.6.
-	  [Bug #11245]
-
-Wed Jun 10 21:59:51 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* README.ja.md: fix markup miss.
-
-Wed Jun 10 11:06:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/fake.rb.in: turn into erb template from autoconf
-	  template to fake more accurately.
-
-	* common.mk (fake.rb): needs preprocessed file now.
-
-	* version.c (Init_version): add dummy expression to
-	  RUBY_ENGINE_VERSION.
-
-Tue Jun  9 12:31:25 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Simplify and optimize EratosthenesSieve
-
-Tue Jun  9 11:45:00 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Simplify and optimize EratosthenesSieve
-	  based on patch by Ajay Kumar. [Fixes GH-921]
-
-Mon Jun  8 05:09:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): print method id for T_IMEMO/ment.
-
-Sun Jun  7 07:05:43 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* Move test cases from test/ruby/test_complex.rb to test/test_cmath.rb
-
-Sat Jun  6 18:23:41 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: back to share rb_method_definition_t by
-	  rb_method_entry_t.
-
-	  r50728 changed sharing `def's to isolating `def's
-	  on alias and so on. However, this change conflicts
-	  future improvement plan. So I change back to sharing approach.
-
-	* method.h: move rb_method_definition_t::flags to
-	  rb_method_entry_t::attr::flags.
-
-	  rb_method_entry_t::attr is union with VALUE because this field
-	  should have same size of VALUE. rb_method_entry_t is T_IMEMO).
-
-	  And also add the following access macros to it's fields.
-
-	  * METHOD_ENTRY_VISI(me)
-	  * METHOD_ENTRY_BASIC(me)
-	  * METHOD_ENTRY_SAFE(me)
-
-	* vm_method.c (rb_method_definition_addref): added instead of
-	  rb_method_definition_clone().
-
-	  Do not create new definition, but increment alias_count.
-
-	* class.c (clone_method): catch up this fix.
-
-	* class.c (method_entry_i): ditto.
-
-	* proc.c (mnew_internal): ditto.
-
-	* proc.c (mnew_missing): ditto.
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-	* vm_method.c: ditto.
-
-Sat Jun  6 15:59:38 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c: ins_methods_push() needs rb_method_visibility_t type on
-	  2nd arg.
-
-Sat Jun  6 15:05:47 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (ins_methods_push): Change type and name of parameters
-	  to make more clear.
-
-Sat Jun  6 08:52:13 2015  Eric Wong  <e@80x24.org>
-
-	* test/socket/test_nonblock.rb: try to avoid EMSGSIZE
-	  [ruby-core:69466]
-
-Sat Jun  6 07:58:30 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove struct mark_tbl_arg and pass objspace directly
-	  to avoid indirect access overhead.
-
-Sat Jun  6 07:08:45 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): drop redundant assignment
-
-Sat Jun  6 01:00:06 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): all arguments are
-	  parsed even on systems without HAVE_STRUCT_MSGHDR_MSG_CONTROL
-	  to prevent SEGV caused by passing Qnil to RARRAY_LENINT and
-	  to preserve behavior before r50776.
-	  [Bug #11224] [ruby-core:69468] [Bug #11225] [ruby-core:69469]
-
-Fri Jun  5 22:37:42 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (ins_methods_push): change 3rd parameter's type
-	  from long to rb_method_visibility_t.
-
-	* class.c (ins_methods_i): catch up this fix.
-
-	* class.c (method_entry_i): cast to st_data_t instead of `long'.
-
-Fri Jun  5 20:37:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: move definition of rb_cref_t to method.h.
-
-	* eval_intern.h: move definition of rb_scope_visibility_t
-	  to method.h.
-
-	* method.h: change rb_cref_t::scope_visi from VALUE to
-	  rb_scope_visibility_t.
-	  [Bug #11219]
-
-	* vm.c (vm_cref_new): accept rb_method_visibility_t directly.
-
-	* vm_insnhelper.c (rb_vm_rewrite_cref): don't use 0,
-	  but METHOD_VISI_UNDEF.
-
-	* vm_method.c (rb_scope_visibility_set): don't need to use cast.
-
-	* vm_method.c (rb_scope_module_func_set): ditto.
-
-Fri Jun  5 17:27:30 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): avoid msg_control
-	  ptr if msg_controllen is zero to fix portability problems.
-
-Fri Jun  5 09:17:45 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): fix build error
-	  from r50776
-
-Fri Jun  5 07:05:58 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (sym_wait_readable, sym_wait_writable): declare
-	  (io_getpartial): use sym_wait_readable
-	  (io_write_nonblock): use sym_wait_writable
-	  (Init_IO): initialize sym_wait_*able
-
-Fri Jun  5 06:43:00 2015  Eric Wong  <e@80x24.org>
-
-	* doc/extension.rdoc: note rb_get_kwargs changes keywords_hash
-	  [ruby-core:68507]
-
-Fri Jun  5 05:50:29 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal): use rb_scan_args
-	  [ruby-core:69439] [Feature #11207]
-
-Fri Jun  5 02:20:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/lib/envutil.rb (assert_no_memory_leak): change default value
-	  of limit from 1.5 to 2.0. It is ad-hoc fix to solve test failure
-	  in travis-ci.
-
-Fri Jun  5 01:17:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_defined): no need to use cast.
-
-Fri Jun  5 01:14:02 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_defined): show additional messages on rb_bug().
-
-Fri Jun  5 01:06:02 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_add_method_iseq): use intermediate struct to
-	  avoid initializing struct with variables.
-	  [Bug #11217]
-
-	* method.h: add a comment about it.
-
-Fri Jun  5 00:55:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: constify rb_method_refined_t::orig_me.
-
-	  Also constify the following functions.
-
-	  * rb_resolve_refined_method()
-	  * rb_method_entry_with_refinements()
-	  * rb_method_entry_without_refinements()
-	  * rb_method_entry_copy()'s parameter.
-
-	* class.c: catch up this fix.
-
-	* vm_insnhelper.c: ditto.
-
-	* vm_method.c: ditto.
-
-Thu Jun  4 12:47:54 SGT 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* array.c: Revert r50763. because "reentered" is not typo.
-
-Thu Jun  4 11:12:29 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c: fix a typo. Patch by @davydovanton
-	  [fix GH-923]
-	* include/ruby/st.h: ditto.
-	* include/ruby/util.h: ditto.
-
-Thu Jun  4 10:54:30 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* array.c: fix a typo. Patch by @manish-shrivastava
-	  [fix GH-922]
-
-Thu Jun  4 09:52:02 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/lib/openssl/ssl.rb: use io/nonblock instead of fcntl
-	  [ruby-core:69382] [Feature #11190]
-
-Thu Jun  4 07:22:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: introduce rb_method_refined_t for refined method entry.
-
-	* class.c (move_refined_method): catch up this fix.
-
-	* gc.c (mark_method_entry): ditto.
-
-	* vm_eval.c (vm_call0_body): ditto.
-
-	* vm_insnhelper.c (vm_call_method): ditto.
-
-	* vm_method.c: ditto.
-
-Thu Jun  4 07:12:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dirent_match): match short names only when FNM_SHORTNAME
-	  flag is given, for the backward compatibility, and the new
-	  behavior is often dangerous.  [ruby-core:69435] [Bug #11206]
-
-Thu Jun  4 05:44:01 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (special_generic_ivar): remove flag
-	  (givar_i, rb_mark_generic_ivar_tbl): remove functions
-	  (rb_free_generic_ivar, rb_ivar_lookup, rb_ivar_delete,
-	   generic_ivar_set, rb_ivar_set, rb_ivar_defined,
-	   rb_copy_generic_ivar, rb_ivar_foreach, rb_ivar_count,
-	   rb_obj_remove_instance_variable):
-	   adjust for lack of ivar support in special constants
-	* test/ruby/test_variable.rb: test ivars for special consts
-	* internal.h: remove rb_mark_generic_ivar_tbl decl
-	* gc.c (gc_mark_roots): remove rb_mark_generic_ivar_tbl call
-	  [ruby-core:69441] [Feature #11208]
-
-Thu Jun  4 05:13:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (def_iseq_ptr): `iseqval' is not available any more.
-
-Thu Jun  4 04:50:12 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (method_entry_i): mtbl should not have `me' as NULL.
-
-Thu Jun  4 04:28:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (clone_method): do not use me->klass, but use explicitly
-	  passed argument.
-
-Thu Jun  4 04:10:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h (rb_vm_rewrite_cref_stack): rename to rb_vm_rewrite_cref().
-
-	* class.c (clone_method): use renamed name.
-
-	* vm_insnhelper.c (rb_vm_rewrite_cref): do not use `node' in variable
-	  names.
-
-Wed Jun  3 23:03:50 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c: rename `rb_frame_...' to `rb_scope_...'.
-
-	* eval_intern.h: move decl. of rb_scope_visibility_set() to method.h.
-
-	* load.c: catch up this fix.
-
-Wed Jun  3 21:14:20 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/rbconfig/sizeof/extconf.rb: Check C99 standard integer types.
-
-Wed Jun  3 21:00:47 2015  Tanaka Akira  <akr@fsij.org>
-
-	* configure.in: Don't check __int128.
-
-	* ext/rbconfig/sizeof/extconf.rb: Check __int128.
-
-	* ext/rbconfig/sizeof/depend: sizes.c depends on
-	  ext/rbconfig/sizeof/extconf.rb.
-
-	* template/sizes.c.tmpl: Detect check_sizeof.
-
-Wed Jun  3 20:07:07 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (clone_method): remove redundant check for me->def != NULL.
-	  Now, all `me` have `me->def`.
-
-	* proc.c (rb_method_entry_location): ditto.
-
-	* vm.c (rb_vm_check_redefinition_opt_method): ditto.
-
-	* vm.c (add_opt_method): ditto.
-
-	* vm_eval.c (vm_call0_body): ditto.
-
-Wed Jun  3 19:24:12 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: rename enum missing_reason to enum method_missing_reason.
-
-	* vm_core.h: use enum method_missing_reason for
-	  rb_thread_t::method_missing_reason.
-
-	* vm_eval.c: catch up this fix.
-
-	* vm_insnhelper.c: ditto.
-
-Wed Jun  3 16:17:21 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* vm.c: eagerly allocate `loading_table`.  This eliminates the need to
-	  do NULL checks when looking up the `loading_table` hash.
-	  https://github.com/ruby/ruby/pull/918
-
-	* load.c: remove various NULL checks
-
-Wed Jun  3 11:47:15 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: change fields order to gather frequent access fields.
-
-	* vm_insnhelper.c (vm_call_method): add LIKELY().
-
-Wed Jun 03 10:35:45 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: split rb_method_definition_t::flag to several flags.
-
-	  `flag' contains several categories of attributes and it makes us
-	  confusion (at least, I had confused).
-
-	  * rb_method_visibility_t (flags::visi)
-	    * NOEX_UNDEF     -> METHOD_VISI_UNDEF     = 0
-	    * NOEX_PUBLIC    -> METHOD_VISI_PUBLIC    = 1
-	    * NOEX_PRIVATE   -> METHOD_VISI_PRIVATE   = 2
-	    * NOEX_PROTECTED -> METHOD_VISI_PROTECTED = 3
-	  * NOEX_SAFE(flag)  -> safe (flags::safe, 3 bits)
-	  * NOEX_BASIC       -> basic (flags::basic, 1 bit)
-	  * NOEX_MODFUNC     -> rb_scope_visibility_t in CREF
-	  * NOEX_SUPER       -> MISSING_SUPER (enum missing_reason)
-	  * NOEX_VCALL       -> MISSING_VCALL (enum missing_reason)
-	  * NOEX_RESPONDS    -> BOUND_RESPONDS (macro)
-
-	  Now, NOEX_NOREDEF is not supported (I'm not sure it is needed).
-
-	  Background:
-	    I did not know what "NOEX" stands for.
-	    I asked Matz (who made this name) and his answer was "Nothing".
-	    "At first, it meant NO EXport (private), but the original
-	    meaning was gone."
-	    This is why I remove the mysterious word "NOEX" from MRI.
-
-	* vm_core.h: introduce `enum missing_reason' to represent
-	  method_missing (NoMethodError) reason.
-
-	* eval_intern.h: introduce rb_scope_visibility_t to represent
-	  scope visibility.
-	  It has 3 method visibilities (public/private/protected)
-	  and `module_function`.
-
-Wed Jun  3 08:06:30 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gem/bundled_gems: updated to test-unit 3.1.1 and minitest 5.7.0.
-
-Wed Jun  3 04:48:05 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_defined): check respond_to_missing?
-	  at defined?(func()).
-	  [Bug #11212]
-
-	* test/ruby/test_defined.rb: add a test for this fix.
-
-Wed Jun  3 04:34:39 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_defined): skip respond_to_missing? when
-	  a method is available.
-	  [Bug #11211]
-
-	* test/ruby/test_defined.rb: add a test for this fix.
-
-Wed Jun  3 04:14:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def (defined), vm_insnhelper.c (vm_defined):
-	  move instruction body to the vm_defined() function.
-
-Wed Jun  3 02:29:25 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* test/ruby/test_module.rb: Do not assume class variable order.
-	  Patch by @enebo.
-
-Wed Jun  3 01:10:38 2015  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm_method.c (rb_method_definition_set): remove a double assignment.
-	  Coverity Scan found this bug.
-
-Wed Jun  3 00:04:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_alias): rename parameter names.
-
-Tue Jun  2 23:27:18 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: remove rb_method_iseq_t::iseqval.
-	  While making a r50728, iseqval is needed (to mark correctly),
-	  but now just iseqptr is enough.
-
-	* class.c: catch up this fix.
-
-	* gc.c: ditto.
-
-	* proc.c: ditto.
-
-	* vm_method.c: ditto.
-
-Tue Jun  2 21:29:28 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (proc_curry): remove a debug line.
-
-Tue Jun  2 12:43:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: make rb_method_entry_t a VALUE.
-	  Motivation and new data structure are described in [Bug #11203].
-
-	  This patch also solve the following issues.
-
-	  * [Bug #11200] Memory leak of method entries
-	  * [Bug #11046] __callee__ returns incorrect method name in orphan
-	                 proc
-
-	* test/ruby/test_method.rb: add a test for [Bug #11046].
-
-	* vm_core.h: remove rb_control_frame_t::me. me is located at value
-	  stack.
-
-	* vm_core.h, gc.c, vm_method.c: remove unlinked_method... codes
-	  because method entries are simple VALUEs.
-
-	* method.h: Now, all method entries has own independent method
-	  definitions. Strictly speaking, this change is not essential,
-	  but for future changes.
-
-	  * rb_method_entry_t::flag is move to rb_method_definition_t::flag.
-	  * rb_method_definition_t::alias_count is now
-	    rb_method_definition_t::alias_count_ptr, a pointer to the counter.
-
-	* vm_core.h, vm_insnhelper.c (rb_vm_frame_method_entry) added to
-	  search the current method entry from value stack.
-
-	* vm_insnhelper.c (VM_CHECK_MODE): introduced to enable/disable
-	  assertions.
-
-Tue Jun  2 10:46:36 2015  Eric Wong  <e@80x24.org>
-
-	* test/socket/test_nonblock.rb: new test for sendmsg_nonblock
-
-Tue Jun  2 09:04:14 2015  Eric Wong  <e@80x24.org>
-
-	* lib/benchmark.rb: just use Process::CLOCK_MONOTONIC
-	  [ruby-core:69390]
-
-Mon Jun  1 22:01:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option
-	  is not available.  patch in [ruby-core:69428] by Hans Mackowiak.
-	  [ruby-core:69421] [Bug #11201]
-
-Mon Jun  1 21:18:24 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_children): remove a garbage character
-	  introduced at the last commit.
-
-Mon Jun  1 19:24:42 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_method_entry_make): do not show warning message
-	  when method_entry is an alias.
-
-Mon Jun  1 15:47:16 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: move class related definitions.
-
-Mon Jun  1 15:43:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c: remove needless include pragma for method.h.
-
-	* struct.c: ditto.
-
-	* vm_method.c: ditto.
-
-Mon Jun  1 05:42:00 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h, vm_method.c: move macros to functions.
-	  * SCOPE_TEST(f)  -> rb_frame_visibility_test(flag).
-	  * SCOPE_CHECK(f) -> rb_frame_visibility_check(flag).
-	  * SCOPE_SET(f)   -> rb_frame_visibility_set(flag).
-
-	* load.c (load_ext): use it.
-
-Mon Jun  1 04:47:37 2015  Zachary Scott  <e@zzak.io>
-
-	* ext/date/date_core.c: [DOC] Add comparison of Time and DateTime
-	  Patch provided by @pixeltrix
-
-Mon Jun  1 04:22:09 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h (VM_FRAME_MAGIC_DUMMY): introduce new frame type to
-	  recognize dummy frame.
-
-	* vm.c (th_init): use new frame type.
-
-	* vm_args.c (raise_argument_error): ditto.
-
-Mon Jun  1 04:15:42 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (rb_class_has_methods): added to reduce dependency
-	  to internal class data structure.
-
-	* internal.h: ditto.
-
-	* hash.c (has_extra_methods): use added function.
-
-Mon Jun  1 04:11:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c , gc.h (rb_obj_info): export obj_info(VALUE) for debugging.
-
-Mon Jun  1 03:52:55 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_gc.rb: increase timeout seconds for GC stressful
-	  debugging.
-
-Sun May 31 04:18:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: fix typo of comments.
-
-Sun May 31 03:36:42 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: add VM_METHOD_TYPE_ALIAS rb_method_definition_t::type
-	  to fix [Bug #11173].
-
-	  Now, inter class/method alias creates new method entry
-	  VM_METHOD_TYPE_ALIAS, which has an original method entry.
-
-	* vm_insnhelper.c (find_defined_class_by_owner): added.
-	  Search corresponding defined_class from owner class/module.
-
-	* vm_method.c (rb_method_entry_get_without_cache): return me->klass
-	  directly for defined_class.
-
-	  Now, no need to check me->klass any more.
-
-	* vm_method.c (method_entry_set0): separated from method_entry_set().
-
-	* vm_method.c (rb_alias): make method entry has VM_METHOD_TYPE_ALIAS.
-
-	* vm_method.c (release_method_definition): support VM_METHOD_TYPE_ALIAS.
-
-	* vm_method.c (rb_hash_method_definition): ditto.
-
-	* vm_method.c (rb_method_definition_eq): ditto.
-
-	* vm_method.c (release_method_definition): ditto.
-
-	* vm_insnhelper.c (vm_call_method): ditto.
-
-	* vm_insnhelper.c (vm_method_cfunc_entry): ditto.
-
-	* vm_eval.c (vm_call0_body): ditto.
-
-	* gc.c (mark_method_entry): ditto.
-
-	* proc.c (method_def_iseq): ditto.
-
-	* proc.c (method_cref): ditto.
-
-	* proc.c (rb_method_entry_min_max_arity): ditto.
-
-	* test/ruby/test_alias.rb: add tests.
-
-	* test/ruby/test_module.rb: fix a test to catch up current behavior.
-
-Sun May 31 03:34:25 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_unlink_method_entry): make it static.
-
-Sun May 31 03:26:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h, vm_method.c (rb_free_method_entry): constify a parameter.
-
-	* vm_core.h: remove useless declaration about rb_unlink_method_entry().
-
-Sat May 30 18:05:02 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/tempfile.rb (Remover#call): fixed wrong condition.  introduced at
-	  r50682.
-
-Sat May 30 16:12:35 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
-	  [ruby-core:69419] [Feature #11198]
-
-Sat May 30 15:59:10 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile#initialize): initialize @unlinked to fix
-	  test failures introduced at r50682.  I hope that check the results of
-	  tests before committing, at least the tests about the changed feature.
-
-Sat May 30 11:02:55 2015  Martin Englund <martin@englund.nu>
-
-	* doc/dtrace_probes.rdoc: change lingering dtrace probe documentation
-	  from function- to method-
-
-Sat May 30 10:26:09 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* lib/tempfile.rb: refactoring.
-	  * use warn instead of STDERR.print
-	  * remove @tmpname and use @tmpfile.path
-	  * introduce @unlinked flag
-	  * Remover takes only @tmpfile
-	  * mode will be modified just before file reopen
-
-Sat May 30 09:02:51 2015  Eric Wong  <e@80x24.org>
-
-	* include/ruby/intern.h (rb_generic_ivar_table): deprecate
-	* internal.h (rb_attr_delete): declare
-	* marshal.c (has_ivars): use rb_ivar_foreach
-	  (w_ivar): ditto
-	  (w_object): update for new interface
-	* time.c (time_mload): use rb_attr_delete
-	* variable.c (generic_ivar_delete): implement
-	  (rb_ivar_delete): ditto
-	  (rb_attr_delete): ditto
-	  [ruby-core:69323] [Feature #11170]
-
-Sat May 30 09:14:28 2015  Scott Francis  <scott.francis@shopify.com>
-
-	* cont.c (cont_free): check if ruby_current_thread is still valid.
-	  [Fix GH-914]
-
-Sat May 30 08:36:04 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (static int special_generic_ivar): move
-	  (rb_generic_ivar_table): rewrite for compatibility
-	  (gen_ivtbl_bytes): new function
-	  (generic_ivar_get): update to use ivar index
-	  (generic_ivar_update): ditto
-	  (generic_ivar_set): ditto
-	  (generic_ivar_defined): ditto
-	  (generic_ivar_remove): ditto
-	  (rb_mark_generic_ivar): ditto
-	  (givar_i): ditto
-	  (rb_free_generic_ivar): ditto
-	  (rb_mark_generic_ivar_tbl): ditto
-	  (rb_generic_ivar_memsize): ditto
-	  (rb_copy_generic_ivar): ditto
-	  (rb_ivar_set): ditto
-	  (rb_ivar_foreach): ditto
-	  (rb_ivar_count): ditto
-	  (givar_mark_i): remove
-	  (gen_ivtbl_mark): new function
-	  (gen_ivar_each): ditto
-	  (iv_index_tbl_extend): update for struct ivar_update
-	  (iv_index_tbl_newsize): ditto
-	  [ruby-core:69323] [Feature #11170]
-
-Sat May 30 08:10:46 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (iv_index_tbl_make): extract from rb_ivar_set
-	  (iv_index_tbl_extend): ditto
-	  (iv_index_tbl_newsize): ditto
-	  (rb_ivar_set): use extracted functions
-	  [ruby-core:69323] (Part 1)
-
-Fri May 29 17:39:14 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* tool/make_hgraph.rb: added.
-
-Fri May 29 14:39:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): out of range NTH_REF is always
-	  nil.
-
-	* parse.y (parse_numvar): check overflow of NTH_REF and range.
-	  [ruby-core:69393] [Bug #11192]
-
-	* util.c (ruby_scan_digits): make public and add length parameter.
-
-Fri May 29 11:18:58 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_sendmsg_internal,
-	  bsock_recvmsg_internal):
-	  avoid redundant fcntl on Linux
-	  [ruby-core:69154] [Feature #11145]
-	* ext/socket/init.c (rsock_s_recvfrom_nonblock): ditto
-	* ext/socket/rubysocket.h (MSG_DONTWAIT_RELIABLE): new macro
-
-Fri May 29 10:30:34 2015  Eric Wong  <e@80x24.org>
-
-	* lib/net/resolv.rb (request): use monotonic clock
-	* lib/net/http.rb (begin_transport, end_transport): ditto
-	  [ruby-core:69384] [Feature #11124]
-
-Fri May 29 04:37:38 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c: add two methods to debug internals.
-
-	  * ObjectSpace.internal_class_of: return RBASIC_CLASS(obj).
-	  * ObjectSpace.internal_super_of: return RCLASS_SUPER(cls).
-
-	* NEWS: add information about both methods.
-
-	* test/objspace/test_objspace.rb: add tests for both methods.
-
-Thu May 28 06:55:53 2015  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* ext/tk/sample/figmemo_sample.rb (open_file),
-	  ext/tk/sample/tktextio.rb (TkTextIO): fix typo in messages.
-	  [Fix GH-916]
-
-Wed May 27 09:50:51 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile
-	  [ruby-core:69371] [Bug #11185]
-
-Wed May 27 09:27:30 2015  Eric Wong  <e@80x24.org>
-
-	* lib/drb/drb.rb (set_sockopt): remove redundant fcntl call
-	* lib/drb/unix.rb (set_sockopt): ditto
-	  [ruby-core:69128] [Feature #11137]
-
-Tue May 26 22:10:43 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_method.c (rb_alias): should resolve refined methods.
-	  [ruby-core:69360] [Bug #11182]
-
-Tue May 26 21:35:13 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* include/ruby/defines.h (RUBY_ATTR_ALLOC_SIZE): fix condition.
-
-Mon May 25 22:35:58 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (rel): after the relations is changed,
-	  @changesets is no longer right.
-
-Mon May 25 11:27:14 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c (setup_overlapped): seek to the file end only when
-	  writing (mode:a), not reading (mode:a+, read).
-
-Mon May 25 00:27:37 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* numeric.c (Numeric#negative?): [DOC] Fix call-seq.
-	  Patch by @yui-knk. [Fixes GH-908]
-
-Sun May 24 01:35:22 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* debug.c (ruby_debug_print_id): use rb_id2name() for fprintf().
-
-Sat May 23 18:38:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* man/*.1: updated dates in man pages.
-	  [ruby-dev:48988] [Bug #11171]
-
-Sat May 23 03:10:58 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): should return the count of
-	  actually eaten characters, include escape sequences.
-
-Fri May 22 22:36:14 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Remove obsolete Prime.new
-	  patch by Ajay Kumar. [Fixes GH-891]
-
-Fri May 22 21:13:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_sym_count): move `rb_sym_all_symbols`
-	  to a symbol.c specific section.  a part of patch by Lourens
-	  Naude.
-
-Fri May 22 20:56:33 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* complex.c (f_complex_polar): simple bug reproduced only when y is
-	  a float but x is not a float.
-
-Fri May 22 19:42:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_spawn_process): do not discard global escape
-	  status.  [ruby-core:69304] [Bug #11166]
-
-	* process.c (rb_execarg_spawn): extract the start procedure in a
-	  parent process with ensuring the end procedure.
-
-Fri May 22 16:48:32 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: added news for net-telnet and rake
-
-Thu May 21 20:27:07 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (RUBY_DTRACE_POSTPROCESS): cmp -b is GNU extension.
-	  darwin uses GNU cmp, and FreeBSD and Solaris are not.
-	  Note that accidentally equals to expected result.
-
-Thu May 21 18:00:19 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c: constify.
-
-	* iseq.h: ditto.
-
-	* method.h: ditto.
-
-	* proc.c: ditto.
-
-	* vm_method.c: ditto.
-
-Thu May 21 17:44:53 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: fix issues caused by binding created from Method#to_proc.
-	  [Bug #11163]
-
-	* vm.c (vm_cref_new_toplevel): export as rb_vm_cref_new_toplevel().
-
-	* test/ruby/test_method.rb: add some assertions.
-
-Thu May 21 17:29:26 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/matrix.rb: added documentation for Matrix#empty and Matrix#/
-	  [Feature #10070][ruby-dev:48433] Patch by @gogotanaka
-
-Thu May 21 17:02:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: rename functions.
-	  * method_get_def() -> method_def()
-	  * method_get_iseq() -> method_def_iseq()
-	  * method_get_cref() -> method_cref()
-
-Thu May 21 16:52:44 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (rb_method_get_iseq): rename to rb_method_iseq.
-
-	* iseq.c: catch up this fix.
-
-	* iseq.h: commit ditto.
-
-Thu May 21 15:41:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/telnet.rb: gemify net-telnet.
-	  [Feature #11083]
-	* gems/bundled_gems: added net-telnet to bundled gems.
-
-Thu May 21 15:37:32 2015  Zachary Scott  <e@zzak.io>
-
-	* vm_method.c: Remove private attribute warning [Bug #10967]
-	  Patch by @spastorino [Fixes GH-849]
-	  https://github.com/ruby/ruby/pull/849
-
-	* test/ruby/test_module.rb: Update test for changes
-
-Thu May 21 10:59:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (method_proc): rename to method_to_proc.
-
-Thu May 21 10:51:54 2015  Jake Worth  <jakeworth82@gmail.com>
-
-	* io.c (rb_f_select): [DOC] Fixes for grammar and style.
-	  [Fix GH-906]
-
-Thu May 21 08:25:19 2015  Eric Wong  <e@80x24.org>
-
-	* variable.c (Init_var_tables): init generic_iv_tbl
-	  (rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
-	   generic_ivar_defined, generic_ivar_remove,
-	   rb_mark_generic_ivar, givar_i, rb_mark_generic_ivar_tbl,
-	   rb_free_generic_ivar, rb_copy_generic_ivar, rb_ivar_foreach,
-	   rb_ivar_count): remove checks for uninitialize generic_iv_tbl
-	[ruby-core:69155] [Feature #11146]
-
-Thu May 21 04:11:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (exception_type2symbol): show correct bug message.
-
-Wed May 20 23:19:05 2015  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* lib/base64.rb: Fix rdoc-formatting for padding argument.
-	  [fix GH-905][ci skip] Patch by @davydovanton
-
-Wed May 20 13:16:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (DEPRECATED_BY): deprecate warning with preferable
-	  alternative.
-
-	* configure.in (RUBY_FUNC_ATTRIBUTE): allow attribute arguments in
-	  the macro.
-
-Wed May 20 11:23:24 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_dump.c (rb_print_backtrace): return value of libexec's backtrace
-	  is size_t, so simply cast as int.
-
-Tue May 19 18:54:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_compile_with_option): check source type, must be
-	  an IO or a String.  [ruby-core:69219] [Bug #11159]
-
-Tue May 19 17:15:03 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/benchmark.rb: Update Benchmark documentation and formatting.
-	  [fix GH-903][ci skip] Patch by @davydovanton
-
-Tue May 19 13:10:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_positive_p): should false on Bignum 0.
-	  http://twitter.com/rafaelfranca/status/600509783427391488
-	  [ruby-core:69173] [Feature #11151]
-
-Tue May 19 11:22:28 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/rfc2396_parser.rb (initialize_pattern):
-	  URI::Generic.build should accept port as a string.
-	  pattern[:PORT] is not defined for long.
-	  by Dave Slutzkin <daveslutzkin@fastmail.fm>
-	  https://github.com/ruby/ruby/pull/804 fix GH-804
-
-Tue May 19 11:18:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_data_typed_object_alloc),
-	  (rb_data_object_alloc): add old names for source level backward
-	  compatibilities.
-
-	* gc.c (rb_data_object_alloc, rb_data_typed_object_alloc): add
-	  aliases for binary level backward compatibilities.
-
-Tue May 19 09:54:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (Data_Make_Struct0): needs function pointer
-	  casts to fix function overloading in C++.
-
-Tue May 19 09:43:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (Data_Make_Struct0, TypedData_Make_Struct0):
-	  explicit cast from void* is necessary as implicit cast is
-	  disallowed in C++.
-
-Mon May 18 15:31:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_f_notimplement): should not respond to
-	  not-implemented methods.  as the address inside a DLL and the
-	  imported address are different on Windows, use an exported
-	  variable to share the same address.
-
-Mon May 18 13:55:01 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/monitor.rb (mon_try_enter, mon_enter): should reset @mon_count
-	  just in case the previous owner thread dies without mon_exit.
-	  [fix GH-874] Patch by @chrisberkhout
-
-Sun May 17 17:21:29 2015  Eric Wong  <e@80x24.org>
-
-	* lib/webrick/utils.rb (set_non_blocking): use IO#nonblock=
-	* (set_close_on_exec): use IO#close_on_exec=
-	  [Feature #11136]
-
-Sun May 17 15:01:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_positive_p, num_negative_p): add methods
-	  Numeric#positive? and Numeric#negative?.
-	  [ruby-core:69173] [Feature #11151]
-
-	* numeric.c (flo_positive_p, flo_negative_p): specialized
-	  functions for Float.
-
-	* complex.c (Init_Complex): Complex do not have positive? and
-	  negative? methods
-
-Sun May 17 14:57:42 2015  Eric Wong  <e@80x24.org>
-
-	* lib/webrick/server.rb (accept_client): avoid redundant fcntl call
-	  [Feature #11137]
-
-Sun May 17 12:13:33 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (cloexec_accept): support nonblock flag and
-	  use SOCK_NONBLOCK if possible
-	* ext/socket/init.c (rsock_s_accept_nonblock):
-	  update cloexec_accept call
-	* ext/socket/init.c (accept_blocking): ditto for blocking
-	* test/socket/test_nonblock.rb: check nonblock? on accepted socket
-	  [Feature #11138]
-
-Sun May 17 03:58:59 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* load.c (loaded_feature_path): stop returning false negatives for
-	  filenames which are trailing substrings of file extensions.  For
-	  example, 'b', which a trailing substring of ".rb" should not return
-	  false. [Bug #11155][ruby-core:69206]
-
-	* test/ruby/test_autoload.rb: test for fix
-
-Sat May 16 21:41:24 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* string.c: added documentation for character sequence \' with String#sub
-	  [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127
-
-Sat May 16 21:38:05 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enum.c: fix a sample code. Patch by @eagletmt
-	  [fix GH-901][ci skip]
-
-Sat May 16 21:17:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_data_object_wrap, rb_data_typed_object_wrap): rename
-	  alloc as wrap.  these functions do not allocate data pointers
-	  but just wrap the given pointers.
-
-Sat May 16 19:59:24 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_accept): simplified.
-
-Fri May 15 18:28:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_assoc, rb_ary_rassoc): [DOC] the result when key
-	  was found is the existing element, not a new array.  reported by
-	  Giau Nguyen <giaunv AT nustechnology.com>.
-
-Fri May 15 08:24:28 2015  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
-
-	* lib/cgi/cookie.rb: Implement HttpOnly flag for cookies.
-	  [fix GH-887] Patch by @martinpovolny
-
-Fri May 15 06:54:19 2015  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* variable.c: Change autoload to call `require` through Ruby rather
-	  than directly calling `rb_require_safe`.  This allows things like
-	  RubyGems to intercept file loading done though `autoload`.
-	  [Feature #11140]
-
-	* test/ruby/test_autoload.rb: Test for change.
-
-Wed Apr  8 19:18:02 2015  Shota Fukumori (sora_h)  <her@sorah.jp>
-
-	* enum.c (enum_grep_v, grep_i, grep_iter_i, Init_enum):
-	  Implement Enumerable#grep_v. [Feature #11049]
-
-Thu May 14 15:54:13 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/pathname/lib/pathname.rb: Remove condition of RUBY_VERSION <= 1.9.
-	  [Feature #11082]
-
-Wed May 13 17:10:37 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* enum.c (enum_to_a): revert r50457.
-	  it requires recursion check.
-	  then, it doesn't make performance improvement.
-	  [Bug #11130] [Feature #9118]
-
-Wed May 13 11:13:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parse_gvar): separate message for gvar without
-	  non-space characters from message for invalid identifiers.
-
-Tue May 12 22:18:27 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* enum.c (enum_to_a): fix incompatibility introduced in r50457.
-	  [Bug #11130]
-
-	* test/ruby/test_enum.rb: test for above.
-
-Tue May 12 17:08:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* method.h: remove unused declaration.
-
-Mon May 11 10:58:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update minitest-5.6.1 and power_assert-0.2.3.
-
-Mon May 11 00:20:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (Data_Make_Struct, TypedData_Make_Struct):
-	  allocate wrapper data object before allocating DATA_PTR to get
-	  rid of possible memory leak when the former failed.
-
-Sun May 10 21:32:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (gc_mark_children): call dmark function for non-NULL
-	  pointers only, so that DATA_PTR can be NULL safely now.
-
-Sun May 10 16:23:58 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* proc.c (proc_binding): fix segmentation fault on marking phase.
-	  envptr of newenvval should not be NULL.
-
-	  You can reproduce by
-	   make test-all TESTS='--gc-stress -n test_to_proc_binding ruby/test_method.rb'
-
-Sun May 10 12:41:18 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* ext/zlib/zlib.c (rb_gzreader_external_encoding):
-	  define GzipReader#external_encoding.
-	  [Bug #10900]
-
-	* test/zlib/test_zlib.rb: test for above.
-
-Sun May 10 11:57:48 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* ext/win32ole/win32ole_variant.c: fix typo "indicies".
-	  the patch is from davydovanton <antondavydov.o at gmail.com>.
-	  [fix GH-892]
-
-	* lib/rubygems/indexer.rb: ditto.
-
-	* test/rubygems/test_gem_indexer.rb: ditto.
-
-Sun May 10 11:44:37 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* string.c (rb_str_crypt): Raise ArgumentError when
-	  string passed to String#crypt contains null.
-	  the patch is from jrusnack <jrusnack at redhat.com>.
-	  [Bug #10988] [fix GH-853]
-
-	* test/ruby/test_string.rb: test for above.
-
-Sun May 10 11:23:03 2015  Masaki Matsushita <glass.saga@gmail.com>
-
-	* enum.c (enum_to_a): Use size to set array capa when possible.
-	  the patch is from HonoreDB <aweiner at mdsol.com>.
-	  [fix GH-444]
-
-Sat May  9 06:48:36 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
-	  [Bug #11123]
-
-Fri May  8 22:57:24 2015  takiy33  <takiy33@gmail.com>
-
-	* test/matrix/test_matrix.rb (test_determinant): refactor test on
-	  Matrix#determinant, by merging with test_det for an alias method
-	  det.  [Fix GH-897]
-
-Fri May  8 15:43:11 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp
-	  is omitted.  [ruby-core:69093] [Bug #11128]
-
-Fri May  8 15:05:57 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/syntax/control_expressions.rdoc: fix a missing "a"
-	  [fix GH-888][ci skip] Patch by @riffraff
-
-Fri May  8 12:11:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_method_call_status): resolve refined method entry
-	  to check if undefined.  [ruby-core:69064] [Bug #11117]
-
-Thu May  7 22:22:59 2015  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* proc.c: [DOC] fix Binding#local_variable_set example. [ci skip]
-
-Thu May  7 11:32:57 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* Makefile.in (rbconfig.rb): add rule to make.
-
-Thu May  7 05:14:39 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/lib/socket.rb (connect_nonblock): use IO#wait_writable
-	* lib/drb/drb.rb (DRB::DRbTCPSocket#alive?): use IO#wait_readable
-	* lib/webrick/httpserver.rb (run): ditto
-	* lib/resolv.rb (request): ditto for single socket case
-	  [ruby-core:68943] [Feature #11081]
-
-Wed May  6 22:49:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_method_call_status): undefined refined method is
-	  not callable unless using.  [ruby-core:69064] [Bug #11117]
-
-Sun May  3 22:40:06 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* ext/-test-/file/fs.c: need to include sys/statvfs.h
-	  to use statvfs().
-
-	* ext/-test-/file/extconf.rb: check the existence of
-	  sys/statvfs.h
-
-Sun May  3 21:59:48 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/yaml.rb: fix typo. [ci skip][fix GH-890]
-	  Patch by @miketheman
-
-Sun May  3 10:02:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (linear_object_p, range_include): test if covered for
-	  linear objects.  [ruby-core:69052] [Bug #11113]
-
-Fri May  1 13:30:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (dln_load): check if a different libruby is loaded by the
-	  extension library, and then bail out to get rid of very
-	  frequently reported stale bug reports.
-
-Thu Apr 30 19:51:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): revert r46873 and r46875, not to
-	  allow to execute private readers by pretending op assign.
-	  [ruby-core:68984] [Bug #11096]
-
-Thu Apr 30 17:02:33 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* rational.c: Added documentation for rational literal.
-	  [Bug #11075][fix GH-885][ci skip] Patch by @shishir127
-
-Thu Apr 30 16:39:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
-	  before other library calls and use rb_syserr_fail.
-	  [ruby-core:68531] [Bug #10975]
-
-Thu Apr 30 16:22:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lambda): push and reset cmdarg_stack in lambda body.
-	  [ruby-core:69017] [Bug #11107]
-
-Sun Apr 26 07:36:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/utf_8.c (code_to_mbclen, code_to_mbc): reject values larger
-	  than UTF-8 max codepoints.  [Feature #11094]
-
-Sat Apr 25 14:26:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_buf_cat): expand later so that the buffer can be
-	  larger for further use.  [Bug #11080] [Bug #11095]
-
-Fri Apr 24 23:48:45 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* misc/ruby-electric.el: Import version 2.2.3 from
-	  https://github.com/knu/ruby-electric.el.
-
-Fri Apr 24 10:40:02 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_{getc,putc}): removed.  they are needed for old
-	  ruby (before 1.8), but not now.
-
-Fri Apr 24 08:40:13 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c: remove bcc related code.
-
-	* include/ruby/win32.h: ditto.
-
-Fri Apr 24 08:21:07 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c (rb_acrt_lowio_lock_fh): wrap _pioinfo(i)->lock.
-
-	* win32/win32.c (rb_acrt_lowio_unlock_fh): ditto.
-
-Fri Apr 24 06:47:19 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c (_filbuf): msvc14 doesn't have it, use _fgetc_nolock.
-
-	* win32/win32.c (_flsbuf): msvc14 doesn't have it, use _fputc_nolock.
-
-	* win32/win32.c (vcruntime_file): define vcruntime_file on msvc14
-	  because it doesn't export FILE's internal structure.
-
-	* win32/win32.c (FILE_COUNT): added to abstract FILE->_cnt.
-
-	* win32/win32.c (FILE_READPTR): added to abstract FILE->_ptr.
-
-	* win32/win32.c (FILE_FILENO): added to abstract FILE->_file.
-
-	* win32/win32.c (init_stdhandle): use FILE_FILENO.
-
-	* win32/win32.c (rb_w32_getc): use FILE_COUNT and FILE_READPTR.
-
-	* win32/win32.c (rb_w32_putc): ditto.
-
-Fri Apr 24 06:37:07 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c (dupfd): use _set_osfhnd.
-
-	* win32/win32.c (rb_w32_wopen): use _set_osflags.
-
-Thu Apr 24 05:38:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_roots): fox to work PRINT_ROOT_TICKS.
-
-Fri Apr 24 04:49:05 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/Makefile.sub: MSVC14 have struct timespec.
-
-	* win32/rtname.cmd: support vcruntime140.dll.
-
-	* time.c (localtime_with_gmtoff_zone): MSVC14 doesn't have tzname and
-	  daylight but have _tzname and _daylight.
-
-Thu Apr 23 11:35:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow
-	  symbols to just instance_eval/exec, except for definition of
-	  singletons.  [ruby-core:68961] [Bug #11086]
-
-Thu Apr 23 10:01:36 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/delegate.rb: fix a typo.
-	  [fix GH-881][ci skip] Patch by @Zorbash
-
-Wed Apr 22 18:36:50 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (move, uid_move): support the MOVE command defined
-	  in RFC6851.  Patch by ojab ojab.
-	  [ruby-core:68960] [Feature #11077]
-
-Tue Apr 22 12:42:12 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* test/ruby/test_object.rb: add tests for Kernel#String and Kernel#Array.
-	  [fix GH-879][fix GH-880] Patch by @yui-knk
-
-Tue Apr 21 20:46:02 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_object.rb: renamed tests to explicitly class name.
-	  [fix GH-877] Patch by @yui-knk
-
-Tue Apr 21 05:31:00 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/lib/socket.rb (connect_internal): avoid common exceptions
-	  from connect_nonblock. [ruby-core:68909]
-
-Mon Apr 20 23:46:53 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_wreadlink): follow the official format of
-	  REPARSE_DATA_BUFFER structure.
-
-Mon Apr 20 20:23:04 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk ($(arch)-fake.rb): revert r50354 because bsdmake seems not
-	  to handle such substitution.
-
-	* tool/expand-config.rb: convert path separators here.
-
-Mon Apr 20 16:52:20 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/fake.rb: don't fake libdir.  use libdirname instead.
-
-Mon Apr 20 16:49:52 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (MakeMakefile#configuration): DESTDIR should never affect
-	  top_srcdir and builddir.
-
-Mon Apr 20 16:18:17 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk ($(arch)-fake.rb): fix the path separator up for Windows.
-
-Mon Apr 20 15:02:47 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_wreadlink): fixed a bug that a junction misses
-	  its drive letter.
-
-Mon Apr 20 12:54:56 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/openssl/*: use license instead of licence.
-	  [fix GH-876][ci skip] Patch by @davydovanton
-	* lib/net/https.rb: ditto.
-
-Mon Apr 20 12:42:40 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* benchmark/bm_so_meteor_contest.rb: fix a typo.
-	  [fix GH-876][ci skip] Patch by @davydovanton
-	* tool/bisect.sh: ditto.
-	* tool/update-deps: ditto.
-
-Mon Apr 20 11:10:46 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/socket.c (sock_connect_nonblock): do not raise EISCONN
-	  [ruby-core:68926] [Feature #11072]
-	* test/socket/test_nonblock.rb: check non-EISCONN on 2nd connect
-
-Sun Apr 19 12:19:17 2015  Chad Brewbaker  <crb002@gmail.com>
-
-	* ext/{etc,openssl,tk}: Adding parens and comparisons around
-	  assignments to get rid of Wparentheses warnings.  [Fix GH-875]
-
-Sun Apr 19 10:42:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (get_env_cstr): environment variables must be ASCII
-	  compatible, as dummy encodings and wide char encodings are
-	  unsupported now.
-
-Sat Apr 18 15:18:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/parser/parser.rl: raise with messages in UTF-8
-	  encoding.  [ruby-core:67386] [Bug #10705]
-
-Fri Apr 17 11:58:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (STR_SET_EMBED): clear NOFREE flag at embedding as
-	  embedded strings no longer refer static strings.
-	  [ruby-core:68436] [Bug #10942]
-
-Thu Apr 16 05:15:50 2015  Eric Wong  <e@80x24.org>
-
-	* NEWS: note IO#wait_readable change in r50263
-
-Thu Apr 16 05:09:36 2015  Eric Wong  <e@80x24.org>
-
-	* lib/net/protocol.rb (rbuf_fill): use IO#wait_*able
-	* lib/net/http/generic_request.rb (wait_for_continue): ditto
-	  [ruby-core:68891] [Feature #11056]
-
-Wed Apr 15 18:43:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_trace.c (rb_tracepoint_new): fix documentation.
-	  Commented by @emilsoman.
-
-Wed Apr 15 17:36:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_trace.c (rb_tracepoint_new): Add documentation for
-	  rb_tracepoint_new C level API [ci skip]
-	  Provided by @emilsoman. [fix GH-869]
-
-Wed Apr 15 10:37:40 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/contributors.rdoc: fix a typo. Patch by @davydovanton
-	  [fix GH-872][ci skip]
-	* doc/syntax/methods.rdoc: ditto.
-	* ext/digest/sha2/sha2.c: ditto.
-	* ext/socket/ipsocket.c: ditto.
-	* ext/tk/*: ditto.
-
-Wed Apr 15 07:51:23 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
-
-	* doc/extension.ja.rdoc: Added description of TypedData_XXX.
-	  Deprecated the old DATA_XXX.
-	  Reviewed by ko1 and nobu.
-	  Fixes [ruby-dev:40881] #3064
-
-	* doc/extension.rdoc: ditto.
-
-Wed Apr 15 07:34:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (reserve_stack): keep sp safe zone to get rid
-	  of crash by -fstack-check.  [ruby-core:68740] [Bug #11030]
-
-Tue Apr 14 16:03:49 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/merger.rb (versionup): should also increment revision when
-	  changing teeny.
-
-Tue Apr 14 11:24:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of
-	  conflict on cygwin.  [ruby-core:68877] [Bug #11065]
-
-Tue Apr 14 08:59:04 2015  Zachary Scott  <e@zzak.io>
-
-	* gc.c: [DOC] Improve documentation for ObjectSpace.count_objects
-	  with regards to `:TOTAL` key, with patch by @schneems [Fixes GH-871]
-	  https://github.com/ruby/ruby/pull/871 [Bug #11067]
-
-Mon Apr 13 22:44:07 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/envutil.rb (File.mkfifo): Defined using mkfifo command.
-
-	* test/ruby/test_io.rb: Use File.mkfifo.
-
-	* test/ruby/test_file_exhaustive.rb: Ditto.
-
-	* test/ruby/test_process.rb: Ditto.
-
-Mon Apr 13 21:20:20 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/ssl.rb: stricter hostname verification
-	  following RFC 6125. with the patch provided by Tony Arcieri and
-	  Hiroshi Nakamura [ruby-core:61545] [Bug #9644]
-	* test/openssl/test_ssl.rb: add tests for above.
-
-Sun Apr 12 18:40:04 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json/json.gemspec: bump version to 1.8.2.
-	* ext/json/lib/json/version.rb: ditto.
-
-Sun Apr 12 18:12:07 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json/json.gemspec, lib/rdoc/rdoc.gemspec: added gemspec directly.
-	* defs/default_gems, tool/rbinstall.rb: removed default_gems definition.
-	  it make simple installation for default gems.
-
-Sun Apr 12 17:35:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json/*, test/json/*: Reverted r50231.  Because it's not
-	  working with cross-compile environment.
-
-Sun Apr 12 15:34:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (arg): fix segfault by null caused by syntax error.
-	  [ruby-core:68851] [Bug #10957]
-
-Sun Apr 12 15:11:16 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/test_case.rb: use explicitly exception class and reverted
-	  to require JSON library for rubygems tests with Ruby 2.2.0 or earlier.
-
-Sun Apr 12 15:10:18 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/wait/wait.c (io_wait_readable): simply returns that IO is
-	  readable without blocking, but no longer returns EOF.
-
-	* ext/io/wait/wait.c (io_ready_p, io_wait_readable): try polling
-	  first and check FIONREAD optionally to see if EOF.
-	  [ruby-core:36805] [Feature #4849]
-
-Sun Apr 12 14:53:23 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems/test_case.rb: fixed json load error for rubygems tests.
-
-Sun Apr 12 14:13:28 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gc.c: Document require name for ObjectSpace methods.
-	  [ci skip][fix GH-860] Patch by @schneems
-
-Sun Apr 12 13:54:05 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io.rb: New test that open(fifo) doesn't block other
-	  threads.
-
-Sun Apr 12 13:52:18 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/coverage/coverage.c: Remove extension from require argument.
-	  [ci skip][fix GH-870] Patch by @yui-knk
-
-Sun Apr 12 10:29:14 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_connect_nonblock):
-	  support `exception: false'
-	* (get_no_exception): move function location
-	* ext/socket/socket.c (sock_connect_nonblock):
-	  support `exception: false'
-	* test/openssl/test_pair.rb (test_connect_accept_nonblock_no_exception):
-	  test `exception: false' on connect,
-	  rename from `test_accept_nonblock_no_exception'
-	* test/socket/test_nonblock.rb (test_connect_nonblock_no_exception):
-	  new test
-
-Sun Apr 12 09:57:16 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test a block device on GNU/Linux.
-
-Sun Apr 12 09:24:03 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test a file not owned.
-
-Sun Apr 12 09:05:44 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/fiddle/depend: Fix "Wrong mix of special targets" error with
-	  OpenBSD make.
-
-Sun Apr 12 09:04:37 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_file_exhaustive.rb: Windows doesn't support Unix file
-	  modes.
-
-Sun Apr 12 08:56:44 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/-test-/file/fs.c: OpenBSD needs sys/param.h before sys/mount.h.
-
-Sun Apr 12 08:52:01 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test suid, sgid and sticky file.
-
-Sat Apr 11 23:48:30 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* template/fake.rb.in: Don't assign baseruby, Because it's affect to
-	  Makefile of native gem like json on bundled gems.
-
-Sat Apr 11 23:33:22 2015  Tanaka Akira  <akr@fsij.org>
-
-	* file.c (rb_f_test): Consider nsec for "=", "<" and ">" for "test"
-	  method.
-
-Sat Apr 11 23:26:05 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/rbinstall.rb: support destdir for native extension gem.
-
-Sat Apr 11 21:02:06 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_file_exhaustive.rb
-	  (TestFileExhaustive#test_stat_socket_p): r50226 accidentally missed
-	  the guard for non-unix environments.
-
-Sat Apr 11 20:14:21 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json/*, test/json/*, defs/default_gems: Gemify JSON library.
-	  [fix GH-867][Feature #11057]
-	* test/ruby/test_extlibs.rb: removed json gem from existence extensions.
-	* gems/bundled_gems: added json gem into bundled gem.
-	* lib/rdoc/rubygems_hook.rb: ignored no json environment.
-	* lib/rubygems/test_case.rb, test/rubygems/*: ditto.
-	* lib/rdoc/test_case.rb, test/rdoc/*: ditto.
-
-Sat Apr 11 15:56:58 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Create sample files lazily.
-
-Sat Apr 11 14:03:47 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test character device using
-	  /dev/null.
-
-Sat Apr 11 10:59:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (append_cppflags, append_cflags, append_ldflags):
-	  utility methods to append compiler options.
-
-Sat Apr 11 08:22:24 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rdoc/text.rb: removed duplicated code.
-
-Sat Apr 11 04:46:42 2015  Eric Wong  <e@80x24.org>
-
-	* lib/net/protocol.rb (rbuf_fill): avoid exception with read_nonblock
-	  [ruby-core:68787] [Feature #11044]
-
-Fri Apr 10 23:57:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (need_normalization): use getattrlist() if fgetattrlist()
-	  is unavailable, on OSX 10.5.  [ruby-core:68829] [Bug #11054]
-
-Fri Apr 10 22:29:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_compile): pass the given werror flag to try_do
-	  to check if stderr is empty.
-
-	* lib/mkmf.rb (try_cflags, try_ldflags): default werror to true.
-
-	* win32/Makefile.sub (WERRORFLAG): remove useless option.  VC does
-	  not make warnings of unknown command option an error.
-
-Fri Apr 10 19:34:24 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test socket.
-
-Fri Apr 10 19:38:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/objspace/test_objspace.rb: remove debug prints.
-
-Fri Apr 10 19:35:51 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c: add ObjectSpace.count_imemo_objects method
-	  to count imemo objects for each type.
-
-	* test/objspace/test_objspace.rb: add a test.
-
-	* NEWS: describe about this addition.
-
-Fri Apr 10 19:34:24 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test anonymous pipe.
-
-Fri Apr 10 19:31:56 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_file_exhaustive.rb: Test named pipe.
-
-Fri Apr 10 19:10:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (setup_hash): unify common routine.
-
-Fri Apr 10 18:29:49 2015  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (rb_execarg_parent_start1): Handle EINTR.
-
-Fri Apr 10 17:27:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (vm_exec): check other events when RETURN is thrown.
-	  [Bug #10724]
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-Fri Apr 10 11:44:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/extconf.rb: check warnings.
-
-	* lib/mkmf.rb (try_cflags): pass options to try_compile.
-
-	* win32/Makefile.sub (WERRORFLAG): make unknown command line
-	  options an error.
-
-Fri Apr 10 08:00:17 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_process.rb: unfortunately, windows is not POSIX...
-	  cygwin has mkfifo command, but it does not affect system-wide.
-
-Fri Apr 10 02:18:53 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb: Use mkfifo command instead of mknod
-	  command to create a named pipe.  mkfifo command is defined by POSIX.
-
-Fri Apr 10 01:29:05 2015  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: Release GVL when opening a file in spawn() to avoid whole
-	  process blocking when opening a named pipe.
-	  (open_func): New function.
-	  (rb_execarg_parent_start1): Extracted from rb_execarg_parent_start and
-	  use rb_thread_call_without_gvl2 to release GVL when opening a file.
-	  (rb_execarg_parent_start): Invoke rb_execarg_parent_start1 via
-	  rb_protect and invoke rb_execarg_parent_end when error.
-
-Thu Apr  9 22:19:19 2015  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (redirect_open): Removed.
-
-Thu Apr  9 21:38:20 2015  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h (rb_execarg_parent_end): Declared.
-
-	* process.c: "spawn" opens files in the parent process.
-	  (check_exec_redirect): Add an placeholder for fd in parameters
-	  for fd_open.
-	  (check_exec_fds_1): Delete fd_open condition.
-	  (check_exec_fds): Don't call check_exec_fds_1 with fd_open.
-	  (rb_execarg_parent_start): Open files specified as "spawn" options
-	  and add "dup2" options.
-	  (rb_execarg_parent_end): New function to close opened fds.
-	  (run_exec_open): Removed.
-	  (rb_execarg_run_options): Don't call run_exec_open.
-	  (rb_spawn_internal): Call rb_execarg_parent_end.
-
-	* io.c (pipe_open): Call rb_execarg_parent_end.
-
-	* ext/pty/pty.c (establishShell): Call rb_execarg_parent_end.
-
-Thu Apr  9 20:52:31 2015  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h (rb_execarg_parent_start): Renamed from rb_execarg_fixup.
-
-	* process.c: Follows the above change.
-
-	* io.c: Ditto.
-
-	* ext/pty/pty.c: Ditto.
-
-Thu Apr  9 20:35:12 2015  Tanaka Akira  <akr@fsij.org>
-
-	* process.c (fd_clear_cloexec): Extracted from run_exec_dup2.
-
-Thu Apr  9 09:26:47 2015  Eric Wong  <e@80x24.org>
-
-	* ccan/list/list.h: sync with ccan upstream
-	  [ccan commit c2fbfe5282ba264f3485586e7efa8a5967f2d386]
-
-Thu Apr  9 08:24:03 2015  Masahiro Tomita  <tommy@tmtm.org>
-
-	* ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of
-	  addrinfo.  [ruby-dev:48923] [Bug #11051]
-
-Wed Apr  8 17:45:02 2015  Shannon Skipper  <shannonskipper@gmail.com>
-
-	* version.c (Init_version): the version of the engine or
-	  interpreter.  [Fix GH-858]
-
-Wed Apr  8 16:15:30 2015  Kenta Murata  <mrkn@cookpad.com>
-
-	* bigdecimal: conform to ruby's license.  [ruby-core:68466] [Bug #10952]
-
-Wed Apr  8 14:57:06 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_wreadlink): should treat junctions like as
-	  symlinks.
-
-Wed Apr  8 14:03:47 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_symbol.rb: fix syntax error.
-
-Wed Apr  8 13:01:06 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_any_hash): Symbols are compared by the identities
-	  always.  [ruby-core:68767] [Bug #11035]
-
-Tue Apr  7 10:22:51 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* internal.h: fix typo. Patch by @sferik [fix GH-865]
-
-Mon Apr  6 22:52:35 2015  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c: Enumerable#chunk and Enumerable#slice_before no longer takes
-	  the initial_state argument.  [Feature #10958]
-
-Mon Apr  6 16:09:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_args.c: protect value stack from calling other methods
-	  during complex parameter setting process (splat, kw, and so on).
-	  [Bug #11027]
-
-	* vm_core.h: remove rb_thread_t::mark_stack_len.
-	  With this modification, we don't need to use th->mark_stack_len.
-
-	* test/ruby/test_keyword.rb: add a test.
-
-	* cont.c (cont_capture): catch up this fix.
-
-	* vm.c (rb_thread_mark): ditto.
-
-Mon Apr  6 11:26:42 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/downloader.rb (http_options): prevent content auto decoding
-	  because this is a downloader.
-
-Sun Apr  5 09:55:18 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* doc/contributing.rdoc: update Maintainers list.
-
-Sun Apr  5 09:11:00 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/rbinstall.rb: fix bin script permission of bundled gems.
-
-Sun Apr  5 08:46:08 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/rbinstall.rb: support --program-suffix option.
-
-Sat Apr  4 21:31:18 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rake/*: Gemify rake [fix GH-862][Feature #11025]
-	* test/rake/*: ditto.
-	* tool/rbinstall.rb: ditto.
-
-Sat Apr  4 11:30:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_setbyte): check the argument first not to
-	  discard shared string and code range unnecessarily until
-	  actually changing the contents.  pointed out by headius.
-
-Sat Apr  4 08:16:43 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (edit_path): use path which is absolute ftp url
-	  on using ftp_proxy.
-
-Fri Apr  3 11:43:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (vm_call0_cfunc): update invoker arguments.
-
-	* vm_insnhelper.c (vm_call_cfunc_latter): ditto.
-
-	* vm_insnhelper.c (rb_vm_call_cfunc_push_frame): ditto, and prefix
-	  with rb_.
-
-Thu Apr  2 16:26:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, tool/mkconfig.rb: check the running ruby version in
-	  rbconfig.rb with the program version, as RUBY_VERSION has never
-	  been affected by --with-ruby-version option.
-	  [ruby-core:68639] [Bug #11002]
-
-	* configure.in (LIBRUBY_DLDFLAGS): compatibility_version must be
-	  valid version numbers, not an arbitrary string.
-
-Wed Apr  1 11:09:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_glob): remove indirect links of arguments for
-	  trampoline.
-
-Wed Apr  1 09:59:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils#mv): show the exact target path in
-	  the error message instead of the destination parent directory
-	  name.  patched by Joao Britto <jabcalves AT gmail.com> at
-	  [ruby-core:68706].  [Bug #11021]
-
-Tue Mar 31 15:25:07 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/ChangeLog-0.06_to_0.52: added archived Changelog.
-	  [ruby-list:50105]
-	* doc/ChangeLog-0.50_to_0.60: ditto.
-	* doc/ChangeLog-0.60_to_1.1: ditto.
-
-Mon Mar 30 22:02:55 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* README.EXT.ja: add redirect [ruby-core:68631]
-
-Mon Mar 30 14:42:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (fileattr_to_unixmode, winnt_lstat): deal with
-	  symbolic link than directory, and set executable bits.
-
-Mon Mar 30 11:27:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (copy_stream_body): use the arguments without conversion if
-	  having read, readpartial, and write methods, than conversion by
-	  to_path method.  [ruby-core:68676] [Bug #11015]
-
-Sun Mar 29 21:08:37 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* gc.c (objspace_allrefs_destruct_i): fix a typo.
-	  [Bug #11013]
-
-Sun Mar 29 11:51:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_binding): replicate env from method object, and
-	  allocate the local variable area for the iseq local table.
-	  [ruby-core:68673] [Bug #11012]
-
-Sat Mar 28 09:19:41 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906]
-	  ruby itself (including numeric.c) is built with strict compile
-	  options including -std=iso9899:1999, but ext/date is not.
-	  By the way -std=iso9899:1999 is not only a warning option but also
-	  changes behavior like MACRO definitions for example INFINITY.
-	  gcc on Solaris affect this.
-
-Fri Mar 27 16:34:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk: revert using BOOTSTRAPRUBY for enc.mk, as
-	  enc/depend uses CONFIG.  [ruby-core:68647] [Bug #11004]
-
-Thu Mar 26 10:05:13 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/test_observer.rb: add tests for Observable module.
-	  [fix GH-859] Patch by @brightbits
-
-Thu Mar 26 06:35:10 2015  Eric Wong  <e@80x24.org>
-
-	* README.EXT: add redirect [ruby-core:68631]
-
-Wed Mar 25 16:46:49 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state,
-	  but it is a dummy.
-
-	* ext/socket/option.c: Solaris 11 doesn't have u_intN_t.
-
-	* ext/socket/option.c: Solaris 11 needs inspect_tcpi_msec.
-
-	* ext/socket/raddrinfo.c: Solaris 11 has AF_PACKET but doesn't have
-	  related macros.
-
-Wed Mar 25 17:03:08 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/file/fs.c (get_fsname): try magic number only if
-	  f_type is included.  [ruby-dev:48913] [Bug #11000]
-
-Wed Mar 25 11:20:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* benchmark/bm_hash_aref_flo.rb: make more realistic data.
-	  [ruby-core:68632] [[Bug #10999]
-
-Wed Mar 25 10:39:06 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .document: removed needless entries.
-
-Wed Mar 25 08:07:28 2015  Eric Wong  <e@80x24.org>
-
-	* doc/extension.rdoc: fix spelling of filename
-	* doc/extension.ja.rdoc: ditto.
-
-Tue Mar 25 06:55:43 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* complex.c (k_inexact_p, k_exact_zero_p): use k_exact_zero_p macro
-	  to remove k_inexact_p macro.
-
-	* complex.c (k_exact_one_p): remove unused macro k_exact_one_p.
-
-Tue Mar 24 22:23:33 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/extension.rdoc: move from toplevel document and added extname.
-	* doc/extension.ja.rdoc: ditto.
-
-Tue Mar 24 22:06:58 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/standard_library.rdoc: strip.
-
-Tue Mar 24 22:06:27 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/standard_library.rdoc: move Thread to Extensions.
-
-Tue Mar 24 21:59:10 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/contributing.rdoc: update Maintainers list.
-
-Tue Mar 24 19:10:24 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_writebarrier_generational): fix messages for rb_bug().
-	  Remove `rb_' prefix.
-
-	* gc.c (gc_writebarrier_incremental): ditto.
-
-Tue Mar 24 17:34:01 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* README.ja.md: should be chunibyo.
-
-Tue Mar 24 17:30:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/file/fs.c (get_fsname): return filesystem name by
-	  statfs/statvfs.  [ruby-core:68624] [Bug #10998]
-
-Tue Mar 24 16:46:02 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: now doesn't required spaces just after
-	  `!`.
-
-Mon Mar 23 23:18:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_close): don't raise on double close for consistent to
-	  IO#close.  [Feature #10950]
-
-Mon Mar 23 21:22:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (rb_readlink): move from file.c for better buffer
-	  allocation and the result encoding.
-
-	* win32/win32.c (wreadlink, rb_w32_ureadlink): implement readlink().
-
-Mon Mar 23 14:40:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (winnt_stat): stat with following symbolic links.
-
-	* win32/win32.c (winnt_lstat): rename old winnt_stat, which does
-	  not follow symbolic links.
-
-Mon Mar 23 01:44:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (r_symreal): register symbol names as strings first so
-	  that r_symlink always returns valid names.
-	  [ruby-core:68587] [Bug #10991]
-
-	* marshal.c (r_ivar, r_object0): now need to intern symbol names.
-
-	* marshal.c (r_object0): compare with symbol names.
-
-Sun Mar 22 22:07:40 2015  Kouhei Sutou  <kou@cozmixng.org>
-
-	* doc/etc.rd.ja: Fix wrong coding for Emacs.
-
-Sun Mar 22 09:53:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot (package): add default CONFIGURE name to
-	  follow r50039.
-
-	* tool/make-snapshot (package): substitute configuration variables
-	  in Makefile.in instead of passing by the command line, and make
-	  temporary Makefile instead of a pipe.
-
-Sun Mar 22 08:09:47 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ext/ripper/ripper.c, ext/rbconfig/sizeof/sizes.c):
-	  strip autogenerated dependencies which have invalid syntax in
-	  other than nmake.
-
-Sat Mar 21 15:01:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_set_winsize): use handle for
-	  writing.  GetConsoleScreenBufferInfo seems failing on a handle
-	  for reading.
-
-	* io.c: [DOC] update the example of IO#winsize to use $stdout
-	  instead of $stdin, which does not work on Windows.  a patch by
-	  Jan Lelis <mail AT janlelis.de> at [ruby-core:68574].
-	  [Bug #10986]
-
-Fri Mar 20 18:41:03 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (respond_to_missing_p): check if the receiver responds to
-	  the given method by respond_to_missing?.
-
-	* proc.c (mnew_missing): create Method object for method_missing.
-	  [ruby-core:68564] [Bug #10985]
-
-Fri Mar 20 17:43:18 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: enabled email notification.
-
-Fri Mar 20 17:39:52 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: removed Ruby 1.9.3 build on Travis CI
-
-Fri Mar 20 12:38:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): obj_info() can receive internal objects.
-
-	* gc.c (check_rvalue_consistency): obj_info() returns const char *.
-
-Fri Mar 20 12:14:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): show class name and T_DATA type_name.
-
-Thu Mar 19 22:12:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_copy_wb_protected_attribute): `dest' can be WB unprotected.
-
-Thu Mar 19 21:25:25 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_copy_wb_protected_attribute): demote `dest' object.
-
-Thu Mar 19 16:18:00 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c, internal.h: export rb_gc_verify_internal_consistency().
-
-Thu Mar 19 16:15:24 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): show allocation site if GC_DEBUG is not 0.
-
-Thu Mar 19 16:12:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (newobj_of): fix RGENGC_OLD_NEWOBJ_CHECK logics.
-	  * skip on incremental marking because not sure what happen :p
-	  * rb_gc_writebarrier_remember() is enough to mark children.
-
-Thu Mar 19 16:08:42 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_copy_wb_protected_attribute): need demote for old objects.
-
-Thu Mar 19 10:31:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (fill_random_bytes): release the handle in the static
-	  variable, not a local variable.
-
-Thu Mar 19 06:30:35 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* object.c (rb_obj_clone): do not touch age (FL_PROMOTED[01]) because
-	  rb_obj_alloc() can return old object in debug.
-
-Thu Mar 19 06:29:28 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/objspace/test_objspace.rb: flag name was changed
-	  (long_lived -> uncollectible).
-
-Thu Mar 19 05:30:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_mark): skip some marking if iseq->orig is available.
-
-	* iseq.c (rb_iseq_clone): need WB for iseq1->klass = iseq0->klass
-	  (done in MEMCPY).
-
-Thu Mar 19 04:55:53 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h (IMEMO_DEBUG): added.
-
-	* internal.h: remove unused FL_IMEMO_MARK_V[0-3].
-
-	* gc.c (rb_imemo_new_debug): added.
-
-	* gc.c (obj_info): show imemo type name.
-
-Thu Mar 19 04:52:26 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (RGENGC_OLD_NEWOBJ_CHECK): add check mechanism.
-
-	  If RGENGC_OLD_NEWOBJ_CHECK > 0, then create old objects
-	  (not new objects) periodically.
-
-	  Create one old objects per RGENGC_OLD_NEWOBJ_CHECK objects are
-	  created.
-
-Thu Mar 19 04:46:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* enum.c (enum_sort_by): add WBs.
-
-Thu Mar 19 03:37:52 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (check_rvalue_consistency): refactoring.
-	  * not inline on RGENGC_CHECK_MODE > 0.
-	  * check SPECIAL_CONST_P(obj) first.
-	  * add a check that remembered_bit is only TRUE when old (age == 3).
-
-	* gc.c (RVALUE_DEMOTE): should clear RVALUE_REMEMBERED bit.
-
-	  remembered_bit should be TRUE only for old (age == 3) objects.
-
-	  Actually there are no effect because demoted objects will be
-	  uncollectible WB unprotected objects (marked at the beginning of
-	  every minor GC).
-
-Thu Mar 19 02:52:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename terminologies.
-	  * long_lived -> uncollectible:
-	    because this bitmap does not mean "long lived objects in past",
-	    but means "prohibit collection these objects until next major GC".
-
-	    Uncollectible objects consist of two types objects, one is old
-	    objects (WB protected objects which age == 3) and another is
-	    uncollectible WB unprotected objects which are referred from old
-	    objects
-
-	  * remembered_wb_unprotected_objects ->
-	    uncollectible_wb_unprotected_objects:
-	    because uncollectible objects does not mean remembered objects.
-
-Wed Mar 18 17:21:12 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_writebarrier_generational): add an alternative write
-	  barrier (WB) implementation.
-	  When finding reference from [Old obj] to [New obj] by WB, current
-	  implementation marks [Old obj] as remembered old objects and marks
-	  children of [Old obj] at the beginning of marking.
-
-	  Added (but disabled) code changes current behaviour. This fix promote
-	  [New obj] to old and marks as a remembered old object. We can assume
-	  "new objects referred from old objects are maybe long-lived old
-	  objects".
-
-	  Disadvantage of added algorithm is we may promote unwilling
-	  short-lived objects. For example, consider many new objects push and
-	  pop to an old stack object. All of new objects (short-lived objects)
-	  promote to old objects unexpectedly.
-
-	  To compare these behaviour, I add this new code (but disabled it).
-
-Wed Mar 18 17:14:39 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (RVALUE_PROMOTE_RAW): rename to RVALUE_OLD_LONG_LIVED_SET()
-	  to make clear.
-
-Wed Mar 18 17:10:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (check_rvalue_consistency): do not need to check is_sweeping().
-
-Wed Mar 18 14:13:22 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm1_gc_wb_ary.rb: run GC to finish "marking" phase.
-
-	* benchmark/bm_vm1_gc_wb_obj.rb: ditto.
-
-	* benchmark/bm_vm1_gc_wb_ary_promoted.rb: add parameter
-	  full_mark: false to invoke only minor GC.
-
-	* benchmark/bm_vm1_gc_wb_obj_promoted.rb: ditto.
-
-Wed Mar 18 12:07:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: add a comment about RSTRING_FSTR.
-
-Wed Mar 18 12:01:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_any_hash): use same hash values with Float#hash so
-	  that -0.0 and +0.0 will be identical.
-	  [ruby-core:68541] [Bug #10979]
-
-Wed Mar 18 05:34:32 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* string.c: introduce STR_FAKESTR to show string is FAKESTR or not.
-
-	* string.c (STR_SET_SHARED): ignore FAKESTR because only Ruby objects
-	  can use write barrier.
-
-Tue Mar 17 18:59:16 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h: use rb_gc_writebrrier() simply.
-	  For incremental GC, we need to get a pointer to the objspace.
-	  We can share this pointer for the following WB process.
-	  And considering icache hit ratio, process in the GC.
-
-	* gc.c (rb_gc_writebarrier): added.
-
-	* gc.c (gc_writebarrier_generational, gc_writebarrier_incremental):
-	  make them NOINLINE because inlining them into rb_gc_writebarrier()
-	  makes a prologue code of rb_gc_writebarrier() longer (storing callee
-	  save registers).
-
-	  This patch improve the performance of WB on micro-benchmarks.
-
-	  name                   ruby 2.1   trunk   modified
-	  vm1_gc_wb_ary*            0.511   0.632      0.532
-	  vm1_gc_wb_ary_promoted*   0.578   0.701      0.674
-	  vm1_gc_wb_obj*            0.419   0.575      0.492
-	  vm1_gc_wb_obj_promoted*   0.537   0.664      0.618
-	                                                 (sec)
-
-Tue Mar 17 18:51:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm1_gc_wb_ary(_promoted).rb: separate fastpath and
-	  slowpath for WB.
-
-	  Before this change bm_vm1_gc_wb_ary.rb tried to check the performance
-	  for WB slowpath (making a reference from oldobj to newobj). However,
-	  from Ruby 2.2, 3 GCs are needed to promote new objects because
-	  only 3 age objects are promoted objects.
-
-	  To compare fastpath and slowpath, introduce new "promoted" version
-	  benchmark.
-
-	  bm_vm1_gc_wb_ary.rb is for fastpath and
-	  bm_vm1_gc_wb_ary_promoted.rb is for slowpath.
-
-	* benchmark/bm_vm1_gc_wb_obj(_promoted).rb: ditto.
-
-Tue Mar 17 17:23:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): distinguish not-yet-stated and DT_UNKNOWN
-	  by readdir, and traverse recursively for the former.  Linux
-	  readdir returns DT_UNKNOWN on some filesystems, e.g., smbfs,
-	  iso9660.
-
-Mon Mar 16 17:43:21 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/webrick/server.rb: Fix regression bug in WEBrick's
-	  :DoNotReverseLookup config option implementation.
-	  [fix GH-731] Patch by @vais
-	* test/webrick/test_do_not_reverse_lookup.rb: ditto.
-
-Sat Mar 14 20:05:23 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* math.c (math_gamma): optimization for passed small integer.
-
-Sat Mar 14 18:07:23 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* enum.c: [DOC] Fixes Enumerable#member? documentation
-	  [fix GH-756][ci skip] Patch by @shamanime
-
-Sat Mar 14 12:23:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): use d_type to reduce lstat system calls.
-
-	* win32/dir.h (struct direct): add d_type instead of d_isdir and
-	  d_isrep.  SYMLINKD is unreliable, since the target can be
-	  replaced after a link was created.
-
-	* win32/win32.c (readdir_internal): set d_type.
-
-Sat Mar 14 02:14:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (primary): empty parentheses at cmdarg can be null.
-	  [ruby-core:68477] [Bug #10957]
-
-Fri Mar 13 15:04:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_close): don't raise on double
-	  close for consistent to IO#close.
-
-Fri Mar 13 15:03:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_close_read, rb_io_close_write): don't raise after
-	  close same as IO#close.
-
-Fri Mar 13 12:29:07 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/readline/test_readline.rb: Restore environment variables:
-	  COLUMNS LINES
-
-Fri Mar 13 11:37:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/extconf.rb: needs --enable-shared when linked to
-	  libruby or fiddle.so.  since --with-static-linked-ext does no
-	  longer link extensions to ruby program with --enable-shared, the
-	  only combination needs --enable-static is --disable-shared and
-	  --with-static-linked-ext.  [ruby-dev:48901] [Bug #10960]
-
-Fri Mar 13 07:02:20 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_s_accept_nonblock): use rb_hash_lookup2
-	* ext/openssl/ossl_ssl.c (get_no_exception): new function
-	  (ossl_ssl_accept_nonblock): use get_no_exception
-	  (ossl_ssl_read_internal): ditto
-	  (ossl_ssl_write_nonblock): ditto
-	  [ruby-core:68511]
-
-Fri Mar 13 07:01:38 2015  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c: predefine wait_*able symbols
-
-Thu Mar 12 22:59:53 2015  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/leakchecker.rb: Check environment variables.
-
-Thu Mar 12 05:54:27 2015  Eric Wong  <e@80x24.org>
-
-	* ext/socket/init.c (rsock_s_accept_nonblock):
-	  support exception: false
-	  [ruby-core:66385] [Feature #10532]
-	* ext/socket/init.c (rsock_init_socket_init): define new symbols
-	* ext/socket/rubysocket.h: adjust prototype
-	* ext/socket/socket.c (sock_accept_nonblock): support exception: false
-	* ext/openssl/ossl_ssl.c (ossl_ssl_accept_nonblock): ditto
-	* ext/socket/socket.c (Init_socket): adjust accept_nonblock definition
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): ditto
-	* ext/socket/tcpserver.c (rsock_init_tcpserver): ditto
-	* ext/socket/unixserver.c (rsock_init_unixserver): ditto
-	* ext/socket/tcpserver.c (tcp_accept_nonblock): adjust
-	  rsock_s_accept_nonblock call
-	* ext/socket/unixserver.c (unix_accept_nonblock): ditto
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl): support no_exception
-	* ext/openssl/ossl_ssl.c (ossl_ssl_connect): adjust ossl_start_ssl call
-	* ext/openssl/ossl_ssl.c (ossl_ssl_connect_nonblock): ditto
-	* ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto
-	* test/socket/test_nonblock.rb (test_accept_nonblock): test for
-	  "exception :false"
-	* test/socket/test_tcp.rb (test_accept_nonblock): new test
-	* test/socket/test_unix.rb (test_accept_nonblock): ditto
-	* test/openssl/test_pair.rb (test_accept_nonblock_no_exception): ditto
-
-Thu Mar 12 10:53:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h, node.h: move a definition of `struct rb_global_entry'
-	  and related functions from node.h to internal.h.
-
-	* variable.c: remove unused include pragma.
-
-	* common.mk: remove unused dependency.
-
-Thu Mar 12 10:32:39 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: remove unused dependency.
-
-Thu Mar 12 08:20:14 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* load.c: removed unused header file "node.h".
-
-	* method.h: ditto.
-
-	* symbol.c: ditto.
-
-Thu Mar 12 08:14:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: RGENGC_CHECK_MODE should be 0.
-
-Thu Mar 12 07:44:17 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: use T_IMEMO to represent `struct MEMO' value.
-	  memo->v1 and memo->v2 is WB protected values.
-	  So use MEMO_V1/V2_SET() macros to set these values.
-	  memo->u3 is ambiguous (sometimes a VALUE, sometimes an integer
-	  value), so use gc_mark_maybe() in gc.c to mark it.
-
-	  Rename NEW_MEMO() to MEMO_NEW().
-
-	  Move MEMO_FOR and NEW_MEMO_FOR macros from node.h.
-
-	  Export a rb_imemo_new() function for ext/ripper.
-
-	* node.h: remove NODE_MEMO.
-
-	* enum.c: catch up these change.
-
-	* enumerator.c: ditto.
-
-	* load.c: ditto.
-
-	* ext/objspace/objspace.c (count_nodes): ditto.
-
-	* gc.c (gc_mark_children): mark imemo_memo type.
-
-	* parse.y (new_args_gen): use T_IMEMO.
-	  (I'm not sure it is working correctly...)
-
-Wed Mar 11 22:36:34 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* eval.c (frame_called_id): it should use vm_ifunc type.
-
-	* eval.c (frame_func_id): ditto.
-
-Wed Mar 11 22:27:05 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* node.h: remove NODE_IFUNC, NEW_IFUNC.
-
-	* internal.h: use T_IMEMO for IFUNC.
-
-	  rename `struct IFUNC' to `struct vm_ifunc' and move the definition
-	  from vm_insnhelper.h. Add imemo_ifunc.
-
-	* gc.c (gc_mark_children): mark imemo_ifunc type T_IMEMO object.
-
-	* compile.c: catch up these changes.
-
-	* proc.c: ditto.
-
-	* vm_core.h (RUBY_VM_IFUNC_P): ditto.
-
-	* vm_eval.c (rb_iterate): ditto.
-
-	* vm_insnhelper.c: ditto.
-
-	* ext/objspace/objspace.c: ditto.
-
-Wed Mar 11 21:53:43 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h, eval_intern.h: move CREF accessors.
-
-	  List IMEMO supported types in internal.h.
-
-Wed Mar 11 21:45:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h: use T_IMEMO to create THROW_DATA.
-
-	  Add THROW_DATA_NEW().
-
-	* internal.h: move definition of `struct THROW_DATA'
-	  from vm_insnhelper.h to internal.h.
-
-	  Rename `THROW_DATA' to `vm_throw_data'.
-
-	* eval_intern.h (THROW_DATA_P): move to internal.h.
-	  THROW_DATA is no longer T_NODE, so check T_IMEMO.
-
-	* gc.c (gc_mark_children): mark THROW_DATA.
-
-	* vm.c: catch up these changes.
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-Wed Mar 11 21:21:56 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c: use T_IMEMO to create SVAR.
-
-	* internal.h, vm_insnhelper.h: move definition `struct SVAR'
-	  from vm_insnhelper.h to internal.h. And rename it to struct vm_svar.
-
-	  new imemo_type imemo_svar is added.
-
-	* gc.c (gc_mark_children): mark imemo_svar.
-
-	* node.c (rb_gc_mark_node): remove useless marking.
-
-Wed Mar 11 19:35:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* include/ruby/ruby.h: introduce new type T_IMEMO.
-	  T_IMEMO is Internal Memo type, internal use only.
-	  T_IMEMO has same purpose of NODE_MEMO.
-
-	  To insert T_IMEMO, type numbers are modified a little.
-
-	* internal.h: define struct RIMemo. Each RIMemo objects
-	  has imemo_type. We can observe it by the imemo_type() function.
-
-	* gc.c (rb_imemo_new): added.
-
-	* node.h: remove NODE_CREF and NEW_CREF().
-
-	* node.c (rb_gc_mark_node): ditto.
-
-	* vm.c (vm_cref_new): use rb_imem_new().
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: use RIMemo objects for CREF.
-
-	* ext/objspace/objspace.c: support T_IMEMO.
-
-Wed Mar 11 17:03:20 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: fix memory leak by prepend method.
-
-	  It is easy to reproduce with such script:
-
-	    module M; def bar; end; end
-	    loop{
-	      Class.new do
-	        def foo; end
-	        prepend M
-	      end
-	    }
-
-	* gc.c (obj_free): free T_ICLASS::m_tbl if it is created by prepend.
-	  To recognize it, check RICLASS_IS_ORIGIN flag.
-
-	* gc.c (gc_mark_children): T_ICLASS objects only need to mark
-	  T_ICLASS::m_tbl if RICLASS_IS_ORIGIN is set.
-
-	* gc.c (obj_memsize_of): count T_ICLASS if RICLASS_IS_ORIGIN is set.
-
-	* internal.h (RCLASS_SET_ORIGIN): add to set RCLASS_SET_ORIGIN.
-
-	  TODO: The word `origin' seems not good name. We need to invent
-	  another good name.
-
-	* class.c: use RCLASS_SET_ORIGIN().
-
-	* class.c (class_alloc): zero clear rb_classext_t.
-
-Wed Mar 11 13:28:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check also procstat_getvmmap, which is not
-	  available on FreeBSD 9.  [ruby-core:68468] [Bug #10954]
-
-	* vm_dump.c (procstat_vm): use kinfo_getvmmap instead if
-	  procstat_getvmmap is not available.
-
-Wed Mar 11 09:15:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: define struct MEMO.
-
-	* enum.c: use MEMO.
-
-	* enumerator.c: ditto.
-
-	* load.c: ditto.
-
-	* node.h: return (struct MEMO *) pointer.
-
-Wed Mar 11 06:26:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h (THROW_DATA_STATE): return int, not VALUE.
-
-	* vm_insnhelper.h (THROW_DATA_STATE_SET): accept int value.
-
-Wed Mar 11 05:06:46 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_eval.c (rb_catch_protect): use THROW_DATA_VAL().
-
-Wed Mar 11 04:56:04 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h: define struct IFUNC.
-
-	* vm_eval.c (rb_iterate): use it.
-
-	* vm_insnhelper.c (vm_yield_with_cfunc): ditto.
-
-Wed Mar 11 03:52:12 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* eval_intern.h (THROW_DATA_P): use RB_TYPE_P() instead of
-	  BUILTIN_TYPE().
-
-	* thread.c (thread_join): use THROW_DATA_P().
-
-Wed Mar 11 03:48:01 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c: use RUBY_VM_IFUNC_P() to recognize IFUNC or not.
-
-	* vm.c: ditto.
-
-	* vm_dump.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-	* vm_core.h (RUBY_VM_IFUNC_P): use RB_TYPE_P() instead of
-	  BUILTIN_TYPE().
-
-Wed Mar 11 03:21:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h: define struct THROW_DATA to represent
-	  throwing data. Also define accessor functions.
-
-	* eval_intern.h: move related changes into vm_insnhelper.h.
-	  Now these MACROs (functions) are only used in vm*.c.
-
-	  There is only THROW_DATA_P(err) to check this data type or not.
-
-	* vm.c: catch up these changes.
-
-	* vm_eval.c: ditto.
-
-	* vm_insnhelper.c: ditto.
-
-Wed Mar 11 00:57:00 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/rubygems/test_gem_security_trust_dir.rb: The return value of
-	  File::Stat#mode is OS dependent. In AIX, 0200000 is set.
-
-Tue Mar 10 20:03:41 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/webrick/server.rb: Invoke setup_shutdown_pipe in start method
-	  instead of listen method.
-	  [ruby-core:68476] [Bug #10956] Reported by Shintaro Kojima.
-
-Tue Mar 10 17:27:27 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* thread.c (thread_join): Fixnum (except TAG_FATAL) and
-	  NODE should not be reached here.
-
-Mon Mar  9 21:42:10 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (ep_cref): rename to lep_cref() because it should be
-	  local ep.
-
-Mon Mar  9 16:34:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_close): don't raise on double
-	  close for consistent to IO#close.
-
-Mon Mar 09 06:44:48 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h: define struct SVAR for SVAR.
-	  This data type is also same layout of NODE (NODE_IF).
-
-	* vm_insnhelper.c: catch up this change.
-
-Mon Mar  9 06:43:21 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (lep_svar_set): add WBs.
-
-Mon Mar  9 06:19:06 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: define rb_cref_t and change to use it.
-
-	  rb_cref_t is data type of CREF. Now, the body is still NODE.
-	  It is easy to understand what is CREF and what is pure NODE.
-
-Mon Mar  9 06:00:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h (COPY_CREF_OMOD): fix translation miss.
-
-Mon Mar  9 04:47:58 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: define CREF accessor macros.
-	  * CREF_CLASS(cref)
-	  * CREF_NEXT(cref)
-	  * CREF_VISI(cref)
-	  * CREF_VISI_SET(cref, v)
-	  * CREF_REFINEMENTS(cref)
-	  * CREF_PUSHED_BY_EVAL(cref)
-	  * CREF_PUSHED_BY_EVAL_SET(cref)
-	  * CREF_OMOD_SHARED(cref)
-	  * CREF_OMOD_SHARED_SET(cref)
-	  * CREF_OMOD_SHARED_UNSET(cref)
-
-	  This is process to change CREF data type from NODE.
-
-Sun Mar  8 22:50:57 2015  Tanaka Akira  <akr@fsij.org>
-
-	* ext/zlib/zlib.c (rb_gzfile_close): Don't raise on double
-	  close for consistent to IO#close.
-
-Sun Mar  8 16:57:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): match patterns against legacy short names
-	  too, not only ordinary names.  [ruby-core:67954] [Bug #10819]
-
-	* win32/dir.h (struct direct): add short name members.
-
-	* win32/win32.c (opendir_internal, readdir_internal): ditto.
-
-Sat Mar  7 09:36:05 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* array.c: document that first element is kept when using
-	  Array#uniq and #uniq! [fix GH-845][ci skip]
-	  Patch by @riffraff
-
-Sat Mar  7 09:28:02 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* thread.c: Mutex#owned? is no longer experimental since 2.1.0
-	  [fix GH-839][ci skip] Patch by @takiy33
-
-Sat Mar  7 09:18:42 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/merger.rb: Added documentation to version method.
-	  [fix GH-847][ci skip] Patch by @magikid
-
-Fri Mar  6 22:50:36 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* class.c (rb_prepend_module): need a WB for klass -> origin.
-
-Fri Mar  6 20:18:38 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* fix namespace issue on singleton class expressions. [Bug #10943]
-
-	* vm_core.h, method.h: remove rb_iseq_t::cref_stack. CREF is stored
-	  to rb_method_definition_t::body.iseq_body.cref.
-
-	* vm_insnhelper.c: modify SVAR usage.
-	  When calling ISEQ type method, push CREF information onto method
-	  frame, SVAR located place. Before this fix, SVAR is simply nil.
-	  After this patch, CREF (or NULL == Qfalse for not iseq methods)
-	  is stored at the method invocation.
-
-	  When SVAR is required, then put NODE_IF onto SVAR location,
-	  and NDOE_IF::nd_reserved points CREF itself.
-
-	* vm.c (vm_cref_new, vm_cref_dump, vm_cref_new_toplevel): added.
-
-	* vm_insnhelper.c (vm_push_frame): accept CREF.
-
-	* method.h, vm_method.c (rb_add_method_iseq): added. This function
-	  accepts iseq and CREF.
-
-	* class.c (clone_method): use rb_add_method_iseq().
-
-	* gc.c (mark_method_entry): mark method_entry::body.iseq_body.cref.
-
-	* iseq.c: remove CREF related codes.
-
-	* insns.def (getinlinecache/setinlinecache): CREF should be cache key
-	  because a different CREF has a different namespace.
-
-	* node.c (rb_gc_mark_node): mark NODE_IF::nd_reserved for SVAR.
-
-	* proc.c: catch up changes.
-
-	* struct.c: ditto.
-
-	* insns.def: ditto.
-
-	* vm_args.c (raise_argument_error): ditto.
-
-	* vm_eval.c: ditto.
-
-	* test/ruby/test_class.rb: add a test.
-
-Fri Mar  6 18:19:13 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/webrick/test_filehandler.rb: on vboxsf (on VirtualBox
-	  on Windows 7), file name and permissions are strange (can access
-	  by short file name and so on).
-
-	  Simply skip on such tests on such FS. To detect strange FS, this
-	  patch use a part of code `File.executable?(__FILE__)`.
-	  Please correct them if there are better ways.
-
-Fri Mar  6 17:31:29 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_beginendblock.rb: do not change directory.
-
-	  Run system command in the directory mounted by vboxsf on Windows 7
-	  and get warning like that "warning: Insecure world writable dir...".
-
-Fri Mar  6 10:31:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (vm_call_super): search next super class from the
-	  original class, to get rid of infinite recursion with
-	  prepending.  a patch by Seiei Higa <hanachin AT gmail.com> at
-	  [ruby-core:68434].  [ruby-core:68093] [Bug #10847]
-
-Fri Mar  6 08:45:26 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/matrix.rb: Add Vector#round. Patch by Jordan Stephens.
-	  [Fixes GH-802]
-
-Fri Mar  6 07:33:03 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (obj_info): show node name too.
-
-Fri Mar  6 07:00:44 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: remove struct method_table_wrapper.
-	  struct method_table_wrapper was introduced to avoid duplicate marking
-	  for method tables.
-
-	  For example, `module M1; def foo; end; end` make one method table
-	  (mtbl) contains a method `foo`. M1 (T_MODULE) points mtbl.
-	  Classes C1 and C2 includes M1, then two T_ICLASS objects are created
-	  and they points mtbl too. In this case, three objects (one T_MODULE
-	  and two T_ICLASS objects) points same mtbl. On marking phase, these
-	  three objects mark same mtbl. To avoid such duplication, struct
-	  method_table_wrapper was introduced.
-
-	  However, created two T_ICLASS objects have same or shorter lifetime
-	  than M1 (T_MODULE) object. So that we only need to mark mtbl from M1,
-	  not from T_ICLASS objects. This patch tries marking only from M1.
-	  In other words, original module (M1) has responsibility to mark mtbl.
-	  Because of no duplicate marking, we don't need method_table_wrapper
-	  any more.
-
-	  Note that one `Module#prepend` call creates two T_ICLASS objects.
-	  One for referring to a prepending Module object, same as
-	  `Module#include`. We don't need to care this T_ICLASS.
-	  One for moving original mtbl from a prepending class. We need to
-	  mark such mtbl from this T_ICLASS object. To mark the mtbl,
-	  we need to use `RCLASS_ORIGIN(klass)` on marking from a prepended
-	  class `klass`.
-
-	* class.c: ditto.
-
-	* eval.c (rb_using_refinement): ditto.
-
-	* gc.c: ditto.
-
-	* include/ruby/ruby.h: define m_tbl directly. The definition of
-	  struct RClass should be moved to (srcdir)/internal.h.
-
-	* method.h: remove decl of rb_free_m_tbl_wrapper().
-
-	* object.c: use RCLASS_M_TBL() directly.
-
-Fri Mar  6 02:50:12 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* dir.c (replace_real_basename): need to check the return value of
-	  GLOB_REALLOC().
-
-Fri Mar  6 02:26:03 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* dir.c (replace_real_basename): shouldn't create Ruby object before
-	  the object system is loaded.
-	  [ruby-core:68430] [Bug #10941]
-
-Wed Mar  5 16:58:43 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* hash.c: [DOC] #delete method actually returns nil, if the key
-	  is not found. [fix GH-844][ci skip] Patch by @ivdma
-
-Wed Mar  5 12:22:23 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* math.c: refactoring: remove unnecessary variable d0 to unify code
-	  appearance.
-
-Thu Mar  5 11:50:54 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_eval.c (eval_string_with_cref): A binding should keep
-	  refinements activation information and the refinements should be
-	  activated in subsequent eval calls with the binding.
-	  [ruby-core:67945] [Bug #10818]
-
-Thu Mar  5 11:16:55 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_refinement.rb: There is no need anymore to suppress
-	  warnings.
-
-Thu Mar  5 08:31:02 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* random.c (random_raw_seed): Avoid calling fill_random_bytes()
-	  if the requested size is 0. AIX returns -1 for 0-byte read from
-	  /dev/urandom, while other UNIX returns 0. With this change,
-	  Random.raw_seed(0) consistently returns "" in any UNIX.
-
-Wed Mar  4 12:43:32 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* test/ruby/test_math.rb (assert_float_and_int): Refactor test cases
-	  by introducing assert_float_and_int. [misc #10810]
-
-Wed Mar  4 11:52:30 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (Init_sym): make dsym_fstrs a hash compared by identity
-	  as the keys are unique fstrings, to get rid of running hash and
-	  compare methods and causing new object allocation during garbage
-	  collection phase.  [ruby-dev:48891] [Bug #10933]
-
-Wed Mar  4 10:16:57 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* enum.c: Fix typo in slice_after's exception message.
-	  [fix GH-842][ci skip] Patch by @jsyeo
-
-Wed Mar  4 10:15:37 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/syntax/methods.rdoc: add some missing spaces and
-	  fix a grammatical error in method docs.
-	  [fix GH-843][ci skip] Patch by @nikolas
-
-Wed Mar  4 02:13:06 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (backport_command_string): pick up only
-	  when the revision exists in trunk.
-
-Wed Mar  4 00:44:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_io_blocking_region): assigned variables
-	  inside EXEC_TAG() should be volatile.
-
-	* thread.c (rb_thread_s_handle_interrupt): ditto.
-
-	* thread.c (exec_recursive): ditto.
-
-Wed Mar  4 00:29:18 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: now can specify shorten form of commands.
-
-Tue Mar  3 23:41:42 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (Readline.readline): drop untreated control
-	  characters.
-
-Tue Mar  3 22:25:24 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/lib/envutil.rb (EnvUtil.invoke_ruby): need to rescue because
-	  Signal.signame may raise exception.
-
-Tue Mar  3 16:57:39 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: use 'b' instead of 's' for showing
-	  Backport options for merger.rb.
-
-Tue Mar  3 16:55:23 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: show selected ticket number at prompt.
-
-Tue Mar  3 14:47:30 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* math.c (num2dbl_with_to_f): direct casting from Rational to double.
-	  [Feature #10909]
-
-	* test/ruby/test_math.rb: add tests for the above change.
-
-Tue Mar  3 07:52:20 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/ruby/test_symbol.rb: avoid a false positive in AIX.
-
-Tue Mar  3 00:59:39 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* configure.in: set PRELOADENV in Solaris to avoid "wrong ELF class"
-	  error. [Bug #10926] [ruby-dev:48888]
-	* configure.in: set LIBPATHENV for 32-bit compile in Solaris
-	  in addition to 64-bit.
-
-Mon Mar  2 15:36:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: do not check _setjmp unless _longjmp is available,
-	  so that configure results will not be changed by cache.
-
-Mon Mar  2 14:44:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_REPLACE_TYPE): restore unsigned type from
-	  cached variable only if the target type is not available.
-
-Mon Mar  2 13:04:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (sig_signame): return nil if the argument is a valid
-	  signal number.
-
-Mon Mar  2 12:05:04 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/net/ftp/test_ftp.rb (create_ftp_server): set SO_OOBINLINE
-	  for receiving OOB data which is sent with MSG_OOB flag in
-	  portable way. [Bug #10915] [ruby-dev:48885]
-	* test/net/ftp/test_ftp.rb (test_abort, test_status): use gets
-	  for receiving OOB data in portable way.
-
-Mon Mar  2 11:43:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_REPLACE_TYPE): restore unsigned type from
-	  cached variable.
-
-Mon Mar  2 06:01:41 2015  Eric Wong  <e@80x24.org>
-
-	* ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX
-	  Thanks to Yura Sokolov <funny.falcon@gmail.com>
-	  [ruby-core:68369] [Bug#10923]
-	* test/io/wait/test_io_wait.rb (test_nread_buffered):
-	  fix broken test
-
-Sun Mar  1 20:21:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_REPLACE_TYPE): restore convertible type from
-	  cached variable, so that configured results will be stable.
-
-Sun Mar  1 18:10:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_broken_memmem): check before adding the
-	  result HAVE_MEMMEM macro to confdefs.h, so that configured
-	  results will be stable.
-
-Sun Mar  1 11:17:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (id2ref): prohibit from accessing internal objects.
-	  [ruby-core:68348] [Bug #10918]
-
-Sun Mar  1 09:06:11 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (strptime): Support %s.%N.
-	  [ruby-core:68301] [Bug #10904] Patch by Sadayuki Furuhashi.
-
-Sat Feb 28 17:18:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (enum_each_slice, enum_each_cons): limit elements size by
-	  the enumerator size.  suggested by Hans Mackowiak <hanmac AT
-	  gmx.de> at [ruby-core:68335]
-
-Sat Feb 28 15:44:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_dump.c (rb_vm_bugreport): get rid of making new strings
-	  inside signal context.
-
-	* variable.c (rb_tmp_class_path): defer making temporary class
-	  path string.
-
-	* variable.c (rb_search_class_path): search class path or return
-	  Qnil or Qfalse if unnamed, not creating a temporary path.
-
-Sat Feb 28 15:02:02 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_tmp_class_path): preserve name encoding of an
-	  anonymous instance of module/class subclass.
-
-Sat Feb 28 08:24:30 2015  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* ext/pty/pty.c: AIX supports autopush.
-	  Patch by Perry Smith [ruby-core:58539] [Bug #9144]
-
-Fri Feb 27 22:00:05 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems: Update to RubyGems 2.4.6 and HEAD(800f2e6).
-	  Fixed #1159, #1171, #1173 on rubygems/rubygems
-	* test/rubygems: ditto.
-
-Fri Feb 27 20:55:42 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rake: Update to rake (9237e74), typo fix and remove needless
-	  private syntax.
-	* test/rake: ditto.
-
-Fri Feb 27 17:06:44 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: define vm_svar_index.
-
-	* vm_insnhelper.c, vm.c, compile.c: use vm_svar_index names.
-
-	* iseq.h: remove DEFAULT_SPECIAL_VAR_COUNT.
-	  use VM_SVAR_FLIPFLOP_START instead.
-
-Fri Feb 27 13:57:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (setup_narg): wipe away expanded part of buffer to get rid
-	  of revealing uncleaned data.  reported by Dongkwan Kim <dkay AT
-	  kaist.ac.kr>.
-
-Wed Feb 25 22:25:07 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* spec/default.mspec: use default configuration file name.
-	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
-
-Wed Feb 25 22:21:56 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* spec/default.mspec: remove specific version number.
-	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
-
-Wed Feb 25 22:04:04 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32/Win32API.rb (initialize): accept both a string and an array
-	  for the arguments of the imported function.
-	  reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835]
-
-Wed Feb 25 18:12:11 2015  Eric Wong  <e@80x24.org>
-
-	* signal.c (sighandler): preserve errno
-	  Patch by Steven Stewart-Gallus <sstewartgallus00@mylangara.bc.ca>
-	  [ruby-core:68172] [Bug #10866]
-
-Wed Feb 25 15:59:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_pattern, push_glob): make globbed file names same
-	  encoding to the given pattern.
-
-Wed Feb 25 15:27:16 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/merger.rb: support 2.1+ versioning scheme.
-
-Tue Feb 25 08:49:12 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* lib/cmath.rb (log): raise ArgumentError when more than 2 arguments
-	  are passed. [ruby-core:66143] [Bug #10487]
-
-Tue Feb 25 02:15:17 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* test/ruby/test_math.rb: Use assert_infinity instead of assert_equal(1.0/0, ...).
-
-	* test/ruby/test_math.rb: Add tests for overriding Integer#to_f.
-	  [ruby-core:67919] [Misc #10809]
-
-Tue Feb 24 22:58:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* complex.c (nucomp_mul): calculate as rotation in complex plane
-	  if matrix calculation resulted in NaN.
-
-Tue Feb 24 21:45:39 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* test/ruby/test_math.rb(test_cbrt): Add an assertion for Math.cbrt(1.0/0)
-	  and move #test_cbrt to more proper place.
-
-Tue Feb 24 19:09:25 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (lep_svar_place, lep_svar_get): do not create
-	  additional T_NODE object (svars holder) when only getting
-	  svars.
-
-Tue Feb 24 11:49:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_zone_name): should be US-ASCII only if all 7-bits,
-	  otherwise locale encoding.  [ruby-core:68230] [Bug #10887]
-
-Tue Feb 24 09:47:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (chompped_length): enable smart chomp for all non-dummy
-	  encoding strings, not only default_rs.
-	  [ruby-core:68258] [Bug #10893]
-
-Mon Feb 23 23:19:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/vcs.rb (IO.popen): support :chdir option.
-
-	* tool/vcs.rb (VCS::GIT.get_revisions): use :chdir option instead
-	  of -C option which is not supported by older git.
-	  [ruby-dev:48880] [Bug #10890]
-
-Mon Feb 23 15:26:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_split_m): raise ArgumentError at broken string
-	  not RegexpError, as Regexp is not involved in.
-	  [ruby-core:68229] [Bug #10886]
-
-Mon Feb 23 07:25:29 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* time.c: Zone encoding should be US-ASCII if all 7-bits. Fix r46907.
-
-	* test/ruby/test_time.rb, test/ruby/test_time_tz.rb: Update tests.
-
-Sun Feb 22 18:33:42 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* common.mk: use ruby organization for rubyspec.
-
-Sun Feb 22 15:56:06 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements
-	  of original crefs. It fixes segmentation fault when calling
-	  refined method in duplicate module. [ruby-dev:48878] [Bug #10885]
-
-	* vm_core.h, class.c: change accordingly.
-
-	* test/ruby/test_refinement.rb: add a test for above.
-
-Sun Feb 22 10:43:37 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_objspace_call_finalizer): control GC execution during
-	  force firnalizations at the end of interpreter process.
-	  [Bug #10768]
-
-	  1) Prohibit incremental GC while running Ruby-level finalizers
-	     to avoid any danger.
-	  2) Prohibit GC while invoking T_DATA/T_FILE data structure
-	     because these operations break object relations consistency.
-
-	  This patch can introduce another memory consuming issue because
-	  Ruby-level finalizers can run after (2), GC is disabled.
-	  However, basically object consistency was broken at (2) as I
-	  described above. So that running Ruby-level finalizers contains
-	  danger originally. Because of this point, I need to suggest to
-	  remove these 3 lines (invoking remaining finalizers). And add a
-	  rule to add that finalizers should not add new finalizers, or
-	  say there is no guarantee to invoke finalizers that added by
-	  another finalizer.
-
-Sun Feb 22 04:07:05 2015  Zachary Scott  <e@zzak.io>
-
-	* ext/openssl/ossl_asn1.c: [DOC] RDoc formatting fixes for
-	  ASN1::ObjectId with patch from @vbatts [Fixes GH-834]
-
-	* ext/openssl/ossl_bn.c: ditto.
-
-Sat Feb 21 19:51:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (match_aref): RMatch::regexp is Qnil after matching by a
-	  string since r45451.  [ruby-core:68209] [Bug #10877]
-
-Sat Feb 21 16:18:42 2015  Stefan Schuler  <mail@stefanschuessler.de>
-
-	* compar.c (Init_Comparable): [DOC] Replace camelcase variable name.
-	  [Fix GH-833]
-
-Fri Feb 20 17:27:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_identical_p): fix handle leak, ensure to close
-	  the handle of the first argument.
-
-Fri Feb 20 17:19:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (different_device_p): compare by volume serial
-	  numbers, not by path names.  [ruby-core:68162] [Bug #10865]
-
-Thu Feb 19 01:58:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (rb_file_expand_path_internal): neither the drive
-	  of base directory nor the current drive are involved in the
-	  result if different than the drive of path.
-	  [ruby-core:68130] [Bug #10858]
-
-Wed Feb 18 10:48:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (wrename): return EXDEV if moving a directory to
-	  another drive, since MoveFileExW does not set proper error code.
-	  [ruby-core:68162] [Bug #10865]
-
-Wed Feb 18 03:13:52 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: bump psych version.
-	* ext/psych/psych.gemspec: ditto
-	* ext/psych/yaml/scanner.c: add latest libyaml change.
-	* test/psych/helper.rb: support newer minitest
-	* test/psych/test_to_yaml_properties.rb: ditto
-
-Tue Feb 17 11:47:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
-	  returned by Kernel#instance_variables are Symbols now.
-	  [ruby-core:68128] [Bug #10857]
-
-Tue Feb 17 10:59:10 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/syntax/calling_methods.rdoc: Fix documentation for "calling_methods"
-	  Patch by @sos4nt [fix GH-830][ci skip]
-
-Tue Feb 17 10:53:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (rb_file_expand_path_internal): do not make invalid
-	  (or ADS) path if the path has a drive letter, the result also
-	  should have be under it.  [ruby-core:68130] [Bug #10858]
-
-Tue Feb 17 10:47:20 2015  Iain Beeston  <iain.beeston@gmail.com>
-
-	* hash.c: Added docs to explain that #include? and #member? do not
-	  check member equality
-	* lib/set.rb: ditto
-
-Mon Feb 16 20:58:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_massign): optimization for special case,
-	  assignments by aset or attrset.
-	  http://kokizzu.blogspot.jp/2015/02/c-java-hhvm-ruby-nodejsrhinojscspidermo.html
-	  http://www.atdot.net/~ko1/diary/201502.html#d16
-
-Sun Feb 15 10:41:23 2015  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* doc/standard_library.rdoc: [DOC] delete removed libraries.
-	  [misc #10843] [ci skip]
-
-Sat Feb 14 12:20:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (rand_random_number): add a method to return a random
-	  number like SecureRandom to Random::Formatter.
-
-	* lib/securerandom.rb (random_bytes): move to Random::Formatter,
-	  the base method of the module.
-
-Sat Feb 14 12:01:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (random_raw_seed): extract platform dependent random
-	  seed initialization function as a new method Random.raw_seed.
-
-	* lib/securerandom.rb (SecureRandom): use Random.raw_seed.
-
-Sat Feb 14 00:49:37 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/coverage/coverage.c: Add Coverage.peek_result.  Allows you to
-	  capture coverage information without stopping the coverage tool.
-	  [ruby-core:67940] [Feature #10816]
-
-	* test/coverage/test_coverage.rb: test for change.
-
-Fri Feb 13 21:52:05 2015  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* string.c (str_discard): does not free for STR_NOFREE string.
-	  [Bug #10853][ruby-core:68110]
-
-	* bootstraptest/test_string.rb: test for above.
-
-Fri Feb 13 21:16:00 2015  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* lib/base64.rb: make urlsafe mode user-friendly.
-
-	* lib/base64.rb (Base64.urlsafe_encode64): a new option "padding" to
-	  suppress the padding character ("=").
-
-	* lib/base64.rb (Base64.urlsafe_decode64): now it accepts not only
-	  correctly-padded input but also unpadded input.
-	  [Feature #10740][ruby-core:67570]
-
-	* test/base64/test_base64.rb: Test for above
-
-Fri Feb 13 14:19:06 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json: merge upstream from flori/json
-	  change usage of TypedData. [Feature #10739][ruby-core:67564]
-
-Thu Feb 12 18:34:01 2015  multisnow  <infinity.blick.winkel@gmail.com>
-
-	* ext/openssl/extconf.rb: check RAND_edg to support libressl.
-
-	* ext/openssl/ossl_rand.c (ossl_rand_egd): define only if RAND_edg
-	  is available.  [Fix GH-829]
-
-Thu Feb 12 10:46:14 2015  Eric Hodel  <drbrain@segment7.net>
-
-	* proc.c (proc_call):  Improve Proc#call documentation.  Patch by
-	  Hsing-Hui Hsu.  [fix GH-761]
-
-Thu Feb 12 04:33:02 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* compar.c (cmp_equal): no more error hiding for Comparable#==.
-	  It now behaves as other Comparable methods. See #7688.
-
-	* test/ruby/test_comparable.rb: update related test.
-
-Thu Feb 12 03:28:05 2015  Eric Wong  <e@80x24.org>
-
-	* lib/set.rb (initialize): internal hash defaults to false
-
-	* lib/set.rb (include?): use Hash#[] for optimized dispatch.
-	  Patch by Ismael Abreu <ismaelga@gmail.com>
-	  [ruby-core:67664] [Misc #10754]
-
-Wed Feb 11 11:09:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/digest/digest_conf.rb (digest_conf): check for CommonDigest.
-
-	* ext/digest/*/*cc.h: for Apple CommonCrypto/CommonDigest.h.
-
-	* ext/digest/digest.h (DEFINE_FINISH_FUNC_FROM_FINAL): macro for
-	  finish functions, by inverting arguments order.
-
-	* ext/digest/digest_conf.rb (digest_conf): extract common
-	  configurations.
-
-Wed Feb 11 11:01:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/generator/generator.c (generate_json): get rid of
-	  unnecessary recursive calls which can cause infinite recursion.
-	  T_STRING may not have rb_cString.
-
-Wed Feb 11 07:53:35 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_word.rb: use skip method to skip test.
-
-Tue Feb 10 11:38:28 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_method): stop method search when a method
-	  is not found in a refinement, to support undef in refinements.
-	  [ruby-core:66741] [Bug #10578]
-
-Tue Feb 10 11:19:11 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (chdir, delete, gettextfile, mdtm, mkdir, nlst,
-	  putbinaryfile, puttextfile, rename, rmdir, size): support
-	  Pathname. Patch by Joe Rafaniello. [fix GH-828]
-
-Mon Feb  9 16:36:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot (package): get rid of loading unbundled and
-	  unexpected libraries.  [ruby-core:67977] [Bug #10822]
-
-Sun Feb  8 20:09:37 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/net/http/header.rb: pass header names as symbols.
-	  Patch by @DamirSvrtan [fix GH-805]
-	* test/net/http/test_httpheader.rb: added test.
-
-Sun Feb  8 13:04:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/getaddrinfo.c (get_addr): reject too long hostname to
-	  get rid of GHOST vulnerability on very old platforms.
-
-	* ext/socket/raddrinfo.c (make_hostent_internal): ditto, paranoic
-	  check for the canonical name.
-
-Sun Feb  8 12:48:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide
-	  versions of RegDeleteValue and RegDeleteKey.
-	  [ruby-core:67958] [Bug #10820]
-
-Sat Feb  7 22:13:08 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_record.rb: remove test using .NET
-	  Framework 3.5 because it is not included in Windows 8/8.1.
-
-Sat Feb  7 19:25:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (has_magic): always get long path name on Windows even if
-	  no tilde is there.  [ruby-core:68011] [Bug #10819]
-
-	* dir.c (replace_real_basename): FindFirstFile ignore redirection
-	  character, check if exists before call it.  cf. [Bug #8597]
-
-Sat Feb  7 13:30:11 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_win32ole_record.rb
-	  (test_ole_instance_variable_get): correct VT_RECORD type and
-	  instance variables.
-
-Fri Feb  6 17:47:05 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when
-	  dumping objects with custom coders. [ruby-core:66215] [Bug #10496]
-
-	* test/psych/test_coder.rb: test for fix
-
-Fri Feb  6 16:58:31 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular
-	  expressions with newlines. tenderlove/psych#222
-
-	* test/psych/test_yaml.rb: test for change.
-
-Fri Feb  6 10:31:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_call_info_kw_arg_struct): make keywords a symbols
-	  list to get rid of inadvertent creation by variable keyword
-	  arguments.  [ruby-core:68031] [Bug #10831]
-
-Thu Feb  5 22:42:34 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems:  Update to RubyGems HEAD(5c3b6f3).
-	  Fixed #1156, #1142, #1115, #1142, #1139 on rubygems/rubygems
-	* test/rubygems:  ditto.
-
-Thu Feb  5 13:41:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (send_internal), vm_insnhelper.c (vm_call_opt_send):
-	  convert String method name into a Symbol, as method_missing
-	  method expects its first argument to be a Symbol.  [Bug #10828]
-
-	* vm_insnhelper.c (ci_missing_reason): return the reason of method
-	  missing in call info.
-
-	* vm_insnhelper.c (vm_call_opt_send): re-apply r49500 with the
-	  proper missing reason.  [Bug #10828]
-
-Thu Feb  5 10:31:46 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* class.c (rb_obj_singleton_methods): should use RTEST() to convert
-	  VALUE to int.
-
-Thu Feb  5 03:59:33 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* vm_insnhelper.c: Fix symbol leak with +send+ [Bug #10828]
-
-Wed Feb  4 20:26:54 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (Init_win32ole): should not use atexit to
-	  free allocated hash table to avoid error on Cygwin.
-
-Wed Feb  4 15:34:25 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* class.c (method_entry_i, class_instance_method_list,
-	  rb_obj_singleton_methods): should not include methods of
-	  superclasses if recur is false. [ruby-dev:48854] [Bug #10826]
-
-Wed Feb  4 16:32:40 2015  Matt Hoyle  <matt@deployable.co>
-
-	* ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt'
-	  to 'exponent'.  [ruby-core:67980] [Bug #10823] [Fix GH-825]
-
-Wed Feb  4 15:55:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a
-	  macro `DEBUG` is defined.  based on the patch by Owen Rodley in
-	  [ruby-core:67987]. [Bug #10825]
-
-Wed Feb  4 11:12:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (probes.stamp): rebuild dtrace dependent objects
-	  only when `dtrace -G` modifies its input files.
-
-Tue Feb  3 19:27:16 2015  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written
-	  in common.mk (in which OBJ is defined) because of Makefile include
-	  and parse order. This partly reverts r49419.
-	  [ruby-dev:48849] [Bug #10808]
-
-	* Makefile.in (ruby-glommed.o): ditto.
-
-	* Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because
-	  it is included in $(OBJS) since r49451.
-
-	* Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS)
-
-Tue Feb  3 17:15:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
-	  interference by modifying global variables in have_devel? method.
-	  [ruby-core:67962] [Bug #10821]
-
-Tue Feb  3 15:23:58 2015  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_method.c (remove_method): When remove refined
-	  method, raise a NameError if the method is not
-	  defined in refined class.
-
-	  But if the method is defined in refined class,
-	  it should keep refined method and remove original
-	  method.
-
-	  Patch by Seiei Higa. [ruby-core:67722] [Bug #10765]
-
-Tue Feb  3 14:04:47 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): obtain real name with FindFirstFile API
-	  instead of matching all entries, on Windows.
-	  [ruby-core:67954] [Bug #10819]
-
-Tue Feb  3 12:26:35 2015  Katsuhiko Nishimra  <ktns.87@gmail.com>
-
-	* lib/mkmf.rb (configuration): set the default cxxflags, which is
-	  referred from the default CXXFLAGS, for extension libraries.
-	  [Fix GH-823]
-
-Tue Feb  3 05:52:00 2015  Aman Gupta <ruby@tmm1.net>
-
-	* gc.c (rb_objspace_free): cause rb_bug if lazy sweep is in progress
-	  during rb_objspace_free. Adds extra protection for r46340.
-	  Patch by Vicent Marti. [Bug #10768] [ruby-core:67734]
-	* gc.c (rb_objspace_call_finalizer): Ensure GC is completed after
-	  finalizers have run. We already call gc_rest() before invoking
-	  finalizers, but finalizer can allocate new objects and start new GC
-	  cycle, so we call gc_rest() again after finalizers are complete.
-
-Mon Feb  2 10:51:34 2015  Ari Pollak  <ajp@aripollak.com>
-
-	* doc/security.rdoc (Symbols): update about Symbol GC.  Symbols
-	  explicitly converted from Strings now can be collected, but
-	  reflection/metaprogramming still can cause memory flooding.
-	  [Fix GH-725]
-
-Sun Feb  1 13:46:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (bin-comm): drop batch file installation.
-	  Windows 95 support has not been supported already.
-	  [Feature #10806]
-
-Sat Jan 31 12:06:23 2015  Scott Francis  <scott.francis@shopify.com>
-
-	* thread_pthread.c (reserve_stack): fix intermittent SIGBUS on
-	  Linux, by reserving the stack virtual address space at process
-	  start up so that it will not clash with the heap space.
-	  [Fix GH-822]
-
-Fri Jan 30 17:28:29 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* math.c (num2dbl_with_to_f): make faster when Bignum passed by
-	  direct conversion using rb_big2dbl().  [Feature #10800]
-
-Thu Jan 29 23:30:00 2015  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (rb_rational_num): add fallback function
-	  for rubies lower than 2.2.0.
-
-	* ext/bigdecimal/bigdecimal.c (rb_rational_den): ditto.
-
-	* ext/bigdecimal/extconf.rb: check the existences of struct RRational,
-	  rb_rational_num, and rb_rational_den.
-
-	* ext/bigdecimal/bigdecimal.bundle: bump version.
-
-Thu Jan 29 20:28:25 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/make-snapshot: removed md5 digest with package information
-
-Thu Jan 29 10:41:52 2015  Kazuki Tanaka  <gogotanaka@ruby-lang.org>
-
-	* math.c (Get_Double): direct casting from Fixnum to double.
-	  [Feature #10785]
-
-Thu Jan 29 02:34:27 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with
-	  instance variables when it is referenced multiple times.
-	* ext/psych/lib/psych.rb: bump version
-	* ext/psych/psych.gemspec: bump version
-	* test/psych/test_hash.rb: test for fix
-
-Thu Jan 29 02:06:09 2015  Eric Wong  <e@80x24.org>
-
-	* thread.c (struct join_arg): restructure and make smaller
-	  (thread_join_sleep): avoid timeofday() call if forever
-	  (thread_join): pass join_arg.delay directly
-	  (rb_thread_inspect_msg): remove, inline into rb_thread_inspect
-	  (rb_thread_inspect): reduce branching and string creation
-	* thread_pthread.c (native_set_thread_name): create string directly
-	  to avoid reparsing. [Misc #10723]
-
-Wed Jan 28 21:32:24 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* thread.c: Improve documentation for Thread#value
-	  [Bug #10694][ruby-core:67324][ci skip]
-
-Tue Jan 27 16:04:19 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: added `!` command.
-
-Tue Jan 27 15:58:23 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: added history feature for platforms which
-	  lack readline.
-
-Mon Jan 26 22:09:35 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .gitignore: ignored temporary file with git.
-
-Mon Jan 26 18:06:03 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* misc/ruby-electric.el: Import version 2.2.2 from
-	  https://github.com/knu/ruby-electric.el.
-
-Mon Jan 26 11:37:49 2015  Dave Stevens  <dave@crowdlab.com>
-
-	* string.c (str_make_independent_expand): terminate String when
-	  moved from heap to embedded.  [Fix GH-821].
-
-Sun Jan 25 12:04:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (flatten): no need to call to_ary method on elements
-	  beyond the given level.  [ruby-core:67637] [Bug #10748]
-
-Sun Jan 25 00:42:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix.
-	  workaround of a bug of VC12 ml, by unak at [ruby-core:67792].
-	  [ruby-core:67789] [Bug #10780]
-
-Sat Jan 24 19:56:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln_find.c (dln_find_1): search regular files only.  based on
-	  the patch by Alex Coomans in [ruby-core:67766].  [Bug #10776]
-
-Fri Jan 23 23:57:05 2015  Misumi Rize  <r@ayase-e.li>
-
-	* vm_insnhelper.c (vm_throw_start): search the target to break
-	  from a block with nested rescue, from the nested blocks.
-	  [ruby-core:67765] [Bug #10775] [Fix GH-820]
-
-Fri Jan 23 20:00:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_object, marshal_dump): use identity tables for
-	  arbitrary VALUE keys, because of performance of FLONUM.
-	  [Bug #10761]
-
-	* marshal.c (obj_alloc_by_klass, marshal_load): ditto.
-
-Fri Jan 23 17:12:33 2015  Eric Wong  <e@80x24.org>
-
-	* benchmark/bm_marshal_dump_flo.rb: new benchmark for [Bug #10761]
-
-Thu Jan 22 18:03:19 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (find_svn_log): use double quotes instead
-	  of single quotes because cmd.exe doesn't handle them.
-
-	* tool/redmine-backporter.rb (done): the 2nd element of matched data
-	  is the offset of the end of matched string, not length.
-
-Thu Jan 22 16:45:24 2015  Eric Wong  <e@80x24.org>
-
-	* st.c (st_numhash): mix float value for flonum
-	* hash.c (rb_any_hash): ditto
-	* benchmark/bm_hash_aref_flo.rb: new benchmark
-	* benchmark/bm_hash_ident_flo.rb: ditto
-	  [Bug #10761]
-
-Wed Jan 21 22:33:51 2015  Akinori MUSHA  <knu@iDaemons.org>
-
-	* misc/ruby-electric.el: Import version 2.2.1 from
-	  https://github.com/knu/ruby-electric.el.  Improve compatibility
-	  with and optimize for Emacs 24.4.
-
-Wed Jan 21 09:40:52 2015  Zachary Scott  <e@zzak.io>
-
-	* file.c: Document other cases of missing birthtime on OS with patch
-	  provided by @sho-h similar to GH-817. [ci skip] [DOC]
-
-Wed Jan 21 09:09:19 2015  Tanaka Akira  <akr@fsij.org>
-
-	* NEWS: References to tickets added.
-	  [ruby-core:67701] [Bug #10760] Suggested by Zachary Scott.
-
-Tue Jan 20 22:59:54 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/vcs.rb: fix the exception given remote-url of svn.
-
-Tue Jan 20 12:58:33 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: now can change the page of `ls`.
-
-Tue Jan 20 12:28:37 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (readline): fallback to normal gets on
-	  Windows because IO.console.getch is not always do as expected.
-
-Tue Jan 20 11:31:07 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: update usage.
-
-Tue Jan 20 11:23:47 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (mygets): to support Backspace
-	  implement gets by itself.
-
-Tue Jan 20 02:54:11 2015  Zachary Scott  <e@zzak.io>
-
-	* file.c: NotImplementedError is raised if birthtime is unavailable.
-	  Patch by @y-yagi san and [Fixes GH-817] [ci skip] [DOC]
-
-	* ext/pathname/pathname.c: ditto.
-
-Mon Jan 19 22:08:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (include_modules_at): allow to prepend each module up to
-	  once for each classe.  [EXPERIMENTAL]
-
-Sun Jan 18 18:32:20 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* math.c (math_atan2): revive documentation before r49220.
-	  http://d.hatena.ne.jp/nagachika/20150112/ruby_trunk_changes_49213_49226
-
-Sun Jan 18 15:57:32 2015  Seiei Higa  <hanachin@gmail.com>
-
-	* vm_method.c (check_definition): Module#public_method_defined?,
-	  Module#private_method_defined?, Module#protected_method_defined?
-	  should not use refinements. [ruby-core:67656] [Bug #10753]
-
-Sun Jan 18 15:50:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_dump.c (rb_vm_bugreport): check by configured result instead
-	  of system name for old FreeBSD.  based on a patch by Steve Wills
-	  at [ruby-core:67655].  [Bug #10752]
-
-Sun Jan 18 12:56:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (VPATH, NEWLINE_C), common.mk (common-srcs): make
-	  and use newline.c under enc/trans directory, not toplevel.  no
-	  longer search enc directory implicitly.
-
-	* configure.in, enc/Makefile.in (BUILTIN_ENCS, BUILTIN_TRANSES):
-	  prefix respective directory names to builtin encodings and
-	  transcoder source names.
-
-Sun Jan 18 11:49:46 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_invoke): avoid SEGV when VT_RECORD
-	  variable is passed by reference. [ruby-dev:48803] [Bug #10697]
-
-Sat Jan 17 23:59:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb (visit_String):
-	  anchors like `\Z` are not valid inside character class.  use
-	  negative-lookahead instead.
-	  Fixes: https://github.com/tenderlove/psych/issues/221
-
-Sat Jan 17 23:42:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: get rid of pattern substitution, which is not
-	  supported by ash, and ash on NetBSD parses whole source first
-	  and fails to start.  [ruby-dev:48823] [Bug #10750]
-
-Fri Jan 16 18:42:58 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: support adding related revisions
-	  to issues.
-
-Fri Jan 16 17:20:33 2015  Koichi Sasada  <ko1@atdot.net>
-
-	vm.c, vm_core.h: constify VM_CF_LEP, VM_CF_PREV_EP, VM_CF_BLOCK_PTR
-	and rb_vm_control_frame_block_ptr.
-
-Fri Jan 16 15:41:21 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: bump version
-
-	* ext/psych/psych.gemspec: ditto
-
-Fri Jan 16 15:37:49 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: only dump hash
-	  subclasses. Thanks Joe Eli McIlvain <joe.eli.mac@gmail.com>
-
-	* test/psych/test_hash.rb: test for change
-
-Fri Jan 16 15:35:21 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: bump version
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix line width wrapping
-	  for long strings.  Thanks Jakub Jirutka <jakub@jirutka.cz>
-
-	* test/psych/test_string.rb: test for change
-
-Fri Jan 16 11:44:44 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* eval_intern.h, vm.c, vm_eval.c, vm_insnhelper.c:
-	  change throw mechanism (not save target ep, but save target cfp).
-	  It fixes `unexpected break' bug that occurs when
-	  TracePoint#binding is called.
-	  [ruby-dev:48797] [Bug #10689]
-
-	* test/ruby/test_settracefunc.rb: add a test.
-
-Thu Jan 15 23:55:15 2015  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_io_close_m): Don't raise when the IO object is closed.
-	  [ruby-core:67444] [Feature #10718]
-
-Thu Jan 15 21:34:57 2015  Seiei Higa  <hanachin@gmail.com>
-
-	* proc.c (rb_obj_singleton_method): Kernel#singleton_method should
-	  not use refinements, as well as Kernel#method.
-	  [ruby-core:67603] [Bug #10744]
-
-Thu Jan 15 10:45:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_select_bang, ary_reject_bang): linear
-	  performance.  [ruby-core:67418] [Feature #10714]
-
-Wed Jan 14 18:06:06 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* lib/uri/mailto.rb: raising URI::InvalidComponentError instead
-	  of failing with undefined method `split' for nil:NilClass for
-	  mailto: URIs without opaque part. [Bug #10738]
-	* test/uri/testuri.rb: Test for above
-
-Wed Jan 14 16:45:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/downloader.rb (RubyGems.download): verify downloaded gem
-	  packages.  LowSecurity to allow untrusted certificates now.
-
-Wed Jan 14 15:43:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_s_refresh_line): initialize
-	  before rl_refresh_line(), as some function make the internal
-	  state non-clean but rl_refresh_line() does not re-initialize it.
-	  [ruby-core:43957] [Bug #6232]
-
-Tue Jan 13 21:59:24 2015  Michal Papis  <mpapis@gmail.com>
-
-	* tool/rbinstall.rb (gem): fix changing permissions of installed
-	  bundled gems.  [Fix GH-812]
-
-Tue Jan 13 21:57:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (distclean-local): remove autom4te.cache generated by
-	  autoconf.
-
-	* common.mk (realclean-local): remove id sources and dummy header
-	  for dtrace.  [ruby-core:67562] [Bug #10737]
-
-Tue Jan 13 21:08:22 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json, test/json: merge JSON HEAD(259dee6)
-	  separate implementation of Typed_Data macro.
-	  https://github.com/flori/json/compare/v1.8.1...v1.8.2
-
-Tue Jan 13 14:16:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/net/http/test_http.rb: get rid of accessing DNS actually
-	  for some servers returning wrong results.
-	  [ruby-core:67454] [Bug #10721]
-
-Mon Jan 12 23:21:57 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gems/bundled_gems: update test-unit to 3.0.9.
-
-Mon Jan 12 18:35:44 2015  Eric Wong  <e@80x24.org>
-
-	* numeric.c (bit_coerce): use original value for error message
-	  [ruby-core:67405] [Bug #10711]
-	* test/ruby/test_numeric.rb (test_coerce): check error message
-
-Mon Jan 12 18:01:24 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
-	  CR.  should check if substitution occurred too.
-	  [ruby-dev:48813] [Bug #10732]
-
-Mon Jan 12 16:45:46 2015  Seiei Higa  <hanachin@gmail.com>
-
-	* vm_method.c (rb_alias): raise a NameError when creating alias to
-	  a refined method if the original method of the refined method is
-	  not defined.  [ruby-core:67523] [Bug #10731]
-
-Mon Jan 12 13:53:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* math.c (math_atan2): improve documentation.
-	  [Feature #10323][ruby-core:65400][ci skip]
-
-Mon Jan 12 13:50:49 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/bigdecimal/bigdecimal.c: fixes documentation like labeled lists,
-	  code examples etc. [ruby-core:66730][Bug #10576][ci skip]
-
-Mon Jan 12 13:36:44 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/optparse.rb: improvements for OptionParser documentation.
-	  [misc #10608][ruby-core:66901][ci skip]
-
-Mon Jan 12 13:33:52 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* array.c (rb_ary_each): documented return value.
-	  [misc #10469][ruby-core:66063]
-
-Sun Jan 11 15:11:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/webrick/test_utils.rb (test_create_listeners): use
-	  dynamically chosen port number, not hardcoded port number.
-	  [ruby-core:67508]
-
-Sat Jan 10 12:57:12 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/zlib/zlib.c: fix document of method signatures.
-	  [Bug #10668][ruby-core:67186][ci skip]
-
-Sat Jan 10 12:32:44 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval_error.c (error_print): pos and len parameters of rb_str_substr()
-	  are counted by characters, not bytes.  use rb_str_subseq() instead.
-	  [Bug #10727] [ruby-core:67473]
-
-Sat Jan 10 10:58:55 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* complex.c: removed commented-out code.
-
-Sat Jan 10 10:57:19 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* rational.c: removed commented-out code.
-	  [Feature #10376][ruby-core:65643]
-
-Sat Jan 10 10:12:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_select_bang): keep the array consistent by
-	  removing unselected values soon.  [ruby-dev:48805] [Bug #10722]
-
-Fri Jan  9 23:20:04 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/rubygems:  Update to RubyGems HEAD(e53c54a).
-	* test/rubygems:  ditto.
-
-Fri Jan  9 11:13:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (assocs, assoc): eliminate splatting empty literal
-	  hashes.  [ruby-core:67446] [Bug #10719]
-
-	* compile.c (compile_array_): support splatted hash in hash type.
-
-Fri Jan  9 10:57:09 2015  Vit Ondruch  <vondruch@redhat.com>
-
-	* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
-	  which causes a syntax error with autoconf 2.63.
-	  [ruby-core:67429] [Bug #10716]
-
-Fri Jan  9 07:23:32 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: correctly quote non-ascii
-	  letters. Thanks @jirutka for the patch.
-
-	* test/psych/test_string.rb: test for change
-
-Fri Jan  9 07:13:55 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hash
-	  subclasses.  Fixes github.com/tenderlove/psych/issues/196
-
-	* test/psych/test_hash.rb: test for change
-
-Fri Jan  9 06:58:43 2015  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivars
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: dump hashes with ivars.
-	  Fixes github.com/psych/issues/43
-
-	* test/psych/test_hash.rb: test for change
-
-Thu Jan  8 17:05:00 2015  Seiei Higa  <hanachin@gmail.com>
-
-	* vm_method.c (rb_method_entry): if no super class, no original
-	  method entry.  [ruby-core:67389] [Bug #10707]
-
-Thu Jan  8 16:31:43 2015  Seiei Higa  <hanachin@gmail.com>
-
-	* vm_method.c (rb_export_method): bail out if the original method
-	  is undefined when the method is refined.
-	  [ruby-core:67387] [Bug #10706]
-
-Thu Jan  8 12:53:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (glob_helper): match in case-folding only if the directory
-	  resides on a case-insensitive file system, on OSX.
-	  [ruby-core:67364] [Bug #10700]
-
-Thu Jan  8 11:39:18 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* .travis.yml: Remove redundant configuration option.
-	  [fix GH-809] Patch by @gxworld
-
-Thu Jan  8 07:17:14 2015  Eric Wong  <e@80x24.org>
-
-	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
-	  [ruby-core:67411] [Bug #10712]
-
-Thu Jan  8 00:13:52 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open3.rb: Open3 properly passes non-keyword hash args to spawn.
-	  Fixed by Josh Cheek.  [Fix GH-808]
-	  Related to [ruby-core:67347] [Bug #10699]
-
-Wed Jan  7 19:19:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_initialize): workaround of opendir failure at symlink
-	  directories on Windows via CIFS.
-
-Wed Jan  7 18:52:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (need_normalization): not only HFS+, CIFS (SMB) is also
-	  decomposed.  [Bug #10704]
-
-	* dir.c (NORMALIZE_UTF8PATH): Unicode decomposition seems to
-	  perform in an upper layer than file systems on OSX, as all path
-	  names are always decomposed regardless of file system types.
-
-Tue Jan  6 21:41:04 2015  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (timelocalw): Set tm_isdst field -1 if vtm->isdst is
-	  VTM_ISDST_INITVAL.  This bug is introduced at packing struct
-	  vtm (r45155).
-	  [ruby-core:67345] [Bug #10698] Reported by Boris Ruf.
-
-Tue Jan  6 03:10:54 2015  Koichi Sasada  <ko1@atdot.net>
-
-	* test/fiddle/test_handle.rb: fix syntax.
-
-Tue Jan  6 00:16:10 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty
-	  which is always a shared object and is not used by others.
-	  [ruby-dev:48629] [Bug #10384]
-
-Mon Jan  5 14:58:01 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_io.rb: added timeout for AIX environment.
-	  [ruby-core:62983][Bug #9917]
-
-Sun Jan  4 22:33:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (ExcludesOption): add "excludes" support
-	  to test suite, for alternative implementations and platforms.
-	  [Feature #10682]
-
-Sun Jan  4 22:32:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Test::Unit): reorder modules and merge
-	  each modules.
-
-	* test/lib/test/unit.rb (Test::Unit): split the large class into
-	  each modules.
-
-Sun Jan  4 21:32:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_label): return tLABEL value as it is.
-	  [ruby-core:67315] [Bug #10693]
-
-Sun Jan  4 14:02:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit/parallel.rb (run): expand the file name to be
-	  loaded, so that relative paths work in parallel mode.
-
-Sun Jan  4 13:36:56 2015  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* test/test_tempfile.rb: use assert_file for more descriptive message.
-	  following r49131.
-
-Sun Jan  4 13:05:09 2015  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* string.c: improve docs for String#<=>. [ruby-core:65399][Feature #10322]
-	  Patch by gogo tanaka.
-
-Sun Jan  4 12:42:24 2015  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* array.c: improve docs for Array#reject. [ruby-core:65324][misc #10307]
-	  Patched by Nebu Pookins.
-
-Sun Jan  4 12:24:11 2015  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* string.c: improve docs for String#strip and variations.
-	  [ruby-core:66081][Bug #10476]
-
-Sun Jan  4 09:21:04 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/drb/drb.rb: removed unused argument. Patch by @vipulnsward
-	  [fix GH-515]
-
-Sun Jan  4 09:18:31 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/tempfile.rb: provide default basename parameter.
-	  [fix GH-523] Patch by @dissolved
-	* test/test_tempfile.rb: ditto.
-
-Sun Jan  4 00:43:41 2015  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* README.ja.md: add guidance of mailing list and bugs.r-l.o.
-
-Sat Jan  3 23:56:28 2015  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
-
-	* hash.c: fix docs for Hash#invert. [ruby-core:66917] [Bug #10612]
-
-Sat Jan  3 19:52:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_str_new_literal): define on all
-	  platforms, not only gcc.
-
-Sat Jan  3 18:53:28 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/lib/fiddle/cparser.rb (parse_ctype): limit split word
-	  number as the rest are not used.
-
-Sat Jan  3 18:19:50 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/fiddle/lib/fiddle/cparser.rb: r49110 broke Fiddle::Import with
-	  type_alias.
-	* test/fiddle/test_cparser.rb: added type_alias test for parse_ctype
-	  and parse_struct_signature.
-
-Sat Jan  3 11:50:16 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/openssl/ossl.h: avoid to build failure of Windows environment.
-	* ext/openssl/ossl_ssl_session.c: ditto.
-
-Sat Jan  3 11:27:46 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* array.c: Improve performance of Array#shift. use shared instead of
-	  MEMMOVE if with arguments. Patch by @ksss [fix GH-537]
-	* test/ruby/test_array.rb: ditto.
-	* benchmark/bm_array_shift.rb: Added benchmark of GH-537 issue.
-
-Sat Jan  3 10:38:52 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/net/http.rb: More descriptive error message when net/http fails
-	  to connect to a server. Patch by @xaviershay [fix GH-700]
-	* test/net/http/test_http.rb: ditto.
-
-Sat Jan  3 10:14:51 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/openssl/ossl.h: Make `SSL_SESSION_cmp` use `CRYPTO_memcmp`
-	  [fix GH-591] Patch by @PiPeep
-	* ext/openssl/ossl_ssl_session.c: ditto.
-
-Sat Jan  3 09:54:32 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/fiddle/lib/fiddle/cparser.rb: Support for Fiddle::CParser
-	  to handle rich signatures including parameter names and function
-	  pointer types. Patch by @theryan [fix GH-590]
-	* test/fiddle/test_cparser.rb: ditto.
-
-Sat Jan  3 09:01:43 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* NEWS: added compatibility entry of r49101.
-
-Fri Jan  2 21:06:59 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/net/http.rb (Net::HTTP#send_request): there is no response body
-	  with HEAD request. Patch by @rodrigosaito [fix GH-520]
-
-Fri Jan  2 21:04:36 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/net/http/test_http.rb (_test_send_request__HEAD): Added
-	  failing test for send_request with HEAD method.
-
-Fri Jan  2 18:41:20 2015  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c (ruby_init): Print ruby_setup() error only in debug mode.
-	  Unsuppressable error message is not a good idea.
-	  Note that the message is printed sometimes with following
-	  code (highly timing dependent, though):
-	  pid = spawn("ruby -e ''"); Process.kill(:TERM, pid)
-
-Fri Jan  2 16:18:44 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/ruby/test_module.rb: Refactor invalid testcase.
-	  [fix GH-472][ruby-core:59035][Bug #9240]
-
-Fri Jan  2 15:53:00 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/webrick/utils.rb: removed unused argument variable.
-	  [fix GH-356] Patch by @vipulnsward
-	* lib/webrick/server.rb: ditto.
-	* lib/webrick/ssl.rb: ditto.
-	* test/webrick/test_utils.rb: added test for WEBrick::Utils#create_listeners.
-
-Fri Jan  2 15:35:53 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/securerandom.rb: improve syntax and grammar of documentation.
-	  [fix GH-796][ci skip] Patch by @Erol
-
-Fri Jan  2 15:10:01 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
-	  fix test failure with OpenSSL disabled SSLv3 protocol.
-	  [ruby-core:63772] [Bug #10046]
-
-Fri Jan  2 09:08:31 2015  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality.
-	  (Resolv::DNS::Name#initialize): Normalize labels as
-	  Resolv::DNS::Label::Str objects.
-
-Thu Jan  1 21:41:49 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* doc/regexp.rdoc: fix regexp docs for whitespace character.
-	  [ruby-dev:48765] [Bug #10624]
-
-Thu Jan  1 17:50:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_rubyoptions.rb: try locale encoding name.
-	  [ruby-core:67109] [Bug #10643]
-
-Thu Jan  1 11:07:12 2015  Eric Wong  <e@80x24.org>
-
-	* symbol.c (rb_gc_free_dsymbol): delete from global fstr hash
-	* test/ruby/test_symbol.rb (test_symbol_fstr_leak): test for bug
-	  [ruby-core:67268] [Bug #10686]
-
-Thu Jan  1 09:14:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_args.c (keyword_hash_p): fix non-symbol keys hash.
-	  rb_extract_keywords() returns 0 not Qnil when no symbol keys is
-	  included.  [ruby-core:67264] [Bug #10685]
-
-Wed Dec 31 17:48:43 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Label::Str#initialize): Set encoding
-	  ASCII-8BIT before downcase.  case insensitivity of DNS labels doesn't
-	  apply non-ASCII characters.  [RFC 4343]
-
-Wed Dec 31 16:48:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (gettable_gen): disable warnings of possible reference
-	  to a local variable defined in a past scope.
-	  [ruby-core:67162] [Bug #10661]
-
-Wed Dec 31 13:43:48 2014  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
-	  objects.  Label#Str#== is case-insensitive.
-
-Tue Dec 30 16:16:12 2014  Ben Miller  <bmiller@rackspace.com>
-
-	* lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the
-	  comparison should be case-insensitive as well.
-	  [ruby-core:66498] [Bug #10550]
-
-Tue Dec 30 16:03:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/resolv.rb (Resolv::DNS::Name): names with different dots
-	  should be different.
-
-Tue Dec 30 13:16:56 2014  Martin Duerst  <bernhard+git@lsmod.de>
-
-	* lib/uri/common.rb: Initialize HTML5ASCIIINCOMPAT to empty Array
-	  to avoid error during bootstrap when encodings are not yet defined.
-	  [Bug #10678]
-
-Tue Dec 30 09:29:26 2014  Bernhard M. Wiedemann  <bernhard+git@lsmod.de>
-
-	* ext/dbm/dbm.c (Init_dbm): [DOC] as UNIX permissions are octal
-	  numbers, needs to be prefixed by 0.  [Fix GH-800]
-
-Tue Dec 30 08:57:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* lib/unicode_normalize.rb: typo fix. [ci skip]
-	  [ruby-dev:48794][misc #10675]
-
-Mon Dec 29 19:38:01 2014  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* version.h (RUBY_VERSION): 2.3.0 development has started.
-
-Mon Dec 29 18:58:46 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (unescape_nonascii): append escape sequence as-is not
-	  unescaped character, to get rid of unexpected meta-character.
-	  [ruby-core:67193] [Bug #10670]
-
-Mon Dec 29 14:27:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/syntax/literals.rdoc (Symbols): now Symbols created by
-	  interpolation can be garbage collected.  patch by Yihang Ho in
-	  [ruby-core:67194].  [Bug #10671]
-
-Mon Dec 29 11:18:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_variable_get): fix dynamic symbol keys.
-	  rb_check_id() returns non-zero only for static symbols, whereas
-	  thread local variable keys can be dynamic symbols.
-	  [ruby-core:67185] [Bug #10667]
-
-Mon Dec 29 10:37:27 2014  Thiago Lewin  <thiago_lewin@yahoo.com.br>
-
-	* io.c (rb_f_select): [DOC] workaround for YARD doc.  [Fix GH-799]
-
-	* process.c (proc_detach): [DOC] fix missing closing parenthesis.
-	  [Fix GH-799]
-
-Mon Dec 29 07:27:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/json, test/json: merge JSON HEAD(17fe8e7)
-	  https://github.com/flori/json/compare/v1.8.1...17fe8e7
-
-Sun Dec 28 23:49:37 2014  Michal Papis  <mpapis@gmail.com>
-
-	* rbinstall.rb: fix target location for installing bundled gems.
-	  install to the prepared directory instead of default Gem.dir,
-	  not to be affected GEM_HOME environment variable.  [Fix GH-798]
-
-Sun Dec 28 18:19:28 2014  Eric Wong  <e@80x24.org>
-
-	* test/-ext-/iseq_load/test_iseq_load.rb
-	  (test_next_in_block_in_block): test using ISeq#eval
-	  (test_break_ensure): ditto
-	  [ruby-core:66988]
-
-Sun Dec 28 16:25:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
-	  always.  [ruby-core:67153] [Bug #10657]
-
-Sun Dec 28 13:54:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and
-	  keywords bits arguments should be unique.  since internal IDs
-	  depend on the local variable index in the current scope, new ID
-	  should be made before popping those vtables.
-	  [ruby-core:67157] [Bug #10659]
-
-Sat Dec 27 20:12:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/generator/generator.c (JSON_Generator_State_type): add
-	  #ifdef for backward compatibility.
-
-	* ext/json/parser/parser.rl (JSON_Parser_type): ditto.
-
-	* ext/json/generator/generator.h (ZALLOC): add fallback definition.
-
-	* ext/json/parser/parser.h (ZALLOC): ditto.
-
-Sat Dec 27 16:54:05 2014  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: Unused code removed.
-	  It seems waitpid() is universally available on POSIX platforms.
-
-Sat Dec 27 15:08:27 2014  Eric Wong  <e@80x24.org>
-
-	* vm_core.h (rb_vm_living_threads_insert): preserve order
-	  [Bug #10660] [ruby-core:67154] [ruby-core:67159]
-
-Sat Dec 27 13:08:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/socket/socket.c: improved document for YARD doc.
-	  [fix GH-795][ci skip] Patch by @tlewin
-
-Sat Dec 27 10:11:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
-	  of tcllib. Patch by @zalt50 [fix GH-787]
-
-Sat Dec 27 10:03:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
-
-	* tool/make-snapshot: show sha1 digest when making packages.
-	  it's request from https://github.com/ruby/www.ruby-lang.org/issues/921
-	  [fix GH-794]
-
-Fri Dec 26 15:32:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tcltklib.c (ip_invoke_core): remove probably duplicate
-	  dead code.
-
-Fri Dec 26 15:28:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tcltklib.c (ip_ruby_cmd_receiver_const_get): simply use
-	  rb_path2class() to get a class/module from its name.
-
-Fri Dec 26 15:20:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (w_long): append at once by w_nbyte() instead of
-	  appending byte by byte.
-
-Fri Dec 26 15:13:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/parser/parser.rl (unescape_unicode): check if valid
-	  before bit-or assignments.
-	  reported by Denis Denisov <denji0k AT gmail.com>.
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_iconv_t): fix a missing semicolon.
-	  reported by Denis Denisov <denji0k AT gmail.com>.
-
-	* process.c (rb_spawn_process): get rid of usage of uninitialized
-	  variable.
-	  reported by Denis Denisov <denji0k AT gmail.com>.
-
-	* regexec.c (match_at): ditto.
-
-	* ext/win32ole/win32ole.c (ole_wc2mb_alloc, ole_vstr2wc, ole_mb2wc):
-	  ditto.
-
-	* dir.c (ruby_glob0): no need to check never-NULL pointer.
-	  reported by Denis Denisov <denji0k AT gmail.com>.
-
-	* win32/file.c (rb_file_expand_path_internal): ditto.
-
-	* win32/file.c (code_page_i): handle realloc failure.
-	  reported by Denis Denisov <denji0k AT gmail.com>.
-
-	* win32/stub.c (stub_sysinit): ditto.
-
-	* fix printf format conversion specifiers.
-	  reported by Denis Denisov <denji0k AT gmail.com>.
-
-Fri Dec 26 01:41:40 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable.
-	  [Bug #10647] [ruby-dev:48787]
-
-Fri Dec 26 01:24:42 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/downloader.rb: support old versions of ruby.
-
-	* tool/downloader.rb: now can download gems by http if openssl is not
-	  available (this may be danger!)
-
-Fri Dec 26 00:13:48 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_extlibs.rb: check existence of extension libraries
-	  which not depend on outer libraries. (experimental)
-
-Thu Dec 25 21:58:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/extconf.rb: make PIC objects if it will be linked as
-	  a shared object eventually.  [ruby-core:67128]
-
-Thu Dec 25 19:01:13 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/fiddle/win32/libffi-3.2.1-mswin.patch: support mswin32.
-
-Thu Dec 25 17:30:40 2014  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* gc.c (wmap_final_func): fix memory size shortage when realloc wmap.
-	  Fix SEGV during finalize of WeakRef on Solaris (though the SEGV
-	  could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646]
-
-Thu Dec 25 17:27:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (NET_LUID): include winsock2.h instead of windows.h.
-	  patch by Jon Forums in [ruby-core:67125].  [Bug #10640]
-
-Thu Dec 25 16:14:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): send the given arguments
-	  to the opened console.  as a special case, do nothing if :close
-	  is given.
-
-	* test/lib/leakchecker.rb (LeakChecker#check_fd_leak): close if
-	  console.
-
-For the changes before 2.2.0, see doc/ChangeLog-2.2.0
-For the changes before 2.1.0, see doc/ChangeLog-2.1.0
-For the changes before 2.0.0, see doc/ChangeLog-2.0.0
-For the changes before 1.9.3, see doc/ChangeLog-1.9.3
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
-
-Local variables:
-coding: us-ascii
-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))))
-  (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
-indent-tabs-mode: t
-tab-width: 8
-change-log-indent-text: 2
-end:
-vim: tabstop=8 shiftwidth=2
diff --git a/doc/ChangeLog-2.4.0 b/doc/ChangeLog-2.4.0
deleted file mode 100644
index 1714b7caec..0000000000
--- a/doc/ChangeLog-2.4.0
+++ /dev/null
@@ -1,9492 +0,0 @@
-Mon Nov  7 00:32:45 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
-	  ignore on Windows because we cannot handle signaled status of child
-	  ruby process on this platform.
-
-Sun Nov  6 23:36:07 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
-	  send SIGKILL if the child process doesn't die within 1 second.
-
-Sun Nov  6 21:54:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/vcs.rb (export_changelog): generate ChangeLog file from
-	  vcs's log. [Feature #12283]
-
-	* tool/make-snapshot (package): overwrite ChangeLog by generated
-	  ChangeLog.
-
-Sun Nov  6 21:36:33 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: Added entry for RDoc 5.
-
-Sun Nov  6 21:35:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: ordered entries and adjust styles.
-
-Sun Nov  6 18:23:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: Added entry for [Feature #12160][ruby-core:74239]
-
-Sun Nov  6 18:18:25 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* NEWS: Added entry for r56624.
-
-Sun Nov  6 15:53:03 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* configure.in (-Wno-maybe-uninitialized): gcc 6 also shows the same
-	  warnings as described in r49410.
-
-Sun Nov  6 14:42:50 2016  takkanm  <takkanm@gmail.com>
-
-	* eval.c (rb_mod_include, rb_mod_prepend): check if arguments are
-	  given, as well as Kernel#extend.  [ruby-dev:49854] [Bug #12887]
-	  [Fix GH-1470]
-
-Sun Nov  6 11:59:05 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
-	  test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast
-	  address is not available.
-
-Sun Nov  6 11:53:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/irb.rb (Binding#irb): new method like Binding#pry.
-
-Sun Nov  6 11:48:55 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/net/smtp/test_smtp.rb (test_tls_connect, test_tls_connect):
-	  use Socket.tcp_server_sockets in case localhost is resolved to ::1.
-
-Sun Nov  6 11:49:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/irb.rb (IRB::Irb#run): split from IRB.start.
-
-Sun Nov  6 11:45:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/e2mmap.rb (E2MM.def_exception): remove old definition if
-	  exists so that works multiple times.
-
-Sun Nov  6 10:03:00 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_optimization.rb (test_tailcall_interrupted_by_sigint):
-	  don't use sleep to run faster.
-
-Sun Nov  6 09:58:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_exec_fillarg): honor the given path environment
-	  variable.  [ruby-core:53103] [Bug #8004]
-
-Sun Nov  6 01:52:31 2016  Akira Matsuda  <ronnie@dio.jp>
-
-	* lib/erb.rb: Alias regist_scanner to register_scanner
-
-Sun Nov  6 01:39:36 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* compile.c (tailcallable_p): disable tail call optimization for
-	  toplevel, eval, and load to avoid SEGV when interrupted by SIGINT.
-	  [ruby-core:76327] [Bug #12576]
-
-Sun Nov  6 01:28:41 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.h: rename REG_(CFP|PC|SP|EP) to VM_REG_....
-	  [Bug #12527]
-
-	* vm_exec.c: ditto.
-
-Sun Nov  6 00:25:11 2016  Sho Hashimoto  <sho.hsmt@gmail.com>
-
-	* enumerator.c (InitVM_Enumerator): Enumerator::Lazy#chunk_while
-	  defined.  [Fix GH-1186]
-	  https://github.com/ruby/ruby/pull/1186
-
-Sun Nov  6 00:22:51 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_eval.c (vm_call0_cfunc_with_frame): pass method id to
-	  dtrace hook. follow up r56592.
-
-Sun Nov  6 00:06:38 2016  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::LOC::Coord.create): fixed.
-	  [ruby-core:72567] [Bug #11912] fixed by Eric Wong and Kazuhiro
-	  NISHIYAMA.
-
-Sun Nov  6 00:03:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (-Wimplicit-fallthrough): gcc7 introduces case
-	  fall through warnings but it is too noisy.
-	  https://gcc.gnu.org/bugzilla/show_bug.cgi?id=7652
-
-Sat Nov  5 23:58:32 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* numeric.c (rb_int_round): cast to SIGNED_VALUE to suppress
-	  warnings by -Wsign-compare.
-
-Sat Nov  5 23:48:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (rb_home_dir_of): convert given username into filesystem
-	  encoding. [ruby-core:76682] [Bug #12652]
-	  patched by Davis Mosans
-
-Sat Nov  5 23:46:03 2016  Tanaka Akira  <akr@fsij.org>
-
-	* time.c (vtm_add_offset): Fix yday on last day of year.
-	  [ruby-core:72878] [Bug #11994] Fixed by Andrew White.
-
-Sat Nov  5 23:30:41 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP.post): new convenience method to send
-	  a POST request.  [ruby-core:75484] [Feature #12375]
-
-Sat Nov  5 23:03:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (transport_request): other than HTTPContinue
-	  in 1xx (HTTPInformation) also needs to continue. [Bug #12890]
-
-Sat Nov  5 22:51:06 2016  Tanaka Akira  <akr@fsij.org>
-
-	* lib/time.rb (make_time): "now" argument as nil works again.
-	  This is broken since Ruby 2.2.
-	  Mathieu Jobin pointed a problem.
-	  https://github.com/ruby/ruby/commit/e4b05d91eb0d48fd172abf015c493bb42d755d07#commitcomment-17421387
-
-Sat Nov  5 22:50:13 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/ipaddr.rb (IPAddr#==): If coercion fails, return false
-	  instead of passing through the exception. [ruby-core:77451]
-	  [Bug #12799]
-
-	* lib/ipaddr.rb (IPAddr#<=>): If coercion fails, return nil
-	  instead of passing through the exception. [ruby-core:77451]
-	  [Bug #12799]
-
-Sat Nov  5 22:11:33 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_trace.c (tracepoint_attr_callee_id, rb_tracearg_callee_id):
-	  add TracePoint#callee_id. [ruby-core:77241] [Feature #12747]
-
-	* cont.c, eval.c, gc.c, include/ruby/intern.h, insns.def, thread.c,
-	  vm.c, vm_backtrace.c, vm_core.h, vm_eval.c, vm_insnhelper.c, vm_trace.c: ditto.
-
-	* test/ruby/test_settracefunc.rb: tests for above.
-
-Sat Nov  5 22:09:48 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* eval.c, method.h, proc.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c:
-	  TracePoint#method_id should return method_id, not callee_id.
-	  [ruby-core:77241] [Feature #12747]
-
-	* test/ruby/test_settracefunc.rb: change accordingly.
-
-Sat Nov  5 18:49:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round, int_round): support round-to-nearest-even
-	  semantics of IEEE 754 to match sprintf behavior, and add `half:`
-	  optional keyword argument for the old behavior.
-	  [ruby-core:76273] [Bug #12548]
-
-Sat Nov  5 18:17:54 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/set.rb (Set#compare_by_identity, Set#compare_by_identity?):
-	  New methods. [Feature #12210]
-
-Sat Nov  5 18:17:08 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0
-	  Release note: https://github.com/rdoc/rdoc/blob/b825775647f62c5b525e9780a28ff2fbb1d5bf6f/History.rdoc#500--2016-11-05
-
-Sat Nov  5 17:29:06 2016  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb (Resolv::DNS#extract_resources): Use each_resource
-	  instead of each_answer.
-	  [ruby-core:75461] [Bug #12372] reported by Rafael Fernandez Lopez.
-
-Sat Nov  5 17:18:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/-test-/file/fs.c (get_atime_p): Updating of file access times
-	  is enabled or not.
-
-Sat Nov  5 16:28:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (extract_getline_opts): extract chomp option.
-	  [Feature #12553]
-
-Sat Nov  5 15:58:24 2016  Sho Hashimoto  <sho-h@netlab.jp>
-
-	* tool/mkconfig.rb: [DOC] add rbconfig documentation.
-
-Sat Nov  5 15:42:52 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/smtp.rb (tlsconnect): support timeout for TLS handshake.
-	  [ruby-core:76893] [Bug #12678]
-
-	* lib/net/protocol.rb (ssl_socket_connect): new method to implement
-	  timeout for TLS handshake.
-
-	* lib/net/http.rb (connect): use Net::Protocol#ssl_socket_connect.
-
-Sat Nov  5 14:17:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (brace_body, do_body): since cmdarg_stack is saved in
-	  VALUE val, should restore from the same member.  on big-endian
-	  platforms where VALUE is larger than int, it restored 0 in the
-	  upper word.  [ruby-core:77920] [Bug #12900]
-
-Sat Nov  5 13:52:52 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/shellwords.rb (Shellwords#shellsplit): Fix the handling of
-	  the backslash in double quotes to conform to the standard.
-	  [ruby-core:63807] [Bug #10055]
-
-Sat Nov  5 12:14:31 2016  Tanaka Akira  <akr@fsij.org>
-
-	* ext/pathname/pathname.c (Pathname#empty?): New method.
-	  [ruby-core:76404] [Feature #12596] Proposed by John Backus.
-
-Sat Nov  5 11:53:02 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_refinement.rb (test_refine_alias_in_subclass):
-	  add a test to check that alias in subclasses can be refined.
-	  [ruby-core:69374] [Bug #11186]
-
-Sat Nov  5 11:20:57 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* cont.c (cont_new): disable optimization if clang's version is
-	  3.8.0.  [ruby-core:77894] [Bug #12893]
-
-Sat Nov  5 10:07:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_file.rb (TestFile#test_stat): fix noatime case.
-	  [ruby-core:77943] [Bug #12903]
-
-Fri Nov  4 17:52:44 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (heap_page_resurrect): do not return tomb_pages when
-	  page->freelist == NULL.
-	  [Bug #12670]
-
-Fri Nov  4 16:31:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_dtoa): round to even, instead of rounding to
-	  nearest.  [ruby-core:77864] [Bug #12889]
-
-Fri Nov  4 15:31:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: Add compiler version message into rbconfig
-	  as RbConfig::CONFIG['CC_VERSION_MESSAGE']. [Feature #12896]
-
-Fri Nov  4 13:03:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (rb_int_digits): Fix exception message
-	  [ruby-core:77502] [Bug #12815]
-
-Fri Nov  4 10:51:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pathname/pathname.c (path_hash): fix unnormalized Fixnum
-	  value bug on mingw/mswin.
-
-Fri Nov  4 10:35:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::Entry_#copy): ensure that the
-	  source entry exists first, to fix error for non-existent entry.
-	  [ruby-core:77885] [Bug #12892]
-
-Thu Nov  3 21:45:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c: Import changes from ruby/bigdecimal
-	  repository.
-
-Thu Nov  3 15:01:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c: include sys/sysmacros.h for ArchLinux which deprecated
-	  use of major() and minor() in sys/types.h.
-
-Wed Nov  2 08:45:49 2016  Dmitry Gritsay  <unseductable@gmail.com>
-
-	* doc/extension.rdoc: set ANYARGS as arguments for func1 and func2.
-
-	* doc/extension.rdoc: mention the exception object which is passed
-	  to func2 as the second argument.  [Fix GH-1471]
-
-Wed Nov  2 07:34:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_num_coerce_bit): enable bit operations with
-	  coercing by non-integer object.  [ruby-core:77783] [Bug #12875]
-
-Tue Nov  1 01:31:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_cv_func_round): round(3) in x86_64-w64-mingw32
-	  is not accurate in an edge case.  [ruby-core:77794] [Bug #12878]
-
-Mon Oct 31 17:36:04 2016  Code Ahss  <aycabta@gmail.com>
-
-	* test/test_forwardable.rb (TestForwardable#test_on_private_method):
-	  add test for [Bug #12782] [Bug #12840]
-
-Mon Oct 31 11:08:51 2016  Samuel Williams  <samuel.williams@oriontransfer.co.nz>
-
-	* lib/uri/generic.rb (URI::Generic#merge): merge merge0.
-	  [GH-1469]
-
-Sun Oct 30 15:32:43 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update
-	  rubygems to 2.6.8.
-	  Release note of 2.6.8: https://github.com/rubygems/rubygems/commit/9fb8880976f5ab998912898b091d88aa10eb1d4a
-
-Sun Oct 30 06:39:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1254.c: Fix typo. Reported by k-takata at
-	  https://github.com/k-takata/Onigmo/commit/ceb59cc. Thanks!
-
-Sat Oct 29 19:59:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (cond0): !-operator is a method call, no warning for
-	  literal in condition.  [ruby-core:77801] [Bug #12881]
-
-Sat Oct 29 10:09:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): turn flip-flop in a not-operator
-	  into a boolean value.  fix up r56315
-
-Sat Oct 29 09:39:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (vm_call0_body): follow the original class, not to
-	  loop the prepended module.  [ruby-core:77784] [Bug #12876]
-
-Sat Oct 29 00:14:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/windows-1255-tbl.rb: update mapping from 0xCA to
-	  U+05BA.  [Feature #12877]
-
-Fri Oct 28 23:22:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/depend: extract transcode_tblgen method calls for libraries
-	  loaded by dynamically generated names, in single_byte.trans.
-
-Fri Oct 28 16:05:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* insns.def (opt_case_dispatch): extract float value only if the
-	  Float method is not redefined.
-
-Fri Oct 28 15:58:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (RB_OBJ_BUILTIN_TYPE): special-const safe
-	  BUILTIN_TYPE.
-
-Fri Oct 28 15:20:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* complex.c (id_finite_p, id_infinite_p, id_rationalize, id_PI):
-	  initialize static IDs.
-
-	* complex.c (FINITE_TYPE_P): extract predicate.
-
-	* complex.c (rb_complex_finite_p, rb_complex_infinite_p): use
-	  dedicated predicates instead of switch by TYPE.
-
-Thu Oct 27 23:28:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_integer_type_p): turn into macro to help
-	  clang based on old gcc to eliminate CSE.
-
-Thu Oct 27 16:33:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (rel): check the exception and show right
-	  message.
-
-Thu Oct 27 14:57:33 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/socket/lib/socket.rb (UDPSocket#recvfrom_nonblock): [DOC] Remove
-	  a false statement "If _maxlen_ is omitted, its default value is
-	  65536." maxlen, the first parameter, cannot be omitted as the method
-	  signature indicates. This hasn't changed ever since it was first
-	  implemented.
-
-Thu Oct 27 09:42:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_convert_to_integer): convert a fixable float to a
-	  fixnum directly without the conversion method, as well as bignum
-	  case.
-
-	* object.c (rb_convert_to_integer): should not drop the converted
-	  string.
-
-Wed Oct 26 17:09:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_intern): use prefixed version macro
-	  RUBY_CONST_ID_CACHE.
-
-Wed Oct 26 11:28:25 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* NEWS: added several entries which (if I remember correctly) are
-	  added in a year.
-
-Tue Oct 25 12:54:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (mnew_internal): follow the original class, not to loop
-	  the prepended module.  [ruby-core:77591] [Bug #12832]
-
-Mon Oct 24 10:52:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Test::Unit::Parallel#deal): update the
-	  job status after a task finished, to show idling workers.
-
-Mon Oct 24 10:51:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* complex.c (Init_Complex): undefine methods inherited from
-	  Comparable, because Complex does not have <=> method.
-	  [Bug #12866]
-
-	* class.c (rb_undef_methods_from): undefine methods defined in
-	  super from klass.
-
-Mon Oct 24 10:19:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* complex.c (Init_Complex): undefine Complex#clamp, which does not
-	  work like other Comparable methods, because Complex does not
-	  have <=> method.  patched by Tim Peters <zomg.tim AT gmail.com>
-	  in [ruby-core:77720].  [Bug #12866]
-
-Sun Oct 23 11:41:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/encoding.h: include "ruby/ruby.h" explicitly for
-	  enum ruby_fl_type and VALUE.
-
-Sat Oct 22 23:33:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_compile_gen): always append error message to the
-	  error buffer.
-
-Sat Oct 22 22:33:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_funcall1): check recursion by inverse pair, to
-	  fix fake infinite recursion.  [ruby-core:77713] [Bug #12864]
-
-Sat Oct 22 18:52:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_compact_bang): should return nil if no elements
-	  is deleted.  [ruby-core:77709] [Bug #12863]
-
-Sat Oct 22 10:28:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (DLDFLAGS): fallback to LDFLAGS.
-	  [ruby-core:72444] [Bug #11863]
-
-	* configure.in (LIBRUBY_DLDFLAGS): fallback to DLDFLAGS.
-
-	* configure.in (RUBY_APPEND_OPTION, RUBY_PREPEND_OPTION): expand
-	  the option to be appended/prepended when matching, as well as
-	  RUBY_APPEND_OPTIONS and  RUBY_PREPEND_OPTIONS.
-
-Sat Oct 22 09:52:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args): duplicate splatting array if more
-	  arguments present to obey left-to-right execution order.
-	  [ruby-core:77701] [Bug# 12860]
-
-Fri Oct 21 16:44:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (do_opendir): retry after GC when the limit for open file
-	  descriptors reached.
-
-Fri Oct 21 16:06:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (open_load_file): retry after GC when the limit for open
-	  file descriptors reached.
-
-Fri Oct 21 11:34:17 2016  Pascal Schmid  <Lechindianer@users.noreply.github.com>
-
-	* string.c (rb_str_sub, rb_str_gsub): [DOC] 'backlash' should read
-	  'backslash'.  [Fix GH-1461]
-
-Thu Oct 20 17:02:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/uri/common.rb: added documentation for deprecated method.
-	  [Misc #11960][ruby-core:72733][ci skip]
-
-Thu Oct 20 16:57:23 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/digest/digest.c: Add documentation for Digest.
-	  [Feature #10452][ruby-core:66001][ci skip]
-	  * remove HMAC from list of digest algorithms,
-	  * add MD5 in list of digest algorithms,
-	  * add information about writing a C digest implementation using Digest::Base,
-	  * add documentation for Digest::Base public methods.
-	* ext/digest/md5/md5init.c: add examples for MD5.
-	* ext/digest/rmd160/rmd160init.c: add examples for Digest::RMD160.
-	* ext/digest/sha1/sha1init.c: add examples for Digest::SHA1.
-
-Thu Oct 20 16:19:51 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/open-uri.rb: Improved documentation grammar for
-	  open-uri#open option. [Misc #11329][ruby-core:69868][ci skip]
-
-Wed Oct 19 21:48:40 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention refinements with Kernel#send and
-	  BasicObject#__send__.  [Feature #11476]
-
-Wed Oct 19 17:02:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_call_opt_send): enable refinements with
-	  Kernel#send and BasicObject#__send__.  [Feature #11476]
-
-Wed Oct 19 14:22:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* basictest/runner.rb: do not clobber the option by --run-opt with
-	  RUBYOPT.  reported by Allen Hewes <rallenh AT hotmail.com>.
-
-Wed Oct 19 00:09:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* addr2line.c (parse_debug_line_cu): boundary checks for
-	  compressed debug sections.  [ruby-dev:49840] [Bug #12850]
-
-Tue Oct 18 16:36:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (DLDFLAGS): append --compress-debug-sections=zlib
-	  if available, which reduces the size of LIBRUBY_SO by half or
-	  more.
-
-Mon Oct 17 16:20:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/configure.bat: add option to enable/disable to install
-	  static ruby library.  defaulted to "no".  [Feature #12845]
-
-	* configure.in (install-static-library): add option to enable/
-	  disable to install static ruby library.  defaulted to "no" if
-	  enable-shared.  [Feature #12845]
-
-	* tool/rbinstall.rb (local-arch-lib): respect the option.
-
-Sun Oct 16 15:09:06 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1254.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for Windows-1254.
-
-Sat Oct 15 14:17:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_args.c (refine_sym_proc_call): search and call method with
-	  refinements.
-
-	* vm_args.c (vm_caller_setup_arg_block): enable refinements when
-	  enabled in the caller.  [Feature #9451]
-
-Sat Oct 15 00:54:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_exec_cmd): use UTF-8 version aspawn.
-	  [ruby-dev:49838] [Bug #12841]
-
-Fri Oct 14 22:26:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse/kwargs.rb (OptionParser#define_by_keywords):
-	  [EXPERIMENTAL] extract command line option definitions from the
-	  information of keyword arguments.
-
-Fri Oct 14 18:27:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* object.c: Improve documentation for Float conversion.
-	  [ruby-core:71661][Bug #11736][ci skip]
-
-Fri Oct 14 18:00:20 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/logger.rb: Improve Logger.new option documentation.
-	  [Feature #12803][ruby-core:77467]
-
-Fri Oct 14 17:20:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (make_switch, parse_in_order): unify underscores
-	  to hyphens.
-
-Fri Oct 14 10:48:37 2016  Eric Wong  <e@80x24.org>
-
-	* lib/webrick/utils.rb (TimeoutHandler): use monotonic clock
-	  (watch): ditto
-
-Thu Oct 13 19:41:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (copy_stream_body): use IO to write to copy to duplex IO.
-	  http://twitter.com/knu/status/786505317974585344
-
-Thu Oct 13 17:05:57 2016  Dwain Faithfull  <dwfaithfull@gmail.com>
-
-	* hash.c (rb_hash_compact, rb_hash_compact_bang): Removes nil
-	  values from the original hash, to port Active Support behavior.
-	  [Feature #11818]
-
-Thu Oct 13 11:35:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang, rb_ary_sort, rb_ary_sort_by_bang):
-	  [DOC] describe that sort may not be stable.
-
-	* enum.c (enum_sort, enum_sort_by): ditto.
-
-Thu Oct 13 11:31:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rexml/xpath/test_text.rb (test_ancestors): Array#sort may
-	  not be stable.  [ruby-core:76088] [Bug #12509]
-
-	* test/rss/test_maker_{0.9,1.0,2.0}.rb (test_items): ditto.
-
-Thu Oct 13 10:37:31 2016  Eric Wong  <e@80x24.org>
-
-	* doc/extension.rdoc: wording fix
-
-Thu Oct 13 00:39:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_array.rb (test_sort_bang_with_freeze): make a
-	  clone to copy a <=> singleton method, instead of dup.  which
-	  element will be called is not predictable.
-	  [ruby-core:76088] [Bug #12509]
-
-Thu Oct 13 00:21:27 2016  Simon Soriano  <simon0191@gmail.com>
-
-	* doc/extension.rdoc: Replace "You can defined hooked variables"
-	  with "You can define hooked variables". [Fix GH-1460]
-
-Wed Oct 12 21:05:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (open_load_file): revert r56385.  it introduced incompatibility
-	  about `DATA.binmode?`.
-
-Wed Oct 12 15:24:53 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* tool/downloader.rb: Removed verification of gem certification.
-	  Because signed gem is not working on rubygems ecosystem.
-	* tool/gem-unpack.rb: ditto.
-
-Tue Oct 11 22:08:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (prep_io): fix typo of struct member name.
-	  [ruby-core:77550] [Bug #12829]
-
-Tue Oct 11 16:45:24 2016  Tanaka Akira  <akr@fsij.org>
-
-	* lib/uri/generic.rb (URI.find_proxy): Add an optional argument, env.
-
-Tue Oct 11 16:38:32 2016  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pp.rb (String#pretty_print): Defined to print a string as
-	  multiple lines.
-	  [ruby-core:76800] [Feature#12664] proposed by Petr Chalupa.
-
-Mon Oct 10 15:22:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (open_load_file): bind the open fd to an IO instance
-	  before waiting FIFO, not to leak the fd if interrupted.
-
-Mon Oct 10 12:40:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (open_load_file): compare with EXEEXT instead of hard
-	  coded name, and do not match with mere EXEEXT.
-
-	* ruby.c (open_load_file): open in binary mode if available, as
-	  parser deals with EOLs.
-
-	* io.c (prep_io): reduce isatty call (and its system call) on
-	  Cygwin.
-
-Sun Oct  9 23:05:53 2016  Prathamesh Sonpatki  <csonpatki@gmail.com>
-
-	* array.c, class.c: Fixed documentation where Fixnum was referred
-	  directly to use Integer, as Fixnum and Bignum are now unified
-	  into Integer and direct usage is deprecated.  [Fix GH-1459]
-
-Sun Oct  9 11:37:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (VM_ASSERT): stringify expr here before expansion in
-	  RUBY_ASSERT_WHEN.
-
-Sat Oct  8 10:54:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/memory_status/memory_status.c (read_status): use
-	  Win32 GetProcessMemoryInfo API.
-
-	* ext/-test-/memory_status/memory_status.c: get memory sizes by
-	  mach task_info system call.
-
-Sat Oct  8 09:06:55 2016  Aurelien Jacobs  <aurel@gnuage.org>
-
-	* lib/logger.rb (Logger::Period#next_rotate_time): fix monthly log
-	  rotate when DST is applied during a month of 31 days.
-	  [Fix GH-1458]
-
-Fri Oct  7 20:21:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (gc_prof_setup_new_record): fix the condition to get
-	  rusage.
-
-	* gc.c (gc_profile_dump_major_reason): remove undefined flags.
-
-Fri Oct  7 19:18:33 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/*.c, ext/win32ole/win32ole.h: use RB_INT2FIX instead of
-	  INT2FIX, and so on.
-
-Fri Oct  7 14:18:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* basictest/test.rb: Adjust spaces in class declarations
-	  with inheritance. [fix GH-1227] Patch by @adrfer
-	* lib/irb/*: ditto.
-	* lib/prime.rb: ditto.
-	* lib/shell/builtin-command.rb: ditto.
-	* object.c: ditto.
-	* sample/*.rb: ditto.
-	* test/-ext-/method/test_arity.rb: ditto.
-
-Thu Oct  6 17:29:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_require_safe): SyntaxError created by the parser just
-	  has the message and needs to set up the backtrace.
-	  [ruby-core:77491] [Bug #12811]
-
-	* load.c (rb_load_internal0): load/require is not the main
-	  script.
-
-Thu Oct  6 13:35:15 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* enum.c: [DOC] Improve doc [ci-skip]
-
-Thu Oct  6 11:38:14 2016  Chris Jones  <chris@christopherjones.us>
-
-	* ext/readline/extconf.rb: Update error message with correct words.
-	  [fix GH-1453][ci skip] Patch by @magikid
-
-Thu Oct  6 11:01:49 2016  Tieg Zaharia  <tieg.zaharia@gmail.com>
-
-	* lib/uri/common.rb (WEB_ENCODINGS_): Update URI::WEB_ENCODINGS_
-	  hash, and fix documented command to grab it.  [Fix GH-1430]
-
-Thu Oct  6 10:37:13 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enum.c: Add reduce/inject alias note.
-	  [fix GH-1400][ci skip] Patch by @getaaron
-
-Thu Oct  6 10:30:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (update_coverage): check coverage values, and ignore
-	  non-fixnum values.
-
-Thu Oct  6 09:19:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fptr_finalize): use dedicated macro RB_INTEGER_TYPE_P.
-
-Wed Oct  5 18:02:44 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http/response.rb: Improve document readability.
-	  [fix GH-1411][ci skip] Patch by @stz-seongheon
-
-Wed Oct  5 15:43:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (dump_node): flatten statements in NODE_BLOCK.
-
-Wed Oct  5 14:27:36 2016  Byron Bowerman  <me@bm5k.com>
-
-	* range.c: Add docs for max/min behavior with exclusive range.
-	  [fix GH-1433][ci skip] Patch by @BM5k
-
-Wed Oct  5 12:57:21 2016  Richard Schneeman  <richard.schneeman+foo@gmail.com>
-
-	* ext/socket/*.c: Add proper require for example to work.
-	  [fix GH-1378][ci skip] Patch by @schneems
-
-Wed Oct  5 11:47:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* io.c: Fixed equivalent ruby code with core implemention.
-	  [fix GH-1429][ci skip] Patch by @sos4nt
-
-Wed Oct  5 11:36:21 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/delegate.rb: Added missing spaces and Removed needless spaces.
-	  [fix GH-1454][ci skip] Patch by @bogdanvlviv
-
-Wed Oct  5 03:24:55 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* enum.c: Make Enumerable#chunk with no block return
-	  an Enumerator [#2172]
-
-Wed Oct  5 01:19:45 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* internal.h (ST2FIX): new macro to convert st_index_t to Fixnum.
-	  a hash value of Object might be Bignum, but it causes many troubles
-	  especially the Object is used as a key of a hash.  so I've gave up
-	  to do so.
-
-	* array.c (rb_ary_hash): use above macro.
-
-	* bignum.c (rb_big_hash): ditto.
-
-	* hash.c (rb_obj_hash, rb_hash_hash): ditto.
-
-	* numeric.c (rb_dbl_hash): ditto.
-
-	* proc.c (proc_hash): ditto.
-
-	* re.c (rb_reg_hash, match_hash): ditto.
-
-	* string.c (rb_str_hash_m): ditto.
-
-Tue Oct  4 12:59:44 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* array.c (rb_ary_dig): [DOC] update an example of error message
-	  by Array#dig, because of Integer Unification.  [Fix GH-1455]
-
-Tue Oct  4 09:55:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2): need more room
-	  for precision to round.  [ruby-core:77475] [Bug #12805]
-
-Tue Oct  4 06:05:46 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (onig_print_compiled_byte_code): make the shown address
-	  look relative.
-
-Tue Oct  4 05:53:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regexec.c (OPCODE_EXEC_HOOK): op is p-1 because p is already
-	  incremented.
-
-	* regexec.c (OPCODE_EXEC_HOOK): use the exact end address.
-
-	* regexec.c (match_at): don't call OPCODE_EXEC_HOOK in CASE()
-	  when it comes from goto fail.
-
-Mon Oct  3 21:24:41 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention Readline.quoting_detection_proc{,=}.
-
-Mon Oct  3 21:19:46 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/logger.rb: [DOC] Fix default value of shift_age.
-
-Mon Oct  3 17:20:05 2016  George Brocklehurst  <ruby@georgebrock.com>
-
-	* ext/readline/readline.c (readline_s_set_quoting_detection_proc):
-	  support rl_char_is_quoted_p.  [Feature #12659]
-
-	* ext/readline/readline.c (readline_s_get_quoting_detection_proc):
-	  ditto.
-
-Sun Oct  2 08:22:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_INT2FIX, RB_LONG2FIX): prefix RB to
-	  global symbols to get rid of name conflicts with other headers.
-
-Sun Oct  2 07:51:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_hash_m): hash values may be negative.
-
-Sun Oct  2 02:04:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_hash_m): st_index_t is not guaranteed as the same
-	  size with int, and of course also not guaranteed the value can be
-	  Fixnum.
-
-Sun Oct  2 02:03:06 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (rb_fix2str): detect unnormalized Fixnum value.
-
-Sat Oct  1 23:08:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/date/date_parse.c (date_zone_to_diff): it's nonsence and really
-	  harm that to use unary minus operator with unsigned value.
-	  get rid of test failures introduced at r56312.
-
-Sat Oct  1 22:17:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): move numeric literal range
-	  optimization from fixup_nodes() in parse.y.
-
-Sat Oct  1 19:19:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_flip_flop): simplify generated code.
-
-	* compile.c (compile_branch_condition): flip-flop can appear only
-	  in conditional expressions.
-
-Sat Oct  1 02:02:02 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (poll_child_status): rb_w32_wait_events_blocking() sets
-	  errno internally, then should not set it here.
-
-Fri Sep 30 19:06:21 2016  Anton Davydov  <mail@davydovanton.com>
-
-	* lib/uri/http.rb: Documentation and code style improvements.
-	* test/uri/test_http.rb: Added test for coverage.
-	  [fix GH-1427][ruby-core:77255][Misc #12756]
-
-Fri Sep 30 18:43:20 2016  Jason Yeo  <jason@jasonyeo.me>
-
-	* doc/syntax/control_expressions.rdoc: Add missing 'as'
-	  [ci skip][fix GH-1448] Patch by @jsyeo
-
-Thu Sep 29 23:38:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/yaml/store.rb (YAML::Store#dump): use table argument instead
-	  of @table directly.
-
-Thu Sep 29 22:22:22 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/yaml/store.rb (YAML::Store#initialize): Fix arguments.
-	  [ruby-dev:49821] [Bug #12800]
-
-	* test/yaml/test_store.rb: Add tests from test/test_pstore.rb.
-
-	* test/yaml/test_store.rb (YAMLStoreTest#test_with_options): Add options test.
-
-	* lib/yaml/store.rb (YAML::Store#dump): Revert to to_yaml.
-
-	* lib/yaml/store.rb (YAML::Store#empty_marshal_data): Use to_yaml with options.
-
-	* lib/yaml/store.rb (YAML::Store#empty_marshal_checksum): Use CHECKSUM_ALGO.
-
-Thu Sep 29 19:34:23 2016  Pete Higgins  <pete@peterhiggins.org>
-
-	* thread_sync.c (rb_queue_pop, rb_szqueue_push, rb_szqueue_pop):
-	  Document exception types, ThreadError, raised by Queue and
-	  SizedQueue.  [Fix GH-1451]
-
-Thu Sep 29 19:21:02 2016  Pete Higgins  <pete@peterhiggins.org>
-
-	* thread_sync.c (Init_thread_sync): Remove confusing doc comments,
-	  which are picked up by rdoc unexpectedly, from Queue and
-	  SizedQueue.  [Fix GH-1450]
-
-Wed Sep 28 23:14:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pstore.rb (PStore::CHECKSUM_ALGO): find available hashing
-	  algorithm for checksum.  MD5 is not available in FIPS mode.
-	  [Feature #6943]
-
-Wed Sep 28 13:00:25 2016  ksss  <co000ri@gmail.com>
-
-	* signal.c (sig_signame): [DOC] Add documentation in the case of
-	  return nil.  [Fix GH-1449]
-
-Wed Sep 28 10:43:27 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* .travis.yml: delete comments. They were outdated.
-
-Wed Sep 28 09:57:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update
-	  rubygems to 2.6.7.
-	  Release note of 2.6.7: https://github.com/rubygems/rubygems/commit/60f35bd1d2359fc30301d2d4cd72bc6833e8d12a
-
-Wed Sep 28 00:21:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_warning_s_warn): the argument must be an
-	  ASCII-compatible string.  [ruby-core:77430] [Bug #12793]
-
-Tue Sep 27 23:22:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (symbol, dsym, parser_set_number_literal): set state to
-	  ENDARG, so that `do` after a literal should be `do_block` and
-	  bound to the outer method.  [ruby-core:72482] [Bug #11873]
-
-	* parse.y (parse_ident): revert r56198.
-
-	* parse.y (warn_balanced): the state of symbol and numeric
-	  literals is now EXPR_ENDARG, do not exclude it.
-
-Tue Sep 27 22:59:42 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* NEWS: news about Warning.warn.
-
-Tue Sep 27 18:10:18 2016  Jeremy Evans <code@jeremyevans.net>
-
-	* error.c: This makes all warnings raised call Warning.warn, which
-	  by default does the same thing it does currently
-	  (rb_write_error_str).  You can override Warning.warn to change
-	  the behavior. [ruby-core:75016] [Feature #12299]
-
-Tue Sep 27 17:35:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (iseqw_s_compile_file): deal with syntax error as well as
-	  compile, and should not abort when rescued.
-
-Tue Sep 27 12:07:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/cgi/cookie.rb (parse): don't allow , as a separator. [Bug #12791]
-
-	* lib/webrick/cookie.rb (parse): ditto.
-
-Mon Sep 26 21:37:21 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* man/erb.1, man/irb.1, man/ri.1, man/ruby.1: Remove Ns before
-	  punctuation.
-
-Mon Sep 26 16:23:49 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/stringio/stringio.c (strio_seek): Avoid signed integer overflow.
-	  It's not harmful in practice here, but is still undefined behavior.
-
-	* ext/stringio/stringio.c (strio_extend): Check that the new length does
-	  not exceed LONG_MAX. This fixes the invalid write on the overflow.
-
-	* test/stringio/test_stringio.rb (test_write_integer_overflow): Add a
-	  test case for the above fix in strio_extend().
-
-Mon Sep 26 15:43:34 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* eval_intern.h (TH_PUSH_TAG): Initialize struct rb_vm_tag::tag with
-	  Qundef rather than 0 which is equal to Qfalse. Since Kernel#throw(obj)
-	  searches a tag with rb_vm_tag::tag == obj, throw(false) can
-	  accidentally find an unrelated tag which is not created by
-	  Kernel#catch.  [ruby-core:77229] [Bug #12743]
-
-	* test/ruby/test_exception.rb (test_throw_false): Add a test case for
-	  this.
-
-Mon Sep 26 14:36:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/tempfile.rb: provide default basename parameter for
-	  Tempfile.create. [Feature #11965] Patch by Yuki Kurihara
-	* test/test_tempfile.rb: ditto.
-
-Mon Sep 26 14:10:54 2016  Ary Borenszweig  <ary@esperanto.org.ar>
-
-	* string.c (lstrip_offset): add a fast path in the case of single
-	  byte optimizable strings, as well as rstrip_offset.
-	  [ruby-core:77392] [Feature #12788]
-
-Mon Sep 26 12:00:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gems/bundled_gems: update to minitest-5.9.1.
-
-Mon Sep 26 11:50:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* tool/rbinstall.rb (gem): Don't install gemspec if no files will be
-	  installed for the gem. This happens when the extension library is not
-	  compiled.
-
-Mon Sep 26 11:06:47 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* string.c (enc_strlen, rb_enc_strlen_cr): Avoid signed integer
-	  overflow. The result type of a pointer subtraction may have the same
-	  size as long. This fixes String#size returning an negative value on
-	  i686-linux environment:
-
-	    str = "\x00" * ((1<<31)-2))
-	    str.slice!(-3, 3)
-	    str.force_encoding("UTF-32BE")
-	    str << 1234
-	    p str.size
-
-Sun Sep 25 22:48:06 2016  namusyaka  <namusyaka@gmail.com>
-
-	* lib/erb.rb (ERB::Compiler::TrimScanner#stag): The :stag accessor
-	  has already been available because it is defined in parent
-	  Scanner class.  [Fix GH-1445]
-
-Sun Sep 25 19:21:26 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* node.c (dump_array): remove duplicate header of NODE_ARRAY/
-	  NODE_VALUES.
-
-Sat Sep 24 22:26:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extract_makefile, extmake, configuration): store
-	  extra libraries to be installed.
-
-	* tool/rbinstall.rb (ext-arch): install extra libraries.
-
-	* ext/zlib/extconf.rb: install zlib if built.
-
-Sat Sep 24 14:24:55 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* spec/README: update URL.
-
-Sat Sep 24 11:28:22 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* fix typos, "a" before "Integer" to "an".  [Fix GH-1438]
-
-Sat Sep 24 10:19:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/misc/test_ruby_mode.rb (assert_indent): since write-region
-	  in Emacs 25.1 no longer displays the "Wrote file" message, shows
-	  the explicit message to check if successfully finished.
-	  [ruby-core:77355] [Bug #12785]
-
-	* test/misc/test_ruby_mode.rb (EXPR_SAVE): use a numeric prefix
-	  argument of 0, not to make the previous version into a backup
-	  file, instead of backup-inhibited.
-
-	* test/misc/test_ruby_mode.rb (run_emacs): always save the buffer
-	  if modified.
-
-Fri Sep 23 23:57:40 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_method.c (make_method_entry_refined): fix wrong use of ||.
-
-Fri Sep 23 21:38:58 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* tool/mdoc2man.rb (Mdoc2Man#parse_macro): Add support for the
-	  `Lk` macro.
-
-	* tool/mdoc2man.rb (Mdoc2Man#shift_arg): A new function to extract
-	  a possibly quoted argument.
-
-Fri Sep 23 20:36:05 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_mod_refine): refine modules as well.
-	  [ruby-core:76199] [Feature #12534]
-
-Fri Sep 23 20:19:09 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* man/ruby.1: Update the paragraphs in "Rich Libraries" which
-	  included a dead link.
-
-Fri Sep 23 20:05:27 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* man/ruby.1, man/erb.1, man/irb.1, man/ri.1: Use the `Lk` macro
-	  for hyperlinks, which has been available since mdocml 1.5.1
-	  (released more than seven years ago).
-
-Fri Sep 23 15:47:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): allow private methods to
-	  be delegated, with warnings.  [ruby-core:77341] [Bug #12782]
-
-Fri Sep 23 12:15:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): enable tail call
-	  optimization inside a conditional block.
-
-Thu Sep 22 13:00:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* gc.c (gc_start_internal): [DOC] methods without arguments
-	  like r56194. [Bug #12777]
-
-Wed Sep 21 17:43:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (InitVM_process): Support CLOCK_MONOTONIC_RAW_APPROX,
-	  CLOCK_UPTIME_RAW, and CLOCK_UPTIME_RAW_APPROX which are introduced
-	  by macOS 10.12.
-
-Wed Sep 21 13:47:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (brace_body, do_body): preserve cmdarg_stack so that
-	  `do` after cmdarg in a block should be `do_block` and bound to
-	  the outer method.  [ruby-core:72482] [Bug #11873]
-
-	* parse.y: `do` after cmdarg in parentheses should be `do_block`
-	  and bound to the outer method.  [ruby-core:72482] [Bug #11873]
-
-	* parse.y (brace_body, do_body): extract block bodies.
-
-Tue Sep 20 23:02:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (gc_start_internal): [DOC] add ObjectSpace.garbage_collect
-	  and fix GC#garbage_collect.  [Bug #12777]
-
-Tue Sep 20 21:24:01 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* doc/extension.ja.rdoc: translate r56189 (rb_gc_adjust_memory_usage).
-
-Tue Sep 20 17:52:28 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update rake-11.3.0
-
-Tue Sep 20 16:52:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_gc_adjust_memory_usage): notify memory usage to the GC
-	  engine by extension libraries, to trigger GC.  [Feature #12690]
-
-Mon Sep 19 17:05:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (Init_Numeric), bignum.c (Init_Bignum): deprecate
-	  Fixnum and Bignum.  this may be reverted after previews.
-	  [Feature #12739]
-
-Mon Sep 19 10:36:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (lazy_init_yielder): directly call stored functions.
-	  [Feature #6183]
-
-	* enumerator.c (lazy_add_method): create lazy enumerator which
-	  uses lazy_init_yielder().
-
-Sun Sep 18 22:48:54 2016  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::BaseModel): Remove needless codes.
-	  [Bug #12773][ruby-dev:49813]
-	  Reported by Kazuhiro NISHIYAMA. Thanks!!!
-
-Sun Sep 18 19:23:47 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/sync.rb: Fix NameError when error.
-
-Sat Sep 17 22:46:02 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* vm_insnhelper.c (vm_throw_start): Remove too much ";"
-	  [fix GH-1432]
-
-Sat Sep 17 19:19:06 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/openssl/test_ssl.rb (test_ctx_options): Fix test failure on
-	  Ubuntu 16.04. The fix in r56147 was incomplete. This is a cherry-pick
-	  of the commit b039f3e268c2 at ruby/openssl.
-
-Sat Sep 17 10:49:35 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* doc/extension.ja.rdoc: translate r56130 (rb_check_arity).
-
-Sat Sep 17 02:40:52 2016  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* ext/objspace/objspace_dump.c: Fix stream processing support for heap
-	  dumps. Full heap dumps should use JSON lines (http://jsonlines.org)
-	  so that we can process very large heaps without loading the entire
-	  heap dump in to memory at once.
-
-Fri Sep 16 22:10:31 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): Fix compile error
-	  with old version of fcc (Fujitsu C Compiler) on Solaris 10.
-	  [Bug #12769] [ruby-dev:49809]
-
-Fri Sep 16 21:28:25 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* internal.h (MAYBE_UNUSED): The fallback definition is needed.
-	  Fix compile error with some non-GCC compilers such as
-	  Oracle Solaris Studio 12.3 on Solaris 10.
-	  [Bug #12767] [ruby-dev:49807]
-
-	* internal.h (WARN_UNUSED_RESULT): ditto.
-
-Fri Sep 16 21:19:51 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* hash.c (each_pair_i_fast): Fix compile error with old version of
-	  fcc on Solaris 10. [Bug #12768] [ruby-dev:49808]
-
-Fri Sep 16 19:46:05 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.h): fixed compile error with VC introduced
-	  by previous commit.
-
-Fri Sep 16 14:54:34 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* internal.h (WARN_UNUSED_RESULT): moved to configure.in, to
-	  actually check its availability rather to check GCC's version.
-
-	* configure.in (WARN_UNUSED_RESULT): moved to here.
-
-	* configure.in (RUBY_FUNC_ATTRIBUTE): change function declaration
-	  to return int rather than void, because it makes no sense for a
-	  warn_unused_result attributed function to return void.
-
-	  Funny thing however is that it also makes no sense for noreturn
-	  attributed function to return int.  So there is a fundamental
-	  conflict between them.  While I tested this, I confirmed both
-	  GCC 6 and Clang 3.8 prefers int over void to correctly detect
-	  necessary attributes under this setup.  Maybe subject to change
-	  in future.
-
-	* internal.h (UNINITIALIZED_VAR): renamed to MAYBE_UNUSED, then
-	  moved to configure.in for the same reason we move
-	  WARN_UNUSED_RESULT.
-
-	* configure.in (MAYBE_UNUSED): moved to here.
-
-	* internal.h (__has_attribute): deleted, because it has no use now.
-
-	* string.c (rb_str_enumerate_lines): refactor macro rename.
-
-	* string.c (rb_str_enumerate_bytes): ditto.
-
-	* string.c (rb_str_enumerate_chars): ditto.
-
-	* string.c (rb_str_enumerate_codepoints): ditto.
-
-	* thread.c (do_select): ditto.
-
-	* vm_backtrace.c (rb_debug_inspector_open): ditto.
-
-	* vsnprintf.c (BSD_vfprintf): ditto.
-
-Fri Sep 16 14:35:55 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* ChangeLog (add-log-time-format): Not exactly sure when but
-	  recently (25.x maybe), emacs changed its API to take optional
-	  two arguments.  We have to follow that.
-
-Fri Sep 16 06:43:25 2016  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* lib/uri/generic.rb (def check_password): don't include bad password
-	  in URI exception output
-
-	* test/uri/test_generic.rb (def test_set_component): test for behavior
-
-Thu Sep 15 21:40:03 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* doc/extension.ja.rdoc: Fix file name.
-
-Thu Sep 15 00:59:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* benchmark/: add vnmakarov's benchmarks around hash [ruby-core:75265]
-
-Wed Sep 14 07:02:31 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* hash.c (each_pair_i_fast): use rb_yield_values2 to avoid var args.
-
-Tue Sep 13 21:32:54 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* string.c (STR_HEAP_SIZE, RESIZE_CAPA_TERM, str_new0, rb_str_buf_new,
-	  str_shared_replace, rb_str_init, str_make_independent_expand,
-	  rb_str_resize): Avoid overflow by casting the length to size_t. size_t
-	  should be able to represent LONG_MAX+termlen.
-
-	* string.c (rb_str_modify_expand): Check that the new length is in the
-	  range of long before resizing. Also refactor to use RESIZE_CAPA_TERM
-	  macro.
-
-	* string.c (str_buf_cat): Fix so that it does not create a negative
-	  length String. Also fix the condition for 'string sizes too big', the
-	  total length can be up to LONG_MAX.
-
-	* string.c (rb_str_plus): Check the resulting String length does not
-	  exceed LONG_MAX.
-
-	* string.c (rb_str_dump): Fix integer overflow. The dump result will be
-	  longer then the original String.
-
-Tue Sep 13 21:30:53 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* gc.c (heap_extend_pages, get_envparam_size, ruby_malloc_size_overflow,
-	  gc_profile_dump_on): Use PRIuSIZE instead of PRIdSIZE as the passed
-	  value is size_t, not ssize_t.
-
-	* iseq.c (get_line_info, rb_iseq_disasm_insn): Ditto.
-
-	* sprintf.c (rb_str_format): Ditto.
-
-	* thread_win32.c (native_thread_create): Ditto.
-
-	* vm.c (get_param): Ditto.
-
-	* ext/objspace/objspace_dump.c (dump_append_string_content,
-	  dump_object): Ditto.
-
-	* ext/socket/raddrinfo.c (host_str, port_str): Ditto.
-
-Tue Sep 13 21:27:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* string.c (STR_EMBEDDABLE_P): Renamed from STR_EMBEDABLE_P(). And use
-	  it in more places.
-
-Tue Sep 13 21:23:51 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* README.md: Drop support for BeOS now that Haiku is stable since
-	  2.3.0.
-
-	* README.ja.md: ditto.
-
-Tue Sep 13 21:11:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (STR_EMBEDABLE_P): extract the predicate macro to tell
-	  if the given length is capable in an embedded string, and fix
-	  possible integer overflow.
-
-Tue Sep 13 18:37:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_exception.rb: fix thread issues.
-	  * use Queue instead of a local variable for synchronization.
-	  * join created thread to solve leaking threads warning.
-
-Tue Sep 13 16:07:26 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* string.c (rb_str_set_len): The buffer overflow check is wrong. The
-	  space for termlen is allocated outside the capacity returned by
-	  rb_str_capacity(). This fixes r41920 ("string.c: multi-byte
-	  terminator", 2013-07-11).  [ruby-core:77257] [Bug #12757]
-
-	* test/-ext-/string/test_set_len.rb (test_capacity_equals_to_new_size):
-	  Test for this change. Applying only the test will trigger [BUG].
-
-Tue Sep 13 06:03:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (benchmark): fix lib path.
-
-Tue Sep 13 00:39:47 2016  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* class.c (singleton_class_of): Copy superclass serial number to
-	  singleton class.  This improves singleton class IMC hit rates.
-	  [Feature #12364] [ruby-core:75425]
-
-Mon Sep 12 13:46:23 2016  Anton Davydov  <mail@davydovanton.com>
-
-	* lib/uri/mailto.rb: Removed needless `return` and use `.` instead of `::`
-	  with class method.
-	* test/uri/test_mailto.rb: Added tests for coverage.
-	  [fix GH-1426][Misc #12750][ruby-core:77242]
-
-Sun Sep 11 21:30:26 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: News about Module.used_modules.
-
-Sun Sep 11 19:06:49 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): should set written length as the
-	  return value.  [Bug #12748] [ruby-dev:49786]
-
-Fri Sep  9 22:43:29 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* gems/bundled_gems: sort lines.
-
-Fri Sep  9 17:59:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_threadptr_raise): set cause from the called thread,
-	  but not from the thread to be interrupted.
-	  [ruby-core:77222] [Bug #12741]
-
-Fri Sep  9 13:50:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/extension.rdoc, doc/extension.ja.rdoc: fix file name.
-	  pointed out by @takkanm in the RubyKaigi talk.
-
-Fri Sep  9 13:14:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* News: Announcing update to Unicode version 9.0.0 [ci skip]
-
-Fri Sep  9 10:10:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_const_search): warn with the actual class/module
-	  name which defines the deprecated constant.
-
-	* variable.c (rb_const_search): raise with the actual class/module
-	  name which defines the private constant.
-
-Thu Sep  8 17:47:18 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* array.c (flatten): use rb_obj_class instead of rb_class_of
-	  because rb_class_of may return a singleton class.
-	  [ruby-dev:49781] [Bug #12738]
-
-Thu Sep  8 17:40:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (gem): use the bindir of each gemspec instead
-	  of hardcoded 'bin', since rdoc 5.0.0 overrides it.
-
-Thu Sep  8 16:47:03 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
-	  Module.used_modules.  [Feature #7418] [ruby-core:49805]
-
-Thu Sep  8 14:21:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/psych.gemspec, lib/rdoc/rdoc.gemspec: Use file list instead of
-	  git output. It shows warning message when invoke `make install`
-	  [Bug #12736][ruby-dev:49778]
-
-Thu Sep  8 13:41:46 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* insns.def (setclassvariable, setconstant): warn when self is a
-	  refinement.  [Bug #10103] [ruby-core:64143]
-
-Thu Sep  8 11:29:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* hash.c (rb_hash_transform_values, rb_hash_transform_values_bang):
-	  Rename map_v to transform_values.
-	  [Feature #12512] [ruby-core:76095]
-
-	* test/ruby/test_hash.rb: ditto.
-
-Thu Sep  8 10:08:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* {ext,test}/openssl: Import Ruby/OpenSSL 2.0.0.beta.2. The full commit
-	  history since v2.0.0.beta.1 can be found at:
-	  https://github.com/ruby/openssl/compare/v2.0.0.beta.1...v2.0.0.beta.2
-
-Thu Sep  8 07:23:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2
-	  Fixed ri parse defect with left-hand matched classes.
-	  https://github.com/rdoc/rdoc/pull/420
-
-Thu Sep  8 01:12:47 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* eval.c (rb_mod_s_used_refinements): new method
-	  Module.used_refinements.  based on the patch by Charlie
-	  Somerville.  [Feature #7418] [ruby-core:49805]
-
-Wed Sep  7 17:50:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/util.h (setenv): remove POSIX-noncompliant
-	  definition with 2 arguments.
-
-Wed Sep  7 17:35:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* unicode/8.0.0/casefold.h, name2ctype.h, unicode/data/8.0.0:
-	  removing directories/files related to Unicode version 8.0.0
-
-Wed Sep  7 17:21:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout#timeout): add custom error message
-	  argument.  [Feature #11650]
-
-Wed Sep  7 17:13:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Updated Unicode version to 9.0.0 [Feature #12513]
-
-	* unicode/9.0.0/casefold.h, name2ctype.h, unicode/data/9.0.0:
-	  new directories/files for Unicode version 9.0.0
-
-Wed Sep  7 16:00:45 2016  Tanaka Akira  <akr@fsij.org>
-
-	* lib/open-uri.rb: Allow http to https redirection.
-	  Note that https to http is still forbidden.
-	  [ruby-core:20485] [Feature #859] by Roman Shterenzon.
-
-Wed Sep  7 14:56:59 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/csv.rb (CSV::{Row,Table}#{each,delete_if}): returns an enumerator
-	  if no block is given. [ruby-core:75346] [Feature #12347]
-
-	* test/csv/test_row.rb: add test for above.
-
-	* test/csv/test_table.rb: ditto.
-
-Wed Sep  7 14:50:01 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* gems/bundled_gems: update to power_assert 0.3.1.
-
-Wed Sep  7 12:16:09 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/*, test/psych/*: Update psych-2.1.1
-	  This version fixed following pull requests.
-	  https://github.com/tenderlove/psych/pull/284
-	  https://github.com/tenderlove/psych/pull/276
-
-Wed Sep  7 11:51:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta1
-	  This version is mostly same as r56072. It contains to remove code
-	  for Ruby 1.8
-
-Tue Sep  6 09:23:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc/rdoc.gemspec: partly reverted for default gem installer.
-	  upstream configuration is not working on ruby core repository.
-
-Mon Sep  5 19:35:22 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rdoc/*, test/rdoc/*: Update rdoc/rdoc master(f191513)
-	  https://github.com/rdoc/rdoc/blob/master/History.rdoc#423--2016--
-	  https://github.com/rdoc/rdoc/blob/master/History.rdoc#422--2016-02-09
-
-Sun Sep  4 00:17:55 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* proc.c: [DOC] fix Object#define_singleton_method and
-	  main.define_method return value. [ci skip]
-
-Sat Sep  3 11:28:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (ruby_init_stack): check stack bounds even if
-	  get_main_stack succeeded, on the "co-routine" case.
-	  https://github.com/ruby/ruby/commit/53953ee#commitcomment-18887413
-
-Fri Sep  2 16:06:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (MEMO_V1_SET, MEMO_V2_SET): fix typos.  use the macro
-	  parameter, not the local variable.
-
-Fri Sep  2 00:55:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (timestamp_file): move extmk.rb specific tricks
-	  from lib/mkmf.rb.  keep RUBYCOMMONDIR prefix not to conflict
-	  with a timestamp file in the toplevel.
-
-Thu Sep  1 14:24:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (gems): move dirty hacks for bundled gems from
-	  mkmf.rb.
-
-	* lib/mkmf.rb (create_makefile): yield all configuration strings.
-
-Wed Aug 31 17:39:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (create_makefile): make gem.build_complete file
-	  under TARGET_SO_DIR and install it only when the gem build
-	  succeeded.  [ruby-core:77057] [Bug #12681]
-
-Wed Aug 31 15:36:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: move TARGET_SO_DIR stuffs to mkmf.rb.
-
-	* lib/mkmf.rb (create_makefile): create target shared object files
-	  under $(TARGET_SO_DIR) which is $sodir if it is defined with
-	  $extout.  [ruby-core:77058] [Bug #12681]
-
-Wed Aug 31 01:56:55 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* doc/extension.ja.rdoc: [DOC] Fix a typo. [ci skip]
-
-Wed Aug 31 00:52:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: make the gems target directory under the expanded
-	  name.  [ruby-core:77102] [Bug #12714]
-
-Tue Aug 30 15:27:27 2016  Kouhei Yanagita  <yanagi@shakenbu.org>
-
-	* ext/json/lib/json/add/ostruct.rb (OpenStruct.json_create):
-	  Correct documentation, fix the name of values.  [Fix GH-1421]
-
-Tue Aug 30 14:53:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (nogvl_fsync, nogvl_fdatasync): on Windows, just ignore if the
-	  fd is associated to non-disk device.  if call fsync and/or fdatasync
-	  with such fds, it causes Errno::EBADF exception and the behavior is
-	  incompatible with ruby 2.1 and earlier unintentionally introduced.
-
-Tue Aug 30 03:38:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_dump.c (backtrace): use rip in the saved context for the case
-	  the SIGSEGV is received when the process is in userland.
-	  Note that ip in the stack should be used if the signal is received
-	  when it is in kernel (when it is calling syscall) [Bug #12711]
-
-Sat Aug 27 10:26:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_concat_multi): take multiple arguments.  based
-	  on the patch by Satoru Horie.  [Feature #12333]
-
-	* string.c (rb_str_concat_multi, rb_str_prepend_multi): ditto.
-
-Thu Aug 25 00:42:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (append_wstr): remove a codepage argument, and use
-	  INVALID_CODE_PAGE for conversion by econv.
-
-	* win32/file.c (append_wstr): exclude the terminator from the
-	  result length when input len == -1.
-
-Wed Aug 24 22:41:30 2016  Kouhei Sutou  <kou@cozmixng.org>
-
-	* gc.c (gc_reset_malloc_info): Remove too much ";".
-
-Wed Aug 24 20:07:57 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/defines.h (ALWAYS_INLINE): Add alternative definition.
-	  Fix compile error with compilers that do not have force inline
-	  attribute, including old version of fcc on Solaris 10.
-	  [ruby-dev:49773] [Bug #12701]
-
-Wed Aug 24 16:56:26 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* .gdbinit: follow r55766's VM change.
-
-Wed Aug 24 12:57:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_initialize, rb_class_initialize): [DOC] these
-	  methods do not invoke module_eval/class_eval, just eval the
-	  given block under the new module/class but sharing the context
-	  with the surrounding scope like those methods.
-	  [ruby-core:77023] [Bug #12696]
-
-Tue Aug 23 10:34:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/psych/test_psych.rb (test_load_file_with_fallback): fix
-	  Tempfile leak.  https://github.com/tenderlove/psych/pull/288
-
-Tue Aug 23 10:15:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_fs_setter): check and convert $; value at
-	  assignment.
-
-Tue Aug 23 02:09:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_split_m): show $; name in error message when it
-	  is a wrong object.
-
-Mon Aug 22 16:29:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/csv.rb (CSV#shift): store partial quoted strings in an array
-	  and join at last, to improve performance with very long quoted
-	  lines.  [ruby-core:76987] [Bug #12691]
-
-Mon Aug 22 14:35:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* man/irb.1: remove useless -width option.
-	  [ruby-dev:49767] [Bug #12692]
-
-Mon Aug 22 09:02:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (Init_ISeq): undefine allocator of InstructionSequence,
-	  to get rid of segfaults at method call on uninitialized object.
-
-Sat Aug 21 05:47:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sort): prevent wasteful array duplication.
-
-Sat Aug 20 11:20:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rubystub.c: generalize win32/stub.c.
-
-Fri Aug 19 11:39:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (primary): allow parenthesised statement as a method
-	  argument.  [Feature #12686]
-
-Fri Aug 19 09:12:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (vm_set_main_stack): TOPLEVEL_BINDING must be built.
-	  http://www.viva64.com/en/b/0414/#ID0EQ1CI  [ruby-core:76973]
-
-Fri Aug 19 01:00:53 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* proc.c (mnew_missing): Remove an unused argument.
-	  After r51126 rid is not used.
-
-Thu Aug 18 09:26:52 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: bump to test-unit-3.2.1
-
-Thu Aug 18 02:36:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb: skip gems which failed to build extensions.
-	  [ruby-dev:49764] [Bug #12683]
-
-Wed Aug 17 23:35:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gems/bundled_gems (tk): bump up to 0.1.1.
-
-Wed Aug 17 23:14:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: build gem extensions into separate directories
-
-	* tool/rbinstall.rb: install pre-built gem extension files gem
-	  extension directories.  [ruby-core:76931] [Bug #12681]
-
-Tue Aug 16 21:04:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (UNICODE_HDR_DIR): separate unicode header files from
-	  unicode data files.  [ruby-core:76879] [Bug #12677]
-
-Tue Aug 16 11:17:51 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* lib/net/http/header.rb: Fix typo. [ci skip][fix GH-1407]
-	* transcode.c: ditto.
-
-Tue Aug 16 11:02:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/make-snapshot (package): save generated header files from
-	  unicode data.  [ruby-core:76879] [Bug #12677]
-
-Mon Aug 15 20:31:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (dump_array): show nd_alen field in NODE_ARRAY only in
-	  the first node.  it is nd_end in the rest nodes.
-
-Mon Aug 15 16:41:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* appveyor.yml: Update libressl version to 2.3.7.
-
-Mon Aug 15 11:46:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): extension libraries in gems cannot link
-	  statically.
-
-Sun Aug 14 22:35:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* id_table.c (hash_table_extend): should not shrink the table than
-	  the previous capacity.  [ruby-core:76534] [Bug #12614]
-
-Sun Aug 14 18:51:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gems/bundled_gems: add gemified tk 0.1.0.
-	  this needs `extract-gems` to build.
-
-Sun Aug 14 14:54:14 2016  Kouhei Sutou  <kou@cozmixng.org>
-
-	* object.c (InitVM_Object): Update referenced document path.
-
-Sat Aug 13 23:08:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_funcall0, num_funcall1): get rid of infinite
-	  recursion in fallback methods of Numeric.
-
-Sat Aug 13 11:10:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (command_asgn, arg): fix syntax errors with chained
-	  assignment with op assign.  [Bug #12669]
-
-Sat Aug 13 10:52:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt, arg): rescue modifier in command op assignment
-	  should be limited to rhs only.  [ruby-core:75621] [Bug #12402]
-
-Sat Aug 13 07:51:40 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_val2variant): fix integer conversion in
-	  cygwin64.
-
-Fri Aug 12 21:05:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/config.rb (WEBrick::Config::General):
-	  disable reverse lookup by default. [ruby-core:45514] [Feature #6559]
-	  Socket.do_not_reverse_lookup is true by default but WEBrick
-	  overwrote it.
-	  patch by Eric Hodel [ruby-core:45527]
-
-Fri Aug 12 12:50:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_syntax_error_append): fix newline in syntax error
-	  message to the beginning, not after file name and line number.
-	  [Feature #11951]
-
-Thu Aug 11 16:24:23 2016  Ferdinand Niedermann  <nerdinand@nerdinand.com>
-
-	* compar.c (cmp_clamp): Introduce Comparable#clamp.  [Feature #10594]
-
-Thu Aug 11 03:16:59 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/prime.rb: Optimize prime?
-	  Adapted from patch by Jabari Zakiya [#12665]
-
-	* test/test_prime.rb: Improve test
-
-Wed Aug 10 22:37:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (command_rhs, arg_rhs): introduce new rules to reduce
-	  repeated rules with rescue modifier.
-
-Wed Aug 10 17:26:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (command_asgn): rescue modifier in command assignment
-	  should be limited to rhs only.  [ruby-core:75621] [Bug #12402]
-
-Wed Aug 10 15:35:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
-	  cygwin.  [ruby-core:76791] [Bug #12663]
-
-	* ext/win32/resolv/resolv.c (w32error_make_error): use
-	  Win32::Resolv::Error, an alias of Win32::Registry::Error.
-
-Tue Aug  9 17:50:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* hash.c (rb_hash_map_v, rb_hash_map_v_bang): implement Hash#map_v and
-	  Hash#map_v! [Feature #12512] [ruby-core:76095]
-
-	* test/ruby/test_hash.rb: add tests for above change.
-
-Tue Aug  9 16:09:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_getivar): use always_inline because
-	  gcc7 doesn't inline this without always_inline.
-
-Tue Aug  9 15:41:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/tk: Tk is removed from stdlib.  [Feature #8539]
-	  https://github.com/ruby/tk is the new upstream.
-
-Tue Aug  9 00:12:31 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* doc/maintainers.rdoc: Remove moved file section.
-
-Mon Aug  8 20:56:46 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/sample/excel1.rb, ext/win32ole/sample/excel2.rb,
-	  ext/win32ole/sample/excel3.rb, ext/win32ole/sample/ie.rb,
-	  ext/win32ole/sample/ienavi.rb, ext/win32ole/sample/ienavi2.rb: use
-	  true instead of deprecated TRUE. [ci skip]
-
-Mon Aug  8 12:51:12 2016  Zarko Todorovski <zarko@ca.ibm.com>
-
-	* internal.h (RBASIC_CLEAR_CLASS): Reroute ANSI C's strict
-	  aliasing rule.
-	  [ruby-core:74427][Bug #12191][ruby-core:76747][Bug #12657]
-
-Sun Aug  7 18:08:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (InitVM_Object): deprecate toplevel constants TRUE,
-	  FALSE, and NIL.  [Feature #12574]
-
-Sun Aug  7 06:48:21 2016  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_write_internal):
-	  avoid undefined behavior
-	* test/openssl/test_pair.rb (test_write_zero): new test
-	  [ruby-core:76751] [Bug #12660]
-
-Sat Aug  6 09:35:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* id_table.h (rb_id_table_iterator_result): add dummy sentinel
-	  member because C standard prohibits a trailing comma.
-
-Sat Aug  6 00:39:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_enc_str_new): make string for an environment
-	  variable name or value.
-
-	* hash.c (env_name_new): make environment value string with the
-	  encoding for its name.
-
-Fri Aug  5 23:18:35 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (env_str_new): taint the string.  get rid of a test failure
-	  introduced at r55811.
-
-Fri Aug  5 17:04:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (w32_getenv): call rb_w32_getenv and rb_w32_ugetenv via
-	  this pointer without further comparisons.
-
-Thu Aug  4 11:54:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (env_assoc): the encoding of the value should be the
-	  locale, as well as other methods, [], fetch, values, etc.
-
-Wed Aug  3 21:31:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_fragment_enc_error): compile_error is different
-	  between parser and ripper.  [ruby-core:76397] [Bug #12651]
-
-Wed Aug  3 17:15:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_obj_clone2): restrict freeze option to true other
-	  than false which only has the effect.  [Feature #12300]
-
-Wed Aug  3 10:47:07 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: introduce VM_FRAME_RUBYFRAME_P()
-	  and VM_FRAME_CFRAME_P().
-	  Most of case, RUBY_VM_NORMAL_ISEQ_P() is no
-	  longer needed.
-
-	* vm_core.h: introduce rb_obj_is_iseq().
-
-	* cont.c, vm.c: VM_FRAME_MAGIC_DUMMY with
-	  VM_FRAME_FLAG_CFRAME.
-
-Wed Aug  3 09:25:16 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: rename macros and make them inline functions.
-
-	  * rename VM_FRAME_TYPE_FINISH_P() to VM_FRAME_FINISHED_P().
-	  * rename VM_FRAME_TYPE_BMETHOD_P() to VM_FRAME_BMETHOD_P().
-
-Wed Aug 03 09:15:02 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: introduce VM_FRAME_FLAG_CFRAME to represent cfp->iseq
-	  type.
-
-Tue Aug  2 21:42:40 2016  Chia-sheng Chen  <qitar888@gmail.com>
-
-	* math.c (tanh): make faster by the extract form if three
-	  hyperbolic functions are unavailable.  [Feature #12647]
-
-Tue Aug  2 12:37:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c, ext/socket/rubysocket.h (inet_ntop): share
-	  the fallback definition.  [ruby-core:76646] [Bug #12645]
-
-Tue Aug  2 04:07:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (set_pioinfo_extra): use more reliable way to search
-	  the position of pioinfo of VC14, and also support debug library of it.
-	  patched by davispuh AT gmail.com
-	  [ruby-core:76644] [Bug #12644]
-	  this fixes also [Bug #12631]
-
-Mon Aug  1 21:39:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: [EXPERIMENTAL] build extension libraries in
-	  extracted gems.
-
-Mon Aug  1 16:07:18 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* include/ruby/ruby.h (struct RStruct): no longer.
-
-	* internal.h (struct RStruct): moved here.
-
-	* struct.c (rb_struct_ptr): a compensation function for the lack
-	  of RSTRUCT_PTR.  But now that we have RSTRUCT_GET/SET, that must
-	  not be used anyway.  I mark this deprecated.  Dont use it.
-
-Mon Aug  1 14:50:06 2016  Jeremy Evans <code@jeremyevans.net>
-
-	* object.c (rb_obj_clone2): Allow Object#clone to take freeze:
-	  false keyword argument to not freeze the clone.
-	  [ruby-core:75017][Feature #12300]
-
-	* test/ruby/test_object.rb (TestObject): test for it.
-
-Mon Aug  1 12:16:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/json/*, test/json/json_parser_test.rb: Update json-2.0.2.
-
-Sun Jul 31 16:17:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/resolv/resolv.c (get_dns_server_list): [Win32] get DNS
-	  servers only for connected network devices by GetNetworkParams
-	  API.  [Bug #12604]
-
-Sat Jul 30 12:13:26 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c (String#downcase), NEWS: Mentioned that case mapping for all
-	  of ISO-8859-1~16 is now supported. [ci skip]
-
-Sat Jul 30 12:00:01 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_2.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-2, by Yushiro Ishii.
-
-Fri Jul 29 20:57:12 2016  chuanshuo  <lilijreey@126.com>
-
-	* *.c: rename rb_funcall2 to rb_funcallv, except for extensions
-	  which are/will be/may be gems.  [Fix GH-1406]
-
-Fri Jul 29 10:51:34 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* proc.c (env_write): remove unused function.
-
-Fri Jul 29 10:49:52 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h (VM_LOCAL_P): should return an integer value.
-	  reported at
-	  http://d.hatena.ne.jp/nagachika/20160728/ruby_trunk_changes_55764_55770
-
-Fri Jul 29 04:23:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h (VM_ENV_LOCAL_P): return truthy (0 or not) value.
-
-	* vm.c (rb_vm_make_proc_lambda): use VM_ENV_ESCAPED_P() macro.
-
-Fri Jul 29 03:49:04 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, internal.h: remove RubyVM::Env class and all of env objects
-	  are imemo objects (imemo_env).
-
-	* NEWS: describe this change. I believe nobody touch these objects
-	  because there are no method defined.
-
-	* vm_core.h: remove the following definitions.
-	  * rb_cEnv decl.
-	  * GetEnvPtr() because Env is no longer T_DATA object.
-
-	* vm_core.h (rb_env_t): fix layout for imemo values.
-
-	* vm_core.h (vm_assert_env): added.
-
-	* vm_core.h (vm_env_new): added.
-
-Thu Jul 28 19:53:21 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: revisit the structure of frame, block and env.
-	  [Bug #12628]
-
-	  This patch introduce many changes.
-
-	  * Introduce concept of "Block Handler (BH)" to represent
-	    passed blocks.
-
-	  * move rb_control_frame_t::flag to ep[0] (as a special local
-	    variable). This flags represents not only frame type, but also
-	    env flags such as escaped.
-
-	  * rename `rb_block_t` to `struct rb_block`.
-
-	  * Make Proc, Binding and RubyVM::Env objects wb-protected.
-
-	  Check [Bug #12628] for more details.
-
-Thu Jul 28 15:05:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (ruby_fl_type): use __extension__ to get rid
-	  of pedantic warning against RUBY_FL_USER19.
-	  https://github.com/skylightio/skylight-ruby/issues/64
-
-	* include/ruby/ruby.h (rb_mul_size_overflow): ditto for use of
-	  int128.
-
-Wed Jul 27 10:32:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1253.c: Remove dead code found by Coverity Scan.
-
-Tue Jul 26 22:43:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (run_finalizer): make saved running finalizer state
-	  volatile to ensure not to be clobbered by longjmp.
-
-Tue Jul 26 19:26:00 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c: introduce rb_vm_pop_frame() and use it
-	  instead of setting rb_thread_t::cfp directly.
-
-	* vm_insnhelper.c (vm_pop_frame): return the result of
-	  finish frame or not.
-
-Tue Jul 26 19:06:39 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (rb_raw_obj_info): support to show Proc obj.
-
-Tue Jul 26 18:55:55 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark): add `inline' explicitly.
-	  I expected to inline this function implicitly at the loop
-	  (ex: marking T_ARRAY objects) but sometimes it remains as
-	  normal call.
-
-Tue Jul 26 16:33:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1257.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for Windows-1257, by Sho Koike.
-
-Tue Jul 26 16:19:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1250.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for Windows-1250, by Sho Koike.
-
-	* ChangeLog: Fixed order of previous two entries.
-
-Tue Jul 26 15:54:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1253.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for Windows-1253, by Takumi Koyama.
-
-Tue Jul 26 15:30:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1251.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for Windows-1251, by Shunsuke Sato.
-
-Tue Jul 26 13:04:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add explicit skip test for
-	  availability of Unicode data files.
-
-Mon Jul 25 21:33:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* range.c (check_step_domain): check step argument domain by <=>
-	  method, instead of < and >.
-
-Mon Jul 25 21:11:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* doc/maintainers.rdoc: fix filenames.
-
-Mon Jul 25 16:59:00 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* debug.c (ruby_debug_printf): use rb_raw_obj_info()
-	  instead of rb_inspect() because it is more robust way
-	  to see object internal.
-
-Sun Jul 24 16:33:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.h/c, include/ruby/oniguruma.h, enc/ascii.c, big5.c, cp949.c,
-	  emacs_mule.c, euc_jp.c, euc_kr.c, euc_tw.c, gb18030.c, gbk.c,
-	  iso_8859_1|2|3|4|5|6|7|8|9|10|11|13|14|15|16.c, koi8_r.c, koi8_u.c,
-	  shift_jis.c, unicode.c, us_ascii.c, utf_16|32be|le.c, utf_8.c,
-	  windows_1250|51|52|53|54|57.c, windows_31j.c, unicode.c:
-	  Remove conditional compilation macro ONIG_CASE_MAPPING. [Feature #12386].
-
-Sun Jul 24 12:53:42 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: xmlrpc is bundled gem from Ruby 2.4.
-
-Sun Jul 24 12:07:39 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Update OpenSSL maintainer.
-
-Sat Jul 23 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (Check_Type): inline check for the object type.
-
-Sat Jul 23 04:06:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in
-	  macros.
-
-Sat Jul 23 01:41:29 2016  Eric Wong  <e@80x24.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY
-	* test/webrick/test_cgi.rb (test_cgi_env): new test
-	* test/webrick/webrick.cgi (do_GET): new endpoint to dump env
-	  [ruby-core:76511] [Bug #12610]
-
-Fri Jul 22 19:55:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
-	  binding must be initialized.  [Bug #12611] (N1)
-
-	* win32/win32.c (w32_symlink): fix return type.  [Bug #12611] (N3)
-
-	* string.c (rb_str_split_m): simplify the condition.
-	  [Bug #12611](N4)
-
-Fri Jul 22 17:13:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c (String#dump): Change escaping of non-ASCII characters in
-	  UTF-8 to use upper-case four-digit hexadecimal escapes without braces
-	  where possible [Feature #12419].
-
-	* test/ruby/test_string.rb (test_dump): Add tests for above.
-
-Fri Jul 22 10:35:35 2016  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
-	  entry reference name of double quote.
-	  [Bug #12609][ruby-core:76509]
-	  Patch by Joseph Marrero. Thanks!!!
-
-Fri Jul 22 10:32:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* template/unicode_norm_gen.tmpl: Remove
-	  UnicodeNormalize::UNICODE_VERSION at origin [Feature #12546].
-
-Fri Jul 22 09:23:51 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* LEGAL: Added entries for files under the USD license.
-	  [Bug #12598][ruby-core:76428][ci skip]
-
-Fri Jul 22 09:19:57 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* LEGAL: Added entry for `lib/rdoc/generator/template/darkfish/css/fonts.css`
-	  [Misc #12550][ruby-core:76255][ci skip]
-
-Fri Jul 22 06:28:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (run_finalizer): push and exec tag just once, instead of
-	  protecting for each finalizer.
-
-	* gc.c (gc_start_internal, rb_gc_start): set finalizing flag
-	  whenever calling deferred finalizers not to recurse.
-
-Thu Jul 21 22:26:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* missing/strl{cat,cpy}.c: Update latest upstream files.
-	  [Misc #12205][ruby-core:74487]
-	* LEGAL: Update license for missing/strl{cat,cpy}.c.
-
-Thu Jul 21 21:53:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* LEGAL: added file list with Public domain license.
-	  [ruby-core:76254][Bug #12549]
-
-Wed Jul 20 17:44:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enumerator.c (lazy_uniq): new method Enumerator::Lazy#uniq.
-	  [Feature #11090]
-
-	* enum.c (enum_uniq): new method Enumerable#uniq.
-	  [Feature #11090]
-
-Wed Jul 20 17:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_add_new_element): add new element or do nothing
-	  if it is contained already.
-
-	* array.c (ary_add_hash, ary_add_hash_by): use
-	  rb_hash_add_new_element.
-
-Tue Jul 19 18:21:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* lib/unicode_normalize/tables.rb: Remove
-	  UnicodeNormalize::UNICODE_VERSION (#12546).
-
-Tue Jul 19 15:38:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_local_constants_i): exclude private constants
-	  when excluding inherited constants too.  [Bug #12345]
-
-Sun Jul 17 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (num_finite_p, num_infinite_p): Add Numeric#finite? and
-	  Numeric#infinite?  [Feature #12039] [ruby-core:73618]
-
-	* complex.c (rb_complex_finite_p): Add Complex#finite?
-
-	* complex.c (rb_complex_infinite_p): Add Complex#infinite?
-
-	* test/ruby/test_bignum.rb: Add test for Integer#finite? and
-	  Integer#infinite?
-
-	* test/ruby/test_fixnum.rb: ditto.
-
-	* test/ruby/test_rational.rb: Add test for Rational#finite? and
-	  Rational#infinite?
-
-	* test/ruby/test_complex.rb: Add test for Complex#finite? and
-	  Complex#infinite?
-
-Sun Jul 17 20:59:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, enc/depend (casefold.h, name2ctype.h): move to
-	  unicode data directory per version.
-
-Sat Jul 16 06:26:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, enc/Makefile.in: moved timestamp files for
-	  directories under the specific directory, to get rid of match
-	  with files under the source directory.
-
-Fri Jul 15 22:05:13 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c (str_buf_cat): Fix potential integer overflow of capa.
-	  In addition, termlen is used instead of +1.
-
-Fri Jul 15 21:30:38 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c (str_buf_cat): Fix capa size for embed string.
-	  Fix bug in r55547. [Bug #12536]
-
-Fri Jul 15 18:13:15 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: update latest gems.
-
-Fri Jul 15 17:08:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): do not underflow only by preceding zeros,
-	  which may be canceled out by the exponent.
-	  http://twitter.com/kazuho/status/753829998767714305
-
-Fri Jul 15 09:53:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/unicode/case-folding.rb, tool/enc-unicode.rb: check if
-	  Unicode versions are consistent with each other.
-
-Fri Jul 15 08:25:15 2016  Jeremy Evans <code@jeremyevans.net>
-
-	* string.c (STR_BUF_MIN_SIZE): reduce from 128 to 127
-	  [ruby-core:76371] [Feature #12025]
-	* string.c (rb_str_buf_new): adjust for above reduction
-
-Thu Jul 14 17:26:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (enc/unicode/name2ctype.h): remove stale recipe,
-	  which did not support Unicode age properties.
-
-	* common.mk (enc/unicode/name2ctype.h): update by --header option
-	  of tool/enc-unicode.rb.  enc/unicode/name2ctype.kwd file has not
-	  been used.
-
-	* common.mk (enc/unicode/name2ctype.kwd): rule to create from
-	  Unicode data files, used only when the target does not exist.
-
-Thu Jul 14 13:10:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/lib/json/ext: remove stale directory.  bundled
-	  extension libraries are placed under the directory for each
-	  architectures, but not mixed with plain text script libraries.
-
-Thu Jul 14 12:48:47 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/json/**/*.rb: merge original files from upstream repository.
-	  It only fixes styles of frozen string literal.
-
-Wed Jul 13 22:23:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/json/json_common_interface_test.rb: use assert_raise instead of
-	  assert_raises.
-
-Wed Jul 13 22:14:23 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/lib/test/unit.rb: added test files with `_test` suffix for json
-	  upstream.
-	* test/json: merge original test files from json upstream.
-
-Wed Jul 13 18:09:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_9.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-9, by Kazuki Iijima.
-
-	* enc/iso_8859_9.c: Exclude dotless i/I with dot from case-insensitive
-	  matching because they are not a case pair.
-
-	* test/ruby/enc/test_iso_8859.rb: Make test coverage for ISO-8859-9
-	  a bit more complete.
-
-Wed Jul 13 17:21:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1252.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for Windows-1252, by Serina Tai.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
-
-Wed Jul 13 16:19:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_7.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-7, by Kosuke Kurihara.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
-
-Wed Jul 13 16:08:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_mark_roots): should mark the VM object itself to mark
-	  singleton class of the VM object.
-	  Before this patch, we only set mark bit for the VM object and
-	  invoke mark function separately.
-	  [Bug #12583]
-
-	* test/ruby/test_gc.rb: add a test.
-
-Wed Jul 13 15:59:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* math.c (_USE_MATH_DEFINES): it must be set before including internal.h
-	  because internal.h includes ruby.h, ruby.h includes win32.h, and
-	  win32.h includes system's math.h.
-	  this change is to get rid of a compiler warning (redefinition of
-	  a macro) introduced at r55641.
-
-Wed Jul 13 15:19:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if
-	  there is no modification.
-
-Wed Jul 13 14:40:04 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-5, by Masaru Onodera.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
-
-Wed Jul 13 14:28:33 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* math.c (rb_math_sqrt): r55646 must use f_signbit.
-
-Wed Jul 13 14:22:50 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (Init_ISeq): undef ISeq.translate and ISeq.load_iseq
-	  to prevent calling super classes' methods.
-
-	  Without this patch, you can write workaround like:
-
-	    class << RubyVM::InstructionSequence
-	      def translate; end
-	      undef translate
-	    end
-
-	* test/ruby/test_iseq.rb: add a test.
-
-Wed Jul 13 14:16:03 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (method_entry_get_without_cache): check
-	  undefined method even if ruby_running is FALSE.
-
-	  We haven't call "undef"ed methods before ruby_running.
-	  So that this issue does not make troubles.
-
-Wed Jul 13 14:15:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/windows_1254.c: Adjust variable/macro names.
-
-Wed Jul 13 13:19:12 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_9.c, enc/windows_1254.c: Split Windows-1254 from
-	  ISO-8859-9 to be able to implement different case conversions.
-
-Wed Jul 13 13:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_7.c, enc/windows_1253.c: Split Windows-1253 from
-	  ISO-8859-7 to be able to implement different case conversions.
-
-Wed Jul 13 10:50:12 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_13.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-13, by Kanon Shindo.
-
-Wed Jul 13 10:31:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_13.c, enc/windows_1257.c: Split Windows-1257 from
-	  ISO-8859-13 to be able to implement different case conversions.
-
-Wed Jul 13 09:02:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_3.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-3, by Takuya Miyamoto.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Extend special treatment
-	  for Turkic.
-
-	* enc/iso_8859_3.c: Exclude dotless i/I with dot from case-insensitive
-	  matching because they are not a case pair.
-
-Wed Jul 13 08:40:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_iso_8859.rb: Exclude dotless i/I with dot from
-	  case-insensitive matching because they are not a case pair.
-
-Tue Jul 12 23:13:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* math.c (rb_math_sqrt): [EXPERIMENTAL] move Complex sqrt support
-	  from mathn.rb.
-
-Tue Jul 12 01:25:09 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in, lib/mkmf.rb, win32/Makefile.sub (CSRCFLAG): make the
-	  compiler option replacable in Makefile.
-
-	* win32/Makefile.sub (OUTFLAG, COUTFLAG): ditto.
-
-	* win32/Makeile.sub, win32/setup.mak (CC): should not append `-nologo`
-	  option forcely.
-
-Mon Jul 11 18:05:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c: Moved test for lowercase characters without
-	  uppercase equivalent.
-
-Mon Jul 11 17:49:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_4.c, enc/iso_8859_10.c, enc/iso_8859_14.c,
-	  enc/iso_8859_15.c, enc/iso_8859_16.c: Replace case-by-case code with
-	  lookup in ENC_ISO_8859_xx_TO_LOWER_CASE table.
-
-Mon Jul 11 16:00:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_each, strio_readlines): convert
-	  arguments just once before reading, instead of conversions for
-	  each lines, as r55603.
-
-Sun Jul 10 19:53:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_10.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-10, by Toya Hosokawa.
-
-Sun Jul 10 19:33:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Changed testing logic to
-	  catch unintended modifications of characters that do not have a case
-	  equivalent in the respective encoding.
-	* enc/iso_8859_1.c, enc/iso_8859_15.c: Fixed unintended modifications of
-	  micro sign and y with diaeresis.
-
-Sun Jul 10 17:05:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_4.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-4, by Kotaro Yoshida.
-
-Sun Jul 10 16:17:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Fixed a comment
-	  (message belongs to last commit). [ci skip]
-
-Sun Jul 10 14:27:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_dtoa): [EXPERIMENTAL] adjust the case that the
-	  Float value is close to the exact but unrepresentable middle
-	  value of two values in the given precision, as r55604.
-
-Sun Jul 10 08:57:20 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* thread.c: Fixed implicit conversion error with Apple clang-800.0.31
-
-Sat Jul  9 12:43:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/getoptlong.rb: use false instead of FALSE.
-
-Fri Jul  8 21:49:28 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
-	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]
-
-Fri Jul  8 14:16:48 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_args.c (vm_caller_setup_arg_block): call rb_sym_to_proc()
-	  directly to reduce method dispatch overhead.
-
-Fri Jul  8 08:43:31 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* io.c (rb_io_s_read): add description of pipes to the documentation
-	  of IO.read.
-
-Fri Jul  8 03:54:22 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_args.c (setup_parameters_complex): don't raise ArgumentError
-	  if an array is given for instance_exec with optional argument.
-	  [ruby-core:76300] [Bug #12568]
-	  https://github.com/rails/rails/pull/25699
-
-Fri Jul  8 00:47:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_eval.c (yield_under): change prototype to get argc/argv.
-
-	* vm_eval.c (specific_eval): change for above.
-
-	* vm_eval.c (rb_obj_instance_exec): avoid object allocation.
-
-	* vm_eval.c (rb_mod_module_exec): ditto.
-
-Thu Jul  7 20:08:37 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_args.c (vm_caller_setup_arg_block): disable symbol block
-	  argument optimization when tail call optimization is enabled,
-	  in order to avoid SEGV.  [ruby-core:76288] [Bug #12565]
-
-Thu Jul  7 16:37:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round): [EXPERIMENTAL] adjust the case that the
-	  receiver is close to the exact but unrepresentable middle value
-	  of two values in the given precision.
-	  http://d.hatena.ne.jp/hnw/20160702
-
-Thu Jul  7 16:31:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_s_foreach, rb_io_s_readlines): convert arguments
-	  just once before reading, instead of conversions for each lines.
-
-Wed Jul  6 19:54:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_14.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-14, by Yutaro Tada.
-
-Wed Jul  6 19:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c:
-	  Align indenting to onigmo convention.
-
-Wed Jul  6 18:59:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-15, by Maho Harada.
-
-Wed Jul  6 18:34:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_16.c, test/ruby/enc/test_case_comprehensive.rb:
-	  Implement non-ASCII case conversion for ISO-8859-16, by Satoshi Kayama.
-
-Wed Jul  6 14:44:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): store $headers in LOCAL_HDRS for
-	  depend files.
-
-	* ext/digest/digest_conf.rb (digest_conf): add implementation
-	  specific headers to $header.
-
-	* ext/digest/{md5,rmd160,sha1,sha2}/depend: add LOCAL_HDRS to the
-	  dependencies.
-
-Wed Jul  6 08:59:35 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/http/generic_request.rb (write_header): A Request-Line must
-	  not contain CR or LF.
-
-Wed Jul  6 07:11:27 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (putline): raise an ArgumentError when
-	  CR or LF is included in a line.
-
-Tue Jul  5 20:49:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/json/*, test/json/*: Update json-2.0.1.
-	  Changes of 2.0.0: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2015-09-11-200
-	  Changes of 2.0.1: https://github.com/flori/json/blob/f679ebd0c69a94e3e70a897ac9a229f5779c2ee1/CHANGES.md#2016-07-01-201
-	  [Feature #12542][ruby-dev:49706][fix GH-1395]
-
-Tue Jul  5 19:39:49 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c (rb_str_change_terminator_length): New function to change
-	  termlen and resize heap for the terminator. This is split from
-	  rb_str_fill_terminator (str_fill_term) because filling terminator
-	  and changing terminator length are different things. [Bug #12536]
-
-	* internal.h: declaration for rb_str_change_terminator_length.
-
-	* string.c (str_fill_term): Simplify only to zero-fill the terminator.
-	  For non-shared strings, it assumes that (capa + termlen) bytes of
-	  heap is allocated. This partially reverts r55557.
-
-	* encoding.c (rb_enc_associate_index): rb_str_change_terminator_length
-	  is used, and it should be called whenever the termlen is changed.
-
-	* string.c (str_capacity): New static function to return capacity
-	  of a string with the given termlen, because the termlen may
-	  sometimes be different from TERM_LEN(str) especially during
-	  changing termlen or filling terminator with specific termlen.
-
-	* string.c (rb_str_capacity): Use str_capacity.
-
-Tue Jul  5 11:07:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): use union instead of bare variable to ease
-	  optimizations and avoid assigning x87 floating point number.
-	  [ruby-core:74496] [Bug #12209]
-
-	* pack.c (pack_unpack): ditto.
-
-Mon Jul  4 13:56:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c: define sig_t if not exist.
-	  at least Solaris 10 and 11 doesn't have sig_t.
-
-Mon Jul  4 13:08:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (random_ulong_limited): avoid left shift count >= width of
-	  type on 32bit environment.
-
-Sun Jul  3 18:51:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb, test_regex_casefold.rb,
-	  test/test_unicode_normalize.rb: Replace UNICODE_VERSION from
-	  UnicodeNormalize with RbConfig::CONFIG['UNICODE_VERSION'] from
-	  feature 12460.
-
-Sun Jul  3 06:04:09 2016  Eric Wong  <e@80x24.org>
-
-	* process.c (disable_child_handler_fork_child): simplify
-	  [ruby-core:75781] [Misc #12439]
-
-Sun Jul  3 05:25:46 2016  Eric Wong  <e@80x24.org>
-
-	* tool/asm_parse.rb: add description
-	* tool/change_maker.rb: ditto
-	* tool/downloader.rb: ditto
-	* tool/eval.rb: ditto
-	* tool/expand-config.rb: ditto
-	* tool/extlibs.rb: ditto
-	* tool/fake.rb: ditto
-	* tool/file2lastrev.rb: ditto
-	* tool/gem-unpack.rb: ditto
-	* tool/gen_dummy_probes.rb: ditto
-	* tool/gen_ruby_tapset.rb: ditto
-	* tool/generic_erb.rb: ditto
-	* tool/id2token.rb: ditto
-	* tool/ifchange: ditto
-	* tool/insns2vm.rb: ditto
-	* tool/instruction.rb: ditto
-	* tool/jisx0208.rb: ditto
-	* tool/merger.rb: ditto
-	* tool/mkrunnable.rb: ditto
-	* tool/node_name.rb: ditto
-	* tool/parse.rb: ditto
-	* tool/rbinstall.rb: ditto
-	* tool/rbuninstall.rb: ditto
-	* tool/rmdirs: ditto
-	* tool/runruby.rb: ditto
-	* tool/strip-rdoc.rb: ditto
-	* tool/vcs.rb: ditto
-	* tool/vtlh.rb: ditto
-	* tool/ytab.sed: ditto
-	* tool/enc-unicode.rb: fix typo
-	* tool/mk_call_iseq_optimized.rb: ditto
-	* tool/update-deps: ditto
-	  [ruby-core:76215] [Bug #12539]
-	  by Noah Gibbs <the.codefolio.guy@gmail.com>
-
-Sat Jul  2 18:04:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque
-	  only if the URI has path-rootless, not path-empty.
-	  [ruby-core:76055] [Bug #12498]
-	  patched by Chris Heisterkamp <cheister@squareup.com>
-
-Sat Jul  2 04:26:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (noname_disable_map): don't optimize out group 0
-	  Ruby's Regexp doesn't allow normal numbered groups if the regexp
-	  has named groups. On such case it optimizes out related NT_ENCLOSE.
-	  But even on the case it can use \g<0>.
-	  This fix not to remove NT_ENCLOSE whose regnum is 0.
-	  [ruby-core:75828] [Bug #12454]
-
-Sat Jul  2 03:09:27 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c: Partially reverts r55547 and r55555.
-	  ChangeLog about the reverted changes are also deleted in this file.
-	  [Bug #12536] [ruby-dev:49699] [ruby-dev:49702]
-
-Sat Jul  2 02:22:22 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c (str_fill_term): When termlen increases, re-allocation
-	  of memory for termlen should always be needed.
-	  In this fix, if possible, decrease capa instead of realloc.
-	  [Bug #12536] [ruby-dev:49699]
-
-Fri Jul  1 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c: Specify termlen as far as possible.
-	  Additional fix for [Bug #12536] [ruby-dev:49699].
-
-	* string.c (str_new_static): Specify termlen from the given encoding
-	  when creating a new String object is needed.
-
-	* string.c (rb_tainted_str_new_with_enc): New function to create a
-	  tainted String object with the given encoding. This means that
-	  the termlen is correctly specified. Currently static function.
-	  The function name might be renamed to rb_tainted_enc_str_new
-	  or rb_enc_tainted_str_new.
-
-	* string.c (rb_external_str_new_with_enc): Use encoding by using the
-	  above rb_tainted_str_new_with_enc().
-
-Fri Jul  1 19:38:57 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset):
-	  Attempt to use independent strings for destructive tests that
-	  directly modify values on memory by using Fiddle::Pointer.
-	  [Bug #12537] [ruby-dev:49700]
-
-Fri Jul  1 18:20:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* .gdbinit (rb_ps_thread): show the detail of cfunc in ruby level
-	  backtrace.
-
-Fri Jul  1 13:26:39 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c (rb_str_subseq, str_substr): When RSTRING_EMBED_LEN_MAX
-	  is used, TERM_LEN(str) should be considered with it because
-	  embedded strings are also processed by TERM_FILL.
-	  Additional fix for [Bug #12536] [ruby-dev:49699].
-
-Fri Jul  1 12:11:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* .gdbinit (rb_count_objects): added gdb version of count_objects().
-
-Fri Jul  1 04:32:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* .gdbinit (rb_ps_thread): show ruby level backtrace.
-	  Usually you can call `rb_ps` to show ruby level backtraces
-	  for all living threads.
-	  Note that it can call with core file like `gcore <pid>`
-	  and `gdb ruby core.<pid>`.
-
-Thu Jun 30 19:15:13 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* string.c: Fix memory corruptions when using UTF-16/32 strings.
-	  [Bug #12536] [ruby-dev:49699]
-
-	* string.c (rb_str_new_with_class): Use TERM_LEN of the "obj".
-
-	* string.c (rb_str_plus, rb_str_justify): Use str_new0 which is aware
-	  of termlen.
-
-	* string.c (str_shared_replace): Copy +termlen bytes instead of +1.
-
-	* string.c (rb_str_times): termlen should not be included in capa.
-
-	* string.c (RESIZE_CAPA_TERM): When using RSTRING_EMBED_LEN_MAX,
-	  termlen should be counted with it because embedded strings are
-	  also processed by TERM_FILL.
-
-	* string.c (rb_str_capacity, str_shared_replace, str_buf_cat): ditto.
-
-	* string.c (rb_str_drop_bytes, rb_str_setbyte, str_byte_substr): ditto.
-
-Wed Jun 29 22:24:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/lib/psych_jars.rb: removed needless file required to JRuby.
-
-Wed Jun 29 22:21:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c: The "reuse" behavior of d2i_ functions does
-	  not work well with OpenSSL 1.0.0t. So avoid it.
-
-Wed Jun 29 15:18:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_succ): optimize like r55515. (but this argument is
-	  constant)
-
-Wed Jun 29 12:41:58 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/ruby/test_refinement.rb: skip
-	  test_prepend_after_refine_wb_miss on ARM or MIPS.
-	  [ruby-core:76031] [Bug #12491]
-
-Wed Jun 29 08:45:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (passed_block): convert passed block symbol to proc.
-	  based on the patch by Daisuke Sato in [ruby-dev:49695].
-	  [Bug #12531]
-
-Wed Jun 29 03:34:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bignum.c (rb_big2ulong): the old logic seems to try to avoid
-	  calculating `-(long)(num-1)-1` if `num` is not LONG_MIN. (Note that
-	  `-LONG_MIN` may be larger than LONG_MAX) But C compilers can
-	  optimize it into single NEG instruction.
-	  Therefore those two conditions can be single if-body.
-
-	* bignum.c (rb_big2long): ditto.
-
-	* bignum.c (rb_big2ull): ditto.
-
-	* bignum.c (rb_big2ll): ditto.
-
-Tue Jun 28 22:55:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pstore.rb (PStore::CHECKSUM_ALGO): extract the algorithm for
-	  checksum, instead of qualified names for each times.
-
-Tue Jun 28 22:29:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bootstraptest/runner.rb: do not use safe navigation operator.
-	  this runner may run on older ruby.  partially revert r53110
-	  (GH-1142 patched by @mlarraz).
-
-Tue Jun 28 22:09:09 2016  Akio Tajima <artonx@yahoo.co.jp>
-
-	* lib/fileutils.rb: rescue Errno:EACCES for chown.
-	  [Bug #12520]
-
-Tue Jun 28 18:38:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* ext/digest/md5/md5ossl.h: Remove excess semicolons.
-	  Suppress warning on Solaris with Oracle Solaris Studio 12.
-	  [ruby-dev:49692] [Bug #12524]
-
-	* ext/digest/md5/md5cc.h: ditto.
-	* ext/digest/sha1/sha1cc.h: ditto.
-	* ext/digest/sha1/sha1ossl.h: ditto.
-	* ext/digest/sha2/sha2cc.h: ditto.
-	* ext/digest/sha2/sha2ossl.h: ditto.
-	* ext/openssl/ossl_pkey_rsa.c: ditto.
-
-Tue Jun 28 15:56:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/enc/test_case_comprehensive.rb: noting to test if
-	  Unicode data files are available.
-	  [ruby-core:76160] [Bug #12433]
-
-	* test/test_unicode_normalize.rb: ditto.
-
-Tue Jun 28 15:20:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP#proxy_uri): cache the case no proxy
-	  is used.
-
-Tue Jun 28 09:56:29 2016  Stefan Schussler  <mail@stefanschuessler.de>
-
-	* object.c (rb_mod_eqq): [DOC] Fix typo in RDoc.  [Fix GH-1393]
-
-Tue Jun 28 02:41:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_plus): use `- 1` instead of `& (~1)` to allow
-	  compilers to use x86 LEA instruction (3 operand).
-	  Even if 3 operand LEA's latency is 3 cycle after SandyBridge,
-	  it reduces code size and can be faster because of super scalar.
-
-	* insns.def (opt_plus): calculate and use rb_int2big.
-	  On positive Fixnum overflow, `recv - 1 + obj` doesn't carry
-	  because recv's msb and obj's msb are 0, and resulted msb is 1.
-	  Therefore simply rshift and cast as signed long works fine.
-	  On negative Fixnum overflow, it will carry because both arguments'
-	  msb are 1, and resulted msb is also 1.
-	  In this case it needs to restore carried sign bit after rshift.
-
-Mon Jun 27 16:58:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils#install): accecpt symbolic mode, as
-	  well as chmod.
-
-	* lib/fileutils.rb (FileUtils#install): add owner and group
-	  options.
-
-Mon Jun 27 08:56:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (ADD_TRACE): ignore trace instruction on non-positive
-	  line.
-
-	* parse.y (coverage): get rid of ArgumentError when the starting
-	  line number is not positive.  [ruby-core:76141] [Bug #12517]
-
-Sun Jun 26 10:20:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32/lib/Win32API.rb (Win32API#initialize): Cygwin
-	  2.5.2-1 (perhaps) seems to no longer append ".dll" suffix
-	  implicitly.
-
-	* ext/win32/lib/win32/resolv.rb (Win32::Resolv): ditto.  Fix the
-	  error reported by yamataka AT u08.itscom.net in
-	  [ruby-list:50339], and pointed out and patched by cerberus AT
-	  m3.kcn.ne.jp in [ruby-list:50341].
-
-Sat Jun 25 10:07:52 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/openssl/test_ocsp.rb: Ignore errors caused by bugs that exist in
-	  LibreSSL >= 2.3.1.
-
-Sat Jun 25 02:33:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (vm_respond_to): try method_missing if respond_to?
-	  is undefined, as if it is the default definition.
-	  [ruby-core:75377] [Bug #12353]
-
-Fri Jun 24 17:04:21 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/psych/*, test/psych/*: Update psych 2.1.0
-	  This version fixed [Bug #11988][ruby-core:72850]
-
-Fri Jun 24 13:12:41 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*:
-	  Update rubygems 2.6.5 and 2.6.6.
-	  Release note of 2.6.5: https://github.com/rubygems/rubygems/commit/656f5d94dc888d78d0d00f3598a4fa37391aac80
-	  Release note of 2.6.6: https://github.com/rubygems/rubygems/commit/ccb9c3300c063f5b5656669972d24a10ef8afbf5
-
-Fri Jun 24 09:17:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (lib/unicode_normalize/tables.rb): should not depend
-	  on Unicode data files unless ALWAYS_UPDATE_UNICODE=yes, to get
-	  rid of downloading Unicode data unnecessary.  [ruby-dev:49681]
-
-	* common.mk (enc/unicode/casefold.h): update Unicode files in a
-	  sub-make, not to let the header depend on the files always.
-
-	* enc/unicode/case-folding.rb: if gperf is not usable, assume the
-	  existing file is OK.
-
-Tue Jun 21 19:44:54 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_regex_casefold.rb: Add Windows-1251, KOI8-R, and
-	  KOI8-U to encodings; definitely removed EUC-JP.
-
-Tue Jun 21 19:32:23 2016  Mark St.Godard  <markstgodard@gmail.com>
-
-	* lib/webrick/httprequest.rb (setup_forwarded_info): Use the first
-	  value in X-Forwarded-Proto, if header contains multiple comma
-	  separated values.  Some middlewares may add these values to the
-	  list, not replacing.  [Fix GH-1386]
-
-Tue Jun 21 17:17:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_io.rb: Skip test_readpartial_with_not_empty_buffer,
-	  test_read_buffer_error, test_read_unlocktmp_ensure,
-	  test_readpartial_unlocktmp_ensure, and
-	  test_sysread_unlocktmp_ensure on cygwin,
-	  because these tests repeatedly hang. This makes test_io.rb
-	  complete in finite time on cygwin.
-
-	* ChangeLog: Fix test_in.rb -> test_io.rb (two instances).
-
-Tue Jun 21 16:38:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_casemap): do not put code with side effects
-	  inside RSTRING_PTR() macro which evaluates the argument multiple
-	  times.
-
-Tue Jun 21 16:13:45 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_casemap): fix memory leak.
-
-Tue Jun 21 16:12:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_casemap): int is too small for string size.
-
-Tue Jun 21 15:42:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_io.rb: Skip test_read_buffer_error on cygwin,
-	  because this test repeatedly hangs.
-
-Tue Jun 21 15:35:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* LEGAL: Added filenames and copyrights for some files in
-	  enc/trans/JIS.
-
-Tue Jun 21 00:56:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (get_special_folder): fix calling convention of
-	  SHGetPathFromIDListEx, which should be WINAPI.  pointed out by
-	  @arton at http://twitter.com/arton/status/744884064277016576
-
-Tue Jun 21 00:22:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, include/ruby/defines.h (RUBY_USE_SETJMPEX):
-	  include setjmpex.h only when using setjmpex() for RUBY_SETJMP.
-	  the header of mingw32 overrides setjmp() by setjmpex().
-
-Mon Jun 20 18:39:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_io.rb: Skip test_open_fifo_does_not_block_other_threads
-	  on cygwin. Fifos seem to work okay in cygwin, but this test repeatedly
-	  hangs.
-
-Mon Jun 20 13:35:06 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm.c (invoke_bmethod, invoke_block_from_c_0): revert r52104
-	  partially to avoid "self has wrong type to call super in this
-	  context" errors.
-	  [ruby-core:72724] [Bug #11954]
-
-Mon Jun 20 12:53:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/rubygems/test_gem_remote_fetcher.rb: OpenSSL::PKey::DH#priv_key=
-	  is not defined when ext/openssl is built with OpenSSL 1.1.0.
-	  https://github.com/rubygems/rubygems/pull/1648
-	  [ruby-core:75225] [Feature #12324]
-
-Sun Jun 19 21:25:43 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c: Add OCSP::SingleResponse that represents an
-	  OCSP SingleResponse structure. Also add two new methods #responses
-	  and #find_response to OCSP::BasicResponse. A BasicResponse has one or
-	  more SingleResponse. We have OCSP::BasicResponse#status that returns
-	  them as an array of arrays, each containing the content of a
-	  SingleResponse, but this is not useful. When validating an OCSP
-	  response, we need to look into the each SingleResponse and check their
-	  validity but it is not simple. For example, when validating for a
-	  certificate 'cert', the code would be like:
-
-	    # certid_target is an OpenSSL::OCSP::CertificateId for cert
-	    basic = res.basic
-	    result = basic.status.any? do |ary|
-	      ary[0].cmp(certid_target) &&
-	        ary[4] <= Time.now && (!ary[5] || Time.now <= ary[5])
-	    end
-
-	  Adding OCSP::SingleResponse at the same time allows exposing
-	  OCSP_check_validity(). With this, the code above can be rewritten as:
-
-	    basic = res.basic
-	    single = basic.find_response(certid_target)
-	    result = single.check_validity
-
-	* test/openssl/test_ocsp.rb: Test this.
-
-Sun Jun 19 18:40:19 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_add_status): Allow specifying
-	  the times (thisUpdate, nextUpdate and revocationTime) with Time
-	  objects. Currently they accepts only relative seconds from the current
-	  time. This is inconvenience, especially for revocationTime. When
-	  Integer is passed, they are still treated as relative times. Since the
-	  type check is currently done with rb_Integer(), this is a slightly
-	  incompatible change. Hope no one passes a relative time as String or
-	  Time object...
-	  Also, allow passing nil as nextUpdate. It is optional.
-
-	* ext/openssl/ruby_missing.h: Define RB_INTEGER_TYPE_P() if not defined.
-	  openssl gem will be released before Ruby 2.4.0.
-
-Sun Jun 19 18:39:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c: Implement OCSP::{CertificateId,Request,
-	  BasicResponse,Response}#initialize_copy.
-	  [ruby-core:75504] [Bug #12381]
-
-	* test/openssl/test_ocsp.rb: Test them.
-
-Sun Jun 19 18:29:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_dh.c, ext/openssl/ossl_pkey_dsa.c,
-	  ext/openssl/ossl_pkey_ec.c, ext/openssl/ossl_pkey_rsa.c: Implement
-	  initialize_copy method for OpenSSL::PKey::*.
-	  [ruby-core:75504] [Bug #12381]
-
-	* test/openssl/test_pkey_dh.rb, test/openssl/test_pkey_dsa.rb,
-	  test/openssl/test_pkey_ec.rb, test/openssl/test_pkey_rsa.rb: Test they
-	  actually copy the OpenSSL objects, and modifications to cloned object
-	  don't affect the original object.
-
-Sun Jun 19 16:55:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/test_dir_m17n.rb: Skip tests with non-UTF-8 encodings
-	  on cygwin. Cygwin can use the Unicode PUA (private use area) to store
-	  bytes from non-UTF-8 filenames (see
-	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-specialchars),
-	  but we are not supporting this. [Bug #12443]
-
-Sun Jun 19 15:01:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* localeinit.c: Fix filesystem encoding for cygwin to UTF-8 (see
-	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-unusual)
-
-Sun Jun 19 14:31:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey.h, ext/openssl/ossl_pkey_dh.c,
-	  ext/openssl/ossl_pkey_dsa.c, ext/openssl/ossl_pkey_rsa.c: A few days
-	  ago, OpenSSL changed {DH,DSA,RSA}_get0_*() to take const BIGNUM **.
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=fd809cfdbd6e32b6b67b68c59f6d55fbed7a9327
-	  [ruby-core:75225] [Feature #12324]
-
-Sun Jun 19 11:19:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_path_to_class): consider the string length
-	  instead of a terminator.
-
-	* variable.c (rb_path_to_class): search the constant at once
-	  instead of checking if defined and then getting it.
-
-Sat Jun 18 14:01:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/rubygems/test_gem_installer.rb: Fixed broken test with extension
-	  build. https://github.com/rubygems/rubygems/pull/1645
-
-Sat Jun 18 13:59:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems
-	  HEAD(2c6d256). It contains to update vendored Molinillo to 0.5.0.
-	  https://github.com/rubygems/rubygems/pull/1638
-
-Sat Jun 18 10:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (build-ext), ext/extmk.rb: use variable EXTENCS
-	  different than ENCOBJS, to get rid of circular dependency.
-	  build libencs when linking encodings statically.
-	  [ruby-core:75618] [Bug #12401]
-
-Sat Jun 18 08:52:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_getline): fix pointer index
-	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
-
-Thu Jun 16 16:35:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (Init_class_hierarchy): prevent rb_cObject which is the
-	  class tree root, from GC.  [ruby-dev:49666] [Bug #12492]
-
-Thu Jun 16 12:17:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_trans): adjust buffer size by processed and rest
-	  lengths, instead of doubling repeatedly.
-
-Thu Jun 16 11:15:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (tr_trans): consider terminator length and fix heap
-	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
-
-Thu Jun 16 00:02:32 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify, ossl_ocspbres_verify):
-	  Use ossl_clear_error() so that they don't print warnings to stderr and
-	  leak errors in the OpenSSL error queue. Also, check the return value
-	  of OCSP_*_verify() correctly. They can return -1 on verification
-	  failure.
-
-Wed Jun 15 19:52:23 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_sign, ossl_ocspbres_sign): Allow
-	  specifying hash algorithm used in signing. They are hard coded to use
-	  SHA-1.
-	  Based on a patch provided by Tim Shirley <tidoublemy@gmail.com>.
-	  [ruby-core:70915] [Feature #11552] [GH ruby/openssl#28]
-
-	* test/openssl/test_ocsp.rb: Test sign-verify works.
-
-Wed Jun 15 01:46:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c: [DOC] fix rdoc directive, and an example of negative
-	  value.  [ruby-core:76025] [Bug #12487]
-
-Wed Jun 15 01:44:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb: provide Unicode Version information as
-	  RbConfig::CONFIG['UNICODE_VERSION'].
-	  [ruby-core:75845] [Feature #12460]
-
-Wed Jun 15 00:01:18 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/enc/test_case_comprehensive.rb
-	  (TestComprehensiveCaseFold::read_data): use \A and \z instead of
-	  ^ and $ in regexp.
-
-Tue Jun 14 23:43:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/backward.h (rb_cFixnum, rb_cBignum): remove the
-	  backward compatibility macros, to fail incompatible extension
-	  libraries early.  [Bug #12427]
-
-Tue Jun 14 22:22:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (rb_strftime_with_timespec): limit the result string
-	  size by the format length, to get rid of unlimited memory use.
-
-Tue Jun 14 22:11:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_get_issuer_name_hash,
-	  ossl_ocspcid_get_issuer_key_hash, ossl_ocspcid_get_hash_algorithm):
-	  Add accessor methods OCSP::CertificateId#issuer_name_hash,
-	  #issuer_key_hash, #hash_algorithm.
-	  Based on a patch provided by Paul Kehrer <paul.l.kehrer@gmail.com>.
-	  [ruby-core:48062] [Feature #7181]
-
-	* test/openssl/test_ocsp.rb: Test these new methods.
-
-Tue Jun 14 22:07:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_strftime.c (date_strftime_with_tmx): reject too
-	  large precision to get rid of buffer overflow.
-	  reported by Guido Vranken <guido AT guidovranken.nl>.
-
-Tue Jun 14 21:40:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_to_der, ossl_ocspcid_to_der):
-	  Implement #to_der methods for OCSP::BasicResponse and
-	  OCSP::CertificateId.
-
-	  (ossl_ocspreq_initialize, ossl_ocspres_initialize): Use GetOCSP*()
-	  instead of raw DATA_PTR().
-
-	  (ossl_ocspbres_initialize, ossl_ocspcid_initialize): Allow
-	  initializing from DER string.
-
-	  (Init_ossl_ocsp): Define new #to_der methods.
-
-	* test/openssl/test_ocsp.rb: Test these changes. Also add missing tests
-	  for OCSP::{Response,Request}#to_der.
-
-Tue Jun 14 21:35:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.h (DH_set0_pqg, RSA_set0_key):
-	  DH_set0_pqg() allows 'q' to be NULL. Fix a typo in RSA_set0_key().
-	  Fixes r55285.  [ruby-core:75225] [Feature #12324]
-
-Mon Jun 14 10:19:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: describe Integer#digits.
-
-Mon Jun 13 21:09:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread.c (debug_deadlock_check): show thread lock dependency and
-	  backtrace [Feature #8214] [ruby-dev:47217]
-
-	* thread.c (thread_status_name): show "sleep_forever" instead of
-	  "sleep" if called from inspect.
-
-Mon Jun 13 20:50:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reg_named_capture_assign_iter): remove named capture
-	  conflict warnings.  it is just annoying rather than useful.
-	  [ruby-core:75416] [Bug #12359]
-
-Mon Jun 13 20:04:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (rb_int_digits, rb_fix_digits, rb_int_digits_bigbase):
-	  Add Integer#digits to extract columns in place-value notation
-	  [Feature #12447] [ruby-core:75799]
-
-	* test/ruby/test_integer.rb: Add tests for the above change.
-
-	* test/ruby/test_bignum.rb: ditto.
-
-Mon Jun 13 20:34:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RUBY_INTEGER_UNIFICATION): macro to tell if
-	  Integer is integrated.  [ruby-core:75718][Bug #12427]
-
-	* include/ruby/backward.h, internal.h (rb_cFixnum, rb_cBignum):
-	  fallback to rb_cInteger.
-
-	* bignum.c, numeric.c, ext/json/generator/generator.{c,h}: use the
-	  macro.
-
-Mon Jun 13 16:58:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add tests for full Unicode
-	  swapcase.
-
-Sun Jun 12 14:48:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add tests for ASCII-only
-	  swapcase; store calculated values in hashes.
-
-Sun Jun 12 14:05:45 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_get_auth_tag,
-	  ossl_cipher_set_auth_tag): Check if the cipher flags retrieved by
-	  EVP_CIPHER_CTX_flags() includes EVP_CIPH_FLAG_AEAD_CIPHER to see if
-	  the cipher supports AEAD. AES-GCM was the only supported in OpenSSL
-	  1.0.1.
-
-	  (Init_ossl_cipher): Fix doc; OpenSSL::Cipher::AES.new(128, :GCM) can't
-	  work.
-
-	* ext/openssl/openssl_missing.h: Define EVP_CTRL_AEAD_{GET,SET}_TAG if
-	  missing. They are added in OpenSSL 1.1.0, and have the same value as
-	  EVP_CTRL_GCM_{GET,SET}_TAG and EVP_CTRL_CCM_{GET,SET}_TAG.
-
-Sun Jun 12 13:47:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/openssl/test_engine.rb (test_openssl_engine_builtin,
-	  test_openssl_engine_by_id_string): Skip test if 'openssl' engine is
-	  already loaded. And test the number increased by Engine.load{_by_id,},
-	  not the total count of loaded engines. Previously, we called
-	  OpenSSL::Engine.cleanup every time running a test case, but we no
-	  longer can do it.
-	  [ruby-core:75225] [Feature #12324]
-
-Sun Jun 12 09:24:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (append_fspath): normalize directory name to be appended
-	  on OS X.  [ruby-core:75957] [Ruby trunk Bug#12483]
-	  https://github.com/rails/rails/issues/25303#issuecomment-224834804
-
-Sat Jun 11 23:07:32 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): get rid of a warning which
-	  causes test failures introduced at r55376.
-
-Sat Jun 11 18:37:58 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary
-	  class description. [ci skip][Bug #12255][ruby-core:74835]
-
-Sat Jun 11 15:19:38 2016  takiy33  <takiy33@users.noreply.github.com>
-
-	* lib/net/smtp.rb: [DOC] Remove dead link on documentation for
-	  Japanese of SMTP.  [Fix GH-1380]
-
-Sat Jun 11 15:02:45 2016  Grant Hutchins  <github@nertzy.com>
-
-	* string.c (rb_str_oct): [DOC] fix typo, hornored -> honored.
-	  [Fix GH-1379]
-
-Sat Jun 11 14:04:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/objspace/objspace_dump.c: generate valid JSON for dump_all.
-
-Sat Jun 11 13:52:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): remove __send__ call if
-	  possible, so that more optimizations will be enabled.
-
-Sat Jun 11 11:24:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/iso_8859.h (SHARP_s): name frequently used codepoint.
-
-Sat Jun 11 09:58:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c: Revert to older version of code.
-
-Sat Jun 11 09:46:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/iso_8859_1.c: Implement non-ASCII case mapping.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Tests for above.
-
-	* string.c: Add iso-8859-1 to supported encodings.
-
-Sat Jun 11 09:31:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (_delegator_method): leave the backtrace
-	  untouched during accessor.  forwardable.rb does not appear in
-	  the backtrace during delegated method because of tail-call
-	  optimization.
-
-Sat Jun 11 01:38:31 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/defines.h (GCC_VERSION_SINCE): Fix logic error by
-	  adding parentheses. Fix failures of TestMkmf::TestConvertible
-	  with GCC 3.4.3 on Solaris 10. [Bug #12479] [ruby-dev:49660]
-
-Fri Jun 10 21:54:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (Forwardable._delegator_method): extract
-	  method generator and deal with non-module objects.
-	  [ruby-dev:49656] [Bug #12478]
-
-Fri Jun 10 17:35:11 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Special-case :ascii option in rb_str_capitalize_bang and
-	  rb_str_swapcase_bang.
-
-Fri Jun 10 17:12:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Special-case :ascii option in rb_str_upcase_bang (retry).
-
-Fri Jun 10 14:48:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (get_env_cstr): ensure NUL-terminated.
-	  [ruby-dev:49655] [Bug #12475]
-
-	* string.c (rb_str_fill_terminator): return the pointer to the
-	  NUL-terminated content.
-
-Thu Jun  9 21:42:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c (asn1integer_to_num): Use
-	  ASN1_ENUMERATED_to_BN() to convert an ASN1_ENUMERATED to a BN.
-	  Starting from OpenSSL 1.1.0, ASN1_INTEGER_to_BN() rejects
-	  non-ASN1_INTEGER objects. The format of INTEGER and ENUMERATED are
-	  almost identical so they behaved in the same way in OpenSSL <= 1.0.2.
-	  [ruby-core:75225] [Feature #12324]
-
-	* test/openssl/test_asn1.rb (test_decode_enumerated): Test that it
-	  works.
-
-Thu Jun  9 21:10:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* tool/ifchange: fix timestamp error when target without
-	  directory.
-
-Thu Jun  9 19:46:22 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ssl.c: Add define guards for OPENSSL_NO_EC.
-	  SSL_CTX_set_ecdh_auto() is defined even when ECDH is disabled in
-	  OpenSSL's configuration. This fixes r55214.
-
-	* test/openssl/test_pair.rb (test_ecdh_curves): Skip if the OpenSSL does
-	  not support ECDH.
-
-	* test/openssl/utils.rb (start_server): Ignore error in
-	  SSLContext#ecdh_curves=.
-
-Thu Jun  9 18:12:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (un-runnable): fail with proper error message.
-	  [ruby-core:75905] [Bug #12472]
-
-Thu Jun  9 15:32:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RBCONFIG): use ifchange tool to see if the content is
-	  changed and update the timestamp file.
-
-	* tool/mkconfig.rb: remove ifchange features.
-
-	* tool/ifchange: make target directory if it does not exist with
-	  its parent directories.
-
-	* win32/ifchange.bat: drop support for command.com used on old
-	  systems.
-
-Thu Jun  9 15:03:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check for CRYPTO_malloc() and SSL_new().
-	  OpenSSL_add_all_digests() and SSL_library_init() are deprecated and
-	  converted to macros in OpenSSL 1.1.0.
-	  [ruby-core:75225] [Feature #12324]
-
-Wed Jun  8 23:09:51 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* string.c (rb_str_ascii_casemap): fix compile error.
-
-Wed Jun  8 22:22:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Revert previous commit (possibility of endless loop).
-
-Wed Jun  8 21:57:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Special-case :ascii option in rb_str_upcase_bang.
-
-Wed Jun  8 21:28:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: New static function rb_str_ascii_casemap; special-casing
-	  :ascii option in rb_str_upcase_bang and rb_str_downcase_bang.
-
-	* regenc.c: Fix a bug (wrong use of unnecessary slack at end of string).
-
-	* regenc.h -> include/ruby/oniguruma.h: Move declaration of
-	  onigenc_ascii_only_case_map so that it is visible in string.c.
-
-Wed Jun  8 20:33:44 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/intern.h: Remove excess semicolons in PUREFUNC().
-	  Fix failure of TestMkmf::TestConvertible on Solaris with
-	  Oracle Solaris Studio 12. [ruby-dev:49651] [Bug #12470]
-	* internal.h: ditto.
-
-Wed Jun  8 16:03:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/smtp.rb (getok, get_response): raise an ArgumentError when
-	  CR or LF is included in a line, because they are not allowed in
-	  RFC5321.  Thanks, Jeremy Daer.
-
-Tue Jun  7 21:27:25 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/rubygems/*_{cert,cert_32}.pem: Regenerate test certificates for
-	  OpenSSL 1.1.0. This is already in upstream.
-	  https://github.com/rubygems/rubygems/commit/9be5c53939440a61c4bba73cfffbeb5cfadf72be
-	  [ruby-core:75225] [Feature #12324]
-
-Tue Jun  7 21:27:17 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/open-uri/test_ssl.rb: Regenerate test certificates. The test CA
-	  certificate was incorrectly generated. A CA certificate must have the
-	  basic constraints extension with cA bit set to TRUE. OpenSSL <= 1.0.2
-	  allowed the error when the certificate is in the trusted store but
-	  OpenSSL 1.1.0 no longer does.
-	  [ruby-core:75225] [Feature #12324]
-
-Tue Jun  7 21:20:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* test/openssl/test_x509name.rb: Don't register OID for 'emailAddress'
-	  and 'serialNumber'. A recent change in OpenSSL made OBJ_create()
-	  reject an already existing OID. They were needed to run tests with
-	  OpenSSL 0.9.6 which is now unsupported.
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=52832e470f5fe8c222249ae5b539aeb3c74cdb25
-	  [ruby-core:75225] [Feature #12324]
-
-	* test/openssl/test_ssl_session.rb (test_server_session): Duplicate
-	  SSL::Session before re-adding to the session store. OpenSSL 1.1.0
-	  starts rejecting SSL_SESSION once removed by SSL_CTX_remove_session().
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=7c2d4fee2547650102cd16d23f8125b76112ae75
-
-	* test/openssl/test_pkey_ec.rb (setup): Remove X25519 from @keys. X25519
-	  is new in OpenSSL 1.1.0 but this is for key agreement and not for
-	  signing.
-
-	* test/openssl/test_pair.rb, test/openssl/test_ssl.rb,
-	  test/openssl/utils.rb: Set security level to 0 when using aNULL cipher
-	  suites.
-
-	* test/openssl/utils.rb: Use 1024 bits DSA key for client certificates.
-
-	* test/openssl/test_engine.rb: Run each test in separate process.
-	  We can no longer cleanup engines explicitly as ENGINE_cleanup() was
-	  removed.
-	  https://git.openssl.org/gitweb/?p=openssl.git;a=commit;h=6d4fb1d59e61aacefa25edc4fe5acfe1ac93f743
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_cleanup): Add a note to the
-	  RDoc for Engine.cleanup.
-
-	* ext/openssl/lib/openssl/digest.rb: Don't define constants for DSS,
-	  DSS1 and SHA(-0) when using with OpenSSL 1.1.0. They are removed.
-
-	* test/openssl/test_digest.rb, test/openssl/test_pkey_dsa.rb,
-	  test/openssl/test_pkey_dsa.rb, test/openssl/test_ssl.rb,
-	  test/openssl/test_x509cert.rb, test/openssl/test_x509req.rb: Don't
-	  test unsupported hash functions.
-
-Tue Jun  7 17:49:52 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive: Change test for encodings
-	  without any non-ASCII case conversions from ASCII-only test
-	  to full test.
-
-Tue Jun  7 17:18:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang,
-	  rb_str_swapcase_bang): Switch to use primitive.
-
-Tue Jun  7 16:44:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c (rb_str_downcase_bang): Switch to use primitive except if
-	  conversion can be done ASCII-only.
-
-Tue Jun  7 16:13:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive: Add regression tests for
-	  current ASCII-only case conversion.
-
-Tue Jun  7 15:28:38 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive: Fix method name
-	  (generate_casefold_tests -> generate_case_mapping_tests).
-
-Tue Jun  7 15:05:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.h/c: Rename onigenc_not_support_case_map to
-	  onigenc_ascii_only_case_map.
-
-	* regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map.
-
-	* enc/iso_8859_X.c, windows_125X.c, ascii.c, us-ascii.c, koi8_x.c:
-	  Replace onigenc_not_support_case_map by
-	  onigenc_single_byte_ascii_only_case_map.
-
-	* enc/big5.c, cp949.c, emacs_mule.c, euc_X.c, gbX.c, shift_jis.c,
-	  windows_31j.c: Replace onigenc_not_support_case_map by
-	  onigenc_ascii_only_case_map.
-
-Tue Jun  7 14:57:09 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check for SSL_CTX_set_min_proto_version()
-	  macro added in OpenSSL 1.1.0. Version-specific methods, such as
-	  TLSv1_method(), are deprecated in OpenSSL 1.1.0. We need to use
-	  version-flexible methods (TLS_*method() or SSLv23_*method()) and
-	  disable other protocol versions as necessary.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/ossl_ssl.c: Use SSL_CTX_set_{min,max}_proto_version() to
-	  fix the protocol version.
-
-Tue Jun  7 12:55:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.c (onigenc_not_support_case_map): Move to end of file;
-	  (onigenc_single_byte_ascii_only_case_map): Add new function.
-
-Tue Jun  7 09:26:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.c (onigenc_not_support_case_map): Rewrite to work correctly
-	  in ASCII range.
-
-Mon Jun  6 23:00:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* appveyor.yml: Update libressl version to 2.3.5.
-
-Mon Jun  6 18:37:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_throw_start): check if the iseq is symbol
-	  proc, class definition should not be a symbol proc.
-	  [ruby-core:75856] [Bug #12462]
-
-Mon Jun  6 18:36:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Added UTF-16BE/LE and UTF-32BE/LE to supported encodings
-	  for Unicode case mapping.
-
-	* test/ruby/enc/test_case_comprehensive.rb: Tests for above
-	  functionality; fixed an encoding issue in assertion error message.
-
-Mon Jun  6 17:29:35 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Speed up testing for small
-	  encodings by preselecting codepoints.
-
-Mon Jun  6 17:10:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_free): Use EVP_CIPHER_CTX_free()
-	  to free EVP_CIPHER_CTX allocated by EVP_CIPHER_CTX_new().
-	  [ruby-core:75225] [Feature #12324]
-
-Mon Jun  6 13:37:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c Change rb_str_casemap to use encoding primitive
-	  case_map instead of directly calling onigenc_unicode_case_map.
-
-Mon Jun  6 13:16:46 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb:
-	  Remove :lithuanian guard for Unicode case mapping.
-
-Mon Jun  6 10:39:56 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.h: Include ruby/config.h. r55285 added
-	  some inline functions but VC does not recognize 'inline' keyword.
-
-Mon Jun  6 09:25:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (thread_start_func_2): report raised exception if
-	  report_on_exception flag is set.  [Feature #6647]
-
-Mon Jun  6 01:36:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check existence of SSL_is_server(). This
-	  function was introduced in OpenSSL 1.0.2.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/openssl_missing.h: Implement SSL_is_server() if missing.
-
-	* ext/openssl/ossl_ssl.c (ssl_info_cb): Use SSL_is_server() to see if
-	  the SSL is server. The state machine in OpenSSL was rewritten and
-	  SSL_get_state() no longer returns SSL_ST_ACCEPT.
-
-	  (ossl_ssl_cipher_to_ary, ossl_sslctx_session_get_cb): Add some
-	  `const`s to suppress warning.
-
-Mon Jun  6 01:18:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c (decode_bool): Do the same thing as
-	  d2i_ASN1_BOOLEAN() does by ourselves. This function is removed in
-	  OpenSSL 1.1.0.
-	  [ruby-core:75225] [Feature #12324]
-
-Mon Jun  6 00:34:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check existence of accessor functions that
-	  don't exist in OpenSSL 0.9.8. OpenSSL 1.1.0 made most of its
-	  structures opaque and requires use of these accessor functions.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/openssl_missing.[ch]: Implement them if missing.
-
-	* ext/openssl/ossl*.c: Use these accessor functions.
-
-	* test/openssl/test_hmac.rb: Add missing test for HMAC#reset.
-
-Mon Jun  6 00:00:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.[ch]: Implement EVP_PKEY_get0_*() and
-	  {RSA,DSA,EC_KEY,DH}_get0_*() functions.
-	  OpenSSL 1.1.0 makes EVP_PKEY/RSA/DSA/DH opaque. We used to provide
-	  setter methods for each parameter of each PKey type, for example
-	  PKey::RSA#e=, but this is no longer possible because the new API
-	  RSA_set0_key() requires the 'n' at the same time. This commit adds
-	  deprecation warning to them and adds PKey::*#set_* methods as direct
-	  wrapper for those new APIs. For example, 'rsa.e = 3' now needs to be
-	  rewritten as 'rsa.set_key(rsa.n, 3, rsa.d)'.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/ossl_pkey*.[ch]: Use the new accessor functions. Implement
-	  RSA#set_{key,factors,crt_params}, DSA#set_{key,pqg}, DH#set_{key,pqg}.
-	  Emit a warning with rb_warning() when old setter methods are used.
-
-	* test/drb/ut_array_drbssl.rb, test/drb/ut_drb_drbssl.rb,
-	  test/rubygems/test_gem_remote_fetcher.rb: Don't set a priv_key for DH
-	  object that are used in tmp_dh_callback. Generating a new key pair
-	  every time should be fine - actually the private exponent is ignored
-	  in OpenSSL >= 1.0.2f/1.0.1r even if we explicitly set.
-	  https://www.openssl.org/news/secadv/20160128.txt
-
-Sun Jun  5 22:06:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* configure.in: Fix the timing to detect the appropriate C++ compiler
-	  in OS X.
-
-Sun Jun  5 21:42:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check absence of CRYPTO_lock() to see if the
-	  OpenSSL has the new threading API. In OpenSSL <= 1.0.2, an application
-	  had to set locking callbacks to use OpenSSL in a multi-threaded
-	  environment. OpenSSL 1.1.0 now finds pthreads or Windows threads so we
-	  don't need to do something special.
-	  [ruby-core:75225] [Feature #12324]
-
-	  Also check existence of *_up_ref(). Some structures in OpenSSL have
-	  a reference counter. We used to increment it with CRYPTO_add() which
-	  is a part of the old API.
-
-	* ext/openssl/openssl_missing.h: Implement *_up_ref() if missing.
-
-	* ext/openssl/ossl.c: Don't set locking callbacks if unneeded.
-
-	* ext/openssl/ossl_pkey.c, ext/openssl/ossl_ssl.c,
-	  ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
-	  ext/openssl/ossl_x509store.c: Use *_up_ref() instead of CRYPTO_add().
-
-Sun Jun  5 21:38:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check if RAND_pseudo_bytes() is usable. It is
-	  marked as deprecated in OpenSSL 1.1.0.
-	  [ruby-core:75225] [Feature #12324]
-
-	* ext/openssl/ossl_rand.c: Disable Random.pseudo_bytes if
-	  RAND_pseudo_bytes() is unavailable.
-
-	* test/openssl/test_random.rb: Don't test Random.pseudo_bytes if not
-	  defined.
-
-Sun Jun  5 19:06:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* NEWS: Add news about Unicode-wide case mapping for
-	  String/Symbol#upcase/downcase/swapcase/capitalize(!).
-
-Sun Jun  5 15:24:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb:
-	  Remove :lithuanian guard for Unicode case mapping.
-
-Sun Jun  5 14:46:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Remove :lithuanian guard for Unicode case mapping.
-
-Sat Jun  4 10:54:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/crypt.h (struct crypt_data): remove unnecessary member
-	  "initialized".
-
-	* missing/crypt.c (des_setkey_r): nothing to be initialized in
-	  crypt_data.
-
-	* configure.in (struct crypt_data): check for "initialized" in
-	  struct crypt_data, which may be only in glibc, and isn't on AIX
-	  at least.
-
-Sat Jun  4 10:38:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c: unify MAX_PATH, _MAX_PATH, and MAXPATHLEN to
-	  PATH_MAX, except for MAX_PATH in get_special_folder for an API
-	  limit.
-
-Fri Jun  3 21:27:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): rb_str_conv_enc() never set encoding
-	  of the source string, but returns the string itself if the
-	  conversion failed.  then the instance variable does not need to
-	  be set again.
-
-Fri Jun  3 18:04:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (process_options): need to duplicate path before passing it to
-	  rb_str_conv_enc() because the function might call rb_enc_associate()
-	  internally.  this fixes test failures on Windows introduced at r55260.
-
-Fri Jun  3 17:44:25 2016  Reiner Herrmann  <reiner@reiner-h.de>
-
-	* lib/mkmf.rb (create_makefile): sort lists of source and object
-	  files in generated Makefile, unless given by extconf.rb.
-	  [Fix GH-1367]
-
-Thu Jun  2 21:18:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if
-	  available instead of old SHGetPathFromIDListW, to check the
-	  buffer size.
-
-Thu Jun  2 17:05:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_init_loadpath_safe): remove MAXPATHLEN restriction
-	  for Windows 10.
-
-Thu Jun  2 16:51:35 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* misc/ruby-mode.el (ruby-here-doc-beg-re),
-	  (ruby-here-doc-beg-match, ruby-parse-partial): Support for
-	  `squiggly heredoc' syntax in ruby-mode.  [Fix GH-1372]
-
-Thu Jun  2 10:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Raise ArgumentError when invalid string is detected in
-	  case mapping methods.
-
-	* enc/unicode.c: Check for invalid string and signal with negative
-	  length value.
-
-	* test/ruby/enc/test_case_mapping.rb: Add tests for above.
-
-	* test/ruby/test_m17n_comb.rb: Add a message to clarify test failure.
-
-Wed Jun  1 21:41:05 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Check existence of ASN1_TIME_adj(). The old
-	  ASN1_TIME_set() is not Year 2038 ready on sizeof(time_t) == 4
-	  environment. This function was added in OpenSSL 1.0.0.
-	  [ruby-core:45552] [Bug #6571]
-
-	* ext/openssl/ossl_asn1.c (ossl_time_split): Added. Split the argument
-	  (Time) into the number of days elapsed since the epoch and the
-	  remainder seconds to conform to ASN1_TIME_adj().
-	  (obj_to_asn1utime, obj_to_asn1gtime): Use ossl_time_split() and
-	  ASN1_*TIME_adj().
-
-	* ext/openssl/ossl_asn1.h: Add the function prototype for
-	  ossl_time_split().
-
-	* ext/openssl/ossl_x509.[ch]: Add ossl_x509_time_adjust(). Similarly to
-	  obj_to_asn1*time(), use X509_time_adj_ex() instead of X509_time_adj().
-
-	* ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
-	  ext/openssl/ossl_x509revoked.c: Use ossl_x509_time_adjust().
-
-Wed Jun  1 15:58:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: revert r55237.  replace crypt, not crypt_r, and
-	  check if crypt is broken more.
-
-	* missing/crypt.c: move crypt_r.c
-
-	* string.c (rb_str_crypt): use crypt_r if provided by the system.
-
-Wed Jun  1 14:07:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/crypt_r.c (a64toi): initialize statically and fix out of
-	  bounds access when salt is not 7bit clean.
-
-Wed Jun  1 11:34:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (MISSING): fixed build error introduced at r55237.
-
-Wed Jun  1 09:48:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_crypt): use reentrant crypt_r.
-
-Wed Jun  1 09:37:26 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* missing/crypt.c (des_setkey): void function never returns any value.
-
-Wed Jun  1 09:16:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* crypt.h: separate header file from missing/crypt.c.
-
-	* missing/crypt.c (crypt_r, setkey_r, encrypt_r): add reentrant
-	  versions.
-
-Wed Jun  1 02:25:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/crypt.c: fix size macros to use configured values
-	  for platforms long is larger than 32bit.
-	  [ruby-core:75792] [Bug #12446]
-
-Tue May 31 17:28:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
-	  nil as key names.  [ruby-core:75773] [Bug #12438]
-
-	* lib/optparse.rb (OptionParser#make_switch): char class option
-	  cannot be NoArgument, default to RequiredArgument.
-
-Tue May 31 00:30:11 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/raddrinfo.c (host_str, port_str): Use StringValueCStr
-	  instead of (Safe)StringValue, to detect NUL byte in the string.
-
-Mon May 30 22:02:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c (time_to_time_t): Use NUM2TIMET() instead of
-	  NUM2LONG(). time_t may be larger than long.
-	  [ruby-core:45552] [Bug #6571]
-
-Mon May 30 21:15:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Document current behavior for other case mapping methods
-	  on String. [ci skip]
-
-Mon May 30 20:00:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Document current situation for String#downcase. [ci skip]
-
-Mon May 30 18:29:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): Enable the automatic
-	  curve selection for ECDH by calling SSL_CTX_set_ecdh_auto(). With
-	  this a TLS server automatically selects a curve which both the client
-	  and the server support to use in ECDH. This changes the default
-	  behavior but users can still disable ECDH by excluding 'ECDH' cipher
-	  suites from the cipher list (with SSLContext#ciphers=). This commit
-	  also deprecate #tmp_ecdh_callback=. It was added in Ruby 2.3.0. It
-	  wraps SSL_CTX_set_tmp_ecdh_callback() which will be removed in OpenSSL
-	  1.1.0. Its callback receives two values 'is_export' and 'keylength'
-	  but both are completely useless for determining a curve to use in
-	  ECDH. The automatic curve selection was introduced to replace this.
-
-	  (ossl_sslctx_setup): Deprecate SSLContext#tmp_ecdh_callback=. Emit a
-	  warning if this is in use.
-
-	  (ossl_sslctx_set_ecdh_curves): Add SSLContext#ecdh_curves=. Wrap
-	  SSL_CTX_set1_curves_list(). If it is not available, this falls back
-	  to SSL_CTX_set_tmp_ecdh().
-
-	  (Init_ossl_ssl): Define SSLContext#ecdh_curves=.
-
-	* ext/openssl/extconf.rb: Check the existence of EC_curve_nist2nid(),
-	  SSL_CTX_set1_curves_list(), SSL_CTX_set_ecdh_auto() and
-	  SSL_CTX_set_tmp_ecdh_callback().
-
-	* ext/openssl/openssl_missing.[ch]: Implement EC_curve_nist2nid() if
-	  missing.
-
-	* test/openssl/test_pair.rb (test_ecdh_callback): Use
-	  EnvUtil.suppress_warning to suppress deprecated warning.
-
-	  (test_ecdh_curves): Test that SSLContext#ecdh_curves= works.
-
-	* test/openssl/utils.rb (start_server): Use SSLContext#ecdh_curves=.
-
-Mon May 30 16:28:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/raddrinfo.c (host_str, port_str): use RSTRING_LEN
-	  instead of strlen, since RSTRING_PTR StringValueCStr may not be
-	  NUL-terminated when SHARABLE_MIDDLE_SUBSTRING=1.  reported by
-	  @tmtms, http://twitter.com/tmtms/status/736910516229005312
-
-Mon May 30 16:20:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_fill_term): return new pointer reallocated by
-	  filling terminator.
-
-Mon May 30 14:54:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (enc_subseq): share the return value and
-	  the buffer as possible.
-
-Mon May 30 14:50:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_substr, rb_str_aref): refactor not to create
-	  unnecessary empty string.
-
-	* string.c (str_byte_substr, str_byte_aref): ditto.
-
-Mon May 30 00:09:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/-test-/auto_ext.rb: fixed a heedless bug introduced at r55198.
-	  this change will make RubyCI green.
-
-Sun May 29 22:58:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regexec.c (ONIGENC_IS_MBC_ASCII_WORD): redefine optimized one.
-	  WORD of Ruby's ascii compatible encoding is always [a-zA-Z0-9_].
-
-Sun May 29 22:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regexec.c (match_at): make compilers optimize harder.
-
-Sun May 29 12:08:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/auto_ext.rb (auto_ext): utility method to create
-	  extension libraries for tests.
-
-Sat May 28 20:40:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-additional.el (ruby-insert-heredoc-code-block): insert
-	  here document code block for assert_separately mainly.
-
-Sat May 28 20:34:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/test_unicode_normalize.rb: Add test to check for availability of
-	  Unicode data file; refactoring; fix an error with tests for destructive
-	  method (unicode_normalize!).
-
-Sat May 28 19:08:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add error messages to tests
-	  for data file availability; refactoring.
-
-Sat May 28 14:00:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/lib/openssl/ssl.rb (SSLSocket): Move the implementation of
-	  SSLSocket#initialize to C. Initialize the SSL (OpenSSL object) in it.
-	  Currently this is delayed until ossl_ssl_setup(), which is called from
-	  SSLSocket#accept or #connect. Say we call SSLSocket#hostname= with an
-	  illegal value. We expect an exception to be raised in #hostname= but
-	  actually we get it in the later SSLSocket#connect. Because the SSL is
-	  not ready at #hostname=, the actual call of SSL_set_tlsext_host_name()
-	  is also delayed.
-	  This also fixes: [ruby-dev:49376] [Bug #11724]
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_initialize): Added. Almost the same
-	  as the Ruby version but this instantiate the SSL object at the same
-	  time.
-
-	  (ossl_ssl_setup): Adjust to the changes. Just set the underlying IO to
-	  the SSL.
-
-	  (ssl_started): Added. Make use of SSL_get_fd(). This returns -1 if not
-	  yet set by SSL_set_fd().
-
-	  (ossl_ssl_data_get_struct): Removed. Now GetSSL() checks that the SSL
-	  exists.
-
-	  (ossl_ssl_set_session): Don't call ossl_ssl_setup() here as now the
-	  SSL is already instantiated in #initialize.
-
-	  (ossl_ssl_shutdown, ossl_start_ssl, ossl_ssl_read_internal,
-	   ossl_ssl_write_internal, ossl_ssl_stop, ossl_ssl_get_cert,
-	   ossl_ssl_get_peer_cert, ossl_ssl_get_peer_cert_chain,
-	   ossl_ssl_get_version, ossl_ssl_get_cipher, ossl_ssl_get_state,
-	   ossl_ssl_pending, ossl_ssl_session_reused,
-	   ossl_ssl_get_verify_result, ossl_ssl_get_client_ca_list,
-	   ossl_ssl_npn_protocol, ossl_ssl_alpn_protocol, ossl_ssl_tmp_key): Use
-	  GetSSL() instead of ossl_ssl_data_get_struct(). Use ssl_started().
-
-	  (Init_ossl_ssl): Add method declarations of SSLSocket#{initialize,
-	  hostname=}.
-
-	* ext/openssl/ossl_ssl.h (GetSSL): Check that the SSL is not NULL. It
-	  should not be NULL because we now set it in #initialize.
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize): No need
-	  to check if the SSL is NULL.
-
-Sat May 28 10:47:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update latest releases, power_assert-0.3.0,
-	  test-unit 3.1.9, minitest 5.9.0, did_you_mean 1.0.1
-
-Sat May 28 10:45:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* addr2line.c: drop support for ATARI ST platform. It was
-	  discontinued more than two decades ago. [fix GH-1350] Patch by
-	  @cremno
-	* include/ruby/ruby.h: ditto.
-	* io.c: ditto.
-
-Sat May 28 10:39:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Converted exception for
-	  unavailable Unicode data files to failed assertion.
-
-Sat May 28 10:26:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/cgi/util.rb: added missing quote.
-	  [fix GH-1363][ci skip] Patch by @dwaller
-
-Fri May 27 17:38:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_local_constants_i): exclude hidden constants.
-	  [ruby-core:75575] [Bug #12389]
-
-Fri May 27 17:09:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (str_transcode0): scrub in the given encoding when
-	  the source encoding is given, not in the encoding of the
-	  receiver.  [ruby-core:75732] [Bug #12431]
-
-Fri May 27 15:07:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): remove nul padding which
-	  caused syntax error if fmt is not a string literal.
-
-	* include/ruby/ruby.h (rb_scan_args_verify): suppress array-bounds
-	  warnings by old clang.
-
-	* include/ruby/ruby.h (rb_scan_args0): make extractor macros
-	  inline functions, which do not validate the format and are
-	  unnecessary to be expanded.
-
-Fri May 27 01:00:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* symbol.c (is_identchar): use ISDIGIT instead of rb_enc_isalnum.
-	  Though rb_enc_isalnum is encoding aware function, its argument here
-	  is *m, which is a single byte. Therefore ISDIGIT is faster.
-
-	* symbol.c (is_special_global_name): ditto.
-
-	* symbol.c (rb_enc_symname_type): ditto.
-
-Fri May 27 00:39:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): add nul padding here to
-	  apply to all references.
-
-	* include/ruby/ruby.h (rb_scan_args_verify): move length mismatch
-	  check outside conditional operators.
-
-Thu May 26 14:21:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH
-	  has 'p' (the prime) before calling DH_size(). We can create a DH with
-	  no parameter but DH_size() does not check and dereferences NULL.
-	  [ruby-core:75720] [Bug #12428]
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_sign): Ditto. DSA_size() does
-	  not check dsa->q.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
-	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
-	  ossl_rsa_private_decrypt): Ditto. RSA_size() does not check rsa->n.
-
-Thu May 26 14:13:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_count): verify length with
-	  counting variables together.
-
-Thu May 26 09:45:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_comprehensive.rb: Add set of comprehensive
-	  (across most Unicode characters; later across most character encodings)
-	  tests for case mapping.
-
-Thu May 26 05:00:13 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* class.c (rb_define_class): Fix documentation.
-
-Wed May 25 20:50:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (unescape_nonascii): scan hex up to only 3 characters.
-	  [Bug #12420] [Bug #12423]
-
-Wed May 25 19:07:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding.
-
-Wed May 25 18:30:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regparse.c (fetch_token_in_cc): raise error if given octal escaped
-	  character is too big. [Bug #12420] [Bug #12423]
-
-Wed May 25 17:45:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.
-
-Wed May 25 17:43:30 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/openssl_missing.h, ext/openssl/ossl.h: Remove
-	  unnecessary 'extern "C"' blocks. We don't use C++ and these headers
-	  are local to ext/openssl, so there is no need to enclose with it.
-
-Wed May 25 17:42:58 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: Remove check of OPENSSL_FIPS macro. This is
-	  unneeded because we can check the macro directly in source code,
-	  just as we already do for OPENSSL_NO_* macros.
-
-	* ext/openssl/ossl.c: Replace occurrences of HAVE_OPENSSL_FIPS with
-	  OPENSSL_FIPS.
-
-Wed May 25 17:13:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_scan_args): merge code for n_trail.
-
-Wed May 25 17:11:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_validate): move failed
-	  condition to the terminal.  [ruby-core:75714] [Bug #12426]
-
-Wed May 25 13:13:37 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c: remove condition for debug output because prelude
-	  doesn't use regexp now.
-
-Wed May 25 13:10:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regcomp.c (compile_length_tree): return error code immediately
-	  if compile_length_tree raised error [Bug #12418]
-
-Wed May 25 08:01:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fix flag error for switch from titlecase to lowercase.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for above error.
-
-Wed May 25 01:13:55 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c (ec_key_new_from_group): Create a new
-	  EC_KEY on given EC group. Extracted from ossl_ec_key_initialize().
-	  (ossl_ec_key_s_generate): Added. Create a new EC instance and
-	  generate a random private and public key.
-	  (ossl_ec_key_initialize): Use ec_key_new_from_group().
-	  (Init_ossl_ec): Define the new method EC.generate. This change is
-	  for consistency with other PKey types.  [ruby-core:45541] [Bug #6567]
-
-	* test/openssl/test_pkey_ec.rb: Test that EC.generate works.
-
-Wed May 25 00:37:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_generate_key): Fix up RDoc.
-	  (Init_ossl_ec): Rename EC#generate_key to EC#generate_key!. Make the
-	  old name an alias of #generate_key!. This change is for consistency
-	  with other PKey types.  [ruby-core:45541] [Bug #6567]
-
-	* test/openssl/test_pkey_ec.rb: Use EC#generate_key! instead of
-	  EC#generate_key.
-
-Wed May 25 00:23:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_set): check the arity after
-	  adjusting argc for an option hash, for optimization in simpler
-	  cases.
-
-Wed May 25 00:21:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (XCFLAGS): merge flags only for ruby itself from
-	  ruby_cflags.
-
-Tue May 24 22:04:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key, ossl_cipher_set_iv):
-	  Reject too long values as well as too short ones. Currently they
-	  just truncate the input but this would hide bugs and lead to
-	  unexpected encryption/decryption results.
-
-	* test/openssl/test_cipher.rb: Test that Cipher#key= and #iv= reject
-	  Strings with invalid length.
-
-Tue May 24 21:32:21 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): Use
-	  ASN1_OCTET_STRING_set() instead of M_ASN1_OCTET_STRING_set(). Macros
-	  prefixed by "M_" are discouraged to be used from outside OpenSSL
-	  library[1].
-	  (ossl_x509ext_get_value): Likewise, use ASN1_STRING_print() instead
-	  of M_ASN1_OCTET_STRING_print().
-	  [1] https://git.openssl.org/gitweb/?p=openssl.git;a=blob;f=CHANGES;h=bf61913d7b01212b4d8b2f3c13d71d645914f67c;hb=b6079a7835f61daa9fb2cbf9addfa86049523933#l878
-
-	* ext/openssl/ossl.h: Include openssl/asn1.h instead of
-	  openssl/asn1_mac.h. It just includes openssl/asn1.h and defines some
-	  additional "M_" macros.
-
-Tue May 24 18:52:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args_verify): verify the format to
-	  scan if no invalid chars and variable argument length matching,
-	  at the compile time if possible.
-
-Tue May 24 17:18:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/defines.h (ERRORFUNC, WARNINGFUNC): add fallback
-	  definitions.
-
-Tue May 24 16:37:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (ruby_cflags): separate from optflags [Bug #12409]
-	  -fexcess-precision=standard and -fp-model precise are set to this now.
-
-	* configure.in (cflags): use ruby_cflags.
-
-Tue May 24 16:20:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__
-	  attributes take a parenthesized string literal.
-
-Tue May 24 12:35:56 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* common.mk: sort lines, and add missing dependencies suggested
-	  by tool/update-deps
-
-Mon May 23 21:33:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/missing.h (isfinite): move from numeric.c.
-
-Mon May 23 21:09:06 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (Init_openssl): Avoid reference to unset global
-	  variable. ossl_raise() may be called before dOSSL is set. Since
-	  global variables default to 0 and the default value of dOSSL set in
-	  Init_openssl() is also Qfalse, there is no real issue but confusing.
-	  Patch by Bertram Scharpf <software@bertram-scharpf.de>
-	  [ruby-core:58264] [Bug #9101]
-
-Mon May 23 20:32:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_asn1.c, ext/openssl/ossl_bn.c,
-	  ext/openssl/ossl_cipher.c, ext/openssl/ossl_digest.c
-	  ext/openssl/ossl_engine.c, ext/openssl/ossl_ns_spki.c
-	  ext/openssl/ossl_pkcs12.c, ext/openssl/ossl_pkcs7.c
-	  ext/openssl/ossl_pkey.c, ext/openssl/ossl_pkey_ec.c
-	  ext/openssl/ossl_rand.c, ext/openssl/ossl_ssl.c
-	  ext/openssl/ossl_x509attr.c, ext/openssl/ossl_x509cert.c
-	  ext/openssl/ossl_x509ext.c, ext/openssl/ossl_x509store.c: Use
-	  StringValueCStr() where NUL-terminated string is expected.
-
-Mon May 23 20:20:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
-	  cygwin. [Bug #12417][ruby-core:75691]
-
-Mon May 23 19:41:27 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_rand.c (ossl_rand_egd, ossl_rand_egd_bytes):
-	  RAND_egd{_bytes,}() return -1 on failure, not 0.
-	  Patch by cremno phobia <cremno@mail.ru>
-	  [ruby-core:63795] [Bug #10053]
-	  (ossl_pseudo_bytes): Similar, RAND_pseudo_bytes() may return 0 or
-	  -1 on failure.
-
-Mon May 23 15:52:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
-	  exist.  fixed build error on Windows introduced at r55123.
-
-Mon May 23 13:19:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args0): make compile error if the
-	  format is wrong or does not match with the variable argument
-	  length if possible.
-
-Mon May 23 12:47:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args0): raise fatal error if
-	  variable argument length does not match, it is a bug in the code
-	  which uses rb_scan_args, not a runtime error.
-
-Mon May 23 12:30:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
-	  non-finite float values not to raise FloatDomainError.
-	  [ruby-core:75682] [Bug #12414]
-
-Mon May 23 12:21:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_fill): suppress warnings: 'item' may be used
-	  uninitialized in this function
-
-Mon May 23 07:41:49 2016  Eric Wong  <e@80x24.org>
-
-	* dir.c (dir_close): update RDoc for 2.3 #close change
-	  [ruby-core:75679] [Bug #12413]
-
-Sun May 22 20:01:21 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/timeridconv.rb: use finalizer trick instead of thread.
-
-	* test/drb/ut_timerholder.rb: ditto.
-
-Sun May 22 17:25:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_options.rb: adjust test class name
-	  to match file name
-
-Sun May 22 17:24:07 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* rename test/ruby/enc/test_casing_options.rb to test_case_options.rb
-	  for consistency
-
-Sun May 22 17:06:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (enc_arg, str_transcode_enc_args, econv_args):
-	  remove volatile, and add GC guards in callers.
-	  [ruby-core:75664] [Bug #12411]
-
-Sun May 22 16:27:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/-test-/integer/core_ext.c: move testutil/integer.c.
-
-	* test/lib/-test-/integer.rb: extract implementation details from
-	  test/unit/assertions.rb.  [Bug #12408]
-
-Sun May 22 14:57:43 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Extend OnigEncodingTypeDefine to define a
-	  new encoding primitive 'case_map' for case mapping
-
-	* enc/utf-8.c, utf_16be/le.c, utf_32be/le.c:
-	  add onigenc_unicode_case_map as case_map primitive
-
-	* enc/ascii.c, big5.c, cp949.c, emacs_mule.c, euc_jp/kr/tw.c, gb18030.c,
-	  gbk.c, iso_8859_1/2/3/4/5/6/7/8/9/10/11/13/14/15/16.c, koi8_r/u.c,
-	  shift_jis.c, us_ascii.c, windows_1250/1251/1252.c:
-	  add onigenc_not_support_case_map as case_map primitive
-
-Sun May 22 14:45:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* regenc.h/c: Define new function onigenc_not_support_case_map
-
-Sun May 22 12:14:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): use original rb_scan_args
-	  when fmt is dynamic.
-
-Sun May 22 11:41:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* class.c (rb_scan_args): moved to bottom of the file to make the
-	  effect of `#undef rb_scan_args` the minimum.
-
-	* include/ruby/ruby.h (rb_scan_args): overwrite only if GCC and
-	  optimized. Visual C++ 14 or later can compile it but make it
-	  conservative.
-
-Sat May 21 22:45:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with
-	  `inline`.  if gcc needs this duplication, do in ALWAYS_INLINE macro.
-
-Sat May 21 21:11:56 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_scan_args): use __VA_ARGS__ instead of
-	  va_arg to allow compilers optimize more aggressive.
-	  https://gustedt.wordpress.com/2011/07/10/avoid-writing-va_arg-functions/
-	  rb_scan_args is now expected to be statically resolved.
-
-Sun May 22 02:41:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c: remove hacky macro introduced at r30437.
-
-	* ext/zlib/zlib.c (gzfile_make_header): cast as long (instead of int).
-
-	* ext/zlib/zlib.c (gzfile_make_footer): ditto.
-
-Sat May 21 21:07:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (ALWAYS_INLINE): force compilers the function inlined.
-
-Sat May 21 16:16:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_stop): Don't free the SSL struct
-	  here. Since some methods such as SSLSocket#connect releases GVL,
-	  there is a chance of use after free if we free the SSL from another
-	  thread. SSLSocket#stop was documented as "prepares it for another
-	  connection" so this is a slightly incompatible change. However when
-	  this sentence was added (r30090, Add toplevel documentation for
-	  OpenSSL, 2010-12-06), it didn't actually. The current behavior is
-	  from r40304 (Correct shutdown behavior w.r.t GC., 2013-04-15).
-	  [ruby-core:74978] [Bug #12292]
-
-	* ext/openssl/lib/openssl/ssl.rb (sysclose): Update doc.
-
-	* test/openssl/test_ssl.rb: Test this.
-
-Sat May 21 14:41:14 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c: [DOC] Fix SSL client example. The variable name
-	  was wrong. Patch by Andreas Tiefenthaler <at@an-ti.eu> (@pxlpnk).
-	  [GH ruby/openssl#32]
-
-Sat May 21 14:25:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c: rename PKey::EC#private_key? and
-	  #public_key? to #private? and #public? for consistency with other
-	  PKey types. Old names remain as alias.  [ruby-core:45541] [Bug #6567]
-
-	* test/openssl/test_pkey_ec.rb (test_check_key): check private? and
-	  public? works correctly.
-
-Sat May 21 12:40:36 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial):
-	  Remove impossible EOFError raise. Patch by Zach Anker
-	  <zanker@squareup.com>.  [GH ruby/openssl#23]
-
-Sat May 21 11:18:42 2016  Evgeni Golov  <evgeni@golov.de>
-
-	* lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention
-	  IPv6.  [Fix GH-1349]
-
-Sat May 21 11:12:53 2016  Dan Martinez  <dfm@razorwind.org>
-
-	* io.c (Init_IO): [DOC] define dummy ARGF instead of ARGF.class to
-	  re-enable the generation of ARGF documentation.  [Fix GH-1358]
-
-Sat May 21 11:07:29 2016  0x01f7  <souk.0x01f7@gmail.com>
-
-	* doc/syntax/methods.rdoc (Method Names): add proper closing tag.
-	  [Fix GH-1356]
-
-Sat May 21 09:26:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_SETJMP): fix missing macro definition
-	  for the configured result.  fix up r55021.
-
-Sat May 21 00:36:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_execarg_commandline): build command line string
-	  from argument vector in rb_execarg.
-	  [ruby-core:75611] [Bug #12398]
-
-Fri May 20 23:25:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (ossl_pem_passwd_value): Added. Convert the
-	  argument to String with StringValue() and validate the length is in
-	  4..PEM_BUFSIZE. PEM_BUFSIZE is a macro defined in OpenSSL headers.
-	  (ossl_pem_passwd_cb): When reading/writing encrypted PEM format, we
-	  used to pass the password to PEM_def_callback() directly but it was
-	  problematic. It is not NUL character safe. And surprisingly, it
-	  silently truncates the password to 1024 bytes.  [GH ruby/openssl#51]
-
-	* ext/openssl/ossl.h: Add function prototype declaration of newly
-	  added ossl_pem_passwd_value().
-
-	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): Use
-	  ossl_pem_passwd_value() to validate the password String.
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize, ossl_dsa_export):
-	  ditto.
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize,
-	  ossl_ec_key_to_string): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize, ossl_rsa_export):
-	  ditto.
-
-	* test/openssl/test_pkey_{dsa,ec,rsa}.rb: test this.
-
-Fri May 20 23:45:53 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* id_table.c (list_id_table_init): When unaligned word access is
-	  prohibited and sizeof(VALUE) is 8 (64-bit machines),
-	  capa should always be even number for 8-byte word alignment
-	  of the values of a table. This code assumes that sizeof(ID) is 4,
-	  sizeof(VALUE) is 8, and xmalloc() returns 8-byte aligned memory.
-	  This fixes bus error on 64-bit SPARC Solaris 10.
-	  [Bug #12406][ruby-dev:49631]
-
-Fri May 20 22:30:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* symbol.h (rb_id2sym): Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
-
-Fri May 20 22:19:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* ext/date/date_core.c: [DOC] fix typos.
-	  [fix GH-1360] patched by @soundasleep
-
-Fri May 20 21:26:58 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* include/ruby/defines.h (RB_GNUC_EXTENSION, RB_GNUC_EXTENSION_BLOCK):
-	  macros for skipping __extension__ on non-GCC compilers.
-	* eval_error.c (warn_print): use RB_GNUC_EXTENSION_BLOCK instead of
-	  __extension__ because __extension__ is a GNU extension.
-	  Fix compile error on Solaris 10 with Oracle Solaris Studio 12.x.
-	  [Bug #12397] [ruby-dev:49629].
-	* internal.h (rb_fstring_cstr, rb_fstring_enc_cstr): ditto
-	* include/ruby/encoding.h (rb_enc_str_new, rb_enc_str_new_cstr): ditto
-	* include/ruby/intern.h (rb_str_new, rb_str_new_cstr,
-	  rb_usascii_str_new, rb_utf8_str_new, rb_tainted_str_new_cstr,
-	  rb_usascii_str_new_cstr, rb_utf8_str_new_cstr,
-	  rb_external_str_new_cstr, rb_locale_str_new_cstr,
-	  rb_str_buf_new_cstr, rb_str_cat_cstr, rb_exc_new_cstr): ditto
-
-Fri May 20 21:17:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c (fole_missing): make substring or dup to
-	  share the content if possible.
-
-Fri May 20 19:48:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (NEW_PARTIAL_MEMO_FOR): shrink buffer array not to
-	  mark non-VALUE fields.  fix check_rvalue_consistency abort with
-	  RGENGC_CHECK_MODE=2.
-
-	* internal.h (NEW_CMP_OPT_MEMO): exclude struct cmp_opt_data from
-	  the valid array range.
-
-	* enum.c (slicewhen_i): exclude inverted too.
-
-Thu May 19 21:21:57 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* re.c (rb_reg_match_m_p): [DOC] fix return value in rdoc.
-
-	* test/ruby/test_regexp.rb (TestRegexp#test_match_p): add some
-	  tests from document.
-
-Thu May 19 13:22:44 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
-	  X509_STORE and X509_STORE_CTX respectively. Since they don't share
-	  the ex_data index registry, we can't use the same index.
-	  (ossl_verify_cb): use the the correct index.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
-	  (ossl_x509stctx_verify): ditto.
-
-	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
-	  of ossl_store_{ctx_,}ex_verify_cb_idx.
-
-	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
-	  X509_STORE_get_ex_data.
-
-	* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
-	  X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
-
-Thu May 19 13:11:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): check that the
-	  argument is an OpenSSL::ASN1::Data before converting to ASN1_TYPE.
-	  This fixes SEGV on OpenSSL::X509::Attribute#value=(non-asn1-value).
-
-	* test/openssl/test_x509attr.rb: add tests for OpenSSL::X509::Attribute.
-
-Thu May 19 12:10:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_match_m_p): fix match against empty string.
-	  rb_str_offset returns the end when the position exceeds the
-	  length.  fix the range parameter of onig_search.
-	  [ruby-core:75604] [Bug #12394]
-
-Thu May 19 11:37:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (rb_reg_match_m_p): should return false if no match, as the
-	  document says.  [Feature #8110]
-
-Thu May 19 00:17:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (reg_names_iter): specify capacify
-
-Wed May 18 21:29:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread.c (recursive_list_access): a object id may be a Bignum.  so,
-	  the list must be a objhash, instead of a identhash.
-	  this fixes many test errors on mswin64 CI.
-
-Wed May 18 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_match_m_p): Introduce Regexp#match?, which returns
-	  bool and doesn't save backref.
-
-Wed May 18 16:52:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): pop errors
-	  leaked by PKCS12_parse(). This is a bug in OpenSSL, which exists
-	  in the versions before the version 1.0.0t, 1.0.1p, 1.0.2d.
-
-Wed May 18 16:04:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/downloader.rb (Downloader::RubyGems.download): verify gems
-	  only if RubyGems is 2.4 or later.  old RubyGems fails to verify
-	  almost all of bundled gems.
-
-Wed May 18 14:52:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_modify_expand): check integer overflow.
-	  [ruby-core:75592] [Bug #12390]
-
-Wed May 18 13:11:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (match_ary_subseq): get subseq of match array without creating
-	  temporary array.
-
-	* re.c (match_ary_aref): get element(s) of match array without creating
-	  temporary array.
-
-	* re.c (match_aref): Use match_ary_subseq with handling irregulars.
-
-	* re.c (match_values_at): Use match_ary_aref.
-
-Wed May 18 13:03:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_x509cert.c (ossl_x509_verify): X509_verify()
-	  family may put errors on 0 return (0 means verification failure).
-	  Clear OpenSSL error queue before return to Ruby. Since the queue is
-	  thread global, remaining errors in the queue can cause an unexpected
-	  error in the next OpenSSL operation.  [ruby-core:48284] [Bug #7215]
-
-	* ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto.
-
-	* ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto.
-
-	* ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error
-	  queue before re-raising exception.
-
-	* ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
-
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto.
-
-	* test/openssl: check that OpenSSL.errors is empty every time after
-	  running a test case.
-
-Wed May 18 12:07:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl.c (ossl_clear_error): Extracted from
-	  ossl_make_error(). This prints errors in the OpenSSL error queue if
-	  OpenSSL.debug is true, and clears the queue.
-	  (ossl_make_error): use ossl_clear_error().
-
-	* ext/openssl/ossl.h: add prototype declaration of ossl_make_error().
-	  (OSSL_BIO_reset) use ossl_clear_error() to clear the queue. Clearing
-	  silently makes debugging difficult.
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id): ditto.
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
-
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): ditto.
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
-	  (ossl_ec_group_initialize): ditto.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): ditto.
-
-Wed May 18 11:53:49 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_pkey_ec.c (ossl_ec_point_mul): Validate the
-	  arguments before passing to EC_POINT(s)_mul(). Add description of this
-	  method.  [ruby-core:65152] [Bug #10268]
-
-	* test/openssl/test_pkey_ec.rb (test_ec_point_mul): Test that
-	  OpenSSL::PKey::EC::Point#mul works.
-
-Wed May 18 11:19:59 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from
-	  GetBNPtr(). This doesn't raise exception but returns NULL on error.
-	  (GetBNPtr): Raise TypeError if conversion fails.
-	  (ossl_bn_eq): Implement BN#==.
-	  (ossl_bn_eql): #eql? should not raise TypeError even if the argument
-	  is not compatible with BN.
-	  (ossl_bn_hash): Implement BN#hash.
-
-	* ext/openssl/ossl_bn.c (Init_ossl_bn): Define #== and #hash.
-
-	* test/openssl/test_bn.rb: Test BN#eql?, #== and #hash
-
-Wed May 18 10:17:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_INTEGER_TYPE_P): new macro and
-	  underlying inline function to check if the object is an
-	  Integer (Fixnum or Bignum).
-
-Wed May 18 09:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum, hash_sum, hash_sum_i, enum_sum_i, sum_iter):
-	  Optimize for hashes when each method isn't redefined.
-
-Wed May 18 09:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum, int_range_sum): Extract int_range_sum from
-	  enum_sum.
-
-Wed May 18 03:16:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (match_values_at): fix regression at r55036.
-	  MatchData#values_at accepts Range.
-
-Wed May 18 02:02:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (match_aref): remove useless condition and call rb_fix2int.
-	  rb_reg_nth_match handles negative index.
-
-Wed May 18 01:57:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (match_values_at): MatchData#values_at supports named captures
-	  [Feature #9179]
-
-	* re.c (namev_to_backref_number): separated.
-
-Wed May 18 00:05:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum): Optimize for a range from int to int.
-
-	* test/ruby/test_enum.rb (test_range_sum): Move from test_range.rb,
-	  and add assertions for some conditions.
-
-	* test/ruby/test_enum.rb (test_hash_sum): Move from test_hash.rb.
-
-	* test/ruby/test_hash.rb, test/ruby/test_range.rb: Remove test_sum.
-
-Tue May 17 23:08:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum): [DOC] Write documentation.
-
-Tue May 17 22:53:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (enum_sum): Implement Enumerable#sum.
-
-	* test/ruby/test_enum.rb (test_sum): Test sum for Enumerable.
-
-	* test/ruby/test_hash.rb (test_sum): Test sum for Hash.
-
-	* test/ruby/test_range.rb (test_sum): Test sum for Range.
-
-Tue May 17 22:11:41 2016  Tanaka Akira  <akr@fsij.org>
-
-	* object.c, numeric.c, enum.c, ext/-test-/bignum/mul.c,
-	  lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rexml/xpath_parser.rb,
-	  lib/rubygems/specification.rb, lib/uri/generic.rb,
-	  bootstraptest/test_eval.rb, basictest/test.rb,
-	  test/-ext-/bignum/test_big2str.rb, test/-ext-/bignum/test_div.rb,
-	  test/-ext-/bignum/test_mul.rb, test/-ext-/bignum/test_str2big.rb,
-	  test/csv/test_data_converters.rb, test/date/test_date.rb,
-	  test/json/test_json_generate.rb, test/minitest/test_minitest_mock.rb,
-	  test/openssl/test_cipher.rb, test/rexml/test_jaxen.rb,
-	  test/ruby/test_array.rb, test/ruby/test_basicinstructions.rb,
-	  test/ruby/test_bignum.rb, test/ruby/test_case.rb,
-	  test/ruby/test_class.rb, test/ruby/test_complex.rb,
-	  test/ruby/test_enum.rb, test/ruby/test_eval.rb,
-	  test/ruby/test_iseq.rb, test/ruby/test_literal.rb,
-	  test/ruby/test_math.rb, test/ruby/test_module.rb,
-	  test/ruby/test_numeric.rb, test/ruby/test_range.rb,
-	  test/ruby/test_rational.rb, test/ruby/test_refinement.rb,
-	  test/ruby/test_rubyvm.rb, test/ruby/test_struct.rb,
-	  test/ruby/test_variable.rb, test/rubygems/test_gem_specification.rb,
-	  test/thread/test_queue.rb: Use Integer instead of Fixnum and Bignum.
-
-Tue May 17 15:26:10 2016  Tanaka Akira  <akr@fsij.org>
-
-	* [Feature #12005] Unify Fixnum and Bignum into Integer
-
-	* include/ruby/ruby.h (rb_class_of): Return rb_cInteger for fixnums.
-
-	* insns.def (INTEGER_REDEFINED_OP_FLAG): Unified from
-	  FIXNUM_REDEFINED_OP_FLAG and BIGNUM_REDEFINED_OP_FLAG.
-
-	* vm_core.h: Ditto.
-
-	* vm_insnhelper.c (opt_eq_func): Use INTEGER_REDEFINED_OP_FLAG instead
-	  of FIXNUM_REDEFINED_OP_FLAG.
-
-	* vm.c (vm_redefinition_check_flag): Use rb_cInteger instead of
-	  rb_cFixnum and rb_cBignum.
-	  (C): Use Integer instead of Fixnum and Bignum.
-
-	* numeric.c (fix_succ): Removed.
-	  (Init_Numeric): Define Fixnum as Integer.
-
-	* bignum.c (bignew): Use rb_cInteger instead of rb_cBignum.
-	  (rb_int_coerce): replaced from rb_big_coerce and return fixnums
-	  as-is.
-	  (Init_Bignum): Define Bignum as Integer.
-	  Don't define ===.
-
-	* error.c (builtin_class_name): Return "Integer" for fixnums.
-
-	* sprintf.c (ruby__sfvextra): Use rb_cInteger instead of rb_cFixnum.
-
-	* ext/-test-/testutil: New directory to test.
-	  Currently it provides utilities for fixnum and bignum.
-
-	* ext/json/generator/generator.c: Define mInteger_to_json.
-
-	* lib/mathn.rb (Fixnum#/): Redefinition removed.
-
-Tue May 17 11:58:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_BUILTIN_SETJMP): declare t as NORETURN
-	  to suppress warnings by -Wsuggest-attribute=noreturn.
-	  [ruby-core:75510] [Bug #12383]
-
-Tue May 17 10:40:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_SETJMP): needs the header and proper
-	  arguments for builtin setjmp functions.
-
-Mon May 16 20:00:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch
-
-Mon May 16 19:46:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Introducing ONIG_CASE_MAPPING compilation
-	  switch
-
-	* include/ruby/oniguruma.h, enc/unicode.h: Using ONIG_CASE_MAPPING
-	  compilation switch
-
-Mon May 16 19:29:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update xmlrpc-0.1.1. xmlrpc-0.1.0 didn't allow
-	  to install on 2.4.0dev.
-
-Mon May 16 13:28:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (FUNC_STDCALL, FUNC_CDECL, FUNC_FASTCALL): set
-	  macro names explicitly to the old names, which are accidentally
-	  changed at r54985, for backward compatibilities.
-	  fiddle also depends on these names to fallback to ANSI names.
-	  [ruby-core:75494] [Bug #12377]
-
-Mon May 16 11:39:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/xmlrpc.rb, lib/xmlrpc/*, test/xmlrpc: XMLRPC is bundled gem
-	  on Ruby 2.4. It is extracted to https://github.com/ruby/xmlrpc
-	  [Feature #12160][ruby-core:74239]
-	* gems/bundled_gems: ditto.
-
-Mon May 16 06:06:21 2016  Eric Wong  <e@80x24.org>
-
-	* proc.c: fix RDoc of Proc#===/call/yield/[]
-	  [Bug #12332]
-
-Sun May 15 20:55:31 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342]
-
-	* test/drb/ut_timerholder.rb: ditto.
-
-Sun May 15 16:15:25 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_entry): extract rb_ary_elt to organize if-conditions
-	  and check whether is embedded at once.
-
-Sun May 15 10:57:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even
-	  in the class context.  [ruby-core:75505] [Bug #12382]
-
-Sun May 15 03:13:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* iseq.h (struct iseq_compile_data): use struct rb_id_table
-	  instead of st_table.
-
-	* iseq.c (prepare_iseq_build): don't allocate ivar_cache_table
-	  until it has at least one element.
-
-	* iseq.c (compile_data_free): free ivar_cache_table only if it
-	  is allocated.
-
-	* compile.c (get_ivar_ic_value): allocate if the table is not
-	  allocated yet.
-
-Sat May 14 09:04:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (pkg_config): use xsystem consistently to set up
-	  library path environment variable as well as latter pkg-config
-	  calls.  [ruby-dev:49619] [Bug #12379]
-
-Sat May 14 00:16:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (make_seed_value): append leading-zero-guard and get
-	  rid of making a local copy of the seed.
-
-Fri May 13 08:46:42 2016  cremno  <cremno@mail.ru>
-
-	* NEWS: drop FreeBSD < 4 support.  [Fix GH-1339]
-	  The most recent version affected by this is 3.5 and was released
-	  in 2000.
-	  https://www.freebsd.org/releases/3.5R/announce.html
-	  https://en.wikipedia.org/wiki/History_of_FreeBSD#Version_history
-
-Fri May 13 03:12:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/defines.h (GCC_VERSION_SINCE): moved from internal.h.
-
-Fri May 13 03:11:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (__builtin_constant_p): check.
-
-	* internal.h: Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
-
-Fri May 13 03:10:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: use alternative keyword
-	  to avoid macros conflicts with them.
-
-Thu May 12 01:54:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_func): get rid of conflict of declarations of
-	  main().  checking local symbol reference does not make sense.
-
-Thu May 12 00:18:19 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (HAVE_QSORT_S): use qsort_s only for Visual Studio
-	  2012 or later, because VS2010 seems to causes a SEGV in
-	  test/ruby/test_enum.rb.
-
-Wed May 11 23:59:47 2016  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_getivar): describe fast-path explicit
-	  (compiler friendly). [Bug #12274].
-
-Wed May 11 21:30:07 2016  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): share InlineCache during same
-	  instance variable accesses. Reducing memory consumption,
-	  rising cache hit rate and rising branch prediction hit rate
-	  are expected. A part of [Bug #12274].
-
-	* iseq.h (struct iseq_compile_data): introduce instance
-	  variable IC table for sharing.
-
-	* iseq.c (prepare_iseq_build, compile_data_free):
-	  construct/destruct above table.
-
-Wed May 11 17:18:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_qsort): use qsort_s if available, for Microsoft
-	  Visual Studio 2005 (msvcr80.dll) and mingw.
-
-Wed May 11 10:33:26 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* COPYING: Remove trailing-whitespaces.
-	  [ci skip][fix GH-1348]
-
-Tue May 10 21:05:45 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* insns.def (defineclass): Also raise an error when redeclaring the
-	  superclass of a class as Object and it has another superclass.
-	  [Bug #12367] [ruby-core:75446]
-
-	* test/ruby/test_class.rb: test for above.
-
-Tue May 10 14:57:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (obj_random_bytes): base on bytes method instead of
-	  rand method, not to call toplevel rand method.
-
-Tue May 10 13:07:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (-fexcess-precision=standard): before r54895 -std=c99
-	  is specified and it implied -fexcess-precision=standard.
-	  Now with -std=gnu99, it should be explicitly specified.
-	  https://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html
-
-Mon May  9 10:51:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_atfork_internal): move th to an argument.
-
-	* thread.c (rb_thread_atfork): do not repeat GET_THREAD().
-
-Mon May  9 10:46:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do
-	  nothing unless working fork is available.
-
-	* thread_sync.c (rb_mutex_abandon_all): define only if working
-	  fork is available.
-
-	* thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto.
-
-	* thread_sync.c (rb_mutex_abandon_locking_mutex): ditto.
-
-	* thread_win32.c (gvl_init): never used.
-
-Mon May  9 07:18:06 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/{defines,ruby}.h: need to define function attributes
-	  alternatives in defines.h instead of ruby.h, because they are used
-	  in oniguruma.h and the header used without including ruby.h at
-	  encoding library sources.
-
-Mon May  9 06:30:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on
-	  non-gcc build environments introduced at r54952.
-
-Mon May  9 02:51:51 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (rb_gc_unprotect_logging): throw rb_memerror when it cannot
-	  allocate memory. This is pointed out by Facebook's Infer.
-
-	* gc.c (gc_prof_setup_new_record): ditto.
-
-	* regparse.c (parse_regexp): ditto.
-
-	* util.c (MALLOC): use xmalloc and xfree like above.
-
-Mon May  9 02:39:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: check function attribute const and pure,
-	  and define CONSTFUNC and PUREFUNC if available.
-	  Note that I don't add those options as default because
-	  it still shows many false-positive (it seems not to consider
-	  longjmp).
-
-	* vm_eval.c (stack_check): get rb_thread_t* as an argument
-	  to avoid duplicate call of GET_THREAD().
-
-Sun May  8 21:01:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: assume it doesn't have SSLv2 related
-	  functions when OPENSSL_NO_SSL2 is defined.
-	  Usually openssl's header and the library (libssl) have the same
-	  set of functions, but on some environment the library has functions
-	  whose headers doesn't declare. (openssl/opensslconf.h and libssl.so
-	  aren't be synchronized)
-	  To detect such case explicitly check feature macro and remove
-	  related functions.
-
-Sun May  8 18:51:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_home_dir_of): return the default home path if the
-	  user name is the current user name, on platforms where struct
-	  pwd is not supported.  a temporary measure against
-	  [Bug #12226].
-
-Sun May  8 08:51:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: add -Wsuggest-attribute=format and suppress warnings.
-
-Sun May  8 08:31:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: add -Wsuggest-attribute=noreturn and suppress warnings.
-
-Sun May  8 08:19:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: add -Werror=implicit-int to avoid missing type of
-	  function declaration.
-
-Sat May  7 22:22:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/ssl.rb: Accept string value for SSLCertName. It is used
-	  to invoke ssl server with command line.
-	  [fix GH-1329] Patch by @kerlin
-	* test/webrick/test_ssl_server.rb: Added test for GH-1329
-
-Sat May  7 21:55:12 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/webrick/test_ssl_server.rb: Added basic test for `webrick/ssl`
-
-Sat May  7 16:22:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (int_pair_to_real_inclusive): optimize to multiply
-	  without Bignum.
-
-Sat May  7 07:58:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_exec_getargs): honor the expected argument types
-	  over the conversion method.  the basic language functionality
-	  should be robust.  [ruby-core:75388] [Bug #12355]
-
-Fri May  6 08:16:26 2016  David Silva  <david.silva@digital.cabinet-office.gov.uk>
-
-	* enum.c (enum_find): [DOC] add more examples to the documentation
-	  of Enumerable#detect, to show that it equals to Enumerable#find.
-	  [Fix GH-1340]
-
-Thu May  5 18:08:31 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* test/ruby/test_complexrational.rb: Remove duplicated raise.
-
-Thu May  5 14:41:05 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* string.c (rb_str_sub): Fix a special match variable name.
-	  [ci skip]
-
-Thu May  5 12:22:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_eval_cmd, rb_catch_obj): use TH_JUMP_TAG with the
-	  same rb_thread_t used for TH_PUSH_TAG, instead of JUMP_TAG with
-	  the current thread global variable.
-
-Thu May  5 10:49:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* random.c (fill_random_bytes_syscall): use arc4random_buf if
-	  available.
-
-Wed May  4 23:13:58 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* numeric.c (fix_plus): Remove rb_nucomp_add prototype
-	  declaration.
-
-	* numeric.c (fix_mul): Remove rb_nucomp_mul prototype
-	  declaration.
-
-	* internal.h (rb_nucomp_add, rb_nucomp_mul): add prototype
-	  declarations.
-
-Wed May  4 18:38:00 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/net/http/header.rb (Net::HTTPHeader#{each_header,each_name,
-	  each_capitalized_name,each_value,each_capitalized}): Return
-	  sized enumerators.
-
-	* test/net/http/test_httpheader.rb: add test for above.
-
-Wed May  4 17:53:15 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* lib/set.rb (Set#{delete_if,keep_if,collect!,reject!,select!,classify,divide},
-	  SortedSet#{delete_if,keep_if}): Return sized enumerators.
-
-	* test/test_set.rb: add test for above.
-
-Tue May  3 23:25:48 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* numeric.c: [DOC] Update result of 123456789 ** -2.
-	  [ruby-dev:49606] [Bug #12339]
-
-Tue May  3 23:13:16 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
-	  instead of duplicated undef RCOMPLEX_SET_REAL.
-
-Tue May  3 22:55:07 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* complex.c (rb_complex_set_imag): Fix to properly set imag
-	  of complex.
-
-Tue May  3 22:19:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (warnflags): use -std=gnu99 instead of
-	  -std=iso9899:1999. [Feature #12336]
-
-Tue May  3 22:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (count_utf8_lead_bytes_with_word): Use __builtin_popcount
-	  only if it can use SSE 4.2 POPCNT whose latency is 3 cycle.
-
-	* internal.h (rb_popcount64): use __builtin_popcountll because now
-	  it is in fast path.
-
-Tue May  3 14:19:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (new_if_gen): set newline flag to NODE_IF to trace all
-	  if/elsif statements.  [ruby-core:67720] [Bug #10763]
-
-Tue May  3 05:35:54 2016  Eric Wong  <e@80x24.org>
-
-	* process.c (disable_child_handler_fork_child):
-	  initialize handler for SIGPIPE for !POSIX_SIGNAL
-
-Mon May  2 23:03:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new
-	  truncate alternative which accepts UTF-8 path.
-
-	* file.c (truncate): use above function.
-	  [Bug #12340]
-
-Mon May  2 20:59:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (str_coderange): to avoid function call when the string already
-	  has coderange information.
-
-	* re.c (rb_reg_prepare_enc): add shortcut path when the regexp has
-	  the same encoding of given string.
-
-	* re.c (rb_reg_prepare_re): avoid duplicated allocation of
-	  onig_errmsg_buffer.
-
-
-Mon May  2 12:34:52 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_refinement.rb (test_inspect): Use Integer instead of
-	  Fixnum.
-
-Mon May  2 06:58:38 2016  Tanaka Akira  <akr@fsij.org>
-
-	* complex.c: Don't refer rb_cFixnum and rb_cBignum.
-	  (k_fixnum_p): Use FIXNUM_P.
-	  (k_bignum_p): Use RB_TYPE_P.
-
-Mon May  2 01:27:59 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_numeric.rb (test_step): Use Integer::FIXNUM_MAX.
-
-Mon May  2 01:15:01 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_module.rb (test_name): Use Integer instead of Fixnum.
-
-Mon May  2 01:00:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/test/unit/assertions.rb (assert_fixnum): Defined.
-	  (assert_bignum): Defined.
-
-	* test/ruby/test_bignum.rb: Use assert_bignum.
-
-	* test/ruby/test_integer_comb.rb: Use assert_fixnum and assert_bignum.
-
-	* test/ruby/test_optimization.rb: Ditto.
-
-Mon May  2 00:41:53 2016  Tanaka Akira  <akr@fsij.org>
-
-	* vm_trace.c (recalc_remove_ruby_vm_event_flags): Add a cast to
-	  avoid signed integer overflow.
-
-Mon May  2 00:06:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/envutil.rb: Define Integer::{FIXNUM_MIN,FIXNUM_MAX}.
-
-	* test/ruby/test_bignum.rb: Use Integer::{FIXNUM_MIN,FIXNUM_MAX}.
-
-	* test/ruby/test_bignum.rb: Ditto.
-
-	* test/ruby/test_integer_comb.rb: Ditto.
-
-	* test/ruby/test_marshal.rb: Ditto.
-
-	* test/ruby/test_optimization.rb: Ditto.
-
-Sun May  1 23:59:59 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* array.c (rb_ary_sum): fix for mathn
-
-	* test/ruby/test_array.rb (test_sum): ditto.
-
-Sun May  1 23:51:54 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Options#non_options): fixed wrong regexp.
-	  if both positives and negatives were specified, positives had to
-	  be specified from the beginning.
-
-Sun May  1 21:00:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c: drop Win2K support.
-
-Sun May  1 20:39:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4
-	  support leftovers.
-	  [fix GH-1328] patched by @cremno
-
-Sun May  1 07:30:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (search_nonascii): use nlz on big endian environments.
-
-	* internal.h (nlz_intptr): defined.
-
-Sun May  1 00:03:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (__builtin_ctz): check.
-
-	* configure.in (__builtin_ctzll): check.
-
-	* internal.h (rb_popcount32): defined for ntz_int32.
-	  it can use __builtin_popcount but this function is not used on
-	  GCC environment because it uses __builtin_ctz.
-	  When another function uses this, using __builtin_popcount
-	  should be re-considered.
-
-	* internal.h (rb_popcount64): ditto.
-
-	* internal.h (ntz_int32): defined for ntz_intptr.
-
-	* internal.h (ntz_int64): defined for ntz_intptr.
-
-	* internal.h (ntz_intptr): defined as ntz for uintptr_t.
-
-	* string.c (search_nonascii): unroll and use ntz.
-
-Sat Apr 30 21:54:13 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (Init_Numeric): Gather Fixnum method definitions.
-
-Sat Apr 30 21:28:14 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_div): Define Integer#/.
-
-	* bignum.c (rb_big_div): Don't define Bignum#/.
-
-	* lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/.
-
-Sat Apr 30 21:11:08 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_plus): Define Integer#+.
-
-	* bignum.c (rb_big_plus): Don't define Bignum#+.
-
-Sat Apr 30 21:01:20 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_minus): Define Integer#-.
-
-	* bignum.c (rb_big_minus): Don't define Bignum#-.
-
-Sat Apr 30 20:53:33 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_mul): Define Integer#*.
-
-	* bignum.c (rb_big_mul): Don't define Bignum#*.
-
-Sat Apr 30 20:30:44 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_modulo): Define Integer#%.
-
-	* bignum.c (rb_big_modulo): Don't define Bignum#%.
-
-Sat Apr 30 20:17:08 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_equal): Define Integer#==.
-
-	* bignum.c (rb_big_eq): Don't define Bignum#==.
-
-Sat Apr 30 19:41:15 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_gt): Define Integer#>.
-
-	* bignum.c (rb_big_gt): Don't define Bignum#>.
-	  Renamed from big_gt.
-
-	* internal.h (rb_big_gt): Declared.
-
-Sat Apr 30 19:24:40 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_ge): Define Integer#>=.
-
-	* bignum.c (rb_big_ge): Don't define Bignum#>=.
-	  Renamed from big_ge.
-
-	* internal.h (rb_big_ge): Declared.
-
-Sat Apr 30 19:20:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/standard_library.rdoc: Remove obsoleted classes and modules.
-
-Sat Apr 30 19:09:23 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_lt): Define Integer#<.
-
-	* bignum.c (rb_big_lt): Don't define Bignum#<.
-	  Renamed from big_lt.
-
-	* internal.h (rb_big_lt): Declared.
-
-Sat Apr 30 18:44:05 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_le): Define Integer#<=.
-
-	* bignum.c (rb_big_le): Don't define Bignum#<=.
-	  Renamed from big_le.
-
-	* internal.h (rb_big_le): Declared.
-
-Sat Apr 30 18:11:44 2016  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (Init_Bignum): Define Integer::GMP_VERSION.
-
-Sat Apr 30 16:58:18 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_remainder): Define Integer#remainder.
-
-	* bignum.c (rb_big_remainder): Don't define Bignum#remainder.
-
-	* internal.h (rb_big_remainder): Declared.
-
-Sat Apr 30 15:29:24 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_uminus): {Fixnum,Bignum}#-@ is unified into
-	  Integer.
-
-	* bignum.c (rb_big_uminus): Don't define Bignum#-@.
-
-Sat Apr 30 14:42:20 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_idiv): {Fixnum,Bignum}#div is unified into
-	  Integer.
-
-	* bignum.c (rb_big_idiv): Don't define Bignum#div.
-
-Sat Apr 30 14:25:55 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_modulo): {Fixnum,Bignum}#modulo is unified into
-	  Integer.
-
-	* bignum.c (rb_big_modulo): Don't define Bignum#modulo.
-
-Sat Apr 30 14:04:30 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_divmod): {Fixnum,Bignum}#divmod is unified into
-	  Integer.
-
-	* bignum.c (rb_big_divmod): Don't define Bignum#divmod.
-
-Sat Apr 30 13:20:00 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into
-	  Integer.
-
-	* bignum.c (rb_big_fdiv): Don't define Bignum#fdiv.
-
-Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_pow): {Fixnum,Bignum}#** is unified into
-	  Integer.
-
-	* bignum.c (rb_big_pow): Don't define Bignum#**.
-
-Sat Apr 30 12:28:59 2016  Tanaka Akira  <akr@fsij.org>
-
-	* bignum.c (rb_big_comp): Renamed from rb_big_neg.
-
-	* numeric.c (fix_comp): Renamed from fix_rev.
-
-Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into
-	  Integer.
-
-	* bignum.c (rb_big_neg): Don't define Bignum#~.
-
-	* internal.h (rb_big_neg): Declared.
-
-Sat Apr 30 12:07:42 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_and): {Fixnum,Bignum}#& is unified into
-	  Integer.
-
-	* bignum.c (rb_big_and): Don't define Bignum#&.
-
-Sat Apr 30 11:56:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/thread: removed dummy extension library.  thread_sync.c
-	  provides "thread.rb" already.
-
-Sat Apr 30 11:53:48 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_or): {Fixnum,Bignum}#| is unified into
-	  Integer.
-
-	* bignum.c (rb_big_or): Don't define Bignum#|.
-
-Sat Apr 30 11:18:47 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* vm_trace.c: Fix typos. [ci skip]
-
-Sat Apr 30 10:09:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (establishShell): honor USER environment variable
-	  and login name over uid, one uid can be shared by some login
-	  names.
-
-Fri Apr 29 22:40:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/maintainers.rdoc (ext/io/nonblock): still maintained, as
-	  well as ext/io/wait, which is the origin.
-
-Fri Apr 29 21:18:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* doc/maintainers.rdoc (ext/win32): of course, it's still maintained.
-
-Fri Apr 29 21:03:10 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* gems/bundled_gems: Update latest gems, test-unit-3.1.8 and rake-11.1.2.
-
-Fri Apr 29 20:43:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Update latest maintainers list on Ruby 2.4
-
-Fri Apr 29 19:52:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Removed deprecated entries. These are already deleted.
-
-Fri Apr 29 19:48:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/maintainers.rdoc: Removed Ruby 1.8 entries. It's not necessary to
-	  Ruby 2.4 or later.
-
-Thu Apr 28 17:03:17 2016  Nicholas Maccharoli  <nmaccharoli@gmail.com>
-
-	* hash.c (rb_hash_update_{block,func}_callback): dry up hash
-	  update callback code.  [Fix GH-1338]
-
-Thu Apr 28 16:52:05 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_prepare_enc): use rb_enc_asciicompat(enc) instead of
-	  rb_enc_str_asciicompat_p(str) to avoid useless rb_enc_get(str) call.
-
-Thu Apr 28 16:33:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: [DOC] fix example code.  base on the code by
-	  Semyon Gaivoronskiy in [ruby-core:75224].  [Bug #12323]
-
-Thu Apr 28 09:33:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.4.
-	  Please see entries of 2.6.4 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-
-Thu Apr 28 04:49:07 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in (rb_cv_lgamma_r_pm0): check if lgamma_r(+0.0)
-	  returns positive infinity, in addition to lgamma_r(-0.0).
-	  AIX returns an incorrect result of negative infinity.
-
-	* math.c (ruby_lgamma_r): handle +0.0, in addition to -0.0.
-
-Thu Apr 28 01:11:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c: define _DEFAULT_SOURCE because glibc 2.20 deprecates
-	  _BSD_SOURCE.
-	  https://sourceware.org/glibc/wiki/Release/2.20
-
-Thu Apr 28 00:27:55 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into
-	  Integer.
-
-	* bignum.c (rb_big_xor): Don't define Bignum#^.
-
-Wed Apr 27 20:53:59 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into
-	  Integer.
-
-	* bignum.c (rb_big_aref): Don't define Bignum#<<.
-
-	* internal.h (rb_big_aref): Declared.
-
-Wed Apr 27 16:10:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/instruction.rb: fix to follow current implementation.
-
-Wed Apr 27 15:47:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_s_new): warn if a block is given,
-	  as well as IO.new.
-
-Wed Apr 27 14:29:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (ruby_only_for_internal_use): raise fatal error when
-	  deprecated function only for internal use is called, not just a
-	  warning.
-
-Tue Apr 26 23:42:30 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (rel): should not raise exceptions even if
-	  the user input is wrong.  only reports the error and continue process.
-
-Tue Apr 26 23:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (process_options): convert -e script to the encoding
-	  given by a command line option on Windows.  assume it is the
-	  expected encoding.  [ruby-dev:49461] [Bug #11900]
-
-Tue Apr 26 21:11:02 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into
-	  Integer.
-
-	* bignum.c (rb_big_lshift): Don't define Bignum#<<.
-
-Tue Apr 26 20:59:40 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into
-	  Integer.
-
-	* bignum.c (rb_big_rshift): Don't define Bignum#>>.
-
-Tue Apr 26 20:46:16 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer.
-
-	* bignum.c (rb_big_size_m): Don't define Bignum#size.
-
-	* internal.h (rb_big_size_m): Declared.
-
-Tue Apr 26 20:09:08 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (rb_int_bit_length): {Fixnum,Bignum}#bit_length is
-	  unified into Integer.
-
-	* bignum.c (rb_big_bit_length): Don't define Bignum#bit_length.
-
-	* internal.h (rb_big_bit_length): Declared.
-
-Tue Apr 26 19:56:16 2016  Tanaka Akira  <akr@fsij.org>
-
-	* numeric.c (int_abs): Integer#{abs,magnitude} moved from
-	  Fixnum and Bignum.
-
-	* bignum.c (rb_big_abs): Don't define Bignum#{abs,magnitude}.
-
-	* internal.h (rb_big_abs): Declared.
-
-Mon Apr 25 14:39:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/rbconfig/sizeof/extconf.rb: just check the existence of each
-	  types, to reduce configuration time, especially cross-compiling.
-
-	* template/sizes.c.tmpl: calculate sizes of checked types at
-	  compilation time.
-
-Mon Apr 25 11:27:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* doc/extension.rdoc: Improvements to english grammars.
-	  [Bug #12246][ruby-core:74792][ci skip]
-
-Mon Apr 25 11:17:50 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
-	  [Bug #12313][ruby-core:75147][ci skip]
-	* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
-
-Sun Apr 24 23:29:16 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in: add missing -lm for AIX.
-
-Sun Apr 24 18:33:58 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
-
-	* vm_insnhelper.c (INLINE): disable r54738 if __NO_INLINE__ is defined.
-	  It caused "undefined reference to `vm_getivar'".
-
-Sun Apr 24 09:32:12 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* test/ruby/test_array.rb: Add test cases for Array#sum with
-	  non-numeric objects.
-
-Sun Apr 24 04:21:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_insnhelper.c (INLINE): define as `inline` when it is optimized.
-	  define as `static inline` when it is not optimized to keep
-	  the symbol generated.
-
-	* vm_insnhelper.c (vm_getivar): use `INLINE` to force inline
-	  so that a compiler inlines it into vm_getinstancevariable
-	  and optimizes out is_attr and related branches.
-
-	* vm_insnhelper.c (vm_getivar): use `inline` to recommend inline.
-	  Without this vm1_ivar_set is degraded.
-
-	  benchmark results:
-	  minimum results in each 5 measurements.
-	  Execution time (sec)
-	  name    ruby 2.4.0dev (2016-04-23 trunk 54727) [x86_64-linux]   ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux]       built-ruby
-	  loop_whileloop 0.641                                                   0.642 0.646
-	  vm1_ivar* 1.002                                                   0.999 0.831
-	  vm1_ivar_set* 0.369                                                   1.106 0.362
-
-	  Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23
-	  trunk 54727) [x86_64-linux]' (greater is better)
-	  name    ruby 2.4.0dev (2016-04-23 trunk 54733) [x86_64-linux]
-	  built-ruby
-	  loop_whileloop
-	  0.998        0.991
-	  vm1_ivar*
-	  1.003        1.205
-	  vm1_ivar_set*
-	  0.334        1.018
-
-Sat Apr 23 18:01:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_getivar): specify inline instead of static inline.
-	  vm_getivar is called by vm_call_ivar and vm_getinstancevariable.
-	  At least with GCC 4.8 and 5.3 on Linux, they are inlining it into
-	  vm_call_ivar but not vm_getinstancevariable.
-	  By `inline`, they correctly inline it and gains performance.
-
-	  Speedup ratio: compare with the result of `ruby 2.4.0dev (2016-04-23
-	  trunk 54727) [x86_64-linux]' (greater is better)
-	  name    built-ruby
-	  loop_whileloop       1.001
-	  vm1_ivar*            1.189
-	  vm1_ivar_set*        1.024
-
-	  Note the `inline`'s meaning is different between old GCC
-	  and C99. Old GCC's inline means C99's extern inline.
-	  https://gcc.gnu.org/onlinedocs/gcc/Inline.html
-	  Since Ruby specify -std=iso9899:1999, it works like C99.
-
-Sat Apr 23 16:11:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY
-	  by user side to improve generality.
-
-Sat Apr 23 16:10:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_LIKELY): use prefix in ruby.h.
-
-	* intern.h (LIKELY): define with RB_LIKELY.
-
-Sat Apr 23 13:27:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* NEWS: Add descriptions for Time#to_time updates.
-	  [Bug #12271]
-
-Sat Apr 23 13:21:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* NEWS: Add descriptions for DateTime#to_time updates.
-	  [Bug #12189]
-
-Sat Apr 23 11:21:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime
-	  documentation to RDoc from Markdown.
-	  [ruby-core:75136] [Bug #12311]
-
-Sat Apr 23 09:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c: cygwin does not use w32_cmdvector, command line can be
-	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]
-
-Sat Apr 23 01:00:03 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* configure.in: don't use the system-provided round(3) on AIX.
-	  In AIX, round(0.49999999999999994) returns 1.0.
-	  Use round() in numeric.c instead.
-
-Fri Apr 22 21:00:44 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
-	  to avoid test failures due to the tzdata change.
-	  https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
-	  Found by naruse.
-
-Fri Apr 22 20:18:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_mul_size_overflow): added to handle
-	  mul overflow efficiently.
-
-	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): use rb_mul_size_overflow
-	  and avoid division where it can define DSIZE_T.
-
-	* gc.c (xmalloc2_size): moved from ruby.h and use rb_mul_size_overflow.
-
-Fri Apr 22 20:34:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_asctime): [DOC] add ctime example, not only
-	  asctime.  [ruby-core:75126] [Bug #12310]
-
-Fri Apr 22 18:44:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* variable.c: use uint32_t instead of long to avoid confusion about
-	  the type of ivtbl->numiv.
-
-Fri Apr 22 15:09:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval_jump.c (exec_end_procs_chain): restore previous error info
-	  for each end procs.  [ruby-core:75038] [Bug #12302]
-
-Fri Apr 22 15:04:56 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: the fullpath of merger.rb is too long to
-	  copy&paste on Windows.  show shorter name instead on the platform.
-	  I'm sure that the user of this command on Windows is only me.
-
-Fri Apr 22 14:52:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/merger.rb: remove temporary file.
-
-Fri Apr 22 11:27:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http.rb: Improve documentation for SSL requests via GET method.
-	  [fix GH-1325][ci skip] Patch by @jsyeo
-
-Fri Apr 22 10:51:13 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/ssl.rb: Support to add SSLCiphers option.
-	  [fix GH-1321] Patch by @rhadoo
-
-Fri Apr 22 10:43:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* file.c, win32/file.c: Removed obsoleted safe level checks.
-	  [fix GH-1327] Patch by @cremno
-
-Fri Apr 22 10:01:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* benchmark/bm_so_meteor_contest.rb: fix a typo.
-	  [fix GH-1330][ci skip] Patch by @sachin21
-
-Fri Apr 22 04:57:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (rb_alloc_tmp_buffer_with_count): added like xmalloc2 to
-	  avoid duplicated check of size.
-
-	* gc.c (ruby_xmalloc2): added to keep separate layers.
-
-	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): added to check
-	  the size more statically.
-
-Fri Apr 22 04:54:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (LIKELY): moved from internal.h.
-
-	* include/ruby/ruby.h (UNLIKELY): ditto.
-
-Thu Apr 21 01:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (objspace_malloc_prepare): remove size check because it is
-	  used by objspace_xmalloc and objspace_xcalloc.
-	  objspace_xmalloc introduces its own check in this commit.
-	  objspace_xcalloc checks with xmalloc2_size (ruby_xmalloc2_size).
-
-	* gc.c (objspace_xmalloc0): common xmalloc function.
-
-	* gc.c (objspace_xmalloc): introduce its own size check.
-
-	* gc.c (objspace_xmalloc2): separated from ruby_xmalloc2 to clarify
-	  the layer who has the responsibility to check the size.
-
-	* gc.c (objspace_xrealloc): remove duplicated size check.
-
-	* gc.c (ruby_xmalloc2): use objspace_xmalloc2.
-
-	* include/ruby/ruby.h (ruby_xmalloc2_size): follow the size limit
-	  as SSIZE_MAX. Note that ISO C says size_t is unsigned integer.
-
-Thu Apr 21 12:14:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check if succeeded in creating config.h.
-
-	* tool/ifchange: ignore failures when TEST_COLORS unmatched. just
-	  use the default value if expected name is not contained in it.
-	  [ruby-core:75046] [Bug #12303]
-
-Wed Apr 20 17:33:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/cgi/escape/escape.c (cgiesc_unescape): define unescape
-	  method instead of _unescape, and should pass the optional
-	  argument to the super method.
-
-	* lib/cgi/util.rb (CGI::Util#_unescape): remove intermediate
-	  method.
-
-Wed Apr 20 15:52:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (syntax_error_initialize): move the default message,
-	  "compile error", from parse.y.  the default parameter should
-	  belong to the class definition.
-
-	* parse.y (yycompile0): use the default parameter.
-
-Wed Apr 20 10:25:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (append_compile_error): use rb_syntax_error_append.
-
-	* error.c (rb_syntax_error_append): append messages into a
-	  SyntaxError exception instance.
-
-	* parse.y (yycompile0): make new SyntaxError instance in main
-	  mode, otherwise error_buffer should be a SyntaxError if error
-	  has occurred.
-
-Tue Apr 19 17:42:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (err_vcatf): rename, and separate appending message from
-	  creating a string buffer.
-
-	* error.c (rb_syntax_error_append): merge rb_error_vsprintf and
-	  rb_compile_err_append.
-
-	* parse.y (parser_compile_error): use rb_syntax_error_append.
-
-Tue Apr 19 13:46:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (append_compile_error, compile_bug): pass iseq and get
-	  error info and file from it, not by the thread error info.
-
-	* error.c (rb_report_bug_valist): take va_list instead of variadic
-	  arguments, and just report the bug but not abort.
-
-Tue Apr 19 13:18:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/time.rb: revert r54167 because it would break
-	  backward compatibilities, and it is documented that
-	  Time.parse does not take into account time zone
-	  abbreations other than ones described in RFC 822
-
-Tue Apr 19 13:12:03 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* ChangeLog: Fix dates of previous commits
-
-Tue Apr 19 12:45:03 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* ChangeLog: Add descriptions for logger updates
-	* NEWS: Add descriptions for logger updates
-
-Tue Apr 19 12:45:02 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Add shift_period_suffix option
-
-Tue Apr 19 12:45:01 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Allow specifying logger parameters in constructor
-	  such as level, progname, datetime_format, formatter.
-
-Mon Apr 18 16:07:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_peephole_optimize): should not replace the
-	  current target INSN, not to follow the replaced dangling link in
-	  the caller.  [ruby-core:74993] [Bug #11816]
-
-Mon Apr 18 12:56:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_truncate): add an optional parameter, digits, as
-	  well as Float#round.  [Feature #12245]
-
-	* numeric.c (int_truncate): add an optional parameter, digits, as
-	  well as Integer#round.  [Feature #12245]
-
-Sun Apr 17 04:18:56 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: revisions are strings.
-
-Sat Apr 16 14:26:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* ext/date/date_core.c : remove not used f_getlocal macro.
-	  After r54553 f_getlocal macro is not used.
-
-Sat Apr 16 14:15:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* ext/date/date_core.c : remove not used f_utc6 macro.
-	  After r54169 f_utc6 macro is not used.
-
-Sat Apr 16 10:00:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* struct.c (struct_make_members_list, rb_struct_s_def): member
-	  names should be unique. [ruby-core:74971] [Bug #12291]
-
-	* struct.c (struct_make_members_list): extract making member name
-	  list from char* va_list, with creating symbols without
-	  intermediate IDs.
-
-Sat Apr 16 01:33:27 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: sort revisions.
-
-Sat Apr 16 01:16:02 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Don't yield same element twice.
-	  Found by nagachika.
-
-Sat Apr 16 01:03:32 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Fix SEGV by [1/2r, 1].sum.
-
-Fri Apr 15 23:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* rational.c (rb_rational_plus): rename from rb_rational_add
-	  to be aligned with rb_fix_plus.
-
-	* array.c (rb_ary_sum): ditto.
-
-	* internal.h: ditto.
-
-Fri Apr 15 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* rational.c (rb_rational_add): rename from nurat_add.
-
-	* array.c (rb_ary_sum): use rb_rational_add directly.
-
-	* test/ruby/test_array.rb (test_sum): add assertions for an array of
-	  Rational values.
-
-Fri Apr 15 22:31:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* array.c (rb_ary_sum): apply the precision compensated algorithm
-	  for an array in which Rational and Float values are mixed.
-
-	* test/ruby/test_array.rb (test_sum): add assertions for the above
-	  change.
-
-Fri Apr 15 22:30:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_setname): defer setting native thread name
-	  set in initialize until the native thread is created.
-	  [ruby-core:74963] [Bug #12290]
-
-Fri Apr 15 20:27:16 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
-
-Fri Apr 15 15:38:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* common.mk (benchmark): order options for built-ruby and compare-ruby.
-
-Fri Apr 15 14:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* test/ruby/test_array.rb (test_sum): add assertions for Rational and
-	  Complex numbers.
-
-Fri Apr 15 10:07:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_key_pressed_p): raise the same
-	  exception, "unknown virtual key code", for names with nul chars.
-	  though console_win32_vk() considers the length and can deal with
-	  nul chars, rb_sprintf() raised at PRIsVALUE previously, so quote
-	  it if it is unprintable.
-
-Fri Apr 15 09:02:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (rb_sym2str): fallback definition for
-	  older ruby.  [ruby-core:74953] [Bug #12284]
-
-Thu Apr 14 21:46:36 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Support the optional argument, init, and
-	  block.
-
-Thu Apr 14 19:02:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
-	  discarding old save_history=.
-
-Thu Apr 14 14:58:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tkutil/tkutil.c (tk_hash_kv): the third argument can be
-	  nil not only an Array.  reported by @windwiny at
-	  https://github.com/ruby/ruby/commit/cdaa94e#commitcomment-17096618
-
-Thu Apr 14 14:28:55 2016  cremno phobia  <cremno@mail.ru>
-
-	* cont.c (fiber_initialize_machine_stack_context): fix wrong
-	  _MSC_VER check, should be decimal but not hexadecimal.
-	  [ruby-core:74936] [Bug #12279]
-
-Wed Apr 13 22:51:38 2016  Tanaka Akira  <akr@fsij.org>
-
-	* array.c (rb_ary_sum): Array#sum is implemented.
-	  Kahan's compensated summation algorithm for precise sum of float
-	  numbers is moved from ary_inject_op in enum.c.
-
-	* enum.c (ary_inject_op): Don't specialize for float numbers.
-
-	  [ruby-core:74569] [Feature #12217] proposed by mrkn.
-
-Wed Apr 13 15:56:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_ceil): add an optional parameter, digits, as
-	  well as Float#round.  [Feature #12245]
-
-	* numeric.c (flo_floor): add an optional parameter, digits, as
-	  well as Float#round.  [Feature #12245]
-
-	* numeric.c (int_ceil): add an optional parameter, digits, as
-	  well as Integer#round.  [Feature #12245]
-
-	* numeric.c (int_floor): add an optional parameter, digits, as
-	  well as Integer#round.  [Feature #12245]
-
-Wed Apr 13 14:47:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (Init_File): add alias File.empty? to File.zero?.
-	  [Feature #9969]
-
-Wed Apr 13 14:36:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (assign_in_cond): allow multiple assignment in
-	  conditional expression.  [Feature #10617]
-
-Wed Apr 13 14:11:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_big_size): add wrapper function of BIGSIZE and
-	  rename the method function with _m suffix.
-
-	* numeric.c (int_round_zero_p): extracted from rb_int_round.
-	  optimize for Bignum, and convert VALUE returned by Numeric#size
-	  to long.
-
-Wed Apr 13 12:00:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* test/ruby/test_basicinstructions.rb: add a test to check access
-	  instance variables on special const objects.
-
-	  All of such objects are frozen, so that we can not set instance
-	  variables for them. But we can read instance variables and return
-	  default value (nil).
-
-Tue Apr 12 20:40:35 2016  Kaneko Yuichiro  <spiketeika@gmail.com>
-
-	* ext/date/date_core.c (time_to_time): should preserve timezone
-	  info.  [ruby-core:74889] [Bug #12271]
-
-Tue Apr 12 11:51:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (new_label_body): initialize bit fields, since
-	  compile_data_alloc does not clear the memory.  [Bug #12082]
-
-Mon Apr 11 20:18:43 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_backtrace.c (frame2klass): filter only for imemo_ment.
-	  T_IMEMO/imemo_iseq can be passed here.
-
-Mon Apr 11 17:43:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_optimize): disable tail call optimization in
-	  rescued, rescue, and ensure blocks.
-	  [ruby-core:73871] [Bug #12082]
-
-Mon Apr 11 06:54:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (apply2files): apply to a VALUE vector instead of a
-	  temporary array.
-
-Sun Apr 10 20:54:16 2016  Joe Swatosh  <joe.swatosh@gmail.com>
-
-	* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
-	  API names.  [ruby-core:74863] [Bug #12264]
-
-Sun Apr 10 17:47:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_realpath_internal): no argument conversions since
-	  this internal function does not need to_path and encoding
-	  conversions, not to be affected by the default internal
-	  encoding.
-
-Sat Apr  9 10:03:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_f_load): raise with the original path name before
-	  encoding conversion.
-
-Sat Apr  9 02:05:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bignum.c (rb_cstr_parse_inum): [EXPERIMENTAL] new function to
-	  parse integer in C-string with length.  the name and the
-	  arguments may be changed in the future.
-
-	* bignum.c (rb_str_to_inum): preserve encoding of the argument in
-	  error messages, and no longer needs to copy non-terminated
-	  strings.
-
-	* bignum.c (rb_str2big_{poweroftwo,normal,karatsuba,gmp}): ditto.
-
-Thu Apr  7 19:04:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
-	  comments.  [ruby-core:74838] [Bug #12256]
-
-Thu Apr  7 11:24:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_initialize): fix out-of-bound
-	  access when no arguments given.  `p Tk::Event.new` crashed.
-
-Fri Apr  1 01:26:00 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* ext/coverage/coverage.c: Fully reset coverage to not persist global state.
-	  It was returning old file coverages as empty arrays to the user.
-	  [ruby-core:74596] [Bug #12220]
-
-	* ext/coverage/coverage.c (rb_coverages): remove unused static state.
-
-	* thread.c: Moved and renamed coverage_clear_result_i to reset_coverage_i.
-
-	* test/coverage/test_coverage.rb: improve precision of tests.
-
-Wed Apr  6 22:41:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_lgamma_r_m0): fix the condition for
-	  lgamma_r(-0.0).  [Bug #12249]
-
-Wed Apr  6 17:38:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* tool/downloader.rb (RubyGems.download): follow the change of the
-	  rubygems ssl_certs directory tree introduced by previous commit.
-
-Wed Apr  6 15:00:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3.
-	  Please see entries of 2.6.3 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-
-Wed Apr  6 14:13:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0)
-	  returns negative infinity.  [Bug #12249]
-
-	* math.c (ruby_lgamma_r): define by the configured result.
-
-Wed Apr  6 10:56:15 2016  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* lib/logger.rb (Logger#level=): remove unnecessary local
-	  variable.
-
-	* lib/logger.rb (Logger#initialize, Logger#reopen): [DOC] mention
-	  the default values.  cherrypicked from [GH-1319].
-
-Wed Apr  6 10:17:53 2016  cremno phobia  <cremno@mail.ru>
-
-	* math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows,
-	  since msvcrt does not provide it.
-
-	* missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0).
-	  [ruby-core:74823] [Bug #12249]
-
-Wed Apr  6 01:22:55 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong.
-	  cf. [Bug #12249]
-
-Wed Apr  6 00:53:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* math.c (ruby_lgamma_r): fix lgamma(-0.0) on mingw and OSX.
-
-	* math.c (ruby_tgamma): fix tgamma(-0.0) on mingw.
-	  [ruby-core:74817] [Bug #12249]
-
-Tue Apr  5 14:50:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
-	  [Bug #12202] [ruby-core:74802]
-
-Tue Apr  5 00:06:44 2016  Aeris  <aeris@imirhil.fr>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_tmp_key): Access to ephemeral
-	  TLS session key in case of forward secrecy cipher.  Only
-	  available since OpenSSL 1.0.2.  [Fix GH-1318]
-
-	* ext/openssl/extconf.rb: Check for SSL_get_server_tmp_key.
-
-Mon Apr  4 23:37:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (rb_vm_struct): make at_exit a single linked list but
-	  not RArray, not to mark the registered functions by the write
-	  barrier.  based on the patches by Evan Phoenix.
-	  [ruby-core:73908] [Bug #12095]
-
-Mon Apr  4 17:43:45 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change default value of
-	  RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO 0.3 -> 0.2
-	  RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO 0.8 -> 0.65
-
-	  These values are same as Ruby 2.0.0.
-
-	  This change cause GC counts.
-	  However, generational GC reduced each (minor) GC time and
-	  increase memory locality. So that not so big impact on my
-	  benchmarking results.
-	  (surprisingly, this fix speed up programs on some cases)
-
-	  You can change these values by environment variables
-	  if you feel wrong.
-
-Mon Apr  4 17:36:52 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (get_envparam_double): take an upper_bound.
-
-	  And also take an accept_zero flag which allow to accept zero
-	  even if lower_bound is set.
-
-	* gc.c (ruby_gc_set_params): fix parameters.
-
-	  RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO set 0.9 as *lower_bound*, so that
-	  it should be upper_bound.
-	  Set RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO as lower bound.
-
-	  Also set lower/upper bound of RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO to
-	  RUBY_GC_HEAP_FREE_SLOTS_MIN/MAX_RATIO.
-
-Mon Apr  4 16:41:32 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c (Init_VM): should pass tokens.
-
-Sun Apr  3 09:34:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flodivmod): round division if it is a finite number
-	  and module is required.
-
-	* numeric.c (dbl2ival): do not round here.
-
-	* numeric.c (flo_ceil): use dbl2ival.
-
-	* numeric.c (flo_round): round explicitly.
-
-Sat Apr  2 15:24:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/intern.h (rb_check_arity): returns argc.
-
-Fri Apr  1 20:58:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Data generation to implement
-	  swapcase functionality for titlecase characters. Swapcase isn't defined
-	  by Unicode, because the purpose/usage of swapcase is unclear anyway.
-	  The implementation follows a proposal from Nobu, swapping the case of
-	  each component of a titlecase character individually.
-	  This means that the titlecase characters have to be decomposed.
-
-	* enc/unicode.c: Code using the above data.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for the above.
-
-Fri Apr  1 14:55:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* configure.in (AC_CONFIG_FILES): $srcdir/.git can be a file pointing
-	  the real git_dir, such as when the git working tree is a "linked
-	  working tree" (a working tree created by git-worktree). So use
-	  git-rev-parse --git-dir to check if $srcdir is the top-level of a git
-	  repository, not just checking if the $srcdir/.git directory does exist
-	  or not.  [ruby-core:74759] [Bug #12239]
-
-	* tool/change_maker.rb: use tool/vcs.rb to detect VCS. This used to have
-	  its own VCS detection code, while we have tool/vcs.rb.
-
-	* tool/vcs.rb (detect): remove code duplication
-
-Fri Apr  1 04:50:44 2016  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc):
-	  enable SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER by default
-	  [Bug #12126]
-
-Fri Apr  1 01:13:55 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* thread.c (update_coverage): Do not track coverage in loaded files
-	  after Coverage.result. Avoids out-of-bounds access. [Bug #12237]
-
-	* ext/coverage/coverage.c (coverage_clear_result_i): document.
-
-Thu Mar 31 19:16:16 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: need to set initial value of GC_HEAP_FREE_SLOTS_GOAL_RATIO.
-
-Thu Mar 31 17:50:27 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: change additional allocation policy.
-
-	  Introduce new environment variable
-	  RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (goal_ratio) to calculate the
-	  ratio of additional memory.
-
-	  Before this change, we add pages with the following formula
-	  (when free_slots < total_pages * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO):
-	    next_pages = total_pages * RUBY_GC_HEAP_GROWTH_FACTOR
-
-	  This addition can allocate too much.
-
-	  With this change, we increase pages to satisfy the following formula:
-	    next_free_slots = next_total_slots * goal_ratio
-	  where
-	    next_free_slots = free_slots + adding_slots
-	    next_total_slots = total_slots + adding_slots.
-
-	  If you want to prepare many free slots, increase this ratio.
-
-	  If this variable is 0, then simply multiply
-	  RUBY_GC_HEAP_GROWTH_FACTOR.
-
-	* gc.c (get_envparam_double): enable to accept 0.
-
-Thu Mar 31 17:48:25 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_marks_finish): fix syntax error.
-
-Thu Mar 31 16:49:36 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: simplify allocate/free detecting logic at the end of marking.
-
-	  Before this change, heap_pages_min_slots are calculated at the
-	  beginning sweeping phase. And this value is used at the end of
-	  *next* marking phase.
-
-	  To simplify it, we use this value at the end of this marking phase.
-	  It means that we don't need to store this value as global state.
-
-	  Also heap_pages_max_slots is calculated at the begging of sweeping
-	  phase and used at the end of sweeping phase.
-	  To simplify this logic, we introduced new global value
-	  heap_pages_freeable_pages it means extra pages count we can free.
-	  gc_sweep_step() checks this value and moves empty pages to tomb_heap
-	  not more than this value.
-
-	  Because of this fix, heap_pages_swept_slots is no longer needed.
-
-	* gc.c (rb_objspace_t::heap_pages): restruct the objspace global
-	  status.
-
-	  remove the following fields
-	    * swept_slots (and heap_pages_swept_slots)
-	    * min_free_slots (and heap_pages_min_free_slots)
-	    * max_free_slots (and heap_pages_max_free_slots)
-	  And add the following filed.
-	    * freeable_pages (and heap_pages_freeable_pages)
-
-	* gc.c (heap_pages_free_unused_pages): unlink tomb heap pages
-	  because tomb heap should have only freeable pages.
-
-	* gc.c (heap_extend_pages): add parameters for future extension.
-
-Thu Mar 31 16:43:02 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: add GC parameters to configure the following values:
-	  * RUBY_GC_HEAP_FREE_SLOTS_MIN_RATIO:
-	    allocate additional pages when free slots is lower than
-	    the value (total_slots * (this ratio)).
-	  * RUBY_GC_HEAP_FREE_SLOTS_MAX_RATIO:
-	    allow to free pages when free slots is greater than
-	    the value (total_slots * (this ratio)).
-
-	  Before this change, these values are hard coded.
-
-	* gc.c (ruby_gc_params_t): ditto.
-
-	* gc.c (ruby_gc_set_params): ditto.
-
-Thu Mar 31 15:59:17 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_verify_heap_page): check the number of zombies.
-
-	* gc.c (gc_verify_heap_pages): check also tomb heap.
-
-Thu Mar 31 15:48:18 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_page_sweep): return free slots count.
-
-	* gc.c (gc_sweep_step): use returned free slots count.
-
-	* gc.c (gc_sweep_step): change variable name `next'
-	  to `next_sweep_page'.
-
-Thu Mar 31 11:33:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (d_lite_strftime, dt_lite_strftime): [DOC]
-	  fix indent not to be a big sole verbatim.
-
-Thu Mar 31 11:18:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc
-	  of DateTime.  [ruby-core:74729] [Bug #12233]
-
-Thu Mar 31 03:41:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
-	  fix indent.
-
-Wed Mar 30 16:33:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.
-	  Renamed files, wrong method names or argument types; the example
-	  GetDBM macro is now updated to the current version of the actual
-	  code.  patch by Marcus Stollsteimer in [ruby-core:74690].
-	  [Bug #12228]
-
-Wed Mar 30 09:46:01 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/open-uri.rb: Use `userinfo` for authenticated proxy.
-	  [fix GH-1148] Patch by @SokichiFujita
-	* test/open-uri/test_open-uri.rb: ditto.
-	  [fix GH-1309] Patch by @jdamick
-
-Wed Mar 30 01:56:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
-	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
-
-Wed Mar 30 01:54:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb: add given revision to current changesets
-	  on associating the revision to the related ticket.
-
-Wed Mar 30 01:53:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/merger.rb: update revision.h before merge.
-
-Tue Mar 29 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: define toupper for its use. fix r54391.
-
-Tue Mar 29 19:23:46 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/ruby.h (rb_isupper, rb_islower, rb_isalpha, rb_isdigit,
-	  rb_isalnum, rb_isxdigit, rb_isblank, rb_isspace, rb_isblank,
-	  rb_iscntrl, rb_isprint, rb_ispunct, rb_isgraph,
-	  rb_tolower, rb_toupper): use inline function to avoid function call.
-
-	* include/ruby/ruby.h (rb_isascii): use inline function to clarify
-	  the logic.
-
-Tue Mar 29 18:56:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/redmine-backporter.rb (backport): show merger.rb's path.
-
-	* tool/redmine-backporter.rb (show): show current issue again if no
-	  ticket number is given.
-
-	* tool/redmine-backporter.rb (rel): show error message if current
-	  bugs.ruby-lang.org doesn't support the API.
-
-Tue Mar 29 18:54:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/merger.rb: support to backport header as backport identifier.
-	  Now you can specify by 'merge revision(s) 49254: [Backport #10738]'.
-
-Tue Mar 29 16:53:44 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Tweaked handling of 6
-	  special cases in CaseUnfold_11_Table.
-
-	* enc/unicode.c: Adjustments for above.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for the above: Some tests in
-	  test_titlecase activated; test_greek added. A test in test_cherokee fixed.
-
-Tue Mar 29 13:31:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Cleaned up some comments.
-
-Tue Mar 29 13:24:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Removing data for idempotent
-	  titlecasing.
-
-	* enc/unicode.c: Adjust code to data removal.
-
-Tue Mar 29 12:45:18 2016  Laurent Arnoud  <laurent@spkdev.net>
-
-	* lib/webrick/httpresponse.rb: Move error_body to method. It allow to
-	  override the body more easily. [fix GH-1307]
-	* test/webrick/test_httpresponse.rb: ditto.
-
-Tue Mar 29 06:40:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_compile_err_append): rb_thread_t::base_block is no
-	  longer used.
-
-	* iseq.c (rb_iseq_compile_with_option): ditto, no protection is
-	  needed.
-
-Tue Mar 29 06:39:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (struct parser_params): move parse_in_eval flag from
-	  rb_thread_t.
-
-	* parse.y (rb_parser_set_context): set parsing context, not only
-	  mild error flag.
-
-	* iseq.c (rb_iseq_compile_with_option): the parser now refers no
-	  thread local states to be restored.
-
-	* vm_eval.c (eval_string_with_cref): ditto.
-
-Mon Mar 28 21:24:02 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* numeric.c (int_pos_p): fix typos.
-
-Mon Mar 28 14:54:49 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Refactoring in preparation for data reduction for
-	  titlecase.
-
-Mon Mar 28 14:36:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Minor refactoring for I WITH DOT ABOVE.
-
-Mon Mar 28 14:26:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Removed code now covered by data from table.
-
-Mon Mar 28 11:49:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Adding comments. [ci skip]
-
-Mon Mar 28 11:30:23 2016  Shinichi Maeshima  <netwillnet@gmail.com>
-
-	* lib/rubygems.rb: Fix `Gem.find_spec_for_exe` picks oldest gem.
-	  https://github.com/travis-ci/travis-ci/issues/5798
-	  https://github.com/rubygems/rubygems/pull/1566
-	* test/rubygems/test_gem.rb: ditto.
-
-Mon Mar 28 11:26:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.2.
-	  Please see entries of 2.6.2 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-
-Mon Mar 28 11:02:31 2016  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
-
-	* lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
-	  https://github.com/rubygems/rubygems/pull/1554
-	  [Bug #12193][ruby-core:74431]
-
-Mon Mar 28 08:19:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): refactor floating point format of
-	  Rational by using generic Integer functions.
-
-	* sprintf.c (rb_str_format): fix buffer overflow, length must be
-	  greater than precision.  reported by William Bowling <will AT
-	  wbowling.info>.
-
-Sun Mar 27 12:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): convert Rational to floating point
-	  format by using generic Integer functions, not by methods which
-	  can be overwritten.
-
-Sat Mar 26 10:55:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_int2str): conversion function to String for
-	  generic Integer.
-
-	* numeric.c (rb_int_round): rounding function for generic
-	  Integers.
-
-	* numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic
-	  arithmetic functions for generic Integers.
-
-	* numeric.c (FIXNUM_{POSITIVE,NEGATIVE,ZERO}_P): predict macros
-	  only for Fixnum.
-
-Sat Mar 26 06:34:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* localeinit.c (rb_locale_charmap_index): fix prototype.
-	  patched by Andreas Schwab [Bug #12218]
-
-Fri Mar 25 16:40:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Additional tests title case;
-	  some not yet activated.
-
-Fri Mar 25 13:38:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
-	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
-	  even if it is disabled by OpenSSL configuration.
-	  [ruby-core:74384] [Bug #12182]
-
-	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.
-
-	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.
-
-Fri Mar 25 11:08:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
-	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]
-
-Fri Mar 25 01:50:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c (reserve_stack): fix reserving position where
-	  the stack growing bottom to top. [Bug #12118]
-
-Fri Mar 25 01:10:42 2016  Sebastian Schuberth  <sschuberth@gmail.com>
-
-	* lib/mkmf.rb (find_executable0): On Windows, it is actually valid
-	  to surround individual PATH directory entries with double
-	  quotes. Remove these before joining the path as otherwise the
-	  literal quotes would become part of the path, resulting in the
-	  executable not to be found.  [Fix GH-1305]
-
-Thu Mar 24 22:38:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (FMT, FMTV): remove recursive-assignments to get rid
-	  of undefined behavior.  [ruby-core:74532] [Bug #12213]
-
-Thu Mar 24 17:44:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (FMT_PADDING): extract format for padding.
-
-	* strftime.c (FMT_PRECISION): extract precision formula.
-
-	* strftime.c (FMTV): append formatted string to expand the result.
-
-Thu Mar 24 14:20:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (STRFTIME): deal with case conversion flags for
-	  recursive formats.
-
-Thu Mar 24 12:43:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (dt_lite_iso8601): strftimev() always
-	  returns a String, so append them directly.
-
-	* ext/date/date_core.c (d_lite_jisx0301, iso8601_timediv),
-	  (dt_lite_jisx0301): format by the format string in local buffer
-	  to prevent intermediate strings from GC.
-
-	* ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by
-	  "%+"PRIsVALUE, to prevent intermediate strings from GC.
-
-Thu Mar 24 11:43:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (rb_strftime_with_timespec): remove unnecessary
-	  check, as `s` equals to `endp` when recursed STRFTIME resized
-	  the capacity same as the size.
-
-Wed Mar 23 21:48:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (ary_inject_op): put subtract operation out of if-clause.
-
-Wed Mar 23 21:38:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* enum.c (ary_inject_op): Use Kahan's compensated summation algorithm
-	  for summing up float values.
-
-Wed Mar 23 20:56:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* strftime.c (rb_strftime_with_timespec): append formatted results
-	  to the given string with expanding, and also deal with NUL chars.
-
-	* strftime.c (rb_strftime, rb_strftime_timespec): return formatted
-	  string, not the length put in the given buffer.
-
-	* time.c (rb_strftime_alloc): no longer needs to retry with
-	  reallocating buffers.
-
-	* time.c (time_strftime): no longer needs to split by NUL chars.
-
-Wed Mar 23 14:23:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rdoc/ri/driver.rb (interactive): rescue NotFoundError raised in
-	  expand_name. (display_name rescues NotFoundError by itself,
-	  the original logic looks buggy...)
-
-Wed Mar 23 11:44:53 2016  cremno  <cremno@mail.ru>
-
-	* marshal.c (r_long): cast to `signed char`, which is used
-	  already, instead of SIGN_EXTEND_CHAR.
-
-	* parse.y: SIGN_EXTEND_CHAR is no longer used.  [Fix GH-1302]
-
-Wed Mar 23 11:38:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM):
-	  * add missing parentheses and remove double quotes.
-	  * rename to get rid of recursive references.
-	  * as --excludes-dir option is for a path name, its argument
-	    should be converted.
-	  [ruby-dev:49526] [Bug #12199]
-
-Wed Mar 23 10:39:38 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* variable.c: Added documentation about order of `Module#constants`
-	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
-
-Tue Mar 22 21:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Additional flag for characters that are titlecase.
-
-	* enc/unicode/case-folding.rb, casefold.h: Using above flag in data.
-
-	* enc/unicode.c: Marking capitalized character as unmodified if it is
-	  already titlecase.
-
-	* test/ruby/enc/test_case_mapping.rb: Tests for above functionality.
-
-Tue Mar 22 14:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lambda_body, parser_yylex): warn mismatched indentation
-	  of lambda block.
-
-Tue Mar 22 11:36:49 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (wmul): wrong condition.
-	  fixed many test failures on 32bit and LLP64 platforms.
-
-Tue Mar 22 10:31:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (wdiv, wmod): wdivmod0() assumes the 3rd and the 4th arguments
-	  are valid pointers.
-	  maybe checking them in wdivmod0() is better manner, but I guess that
-	  passing real dummy pointers may be faster than checking and branching
-	  in wdivmod0().
-	  this commit fixes SEGV on 32bit and LLP64 platforms.
-
-Tue Mar 22 10:24:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (divmodv): void function never returns any value.
-
-Tue Mar 22 10:11:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): print
-	  failed messages only if replacing mode, otherwise defer them
-	  until the end, to get rid of interleaving failures with progress
-	  messages.  refix r54195.
-
-Tue Mar 22 03:45:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (MUL_OVERFLOW_FIXWV_P): defined for FIXWV.
-
-	* time.c (wmul): use MUL_OVERFLOW_FIXWV_P and only switch.
-
-	* time.c (wmul): use mul which has Fixnum optimization.
-
-	* time.c (rb_time_magnify): If WIDEVALUE_IS_WIDER, wmul() has the same
-	  optimized logic, else mul() has also the similar logic for Fixnum.
-
-	* time.c (rb_time_unmagnify): almost ditto.
-
-Tue Mar 22 03:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (divmodv): add the case both arguments are Fixnum.
-
-	* time.c (wquo): use quo which has Fixnum optimization.
-
-	* time.c (wdivmod0): added for WIDEVALUE_IS_WIDER.
-
-	* time.c (wdivmod): use wdivmod0 and divmodv.
-	  divmodv has Fixnum optimization.
-
-	* time.c (wdiv): use wdivmod0 and div to avoid the use of divmodv which
-	  calls id_quo whose return value is array.
-
-	* time.c (wmod): use wdivmod0 and mod to avoid the use of divmodv which
-	  calls id_quo whose return value is array.
-
-Mon Mar 21 22:32:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* internal.h (rb_fix_divmod_fix): like r54213, use FIX2NUM only if
-	  x == FIXNUM_MIN && y == -1. This must be a rare case and it is
-	  expected compiler to handle well.
-
-Mon Mar 21 22:15:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (mod): Add Fixnum case.
-
-	* time.c (quo): c can be Fixnum except a == FIXNUM_MIN && b == -1.
-	  Such case can be optimized out because quo()'s argument is constant.
-
-Mon Mar 21 22:09:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (rb_fix_mul_fix): multiply converted values, not
-	  object VALUEs.
-
-Mon Mar 21 20:18:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell
-	  long option.
-
-	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name
-	  conversions by msys2.  [ruby-dev:49525] [Bug #12199]
-
-Mon Mar 21 19:09:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (enc_succ_alnum_char): try to skip an invalid character
-	  gap between GREEK CAPITAL RHO and SIGMA.
-	  [ruby-core:74478] [Bug #12204]
-
-Mon Mar 21 18:55:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (rb_gc_mark_node): NODE_MATCH2 can have nd_args, u3,
-	  since r54100.
-
-Sun Mar 20 21:17:13 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* internal.h (rb_int128t2big): declare only when HAVE_INT128_T.
-	  fixed a compile error with VC++ introduced at r54203.
-
-Sun Mar 20 20:10:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* internal.h (DLONG): defined if long is 32bit (and LONG_LONG is 64bit;
-	  but LONG_LONG is always defined as 64bit), or there's int128_t.
-
-	* internal.h (DL2NUM): defined if DLONG is defined.
-
-	* internal.h (rb_fix_mul_fix): defined for `Fixnum * Fixnum`.
-
-	* insns.def (opt_mul): use rb_fix_mul_fix().
-
-	* numeric.c (fix_mul): ditto.
-
-	* time.c (mul): ditto.
-
-Sun Mar 20 18:53:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_gt, fix_ge, fix_lt, fix_le): optimize comparisons
-	  Fixnum against Bignum by rb_big_cmp in inversed order without
-	  new Bignum instance.
-
-Sun Mar 20 18:44:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (add): remove FIXABLE() which is in LONG2NUM().
-
-	* time.c (sub): ditto.
-
-	* time.c (mul): ditto.
-
-Sun Mar 20 04:46:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bignum.c (rb_big_cmp): reduce the code.
-
-	* bignum.c (rb_big_eq): If normalized bignum is still bignum,
-	  it must be larger than fixnum.
-
-Sat Mar 20 00:58:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* include/ruby/intern.h (rb_big_odd_p, rb_big_even_p): move to
-	  internal.h so that they are exported only for ruby itself.
-
-	* internal.h (rb_big_odd_p, rb_big_even_p): ditto.
-
-Sat Mar 19 21:56:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Test::Unit::StatusLine#failed): defer
-	  failed messages until the end in verbose mode, to get rid of
-	  interleaving failures with progress messages.
-
-Sat Mar 19 21:53:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (fix_cmp): invert the result as the comparison is
-	  inverted.
-
-Sat Mar 19 18:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_to_f): raise NotImplementedError when a receiver
-	  class is unknown.
-
-	* test/-ext-/integer/test_my_integer.rb (test_my_integer_to_f): modify
-	  a test for the above change.
-
-Sat Mar 19 18:21:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (Bignum#<=>): remove it because they are unified with
-	  Integer#<=>.
-
-	* numeric.c (Integer#<=>, Fixnum#<=>): move <=> method from Fixnum to
-	  Integer.
-
-	* numeric.c (int_cmp): add this method for Integer#<=>.
-
-	* test/-ext-/integer/test_my_integer.rb (test_my_integer_cmp): add a
-	  test to examine Integer#<=> for unknown subclasses.
-
-Sat Mar 19 14:46:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_compile_with_option): make the parser in mild
-	  error.
-
-	* load.c (rb_load_internal0): ditto.
-
-	* parse.y (yycompile0): return the error message within the error
-	  to be raised.  [Feature #11951]
-
-	* parse.y (parser_compile_error): accumulate error messages in the
-	  error_buffer.
-
-Sat Mar 19 03:57:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* time.c (LOCALTIME): organize #ifdefs.
-
-	* time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF.
-
-Sat Mar 19 03:53:31 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc)
-	  define _BSD_SOURCE for time.h to define struct tm.tm_gmtoff.
-
-	* time.c: define _BSD_SOURCE at the top.
-
-Sat Mar 19 03:00:50 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/-ext-/time/test_new.rb (test_timespec_new): change a gmtoff
-	  test to a better one that does not depend on whether the current
-	  time is in summer time or not.
-
-Fri Mar 19 00:00:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_to_f, Bignum#to_f): removed them because they are
-	  unified with int_to_f and Integer#to_f.
-
-	* numeric.c (int_to_f): treat Bignum values directly.
-
-Fri Mar 18 23:41:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_to_f, fix_to_f): rename fix_to_f to int_to_f, and add
-	  treatment for subclasses which don't have definitions of to_f method.
-
-	* numeric.c (Integer#to_f, Fixnum#to_f): move to_f method from Fixnum
-	  to Integer.
-
-	* ext/-test-/integer/my_integer.c: define helper class for testing
-	  to_f method for a subclass of Integer.
-
-	* ext/-test-/integer/extconf.rb: ditto.
-
-	* ext/-test-/integer/init.c: ditto.
-
-	* test/-ext-/integer/test_my_integer.rb: examine to_f method for a
-	  subclass of Integer.
-
-Fri Mar 18 22:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* include/ruby/intern.h (rb_big_hash): Move to internal.h.
-
-	* internal.h: ditto.
-
-Fri Mar 18 22:10:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (Bignum#eql?): remove its definition because it is unified
-	  with Numeric#eql?.
-
-	* numeric.c (num_eql): treat Bignum values directly.
-
-Fri Mar 18 21:57:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_to_s, Bignum#to_s): remove its definition because
-	  it is unified with Integer#to_s.
-
-	* numeric.c (int_to_s): treat Bignum values directly.
-
-Fri Mar 18 21:30:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_to_s): Move from fix_to_s.
-
-	* numeric.c (Integer#to_s): Move from Fixnum#to_s.
-
-Fri Mar 18 16:22:24 2016  Victor Nawothnig  <Victor.Nawothnig@gmail.com>
-
-	* parse.y (parse_numvar): NTH_REF must be less than a half of
-	  INT_MAX, as it is left-shifted to be ORed with back-ref flag.
-	  [ruby-core:74444] [Bug#12192] [Fix GH-1296]
-
-Fri Mar 18 12:25:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (tick): fix missing close parenthesis.  [Fix GH-1291]
-
-Fri Mar 18 10:24:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* ext/date/date_core.c (datetime_to_time): preserve timezone info
-	  [Bug #12189] [Fix GH-1295]
-
-Fri Mar 18 10:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_hash): make it public function to be available in
-	  other source files, and remove documentation comment for Bignum#hash.
-
-	* bignum.c (Bignum#hash): remove its definition because it is unified
-	  with Object#hash.
-
-	* include/ruby/intern.h (rb_big_hash): add a prototype declaration.
-
-	* hash.c (any_hash): treat Bignum values directly.
-
-Fri Mar 18 02:35:12 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/time.rb (parse, strptime): Fix Time.parse/strptime does not
-	  have compatibility with DateTime.parse/strptime in terms of parsing
-	  timezone [Bug #12190] [Fix GH-1297]
-
-Fri Mar 18 02:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (fix_zero_p, fix_even_p, fix_odd_p): remove needless
-	  functions.
-
-Fri Mar 18 02:15:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* numeric.c (int_even_p): treat Fixnum and Bignum values directly.
-
-Fri Mar 18 02:07:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (Bignum#even?, Bignum#odd?): remove definitions
-	  because they are unified with Integer#even? and Integer#odd?.
-
-	* numeric.c (Fixnum#zero?, Fixnum#even?, Fixnum#odd?): remove
-	  definitions because they are unified with Numeric#zero?,
-	  Integer#even?, and Integer#odd?.
-
-	* numeric.c (num_zero_p, int_odd_p): treat Fixnum and
-	  Bignum values directly.
-
-	* test/ruby/test_integer.rb (test_odd_p_even_p): remove meaningless
-	  test case.
-
-Fri Mar 18 01:51:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (rb_big_even_p, rb_big_odd_p): make them public functions
-	  to be available in other source files.
-
-	* include/ruby/intern.h (rb_big_even_p, rb_big_odd_p): add prototype
-	  declarations.
-
-Fri Mar 18 00:25:56 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (ary_inject_op): Implement the specialized code for sum of
-	  float numbers.
-
-Fri Mar 18 00:15:05 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* numeric.c (num_step): use rb_equal for zero check. rb_num_coerce_cmp
-	  created an object which caused extra overhead.
-
-Thu Mar 17 22:21:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (RB_GC_GUARD_PTR): remove intermediate
-	  macro, and expand for each RB_GC_GUARD.  [Fix GH-1293]
-
-Thu Mar 17 22:08:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_specialized_instruction): move specialization
-	  for opt_newarray_max/min from translation phase.
-
-Thu Mar 17 21:52:09 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c, enum.c: make rdoc format consistent.
-
-Thu Mar 17 21:47:57 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* NEWS: add Array#max, #min, and the optimization.  [Feature #12172]
-
-Thu Mar 17 21:45:02 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* compile.c (NODE_CALL): add optimization shortcut for Array#max/min.
-	  Now `[x, y].max` is optimized so that a temporal array object is not
-	  created in some condition.  [Feature #12172]
-
-	* insns.def (opt_newarray_max, opt_newarray_min): added.
-
-Thu Mar 17 21:35:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c (rb_ary_max, rb_ary_min): implement Array#max and min with
-	  arguments.  replace super call with rb_nmin_run.
-
-	* enum.c (nmin_run): exported (as rb_nmin_run).
-
-	* internal.h: added a prototype for rb_nmin_run.
-
-Thu Mar 17 21:24:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c (rb_ary_max, rb_ary_min): implement a block by itself instead
-	  of delegating Enumerable#max/min.
-
-Thu Mar 17 21:09:34 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added.
-	  [Feature #12172]
-
-	* internal.h (OPTIMIZED_CMP): moved from enum.c so that array.c can
-	  use it.
-
-	* test/ruby/test_array.rb (test_max, test_min): tests for Array#max
-	  and Array#min.
-
-	* test/ruby/test_enum.rb (test_max, test_min): revised a bit to test
-	  Enumerable#max and #min explicitly.
-
-Thu Mar 17 21:02:42 2016  Yusuke Endoh  <mame@ruby-lang.org>
-
-	* internal.c: struct cmp_opt_data added for refactoring out a data
-	  structure for CMP_OPTIMIZABLE
-
-	* array.c (struct ary_sort_data): use struct cmp_opt_data.
-
-	* enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data.
-
-Thu Mar 17 20:55:21 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (ary_inject_op): Extracted from enum_inject.
-
-Thu Mar 17 18:39:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Implement the specialized code for sum of
-	  integers including Bignums.
-
-	* internal.h (rb_fix_plus): Declared to be usable from enum_inject.
-
-	* numeric.c (rb_fix_plus): Defined.
-
-Thu Mar 17 17:20:28 2016  Anton Davydov  <antondavydov.o@gmail.com>
-
-	* thread_sync.c: [DOC] Update documentation for Queue class
-	  description.  [Fix GH-1292]
-
-Thu Mar 17 17:14:51 2016  Dinar Valeev  <dvaleev@suse.com>
-
-	* gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch.
-	  [Fix GH-1291]
-
-Thu Mar 17 11:51:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/securerandom.rb (gen_random): to avoid blocking on Windows.
-	  On Windows OpenSSL RAND_bytes (underlying implementation is
-	  RAND_poll in crypto/rand/rand_win.c) may be blocked at
-	  NetStatisticsGet.
-	  https://wiki.openssl.org/index.php/Random_Numbers#Windows_Issues
-	  Instead of this, use Random.raw_seed directly (whose implementation
-	  CryptGenRandom is one of the source of
-	  entropy of RAND_poll on Windows).
-	  https://wiki.openssl.org/index.php/Random_Numbers
-	  Note: CryptGenRandom function is PRNG and doesn't check its entropy,
-	  so it won't block. [Bug #12139]
-	  https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx
-	  https://tools.ietf.org/html/rfc4086#section-7.1.3
-	  https://eprint.iacr.org/2007/419.pdf
-	  http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf
-
-Thu Mar 17 12:09:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fixed two macro definitions.
-	* test/ruby/enc/test_case_mapping.rb: Test cases that detected
-	  the above bugs.
-
-Thu Mar 17 11:36:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
-	  for TCPI msec member inspection function.
-	  [ruby-core:74388] [Bug #12185]
-
-Thu Mar 17 08:13:43 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/-ext-/time/test_new.rb (test_timespec_new): Time#gmtoff values
-	  are the same only when both or neither of the Time objects are in
-	  summer time (daylight-saving time).
-
-Thu Mar 17 07:17:36 2016  Eric Hodel  <drbrain@segment7.net>
-
-	* marshal.c (r_object0):  raise ArgumentError when linking to undefined
-	  object.
-
-Thu Mar 17 00:45:00 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* test/ruby/test_bignum.rb: Make sure to use Bignum values in the tests.
-
-Wed Mar 16 23:10:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/keywords (alias, undef): symbol literals are allowed.
-
-	* parse.y (parse_percent): should parse symbol literals for alias
-	  and undef.  [ruby-dev:47681] [Bug #8851]
-
-Wed Mar 16 21:39:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/JIS: update Unicode's notice. [Bug #11844]
-
-Wed Mar 16 20:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* proc.c (proc_binding): proc from symbol can not make a binding.
-	  [ruby-core:74100] [Bug #12137]
-
-Wed Mar 16 18:42:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Fixed and activated a test for Cherokee.
-
-Wed Mar 16 17:58:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Fixed a logical error.
-
-Wed Mar 16 17:57:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Adding tests for Cherokee.
-	  One test not yet working.
-	  (with Kimihito Matsui)
-
-Wed Mar 16 15:44:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: Adding tests for actual Unicode
-	  case mapping. Fixing some aliasing issues.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 21:38:28 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Consider redefinition of Fixnum#+.
-	  [ruby-dev:49510] [Bug#12178] Reported by usa.
-
-Tue Mar 15 20:32:57 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Implement the specialized code for :+ operator
-	  for Fixnums.
-
-Tue Mar 15 20:21:01 2016  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_inject): Implement the specialized code for self is an
-	  array and a symbol operator is given.
-
-Tue Mar 15 16:29:51 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Eliminating common code.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 16:17:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Expansion of some code repetition in preparation for
-	  elimination of common code pieces.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 13:49:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Additional macros and code to use mapping data in
-	  CaseMappingSpecials array.
-	  (with Kimihito Matsui)
-
-Tue Mar 15 13:41:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h (rb_gc_mark_global_tbl): should be private,
-	  but was accidentally exported.
-
-Tue Mar 15 12:51:06 2016  Marcus Stollsteimer  <sto.mar@web.de>
-
-	* doc/extension.ja.rdoc: Fix RDoc markup in doc/extension*.rdoc.
-	  [ci skip][Bug #12143][ruby-core:74143]
-	* doc/extension.rdoc: ditto.
-
-Tue Mar 15 09:56:41 2016  Ian Lunderskov  <ian.lunderskov@gmail.com>
-
-	* time.c: Minor typo in Time#dst? documentation.
-	  [ci skip][fix GH-1290]
-
-Tue Mar 15 04:36:41 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_rubyoptions.rb (test_disable): add tests for
-	  --disable-gems and --disable-did_you_mean.
-
-Tue Mar 15 03:35:04 2016  Eric Hodel  <drbrain@segment7.net>
-
-	* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
-
-Tue Mar 15 01:22:27 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_rubyoptions.rb: make version matching support
-	  JRuby's version output.
-
-Mon Mar 14 19:05:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* bignum.c (big2str_2bdigits): reduce div instruction.
-
-Mon Mar 14 18:39:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h, enc/unicode.c: Adjusting flag assignments
-	  and macros to work with unified CaseMappingSpecials array.
-	  (with Kimihito Matsui)
-
-Mon Mar 14 16:53:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_named_capture_assign): optimize named capture
-	  assignments, by replacing repeating global variable accesses
-	  with `dup`, and by returning the matched result instead of
-	  re-getting it from the MatchData.
-
-	* parse.y (reg_named_capture_assign_gen): build just assignment
-	  nodes for the optimization.
-
-Mon Mar 14 16:02:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (ruby_is_fd_loadable): now return -1 if loadable but
-	  may block.
-
-	* ruby.c (open_load_file): wait to read by the result of
-	  ruby_is_fd_loadable, without fstat.
-
-Mon Mar 14 13:38:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (fix2str): improve r54092 like rb_int2big().
-
-Mon Mar 14 10:02:23 2016  Eric Wong  <e@80x24.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
-	  [ruby-core:73803] [Bug #12069]
-
-Sun Mar 13 09:43:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum
-	  limit.  [ruby-core:74285] [Bug #12171]
-
-Sun Mar 13 09:15:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_fix2str): fix edge case, accidentally generated
-	  wrong Fixnum from LONG_MIN.
-
-Sat Mar 12 09:50:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
-	  cannot enclose non-identifier characters.
-	  a patch by Sebastian S in [ruby-core:74278].  [Bug#12170]
-
-Sat Mar 12 02:44:48 2016  Tanaka Akira  <akr@fsij.org>
-
-	* test/lib/test/unit.rb: describe !/REGEXP/ in the help message.
-
-Fri Mar 11 17:03:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/test/unit.rb (Options#non_options): make regexp name
-	  options prefixed with "!" negative filters.
-
-	* common.mk (TEST_EXCLUDES): use negative filter to exclude memory
-	  leak tests.  -x option excludes test files, not test methods.
-
-Fri Mar 11 16:11:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Streamlining approach to
-	  case mapping data not available from case folding by unifying all
-	  three cases (special title, special upper, special lower).
-	* enc/unicode.c: Adjust macro names for above (macros are currently inactive).
-	  (with Kimihito Matsui)
-
-Thu Mar 10 17:34:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (prepare_iseq_build): enable coverage by coverage_enabled
-	  option, not by parse_in_eval flag in the thread context.
-
-	* iseq.h (rb_compile_option_struct): add coverage_enabled flag.
-
-	* parse.y (yycompile0): set coverage_enabled flag if coverage
-	  array is made.
-
-Thu Mar 10 15:19:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.c (dump_option): nd_compile_option is a hidden hash object,
-	  cannot call inspect on it.
-
-Thu Mar 10 09:49:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/socket/test_socket.rb (test_udp_recvmsg_truncation):
-	  AIX does not set the MSG_TRUNC flag for a message partially read
-	  by recvmsg(2) with the MSG_PEEK flag set.
-
-Wed Mar  9 16:48:45 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix my last commit (syntax error).
-
-Wed Mar  9 16:41:44 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: fix output messages.
-
-	* benchmark/memory_wrapper.rb: use respond_to? because
-	  member? does not work well.
-
-Wed Mar  9 16:20:25 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: support memory usage benchmark.
-	  use `--measure-target=[target]'.
-	  Now, we can use the following targets:
-	    * real (default): real time which returns process time in sec.
-	    * peak: peak memory usage (physical memory) in bytes.
-	    * size: last memory usage (physical memory) in bytes.
-
-	* benchmark/memory_wrapper.rb: ditto.
-
-Wed Mar  9 15:04:22 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_gc_old_full.rb: add GC.start benchmark.
-
-	* benchmark/bm_vm3_gc_old_immediate.rb: ditto.
-
-	* benchmark/bm_vm3_gc_old_lazy.rb: ditto.
-
-Wed Mar  9 14:59:11 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/driver.rb: exit benchmarking if a benchmark process
-	  receives signals.
-
-Wed Mar  9 13:22:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/lib/memory_status.rb: make Memory::Status independent of
-	  MiniTest::Skip.
-
-	* test/lib/test/unit/assertions.rb (assert_no_memory_leak): skip
-	  if Memory::Status is not available.
-
-Wed Mar  9 09:19:55 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/io/wait/test_io_wait.rb (test_wait_readwrite_timeout):
-	  select(2) in AIX returns "readable" for the write-side fd
-	  of a pipe, so it is not possible to use a pipe to test
-	  the read-write timeout of IO#wait on AIX.
-
-Wed Mar  9 03:35:22 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
-	  Only remove PATH so threads don't accidentally double-pop.
-
-Wed Mar  9 00:29:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_method.c (rb_alias): the original name should be properly
-	  available method_added method, set the name before calling the
-	  hook.
-
-Wed Mar  9 00:07:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/logger.rb (Logger::LogDevice#initialize): define using
-	  keyword arguments.
-
-Tue Mar  8 23:37:07 2016  Charles Oliver Nutter  <headius@headius.com>
-
-	* test/ruby/test_array.rb: split out the test for no stack error
-	  on large input for test_permutation, test_repeated_permutation,
-	  and test_repeated_combination, and make them all timeout:30.
-
-Tue Mar  8 17:20:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* intern.h (rb_divmod): assume compilers `/` and `%` comply C99
-	  and reduce branching. If a compiler doesn't comply, add #ifdefs.
-
-	* intern.h (rb_div): added for Ruby's behavior.
-
-	* intern.h (rb_mod): added for Ruby's behavior.
-
-	* insns.def (opt_div): use rb_div.
-
-	* insns.def (opt_mod): use rb_mod.
-
-	* numeric.c (fixdivmod): removed.
-
-	* numeric.c (fix_divide): use rb_div.
-
-	* numeric.c (fix_mod): use rb_mod.
-
-	* numeric.c (fix_divmod): use rb_divmod.
-
-Tue Mar  8 17:53:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_mod): show its method name on ZeroDivisionError.
-	  [Bug #12158]
-
-Tue Mar  8 17:33:38 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): now no need to check
-	  ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X.
-
-Tue Mar  8 16:54:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): stop the VT100 emulation if the
-	  console supports it natively.
-
-Tue Mar  8 08:13:01 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/net/imap/test_imap.rb (test_idle_timeout): Because of the
-	  timeout specified in "imap.idle(0.2)", there is no guarantee that
-	  the server thread has done all the work before the client thread
-	  performs the assertions. It depends on the thread scheduling.
-	  Add checks to avoid false positives (on AIX, particularly).
-
-Tue Mar  8 00:42:22 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (warn_cr_in_shebang): meaningless check on DOSISH platforms.
-	  fixed a test failure introduced at r53998.
-
-Tue Mar  8 00:27:53 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
-	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.
-
-
-Tue Mar  8 00:25:08 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
-	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
-
-
-Tue Mar  8 00:21:58 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
-	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
-
-
-Tue Mar  8 00:11:47 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
-	  [Bug #11886] The patch provided by Akira Matsuda.
-
-	* ext/tk/sample/*.rb: ditto.
-
-Mon Mar  7 13:32:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_define_class, rb_define_class_id_under): raise
-	  ArgumentError if super is 0, deprecated behavior which has been
-	  warned long time.
-
-Mon Mar  7 13:28:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h: move function declarations for class internals from
-	  include/ruby/intern.h.
-
-Mon Mar  7 10:58:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/win32ole_event.c (rescue_callback): use
-	  rb_write_error_str instead of rb_write_error, to respect
-	  the encoding and prevent the message from GC.
-
-	* internal.h (rb_write_error_str): export.
-
-Mon Mar  7 01:38:41 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/ruby/test_process.rb (test_execopts_gid): Skip a test
-	  that is known to fail on AIX. AIX allows setgid to
-	  a supplementary group, but Ruby does not allow the "-e"
-	  option when setgid'ed, so the test does not work as intended.
-
-Sun Mar  6 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_obj_display): [DOC] fix output of Array, as Array#to_s
-	  is same as Array#inspect since 1.9.
-
-Sat Mar  5 09:50:58 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
-	  IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
-	  on AIX, so skip related tests.
-
-Sat Mar  5 09:17:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
-	  The fifth argument to getsockopt(2) should be modified to
-	  indicate the actual size of the value on return,
-	  but not in AIX. This is a know bug. Skip related tests.
-	* test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast):
-	  ditto.
-	* test/rinda/test_rinda.rb (test_make_socket_unicast): ditto.
-	* test/socket/test_basicsocket.rb (test_getsockopt): ditto.
-	* test/socket/test_sockopt.rb (test_bool): ditto.
-
-Sat Mar  5 07:36:27 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/-ext-/float/test_nextafter.rb: In AIX,
-	  nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0,
-	  but they should return -0.0 and +0.0, respectively. This is
-	  a known bug in nextafter(3) on AIX, so skip related tests.
-
-Sat Mar  5 07:14:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
-	  Skip two tests on AIX because zconf.h in zlib does not correctly
-	  recognize _LARGE_FILES in AIX. The problem was already reported
-	  to zlib, and skip these tests until it is fixed.
-
-Sat Mar  5 03:07:40 2016  Rei Odaira  <Rei.Odaira@gmail.com>
-
-	* thread_pthread.c (getstack): __pi_stacksize returned by
-	  pthread_getthrds_np() is wrong on AIX. Use
-	  __pi_stackend - __pi_stackaddr instead.
-
-Fri Mar  4 19:19:42 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: use 2 bits with unsigned int for rb_objspace::flags::mode
-	  because it always returns 0 to 2 (non-negative value).
-
-Fri Mar  4 18:42:08 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename "enum gc_stat" to "enum gc_mode"
-	  because there is a same name (no related) function gc_stat().
-
-	  Also gc_stat_* are renamed to gc_mode_*,
-	  gc_stat_transition() to gc_mode_transition(),
-	  rb_objspace::flags::stat is renamed to rb_objspace::flags::mode.
-
-	  Change rb_objspace::flags::mode from 2 bits to 3 bits because VC++
-	  returns negative enum value with 2 bits.
-
-	* gc.c (gc_mode): add a macro to access rb_objspace::flags::mode
-	  with verification code (verification is enabled only on
-	  RGENGC_CHECK_MODE > 0).
-
-	* gc.c (gc_mode_set): same macro for setter.
-
-Fri Mar  4 09:28:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.1.
-	  Please see entries of 2.6.0 and 2.6.1 on
-	  https://github.com/rubygems/rubygems/blob/master/History.txt
-	  [fix GH-1270] Patch by @segiddins
-
-Thu Mar  3 14:09:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (modifiable?, new_ostruct_member!, table!):
-	  rename methods for internal use with suffixes and make private,
-	  [ruby-core:71069] [Bug #11587]
-
-Wed Mar  2 16:28:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (method_missing): call by found method entry and get
-	  rid of searching the same method entry twice.
-
-	* vm_eval.c (vm_call0_body): calling method_missing method is
-	  method_missing().
-
-Wed Mar  2 15:13:33 2016  herwinw  <herwin@quarantainenet.nl>
-
-	* lib/xmlrpc.rb: Removed broken parser named XMLScanStreamParser.
-	  It's not works with current Ruby version.
-	  [fix GH-1271][ruby-core:59588][Bug #9369]
-	* lib/xmlrpc/config.rb: ditto.
-	* lib/xmlrpc/parser.rb: ditto.
-
-Wed Mar  2 15:08:33 2016  herwinw  <herwin@quarantainenet.nl>
-
-	* lib/xmlrpc.rb: Removed broken parser named XMLTreeParser.
-	  Required gem of its parser didn't compile on newer Ruby versions.
-	  [fix GH-1271][ruby-core:59590][Bug #9370]
-	* lib/xmlrpc/config.rb: ditto.
-	* lib/xmlrpc/parser.rb: ditto.
-
-Tue Mar  1 11:25:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb: use keyword arguments instead of option
-	  hashes.
-
-Mon Feb 29 16:50:20 2016  hanachin  <hanachin@gmail.com>
-
-	* array.c (rb_ary_push_m): [DOC] Remove trailing comma from
-	  Array#push example, as other Array examples doesn't put trailing
-	  comma.  [Fix GH-1279]
-
-Mon Feb 29 16:31:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk, tool/mkconfig.rb: set cross_compiling option from
-	  Makefile, but not from rbconfig.rb, which is just going to be
-	  created by this command.
-
-Sun Feb 28 23:13:49 2016  C.J. Collier  <cjcollier@linuxfoundation.org>
-
-	* configure.in: Add summary to end of configure output.
-	  [Fix GH-1275]
-
-Sun Feb 28 20:23:36 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (error_print): Add verbose failure messages and
-	  avoid infamous DRb::DRbConnError. [Feature #12101]
-
-Sun Feb 28 13:40:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (nometh_err_initialize): add private_call? parameter.
-
-	* error.c (nometh_err_private_call_p): add private_call? method,
-	  to tell if the exception raised in private form FCALL or VCALL.
-	  [Feature #12043]
-
-	* vm_eval.c (make_no_method_exception): append private_call?
-	  argument.
-
-	* vm_insnhelper.c (ci_missing_reason): copy FCALL flag.
-
-Sun Feb 28 10:19:47 2016  Ryan T. Hosford  <tad.hosford@gmail.com>
-
-	* array.c (rb_ary_and): clarify that set intersection returns the
-	  unique elements common to both arrays.
-
-	* array.c (rb_ary_or): clarify that union preserves the order from
-	  the given arrays.
-
-Sat Feb 27 17:05:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Reducing size of TitleCase
-	  table by eliminating duplicates.
-	  (with Kimihito Matsui)
-
-Fri Feb 26 14:40:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (num_step_scan_args): comparison String with Numeric
-	  should raise TypeError. it is an invalid type, but not a
-	  mismatch the number of arguments.  [ruby-core:62430] [Bug #9810]
-
-Fri Feb 26 14:39:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* doc/extension.rdoc, doc/extension.ja.rdoc: add editor local
-	  variables, with commenting out by :enddoc: directives which are
-	  just ignored unless code object mode.  [Bug #12111]
-
-Fri Feb 26 12:25:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/extension.ja.rdoc: removed rendering error caused by editor specific
-	  configuration on http://docs.ruby-lang.org/en/trunk/extension_rdoc.html .
-	  [Bug #12111][ruby-core:73990]
-
-Fri Feb 26 11:21:41 2016  herwinw  <herwin@quarantainenet.nl>
-
-	* lib/xmlrpc.rb: Removed references to NQXML. It's obsoleted parser.
-	  [fix GH-1245][ruby-core:59593][Feature #9371]
-	* lib/xmlrpc/config.rb: ditto.
-	* lib/xmlrpc/parser.rb: ditto.
-
-Fri Feb 26 11:10:19 2016  Rick Salevsky  <rsalevsky@suse.com>
-
-	* lib/tmpdir.rb: Unify to coding-style for method definition.
-	  [fix GH-1252]
-
-Fri Feb 26 11:02:04 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* README.md: update markdown syntax for anchor tag.
-	  [fix GH-1265] Patch by @lukBarros
-
-Fri Feb 26 10:52:29 2016  Alex Boyd  <alex@opengroove.org>
-
-	* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
-	  [fix GH-1205][ruby-core:72773][Bug #11969]
-
-Fri Feb 26 08:11:58 2016  Aaron Patterson <tenderlove@ruby-lang.org>
-
-	* gem_prelude.rb: Reduce system calls by activating the `did_you_mean`
-	  gem before requiring the gem.  Activating the gem puts the gem on
-	  the load path, where simply requiring the file will search every gem
-	  that's installed until it can find a gem that contains the
-	  `did_you_mean` file.
-
-Thu Feb 25 19:04:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: Adding possibility for debugging output
-	  for TitleCase table in casefold.h.
-	  (with Kimihito Matsui)
-
-Wed Feb 24 22:31:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Rearranging flag assignments and making
-	  space for titlecase indices; adding additional macros to add or
-	  extract titlecase index; adding comments for better documentation.
-	* enc/unicode.c: Moving some macros to include/ruby/oniguruma.h;
-	  activating use of titlecase indices.
-	  (with Kimihito Matsui)
-
-Wed Feb 24 21:03:04 2016  Tanaka Akira  <akr@fsij.org>
-
-	* random.c (limited_rand): Add a specialized path for when the limit fits
-	  in 32 bit.
-
-Tue Feb 23 21:52:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Outputting actual titlecase
-	  data (new table, with indices from other tables).
-	* enc/unicode.c: Ignoring titlecase data indices for the moment.
-	  (with Kimihito Matsui)
-
-Tue Feb 23 15:21:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Reading casing data from
-	  SpecialCasing.txt.
-	  (with Kimihito Matsui)
-
-Mon Feb 22 18:33:55 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Adding flag for title-case,
-	  not yet operational.
-	  (with Kimihito Matsui)
-
-Mon Feb 22 18:17:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Fixed bug that avoided inclusion
-	  of compatibility characters in upper-/lower-case mappings.
-	  (with Kimihito Matsui)
-
-Sun Feb 21 13:57:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cgi/escape/escape.c: Optimize CGI.unescape performance by C ext
-	  for ASCII-compatible encodings.  [Fix GH-1250]
-
-Sun Feb 21 13:56:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* cgi/escape/escape.c: Optimize CGI.unescapeHTML performance by C
-	  ext for ASCII-compatible encodings.  [Fix GH-1242]
-
-Sat Feb 20 15:38:16 2016  Eric Wong  <e@80x24.org>
-
-	* doc/extension.rdoc: update paths for defs/ directory
-
-Sat Feb 20 14:44:15 2016  Lucas Buchala  <lucasbuchala@gmail.com>
-
-	* vm_eval.c (rb_mod_module_eval): [DOC] Fix documentation
-	  signature for Module#module_eval.  [Fix GH-1258]
-
-Sat Feb 20 14:40:44 2016  Adam O'Connor  <northband@gmail.com>
-
-	* README.md: a few grammatical changes to the main Ruby README.md.
-	  [Fix GH-1259]
-
-Sat Feb 20 13:04:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_pattern, push_glob): deal with read paths as UTF-8
-	  to stat later, on Windows as well as OS X.
-	  [ruby-core:73868] [Bug #12081]
-
-Sat Feb 20 01:53:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_const_get): make error message at uninterned
-	  string consistent with symbols.  [ruby-dev:49498] [Bug #12089]
-
-Fri Feb 19 23:37:52 2016  Masahiro Tomita  <tommy@tmtm.org>
-
-	* lib/find.rb (Find#find): raise with the given path name if it
-	  does not exist.  [ruby-dev:49497] [Bug #12087]
-
-Fri Feb 19 12:44:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Activated use of case mapping data in CaseUnfold_11 array.
-	  (with Kimihito Matsui)
-
-Fri Feb 19 11:08:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: add cygwin case, nothing excluded.
-	  [ruby-core:73806] [Bug#12071]
-
-Thu Feb 18 21:32:15 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* man/irb.1: fix output in EXAMPLES.
-
-Thu Feb 18 21:05:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (sym_match_m): delegate to String#match but not
-	  String#=~.  [ruby-core:72864] [Bug #11991]
-
-Thu Feb 18 14:15:38 2016  Shota Fukumori  <her@sorah.jp>
-
-	* re.c: Add MatchData#named_captures
-	  [Feature #11999] [ruby-core:72897]
-
-	* test/ruby/test_regexp.rb(test_match_data_named_captures): Test for above.
-
-	* NEWS: News about MatchData#named_captures.
-
-Wed Feb 17 21:41:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defs/id.def (predefined): add idLASTLINE and idBACKREF for $_
-	  and $~ respectively.
-
-	* parse.y: use idLASTLINE and idBACKREF instead of rb_intern.
-
-Wed Feb 17 20:23:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_init): fix segfault and memory leak, consider
-	  wide char encoding terminator.
-
-Wed Feb 17 12:14:59 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_init): introduce String.new(capacity: size)
-	  [Feature #12024]
-
-Tue Feb 16 19:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, casefold.h: Used only first element
-	  (rather than all) of target in CaseUnfold_11 array.
-	  (with Kimihito Matsui)
-
-Tue Feb 16 18:24:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (compare_with_zero): fix variable name, rb_cmperr
-	  requires VALUEs but not an ID.
-
-Tue Feb 16 17:34:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_dir_s_empty_p): add Dir.empty? method, which tells the
-	  argument is the name of an empty directory.  [Feature #10121]
-
-Tue Feb 16 09:51:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (without_destdir): just strip a drive letter
-	  which is prepended by with_destdir.
-	  pointed out by @DavidEGrayson.
-	  https://github.com/ruby/ruby/commit/0e5f9ae#commitcomment-16101763
-
-Tue Feb 16 04:42:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_plus): simply use LONG2NUM() instead of wrongly
-	  complex overflow case.
-
-	* insns.def (opt_sub): ditto.
-
-Tue Feb 16 02:49:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (without_destdir): compare with the destdir
-	  after stripping a drive letter, on dosish platforms.
-	  pointed out by @DavidEGrayson.
-	  https://github.com/ruby/ruby/commit/d0cf23b#commitcomment-16100407
-
-Mon Feb 15 15:44:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parse_ident): allow keyword arguments just after a
-	  method where the same name local variable is defined.
-	  [ruby-core:73816] [Bug#12073]
-
-Mon Feb 15 14:43:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: Added debugging option
-	  (with Kimihito Matsui)
-
-Sun Feb 14 17:31:50 2016  Lars Kanis  <lars@greiz-reinsdorf.de>
-
-	* lib/mkmf.rb (with_{cpp,c,ld}flags): copy caller strings not to
-	  be modified, in append_{cpp,c,ld}flags respectively.
-	  [Fix GH-1246]
-
-Sun Feb 14 16:18:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): set the cause only if it is explicitly
-	  given or not set yet.  [Bug #12068]
-
-Sat Feb 13 21:44:58 2016  Tanaka Akira  <akr@fsij.org>
-
-	* hash.c (rb_hash_invert): [DOC] more examples.
-
-Sat Feb 13 17:30:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in
-	  no_proxy.  [ruby-core:73769] [Feature#12062]
-
-Sat Feb 13 17:11:58 2016  Fabian Wiesel  <fabian.wiesel@sap.com>
-
-	* lib/uri/generic.rb (find_proxy): exclude white-spaces and allow
-	  for a leading dot in the domain name in no_proxy.
-	  [ruby-core:54542] [Feature #8317]
-
-Fri Feb 12 12:20:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (name_err_initialize, nometh_err_initialize): [DOC] fix
-	  argument positions.  optional parameters except for the message
-	  are placed at the last.
-
-Fri Feb 12 11:49:49 2016  Anthony Dmitriyev  <antstorm@gmail.com>
-
-	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
-	  connection.  [Fix GH-1232]
-
-Fri Feb 12 11:17:38 2016  Bogdan  <bogdanvlviv@gmail.com>
-
-	* re.c (rb_reg_initialize_m): [DOC] fix missing right bracket.
-	  [Fix GH-1243]
-
-Thu Feb 11 14:57:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_CHECK_SIZEOF, RUBY_DEFINT): fix for types
-	  which are conditionally available depending on architectures
-	  when universal binary, e.g., __int128.
-
-Thu Feb 11 06:26:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (RUBY_DEFINT): use Parameter Expansion.
-
-Thu Feb 11 05:33:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in (int128_t): don't check HAVE_XXX (for example
-	  HAVE___INT128) because RUBY_CHECK_SIZEOF() don't define it for
-	  config.h and use of $ac_cv_sizeof___int128 alternates the check.
-	  (and don't need to define because users shouldn't know that)
-
-Wed Feb 10 12:03:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ARFLAGS): check if deterministic mode flag is
-	  effective, which is on by default on Ubuntu.
-
-Tue Feb  9 16:36:23 2016  Naotoshi Seo  <sonots@gmail.com>
-
-	* lib/logger.rb: Remove block from Logger.add as it's not needed
-	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
-
-Tue Feb  9 14:32:23 2016  Zachary Scott  <zzak@ruby-lang.org>
-
-	* ext/zlib/zlib.c: Document mtime header behavior with patch by @schneems
-	  Fixes [GH-1129]: https://github.com/ruby/ruby/pull/1129
-
-Tue Feb  9 13:52:49 2016  Zachary Scott  <zzak@ruby-lang.org>
-
-	* re.c: Remove deprecated kcode argument from Regexp.new and compile
-	  patch provided by Dylan Pulliam [Bug #11495]
-
-Mon Feb  8 21:26:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb, enc/unicode/casefold.h: Flags for
-	  upper/lower conversion added (titlecase and SpecialCasing still missing)
-	  (with Kimihito Matsui)
-
-Mon Feb  8 20:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c, enc/unicode.c: Disassociating ONIGENC_CASE_FOLD flag from
-	  ONIGENC_CASE_DOWNCASE.
-	  (with Kimihito Matsui)
-
-Mon Feb  8 13:00:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Shortened macros for enc/unicode/casefold.h to
-	  single-letter; use flags in casefold.h for logic.
-
-	* enc/unicode/case-folding.rb: Added flag for case folding.
-	  Changed parameter passing.
-
-	* enc/unicode/casefold.h: New flags added.
-	  (with Kimihito Matsui)
-
-Mon Feb  8 10:30:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (feature_option): raise a runtime error if ambiguous
-	  feature name is given, in the future.  [Bug #12050]
-
-Mon Feb  8 09:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Removed enc/unicode/casefold.h from automatic build because
-	  some CI systems don't have gperf. Creation of enc/unicode/casefold.h
-	  is now possible with make unicode-up. This is intended as a temporary measure.
-
-Sun Feb  7 22:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added two more precondition files for enc/unicode/casefold.h
-
-	* enc/unicode.c: Added shortening macros for enc/unicode/casefold.h
-
-	* enc/unicode/case-folding.rb: Fixed file encoding for CaseFolding.txt
-	  to ASCII-8BIT (should fix some ci errors). Clarified usage. Created
-	  class MapItem. Partially implemented class CaseMapping.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 14:12:32 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: Fixing parameter passing.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 11:44:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode/case-folding.rb: New classes CaseMapping/CaseMappingDummy
-	  to pass as parameters; not yet implemented or used.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 11:16:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: using new option in recipe for enc/unicode/casefold.h
-
-	* enc/unicode/case-folding.rb: Correctly specify argument to new option.
-	  (with Kimihito Matsui)
-
-Sun Feb  7 10:43:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	(this commit message applies to the previous commit)
-	* common.mk: explicit recipe for enc/unicode/casefold.h
-
-	* enc/unicode/case-folding.rb: Adding -m option to prepare for using
-	  multiple data files.
-	  (with Kimihito Matsui)
-
-Sat Feb  6 22:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/util.rb (escapeHTML, unescapeHTML): consider
-	  ASCII-incompatible encodings.  [Fix GH-1239]
-
-Sat Feb  6 15:18:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_regex_casefold.rb: Added data-based testing for
-	  String#downcase :fold.
-
-	* enc/unicode.c: Fixed a range error (lowest non-ASCII character affected
-	  by case operations is U+00B5, MICRO SIGN)
-
-	* test/ruby/enc/test_case_mapping.rb: Explicit test for case folding of
-	  MICRO SIGN to Greek mu.
-	  (with Kimihito Matsui)
-
-Sat Feb  6 14:51:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_regex_casefold.rb: Tests for three case folding
-	  primitives (mbc_case_fold, get_case_fold_codes_by_str,
-	  apply_all_case_fold) in the various encodings. Currently only known
-	  good encodings are tested to avoid test failures. For bug hunting,
-	  start by adding more encodings with
-	  generate_test_casefold encoding
-	  (with Kimihito Matsui)
-
-Sat Feb  6 14:37:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c, test/ruby/enc/test_case_mapping.rb: Implemented :fold
-	  option for String#downcase by using case folding data from
-	  regular expression engine, and added a few simple tests.
-	  (with Kimihito Matsui)
-
-Fri Feb  5 20:08:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_case_mapping.rb: added tests for :ascii option.
-	  (with Kimihito Matsui)
-
-Fri Feb  5 12:22:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_mult): Use int128_t for overflow detection.
-
-	* bignum.c (rb_uint128t2big): added for opt_mult.
-
-	* bignum.c (rb_uint128t2big): added for rb_uint128t2big..
-
-	* configure.in: define int128_t, uint128_t and related MACROs.
-	  Initially introduced by r41379 but reverted by r50749.
-
-Thu Feb  4 21:05:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Activated :ascii flag for ASCII-only case conversion
-	  (with Kimihito Matsui)
-
-Thu Feb  4 17:38:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* re.c (reg_set_source): make source string frozen without
-	  copying.
-
-	* re.c (rb_reg_initialize_m): refactor initialization with
-	  encoding.
-
-Thu Feb  4 15:35:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to
-	  make fstring with encoding.
-
-Thu Feb  4 14:42:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added Unicode data file SpecialCasing.txt to be additionally
-	  downloaded (with Kimihito Matsui)
-
-Thu Feb  4 12:39:08 2016  joker1007  <kakyoin.hierophant@gmail.com>
-
-	* cgi/escape/escape.c: Optimize CGI.escape performance by C ext
-	  for ASCII-compatible encodings.  [Fix GH-1238]
-
-Thu Feb  4 11:53:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Introduce two variables (UNICODE_DATA_DIR and
-	  UNICODE_SRC_DATA_DIR) to eliminate repetitions.
-
-Wed Feb  3 12:13:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (str_new_frozen): if the given string is embeddedable
-	  but not embedded, embed a new copied string. [Bug #11946]
-
-Wed Feb  3 08:25:38 2016  boshan  <boshan@subsplash.com>
-
-	* ext/openssl/ossl_pkey.c (Init_ossl_pkey): [DOC] Fix typo
-	  "encrypted" to "decrypted".  [Fix GH-1235]
-
-Wed Feb  3 08:21:32 2016  Seiei Miyagi  <hanachin@gmail.com>
-
-	* ext/ripper/lib/ripper/lexer.rb (on_heredoc_dedent): Fix
-	  Ripper.lex error in dedenting squiggly heredoc.  heredoc tree is
-	  also an array of Elem in the outer tree.  [Fix GH-1234]
-
-Wed Feb  3 02:33:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_prepare_enc): use already compiled US-ASCII regexp
-	  if given string is ASCII only.
-	  121.2s to 113.9s on my x86_64-freebsd10.2 Intel Core i5 661
-
-Tue Feb  2 13:02:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c: Introduce RREGEXP_PTR.
-	  patch by dbussink.
-	  partially merge https://github.com/ruby/ruby/pull/497
-
-	* include/ruby/ruby.h: ditto.
-
-	* gc.c: ditto.
-
-	* ext/strscan/strscan.c: ditto.
-
-	* parse.y: ditto.
-
-	* string.c: ditto.
-
-Tue Feb  2 09:08:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems/specification.rb: `coding` is effective only first
-	  line except shebang.
-
-	* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
-
-Mon Feb  1 21:41:58 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.5.2.
-	  It supports to enable frozen string literal and add `--norc` option for
-	  disable to `.gemrc` configuration.
-	  See 2.5.2 release notes for other fixes and enhancements.
-	  https://github.com/rubygems/rubygems/blob/a8aa3bac723f045c52471c7b9328310a048561e0/History.txt#L3
-
-Sun Jan 31 12:33:13 2016  Dan Kreiger  <dan@dankreiger.com>
-
-	* test/drb/ut_large.rb (multiply, avg, median): add additional
-	  math operations to DRbLarge.  [Fix GH-1086]
-
-Sun Jan 31 12:19:15 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_file_exhaustive.rb (test_lstat): Add lacking test
-	  for File#lstat.  [Fix GH-1231]
-
-Sun Jan 31 12:15:33 2016  Prayag Verma  <prayag.verma@gmail.com>
-
-	* doc/standard_library.rdoc: fix typo  [Fix GH-1230]
-	  Spelling mistakes -
-	  outputing > outputting
-	  publich > publish
-
-Sat Jan 30 15:18:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_eval.c (rb_check_funcall_with_hook): also should call the
-	  given hook before returning Qundef when overridden respond_to?
-	  method returned false.  [ruby-core:73556] [Bug #12030]
-
-Fri Jan 29 17:40:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/file.c (rb_readlink): drop garbage after the substitute
-	  name, as rb_w32_read_reparse_point returns the expected buffer
-	  size but "\??\" prefix is dropped from the result.
-
-	* win32/win32.c (w32_readlink): ditto, including NUL-terminator.
-
-Fri Jan 29 17:07:27 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (fileattr_to_unixmode, rb_w32_reparse_symlink_p): volume
-	  mount point should be treated as directory, not symlink.
-	  [ruby-core:72483] [Bug #11874]
-
-	* win32/win32.c (rb_w32_read_reparse_point): check the reparse point is
-	  a volume mount point or not.
-
-	* win32/file.c (rb_readlink): follow above change (but this pass won't
-	  be used).
-
-Fri Jan 29 16:17:07 2016  Lucas Buchala  <lucasbuchala@gmail.com>
-
-	* enum.c (enum_take_while, enum_drop_while): rename block
-	  parameter to obj, since they are generic objects.  [Fix GH-1226]
-
-Fri Jan 29 14:15:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/erb.rb (ERB::Compiler#detect_magic_comment): allow
-	  frozen-string-literal in comment as well as encoding.
-
-	* lib/erb.rb (ERB#def_method): insert def line just before the
-	  first non-comment and non-empty line, not to leave duplicated
-	  and stale magic comments.
-
-Fri Jan 29 11:13:33 2016  Jeremy Evans  <code@jeremyevans.net>
-
-	* lib/erb.rb (ERB#set_eoutvar): explicitly make mutable string as
-	  a buffer to make ERB work with --enable-frozen-string-literal.
-	  [ruby-core:73561] [Bug #12031]
-
-Fri Jan 29 10:44:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http/header.rb: Warn nil variable on HTTP Header.
-	  It caused to NoMethodError. [fix GH-952][fix GH-641] Patch by @teosz
-	* test/net/http/test_httpheader.rb: Added test for nil HTTP Header.
-
-Thu Jan 28 17:31:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_gethostname): support unlimited size
-	  hostname.
-
-Wed Jan 27 21:03:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/-ext-/string/test_capacity.rb: Added missing library.
-
-Wed Jan 27 18:53:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fixed bit mask in macro OnigCodePointCount
-
-Wed Jan 27 17:54:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Protect code point count by macro, in order to
-	  be able to use the remaining bits for flags.
-	  (with Kimihito Matsui)
-
-Wed Jan 27 16:34:35 2016  boshan  <boshan@subsplash.com>
-
-	* lib/tempfile.rb (Tempfile#initialize): [DOC] the first parameter
-	  `basename` is optional and defaulted to an empty string since
-	  [GH-523].  [Fix GH-1225]
-
-Wed Jan 27 16:25:54 2016  Koichi ITO  <koic.ito@gmail.com>
-
-	* array.c (rb_ary_dig): [DOC] fix the exception class to be raised
-	  when intermediate object does not have dig method.  TypeError
-	  will be raised now.  [Fix GH-1224]
-
-Tue Jan 26 19:36:15 2016  Aggelos Avgerinos  <evaggelos.avgerinos@gmail.com>
-
-	* array.c (permute0, rpermute0): [DOC] Substitute indexes ->
-	  indices in documentation for consistency.  [Fix GH-1222]
-
-Tue Jan 26 15:21:37 2016  Eric Wong  <e@80x24.org>
-
-	* compile.c (caller_location): use rb_fstring_cstr for "<compiled>"
-	  (it is converted to fstring anyways inside rb_iseq_new_with_opt)
-	* iseq.c (iseqw_s_compile): ditto
-	* iseq.c (rb_iseq_new_main): use rb_fstring_cstr for "<main>"
-	* vm.c (Init_VM): ditto, share with with above
-	* iseq.c (iseqw_s_compile_file): rb_fstring before rb_io_t->pathv
-	  share "<main>" with above
-	* vm.c (rb_binding_add_dynavars): fstring "<temp>" immediately
-
-Tue Jan 26 15:14:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
-
-	* compile.c (iseq_peephole_optimize): don't apply tailcall
-	  optimization to send/invokesuper instructions with blockiseq.
-	  This is a follow-up to the changes in r51903; blockiseq is now
-	  the third operand of send/invokesuper instructions.
-	  [ruby-core:73413] [Bug #12018]
-
-Tue Jan 26 14:26:46 2016  Eric Wong  <e@80x24.org>
-
-	* signal.c (sig_list): use fstring for hash key
-	* test/ruby/test_signal.rb (test_signal_list_dedupe_keys): added
-
-Tue Jan 26 13:08:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* signal.c (rb_f_kill): should immediately deliver reserved
-	  signals SIGILL and SIGFPE, not only SIGSEGV and SIGBUS.
-
-Tue Jan 26 07:57:28 2016  Joseph Tibbertsma  <josephtibbertsma@gmail.com>
-
-	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
-	  [Fix GH-1221]
-
-Mon Jan 25 17:26:54 2016  Eric Wong  <e@80x24.org>
-
-	* ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name
-	* vm_core.h: include ruby_assert.h before using
-	  [ruby-core:73371]
-
-Mon Jan 25 15:55:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.c (sym_check_asciionly): more informative error message
-	  with the encoding name and the inspected content.
-	  [ruby-core:73398] [Feature #12016]
-
-Mon Jan 25 09:38:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_string.rb: added testcase for next!, succ and succ!
-	  [fix GH-1213] Patch by @K0mAtoru
-
-Mon Jan 25 09:32:25 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/httpservlet/filehandler.rb: fix documentation for namespace.
-	  [fix GH-1219][ci skip] Patch by @leafac
-
-Sun Jan 24 19:34:23 2016  Eric Wong  <e@80x24.org>
-
-	* vm_insnhelper.c (vm_check_if_namespace): tiny size reduction
-
-Sun Jan 24 18:12:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Simplifying Unicode data file download logic to make
-	  it more reliable (including additional fix not in r53633) [Bug #12007]
-
-Sun Jan 24 16:54:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/wait/wait.c (io_wait_readwrite): [EXPERIMENTAL] allow to
-	  wait for multiple modes, readable and writable, at once.  the
-	  arguments may change in the future.  [Feature #12013]
-
-Sat Jan 23 22:30:59 2016  K0mA  <mctj1218@gmail.com>
-
-	* test/ruby/test_array.rb (test_keep_if): Add test for
-	  Array#keep_if separate from Array#select!  [Fix GH-1218]
-
-Sat Jan 23 20:54:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: revert r53633. It broke rubyci and travis.
-	  https://travis-ci.org/ruby/ruby/builds/104259623
-
-Sat Jan 23 20:10:29 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* range.c (range_eqq): revert r51585 because rb_call_super() is
-	  called in range_include() and thus r51585 doesn't work when the
-	  receiver Range object consists of non linear objects such as Date
-	  objects.
-	  [ruby-core:72908] [Bug #12003]
-
-Sat Jan 23 18:37:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* ChangeLog: Fixing wrong time on previous commit, and adding
-	  previous commit message to svn [ci skip]
-
-Sat Jan 23 18:30:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Simplifying Unicode data file download logic to make
-	  it more reliable [Bug #12007]
-
-Sat Jan 23 16:29:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* tool/downloader.rb: Fixed a logical error, improved documentation
-
-Sat Jan 23 11:42:43 2016  Peter Suschlik  <ps@neopoly.de>
-
-	* README.md: Use SVG Travis badge over PNG for better quality and
-	  device support.  [Fix GH-1214] [Fix GH-1216]
-
-Sat Jan 23 11:29:16 2016  Pascal Betz  <pascal.betz@simplificator.com>
-
-	* lib/csv.rb: Update documentation of CSV header converter for
-	  r45498, [GH-575].  [Fix GH-1215]
-
-Fri Jan 22 17:36:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_core.h (VM_ASSERT): use RUBY_ASSERT instead of rb_bug.
-
-	* error.c (rb_assert_failure): assertion with stack dump.
-
-	* ruby_assert.h (RUBY_ASSERT): new header for the assertion.
-
-Fri Jan 22 00:25:57 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regparse.c (fetch_name_with_level): allow non word characters
-	  at the first character.  [Feature #11949]
-
-	* regparse.c (fetch_name): ditto.
-
-Thu Jan 21 17:34:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* marshal.c (r_object0): honor Marshal.load post proc
-	  value for TYPE_LINK.  by Hiroshi Nakamura <nahi@ruby-lang.org>
-	  https://github.com/ruby/ruby/pull/1204 fix GH-1204
-
-Thu Jan 21 16:37:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* Makefile.in (update-rubyspec): fix r53208 like r53451.
-
-Wed Jan 20 20:58:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk, Makefile.in: update-config_files is only for Unix
-	  platforms.
-
-Wed Jan 20 17:13:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/extlibs.rb: add --cache option to change cache directory.
-
-Tue Jan 19 17:03:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* common.mk: Added Unicode data file CaseFolding.txt to be additionally
-	  downloaded (with Kimihito Matsui)
-
-Tue Jan 19 10:09:58 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* lib/shell.rb (Shell.debug_output_exclusive_unlock): remove
-	  because Mutex#exclusive_unlock was already deleted. [fix GH-1185]
-
-Tue Jan 19 09:38:27 2016  Nick Cox  <nick@nickcox.me>
-
-	* vm_method.c: fix grammar in respond_to? warning.
-	  [fix GH-1047]
-
-Mon Jan 18 14:37:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): an escaped newline is not an
-	  actual newline, and the rest part should not be dedented.
-	  [ruby-core:72855] [Bug #11989]
-
-Mon Jan 18 12:04:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/ruby/test_string.rb: Added extra testcase for test_rstrip_bang
-	  and test_lstrip_bang. [fix GH-1178] Patch by @Matrixbirds
-
-Mon Jan 18 11:47:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* string.c: fix a typo. [fix GH-1202][ci skip] Patch by @sunboshan
-
-Sun Jan 17 21:15:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: improve ICC (Intel C Compiler) support.
-
-	* configure.in (CXX): The name of icc's c++ compiler is `icpc`.
-
-	* configure.in (warnings): Add `-diag-disable=2259` to suppress
-	  noisy warnings: "non-pointer conversion from "..." to "..." may
-	  lose significant bits".
-
-	* configure.in (optflags): Add `-fp-model precise` like -fno-fast-math.
-
-	* lib/mkmf.rb: icc supports -Werror=division-by-zero
-	  and -Werror=deprecated-declarations, but doesn't support
-	  -Wdivision-by-zero and -Wdeprecated-declarations.
-
-Sun Jan 17 20:40:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Any kind of option is now taking the new code path for
-	  upcase/downcase/capitalize/swapcase. :lithuanian can be used for
-	  testing if no specific option is desired.
-	* test/ruby/enc/test_case_mapping.rb: Adjusted to above.
-	  (with Kimihito Matsui)
-
-Sun Jan 17 20:10:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Fixed a logical error and some comments.
-	* test/ruby/enc/test_case_mapping.rb: Made tests more general.
-	  (with Kimihito Matsui)
-
-Sun Jan 17 17:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Removed artificial expansion for Turkic,
-	  added hand-coded support for Turkic, fixed logic for swapcase.
-	* string.c: Made use of new case mapping code possible from upcase,
-	  capitalize, and swapcase (with :lithuanian as a guard).
-	* test/ruby/enc/test_case_mapping.rb: Adjusted for above.
-	  (with Kimihito Matsui)
-
-Sun Jan 17 15:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (sockopt_bool): relax boolean size to be one
-	  too not only sizeof(int).  Winsock getsockopt() returns a single
-	  byte as a boolean socket option.  [ruby-core:72730] [Bug #11958]
-
-Sun Jan 17 14:43:01 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_env.rb: [Fix GH-1201]
-	  * Extract test code for ENV#keep_if from ENV#select_bang
-	  * Add a test case for ENV#select_bang,keep_if
-
-Sun Jan 17 14:42:25 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_env.rb: [Fix GH-1201]
-	  * Extract test code for ENV#delete_if from ENV#reject_bang
-	  * Add a test case for ENV#reject_bang,delete_if
-
-Sun Jan 17 14:40:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/option.c (check_size): extract a macro to check
-	  binary data size, with a consistent message.
-
-	* ext/socket/option.c (sockopt_byte): fix error message,
-	  sizeof(int) differs from sizeof(unsigned char) in general.
-
-Sat Jan 16 21:16:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (xstring): reset heredoc indent after dedenting,
-	  so that following string literal would not be dedented.
-	  [ruby-core:72857] [Bug #11990]
-
-Sat Jan 16 17:24:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* enc/unicode.c: Artificial mapping to test buffer expansion code.
-	* string.c: Fixed buffer expansion logic.
-	* test/ruby/enc/test_case_mapping.rb: Tests for above.
-	  (with Kimihito Matsui)
-
-Sat Jan 16 16:47:14 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/pkey.rb: Added 2048 bit DH parameter.
-	* test/openssl/test_pkey_dh.rb: ditto.
-
-Sat Jan 16 10:51:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
-	* string.c: ditto.
-
-Sat Jan 16 10:31:00 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* common.mk: test-sample was changed to test-basic.
-	  [Feature #11982][ruby-core:72823]
-	* basictest/runner.rb: ditto. rename from tool/rubytest.rb.
-	* basictest/test.rb: ditto. rename from sample/test.rb.
-	* defs/gmake.mk: picked from r53540
-	* sample/test.rb: backward compatibility for chkbuild.
-
-Sat Jan 16 10:23:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c, enc/unicode.c: New code path as a preparation for Unicode-wide
-	  case mapping. The code path is currently guarded by the :lithuanian
-	  option to avoid accidental problems in daily use.
-	* test/ruby/enc/test_case_mapping.rb: Test for above.
-	* string.c: function 'check_case_options': fixed logical errors
-	  (with Kimihito Matsui)
-
-Fri Jan 15 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
-
-	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): The value of
-	  UNALIGNED_WORD_ACCESS should be used to determine whether
-	  unaligned word access is allowed or not. After this commit,
-	  ./configure CPPFLAGS="-DUNALIGNED_WORD_ACCESS=0" disables
-	  unaligned word access even on platforms that support the feature.
-
-Fri Jan 15 16:12:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (string1): reset heredoc indent for each string literal
-	  so that concatenated string would not be dedented.
-	  [ruby-core:72857] [Bug #11990]
-
-Thu Jan 14 20:01:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#to_s): change encoding to
-	  UTF-8 as Ruby 2.2/ by Koichi ITO <koic.ito@gmail.com>
-	  https://github.com/ruby/ruby/pull/1188 fix GH-1188
-
-Thu Jan 14 17:36:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_f_global_variables): add matched back references
-	  only, as well as defined? operator.
-
-Thu Jan 14 16:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): format exact number more exactly.
-
-Thu Jan 14 15:08:43 2016  Tony Arcieri  <bascule@gmail.com>
-
-	* Remove 512-bit DH group. It's affected by LogJam Attack.
-	  https://weakdh.org/
-	  [fix GH-1196][Bug #11968][ruby-core:72766]
-
-Thu Jan 14 11:44:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_f_global_variables): add $1..$9 only if $~ is
-	  set.  fix the condition removed at r14014.
-
-Wed Jan 13 17:21:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* .travis.yml: removed commented-out code.
-
-Wed Jan 13 17:14:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* .travis.yml: removed osx code. follow up with r53517
-
-Wed Jan 13 16:56:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically
-	  generated iseq by eval from GC.  [ruby-core:72620] [Bug #11928]
-
-Wed Jan 13 03:42:58 2016  Eric Wong  <e@80x24.org>
-
-	* class.c (Init_class_hierarchy): resolve name for rb_cObject ASAP
-	* object.c (rb_mod_const_set): move name resolution to rb_const_set
-	* variable.c (rb_const_set): do class resolution here
-	  [ruby-core:72807] [Bug #11977]
-
-Wed Jan 13 00:37:12 2016  Satoshi Ohmori  <sachin21dev@gmail.com>
-
-	* man/ruby.1: fix double word typo.  [Fix GH-1194]
-
-Tue Jan 12 21:01:09 2016  Benoit Daloze  <eregontp@gmail.com>
-
-	* common.mk: update URL and name for the Ruby spec suite.
-
-Tue Jan 12 19:52:19 2016  sorah (Shota Fukumori)  <her@sorah.jp>
-
-	* lib/forwardable.rb: Convert given accessors to String.
-
-	  r53381 changed to accept only Symbol or String for accessors, but
-	  there are several rubygems that pass classes (e.g. Array,
-	  Hash, ...) as accessors. Prior r53381, it was accepted because Class#to_s
-	  returns its class name. After r53381 given accessors are checked
-	  with define_method, but it accepts only Symbol or String, otherwise
-	  raises TypeError.
-
-	      def_delegator Foo, :some_method
-
-	  This change is to revert unexpected incompatibility. But this behavior
-	  may change in the future.
-
-Mon Jan 12 18:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: made a variable name more grammatically correct
-
-Mon Jan 12 18:34:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: minor grammar fix [ci skip]
-
-Mon Jan 12 16:09:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* test/ruby/enc/test_casing_options.rb: Tests for option
-	  parsing/checking for upcase/downcase/capitalize/swapcase
-	  (see r53503; with Kimihito Matsui)
-
-Mon Jan 12 16:03:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* string.c: Added option parsing/checking for upcase/downcase/
-	  capitalize/swapcase (with Kimihito Matsui)
-
-Mon Jan 11 21:28:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* include/ruby/oniguruma.h: Added flags needed for upcase/downcase
-	  Unicode addition (with Kimihito Matsui)
-
-Mon Jan 11 09:50:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check if the API version number is consistent with
-	  the program version number.
-
-Sun Jan 10 20:57:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (compile_massign_lhs): when index ends with splat,
-	  append rhs value to it like POSTARG, since VM_CALL_ARGS_SPLAT
-	  splats the last argument only.  [ruby-core:72777] [Bug #11970]
-
-Sun Jan 10 15:45:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/missing.h (explicit_bzero_by_memset_s): remove
-	  inline implementation by memset_s, which needs a macro before
-	  including headers and can cause problems in extension libraries
-	  by the order of the macro and headers.
-
-Sun Jan 10 13:41:36 2016  Eric Wong  <e@80x24.org>
-
-	* io.c (rb_deferr): remove long obsolete global
-
-Sun Jan 10 09:14:42 2016  Eric Wong  <e@80x24.org>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb (visit_String):
-	  eliminate chomp
-	* lib/net/http.rb (connect): eliminate delete
-	* lib/net/http/header.rb (basic_encode): ditto
-	* lib/net/imap.rb (authenticate): eliminate gsub
-	  (self.encode_utf7): shorten delete arg
-	* lib/net/smtp.rb (base64_encode): eliminate gsub
-	* lib/open-uri.rb (OpenURI.open_http): eliminate delete
-	* lib/rss/rss.rb: ditto
-	* lib/securerandom.rb (base64): ditto
-	  (urlsafe_base64): eliminate delete!
-	* lib/webrick/httpauth/digestauth.rb (split_param_value):
-	  eliminate chop
-	* lib/webrick/httpproxy.rb (do_CONNECT): eliminate delete
-	  (setup_upstream_proxy_authentication): ditto
-	  [ruby-core:72666] [Feature #11938]
-
-Sat Jan  9 23:19:14 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_hash.rb (test_try_convert): Add test for
-	  Hash.try_convert.  [Fix GH-1190]
-
-Sat Jan  9 23:15:25 2016  Jon Moss  <maclover7@users.noreply.github.com>
-
-	* ext/openssl/ossl.c: Add missing variables to documentation
-	  examples.  [Fix GH-1189]
-
-Sat Jan  9 18:25:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* symbol.h (is_attrset_id): ASET is an attrset ID.  fix
-	  unexpected safe call instead of an ordinary ASET.
-
-Sat Jan  9 10:44:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, win32/setup.mak: extract RUBY_PROGRAM_VERSION from
-	  RUBY_VERSION in version.h instead of RUBY_API_VERSION numbers in
-	  include/ruby/version.h, and cut it into version numbers.
-
-Sat Jan  9 07:13:33 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename PAGE_* to HEAP_PAGE_* because PAGE_SIZE is used
-	  in Mac OS X.
-
-	* test/ruby/test_gc.rb: catch up this fix.
-
-Sat Jan  9 05:45:40 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: PAGE_BITMAP_PLANES (the number of bitmap) is 4, not 3.
-
-Sat Jan  9 05:42:57 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename constant names HEAP_* to PAGE_*.
-
-	  Keys of GC::INTERNAL_CONSTANTS are also renamed.
-
-	* test/ruby/test_gc.rb: catch up this fix.
-
-Fri Jan  8 22:30:06 2016  Akinori MUSHA  <knu@iDaemons.org>
-
-	* doc/regexp.rdoc: [DOC] Elaborate on the \G anchor. [ci skip]
-
-Fri Jan  8 19:49:27 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove heap_page::body. Instead of this field,
-	  heap_page::start field works well.
-
-Fri Jan  8 19:31:52 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: rename rb_heap_t::page_length to rb_heap_t::total_pages.
-
-	  `page_length' is not clear (we may understand with length of
-	  a page).
-
-Fri Jan  8 17:07:14 2016  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c: remove heap_page::heap. This field is only used to recognize
-	  whether a page is in a tomb or not. Instead of this field,
-	  heap_page::flags::in_tomb (1 bit field) is added.
-
-	  Also type of heap_page::(total|free|final)_slots are changed from
-	  int to short. 2B is enough for them.
-
-Fri Jan  8 09:33:59 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* iseq.c (rb_iseq_compile_with_option): move variable initialization
-	  code to avoid maybe-uninitialized warnings by gcc 4.8.
-
-Fri Jan  8 00:03:22 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* enum.c (enum_min, enum_max): do the same optimization as r53454.
-
-Thu Jan  7 22:32:21 2016  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
-	  and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
-	  [ruby-core:72736] [Bug #11962]
-
-Thu Jan  7 22:02:21 2016  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* enum.c (enum_minmax): optimize object comparison in
-	  Enumerable#minmax.
-
-Thu Jan  7 14:49:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
-	  before initialization.
-
-	* thread.c (thread_raise_m, rb_thread_kill): uninitialized thread
-	  cannot interrupt.  [ruby-core:72732] [Bug #11959]
-
-Thu Jan  7 11:34:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/backward.h (ruby_show_copyright_to_die): for source
-	  code backward compatibility.
-
-	* ruby.c (process_options): return Qtrue to exit the process
-	  successfully.
-
-	* version.c (ruby_show_copyright): no longer exit.
-
-Wed Jan  6 17:22:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#order!): add `into` optional
-	  keyword argument to store the results.  [Feature #11191]
-
-Tue Jan  5 21:44:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* ChangeLog: fix wrong class name.
-
-Tue Jan  5 21:43:50 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb(test_chr): added test for String#chr
-	  [fix GH-1179]
-
-Tue Jan  5 21:32:26 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_numeric.rb (test_nonzero_p): added test for Numeric#nonzero?
-	  [fix GH-1187]
-
-Tue Jan  5 11:47:23 2016  Damir Gaynetdinov  <damir.gaynetdinov@gmail.com>
-
-	* doc/marshal.rdoc: Clarify object references example, that the
-	  reference is same object.  [Fix GH-1156]
-
-Tue Jan  5 05:06:51 2016  Eric Wong  <e@80x24.org>
-
-	* ext/stringio/stringio.c (strio_binmode): implement to set encoding
-	* test/stringio/test_stringio.rb (test_binmode): new test
-	  [ruby-core:72699] [Bug #11945]
-
-Mon Jan  4 15:44:37 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* variable.c (rb_mod_deprecate_constant): [DOC] added
-	  documentation for Module#deprecate_constant. [ci skip]
-
-Mon Jan  4 15:36:38 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
-
-	* thread_sync.c: [DOC] remove SizedQueue#close argument.
-	  [ci skip]
-
-Mon Jan  4 10:14:24 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* test/coverage/test_coverage.rb: ignored test when enabled to coverage.
-	  It lead to crash with `make test-all`.
-
-Mon Jan  4 08:10:44 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* insns.def (opt_case_dispatch): Move a comment to the
-	  appropriate position.
-	  [ci skip]
-
-Sun Jan  3 23:55:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM):
-	  should check same name as the used constants.
-	  [ruby-core:72674] [Bug #11940]
-
-Sun Jan  3 19:22:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* aclocal.m4: add fallback file for non-aclocal environments.
-	  [ruby-core:72683] [Bug #11942]
-
-Sun Jan  3 13:56:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
-
-	* eval_error.c (rb_print_undef): Use `rb_method_visibility_t`
-	  instead of `int`.
-	* eval_intern.h (rb_print_undef): ditto
-	* proc.c (mnew_internal): ditto
-	* vm_method.c (rb_export_method): ditto
-	  [Misc #11649] [ruby-core:71311] [fix GH-1078]
-
-Sun Jan  3 12:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* acinclude.m4: rename aclocal.m4, which should be generated by
-	  aclocal.  [ruby-core:72675] [Bug #11941]
-
-Sat Jan  2 21:07:55 2016  Eric Wong  <e@80x24.org>
-
-	* thread_sync.c (queue_do_pop): avoid cast with Qfalse
-	  (rb_szqueue_push): ditto, use queue_sleep wrapper
-
-Sat Jan  2 16:16:14 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb: Allow ERB subclass to add token easily.
-	  [Feature #11936]
-
-	* test/erb/test_erb.rb: ditto.
-
-Sat Jan  2 14:44:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
-	  instead of nd_state.  [ruby-core:72638] [Bug #11932]
-
-Sat Jan  2 02:27:22 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb: Fix case of frozen object with initializer.
-	  Bug revealed by RubySpec [ruby-core:72639]
-
-Fri Jan  1 22:01:52 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: mention CSV's liberal_parsing option.
-
-Fri Jan  1 19:38:23 2016  okkez  <okkez000@gmail.com>
-
-	* doc/NEWS-2.3.0: fix double words typo.
-	  [ci skip][fix GH-1183]
-
-Fri Jan  1 15:28:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (remove_unreachable_chunk): decrease count of
-	  call_info in removed instructions.  fix up r53402.
-
-Fri Jan  1 12:05:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (remove_unreachable_chunk): remove unreferred label
-	  to optimize away unreachable chunk.
-
-Fri Jan  1 11:42:57 2016  James Edward Gray II  <james@graysoftinc.com>
-
-	* lib/csv.rb (CSV): Add a liberal_parsing option.
-	  Patch by Braden Anderson. [#11839]
-	* test/csv/test_features.rb:  test liberal_parsing
-
-Fri Jan  1 10:27:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
-	  not includedir, the latter is outside the ruby installation.
-	  [ruby-core:72496] [Bug #11881]
-
-Fri Jan  1 08:53:02 2016  Yuki Kurihara  <co000ri@gmail.com>
-
-	* test/ruby/test_lazy_enumerator.rb (test_take_bad_arg): Add test
-	  code in case of Enumerator::Lazy#take called with negative number.
-	  [ruby-dev:49467] [Bug #11933]
-
-Fri Jan  1 05:06:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_here_document): update indent for each line in
-	  indented here document with single-quotes.
-	  [ruby-core:72479] [Bug #11871]
-
-Fri Jan  1 03:26:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (freeze): define deferred accessors before
-	  freezing to get rid of an error when just reading frozen
-	  OpenStruct.
-
-Thu Dec 31 14:36:45 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb: Fix new_ostruct_member to correctly avoid
-	  redefinition [#11901]
-
-Thu Dec 31 02:45:12 2015  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/ruby/test_module.rb (test_classpath): r53376 may change
-	  the order of m.constants.
-	  `make TESTS='-v ruby/test_class.rb ruby/test_module.rb' test-all`
-	  may fail after that.
-	  http://rubyci.s3.amazonaws.com/tk2-243-31075/ruby-trunk/log/20151230T164202Z.log.html.gz
-
-Thu Dec 31 02:20:00 2015  Benoit Daloze  <eregontp@gmail.com>
-
-	* common.mk (help): Fix typo.
-
-Wed Dec 30 20:53:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/net/http/responses.rb: Added new response class for 451 status code.
-	* lib/net/http.rb: documentation for HTTPUnavailableForLegalReasons
-
-Wed Dec 30 20:45:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* lib/webrick/httpstatus.rb: Added HTTP 451 Status Code.
-	  [fix GH-1167] Patch by @MuhammetDilmac
-	  https://tools.ietf.org/html/draft-tbray-http-legally-restricted-status-00
-
-Wed Dec 30 20:25:52 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/syntax/calling_methods.rdoc: fix old operator for safe navigation
-	  operator. [ci skip][fix GH-1182] Patch by @dougo
-
-Wed Dec 30 16:43:23 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (test_ord): Add test for String#ord.
-	  [Fix GH-1181]
-
-Wed Dec 30 11:28:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/forwardable.rb (def_instance_delegator): adjust backtrace of
-	  method body by tail call optimization.  adjusting the delegated
-	  target is still done by deleting backtrace.
-
-	* lib/forwardable.rb (def_single_delegator): ditto.
-
-Wed Dec 30 11:18:42 2015  Elliot Winkler  <elliot.winkler@gmail.com>
-
-	* lib/forwardable.rb (def_instance_delegator) fix delegating to
-	  'args' and 'block', clashing with local variables in generated
-	  methods.  [ruby-core:72579] [Bug #11916]
-
-	* lib/forwardable.rb (def_single_delegator): ditto.
-
-Wed Dec 30 09:58:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_class_inherited_p): search the corresponding
-	  ancestor to prepended module from prepending class itself.
-	  [ruby-core:72493] [Bug #11878]
-
-Wed Dec 30 09:20:00 2015  Yuki Kurihara  <co000ri@gmail.com>
-
-	* test/stringio/test_io.rb (test_flag): add assertion for error when
-	  text and binary mode are mixed.
-	  [ruby-dev:49465] [Feature #11921]
-
-Wed Dec 30 08:43:59 2015  Yuki Kurihara  <co000ri@gmail.com>
-
-	* test/stringio/test_stringio.rb (test_initialize): add test for
-	  StringIO#initialize.  [ruby-core:72585] [Feature #11920]
-
-Wed Dec 30 05:19:24 2015  Eric Wong  <e@80x24.org>
-
-	* class.c (struct clone_const_arg): adjust for id_table
-	  (clone_const): ditto
-	  (clone_const_i): ditto
-	  (rb_mod_init_copy): ditto
-	  (rb_singleton_class_clone_and_attach): ditto
-	  (rb_include_class_new): ditto
-	  (include_modules_at): ditto
-	* constant.h (rb_free_const_table): ditto
-	* gc.c (free_const_entry_i): ditto
-	  (rb_free_const_table): ditto
-	  (obj_memsize_of): ditto
-	  (mark_const_entry_i): ditto
-	  (mark_const_tbl): ditto
-	* internal.h (struct rb_classext_struct): ditto
-	* object.c (rb_mod_const_set): resolve class name on assignment
-	* variable.c (const_update): replace with const_tbl_update
-	  (const_tbl_update): new function
-	  (fc_i): adjust for id_table
-	  (find_class_path): ditto
-	  (autoload_const_set): st_update => const_tbl_update
-	  (rb_const_remove): adjust for id_table
-	  (sv_i): ditto
-	  (rb_local_constants_i): ditto
-	  (rb_local_constants): ditto
-	  (rb_mod_const_at): ditto
-	  (rb_mod_const_set): ditto
-	  (rb_const_lookup): ditto
-	  [ruby-core:72112] [Feature #11614]
-
-Wed Dec 30 04:10:13 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
-
-	* thread_pthread.c (rb_thread_create_timer_thread): destroy attr even
-	  if pthread_create() failed.
-
-Wed Dec 30 02:55:09 2015  Eric Wong  <e@80x24.org>
-
-	* thread_pthread.c (setup_communication_pipe): delay setting owner
-	  (rb_thread_create_timer_thread): until thread creation succeeds
-	  [ruby-core:72590] [Bug #11922]
-
-Tue Dec 29 19:12:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): -W command line option should be able to
-	  override -w in RUBYOPT environment variable.
-
-Tue Dec 29 17:54:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ignored_block): warn if a block is given to `using`,
-	  which is probably for `Module.new`.
-
-Tue Dec 29 12:48:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct): make respond_to? working on
-	  just-allocated objects for workaround of Psych.
-	  [ruby-core:72501] [Bug #11884]
-
-Tue Dec 29 10:35:00 2015  Kenta Murata  <mrkn@mrkn.jp>
-
-	* test/mkmf/test_have_func.rb (test_have_func):
-	  Add assertion to examine the existence of HAVE_RUBY_INIT.
-
-	* test/mkmf/test_have_func.rb (test_not_have_func):
-	  Add assertion to examine the absence of HAVE_RUBY_INIT.
-
-Tue Dec 29 06:50:42 2015  Eric Wong  <e@80x24.org>
-
-	* thread_sync.c: static classes
-
-Tue Dec 29 05:30:30 2015  Eric Wong  <e@80x24.org>
-
-	* lib/resolv.rb (Resolv::IPv6.create): avoid modifying frozen
-	* test/resolv/test_dns.rb (test_ipv6_create): test for above
-	  [Bug #11910] [ruby-core:72559]
-
-Mon Dec 28 14:55:57 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (TestString#test_rstrip_bang): Add test
-	  for String#rstrip!.  [Fix GH-1176]
-
-Mon Dec 28 09:18:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (TestString#test_lstrip_bang): Add test
-	  for String#lstrip!.  [Fix GH-1176]
-
-Sun Dec 27 23:32:26 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_variant2val): refactoring.
-
-Sun Dec 27 21:14:42 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_execarg_parent_start1): need to convert the encoding to
-	  ospath's one.
-
-Sun Dec 27 20:54:22 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
-	  reported by naruse via twitter.
-
-	* process.c (rb_execarg_addopt): need to convert the encoding to
-	  ospath's one.
-
-Sun Dec 27 20:00:31 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* enc/x_emoji.h: fix dead-link.
-
-Sun Dec 27 19:55:55 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
-
-	* doc/NEWS-2.3.0: fix a typo.
-
-Sun Dec 27 18:08:15 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): [DOC] Fix
-	  ruby-doc comments for String#rstrip! and lstrip!.  It looks like
-	  dropped bang.  [Fix GH-1175]
-
-Sun Dec 27 15:14:20 2015  Eric Wong  <e@80x24.org>
-
-	* io.c (io_getpartial): remove unused kwarg from template
-	* test/ruby/test_io.rb (test_readpartial_bad_args): new
-	  [Bug #11885]
-
-Sun Dec 27 11:50:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (test_rstrip, test_lstrip): Add tests
-	  for String#lstrip and rstrip.  The test cases are used from
-	  string.c ruby-doc comments.  [Fix GH-1174]
-
-Sun Dec 27 11:47:46 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
-
-	* test/ruby/test_string.rb (test_insert): Add test for
-	  String#insert.  The test cases are written in string.c
-	  comments as a reference.  [Fix GH-1173]
-
-Sun Dec 27 11:03:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (show_bitstack): trace stack_type value if yydebug.
-
-Sun Dec 27 10:03:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/depend (enc, trans): fix version dependency, shared object
-	  files depend on the RUBY_SO_NAME value for runtime link.
-
-Sun Dec 27 09:47:20 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_vstr2wc, ole_variant2val): fix blank
-	  string conversion.
-	  [Bug #11880]
-	  Thanks Akio Tajima for the patch!
-
-Sun Dec 27 09:34:53 2015  craft4coder  <yooobuntu@163.com>
-
-	* doc/extension.rdoc: [DOC] `nul` should be uppercase.
-	  change 'nul' => 'NUL'.  [Fix GH-1172]
-
-Sat Dec 26 18:29:01 2015  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/xmlrpc/client.rb: Support SSL options in async methods of
-	  XMLRPC::Client.
-	  [Bug #11489]
-	  Reported by Aleksandar Kostadinov. Thanks!!!
-
-Sat Dec 26 11:26:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* miniinit.c (Init_enc): add some common aliases of built-in
-	  encodings.  [ruby-core:72481] [Bug #11872]
-
-Fri Dec 25 22:43:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: extract RUBY_RELEASE_DAY at generating Makefile.
-
-	* version.h (RUBY_RELEASE_DATE): construct from RUBY_RELEASE_YEAR,
-	  RUBY_RELEASE_MONTH, and RUBY_RELEASE_DAY.
-
-Fri Dec 25 21:33:06 2015  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* version.h (RUBY_VERSION): 2.4.0 development has started.
-
-Fri Dec 25 14:12:12 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
-
-	* doc/ChangeLog-2.3.0, ext/tk/lib/tkextlib/SUPPORT_STATUS,
-	  include/ruby/version.h: minor grammar fixes [ci skip]
-
-Fri Dec 25 08:23:22 2015  Tadashi Saito  <tad.a.digger@gmail.com>
-
-	* compile.c, cont.c, doc, man: fix common misspelling.
-	  [ruby-core:72466] [Bug #11870]
-
-
-For the changes before 2.3.0, see doc/ChangeLog-2.3.0
-For the changes before 2.2.0, see doc/ChangeLog-2.2.0
-For the changes before 2.1.0, see doc/ChangeLog-2.1.0
-For the changes before 2.0.0, see doc/ChangeLog-2.0.0
-For the changes before 1.9.3, see doc/ChangeLog-1.9.3
-For the changes before 1.8.0, see doc/ChangeLog-1.8.0
-
-Local variables:
-coding: us-ascii
-add-log-time-format: (lambda (&optional x y)
-  (let* ((time (or x (current-time)))
-	 (system-time-locale "C")
-	 (diff (+ (cadr time) 32400))
-	 (lo (% 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
-change-log-indent-text: 2
-end:
-vim: tabstop=8 shiftwidth=2
diff --git a/doc/ChangeLog-2016 b/doc/ChangeLog-2016
deleted file mode 100644
index c708428a93..0000000000
--- a/doc/ChangeLog-2016
+++ /dev/null
@@ -1,5 +0,0 @@
-------------------------------------------------------------------------
-r56645 | naruse | 2016-11-07 00:56:27 +0900 (Mon, 07 Nov 2016) | 1 line
-
-Obsolete ChangeLog [Feature #12283]
-------------------------------------------------------------------------
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
index a8b999dff2..529854586c 100644
--- a/doc/ChangeLog-YARV
+++ b/doc/ChangeLog-YARV
@@ -530,7 +530,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-08-17(Thu) 12:23:52 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c : change initialize routine order ([yarv-dev:1067])
+	* eval.c : change initilize routine order ([yarv-dev:1067])
 
 	* yarvcore.c (Init_yarv) : init th->machine_stack_start
 
@@ -2115,7 +2115,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-02-14(Tue) 18:15:03 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* configure.in : enable pthread by default
+	* configure.in : enable pthread by deafult
 
 	* ascii.c : import ruby 1.9 HEAD
 
@@ -2428,7 +2428,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 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 referring klass.
+	  break'ing, check it before refering klass.
 
 
 2006-02-14(Tue) 05:45:07 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -2461,7 +2461,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-02-14(Tue) 01:42:11 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* error.c : fix include file position
+	* error.c : fix include file positon
 
 	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
 
@@ -3650,10 +3650,10 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* thread.c (yarv_thread_execute_interrupts) : added
 
 	* thread_pthread.h (thread_timer) : set interrupt_flag of
-	current running threads
+	current runnning threads
 
 	* vm.c (th_invoke_proc) : jump with JUMP_TAG() if some exception
-	occurs
+	occurres
 
 	* yarv.h : add yarv_set_current_running_thread_raw() for bootstrap
 
@@ -5617,7 +5617,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* rb/insns2vm.rb : fix category (comment)
 
-	* depend : remove space between target name and colon
+	* depend : remove space betweeen target name and colon
 
 
 2005-03-04(Fri) 15:55:51 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -5783,7 +5783,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* disasm.c : fix ID to String method
 
-	* compile.c : NODE_SUPER, NODE_ZSUPER check 'popped'
+	* compile.c : NODE_SUPER, NODE_ZSUPER check 'poped'
 	and NODE_RETURN check outer type
 	and NODE_DREGX_ONCE supported (temporarily)
 
@@ -6168,7 +6168,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* test.rb : restore $" after evaluation with ruby
 
-	* rb/insns2vm.rb : remove unnecessary each
+	* rb/insns2vm.rb : remove unnecesary each
 
 
 2004-12-17(Fri) 18:56:38 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -6397,7 +6397,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c : fix stack dump routine
 
-	* vm.c : implement thread_funcall (temporarily)
+	* vm.c : impliment thread_funcall (temporarily)
 
 	* yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
 
@@ -6590,7 +6590,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* yarvcore.h, yarvcore.c : add idThrow*
 
 	* insns.def, compile.c, vm.c : support retry, break,
-	next, redo, return(incomplete)
+	next, redo, return(imcomplete)
 
 
 2004-09-03(Fri) 13:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
diff --git a/doc/NEWS-1.8.7 b/doc/NEWS-1.8.7
index 38571fe103..51fb5f1c6a 100644
--- a/doc/NEWS-1.8.7
+++ b/doc/NEWS-1.8.7
@@ -230,7 +230,7 @@ with all sufficient information, see the ChangeLog file.
   * ARGF.lines
   * ARGF.readbyte
 
-    New methods.
+    New methods. 
 
   * Method#name
   * Method#owner
@@ -638,7 +638,7 @@ with all sufficient information, see the ChangeLog file.
       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)
diff --git a/doc/NEWS-2.2.0 b/doc/NEWS-2.2.0
deleted file mode 100644
index 5564c606ae..0000000000
--- a/doc/NEWS-2.2.0
+++ /dev/null
@@ -1,361 +0,0 @@
-# -*- rdoc -*-
-
-= NEWS for Ruby 2.2.0
-
-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 2.1.0 release
-
-=== Language changes
-
-* nil/true/false
-  * nil/true/false objects are frozen. [Feature #8923]
-
-* Hash literal
-  * Symbol key followed by a colon can be quoted. [Feature #4276]
-
-* default argument
-  fixed a very longstanding bug that an optional argument was not
-  accessible in its default value expression.  [Bug #9593]
-
-=== Core classes updates (outstanding ones only)
-
-* Binding
-  * New methods:
-    * Binding#local_variables
-    * Binding#receiver
-
-* Dir
-  * New methods:
-    * Dir#fileno
-
-* Enumerable
-  * New methods:
-    * Enumerable#slice_after
-    * Enumerable#slice_when
-  * Extended methods:
-    * min, min_by, max and max_by supports optional argument to return
-      multiple elements.
-
-* Float
-  * New methods:
-    * Float#next_float
-    * Float#prev_float
-
-* File
-  * New methods:
-    * File.birthtime
-    * File#birthtime
-
-* File::Stat
-  * New methods:
-    * File::Stat#birthtime
-
-* GC
-  * GC.latest_gc_info returns :state to represent current GC status.
-  * Improvements
-    * Introduce incremental marking for major GC. [Feature #10137]
-
-* IO
-  * Improvements
-    * IO#read_nonblock and IO#write_nonblock for pipes on Windows are supported.
-
-* Kernel
-  * New methods:
-    * Kernel#itself
-  * Improvements
-    * Kernel#throw raises UncaughtThrowError, subclass of ArgumentError when
-      there is no corresponding catch block, instead of ArgumentError.
-
-* Process
-  * Extended method:
-    * Process execution methods such as Process.spawn opens the file in write
-      mode for redirect from [:out, :err].
-
-* String
-  * New methods:
-    * String#unicode_normalize
-    * String#unicode_normalize!
-    * String#unicode_normalized?
-
-* Symbol
-  * Improvements
-    * Most symbols which are returned by String#to_sym and
-      String#intern are GC-able.
-
-* Method
-  * New methods:
-    * Method#curry([arity]) returns a curried Proc.
-    * Method#super_method returns a Method of superclass, which would be called
-      when super is used.
-
-=== Core classes compatibility issues (excluding feature bug fixes)
-
-* Enumerable
-  * Enumerable#slice_before's state management deprecated.
-  * Enumerable#chunk's state management deprecated.
-
-* GC
-  * incompatible changes:
-    * Rename GC.stat entries. [Feature #9924]
-      See https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
-
-* Hash
-  * incompatible changes:
-    * Change overriding policy for duplicated key. [Bug #10315]
-      { **hash1, **hash2 } contains values of hash2 for duplicated keys.
-
-* IO
-  * incompatible changes:
-    * When flushing file IO with IO#flush, you cannot assume that the metadata
-      of the file is updated immediately.  On some platforms (especially
-      Windows), it is delayed until the filesystem load is decreased.
-      Use IO#fsync if you want to guarantee updating metadata.
-
-* Math
-  * incompatible changes:
-    * Math.log now raises Math::DomainError instead of returning NaN if the
-      base is less than 0, and returns NaN instead of -infinity if both of
-      two arguments are 0.
-    * Math.atan2 now returns values like as expected by C99 if both two
-      arguments are infinity.
-
-* Proc
-  * incompatible changes:
-    * ArgumentError is no longer raised when lambda Proc is passed as a
-      block, and the number of yielded arguments does not match the formal
-      arguments of the lambda, if just an array is yielded and its length
-      matches.
-
-* Process
-  * Process execution methods such as Process.spawn opens the file in write
-    mode for redirect from [:out, :err].
-    Before Ruby 2.2, it was opened in read mode.
-
-=== Stdlib updates (outstanding ones only)
-
-* Continuation
-  * callcc is obsolete. use Fiber instead.
-
-* Digest
-
-  * Digest() should now be thread-safe.  If you have a problem with
-    regard to on-demand loading under a multi-threaded environment,
-    preload "digest/*" modules on boot or use this method instead of
-    directly referencing Digest::*.
-  * Digest::HMAC has been removed just as previously noticed.
-
-* DL
-  * DL has been removed from stdlib. Please use Fiddle instead!
-
-* Etc
-  * New methods:
-    * Etc.uname
-    * Etc.sysconf
-    * Etc.confstr
-    * IO#pathconf
-    * Etc.nprocessors
-
-* Find, Pathname
-  * Extended methods:
-    * find method accepts "ignore_error" keyword argument.
-
-* Matrix
-  * New methods:
-    * Matrix#first_minor(row, column) returns the submatrix obtained
-      by deleting the specified row and column.
-    * Matrix#cofactor(row, column) returns the (row, column) cofactor
-      which is obtained by multiplying the first minor by (-1)**(row + column).
-    * Matrix#adjugate returns the adjugate of the matrix.
-    * hstack and vstack are new instance and class methods to stack matrices
-      horizontally and vertically.
-    * Matrix#laplace_expansion(row_or_column: num) returns the laplace_expansion
-      along the +num+ -th row or column.
-    * Vector.basis(size:, index:) returns the specified basis vector.
-    * Unary - and + added for Vector and Matrix.
-    * Vector#cross_product generalized to arbitrary dimensions.
-    * Vector#dot and #cross are aliases for #inner_product and #cross_product.
-    * Vector#angle_with returns the angle with its argument
-    * New instance and class method independent? to test linear independence.
-
-* Pathname
-  * Pathname#/ is aliased to Pathname#+.
-  * New methods:
-    * Pathname#birthtime
-
-* Rake
-  * Updated to Rake 10.4.0.  For full release notes see:
-
-    http://docs.seattlerb.org/rake/History_rdoc.html#label-10.4.0
-
-* RubyGems
-  * Updated to RubyGems 2.4.2.  For full release notes see:
-
-    http://docs.seattlerb.org/rubygems/History_txt.html#label-2.4.2+%2F+2014-10-01
-
-* TSort
-  * TSort.tsort_each, TSort.each_strongly_connected_component and
-    TSort.each_strongly_connected_component_from returns an enumerator if
-    no block given.
-
-* XMLRPC
-  * Added new parser class named LibXMLStreamParser.
-
-=== Stdlib compatibility issues (excluding feature bug fixes)
-
-* lib/mathn.rb
-  * Show deprecated warning [Feature #10169]
-
-* ext/date/lib/date/format.rb
-  * Removed because it's empty file.
-
-* Digest
-  * Digest::HMAC has finally ceased to exist.  Use OpenSSL::HMAC or an external gem instead.
-
-* time.rb
-  * Time.parse, Time.strptime, Time.rfc2822, Time.xmlschema may produce
-    fixed-offset Time objects.
-    It is happen when usual localtime doesn't preserve the offset from UTC.
-  * Time.httpdate produces always UTC Time object.
-  * Time.strptime raises ArgumentError when no date information.
-
-* lib/rational.rb
-  * Removed because it is deprecated from 2009.
-
-* lib/complex.rb
-  * Removed because it is deprecated from 2009.
-
-* lib/prettyprint.rb
-  * Removed PrettyPrint#first?
-
-* lib/minitest/*.rb
-  * Removed because it conflicts to minitest 5. [Feature #9711]
-
-* lib/test/**/*.rb
-  * Removed because it conflicts to minitest 5, and it was just an wrapper
-    of minitest 4. [Feature #9711]
-
-* lib/uri
-  * support RFC 3986. [Feature #2542]
-
-* GServer
-  * GServer is extracted to gserver gem. It's unmaintain code.
-
-* Logger
-  * Logger::Application is extracted to logger-application gem. It's unmaintain code.
-
-* ObjectSpace (after requiring "objspace")
-  * ObjectSpace.memsize_of(obj) returns a size includes sizeof(RVALUE).
-    [Bug #8984]
-
-* Prime
-  * incompatible changes:
-    * Prime.prime? now returns false for negative numbers. This method
-      should not be used to know the number is composite or not. [Bug #7395]
-
-* Psych
-  * Removed Psych::EngineManager [Bug #8344]
-
-=== Built-in global variables compatibility issues
-
-=== C API updates
-
-* Deprecated APIs removed.  [Feature #9502]
-
-  Check_SafeStr -> SafeStringValue
-  rb_check_safe_str -> SafeStringValue
-  rb_quad_pack -> rb_integer_pack
-  rb_quad_unpack -> rb_integer_unpack
-  rb_read_check : access struct FILE internal. no replacement.
-  rb_struct_iv_get : internal function. no replacement.
-  struct rb_blocking_region_buffer : internal type. no replacement.
-  rb_thread_blocking_region_begin -> rb_thread_call_without_gvl family
-  rb_thread_blocking_region_end -> rb_thread_call_without_gvl family
-  TRAP_BEG -> rb_thread_call_without_gvl family
-  TRAP_END -> rb_thread_call_without_gvl family
-  rb_thread_select -> rb_thread_fd_select
-  struct rb_exec_arg : internal type. no replacement.
-  rb_exec : internal function. no replacement.
-  rb_exec_arg_addopt : internal function. no replacement.
-  rb_exec_arg_fixup : internal function. no replacement.
-  rb_exec_arg_init : internal function. no replacement.
-  rb_exec_err : internal function. no replacement.
-  rb_fork : internal function. no replacement.
-  rb_fork_err : internal function. no replacement.
-  rb_proc_exec_n : internal function. no replacement.
-  rb_run_exec_options : internal function. no replacement.
-  rb_run_exec_options_err : internal function. no replacement.
-  rb_thread_blocking_region -> rb_thread_call_without_gvl family
-  rb_thread_polling -> rb_thread_wait_for
-  rb_big2str0 : internal function. no replacement.
-  rb_big2ulong_pack -> rb_integer_pack
-  rb_gc_set_params : internal function. no replacement.
-  rb_io_mode_flags -> rb_io_modestr_fmode
-  rb_io_modenum_flags -> rb_io_oflags_fmode
-
-* struct RBignum is hidden.  [Feature #6083]
-  Use rb_integer_pack and rb_integer_unpack instead.
-
-* struct RRational is hidden.  [Feature #9513]
-  Use rb_rational_num and rb_rational_den instead.
-
-* rb_big_new and rb_big_resize takes a size_t instead of long.
-
-* rb_num2long returns a long instead of SIGNED_VALUE.
-
-* rb_num2ulong returns an unsigned long instead of VALUE.
-
-* st hash table uses power-of-two sizes for speed [Feature #9425].
-  Lookups are 10-25% faster if using appropriate hash functions.
-  However, weaknesses in hash distribution can no longer be masked
-  by prime number-sized tables, so extensions may need to tweak
-  hash functions to ensure good distribution.
-
-* rb_sym2str() added. This is almost same as `rb_id2str(SYM2ID(sym))`
-  but not pinning a dynamic symbol.
-
-* rb_str_cat_cstr() added. This is same as `rb_str_cat2()`.
-
-* `rb_str_substr()` and `rb_str_subseq()` will share middle of a string,
-  but not only the end of a string, in the future.  Therefore, result
-  strings may not be NUL-terminated, `StringValueCStr()` is needed
-  calling to obtain a NUL-terminated C string.
-
-* rb_tracepoint_new() supports new internal events accessible only from C:
-  * RUBY_INTERNAL_EVENT_GC_ENTER
-  * RUBY_INTERNAL_EVENT_GC_EXIT
-    r47528
-
-* rb_hash_delete() now does not call the block given to the current method.
-
-* rb_extract_keywords() and rb_get_kwargs() exported.  See README.EXT
-  for details.
-
-=== Build system updates
-
-* jemalloc is optionally supported via `./configure --with-jemalloc`
-  jemalloc may be suitable when system malloc is slow or prone
-  to fragmentation.  [Feature #9113]
-
-=== Implementation changes
-
-* GC
-    * Most symbols which are returned by String#to_sym and
-      String#intern are GC-able [Feature #9634]
-    * Introduce incremental marking for major GC. [Feature #10137]
-    * Enable lazy sweep on GC caused by malloc().
-
-* VM
-    * Use frozen string literals for Hash#[] and Hash#[]=
-    * Fast keyword arguments passing [Feature #10440]
-    * Allow to receive huge splatted array by a rest argument
-      [Feature #10440]
-
-* Process
-    * Process creation methods, such as spawn(), uses vfork() system call.
-      vfork() is faster than fork() when the parent process uses huge memory.
diff --git a/doc/NEWS-2.3.0 b/doc/NEWS-2.3.0
deleted file mode 100644
index 489aba4a89..0000000000
--- a/doc/NEWS-2.3.0
+++ /dev/null
@@ -1,404 +0,0 @@
-# -*- rdoc -*-
-
-= NEWS for Ruby 2.3.0
-
-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 or Redmine
-(e.g. <tt>https://bugs.ruby-lang.org/issues/$FEATURE_OR_BUG_NUMBER</tt>)
-
-== Changes since the 2.2.0 release
-
-=== Language changes
-
-* frozen-string-literal pragma:
-
-  * new pragma, frozen-string-literal has been experimentally introduced.
-    [Feature #8976]
-  * besides, --enable/--disable=frozen-string-literal options also have
-    been introduced. [Feature #8976]
-  * command line options --debug or --debug=frozen-string-literal enable
-    additional debugging mode which shows created location with at frozen
-    object error (RuntimeError).
-    [Feature #11725]
-
-* safe navigation operator:
-
-  * new method call syntax, `object&.foo', method #foo is called on
-    `object' if it is not nil.
-    this is similar to `try!' in Active Support, except:
-    * method name is syntactically required
-          obj.try! {} # valid
-          obj&. {}    # syntax error
-    * arguments are evaluated only if a call is made:
-          obj.try!(:foo, bar())  # bar() is always evaluated
-          obj&.foo(bar())        # bar() is conditionally evaluated
-    * attribute assignment is valid
-          obj&.attr += 1
-    [Feature #11537]
-
-* the did_you_mean gem:
-
-  * When a NameError or NoMethodError occurs because of a typo in the name,
-    the did_you_mean gem automatically suggests other names similar to the
-    method name.
-
-      "Yuki".starts_with?("Y")
-      # => NoMethodError: undefined method `starts_with?' for "Yuki":String
-      #    Did you mean?  start_with?
-
-* indented here document:
-
-  * new string literal, here document starts with `<<~`.
-    refer doc/syntax/literals.rdoc for more details.
-    [Feature #9098]
-
-=== Core classes updates (outstanding ones only)
-
-* ARGF
-
-  * ARGF.read_nonblock supports `exception: false' like IO#read_nonblock.
-    [Feature #11358]
-
-* Array
-
-  * Array#bsearch_index [Feature #10730]
-  * Array#dig [Feature #11643]
-
-* Comparable
-
-  * Comparable#== no longer rescues exceptions [Feature #7688]
-
-* Encoding
-
-  * new Encoding::IBM037 (alias ebcdic-cp-us; dummy)
-
-* Enumerable
-
-  * Enumerable#grep_v is added as inverse version of Enumerable#grep.
-    [Feature #11049]
-  * Enumerable#chunk_while [Feature #10769]
-
-* Enumerator::Lazy
-
-  * Enumerator::Lazy#grep_v [Feature #11773]
-
-* File
-
-  * File.mkfifo [Feature #11536]
-  * Add File::TMPFILE corresponding to O_TMPFILE
-
-* Hash
-
-  * Hash#fetch_values [Feature #10017]
-  * Hash#dig [Feature #11643]
-  * Hash#<=, Hash#<, Hash#>=, Hash#> [Feature #10984]
-  * Hash#to_proc [Feature #11653]
-
-* IO
-
-  * new mode flag File::SHARE_DELETE is available.
-    this flag means to permit deleting opened file on Windows, but currently
-    this affect only files opened as binary.  [Feature #11218]
-
-  * new option parameter `flags' is added.
-    this parameter is bitwise-ORed to oflags generated by normal mode argument.
-    [Feature #11253]
-
-  * IO#advise no longer raises Errno::ENOSYS in cases where it was
-    detected at build time but not available at runtime.  [Feature #11806]
-
-* Kernel
-
-  * Kernel#loop, when stopped by a StopIteration exception, returns
-    what the enumerator has returned instead of nil. [Feature #11498]
-
-* Module
-  * Module#deprecate_constant [Feature #11398]
-
-* NameError
-  * NameError#receiver is added to take the receiver object. [Feature #10881]
-
-* Numeric
-
-  * Numeric#positive? and Numeric#negative? are added, which return
-    true when the receiver is positive and negative respectively.
-    [Feature #11151]
-
-* Proc
-
-  * Proc#call (and also #[], #===, #yield) are optimized.
-    Backtrace doesn't show each method (show block lines directly).
-    TracePoint also ignores these calls. [Feature #11569]
-
-* Queue (Thread::Queue)
-
-  * Queue#close is added to notice a termination. [Feature #10600]
-
-* Regexp/String: Updated Unicode version from 7.0.0 to 8.0.0
-
-* RubyVM::InstructionSequence
-  * add the following methods as a primitive tool of iseq loader.
-    See sample/iseq_loader.rb for usage.
-    Note that loader does not have verifier so it is easy to cause
-    critical problem by loading modified/broken binary data.
-    See [Feature #11788] for more details. (experimental feature)
-    * RubyVM::InstructionSequence#to_binary(extra_data = nil)
-    * RubyVM::InstructionSequence.load_from_binary(binary)
-    * RubyVM::InstructionSequence.load_from_binary_extra_data(binary)
-
-* String
-
-  * String#+@ and String#-@ are added to get mutable/frozen strings.
-    [Feature #11782]
-
-  * String.new now accepts new option parameter `encoding'.
-    [Feature #11785]
-
-* Struct
-  * Struct#dig [Feature #11688]
-
-* Thread
-  * Thread#name, Thread#name= are added to handle thread names [Feature #11251]
-
-=== Core classes compatibility issues (excluding feature bug fixes)
-
-* Array
-  * Array#select!, Array#keep_if, Array#reject!, and Array#delete_if
-    no longer changes the receiver array instantly every time the
-    block is called.  [Feature #10714]
-
-  * Array#flatten and Array#flatten! no longer try to call #to_ary
-    method on elements beyond the given level.  [Bug #10748]
-
-  * Array#inspect doesn't raise error even if its content returns
-    a string which is not compatible with Encoding.default_external
-    as inspected result. [Feature #11801]
-
-* Enumerable
-  * Enumerable#chunk and Enumerable#slice_before no longer takes the
-    initial_state argument.  [Feature #10958]
-    Use a local variable instead to maintain a state.
-
-* File::Stat
-  * On Windows File::Stat#ino always returned 0, but now returns
-    BY_HANDLE_FILE_INFORMATION.nFileIndexHigh/Low.  [Feature #11216]
-
-* Hash
-  * Hash#inspect doesn't raise error even if its content returns
-    a string which is not compatible with Encoding.default_external
-    as inspected result. [Feature #11801]
-
-* IO
-  * IO#close doesn't raise when the IO object is closed.  [Feature #10718]
-  * IO#each_codepoint raises an exception at incomplete character
-    before EOF when conversion takes place.  [Bug #11444]
-
-* Module
-  * Module#define_method and Object.define_singleton_method now
-    require method body, Proc, Method, or a block, and raise
-    ArgumentError if no block is given directly.  [Bug #11283]
-
-* pack/unpack (Array/String)
-  * j and J directives for pointer width integer type.  [Feature #11215]
-
-
-=== Stdlib updates (outstanding ones only)
-
-* Logger
-
-  * Logger#level= now supports symbol and string levels such as :debug, :info,
-    :warn, :error, :fatal (case insensitive) [Feature #11695]
-  * Logger#reopen is added to reopen a log device. [Feature #11696]
-
-* io/wait
-  * IO#wait_readable no longer checks FIONREAD, it may be used for
-    non-bytestream IO such as listen sockets.
-
-* Net::FTP
-  * Net::FTP#mlst is added.
-  * Net::FTP#mlsd is added.
-
-* nkf
-  * Merge nkf 2.1.4.
-
-* ObjectSpace (objspace)
-  * ObjectSpace.count_symbols is added.
-  * ObjectSpace.count_imemo_objects is added.
-  * ObjectSpace.internal_class_of is added.
-  * ObjectSpace.internal_super_of is added.
-
-* OpenSSL
-  * OpenSSL::SSL::SSLSocket#accept_nonblock and
-    OpenSSL::SSL::SSLSocket#connect_nonblock supports `exception: false`.
-    [Feature #10532]
-
-* Pathname
-  * Pathname#descend and Pathname#ascend supported blockless form.
-    [Feature #11052]
-
-* Socket
-  * Socket#connect_nonblock, Socket#accept_nonblock,
-    TCPServer#accept_nonblock, UNIXServer#accept_nonblock,
-    BasicSocket#recv_nonblock, BasicSocket#recvmsg_nonblock,
-    BasicSocket#sendmsg_nonblock all support `exception: false` to return
-    :wait_readable or :wait_writable symbols instead of raising
-    IO::WaitReadable or IO::WaitWritable exceptions
-    [Feature #10532] [Feature #11229]
-  * BasicSocket#recv and BasicSocket#recv_nonblock allow an output
-    String buffer argument like IO#read and IO#read_nonblock to reduce
-    GC overhead [Feature #11242]
-
-* StringIO
-  * In read-only mode, StringIO#set_encoding no longer sets the encoding
-    of its buffer string.  Setting the encoding of the string directly
-    without StringIO#set_encoding may cause unpredictable behavior now.
-    [Bug #11827]
-
-* timeout
-  * Object#timeout is now warned as deprecated when called.
-
-=== Stdlib compatibility issues (excluding feature bug fixes)
-
-* ext/coverage/coverage.c
-  * Coverage.peek_result: new method to allow coverage to be captured without
-    stopping the coverage tool.  [Feature #10816]
-
-* Fiddle
-  * Fiddle::Function#call releases the GVL.  [Feature #11607]
-
-* io-console
-  * Update to io-console 0.4.5, and change the license to BSD 2-clause
-    "Simplified" License.
-
-* lib/base64.rb
-  * Base64.urlsafe_encode64: added a "padding" option to suppress
-    the padding character ("=").  [Feature #10740]
-  * Base64.urlsafe_decode64: now it accepts not only correctly-padded
-    input but also unpadded input.  [Feature #10740]
-
-* lib/drb/drb.rb
-  * removed unused argument. https://github.com/ruby/ruby/pull/515
-
-* lib/matrix.rb
-  * Add Vector#round. https://github.com/ruby/ruby/pull/802
-
-* lib/webrick/utils.rb
-  * removed unused argument. https://github.com/ruby/ruby/pull/356
-
-* Net::FTP
-  * Connections are in passive mode per default now.  The default mode can
-    be changed by Net::FTP.default_passive=.  [Feature #11612]
-
-* Net::HTTP
-  * default value of Net::HTTP#open_timeout is now 60 (was nil).
-
-* Net::Telnet
-  * Net::Telnet is extracted to net-telnet gem. It's unmaintain code.
-    [Feature #11083]
-
-* Psych
-  * Updated to Psych 2.0.17
-
-* Rake
-  * Rake is removed from stdlib.  [Feature #11025]
-
-* RDoc
-  * Updated to RDoc 4.2.1.  For full release notes see:
-
-    https://github.com/rdoc/rdoc/blob/master/History.rdoc#421--2015-12-22
-
-* RubyGems
-  * Updated to RubyGems 2.5.1.  For full release notes see:
-
-    http://docs.seattlerb.org/rubygems/History_txt.html#label-2.5.0+-2F+2015-11-03
-    and
-    http://docs.seattlerb.org/rubygems/History_txt.html#label-2.5.1+-2F+2015-12-10
-
-=== Built-in global variables compatibility issues
-
-* $SAFE
-  * $SAFE=2 and $SAFE=3 are obsolete.  If $SAFE is set to 2 or larger,
-    an ArgumentError is raised.  [Feature #5455]
-
-=== C API updates
-
-* rb_define_class_id_under() now raises a TypeError exception when the
-  class is already defined but its superclass does not match the given
-  superclass, as well as definitions in ruby level.
-
-* rb_timespec_now() is added to fetch current datetime as struct timespec.
-  [Feature #11558]
-
-* rb_time_timespec_new() is added to create a time object with epoch,
-  nanosecond, and UTC/localtime/time offset arguments.  [Feature #11558]
-
-* rb_autoload() deprecated, use rb_funcall() instead.  [Feature #11664]
-
-* rb_compile_error_with_enc(), rb_compile_error(), and rb_compile_bug()
-  deprecated.  these functions are exposed but only for internal use.
-  external libraries should not use them.
-
-=== Supported platform changes
-
-* OS/2 is no longer supported
-
-* BeOS is no longer supported
-
-* Borland-C is no longer supported
-
-* Haiku now stable and best effort
-
-=== Implementation improvements
-
-* Optimize Proc#call to eliminate method frame construction.
-  [Feature #11569]
-
-* Reconsidering method entry data structure.
-  [Bug #11278]
-
-* Introducing new table data structure for ID keys tables used by
-  method table and so on. New table structure is simple and fast
-  than st_table. [Feature #11420]
-
-* Machine code level tuning for object allocation and method calling
-  code. r52099, r52254
-
-* RubyVM::InstructionSequence is extended for future improvement.
-  [Feature #11788]
-
-* Case dispatch is now optimized for all special constant literals
-  including nil, true, and false.  Previously, only literal strings,
-  symbols, integers and floats compiled to optimized case dispatch.
-  [Feature #11769]
-
-* Instance variables on non-pure Ruby classes (T_DATA, T_FILE,
-  etc..) is less expensive to store than before. [Feature #11170]
-
-* All accesses to members of big Struct objects are performed in
-  constant-time.  Previously, Struct elements beyond the first 10
-  elements used a linear scan. [Feature #10585]
-
-* The Set class got several speed up.
-  [Misc #10754], [r52591]
-
-* Socket and I/O-related improvements
-
-  * Calling overhead of most of new keyword-using I/O methods in
-    [Feature #11229] is reduced by avoiding the inefficient C API
-    to parse keywords.  [Feature #11339]
-
-  * The standard library is updated to use the improved
-    exception-free non-blocking I/O from [Feature #11229].
-    This has the additional benefit of quieter $DEBUG output in
-    addition to reducing expensive exceptions. [Feature #11044]
-
-  * (Linux-only) waiting on a single FD anywhere in the stdlib no longer
-    uses select(2), making it immune to slowdowns with high-numbered FDs.
-    [Feature #11081] [Feature #11377]
-
-* CGI.escapeHTML is optimized with C extension.
-  https://github.com/ruby/ruby/pull/1164
diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc
index d0340d4d82..c6ccc68302 100644
--- a/doc/contributing.rdoc
+++ b/doc/contributing.rdoc
@@ -11,7 +11,7 @@ trying out beta releases with your applications.
 == How To Report
 
 If you've encountered a bug in Ruby please report it to the redmine issue
-tracker available at {bugs.ruby-lang.org}[https://bugs.ruby-lang.org/].  Do not
+tracker available at {bugs.ruby-lang.org}[http://bugs.ruby-lang.org/].  Do not
 report security vulnerabilities here, there is a {separate
 channel}[rdoc-label:label-Reporting+Security+Issues] for them.
 
@@ -25,7 +25,7 @@ on your ticket.
 
   If you aren't already using the latest version, try installing a newer
   stable release. See
-  {Downloading Ruby}[https://www.ruby-lang.org/en/downloads/].
+  {Downloading Ruby}[http://www.ruby-lang.org/en/downloads/].
 * Look to see if anyone already reported your issue, try
   {searching on redmine}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues]
   for your problem.
@@ -51,7 +51,7 @@ on your ticket.
 
 === Reporting to downstream distributions
 
-You can report downstream issues for the following distributions via their bug tracker:
+You can reports downstream issues for the following distributions via their bugtracker:
 
 * {debian}[http://bugs.debian.org/cgi-bin/pkgreport.cgi?src=ruby-defaults]
 * {freebsd}[http://www.freebsd.org/cgi/query-pr-summary.cgi?text=ruby]
@@ -61,7 +61,7 @@ You can report downstream issues for the following distributions via their bug t
 
 === Platform Maintainers
 
-For platform specific bugs in Ruby, you can assign your ticket to the current
+For platform specific bugs in Ruby, you can assign your ticket the current
 maintainer for a specific platform.
 
 The current active platform maintainers are as follows:
@@ -94,7 +94,7 @@ affect many users. There is a private mailing list that all security issues
 should be reported to and will be handled discretely. Email the
 mailto:security@ruby-lang.org list and the problem will be published after
 fixes have been released. You can also encrypt the issue using {the PGP public
-key}[https://www.ruby-lang.org/security.asc] for the list.
+key}[http://www.ruby-lang.org/security.asc] for the list.
 
 == Reporting Other Issues
 
@@ -113,12 +113,12 @@ You can also report issues with the ruby-lang.org website on the issue tracker:
 
 As a next step beyond reporting issues you can help the core team resolve
 existing issues. If you check the Everyone's Issues list in GitHub Issues,
-you will find a lot of issues already requiring attention. What can you do for
+you'll find lots of issues already requiring attention. What can you do for
 these? Quite a bit, actually:
 
 When a bug report goes for a while without any feedback, it goes to the bug
 graveyard which is unfortunate. If you check the {issues
-list}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues] you will find lots
+list}[https://bugs.ruby-lang.org/projects/ruby-trunk/issues] you'll find lots
 of delinquent bugs that require attention.
 
 You can help by verifying the existing tickets, try to reproduce the reported
@@ -154,7 +154,7 @@ patch.
 
 == How To Request Features
 
-If there's a new feature that you want to see added to Ruby, you will need to
+If there's a new feature that you want to see added to Ruby, you'll need to
 write a convincing proposal and patch to implement the feature.
 
 For new features in CRuby, use the {'Feature'
@@ -174,7 +174,7 @@ requests can seem like an alluring way to contribute to Ruby, often these
 discussions can lead nowhere and exhaust time and energy that could be better
 spent fixing bugs. Choose your battles.
 
-A good template for a feature proposal should look something like this:
+A good template for feature proposal should look something like this:
 
 [Abstract]
   Summary of your feature
@@ -199,8 +199,7 @@ A good template for a feature proposal should look something like this:
 
 === Slideshow
 
-At the Ruby Developer Meeting in Japan, committers discuss Feature Proposals together in Tokyo. We will judge proposals and then accept, reject, or give feedback for them.
-If you have a stalled proposal, making a slide to submit is good way to get feedback.
+On Ruby Developer Meeting Japan, committers discuss about Feature Proposals together at Tokyo. We'll judge proposals accept, reject, or feedback. If you have a stalled proposal, making a slide to submit is good way to get feedback.
 
 Slides should be:
 
@@ -218,8 +217,8 @@ Please note:
 
 == Backport Requests
 
-When a new version of Ruby is released, it starts at patch level 0 (p0), and
-bugs will be fixed first on the trunk branch. If it's determined that a bug
+When a new version of Ruby is released it starts at patch level 0 (p0), and
+bugs will be fixed first on the trunk branch. If its determined that a bug
 exists in a previous version of Ruby that is still in the bug fix stage of
 maintenance, then a patch will be backported. After the maintenance stage of a
 particular Ruby version ends, it goes into "security fix only" mode which
@@ -239,10 +238,26 @@ Each major version of Ruby has a release manager that should be assigned to
 handle backport requests. You can find the list of release managers on the
 {wiki}[https://bugs.ruby-lang.org/projects/ruby/wiki/ReleaseEngineering].
 
-=== Branches
+=== Branch Maintainers
 
-Status and maintainers of branches are listed on the
-{wiki}[https://bugs.ruby-lang.org/projects/ruby/wiki/ReleaseEngineering].
+A branch maintainer maintains a branch and releases a new release of Ruby. The
+branch depends on the associated version of Ruby, such as ruby_1_8_7 for
+version 1.8.7. The current branch maintainers are as follows:
+
+[trunk]
+  unnecessary
+[ruby_2_0_0]
+  Chikanaga Tomoyuki (nagachika)
+[ruby_1_9_3]
+  NAKAMURA Usaku (usa)
+[ruby_1_9_2, ruby_1_9_1]
+  _unmaintained_
+[ruby_1_8]
+  _unmaintained_
+[ruby_1_8_7]
+  _unmaintained_
+[ruby_1_8_6 ...]
+  _unmaintained_
 
 == Running tests
 
@@ -253,7 +268,7 @@ CRuby uses subversion for source control, you can find installation
 instructions and lots of great info to learn subversion on the
 {svnbook.red-bean.com}[http://svnbook.red-bean.com/]. For other resources see
 the {ruby-core documentation on
-ruby-lang.org}[https://www.ruby-lang.org/en/community/ruby-core/].
+ruby-lang.org}[http://www.ruby-lang.org/en/community/ruby-core/].
 
 This guide will use git for contributing.  The {git
 homepage}[http://git-scm.com/] has installation instructions with links to
@@ -295,8 +310,8 @@ Now let's build CRuby:
     autoconf
     mkdir build && cd build # its good practice to build outside of source dir
     mkdir ~/.rubies # we will install to .rubies/ruby-trunk in our home dir
-    ../configure --prefix="${HOME}/.rubies/ruby-trunk"
-    make up && make install
+    ../configure --prefix=~/.rubies/ruby-trunk
+    make && make install
 
 After adding Ruby to your PATH, you should be ready to run the test suite:
 
@@ -311,24 +326,12 @@ This is also how you can run a specific test from our build dir:
 
     make test-all TESTS=drb/test_drb.rb
 
-You can run +test+ and +test-all+ at once by +check+ .
-
-    make check
-
-For older versions of Ruby you will need to run the build setup again after
+For older versions of Ruby you'll need to run the build setup again after
 checking out the associated branch in git, for example if you wanted to
 checkout 1.9.3:
 
     git clone git://github.com/ruby/ruby.git --branch ruby_1_9_3
 
-Once you checked out the source code, you can update the local copy by:
-
-    make up
-
-Or, update, build, install and check, by just:
-
-    make love
-
 == Contributing Documentation
 
 If you're interested in contributing documentation directly to CRuby there is
@@ -433,7 +436,7 @@ your working branch:
 Now that you've got some code you want to contribute, let's get set up to
 generate a patch. Start by forking the github mirror, check the {github docs on
 forking}[https://help.github.com/articles/fork-a-repo] if you get stuck here.
-You will only need a github account if you intend to host your repository
+here.  You will only need a github account if you intend to host your repository
 on github.
 
 Next copy the writable url for your fork and add it as a git remote, replace
@@ -453,10 +456,11 @@ tracker. Alternatively you can submit a pull request, but for the best chances
 to receive feedback add it is recommended you add it to redmine.
 
 Since git is a distributed system, you are welcome to host your git repository
-on any {publicly accessible hosting
+on any {publically accessible hosting
 site}[https://git.wiki.kernel.org/index.php/GitHosting], including {hosting your
 own}[https://www.kernel.org/pub/software/scm/git/docs/user-manual.html#public-repositories]
 You may use the {'git format-patch'}[http://git-scm.com/docs/git-format-patch]
 command to generate patch files to upload to redmine.  You may also use
 the {'git request-pull'}[http://git-scm.com/docs/git-request-pull] command for
 formatting pull request messages to redmine.
+
diff --git a/doc/contributors.rdoc b/doc/contributors.rdoc
index ced4eb1cd0..96fe887e4e 100644
--- a/doc/contributors.rdoc
+++ b/doc/contributors.rdoc
@@ -1,6 +1,6 @@
 = Contributors to Ruby
 
-The following list might be incomplete. Feel free to add your name if your
+The following list might be imcomplete. Feel free to add your name if your
 patch was accepted into Ruby.
 
 == A
diff --git a/doc/dtrace_probes.rdoc b/doc/dtrace_probes.rdoc
index d2cdd56902..a1e0fff3b0 100644
--- a/doc/dtrace_probes.rdoc
+++ b/doc/dtrace_probes.rdoc
@@ -9,10 +9,10 @@ specified. Probe definitions are in the format of:
 Since module and function cannot be specified, they will be blank. An example
 probe definition for Ruby would then be:
 
-  ruby:::method-entry(class name, method name, file name, line number)
+  ruby:::function-entry(class name, method name, file name, line number)
 
 Where "ruby" is the provider name, module and function names are blank, the
-probe name is "method-entry", and the probe takes four arguments:
+probe name is "function-entry", and the probe takes four arguments:
 
 * class name
 * method name
@@ -59,15 +59,15 @@ with when they are fired and the arguments they take:
 
 [ruby:::method-return(classname, methodname, filename, lineno);]
   This probe is fired just after a method has returned. The arguments are the
-  same as "ruby:::method-entry".
+  same as "ruby:::function-entry".
 
 [ruby:::cmethod-entry(classname, methodname, filename, lineno);]
   This probe is fired just before a C method is entered. The arguments are the
-  same as "ruby:::method-entry".
+  same as "ruby:::function-entry".
 
 [ruby:::cmethod-return(classname, methodname, filename, lineno);]
   This probe is fired just before a C method returns. The arguments are the
-  same as "ruby:::method-entry".
+  same as "ruby:::function-entry".
 
 [ruby:::require-entry(requiredfile, filename, lineno);]
   This probe is fired on calls to rb_require_safe (when a file is required).
diff --git a/doc/etc.rd.ja b/doc/etc.rd.ja
index b4ff6ed04e..b36e05c994 100644
--- a/doc/etc.rd.ja
+++ b/doc/etc.rd.ja
@@ -1,4 +1,4 @@
-# etc.rd.ja -  -*- mode: rd; coding: utf-8; -*- created at: Fri Jul 14 00:47:15 JST 1995
+# etc.rd.ja -  -*- mode: rd; coding: euc-jp; -*- created at: Fri Jul 14 00:47:15 JST 1995
 =begin
 
 = Etc(モジュール)
@@ -33,7 +33,7 @@
 	    age		# エージ(整数)
 	    class	# ユーザアクセスクラス(文字列)
 	    comment	# コメント(文字列)
-	    expire	# アカウント有効期限(整数)
+	    expire	# アカウント有効期限(整数)	    
 	  end
 
 	詳細はgetpwnam(3)を参照のこと．
diff --git a/doc/extension.ja.rdoc b/doc/extension.ja.rdoc
deleted file mode 100644
index ce9abec6ad..0000000000
--- a/doc/extension.ja.rdoc
+++ /dev/null
@@ -1,1823 +0,0 @@
-# extension.ja.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
-
-Rubyの拡張ライブラリの作り方を説明します．
-
-= 基礎知識
-
-Cの変数には型があり，データには型がありません．ですから，た
-とえばポインタをintの変数に代入すると，その値は整数として取
-り扱われます．逆にRubyの変数には型がなく，データに型がありま
-す．この違いのため，CとRubyは相互に変換しなければ，お互いの
-データをアクセスできません．
-
-RubyのデータはVALUEというCの型で表現されます．VALUE型のデー
-タはそのデータタイプを自分で知っています．このデータタイプと
-いうのはデータ(オブジェクト)の実際の構造を意味していて，Ruby
-のクラスとはまた違ったものです．
-
-VALUEからCにとって意味のあるデータを取り出すためには
-
-1. VALUEのデータタイプを知る
-2. VALUEをCのデータに変換する
-
-の両方が必要です．(1)を忘れると間違ったデータの変換が行われ
-て，最悪プログラムがcore dumpします．
-
-== データタイプ
-
-Rubyにはユーザが使う可能性のある以下のタイプがあります．
-
-T_NIL      :: nil
-T_OBJECT   :: 通常のオブジェクト
-T_CLASS    :: クラス
-T_MODULE   :: モジュール
-T_FLOAT    :: 浮動小数点数
-T_STRING   :: 文字列
-T_REGEXP   :: 正規表現
-T_ARRAY    :: 配列
-T_HASH     :: 連想配列
-T_STRUCT   :: (Rubyの)構造体
-T_BIGNUM   :: 多倍長整数
-T_FIXNUM   :: Fixnum(31bitまたは63bit長整数)
-T_COMPLEX  :: 複素数
-T_RATIONAL :: 有理数
-T_FILE     :: 入出力
-T_TRUE     :: 真
-T_FALSE    :: 偽
-T_DATA     :: データ
-T_SYMBOL   :: シンボル
-
-その他に内部で利用されている以下のタイプがあります．
-
-  T_ICLASS
-  T_MATCH
-  T_UNDEF
-  T_NODE
-  T_ZOMBIE
-
-ほとんどのタイプはCの構造体で実装されています．
-
-== VALUEのデータタイプをチェックする
-
-ruby.hではTYPE()というマクロが定義されていて，VALUEのデータ
-タイプを知ることが出来ます．TYPE()マクロは上で紹介したT_XXXX
-の形式の定数を返します．VALUEのデータタイプに応じて処理する
-場合には，TYPE()の値で分岐することになります．
-
-  switch (TYPE(obj)) {
-    case T_FIXNUM:
-      /* FIXNUMの処理 */
-      break;
-    case T_STRING:
-      /* 文字列の処理 */
-      break;
-    case T_ARRAY:
-      /* 配列の処理 */
-      break;
-    default:
-      /* 例外を発生させる */
-      rb_raise(rb_eTypeError, "not valid value");
-      break;
-  }
-
-それとデータタイプをチェックして，正しくなければ例外を発生す
-る関数が用意されています．
-
-  void Check_Type(VALUE value, int type)
-
-この関数はvalueがtypeで無ければ，例外を発生させます．引数と
-して与えられたVALUEのデータタイプが正しいかどうかチェックす
-るためには，この関数を使います．
-
-FIXNUMとNILに関してはより高速な判別マクロが用意されています．
-
-  FIXNUM_P(obj)
-  NIL_P(obj)
-
-== VALUEをCのデータに変換する
-
-データタイプがT_NIL，T_FALSE，T_TRUEである時，データはそれぞ
-れnil，false，trueです．このデータタイプのオブジェクトはひと
-つずつしか存在しません．
-
-データタイプが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はそのままキャスト(型変換)すれば構造体の
-ポインタに変換できます．
-
-構造体は「struct RXxxxx」という名前でruby.hで定義されていま
-す．例えば文字列は「struct RString」です．実際に使う可能性が
-あるのは文字列と配列くらいだと思います．
-
-ruby.hでは構造体へキャストするマクロも「RXXXXX()」(全部大文
-字にしたもの)という名前で提供されています(例: RSTRING())．た
-だし、構造体への直接のアクセスはできるだけ避け，対応する
-rb_xxxx() といった関数を使うようにして下さい．例えば，配列の
-要素へアクセスする場合は，rb_ary_entry(ary, offset)，
-rb_ary_store(ary, offset, obj) を利用するようにして下さい．
-
-構造体からデータを取り出すマクロが提供されています．文字列
-strの長さを得るためには「RSTRING_LEN(str)」とし，文字列strを
-char*として得るためには「RSTRING_PTR(str)」とします．
-
-Rubyの構造体を直接アクセスする時に気をつけなければならないこ
-とは，配列や文字列の構造体の中身は参照するだけで，直接変更し
-ないことです．直接変更した場合，オブジェクトの内容の整合性が
-とれなくなって，思わぬバグの原因になります．
-
-== CのデータをVALUEに変換する
-
-VALUEの実際の構造は
-
-FIXNUMの場合 ::
-
-  1bit左シフトして，LSBを立てる．
-
-その他のポインタの場合 ::
-
-  そのままVALUEにキャストする．
-
-となっています．よって，LSBをチェックすればVALUEがFIXNUMかど
-うかわかるわけです(ポインタのLSBが立っていないことを仮定して
-いる)．
-
-ですから，FIXNUM以外のRubyのオブジェクトの構造体は単にVALUE
-にキャストするだけでVALUEに変換出来ます．ただし，任意の構造
-体がVALUEにキャスト出来るわけではありません．キャストするの
-はRubyの知っている構造体(ruby.hで定義されているstruct RXxxx
-のもの)だけです．
-
-FIXNUMに関しては変換マクロを経由する必要があります．Cの整数
-からVALUEに変換するマクロは以下のものがあります．必要に応じ
-て使い分けてください．
-
-INT2FIX() :: もとの整数が31bitまたは63bit以内に収まる自信
-             がある時
-INT2NUM() :: 任意の整数からVALUEへ
-
-INT2NUM()は整数がFIXNUMの範囲に収まらない場合，Bignumに変換
-してくれます(が，少し遅い)．
-
-== Rubyのデータを操作する
-
-先程も述べた通り，Rubyの構造体をアクセスする時に内容の更新を
-行うことは勧められません．で，Rubyのデータを操作する時には
-Rubyが用意している関数を用いてください．
-
-ここではもっとも使われるであろう文字列と配列の生成/操作を行
-う関数をあげます(全部ではないです)．
-
-=== 文字列に対する関数
-
-rb_str_new(const char *ptr, long len) ::
-
-  新しいRubyの文字列を生成する．
-
-rb_str_new2(const char *ptr) ::
-rb_str_new_cstr(const char *ptr) ::
-
-  Cの文字列からRubyの文字列を生成する．この関数の機能は
-  rb_str_new(ptr, strlen(ptr))と同等である．
-
-rb_str_new_literal(const char *ptr) ::
-
-  Cのリテラル文字列からRubyの文字列を生成する．
-
-rb_tainted_str_new(const char *ptr, long len) ::
-
-  汚染マークが付加された新しいRubyの文字列を生成する．外部
-  からのデータに基づく文字列には汚染マークが付加されるべき
-  である．
-
-rb_tainted_str_new2(const char *ptr) ::
-rb_tainted_str_new_cstr(const char *ptr) ::
-
-  Cの文字列から汚染マークが付加されたRubyの文字列を生成する．
-
-rb_sprintf(const char *format, ...) ::
-rb_vsprintf(const char *format, va_list ap) ::
-
-  Cの文字列formatと続く引数をprintf(3)のフォーマットにしたがって
-  整形し，Rubyの文字列を生成する．
-
-  注意: "%"PRIsVALUEがObject#to_s('+'フラグが指定されている
-  ときはObject#inspect)を使ったVALUEの出力に利用できる．これ
-  は"%i"と衝突するため，整数には"%d"を使用すること．
-
-rb_str_cat(VALUE str, const char *ptr, long len) ::
-
-  Rubyの文字列strにlenバイトの文字列ptrを追加する．
-
-rb_str_cat2(VALUE str, const char* ptr) ::
-rb_str_cat_cstr(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) ::
-rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) ::
-
-  指定されたエンコーディングでRubyの文字列を生成する.
-
-rb_enc_str_new_literal(const char *ptr) ::
-
-  Cのリテラル文字列から指定されたエンコーディングでRubyの文字列を生成する．
-
-rb_usascii_str_new(const char *ptr, long len) ::
-rb_usascii_str_new_cstr(const char *ptr) ::
-
-  エンコーディングがUS-ASCIIのRubyの文字列を生成する.
-
-rb_usascii_str_new_literal(const char *ptr) ::
-
-  Cのリテラル文字列からエンコーディングがUS-ASCIIのRubyの文字列を生成する．
-
-rb_utf8_str_new(const char *ptr, long len) ::
-rb_utf8_str_new_cstr(const char *ptr) ::
-
-  エンコーディングがUTF-8のRubyの文字列を生成する.
-
-rb_utf8_str_new_literal(const char *ptr) ::
-
-  Cのリテラル文字列からエンコーディングがUTF-8のRubyの文字列を生成する．
-
-rb_str_resize(VALUE str, long len) ::
-
-  Rubyの文字列のサイズをlenバイトに変更する．strの長さは前
-  以てセットされていなければならない．lenが元の長さよりも短
-  い時は，lenバイトを越えた部分の内容は捨てられる．lenが元
-  の長さよりも長い時は，元の長さを越えた部分の内容は保存さ
-  れないでゴミになるだろう．この関数の呼び出しによって
-  RSTRING_PTR(str)が変更されるかもしれないことに注意．
-
-rb_str_set_len(VALUE str, long len) ::
-
-  Rubyの文字列のサイズをlenバイトにセットする．strが変更可
-  能でなければ例外が発生する．RSTRING_LEN(str)とは無関係に，
-  lenバイトまでの内容は保存される．lenはstrの容量を越えてい
-  てはならない．
-
-=== 配列に対する関数
-
-rb_ary_new() ::
-
-  要素が0の配列を生成する．
-
-rb_ary_new2(long len) ::
-rb_ary_new_capa(long len) ::
-
-  要素が0の配列を生成する．len要素分の領域をあらかじめ割り
-  当てておく．
-
-rb_ary_new3(long n, ...) ::
-rb_ary_new_from_args(long n, ...) ::
-
-  引数で指定したn要素を含む配列を生成する．
-
-rb_ary_new4(long n, VALUE *elts) ::
-rb_ary_new_from_values(long n, VALUE *elts) ::
-
-  配列で与えた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_store(VALUE ary, long offset, VALUE obj) ::
-
-  \ary[offset] = obj
-
-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) ::
-
-  ary.push, ary.pop, ary.shift, ary.unshift
-
-rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
-
-  配列aryにptrからlen個のオブジェクトを追加する．
-
-= Rubyの機能を使う
-
-原理的にRubyで書けることはCでも書けます．RubyそのものがCで記
-述されているんですから，当然といえば当然なんですけど．ここで
-はRubyの拡張に使うことが多いだろうと予測される機能を中心に紹
-介します．
-
-== Rubyに機能を追加する
-
-Rubyで提供されている関数を使えばRubyインタプリタに新しい機能
-を追加することができます．Rubyでは以下の機能を追加する関数が
-提供されています．
-
-- クラス，モジュール
-- メソッド，特異メソッドなど
-- 定数
-
-では順に紹介します．
-
-=== クラス/モジュール定義
-
-クラスやモジュールを定義するためには，以下の関数を使います．
-
-  VALUE rb_define_class(const char *name, VALUE super)
-  VALUE rb_define_module(const char *name)
-
-これらの関数は新しく定義されたクラスやモジュールを返します．
-メソッドや定数の定義にこれらの値が必要なので，ほとんどの場合
-は戻り値を変数に格納しておく必要があるでしょう．
-
-クラスやモジュールを他のクラスの内部にネストして定義する時に
-は以下の関数を使います．
-
-  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
-  VALUE rb_define_module_under(VALUE outer, const char *name)
-
-=== メソッド/特異メソッド定義
-
-メソッドや特異メソッドを定義するには以下の関数を使います．
-
-  void rb_define_method(VALUE klass, const char *name,
-                        VALUE (*func)(ANYARGS), int argc)
-
-  void rb_define_singleton_method(VALUE object, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
-
-念のため説明すると「特異メソッド」とは，その特定のオブジェク
-トに対してだけ有効なメソッドです．RubyではよくSmalltalkにお
-けるクラスメソッドとして，クラスに対する特異メソッドが使われ
-ます．
-
-これらの関数の argcという引数はCの関数へ渡される引数の数(と
-形式)を決めます．argcが0以上の時は関数に引き渡す引数の数を意
-味します．16個以上の引数は使えません(が，要りませんよね，そ
-んなに)．実際の関数には先頭の引数としてselfが与えられますの
-で，指定した数より1多い引数を持つことになります．
-
-argcが負の時は引数の数ではなく，形式を指定したことになります．
-argcが-1の時は引数を配列に入れて渡されます．argcが-2の時は引
-数はRubyの配列として渡されます．
-
-メソッドを定義する関数はまだいくつかあります. ひとつはメソッド
-名として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)(ANYARGS), int argc)
-  void rb_define_protected_method(VALUE klass, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
-
-privateメソッドとは関数形式でしか呼び出すことの出来ないメソッ
-ドです．
-
-最後に， rb_define_module関数はモジュール関数を定義します．
-モジュール関数とはモジュールの特異メソッドであり，同時に
-privateメソッドでもあるものです．例をあげるとMathモジュール
-のsqrt()などがあげられます．このメソッドは
-
-  Math.sqrt(4)
-
-という形式でも
-
-  include Math
-  sqrt(4)
-
-という形式でも使えます．モジュール関数を定義する関数は以下の
-通りです．
-
-  void rb_define_module_function(VALUE module, const char *name,
-                                 VALUE (*func)(ANYARGS), int argc)
-
-関数的メソッド(Kernelモジュールのprivate method)を定義するた
-めの関数は以下の通りです．
-
-  void rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), 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はクラスを引数として受け取って，新しく割り当てられたイン
-スタンスを返さなくてはなりません．このインスタンスは，外部リ
-ソースなどを含まない，できるだけ「空」のままにしておいたほう
-がよいでしょう．
-
-継承したクラスにある既存のメソッドをオーバーライドしているな
-ら，オーバーライドされたメソッドを呼び出すには以下の関数を使
-います．
-
-  VALUE rb_call_super(int argc, const VALUE *argv)
-
-現在のスコープのレシーバは(他に方法がなければ)，以下の関数で
-得ることができます．
-
-  VALUE rb_current_receiver(void)
-
-=== 定数定義
-
-拡張ライブラリが必要な定数はあらかじめ定義しておいた方が良い
-でしょう．定数を定義する関数は二つあります．
-
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
-
-前者は特定のクラス/モジュールに属する定数を定義するもの，後
-者はグローバルな定数を定義するものです．
-
-== Rubyの機能をCから呼び出す
-
-既に『1.5 Rubyのデータを操作する』で一部紹介したような関数を
-使えば，Rubyの機能を実現している関数を直接呼び出すことが出来
-ます．
-
-# このような関数の一覧表はいまのところありません．ソースを見
-# るしかないですね．
-
-それ以外にもRubyの機能を呼び出す方法はいくつかあります．
-
-=== Rubyのプログラムをevalする
-
-CからRubyの機能を呼び出すもっとも簡単な方法として，文字列で
-与えられたRubyのプログラムを評価する以下の関数があります．
-
-  VALUE rb_eval_string(const char *str)
-
-この評価は現在の環境で行われます．つまり，現在のローカル変数
-などを受け継ぎます．
-
-評価は例外を発生するかもしれないことに注意しましょう. より安全
-な関数もあります.
-
-  VALUE rb_eval_string_protect(const char *str, int *state)
-
-この関数はエラーが発生するとnilを返します．そして，成功時には
-*stateはゼロに，さもなくば非ゼロになります．
-
-=== IDまたはシンボル
-
-Cから文字列を経由せずにRubyのメソッドを呼び出すこともできま
-す．その前に，Rubyインタプリタ内でメソッドや変数名を指定する
-時に使われているIDについて説明しておきましょう．
-
-IDとは変数名，メソッド名を表す整数です．Rubyの中では
-
- :識別子
-
-または
-
- :"任意の文字列"
-
-でアクセスできます．Cからこの整数を得るためには関数
-
-  rb_intern(const char *name)
-  rb_intern_str(VALUE name)
-
-を使います．Rubyから引数として与えられたシンボル(または文字
-列)をIDに変換するには以下の関数を使います．
-
-  rb_to_id(VALUE symbol)
-  rb_check_id(volatile VALUE *name)
-  rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
-
-もし引数がシンボルでも文字列でもなければ，to_strメソッドで文
-字列に変換しようとします．第二の関数はその変換結果を*nameに保
-存し,その名前が既知のシンボルでない場合は0を返します．この関
-数が0以外を返した場合は*nameは常にシンボルか文字列であり，0を
-返した場合は常に文字列です．第三の関数はRubyの文字列ではなく
-NUL終端されたCの文字列を使います．
-
-Rubyから引数として与えられたシンボル(または文字列)をシンボル
-に変換するには以下の関数を使います．
-
-  rb_to_symbol(VALUE name)
-  rb_check_symbol(volatile VALUE *namep)
-  rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
-
-これらの関数は，IDの代わりにシンボルを返すことを除けば上記の
-関数と同じです．
-
-=== CからRubyのメソッドを呼び出す
-
-Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
-の関数を使います．
-
-  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
-
-この関数はオブジェクトrecvのmidで指定されるメソッドを呼び出
-します．その他に引数の指定の仕方が違う以下の関数もあります．
-
-  VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-  VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv)
-  VALUE rb_apply(VALUE recv, ID mid, VALUE args)
-
-applyには引数としてRubyの配列を与えます．
-
-=== 変数/定数を参照/更新する
-
-Cから関数を使って参照・更新できるのは，定数，インスタンス変
-数です．大域変数は一部のものはCの大域変数としてアクセスでき
-ます．ローカル変数を参照する方法は公開していません．
-
-オブジェクトのインスタンス変数を参照・更新する関数は以下の通
-りです．
-
-  VALUE rb_ivar_get(VALUE obj, ID id)
-  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
-
-idはrb_intern()で得られるものを使ってください．
-
-定数を参照するには以下の関数を使ってください．
-
-  VALUE rb_const_get(VALUE obj, ID id)
-
-定数を新しく定義するためには『2.1.3 定数定義』で紹介さ
-れている関数を使ってください．
-
-= RubyとCとの情報共有
-
-C言語とRubyの間で情報を共有する方法について解説します．
-
-== Cから参照できるRubyの定数
-
-以下のRubyの定数はCのレベルから参照できます．
-
-Qtrue ::
-Qfalse ::
-
-  真偽値．QfalseはC言語でも偽とみなされます(つまり0)．
-
-Qnil ::
-
-  C言語から見た「nil」．
-
-== CとRubyで共有される大域変数
-
-CとRubyで大域変数を使って情報を共有できます．共有できる大域
-変数にはいくつかの種類があります．そのなかでもっとも良く使わ
-れると思われるのはrb_define_variable()です．
-
-  void rb_define_variable(const char *name, VALUE *var)
-
-この関数はRubyとCとで共有する大域変数を定義します．変数名が
-`$'で始まらない時には自動的に追加されます．この変数の値を変
-更すると自動的にRubyの対応する変数の値も変わります．
-
-またRuby側からは更新できない変数もあります．このread onlyの
-変数は以下の関数で定義します．
-
-  void rb_define_readonly_variable(const char *name, VALUE *var)
-
-これら変数の他にhookをつけた大域変数を定義できます．hook付き
-の大域変数は以下の関数を用いて定義します．hook付き大域変数の
-値の参照や設定はhookで行う必要があります．
-
-  void rb_define_hooked_variable(const char *name, VALUE *var,
-                                 VALUE (*getter)(), void (*setter)())
-
-この関数はCの関数によってhookのつけられた大域変数を定義しま
-す．変数が参照された時には関数getterが，変数に値がセットされ
-た時には関数setterが呼ばれる．hookを指定しない場合はgetterや
-setterに0を指定します．
---
-getterもsetterも0ならばrb_define_variable()と同じになる．
-++
-
-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)())
-
-この関数によって定義されたRubyの大域変数が参照された時には
-getterが，変数に値がセットされた時にはsetterが呼ばれます．
-
-getterとsetterの仕様は以下の通りです．
-
-  (*getter)(ID id);
-  (*setter)(VALUE val, ID id);
-
-== CのデータをRubyオブジェクトにする
-
-Cの世界で定義されたデータ(構造体)をRubyのオブジェクトとして
-取り扱いたい場合がありえます．このような場合はTypedData_XXX
-マクロ群を用いて構造体へのポインタとRubyのオブジェクトとを互
-いに変換できます．
-
---
-古い(非Typedな)Data_XXXマクロ群は非推奨になりました．
-将来のバージョンのRubyでは古いマクロは動作しなくなる可能性
-があります．
-++
-
-=== 構造体からオブジェクトへ
-
-構造体へのポインタsvalをRubyオブジェクトに変換するには次のマ
-クロを使います。
-
-  TypedData_Wrap_Struct(klass, data_type, sval)
-
-このマクロの戻り値は生成されたオブジェクトを表すVALUE値です．
-
-klassはこのオブジェクトのクラスです．data_typeはこの構造体を
-Rubyが管理するための情報を記述したconst rb_data_type_t型への
-ポインタです．
-
-なお, klassは, Objectや他のクラスではなくData (rb_cData)とい
-う特別なクラスから派生することが推奨されます．
-Dataから派生しない場合には, 必ずrb_undef_alloc_func(klass)
-を呼び出してください．
-
-rb_data_type_tは次のように定義されています．
-
-  struct rb_data_type_struct {
-          const char *wrap_struct_name;
-          struct {
-                  void (*dmark)(void*);
-                  void (*dfree)(void*);
-                  size_t (*dsize)(const void *);
-                  void *reserved[2];
-          } function;
-          const rb_data_type_t *parent;
-          void *data;
-          VALUE flags;
-  };
-
-wrap_struct_nameはこの構造体を識別する名前です．主に統計情報
-の収集と出力に用いられます．プロセス内で一意であれば特にCや
-Rubyの識別子として有効である必要はありません．
-
-dmarkおよびdfree関数はGC実行中に呼び出されます.
-なお, GC実行中はRubyオブジェクトのアロケーションは禁止されま
-す. よって, dmarkおよびdfree関数でRubyオブジェクトのアロケー
-ションは行わないでください.
-
-dmarkはガーベージコレクタがオブジェクトへの参照をマークする
-ときに用いる関数です．この構造体がRubyのオブジェクトへの参照
-を保持するときには, dmarkではrb_gc_markなどを用いて構造体内
-のすべての参照をマークしなければなりません．
-そのような参照を含まない時には0を指定します．
-
---
-そのような参照は勧められません．
-++
-
-dfreeはこの構造体がもう不要になった時に呼ばれる関数です．こ
-の関数がガーベージコレクタから呼ばれます．これが-1の場合は，
-単純に構造体が解放されます．
-
-dsizeは構造体が消費しているメモリのバイト数を返す関数です．
-引数として構造体へのポインタが渡されます．実装困難であれば0
-を渡しても差し支えありませんが, できるだけ指定するようにして
-ください．
-
-reservedとparentは0で埋めなければなりません．
-
-dataにはユーザー定義の任意の値を指定できます．Rubyはこの値に
-は関知しないので，好きに使ってください．
-
-flagsには次のフラグのうち当てはまるもののビット和を指定しま
-す．いずれもRubyのガーベージコレクタについての深い理解を必要
-としますので，良くわからない場合には0を指定すると良いでしょ
-う．
-
-RUBY_TYPED_FREE_IMMEDIATELY ::
-
-  このフラグを指定すると，ガーベージコレクタはこの構造体が不
-  要になった場合にはGC中に直ちにdfreeを呼び出します．
-  dfreeがRuby内部のロック(GVL)を解放する可能性がない場合はこ
-  のフラグを指定できます．
-
-  指定しない場合はdfree呼び出しは遅延され, ファイナライザと
-  同じタイミングで実行されます．
-
-RUBY_TYPED_WB_PROTECTED ::
-
-  オブジェクトの実装がライトバリアをサポートしていることを示
-  します．このフラグを指定するとRubyはそのオブジェクトに対し
-  てGCをより効率的に実行できます．
-  ただし，指定する場合はユーザーはそのオブジェクトのすべての
-  メソッドの実装に適切にライトバリアを挿入する責任があります．
-  さもなくばRubyは実行時にクラッシュする可能性があります．
-
-  ライトバリアについてはdoc/extension.rdocのAppendix D
-  "Generational GC"も参照してください．
-
-
-Cの構造体の割当と対応するオブジェクトの生成を同時に行うマク
-ロとして以下のものが提供されています．
-
-  TypedData_Make_Struct(klass, type, data_type, sval)
-
-このマクロの戻り値は生成されたオブジェクトのVALUE値
-です．このマクロは以下の式のように働きます:
-
-  (sval = ZALLOC(type), TypedData_Wrap_Struct(klass, data_type, sval))
-
-klass, data_typeはData_Wrap_Structと同じ働きをします．type
-は割り当てるC構造体の型です．割り当てられた構造体は変数sval
-に代入されます．この変数の型は (type*) である必要があります．
-
-=== オブジェクトから構造体へ
-
-TypedData_Wrap_StructやTypedData_Make_Structで生成したオブジェ
-クトから構造体へのポインタを復元するには以下のマクロを用いま
-す．
-
-  TypedData_Get_Struct(obj, type, &data_type, sval)
-
-Cの構造体へのポインタは変数svalに代入されます．
-
-これらのマクロの使い方はちょっと分かりにくいので，後で説明す
-る例題を参照してください．
-
-== ディレクトリを作る
-
-  % mkdir ext/dbm
-
-Ruby 1.1からは任意のディレクトリでダイナミックライブラリを作
-ることができるようになりました．Rubyに静的にリンクする場合に
-はRubyを展開したディレクトリの下，extディレクトリの中に拡張
-ライブラリ用のディレクトリを作る必要があります．名前は適当に
-選んで構いません．
-
-== 設計する
-
-まあ，当然なんですけど，どういう機能を実現するかどうかまず設
-計する必要があります．どんなクラスをつくるか，そのクラスには
-どんなメソッドがあるか，クラスが提供する定数などについて設計
-します．
-
-== Cコードを書く
-
-拡張ライブラリ本体となるC言語のソースを書きます．C言語のソー
-スがひとつの時には「ライブラリ名.c」を選ぶと良いでしょう．C
-言語のソースが複数の場合には逆に「ライブラリ名.c」というファ
-イル名は避ける必要があります．オブジェクトファイルとモジュー
-ル生成時に中間的に生成される「ライブラリ名.o」というファイル
-とが衝突するからです．また，後述する mkmf ライブラリのいくつ
-かの関数がコンパイルを要するテストのために「conftest.c」とい
-うファイル名を使用することに注意してください．ソースファイル
-名として「conftest.c」を使用してはなりません．
-
-Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名」と
-いう関数を自動的に実行します．dbmライブラリの場合「Init_dbm」
-です．この関数の中でクラス，モジュール，メソッド，定数などの
-定義を行います．dbm.cから一部引用します．
-
-  void
-  Init_dbm(void)
-  {
-      /* DBMクラスを定義する */
-      VALUE cDBM = rb_define_class("DBM", rb_cObject);
-      /* DBMはEnumerableモジュールをインクルードする */
-      rb_include_module(cDBM, rb_mEnumerable);
-
-      /* DBMクラスのクラスメソッドopen(): 引数はCの配列で受ける */
-      rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
-
-      /* DBMクラスのメソッドclose(): 引数はなし */
-      rb_define_method(cDBM, "close", fdbm_close, 0);
-      /* DBMクラスのメソッド[]: 引数は1個 */
-      rb_define_method(cDBM, "[]", fdbm_fetch, 1);
-
-      /* ... */
-
-      /* DBMデータを格納するインスタンス変数名のためのID */
-      id_dbm = rb_intern("dbm");
-  }
-
-DBMライブラリはdbmのデータと対応するオブジェクトになるはずで
-すから，Cの世界のdbmをRubyの世界に取り込む必要があります．
-
-dbm.cではData_Make_Structを以下のように使っています．
-
-  struct dbmdata {
-      int  di_size;
-      DBM *di_dbm;
-  };
-
-  static const rb_data_type_t dbm_type = {
-      "dbm",
-      {0, free_dbm, memsize_dbm,},
-      0, 0,
-      RUBY_TYPED_FREE_IMMEDIATELY,
-  };
-
-  obj = TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
-
-ここではdbmdata構造体へのポインタをDataにカプセル化してい
-ます．DBM*を直接カプセル化しないのはclose()した時の処理を考
-えてのことです．
-
-Dataオブジェクトからdbmstruct構造体のポインタを取り出すため
-に以下のマクロを使っています．
-
-  #define GetDBM(obj, dbmp) do {\
-      TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
-      if ((dbmp) == 0) closed_dbm();\
-      if ((dbmp)->di_dbm == 0) closed_dbm();\
-  } while (0)
-
-ちょっと複雑なマクロですが，要するにdbmdata構造体のポインタ
-の取り出しと，closeされているかどうかのチェックをまとめてい
-るだけです．
-
-DBMクラスにはたくさんメソッドがありますが，分類すると3種類の
-引数の受け方があります．ひとつは引数の数が固定のもので，例と
-してはdeleteメソッドがあります．deleteメソッドを実装している
-fdbm_delete()はこのようになっています．
-
-  static VALUE
-  fdbm_delete(VALUE obj, VALUE keystr)
-  {
-      /* ... */
-  }
-
-引数の数が固定のタイプは第1引数がself，第2引数以降がメソッド
-の引数となります．
-
-引数の数が不定のものはCの配列で受けるものとRubyの配列で受け
-るものとがあります．dbmライブラリの中で，Cの配列で受けるもの
-はDBMのクラスメソッドであるopen()です．これを実装している関
-数fdbm_s_open()はこうなっています．
-
-  static VALUE
-  fdbm_s_open(int argc, VALUE *argv, VALUE klass)
-  {
-      /* ... */
-
-      if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-          mode = 0666;          /* default value */
-      }
-
-      /* ... */
-  }
-
-このタイプの関数は第1引数が与えられた引数の数，第2引数が与え
-られた引数の入っている配列になります．selfは第3引数として与
-えられます．
-
-この配列で与えられた引数を解析するための関数がopen()でも使わ
-れているrb_scan_args()です．第3引数に指定したフォーマットに従
-い，第4引数以降に指定したVALUEへの参照に値を代入してくれま
-す．
-
-引数の数をチェックするだけならrb_check_arity()が使えます．
-これは引数をリストとして扱いたいときに便利です．
-
-引数をRubyの配列として受け取るメソッドの例には
-Thread#initializeがあります．実装はこうです．
-
-  static VALUE
-  thread_initialize(VALUE thread, VALUE args)
-  {
-      /* ... */
-  }
-
-第1引数はself，第2引数はRubyの配列です．
-
-*注意事項*
-
-Rubyと共有はしないがRubyのオブジェクトを格納する可能性のある
-Cの大域変数は以下の関数を使ってRubyインタプリタに変数の存在
-を教えてあげてください．でないとGCでトラブルを起こします．
-
-  void rb_global_variable(VALUE *var)
-
-== extconf.rbを用意する
-
-Makefileを作る場合の雛型になるextconf.rbというファイルを作り
-ます．extconf.rbはライブラリのコンパイルに必要な条件のチェッ
-クなどを行うことが目的です．まず，
-
-  require 'mkmf'
-
-をextconf.rbの先頭に置きます．extconf.rbの中では以下のRuby関
-数を使うことが出来ます．
-
-  have_library(lib, func): ライブラリの存在チェック
-  have_func(func, header): 関数の存在チェック
-  have_header(header): ヘッダファイルの存在チェック
-  create_makefile(target[, target_prefix]): Makefileの生成
-
-以下の変数を使うことができます．
-
-  $CFLAGS: コンパイル時に追加的に指定するフラグ(-Oなど)
-  $CPPFLAGS: プリプロセッサに追加的に指定するフラグ(-Iや-Dなど)
-  $LDFLAGS: リンク時に追加的に指定するフラグ(-Lなど)
-  $objs: リンクされるオブジェクトファイル名のリスト
-
-オブジェクトファイルのリストは，通常はソースファイルを検索し
-て自動的に生成されますが，makeの途中でソースを生成するような
-場合は明示的に指定する必要があります．
-
-ライブラリをコンパイルする条件が揃わず，そのライブラリをコン
-パイルしない時にはcreate_makefileを呼ばなければMakefileは生
-成されず，コンパイルも行われません．
-
-== dependを用意する
-
-もし，ディレクトリにdependというファイルが存在すれば，
-Makefileが依存関係をチェックしてくれます．
-
-  % gcc -MM *.c > depend
-
-などで作ることが出来ます．あって損は無いでしょう．
-
-== Makefileを生成する
-
-Makefileを実際に生成するためには
-
-  ruby extconf.rb
-
-とします．extconf.rbに require 'mkmf' の行がない場合にはエラー
-になりますので，引数を追加して
-
-  ruby -r mkmf extconf.rb
-
-としてください．
-
-site_ruby ディレクトリでなく，
-vendor_ruby ディレクトリにインストールする場合には
-以下のように --vendor オプションを加えてください．
-
-  ruby extconf.rb --vendor
-
-ディレクトリをext以下に用意した場合にはRuby全体のmakeの時に
-自動的にMakefileが生成されますので，このステップは不要です．
-
-== makeする
-
-動的リンクライブラリを生成する場合にはその場でmakeしてくださ
-い．必要であれば make install でインストールされます．
-
-ext以下にディレクトリを用意した場合は，Rubyのディレクトリで
-makeを実行するとMakefileを生成からmake，必要によってはそのモ
-ジュールのRubyへのリンクまで自動的に実行してくれます．
-extconf.rbを書き換えるなどしてMakefileの再生成が必要な時はま
-たRubyディレクトリでmakeしてください．
-
-拡張ライブラリはmake installでRubyライブラリのディレクトリの
-下にコピーされます．もし拡張ライブラリと協調して使うRubyで記
-述されたプログラムがあり，Rubyライブラリに置きたい場合には，
-拡張ライブラリ用のディレクトリの下に lib というディレクトリ
-を作り，そこに 拡張子 .rb のファイルを置いておけば同時にイン
-ストールされます．
-
-== デバッグ
-
-まあ，デバッグしないと動かないでしょうね．ext/Setupにディレ
-クトリ名を書くと静的にリンクするのでデバッガが使えるようにな
-ります．その分コンパイルが遅くなりますけど．
-
-== できあがり
-
-後はこっそり使うなり，広く公開するなり，売るなり，ご自由にお
-使いください．Rubyの作者は拡張ライブラリに関して一切の権利を
-主張しません．
-
-= Appendix A. Rubyのソースコードの分類
-
-Rubyのソースはいくつかに分類することが出来ます．このうちクラ
-スライブラリの部分は基本的に拡張ライブラリと同じ作り方になっ
-ています．これらのソースは今までの説明でほとんど理解できると
-思います．
-
-== Ruby言語のコア
-
-class.c    :: クラスとモジュール
-error.c    :: 例外クラスと例外機構
-gc.c       :: 記憶領域管理
-load.c     :: ライブラリのロード
-object.c   :: オブジェクト
-variable.c :: 変数と定数
-
-== Rubyの構文解析器
-
-parse.y       :: 字句解析器と構文定義
-parse.c       :: 自動生成
-defs/keywords :: 予約語
-lex.c         :: 自動生成
-
-== Rubyの評価器 (通称YARV)
-
-  compile.c
-  eval.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
-
-  defs/opt_insns_unif.def  : 命令融合
-  defs/opt_operand.def     : 最適化のための定義
-
-    -> insn*.inc           : 自動生成
-    -> opt*.inc            : 自動生成
-    -> vm.inc              : 自動生成
-
-== 正規表現エンジン (鬼車)
-
-  regex.c
-  regcomp.c
-  regenc.c
-  regerror.c
-  regexec.c
-  regparse.c
-  regsyntax.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      :: 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#sprintf
-string.c     :: String
-struct.c     :: Struct
-time.c       :: Time
-
-defs/known_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. 拡張用関数リファレンス
-
-C言語からRubyの機能を利用するAPIは以下の通りである．
-
-== 型
-
-VALUE ::
-
-  Rubyオブジェクトを表現する型．必要に応じてキャストして用いる．
-  組み込み型を表現するCの型はruby.hに記述してあるRで始まる構造
-  体である．VALUE型をこれらにキャストするためにRで始まる構造体
-  名を全て大文字にした名前のマクロが用意されている．
-
-== 変数・定数
-
-Qnil ::
-
-  定数: nilオブジェクト
-
-Qtrue ::
-
-  定数: trueオブジェクト(真のデフォルト値)
-
-Qfalse ::
-
-  定数: falseオブジェクト
-
-== Cデータのカプセル化
-
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
-
-  Cの任意のポインタをカプセル化したRubyオブジェクトを返す．こ
-  のポインタがRubyからアクセスされなくなった時，freeで指定した
-  関数が呼ばれる．また，このポインタの指すデータが他のRubyオブ
-  ジェクトを指している場合，markに指定する関数でマークする必要
-  がある．
-
-Data_Make_Struct(klass, type, mark, free, sval) ::
-
-  type型のメモリをmallocし，変数svalに代入した後，それをカプセ
-  ル化したデータを返すマクロ．
-
-Data_Get_Struct(data, type, sval) ::
-
-  dataからtype型のポインタを取り出し変数svalに代入するマクロ．
-
-== 型チェック
-
-  RB_TYPE_P(value, type)
-  TYPE(value)
-  FIXNUM_P(value)
-  NIL_P(value)
-  RB_INTEGER_TYPE_P(value)
-  RB_FLOAT_TYPE_P(value)
-  void Check_Type(VALUE value, int type)
-  SafeStringValue(value)
-
-== 型変換
-
-  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)
-  rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags)
-  NUM2DBL(value)
-  rb_float_new(f)
-  RSTRING_LEN(str)
-  RSTRING_PTR(str)
-  StringValue(value)
-  StringValuePtr(value)
-  StringValueCStr(value)
-  rb_str_new2(s)
-
-== クラス/モジュール定義
-
-VALUE rb_define_class(const char *name, VALUE super) ::
-
-  superのサブクラスとして新しいRubyクラスを定義する．
-
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
-
-  superのサブクラスとして新しいRubyクラスを定義し，moduleの
-  定数として定義する．
-
-VALUE rb_define_module(const char *name) ::
-
-  新しいRubyモジュールを定義する．
-
-VALUE rb_define_module_under(VALUE module, const char *name) ::
-
-  新しいRubyモジュールを定義し，moduleの定数として定義する．
-
-void rb_include_module(VALUE klass, VALUE module) ::
-
-  モジュールをインクルードする．classがすでにmoduleをインク
-  ルードしている時には何もしない(多重インクルードの禁止)．
-
-void rb_extend_object(VALUE object, VALUE module) ::
-
-  オブジェクトをモジュール(で定義されているメソッド)で拡張する．
-
-== 大域変数定義
-
-void rb_define_variable(const char *name, VALUE *var) ::
-
-  RubyとCとで共有するグローバル変数を定義する．変数名が`$'で
-  始まらない時には自動的に追加される．nameとしてRubyの識別子
-  として許されない文字(例えば` ')を含む場合にはRubyプログラ
-  ムからは見えなくなる．
-
-void rb_define_readonly_variable(const char *name, VALUE *var) ::
-
-  RubyとCとで共有するread onlyのグローバル変数を定義する．
-  read onlyであること以外はrb_define_variable()と同じ．
-
-void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) ::
-
-  関数によって実現されるRuby変数を定義する．変数が参照された
-  時にはgetterが，変数に値がセットされた時にはsetterが呼ばれ
-  る．
-
-void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) ::
-
-  関数によってhookのつけられたグローバル変数を定義する．変数
-  が参照された時にはgetterが，関数に値がセットされた時には
-  setterが呼ばれる．getterやsetterに0を指定した時にはhookを
-  指定しないのと同じ事になる．
-
-void rb_global_variable(VALUE *var) ::
-
-  GCのため，Rubyプログラムからはアクセスされないが, Rubyオブ
-  ジェクトを含む大域変数をマークする．
-
-== 定数
-
-void rb_define_const(VALUE klass, const char *name, VALUE val) ::
-
-  定数を定義する．
-
-void rb_define_global_const(const char *name, VALUE val) ::
-
-  大域定数を定義する．
-
-    rb_define_const(rb_cObject, name, val)
-
-  と同じ意味．
-
-== メソッド定義
-
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
-
-  メソッドを定義する．argcはselfを除く引数の数．argcが-1の時,
-  関数には引数の数(selfを含まない)を第1引数, 引数の配列を第2
-  引数とする形式で与えられる(第3引数はself)．argcが-2の時,
-  第1引数がself, 第2引数がargs(argsは引数を含むRubyの配列)と
-  いう形式で与えられる．
-
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
-
-  privateメソッドを定義する．引数はrb_define_method()と同じ．
-
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
-
-  特異メソッドを定義する．引数はrb_define_method()と同じ．
-
-rb_check_arity(int argc, int min, int max) ::
-
-  引数の数であるargcがmin..maxの範囲に入っているかをチェックします．
-  もしmaxがUNLIMITED_ARGUMENTSなら，上限はチェックしません．
-  もしargcが範囲外ならArgumentErrorが発生します．
-
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
-
-  argc, argv形式で与えられた指定されたフォーマットに従って引
-  数を分解し，続くVALUEへの参照にセットします．このフォーマッ
-  トは，ABNFで記述すると以下の通りです．
-
-    scan-arg-spec  := param-arg-spec [option-hash-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
-    option-hash-arg-spec := sym-for-option-hash-arg
-    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-option-hash-arg        := ":"   ; オプションハッシュを取得する
-                                            ; ための指定; 省略不能な引数の
-                                            ; 数よりも多くの引数が指定され，
-                                            ; 最後の引数がハッシュ（または
-                                            ; #to_hashで変換可能）の場合に
-                                            ; 取得される．最後の引数がnilの
-                                            ; 場合，可変長引数指定がなく，
-                                            ; 省略不能引数の数よりも多くの
-                                            ; 引数が指定された場合に取得される
-    sym-for-block-arg              := "&"   ; イテレータブロックを取得するための
-                                            ; 指定
-
-  フォーマットが"12"の場合，引数は最低1つで，3つ(1+2)まで許さ
-  れるという意味になります．従って，フォーマット文字列に続い
-  て3つのVALUEへの参照を置く必要があります．それらには取得した
-  変数がセットされます．変数への参照の代わりにNULLを指定する
-  こともでき，その場合は取得した引数の値は捨てられます．なお，
-  省略可能引数が省略された時の変数の値はnil(C言語のレベルでは
-  Qnil)になります．
-
-  返り値は与えられた引数の数です．オプションハッシュおよびイ
-  テレータブロックは数えません．
-
-int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) ::
-
-  キーワードで指定された値をtableにしたがって取り出します．
-  tableの最初のrequired個のIDは必須キーワードを表し，続く
-  optional (optionalが負の場合は-optional-1) 個のIDは省略可能
-  キーワードです．必須キーワードがkeyword_hash中にない場合，
-  "missing keyword"ArgumentErrorが発生します．省略可能キーワー
-  ドがない場合は，values中の対応する要素にはQundefがセットされ
-  ます．keyword_hashに使用されない要素がある場合は，optionalが
-  負なら無視されますが，そうでなければ"unknown keyword"
-  ArgumentErrorが発生します．
-
-VALUE rb_extract_keywords(VALUE *original_hash) ::
-
-  original_hashで参照されるHashオブジェクトから，Symbolである
-  キーとその値を新しいHashに取り出します．original_hashの指す
-  先には，元のHashがSymbol以外のキーを含んでいた場合はそれらが
-  コピーされた別の新しいHash，そうでなければ0が保存されます．
-
-== Rubyメソッド呼び出し
-
-VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
-
-  メソッド呼び出し．文字列からmidを得るためにはrb_intern()を
-  使う．
-  private/protectedなメソッドでも呼び出せる．
-
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
-VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
-
-  メソッド呼び出し．引数をargc, argv形式で渡す．
-  private/protectedなメソッドでも呼び出せる．
-
-VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
-
-  メソッド呼び出し．
-  publicなメソッドしか呼べない．
-
-VALUE rb_eval_string(const char *str) ::
-
-  文字列をRubyスクリプトとしてコンパイル・実行する．
-
-ID rb_intern(const char *name) ::
-
-  文字列に対応するIDを返す．
-
-char *rb_id2name(ID id) ::
-
-  IDに対応する文字列を返す(デバッグ用)．
-
-char *rb_class2name(VALUE klass) ::
-
-  クラスの名前を返す(デバッグ用)．クラスが名前を持たない時に
-  は, 祖先を遡って名前を持つクラスの名前を返す．
-
-int rb_respond_to(VALUE obj, ID id) ::
-
-  objがidで示されるメソッドを持つかどうかを返す．
-
-== インスタンス変数
-
-VALUE rb_iv_get(VALUE obj, const char *name) ::
-
-  objのインスタンス変数の値を得る．`@'で始まらないインスタン
-  ス変数は Rubyプログラムからアクセスできない「隠れた」イン
-  スタンス変数になる．定数は大文字の名前を持つクラス(または
-  モジュール)のインスタンス変数として実装されている．
-
-VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
-
-  objのインスタンス変数をvalにセットする．
-
-== 制御構造
-
-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を値としてイテレータブロックを呼び出す．
-
-VALUE rb_rescue(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
-
-  関数func1をarg1を引数に呼び出す．func1の実行中に例外が発生
-  した時には func2をarg2を第一引数, 発生した例外オブジェクト
-  を第二引数として呼ぶ．戻り値は例外が発生しなかった時はfunc1
-  の戻り値, 例外が発生した時にはfunc2の戻り値である．
-
-VALUE rb_ensure(VALUE (*func1)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
-
-  関数func1をarg1を引数として実行し, 実行終了後(たとえ例外が
-  発生しても) func2をarg2を引数として実行する．戻り値はfunc1
-  の戻り値である(例外が発生した時は戻らない)．
-
-VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
-
-  関数funcをargを引数として実行し, 例外が発生しなければその戻
-  り値を返す．例外が発生した場合は, *stateに非0をセットして
-  Qnilを返す．
-  rb_jump_tag()を呼ばずに捕捉した例外を無視する場合には，
-  rb_set_errinfo(Qnil)でエラー情報をクリアしなければならない．
-
-void rb_jump_tag(int state) ::
-
-  rb_protect()やrb_eval_string_protect()で捕捉された例外を再
-  送する．stateはそれらの関数から返された値でなければならない．
-  この関数は直接の呼び出し元に戻らない．
-
-void rb_iter_break() ::
-
-  現在の最も内側のブロックを終了する．この関数は直接の呼び出
-  し元に戻らない．
-
-void rb_iter_break_value(VALUE value) ::
-
-  現在の最も内側のブロックをvalueで終了する．ブロックは引数で
-  与えられたvalueを返す．この関数は直接の呼び出し元に戻らない．
-
-== 例外・エラー
-
-void rb_warning(const char *fmt, ...) ::
-
-  rb_verbose時に標準エラー出力に警告情報を表示する．引数は
-  printf()と同じ．
-
-void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
-
-  RuntimeError例外を発生させる．引数はprintf()と同じ．
-
-void rb_raise(VALUE exception, const char *fmt, ...) ::
-
-  exceptionで指定した例外を発生させる．fmt以下の引数は
-  printf()と同じ．
-
-void rb_fatal(const char *fmt, ...) ::
-
-  致命的例外を発生させる．通常の例外処理は行なわれず, インター
-  プリタが終了する(ただしensureで指定されたコードは終了前に
-  実行される)．
-
-void rb_bug(const char *fmt, ...) ::
-
-  インタープリタなどプログラムのバグでしか発生するはずのない
-  状況の時呼ぶ．インタープリタはコアダンプし直ちに終了する．
-  例外処理は一切行なわれない．
-
-注意: "%"PRIsVALUEがObject#to_s('+'フラグが指定されていると
-きはObject#inspect)を使ったVALUEの出力に利用できる．これは
-"%i"と衝突するため，整数には"%d"を使用すること．
-
-== Rubyの初期化・実行
-
-Rubyをアプリケーションに埋め込む場合には以下のインタフェース
-を使う．通常の拡張ライブラリには必要ない．
-
-void ruby_init() ::
-
-  Rubyインタプリタの初期化を行なう．
-
-void *ruby_options(int argc, char **argv) ::
-
-  Rubyインタプリタのコマンドライン引数の処理を行ない，
-  Rubyのソースコードをコンパイルする．
-  コンパイルされたソースへのポインタ，もしくは特殊値を返す.
-
-int ruby_run_node(void *n) ::
-
-  コンパイルされたコードを実行する．
-  実行に成功した場合はEXIT_SUCCESSを，エラーが起こったときはそれ以外を返す．
-
-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) ::
-
-  指定されたフック関数を削除します．
-
-== メモリ使用量
-
-void rb_gc_adjust_memory_usage(ssize_t diff) ::
-
-  登録された外部のメモリ使用量を調整します．この関数で外部のライブラリが
-  どのくらいメモリを使っているのかをGCに伝えることができます．正のdiffで
-  この関数を呼び出すとメモリ使用量の増加を意味します．新しいメモリブロッ
-  クが確保されたり，ブロックがより大きなサイズで再割り当てされたりした場
-  合などです．負のdiffでこの関数を呼び出すとメモリ使用量の減少を意味しま
-  す．メモリブロックが解放されたり，メモリブロックがより小さいサイズで再
-  確保されたりした場合などです．この関数はGCを引き起こすかもしれません．
-
-== 互換性のためのマクロ
-
-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で使える関数たち
-
-extconf.rbの中では利用可能なコンパイル条件チェックの関数は以
-下の通りである．
-
-have_macro(macro, headers) ::
-
-  ヘッダファイルheaderをインクルードしてマクロmacroが定義さ
-  れているかどうかチェックする．マクロが定義されている時true
-  を返す．
-
-have_library(lib, func) ::
-
-  関数funcを定義しているライブラリlibの存在をチェックする．
-  チェックに成功すると，-llibを$libsに追加し，trueを返す．
-
-find_library(lib, func, path...) ::
-
-  関数funcを定義しているライブラリlibの存在を -Lpath を追加
-  しながらチェックする．チェックに成功すると，-llibを$libsに
-  追加し，trueを返す．
-
-have_func(func, header) ::
-
-  ヘッダファイルheaderをインクルードして関数funcの存在をチェ
-  ックする．funcが標準ではリンクされないライブラリ内のもので
-  ある時には先にhave_libraryでそのライブラリをチェックしてお
-  く事．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_{FUNC}` を定義し，trueを返す．
-
-have_var(var, header) ::
-
-  ヘッダファイルheaderをインクルードして変数varの存在をチェッ
-  クする．varが標準ではリンクされないライブラリ内のものであ
-  る時には先にhave_libraryでそのライブラリをチェックしておく
-  事．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_{VAR}` を定義し，trueを返す．
-
-have_header(header) ::
-
-  ヘッダファイルの存在をチェックする．チェックに成功すると，
-  プリプロセッサマクロ `HAVE_{HEADER_H}` を定義し，trueを返す．
-  (スラッシュやドットはアンダースコアに置換される)
-
-find_header(header, path...) ::
-
-  ヘッダファイルheaderの存在を -Ipath を追加しながらチェック
-  する．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_{HEADER_H}` を定義し，trueを返す．
-  (スラッシュやドットはアンダースコアに置換される)
-
-have_struct_member(type, member[, header[, opt]]) ::
-
-  ヘッダファイルheaderをインクルードして型typeが定義され，
-  なおかつメンバmemberが存在するかをチェックする．チェックに
-  成功すると，プリプロセッサマクロ `HAVE_{TYPE}_{MEMBER}` を
-  定義し，trueを返す．
-
-have_type(type, header, opt) ::
-
-  ヘッダファイルheaderをインクルードして型typeが存在するかを
-  チェックする．チェックに成功すると，プリプロセッサマクロ
-  `HAVE_TYPE_{TYPE}` を定義し，trueを返す．
-
-check_sizeof(type, header) ::
-
-  ヘッダファイルheaderをインクルードして型typeのchar単位サイ
-  ズを調べる．チェックに成功すると，プリプロセッサマクロ
-  `SIZEOF_{TYPE}` を定義し，そのサイズを返す．定義されていな
-  いときはnilを返す．
-
-create_makefile(target[, target_prefix]) ::
-
-  拡張ライブラリ用のMakefileを生成する．この関数を呼ばなけれ
-  ばそのライブラリはコンパイルされない．targetはモジュール名
-  を表す．
-
-find_executable(command, path) ::
-
-  コマンドcommandをFile::PATH_SEPARATORで区切られたパス名の
-  リストpathから探す．pathがnilまたは省略された場合は，環境
-  変数PATHの値を使用する．実行可能なコマンドが見つかった場合
-  はパスを含むファイル名，見つからなかった場合はnilを返す．
-
-with_config(withval[, default=nil]) ::
-
-  コマンドライン上の--with-<withval>で指定されたオプション値
-  を得る．
-
-enable_config(config, *defaults) ::
-disable_config(config, *defaults) ::
-
-  コマンドライン上の--enable-<config>または
-  --disable-<config>で指定された真偽値を得る．
-  --enable-<config>が指定されていた場合はtrue，
-  --disable-<config>が指定されていた場合はfalseを返す．
-  どちらも指定されていない場合は，ブロックつきで呼び出されて
-  いる場合は*defaultsをyieldした結果，ブロックなしなら
-  \*defaultsを返す．
-
-dir_config(target[, default_dir]) ::
-dir_config(target[, default_include, default_lib]) ::
-
-  コマンドライン上の--with-<target>-dir, --with-<target>-include,
-  --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])
-
-pkg_config(pkg, option=nil) ::
-
-  pkg-configコマンドからパッケージpkgの情報を [cflags, ldflags, libs]
-  の配列として得る．$CFLAGS, $LDFLAGS, $libs にはそれぞれの値が
-  追加される．
-
-  pkg-configの実際のコマンドは，以下の順で試される．
-
-  1. コマンドラインで--with-{pkg}-config={command}オプションが
-     指定された場合: {command} {option}
-  2. {pkg}-config {option}
-  3. pkg-config {option} {pkg}
-
-  optionが指定された場合は，上記の配列の代わりにそのオプションを
-  指定して得られた出力をstripしたものを返す．
-
-= Appendix D. 世代別GC
-
-Ruby 2.1から世代別GCに対応しました．我々はこれをRGenGCと呼んでいます．
-RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つように開発されている
-ため，拡張ライブラリ側の対応はほぼ不要です．
-
-ただし，対応をすることで性能を向上することができる可能性があります．もし
-拡張ライブラリに高い性能が必要である場合は対応を検討して下さい．
-
-とくにRARRAY_PTR()/RHASH_TBL()のようなマクロを用いてポインタに直接アクセ
-スするようなコードは書かないようにして下さい．代わりに，rb_ary_aref(),
-rb_ary_store() などの，適切な API 関数を利用するようにして下さい．
-
-そのほか，対応についての詳細は extension.rdoc の「Appendix D. Generational
-GC」を参照して下さい．
-
-:enddoc: Local variables:
-:enddoc: fill-column: 60
-:enddoc: end:
diff --git a/doc/extension.rdoc b/doc/extension.rdoc
deleted file mode 100644
index 61a6aeffd9..0000000000
--- a/doc/extension.rdoc
+++ /dev/null
@@ -1,1861 +0,0 @@
-# extension.rdoc -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
-
-This document explains how to make extension libraries for Ruby.
-
-= Basic Knowledge
-
-In C, variables have types and data do not have types.  In contrast,
-Ruby variables do not have a static type, and data themselves have
-types, so data will need to be converted between the languages.
-
-Data in Ruby are represented by the C type `VALUE'.  Each VALUE data
-has its data type.
-
-To retrieve C data from a VALUE, you need to:
-
-1. Identify the VALUE's data type
-2. Convert the VALUE into C data
-
-Converting to the wrong data type may cause serious problems.
-
-== Data Types
-
-The Ruby interpreter has the following data types:
-
-T_NIL       :: nil
-T_OBJECT    :: ordinary object
-T_CLASS     :: class
-T_MODULE    :: module
-T_FLOAT     :: floating point number
-T_STRING    :: string
-T_REGEXP    :: regular expression
-T_ARRAY     :: array
-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
-T_DATA      :: data
-T_SYMBOL    :: symbol
-
-In addition, there are several other types used internally:
-
-T_ICLASS    :: included module
-T_MATCH     :: MatchData object
-T_UNDEF     :: undefined
-T_NODE      :: syntax tree node
-T_ZOMBIE    :: object awaiting finalization
-
-Most of the types are represented by C structures.
-
-== Check Data Type of the VALUE
-
-The macro TYPE() defined in ruby.h shows the data type of the VALUE.
-TYPE() returns the constant number T_XXXX described above.  To handle
-data types, your code will look something like this:
-
-  switch (TYPE(obj)) {
-    case T_FIXNUM:
-      /* process Fixnum */
-      break;
-    case T_STRING:
-      /* process String */
-      break;
-    case T_ARRAY:
-      /* process Array */
-      break;
-    default:
-      /* raise exception */
-      rb_raise(rb_eTypeError, "not valid value");
-      break;
-  }
-
-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.
-
-There are also faster check macros for fixnums and nil.
-
-  FIXNUM_P(obj)
-  NIL_P(obj)
-
-== Convert VALUE into C Data
-
-The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true
-respectively.  They are singletons for the data type.
-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 depends 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 include 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 the same replacement and returns the 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
-argument, to change the value of var in place.
-
-You can also use the macro named StringValueCStr(). This is just
-like StringValuePtr(), but always adds a NUL character at the end of
-the result. If the result contains a 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".  However, we do not recommend
-to access RXXXX data directly because these data structures are complex.
-Use corresponding rb_xxx() functions to access the internal struct.
-For example, to access an entry of array, use rb_ary_entry(ary, offset)
-and rb_ary_store(ary, offset, obj).
-
-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)'.
-
-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.
-
-== Convert C Data into VALUE
-
-To convert C data to Ruby values:
-
-FIXNUM ::
-
-  left shift 1 bit, and turn on its least significant bit (LSB).
-
-Other pointer values ::
-
-  cast to VALUE.
-
-You can determine whether a VALUE is a pointer or not by checking its LSB.
-
-Notice: Ruby does not allow arbitrary pointer values to be a VALUE.  They
-should be pointers to the structures which Ruby knows about.  The known
-structures are defined in <ruby.h>.
-
-To convert C numbers to Ruby values, use these macros:
-
-INT2FIX() :: for integers within 31bits.
-INT2NUM() :: for arbitrary sized integers.
-
-INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
-range, but is a bit slower.
-
-== 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:
-
-=== String Functions
-
-rb_str_new(const char *ptr, long len) ::
-
-  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)).
-
-rb_str_new_literal(const char *ptr) ::
-
-  Creates a new Ruby string from a C string literal.
-
-rb_tainted_str_new(const char *ptr, long len) ::
-
-  Creates a new tainted Ruby string.  Strings from external data
-  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.
-
-  Note: In the format string, "%"PRIsVALUE can be used for Object#to_s
-  (or Object#inspect if '+' flag is set) output (and related argument
-  must be a VALUE).  Since it conflicts with "%i", for integers in
-  format strings, use "%d".
-
-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) ::
-rb_str_cat_cstr(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) ::
-rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) ::
-
-  Creates a new Ruby string with the specified encoding.
-
-rb_enc_str_new_literal(const char *ptr) ::
-
-  Creates a new Ruby string from a C string literal 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.
-
-rb_usascii_str_new_literal(const char *ptr) ::
-
-  Creates a new Ruby string from a C string literal with encoding
-  US-ASCII.
-
-rb_utf8_str_new(const char *ptr, long len) ::
-rb_utf8_str_new_cstr(const char *ptr) ::
-
-  Creates a new Ruby string with encoding UTF-8.
-
-rb_utf8_str_new_literal(const char *ptr) ::
-
-  Creates a new Ruby string from a C string literal with encoding
-  UTF-8.
-
-rb_str_resize(VALUE str, long len) ::
-
-  Resizes a Ruby string to len bytes.  If str is not modifiable, this
-  function raises an exception.  The length of str must be set in
-  advance.  If len is less than the old length the content beyond
-  len bytes is discarded, else if len is greater than the old length
-  the content beyond the old length bytes will not be preserved but
-  will be garbage.  Note that RSTRING_PTR(str) may change by calling
-  this function.
-
-rb_str_set_len(VALUE str, long len) ::
-
-  Sets the length of a Ruby string.  If str is not modifiable, this
-  function raises an exception.  This function preserves the content
-  up to len bytes, regardless RSTRING_LEN(str).  len must not exceed
-  the capacity of str.
-
-=== Array Functions
-
-rb_ary_new() ::
-
-  Creates an array with no elements.
-
-rb_ary_new2(long len) ::
-rb_ary_new_capa(long len) ::
-
-  Creates an array with no elements, allocating internal buffer
-  for len elements.
-
-rb_ary_new3(long n, ...) ::
-rb_ary_new_from_args(long n, ...) ::
-
-  Creates an n-element array from the arguments.
-
-rb_ary_new4(long n, VALUE *elts) ::
-rb_ary_new_from_values(long n, VALUE *elts) ::
-
-  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) ::
-
-  Equivalent to Array#[].
-
-rb_ary_entry(VALUE ary, long offset) ::
-
-  \ary[offset]
-
-rb_ary_store(VALUE ary, long offset, VALUE obj) ::
-
-  \ary[offset] = obj
-
-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) ::
-
-  ary.push, ary.pop, ary.shift, ary.unshift
-
-rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
-
-  Appends len elements of objects from ptr to the array.
-
-= Extending Ruby with C
-
-== 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:
-
-- Classes, Modules
-- Methods, Singleton Methods
-- Constants
-
-=== Class and Module Definition
-
-To define a class or module, use the functions below:
-
-  VALUE rb_define_class(const char *name, VALUE super)
-  VALUE rb_define_module(const char *name)
-
-These functions return the newly created class or module.  You may
-want to save this reference into a variable to use later.
-
-To define nested classes or modules, use the functions below:
-
-  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
-  VALUE rb_define_module_under(VALUE outer, const char *name)
-
-=== Method and Singleton Method Definition
-
-To define methods or singleton methods, use these functions:
-
-  void rb_define_method(VALUE klass, const char *name,
-                        VALUE (*func)(ANYARGS), int argc)
-
-  void rb_define_singleton_method(VALUE object, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
-
-The `argc' represents the number of the arguments to the C function,
-which must be less than 17.  But I doubt you'll need that many.
-
-If `argc' is negative, it specifies the calling sequence, not number of
-the arguments.
-
-If argc is -1, the function will be called as:
-
-  VALUE func(int argc, VALUE *argv, VALUE obj)
-
-where argc is the actual number of arguments, argv is the C array of
-the arguments, and obj is the receiver.
-
-If argc is -2, the arguments are passed in a Ruby array. The function
-will be called like:
-
-  VALUE func(VALUE obj, VALUE args)
-
-where obj is the receiver, and args is the Ruby array containing
-actual arguments.
-
-There are some more functions to define methods. One takes an ID
-as the name of method to be defined. See also ID or Symbol below.
-
-  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)(ANYARGS), int argc)
-  void rb_define_protected_method(VALUE klass, const char *name,
-                                  VALUE (*func)(ANYARGS), int argc)
-
-At last, rb_define_module_function defines a module function,
-which are private AND singleton methods of the module.
-For example, sqrt is a module function defined in the Math module.
-It can be called in the following way:
-
-  Math.sqrt(4)
-
-or
-
-  include Math
-  sqrt(4)
-
-To define module functions, use:
-
-  void rb_define_module_function(VALUE module, const char *name,
-                                 VALUE (*func)(ANYARGS), int argc)
-
-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)(ANYARGS), int argc)
-
-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 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.
-
-If you are overriding an existing method of any ancestor of your class,
-you may rely on:
-
-  VALUE rb_call_super(int argc, const VALUE *argv)
-
-To achieve the receiver of the current scope (if no other way is
-available), you can use:
-
-  VALUE rb_current_receiver(void)
-
-=== Constant Definition
-
-We have 2 functions to define constants:
-
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
-
-The former is to define a constant under specified class/module.  The
-latter is to define a global constant.
-
-== Use Ruby Features from C
-
-There are several ways to invoke Ruby's features from C code.
-
-=== Evaluate Ruby Programs in a String
-
-The easiest way to use Ruby's functionality from a C program is to
-evaluate the string as Ruby program.  This function will do the job:
-
-  VALUE rb_eval_string(const char *str)
-
-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 occurred. Moreover, *state is zero if str was
-successfully evaluated, or nonzero otherwise.
-
-=== 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:
-
-  :Identifier
-
-or
-
-  :"any kind of string"
-
-You can get the ID value from a string within C code by using
-
-  rb_intern(const char *name)
-  rb_intern_str(VALUE name)
-
-You can retrieve ID from Ruby object (Symbol or String) given as an
-argument by using
-
-  rb_to_id(VALUE symbol)
-  rb_check_id(volatile VALUE *name)
-  rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
-
-These functions try to convert the argument to a String if it was not
-a Symbol nor a String.  The second function stores the converted
-result into *name, and returns 0 if the string is not a known symbol.
-After this function returned a non-zero value, *name is always a
-Symbol or a String, otherwise it is a String if the result is 0.
-The third function takes NUL-terminated C string, not Ruby VALUE.
-
-You can retrieve Symbol from Ruby object (Symbol or String) given as
-an argument by using
-
-  rb_to_symbol(VALUE name)
-  rb_check_symbol(volatile VALUE *namep)
-  rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
-
-These functions are similar to above functions except that these
-return a Symbol instead of an ID.
-
-You can convert C ID to Ruby Symbol by using
-
-  VALUE ID2SYM(ID id)
-
-and to convert Ruby Symbol object to ID, use
-
-  ID SYM2ID(VALUE symbol)
-
-=== Invoke Ruby Method from C
-
-To invoke methods directly, you can use the function below
-
-  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
-
-This function invokes a method on the recv, with the method name
-specified by the symbol mid.
-
-=== 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.
-
-The functions to access/modify instance variables are below:
-
-  VALUE rb_ivar_get(VALUE obj, ID id)
-  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
-
-id must be the symbol, which can be retrieved by rb_intern().
-
-To access the constants of the class/module:
-
-  VALUE rb_const_get(VALUE obj, ID id)
-
-See also Constant Definition above.
-
-= Information Sharing Between Ruby and C
-
-=== Ruby Constants That Can Be Accessed From C
-
-As stated in section 1.3,
-the following Ruby constants can be referred from C.
-
-Qtrue ::
-Qfalse ::
-
-  Boolean values.  Qfalse is false in C also (i.e. 0).
-
-Qnil ::
-
-  Ruby nil in C scope.
-
-== Global Variables Shared Between C and Ruby
-
-Information can be shared between the two environments using shared global
-variables.  To define them, you can use functions listed below:
-
-  void rb_define_variable(const char *name, VALUE *var)
-
-This function defines the variable which is shared by both environments.
-The value of the global variable pointed to by `var' can be accessed
-through Ruby's global variable named `name'.
-
-You can define read-only (from Ruby, of course) variables using the
-function below.
-
-  void rb_define_readonly_variable(const char *name, VALUE *var)
-
-You can define hooked variables.  The accessor functions (getter and
-setter) are called on access to the hooked variables.
-
-  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().
-
-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);
-
-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:
-
-  VALUE (*getter)(ID id);
-  void (*setter)(VALUE val, ID id);
-
-== Encapsulate C Data into a Ruby Object
-
-Sometimes you need to expose your struct in the C world as a Ruby
-object.
-In a situation like this, making use of the TypedData_XXX macro
-family, the pointer to the struct and the Ruby object can be mutually
-converted.
-
---
-The old (non-Typed) Data_XXX macro family has been deprecated.
-In the future version of Ruby, it is possible old macros will not
-work.
-++
-
-=== C struct to Ruby object
-
-You can convert sval, a pointer to your struct, into a Ruby object
-with the next macro.
-
-  TypedData_Wrap_Struct(klass, data_type, sval)
-
-TypedData_Wrap_Struct() returns a created Ruby object as a VALUE.
-
-The klass argument is the class for the object.
-data_type is a pointer to a const rb_data_type_t which describes
-how Ruby should manage the struct.
-
-It is recommended that klass derives from a special class called
-Data (rb_cData) but not from Object or other ordinal classes.
-If it doesn't, you have to call rb_undef_alloc_func(klass).
-
-rb_data_type_t is defined like this.  Let's take a look at each
-member of the struct.
-
-  struct rb_data_type_struct {
-          const char *wrap_struct_name;
-          struct {
-                  void (*dmark)(void*);
-                  void (*dfree)(void*);
-                  size_t (*dsize)(const void *);
-                  void *reserved[2];
-          } function;
-          const rb_data_type_t *parent;
-          void *data;
-          VALUE flags;
-  };
-
-wrap_struct_name is an identifier of this instance of the struct.
-It is basically used for collecting and emitting statistics.
-So the identifier must be unique in the process, but doesn't need
-to be valid as a C or Ruby identifier.
-
-These dmark / dfree functions are invoked during GC execution.  No
-object allocations are allowed during it, so do not allocate ruby
-objects inside them.
-
-dmark is a function to mark Ruby objects referred from your struct.
-It must mark all references from your struct with rb_gc_mark or
-its family if your struct keeps such references.
-
---
-Note that it is recommended to avoid such a reference.
-++
-
-dfree is a function to free the pointer allocation.
-If this is -1, the pointer will be just freed.
-
-dsize calculates memory consumption in bytes by the struct.
-Its parameter is a pointer to your struct.
-You can pass 0 as dsize if it is hard to implement such a function.
-But it is still recommended to avoid 0.
-
-You have to fill reserved and parent with 0.
-
-You can fill "data" with an arbitrary value for your use.
-Ruby does nothing with the member.
-
-flags is a bitwise-OR of the following flag values.
-Since they require deep understanding of garbage collector in Ruby,
-you can just set 0 to flags if you are not sure.
-
-RUBY_TYPED_FREE_IMMEDIATELY ::
-
-  This flag makes the garbage collector immediately invoke dfree()
-  during GC when it need to free your struct.
-  You can specify this flag if the dfree never unlocks Ruby's
-  internal lock (GVL).
-
-  If this flag is not set, Ruby defers invokation of dfree()
-  and invokes dfree() at the same time as finalizers.
-
-RUBY_TYPED_WB_PROTECTED ::
-
-  It shows that implementation of the object supports write barriers.
-  If this flag is set, Ruby is better able to do garbage collection
-  of the object.
-
-  When it is set, however, you are responsible for putting write
-  barriers in all implementations of methods of that object as
-  appropriate. Otherwise Ruby might crash while running.
-
-  More about write barriers can be found in "Generational GC" in
-  Appendix D.
-
-You can allocate and wrap the structure in one step.
-
-  TypedData_Make_Struct(klass, type, data_type, sval)
-
-This macro returns an allocated Data object, wrapping the pointer to
-the structure, which is also allocated.  This macro works like:
-
-  (sval = ZALLOC(type), TypedData_Wrap_Struct(klass, data_type, sval))
-
-Arguments klass and data_type work like their counterparts in
-TypedData_Wrap_Struct().  A pointer to the allocated structure will
-be assigned to sval, which should be a pointer of the type specified.
-
-=== Ruby object to C struct
-
-To retrieve the C pointer from the Data object, use the macro
-Data_Get_Struct().
-
-  TypedData_Get_Struct(obj, type, &data_type, sval)
-
-A pointer to the structure will be assigned to the variable sval.
-
-See the example below for details.
-
-= Example - Creating the dbm Extension
-
-OK, here's the example of making an extension library.  This is the
-extension to access DBMs.  The full source is included in the ext/
-directory in the Ruby's source tree.
-
-== Make the Directory
-
-  % mkdir ext/dbm
-
-Make a directory for the extension library under ext directory.
-
-== Design the Library
-
-You need to design the library features, before making it.
-
-== Write the C Code
-
-You need to write C code for your extension library.  If your library
-has only one source file, choosing ``LIBRARY.c'' as a file name is
-preferred.  On the other hand, in case your library has multiple source
-files, avoid choosing ``LIBRARY.c'' for a file name.  It may conflict
-with an intermediate file ``LIBRARY.o'' on some platforms.
-Note that some functions in mkmf library described below generate
-a file ``conftest.c'' for checking with compilation.  You shouldn't
-choose ``conftest.c'' as a name of a source file.
-
-Ruby will execute the initializing function named ``Init_LIBRARY'' in
-the library.  For example, ``Init_dbm()'' will be executed when loading
-the library.
-
-Here's the example of an initializing function.
-
-  void
-  Init_dbm(void)
-  {
-      /* define DBM class */
-      VALUE cDBM = rb_define_class("DBM", rb_cObject);
-      /* DBM includes Enumerable module */
-      rb_include_module(cDBM, rb_mEnumerable);
-
-      /* DBM has class method open(): arguments are received as C array */
-      rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
-
-      /* DBM instance method close(): no args */
-      rb_define_method(cDBM, "close", fdbm_close, 0);
-      /* DBM instance method []: 1 argument */
-      rb_define_method(cDBM, "[]", fdbm_fetch, 1);
-
-      /* ... */
-
-      /* ID for a instance variable to store DBM data */
-      id_dbm = rb_intern("dbm");
-  }
-
-The dbm extension wraps the dbm struct in the C environment using
-Data_Make_Struct.
-
-  struct dbmdata {
-      int  di_size;
-      DBM *di_dbm;
-  };
-
-  static const rb_data_type_t dbm_type = {
-      "dbm",
-      {0, free_dbm, memsize_dbm,},
-      0, 0,
-      RUBY_TYPED_FREE_IMMEDIATELY,
-  };
-
-  obj = TypedData_Make_Struct(klass, struct dbmdata, &dbm_type, dbmp);
-
-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:
-
-  #define GetDBM(obj, dbmp) do {\
-      TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
-      if ((dbmp) == 0) closed_dbm();\
-      if ((dbmp)->di_dbm == 0) closed_dbm();\
-  } while (0)
-
-This sort of complicated macro does the retrieving and close checking
-for the DBM.
-
-There are three kinds of way to receive method arguments.  First,
-methods with a fixed number of arguments receive arguments like this:
-
-  static VALUE
-  fdbm_delete(VALUE obj, VALUE keystr)
-  {
-        /* ... */
-  }
-
-The first argument of the C function is the self, the rest are the
-arguments to the method.
-
-Second, methods with an arbitrary number of arguments receive
-arguments like this:
-
-  static VALUE
-  fdbm_s_open(int argc, VALUE *argv, VALUE klass)
-  {
-      /* ... */
-      if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-          mode = 0666;          /* default value */
-      }
-      /* ... */
-  }
-
-The first argument is the number of method arguments, the second
-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.  The third argument is a string that specifies how to
-capture method arguments and assign them to the following VALUE
-references.
-
-You can just check the argument number with rb_check_arity(), this is
-handy in the case you want to treat the arguments as a list.
-
-The following is an example of a method that takes arguments by Ruby's
-array:
-
-  static VALUE
-  thread_initialize(VALUE thread, VALUE args)
-  {
-      /* ... */
-  }
-
-The first argument is the receiver, the second one is the Ruby array
-which contains the arguments to the method.
-
-<b>Notice</b>: GC should know about global variables which refer to Ruby's objects,
-but are not exported to the Ruby world.  You need to protect them by
-
-  void rb_global_variable(VALUE *var)
-
-== Prepare extconf.rb
-
-If the file named extconf.rb exists, it will be executed to generate
-Makefile.
-
-extconf.rb is the file for checking compilation conditions etc.  You
-need to put
-
-  require 'mkmf'
-
-at the top of the file.  You can use the functions below to check
-various conditions.
-
-  have_macro(macro[, headers[, opt]]): check whether macro is defined
-  have_library(lib[, func[, headers[, opt]]]): check whether library containing function exists
-  find_library(lib[, func, *paths]): find library from paths
-  have_func(func[, headers[, opt]): check whether function exists
-  have_var(var[, headers[, opt]]): check whether variable exists
-  have_header(header[, preheaders[, opt]]): check whether header file exists
-  find_header(header, *paths): find header from paths
-  have_framework(fw): check whether framework exists (for MacOS X)
-  have_struct_member(type, member[, headers[, opt]]): check whether struct has member
-  have_type(type[, headers[, opt]]): check whether type exists
-  find_type(type, opt, *headers): check whether type exists in headers
-  have_const(const[, headers[, opt]]): check whether constant is defined
-  check_sizeof(type[, headers[, opts]]): check size of type
-  check_signedness(type[, headers[, opts]]): check signedness of type
-  convertible_int(type[, headers[, opts]]): find convertible integer type
-  find_executable(bin[, path]): find executable file path
-  create_header(header): generate configured header
-  create_makefile(target[, target_prefix]): generate Makefile
-
-See MakeMakefile for full documentation of these functions.
-
-The value of the variables below will affect the Makefile.
-
-  $CFLAGS: included in CFLAGS make variable (such as -O)
-  $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
-  $LDFLAGS: included in LDFLAGS make variable (such as -L)
-  $objs: list of object file names
-
-Normally, the object files list is automatically generated by searching
-source files, but you must define them explicitly if any sources will
-be generated while building.
-
-If a compilation condition is not fulfilled, you should not call
-``create_makefile''.  The Makefile will not be generated, compilation will
-not be done.
-
-== Prepare Depend (Optional)
-
-If the file named depend exists, Makefile will include that file to
-check dependencies.  You can make this file by invoking
-
-  % gcc -MM *.c > depend
-
-It's harmless.  Prepare it.
-
-== Generate Makefile
-
-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.
-
-== Run make
-
-Type
-
-  make
-
-to compile your extension.  You don't need this step either if you have
-put the extension library under the ext directory of the ruby source tree.
-
-== Debug
-
-You may need to rb_debug the extension.  Extensions can be linked
-statically by adding the directory name in the ext/Setup file so that
-you can inspect the extension with the debugger.
-
-== Done! Now You Have the Extension Library
-
-You can do anything you want with your library.  The author of Ruby
-will not claim any restrictions on your code depending on the Ruby API.
-Feel free to use, modify, distribute or sell your program.
-
-= Appendix A. Ruby Source Files Overview
-
-== Ruby Language Core
-
-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       :: grammar definition
-parse.c       :: automatically generated from parse.y
-defs/keywords :: reserved keywords
-lex.c         :: automatically generated from keywords
-
-== 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 switching
-  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
-
-  defs/opt_insns_unif.def  : instruction unification
-  defs/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
-
-debug.c    :: debug symbols for C debugger
-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      :: 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#sprintf
-string.c     :: String
-struct.c     :: Struct
-time.c       :: Time
-
-defs/known_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
-
-== Types
-
-VALUE ::
-
-  The type for the Ruby object.  Actual structures are defined in ruby.h,
-  such as struct RString, etc.  To refer the values in structures, use
-  casting macros like RSTRING(obj).
-
-== Variables and Constants
-
-Qnil ::
-
-  nil object
-
-Qtrue ::
-
-  true object (default true value)
-
-Qfalse ::
-
-  false object
-
-== C Pointer Wrapping
-
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
-
-  Wrap a C pointer into a Ruby object.  If object has references to other
-  Ruby objects, they should be marked by using the mark function during
-  the GC process.  Otherwise, mark should be 0.  When this object is no
-  longer referred by anywhere, the pointer will be discarded by free
-  function.
-
-Data_Make_Struct(klass, type, mark, free, sval) ::
-
-  This macro allocates memory using malloc(), assigns it to the variable
-  sval, and returns the DATA encapsulating the pointer to memory region.
-
-Data_Get_Struct(data, type, sval) ::
-
-  This macro retrieves the pointer value from DATA, and assigns it to
-  the variable sval.
-
-== Checking Data Types
-
-RB_TYPE_P(value, type) ::
-
-  Is +value+ an internal type (T_NIL, T_FIXNUM, etc.)?
-
-TYPE(value) ::
-
-  Internal type (T_NIL, T_FIXNUM, etc.)
-
-FIXNUM_P(value) ::
-
-  Is +value+ a Fixnum?
-
-NIL_P(value) ::
-
-  Is +value+ nil?
-
-RB_INTEGER_TYPE_P(value) ::
-
-  Is +value+ an Integer?
-
-RB_FLOAT_TYPE_P(value) ::
-
-  Is +value+ a Float?
-
-void Check_Type(VALUE value, int type) ::
-
-  Ensures +value+ is of the given internal +type+ or raises a TypeError
-
-SaveStringValue(value) ::
-
-  Checks that +value+ is a String and is not tainted
-
-== Data Type Conversion
-
-FIX2INT(value), INT2FIX(i) ::
-
-  Fixnum <-> integer
-
-FIX2LONG(value), LONG2FIX(l) ::
-
-  Fixnum <-> long
-
-NUM2INT(value), INT2NUM(i) ::
-
-  Numeric <-> integer
-
-NUM2UINT(value), UINT2NUM(ui) ::
-
-  Numeric <-> unsigned integer
-
-NUM2LONG(value), LONG2NUM(l) ::
-
-  Numeric <-> long
-
-NUM2ULONG(value), ULONG2NUM(ul) ::
-
-  Numeric <-> unsigned long
-
-NUM2LL(value), LL2NUM(ll) ::
-
-  Numeric <-> long long
-
-NUM2ULL(value), ULL2NUM(ull) ::
-
-  Numeric <-> unsigned long long
-
-NUM2OFFT(value), OFFT2NUM(off) ::
-
-  Numeric <-> off_t
-
-NUM2SIZET(value), SIZET2NUM(size) ::
-
-  Numeric <-> size_t
-
-NUM2SSIZET(value), SSIZET2NUM(ssize) ::
-
-  Numeric <-> ssize_t
-
-rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags) ::
-
-  Numeric <-> Arbitrary size integer buffer
-
-NUM2DBL(value) ::
-
-  Numeric -> double
-
-rb_float_new(f) ::
-
-  double -> Float
-
-RSTRING_LEN(str) ::
-
-  String -> length of String data in bytes
-
-RSTRING_PTR(str) ::
-
-  String -> pointer to String data
-  Note that the result pointer may not be NUL-terminated
-
-StringValue(value) ::
-
-  Object with \#to_str -> String
-
-StringValuePtr(value) ::
-
-  Object with \#to_str -> pointer to String data
-
-StringValueCStr(value) ::
-
-  Object with \#to_str -> pointer to String data without NUL bytes
-  It is guaranteed that the result data is NUL-terminated
-
-rb_str_new2(s) ::
-
-  char * -> String
-
-== Defining Classes and Modules
-
-VALUE rb_define_class(const char *name, VALUE super) ::
-
-  Defines a new Ruby class as a subclass of super.
-
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
-
-  Creates a new Ruby class as a subclass of super, under the module's
-  namespace.
-
-VALUE rb_define_module(const char *name) ::
-
-  Defines a new Ruby module.
-
-VALUE rb_define_module_under(VALUE module, const char *name) ::
-
-  Defines a new Ruby module under the module's namespace.
-
-void rb_include_module(VALUE klass, VALUE module) ::
-
-  Includes module into class.  If class already includes it, just ignored.
-
-void rb_extend_object(VALUE object, VALUE module) ::
-
-  Extend the object with the module's attributes.
-
-== Defining Global Variables
-
-void rb_define_variable(const char *name, VALUE *var) ::
-
-  Defines a global variable which is shared between C and Ruby.  If name
-  contains a character which is not allowed to be part of the symbol,
-  it can't be seen from Ruby programs.
-
-void rb_define_readonly_variable(const char *name, VALUE *var) ::
-
-  Defines a read-only global variable.  Works just like
-  rb_define_variable(), except the defined variable is read-only.
-
-void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) ::
-
-  Defines a virtual variable, whose behavior is defined by a pair of C
-  functions.  The getter function is called when the variable is
-  referenced.  The setter function is called when the variable is set to a
-  value.  The prototype for getter/setter functions are:
-
-    VALUE getter(ID id)
-    void setter(VALUE val, ID id)
-
-  The getter function must return the value for the access.
-
-void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) ::
-
-  Defines hooked variable.  It's a virtual variable with a C variable.
-  The getter is called as
-
-    VALUE getter(ID id, VALUE *var)
-
-  returning a new value.  The setter is called as
-
-    void setter(VALUE val, ID id, VALUE *var)
-
-void rb_global_variable(VALUE *var) ::
-
-  GC requires C global variables which hold Ruby values to be marked.
-  rb_global_variable tells GC to protect these variables.
-
-== Constant Definition
-
-void rb_define_const(VALUE klass, const char *name, VALUE val) ::
-
-  Defines a new constant under the class/module.
-
-void rb_define_global_const(const char *name, VALUE val) ::
-
-  Defines a global constant.  This is just the same as
-
-    rb_define_const(rb_cObject, name, val)
-
-== Method Definition
-
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
-
-  Defines a method for the class.  func is the function pointer.  argc
-  is the number of arguments.  if argc is -1, the function will receive
-  3 arguments: argc, argv, and self.  if argc is -2, the function will
-  receive 2 arguments, self and args, where args is a Ruby array of
-  the method arguments.
-
-rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
-
-  Defines a private method for the class.  Arguments are same as
-  rb_define_method().
-
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc) ::
-
-  Defines a singleton method.  Arguments are same as rb_define_method().
-
-rb_check_arity(int argc, int min, int max) ::
-
-  Check the number of arguments, argc is in the range of min..max.  If
-  max is UNLIMITED_ARGUMENTS, upper bound is not checked.  If argc is
-  out of bounds, an ArgumentError will be raised.
-
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
-
-  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 [option-hash-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
-    option-hash-arg-spec := sym-for-option-hash-arg
-    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-option-hash-arg        := ":"   ; Indicates that an option
-                                            ; hash is captured if the last
-                                            ; argument is a hash or can be
-                                            ; converted to a hash with
-                                            ; #to_hash.  When the last
-                                            ; argument is nil, it is
-                                            ; captured if it is not
-                                            ; ambiguous to take it as
-                                            ; empty option hash; i.e. '*'
-                                            ; is not specified and
-                                            ; arguments are given more
-                                            ; than sufficient.
-    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 option hash or iterator
-  block, is returned.
-
-int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values) ::
-
-  Retrieves argument VALUEs bound to keywords, which directed by +table+
-  into +values+, deleting retrieved entries from +keyword_hash+ along
-  the way.  First +required+ number of IDs referred by +table+ are
-  mandatory, and succeeding +optional+ (- +optional+ - 1 if
-  +optional+ is negative) number of IDs are optional.  If a
-  mandatory key is not contained in +keyword_hash+, raises "missing
-  keyword" +ArgumentError+.  If an optional key is not present in
-  +keyword_hash+, the corresponding element in +values+ is set to +Qundef+.
-  If +optional+ is negative, rest of +keyword_hash+ are ignored, otherwise
-  raises "unknown keyword" +ArgumentError+.
-
-  Be warned, handling keyword arguments in the C API is less efficient
-  than handling them in Ruby.  Consider using a Ruby wrapper method
-  around a non-keyword C function.
-  ref: https://bugs.ruby-lang.org/issues/11339
-
-VALUE rb_extract_keywords(VALUE *original_hash) ::
-
-  Extracts pairs whose key is a symbol into a new hash from a hash
-  object referred by +original_hash+.  If the original hash contains
-  non-symbol keys, then they are copied to another hash and the new hash
-  is stored through +original_hash+, else 0 is stored.
-
-== Invoking Ruby method
-
-VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
-
-  Invokes a method.  To retrieve mid from a method name, use rb_intern().
-  Able to call even private/protected methods.
-
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
-VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
-
-  Invokes a method, passing arguments as an array of values.
-  Able to call even private/protected methods.
-
-VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
-
-  Invokes a method, passing arguments as an array of values.
-  Able to call only public methods.
-
-VALUE rb_eval_string(const char *str) ::
-
-  Compiles and executes the string as a Ruby program.
-
-ID rb_intern(const char *name) ::
-
-  Returns ID corresponding to the name.
-
-char *rb_id2name(ID id) ::
-
-  Returns the name corresponding ID.
-
-char *rb_class2name(VALUE klass) ::
-
-  Returns the name of the class.
-
-int rb_respond_to(VALUE obj, ID id) ::
-
-  Returns true if the object responds to the message specified by id.
-
-== Instance Variables
-
-VALUE rb_iv_get(VALUE obj, const char *name) ::
-
-  Retrieve the value of the instance variable.  If the name is not
-  prefixed by `@', that variable shall be inaccessible from Ruby.
-
-VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
-
-  Sets the value of the instance variable.
-
-== Control Structure
-
-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)(), VALUE arg1, VALUE (*func2)(), VALUE 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)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), VALUE arg2) ::
-
-  Calls the function func1, with arg1 as the argument.  If an exception
-  occurs during func1, it calls func2 with arg2 as the first argument
-  and the exception object as the second 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)(ANYARGS), VALUE arg1, VALUE (*func2)(ANYARGS), 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 when no exception occurred.
-
-VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
-
-  Calls the function func with arg as the argument.  If no exception
-  occurred 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.
-  You have to clear the error info with rb_set_errinfo(Qnil) when
-  ignoring the caught exception.
-
-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.
-
-void rb_iter_break() ::
-
-  Exits from the current innermost block.  This function never return to
-  the caller.
-
-void rb_iter_break_value(VALUE value) ::
-
-  Exits from the current innermost block with the value.  The block will
-  return the given argument value.  This function never return to the
-  caller.
-
-== Exceptions and Errors
-
-void rb_warn(const char *fmt, ...) ::
-
-  Prints a warning message according to a printf-like format.
-
-void rb_warning(const char *fmt, ...) ::
-
-  Prints a warning message according to a printf-like format, if
-  $VERBOSE is true.
-
-void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
-
-  Raises RuntimeError.  The fmt is a format string just like printf().
-
-void rb_raise(VALUE exception, const char *fmt, ...) ::
-
-  Raises a class exception.  The fmt is a format string just like printf().
-
-void rb_fatal(const char *fmt, ...) ::
-
-  Raises a fatal error, terminates the interpreter.  No exception handling
-  will be done for fatal errors, but ensure blocks will be executed.
-
-void rb_bug(const char *fmt, ...) ::
-
-  Terminates the interpreter immediately.  This function should be
-  called under the situation caused by the bug in the interpreter.  No
-  exception handling nor ensure execution will be done.
-
-Note: In the format string, "%"PRIsVALUE can be used for Object#to_s
-(or Object#inspect if '+' flag is set) output (and related argument
-must be a VALUE).  Since it conflicts with "%i", for integers in
-format strings, use "%d".
-
-== Initialize and Start the Interpreter
-
-The embedding API functions are below (not needed for extension libraries):
-
-void ruby_init() ::
-
-  Initializes the interpreter.
-
-void *ruby_options(int argc, char **argv) ::
-
-  Process command line arguments for the interpreter.
-  And compiles the Ruby source to execute.
-  It returns an opaque pointer to the compiled source
-  or an internal special value.
-
-int ruby_run_node(void *n) ::
-
-  Runs the given compiled source and exits this process.
-  It returns EXIT_SUCCESS if successfully runs the source.
-  Otherwise, it returns other value.
-
-void ruby_script(char *name) ::
-
-  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_flag_t events, VALUE data) ::
-
-  Adds a hook function for the specified interpreter events.
-  events should be OR'ed value of:
-
-    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
-
-  The definition of rb_event_hook_func_t is below:
-
-    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.
-
-== Memory usage
-
-void rb_gc_adjust_memory_usage(ssize_t diff) ::
-
-  Adjusts the amount of registered external memory.  You can tell GC how
-  much memory is used by an external library by this function.  Calling
-  this function with positive diff means the memory usage is increased;
-  new memory block is allocated or a block is reallocated as larger
-  size.  Calling this function with negative diff means the memory usage
-  is decreased; a memory block is freed or a block is reallocated as
-  smaller size.  This function may trigger the GC.
-
-== Macros for Compatibility
-
-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 corresponding 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 for use in extconf.rb
-
-See documentation for {mkmf}[rdoc-ref:MakeMakefile].
-
-= Appendix D. Generational GC
-
-Ruby 2.1 introduced a generational garbage collector (called RGenGC).
-RGenGC (mostly) keeps compatibility.
-
-Generally, the use of the technique called write barriers is required in
-extension libraries for generational GC
-(http://en.wikipedia.org/wiki/Garbage_collection_%28computer_science%29).
-RGenGC works fine without write barriers in extension libraries.
-
-If your library adheres to the following tips, performance can
-be further improved. Especially, the "Don't touch pointers directly" section is
-important.
-
-== Incompatibility
-
-You can't write RBASIC(obj)->klass field directly because it is const
-value now.
-
-Basically you should not write this field because MRI expects it to be
-an immutable field, but if you want to do it in your extension you can
-use the following functions:
-
-VALUE rb_obj_hide(VALUE obj) ::
-
-  Clear RBasic::klass field. The object will be an internal object.
-  ObjectSpace::each_object can't find this object.
-
-VALUE rb_obj_reveal(VALUE obj, VALUE klass) ::
-
-  Reset RBasic::klass to be klass.
-  We expect the `klass' is hidden class by rb_obj_hide().
-
-== Write barriers
-
-RGenGC doesn't require write barriers to support generational GC.
-However, caring about write barrier can improve the performance of
-RGenGC. Please check the following tips.
-
-=== Don't touch pointers directly
-
-In MRI (include/ruby/ruby.h), some macros to acquire pointers to the
-internal data structures are supported such as RARRAY_PTR(),
-RSTRUCT_PTR() and so on.
-
-DO NOT USE THESE MACROS and instead use the corresponding C-APIs such as
-rb_ary_aref(), rb_ary_store() and so on.
-
-=== Consider whether to insert write barriers
-
-You don't need to care about write barriers if you only use built-in
-types.
-
-If you support T_DATA objects, you may consider using write barriers.
-
-Inserting write barriers into T_DATA objects only works with the
-following type objects: (a) long-lived objects, (b) when a huge number
-of objects are generated and \(c) container-type objects that have
-references to other objects. If your extension provides such a type of
-T_DATA objects, consider inserting write barriers.
-
-(a): short-lived objects don't become old generation objects.
-(b): only a few oldgen objects don't have performance impact.
-\(c): only a few references don't have performance impact.
-
-Inserting write barriers is a very difficult hack, it is easy to
-introduce critical bugs. And inserting write barriers has several areas
-of overhead. Basically we don't recommend you insert write barriers.
-Please carefully consider the risks.
-
-=== Combine with built-in types
-
-Please consider utilizing built-in types. Most built-in types support
-write barrier, so you can use them to avoid manually inserting write
-barriers.
-
-For example, if your T_DATA has references to other objects, then you
-can move these references to Array. A T_DATA object only has a reference
-to an array object. Or you can also use a Struct object to gather a
-T_DATA object (without any references) and an that Array contains
-references.
-
-With use of such techniques, you don't need to insert write barriers
-anymore.
-
-=== Insert write barriers
-
-\[AGAIN] Inserting write barriers is a very difficult hack, and it is
-easy to introduce critical bugs. And inserting write barriers has
-several areas of overhead. Basically we don't recommend you insert write
-barriers. Please carefully consider the risks.
-
-Before inserting write barriers, you need to know about RGenGC algorithm
-(gc.c will help you). Macros and functions to insert write barriers are
-available in include/ruby/ruby.h. An example is available in iseq.c.
-
-For a complete guide for RGenGC and write barriers, please refer to
-<https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RGenGC>.
-
-= Appendix E. RB_GC_GUARD to protect from premature GC
-
-C Ruby currently uses conservative garbage collection, thus VALUE
-variables must remain visible on the stack or registers to ensure any
-associated data remains usable.  Optimizing C compilers are not designed
-with conservative garbage collection in mind, so they may optimize away
-the original VALUE even if the code depends on data associated with that
-VALUE.
-
-The following example illustrates the use of RB_GC_GUARD to ensure
-the contents of sptr remain valid while the second invocation of
-rb_str_new_cstr is running.
-
-  VALUE s, w;
-  const char *sptr;
-
-  s = rb_str_new_cstr("hello world!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
-  sptr = RSTRING_PTR(s);
-  w = rb_str_new_cstr(sptr + 6); /* Possible GC invocation */
-
-  RB_GC_GUARD(s); /* ensure s (and thus sptr) do not get GC-ed */
-
-In the above example, RB_GC_GUARD must be placed _after_ the last use of
-sptr.  Placing RB_GC_GUARD before dereferencing sptr would be of no use.
-RB_GC_GUARD is only effective on the VALUE data type, not converted C
-data types.
-
-RB_GC_GUARD would not be necessary at all in the above example if
-non-inlined function calls are made on the `s' VALUE after sptr is
-dereferenced.  Thus, in the above example, calling any un-inlined
-function on `s' such as:
-
-  rb_str_modify(s);
-
-Will ensure `s' stays on the stack or register to prevent a
-GC invocation from prematurely freeing it.
-
-Using the RB_GC_GUARD macro is preferable to using the "volatile"
-keyword in C.  RB_GC_GUARD has the following advantages:
-
-1. the intent of the macro use is clear
-
-2. RB_GC_GUARD only affects its call site, "volatile" generates some
-   extra code every time the variable is used, hurting optimization.
-
-3. "volatile" implementations may be buggy/inconsistent in some
-   compilers and architectures. RB_GC_GUARD is customizable for broken
-   systems/compilers without negatively affecting other systems.
-
-:enddoc: Local variables:
-:enddoc: fill-column: 70
-:enddoc: end:
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 171724b2e5..6a5ff2e236 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -9,8 +9,8 @@
 
 == 使い方
 
-クラスに対してextendして使います.
-
+クラスに対してextendして使います. 
+  
   class Foo
     extend Forwardable
 
@@ -50,7 +50,7 @@
 
 == 使い方
 
-オブジェクトに対して((|extend|))して使います.
+オブジェクトに対して((|extend|))して使います. 
 
   g = Goo.new
   g.extend SingleForwardable
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index b997f0edea..3c95faeb8a 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -112,7 +112,7 @@ XMPメソッド群のコンテキストは, 呼び出す前のコンテキスト
 マルチスレッドには対応していません.
 
 = frame.rb
-現在実行中のフレーム情報を取り扱うためのクラスです.
+現在実行中のフレーム情報を取り扱うためのクラスです. 
 
 * IRB::Frame.top(n = 0)
   上からn番目のコンテキストを取り出します. nは0が最上位になります.
@@ -127,7 +127,7 @@ set_trace_funcを用いてRubyの実行をトレースしています. マルチ
 は対応していません.
 
 = completion.rb
-irbのcompletion機能を提供するものです.
+irbのcompletion機能を提供するものです. 
 
 == 使い方
 
@@ -144,7 +144,7 @@ irb実行中に (TAB) を押すとコンプレーションします.
 トップレベルで(TAB)を押すとすべての構文要素, クラス, メソッドの候補がで
 ます. 候補が唯一ならば完全に補完します.
 
-  irb(main):001:0> in
+  irb(main):001:0> in    
   in                    inspect               instance_eval
   include               install_alias_method  instance_of?
   initialize            install_aliases       instance_variables
@@ -168,8 +168,8 @@ irb実行中に (TAB) を押すとコンプレーションします.
   foo.dup                 foo.kind_of?            foo.to_s
   foo.eql?                foo.method              foo.type
   foo.equal?              foo.methods             foo.untaint
-  foo.extend              foo.nil?
-  foo.freeze              foo.private_methods
+  foo.extend              foo.nil?                
+  foo.freeze              foo.private_methods     
 
 =end
 
diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
index d22d09f7a4..82b8004662 100644
--- a/doc/maintainers.rdoc
+++ b/doc/maintainers.rdoc
@@ -41,15 +41,23 @@ Zachary Scott (zzak)
 [lib/abbrev.rb]
   Akinori MUSHA (knu)
 [lib/base64.rb]
-  Yusuke Endoh (mame)
+  * 1.8: _unmaintained_
+  * 1.9: Yusuke Endoh (mame)
 [lib/benchmark.rb]
   _unmaintained_
 [lib/cgi.rb, lib/cgi/*]
   Takeyuki Fujioka (xibbar)
+[lib/complex.rb]
+  * 1.8: _unmaintained_
+  * 1.9: moved into core
 [lib/cmath.rb]
-  _unmaintained_
+  * 1.8: 1.9 feature
+  * 1.9: _unmaintained_
 [lib/csv.rb]
-  James Edward Gray II (jeg2)
+  * 1.8: Hiroshi Nakamura (nahi)
+  * 1.9: James Edward Gray II (jeg2)
+[lib/date.rb, lib/date/*]
+  Tadayoshi Funaba (tadf)
 [lib/drb.rb, lib/drb/*]
   Masatoshi SEKI (seki)
 [lib/debug.rb]
@@ -64,20 +72,40 @@ Zachary Scott (zzak)
   _unmaintained_
 [lib/find.rb]
   Kazuki Tsujimoto (ktsj)
+[lib/finalize.rb]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
 [lib/forwardable.rb]
   Keiju ISHITSUKA (keiju)
+[lib/ftools.rb]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
+[lib/generator.rb]
+  * 1.8: Akinori MUSHA (knu)
+  * 1.9: moved into core
 [lib/getoptlong.rb]
   _unmaintained_
+[lib/getopts.rb]
+  * 1.8: Akinori MUSHA (knu)
+  * 1.9: _deprecated_
+[lib/gserver.rb]
+  James Edward Gray II (jeg2)
 [lib/ipaddr.rb]
   Akinori MUSHA (knu)
 [lib/irb.rb, lib/irb/*]
   Keiju ISHITSUKA (keiju)
+[lib/jcode.rb]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
 [lib/logger.rb]
-  Naotoshi Seo (sonots)
+  Hiroshi Nakamura (nahi)
 [lib/mathn.rb]
   Keiju ISHITSUKA (keiju)
 [lib/matrix.rb]
   Marc-Andre Lafortune (marcandre)
+[lib/minitest/*]
+  * 1.8: 1.9 feature
+  * 1.9: Ryan Davis (ryan)
 [lib/mkmf.rb]
   _unmaintained_
 [lib/monitor.rb]
@@ -88,12 +116,12 @@ Zachary Scott (zzak)
   Shugo Maeda (shugo)
 [lib/net/imap.rb]
   Shugo Maeda (shugo)
-[lib/net/http.rb, lib/net/https.rb]
+[lib/net/telnet.rb]
+  _unmaintained_
+[lib/net/http.rb, lib/net/https]
   NARUSE, Yui (naruse)
 [lib/net/pop.rb]
   _unmaintained_
-[lib/net/protocol.rb]
-  _unmaintained_
 [lib/net/smtp.rb]
   _unmaintained_
 [lib/observer.rb]
@@ -106,6 +134,17 @@ Zachary Scott (zzak)
   Nobuyuki Nakada (nobu)
 [lib/ostruct.rb]
   Marc-Andre Lafortune (marcandre)
+[lib/parsearg.rb]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
+[lib/parsedate.rb]
+  * 1.8: Tadayoshi Funaba (tadf)
+  * 1.9: _deprecated_
+[lib/pathname.rb]
+  Tanaka Akira (akr)
+[lib/ping.rb]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
 [lib/pp.rb]
   Tanaka Akira (akr)
 [lib/prettyprint.rb]
@@ -120,10 +159,16 @@ Zachary Scott (zzak)
   _unmaintained_
 [lib/racc/*]
   Aaron Patterson (tenderlove)
-[lib/rbconfig/*]
-  _unmaintained_
-[lib/rdoc.rb, lib/rdoc/*]
+[lib/rake/*]
   Eric Hodel (drbrain)
+[lib/rational.rb]
+  * 1.8: _unmaintained_
+  * 1.9: moved into core
+[lib/rdoc/*]
+  Eric Hodel (drbrain)
+[lib/readbytes.rb]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
 [lib/resolv-replace.rb]
   Tanaka Akira (akr)
 [lib/resolv.rb]
@@ -132,10 +177,14 @@ Zachary Scott (zzak)
   Kouhei Sutou (kou)
 [lib/rinda/*]
   Masatoshi SEKI (seki)
-[lib/rss.rb, lib/rss/*]
+[lib/rss/*]
   Kouhei Sutou (kou)
 [lib/rubygems.rb, lib/ubygems.rb, lib/rubygems/*]
-  Eric Hodel (drbrain)
+  * 1.8: 1.9 feature
+  * 1.9: Eric Hodel (drbrain)
+[lib/rubyunit.rb, lib/runit/*]
+  * 1.8: _unmaintained_
+  * 1.9: _deprecated_
 [lib/scanf.rb]
   David A. Black (dblack)
 [lib/set.rb]
@@ -148,12 +197,19 @@ Zachary Scott (zzak)
   Akinori MUSHA (knu)
 [lib/singleton.rb]
   Yukihiro Matsumoto (matz)
+[lib/{soap|wsdl|xsd}/*]
+  * 1.8: Hiroshi Nakamura (nahi)
+  * 1.9: _deprecated_
 [lib/sync.rb]
   Keiju ISHITSUKA (keiju)
 [lib/tempfile.rb]
   _unmaintained_
+[lib/test/*]
+  Shota Fukumori (sorah)
 [lib/tmpdir.rb]
   _unmaintained_
+[lib/thread.rb]
+  _unmaintained_
 [lib/thwait.rb]
   Keiju ISHITSUKA (keiju)
 [lib/time.rb]
@@ -166,63 +222,69 @@ Zachary Scott (zzak)
   Tanaka Akira (akr)
 [lib/un.rb]
   WATANABE Hirofumi (eban)
-[lib/unicode_normalize.rb, lib/unicode_normalize/*]
-  Martin J. Dürst
 [lib/uri.rb, lib/uri/*]
   YAMADA, Akira (akira)
 [lib/weakref.rb]
   _unmaintained_
 [lib/webrick.rb, lib/webrick/*]
   Hiroshi Nakamura (nahi)
+[lib/xmlrpc/*]
+  Kouhei Sutou (kou)
 [lib/yaml.rb, lib/yaml/*]
   Aaron Patterson (tenderlove)
 
 == Extension Maintainers
 
+[ext/Win32API]
+  * 1.8: _unmaintained_
+  * 1.9: merged into dl
 [ext/bigdecimal]
   Kenta Murata (mrkn)
-[ext/cgi]
-  Nobuyoshi Nakada (nobu)
 [ext/continuation]
-  Koichi Sasada (ko1)
+  * 1.8: 1.9 feature
+  * 1.9: Koichi Sasada (ko1)
 [ext/coverage]
   Yusuke Endoh (mame)
-[ext/date]
-  _unmaintained_
 [ext/dbm]
   _unmaintained_
 [ext/digest, ext/digest/*]
   Akinori MUSHA (knu)
+[ext/dl]
+  Aaron Patterson (tenderlove)
+[ext/dl/win32]
+  NAKAMURA Usaku (usa)
+[ext/enumerator]
+  * 1.8: Akinori MUSHA (knu)
+  * 1.9: moved into core
 [ext/etc]
   _unmaintained_
 [ext/fcntl]
   _unmaintained_
 [ext/fiber]
-  Koichi Sasada (ko1)
+  * 1.8: 1.9 feature
+  * 1.9: Koichi Sasada (ko1)
 [ext/fiddle]
   Aaron Patterson (tenderlove)
 [ext/gdbm]
   Yukihiro Matsumoto (matz)
-[ext/io/console]
-  Nobuyuki Nakada (nobu)
-[ext/io/nonblock]
+[ext/iconv]
   Nobuyuki Nakada (nobu)
 [ext/io/wait]
   Nobuyuki Nakada (nobu)
 [ext/json]
   NARUSE, Yui (naruse)
 [ext/mathn/complex]
-  Keiju ISHITSUKA (keiju)
+  * 1.8: 1.9 feature
+  * 1.9: Keiju ISHITSUKA (keiju)
 [ext/mathn/rational]
-  Keiju ISHITSUKA (keiju)
+  * 1.8: 1.9 feature
+  * 1.9: Keiju ISHITSUKA (keiju)
 [ext/nkf]
   NARUSE, Yui (narse)
 [ext/objspace]
   _unmaintained_
 [ext/openssl]
-  Kazuki Yamaguchi (rhe)
-[ext/pathname]
-  Tanaka Akira (akr)
+  Martin Boßlet (emboss)
 [ext/psych]
   Aaron Patterson (tenderlove)
 [ext/pty]
@@ -242,11 +304,19 @@ Zachary Scott (zzak)
   Nobuyuki Nakada (nobu)
 [ext/strscan]
   _unmaintained_
+[ext/syck]
+  _unmaintained_
 [ext/syslog]
   Akinori MUSHA (knu)
-[ext/win32]
-  NAKAMURA Usaku (usa)
+[ext/thread]
+  * 1.8: _unmaintained_
+  * 1.9: 1.8 feature
+[ext/tcltklib]
+  _deprecated_
+[ext/tk]
+  Hidetoshi NAGAI (nagai)
 [ext/win32ole]
   Masaki Suketa (suke)
 [ext/zlib]
   _unmaintained_
+
diff --git a/doc/marshal.rdoc b/doc/marshal.rdoc
index a51f1bf873..f97db00a49 100644
--- a/doc/marshal.rdoc
+++ b/doc/marshal.rdoc
@@ -134,8 +134,8 @@ object is encountered again.  (The first object has an index of 1).
 "@" represents an object link.  Following the type byte is a long giving the
 index of the object.
 
-For example, the following stream contains an Array of the same
-<code>"hello"</code> object twice:
+For example, the following stream contains an Array of the object
+<code>"hello"</code> twice:
 
   "\004\b[\a\"\nhello@\006"
 
diff --git a/doc/pty/README.ja b/doc/pty/README.ja
index 2d83ffa033..9b9d306bf7 100644
--- a/doc/pty/README.ja
+++ b/doc/pty/README.ja
@@ -34,7 +34,7 @@ pty 拡張モジュール version 0.3 by A.ito
       数がブロックパラメータ付きで呼ばれた場合には，そのブロックの中で
       のみ例外が発生します．子プロセスをモニターしているスレッドはブロッ
       クを抜けるときに終了します．
-
+      
    protect_signal
    reset_signal
 
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 49fce51a8d..810f15ce1a 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -128,8 +128,8 @@ The following metacharacters also behave like character classes:
 * <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\v]/</tt>
-* <tt>/\S/</tt> - A non-whitespace character: <tt>/[^ \t\r\n\f\v]/</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
@@ -470,19 +470,7 @@ characters, <i>anchoring</i> the match to a specific position.
 * <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 first matching position:
-
-  In methods like <tt>String#gsub</tt> and <tt>String#scan</tt>, it changes on each iteration.
-  It initially matches the beginning of subject, and in each following iteration it matches where the last match finished.
-
-      "    a b c".gsub(/ /, '_')    #=> "____a_b_c"
-      "    a b c".gsub(/\G /, '_')  #=> "____a b c"
-
-  In methods like <tt>Regexp#match</tt> and <tt>String#match</tt> that take an (optional) offset, it matches where the search begins.
-
-      "hello, world".match(/,/, 3)    #=> #<MatchData ",">
-      "hello, world".match(/\G,/, 3)  #=> nil
-
+* <tt>\G</tt> - Matches point where last match finished
 * <tt>\b</tt> - Matches word boundaries when outside brackets;
   backspace (0x08) when inside brackets
 * <tt>\B</tt> - Matches non-word boundaries
@@ -580,9 +568,6 @@ 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.
 
-Comments in regexp literals cannot include unescaped terminator
-characters.
-
 == Encoding
 
 Regular expressions are assumed to use the source encoding. This can be
diff --git a/doc/security.rdoc b/doc/security.rdoc
index d7d6464ce1..d8efca0042 100644
--- a/doc/security.rdoc
+++ b/doc/security.rdoc
@@ -7,12 +7,12 @@ This document aims to discuss many of these pitfalls and provide more secure
 alternatives where applicable.
 
 Please check the full list of publicly known CVEs and how to correctly report a
-security vulnerability, at: https://www.ruby-lang.org/en/security/
-Japanese version is here: https://www.ruby-lang.org/ja/security/
+security vulnerability, at: http://www.ruby-lang.org/en/security/
+Japanese version is here: http://www.ruby-lang.org/ja/security/
 
 Security vulnerabilities should be reported via an email to
 mailto:security@ruby-lang.org ({the PGP public
-key}[https://www.ruby-lang.org/security.asc]), which is a private mailing list.
+key}[http://www.ruby-lang.org/security.asc]), which is a private mailing list.
 Reported problems will be published after fixes.
 
 == <code>$SAFE</code>
@@ -66,28 +66,20 @@ method, variable and constant names. The reason for this is that symbols are
 simply integers with names attached to them, so they are faster to look up in
 hashtables.
 
-Starting in version 2.2, most symbols can be garbage collected; these are
-called <i>mortal</i> symbols. Most symbols you create (e.g. by calling
-+to_sym+) are mortal.
-
-<i>Immortal</i> symbols on the other hand will never be garbage collected.
-They are created when modifying code:
-* defining a method (e.g. with +define_method+),
-* setting an instance variable (e.g. with +instance_variable_set+),
-* creating a variable or constant (e.g. with +const_set+)
-C extensions that have not been updated and are still calling `SYM2ID`
-will create immortal symbols.
-Bugs in 2.2.0: +send+ and +__send__+ also created immortal symbols,
-and calling methods with keyword arguments could also create some.
-
-Don't create immortal symbols from user inputs. Otherwise, this would
-allow a user to mount a denial of service attack against your application by
-flooding it with unique strings, which will cause memory to grow indefinitely
-until the Ruby process is killed or causes the system to slow to a halt.
-
-While it might not be a good idea to call these with user inputs, methods that
-used to be vulnerable such as +to_sym+, +respond_to?+,
-+method+, +instance_variable_get+, +const_get+, etc. are no longer a threat.
+Once a symbol is created, the memory used by it is never freed. If you convert
+user input to symbols with +to_sym+ or +intern+, it is possible for an attacker
+to mount a denial of service attack against your application by flooding it
+with unique strings. Because each string is kept in memory until the Ruby
+process exits, this will cause memory consumption to grow and grow until Ruby
+runs out of memory and crashes.
+
+Be careful with passing user input to methods such as +send+,
++instance_variable_get+ or +_set+, +const_get+ or +_set+, etc. as these methods
+will convert string parameters to symbols internally and pose the same DoS
+potential as direct conversion through +to_sym+/+intern+.
+
+The workaround to this is simple - don't convert user input to symbols. You
+should attempt to leave user input in string form instead.
 
 == Regular expressions
 
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index a9507fe92a..053b11fb99 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -47,7 +47,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 
 --- Shell.def_system_command(command, path = command)
 
-      Shellのメソッドとしてcommandを登録します.
+      Shellのメソッドとしてcommandを登録します. 
 
       例)
       Shell.def_system_command "ls"
@@ -62,7 +62,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 
 --- Shell.alias_command(ali, command, *opts) {...}
 
-      commandのaliasをします.
+      commandのaliasをします. 
 
       例)
         Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
@@ -139,7 +139,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 --- Shell#test(command, file1, file2)
 --- Shell#[command, file1, file2]
 
-      ファイルテスト関数testと同じ.
+      ファイルテスト関数testと同じ. 
       例)
           sh[?e, "foo"]
           sh[:e, "foo"]
@@ -185,7 +185,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 --- Shell#glob(patten)
 --- Shell#tee(file)
 
-      これらは実行すると, それらを内容とするFilterオブジェクトを返します.
+      これらは実行すると, それらを内容とするFilterオブジェクトを返します. 
 
 --- Filter#each &block
 
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index 8fa4fb5232..448635758b 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -13,7 +13,8 @@ Base64:: Support for encoding and decoding binary data using a Base64 representa
 Benchmark:: Provides methods to measure and report the time used to execute code
 CGI:: Support for the Common Gateway Interface protocol
 CMath:: Provides Trigonometric and Transcendental functions for complex numbers
-ConditionVariable:: Augments the Mutex class
+complex.rb:: Deprecated library replaced by C implementation in core
+ConditionVariable:: Augments the Mutex class, provided by thread.rb
 CSV:: Provides an interface to read and write CSV files and data
 DEBUGGER__:: Debugging functionality for Ruby
 Delegator:: Provides three abilities to delegate method calls to an object
@@ -25,12 +26,14 @@ FileUtils:: Several file utility methods for copying, moving, removing, etc
 Find:: This module supports top-down traversal of a set of file paths
 Forwardable:: Provides delegation of specified methods to a designated object
 GetoptLong:: Parse command line options similar to the GNU C getopt_long()
+GServer:: HTTP server with logging, thread pooling and multi-server management
 IPAddr:: Provides methods to manipulate IPv4 and IPv6 IP addresses
 IRB:: Interactive Ruby command-line tool for REPL (Read Eval Print Loop)
-Logger:: Provides a simple logging utility for outputting messages
+Logger:: Provides a simple logging utility for outputing messages
 mathn.rb:: Deprecated library that extends math operations
 MakeMakefile:: Module used to generate a Makefile for C extensions
 Matrix:: Represents a mathematical matrix.
+MiniTest:: A test suite with TDD, BDD, mocking and benchmarking
 Monitor:: Provides an object or module to use safely by more than one thread
 Mutex_m:: Mixin to extend objects to be handled like a Mutex
 Net::FTP:: Support for the File Transfer Protocol
@@ -38,7 +41,8 @@ Net::HTTP:: HTTP client api for Ruby
 Net::IMAP:: Ruby client api for Internet Message Access Protocol
 Net::POP3:: Ruby client library for POP3
 Net::SMTP:: Simple Mail Transfer Protocol client library for Ruby
-Observable:: Provides a mechanism for publish/subscribe pattern in Ruby
+Net::Telnet:: Telnet client library for Ruby
+Observable:: Provides a mechanism for publich/subscribe pattern in Ruby
 OpenURI:: An easy-to-use wrapper for Net::HTTP, Net::HTTPS and Net::FTP
 Open3:: Provides access to stdin, stdout and stderr when running other programs
 OptionParser:: Ruby-oriented class for command-line option analysis
@@ -49,8 +53,10 @@ Prime:: Prime numbers and factorization library
 profile.rb:: Runs the Ruby Profiler__
 Profiler__:: Provides a way to profile your Ruby application
 PStore:: Implements a file based persistence mechanism based on a Hash
-Queue:: Synchronized communication between threads
+Queue:: Synchronized communication between threads, provided by thread.rb
 Racc:: A LALR(1) parser generator written in Ruby.
+Rake:: Ruby build program with capabilities similar to make
+rational.rb:: Deprecated library replaced by C implementation in core
 RbConfig:: Information of your configure and build of Ruby
 RDoc:: Produces HTML and command-line documentation for Ruby
 resolv-replace.rb:: Replace Socket DNS with Resolv
@@ -67,6 +73,8 @@ Shellwords:: Manipulates strings with word parsing rules of UNIX Bourne shell
 Singleton:: Implementation of the Singleton pattern for Ruby
 Synchronizer:: A module that provides a two-phase lock with a counter
 Tempfile:: A utility class for managing temporary files
+Test::Unit:: A compatibility layer for MiniTest
+Thread:: Provides support classes for threaded programs
 ThreadsWait:: Watches for termination of multiple threads
 Time:: Extends the Time class with methods for parsing and conversion
 Timeout:: Auto-terminate potentially long-running operations in Ruby
@@ -88,6 +96,7 @@ Date:: A subclass of Object includes Comparable module for handling dates
 DateTime:: Subclass of Date to handling dates, hours, minutes, seconds, offsets
 DBM:: Provides a wrapper for the UNIX-style Database Manager Library
 Digest:: Provides a framework for message digest libraries
+DL:: Provides a wrapper for the UNIX dlopen() library
 Etc:: Provides access to information typically stored in UNIX /etc directory
 Fcntl:: Loads constants defined in the OS fcntl.h C header file
 Fiddle:: A libffi wrapper for Ruby
@@ -96,16 +105,21 @@ IO:: Extensions for Ruby IO class, including #wait and ::console
 JSON:: Implements Javascript Object Notation for Ruby
 NKF:: Ruby extension for Network Kanji Filter
 objspace:: Extends ObjectSpace module to add methods for internal statistics
-OpenSSL:: Provides SSL, TLS and general purpose cryptography for Ruby
+OpenSSL:: Provides SSL, TSL and general purpose cryptography for Ruby
 Pathname:: Representation of the name of a file or directory on the filesystem
 Psych:: A YAML parser and emitter for Ruby
 PTY:: Creates and manages pseudo terminals
 Readline:: Provides an interface for GNU Readline and Edit Line (libedit)
 Ripper:: Provides an interface for parsing Ruby programs into S-expressions
-SDBM:: Provides a simple file-based key-value store with String keys and values
+SBDM:: Provides a simple file-based key-value store with String keys and values
 Socket:: Access underlying OS socket implementations
 StringIO:: Pseudo I/O on String objects
 StringScanner:: Provides lexical scanning operations on a String
 Syslog:: Ruby interface for the POSIX system logging facility
+Tk:: Provides a framework for building a Graphical User Interface (GUI)
 WIN32OLE:: Provides an interface for OLE Automation in Ruby
 Zlib:: Ruby interface for the zlib compression/decompression library
+
+
+
+
diff --git a/doc/syntax/assignment.rdoc b/doc/syntax/assignment.rdoc
index 83300cbece..adfe6485a4 100644
--- a/doc/syntax/assignment.rdoc
+++ b/doc/syntax/assignment.rdoc
@@ -1,6 +1,6 @@
 = Assignment
 
-In Ruby, assignment uses the <code>=</code> (equals sign) character.  This
+In Ruby assignment uses the <code>=</code> (equals sign) character.  This
 example assigns the number five to the local variable +v+:
 
   v = 5
@@ -137,7 +137,7 @@ Here is an example of instance variable usage:
   p object2.value # prints "other value"
 
 An uninitialized instance variable has a value of +nil+.  If you run Ruby with
-warnings enabled, you will get a warning when accessing an uninitialized
+warnings enabled you will get a warning when accessing an uninitialized
 instance variable.
 
 The +value+ method has access to the value set by the +initialize+ method, but
@@ -279,7 +279,7 @@ to an instance variable most people use Module#attr_accessor:
   end
 
 When using method assignment you must always have a receiver.  If you do not
-have a receiver, Ruby assumes you are assigning to a local variable:
+have a receiver Ruby assumes you are assigning to a local variable:
 
   class C
     attr_accessor :value
@@ -409,7 +409,7 @@ You can use multiple assignment to swap two values in-place:
   # prints {:new_value=>1, :old_value=>2}
 
 If you have more values on the right hand side of the assignment than variables
-on the left hand side, the extra values are ignored:
+on the left hand side the extra values are ignored:
 
   a, b = 1, 2, 3
 
@@ -452,3 +452,4 @@ Since each decomposition is considered its own multiple assignment you can use
 
   p a: a, b: b, c: c, d: d
   # prints {:a=>1, :b=>2, :c=>[3, 4], :d=>[5, 6]}
+
diff --git a/doc/syntax/calling_methods.rdoc b/doc/syntax/calling_methods.rdoc
index ec86ef05ee..79c0de59dc 100644
--- a/doc/syntax/calling_methods.rdoc
+++ b/doc/syntax/calling_methods.rdoc
@@ -27,10 +27,6 @@ This sends the +my_method+ message to +my_object+.  Any object can be a
 receiver but depending on the method's visibility sending a message may raise a
 NoMethodError.
 
-You may use <code>&.</code> to designate a receiver, then +my_method+ is not
-invoked and the result is +nil+ when the receiver is +nil+.  In that case, the
-arguments of +my_method+ are not evaluated.
-
 You may also use <code>::</code> to designate a receiver, but this is rarely
 used due to the potential for confusion with <code>::</code> for namespaces.
 
@@ -66,7 +62,7 @@ The positional arguments for the message follow the method name:
 
   my_method(argument1, argument2)
 
-In many cases, parenthesis are not necessary when sending a message:
+In many cases parenthesis are not necessary when sending a message:
 
   my_method argument1, argument2
 
@@ -88,7 +84,7 @@ hash-type arguments are assigned as a single hash to the last argument:
 
   my_method('a' => 1, b: 2) # prints: {'a'=>1, :b=>2}
 
-If too many positional arguments are given, an ArgumentError is raised.
+If too many positional arguments are given an ArgumentError is raised.
 
 === Default Positional Arguments
 
@@ -250,8 +246,8 @@ Both are equivalent to:
 
   my_method(1, 2, 3)
 
-If the method accepts keyword arguments, the splat operator will convert a
-hash at the end of the array into keyword arguments:
+If the method accepts keyword arguments the splat operator will convert a hash
+at the end of the array into keyword arguments:
 
   def my_method(a, b, c: 3)
   end
@@ -263,7 +259,7 @@ You may also use the <code>**</code> (described next) to convert a Hash into
 keyword arguments.
 
 If the number of objects in the Array do not match the number of arguments for
-the method, an ArgumentError will be raised.
+the method an ArgumentError will be raised.
 
 If the splat operator comes first in the call, parentheses must be used to
 avoid a warning.
@@ -290,7 +286,7 @@ Both are equivalent to:
   my_method(first: 3, second: 4, third: 5)
 
 If the method definition uses <code>**</code> to gather arbitrary keyword
-arguments, they will not be gathered by <code>*</code>:
+arguments they will not be gathered by <code>*</code>:
 
   def my_method(*a, **kw)
     p arguments: a, keywords: kw
@@ -300,9 +296,9 @@ arguments, they will not be gathered by <code>*</code>:
 
 Prints:
 
-  {:arguments=>[1, 2, {"3"=>4}], :keywords=>{:five=>6}}
+  {:arguments=>[1, 2], :keywords=>{"3"=>4, :five=>6}}
 
-Unlike the splat operator described above, the <code>**</code> operator has no
+Unlike the splat operator described above the <code>**</code> operator has no
 commonly recognized name.
 
 === Proc to Block Conversion
@@ -323,12 +319,12 @@ operator:
 If the splat operator comes first in the call, parenthesis must be used to
 avoid a warning.
 
-Unlike the splat operator described above, the <code>&</code> operator has no
+Unlike the splat operator described above the <code>&</code> operator has no
 commonly recognized name.
 
 == Method Lookup
 
-When you send a message, Ruby looks up the method that matches the name of the
+When you send a message Ruby looks up the method that matches the name of the
 message for the receiver.  Methods are stored in classes and modules so method
 lookup walks these, not the objects themselves.
 
@@ -347,6 +343,7 @@ If no match is found this repeats from the beginning, but looking for
 +method_missing+.  The default +method_missing+ is BasicObject#method_missing
 which raises a NameError when invoked.
 
-If refinements (an experimental feature) are active, the method lookup changes.
+If refinements (an experimental feature) are active the method lookup changes.
 See the {refinements documentation}[rdoc-ref:syntax/refinements.rdoc] for
 details.
+
diff --git a/doc/syntax/control_expressions.rdoc b/doc/syntax/control_expressions.rdoc
index 65f7b431e3..0efc1668ad 100644
--- a/doc/syntax/control_expressions.rdoc
+++ b/doc/syntax/control_expressions.rdoc
@@ -110,7 +110,7 @@ expression as this can be confusing.
 == +unless+ Expression
 
 The +unless+ expression is the opposite of the +if+ expression.  If the value
-is false, the "then" expression is executed:
+is false the "then" expression is executed:
 
   unless true
     puts "the value is a false-value"
@@ -204,10 +204,10 @@ Here is an example of using +case+ to compare a String against a pattern:
 
 Here the string <code>"12345"</code> is compared with <code>/^1/</code> by
 calling <code>/^1/ === "12345"</code> which returns +true+.  Like the +if+
-expression, the first +when+ that matches is executed and all other matches are
+expression the first +when+ that matches is executed and all other matches are
 ignored.
 
-If no matches are found, the +else+ is executed.
+If no matches are found the +else+ is executed.
 
 The +else+ and +then+ are optional, this +case+ expression gives the same
 result as the one above:
@@ -300,9 +300,9 @@ This prints the numbers 0 through 11.  Like a while loop the condition <code>a
 > 10</code> is checked when entering the loop and each time the loop body
 executes.  If the condition is false the loop will continue to execute.
 
-Like a +while+ loop, the +do+ is optional.
+Like a +while+ loop the +do+ is optional.
 
-Like a +while+ loop, the result of an +until+ loop is nil unless +break+ is
+Like a +while+ loop the result of an +until+ loop is nil unless +break+ is
 used.
 
 == +for+ Loop
@@ -356,7 +356,7 @@ before the condition:
 
   p a # prints 10
 
-If you don't use +rescue+ or +ensure+, Ruby optimizes away any exception
+If you don't use +rescue+ or +ensure+ Ruby optimizes away any exception
 handling overhead.
 
 == +break+ Statement
@@ -405,8 +405,8 @@ Use +next+ to skip the rest of the current iteration:
 
   p result # prints [2, nil, 6]
 
-+next+ accepts an argument that can be used as the result of the current
-block iteration:
++next+ accepts an argument that can be used the result of the current block
+iteration:
 
   result = [1, 2, 3].map do |value|
     next value if value.even?
@@ -434,14 +434,14 @@ Use +redo+ to redo the current iteration:
 
 This prints [0, 1, 3, 3, 5, 5, 7, 7, 9, 9, 11]
 
-In Ruby 1.8, you could also use +retry+ where you used +redo+.  This is no
+In Ruby 1.8 you could also use +retry+ where you used +redo+.  This is no
 longer true, now you will receive a SyntaxError when you use +retry+ outside
 of a +rescue+ block.  See {Exceptions}[rdoc-ref:syntax/exceptions.rdoc]
 for proper usage of +retry+.
 
 == Flip-Flop
 
-The flip-flop is a rarely seen conditional expression.  It's primary use is
+The flip-flop is rarely seen conditional expression.  It's primary use is
 for processing text from ruby one-line programs used with <code>ruby -n</code>
 or <code>ruby -p</code>.
 
@@ -461,14 +461,14 @@ Here is an example:
 
   p selected # prints [2, 3, 4, 5, 6, 7, 8]
 
-In the above example, the on condition is <code>n==2</code>.  The flip-flop
+In the above example the on condition is <code>n==2</code>.  The flip-flop
 is initially off (false) for 0 and 1, but becomes on (true) for 2 and remains
 on through 8.  After 8 it turns off and remains off for 9 and 10.
 
 The flip-flop must be used inside a conditional such as +if+, +while+,
 +unless+, +until+ etc. including the modifier forms.
 
-When you use an inclusive range (<code>..</code>), the off condition is
+When you use an inclusive range (<code>..</code>) the off condition is
 evaluated when the on condition changes:
 
   selected = []
@@ -479,11 +479,11 @@ evaluated when the on condition changes:
 
   p selected # prints [2]
 
-Here, both sides of the flip-flop are evaluated so the flip-flop turns on and
+Here both sides of the flip-flop are evaluated so the flip-flop turns on and
 off only when +value+ equals 2.  Since the flip-flop turned on in the
 iteration it returns true.
 
-When you use an exclusive range (<code>...</code>), the off condition is
+When you use an exclusive range (<code>...</code>) the off condition is
 evaluated on the following iteration:
 
   selected = []
@@ -494,6 +494,7 @@ evaluated on the following iteration:
 
   p selected # prints [2, 3, 4, 5]
 
-Here, the flip-flop turns on when +value+ equals 2, but doesn't turn off on the
+Here the flip-flop turns on when +value+ equals 2 but doesn't turn off on the
 same iteration.  The off condition isn't evaluated until the following
 iteration and +value+ will never be two again.
+
diff --git a/doc/syntax/exceptions.rdoc b/doc/syntax/exceptions.rdoc
index a2e75616fb..0efc35a59f 100644
--- a/doc/syntax/exceptions.rdoc
+++ b/doc/syntax/exceptions.rdoc
@@ -8,7 +8,7 @@ Exceptions are rescued in a +begin+/+end+ block:
     # handle exception
   end
 
-If you are inside a method, you do not need to use +begin+ or +end+ unless you
+If you are inside a method you do not need to use +begin+ or +end+ unless you
 wish to limit the scope of rescued exceptions:
 
   def my_method
@@ -29,7 +29,7 @@ variable_name</tt> at the end of the +rescue+ line:
     raise # re-raise the current exception
   end
 
-By default, StandardError and its subclasses are rescued.  You can rescue a
+By default StandardError and its subclasses are rescued.  You can rescue a
 specific set of exception classes (and their subclasses) by listing them after
 +rescue+:
 
@@ -52,7 +52,7 @@ You may rescue different types of exceptions in different ways:
   end
 
 The exception is matched to the rescue section starting at the top, and matches
-only once.  If an ArgumentError is raised in the begin section, it will not be
+only once.  If an ArgumentError is raised in the begin section it will not be
 handled in the StandardError section.
 
 You may retry rescued exceptions:
@@ -93,3 +93,4 @@ You may also run some code when an exception is not raised:
   ensure
     # ...
   end
+
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
index f5b9738868..32e10edd30 100644
--- a/doc/syntax/literals.rdoc
+++ b/doc/syntax/literals.rdoc
@@ -83,33 +83,8 @@ Any internal <tt>"</tt> must be escaped:
 
   "This string has a quote: \".  As you can see, it is escaped"
 
-Double-quote strings allow escaped characters such as <tt>\n</tt> for
-newline, <tt>\t</tt> for tab, etc.  The full list of supported escape
-sequences are as follows:
-
-  \a             bell, ASCII 07h (BEL)
-  \b             backspace, ASCII 08h (BS)
-  \t             horizontal tab, ASCII 09h (TAB)
-  \n             newline (line feed), ASCII 0Ah (LF)
-  \v             vertical tab, ASCII 0Bh (VT)
-  \f             form feed, ASCII 0Ch (FF)
-  \r             carriage return, ASCII 0Dh (CR)
-  \e             escape, ASCII 1Bh (ESC)
-  \s             space, ASCII 20h (SPC)
-  \\             backslash, \
-  \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
-  \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
-  \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
-  \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
-  \cx or \C-x    control character, where x is an ASCII printable character
-  \M-x           meta character, where x is an ASCII printable character
-  \M-\C-x        meta control character, where x is an ASCII printable character
-  \M-\cx         same as above
-  \c\M-x         same as above
-  \c? or \C-?    delete, ASCII 7Fh (DEL)
-
-Any other character followed by a backslash is interpreted as the
-character itself.
+Double-quote strings allow escaped characters such as <tt>\n</tt> for newline,
+<tt>\t</tt> for tab, etc.
 
 Double-quote strings allow interpolation of other values using
 <tt>#{...}</tt>:
@@ -133,7 +108,7 @@ You may also create strings using <tt>%</tt>:
   %(1 + 1 is #{1 + 1}) #=> "1 + 1 is 2"
 
 There are two different types of <tt>%</tt> strings <tt>%q(...)</tt> behaves
-like a single-quote string (no interpolation or character escaping), while
+like a single-quote string (no interpolation or character escaping) while
 <tt>%Q</tt> behaves as a double-quote string.  See Percent Strings below for
 more discussion of the syntax of percent strings.
 
@@ -149,23 +124,6 @@ be concatenated as long as a percent-string is not last.
   %q{a} 'b' "c" #=> "abc"
   "a" 'b' %q{c} #=> NameError: uninitialized constant q
 
-There is also a character literal notation to represent single
-character strings, which syntax is a question mark (<tt>?</tt>)
-followed by a single character or escape sequence that corresponds to
-a single codepoint in the script encoding:
-
-  ?a       #=> "a"
-  ?abc     #=> SyntaxError
-  ?\n      #=> "\n"
-  ?\s      #=> " "
-  ?\\      #=> "\\"
-  ?\u{41}  #=> "A"
-  ?\C-a    #=> "\x01"
-  ?\M-a    #=> "\xE1"
-  ?\M-\C-a #=> "\x81"
-  ?\C-\M-a #=> "\x81", same as above
-  ?あ      #=> "あ"
-
 === Here Documents
 
 If you are writing a large block of text you may use a "here document" or
@@ -196,20 +154,6 @@ Note that the while the closing identifier may be indented, the content is
 always treated as if it is flush left.  If you indent the content those spaces
 will appear in the output.
 
-To have indented content as well as an indented closing identifier, you can use
-a "squiggly" heredoc, which uses a "~" instead of a "-" after <tt><<</tt>:
-
-    expected_result = <<~SQUIGGLY_HEREDOC
-      This would contain specially formatted text.
-
-      That might span many lines
-    SQUIGGLY_HEREDOC
-
-The indentation of the least-indented line will be removed from each line of
-the content.  Note that empty lines and lines consisting solely of literal tabs
-and spaces will be ignored for the purposes of determining indentation, but
-escaped tabs and spaces are considered non-indentation characters.
-
 A heredoc allows interpolation and escaped characters.  You may disable
 interpolation and escaping by surrounding the opening identifier with single
 quotes:
@@ -255,11 +199,14 @@ You may also create symbols by interpolation:
   :"my_symbol1"
   :"my_symbol#{1 + 1}"
 
+Note that symbols are never garbage collected so be careful when referencing
+symbols using interpolation.
+
 Like strings, a single-quote may be used to disable interpolation:
 
   :'my_symbol#{1 + 1}' #=> :"my_symbol\#{1 + 1}"
 
-When creating a Hash, there is a special syntax for referencing a Symbol as
+When creating a Hash there is a special syntax for referencing a Symbol as
 well.
 
 == Arrays
@@ -289,14 +236,6 @@ You can create a hash using symbol keys with the following syntax:
 
 This same syntax is used for keyword arguments for a method.
 
-Like Symbol literals, you can quote symbol keys.
-
-  { "a 1": 1, "b #{1 + 1}": 2 }
-
-is equal to
-
-  { :"a 1" => 1, :"b 2" => 2 }
-
 See Hash for the methods you may use with a hash.
 
 == Ranges
@@ -344,7 +283,7 @@ This proc will add one to its argument.
 
 == Percent Strings
 
-Besides <tt>%(...)</tt> which creates a String, the <tt>%</tt> may create
+Besides <tt>%(...)</tt> which creates a String, The <tt>%</tt> may create
 other types of object.  As with strings, an uppercase letter allows
 interpolation and escaped characters while a lowercase letter disables them.
 
@@ -366,3 +305,4 @@ one of the array entries you must escape it with a "\\" character:
 If you are using "(", "[", "{", "<" you must close it with ")", "]", "}", ">"
 respectively.  You may use most other non-alphanumeric characters for percent
 string delimiters such as "%", "|", "^", etc.
+
diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc
index d41c6fcba5..648843e753 100644
--- a/doc/syntax/methods.rdoc
+++ b/doc/syntax/methods.rdoc
@@ -29,7 +29,7 @@ Ruby programs must be written in a US-ASCII-compatible character set such as
 UTF-8, ISO-8859-1 etc. In such character sets if the eight bit is set it
 indicates an extended character. Ruby allows method names and other identifiers
 to contain such characters. Ruby programs cannot contain some characters like
-ASCII NUL (<code>\x00</code>).
+ASCII NUL (<code>\x00<code>).
 
 The following are the examples of valid ruby methods:
 
@@ -47,23 +47,23 @@ exist on all keyboards.
 Method names may end with a <code>!</code> (bang or exclamation mark), a
 <code>?</code> (question mark) or <code>=</code> equals sign.
 
-The bang methods (<code>!</code> at the end of method name) are called and
+The bang methods(<code>!</code> at the end of method name) are called and
 executed just like any other method. However, by convention, a method with an
 exclamation point or bang is considered dangerous. In ruby core library the
-dangerous method implies that when a method ends with a bang (<code>!</code>),
+dangerous method implies that when a method ends with a bang(<code>!</code>),
 it indicates that unlike its non-bang equivalent, permanently modifies its
-receiver. Almost always, ruby core library will have a non-bang
-counterpart (method name which does NOT end with <code>!</code>) of every bang
-method (method name which does end with <code>!</code>) that does not modify
-the receiver. This convention is typically true for ruby core library but
-may or may not hold true for other ruby libraries.
-
-Methods that end with a question mark by convention return boolean, but they
-may not always return just +true+ or +false+.  Often, they will return an
+receiver. Almost always, Ruby core library will have a non-bang
+counterpart(method name which does NOT end with <code>!</code>) of every bang
+method (method name which does end with <code>!</code>) that has does not
+modify the receiver. This convention is typically true for ruby core libary but
+may/may not hold true for other ruby libraries.
+
+Methods that end with a question mark by convention return boolean. But they
+may not always return just +true+ or +false+.  Often they will may return an
 object to indicate a true value (or "truthy" value).
 
 Methods that end with an equals sign indicate an assignment method.  For
-assignment methods, the return value is ignored and the arguments are returned
+assignment methods the return value is ignored, the arguments are returned
 instead.
 
 These are method names for the various ruby operators.  Each of these
@@ -109,25 +109,6 @@ operator with an <code>@</code> as in <code>+@</code> or <code>!@</code>:
 
 Unary methods accept zero arguments.
 
-Additionally, methods for element reference and assignment may be defined:
-<code>[]</code> and <code>[]=</code> respectively. Both can take one or more
-arguments, and element reference can take none.
-
-  class C
-    def [](a, b)
-      puts a + b
-    end
-
-    def []=(a, b, c)
-      puts a * b + c
-    end
-  end
-
-  obj = C.new
-
-  obj[2, 3]     # prints "5"
-  obj[2, 3] = 4 # prints "10"
-
 == Return Values
 
 By default, a method returns the last expression that was evaluated in the body
@@ -148,7 +129,7 @@ evaluated.
   end
 
 Note that for assignment methods the return value will always be ignored.
-Instead, the argument will be returned:
+Instead the argument will be returned:
 
   def a=(value)
     return 1 + value
@@ -450,6 +431,7 @@ May be written as:
     # handle exception
   end
 
-If you wish to rescue an exception for only part of your method, use +begin+ and
+If you wish to rescue an exception for only part of your method use +begin+ and
 +end+.  For more details see the page on {exception
 handling}[rdoc-ref:syntax/exceptions.rdoc].
+
diff --git a/doc/syntax/miscellaneous.rdoc b/doc/syntax/miscellaneous.rdoc
index d5691f8d60..8f424f019f 100644
--- a/doc/syntax/miscellaneous.rdoc
+++ b/doc/syntax/miscellaneous.rdoc
@@ -10,16 +10,16 @@ most frequently used with <code>ruby -e</code>.
 
 == Indentation
 
-Ruby does not require any indentation.  Typically, ruby programs are indented
+Ruby does not require any indentation.  Typically ruby programs are indented
 two spaces.
 
-If you run ruby with warnings enabled and have an indentation mis-match, you
+If you run ruby with warnings enabled and have an indentation mis-match you
 will receive a warning.
 
 == +alias+
 
 The +alias+ keyword is most frequently used to alias methods.  When aliasing a
-method, you can use either its name or a symbol:
+method you can use either its name or a symbol:
 
   alias new_name old_name
   alias :new_name :old_name
@@ -61,7 +61,7 @@ You may use +undef+ in any scope.  See also Module#undef_method
   p defined?(RUBY_VERSION)       # prints "constant"
   p defined?(1 + 1)              # prints "method"
 
-You don't need to use parenthesis with +defined?+, but they are recommended due
+You don't need to use parenthesis with +defined?+ but they are recommended due
 to the {low precedence}[rdoc-ref:syntax/precedence.rdoc] of +defined?+.
 
 For example, if you wish to check if an instance variable exists and that the
@@ -69,7 +69,7 @@ instance variable is zero:
 
   defined? @instance_variable && @instance_variable.zero?
 
-This returns <code>"expression"</code>, which is not what you want if the
+This returns <code>"expression"</code> which is not what you want if the
 instance variable is not defined.
 
   @instance_variable = 1
@@ -104,3 +104,4 @@ Here is an example one-liner that adds numbers from standard input or any files
 in the argument list:
 
   ruby -ne 'BEGIN { count = 0 }; END { puts count }; count += gets.to_i'
+
diff --git a/doc/syntax/modules_and_classes.rdoc b/doc/syntax/modules_and_classes.rdoc
index dd70d4ac21..a82a6f27ed 100644
--- a/doc/syntax/modules_and_classes.rdoc
+++ b/doc/syntax/modules_and_classes.rdoc
@@ -94,7 +94,7 @@ nesting:
   end
 
 However, if you use <code>::</code> to define <code>A::B</code> without
-nesting it inside +A+, a NameError exception will be raised because the nesting
+nesting it inside +A+ a NameError exception will be raised because the nesting
 does not include +A+:
 
   module A
@@ -129,7 +129,7 @@ method on a module is often called a "class method" instead of a "module
 method".  See also Module#module_function which can convert an instance method
 into a class method.)
 
-When a class method references a constant, it uses the same rules as referencing
+When a class method references a constant it uses the same rules as referencing
 it outside the method as the scope is the same.
 
 Instance methods defined in a module are only callable when included.  These
@@ -342,3 +342,4 @@ is equivalent to this code block:
   end
 
 Both objects will have a +my_method+ that returns +2+.
+
diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc
index 1419fea509..62405a78b7 100644
--- a/doc/syntax/refinements.rdoc
+++ b/doc/syntax/refinements.rdoc
@@ -9,6 +9,11 @@ Refinements are designed to reduce the impact of monkey patching on other
 users of the monkey-patched class.  Refinements provide a way to extend a
 class locally.
 
+Refinements are an experimental feature in Ruby 2.0.  At the time of writing,
+refinements are expected to exist in future versions of Ruby but the
+specification of refinements may change.  You will receive a warning the first
+time you define or activate a refinement.
+
 Here is a basic refinement:
 
   class C
@@ -43,21 +48,15 @@ Activate the refinement with #using:
 
 == Scope
 
-You may activate refinements at top-level, and inside classes and modules.
-You may not activate refinements in method scope.  Refinements are activated
-until the end of the current class or module definition, or until the end of
-the current file if used at the top-level.
-
-You may activate refinements in a string passed to Kernel#eval. Refinements
-are active the end of the eval string.
-
-Refinements are lexical in scope.  Refinements are only active within a scope
-after the call to using. Any code before the using statement will not have the
-refinement activated.
+You may only activate refinements at top-level, not inside any class, module
+or method scope.  You may activate refinements in a string passed to
+Kernel#eval that is evaluated at top-level.  Refinements are active until the
+end of the file or the end of the eval string, respectively.
 
-When control is transferred outside the scope the refinement is deactivated.
-This means that if you require or load a file or call a method that is defined
-outside the current scope the refinement will be deactivated:
+Refinements are lexical in scope.  When control is transferred outside the
+scope the refinement is deactivated.  This means that if you require or load a
+file or call a method that is defined outside the current scope the refinement
+will be deactivated:
 
   class C
   end
@@ -142,26 +141,6 @@ In a file:
   end
   # activated here
 
-In a class:
-
-  # not activated here
-  class Foo
-    # not activated here
-    def foo
-      # not activated here
-    end
-    using M
-    # activated here
-    def bar
-      # activated here
-    end
-    # activated here
-  end
-  # not activated here
-
-Note that the refinements in M are not activated automatically if the class
-Foo is reopened later.
-
 In eval:
 
   # not activated here
@@ -208,6 +187,24 @@ called:
 
   p [{1=>2}, {3=>4}].to_json # prints "[{\"1\":2},{\"3\":4}]"
 
+You may also activate refinements in a class or module definition, in which
+case the refinements are activated from the point where using is called to
+the end of the class or module definition:
+
+  # not activated here
+  class Foo
+    # not activated here
+    using M
+    # activated here
+    def foo
+      # activated here
+    end
+    # activated here
+  end
+  # not activated here
+
+Note that the refinements in M are not activated automatically even if the class
+Foo is reopened later.
 
 == Method Lookup
 
@@ -255,8 +252,15 @@ method lookup.
 
 This behavior may be changed in the future.
 
+== Refinements and module inclusion
+
+Refinements are inherited by module inclusion.  That is, using activates all
+refinements in the ancestors of the specified module.  Refinements in a
+descendant have priority over refinements in an ancestor.
+
 == Further Reading
 
-See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the
+See http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RefinementsSpec for the
 current specification for implementing refinements.  The specification also
 contains more details.
+
diff --git a/enc/Makefile.in b/enc/Makefile.in
index 8385236494..a64785d1c5 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -1,7 +1,8 @@
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO1 = $(V:1=@@NULLCMD@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
 ECHO = $(ECHO1:0=@echo)
 
 encsrcdir = @srcdir@
@@ -20,14 +21,11 @@ TRANSSODIR = $(ENCSODIR)/trans
 DLEXT = @DLEXT@
 OBJEXT = @OBJEXT@
 LIBEXT = @LIBEXT@
-TIMESTAMPDIR  = $(EXTOUT)/.timestamp
-ENC_TRANS_D   = $(TIMESTAMPDIR)/.enc-trans.time
-ENC_TRANS_SO_D = $(TIMESTAMPDIR)/.enc-trans.so.time
 
-BUILTIN_ENCS	= enc/ascii.c enc/us_ascii.c\
-		  enc/unicode.c enc/utf_8.c
+BUILTIN_ENCS	= ascii.c us_ascii.c\
+		  unicode.c utf_8.c
 
-BUILTIN_TRANSES	= enc/trans/newline.trans
+BUILTIN_TRANSES	= newline.trans
 
 RUBY_SO_NAME = @RUBY_SO_NAME@
 LIBRUBY = @LIBRUBY@
@@ -72,7 +70,7 @@ MAKEDIRS = @MAKEDIRS@
 
 .SUFFIXES: .trans
 
-all:
+all: make-workdir
 
 make-workdir:
 	$(Q)$(MAKEDIRS) $(WORKDIRS)
diff --git a/enc/ascii.c b/enc/ascii.c
index 8b32c414fe..72150c037c 100644
--- a/enc/ascii.c
+++ b/enc/ascii.c
@@ -29,13 +29,6 @@
  */
 
 #include "regenc.h"
-#ifdef RUBY
-# include "encindex.h"
-#endif
-
-#ifndef ENCINDEX_ASCII
-# define ENCINDEX_ASCII 0
-#endif
 
 OnigEncodingDefine(ascii, ASCII) = {
   onigenc_single_byte_mbc_enc_len,
@@ -54,8 +47,7 @@ OnigEncodingDefine(ascii, ASCII) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
-  ENCINDEX_ASCII,
+  0,
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("BINARY", "ASCII-8BIT")
diff --git a/enc/big5.c b/enc/big5.c
index ab4fb69819..27315c4ba9 100644
--- a/enc/big5.c
+++ b/enc/big5.c
@@ -300,7 +300,6 @@ OnigEncodingDefine(big5, BIG5) = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
@@ -335,7 +334,6 @@ OnigEncodingDefine(big5_hkscs, BIG5_HKSCS) = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
@@ -370,7 +368,6 @@ OnigEncodingDefine(big5_uao, BIG5_UAO) = {
   onigenc_not_support_get_ctype_code_range,
   big5_left_adjust_char_head,
   big5_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/cp949.c b/enc/cp949.c
index bd2c8d21a4..bf1c2637a3 100644
--- a/enc/cp949.c
+++ b/enc/cp949.c
@@ -211,7 +211,6 @@ OnigEncodingDefine(cp949, CP949) = {
   onigenc_not_support_get_ctype_code_range,
   cp949_left_adjust_char_head,
   cp949_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/depend b/enc/depend
index fd2e5ea996..d3e1f3c74b 100644
--- a/enc/depend
+++ b/enc/depend
@@ -28,10 +28,8 @@ else
   ''
 end %> <%=CONFIG['LIBS']%> $(EXTLIBS)
 
-ENCOBJS =<%ENCS.map {|e|%> enc/<%=e%>.$(OBJEXT) \
-         <%}%> #
-ENCSOS =<%ENCS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
-        <%}%> #
+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(" ")%>
@@ -42,12 +40,9 @@ LIBENC=enc/libenc.$(LIBEXT)
 
 TRANSVPATH = $(srcdir)/enc/trans
 
-TRANSCSRCS =<%ATRANS.map {|e|%> <%=transvpath % "#{e}.c"%> \
-            <%}%> #
-TRANSOBJS =<%TRANS.map {|e|%> enc/<%=e%>.$(OBJEXT) \
-           <%}%> #
-TRANSSOS =<%TRANS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
-          <%}%> #
+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(" ")%>
@@ -55,7 +50,6 @@ TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
 }.join(" ")%>
 LIBTRANS=enc/libtrans.$(LIBEXT)
-UNICODE_HDR_DIR = --missing-unicode-header-dir--
 
 encs: all
 % if MODULE_TYPE == :static
@@ -80,39 +74,28 @@ $(LIBTRANS): $(TRANSOBJS)
 	$(Q) $(AR) $(ARFLAGS)$@ $(TRANSOBJS)
 	@-$(RANLIB) $@ 2> /dev/null || true
 
-enc trans $(ENCSOS) $(TRANSSOS): config.status
-
 srcs: $(TRANSCSRCS)
 
-$(ENC_TRANS_D):
-	$(Q) $(MAKEDIRS) enc/trans
-	@exit > $@
-
-$(ENC_TRANS_SO_D):
-	$(Q) $(MAKEDIRS) $(TRANSSODIR)
-	@exit > $@
-
-$(ENCOBJS) $(TRANSOBJS): $(ENC_TRANS_D)
-$(ENCSOS) $(TRANSSOS): $(ENC_TRANS_SO_D)
-
 <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
 	$(ECHO) generating table from $@
 	$(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
 
 % unless ENCS.empty? or TRANS.empty?
 
+%   unless ENCS.empty?
+$(ENCOBJS): $(hdrdir)/ruby.h regenc.h oniguruma.h config.h defines.h ruby.h missing.h subst.h intern.h st.h encoding.h
+%   end
 %   ENC_DEPS.each do |e, deps|
 enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %   end
+%   unless TRANS.empty?
+$(TRANSOBJS): $(hdrdir)/ruby.h ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h subst.h encoding.h
+%   end
 %   ATRANS.each do |e|
 %     src = "#{e}.trans"
 
 <%=transvpath % "#{e}.c"%>: <%= transvpath % "#{e}.trans"%>
-%     trans = IO.read(File.join($srcdir, "trans", src))
-%     src = trans.scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}
-%     if src.empty?
-%       src = trans.scan(/^\s*transcode_tblgen_\w+\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c.downcase+"-tbl.rb"}
-%     end
+%     src = [*IO.read(File.join($srcdir, "trans", src)).scan(/^\s*require\s+[\'\"]([^\'\"]*)/).flatten.map{|c|c+".rb"}]
 <%=transvpath % "#{e}.c"%>: <%= src.map {|s| transvpath % "#{s}"}.join(" ")%> $(srcdir)/tool/transcode-tblgen.rb
 %   end
 
@@ -139,11 +122,13 @@ enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %     cmd.sub!(/\$\(DEFFILE\)/) {df}
 %     cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
 %   end
+	$(Q)$(MAKEDIRS) "$(@D)"
 	$(Q)<%=cmd%>
 
 % end
 % dependencies.each do |e|
 <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
+	-$(Q)$(MAKEDIRS) "$(@D)"
 	$(ECHO) compiling <%= "$(encsrcdir)/#{e}.c"%>
 	$(Q)<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
 
@@ -153,7 +138,7 @@ enc/encdb.$(OBJEXT): encdb.h
 enc/trans/transdb.$(OBJEXT): transdb.h
 
 clean:
-% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
+% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean|
 	$(Q)$(RM) <%=pathrep[clean]%>
 % end
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
@@ -176,517 +161,3 @@ clean-srcs:
 	-$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
 
 <%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%>
-
-# AUTOGENERATED DEPENDENCIES START
-enc/ascii.$(OBJEXT): $(top_srcdir)/encindex.h
-enc/ascii.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/ascii.$(OBJEXT): config.h
-enc/ascii.$(OBJEXT): defines.h
-enc/ascii.$(OBJEXT): enc/ascii.c
-enc/ascii.$(OBJEXT): missing.h
-enc/ascii.$(OBJEXT): oniguruma.h
-enc/big5.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/big5.$(OBJEXT): config.h
-enc/big5.$(OBJEXT): defines.h
-enc/big5.$(OBJEXT): enc/big5.c
-enc/big5.$(OBJEXT): missing.h
-enc/big5.$(OBJEXT): oniguruma.h
-enc/cp949.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/cp949.$(OBJEXT): config.h
-enc/cp949.$(OBJEXT): defines.h
-enc/cp949.$(OBJEXT): enc/cp949.c
-enc/cp949.$(OBJEXT): missing.h
-enc/cp949.$(OBJEXT): oniguruma.h
-enc/emacs_mule.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regint.h
-enc/emacs_mule.$(OBJEXT): backward.h
-enc/emacs_mule.$(OBJEXT): config.h
-enc/emacs_mule.$(OBJEXT): defines.h
-enc/emacs_mule.$(OBJEXT): enc/emacs_mule.c
-enc/emacs_mule.$(OBJEXT): intern.h
-enc/emacs_mule.$(OBJEXT): missing.h
-enc/emacs_mule.$(OBJEXT): oniguruma.h
-enc/emacs_mule.$(OBJEXT): st.h
-enc/emacs_mule.$(OBJEXT): subst.h
-enc/encdb.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/encdb.$(OBJEXT): $(top_srcdir)/include/ruby.h
-enc/encdb.$(OBJEXT): $(top_srcdir)/internal.h
-enc/encdb.$(OBJEXT): backward.h
-enc/encdb.$(OBJEXT): config.h
-enc/encdb.$(OBJEXT): defines.h
-enc/encdb.$(OBJEXT): enc/encdb.c
-enc/encdb.$(OBJEXT): encdb.h
-enc/encdb.$(OBJEXT): encoding.h
-enc/encdb.$(OBJEXT): intern.h
-enc/encdb.$(OBJEXT): io.h
-enc/encdb.$(OBJEXT): missing.h
-enc/encdb.$(OBJEXT): oniguruma.h
-enc/encdb.$(OBJEXT): st.h
-enc/encdb.$(OBJEXT): subst.h
-enc/euc_jp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/euc_jp.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/euc_jp.$(OBJEXT): $(top_srcdir)/regint.h
-enc/euc_jp.$(OBJEXT): backward.h
-enc/euc_jp.$(OBJEXT): config.h
-enc/euc_jp.$(OBJEXT): defines.h
-enc/euc_jp.$(OBJEXT): enc/euc_jp.c
-enc/euc_jp.$(OBJEXT): enc/jis/props.h
-enc/euc_jp.$(OBJEXT): enc/jis/props.kwd
-enc/euc_jp.$(OBJEXT): intern.h
-enc/euc_jp.$(OBJEXT): missing.h
-enc/euc_jp.$(OBJEXT): oniguruma.h
-enc/euc_jp.$(OBJEXT): st.h
-enc/euc_jp.$(OBJEXT): subst.h
-enc/euc_kr.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/euc_kr.$(OBJEXT): config.h
-enc/euc_kr.$(OBJEXT): defines.h
-enc/euc_kr.$(OBJEXT): enc/euc_kr.c
-enc/euc_kr.$(OBJEXT): missing.h
-enc/euc_kr.$(OBJEXT): oniguruma.h
-enc/euc_tw.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/euc_tw.$(OBJEXT): config.h
-enc/euc_tw.$(OBJEXT): defines.h
-enc/euc_tw.$(OBJEXT): enc/euc_tw.c
-enc/euc_tw.$(OBJEXT): missing.h
-enc/euc_tw.$(OBJEXT): oniguruma.h
-enc/gb18030.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/gb18030.$(OBJEXT): config.h
-enc/gb18030.$(OBJEXT): defines.h
-enc/gb18030.$(OBJEXT): enc/gb18030.c
-enc/gb18030.$(OBJEXT): missing.h
-enc/gb18030.$(OBJEXT): oniguruma.h
-enc/gb2312.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/gb2312.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/gb2312.$(OBJEXT): backward.h
-enc/gb2312.$(OBJEXT): config.h
-enc/gb2312.$(OBJEXT): defines.h
-enc/gb2312.$(OBJEXT): enc/gb2312.c
-enc/gb2312.$(OBJEXT): encoding.h
-enc/gb2312.$(OBJEXT): intern.h
-enc/gb2312.$(OBJEXT): missing.h
-enc/gb2312.$(OBJEXT): oniguruma.h
-enc/gb2312.$(OBJEXT): st.h
-enc/gb2312.$(OBJEXT): subst.h
-enc/gbk.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/gbk.$(OBJEXT): config.h
-enc/gbk.$(OBJEXT): defines.h
-enc/gbk.$(OBJEXT): enc/gbk.c
-enc/gbk.$(OBJEXT): missing.h
-enc/gbk.$(OBJEXT): oniguruma.h
-enc/iso_8859_1.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_1.$(OBJEXT): config.h
-enc/iso_8859_1.$(OBJEXT): defines.h
-enc/iso_8859_1.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_1.$(OBJEXT): enc/iso_8859_1.c
-enc/iso_8859_1.$(OBJEXT): missing.h
-enc/iso_8859_1.$(OBJEXT): oniguruma.h
-enc/iso_8859_10.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_10.$(OBJEXT): config.h
-enc/iso_8859_10.$(OBJEXT): defines.h
-enc/iso_8859_10.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_10.$(OBJEXT): enc/iso_8859_10.c
-enc/iso_8859_10.$(OBJEXT): missing.h
-enc/iso_8859_10.$(OBJEXT): oniguruma.h
-enc/iso_8859_11.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_11.$(OBJEXT): config.h
-enc/iso_8859_11.$(OBJEXT): defines.h
-enc/iso_8859_11.$(OBJEXT): enc/iso_8859_11.c
-enc/iso_8859_11.$(OBJEXT): missing.h
-enc/iso_8859_11.$(OBJEXT): oniguruma.h
-enc/iso_8859_13.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_13.$(OBJEXT): config.h
-enc/iso_8859_13.$(OBJEXT): defines.h
-enc/iso_8859_13.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_13.$(OBJEXT): enc/iso_8859_13.c
-enc/iso_8859_13.$(OBJEXT): missing.h
-enc/iso_8859_13.$(OBJEXT): oniguruma.h
-enc/iso_8859_14.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_14.$(OBJEXT): config.h
-enc/iso_8859_14.$(OBJEXT): defines.h
-enc/iso_8859_14.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_14.$(OBJEXT): enc/iso_8859_14.c
-enc/iso_8859_14.$(OBJEXT): missing.h
-enc/iso_8859_14.$(OBJEXT): oniguruma.h
-enc/iso_8859_15.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_15.$(OBJEXT): config.h
-enc/iso_8859_15.$(OBJEXT): defines.h
-enc/iso_8859_15.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_15.$(OBJEXT): enc/iso_8859_15.c
-enc/iso_8859_15.$(OBJEXT): missing.h
-enc/iso_8859_15.$(OBJEXT): oniguruma.h
-enc/iso_8859_16.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_16.$(OBJEXT): config.h
-enc/iso_8859_16.$(OBJEXT): defines.h
-enc/iso_8859_16.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_16.$(OBJEXT): enc/iso_8859_16.c
-enc/iso_8859_16.$(OBJEXT): missing.h
-enc/iso_8859_16.$(OBJEXT): oniguruma.h
-enc/iso_8859_2.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_2.$(OBJEXT): config.h
-enc/iso_8859_2.$(OBJEXT): defines.h
-enc/iso_8859_2.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_2.$(OBJEXT): enc/iso_8859_2.c
-enc/iso_8859_2.$(OBJEXT): missing.h
-enc/iso_8859_2.$(OBJEXT): oniguruma.h
-enc/iso_8859_3.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_3.$(OBJEXT): config.h
-enc/iso_8859_3.$(OBJEXT): defines.h
-enc/iso_8859_3.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_3.$(OBJEXT): enc/iso_8859_3.c
-enc/iso_8859_3.$(OBJEXT): missing.h
-enc/iso_8859_3.$(OBJEXT): oniguruma.h
-enc/iso_8859_4.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_4.$(OBJEXT): config.h
-enc/iso_8859_4.$(OBJEXT): defines.h
-enc/iso_8859_4.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_4.$(OBJEXT): enc/iso_8859_4.c
-enc/iso_8859_4.$(OBJEXT): missing.h
-enc/iso_8859_4.$(OBJEXT): oniguruma.h
-enc/iso_8859_5.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_5.$(OBJEXT): config.h
-enc/iso_8859_5.$(OBJEXT): defines.h
-enc/iso_8859_5.$(OBJEXT): enc/iso_8859_5.c
-enc/iso_8859_5.$(OBJEXT): missing.h
-enc/iso_8859_5.$(OBJEXT): oniguruma.h
-enc/iso_8859_6.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_6.$(OBJEXT): config.h
-enc/iso_8859_6.$(OBJEXT): defines.h
-enc/iso_8859_6.$(OBJEXT): enc/iso_8859_6.c
-enc/iso_8859_6.$(OBJEXT): missing.h
-enc/iso_8859_6.$(OBJEXT): oniguruma.h
-enc/iso_8859_7.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_7.$(OBJEXT): config.h
-enc/iso_8859_7.$(OBJEXT): defines.h
-enc/iso_8859_7.$(OBJEXT): enc/iso_8859_7.c
-enc/iso_8859_7.$(OBJEXT): missing.h
-enc/iso_8859_7.$(OBJEXT): oniguruma.h
-enc/iso_8859_8.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_8.$(OBJEXT): config.h
-enc/iso_8859_8.$(OBJEXT): defines.h
-enc/iso_8859_8.$(OBJEXT): enc/iso_8859_8.c
-enc/iso_8859_8.$(OBJEXT): missing.h
-enc/iso_8859_8.$(OBJEXT): oniguruma.h
-enc/iso_8859_9.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/iso_8859_9.$(OBJEXT): config.h
-enc/iso_8859_9.$(OBJEXT): defines.h
-enc/iso_8859_9.$(OBJEXT): enc/iso_8859.h
-enc/iso_8859_9.$(OBJEXT): enc/iso_8859_9.c
-enc/iso_8859_9.$(OBJEXT): missing.h
-enc/iso_8859_9.$(OBJEXT): oniguruma.h
-enc/koi8_r.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/koi8_r.$(OBJEXT): config.h
-enc/koi8_r.$(OBJEXT): defines.h
-enc/koi8_r.$(OBJEXT): enc/koi8_r.c
-enc/koi8_r.$(OBJEXT): missing.h
-enc/koi8_r.$(OBJEXT): oniguruma.h
-enc/koi8_u.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/koi8_u.$(OBJEXT): config.h
-enc/koi8_u.$(OBJEXT): defines.h
-enc/koi8_u.$(OBJEXT): enc/koi8_u.c
-enc/koi8_u.$(OBJEXT): missing.h
-enc/koi8_u.$(OBJEXT): oniguruma.h
-enc/shift_jis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/shift_jis.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/shift_jis.$(OBJEXT): $(top_srcdir)/regint.h
-enc/shift_jis.$(OBJEXT): backward.h
-enc/shift_jis.$(OBJEXT): config.h
-enc/shift_jis.$(OBJEXT): defines.h
-enc/shift_jis.$(OBJEXT): enc/jis/props.h
-enc/shift_jis.$(OBJEXT): enc/jis/props.kwd
-enc/shift_jis.$(OBJEXT): enc/shift_jis.c
-enc/shift_jis.$(OBJEXT): intern.h
-enc/shift_jis.$(OBJEXT): missing.h
-enc/shift_jis.$(OBJEXT): oniguruma.h
-enc/shift_jis.$(OBJEXT): st.h
-enc/shift_jis.$(OBJEXT): subst.h
-enc/trans/big5.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/big5.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/big5.$(OBJEXT): backward.h
-enc/trans/big5.$(OBJEXT): config.h
-enc/trans/big5.$(OBJEXT): defines.h
-enc/trans/big5.$(OBJEXT): enc/trans/big5.c
-enc/trans/big5.$(OBJEXT): intern.h
-enc/trans/big5.$(OBJEXT): missing.h
-enc/trans/big5.$(OBJEXT): st.h
-enc/trans/big5.$(OBJEXT): subst.h
-enc/trans/chinese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/chinese.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/chinese.$(OBJEXT): backward.h
-enc/trans/chinese.$(OBJEXT): config.h
-enc/trans/chinese.$(OBJEXT): defines.h
-enc/trans/chinese.$(OBJEXT): enc/trans/chinese.c
-enc/trans/chinese.$(OBJEXT): intern.h
-enc/trans/chinese.$(OBJEXT): missing.h
-enc/trans/chinese.$(OBJEXT): st.h
-enc/trans/chinese.$(OBJEXT): subst.h
-enc/trans/ebcdic.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/ebcdic.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/ebcdic.$(OBJEXT): backward.h
-enc/trans/ebcdic.$(OBJEXT): config.h
-enc/trans/ebcdic.$(OBJEXT): defines.h
-enc/trans/ebcdic.$(OBJEXT): enc/trans/ebcdic.c
-enc/trans/ebcdic.$(OBJEXT): intern.h
-enc/trans/ebcdic.$(OBJEXT): missing.h
-enc/trans/ebcdic.$(OBJEXT): st.h
-enc/trans/ebcdic.$(OBJEXT): subst.h
-enc/trans/emoji.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/emoji.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/emoji.$(OBJEXT): backward.h
-enc/trans/emoji.$(OBJEXT): config.h
-enc/trans/emoji.$(OBJEXT): defines.h
-enc/trans/emoji.$(OBJEXT): enc/trans/emoji.c
-enc/trans/emoji.$(OBJEXT): intern.h
-enc/trans/emoji.$(OBJEXT): missing.h
-enc/trans/emoji.$(OBJEXT): st.h
-enc/trans/emoji.$(OBJEXT): subst.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): backward.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): config.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): defines.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): enc/trans/emoji_iso2022_kddi.c
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): intern.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): missing.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): st.h
-enc/trans/emoji_iso2022_kddi.$(OBJEXT): subst.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): backward.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): config.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): defines.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): enc/trans/emoji_sjis_docomo.c
-enc/trans/emoji_sjis_docomo.$(OBJEXT): intern.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): missing.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): st.h
-enc/trans/emoji_sjis_docomo.$(OBJEXT): subst.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): backward.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): config.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): defines.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): enc/trans/emoji_sjis_kddi.c
-enc/trans/emoji_sjis_kddi.$(OBJEXT): intern.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): missing.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): st.h
-enc/trans/emoji_sjis_kddi.$(OBJEXT): subst.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): backward.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): config.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): defines.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): enc/trans/emoji_sjis_softbank.c
-enc/trans/emoji_sjis_softbank.$(OBJEXT): intern.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): missing.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): st.h
-enc/trans/emoji_sjis_softbank.$(OBJEXT): subst.h
-enc/trans/escape.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/escape.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/escape.$(OBJEXT): backward.h
-enc/trans/escape.$(OBJEXT): config.h
-enc/trans/escape.$(OBJEXT): defines.h
-enc/trans/escape.$(OBJEXT): enc/trans/escape.c
-enc/trans/escape.$(OBJEXT): intern.h
-enc/trans/escape.$(OBJEXT): missing.h
-enc/trans/escape.$(OBJEXT): st.h
-enc/trans/escape.$(OBJEXT): subst.h
-enc/trans/gb18030.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/gb18030.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/gb18030.$(OBJEXT): backward.h
-enc/trans/gb18030.$(OBJEXT): config.h
-enc/trans/gb18030.$(OBJEXT): defines.h
-enc/trans/gb18030.$(OBJEXT): enc/trans/gb18030.c
-enc/trans/gb18030.$(OBJEXT): intern.h
-enc/trans/gb18030.$(OBJEXT): missing.h
-enc/trans/gb18030.$(OBJEXT): st.h
-enc/trans/gb18030.$(OBJEXT): subst.h
-enc/trans/gbk.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/gbk.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/gbk.$(OBJEXT): backward.h
-enc/trans/gbk.$(OBJEXT): config.h
-enc/trans/gbk.$(OBJEXT): defines.h
-enc/trans/gbk.$(OBJEXT): enc/trans/gbk.c
-enc/trans/gbk.$(OBJEXT): intern.h
-enc/trans/gbk.$(OBJEXT): missing.h
-enc/trans/gbk.$(OBJEXT): st.h
-enc/trans/gbk.$(OBJEXT): subst.h
-enc/trans/iso2022.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/iso2022.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/iso2022.$(OBJEXT): backward.h
-enc/trans/iso2022.$(OBJEXT): config.h
-enc/trans/iso2022.$(OBJEXT): defines.h
-enc/trans/iso2022.$(OBJEXT): enc/trans/iso2022.c
-enc/trans/iso2022.$(OBJEXT): intern.h
-enc/trans/iso2022.$(OBJEXT): missing.h
-enc/trans/iso2022.$(OBJEXT): st.h
-enc/trans/iso2022.$(OBJEXT): subst.h
-enc/trans/japanese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/japanese.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/japanese.$(OBJEXT): backward.h
-enc/trans/japanese.$(OBJEXT): config.h
-enc/trans/japanese.$(OBJEXT): defines.h
-enc/trans/japanese.$(OBJEXT): enc/trans/japanese.c
-enc/trans/japanese.$(OBJEXT): intern.h
-enc/trans/japanese.$(OBJEXT): missing.h
-enc/trans/japanese.$(OBJEXT): st.h
-enc/trans/japanese.$(OBJEXT): subst.h
-enc/trans/japanese_euc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/japanese_euc.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/japanese_euc.$(OBJEXT): backward.h
-enc/trans/japanese_euc.$(OBJEXT): config.h
-enc/trans/japanese_euc.$(OBJEXT): defines.h
-enc/trans/japanese_euc.$(OBJEXT): enc/trans/japanese_euc.c
-enc/trans/japanese_euc.$(OBJEXT): intern.h
-enc/trans/japanese_euc.$(OBJEXT): missing.h
-enc/trans/japanese_euc.$(OBJEXT): st.h
-enc/trans/japanese_euc.$(OBJEXT): subst.h
-enc/trans/japanese_sjis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/japanese_sjis.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/japanese_sjis.$(OBJEXT): backward.h
-enc/trans/japanese_sjis.$(OBJEXT): config.h
-enc/trans/japanese_sjis.$(OBJEXT): defines.h
-enc/trans/japanese_sjis.$(OBJEXT): enc/trans/japanese_sjis.c
-enc/trans/japanese_sjis.$(OBJEXT): intern.h
-enc/trans/japanese_sjis.$(OBJEXT): missing.h
-enc/trans/japanese_sjis.$(OBJEXT): st.h
-enc/trans/japanese_sjis.$(OBJEXT): subst.h
-enc/trans/korean.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/korean.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/korean.$(OBJEXT): backward.h
-enc/trans/korean.$(OBJEXT): config.h
-enc/trans/korean.$(OBJEXT): defines.h
-enc/trans/korean.$(OBJEXT): enc/trans/korean.c
-enc/trans/korean.$(OBJEXT): intern.h
-enc/trans/korean.$(OBJEXT): missing.h
-enc/trans/korean.$(OBJEXT): st.h
-enc/trans/korean.$(OBJEXT): subst.h
-enc/trans/newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/newline.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/newline.$(OBJEXT): config.h
-enc/trans/newline.$(OBJEXT): defines.h
-enc/trans/newline.$(OBJEXT): enc/trans/newline.c
-enc/trans/newline.$(OBJEXT): intern.h
-enc/trans/newline.$(OBJEXT): missing.h
-enc/trans/newline.$(OBJEXT): st.h
-enc/trans/newline.$(OBJEXT): subst.h
-enc/trans/single_byte.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/single_byte.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/single_byte.$(OBJEXT): backward.h
-enc/trans/single_byte.$(OBJEXT): config.h
-enc/trans/single_byte.$(OBJEXT): defines.h
-enc/trans/single_byte.$(OBJEXT): enc/trans/single_byte.c
-enc/trans/single_byte.$(OBJEXT): intern.h
-enc/trans/single_byte.$(OBJEXT): missing.h
-enc/trans/single_byte.$(OBJEXT): st.h
-enc/trans/single_byte.$(OBJEXT): subst.h
-enc/trans/transdb.$(OBJEXT): enc/trans/transdb.c
-enc/trans/transdb.$(OBJEXT): transdb.h
-enc/trans/utf8_mac.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/utf8_mac.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/utf8_mac.$(OBJEXT): backward.h
-enc/trans/utf8_mac.$(OBJEXT): config.h
-enc/trans/utf8_mac.$(OBJEXT): defines.h
-enc/trans/utf8_mac.$(OBJEXT): enc/trans/utf8_mac.c
-enc/trans/utf8_mac.$(OBJEXT): intern.h
-enc/trans/utf8_mac.$(OBJEXT): missing.h
-enc/trans/utf8_mac.$(OBJEXT): st.h
-enc/trans/utf8_mac.$(OBJEXT): subst.h
-enc/trans/utf_16_32.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/trans/utf_16_32.$(OBJEXT): $(top_srcdir)/transcode_data.h
-enc/trans/utf_16_32.$(OBJEXT): backward.h
-enc/trans/utf_16_32.$(OBJEXT): config.h
-enc/trans/utf_16_32.$(OBJEXT): defines.h
-enc/trans/utf_16_32.$(OBJEXT): enc/trans/utf_16_32.c
-enc/trans/utf_16_32.$(OBJEXT): intern.h
-enc/trans/utf_16_32.$(OBJEXT): missing.h
-enc/trans/utf_16_32.$(OBJEXT): st.h
-enc/trans/utf_16_32.$(OBJEXT): subst.h
-enc/unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/unicode.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/unicode.$(OBJEXT): $(top_srcdir)/regint.h
-enc/unicode.$(OBJEXT): config.h
-enc/unicode.$(OBJEXT): defines.h
-enc/unicode.$(OBJEXT): enc/unicode.c
-enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/casefold.h
-enc/unicode.$(OBJEXT): $(UNICODE_HDR_DIR)/name2ctype.h
-enc/unicode.$(OBJEXT): intern.h
-enc/unicode.$(OBJEXT): missing.h
-enc/unicode.$(OBJEXT): oniguruma.h
-enc/unicode.$(OBJEXT): st.h
-enc/unicode.$(OBJEXT): subst.h
-enc/us_ascii.$(OBJEXT): $(top_srcdir)/encindex.h
-enc/us_ascii.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/us_ascii.$(OBJEXT): config.h
-enc/us_ascii.$(OBJEXT): defines.h
-enc/us_ascii.$(OBJEXT): enc/us_ascii.c
-enc/us_ascii.$(OBJEXT): missing.h
-enc/us_ascii.$(OBJEXT): oniguruma.h
-enc/utf_16be.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/utf_16be.$(OBJEXT): config.h
-enc/utf_16be.$(OBJEXT): defines.h
-enc/utf_16be.$(OBJEXT): enc/iso_8859.h
-enc/utf_16be.$(OBJEXT): enc/utf_16be.c
-enc/utf_16be.$(OBJEXT): missing.h
-enc/utf_16be.$(OBJEXT): oniguruma.h
-enc/utf_16le.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/utf_16le.$(OBJEXT): config.h
-enc/utf_16le.$(OBJEXT): defines.h
-enc/utf_16le.$(OBJEXT): enc/iso_8859.h
-enc/utf_16le.$(OBJEXT): enc/utf_16le.c
-enc/utf_16le.$(OBJEXT): missing.h
-enc/utf_16le.$(OBJEXT): oniguruma.h
-enc/utf_32be.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/utf_32be.$(OBJEXT): config.h
-enc/utf_32be.$(OBJEXT): defines.h
-enc/utf_32be.$(OBJEXT): enc/iso_8859.h
-enc/utf_32be.$(OBJEXT): enc/utf_32be.c
-enc/utf_32be.$(OBJEXT): missing.h
-enc/utf_32be.$(OBJEXT): oniguruma.h
-enc/utf_32le.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/utf_32le.$(OBJEXT): config.h
-enc/utf_32le.$(OBJEXT): defines.h
-enc/utf_32le.$(OBJEXT): enc/iso_8859.h
-enc/utf_32le.$(OBJEXT): enc/utf_32le.c
-enc/utf_32le.$(OBJEXT): missing.h
-enc/utf_32le.$(OBJEXT): oniguruma.h
-enc/utf_8.$(OBJEXT): $(top_srcdir)/encindex.h
-enc/utf_8.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/utf_8.$(OBJEXT): config.h
-enc/utf_8.$(OBJEXT): defines.h
-enc/utf_8.$(OBJEXT): enc/utf_8.c
-enc/utf_8.$(OBJEXT): missing.h
-enc/utf_8.$(OBJEXT): oniguruma.h
-enc/windows_1250.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/windows_1250.$(OBJEXT): config.h
-enc/windows_1250.$(OBJEXT): defines.h
-enc/windows_1250.$(OBJEXT): enc/windows_1250.c
-enc/windows_1250.$(OBJEXT): missing.h
-enc/windows_1250.$(OBJEXT): oniguruma.h
-enc/windows_1251.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/windows_1251.$(OBJEXT): config.h
-enc/windows_1251.$(OBJEXT): defines.h
-enc/windows_1251.$(OBJEXT): enc/windows_1251.c
-enc/windows_1251.$(OBJEXT): missing.h
-enc/windows_1251.$(OBJEXT): oniguruma.h
-enc/windows_1252.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/windows_1252.$(OBJEXT): config.h
-enc/windows_1252.$(OBJEXT): defines.h
-enc/windows_1252.$(OBJEXT): enc/windows_1252.c
-enc/windows_1252.$(OBJEXT): missing.h
-enc/windows_1252.$(OBJEXT): oniguruma.h
-enc/windows_31j.$(OBJEXT): $(hdrdir)/ruby/ruby.h
-enc/windows_31j.$(OBJEXT): $(top_srcdir)/regenc.h
-enc/windows_31j.$(OBJEXT): $(top_srcdir)/regint.h
-enc/windows_31j.$(OBJEXT): backward.h
-enc/windows_31j.$(OBJEXT): config.h
-enc/windows_31j.$(OBJEXT): defines.h
-enc/windows_31j.$(OBJEXT): enc/jis/props.h
-enc/windows_31j.$(OBJEXT): enc/jis/props.kwd
-enc/windows_31j.$(OBJEXT): enc/shift_jis.c
-enc/windows_31j.$(OBJEXT): enc/windows_31j.c
-enc/windows_31j.$(OBJEXT): intern.h
-enc/windows_31j.$(OBJEXT): missing.h
-enc/windows_31j.$(OBJEXT): oniguruma.h
-enc/windows_31j.$(OBJEXT): st.h
-enc/windows_31j.$(OBJEXT): subst.h
-# AUTOGENERATED DEPENDENCIES END
diff --git a/enc/ebcdic.h b/enc/ebcdic.h
deleted file mode 100644
index a3b380a327..0000000000
--- a/enc/ebcdic.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "regenc.h"
-/* dummy for unsupported, non-ascii-based encoding */
-ENC_DUMMY("IBM037");
-ENC_ALIAS("ebcdic-cp-us", "IBM037");
-
-/* we start with just defining a single EBCDIC encoding,
- * hopefully the most widely used one.
- *
- * See http://www.iana.org/assignments/character-sets/character-sets.xhtml
- *     http://tools.ietf.org/html/rfc1345
- */
diff --git a/enc/emacs_mule.c b/enc/emacs_mule.c
index f92eb183cf..275c8f47dc 100644
--- a/enc/emacs_mule.c
+++ b/enc/emacs_mule.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regenc.h"
+#include "regint.h"
 
 
 #define emacsmule_islead(c)    ((UChar )(c) < 0x9e)
@@ -334,7 +334,6 @@ OnigEncodingDefine(emacs_mule, Emacs_Mule) = {
   onigenc_not_support_get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/encdb.c b/enc/encdb.c
index a41e4edc6d..fa04a5f7f6 100644
--- a/enc/encdb.c
+++ b/enc/encdb.c
@@ -9,8 +9,13 @@
 
 **********************************************************************/
 
-#include "internal.h"
-
+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);
+int rb_enc_set_dummy(int index);
+void rb_encdb_set_unicode(int index);
 #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)
diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb
index 70c2a1934c..fd3ade0c4b 100644
--- a/enc/encinit.c.erb
+++ b/enc/encinit.c.erb
@@ -8,30 +8,19 @@
     ruby_init_ext(name, func);	\
 }
 
-#define init_enc(name) init(Init_##name, "enc/"#name".so")
-#define init_trans(name) init(Init_trans_##name, "enc/trans/"#name".so")
-#define provide(func, name) { \
-    extern void Init_##func(void); \
-    Init_##func(); \
-    rb_provide(name".so"); \
-}
-
 void ruby_init_ext(const char *name, void (*init)(void));
-void rb_provide(const char *feature);
 
 void
 Init_enc(void)
 {
-    provide(encdb, "encdb");
 % ENCS.each do |enc|
-%   next if enc == 'encdb'
-    init_enc(<%= enc %>);
+    init(Init_<%= enc %>, "enc/<%= enc %>.so");
 % end
 
-    provide(transdb, "trans/transdb");
+    init(Init_transdb, "enc/trans/transdb.so");
 % TRANS.each do |trans|
 %   next if trans == 'trans/transdb'
-    init_trans(<%= File.basename trans %>);
+    init(Init_trans_<%= File.basename trans %>, "enc/<%= trans %>.so");
 % end
 }
 <%# vim: set ft=eruby sw=2 : -%>
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index ded051af69..61bb8ba65a 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regenc.h"
+#include "regint.h"
 
 #define eucjp_islead(c)    ((UChar )((c) - 0xa1) > 0xfe - 0xa1)
 
@@ -381,10 +381,8 @@ mbc_case_fold(OnigCaseFoldType flag,
     OnigCodePoint code;
     int len;
 
-    len = mbc_enc_len(p, end, enc);
     code = get_lower_case(mbc_to_code(p, end, enc));
     len = code_to_mbc(code, lower, enc);
-    if (len == ONIGERR_INVALID_CODE_POINT_VALUE) len = 1;
     (*pp) += len;
     return len; /* return byte length of converted char to lower */
   }
@@ -503,9 +501,9 @@ static const OnigCodePoint CR_Cyrillic[] = {
 #include "enc/jis/props.h"
 
 static int
-property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end)
+property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
-  const UChar *s = p, *e = end;
+  UChar *s = p, *e = end;
   const struct enc_property *prop =
     onig_jis_property((const char* )s, (unsigned int )(e - s));
 
@@ -576,7 +574,6 @@ OnigEncodingDefine(euc_jp, EUC_JP) = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/euc_kr.c b/enc/euc_kr.c
index 21d6ab4e1c..55acf00168 100644
--- a/enc/euc_kr.c
+++ b/enc/euc_kr.c
@@ -188,33 +188,7 @@ OnigEncodingDefine(euc_kr, EUC_KR) = {
   onigenc_not_support_get_ctype_code_range,
   euckr_left_adjust_char_head,
   euckr_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("eucKR", "EUC-KR")
-
-#ifndef RUBY
-/* Same with OnigEncodingEUC_KR except the name */
-OnigEncodingDefine(euc_cn, EUC_CN) = {
-  euckr_mbc_enc_len,
-  "EUC-CN",   /* 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,
-  onigenc_ascii_only_case_map,
-  0,
-  ONIGENC_FLAG_NONE,
-};
-#endif /* RUBY */
diff --git a/enc/euc_tw.c b/enc/euc_tw.c
index 1c5659cb1d..6d193b745e 100644
--- a/enc/euc_tw.c
+++ b/enc/euc_tw.c
@@ -221,7 +221,6 @@ OnigEncodingDefine(euc_tw, EUC_TW) = {
   onigenc_not_support_get_ctype_code_range,
   euctw_left_adjust_char_head,
   euctw_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/gb18030.c b/enc/gb18030.c
index 63d2e633ec..d4184333f5 100644
--- a/enc/gb18030.c
+++ b/enc/gb18030.c
@@ -597,7 +597,7 @@ OnigEncodingDefine(gb18030, GB18030) = {
   onigenc_not_support_get_ctype_code_range,
   gb18030_left_adjust_char_head,
   gb18030_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
+
diff --git a/enc/gbk.c b/enc/gbk.c
index 31032553bf..7be60a0de9 100644
--- a/enc/gbk.c
+++ b/enc/gbk.c
@@ -211,7 +211,6 @@ OnigEncodingDefine(gbk, GBK) = {
   onigenc_not_support_get_ctype_code_range,
   gbk_left_adjust_char_head,
   gbk_is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_2022_jp.h b/enc/iso_2022_jp.h
index 9240130166..399c2f56a5 100644
--- a/enc/iso_2022_jp.h
+++ b/enc/iso_2022_jp.h
@@ -1,5 +1,5 @@
 #include "regenc.h"
-/* dummy for unsupported, stateful encoding */
+/* 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");
diff --git a/enc/iso_8859.h b/enc/iso_8859.h
deleted file mode 100644
index 0ec1468661..0000000000
--- a/enc/iso_8859.h
+++ /dev/null
@@ -1 +0,0 @@
-#define SHARP_s 0xdf
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index 7af0888c3e..088b427d1c 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
   ((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
@@ -126,7 +125,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	&& (*(p+1) == 0x53 || *(p+1) == 0x73)) { /* SS */
       items[1].byte_len = 2;
       items[1].code_len = 1;
-      items[1].code[0] = (OnigCodePoint )SHARP_s;
+      items[1].code[0] = (OnigCodePoint )0xdf;
       return 2;
     }
     else
@@ -140,7 +139,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	&& (*(p+1) == 0x73 || *(p+1) == 0x53)) { /* ss */
       items[1].byte_len = 2;
       items[1].code_len = 1;
-      items[1].code[0] = (OnigCodePoint )SHARP_s;
+      items[1].code[0] = (OnigCodePoint )0xdf;
       return 2;
     }
     else
@@ -153,7 +152,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
     return 1;
   }
   else if (0xd0 <= *p && *p <= 0xdf) {
-    if (*p == SHARP_s) {
+    if (*p == 0xdf) {
       items[0].byte_len = 1;
       items[0].code_len = 2;
       items[0].code[0] = (OnigCodePoint )'s';
@@ -207,7 +206,7 @@ mbc_case_fold(OnigCaseFoldType flag, const UChar** pp, const UChar* end ARG_UNUS
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -227,7 +226,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -255,49 +254,6 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
     return FALSE;
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code += 0x20;
-    }
-    else if (code == 0xAA || code == 0xBA || code == 0xB5 || code == 0xFF)
-      ;
-    else if ((EncISO_8859_1_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-1",  /* name */
@@ -315,8 +271,17 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 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
index cae4be2db0..ab71a5adcf 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_10_TO_LOWER_CASE(c) EncISO_8859_10_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_10_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -215,61 +214,15 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if (code == 0xBD || code == 0xFF)
-      ;
-    else if ((EncISO_8859_10_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_10_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_10_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code >= 0xA0 && code <= 0xBF)
-	code -= 0x10;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-10", /* name */
@@ -287,7 +240,6 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_11.c b/enc/iso_8859_11.c
index 85e8f2cdb4..ec9840e127 100644
--- a/enc/iso_8859_11.c
+++ b/enc/iso_8859_11.c
@@ -93,7 +93,6 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index fe1ddd7065..11b3dda1c9 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_13_TO_LOWER_CASE(c) EncISO_8859_13_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_13_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -159,10 +158,6 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 }
 
 static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa8, 0xb8 },
- { 0xaa, 0xba },
- { 0xaf, 0xbf },
-
  { 0xc0, 0xe0 },
  { 0xc1, 0xe1 },
  { 0xc2, 0xe2 },
@@ -208,63 +203,15 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncISO_8859_13_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_13_TO_LOWER_CASE(code);
-    }
-    else if (code == 0xB5)
-      ;
-    else if ((EncISO_8859_13_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xB8 || code == 0xBA || code == 0xBF) {
-        code -= 0x10;
-      }
-      else {
-        code -= 0x20;
-      }
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-13",  /* name */
@@ -282,8 +229,17 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 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
index 647514a016..2939e89b7b 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_14_TO_LOWER_CASE(c) EncISO_8859_14_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_14_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -131,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -217,70 +216,15 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    /* else if (code == 0xAA || code == 0xBA) ; */
-    else if ((EncISO_8859_14_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_14_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_14_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xA2 || code == 0xA5 || code == 0xB1 || code == 0xB3 || code == 0xB5 || code == 0xBE)
-	code -= 0x1;
-      else if (code == 0xAB)
-	code -= 0x5;
-      else if (code == 0xFF)
-	code -= 0x50;
-      else if (code == 0xB9)
-	code -= 0x2;
-      else if (code == 0xBF)
-	code -= 0x4;
-      else if (code == 0xB8 || code == 0xBA || code == 0xBC)
-	code -= 0x10;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-14",  /* name */
@@ -298,7 +242,6 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 377a3afc7b..fdb7ca12d7 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_15_TO_LOWER_CASE(c) EncISO_8859_15_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_15_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -131,7 +130,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag,
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -211,67 +210,15 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if (code == 0xAA || code == 0xBA || code == 0xB5)
-      ;
-    else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_15_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_15_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xA8)
-	code -= 2;
-      else if (code == 0xB8)
-	code -= 4;
-      else if (code == 0xBD)
-	code -= 1;
-      else if (code == 0xFF)
-	code -= 0x41;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-15",  /* name */
@@ -289,7 +236,6 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 135630eb73..5e53f3b6d0 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_16_TO_LOWER_CASE(c) EncISO_8859_16_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_16_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -213,69 +212,15 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
+				       const OnigUChar* p, const OnigUChar* end,
+				       OnigCaseFoldCodeItem items[],
+				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_16_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_16_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags&ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xA2 || code == 0xBD)
-	code--;
-      else if (code == 0xB3 || code == 0xBA || code == 0xBF)
-	code -= 0x10;
-      else if (code == 0xA8 || code == 0xAE)
-	code -= 0x02;
-      else if (code == 0xB9)
-	code -= 0x07;
-      else if (code == 0xB8)
-	code -= 0x04;
-      else if (code == 0xFF)
-	code -= 0x41;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-16",  /* name */
@@ -293,7 +238,6 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
index 3a05c6320d..94613e661b 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_2_TO_LOWER_CASE(c) EncISO_8859_2_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_2_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -220,53 +219,6 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
     return FALSE;
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncISO_8859_2_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_2_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_2_CtypeTable[code] & BIT_CTYPE_LOWER)
-       && (flags & ONIGENC_CASE_UPCASE)) {
-      if (code >= 0xB1 && code <= 0xBF) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code -= 0x10;
-      }
-      else {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code -= 0x20;
-      }
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-2",  /* name */
@@ -284,8 +236,17 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 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
index 2a343eac63..863a575020 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_3_TO_LOWER_CASE(c) EncISO_8859_3_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_3_CTYPE(code,ctype) \
@@ -56,7 +55,7 @@ static const UChar EncISO_8859_3_ToLowerCaseTable[256] = {
   '\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', '\151', '\272', '\273', '\274', '\255', '\256', '\277',
+  '\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',
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -161,7 +160,7 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 static const OnigPairCaseFoldCodes CaseFoldMap[] = {
  { 0xa1, 0xb1 },
  { 0xa6, 0xb6 },
- /*{ 0xa9, 0xb9 }, exclude dotless i/I with dot; not a case pair */
+ { 0xa9, 0xb9 },
  { 0xaa, 0xba },
  { 0xab, 0xbb },
  { 0xac, 0xbc },
@@ -220,63 +219,6 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-#define DOTLESS_i        (0xB9)
-#define I_WITH_DOT_ABOVE (0xA9)
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if (code == 0xB5)
-      ;
-    else if ((EncISO_8859_3_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-        code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
-      else
-	code = ENC_ISO_8859_3_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_3_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'i')
-        code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
-      else if (code == DOTLESS_i)
-        code = 'I';
-      else if (code >= 0xB0 && code <= 0xBF) {
-	code -= 0x10;
-      }
-      else {
-	code -= 0x20;
-      }
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-3",  /* name */
@@ -294,7 +236,6 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index e2134e8c0b..48b999e756 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_4_TO_LOWER_CASE(c) EncISO_8859_4_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_4_CTYPE(code,ctype) \
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -167,7 +166,6 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = {
  { 0xab, 0xbb },
  { 0xac, 0xbc },
  { 0xae, 0xbe },
- { 0xbd, 0xbf },
 
  { 0xc0, 0xe0 },
  { 0xc1, 0xe1 },
@@ -223,56 +221,6 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncISO_8859_4_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_4_TO_LOWER_CASE(code);
-    }
-    else if (code == 0xA2)
-      ;
-    else if ((EncISO_8859_4_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code >= 0xA0 && code <= 0xBF) {
-	if (code == 0xBF)
-	  code -= 0x02;
-	else
-	  code -= 0x10;
-      }
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-4",  /* name */
@@ -290,7 +238,6 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
index 6fafc35823..e71a488c4c 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -209,38 +209,6 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if ((EncISO_8859_5_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_5_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_5_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (0xF1 <= code && code <= 0xFF)
-	code -= 0x50;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-5",  /* name */
@@ -258,7 +226,6 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_6.c b/enc/iso_8859_6.c
index 6d852ac8c0..638a181dc2 100644
--- a/enc/iso_8859_6.c
+++ b/enc/iso_8859_6.c
@@ -93,7 +93,6 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
index ac973f74ba..8d07cb6310 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -205,60 +205,6 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == 0xF2) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code = 0xD3;
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code = 0xF3;
-      }
-    }
-    else if ((EncISO_8859_7_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_ISO_8859_7_TO_LOWER_CASE(code);
-    }
-    else if (code == 0xC0 || code == 0xE0)
-      ;
-    else if ((EncISO_8859_7_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xDC) {
-	code -= 0x26;
-      }
-      else if (code >= 0xDD && code <= 0xDF) {
-	code -= 0x25;
-      }
-      else if (code == 0xFC) {
-	code -= 0x40;
-      }
-      else if (code == 0xFD || code == 0xFE) {
-	code -= 0x3F;
-      }
-      else {
-	code -= 0x20;
-      }
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
 
 OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
   onigenc_single_byte_mbc_enc_len,
@@ -277,8 +223,17 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 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
index 0a7a29e82e..87a6e7bc9b 100644
--- a/enc/iso_8859_8.c
+++ b/enc/iso_8859_8.c
@@ -93,7 +93,6 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
index 004eec310f..211ba3b2f3 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #define ENC_ISO_8859_9_TO_LOWER_CASE(c) EncISO_8859_9_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_9_CTYPE(code,ctype) \
@@ -62,7 +61,7 @@ static const UChar EncISO_8859_9_ToLowerCaseTable[256] = {
   '\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', '\151', '\376', '\337',
+  '\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',
@@ -111,7 +110,7 @@ mbc_case_fold(OnigCaseFoldType flag,
 {
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     *lower++ = 's';
     *lower   = 's';
     (*pp)++;
@@ -130,7 +129,7 @@ is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* end)
   int v;
   const UChar* p = *pp;
 
-  if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+  if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     (*pp)++;
     return TRUE;
   }
@@ -188,7 +187,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = {
   { 0xda, 0xfa },
   { 0xdb, 0xfb },
   { 0xdc, 0xfc },
-  /*{ 0xdd, 0xfd }, exclude dotless i/I with dot; not a case pair */
+  { 0xdd, 0xfd },
   { 0xde, 0xfe }
 };
 
@@ -204,68 +203,15 @@ apply_all_case_fold(OnigCaseFoldType flag,
 
 static int
 get_case_fold_codes_by_str(OnigCaseFoldType flag,
-			   const OnigUChar* p, const OnigUChar* end,
-			   OnigCaseFoldCodeItem items[],
-			   OnigEncoding enc ARG_UNUSED)
+				      const OnigUChar* p, const OnigUChar* end,
+				      OnigCaseFoldCodeItem items[],
+				      OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
 	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
-#define DOTLESS_i        (0xFD)
-#define I_WITH_DOT_ABOVE (0xDD)
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if (code == 0xAA || code == 0xB5 || code == 0xBA || code == 0xFF)
-      ;
-    else if ((EncISO_8859_9_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
-      else
-	code = ENC_ISO_8859_9_TO_LOWER_CASE(code);
-    }
-    else if ((EncISO_8859_9_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'i')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
-      else if (code == DOTLESS_i)
-	code = 'I';
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
   onigenc_single_byte_mbc_enc_len,
   "ISO-8859-9",  /* name */
@@ -283,8 +229,17 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 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
index a520975774..85fa72287e 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -214,8 +214,8 @@ OnigEncodingDefine(koi8_r, KOI8_R) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("CP878", "KOI8-R")
+
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
index 50bb78bd04..0ae449ca21 100644
--- a/enc/koi8_u.c
+++ b/enc/koi8_u.c
@@ -218,7 +218,6 @@ OnigEncodingDefine(koi8_u, KOI8_U) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index 4ab85f36e3..b917eca0bd 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -9,15 +9,12 @@ if $".grep(/mkmf/).empty?
 end
 require 'erb'
 
-CONFIG['srcdir'] = RbConfig::CONFIG['srcdir']
 CONFIG["MAKEDIRS"] ||= '$(MINIRUBY) -run -e mkdir -- -p'
 
 BUILTIN_ENCS = []
 BUILTIN_TRANSES = []
 ENC_PATTERNS = []
 NOENC_PATTERNS = []
-TRANS_PATTERNS = []
-NOTRANS_PATTERNS = []
 module_type = :dynamic
 
 until ARGV.empty?
@@ -34,12 +31,6 @@ until ARGV.empty?
   when /\A--no-encs=/
     NOENC_PATTERNS.concat $'.split
     ARGV.shift
-  when /\A--transes=/
-    TRANS_PATTERNS.concat $'.split
-    ARGV.shift
-  when /\A--no-transes=/
-    NOTRANS_PATTERNS.concat $'.split
-    ARGV.shift
   when /\A--module$/
     ARGV.shift
   when /\A--modulestatic$/
@@ -52,7 +43,7 @@ end
 
 ALPHANUMERIC_ORDER = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten}
 def target_encodings
-  encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c", "encinit.c"]
+  encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c"]
   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)}}
@@ -60,7 +51,7 @@ def target_encodings
   deps = Hash.new {[]}
   inc_srcs = Hash.new {[]}
   default_deps = %w[regenc.h oniguruma.h config.h defines.h]
-  encs.delete(db = "encdb")
+  db = encs.delete("encdb")
   encs.each do |e|
     File.foreach("#$srcdir/#{e}.c") do |l|
       if /^\s*#\s*include\s+(?:"([^\"]+)"|<(ruby\/\sw+.h)>)/ =~ l
@@ -100,14 +91,9 @@ def target_transcoders
   trans -= BUILTIN_TRANSES
   atrans -= BUILTIN_TRANSES
   trans.uniq!
-  atrans.reject! {|e| !TRANS_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !TRANS_PATTERNS.empty?
-  atrans.reject! {|e| NOTRANS_PATTERNS.any? {|p| File.fnmatch?(p, e)}}
-  trans.reject! {|e| !TRANS_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !TRANS_PATTERNS.empty?
-  trans.reject! {|e| NOTRANS_PATTERNS.any? {|p| File.fnmatch?(p, e)}}
   atrans = atrans.sort_by(&ALPHANUMERIC_ORDER)
   trans = trans.sort_by(&ALPHANUMERIC_ORDER)
-  trans.delete(db = "transdb")
-  trans.unshift(db)
+  trans.unshift(trans.delete("transdb"))
   trans.compact!
   trans |= atrans
   trans.map! {|e| "trans/#{e}"}
@@ -134,9 +120,8 @@ open(ARGV[0], 'wb') {|f|
   f.puts mkin, dep
 }
 if MODULE_TYPE == :static
-  filename = "encinit.c.erb"
-  erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
-  erb.filename = "enc/#{filename}"
+  erb = ERB.new(File.read(File.join($srcdir, "encinit.c.erb")), nil, '%-')
+  erb.filename = "enc/encinit.c.cerb"
   tmp = erb.result(binding)
   begin
     Dir.mkdir 'enc'
diff --git a/enc/mktable.c b/enc/mktable.c
index 4edd5a0ff7..49acf628d0 100644
--- a/enc/mktable.c
+++ b/enc/mktable.c
@@ -2,7 +2,7 @@
   mktable.c
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2016  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * 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
@@ -31,10 +31,7 @@
 #include <stdio.h>
 #include <locale.h>
 
-#ifndef __USE_ISOC99
 #define __USE_ISOC99
-#endif
-
 #include <ctype.h>
 
 #include "regenc.h"
@@ -1111,13 +1108,11 @@ static int exec(FILE* fp, ENC_INFO* einfo)
 #define NCOL  8
 
   int c, val, enc;
-  int r;
 
   enc = einfo->num;
 
-  r = fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
-              einfo->name);
-  if (r < 0) return -1;
+  fprintf(fp, "static const unsigned short Enc%s_CtypeTable[256] = {\n",
+	  einfo->name);
 
   for (c = 0; c < 256; c++) {
     val = 0;
@@ -1136,33 +1131,20 @@ static int exec(FILE* fp, ENC_INFO* einfo)
     if (IsWord  (enc, c))   val |= BIT_CTYPE_WORD;
     if (IsAscii (enc, c))   val |= BIT_CTYPE_ASCII;
 
-    if (c % NCOL == 0) {
-      r = fputs("  ", fp);
-      if (r < 0) return -1;
-    }
-    r = fprintf(fp, "0x%04x", val);
-    if (r < 0) return -1;
-
-    if (c != 255) {
-      r = fputs(",", fp);
-      if (r < 0) return -1;
-    }
+    if (c % NCOL == 0) fputs("  ", fp);
+    fprintf(fp, "0x%04x", val);
+    if (c != 255) fputs(",", fp);
     if (c != 0 && c % NCOL == (NCOL-1))
-      r = fputs("\n", fp);
+      fputs("\n", fp);
     else
-      r = fputs(" ", fp);
-
-    if (r < 0) return -1;
+      fputs(" ", fp);
   }
-  r = fprintf(fp, "};\n");
-  if (r < 0) return -1;
-
+  fprintf(fp, "};\n");
   return 0;
 }
 
 extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
 {
-  int r;
   int i;
   FILE* fp = stdout;
 
@@ -1173,11 +1155,7 @@ extern int main(int argc ARG_UNUSED, char* argv[] ARG_UNUSED)
   /* setlocale(LC_ALL, "fr_FR.iso88591"); */
 
   for (i = 0; i < (int )(sizeof(Info)/sizeof(ENC_INFO)); i++) {
-    r = exec(fp, &Info[i]);
-    if (r < 0) {
-      fprintf(stderr, "FAIL exec(): %d\n", r);
-      return -1;
-    }
+    exec(fp, &Info[i]);
   }
 
   return 0;
diff --git a/enc/prelude.rb b/enc/prelude.rb
index be7c0c9445..8ce59f957a 100644
--- a/enc/prelude.rb
+++ b/enc/prelude.rb
@@ -1,4 +1,6 @@
-begin
-  require 'unicode_normalize'
-rescue LoadError
+%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
index eacca9a5db..cbd3f02051 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -28,7 +28,7 @@
  * SUCH DAMAGE.
  */
 
-#include "regenc.h"
+#include "regint.h"
 
 static const int EncLen_SJIS[] = {
   1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -490,9 +490,9 @@ static const OnigCodePoint CR_Cyrillic[] = {
 #include "enc/jis/props.h"
 
 static int
-property_name_to_ctype(OnigEncoding enc, const UChar* p, const UChar* end)
+property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
-  const UChar *s = p, *e = end;
+  UChar *s = p, *e = end;
   const struct enc_property *prop =
     onig_jis_property((const char* )s, (unsigned int )(e - s));
 
@@ -563,7 +563,6 @@ OnigEncodingDefine(shift_jis, Shift_JIS) = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/trans/JIS/JISX0201-KANA%UCS.src b/enc/trans/JIS/JISX0201-KANA%UCS.src
index d56b97f7cc..d25b580fed 100644
--- a/enc/trans/JIS/JISX0201-KANA%UCS.src
+++ b/enc/trans/JIS/JISX0201-KANA%UCS.src
@@ -12,16 +12,27 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
-# JIS0201.TXT
-# Date: 2015-12-02 23:49:00 GMT [KW]
-# © 2015 Unicode®, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 #	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
 #	Unicode version:  1.1
-#	Table version:    2.0
+#	Table version:    0.9
 #	Table format:     Format A
-#	Date:             2011 October 14 (header updated: 2015 December 02)
+#	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:
 #
@@ -31,7 +42,15 @@ BEGIN_MAP
 # 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.
+# 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
@@ -41,22 +60,6 @@ BEGIN_MAP
 #
 #	The entries are in JIS order
 #
-#  Revision History:
-#
-#    [v2.0, 2015 December 02]
-#    updates to copyright notice and terms of use
-#    no changes to character mappings
-#
-#    [v1.0, 2011 October 14]
-#    Updated terms of use to current wording.
-#    Updated contact information.
-#    No changes to the mapping data.
-#
-#    [v0.9, 8 March 1994]
-#    First release.
-#
-#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
-#    for any questions or comments or to report errors in the data.
 #
 0x21 = 0xFF61
 0x22 = 0xFF62
diff --git a/enc/trans/JIS/JISX0208@1990%UCS.src b/enc/trans/JIS/JISX0208@1990%UCS.src
index 7875969b95..c2cacd422e 100644
--- a/enc/trans/JIS/JISX0208@1990%UCS.src
+++ b/enc/trans/JIS/JISX0208@1990%UCS.src
@@ -12,17 +12,27 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
-#
-# JIS0208.TXT
-# Date: 2015-12-02 23:50:00 GMT [KW]
-# © 2015 Unicode®, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 #	Name:             JIS X 0208 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    2.0
+#	Table version:    0.9
 #	Table format:     Format A
-#	Date:             2011 October 14 (header updated: 2015 December 02)
+#	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:
 #
@@ -32,7 +42,15 @@ BEGIN_MAP
 # 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.
+# 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
@@ -59,22 +77,12 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x7426 -> 0x5406 -> 8406
 #
-#  Revision History:
-#
-#    [v2.0, 2015 December 02]
-#    updates to copyright notice and terms of use
-#    no changes to character mappings
-#
-#    [v1.0, 2011 October 14]
-#    Updated terms of use to current wording.
-#    Updated contact information.
-#    No changes to the mapping data.
+#   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
 #
-#    [v0.9, 8 March 1994]
-#    First release.
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
 #
-#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
-#    for any questions or comments or to report errors in the data.
 #
 # NetBSD specific modification:
 #	2003-08-18 : change the conversion for reverse solidus (0x2140).
diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src
index aa51257b99..cf4e7ecf62 100644
--- a/enc/trans/JIS/JISX0212%UCS.src
+++ b/enc/trans/JIS/JISX0212%UCS.src
@@ -12,16 +12,27 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
-# JIS0212.TXT
-# Date: 2015-12-02 23:51:00 GMT [KW]
-# © 2015 Unicode®, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 #	Name:             JIS X 0212 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    2.0
+#	Table version:    0.9
 #	Table format:     Format A
-#	Date:             2011 October 14 (header updated: 2015 December 02)
+#	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:
 #
@@ -31,7 +42,15 @@ BEGIN_MAP
 # 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.
+# 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
@@ -57,11 +76,17 @@ BEGIN_MAP
 #			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
 #
@@ -71,24 +96,7 @@ BEGIN_MAP
 #	   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.
-#
-#  Revision History:
-#
-#    [v2.0, 2015 December 02]
-#    updates to copyright notice and terms of use
-#    no changes to character mappings
-#
-#    [v1.0, 2011 October 14]
-#    Updated terms of use to current wording.
-#    Updated contact information.
-#    No changes to the mapping data.
-#
-#    [v0.9, 8 March 1994]
-#    First release.
-#
-#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
-#    for any questions or comments or to report errors in the data.
-#
+#	  
 0x222F = 0x02D8
 0x2230 = 0x02C7
 0x2231 = 0x00B8
diff --git a/enc/trans/JIS/UCS%JISX0201-KANA.src b/enc/trans/JIS/UCS%JISX0201-KANA.src
index fac6ae8afe..57ae00f23b 100644
--- a/enc/trans/JIS/UCS%JISX0201-KANA.src
+++ b/enc/trans/JIS/UCS%JISX0201-KANA.src
@@ -12,16 +12,27 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
-# JIS0201.TXT
-# Date: 2015-12-02 23:49:00 GMT [KW]
-# © 2015 Unicode®, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 #	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
 #	Unicode version:  1.1
-#	Table version:    2.0
+#	Table version:    0.9
 #	Table format:     Format A
-#	Date:             2011 October 14 (header updated: 2015 December 02)
+#	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:
 #
@@ -31,7 +42,15 @@ BEGIN_MAP
 # 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.
+# 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
@@ -41,23 +60,6 @@ BEGIN_MAP
 #
 #	The entries are in JIS order
 #
-#  Revision History:
-#
-#    [v2.0, 2015 December 02]
-#    updates to copyright notice and terms of use
-#    no changes to character mappings
-#
-#    [v1.0, 2011 October 14]
-#    Updated terms of use to current wording.
-#    Updated contact information.
-#    No changes to the mapping data.
-#
-#    [v0.9, 8 March 1994]
-#    First release.
-#
-#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
-#    for any questions or comments or to report errors in the data.
-#
 #
 0xFF61 = 0x21
 0xFF62 = 0x22
diff --git a/enc/trans/JIS/UCS%JISX0208@1990.src b/enc/trans/JIS/UCS%JISX0208@1990.src
index b06e6de231..977171ccda 100644
--- a/enc/trans/JIS/UCS%JISX0208@1990.src
+++ b/enc/trans/JIS/UCS%JISX0208@1990.src
@@ -12,16 +12,27 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
-# JIS0208.TXT
-# Date: 2015-12-02 23:50:00 GMT [KW]
-# © 2015 Unicode®, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 #	Name:             JIS X 0208 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    2.0
+#	Table version:    0.9
 #	Table format:     Format A
-#	Date:             2011 October 14 (header updated: 2015 December 02)
+#	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:
 #
@@ -31,7 +42,15 @@ BEGIN_MAP
 # 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.
+# 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
@@ -58,22 +77,12 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x7426 -> 0x5406 -> 8406
 #
-#  Revision History:
-#
-#    [v2.0, 2015 December 02]
-#    updates to copyright notice and terms of use
-#    no changes to character mappings
-#
-#    [v1.0, 2011 October 14]
-#    Updated terms of use to current wording.
-#    Updated contact information.
-#    No changes to the mapping data.
+#   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
 #
-#    [v0.9, 8 March 1994]
-#    First release.
+#	Any comments or problems, contact <John_Jenkins@taligent.com>
 #
-#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
-#    for any questions or comments or to report errors in the data.
 #
 # NetBSD specific modification:
 #	2003-08-18 : add U+FF3C -> 0x2140 conversion.
diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src
index 65383a1c9f..f3b2e7089b 100644
--- a/enc/trans/JIS/UCS%JISX0212.src
+++ b/enc/trans/JIS/UCS%JISX0212.src
@@ -12,16 +12,27 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
-# JIS0212.TXT
-# Date: 2015-12-02 23:51:00 GMT [KW]
-# © 2015 Unicode®, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-#
 #	Name:             JIS X 0212 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    2.0
+#	Table version:    0.9
 #	Table format:     Format A
-#	Date:             2011 October 14 (header updated: 2015 December 02)
+#	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:
 #
@@ -31,7 +42,15 @@ BEGIN_MAP
 # 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.
+# 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
@@ -57,11 +76,17 @@ BEGIN_MAP
 #			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
 #
@@ -72,24 +97,6 @@ BEGIN_MAP
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
 #
-#  Revision History:
-#
-#    [v2.0, 2015 December 02]
-#    updates to copyright notice and terms of use
-#    no changes to character mappings
-#
-#    [v1.0, 2011 October 14]
-#    Updated terms of use to current wording.
-#    Updated contact information.
-#    No changes to the mapping data.
-#
-#    [v0.9, 8 March 1994]
-#    First release.
-#
-#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
-#    for any questions or comments or to report errors in the data.
-#
-#
 # Ruby specific modification:
 #     remove 0x007E to 0x2237 conversion.
 #
diff --git a/enc/trans/ebcdic.trans b/enc/trans/ebcdic.trans
deleted file mode 100644
index c5b5dfec87..0000000000
--- a/enc/trans/ebcdic.trans
+++ /dev/null
@@ -1,278 +0,0 @@
-#include "transcode_data.h"
-
-<%
-  us_ebcdic_map = [
-  ["00", "00"],
-  ["01", "01"],
-  ["02", "02"],
-  ["03", "03"],
-  ["37", "04"],
-  ["2D", "05"],
-  ["2E", "06"],
-  ["2F", "07"],
-  ["16", "08"],
-  ["05", "09"],
-  ["25", "0A"],
-  ["0B", "0B"],
-  ["0C", "0C"],
-  ["0D", "0D"],
-  ["0E", "0E"],
-  ["0F", "0F"],
-  ["10", "10"],
-  ["11", "11"],
-  ["12", "12"],
-  ["13", "13"],
-  ["3C", "14"],
-  ["3D", "15"],
-  ["32", "16"],
-  ["26", "17"],
-  ["18", "18"],
-  ["19", "19"],
-  ["3F", "1A"],
-  ["27", "1B"],
-  ["1C", "1C"],
-  ["1D", "1D"],
-  ["1E", "1E"],
-  ["1F", "1F"],
-  ["40", "20"],
-  ["5A", "21"],
-  ["7F", "22"],
-  ["7B", "23"],
-  ["5B", "24"],
-  ["6C", "25"],
-  ["50", "26"],
-  ["7D", "27"],
-  ["4D", "28"],
-  ["5D", "29"],
-  ["5C", "2A"],
-  ["4E", "2B"],
-  ["6B", "2C"],
-  ["60", "2D"],
-  ["4B", "2E"],
-  ["61", "2F"],
-  ["F0", "30"],
-  ["F1", "31"],
-  ["F2", "32"],
-  ["F3", "33"],
-  ["F4", "34"],
-  ["F5", "35"],
-  ["F6", "36"],
-  ["F7", "37"],
-  ["F8", "38"],
-  ["F9", "39"],
-  ["7A", "3A"],
-  ["5E", "3B"],
-  ["4C", "3C"],
-  ["7E", "3D"],
-  ["6E", "3E"],
-  ["6F", "3F"],
-  ["7C", "40"],
-  ["C1", "41"],
-  ["C2", "42"],
-  ["C3", "43"],
-  ["C4", "44"],
-  ["C5", "45"],
-  ["C6", "46"],
-  ["C7", "47"],
-  ["C8", "48"],
-  ["C9", "49"],
-  ["D1", "4A"],
-  ["D2", "4B"],
-  ["D3", "4C"],
-  ["D4", "4D"],
-  ["D5", "4E"],
-  ["D6", "4F"],
-  ["D7", "50"],
-  ["D8", "51"],
-  ["D9", "52"],
-  ["E2", "53"],
-  ["E3", "54"],
-  ["E4", "55"],
-  ["E5", "56"],
-  ["E6", "57"],
-  ["E7", "58"],
-  ["E8", "59"],
-  ["E9", "5A"],
-  ["BA", "5B"],
-  ["E0", "5C"],
-  ["BB", "5D"],
-  ["B0", "5E"],
-  ["6D", "5F"],
-  ["79", "60"],
-  ["81", "61"],
-  ["82", "62"],
-  ["83", "63"],
-  ["84", "64"],
-  ["85", "65"],
-  ["86", "66"],
-  ["87", "67"],
-  ["88", "68"],
-  ["89", "69"],
-  ["91", "6A"],
-  ["92", "6B"],
-  ["93", "6C"],
-  ["94", "6D"],
-  ["95", "6E"],
-  ["96", "6F"],
-  ["97", "70"],
-  ["98", "71"],
-  ["99", "72"],
-  ["A2", "73"],
-  ["A3", "74"],
-  ["A4", "75"],
-  ["A5", "76"],
-  ["A6", "77"],
-  ["A7", "78"],
-  ["A8", "79"],
-  ["A9", "7A"],
-  ["C0", "7B"],
-  ["4F", "7C"],
-  ["D0", "7D"],
-  ["A1", "7E"],
-  ["07", "7F"],
-  ["20", "80"],
-  ["21", "81"],
-  ["22", "82"],
-  ["23", "83"],
-  ["24", "84"],
-  ["15", "85"],
-  ["06", "86"],
-  ["17", "87"],
-  ["28", "88"],
-  ["29", "89"],
-  ["2A", "8A"],
-  ["2B", "8B"],
-  ["2C", "8C"],
-  ["09", "8D"],
-  ["0A", "8E"],
-  ["1B", "8F"],
-  ["30", "90"],
-  ["31", "91"],
-  ["1A", "92"],
-  ["33", "93"],
-  ["34", "94"],
-  ["35", "95"],
-  ["36", "96"],
-  ["08", "97"],
-  ["38", "98"],
-  ["39", "99"],
-  ["3A", "9A"],
-  ["3B", "9B"],
-  ["04", "9C"],
-  ["14", "9D"],
-  ["3E", "9E"],
-  ["FF", "9F"],
-  ["41", "A0"],
-  ["AA", "A1"],
-  ["4A", "A2"],
-  ["B1", "A3"],
-  ["9F", "A4"],
-  ["B2", "A5"],
-  ["6A", "A6"],
-  ["B5", "A7"],
-  ["BD", "A8"],
-  ["B4", "A9"],
-  ["9A", "AA"],
-  ["8A", "AB"],
-  ["5F", "AC"],
-  ["CA", "AD"],
-  ["AF", "AE"],
-  ["BC", "AF"],
-  ["90", "B0"],
-  ["8F", "B1"],
-  ["EA", "B2"],
-  ["FA", "B3"],
-  ["BE", "B4"],
-  ["A0", "B5"],
-  ["B6", "B6"],
-  ["B3", "B7"],
-  ["9D", "B8"],
-  ["DA", "B9"],
-  ["9B", "BA"],
-  ["8B", "BB"],
-  ["B7", "BC"],
-  ["B8", "BD"],
-  ["B9", "BE"],
-  ["AB", "BF"],
-  ["64", "C0"],
-  ["65", "C1"],
-  ["62", "C2"],
-  ["66", "C3"],
-  ["63", "C4"],
-  ["67", "C5"],
-  ["9E", "C6"],
-  ["68", "C7"],
-  ["74", "C8"],
-  ["71", "C9"],
-  ["72", "CA"],
-  ["73", "CB"],
-  ["78", "CC"],
-  ["75", "CD"],
-  ["76", "CE"],
-  ["77", "CF"],
-  ["AC", "D0"],
-  ["69", "D1"],
-  ["ED", "D2"],
-  ["EE", "D3"],
-  ["EB", "D4"],
-  ["EF", "D5"],
-  ["EC", "D6"],
-  ["BF", "D7"],
-  ["80", "D8"],
-  ["FD", "D9"],
-  ["FE", "DA"],
-  ["FB", "DB"],
-  ["FC", "DC"],
-  ["AD", "DD"],
-  ["AE", "DE"],
-  ["59", "DF"],
-  ["44", "E0"],
-  ["45", "E1"],
-  ["42", "E2"],
-  ["46", "E3"],
-  ["43", "E4"],
-  ["47", "E5"],
-  ["9C", "E6"],
-  ["48", "E7"],
-  ["54", "E8"],
-  ["51", "E9"],
-  ["52", "EA"],
-  ["53", "EB"],
-  ["58", "EC"],
-  ["55", "ED"],
-  ["56", "EE"],
-  ["57", "EF"],
-  ["8C", "F0"],
-  ["49", "F1"],
-  ["CD", "F2"],
-  ["CE", "F3"],
-  ["CB", "F4"],
-  ["CF", "F5"],
-  ["CC", "F6"],
-  ["E1", "F7"],
-  ["70", "F8"],
-  ["DD", "F9"],
-  ["DE", "FA"],
-  ["DB", "FB"],
-  ["DC", "FC"],
-  ["8D", "FD"],
-  ["8E", "FE"],
-  ["DF", "FF"]
-]
-
-def to_nomap (map)
-  map.collect do |from, to|
-    from == to ? [from, :nomap] : [from, to]
-  end
-end
-
-transcode_tblgen "IBM037", "ISO-8859-1", to_nomap(us_ebcdic_map), '{00-ff}', 'asciicompat_decoder'
-transcode_tblgen "ISO-8859-1", "IBM037", to_nomap(us_ebcdic_map.map {|a,b| [b,a] }), '{00-ff}', 'asciicompat_encoder'
-%>
-
-<%= transcode_generated_code %>
-
-TRANS_INIT(ebcdic)
-{
-<%= transcode_register_code %>
-}
diff --git a/enc/trans/single_byte.trans b/enc/trans/single_byte.trans
index cf521bed38..50f568cb94 100644
--- a/enc/trans/single_byte.trans
+++ b/enc/trans/single_byte.trans
@@ -18,12 +18,15 @@
   #   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)
+  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")
-    transcode_tblgen(name, "UTF-8", [["{00-7f}", :nomap], *tbl_to_ucs.reject {|a, b| a.length != 2 }], '{00-ff}')
-    transcode_tblgen("UTF-8", name, [["{00-7f}", :nomap], *tbl_to_ucs.map {|a,b| [b,a] }])
+    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"
diff --git a/enc/trans/windows-1255-tbl.rb b/enc/trans/windows-1255-tbl.rb
index 4d4cafe0d8..9084a56a10 100644
--- a/enc/trans/windows-1255-tbl.rb
+++ b/enc/trans/windows-1255-tbl.rb
@@ -43,7 +43,6 @@ WINDOWS_1255_TO_UCS_TBL = [
   ["C7",0x5B7],
   ["C8",0x5B8],
   ["C9",0x5B9],
-  ["CA",0x5BA],
   ["CB",0x5BB],
   ["CC",0x5BC],
   ["CD",0x5BD],
@@ -139,4 +138,4 @@ WINDOWS_1255_TO_UCS_TBL = [
   ["E1CF",0xFB4C],
   ["EBCF",0xFB4D],
   ["F4CF",0xFB4E],
-]
+]
+\ No newline at end of file
diff --git a/enc/unicode.c b/enc/unicode.c
index 72ff5a96e7..f0ef89880f 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -2,7 +2,7 @@
   unicode.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2013  K.Kosako  <sndgk393 AT ybb DOT ne DOT jp>
+ * 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
@@ -137,44 +137,9 @@ code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
   return 1;
 }
 
-/* macros related to ONIGENC_CASE flags */
-/* defined here because not used in other files */
-#define ONIGENC_CASE_SPECIALS       (ONIGENC_CASE_TITLECASE | ONIGENC_CASE_IS_TITLECASE | ONIGENC_CASE_UP_SPECIAL | ONIGENC_CASE_DOWN_SPECIAL)
-
-/* macros for length in CaseMappingSpecials array in enc/unicode/casefold.h */
-#define SpecialsLengthOffset 25  /* needs to be higher than the 22 bits used for Unicode codepoints */
-#define SpecialsLengthExtract(n)    ((n) >> SpecialsLengthOffset)
-#define SpecialsCodepointExtract(n) ((n) & ((1 << SpecialsLengthOffset) - 1))
-#define SpecialsLengthEncode(n)     ((n) << SpecialsLengthOffset)
-
-#define OnigSpecialIndexMask        (((1 << OnigSpecialIndexWidth) - 1) << OnigSpecialIndexShift)
-#define OnigSpecialIndexEncode(n)   ((n) << OnigSpecialIndexShift)
-#define OnigSpecialIndexDecode(n)   (((n) & OnigSpecialIndexMask) >> OnigSpecialIndexShift)
-
-/* macros to shorten "enc/unicode/casefold.h", undefined immediately after including the file */
-#define U ONIGENC_CASE_UPCASE
-#define D ONIGENC_CASE_DOWNCASE
-#define F ONIGENC_CASE_FOLD
-#define ST ONIGENC_CASE_TITLECASE
-#define SU ONIGENC_CASE_UP_SPECIAL
-#define SL ONIGENC_CASE_DOWN_SPECIAL
-#define IT ONIGENC_CASE_IS_TITLECASE
-#define I(n) OnigSpecialIndexEncode(n)
-#define L(n) SpecialsLengthEncode(n)
-
-#include "casefold.h"
-
-#undef U
-#undef D
-#undef F
-#undef ST
-#undef SU
-#undef SL
-#undef IT
-#undef I
-#undef L
-
-#include "name2ctype.h"
+#include "enc/unicode/casefold.h"
+
+#include "enc/unicode/name2ctype.h"
 
 #define CODE_RANGES_NUM numberof(CodeRanges)
 
@@ -218,15 +183,17 @@ onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
   return onigenc_unicode_ctype_code_range(ctype, ranges);
 }
 
+#include "ruby/st.h"
+
 #define PROPERTY_NAME_MAX_SIZE    (MAX_WORD_LENGTH + 1)
 
 extern int
-onigenc_unicode_property_name_to_ctype(OnigEncoding enc, const UChar* name, const UChar* end)
+onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end)
 {
   int len;
   int ctype;
   UChar buf[PROPERTY_NAME_MAX_SIZE];
-  const UChar *p;
+  UChar *p;
   OnigCodePoint code;
 
   len = 0;
@@ -256,12 +223,6 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, const UChar* name, cons
 #define onigenc_unicode_unfold2_lookup onigenc_unicode_CaseUnfold_12_lookup
 #define onigenc_unicode_unfold3_lookup onigenc_unicode_CaseUnfold_13_lookup
 
-enum {
-  I_WITH_DOT_ABOVE = 0x0130,
-  DOTLESS_i = 0x0131,
-  DOT_ABOVE = 0x0307
-};
-
 extern int
 onigenc_unicode_mbc_case_fold(OnigEncoding enc,
     OnigCaseFoldType flag ARG_UNUSED, const UChar** pp, const UChar* end,
@@ -278,17 +239,17 @@ onigenc_unicode_mbc_case_fold(OnigEncoding enc,
 
 #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
   if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    if (code == 'I') {
-      return ONIGENC_CODE_TO_MBC(enc, DOTLESS_i, fold);
+    if (code == 0x0049) {
+      return ONIGENC_CODE_TO_MBC(enc, 0x0131, fold);
     }
-    else if (code == I_WITH_DOT_ABOVE) {
-      return ONIGENC_CODE_TO_MBC(enc, 'i', fold);
+    else if (code == 0x0130) {
+      return ONIGENC_CODE_TO_MBC(enc, 0x0069, fold);
     }
   }
 #endif
 
   if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
-    if (OnigCodePointCount(to->n) == 1) {
+    if (to->n == 1) {
       return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);
     }
 #if 0
@@ -299,7 +260,7 @@ onigenc_unicode_mbc_case_fold(OnigEncoding enc,
 #endif
     {
       rlen = 0;
-      for (i = 0; i < OnigCodePointCount(to->n); i++) {
+      for (i = 0; i < to->n; i++) {
 	len = ONIGENC_CODE_TO_MBC(enc, to->code[i], fold);
 	fold += len;
 	rlen += len;
@@ -325,7 +286,7 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
 
   for (i = 0; i < numberof(CaseUnfold_11); i++) {
     p11 = &CaseUnfold_11[i];
-    for (j = 0; j < OnigCodePointCount(p11->to.n); j++) {
+    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;
@@ -346,25 +307,25 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
 
 #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
   if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    code = DOTLESS_i;
-    r = (*f)('I', &code, 1, arg);
+    code = 0x0131;
+    r = (*f)(0x0049, &code, 1, arg);
     if (r != 0) return r;
-    code = 'I';
-    r = (*f)(DOTLESS_i, &code, 1, arg);
+    code = 0x0049;
+    r = (*f)(0x0131, &code, 1, arg);
     if (r != 0) return r;
 
-    code = I_WITH_DOT_ABOVE;
-    r = (*f)('i', &code, 1, arg);
+    code = 0x0130;
+    r = (*f)(0x0069, &code, 1, arg);
     if (r != 0) return r;
-    code = 'i';
-    r = (*f)(I_WITH_DOT_ABOVE, &code, 1, arg);
+    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 < OnigCodePointCount(p11->to.n); j++) {
+      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;
@@ -390,12 +351,12 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
 
   if ((flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
     for (i = 0; i < numberof(CaseUnfold_12); i++) {
-      for (j = 0; j < OnigCodePointCount(CaseUnfold_12[i].to.n); j++) {
+      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 < OnigCodePointCount(CaseUnfold_12[i].to.n); k++) {
+	for (k = 0; k < CaseUnfold_12[i].to.n; k++) {
 	  if (k == j) continue;
 
 	  r = (*f)(CaseUnfold_12[i].to.code[j],
@@ -409,12 +370,12 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
     if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) == 0) {
 #endif
       for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
-	for (j = 0; j < OnigCodePointCount(CaseUnfold_12_Locale[i].to.n); j++) {
+	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 < OnigCodePointCount(CaseUnfold_12_Locale[i].to.n); k++) {
+	  for (k = 0; k < CaseUnfold_12_Locale[i].to.n; k++) {
 	    if (k == j) continue;
 
 	    r = (*f)(CaseUnfold_12_Locale[i].to.code[j],
@@ -429,12 +390,12 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
 #endif
 
     for (i = 0; i < numberof(CaseUnfold_13); i++) {
-      for (j = 0; j < OnigCodePointCount(CaseUnfold_13[i].to.n); j++) {
+      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 < OnigCodePointCount(CaseUnfold_13[i].to.n); k++) {
+	for (k = 0; k < CaseUnfold_13[i].to.n; k++) {
 	  if (k == j) continue;
 
 	  r = (*f)(CaseUnfold_13[i].to.code[j],
@@ -448,8 +409,6 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
   return 0;
 }
 
-#define CodePointListValidP(x) (OnigCodePointCount((x)->n) <= numberof((x)->code))
-
 extern int
 onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
     OnigCaseFoldType flag, const OnigUChar* p, const OnigUChar* end,
@@ -467,33 +426,35 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
 #ifdef USE_UNICODE_CASE_FOLD_TURKISH_AZERI
   if ((flag & ONIGENC_CASE_FOLD_TURKISH_AZERI) != 0) {
-    switch (code) {
-    case 'I':
+    if (code == 0x0049) {
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = DOTLESS_i;
+      items[0].code[0]  = 0x0131;
       return 1;
-    case I_WITH_DOT_ABOVE:
+    }
+    else if (code == 0x0130) {
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = 'i';
+      items[0].code[0]  = 0x0069;
       return 1;
-    case DOTLESS_i:
+    }
+    else if (code == 0x0131) {
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = 'I';
+      items[0].code[0]  = 0x0049;
       return 1;
-    case 'i':
+    }
+    else if (code == 0x0069) {
       items[0].byte_len = len;
       items[0].code_len = 1;
-      items[0].code[0]  = I_WITH_DOT_ABOVE;
+      items[0].code[0]  = 0x0130;
       return 1;
     }
   }
 #endif
 
   if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
-    if (OnigCodePointCount(to->n) == 1) {
+    if (to->n == 1) {
       OnigCodePoint orig_code = code;
 
       items[0].byte_len = len;
@@ -502,9 +463,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       n++;
 
       code = to->code[0];
-      if ((to = onigenc_unicode_unfold1_lookup(code)) != 0 &&
-	  CodePointListValidP(to)) {
-	for (i = 0; i < OnigCodePointCount(to->n); i++) {
+      if ((to = onigenc_unicode_unfold1_lookup(code)) != 0) {
+	for (i = 0; i < to->n; i++) {
 	  if (to->code[i] != orig_code) {
 	    items[n].byte_len = len;
 	    items[n].code_len = 1;
@@ -518,13 +478,13 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       OnigCodePoint cs[3][4];
       int fn, ncs[3];
 
-      for (fn = 0; fn < OnigCodePointCount(to->n); fn++) {
+      for (fn = 0; fn < to->n; fn++) {
 	cs[fn][0] = to->code[fn];
 	if ((z3 = onigenc_unicode_unfold1_lookup(cs[fn][0])) != 0) {
-	  for (i = 0; i < OnigCodePointCount(z3->n); i++) {
+	  for (i = 0; i < z3->n; i++) {
 	    cs[fn][i+1] = z3->code[i];
 	  }
-	  ncs[fn] = OnigCodePointCount(z3->n) + 1;
+	  ncs[fn] = z3->n + 1;
 	}
 	else
 	  ncs[fn] = 1;
@@ -541,9 +501,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 	  }
 	}
 
-	if ((z2 = onigenc_unicode_unfold2_lookup(to->code)) != 0 &&
-	    CodePointListValidP(z2)) {
-	  for (i = 0; i < OnigCodePointCount(z2->n); i++) {
+	if ((z2 = onigenc_unicode_unfold2_lookup(to->code)) != 0) {
+	  for (i = 0; i < z2->n; i++) {
 	    if (z2->code[i] == code) continue;
 
 	    items[n].byte_len = len;
@@ -567,9 +526,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 	  }
 	}
 
-	if ((z2 = onigenc_unicode_unfold3_lookup(to->code)) != 0 &&
-	    CodePointListValidP(z2)) {
-	  for (i = 0; i < OnigCodePointCount(z2->n); i++) {
+	if ((z2 = onigenc_unicode_unfold3_lookup(to->code)) != 0) {
+	  for (i = 0; i < z2->n; i++) {
 	    if (z2->code[i] == code) continue;
 
 	    items[n].byte_len = len;
@@ -585,9 +543,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
     }
   }
   else {
-    if ((to = onigenc_unicode_unfold1_lookup(code)) != 0 &&
-	CodePointListValidP(to)) {
-      for (i = 0; i < OnigCodePointCount(to->n); i++) {
+    if ((to = onigenc_unicode_unfold1_lookup(code)) != 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];
@@ -605,7 +562,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       codes[0] = code;
       code = ONIGENC_MBC_TO_CODE(enc, p, end);
       if ((to = onigenc_unicode_fold_lookup(code)) != 0
-	  && OnigCodePointCount(to->n) == 1) {
+	  && to->n == 1) {
 	codes[1] = to->code[0];
       }
       else
@@ -613,9 +570,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
       clen = enclen(enc, p, end);
       len += clen;
-      if ((z2 = onigenc_unicode_unfold2_lookup(codes)) != 0 &&
-	  CodePointListValidP(z2)) {
-	for (i = 0; i < OnigCodePointCount(z2->n); i++) {
+      if ((z2 = onigenc_unicode_unfold2_lookup(codes)) != 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];
@@ -627,7 +583,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       if (p < end) {
 	code = ONIGENC_MBC_TO_CODE(enc, p, end);
 	if ((to = onigenc_unicode_fold_lookup(code)) != 0
-	    && OnigCodePointCount(to->n) == 1) {
+	    && to->n == 1) {
 	  codes[2] = to->code[0];
 	}
 	else
@@ -635,9 +591,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
 	clen = enclen(enc, p, end);
 	len += clen;
-	if ((z2 = onigenc_unicode_unfold3_lookup(codes)) != 0 &&
-	    CodePointListValidP(z2)) {
-	  for (i = 0; i < OnigCodePointCount(z2->n); i++) {
+	if ((z2 = onigenc_unicode_unfold3_lookup(codes)) != 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];
@@ -650,156 +605,3 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
   return n;
 }
-
-/* length in bytes for three characters in UTF-32; e.g. needed for ffi (U+FB03) */
-#define CASE_MAPPING_SLACK 12
-#define MODIFIED (flags |= ONIGENC_CASE_MODIFIED)
-extern int
-onigenc_unicode_case_map(OnigCaseFoldType* flagP,
-    const OnigUChar** pp, const OnigUChar* end,
-    OnigUChar* to, OnigUChar* to_end,
-    const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-  int codepoint_length;
-
-  to_end -= CASE_MAPPING_SLACK;
-  /* copy flags ONIGENC_CASE_UPCASE     and ONIGENC_CASE_DOWNCASE over to
-   *            ONIGENC_CASE_UP_SPECIAL and ONIGENC_CASE_DOWN_SPECIAL */
-  flags |= (flags & (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE)) << ONIGENC_CASE_SPECIAL_OFFSET;
-
-  while (*pp < end && to <= to_end) {
-    codepoint_length = ONIGENC_PRECISE_MBC_ENC_LEN(enc, *pp, end);
-    if (codepoint_length < 0)
-      return codepoint_length; /* encoding invalid */
-    code = ONIGENC_MBC_TO_CODE(enc, *pp, end);
-    *pp += codepoint_length;
-
-    if (code <= 'z') { /* ASCII comes first */
-      if (code >= 'a' && code <= 'z') {
-	if (flags & ONIGENC_CASE_UPCASE) {
-	  MODIFIED;
-	  if (flags & ONIGENC_CASE_FOLD_TURKISH_AZERI && code == 'i')
-	    code = I_WITH_DOT_ABOVE;
-	  else
-	    code += 'A' - 'a';
-	}
-      }
-      else if (code >= 'A' && code <= 'Z') {
-	if (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD)) {
-	  MODIFIED;
-	  if (flags & ONIGENC_CASE_FOLD_TURKISH_AZERI && code == 'I')
-	    code = DOTLESS_i;
-	  else
-	    code += 'a' - 'A';
-	}
-      }
-    }
-    else if (!(flags & ONIGENC_CASE_ASCII_ONLY) && code >= 0x00B5) { /* deal with non-ASCII; micron sign (U+00B5) is lowest affected */
-      const CodePointList3 *folded;
-
-      if (code == I_WITH_DOT_ABOVE) {
-	if (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD)) {
-	  MODIFIED;
-	  code = 'i';
-	  if (!(flags & ONIGENC_CASE_FOLD_TURKISH_AZERI)) { /* make dot above explicit */
-	    to += ONIGENC_CODE_TO_MBC(enc, code, to);
-	    code = DOT_ABOVE;
-	  }
-	}
-      }
-      else if (code == DOTLESS_i) { /* handle this manually, because it isn't involved in folding */
-	if (flags & ONIGENC_CASE_UPCASE) {
-	  MODIFIED;
-	  code = 'I';
-	}
-      }
-      else if ((folded = onigenc_unicode_fold_lookup(code)) != 0) { /* data about character found in CaseFold_11_Table */
-	if ((flags & ONIGENC_CASE_TITLECASE)                                 /* Titlecase needed, */
-	    && (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_IS_TITLECASE)) { /* but already Titlecase  */
-	  /* already Titlecase, no changes needed */
-	}
-	else if (flags & OnigCaseFoldFlags(folded->n)) { /* needs and data availability match */
-	  const OnigCodePoint *next;
-	  int count;
-
-	  MODIFIED;
-	  if (flags & OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_SPECIALS) { /* special */
-	    const OnigCodePoint *SpecialsStart = CaseMappingSpecials + OnigSpecialIndexDecode(folded->n);
-
-	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_IS_TITLECASE) { /* swapCASE available */
-	      if ((flags & (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE))
-		  == (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE)) /* swapCASE needed */
-		goto SpecialsCopy;
-	      else /* swapCASE not needed */
-		SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
-	    }
-	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_TITLECASE) { /* Titlecase available */
-	      if (flags & ONIGENC_CASE_TITLECASE) /* Titlecase needed, but not yet Titlecase */
-		goto SpecialsCopy;
-	      else /* Titlecase not needed */
-		SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
-	    }
-	    if (OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_DOWN_SPECIAL) {
-	      if (!(flags & ONIGENC_CASE_DOWN_SPECIAL))
-		SpecialsStart += SpecialsLengthExtract(*SpecialsStart);
-	    }
-	    /* here, we know we use ONIGENC_CASE_UP_SPECIAL, and the position is right */
-SpecialsCopy:
-	    count = SpecialsLengthExtract(*SpecialsStart);
-	    next = SpecialsStart;
-	    code = SpecialsCodepointExtract(*next++);
-	  }
-	  else { /* no specials */
-	    count = OnigCodePointCount(folded->n);
-	    next = folded->code;
-	    code = *next++;
-	  }
-	  if (count == 1)
-	    ;
-	  else if (count == 2) {
-	    to += ONIGENC_CODE_TO_MBC(enc, code, to);
-	    code = *next;
-	  }
-	  else { /* count == 3 */
-	    to += ONIGENC_CODE_TO_MBC(enc, code, to);
-	    to += ONIGENC_CODE_TO_MBC(enc, *next++, to);
-	    code = *next;
-	  }
-	}
-      }
-      else if ((folded = onigenc_unicode_unfold1_lookup(code)) != 0  /* data about character found in CaseUnfold_11_Table */
-	  && flags & OnigCaseFoldFlags(folded->n)) { /* needs and data availability match */
-	MODIFIED;
-	code = folded->code[(flags & OnigCaseFoldFlags(folded->n) & ONIGENC_CASE_TITLECASE) ? 1 : 0];
-      }
-    }
-    to += ONIGENC_CODE_TO_MBC(enc, code, to);
-    /* switch from titlecase to lowercase for capitalize */
-    if (flags & ONIGENC_CASE_TITLECASE)
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE |
-	  ONIGENC_CASE_UP_SPECIAL | ONIGENC_CASE_DOWN_SPECIAL);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
-#if 0
-const char onigenc_unicode_version_string[] =
-#ifdef ONIG_UNICODE_VERSION_STRING
-    ONIG_UNICODE_VERSION_STRING
-#endif
-    "";
-
-const int onigenc_unicode_version_number[3] = {
-#ifdef ONIG_UNICODE_VERSION_MAJOR
-    ONIG_UNICODE_VERSION_MAJOR,
-    ONIG_UNICODE_VERSION_MINOR,
-    ONIG_UNICODE_VERSION_TEENY,
-#else
-    0
-#endif
-};
-#endif
diff --git a/enc/unicode/9.0.0/casefold.h b/enc/unicode/9.0.0/casefold.h
deleted file mode 100644
index 9deac0469e..0000000000
--- a/enc/unicode/9.0.0/casefold.h
+++ /dev/null
@@ -1,7068 +0,0 @@
-/* DO NOT EDIT THIS FILE. */
-/* Generated by enc/unicode/case-folding.rb */
-
-#if defined ONIG_UNICODE_VERSION_STRING && !( \
-      ONIG_UNICODE_VERSION_MAJOR == 9 && \
-      ONIG_UNICODE_VERSION_MINOR == 0 && \
-      ONIG_UNICODE_VERSION_TEENY == 0 && \
-      1)
-# error ONIG_UNICODE_VERSION_STRING mismatch
-#endif
-#define ONIG_UNICODE_VERSION_STRING "9.0.0"
-#define ONIG_UNICODE_VERSION_MAJOR 9
-#define ONIG_UNICODE_VERSION_MINOR 0
-#define ONIG_UNICODE_VERSION_TEENY 0
-
-static const CaseFold_11_Type CaseFold_11_Table[] = {
-#define CaseFold (*(CaseFold_11_Type (*)[1399])(CaseFold_11_Table+0))
-  {0x0041, {1|F|D, {0x0061}}},
-  {0x0042, {1|F|D, {0x0062}}},
-  {0x0043, {1|F|D, {0x0063}}},
-  {0x0044, {1|F|D, {0x0064}}},
-  {0x0045, {1|F|D, {0x0065}}},
-  {0x0046, {1|F|D, {0x0066}}},
-  {0x0047, {1|F|D, {0x0067}}},
-  {0x0048, {1|F|D, {0x0068}}},
-  {0x004a, {1|F|D, {0x006a}}},
-  {0x004b, {1|F|D, {0x006b}}},
-  {0x004c, {1|F|D, {0x006c}}},
-  {0x004d, {1|F|D, {0x006d}}},
-  {0x004e, {1|F|D, {0x006e}}},
-  {0x004f, {1|F|D, {0x006f}}},
-  {0x0050, {1|F|D, {0x0070}}},
-  {0x0051, {1|F|D, {0x0071}}},
-  {0x0052, {1|F|D, {0x0072}}},
-  {0x0053, {1|F|D, {0x0073}}},
-  {0x0054, {1|F|D, {0x0074}}},
-  {0x0055, {1|F|D, {0x0075}}},
-  {0x0056, {1|F|D, {0x0076}}},
-  {0x0057, {1|F|D, {0x0077}}},
-  {0x0058, {1|F|D, {0x0078}}},
-  {0x0059, {1|F|D, {0x0079}}},
-  {0x005a, {1|F|D, {0x007a}}},
-  {0x00b5, {1|F|SU|I(0), {0x03bc}}},
-  {0x00c0, {1|F|D, {0x00e0}}},
-  {0x00c1, {1|F|D, {0x00e1}}},
-  {0x00c2, {1|F|D, {0x00e2}}},
-  {0x00c3, {1|F|D, {0x00e3}}},
-  {0x00c4, {1|F|D, {0x00e4}}},
-  {0x00c5, {1|F|D, {0x00e5}}},
-  {0x00c6, {1|F|D, {0x00e6}}},
-  {0x00c7, {1|F|D, {0x00e7}}},
-  {0x00c8, {1|F|D, {0x00e8}}},
-  {0x00c9, {1|F|D, {0x00e9}}},
-  {0x00ca, {1|F|D, {0x00ea}}},
-  {0x00cb, {1|F|D, {0x00eb}}},
-  {0x00cc, {1|F|D, {0x00ec}}},
-  {0x00cd, {1|F|D, {0x00ed}}},
-  {0x00ce, {1|F|D, {0x00ee}}},
-  {0x00cf, {1|F|D, {0x00ef}}},
-  {0x00d0, {1|F|D, {0x00f0}}},
-  {0x00d1, {1|F|D, {0x00f1}}},
-  {0x00d2, {1|F|D, {0x00f2}}},
-  {0x00d3, {1|F|D, {0x00f3}}},
-  {0x00d4, {1|F|D, {0x00f4}}},
-  {0x00d5, {1|F|D, {0x00f5}}},
-  {0x00d6, {1|F|D, {0x00f6}}},
-  {0x00d8, {1|F|D, {0x00f8}}},
-  {0x00d9, {1|F|D, {0x00f9}}},
-  {0x00da, {1|F|D, {0x00fa}}},
-  {0x00db, {1|F|D, {0x00fb}}},
-  {0x00dc, {1|F|D, {0x00fc}}},
-  {0x00dd, {1|F|D, {0x00fd}}},
-  {0x00de, {1|F|D, {0x00fe}}},
-  {0x00df, {2|F|ST|SU|I(1), {0x0073, 0x0073}}},
-  {0x0100, {1|F|D, {0x0101}}},
-  {0x0102, {1|F|D, {0x0103}}},
-  {0x0104, {1|F|D, {0x0105}}},
-  {0x0106, {1|F|D, {0x0107}}},
-  {0x0108, {1|F|D, {0x0109}}},
-  {0x010a, {1|F|D, {0x010b}}},
-  {0x010c, {1|F|D, {0x010d}}},
-  {0x010e, {1|F|D, {0x010f}}},
-  {0x0110, {1|F|D, {0x0111}}},
-  {0x0112, {1|F|D, {0x0113}}},
-  {0x0114, {1|F|D, {0x0115}}},
-  {0x0116, {1|F|D, {0x0117}}},
-  {0x0118, {1|F|D, {0x0119}}},
-  {0x011a, {1|F|D, {0x011b}}},
-  {0x011c, {1|F|D, {0x011d}}},
-  {0x011e, {1|F|D, {0x011f}}},
-  {0x0120, {1|F|D, {0x0121}}},
-  {0x0122, {1|F|D, {0x0123}}},
-  {0x0124, {1|F|D, {0x0125}}},
-  {0x0126, {1|F|D, {0x0127}}},
-  {0x0128, {1|F|D, {0x0129}}},
-  {0x012a, {1|F|D, {0x012b}}},
-  {0x012c, {1|F|D, {0x012d}}},
-  {0x012e, {1|F|D, {0x012f}}},
-  {0x0132, {1|F|D, {0x0133}}},
-  {0x0134, {1|F|D, {0x0135}}},
-  {0x0136, {1|F|D, {0x0137}}},
-  {0x0139, {1|F|D, {0x013a}}},
-  {0x013b, {1|F|D, {0x013c}}},
-  {0x013d, {1|F|D, {0x013e}}},
-  {0x013f, {1|F|D, {0x0140}}},
-  {0x0141, {1|F|D, {0x0142}}},
-  {0x0143, {1|F|D, {0x0144}}},
-  {0x0145, {1|F|D, {0x0146}}},
-  {0x0147, {1|F|D, {0x0148}}},
-  {0x0149, {2|F|SU|I(5), {0x02bc, 0x006e}}},
-  {0x014a, {1|F|D, {0x014b}}},
-  {0x014c, {1|F|D, {0x014d}}},
-  {0x014e, {1|F|D, {0x014f}}},
-  {0x0150, {1|F|D, {0x0151}}},
-  {0x0152, {1|F|D, {0x0153}}},
-  {0x0154, {1|F|D, {0x0155}}},
-  {0x0156, {1|F|D, {0x0157}}},
-  {0x0158, {1|F|D, {0x0159}}},
-  {0x015a, {1|F|D, {0x015b}}},
-  {0x015c, {1|F|D, {0x015d}}},
-  {0x015e, {1|F|D, {0x015f}}},
-  {0x0160, {1|F|D, {0x0161}}},
-  {0x0162, {1|F|D, {0x0163}}},
-  {0x0164, {1|F|D, {0x0165}}},
-  {0x0166, {1|F|D, {0x0167}}},
-  {0x0168, {1|F|D, {0x0169}}},
-  {0x016a, {1|F|D, {0x016b}}},
-  {0x016c, {1|F|D, {0x016d}}},
-  {0x016e, {1|F|D, {0x016f}}},
-  {0x0170, {1|F|D, {0x0171}}},
-  {0x0172, {1|F|D, {0x0173}}},
-  {0x0174, {1|F|D, {0x0175}}},
-  {0x0176, {1|F|D, {0x0177}}},
-  {0x0178, {1|F|D, {0x00ff}}},
-  {0x0179, {1|F|D, {0x017a}}},
-  {0x017b, {1|F|D, {0x017c}}},
-  {0x017d, {1|F|D, {0x017e}}},
-  {0x017f, {1|F|SU|I(7), {0x0073}}},
-  {0x0181, {1|F|D, {0x0253}}},
-  {0x0182, {1|F|D, {0x0183}}},
-  {0x0184, {1|F|D, {0x0185}}},
-  {0x0186, {1|F|D, {0x0254}}},
-  {0x0187, {1|F|D, {0x0188}}},
-  {0x0189, {1|F|D, {0x0256}}},
-  {0x018a, {1|F|D, {0x0257}}},
-  {0x018b, {1|F|D, {0x018c}}},
-  {0x018e, {1|F|D, {0x01dd}}},
-  {0x018f, {1|F|D, {0x0259}}},
-  {0x0190, {1|F|D, {0x025b}}},
-  {0x0191, {1|F|D, {0x0192}}},
-  {0x0193, {1|F|D, {0x0260}}},
-  {0x0194, {1|F|D, {0x0263}}},
-  {0x0196, {1|F|D, {0x0269}}},
-  {0x0197, {1|F|D, {0x0268}}},
-  {0x0198, {1|F|D, {0x0199}}},
-  {0x019c, {1|F|D, {0x026f}}},
-  {0x019d, {1|F|D, {0x0272}}},
-  {0x019f, {1|F|D, {0x0275}}},
-  {0x01a0, {1|F|D, {0x01a1}}},
-  {0x01a2, {1|F|D, {0x01a3}}},
-  {0x01a4, {1|F|D, {0x01a5}}},
-  {0x01a6, {1|F|D, {0x0280}}},
-  {0x01a7, {1|F|D, {0x01a8}}},
-  {0x01a9, {1|F|D, {0x0283}}},
-  {0x01ac, {1|F|D, {0x01ad}}},
-  {0x01ae, {1|F|D, {0x0288}}},
-  {0x01af, {1|F|D, {0x01b0}}},
-  {0x01b1, {1|F|D, {0x028a}}},
-  {0x01b2, {1|F|D, {0x028b}}},
-  {0x01b3, {1|F|D, {0x01b4}}},
-  {0x01b5, {1|F|D, {0x01b6}}},
-  {0x01b7, {1|F|D, {0x0292}}},
-  {0x01b8, {1|F|D, {0x01b9}}},
-  {0x01bc, {1|F|D, {0x01bd}}},
-  {0x01c4, {1|F|D|ST|I(8), {0x01c6}}},
-  {0x01c5, {1|F|D|IT|SU|I(9), {0x01c6}}},
-  {0x01c7, {1|F|D|ST|I(12), {0x01c9}}},
-  {0x01c8, {1|F|D|IT|SU|I(13), {0x01c9}}},
-  {0x01ca, {1|F|D|ST|I(16), {0x01cc}}},
-  {0x01cb, {1|F|D|IT|SU|I(17), {0x01cc}}},
-  {0x01cd, {1|F|D, {0x01ce}}},
-  {0x01cf, {1|F|D, {0x01d0}}},
-  {0x01d1, {1|F|D, {0x01d2}}},
-  {0x01d3, {1|F|D, {0x01d4}}},
-  {0x01d5, {1|F|D, {0x01d6}}},
-  {0x01d7, {1|F|D, {0x01d8}}},
-  {0x01d9, {1|F|D, {0x01da}}},
-  {0x01db, {1|F|D, {0x01dc}}},
-  {0x01de, {1|F|D, {0x01df}}},
-  {0x01e0, {1|F|D, {0x01e1}}},
-  {0x01e2, {1|F|D, {0x01e3}}},
-  {0x01e4, {1|F|D, {0x01e5}}},
-  {0x01e6, {1|F|D, {0x01e7}}},
-  {0x01e8, {1|F|D, {0x01e9}}},
-  {0x01ea, {1|F|D, {0x01eb}}},
-  {0x01ec, {1|F|D, {0x01ed}}},
-  {0x01ee, {1|F|D, {0x01ef}}},
-  {0x01f0, {2|F|SU|I(20), {0x006a, 0x030c}}},
-  {0x01f1, {1|F|D|ST|I(22), {0x01f3}}},
-  {0x01f2, {1|F|D|IT|SU|I(23), {0x01f3}}},
-  {0x01f4, {1|F|D, {0x01f5}}},
-  {0x01f6, {1|F|D, {0x0195}}},
-  {0x01f7, {1|F|D, {0x01bf}}},
-  {0x01f8, {1|F|D, {0x01f9}}},
-  {0x01fa, {1|F|D, {0x01fb}}},
-  {0x01fc, {1|F|D, {0x01fd}}},
-  {0x01fe, {1|F|D, {0x01ff}}},
-  {0x0200, {1|F|D, {0x0201}}},
-  {0x0202, {1|F|D, {0x0203}}},
-  {0x0204, {1|F|D, {0x0205}}},
-  {0x0206, {1|F|D, {0x0207}}},
-  {0x0208, {1|F|D, {0x0209}}},
-  {0x020a, {1|F|D, {0x020b}}},
-  {0x020c, {1|F|D, {0x020d}}},
-  {0x020e, {1|F|D, {0x020f}}},
-  {0x0210, {1|F|D, {0x0211}}},
-  {0x0212, {1|F|D, {0x0213}}},
-  {0x0214, {1|F|D, {0x0215}}},
-  {0x0216, {1|F|D, {0x0217}}},
-  {0x0218, {1|F|D, {0x0219}}},
-  {0x021a, {1|F|D, {0x021b}}},
-  {0x021c, {1|F|D, {0x021d}}},
-  {0x021e, {1|F|D, {0x021f}}},
-  {0x0220, {1|F|D, {0x019e}}},
-  {0x0222, {1|F|D, {0x0223}}},
-  {0x0224, {1|F|D, {0x0225}}},
-  {0x0226, {1|F|D, {0x0227}}},
-  {0x0228, {1|F|D, {0x0229}}},
-  {0x022a, {1|F|D, {0x022b}}},
-  {0x022c, {1|F|D, {0x022d}}},
-  {0x022e, {1|F|D, {0x022f}}},
-  {0x0230, {1|F|D, {0x0231}}},
-  {0x0232, {1|F|D, {0x0233}}},
-  {0x023a, {1|F|D, {0x2c65}}},
-  {0x023b, {1|F|D, {0x023c}}},
-  {0x023d, {1|F|D, {0x019a}}},
-  {0x023e, {1|F|D, {0x2c66}}},
-  {0x0241, {1|F|D, {0x0242}}},
-  {0x0243, {1|F|D, {0x0180}}},
-  {0x0244, {1|F|D, {0x0289}}},
-  {0x0245, {1|F|D, {0x028c}}},
-  {0x0246, {1|F|D, {0x0247}}},
-  {0x0248, {1|F|D, {0x0249}}},
-  {0x024a, {1|F|D, {0x024b}}},
-  {0x024c, {1|F|D, {0x024d}}},
-  {0x024e, {1|F|D, {0x024f}}},
-  {0x0345, {1|F|SU|I(26), {0x03b9}}},
-  {0x0370, {1|F|D, {0x0371}}},
-  {0x0372, {1|F|D, {0x0373}}},
-  {0x0376, {1|F|D, {0x0377}}},
-  {0x037f, {1|F|D, {0x03f3}}},
-  {0x0386, {1|F|D, {0x03ac}}},
-  {0x0388, {1|F|D, {0x03ad}}},
-  {0x0389, {1|F|D, {0x03ae}}},
-  {0x038a, {1|F|D, {0x03af}}},
-  {0x038c, {1|F|D, {0x03cc}}},
-  {0x038e, {1|F|D, {0x03cd}}},
-  {0x038f, {1|F|D, {0x03ce}}},
-  {0x0390, {3|F|SU|I(27), {0x03b9, 0x0308, 0x0301}}},
-  {0x0391, {1|F|D, {0x03b1}}},
-  {0x0392, {1|F|D, {0x03b2}}},
-  {0x0393, {1|F|D, {0x03b3}}},
-  {0x0394, {1|F|D, {0x03b4}}},
-  {0x0395, {1|F|D, {0x03b5}}},
-  {0x0396, {1|F|D, {0x03b6}}},
-  {0x0397, {1|F|D, {0x03b7}}},
-  {0x0398, {1|F|D, {0x03b8}}},
-  {0x0399, {1|F|D, {0x03b9}}},
-  {0x039a, {1|F|D, {0x03ba}}},
-  {0x039b, {1|F|D, {0x03bb}}},
-  {0x039c, {1|F|D, {0x03bc}}},
-  {0x039d, {1|F|D, {0x03bd}}},
-  {0x039e, {1|F|D, {0x03be}}},
-  {0x039f, {1|F|D, {0x03bf}}},
-  {0x03a0, {1|F|D, {0x03c0}}},
-  {0x03a1, {1|F|D, {0x03c1}}},
-  {0x03a3, {1|F|D, {0x03c3}}},
-  {0x03a4, {1|F|D, {0x03c4}}},
-  {0x03a5, {1|F|D, {0x03c5}}},
-  {0x03a6, {1|F|D, {0x03c6}}},
-  {0x03a7, {1|F|D, {0x03c7}}},
-  {0x03a8, {1|F|D, {0x03c8}}},
-  {0x03a9, {1|F|D, {0x03c9}}},
-  {0x03aa, {1|F|D, {0x03ca}}},
-  {0x03ab, {1|F|D, {0x03cb}}},
-  {0x03b0, {3|F|SU|I(30), {0x03c5, 0x0308, 0x0301}}},
-  {0x03c2, {1|F|SU|I(33), {0x03c3}}},
-  {0x03cf, {1|F|D, {0x03d7}}},
-  {0x03d0, {1|F|SU|I(34), {0x03b2}}},
-  {0x03d1, {1|F|SU|I(35), {0x03b8}}},
-  {0x03d5, {1|F|SU|I(36), {0x03c6}}},
-  {0x03d6, {1|F|SU|I(37), {0x03c0}}},
-  {0x03d8, {1|F|D, {0x03d9}}},
-  {0x03da, {1|F|D, {0x03db}}},
-  {0x03dc, {1|F|D, {0x03dd}}},
-  {0x03de, {1|F|D, {0x03df}}},
-  {0x03e0, {1|F|D, {0x03e1}}},
-  {0x03e2, {1|F|D, {0x03e3}}},
-  {0x03e4, {1|F|D, {0x03e5}}},
-  {0x03e6, {1|F|D, {0x03e7}}},
-  {0x03e8, {1|F|D, {0x03e9}}},
-  {0x03ea, {1|F|D, {0x03eb}}},
-  {0x03ec, {1|F|D, {0x03ed}}},
-  {0x03ee, {1|F|D, {0x03ef}}},
-  {0x03f0, {1|F|SU|I(38), {0x03ba}}},
-  {0x03f1, {1|F|SU|I(39), {0x03c1}}},
-  {0x03f4, {1|F|D, {0x03b8}}},
-  {0x03f5, {1|F|SU|I(40), {0x03b5}}},
-  {0x03f7, {1|F|D, {0x03f8}}},
-  {0x03f9, {1|F|D, {0x03f2}}},
-  {0x03fa, {1|F|D, {0x03fb}}},
-  {0x03fd, {1|F|D, {0x037b}}},
-  {0x03fe, {1|F|D, {0x037c}}},
-  {0x03ff, {1|F|D, {0x037d}}},
-  {0x0400, {1|F|D, {0x0450}}},
-  {0x0401, {1|F|D, {0x0451}}},
-  {0x0402, {1|F|D, {0x0452}}},
-  {0x0403, {1|F|D, {0x0453}}},
-  {0x0404, {1|F|D, {0x0454}}},
-  {0x0405, {1|F|D, {0x0455}}},
-  {0x0406, {1|F|D, {0x0456}}},
-  {0x0407, {1|F|D, {0x0457}}},
-  {0x0408, {1|F|D, {0x0458}}},
-  {0x0409, {1|F|D, {0x0459}}},
-  {0x040a, {1|F|D, {0x045a}}},
-  {0x040b, {1|F|D, {0x045b}}},
-  {0x040c, {1|F|D, {0x045c}}},
-  {0x040d, {1|F|D, {0x045d}}},
-  {0x040e, {1|F|D, {0x045e}}},
-  {0x040f, {1|F|D, {0x045f}}},
-  {0x0410, {1|F|D, {0x0430}}},
-  {0x0411, {1|F|D, {0x0431}}},
-  {0x0412, {1|F|D, {0x0432}}},
-  {0x0413, {1|F|D, {0x0433}}},
-  {0x0414, {1|F|D, {0x0434}}},
-  {0x0415, {1|F|D, {0x0435}}},
-  {0x0416, {1|F|D, {0x0436}}},
-  {0x0417, {1|F|D, {0x0437}}},
-  {0x0418, {1|F|D, {0x0438}}},
-  {0x0419, {1|F|D, {0x0439}}},
-  {0x041a, {1|F|D, {0x043a}}},
-  {0x041b, {1|F|D, {0x043b}}},
-  {0x041c, {1|F|D, {0x043c}}},
-  {0x041d, {1|F|D, {0x043d}}},
-  {0x041e, {1|F|D, {0x043e}}},
-  {0x041f, {1|F|D, {0x043f}}},
-  {0x0420, {1|F|D, {0x0440}}},
-  {0x0421, {1|F|D, {0x0441}}},
-  {0x0422, {1|F|D, {0x0442}}},
-  {0x0423, {1|F|D, {0x0443}}},
-  {0x0424, {1|F|D, {0x0444}}},
-  {0x0425, {1|F|D, {0x0445}}},
-  {0x0426, {1|F|D, {0x0446}}},
-  {0x0427, {1|F|D, {0x0447}}},
-  {0x0428, {1|F|D, {0x0448}}},
-  {0x0429, {1|F|D, {0x0449}}},
-  {0x042a, {1|F|D, {0x044a}}},
-  {0x042b, {1|F|D, {0x044b}}},
-  {0x042c, {1|F|D, {0x044c}}},
-  {0x042d, {1|F|D, {0x044d}}},
-  {0x042e, {1|F|D, {0x044e}}},
-  {0x042f, {1|F|D, {0x044f}}},
-  {0x0460, {1|F|D, {0x0461}}},
-  {0x0462, {1|F|D, {0x0463}}},
-  {0x0464, {1|F|D, {0x0465}}},
-  {0x0466, {1|F|D, {0x0467}}},
-  {0x0468, {1|F|D, {0x0469}}},
-  {0x046a, {1|F|D, {0x046b}}},
-  {0x046c, {1|F|D, {0x046d}}},
-  {0x046e, {1|F|D, {0x046f}}},
-  {0x0470, {1|F|D, {0x0471}}},
-  {0x0472, {1|F|D, {0x0473}}},
-  {0x0474, {1|F|D, {0x0475}}},
-  {0x0476, {1|F|D, {0x0477}}},
-  {0x0478, {1|F|D, {0x0479}}},
-  {0x047a, {1|F|D, {0x047b}}},
-  {0x047c, {1|F|D, {0x047d}}},
-  {0x047e, {1|F|D, {0x047f}}},
-  {0x0480, {1|F|D, {0x0481}}},
-  {0x048a, {1|F|D, {0x048b}}},
-  {0x048c, {1|F|D, {0x048d}}},
-  {0x048e, {1|F|D, {0x048f}}},
-  {0x0490, {1|F|D, {0x0491}}},
-  {0x0492, {1|F|D, {0x0493}}},
-  {0x0494, {1|F|D, {0x0495}}},
-  {0x0496, {1|F|D, {0x0497}}},
-  {0x0498, {1|F|D, {0x0499}}},
-  {0x049a, {1|F|D, {0x049b}}},
-  {0x049c, {1|F|D, {0x049d}}},
-  {0x049e, {1|F|D, {0x049f}}},
-  {0x04a0, {1|F|D, {0x04a1}}},
-  {0x04a2, {1|F|D, {0x04a3}}},
-  {0x04a4, {1|F|D, {0x04a5}}},
-  {0x04a6, {1|F|D, {0x04a7}}},
-  {0x04a8, {1|F|D, {0x04a9}}},
-  {0x04aa, {1|F|D, {0x04ab}}},
-  {0x04ac, {1|F|D, {0x04ad}}},
-  {0x04ae, {1|F|D, {0x04af}}},
-  {0x04b0, {1|F|D, {0x04b1}}},
-  {0x04b2, {1|F|D, {0x04b3}}},
-  {0x04b4, {1|F|D, {0x04b5}}},
-  {0x04b6, {1|F|D, {0x04b7}}},
-  {0x04b8, {1|F|D, {0x04b9}}},
-  {0x04ba, {1|F|D, {0x04bb}}},
-  {0x04bc, {1|F|D, {0x04bd}}},
-  {0x04be, {1|F|D, {0x04bf}}},
-  {0x04c0, {1|F|D, {0x04cf}}},
-  {0x04c1, {1|F|D, {0x04c2}}},
-  {0x04c3, {1|F|D, {0x04c4}}},
-  {0x04c5, {1|F|D, {0x04c6}}},
-  {0x04c7, {1|F|D, {0x04c8}}},
-  {0x04c9, {1|F|D, {0x04ca}}},
-  {0x04cb, {1|F|D, {0x04cc}}},
-  {0x04cd, {1|F|D, {0x04ce}}},
-  {0x04d0, {1|F|D, {0x04d1}}},
-  {0x04d2, {1|F|D, {0x04d3}}},
-  {0x04d4, {1|F|D, {0x04d5}}},
-  {0x04d6, {1|F|D, {0x04d7}}},
-  {0x04d8, {1|F|D, {0x04d9}}},
-  {0x04da, {1|F|D, {0x04db}}},
-  {0x04dc, {1|F|D, {0x04dd}}},
-  {0x04de, {1|F|D, {0x04df}}},
-  {0x04e0, {1|F|D, {0x04e1}}},
-  {0x04e2, {1|F|D, {0x04e3}}},
-  {0x04e4, {1|F|D, {0x04e5}}},
-  {0x04e6, {1|F|D, {0x04e7}}},
-  {0x04e8, {1|F|D, {0x04e9}}},
-  {0x04ea, {1|F|D, {0x04eb}}},
-  {0x04ec, {1|F|D, {0x04ed}}},
-  {0x04ee, {1|F|D, {0x04ef}}},
-  {0x04f0, {1|F|D, {0x04f1}}},
-  {0x04f2, {1|F|D, {0x04f3}}},
-  {0x04f4, {1|F|D, {0x04f5}}},
-  {0x04f6, {1|F|D, {0x04f7}}},
-  {0x04f8, {1|F|D, {0x04f9}}},
-  {0x04fa, {1|F|D, {0x04fb}}},
-  {0x04fc, {1|F|D, {0x04fd}}},
-  {0x04fe, {1|F|D, {0x04ff}}},
-  {0x0500, {1|F|D, {0x0501}}},
-  {0x0502, {1|F|D, {0x0503}}},
-  {0x0504, {1|F|D, {0x0505}}},
-  {0x0506, {1|F|D, {0x0507}}},
-  {0x0508, {1|F|D, {0x0509}}},
-  {0x050a, {1|F|D, {0x050b}}},
-  {0x050c, {1|F|D, {0x050d}}},
-  {0x050e, {1|F|D, {0x050f}}},
-  {0x0510, {1|F|D, {0x0511}}},
-  {0x0512, {1|F|D, {0x0513}}},
-  {0x0514, {1|F|D, {0x0515}}},
-  {0x0516, {1|F|D, {0x0517}}},
-  {0x0518, {1|F|D, {0x0519}}},
-  {0x051a, {1|F|D, {0x051b}}},
-  {0x051c, {1|F|D, {0x051d}}},
-  {0x051e, {1|F|D, {0x051f}}},
-  {0x0520, {1|F|D, {0x0521}}},
-  {0x0522, {1|F|D, {0x0523}}},
-  {0x0524, {1|F|D, {0x0525}}},
-  {0x0526, {1|F|D, {0x0527}}},
-  {0x0528, {1|F|D, {0x0529}}},
-  {0x052a, {1|F|D, {0x052b}}},
-  {0x052c, {1|F|D, {0x052d}}},
-  {0x052e, {1|F|D, {0x052f}}},
-  {0x0531, {1|F|D, {0x0561}}},
-  {0x0532, {1|F|D, {0x0562}}},
-  {0x0533, {1|F|D, {0x0563}}},
-  {0x0534, {1|F|D, {0x0564}}},
-  {0x0535, {1|F|D, {0x0565}}},
-  {0x0536, {1|F|D, {0x0566}}},
-  {0x0537, {1|F|D, {0x0567}}},
-  {0x0538, {1|F|D, {0x0568}}},
-  {0x0539, {1|F|D, {0x0569}}},
-  {0x053a, {1|F|D, {0x056a}}},
-  {0x053b, {1|F|D, {0x056b}}},
-  {0x053c, {1|F|D, {0x056c}}},
-  {0x053d, {1|F|D, {0x056d}}},
-  {0x053e, {1|F|D, {0x056e}}},
-  {0x053f, {1|F|D, {0x056f}}},
-  {0x0540, {1|F|D, {0x0570}}},
-  {0x0541, {1|F|D, {0x0571}}},
-  {0x0542, {1|F|D, {0x0572}}},
-  {0x0543, {1|F|D, {0x0573}}},
-  {0x0544, {1|F|D, {0x0574}}},
-  {0x0545, {1|F|D, {0x0575}}},
-  {0x0546, {1|F|D, {0x0576}}},
-  {0x0547, {1|F|D, {0x0577}}},
-  {0x0548, {1|F|D, {0x0578}}},
-  {0x0549, {1|F|D, {0x0579}}},
-  {0x054a, {1|F|D, {0x057a}}},
-  {0x054b, {1|F|D, {0x057b}}},
-  {0x054c, {1|F|D, {0x057c}}},
-  {0x054d, {1|F|D, {0x057d}}},
-  {0x054e, {1|F|D, {0x057e}}},
-  {0x054f, {1|F|D, {0x057f}}},
-  {0x0550, {1|F|D, {0x0580}}},
-  {0x0551, {1|F|D, {0x0581}}},
-  {0x0552, {1|F|D, {0x0582}}},
-  {0x0553, {1|F|D, {0x0583}}},
-  {0x0554, {1|F|D, {0x0584}}},
-  {0x0555, {1|F|D, {0x0585}}},
-  {0x0556, {1|F|D, {0x0586}}},
-  {0x0587, {2|F|ST|SU|I(41), {0x0565, 0x0582}}},
-  {0x10a0, {1|F|D, {0x2d00}}},
-  {0x10a1, {1|F|D, {0x2d01}}},
-  {0x10a2, {1|F|D, {0x2d02}}},
-  {0x10a3, {1|F|D, {0x2d03}}},
-  {0x10a4, {1|F|D, {0x2d04}}},
-  {0x10a5, {1|F|D, {0x2d05}}},
-  {0x10a6, {1|F|D, {0x2d06}}},
-  {0x10a7, {1|F|D, {0x2d07}}},
-  {0x10a8, {1|F|D, {0x2d08}}},
-  {0x10a9, {1|F|D, {0x2d09}}},
-  {0x10aa, {1|F|D, {0x2d0a}}},
-  {0x10ab, {1|F|D, {0x2d0b}}},
-  {0x10ac, {1|F|D, {0x2d0c}}},
-  {0x10ad, {1|F|D, {0x2d0d}}},
-  {0x10ae, {1|F|D, {0x2d0e}}},
-  {0x10af, {1|F|D, {0x2d0f}}},
-  {0x10b0, {1|F|D, {0x2d10}}},
-  {0x10b1, {1|F|D, {0x2d11}}},
-  {0x10b2, {1|F|D, {0x2d12}}},
-  {0x10b3, {1|F|D, {0x2d13}}},
-  {0x10b4, {1|F|D, {0x2d14}}},
-  {0x10b5, {1|F|D, {0x2d15}}},
-  {0x10b6, {1|F|D, {0x2d16}}},
-  {0x10b7, {1|F|D, {0x2d17}}},
-  {0x10b8, {1|F|D, {0x2d18}}},
-  {0x10b9, {1|F|D, {0x2d19}}},
-  {0x10ba, {1|F|D, {0x2d1a}}},
-  {0x10bb, {1|F|D, {0x2d1b}}},
-  {0x10bc, {1|F|D, {0x2d1c}}},
-  {0x10bd, {1|F|D, {0x2d1d}}},
-  {0x10be, {1|F|D, {0x2d1e}}},
-  {0x10bf, {1|F|D, {0x2d1f}}},
-  {0x10c0, {1|F|D, {0x2d20}}},
-  {0x10c1, {1|F|D, {0x2d21}}},
-  {0x10c2, {1|F|D, {0x2d22}}},
-  {0x10c3, {1|F|D, {0x2d23}}},
-  {0x10c4, {1|F|D, {0x2d24}}},
-  {0x10c5, {1|F|D, {0x2d25}}},
-  {0x10c7, {1|F|D, {0x2d27}}},
-  {0x10cd, {1|F|D, {0x2d2d}}},
-  {0x13f8, {1|F|U, {0x13f0}}},
-  {0x13f9, {1|F|U, {0x13f1}}},
-  {0x13fa, {1|F|U, {0x13f2}}},
-  {0x13fb, {1|F|U, {0x13f3}}},
-  {0x13fc, {1|F|U, {0x13f4}}},
-  {0x13fd, {1|F|U, {0x13f5}}},
-  {0x1c80, {1|F|SU|I(45), {0x0432}}},
-  {0x1c81, {1|F|SU|I(46), {0x0434}}},
-  {0x1c82, {1|F|SU|I(47), {0x043e}}},
-  {0x1c83, {1|F|SU|I(48), {0x0441}}},
-  {0x1c84, {1|F|SU|I(49), {0x0442}}},
-  {0x1c85, {1|F|SU|I(50), {0x0442}}},
-  {0x1c86, {1|F|SU|I(51), {0x044a}}},
-  {0x1c87, {1|F|SU|I(52), {0x0463}}},
-  {0x1c88, {1|F|SU|I(53), {0xa64b}}},
-  {0x1e00, {1|F|D, {0x1e01}}},
-  {0x1e02, {1|F|D, {0x1e03}}},
-  {0x1e04, {1|F|D, {0x1e05}}},
-  {0x1e06, {1|F|D, {0x1e07}}},
-  {0x1e08, {1|F|D, {0x1e09}}},
-  {0x1e0a, {1|F|D, {0x1e0b}}},
-  {0x1e0c, {1|F|D, {0x1e0d}}},
-  {0x1e0e, {1|F|D, {0x1e0f}}},
-  {0x1e10, {1|F|D, {0x1e11}}},
-  {0x1e12, {1|F|D, {0x1e13}}},
-  {0x1e14, {1|F|D, {0x1e15}}},
-  {0x1e16, {1|F|D, {0x1e17}}},
-  {0x1e18, {1|F|D, {0x1e19}}},
-  {0x1e1a, {1|F|D, {0x1e1b}}},
-  {0x1e1c, {1|F|D, {0x1e1d}}},
-  {0x1e1e, {1|F|D, {0x1e1f}}},
-  {0x1e20, {1|F|D, {0x1e21}}},
-  {0x1e22, {1|F|D, {0x1e23}}},
-  {0x1e24, {1|F|D, {0x1e25}}},
-  {0x1e26, {1|F|D, {0x1e27}}},
-  {0x1e28, {1|F|D, {0x1e29}}},
-  {0x1e2a, {1|F|D, {0x1e2b}}},
-  {0x1e2c, {1|F|D, {0x1e2d}}},
-  {0x1e2e, {1|F|D, {0x1e2f}}},
-  {0x1e30, {1|F|D, {0x1e31}}},
-  {0x1e32, {1|F|D, {0x1e33}}},
-  {0x1e34, {1|F|D, {0x1e35}}},
-  {0x1e36, {1|F|D, {0x1e37}}},
-  {0x1e38, {1|F|D, {0x1e39}}},
-  {0x1e3a, {1|F|D, {0x1e3b}}},
-  {0x1e3c, {1|F|D, {0x1e3d}}},
-  {0x1e3e, {1|F|D, {0x1e3f}}},
-  {0x1e40, {1|F|D, {0x1e41}}},
-  {0x1e42, {1|F|D, {0x1e43}}},
-  {0x1e44, {1|F|D, {0x1e45}}},
-  {0x1e46, {1|F|D, {0x1e47}}},
-  {0x1e48, {1|F|D, {0x1e49}}},
-  {0x1e4a, {1|F|D, {0x1e4b}}},
-  {0x1e4c, {1|F|D, {0x1e4d}}},
-  {0x1e4e, {1|F|D, {0x1e4f}}},
-  {0x1e50, {1|F|D, {0x1e51}}},
-  {0x1e52, {1|F|D, {0x1e53}}},
-  {0x1e54, {1|F|D, {0x1e55}}},
-  {0x1e56, {1|F|D, {0x1e57}}},
-  {0x1e58, {1|F|D, {0x1e59}}},
-  {0x1e5a, {1|F|D, {0x1e5b}}},
-  {0x1e5c, {1|F|D, {0x1e5d}}},
-  {0x1e5e, {1|F|D, {0x1e5f}}},
-  {0x1e60, {1|F|D, {0x1e61}}},
-  {0x1e62, {1|F|D, {0x1e63}}},
-  {0x1e64, {1|F|D, {0x1e65}}},
-  {0x1e66, {1|F|D, {0x1e67}}},
-  {0x1e68, {1|F|D, {0x1e69}}},
-  {0x1e6a, {1|F|D, {0x1e6b}}},
-  {0x1e6c, {1|F|D, {0x1e6d}}},
-  {0x1e6e, {1|F|D, {0x1e6f}}},
-  {0x1e70, {1|F|D, {0x1e71}}},
-  {0x1e72, {1|F|D, {0x1e73}}},
-  {0x1e74, {1|F|D, {0x1e75}}},
-  {0x1e76, {1|F|D, {0x1e77}}},
-  {0x1e78, {1|F|D, {0x1e79}}},
-  {0x1e7a, {1|F|D, {0x1e7b}}},
-  {0x1e7c, {1|F|D, {0x1e7d}}},
-  {0x1e7e, {1|F|D, {0x1e7f}}},
-  {0x1e80, {1|F|D, {0x1e81}}},
-  {0x1e82, {1|F|D, {0x1e83}}},
-  {0x1e84, {1|F|D, {0x1e85}}},
-  {0x1e86, {1|F|D, {0x1e87}}},
-  {0x1e88, {1|F|D, {0x1e89}}},
-  {0x1e8a, {1|F|D, {0x1e8b}}},
-  {0x1e8c, {1|F|D, {0x1e8d}}},
-  {0x1e8e, {1|F|D, {0x1e8f}}},
-  {0x1e90, {1|F|D, {0x1e91}}},
-  {0x1e92, {1|F|D, {0x1e93}}},
-  {0x1e94, {1|F|D, {0x1e95}}},
-  {0x1e96, {2|F|SU|I(54), {0x0068, 0x0331}}},
-  {0x1e97, {2|F|SU|I(56), {0x0074, 0x0308}}},
-  {0x1e98, {2|F|SU|I(58), {0x0077, 0x030a}}},
-  {0x1e99, {2|F|SU|I(60), {0x0079, 0x030a}}},
-  {0x1e9a, {2|F|SU|I(62), {0x0061, 0x02be}}},
-  {0x1e9b, {1|F|SU|I(64), {0x1e61}}},
-  {0x1e9e, {2|F|SL|I(65), {0x0073, 0x0073}}},
-  {0x1ea0, {1|F|D, {0x1ea1}}},
-  {0x1ea2, {1|F|D, {0x1ea3}}},
-  {0x1ea4, {1|F|D, {0x1ea5}}},
-  {0x1ea6, {1|F|D, {0x1ea7}}},
-  {0x1ea8, {1|F|D, {0x1ea9}}},
-  {0x1eaa, {1|F|D, {0x1eab}}},
-  {0x1eac, {1|F|D, {0x1ead}}},
-  {0x1eae, {1|F|D, {0x1eaf}}},
-  {0x1eb0, {1|F|D, {0x1eb1}}},
-  {0x1eb2, {1|F|D, {0x1eb3}}},
-  {0x1eb4, {1|F|D, {0x1eb5}}},
-  {0x1eb6, {1|F|D, {0x1eb7}}},
-  {0x1eb8, {1|F|D, {0x1eb9}}},
-  {0x1eba, {1|F|D, {0x1ebb}}},
-  {0x1ebc, {1|F|D, {0x1ebd}}},
-  {0x1ebe, {1|F|D, {0x1ebf}}},
-  {0x1ec0, {1|F|D, {0x1ec1}}},
-  {0x1ec2, {1|F|D, {0x1ec3}}},
-  {0x1ec4, {1|F|D, {0x1ec5}}},
-  {0x1ec6, {1|F|D, {0x1ec7}}},
-  {0x1ec8, {1|F|D, {0x1ec9}}},
-  {0x1eca, {1|F|D, {0x1ecb}}},
-  {0x1ecc, {1|F|D, {0x1ecd}}},
-  {0x1ece, {1|F|D, {0x1ecf}}},
-  {0x1ed0, {1|F|D, {0x1ed1}}},
-  {0x1ed2, {1|F|D, {0x1ed3}}},
-  {0x1ed4, {1|F|D, {0x1ed5}}},
-  {0x1ed6, {1|F|D, {0x1ed7}}},
-  {0x1ed8, {1|F|D, {0x1ed9}}},
-  {0x1eda, {1|F|D, {0x1edb}}},
-  {0x1edc, {1|F|D, {0x1edd}}},
-  {0x1ede, {1|F|D, {0x1edf}}},
-  {0x1ee0, {1|F|D, {0x1ee1}}},
-  {0x1ee2, {1|F|D, {0x1ee3}}},
-  {0x1ee4, {1|F|D, {0x1ee5}}},
-  {0x1ee6, {1|F|D, {0x1ee7}}},
-  {0x1ee8, {1|F|D, {0x1ee9}}},
-  {0x1eea, {1|F|D, {0x1eeb}}},
-  {0x1eec, {1|F|D, {0x1eed}}},
-  {0x1eee, {1|F|D, {0x1eef}}},
-  {0x1ef0, {1|F|D, {0x1ef1}}},
-  {0x1ef2, {1|F|D, {0x1ef3}}},
-  {0x1ef4, {1|F|D, {0x1ef5}}},
-  {0x1ef6, {1|F|D, {0x1ef7}}},
-  {0x1ef8, {1|F|D, {0x1ef9}}},
-  {0x1efa, {1|F|D, {0x1efb}}},
-  {0x1efc, {1|F|D, {0x1efd}}},
-  {0x1efe, {1|F|D, {0x1eff}}},
-  {0x1f08, {1|F|D, {0x1f00}}},
-  {0x1f09, {1|F|D, {0x1f01}}},
-  {0x1f0a, {1|F|D, {0x1f02}}},
-  {0x1f0b, {1|F|D, {0x1f03}}},
-  {0x1f0c, {1|F|D, {0x1f04}}},
-  {0x1f0d, {1|F|D, {0x1f05}}},
-  {0x1f0e, {1|F|D, {0x1f06}}},
-  {0x1f0f, {1|F|D, {0x1f07}}},
-  {0x1f18, {1|F|D, {0x1f10}}},
-  {0x1f19, {1|F|D, {0x1f11}}},
-  {0x1f1a, {1|F|D, {0x1f12}}},
-  {0x1f1b, {1|F|D, {0x1f13}}},
-  {0x1f1c, {1|F|D, {0x1f14}}},
-  {0x1f1d, {1|F|D, {0x1f15}}},
-  {0x1f28, {1|F|D, {0x1f20}}},
-  {0x1f29, {1|F|D, {0x1f21}}},
-  {0x1f2a, {1|F|D, {0x1f22}}},
-  {0x1f2b, {1|F|D, {0x1f23}}},
-  {0x1f2c, {1|F|D, {0x1f24}}},
-  {0x1f2d, {1|F|D, {0x1f25}}},
-  {0x1f2e, {1|F|D, {0x1f26}}},
-  {0x1f2f, {1|F|D, {0x1f27}}},
-  {0x1f38, {1|F|D, {0x1f30}}},
-  {0x1f39, {1|F|D, {0x1f31}}},
-  {0x1f3a, {1|F|D, {0x1f32}}},
-  {0x1f3b, {1|F|D, {0x1f33}}},
-  {0x1f3c, {1|F|D, {0x1f34}}},
-  {0x1f3d, {1|F|D, {0x1f35}}},
-  {0x1f3e, {1|F|D, {0x1f36}}},
-  {0x1f3f, {1|F|D, {0x1f37}}},
-  {0x1f48, {1|F|D, {0x1f40}}},
-  {0x1f49, {1|F|D, {0x1f41}}},
-  {0x1f4a, {1|F|D, {0x1f42}}},
-  {0x1f4b, {1|F|D, {0x1f43}}},
-  {0x1f4c, {1|F|D, {0x1f44}}},
-  {0x1f4d, {1|F|D, {0x1f45}}},
-  {0x1f50, {2|F|SU|I(66), {0x03c5, 0x0313}}},
-  {0x1f52, {3|F|SU|I(68), {0x03c5, 0x0313, 0x0300}}},
-  {0x1f54, {3|F|SU|I(71), {0x03c5, 0x0313, 0x0301}}},
-  {0x1f56, {3|F|SU|I(74), {0x03c5, 0x0313, 0x0342}}},
-  {0x1f59, {1|F|D, {0x1f51}}},
-  {0x1f5b, {1|F|D, {0x1f53}}},
-  {0x1f5d, {1|F|D, {0x1f55}}},
-  {0x1f5f, {1|F|D, {0x1f57}}},
-  {0x1f68, {1|F|D, {0x1f60}}},
-  {0x1f69, {1|F|D, {0x1f61}}},
-  {0x1f6a, {1|F|D, {0x1f62}}},
-  {0x1f6b, {1|F|D, {0x1f63}}},
-  {0x1f6c, {1|F|D, {0x1f64}}},
-  {0x1f6d, {1|F|D, {0x1f65}}},
-  {0x1f6e, {1|F|D, {0x1f66}}},
-  {0x1f6f, {1|F|D, {0x1f67}}},
-  {0x1f80, {2|F|ST|SU|I(77), {0x1f00, 0x03b9}}},
-  {0x1f81, {2|F|ST|SU|I(80), {0x1f01, 0x03b9}}},
-  {0x1f82, {2|F|ST|SU|I(83), {0x1f02, 0x03b9}}},
-  {0x1f83, {2|F|ST|SU|I(86), {0x1f03, 0x03b9}}},
-  {0x1f84, {2|F|ST|SU|I(89), {0x1f04, 0x03b9}}},
-  {0x1f85, {2|F|ST|SU|I(92), {0x1f05, 0x03b9}}},
-  {0x1f86, {2|F|ST|SU|I(95), {0x1f06, 0x03b9}}},
-  {0x1f87, {2|F|ST|SU|I(98), {0x1f07, 0x03b9}}},
-  {0x1f88, {2|F|IT|SL|SU|I(101), {0x1f00, 0x03b9}}},
-  {0x1f89, {2|F|IT|SL|SU|I(106), {0x1f01, 0x03b9}}},
-  {0x1f8a, {2|F|IT|SL|SU|I(111), {0x1f02, 0x03b9}}},
-  {0x1f8b, {2|F|IT|SL|SU|I(116), {0x1f03, 0x03b9}}},
-  {0x1f8c, {2|F|IT|SL|SU|I(121), {0x1f04, 0x03b9}}},
-  {0x1f8d, {2|F|IT|SL|SU|I(126), {0x1f05, 0x03b9}}},
-  {0x1f8e, {2|F|IT|SL|SU|I(131), {0x1f06, 0x03b9}}},
-  {0x1f8f, {2|F|IT|SL|SU|I(136), {0x1f07, 0x03b9}}},
-  {0x1f90, {2|F|ST|SU|I(141), {0x1f20, 0x03b9}}},
-  {0x1f91, {2|F|ST|SU|I(144), {0x1f21, 0x03b9}}},
-  {0x1f92, {2|F|ST|SU|I(147), {0x1f22, 0x03b9}}},
-  {0x1f93, {2|F|ST|SU|I(150), {0x1f23, 0x03b9}}},
-  {0x1f94, {2|F|ST|SU|I(153), {0x1f24, 0x03b9}}},
-  {0x1f95, {2|F|ST|SU|I(156), {0x1f25, 0x03b9}}},
-  {0x1f96, {2|F|ST|SU|I(159), {0x1f26, 0x03b9}}},
-  {0x1f97, {2|F|ST|SU|I(162), {0x1f27, 0x03b9}}},
-  {0x1f98, {2|F|IT|SL|SU|I(165), {0x1f20, 0x03b9}}},
-  {0x1f99, {2|F|IT|SL|SU|I(170), {0x1f21, 0x03b9}}},
-  {0x1f9a, {2|F|IT|SL|SU|I(175), {0x1f22, 0x03b9}}},
-  {0x1f9b, {2|F|IT|SL|SU|I(180), {0x1f23, 0x03b9}}},
-  {0x1f9c, {2|F|IT|SL|SU|I(185), {0x1f24, 0x03b9}}},
-  {0x1f9d, {2|F|IT|SL|SU|I(190), {0x1f25, 0x03b9}}},
-  {0x1f9e, {2|F|IT|SL|SU|I(195), {0x1f26, 0x03b9}}},
-  {0x1f9f, {2|F|IT|SL|SU|I(200), {0x1f27, 0x03b9}}},
-  {0x1fa0, {2|F|ST|SU|I(205), {0x1f60, 0x03b9}}},
-  {0x1fa1, {2|F|ST|SU|I(208), {0x1f61, 0x03b9}}},
-  {0x1fa2, {2|F|ST|SU|I(211), {0x1f62, 0x03b9}}},
-  {0x1fa3, {2|F|ST|SU|I(214), {0x1f63, 0x03b9}}},
-  {0x1fa4, {2|F|ST|SU|I(217), {0x1f64, 0x03b9}}},
-  {0x1fa5, {2|F|ST|SU|I(220), {0x1f65, 0x03b9}}},
-  {0x1fa6, {2|F|ST|SU|I(223), {0x1f66, 0x03b9}}},
-  {0x1fa7, {2|F|ST|SU|I(226), {0x1f67, 0x03b9}}},
-  {0x1fa8, {2|F|IT|SL|SU|I(229), {0x1f60, 0x03b9}}},
-  {0x1fa9, {2|F|IT|SL|SU|I(234), {0x1f61, 0x03b9}}},
-  {0x1faa, {2|F|IT|SL|SU|I(239), {0x1f62, 0x03b9}}},
-  {0x1fab, {2|F|IT|SL|SU|I(244), {0x1f63, 0x03b9}}},
-  {0x1fac, {2|F|IT|SL|SU|I(249), {0x1f64, 0x03b9}}},
-  {0x1fad, {2|F|IT|SL|SU|I(254), {0x1f65, 0x03b9}}},
-  {0x1fae, {2|F|IT|SL|SU|I(259), {0x1f66, 0x03b9}}},
-  {0x1faf, {2|F|IT|SL|SU|I(264), {0x1f67, 0x03b9}}},
-  {0x1fb2, {2|F|ST|SU|I(269), {0x1f70, 0x03b9}}},
-  {0x1fb3, {2|F|ST|SU|I(273), {0x03b1, 0x03b9}}},
-  {0x1fb4, {2|F|ST|SU|I(276), {0x03ac, 0x03b9}}},
-  {0x1fb6, {2|F|SU|I(280), {0x03b1, 0x0342}}},
-  {0x1fb7, {3|F|ST|SU|I(282), {0x03b1, 0x0342, 0x03b9}}},
-  {0x1fb8, {1|F|D, {0x1fb0}}},
-  {0x1fb9, {1|F|D, {0x1fb1}}},
-  {0x1fba, {1|F|D, {0x1f70}}},
-  {0x1fbb, {1|F|D, {0x1f71}}},
-  {0x1fbc, {2|F|IT|SL|SU|I(288), {0x03b1, 0x03b9}}},
-  {0x1fbe, {1|F|SU|I(293), {0x03b9}}},
-  {0x1fc2, {2|F|ST|SU|I(294), {0x1f74, 0x03b9}}},
-  {0x1fc3, {2|F|ST|SU|I(298), {0x03b7, 0x03b9}}},
-  {0x1fc4, {2|F|ST|SU|I(301), {0x03ae, 0x03b9}}},
-  {0x1fc6, {2|F|SU|I(305), {0x03b7, 0x0342}}},
-  {0x1fc7, {3|F|ST|SU|I(307), {0x03b7, 0x0342, 0x03b9}}},
-  {0x1fc8, {1|F|D, {0x1f72}}},
-  {0x1fc9, {1|F|D, {0x1f73}}},
-  {0x1fca, {1|F|D, {0x1f74}}},
-  {0x1fcb, {1|F|D, {0x1f75}}},
-  {0x1fcc, {2|F|IT|SL|SU|I(313), {0x03b7, 0x03b9}}},
-  {0x1fd2, {3|F|SU|I(318), {0x03b9, 0x0308, 0x0300}}},
-  {0x1fd3, {3|F|SU|I(321), {0x03b9, 0x0308, 0x0301}}},
-  {0x1fd6, {2|F|SU|I(324), {0x03b9, 0x0342}}},
-  {0x1fd7, {3|F|SU|I(326), {0x03b9, 0x0308, 0x0342}}},
-  {0x1fd8, {1|F|D, {0x1fd0}}},
-  {0x1fd9, {1|F|D, {0x1fd1}}},
-  {0x1fda, {1|F|D, {0x1f76}}},
-  {0x1fdb, {1|F|D, {0x1f77}}},
-  {0x1fe2, {3|F|SU|I(329), {0x03c5, 0x0308, 0x0300}}},
-  {0x1fe3, {3|F|SU|I(332), {0x03c5, 0x0308, 0x0301}}},
-  {0x1fe4, {2|F|SU|I(335), {0x03c1, 0x0313}}},
-  {0x1fe6, {2|F|SU|I(337), {0x03c5, 0x0342}}},
-  {0x1fe7, {3|F|SU|I(339), {0x03c5, 0x0308, 0x0342}}},
-  {0x1fe8, {1|F|D, {0x1fe0}}},
-  {0x1fe9, {1|F|D, {0x1fe1}}},
-  {0x1fea, {1|F|D, {0x1f7a}}},
-  {0x1feb, {1|F|D, {0x1f7b}}},
-  {0x1fec, {1|F|D, {0x1fe5}}},
-  {0x1ff2, {2|F|ST|SU|I(342), {0x1f7c, 0x03b9}}},
-  {0x1ff3, {2|F|ST|SU|I(346), {0x03c9, 0x03b9}}},
-  {0x1ff4, {2|F|ST|SU|I(349), {0x03ce, 0x03b9}}},
-  {0x1ff6, {2|F|SU|I(353), {0x03c9, 0x0342}}},
-  {0x1ff7, {3|F|ST|SU|I(355), {0x03c9, 0x0342, 0x03b9}}},
-  {0x1ff8, {1|F|D, {0x1f78}}},
-  {0x1ff9, {1|F|D, {0x1f79}}},
-  {0x1ffa, {1|F|D, {0x1f7c}}},
-  {0x1ffb, {1|F|D, {0x1f7d}}},
-  {0x1ffc, {2|F|IT|SL|SU|I(361), {0x03c9, 0x03b9}}},
-  {0x2126, {1|F|D, {0x03c9}}},
-  {0x212a, {1|F|D, {0x006b}}},
-  {0x212b, {1|F|D, {0x00e5}}},
-  {0x2132, {1|F|D, {0x214e}}},
-  {0x2160, {1|F|D, {0x2170}}},
-  {0x2161, {1|F|D, {0x2171}}},
-  {0x2162, {1|F|D, {0x2172}}},
-  {0x2163, {1|F|D, {0x2173}}},
-  {0x2164, {1|F|D, {0x2174}}},
-  {0x2165, {1|F|D, {0x2175}}},
-  {0x2166, {1|F|D, {0x2176}}},
-  {0x2167, {1|F|D, {0x2177}}},
-  {0x2168, {1|F|D, {0x2178}}},
-  {0x2169, {1|F|D, {0x2179}}},
-  {0x216a, {1|F|D, {0x217a}}},
-  {0x216b, {1|F|D, {0x217b}}},
-  {0x216c, {1|F|D, {0x217c}}},
-  {0x216d, {1|F|D, {0x217d}}},
-  {0x216e, {1|F|D, {0x217e}}},
-  {0x216f, {1|F|D, {0x217f}}},
-  {0x2183, {1|F|D, {0x2184}}},
-  {0x24b6, {1|F|D, {0x24d0}}},
-  {0x24b7, {1|F|D, {0x24d1}}},
-  {0x24b8, {1|F|D, {0x24d2}}},
-  {0x24b9, {1|F|D, {0x24d3}}},
-  {0x24ba, {1|F|D, {0x24d4}}},
-  {0x24bb, {1|F|D, {0x24d5}}},
-  {0x24bc, {1|F|D, {0x24d6}}},
-  {0x24bd, {1|F|D, {0x24d7}}},
-  {0x24be, {1|F|D, {0x24d8}}},
-  {0x24bf, {1|F|D, {0x24d9}}},
-  {0x24c0, {1|F|D, {0x24da}}},
-  {0x24c1, {1|F|D, {0x24db}}},
-  {0x24c2, {1|F|D, {0x24dc}}},
-  {0x24c3, {1|F|D, {0x24dd}}},
-  {0x24c4, {1|F|D, {0x24de}}},
-  {0x24c5, {1|F|D, {0x24df}}},
-  {0x24c6, {1|F|D, {0x24e0}}},
-  {0x24c7, {1|F|D, {0x24e1}}},
-  {0x24c8, {1|F|D, {0x24e2}}},
-  {0x24c9, {1|F|D, {0x24e3}}},
-  {0x24ca, {1|F|D, {0x24e4}}},
-  {0x24cb, {1|F|D, {0x24e5}}},
-  {0x24cc, {1|F|D, {0x24e6}}},
-  {0x24cd, {1|F|D, {0x24e7}}},
-  {0x24ce, {1|F|D, {0x24e8}}},
-  {0x24cf, {1|F|D, {0x24e9}}},
-  {0x2c00, {1|F|D, {0x2c30}}},
-  {0x2c01, {1|F|D, {0x2c31}}},
-  {0x2c02, {1|F|D, {0x2c32}}},
-  {0x2c03, {1|F|D, {0x2c33}}},
-  {0x2c04, {1|F|D, {0x2c34}}},
-  {0x2c05, {1|F|D, {0x2c35}}},
-  {0x2c06, {1|F|D, {0x2c36}}},
-  {0x2c07, {1|F|D, {0x2c37}}},
-  {0x2c08, {1|F|D, {0x2c38}}},
-  {0x2c09, {1|F|D, {0x2c39}}},
-  {0x2c0a, {1|F|D, {0x2c3a}}},
-  {0x2c0b, {1|F|D, {0x2c3b}}},
-  {0x2c0c, {1|F|D, {0x2c3c}}},
-  {0x2c0d, {1|F|D, {0x2c3d}}},
-  {0x2c0e, {1|F|D, {0x2c3e}}},
-  {0x2c0f, {1|F|D, {0x2c3f}}},
-  {0x2c10, {1|F|D, {0x2c40}}},
-  {0x2c11, {1|F|D, {0x2c41}}},
-  {0x2c12, {1|F|D, {0x2c42}}},
-  {0x2c13, {1|F|D, {0x2c43}}},
-  {0x2c14, {1|F|D, {0x2c44}}},
-  {0x2c15, {1|F|D, {0x2c45}}},
-  {0x2c16, {1|F|D, {0x2c46}}},
-  {0x2c17, {1|F|D, {0x2c47}}},
-  {0x2c18, {1|F|D, {0x2c48}}},
-  {0x2c19, {1|F|D, {0x2c49}}},
-  {0x2c1a, {1|F|D, {0x2c4a}}},
-  {0x2c1b, {1|F|D, {0x2c4b}}},
-  {0x2c1c, {1|F|D, {0x2c4c}}},
-  {0x2c1d, {1|F|D, {0x2c4d}}},
-  {0x2c1e, {1|F|D, {0x2c4e}}},
-  {0x2c1f, {1|F|D, {0x2c4f}}},
-  {0x2c20, {1|F|D, {0x2c50}}},
-  {0x2c21, {1|F|D, {0x2c51}}},
-  {0x2c22, {1|F|D, {0x2c52}}},
-  {0x2c23, {1|F|D, {0x2c53}}},
-  {0x2c24, {1|F|D, {0x2c54}}},
-  {0x2c25, {1|F|D, {0x2c55}}},
-  {0x2c26, {1|F|D, {0x2c56}}},
-  {0x2c27, {1|F|D, {0x2c57}}},
-  {0x2c28, {1|F|D, {0x2c58}}},
-  {0x2c29, {1|F|D, {0x2c59}}},
-  {0x2c2a, {1|F|D, {0x2c5a}}},
-  {0x2c2b, {1|F|D, {0x2c5b}}},
-  {0x2c2c, {1|F|D, {0x2c5c}}},
-  {0x2c2d, {1|F|D, {0x2c5d}}},
-  {0x2c2e, {1|F|D, {0x2c5e}}},
-  {0x2c60, {1|F|D, {0x2c61}}},
-  {0x2c62, {1|F|D, {0x026b}}},
-  {0x2c63, {1|F|D, {0x1d7d}}},
-  {0x2c64, {1|F|D, {0x027d}}},
-  {0x2c67, {1|F|D, {0x2c68}}},
-  {0x2c69, {1|F|D, {0x2c6a}}},
-  {0x2c6b, {1|F|D, {0x2c6c}}},
-  {0x2c6d, {1|F|D, {0x0251}}},
-  {0x2c6e, {1|F|D, {0x0271}}},
-  {0x2c6f, {1|F|D, {0x0250}}},
-  {0x2c70, {1|F|D, {0x0252}}},
-  {0x2c72, {1|F|D, {0x2c73}}},
-  {0x2c75, {1|F|D, {0x2c76}}},
-  {0x2c7e, {1|F|D, {0x023f}}},
-  {0x2c7f, {1|F|D, {0x0240}}},
-  {0x2c80, {1|F|D, {0x2c81}}},
-  {0x2c82, {1|F|D, {0x2c83}}},
-  {0x2c84, {1|F|D, {0x2c85}}},
-  {0x2c86, {1|F|D, {0x2c87}}},
-  {0x2c88, {1|F|D, {0x2c89}}},
-  {0x2c8a, {1|F|D, {0x2c8b}}},
-  {0x2c8c, {1|F|D, {0x2c8d}}},
-  {0x2c8e, {1|F|D, {0x2c8f}}},
-  {0x2c90, {1|F|D, {0x2c91}}},
-  {0x2c92, {1|F|D, {0x2c93}}},
-  {0x2c94, {1|F|D, {0x2c95}}},
-  {0x2c96, {1|F|D, {0x2c97}}},
-  {0x2c98, {1|F|D, {0x2c99}}},
-  {0x2c9a, {1|F|D, {0x2c9b}}},
-  {0x2c9c, {1|F|D, {0x2c9d}}},
-  {0x2c9e, {1|F|D, {0x2c9f}}},
-  {0x2ca0, {1|F|D, {0x2ca1}}},
-  {0x2ca2, {1|F|D, {0x2ca3}}},
-  {0x2ca4, {1|F|D, {0x2ca5}}},
-  {0x2ca6, {1|F|D, {0x2ca7}}},
-  {0x2ca8, {1|F|D, {0x2ca9}}},
-  {0x2caa, {1|F|D, {0x2cab}}},
-  {0x2cac, {1|F|D, {0x2cad}}},
-  {0x2cae, {1|F|D, {0x2caf}}},
-  {0x2cb0, {1|F|D, {0x2cb1}}},
-  {0x2cb2, {1|F|D, {0x2cb3}}},
-  {0x2cb4, {1|F|D, {0x2cb5}}},
-  {0x2cb6, {1|F|D, {0x2cb7}}},
-  {0x2cb8, {1|F|D, {0x2cb9}}},
-  {0x2cba, {1|F|D, {0x2cbb}}},
-  {0x2cbc, {1|F|D, {0x2cbd}}},
-  {0x2cbe, {1|F|D, {0x2cbf}}},
-  {0x2cc0, {1|F|D, {0x2cc1}}},
-  {0x2cc2, {1|F|D, {0x2cc3}}},
-  {0x2cc4, {1|F|D, {0x2cc5}}},
-  {0x2cc6, {1|F|D, {0x2cc7}}},
-  {0x2cc8, {1|F|D, {0x2cc9}}},
-  {0x2cca, {1|F|D, {0x2ccb}}},
-  {0x2ccc, {1|F|D, {0x2ccd}}},
-  {0x2cce, {1|F|D, {0x2ccf}}},
-  {0x2cd0, {1|F|D, {0x2cd1}}},
-  {0x2cd2, {1|F|D, {0x2cd3}}},
-  {0x2cd4, {1|F|D, {0x2cd5}}},
-  {0x2cd6, {1|F|D, {0x2cd7}}},
-  {0x2cd8, {1|F|D, {0x2cd9}}},
-  {0x2cda, {1|F|D, {0x2cdb}}},
-  {0x2cdc, {1|F|D, {0x2cdd}}},
-  {0x2cde, {1|F|D, {0x2cdf}}},
-  {0x2ce0, {1|F|D, {0x2ce1}}},
-  {0x2ce2, {1|F|D, {0x2ce3}}},
-  {0x2ceb, {1|F|D, {0x2cec}}},
-  {0x2ced, {1|F|D, {0x2cee}}},
-  {0x2cf2, {1|F|D, {0x2cf3}}},
-  {0xa640, {1|F|D, {0xa641}}},
-  {0xa642, {1|F|D, {0xa643}}},
-  {0xa644, {1|F|D, {0xa645}}},
-  {0xa646, {1|F|D, {0xa647}}},
-  {0xa648, {1|F|D, {0xa649}}},
-  {0xa64a, {1|F|D, {0xa64b}}},
-  {0xa64c, {1|F|D, {0xa64d}}},
-  {0xa64e, {1|F|D, {0xa64f}}},
-  {0xa650, {1|F|D, {0xa651}}},
-  {0xa652, {1|F|D, {0xa653}}},
-  {0xa654, {1|F|D, {0xa655}}},
-  {0xa656, {1|F|D, {0xa657}}},
-  {0xa658, {1|F|D, {0xa659}}},
-  {0xa65a, {1|F|D, {0xa65b}}},
-  {0xa65c, {1|F|D, {0xa65d}}},
-  {0xa65e, {1|F|D, {0xa65f}}},
-  {0xa660, {1|F|D, {0xa661}}},
-  {0xa662, {1|F|D, {0xa663}}},
-  {0xa664, {1|F|D, {0xa665}}},
-  {0xa666, {1|F|D, {0xa667}}},
-  {0xa668, {1|F|D, {0xa669}}},
-  {0xa66a, {1|F|D, {0xa66b}}},
-  {0xa66c, {1|F|D, {0xa66d}}},
-  {0xa680, {1|F|D, {0xa681}}},
-  {0xa682, {1|F|D, {0xa683}}},
-  {0xa684, {1|F|D, {0xa685}}},
-  {0xa686, {1|F|D, {0xa687}}},
-  {0xa688, {1|F|D, {0xa689}}},
-  {0xa68a, {1|F|D, {0xa68b}}},
-  {0xa68c, {1|F|D, {0xa68d}}},
-  {0xa68e, {1|F|D, {0xa68f}}},
-  {0xa690, {1|F|D, {0xa691}}},
-  {0xa692, {1|F|D, {0xa693}}},
-  {0xa694, {1|F|D, {0xa695}}},
-  {0xa696, {1|F|D, {0xa697}}},
-  {0xa698, {1|F|D, {0xa699}}},
-  {0xa69a, {1|F|D, {0xa69b}}},
-  {0xa722, {1|F|D, {0xa723}}},
-  {0xa724, {1|F|D, {0xa725}}},
-  {0xa726, {1|F|D, {0xa727}}},
-  {0xa728, {1|F|D, {0xa729}}},
-  {0xa72a, {1|F|D, {0xa72b}}},
-  {0xa72c, {1|F|D, {0xa72d}}},
-  {0xa72e, {1|F|D, {0xa72f}}},
-  {0xa732, {1|F|D, {0xa733}}},
-  {0xa734, {1|F|D, {0xa735}}},
-  {0xa736, {1|F|D, {0xa737}}},
-  {0xa738, {1|F|D, {0xa739}}},
-  {0xa73a, {1|F|D, {0xa73b}}},
-  {0xa73c, {1|F|D, {0xa73d}}},
-  {0xa73e, {1|F|D, {0xa73f}}},
-  {0xa740, {1|F|D, {0xa741}}},
-  {0xa742, {1|F|D, {0xa743}}},
-  {0xa744, {1|F|D, {0xa745}}},
-  {0xa746, {1|F|D, {0xa747}}},
-  {0xa748, {1|F|D, {0xa749}}},
-  {0xa74a, {1|F|D, {0xa74b}}},
-  {0xa74c, {1|F|D, {0xa74d}}},
-  {0xa74e, {1|F|D, {0xa74f}}},
-  {0xa750, {1|F|D, {0xa751}}},
-  {0xa752, {1|F|D, {0xa753}}},
-  {0xa754, {1|F|D, {0xa755}}},
-  {0xa756, {1|F|D, {0xa757}}},
-  {0xa758, {1|F|D, {0xa759}}},
-  {0xa75a, {1|F|D, {0xa75b}}},
-  {0xa75c, {1|F|D, {0xa75d}}},
-  {0xa75e, {1|F|D, {0xa75f}}},
-  {0xa760, {1|F|D, {0xa761}}},
-  {0xa762, {1|F|D, {0xa763}}},
-  {0xa764, {1|F|D, {0xa765}}},
-  {0xa766, {1|F|D, {0xa767}}},
-  {0xa768, {1|F|D, {0xa769}}},
-  {0xa76a, {1|F|D, {0xa76b}}},
-  {0xa76c, {1|F|D, {0xa76d}}},
-  {0xa76e, {1|F|D, {0xa76f}}},
-  {0xa779, {1|F|D, {0xa77a}}},
-  {0xa77b, {1|F|D, {0xa77c}}},
-  {0xa77d, {1|F|D, {0x1d79}}},
-  {0xa77e, {1|F|D, {0xa77f}}},
-  {0xa780, {1|F|D, {0xa781}}},
-  {0xa782, {1|F|D, {0xa783}}},
-  {0xa784, {1|F|D, {0xa785}}},
-  {0xa786, {1|F|D, {0xa787}}},
-  {0xa78b, {1|F|D, {0xa78c}}},
-  {0xa78d, {1|F|D, {0x0265}}},
-  {0xa790, {1|F|D, {0xa791}}},
-  {0xa792, {1|F|D, {0xa793}}},
-  {0xa796, {1|F|D, {0xa797}}},
-  {0xa798, {1|F|D, {0xa799}}},
-  {0xa79a, {1|F|D, {0xa79b}}},
-  {0xa79c, {1|F|D, {0xa79d}}},
-  {0xa79e, {1|F|D, {0xa79f}}},
-  {0xa7a0, {1|F|D, {0xa7a1}}},
-  {0xa7a2, {1|F|D, {0xa7a3}}},
-  {0xa7a4, {1|F|D, {0xa7a5}}},
-  {0xa7a6, {1|F|D, {0xa7a7}}},
-  {0xa7a8, {1|F|D, {0xa7a9}}},
-  {0xa7aa, {1|F|D, {0x0266}}},
-  {0xa7ab, {1|F|D, {0x025c}}},
-  {0xa7ac, {1|F|D, {0x0261}}},
-  {0xa7ad, {1|F|D, {0x026c}}},
-  {0xa7ae, {1|F|D, {0x026a}}},
-  {0xa7b0, {1|F|D, {0x029e}}},
-  {0xa7b1, {1|F|D, {0x0287}}},
-  {0xa7b2, {1|F|D, {0x029d}}},
-  {0xa7b3, {1|F|D, {0xab53}}},
-  {0xa7b4, {1|F|D, {0xa7b5}}},
-  {0xa7b6, {1|F|D, {0xa7b7}}},
-  {0xab70, {1|F|U, {0x13a0}}},
-  {0xab71, {1|F|U, {0x13a1}}},
-  {0xab72, {1|F|U, {0x13a2}}},
-  {0xab73, {1|F|U, {0x13a3}}},
-  {0xab74, {1|F|U, {0x13a4}}},
-  {0xab75, {1|F|U, {0x13a5}}},
-  {0xab76, {1|F|U, {0x13a6}}},
-  {0xab77, {1|F|U, {0x13a7}}},
-  {0xab78, {1|F|U, {0x13a8}}},
-  {0xab79, {1|F|U, {0x13a9}}},
-  {0xab7a, {1|F|U, {0x13aa}}},
-  {0xab7b, {1|F|U, {0x13ab}}},
-  {0xab7c, {1|F|U, {0x13ac}}},
-  {0xab7d, {1|F|U, {0x13ad}}},
-  {0xab7e, {1|F|U, {0x13ae}}},
-  {0xab7f, {1|F|U, {0x13af}}},
-  {0xab80, {1|F|U, {0x13b0}}},
-  {0xab81, {1|F|U, {0x13b1}}},
-  {0xab82, {1|F|U, {0x13b2}}},
-  {0xab83, {1|F|U, {0x13b3}}},
-  {0xab84, {1|F|U, {0x13b4}}},
-  {0xab85, {1|F|U, {0x13b5}}},
-  {0xab86, {1|F|U, {0x13b6}}},
-  {0xab87, {1|F|U, {0x13b7}}},
-  {0xab88, {1|F|U, {0x13b8}}},
-  {0xab89, {1|F|U, {0x13b9}}},
-  {0xab8a, {1|F|U, {0x13ba}}},
-  {0xab8b, {1|F|U, {0x13bb}}},
-  {0xab8c, {1|F|U, {0x13bc}}},
-  {0xab8d, {1|F|U, {0x13bd}}},
-  {0xab8e, {1|F|U, {0x13be}}},
-  {0xab8f, {1|F|U, {0x13bf}}},
-  {0xab90, {1|F|U, {0x13c0}}},
-  {0xab91, {1|F|U, {0x13c1}}},
-  {0xab92, {1|F|U, {0x13c2}}},
-  {0xab93, {1|F|U, {0x13c3}}},
-  {0xab94, {1|F|U, {0x13c4}}},
-  {0xab95, {1|F|U, {0x13c5}}},
-  {0xab96, {1|F|U, {0x13c6}}},
-  {0xab97, {1|F|U, {0x13c7}}},
-  {0xab98, {1|F|U, {0x13c8}}},
-  {0xab99, {1|F|U, {0x13c9}}},
-  {0xab9a, {1|F|U, {0x13ca}}},
-  {0xab9b, {1|F|U, {0x13cb}}},
-  {0xab9c, {1|F|U, {0x13cc}}},
-  {0xab9d, {1|F|U, {0x13cd}}},
-  {0xab9e, {1|F|U, {0x13ce}}},
-  {0xab9f, {1|F|U, {0x13cf}}},
-  {0xaba0, {1|F|U, {0x13d0}}},
-  {0xaba1, {1|F|U, {0x13d1}}},
-  {0xaba2, {1|F|U, {0x13d2}}},
-  {0xaba3, {1|F|U, {0x13d3}}},
-  {0xaba4, {1|F|U, {0x13d4}}},
-  {0xaba5, {1|F|U, {0x13d5}}},
-  {0xaba6, {1|F|U, {0x13d6}}},
-  {0xaba7, {1|F|U, {0x13d7}}},
-  {0xaba8, {1|F|U, {0x13d8}}},
-  {0xaba9, {1|F|U, {0x13d9}}},
-  {0xabaa, {1|F|U, {0x13da}}},
-  {0xabab, {1|F|U, {0x13db}}},
-  {0xabac, {1|F|U, {0x13dc}}},
-  {0xabad, {1|F|U, {0x13dd}}},
-  {0xabae, {1|F|U, {0x13de}}},
-  {0xabaf, {1|F|U, {0x13df}}},
-  {0xabb0, {1|F|U, {0x13e0}}},
-  {0xabb1, {1|F|U, {0x13e1}}},
-  {0xabb2, {1|F|U, {0x13e2}}},
-  {0xabb3, {1|F|U, {0x13e3}}},
-  {0xabb4, {1|F|U, {0x13e4}}},
-  {0xabb5, {1|F|U, {0x13e5}}},
-  {0xabb6, {1|F|U, {0x13e6}}},
-  {0xabb7, {1|F|U, {0x13e7}}},
-  {0xabb8, {1|F|U, {0x13e8}}},
-  {0xabb9, {1|F|U, {0x13e9}}},
-  {0xabba, {1|F|U, {0x13ea}}},
-  {0xabbb, {1|F|U, {0x13eb}}},
-  {0xabbc, {1|F|U, {0x13ec}}},
-  {0xabbd, {1|F|U, {0x13ed}}},
-  {0xabbe, {1|F|U, {0x13ee}}},
-  {0xabbf, {1|F|U, {0x13ef}}},
-  {0xfb00, {2|F|ST|SU|I(366), {0x0066, 0x0066}}},
-  {0xfb01, {2|F|ST|SU|I(370), {0x0066, 0x0069}}},
-  {0xfb02, {2|F|ST|SU|I(374), {0x0066, 0x006c}}},
-  {0xfb03, {3|F|ST|SU|I(378), {0x0066, 0x0066, 0x0069}}},
-  {0xfb04, {3|F|ST|SU|I(384), {0x0066, 0x0066, 0x006c}}},
-  {0xfb05, {2|F|ST|SU|I(390), {0x0073, 0x0074}}},
-  {0xfb06, {2|F|ST|SU|I(394), {0x0073, 0x0074}}},
-  {0xfb13, {2|F|ST|SU|I(398), {0x0574, 0x0576}}},
-  {0xfb14, {2|F|ST|SU|I(402), {0x0574, 0x0565}}},
-  {0xfb15, {2|F|ST|SU|I(406), {0x0574, 0x056b}}},
-  {0xfb16, {2|F|ST|SU|I(410), {0x057e, 0x0576}}},
-  {0xfb17, {2|F|ST|SU|I(414), {0x0574, 0x056d}}},
-  {0xff21, {1|F|D, {0xff41}}},
-  {0xff22, {1|F|D, {0xff42}}},
-  {0xff23, {1|F|D, {0xff43}}},
-  {0xff24, {1|F|D, {0xff44}}},
-  {0xff25, {1|F|D, {0xff45}}},
-  {0xff26, {1|F|D, {0xff46}}},
-  {0xff27, {1|F|D, {0xff47}}},
-  {0xff28, {1|F|D, {0xff48}}},
-  {0xff29, {1|F|D, {0xff49}}},
-  {0xff2a, {1|F|D, {0xff4a}}},
-  {0xff2b, {1|F|D, {0xff4b}}},
-  {0xff2c, {1|F|D, {0xff4c}}},
-  {0xff2d, {1|F|D, {0xff4d}}},
-  {0xff2e, {1|F|D, {0xff4e}}},
-  {0xff2f, {1|F|D, {0xff4f}}},
-  {0xff30, {1|F|D, {0xff50}}},
-  {0xff31, {1|F|D, {0xff51}}},
-  {0xff32, {1|F|D, {0xff52}}},
-  {0xff33, {1|F|D, {0xff53}}},
-  {0xff34, {1|F|D, {0xff54}}},
-  {0xff35, {1|F|D, {0xff55}}},
-  {0xff36, {1|F|D, {0xff56}}},
-  {0xff37, {1|F|D, {0xff57}}},
-  {0xff38, {1|F|D, {0xff58}}},
-  {0xff39, {1|F|D, {0xff59}}},
-  {0xff3a, {1|F|D, {0xff5a}}},
-  {0x10400, {1|F|D, {0x10428}}},
-  {0x10401, {1|F|D, {0x10429}}},
-  {0x10402, {1|F|D, {0x1042a}}},
-  {0x10403, {1|F|D, {0x1042b}}},
-  {0x10404, {1|F|D, {0x1042c}}},
-  {0x10405, {1|F|D, {0x1042d}}},
-  {0x10406, {1|F|D, {0x1042e}}},
-  {0x10407, {1|F|D, {0x1042f}}},
-  {0x10408, {1|F|D, {0x10430}}},
-  {0x10409, {1|F|D, {0x10431}}},
-  {0x1040a, {1|F|D, {0x10432}}},
-  {0x1040b, {1|F|D, {0x10433}}},
-  {0x1040c, {1|F|D, {0x10434}}},
-  {0x1040d, {1|F|D, {0x10435}}},
-  {0x1040e, {1|F|D, {0x10436}}},
-  {0x1040f, {1|F|D, {0x10437}}},
-  {0x10410, {1|F|D, {0x10438}}},
-  {0x10411, {1|F|D, {0x10439}}},
-  {0x10412, {1|F|D, {0x1043a}}},
-  {0x10413, {1|F|D, {0x1043b}}},
-  {0x10414, {1|F|D, {0x1043c}}},
-  {0x10415, {1|F|D, {0x1043d}}},
-  {0x10416, {1|F|D, {0x1043e}}},
-  {0x10417, {1|F|D, {0x1043f}}},
-  {0x10418, {1|F|D, {0x10440}}},
-  {0x10419, {1|F|D, {0x10441}}},
-  {0x1041a, {1|F|D, {0x10442}}},
-  {0x1041b, {1|F|D, {0x10443}}},
-  {0x1041c, {1|F|D, {0x10444}}},
-  {0x1041d, {1|F|D, {0x10445}}},
-  {0x1041e, {1|F|D, {0x10446}}},
-  {0x1041f, {1|F|D, {0x10447}}},
-  {0x10420, {1|F|D, {0x10448}}},
-  {0x10421, {1|F|D, {0x10449}}},
-  {0x10422, {1|F|D, {0x1044a}}},
-  {0x10423, {1|F|D, {0x1044b}}},
-  {0x10424, {1|F|D, {0x1044c}}},
-  {0x10425, {1|F|D, {0x1044d}}},
-  {0x10426, {1|F|D, {0x1044e}}},
-  {0x10427, {1|F|D, {0x1044f}}},
-  {0x104b0, {1|F|D, {0x104d8}}},
-  {0x104b1, {1|F|D, {0x104d9}}},
-  {0x104b2, {1|F|D, {0x104da}}},
-  {0x104b3, {1|F|D, {0x104db}}},
-  {0x104b4, {1|F|D, {0x104dc}}},
-  {0x104b5, {1|F|D, {0x104dd}}},
-  {0x104b6, {1|F|D, {0x104de}}},
-  {0x104b7, {1|F|D, {0x104df}}},
-  {0x104b8, {1|F|D, {0x104e0}}},
-  {0x104b9, {1|F|D, {0x104e1}}},
-  {0x104ba, {1|F|D, {0x104e2}}},
-  {0x104bb, {1|F|D, {0x104e3}}},
-  {0x104bc, {1|F|D, {0x104e4}}},
-  {0x104bd, {1|F|D, {0x104e5}}},
-  {0x104be, {1|F|D, {0x104e6}}},
-  {0x104bf, {1|F|D, {0x104e7}}},
-  {0x104c0, {1|F|D, {0x104e8}}},
-  {0x104c1, {1|F|D, {0x104e9}}},
-  {0x104c2, {1|F|D, {0x104ea}}},
-  {0x104c3, {1|F|D, {0x104eb}}},
-  {0x104c4, {1|F|D, {0x104ec}}},
-  {0x104c5, {1|F|D, {0x104ed}}},
-  {0x104c6, {1|F|D, {0x104ee}}},
-  {0x104c7, {1|F|D, {0x104ef}}},
-  {0x104c8, {1|F|D, {0x104f0}}},
-  {0x104c9, {1|F|D, {0x104f1}}},
-  {0x104ca, {1|F|D, {0x104f2}}},
-  {0x104cb, {1|F|D, {0x104f3}}},
-  {0x104cc, {1|F|D, {0x104f4}}},
-  {0x104cd, {1|F|D, {0x104f5}}},
-  {0x104ce, {1|F|D, {0x104f6}}},
-  {0x104cf, {1|F|D, {0x104f7}}},
-  {0x104d0, {1|F|D, {0x104f8}}},
-  {0x104d1, {1|F|D, {0x104f9}}},
-  {0x104d2, {1|F|D, {0x104fa}}},
-  {0x104d3, {1|F|D, {0x104fb}}},
-  {0x10c80, {1|F|D, {0x10cc0}}},
-  {0x10c81, {1|F|D, {0x10cc1}}},
-  {0x10c82, {1|F|D, {0x10cc2}}},
-  {0x10c83, {1|F|D, {0x10cc3}}},
-  {0x10c84, {1|F|D, {0x10cc4}}},
-  {0x10c85, {1|F|D, {0x10cc5}}},
-  {0x10c86, {1|F|D, {0x10cc6}}},
-  {0x10c87, {1|F|D, {0x10cc7}}},
-  {0x10c88, {1|F|D, {0x10cc8}}},
-  {0x10c89, {1|F|D, {0x10cc9}}},
-  {0x10c8a, {1|F|D, {0x10cca}}},
-  {0x10c8b, {1|F|D, {0x10ccb}}},
-  {0x10c8c, {1|F|D, {0x10ccc}}},
-  {0x10c8d, {1|F|D, {0x10ccd}}},
-  {0x10c8e, {1|F|D, {0x10cce}}},
-  {0x10c8f, {1|F|D, {0x10ccf}}},
-  {0x10c90, {1|F|D, {0x10cd0}}},
-  {0x10c91, {1|F|D, {0x10cd1}}},
-  {0x10c92, {1|F|D, {0x10cd2}}},
-  {0x10c93, {1|F|D, {0x10cd3}}},
-  {0x10c94, {1|F|D, {0x10cd4}}},
-  {0x10c95, {1|F|D, {0x10cd5}}},
-  {0x10c96, {1|F|D, {0x10cd6}}},
-  {0x10c97, {1|F|D, {0x10cd7}}},
-  {0x10c98, {1|F|D, {0x10cd8}}},
-  {0x10c99, {1|F|D, {0x10cd9}}},
-  {0x10c9a, {1|F|D, {0x10cda}}},
-  {0x10c9b, {1|F|D, {0x10cdb}}},
-  {0x10c9c, {1|F|D, {0x10cdc}}},
-  {0x10c9d, {1|F|D, {0x10cdd}}},
-  {0x10c9e, {1|F|D, {0x10cde}}},
-  {0x10c9f, {1|F|D, {0x10cdf}}},
-  {0x10ca0, {1|F|D, {0x10ce0}}},
-  {0x10ca1, {1|F|D, {0x10ce1}}},
-  {0x10ca2, {1|F|D, {0x10ce2}}},
-  {0x10ca3, {1|F|D, {0x10ce3}}},
-  {0x10ca4, {1|F|D, {0x10ce4}}},
-  {0x10ca5, {1|F|D, {0x10ce5}}},
-  {0x10ca6, {1|F|D, {0x10ce6}}},
-  {0x10ca7, {1|F|D, {0x10ce7}}},
-  {0x10ca8, {1|F|D, {0x10ce8}}},
-  {0x10ca9, {1|F|D, {0x10ce9}}},
-  {0x10caa, {1|F|D, {0x10cea}}},
-  {0x10cab, {1|F|D, {0x10ceb}}},
-  {0x10cac, {1|F|D, {0x10cec}}},
-  {0x10cad, {1|F|D, {0x10ced}}},
-  {0x10cae, {1|F|D, {0x10cee}}},
-  {0x10caf, {1|F|D, {0x10cef}}},
-  {0x10cb0, {1|F|D, {0x10cf0}}},
-  {0x10cb1, {1|F|D, {0x10cf1}}},
-  {0x10cb2, {1|F|D, {0x10cf2}}},
-  {0x118a0, {1|F|D, {0x118c0}}},
-  {0x118a1, {1|F|D, {0x118c1}}},
-  {0x118a2, {1|F|D, {0x118c2}}},
-  {0x118a3, {1|F|D, {0x118c3}}},
-  {0x118a4, {1|F|D, {0x118c4}}},
-  {0x118a5, {1|F|D, {0x118c5}}},
-  {0x118a6, {1|F|D, {0x118c6}}},
-  {0x118a7, {1|F|D, {0x118c7}}},
-  {0x118a8, {1|F|D, {0x118c8}}},
-  {0x118a9, {1|F|D, {0x118c9}}},
-  {0x118aa, {1|F|D, {0x118ca}}},
-  {0x118ab, {1|F|D, {0x118cb}}},
-  {0x118ac, {1|F|D, {0x118cc}}},
-  {0x118ad, {1|F|D, {0x118cd}}},
-  {0x118ae, {1|F|D, {0x118ce}}},
-  {0x118af, {1|F|D, {0x118cf}}},
-  {0x118b0, {1|F|D, {0x118d0}}},
-  {0x118b1, {1|F|D, {0x118d1}}},
-  {0x118b2, {1|F|D, {0x118d2}}},
-  {0x118b3, {1|F|D, {0x118d3}}},
-  {0x118b4, {1|F|D, {0x118d4}}},
-  {0x118b5, {1|F|D, {0x118d5}}},
-  {0x118b6, {1|F|D, {0x118d6}}},
-  {0x118b7, {1|F|D, {0x118d7}}},
-  {0x118b8, {1|F|D, {0x118d8}}},
-  {0x118b9, {1|F|D, {0x118d9}}},
-  {0x118ba, {1|F|D, {0x118da}}},
-  {0x118bb, {1|F|D, {0x118db}}},
-  {0x118bc, {1|F|D, {0x118dc}}},
-  {0x118bd, {1|F|D, {0x118dd}}},
-  {0x118be, {1|F|D, {0x118de}}},
-  {0x118bf, {1|F|D, {0x118df}}},
-  {0x1e900, {1|F|D, {0x1e922}}},
-  {0x1e901, {1|F|D, {0x1e923}}},
-  {0x1e902, {1|F|D, {0x1e924}}},
-  {0x1e903, {1|F|D, {0x1e925}}},
-  {0x1e904, {1|F|D, {0x1e926}}},
-  {0x1e905, {1|F|D, {0x1e927}}},
-  {0x1e906, {1|F|D, {0x1e928}}},
-  {0x1e907, {1|F|D, {0x1e929}}},
-  {0x1e908, {1|F|D, {0x1e92a}}},
-  {0x1e909, {1|F|D, {0x1e92b}}},
-  {0x1e90a, {1|F|D, {0x1e92c}}},
-  {0x1e90b, {1|F|D, {0x1e92d}}},
-  {0x1e90c, {1|F|D, {0x1e92e}}},
-  {0x1e90d, {1|F|D, {0x1e92f}}},
-  {0x1e90e, {1|F|D, {0x1e930}}},
-  {0x1e90f, {1|F|D, {0x1e931}}},
-  {0x1e910, {1|F|D, {0x1e932}}},
-  {0x1e911, {1|F|D, {0x1e933}}},
-  {0x1e912, {1|F|D, {0x1e934}}},
-  {0x1e913, {1|F|D, {0x1e935}}},
-  {0x1e914, {1|F|D, {0x1e936}}},
-  {0x1e915, {1|F|D, {0x1e937}}},
-  {0x1e916, {1|F|D, {0x1e938}}},
-  {0x1e917, {1|F|D, {0x1e939}}},
-  {0x1e918, {1|F|D, {0x1e93a}}},
-  {0x1e919, {1|F|D, {0x1e93b}}},
-  {0x1e91a, {1|F|D, {0x1e93c}}},
-  {0x1e91b, {1|F|D, {0x1e93d}}},
-  {0x1e91c, {1|F|D, {0x1e93e}}},
-  {0x1e91d, {1|F|D, {0x1e93f}}},
-  {0x1e91e, {1|F|D, {0x1e940}}},
-  {0x1e91f, {1|F|D, {0x1e941}}},
-  {0x1e920, {1|F|D, {0x1e942}}},
-  {0x1e921, {1|F|D, {0x1e943}}},
-#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1399))
-  {0x0049, {1|F|D, {0x0069}}},
-  {0x0130, {2|F|D, {0x0069, 0x0307}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
-
-/* maximum key range = 3623, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
-{
-  static const unsigned short asso_values[] =
-    {
-         1, 3627,    2,   28,    3,  303,  218,    5,   21,  167,
-         2,  199,  194,    7, 3627, 3627, 3627, 3627, 3627, 3627,
-      3627, 3627, 3627, 3627, 3627, 3627, 3627,   28, 3627, 3627,
-      3627, 3627, 3627, 3627, 3627,  282, 3627, 3627, 3627, 3627,
-      3627,  113, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 3627,
-      3627,  318, 3627, 3627, 3627, 3627, 3627, 3627, 3627, 1197,
-      3627, 3627,  149,   73,  513,    1, 3627, 3627,  267,   17,
-      3627, 3627, 3627, 3627, 3627,  286, 3627, 3627,  289,  617,
-       291,   28, 1163,  444,   36,  430,  954,  110, 1767,    5,
-        11,   22, 1761,  486, 1921,  250, 1746,  122, 1905,  163,
-      1716,  262, 1880,   80, 1503,   68, 1704,  157, 1681,  376,
-      1673,  209, 1822,  203, 1406,  498, 1622,  362, 1588,  316,
-       475,  599, 1228,  538, 1160,  585, 1510,  544,  331,  685,
-      1672,  603, 1536,  840, 1684,  786, 1594,  743, 1380,  700,
-       142,  839, 1302,  865, 1173, 1329, 1730, 1043, 1449,  969,
-      1437, 1108, 1360,  925, 1497,  723,  154,  810,  391, 1083,
-      1777, 1047,  436, 1051,   47, 1342,    8,  974,   98, 1318,
-       781, 1314,  148, 1403,   39, 1357,   18, 1265,   11,  928,
-        92, 1205,    2, 1295,    3, 1181,  187, 1151,  385, 1132,
-       107, 1280,    8, 1678,   41,  511,   42, 1655,   78,  294,
-       134, 1857,   17,  784,    2, 1113,   57,  496,   52
-    };
-  return asso_values[bits_of(code, 2)+81] + asso_values[bits_of(code, 1)+2] + asso_values[bits_of(code, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList3 *
-onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x41,
-      MAX_CODE_VALUE = 0x1e921,
-      TOTAL_KEYWORDS = 1401,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 3,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 3626
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1,
-      /*0x1ffb*/ 816,
-      /*0x1fe7*/ 802,
-      /*0x017b*/ 118,
-      /*0x1f88*/ 729,
-      /*0x0408*/ 305,
-      /*0x0108*/ 61,
-      /*0x10408*/ 1214,
-      /*0x0055*/ 19,
-      /*0xab88*/ 1112,
-      /*0x1f89*/ 730,
-      /*0x0409*/ 306,
-      /*0x2c67*/ 916,
-      /*0x10409*/ 1215,
-      /*0x2c08*/ 873,
-      /*0xab89*/ 1113,
-      /*0x1ff9*/ 814,
-      /*0x2c6f*/ 921,
-      /*0x0179*/ 117,
-      -1,
-      /*0x2c09*/ 874,
-      /*0x1f8a*/ 731,
-      /*0x040a*/ 307,
-      /*0x010a*/ 62,
-      /*0x1040a*/ 1216,
-      /*0x2c88*/ 931,
-      /*0xab8a*/ 1114,
-      /*0x1f80*/ 721,
-      /*0x0400*/ 297,
-      /*0x0100*/ 57,
-      /*0x10400*/ 1206,
-      /*0x2c0a*/ 875,
-      /*0xab80*/ 1104,
-      /*0x10c88*/ 1290,
-      /*0x00d5*/ 47,
-      /*0x1f83*/ 724,
-      /*0x0403*/ 300,
-      /*0x2c00*/ 865,
-      /*0x10403*/ 1209,
-      /*0x10c89*/ 1291,
-      /*0xab83*/ 1107,
-      /*0x1ff3*/ 809,
-      /*0x2c8a*/ 932,
-      /*0x1e908*/ 1373,
-      /*0x00df*/ 56,
-      /*0x2c03*/ 868,
-      /*0x1fd3*/ 791,
-      /*0x0053*/ 17,
-      /*0x2c80*/ 927,
-      /*0x1e909*/ 1374,
-      /*0x10c8a*/ 1292,
-      /*0x2183*/ 838,
-      -1,
-      /*0x017f*/ 120,
-      -1,
-      /*0xa780*/ 1059,
-      /*0x10c80*/ 1282,
-      -1,
-      /*0x017d*/ 119,
-      -1,
-      /*0x1e90a*/ 1375,
-      /*0x2c7f*/ 926,
-      -1, -1,
-      /*0x10c83*/ 1285,
-      /*0x00dd*/ 54,
-      /*0x1e900*/ 1365,
-      /*0x1f98*/ 745,
-      /*0x0418*/ 321,
-      /*0x0118*/ 69,
-      /*0x10418*/ 1230,
-      /*0x037f*/ 233,
-      /*0xab98*/ 1128,
-      /*0x00d3*/ 45,
-      /*0x1e903*/ 1368,
-      -1,
-      /*0x1e88*/ 607,
-      /*0x2c18*/ 889,
-      -1,
-      /*0x1f96*/ 743,
-      /*0x0416*/ 319,
-      /*0x0116*/ 68,
-      /*0x10416*/ 1228,
-      -1,
-      /*0xab96*/ 1126,
-      -1, -1,
-      /*0x2c75*/ 924,
-      /*0x2c98*/ 939,
-      /*0x2c16*/ 887,
-      -1,
-      /*0x1fe3*/ 799,
-      -1,
-      /*0x1e8a*/ 608,
-      -1,
-      /*0xa798*/ 1068,
-      /*0x10c98*/ 1306,
-      /*0x1fd7*/ 793,
-      /*0x0057*/ 21,
-      /*0x1e80*/ 603,
-      /*0x2c96*/ 938,
-      /*0x2c63*/ 914,
-      -1, -1, -1, -1,
-      /*0x1e918*/ 1389,
-      /*0xa796*/ 1067,
-      /*0x10c96*/ 1304,
-      /*0x1f86*/ 727,
-      /*0x0406*/ 303,
-      /*0x0106*/ 60,
-      /*0x10406*/ 1212,
-      /*0x13fb*/ 527,
-      /*0xab86*/ 1110,
-      -1,
-      /*0x2c6d*/ 919,
-      -1,
-      /*0x1e916*/ 1387,
-      /*0x2c06*/ 871,
-      -1,
-      /*0x1f90*/ 737,
-      /*0x0410*/ 313,
-      /*0x0110*/ 65,
-      /*0x10410*/ 1222,
-      -1,
-      /*0xab90*/ 1120,
-      /*0x2ced*/ 978,
-      /*0x13f9*/ 525,
-      -1,
-      /*0x2c86*/ 930,
-      /*0x2c10*/ 881,
-      -1,
-      /*0x1ff7*/ 812,
-      -1, -1, -1,
-      /*0xa786*/ 1062,
-      /*0x10c86*/ 1288,
-      /*0x1e98*/ 616,
-      -1,
-      /*0x1fbb*/ 777,
-      /*0x2c90*/ 935,
-      /*0x013b*/ 85,
-      -1, -1,
-      /*0xabbb*/ 1163,
-      /*0x1fdb*/ 797,
-      /*0x1e906*/ 1371,
-      /*0xa790*/ 1065,
-      /*0x10c90*/ 1298,
-      /*0x1e96*/ 614,
-      /*0x1e08*/ 543,
-      /*0x1fcb*/ 788,
-      /*0x004b*/ 9,
-      -1,
-      /*0x1f9a*/ 747,
-      /*0x041a*/ 323,
-      /*0x011a*/ 70,
-      /*0x1041a*/ 1232,
-      /*0x1e910*/ 1381,
-      /*0xab9a*/ 1130,
-      /*0x1f92*/ 739,
-      /*0x0412*/ 315,
-      /*0x0112*/ 66,
-      /*0x10412*/ 1224,
-      /*0x2c1a*/ 891,
-      /*0xab92*/ 1122,
-      /*0x13fd*/ 529,
-      /*0x1e0a*/ 544,
-      /*0x0388*/ 235,
-      -1,
-      /*0x2c12*/ 883,
-      /*0x03d5*/ 273,
-      /*0x00db*/ 52,
-      /*0x1e00*/ 539,
-      /*0x0389*/ 236,
-      /*0x2c9a*/ 940,
-      -1, -1,
-      /*0x00cb*/ 37,
-      /*0x1e86*/ 606,
-      /*0x03f9*/ 292,
-      /*0x2c92*/ 936,
-      /*0xa79a*/ 1069,
-      /*0x10c9a*/ 1308,
-      /*0x1fe9*/ 804,
-      /*0x038a*/ 237,
-      -1, -1,
-      /*0xa792*/ 1066,
-      /*0x10c92*/ 1300,
-      -1,
-      /*0x1e90*/ 611,
-      -1,
-      /*0x1e91a*/ 1391,
-      /*0x2c69*/ 917,
-      /*0x0508*/ 425,
-      -1, -1,
-      /*0x0555*/ 481,
-      /*0x1e912*/ 1383,
-      /*0x1fa0*/ 753,
-      /*0x0420*/ 329,
-      /*0x0120*/ 73,
-      /*0x10420*/ 1238,
-      /*0x03f1*/ 288,
-      /*0xaba0*/ 1136,
-      /*0x1f9e*/ 751,
-      /*0x041e*/ 327,
-      /*0x011e*/ 72,
-      /*0x1041e*/ 1236,
-      /*0x2c20*/ 897,
-      /*0xab9e*/ 1134,
-      /*0x050a*/ 426,
-      /*0x1e18*/ 551,
-      -1,
-      /*0x03ff*/ 296,
-      /*0x2c1e*/ 895,
-      /*0x048a*/ 362,
-      /*0x0500*/ 421,
-      /*0x0208*/ 194,
-      /*0x03fd*/ 294,
-      /*0x2ca0*/ 943,
-      -1,
-      /*0x0480*/ 361,
-      -1,
-      /*0x1e16*/ 550,
-      /*0x1e9a*/ 618,
-      /*0x2c9e*/ 942,
-      /*0xa7a0*/ 1072,
-      /*0x10ca0*/ 1314,
-      -1,
-      /*0x0398*/ 249,
-      /*0x1e92*/ 612,
-      -1,
-      /*0xa79e*/ 1071,
-      /*0x10c9e*/ 1312,
-      /*0x020a*/ 195,
-      /*0x0553*/ 479,
-      -1,
-      /*0x1e920*/ 1397,
-      -1,
-      /*0x03f5*/ 290,
-      /*0x0200*/ 190,
-      /*0x0396*/ 247,
-      /*0x104d3*/ 1281,
-      /*0x1e91e*/ 1395,
-      -1,
-      /*0x1f8e*/ 735,
-      /*0x040e*/ 311,
-      /*0x010e*/ 64,
-      /*0x1040e*/ 1220,
-      -1,
-      /*0xab8e*/ 1118,
-      -1, -1,
-      /*0x1e06*/ 542,
-      -1,
-      /*0x2c0e*/ 879,
-      /*0x0518*/ 433,
-      /*0x1f94*/ 741,
-      /*0x0414*/ 317,
-      /*0x0114*/ 67,
-      /*0x10414*/ 1226,
-      /*0x0498*/ 369,
-      /*0xab94*/ 1124,
-      /*0x2165*/ 827,
-      /*0x2167*/ 829,
-      /*0x1e10*/ 547,
-      /*0x2c8e*/ 934,
-      /*0x2c14*/ 885,
-      /*0x0516*/ 432,
-      /*0x216f*/ 837,
-      /*0x1ea0*/ 621,
-      /*0x0386*/ 234,
-      /*0x2161*/ 823,
-      /*0x0496*/ 368,
-      /*0x10c8e*/ 1296,
-      -1,
-      /*0x1e9e*/ 620,
-      -1,
-      /*0x2c94*/ 937,
-      -1,
-      /*0x0218*/ 202,
-      -1, -1,
-      /*0x0390*/ 241,
-      /*0x1e90e*/ 1379,
-      -1,
-      /*0x10c94*/ 1302,
-      -1,
-      /*0xa77b*/ 1056,
-      /*0x1ff6*/ 811,
-      /*0x0476*/ 356,
-      /*0x0176*/ 115,
-      /*0x0216*/ 201,
-      -1, -1,
-      /*0x03f7*/ 291,
-      /*0x1e914*/ 1385,
-      -1,
-      /*0x0506*/ 424,
-      -1,
-      /*0x1e1a*/ 552,
-      -1, -1,
-      /*0xa779*/ 1055,
-      -1,
-      /*0x01d5*/ 167,
-      /*0x1e12*/ 548,
-      -1,
-      /*0x0189*/ 126,
-      /*0x0376*/ 232,
-      /*0x0510*/ 429,
-      /*0x1fa6*/ 759,
-      /*0x0426*/ 335,
-      /*0x0126*/ 76,
-      /*0x10426*/ 1244,
-      /*0x0490*/ 365,
-      /*0xaba6*/ 1142,
-      /*0x1e8e*/ 610,
-      /*0x039a*/ 251,
-      /*0x018a*/ 127,
-      -1,
-      /*0x2c26*/ 903,
-      /*0x0206*/ 193,
-      -1,
-      /*0x0392*/ 243,
-      -1,
-      /*0x1faf*/ 768,
-      /*0x042f*/ 344,
-      -1,
-      /*0x1e94*/ 613,
-      /*0x053b*/ 455,
-      /*0xabaf*/ 1151,
-      /*0x2ca6*/ 946,
-      -1,
-      /*0x0210*/ 198,
-      -1, -1,
-      /*0x104bb*/ 1257,
-      /*0x01f1*/ 181,
-      /*0xa7a6*/ 1075,
-      /*0x10ca6*/ 1320,
-      -1,
-      /*0x054b*/ 471,
-      /*0xa77d*/ 1057,
-      /*0x01d3*/ 166,
-      /*0x051a*/ 434,
-      /*0x1e20*/ 555,
-      /*0x04cb*/ 395,
-      -1,
-      /*0x104cb*/ 1273,
-      /*0x049a*/ 370,
-      /*0x0512*/ 430,
-      /*0x1e1e*/ 554,
-      /*0x2163*/ 825,
-      /*0x023b*/ 217,
-      /*0x10caf*/ 1329,
-      /*0x0492*/ 366,
-      /*0x1fa4*/ 757,
-      /*0x0424*/ 333,
-      /*0x0124*/ 75,
-      /*0x10424*/ 1242,
-      /*0x1ef6*/ 664,
-      /*0xaba4*/ 1140,
-      -1,
-      /*0x03a0*/ 257,
-      /*0x0198*/ 137,
-      -1,
-      /*0x2c24*/ 901,
-      /*0x216d*/ 835,
-      /*0x021a*/ 203,
-      /*0x039e*/ 255,
-      /*0x1f9c*/ 749,
-      /*0x041c*/ 325,
-      /*0x011c*/ 71,
-      /*0x1041c*/ 1234,
-      /*0x0212*/ 199,
-      /*0xab9c*/ 1132,
-      /*0x0196*/ 135,
-      /*0x2ca4*/ 945,
-      -1,
-      /*0x1feb*/ 806,
-      /*0x2c1c*/ 893,
-      -1,
-      /*0x1ea6*/ 624,
-      -1,
-      /*0xa7a4*/ 1074,
-      /*0x10ca4*/ 1318,
-      /*0x004d*/ 11,
-      -1, -1,
-      /*0x2c6b*/ 918,
-      /*0x0520*/ 437,
-      /*0x2c9c*/ 941,
-      /*0x1e0e*/ 546,
-      -1,
-      /*0x01d7*/ 168,
-      /*0x04a0*/ 373,
-      /*0x051e*/ 436,
-      -1,
-      /*0xa79c*/ 1070,
-      /*0x10c9c*/ 1310,
-      /*0x2ceb*/ 977,
-      /*0x049e*/ 372,
-      -1, -1,
-      /*0x1e14*/ 549,
-      -1,
-      /*0x0186*/ 124,
-      -1, -1,
-      /*0x1e91c*/ 1393,
-      /*0x038e*/ 239,
-      -1,
-      /*0x00cd*/ 39,
-      -1,
-      /*0x0220*/ 206,
-      -1, -1,
-      /*0x10bb*/ 511,
-      /*0x0190*/ 131,
-      -1,
-      /*0x021e*/ 205,
-      /*0x24bb*/ 844,
-      /*0x0394*/ 245,
-      -1,
-      /*0x1f84*/ 725,
-      /*0x0404*/ 301,
-      /*0x0104*/ 59,
-      /*0x10404*/ 1210,
-      /*0x1ea4*/ 623,
-      /*0xab84*/ 1108,
-      /*0x01f7*/ 185,
-      /*0x0051*/ 15,
-      -1,
-      /*0x24cb*/ 860,
-      /*0x2c04*/ 869,
-      -1,
-      /*0x1e76*/ 598,
-      /*0x050e*/ 428,
-      /*0x1f82*/ 723,
-      /*0x0402*/ 299,
-      /*0x0102*/ 58,
-      /*0x10402*/ 1208,
-      /*0x048e*/ 364,
-      /*0xab82*/ 1106,
-      /*0x01db*/ 170,
-      /*0x2c84*/ 929,
-      -1,
-      /*0x2169*/ 831,
-      /*0x2c02*/ 867,
-      /*0x0514*/ 431,
-      /*0x01cb*/ 162,
-      -1,
-      /*0xa784*/ 1061,
-      /*0x10c84*/ 1286,
-      /*0x0494*/ 367,
-      /*0x118bb*/ 1360,
-      -1,
-      /*0x00d1*/ 43,
-      /*0x1e26*/ 558,
-      /*0x2c82*/ 928,
-      -1,
-      /*0x020e*/ 197,
-      -1,
-      /*0x1e904*/ 1369,
-      -1, -1,
-      /*0xa782*/ 1060,
-      /*0x10c82*/ 1284,
-      -1,
-      /*0x1fa7*/ 760,
-      /*0x0427*/ 336,
-      -1,
-      /*0x10427*/ 1245,
-      /*0x0214*/ 200,
-      /*0xaba7*/ 1143,
-      -1,
-      /*0x03a6*/ 262,
-      /*0x1e902*/ 1367,
-      /*0x10a0*/ 484,
-      /*0x2c27*/ 904,
-      /*0x1f8c*/ 733,
-      /*0x040c*/ 309,
-      /*0x010c*/ 63,
-      /*0x1040c*/ 1218,
-      -1,
-      /*0xab8c*/ 1116,
-      /*0x04f6*/ 416,
-      -1, -1, -1,
-      /*0x2c0c*/ 877,
-      /*0x047e*/ 360,
-      /*0x1fa2*/ 755,
-      /*0x0422*/ 331,
-      /*0x0122*/ 74,
-      /*0x10422*/ 1240,
-      /*0x1e84*/ 605,
-      /*0xaba2*/ 1138,
-      /*0x10ca7*/ 1321,
-      /*0x01a0*/ 141,
-      /*0x2c7e*/ 925,
-      /*0x2c8c*/ 933,
-      /*0x2c22*/ 899,
-      /*0x0526*/ 440,
-      /*0x1e24*/ 557,
-      /*0x1ff2*/ 808,
-      /*0x0472*/ 354,
-      /*0x0172*/ 113,
-      /*0x04a6*/ 376,
-      /*0x10c8c*/ 1294,
-      /*0x1e82*/ 604,
-      /*0x1f08*/ 669,
-      -1,
-      /*0x2ca2*/ 944,
-      /*0x1f6f*/ 720,
-      /*0x2c72*/ 923,
-      /*0x118a0*/ 1333,
-      /*0x1f09*/ 670,
-      /*0x1e1c*/ 553,
-      /*0x1e90c*/ 1377,
-      /*0xa7a2*/ 1073,
-      /*0x10ca2*/ 1316,
-      /*0x03a4*/ 260,
-      /*0xfb00*/ 1168,
-      /*0x1f5f*/ 712,
-      /*0x0372*/ 231,
-      /*0x2cf2*/ 979,
-      /*0x0226*/ 209,
-      /*0x1f0a*/ 671,
-      -1, -1,
-      /*0xfb03*/ 1171,
-      /*0x1faa*/ 763,
-      /*0x042a*/ 339,
-      /*0x012a*/ 78,
-      -1,
-      /*0x039c*/ 253,
-      /*0xabaa*/ 1146,
-      /*0x1fae*/ 767,
-      /*0x042e*/ 343,
-      /*0x012e*/ 80,
-      -1,
-      /*0x2c2a*/ 907,
-      /*0xabae*/ 1150,
-      -1,
-      /*0x1f5d*/ 711,
-      /*0x018e*/ 129,
-      -1,
-      /*0x2c2e*/ 911,
-      /*0x0524*/ 439,
-      -1, -1,
-      /*0x1e8c*/ 609,
-      /*0x2caa*/ 948,
-      /*0x04a4*/ 375,
-      -1, -1, -1,
-      /*0x0194*/ 134,
-      /*0x2cae*/ 950,
-      /*0xa7aa*/ 1077,
-      /*0x10caa*/ 1324,
-      /*0x1efe*/ 668,
-      /*0x051c*/ 435,
-      /*0x1ea2*/ 622,
-      -1,
-      /*0xa7ae*/ 1081,
-      /*0x10cae*/ 1328,
-      /*0x049c*/ 371,
-      -1, -1, -1,
-      /*0x1e04*/ 541,
-      /*0x0224*/ 208,
-      /*0x1f18*/ 677,
-      /*0xfb16*/ 1178,
-      /*0x2126*/ 818,
-      /*0x1ef2*/ 662,
-      /*0x054d*/ 473,
-      /*0x1fac*/ 765,
-      /*0x042c*/ 341,
-      /*0x012c*/ 79,
-      -1,
-      /*0x04cd*/ 396,
-      /*0xabac*/ 1148,
-      /*0x104cd*/ 1275,
-      /*0x1e02*/ 540,
-      /*0x021c*/ 204,
-      -1,
-      /*0x2c2c*/ 909,
-      /*0x01f6*/ 184,
-      /*0x10a6*/ 490,
-      -1,
-      /*0x1fa8*/ 761,
-      /*0x0428*/ 337,
-      /*0x0128*/ 77,
-      /*0x03d1*/ 272,
-      /*0x1fb2*/ 769,
-      /*0xaba8*/ 1144,
-      /*0x0132*/ 81,
-      /*0x2cac*/ 949,
-      /*0xa726*/ 1019,
-      /*0xabb2*/ 1154,
-      /*0x2c28*/ 905,
-      /*0x1eaa*/ 626,
-      /*0xfb06*/ 1174,
-      /*0x10af*/ 499,
-      /*0xa7ac*/ 1079,
-      /*0x10cac*/ 1326,
-      -1,
-      /*0x1eae*/ 628,
-      -1,
-      /*0x01a6*/ 144,
-      /*0x1f6d*/ 718,
-      /*0x2ca8*/ 947,
-      -1,
-      /*0xa688*/ 1007,
-      /*0x0504*/ 423,
-      /*0x2cb2*/ 952,
-      -1, -1,
-      /*0xa7a8*/ 1076,
-      /*0x10ca8*/ 1322,
-      /*0x0551*/ 477,
-      -1,
-      /*0xa7b2*/ 1084,
-      /*0x10cb2*/ 1332,
-      /*0x01af*/ 149,
-      /*0x1e0c*/ 545,
-      /*0x118a6*/ 1339,
-      /*0x104d1*/ 1279,
-      /*0x0502*/ 422,
-      -1,
-      /*0xa68a*/ 1008,
-      -1,
-      /*0x03a7*/ 263,
-      -1,
-      /*0x10a4*/ 488,
-      /*0x1e7e*/ 602,
-      /*0xa680*/ 1003,
-      /*0x1e22*/ 556,
-      /*0x0204*/ 192,
-      -1, -1,
-      /*0x118af*/ 1348,
-      /*0x216b*/ 833,
-      /*0x038c*/ 238,
-      /*0xa724*/ 1018,
-      /*0x1f3b*/ 694,
-      -1, -1,
-      /*0x1eac*/ 627,
-      -1,
-      /*0x1e72*/ 596,
-      /*0x1f5b*/ 710,
-      /*0x0202*/ 191,
-      /*0x03fe*/ 295,
-      -1,
-      /*0x01a4*/ 143,
-      -1,
-      /*0x1f4b*/ 702,
-      -1, -1,
-      /*0x1f1a*/ 679,
-      -1,
-      /*0x1ea8*/ 625,
-      /*0x10cd*/ 523,
-      /*0xff26*/ 1185,
-      -1,
-      /*0x1eb2*/ 630,
-      /*0x24cd*/ 862,
-      -1,
-      /*0x019c*/ 138,
-      /*0x050c*/ 427,
-      -1,
-      /*0x118a4*/ 1337,
-      -1, -1,
-      /*0x048c*/ 363,
-      /*0xa698*/ 1015,
-      /*0x1e2a*/ 560,
-      /*0x0130*/ 1400,
-      /*0xff2f*/ 1194,
-      -1,
-      /*0xabb0*/ 1152,
-      /*0x0522*/ 438,
-      /*0x1e2e*/ 562,
-      /*0x01cd*/ 163,
-      /*0x04fe*/ 420,
-      -1,
-      /*0x04a2*/ 374,
-      /*0xa696*/ 1014,
-      -1,
-      /*0x1f69*/ 714,
-      /*0x1fba*/ 776,
-      -1, -1,
-      /*0x020c*/ 196,
-      /*0x03aa*/ 266,
-      /*0xabba*/ 1162,
-      /*0x2cb0*/ 951,
-      -1, -1,
-      /*0x04f2*/ 414,
-      -1, -1, -1,
-      /*0xa7b0*/ 1082,
-      /*0x10cb0*/ 1330,
-      /*0x0222*/ 207,
-      -1, -1, -1,
-      /*0xff24*/ 1183,
-      -1,
-      /*0x2cba*/ 956,
-      -1,
-      /*0x1fca*/ 787,
-      /*0x004a*/ 8,
-      /*0x014a*/ 93,
-      -1,
-      /*0xa686*/ 1006,
-      -1, -1, -1,
-      /*0x052a*/ 442,
-      /*0x0184*/ 123,
-      /*0x1e2c*/ 561,
-      -1, -1,
-      /*0x04aa*/ 378,
-      /*0x052e*/ 444,
-      /*0x01d1*/ 165,
-      /*0xa690*/ 1011,
-      -1, -1,
-      /*0x04ae*/ 380,
-      /*0x1fb8*/ 774,
-      /*0x2cca*/ 964,
-      -1,
-      /*0x0182*/ 122,
-      /*0x1e28*/ 559,
-      /*0xabb8*/ 1160,
-      -1,
-      /*0x00ca*/ 36,
-      /*0x1e32*/ 564,
-      -1, -1, -1,
-      /*0x022a*/ 211,
-      /*0x10a7*/ 491,
-      /*0x1eb0*/ 629,
-      -1, -1, -1,
-      /*0x022e*/ 213,
-      /*0x1f0e*/ 675,
-      /*0xfb14*/ 1176,
-      /*0x2cb8*/ 955,
-      /*0x03a8*/ 264,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1eba*/ 634,
-      -1,
-      /*0xa69a*/ 1016,
-      -1, -1,
-      /*0x01a7*/ 145,
-      /*0x052c*/ 443,
-      /*0x10a2*/ 486,
-      /*0xa692*/ 1012,
-      /*0x1fd9*/ 795,
-      /*0x0059*/ 23,
-      /*0x04ac*/ 379,
-      /*0x1ffa*/ 815,
-      /*0x047a*/ 358,
-      /*0x1fb6*/ 772,
-      /*0xa77e*/ 1058,
-      /*0x0136*/ 83,
-      /*0xa722*/ 1017,
-      -1,
-      /*0xabb6*/ 1158,
-      /*0x0528*/ 441,
-      -1,
-      /*0x118a7*/ 1340,
-      /*0x1eca*/ 642,
-      /*0x0532*/ 446,
-      /*0x04a8*/ 377,
-      /*0x01fe*/ 189,
-      -1,
-      /*0x01a2*/ 142,
-      /*0x04b2*/ 382,
-      /*0x022c*/ 212,
-      /*0x104b2*/ 1248,
-      /*0x212a*/ 819,
-      -1, -1,
-      /*0x2cb6*/ 954,
-      /*0x00d9*/ 50,
-      -1,
-      /*0x1fcc*/ 789,
-      /*0x004c*/ 10,
-      /*0x014c*/ 94,
-      /*0x01f2*/ 182,
-      /*0xa7b6*/ 1087,
-      /*0x1eb8*/ 633,
-      /*0x0228*/ 210,
-      /*0x118a2*/ 1335,
-      -1,
-      /*0x10aa*/ 494,
-      /*0x0232*/ 215,
-      -1, -1, -1, -1,
-      /*0x10ae*/ 498,
-      -1, -1, -1,
-      /*0xa72a*/ 1021,
-      -1,
-      /*0x2ccc*/ 965,
-      /*0xff27*/ 1186,
-      /*0x1e30*/ 563,
-      -1,
-      /*0xa72e*/ 1023,
-      -1,
-      /*0x00cc*/ 38,
-      -1,
-      /*0x1fbc*/ 778,
-      /*0x1fb4*/ 771,
-      -1,
-      /*0x0134*/ 82,
-      /*0x1f2f*/ 690,
-      /*0xabbc*/ 1164,
-      /*0xabb4*/ 1156,
-      /*0x01ae*/ 148,
-      -1,
-      /*0x1e3a*/ 568,
-      -1, -1,
-      /*0x03b0*/ 268,
-      -1, -1, -1,
-      /*0xff22*/ 1181,
-      /*0x1efa*/ 666,
-      /*0x118aa*/ 1343,
-      /*0x1eb6*/ 632,
-      -1,
-      /*0x2cbc*/ 957,
-      /*0x2cb4*/ 953,
-      -1,
-      /*0x118ae*/ 1347,
-      -1,
-      /*0x1fbe*/ 779,
-      /*0x10ac*/ 496,
-      /*0xa68e*/ 1010,
-      /*0xa7b4*/ 1086,
-      /*0x2132*/ 821,
-      /*0xabbe*/ 1166,
-      /*0x1e4a*/ 576,
-      -1, -1, -1, -1,
-      /*0xa72c*/ 1022,
-      -1, -1,
-      /*0xa694*/ 1013,
-      /*0x10a8*/ 492,
-      -1,
-      /*0x1ecc*/ 643,
-      /*0x04b0*/ 381,
-      /*0x10b2*/ 502,
-      /*0x104b0*/ 1246,
-      /*0x2cbe*/ 958,
-      /*0x01ac*/ 147,
-      /*0x1f1c*/ 681,
-      -1,
-      /*0xa728*/ 1020,
-      /*0x1e38*/ 567,
-      -1,
-      /*0x053a*/ 454,
-      /*0xa732*/ 1024,
-      /*0xff2a*/ 1189,
-      /*0x13fa*/ 526,
-      /*0x1f6b*/ 716,
-      /*0x04ba*/ 386,
-      -1,
-      /*0x104ba*/ 1256,
-      /*0xff2e*/ 1193,
-      /*0x0230*/ 214,
-      /*0x1f4d*/ 704,
-      /*0x118ac*/ 1345,
-      /*0x01b2*/ 151,
-      -1, -1, -1, -1, -1,
-      /*0x1ebc*/ 635,
-      /*0x1eb4*/ 631,
-      -1, -1, -1,
-      /*0x054a*/ 470,
-      /*0x023a*/ 216,
-      /*0x118a8*/ 1341,
-      -1, -1, -1,
-      /*0x118b2*/ 1351,
-      /*0x104ca*/ 1272,
-      -1,
-      /*0x1fc8*/ 785,
-      /*0x0048*/ 7,
-      -1,
-      /*0x1fe2*/ 798,
-      /*0x0462*/ 346,
-      /*0x0162*/ 105,
-      /*0xfb04*/ 1172,
-      /*0x1e7a*/ 600,
-      -1,
-      /*0x1e36*/ 566,
-      -1,
-      /*0x0538*/ 452,
-      /*0x1ebe*/ 636,
-      /*0x2c62*/ 913,
-      -1,
-      /*0x024a*/ 226,
-      /*0x04b8*/ 385,
-      /*0xff2c*/ 1191,
-      /*0x104b8*/ 1254,
-      -1,
-      /*0xfb02*/ 1170,
-      /*0x2cc8*/ 963,
-      -1, -1,
-      /*0x2ce2*/ 976,
-      /*0x03fa*/ 293,
-      -1,
-      /*0x00c8*/ 34,
-      -1,
-      /*0x1f85*/ 726,
-      /*0x0405*/ 302,
-      /*0xff28*/ 1187,
-      /*0x10405*/ 1211,
-      /*0x1e4c*/ 577,
-      /*0xab85*/ 1109,
-      /*0xff32*/ 1197,
-      -1, -1, -1,
-      /*0x2c05*/ 870,
-      -1,
-      /*0x10b0*/ 500,
-      -1, -1,
-      /*0x1fc4*/ 782,
-      /*0x0044*/ 3,
-      -1, -1, -1,
-      /*0x1fd6*/ 792,
-      /*0x0056*/ 20,
-      /*0x0156*/ 99,
-      -1, -1,
-      /*0x0536*/ 450,
-      -1,
-      /*0x10ba*/ 510,
-      /*0x04fa*/ 418,
-      /*0x10c85*/ 1287,
-      /*0x04b6*/ 384,
-      /*0x24ba*/ 843,
-      /*0x104b6*/ 1252,
-      /*0x1e3c*/ 569,
-      /*0x1e34*/ 565,
-      -1,
-      /*0x2cc4*/ 961,
-      /*0xa73a*/ 1028,
-      -1,
-      /*0x1e905*/ 1370,
-      -1,
-      /*0x2cd6*/ 970,
-      /*0x00c4*/ 30,
-      /*0x1ec8*/ 641,
-      /*0x1f0c*/ 673,
-      -1,
-      /*0x1ee2*/ 654,
-      /*0x00d6*/ 48,
-      -1,
-      /*0x054c*/ 472,
-      /*0x118b0*/ 1349,
-      -1, -1, -1,
-      /*0x24ca*/ 859,
-      -1,
-      /*0x104cc*/ 1274,
-      -1,
-      /*0xa64a*/ 985,
-      /*0x1e3e*/ 570,
-      /*0xa74a*/ 1036,
-      -1, -1, -1, -1,
-      /*0x118ba*/ 1359,
-      -1, -1, -1, -1,
-      /*0x10b8*/ 508,
-      /*0x01ca*/ 161,
-      -1,
-      /*0x024c*/ 227,
-      /*0x24b8*/ 841,
-      -1, -1, -1,
-      /*0x053c*/ 456,
-      /*0x0534*/ 448,
-      /*0xa738*/ 1027,
-      -1, -1,
-      /*0x04bc*/ 387,
-      /*0x04b4*/ 383,
-      /*0x104bc*/ 1258,
-      /*0x104b4*/ 1250,
-      /*0x1ec4*/ 639,
-      /*0xff30*/ 1195,
-      /*0x1fc2*/ 780,
-      /*0x0042*/ 1,
-      /*0x01b8*/ 155,
-      /*0x1ed6*/ 648,
-      /*0xa684*/ 1005,
-      /*0x0050*/ 14,
-      /*0x0150*/ 96,
-      /*0x1f2a*/ 685,
-      /*0x1fd2*/ 790,
-      /*0x0052*/ 16,
-      /*0x0152*/ 97,
-      -1, -1,
-      /*0x1f2e*/ 689,
-      /*0xff3a*/ 1205,
-      /*0x053e*/ 458,
-      -1, -1,
-      /*0xa682*/ 1004,
-      /*0x118b8*/ 1357,
-      /*0x04be*/ 388,
-      /*0x2cc2*/ 960,
-      /*0x104be*/ 1260,
-      -1,
-      /*0x10b6*/ 506,
-      /*0x2cd0*/ 967,
-      -1,
-      /*0x00c2*/ 28,
-      /*0x24b6*/ 839,
-      /*0x2cd2*/ 968,
-      /*0x1e48*/ 575,
-      /*0x00d0*/ 42,
-      -1,
-      /*0x1e62*/ 588,
-      /*0xa736*/ 1026,
-      /*0x00d2*/ 44,
-      -1, -1, -1,
-      /*0x023e*/ 219,
-      /*0x01d9*/ 169,
-      /*0x004e*/ 12,
-      /*0x014e*/ 95,
-      /*0x01fa*/ 187,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x03e2*/ 280,
-      /*0x24cc*/ 861,
-      -1,
-      /*0x1f2c*/ 687,
-      -1,
-      /*0xa64c*/ 986,
-      /*0xff38*/ 1203,
-      /*0xa74c*/ 1037,
-      -1,
-      /*0xa68c*/ 1009,
-      /*0x2cce*/ 966,
-      /*0x118b6*/ 1355,
-      -1, -1,
-      /*0x1fc6*/ 783,
-      /*0x0046*/ 5,
-      /*0x00ce*/ 40,
-      /*0x1f28*/ 683,
-      -1,
-      /*0x1ffc*/ 817,
-      /*0x047c*/ 359,
-      /*0x1ec2*/ 638,
-      -1,
-      /*0x1e44*/ 573,
-      /*0x0548*/ 468,
-      /*0x1ed0*/ 645,
-      /*0x10bc*/ 512,
-      /*0x10b4*/ 504,
-      /*0x1e56*/ 582,
-      /*0x1ed2*/ 646,
-      /*0x24bc*/ 845,
-      /*0x104c8*/ 1270,
-      /*0x04e2*/ 406,
-      -1, -1,
-      /*0x2cc6*/ 962,
-      /*0xa73c*/ 1029,
-      /*0xa734*/ 1025,
-      /*0x1fec*/ 807,
-      /*0x046c*/ 351,
-      /*0x016c*/ 110,
-      /*0x00c6*/ 32,
-      -1, -1, -1, -1,
-      /*0x03d6*/ 274,
-      /*0x01bc*/ 156,
-      /*0x0248*/ 225,
-      /*0xff36*/ 1201,
-      -1, -1,
-      /*0x10be*/ 514,
-      -1, -1, -1,
-      /*0x24be*/ 847,
-      /*0x1fea*/ 805,
-      /*0x046a*/ 350,
-      /*0x016a*/ 109,
-      -1,
-      /*0x1ece*/ 644,
-      /*0xa73e*/ 1030,
-      -1,
-      /*0x118bc*/ 1361,
-      /*0x118b4*/ 1353,
-      /*0x1fab*/ 764,
-      /*0x042b*/ 340,
-      /*0x0544*/ 464,
-      /*0x1f81*/ 722,
-      /*0x0401*/ 298,
-      /*0xabab*/ 1147,
-      /*0x10401*/ 1207,
-      /*0x0556*/ 482,
-      /*0xab81*/ 1105,
-      /*0x104c4*/ 1266,
-      /*0x2c2b*/ 908,
-      -1,
-      /*0x04d6*/ 400,
-      /*0x2c01*/ 866,
-      -1,
-      /*0x013f*/ 87,
-      -1, -1,
-      /*0xabbf*/ 1167,
-      -1,
-      /*0x1ec6*/ 640,
-      /*0x1fe8*/ 803,
-      /*0x0468*/ 349,
-      /*0x0168*/ 108,
-      /*0x118be*/ 1363,
-      /*0x1efc*/ 667,
-      /*0x0244*/ 222,
-      -1,
-      /*0xa7ab*/ 1078,
-      /*0x10cab*/ 1325,
-      -1,
-      /*0x1e42*/ 572,
-      /*0x10c81*/ 1283,
-      -1,
-      /*0x2162*/ 824,
-      /*0x1e50*/ 579,
-      -1,
-      /*0xff34*/ 1199,
-      -1,
-      /*0x1e52*/ 580,
-      -1,
-      /*0x1c88*/ 538,
-      /*0x1e901*/ 1366,
-      -1,
-      /*0x1eec*/ 659,
-      /*0x1fe4*/ 800,
-      /*0x0464*/ 347,
-      /*0x0164*/ 106,
-      -1,
-      /*0x03c2*/ 269,
-      /*0x24c8*/ 857,
-      -1,
-      /*0x1f3a*/ 693,
-      /*0x03d0*/ 271,
-      /*0xa648*/ 984,
-      /*0x2c64*/ 915,
-      /*0xa748*/ 1035,
-      /*0xa662*/ 997,
-      -1,
-      /*0xa762*/ 1048,
-      -1, -1, -1,
-      /*0x1eea*/ 658,
-      /*0x1c80*/ 530,
-      /*0x13fc*/ 528,
-      -1,
-      /*0x01c8*/ 160,
-      /*0x1fa9*/ 762,
-      /*0x0429*/ 338,
-      /*0x01e2*/ 173,
-      /*0x1e4e*/ 578,
-      /*0x1c83*/ 533,
-      /*0xaba9*/ 1145,
-      -1,
-      /*0x1f4a*/ 701,
-      /*0x0542*/ 462,
-      -1,
-      /*0x2c29*/ 906,
-      -1,
-      /*0x0550*/ 476,
-      -1, -1,
-      /*0x104c2*/ 1264,
-      /*0x0552*/ 478,
-      /*0x04d0*/ 397,
-      -1,
-      /*0x104d0*/ 1278,
-      -1,
-      /*0x04d2*/ 398,
-      /*0x10c4*/ 520,
-      /*0x104d2*/ 1280,
-      -1,
-      /*0x1ee8*/ 657,
-      /*0x24c4*/ 853,
-      /*0x1f38*/ 691,
-      /*0x1e46*/ 574,
-      /*0x10ca9*/ 1323,
-      /*0xa644*/ 982,
-      -1,
-      /*0xa744*/ 1033,
-      /*0x1e7c*/ 601,
-      -1,
-      /*0xa656*/ 991,
-      -1,
-      /*0xa756*/ 1042,
-      /*0x0460*/ 345,
-      /*0x0160*/ 104,
-      -1, -1, -1,
-      /*0x01c4*/ 157,
-      -1, -1, -1,
-      /*0x2c60*/ 912,
-      /*0x054e*/ 474,
-      /*0x1ee4*/ 655,
-      -1, -1,
-      /*0x1e6c*/ 593,
-      /*0x046e*/ 352,
-      /*0x016e*/ 111,
-      /*0x104ce*/ 1276,
-      -1, -1,
-      /*0x2ce0*/ 975,
-      -1, -1, -1,
-      /*0x2c6e*/ 920,
-      -1, -1,
-      /*0x1f59*/ 709,
-      -1,
-      /*0x1fe6*/ 801,
-      /*0x0466*/ 348,
-      /*0x0166*/ 107,
-      /*0x03ec*/ 285,
-      /*0x1e6a*/ 592,
-      /*0x024e*/ 228,
-      /*0x0546*/ 466,
-      -1, -1,
-      /*0x013d*/ 86,
-      -1,
-      /*0x1c86*/ 536,
-      /*0xabbd*/ 1165,
-      /*0x104c6*/ 1268,
-      -1, -1,
-      /*0x04fc*/ 419,
-      -1, -1,
-      /*0x1fda*/ 796,
-      /*0x005a*/ 24,
-      /*0x015a*/ 101,
-      /*0x03ea*/ 284,
-      /*0x1fd8*/ 794,
-      /*0x0058*/ 22,
-      /*0x0158*/ 100,
-      -1,
-      /*0x1f4c*/ 703,
-      -1,
-      /*0x10c2*/ 518,
-      /*0x0246*/ 224,
-      /*0x03ab*/ 267,
-      -1,
-      /*0x24c2*/ 851,
-      /*0x1e68*/ 591,
-      /*0x04ec*/ 411,
-      -1,
-      /*0xa642*/ 981,
-      -1,
-      /*0xa742*/ 1032,
-      /*0x2cda*/ 972,
-      /*0xa650*/ 988,
-      /*0x1ee0*/ 653,
-      /*0xa750*/ 1039,
-      /*0x2cd8*/ 971,
-      /*0xa652*/ 989,
-      /*0x00da*/ 51,
-      /*0xa752*/ 1040,
-      /*0x0054*/ 18,
-      /*0x0154*/ 98,
-      /*0x00d8*/ 49,
-      -1,
-      /*0x03e8*/ 283,
-      -1,
-      /*0x04ea*/ 410,
-      /*0x2cc0*/ 959,
-      /*0x1f3c*/ 695,
-      /*0x1eee*/ 660,
-      /*0x1e64*/ 589,
-      -1, -1,
-      /*0x00c0*/ 26,
-      -1, -1,
-      /*0x015e*/ 103,
-      /*0x1fc7*/ 784,
-      /*0x0047*/ 6,
-      /*0x0147*/ 91,
-      /*0x2cd4*/ 969,
-      -1, -1,
-      /*0x053f*/ 459,
-      /*0x1ee6*/ 656,
-      /*0x24ce*/ 863,
-      /*0x00d4*/ 46,
-      -1,
-      /*0x03e4*/ 281,
-      /*0xa64e*/ 987,
-      /*0x104bf*/ 1261,
-      /*0xa74e*/ 1038,
-      -1, -1,
-      /*0x1f3e*/ 697,
-      /*0x2cde*/ 974,
-      /*0x04e8*/ 409,
-      /*0x1fb9*/ 775,
-      -1,
-      /*0x0139*/ 84,
-      -1,
-      /*0x00de*/ 55,
-      /*0xabb9*/ 1161,
-      /*0x1eda*/ 650,
-      /*0x00c7*/ 33,
-      -1, -1,
-      /*0x1ed8*/ 649,
-      -1, -1,
-      /*0x24c6*/ 855,
-      /*0x03a9*/ 265,
-      -1, -1,
-      /*0xa646*/ 983,
-      /*0x216c*/ 834,
-      /*0xa746*/ 1034,
-      -1,
-      /*0x1ec0*/ 637,
-      -1,
-      /*0x04e4*/ 407,
-      -1,
-      /*0x015c*/ 102,
-      /*0x1fa1*/ 754,
-      /*0x0421*/ 330,
-      -1,
-      /*0x10421*/ 1239,
-      -1,
-      /*0xaba1*/ 1137,
-      -1,
-      /*0x1e60*/ 587,
-      /*0x1ed4*/ 647,
-      /*0x01fc*/ 188,
-      /*0x2c21*/ 898,
-      /*0x216a*/ 832,
-      -1, -1, -1,
-      /*0xa66c*/ 1002,
-      -1,
-      /*0xa76c*/ 1053,
-      /*0x2cdc*/ 973,
-      -1,
-      /*0x212b*/ 820,
-      -1,
-      /*0x1e6e*/ 594,
-      /*0x1ede*/ 652,
-      /*0x00dc*/ 53,
-      /*0x03e0*/ 279,
-      -1, -1,
-      /*0x01ec*/ 178,
-      /*0x10ca1*/ 1315,
-      -1,
-      /*0x1f48*/ 699,
-      /*0x0045*/ 4,
-      /*0x0145*/ 90,
-      /*0xa66a*/ 1001,
-      /*0x10ab*/ 495,
-      /*0xa76a*/ 1052,
-      /*0x1e66*/ 590,
-      -1,
-      /*0x1e921*/ 1398,
-      /*0x03ee*/ 286,
-      /*0x2168*/ 830,
-      -1,
-      /*0x1fc3*/ 781,
-      /*0x0043*/ 2,
-      /*0x0143*/ 89,
-      -1,
-      /*0x01ea*/ 177,
-      /*0x10bf*/ 515,
-      /*0xfb05*/ 1173,
-      -1,
-      /*0x0345*/ 229,
-      /*0x24bf*/ 848,
-      -1, -1,
-      /*0x03e6*/ 282,
-      /*0x1e5a*/ 584,
-      /*0x04e0*/ 405,
-      /*0x00c5*/ 31,
-      /*0x0181*/ 121,
-      /*0x1e58*/ 583,
-      -1, -1, -1,
-      /*0xa668*/ 1000,
-      /*0x2164*/ 826,
-      /*0xa768*/ 1051,
-      -1, -1,
-      /*0x1edc*/ 651,
-      /*0x00c3*/ 29,
-      /*0x1e40*/ 571,
-      /*0x04ee*/ 412,
-      /*0x118ab*/ 1344,
-      /*0x03da*/ 276,
-      -1, -1,
-      /*0x01e8*/ 176,
-      /*0x03d8*/ 275,
-      -1,
-      /*0x1f56*/ 708,
-      -1, -1, -1,
-      /*0x1e54*/ 581,
-      -1,
-      /*0x118bf*/ 1364,
-      /*0x04e6*/ 408,
-      /*0xa664*/ 998,
-      /*0x053d*/ 457,
-      /*0xa764*/ 1049,
-      /*0x1fc9*/ 786,
-      /*0x0049*/ 1399,
-      /*0x0149*/ 92,
-      -1, -1,
-      /*0x104bd*/ 1259,
-      /*0x1f97*/ 744,
-      /*0x0417*/ 320,
-      /*0x1e5e*/ 586,
-      /*0x10417*/ 1229,
-      /*0x01e4*/ 174,
-      /*0xab97*/ 1127,
-      /*0x10a9*/ 493,
-      /*0x1fad*/ 766,
-      /*0x042d*/ 342,
-      /*0x04da*/ 402,
-      /*0x2c17*/ 888,
-      -1,
-      /*0xabad*/ 1149,
-      /*0x04d8*/ 401,
-      /*0xff2b*/ 1190,
-      -1,
-      /*0x023d*/ 218,
-      /*0x2c2d*/ 910,
-      -1,
-      /*0x0540*/ 460,
-      /*0x03de*/ 278,
-      /*0x00c9*/ 35,
-      -1, -1,
-      /*0x04c0*/ 389,
-      -1,
-      /*0x104c0*/ 1262,
-      /*0x01a9*/ 146,
-      /*0x2160*/ 822,
-      /*0x10c97*/ 1305,
-      -1, -1,
-      /*0x0554*/ 480,
-      /*0x1fb3*/ 770,
-      -1,
-      /*0xa7ad*/ 1080,
-      /*0x10cad*/ 1327,
-      /*0x04d4*/ 399,
-      /*0xabb3*/ 1155,
-      /*0x1e917*/ 1388,
-      -1, -1, -1,
-      /*0x216e*/ 836,
-      /*0x118a9*/ 1342,
-      -1, -1, -1,
-      /*0x1e5c*/ 585,
-      -1,
-      /*0x0547*/ 467,
-      /*0xa660*/ 996,
-      /*0x04de*/ 404,
-      /*0xa760*/ 1047,
-      -1,
-      /*0x04c7*/ 393,
-      /*0x1f50*/ 705,
-      /*0x104c7*/ 1269,
-      /*0x2166*/ 828,
-      -1,
-      /*0x1f52*/ 706,
-      /*0xa7b3*/ 1085,
-      -1, -1,
-      /*0x01e0*/ 172,
-      -1,
-      /*0x03dc*/ 277,
-      -1,
-      /*0xa76e*/ 1054,
-      /*0x03a1*/ 258,
-      /*0x0539*/ 453,
-      -1,
-      /*0x1e97*/ 615,
-      -1, -1, -1, -1,
-      /*0x104b9*/ 1255,
-      -1,
-      /*0x01ee*/ 179,
-      /*0x10bd*/ 513,
-      /*0xa666*/ 999,
-      /*0xff29*/ 1188,
-      /*0xa766*/ 1050,
-      /*0x24bd*/ 846,
-      /*0x1fa5*/ 758,
-      /*0x0425*/ 334,
-      -1,
-      /*0x10425*/ 1243,
-      -1,
-      /*0xaba5*/ 1141,
-      /*0x1fb7*/ 773,
-      -1, -1,
-      /*0x01e6*/ 175,
-      /*0x2c25*/ 902,
-      /*0xabb7*/ 1159,
-      -1,
-      /*0x04dc*/ 403,
-      -1,
-      /*0xa65a*/ 993,
-      -1,
-      /*0xa75a*/ 1044,
-      -1,
-      /*0xa658*/ 992,
-      -1,
-      /*0xa758*/ 1043,
-      /*0x10c0*/ 516,
-      -1, -1, -1,
-      /*0x24c0*/ 849,
-      -1, -1,
-      /*0x10ca5*/ 1319,
-      /*0xa640*/ 980,
-      -1,
-      /*0xa740*/ 1031,
-      /*0x118bd*/ 1362,
-      /*0x1fa3*/ 756,
-      /*0x0423*/ 332,
-      -1,
-      /*0x10423*/ 1241,
-      /*0x1c84*/ 534,
-      /*0xaba3*/ 1139,
-      -1, -1,
-      /*0x0545*/ 465,
-      /*0xa654*/ 990,
-      /*0x2c23*/ 900,
-      /*0xa754*/ 1041,
-      -1,
-      /*0x04c5*/ 392,
-      -1,
-      /*0x104c5*/ 1267,
-      -1, -1,
-      /*0x1c82*/ 532,
-      /*0x10c7*/ 522,
-      /*0x0543*/ 463,
-      -1,
-      /*0x1f6c*/ 717,
-      /*0x24c7*/ 856,
-      /*0xa65e*/ 995,
-      /*0x04c3*/ 391,
-      /*0xa75e*/ 1046,
-      /*0x104c3*/ 1265,
-      -1,
-      /*0x10ca3*/ 1317,
-      -1, -1,
-      /*0x0245*/ 223,
-      /*0x1ff4*/ 810,
-      /*0x0474*/ 355,
-      /*0x0174*/ 114,
-      -1,
-      /*0x01de*/ 171,
-      -1,
-      /*0x10b9*/ 509,
-      /*0x01c7*/ 159,
-      /*0x1f6a*/ 715,
-      /*0xfb01*/ 1169,
-      /*0x24b9*/ 842,
-      /*0x0243*/ 221,
-      -1, -1,
-      /*0x0397*/ 248,
-      -1, -1,
-      /*0x1f2b*/ 686,
-      /*0x1f9d*/ 750,
-      /*0x041d*/ 326,
-      -1,
-      /*0x1041d*/ 1235,
-      /*0xabb1*/ 1153,
-      /*0xab9d*/ 1133,
-      /*0x0470*/ 353,
-      /*0x0170*/ 112,
-      /*0x1f9b*/ 748,
-      /*0x041b*/ 324,
-      /*0x2c1d*/ 894,
-      /*0x1041b*/ 1233,
-      /*0x1f3f*/ 698,
-      /*0xab9b*/ 1131,
-      /*0x10a1*/ 485,
-      /*0x2c70*/ 922,
-      /*0xabb5*/ 1157,
-      /*0x0549*/ 469,
-      /*0x2c1b*/ 892,
-      /*0xa65c*/ 994,
-      /*0x1f68*/ 713,
-      /*0xa75c*/ 1045,
-      /*0x04c9*/ 394,
-      -1,
-      /*0x104c9*/ 1271,
-      /*0x0370*/ 230,
-      /*0x118b9*/ 1358,
-      /*0xa7b1*/ 1083,
-      /*0x10cb1*/ 1331,
-      /*0x10c9d*/ 1311,
-      -1,
-      /*0x1f99*/ 746,
-      /*0x0419*/ 322,
-      -1,
-      /*0x10419*/ 1231,
-      -1,
-      /*0xab99*/ 1129,
-      /*0x10c9b*/ 1309,
-      /*0x00b5*/ 25,
-      /*0x1e91d*/ 1394,
-      -1,
-      /*0x2c19*/ 890,
-      -1,
-      /*0x1f93*/ 740,
-      /*0x0413*/ 316,
-      /*0x10c5*/ 521,
-      /*0x10413*/ 1225,
-      /*0x1e91b*/ 1392,
-      /*0xab93*/ 1123,
-      /*0x24c5*/ 854,
-      -1, -1,
-      /*0x118a1*/ 1334,
-      /*0x2c13*/ 884,
-      /*0x1ef4*/ 663,
-      -1,
-      /*0x0533*/ 447,
-      /*0x10c3*/ 519,
-      /*0x0041*/ 0,
-      /*0x0141*/ 88,
-      /*0x10c99*/ 1307,
-      /*0x24c3*/ 852,
-      -1,
-      /*0x104b3*/ 1249,
-      /*0xff39*/ 1204,
-      -1,
-      /*0x01c5*/ 158,
-      /*0x1f29*/ 684,
-      -1, -1,
-      /*0x1e919*/ 1390,
-      -1,
-      /*0x10c93*/ 1301,
-      /*0x1f8f*/ 736,
-      /*0x040f*/ 312,
-      -1,
-      /*0x1040f*/ 1221,
-      /*0x1ef0*/ 661,
-      /*0xab8f*/ 1119,
-      -1,
-      /*0x1e9b*/ 619,
-      /*0x03a5*/ 261,
-      /*0x1e913*/ 1384,
-      /*0x2c0f*/ 880,
-      /*0x00c1*/ 27,
-      -1, -1, -1,
-      /*0x1f8b*/ 732,
-      /*0x040b*/ 308,
-      /*0xff21*/ 1180,
-      /*0x1040b*/ 1217,
-      -1,
-      /*0xab8b*/ 1115,
-      /*0x1f87*/ 728,
-      /*0x0407*/ 304,
-      /*0xab7b*/ 1099,
-      /*0x10407*/ 1213,
-      /*0x2c0b*/ 876,
-      /*0xab87*/ 1111,
-      /*0x0587*/ 483,
-      -1,
-      /*0x10c8f*/ 1297,
-      /*0x1e99*/ 617,
-      /*0x2c07*/ 872,
-      /*0x004f*/ 13,
-      -1, -1, -1,
-      /*0x24c9*/ 858,
-      -1,
-      /*0xab79*/ 1097,
-      /*0x1e90f*/ 1380,
-      -1,
-      /*0x0537*/ 451,
-      /*0x03a3*/ 259,
-      /*0xa78b*/ 1063,
-      /*0x10c8b*/ 1293,
-      /*0x10ad*/ 497,
-      /*0x1f6e*/ 719,
-      -1,
-      /*0x104b7*/ 1253,
-      -1,
-      /*0x10c87*/ 1289,
-      -1, -1, -1,
-      /*0x1e90b*/ 1376,
-      -1, -1,
-      /*0x1e74*/ 597,
-      /*0x00cf*/ 41,
-      /*0x0197*/ 136,
-      /*0x1e907*/ 1372,
-      -1,
-      /*0xab71*/ 1089,
-      /*0xab73*/ 1091,
-      -1, -1, -1, -1,
-      /*0x1f3d*/ 696,
-      -1, -1,
-      /*0x10b3*/ 503,
-      -1,
-      /*0xab7f*/ 1103,
-      -1,
-      /*0x03f4*/ 289,
-      /*0x1f9f*/ 752,
-      /*0x041f*/ 328,
-      /*0xab7d*/ 1101,
-      /*0x1041f*/ 1237,
-      /*0x1e70*/ 595,
-      /*0xab9f*/ 1135,
-      -1,
-      /*0x118ad*/ 1346,
-      -1, -1,
-      /*0x2c1f*/ 896,
-      -1, -1, -1, -1, -1,
-      /*0x01b3*/ 152,
-      /*0x039d*/ 254,
-      -1, -1, -1, -1,
-      /*0x03f0*/ 287,
-      /*0xab75*/ 1093,
-      -1,
-      /*0x039b*/ 252,
-      -1, -1, -1,
-      /*0x10c9f*/ 1313,
-      -1,
-      /*0x04f4*/ 415,
-      /*0x1f54*/ 707,
-      /*0x118b3*/ 1352,
-      -1,
-      /*0x1ff8*/ 813,
-      /*0x0478*/ 357,
-      /*0x0178*/ 116,
-      -1,
-      /*0x1e91f*/ 1396,
-      -1, -1, -1,
-      /*0x0531*/ 445,
-      -1,
-      /*0xff2d*/ 1192,
-      -1,
-      /*0x10a5*/ 489,
-      /*0x0399*/ 250,
-      -1,
-      /*0x104b1*/ 1247,
-      -1, -1,
-      /*0x10b7*/ 507,
-      /*0x04f0*/ 413,
-      /*0x0535*/ 449,
-      -1,
-      /*0x24b7*/ 840,
-      /*0x1f95*/ 742,
-      /*0x0415*/ 318,
-      /*0x0393*/ 244,
-      /*0x10415*/ 1227,
-      /*0x104b5*/ 1251,
-      /*0xab95*/ 1125,
-      -1, -1, -1, -1,
-      /*0x2c15*/ 886,
-      -1,
-      /*0x1f39*/ 692,
-      /*0xff33*/ 1198,
-      -1, -1,
-      /*0x01b7*/ 154,
-      -1, -1, -1, -1,
-      /*0xab77*/ 1095,
-      -1,
-      /*0x10a3*/ 487,
-      -1,
-      /*0x1f91*/ 738,
-      /*0x0411*/ 314,
-      /*0x118a5*/ 1338,
-      /*0x10411*/ 1223,
-      /*0x10c95*/ 1303,
-      /*0xab91*/ 1121,
-      -1,
-      /*0x038f*/ 240,
-      /*0x118b7*/ 1356,
-      -1,
-      /*0x2c11*/ 882,
-      -1, -1, -1,
-      /*0x1e915*/ 1386,
-      -1,
-      /*0x1f8d*/ 734,
-      /*0x040d*/ 310,
-      /*0x0541*/ 461,
-      /*0x1040d*/ 1219,
-      -1,
-      /*0xab8d*/ 1117,
-      -1,
-      /*0x04c1*/ 390,
-      /*0x1ef8*/ 665,
-      /*0x104c1*/ 1263,
-      /*0x2c0d*/ 878,
-      -1, -1,
-      /*0x10c91*/ 1299,
-      -1, -1, -1, -1, -1, -1,
-      /*0x118a3*/ 1336,
-      -1,
-      /*0x03cf*/ 270,
-      /*0x1e911*/ 1382,
-      /*0xff25*/ 1184,
-      -1,
-      /*0x0241*/ 220,
-      -1,
-      /*0xa78d*/ 1064,
-      /*0x10c8d*/ 1295,
-      /*0xff37*/ 1202,
-      -1,
-      /*0x10b1*/ 501,
-      -1, -1, -1,
-      /*0x01f4*/ 183,
-      -1, -1,
-      /*0x1e90d*/ 1378,
-      -1, -1, -1, -1,
-      /*0x10b5*/ 505,
-      -1, -1, -1,
-      /*0x13f8*/ 524,
-      /*0x054f*/ 475,
-      -1, -1, -1,
-      /*0x01b1*/ 150,
-      /*0x019d*/ 139,
-      -1,
-      /*0x104cf*/ 1277,
-      -1,
-      /*0xff23*/ 1182,
-      /*0x01f0*/ 180,
-      -1, -1, -1, -1, -1,
-      /*0x01b5*/ 153,
-      -1,
-      /*0x039f*/ 256,
-      -1, -1,
-      /*0x118b1*/ 1350,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x118b5*/ 1354,
-      /*0xfb17*/ 1179,
-      /*0x1e78*/ 599,
-      -1, -1, -1,
-      /*0x1f49*/ 700,
-      -1,
-      /*0x10c1*/ 517,
-      -1, -1, -1,
-      /*0x24c1*/ 850,
-      -1, -1,
-      /*0x0193*/ 133,
-      -1, -1, -1,
-      /*0x1f2d*/ 688,
-      -1, -1, -1, -1, -1, -1,
-      /*0xff31*/ 1196,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0xff35*/ 1200,
-      -1, -1, -1, -1,
-      /*0x0395*/ 246,
-      -1,
-      /*0x018f*/ 130,
-      -1, -1, -1, -1, -1, -1,
-      /*0x04f8*/ 417,
-      -1, -1, -1, -1, -1,
-      /*0xab76*/ 1094,
-      /*0x24cf*/ 864,
-      /*0x018b*/ 128,
-      -1, -1, -1, -1, -1,
-      /*0x0187*/ 125,
-      -1,
-      /*0x0391*/ 242,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x01cf*/ 164,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x019f*/ 140,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x1c85*/ 535,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x01f8*/ 186,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x1f1d*/ 682,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x1f1b*/ 680,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x0191*/ 132,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1f19*/ 678,
-      /*0xfb13*/ 1175,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x1f0f*/ 676,
-      -1, -1, -1, -1,
-      /*0xab7e*/ 1102,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1f0b*/ 672,
-      -1, -1, -1, -1,
-      /*0xab72*/ 1090,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1c81*/ 531,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xfb15*/ 1177,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x1f0d*/ 674,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0xab7a*/ 1098,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xab7c*/ 1100,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x1c87*/ 537,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0xab74*/ 1092,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xab70*/ 1088,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xab78*/ 1096
-    };
-
-  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseFold_11_hash(code);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
-            return &CaseFold_11_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
-#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1266])(CaseUnfold_11_Table+0))
-  {0x0061, {1|U, {0x0041}}},
-  {0x0062, {1|U, {0x0042}}},
-  {0x0063, {1|U, {0x0043}}},
-  {0x0064, {1|U, {0x0044}}},
-  {0x0065, {1|U, {0x0045}}},
-  {0x0066, {1|U, {0x0046}}},
-  {0x0067, {1|U, {0x0047}}},
-  {0x0068, {1|U, {0x0048}}},
-  {0x006a, {1|U, {0x004a}}},
-  {0x006b, {2|U, {0x004b, 0x212a}}},
-  {0x006c, {1|U, {0x004c}}},
-  {0x006d, {1|U, {0x004d}}},
-  {0x006e, {1|U, {0x004e}}},
-  {0x006f, {1|U, {0x004f}}},
-  {0x0070, {1|U, {0x0050}}},
-  {0x0071, {1|U, {0x0051}}},
-  {0x0072, {1|U, {0x0052}}},
-  {0x0073, {2|U, {0x0053, 0x017f}}},
-  {0x0074, {1|U, {0x0054}}},
-  {0x0075, {1|U, {0x0055}}},
-  {0x0076, {1|U, {0x0056}}},
-  {0x0077, {1|U, {0x0057}}},
-  {0x0078, {1|U, {0x0058}}},
-  {0x0079, {1|U, {0x0059}}},
-  {0x007a, {1|U, {0x005a}}},
-  {0x00e0, {1|U, {0x00c0}}},
-  {0x00e1, {1|U, {0x00c1}}},
-  {0x00e2, {1|U, {0x00c2}}},
-  {0x00e3, {1|U, {0x00c3}}},
-  {0x00e4, {1|U, {0x00c4}}},
-  {0x00e5, {2|U, {0x00c5, 0x212b}}},
-  {0x00e6, {1|U, {0x00c6}}},
-  {0x00e7, {1|U, {0x00c7}}},
-  {0x00e8, {1|U, {0x00c8}}},
-  {0x00e9, {1|U, {0x00c9}}},
-  {0x00ea, {1|U, {0x00ca}}},
-  {0x00eb, {1|U, {0x00cb}}},
-  {0x00ec, {1|U, {0x00cc}}},
-  {0x00ed, {1|U, {0x00cd}}},
-  {0x00ee, {1|U, {0x00ce}}},
-  {0x00ef, {1|U, {0x00cf}}},
-  {0x00f0, {1|U, {0x00d0}}},
-  {0x00f1, {1|U, {0x00d1}}},
-  {0x00f2, {1|U, {0x00d2}}},
-  {0x00f3, {1|U, {0x00d3}}},
-  {0x00f4, {1|U, {0x00d4}}},
-  {0x00f5, {1|U, {0x00d5}}},
-  {0x00f6, {1|U, {0x00d6}}},
-  {0x00f8, {1|U, {0x00d8}}},
-  {0x00f9, {1|U, {0x00d9}}},
-  {0x00fa, {1|U, {0x00da}}},
-  {0x00fb, {1|U, {0x00db}}},
-  {0x00fc, {1|U, {0x00dc}}},
-  {0x00fd, {1|U, {0x00dd}}},
-  {0x00fe, {1|U, {0x00de}}},
-  {0x00ff, {1|U, {0x0178}}},
-  {0x0101, {1|U, {0x0100}}},
-  {0x0103, {1|U, {0x0102}}},
-  {0x0105, {1|U, {0x0104}}},
-  {0x0107, {1|U, {0x0106}}},
-  {0x0109, {1|U, {0x0108}}},
-  {0x010b, {1|U, {0x010a}}},
-  {0x010d, {1|U, {0x010c}}},
-  {0x010f, {1|U, {0x010e}}},
-  {0x0111, {1|U, {0x0110}}},
-  {0x0113, {1|U, {0x0112}}},
-  {0x0115, {1|U, {0x0114}}},
-  {0x0117, {1|U, {0x0116}}},
-  {0x0119, {1|U, {0x0118}}},
-  {0x011b, {1|U, {0x011a}}},
-  {0x011d, {1|U, {0x011c}}},
-  {0x011f, {1|U, {0x011e}}},
-  {0x0121, {1|U, {0x0120}}},
-  {0x0123, {1|U, {0x0122}}},
-  {0x0125, {1|U, {0x0124}}},
-  {0x0127, {1|U, {0x0126}}},
-  {0x0129, {1|U, {0x0128}}},
-  {0x012b, {1|U, {0x012a}}},
-  {0x012d, {1|U, {0x012c}}},
-  {0x012f, {1|U, {0x012e}}},
-  {0x0133, {1|U, {0x0132}}},
-  {0x0135, {1|U, {0x0134}}},
-  {0x0137, {1|U, {0x0136}}},
-  {0x013a, {1|U, {0x0139}}},
-  {0x013c, {1|U, {0x013b}}},
-  {0x013e, {1|U, {0x013d}}},
-  {0x0140, {1|U, {0x013f}}},
-  {0x0142, {1|U, {0x0141}}},
-  {0x0144, {1|U, {0x0143}}},
-  {0x0146, {1|U, {0x0145}}},
-  {0x0148, {1|U, {0x0147}}},
-  {0x014b, {1|U, {0x014a}}},
-  {0x014d, {1|U, {0x014c}}},
-  {0x014f, {1|U, {0x014e}}},
-  {0x0151, {1|U, {0x0150}}},
-  {0x0153, {1|U, {0x0152}}},
-  {0x0155, {1|U, {0x0154}}},
-  {0x0157, {1|U, {0x0156}}},
-  {0x0159, {1|U, {0x0158}}},
-  {0x015b, {1|U, {0x015a}}},
-  {0x015d, {1|U, {0x015c}}},
-  {0x015f, {1|U, {0x015e}}},
-  {0x0161, {1|U, {0x0160}}},
-  {0x0163, {1|U, {0x0162}}},
-  {0x0165, {1|U, {0x0164}}},
-  {0x0167, {1|U, {0x0166}}},
-  {0x0169, {1|U, {0x0168}}},
-  {0x016b, {1|U, {0x016a}}},
-  {0x016d, {1|U, {0x016c}}},
-  {0x016f, {1|U, {0x016e}}},
-  {0x0171, {1|U, {0x0170}}},
-  {0x0173, {1|U, {0x0172}}},
-  {0x0175, {1|U, {0x0174}}},
-  {0x0177, {1|U, {0x0176}}},
-  {0x017a, {1|U, {0x0179}}},
-  {0x017c, {1|U, {0x017b}}},
-  {0x017e, {1|U, {0x017d}}},
-  {0x0180, {1|U, {0x0243}}},
-  {0x0183, {1|U, {0x0182}}},
-  {0x0185, {1|U, {0x0184}}},
-  {0x0188, {1|U, {0x0187}}},
-  {0x018c, {1|U, {0x018b}}},
-  {0x0192, {1|U, {0x0191}}},
-  {0x0195, {1|U, {0x01f6}}},
-  {0x0199, {1|U, {0x0198}}},
-  {0x019a, {1|U, {0x023d}}},
-  {0x019e, {1|U, {0x0220}}},
-  {0x01a1, {1|U, {0x01a0}}},
-  {0x01a3, {1|U, {0x01a2}}},
-  {0x01a5, {1|U, {0x01a4}}},
-  {0x01a8, {1|U, {0x01a7}}},
-  {0x01ad, {1|U, {0x01ac}}},
-  {0x01b0, {1|U, {0x01af}}},
-  {0x01b4, {1|U, {0x01b3}}},
-  {0x01b6, {1|U, {0x01b5}}},
-  {0x01b9, {1|U, {0x01b8}}},
-  {0x01bd, {1|U, {0x01bc}}},
-  {0x01bf, {1|U, {0x01f7}}},
-  {0x01c6, {2|U|ST, {0x01c4, 0x01c5}}},
-  {0x01c9, {2|U|ST, {0x01c7, 0x01c8}}},
-  {0x01cc, {2|U|ST, {0x01ca, 0x01cb}}},
-  {0x01ce, {1|U, {0x01cd}}},
-  {0x01d0, {1|U, {0x01cf}}},
-  {0x01d2, {1|U, {0x01d1}}},
-  {0x01d4, {1|U, {0x01d3}}},
-  {0x01d6, {1|U, {0x01d5}}},
-  {0x01d8, {1|U, {0x01d7}}},
-  {0x01da, {1|U, {0x01d9}}},
-  {0x01dc, {1|U, {0x01db}}},
-  {0x01dd, {1|U, {0x018e}}},
-  {0x01df, {1|U, {0x01de}}},
-  {0x01e1, {1|U, {0x01e0}}},
-  {0x01e3, {1|U, {0x01e2}}},
-  {0x01e5, {1|U, {0x01e4}}},
-  {0x01e7, {1|U, {0x01e6}}},
-  {0x01e9, {1|U, {0x01e8}}},
-  {0x01eb, {1|U, {0x01ea}}},
-  {0x01ed, {1|U, {0x01ec}}},
-  {0x01ef, {1|U, {0x01ee}}},
-  {0x01f3, {2|U|ST, {0x01f1, 0x01f2}}},
-  {0x01f5, {1|U, {0x01f4}}},
-  {0x01f9, {1|U, {0x01f8}}},
-  {0x01fb, {1|U, {0x01fa}}},
-  {0x01fd, {1|U, {0x01fc}}},
-  {0x01ff, {1|U, {0x01fe}}},
-  {0x0201, {1|U, {0x0200}}},
-  {0x0203, {1|U, {0x0202}}},
-  {0x0205, {1|U, {0x0204}}},
-  {0x0207, {1|U, {0x0206}}},
-  {0x0209, {1|U, {0x0208}}},
-  {0x020b, {1|U, {0x020a}}},
-  {0x020d, {1|U, {0x020c}}},
-  {0x020f, {1|U, {0x020e}}},
-  {0x0211, {1|U, {0x0210}}},
-  {0x0213, {1|U, {0x0212}}},
-  {0x0215, {1|U, {0x0214}}},
-  {0x0217, {1|U, {0x0216}}},
-  {0x0219, {1|U, {0x0218}}},
-  {0x021b, {1|U, {0x021a}}},
-  {0x021d, {1|U, {0x021c}}},
-  {0x021f, {1|U, {0x021e}}},
-  {0x0223, {1|U, {0x0222}}},
-  {0x0225, {1|U, {0x0224}}},
-  {0x0227, {1|U, {0x0226}}},
-  {0x0229, {1|U, {0x0228}}},
-  {0x022b, {1|U, {0x022a}}},
-  {0x022d, {1|U, {0x022c}}},
-  {0x022f, {1|U, {0x022e}}},
-  {0x0231, {1|U, {0x0230}}},
-  {0x0233, {1|U, {0x0232}}},
-  {0x023c, {1|U, {0x023b}}},
-  {0x023f, {1|U, {0x2c7e}}},
-  {0x0240, {1|U, {0x2c7f}}},
-  {0x0242, {1|U, {0x0241}}},
-  {0x0247, {1|U, {0x0246}}},
-  {0x0249, {1|U, {0x0248}}},
-  {0x024b, {1|U, {0x024a}}},
-  {0x024d, {1|U, {0x024c}}},
-  {0x024f, {1|U, {0x024e}}},
-  {0x0250, {1|U, {0x2c6f}}},
-  {0x0251, {1|U, {0x2c6d}}},
-  {0x0252, {1|U, {0x2c70}}},
-  {0x0253, {1|U, {0x0181}}},
-  {0x0254, {1|U, {0x0186}}},
-  {0x0256, {1|U, {0x0189}}},
-  {0x0257, {1|U, {0x018a}}},
-  {0x0259, {1|U, {0x018f}}},
-  {0x025b, {1|U, {0x0190}}},
-  {0x025c, {1|U, {0xa7ab}}},
-  {0x0260, {1|U, {0x0193}}},
-  {0x0261, {1|U, {0xa7ac}}},
-  {0x0263, {1|U, {0x0194}}},
-  {0x0265, {1|U, {0xa78d}}},
-  {0x0266, {1|U, {0xa7aa}}},
-  {0x0268, {1|U, {0x0197}}},
-  {0x0269, {1|U, {0x0196}}},
-  {0x026a, {1|U, {0xa7ae}}},
-  {0x026b, {1|U, {0x2c62}}},
-  {0x026c, {1|U, {0xa7ad}}},
-  {0x026f, {1|U, {0x019c}}},
-  {0x0271, {1|U, {0x2c6e}}},
-  {0x0272, {1|U, {0x019d}}},
-  {0x0275, {1|U, {0x019f}}},
-  {0x027d, {1|U, {0x2c64}}},
-  {0x0280, {1|U, {0x01a6}}},
-  {0x0283, {1|U, {0x01a9}}},
-  {0x0287, {1|U, {0xa7b1}}},
-  {0x0288, {1|U, {0x01ae}}},
-  {0x0289, {1|U, {0x0244}}},
-  {0x028a, {1|U, {0x01b1}}},
-  {0x028b, {1|U, {0x01b2}}},
-  {0x028c, {1|U, {0x0245}}},
-  {0x0292, {1|U, {0x01b7}}},
-  {0x029d, {1|U, {0xa7b2}}},
-  {0x029e, {1|U, {0xa7b0}}},
-  {0x0371, {1|U, {0x0370}}},
-  {0x0373, {1|U, {0x0372}}},
-  {0x0377, {1|U, {0x0376}}},
-  {0x037b, {1|U, {0x03fd}}},
-  {0x037c, {1|U, {0x03fe}}},
-  {0x037d, {1|U, {0x03ff}}},
-  {0x03ac, {1|U, {0x0386}}},
-  {0x03ad, {1|U, {0x0388}}},
-  {0x03ae, {1|U, {0x0389}}},
-  {0x03af, {1|U, {0x038a}}},
-  {0x03b1, {1|U, {0x0391}}},
-  {0x03b2, {2|U, {0x0392, 0x03d0}}},
-  {0x03b3, {1|U, {0x0393}}},
-  {0x03b4, {1|U, {0x0394}}},
-  {0x03b5, {2|U, {0x0395, 0x03f5}}},
-  {0x03b6, {1|U, {0x0396}}},
-  {0x03b7, {1|U, {0x0397}}},
-  {0x03b8, {3|U, {0x0398, 0x03d1, 0x03f4}}},
-  {0x03b9, {3|U, {0x0399, 0x0345, 0x1fbe}}},
-  {0x03ba, {2|U, {0x039a, 0x03f0}}},
-  {0x03bb, {1|U, {0x039b}}},
-  {0x03bc, {2|U, {0x039c, 0x00b5}}},
-  {0x03bd, {1|U, {0x039d}}},
-  {0x03be, {1|U, {0x039e}}},
-  {0x03bf, {1|U, {0x039f}}},
-  {0x03c0, {2|U, {0x03a0, 0x03d6}}},
-  {0x03c1, {2|U, {0x03a1, 0x03f1}}},
-  {0x03c3, {2|U, {0x03a3, 0x03c2}}},
-  {0x03c4, {1|U, {0x03a4}}},
-  {0x03c5, {1|U, {0x03a5}}},
-  {0x03c6, {2|U, {0x03a6, 0x03d5}}},
-  {0x03c7, {1|U, {0x03a7}}},
-  {0x03c8, {1|U, {0x03a8}}},
-  {0x03c9, {2|U, {0x03a9, 0x2126}}},
-  {0x03ca, {1|U, {0x03aa}}},
-  {0x03cb, {1|U, {0x03ab}}},
-  {0x03cc, {1|U, {0x038c}}},
-  {0x03cd, {1|U, {0x038e}}},
-  {0x03ce, {1|U, {0x038f}}},
-  {0x03d7, {1|U, {0x03cf}}},
-  {0x03d9, {1|U, {0x03d8}}},
-  {0x03db, {1|U, {0x03da}}},
-  {0x03dd, {1|U, {0x03dc}}},
-  {0x03df, {1|U, {0x03de}}},
-  {0x03e1, {1|U, {0x03e0}}},
-  {0x03e3, {1|U, {0x03e2}}},
-  {0x03e5, {1|U, {0x03e4}}},
-  {0x03e7, {1|U, {0x03e6}}},
-  {0x03e9, {1|U, {0x03e8}}},
-  {0x03eb, {1|U, {0x03ea}}},
-  {0x03ed, {1|U, {0x03ec}}},
-  {0x03ef, {1|U, {0x03ee}}},
-  {0x03f2, {1|U, {0x03f9}}},
-  {0x03f3, {1|U, {0x037f}}},
-  {0x03f8, {1|U, {0x03f7}}},
-  {0x03fb, {1|U, {0x03fa}}},
-  {0x0430, {1|U, {0x0410}}},
-  {0x0431, {1|U, {0x0411}}},
-  {0x0432, {2|U, {0x0412, 0x1c80}}},
-  {0x0433, {1|U, {0x0413}}},
-  {0x0434, {2|U, {0x0414, 0x1c81}}},
-  {0x0435, {1|U, {0x0415}}},
-  {0x0436, {1|U, {0x0416}}},
-  {0x0437, {1|U, {0x0417}}},
-  {0x0438, {1|U, {0x0418}}},
-  {0x0439, {1|U, {0x0419}}},
-  {0x043a, {1|U, {0x041a}}},
-  {0x043b, {1|U, {0x041b}}},
-  {0x043c, {1|U, {0x041c}}},
-  {0x043d, {1|U, {0x041d}}},
-  {0x043e, {2|U, {0x041e, 0x1c82}}},
-  {0x043f, {1|U, {0x041f}}},
-  {0x0440, {1|U, {0x0420}}},
-  {0x0441, {2|U, {0x0421, 0x1c83}}},
-  {0x0442, {3|U, {0x0422, 0x1c84, 0x1c85}}},
-  {0x0443, {1|U, {0x0423}}},
-  {0x0444, {1|U, {0x0424}}},
-  {0x0445, {1|U, {0x0425}}},
-  {0x0446, {1|U, {0x0426}}},
-  {0x0447, {1|U, {0x0427}}},
-  {0x0448, {1|U, {0x0428}}},
-  {0x0449, {1|U, {0x0429}}},
-  {0x044a, {2|U, {0x042a, 0x1c86}}},
-  {0x044b, {1|U, {0x042b}}},
-  {0x044c, {1|U, {0x042c}}},
-  {0x044d, {1|U, {0x042d}}},
-  {0x044e, {1|U, {0x042e}}},
-  {0x044f, {1|U, {0x042f}}},
-  {0x0450, {1|U, {0x0400}}},
-  {0x0451, {1|U, {0x0401}}},
-  {0x0452, {1|U, {0x0402}}},
-  {0x0453, {1|U, {0x0403}}},
-  {0x0454, {1|U, {0x0404}}},
-  {0x0455, {1|U, {0x0405}}},
-  {0x0456, {1|U, {0x0406}}},
-  {0x0457, {1|U, {0x0407}}},
-  {0x0458, {1|U, {0x0408}}},
-  {0x0459, {1|U, {0x0409}}},
-  {0x045a, {1|U, {0x040a}}},
-  {0x045b, {1|U, {0x040b}}},
-  {0x045c, {1|U, {0x040c}}},
-  {0x045d, {1|U, {0x040d}}},
-  {0x045e, {1|U, {0x040e}}},
-  {0x045f, {1|U, {0x040f}}},
-  {0x0461, {1|U, {0x0460}}},
-  {0x0463, {2|U, {0x0462, 0x1c87}}},
-  {0x0465, {1|U, {0x0464}}},
-  {0x0467, {1|U, {0x0466}}},
-  {0x0469, {1|U, {0x0468}}},
-  {0x046b, {1|U, {0x046a}}},
-  {0x046d, {1|U, {0x046c}}},
-  {0x046f, {1|U, {0x046e}}},
-  {0x0471, {1|U, {0x0470}}},
-  {0x0473, {1|U, {0x0472}}},
-  {0x0475, {1|U, {0x0474}}},
-  {0x0477, {1|U, {0x0476}}},
-  {0x0479, {1|U, {0x0478}}},
-  {0x047b, {1|U, {0x047a}}},
-  {0x047d, {1|U, {0x047c}}},
-  {0x047f, {1|U, {0x047e}}},
-  {0x0481, {1|U, {0x0480}}},
-  {0x048b, {1|U, {0x048a}}},
-  {0x048d, {1|U, {0x048c}}},
-  {0x048f, {1|U, {0x048e}}},
-  {0x0491, {1|U, {0x0490}}},
-  {0x0493, {1|U, {0x0492}}},
-  {0x0495, {1|U, {0x0494}}},
-  {0x0497, {1|U, {0x0496}}},
-  {0x0499, {1|U, {0x0498}}},
-  {0x049b, {1|U, {0x049a}}},
-  {0x049d, {1|U, {0x049c}}},
-  {0x049f, {1|U, {0x049e}}},
-  {0x04a1, {1|U, {0x04a0}}},
-  {0x04a3, {1|U, {0x04a2}}},
-  {0x04a5, {1|U, {0x04a4}}},
-  {0x04a7, {1|U, {0x04a6}}},
-  {0x04a9, {1|U, {0x04a8}}},
-  {0x04ab, {1|U, {0x04aa}}},
-  {0x04ad, {1|U, {0x04ac}}},
-  {0x04af, {1|U, {0x04ae}}},
-  {0x04b1, {1|U, {0x04b0}}},
-  {0x04b3, {1|U, {0x04b2}}},
-  {0x04b5, {1|U, {0x04b4}}},
-  {0x04b7, {1|U, {0x04b6}}},
-  {0x04b9, {1|U, {0x04b8}}},
-  {0x04bb, {1|U, {0x04ba}}},
-  {0x04bd, {1|U, {0x04bc}}},
-  {0x04bf, {1|U, {0x04be}}},
-  {0x04c2, {1|U, {0x04c1}}},
-  {0x04c4, {1|U, {0x04c3}}},
-  {0x04c6, {1|U, {0x04c5}}},
-  {0x04c8, {1|U, {0x04c7}}},
-  {0x04ca, {1|U, {0x04c9}}},
-  {0x04cc, {1|U, {0x04cb}}},
-  {0x04ce, {1|U, {0x04cd}}},
-  {0x04cf, {1|U, {0x04c0}}},
-  {0x04d1, {1|U, {0x04d0}}},
-  {0x04d3, {1|U, {0x04d2}}},
-  {0x04d5, {1|U, {0x04d4}}},
-  {0x04d7, {1|U, {0x04d6}}},
-  {0x04d9, {1|U, {0x04d8}}},
-  {0x04db, {1|U, {0x04da}}},
-  {0x04dd, {1|U, {0x04dc}}},
-  {0x04df, {1|U, {0x04de}}},
-  {0x04e1, {1|U, {0x04e0}}},
-  {0x04e3, {1|U, {0x04e2}}},
-  {0x04e5, {1|U, {0x04e4}}},
-  {0x04e7, {1|U, {0x04e6}}},
-  {0x04e9, {1|U, {0x04e8}}},
-  {0x04eb, {1|U, {0x04ea}}},
-  {0x04ed, {1|U, {0x04ec}}},
-  {0x04ef, {1|U, {0x04ee}}},
-  {0x04f1, {1|U, {0x04f0}}},
-  {0x04f3, {1|U, {0x04f2}}},
-  {0x04f5, {1|U, {0x04f4}}},
-  {0x04f7, {1|U, {0x04f6}}},
-  {0x04f9, {1|U, {0x04f8}}},
-  {0x04fb, {1|U, {0x04fa}}},
-  {0x04fd, {1|U, {0x04fc}}},
-  {0x04ff, {1|U, {0x04fe}}},
-  {0x0501, {1|U, {0x0500}}},
-  {0x0503, {1|U, {0x0502}}},
-  {0x0505, {1|U, {0x0504}}},
-  {0x0507, {1|U, {0x0506}}},
-  {0x0509, {1|U, {0x0508}}},
-  {0x050b, {1|U, {0x050a}}},
-  {0x050d, {1|U, {0x050c}}},
-  {0x050f, {1|U, {0x050e}}},
-  {0x0511, {1|U, {0x0510}}},
-  {0x0513, {1|U, {0x0512}}},
-  {0x0515, {1|U, {0x0514}}},
-  {0x0517, {1|U, {0x0516}}},
-  {0x0519, {1|U, {0x0518}}},
-  {0x051b, {1|U, {0x051a}}},
-  {0x051d, {1|U, {0x051c}}},
-  {0x051f, {1|U, {0x051e}}},
-  {0x0521, {1|U, {0x0520}}},
-  {0x0523, {1|U, {0x0522}}},
-  {0x0525, {1|U, {0x0524}}},
-  {0x0527, {1|U, {0x0526}}},
-  {0x0529, {1|U, {0x0528}}},
-  {0x052b, {1|U, {0x052a}}},
-  {0x052d, {1|U, {0x052c}}},
-  {0x052f, {1|U, {0x052e}}},
-  {0x0561, {1|U, {0x0531}}},
-  {0x0562, {1|U, {0x0532}}},
-  {0x0563, {1|U, {0x0533}}},
-  {0x0564, {1|U, {0x0534}}},
-  {0x0565, {1|U, {0x0535}}},
-  {0x0566, {1|U, {0x0536}}},
-  {0x0567, {1|U, {0x0537}}},
-  {0x0568, {1|U, {0x0538}}},
-  {0x0569, {1|U, {0x0539}}},
-  {0x056a, {1|U, {0x053a}}},
-  {0x056b, {1|U, {0x053b}}},
-  {0x056c, {1|U, {0x053c}}},
-  {0x056d, {1|U, {0x053d}}},
-  {0x056e, {1|U, {0x053e}}},
-  {0x056f, {1|U, {0x053f}}},
-  {0x0570, {1|U, {0x0540}}},
-  {0x0571, {1|U, {0x0541}}},
-  {0x0572, {1|U, {0x0542}}},
-  {0x0573, {1|U, {0x0543}}},
-  {0x0574, {1|U, {0x0544}}},
-  {0x0575, {1|U, {0x0545}}},
-  {0x0576, {1|U, {0x0546}}},
-  {0x0577, {1|U, {0x0547}}},
-  {0x0578, {1|U, {0x0548}}},
-  {0x0579, {1|U, {0x0549}}},
-  {0x057a, {1|U, {0x054a}}},
-  {0x057b, {1|U, {0x054b}}},
-  {0x057c, {1|U, {0x054c}}},
-  {0x057d, {1|U, {0x054d}}},
-  {0x057e, {1|U, {0x054e}}},
-  {0x057f, {1|U, {0x054f}}},
-  {0x0580, {1|U, {0x0550}}},
-  {0x0581, {1|U, {0x0551}}},
-  {0x0582, {1|U, {0x0552}}},
-  {0x0583, {1|U, {0x0553}}},
-  {0x0584, {1|U, {0x0554}}},
-  {0x0585, {1|U, {0x0555}}},
-  {0x0586, {1|U, {0x0556}}},
-  {0x13a0, {1|D, {0xab70}}},
-  {0x13a1, {1|D, {0xab71}}},
-  {0x13a2, {1|D, {0xab72}}},
-  {0x13a3, {1|D, {0xab73}}},
-  {0x13a4, {1|D, {0xab74}}},
-  {0x13a5, {1|D, {0xab75}}},
-  {0x13a6, {1|D, {0xab76}}},
-  {0x13a7, {1|D, {0xab77}}},
-  {0x13a8, {1|D, {0xab78}}},
-  {0x13a9, {1|D, {0xab79}}},
-  {0x13aa, {1|D, {0xab7a}}},
-  {0x13ab, {1|D, {0xab7b}}},
-  {0x13ac, {1|D, {0xab7c}}},
-  {0x13ad, {1|D, {0xab7d}}},
-  {0x13ae, {1|D, {0xab7e}}},
-  {0x13af, {1|D, {0xab7f}}},
-  {0x13b0, {1|D, {0xab80}}},
-  {0x13b1, {1|D, {0xab81}}},
-  {0x13b2, {1|D, {0xab82}}},
-  {0x13b3, {1|D, {0xab83}}},
-  {0x13b4, {1|D, {0xab84}}},
-  {0x13b5, {1|D, {0xab85}}},
-  {0x13b6, {1|D, {0xab86}}},
-  {0x13b7, {1|D, {0xab87}}},
-  {0x13b8, {1|D, {0xab88}}},
-  {0x13b9, {1|D, {0xab89}}},
-  {0x13ba, {1|D, {0xab8a}}},
-  {0x13bb, {1|D, {0xab8b}}},
-  {0x13bc, {1|D, {0xab8c}}},
-  {0x13bd, {1|D, {0xab8d}}},
-  {0x13be, {1|D, {0xab8e}}},
-  {0x13bf, {1|D, {0xab8f}}},
-  {0x13c0, {1|D, {0xab90}}},
-  {0x13c1, {1|D, {0xab91}}},
-  {0x13c2, {1|D, {0xab92}}},
-  {0x13c3, {1|D, {0xab93}}},
-  {0x13c4, {1|D, {0xab94}}},
-  {0x13c5, {1|D, {0xab95}}},
-  {0x13c6, {1|D, {0xab96}}},
-  {0x13c7, {1|D, {0xab97}}},
-  {0x13c8, {1|D, {0xab98}}},
-  {0x13c9, {1|D, {0xab99}}},
-  {0x13ca, {1|D, {0xab9a}}},
-  {0x13cb, {1|D, {0xab9b}}},
-  {0x13cc, {1|D, {0xab9c}}},
-  {0x13cd, {1|D, {0xab9d}}},
-  {0x13ce, {1|D, {0xab9e}}},
-  {0x13cf, {1|D, {0xab9f}}},
-  {0x13d0, {1|D, {0xaba0}}},
-  {0x13d1, {1|D, {0xaba1}}},
-  {0x13d2, {1|D, {0xaba2}}},
-  {0x13d3, {1|D, {0xaba3}}},
-  {0x13d4, {1|D, {0xaba4}}},
-  {0x13d5, {1|D, {0xaba5}}},
-  {0x13d6, {1|D, {0xaba6}}},
-  {0x13d7, {1|D, {0xaba7}}},
-  {0x13d8, {1|D, {0xaba8}}},
-  {0x13d9, {1|D, {0xaba9}}},
-  {0x13da, {1|D, {0xabaa}}},
-  {0x13db, {1|D, {0xabab}}},
-  {0x13dc, {1|D, {0xabac}}},
-  {0x13dd, {1|D, {0xabad}}},
-  {0x13de, {1|D, {0xabae}}},
-  {0x13df, {1|D, {0xabaf}}},
-  {0x13e0, {1|D, {0xabb0}}},
-  {0x13e1, {1|D, {0xabb1}}},
-  {0x13e2, {1|D, {0xabb2}}},
-  {0x13e3, {1|D, {0xabb3}}},
-  {0x13e4, {1|D, {0xabb4}}},
-  {0x13e5, {1|D, {0xabb5}}},
-  {0x13e6, {1|D, {0xabb6}}},
-  {0x13e7, {1|D, {0xabb7}}},
-  {0x13e8, {1|D, {0xabb8}}},
-  {0x13e9, {1|D, {0xabb9}}},
-  {0x13ea, {1|D, {0xabba}}},
-  {0x13eb, {1|D, {0xabbb}}},
-  {0x13ec, {1|D, {0xabbc}}},
-  {0x13ed, {1|D, {0xabbd}}},
-  {0x13ee, {1|D, {0xabbe}}},
-  {0x13ef, {1|D, {0xabbf}}},
-  {0x13f0, {1|D, {0x13f8}}},
-  {0x13f1, {1|D, {0x13f9}}},
-  {0x13f2, {1|D, {0x13fa}}},
-  {0x13f3, {1|D, {0x13fb}}},
-  {0x13f4, {1|D, {0x13fc}}},
-  {0x13f5, {1|D, {0x13fd}}},
-  {0x1d79, {1|U, {0xa77d}}},
-  {0x1d7d, {1|U, {0x2c63}}},
-  {0x1e01, {1|U, {0x1e00}}},
-  {0x1e03, {1|U, {0x1e02}}},
-  {0x1e05, {1|U, {0x1e04}}},
-  {0x1e07, {1|U, {0x1e06}}},
-  {0x1e09, {1|U, {0x1e08}}},
-  {0x1e0b, {1|U, {0x1e0a}}},
-  {0x1e0d, {1|U, {0x1e0c}}},
-  {0x1e0f, {1|U, {0x1e0e}}},
-  {0x1e11, {1|U, {0x1e10}}},
-  {0x1e13, {1|U, {0x1e12}}},
-  {0x1e15, {1|U, {0x1e14}}},
-  {0x1e17, {1|U, {0x1e16}}},
-  {0x1e19, {1|U, {0x1e18}}},
-  {0x1e1b, {1|U, {0x1e1a}}},
-  {0x1e1d, {1|U, {0x1e1c}}},
-  {0x1e1f, {1|U, {0x1e1e}}},
-  {0x1e21, {1|U, {0x1e20}}},
-  {0x1e23, {1|U, {0x1e22}}},
-  {0x1e25, {1|U, {0x1e24}}},
-  {0x1e27, {1|U, {0x1e26}}},
-  {0x1e29, {1|U, {0x1e28}}},
-  {0x1e2b, {1|U, {0x1e2a}}},
-  {0x1e2d, {1|U, {0x1e2c}}},
-  {0x1e2f, {1|U, {0x1e2e}}},
-  {0x1e31, {1|U, {0x1e30}}},
-  {0x1e33, {1|U, {0x1e32}}},
-  {0x1e35, {1|U, {0x1e34}}},
-  {0x1e37, {1|U, {0x1e36}}},
-  {0x1e39, {1|U, {0x1e38}}},
-  {0x1e3b, {1|U, {0x1e3a}}},
-  {0x1e3d, {1|U, {0x1e3c}}},
-  {0x1e3f, {1|U, {0x1e3e}}},
-  {0x1e41, {1|U, {0x1e40}}},
-  {0x1e43, {1|U, {0x1e42}}},
-  {0x1e45, {1|U, {0x1e44}}},
-  {0x1e47, {1|U, {0x1e46}}},
-  {0x1e49, {1|U, {0x1e48}}},
-  {0x1e4b, {1|U, {0x1e4a}}},
-  {0x1e4d, {1|U, {0x1e4c}}},
-  {0x1e4f, {1|U, {0x1e4e}}},
-  {0x1e51, {1|U, {0x1e50}}},
-  {0x1e53, {1|U, {0x1e52}}},
-  {0x1e55, {1|U, {0x1e54}}},
-  {0x1e57, {1|U, {0x1e56}}},
-  {0x1e59, {1|U, {0x1e58}}},
-  {0x1e5b, {1|U, {0x1e5a}}},
-  {0x1e5d, {1|U, {0x1e5c}}},
-  {0x1e5f, {1|U, {0x1e5e}}},
-  {0x1e61, {2|U, {0x1e60, 0x1e9b}}},
-  {0x1e63, {1|U, {0x1e62}}},
-  {0x1e65, {1|U, {0x1e64}}},
-  {0x1e67, {1|U, {0x1e66}}},
-  {0x1e69, {1|U, {0x1e68}}},
-  {0x1e6b, {1|U, {0x1e6a}}},
-  {0x1e6d, {1|U, {0x1e6c}}},
-  {0x1e6f, {1|U, {0x1e6e}}},
-  {0x1e71, {1|U, {0x1e70}}},
-  {0x1e73, {1|U, {0x1e72}}},
-  {0x1e75, {1|U, {0x1e74}}},
-  {0x1e77, {1|U, {0x1e76}}},
-  {0x1e79, {1|U, {0x1e78}}},
-  {0x1e7b, {1|U, {0x1e7a}}},
-  {0x1e7d, {1|U, {0x1e7c}}},
-  {0x1e7f, {1|U, {0x1e7e}}},
-  {0x1e81, {1|U, {0x1e80}}},
-  {0x1e83, {1|U, {0x1e82}}},
-  {0x1e85, {1|U, {0x1e84}}},
-  {0x1e87, {1|U, {0x1e86}}},
-  {0x1e89, {1|U, {0x1e88}}},
-  {0x1e8b, {1|U, {0x1e8a}}},
-  {0x1e8d, {1|U, {0x1e8c}}},
-  {0x1e8f, {1|U, {0x1e8e}}},
-  {0x1e91, {1|U, {0x1e90}}},
-  {0x1e93, {1|U, {0x1e92}}},
-  {0x1e95, {1|U, {0x1e94}}},
-  {0x1ea1, {1|U, {0x1ea0}}},
-  {0x1ea3, {1|U, {0x1ea2}}},
-  {0x1ea5, {1|U, {0x1ea4}}},
-  {0x1ea7, {1|U, {0x1ea6}}},
-  {0x1ea9, {1|U, {0x1ea8}}},
-  {0x1eab, {1|U, {0x1eaa}}},
-  {0x1ead, {1|U, {0x1eac}}},
-  {0x1eaf, {1|U, {0x1eae}}},
-  {0x1eb1, {1|U, {0x1eb0}}},
-  {0x1eb3, {1|U, {0x1eb2}}},
-  {0x1eb5, {1|U, {0x1eb4}}},
-  {0x1eb7, {1|U, {0x1eb6}}},
-  {0x1eb9, {1|U, {0x1eb8}}},
-  {0x1ebb, {1|U, {0x1eba}}},
-  {0x1ebd, {1|U, {0x1ebc}}},
-  {0x1ebf, {1|U, {0x1ebe}}},
-  {0x1ec1, {1|U, {0x1ec0}}},
-  {0x1ec3, {1|U, {0x1ec2}}},
-  {0x1ec5, {1|U, {0x1ec4}}},
-  {0x1ec7, {1|U, {0x1ec6}}},
-  {0x1ec9, {1|U, {0x1ec8}}},
-  {0x1ecb, {1|U, {0x1eca}}},
-  {0x1ecd, {1|U, {0x1ecc}}},
-  {0x1ecf, {1|U, {0x1ece}}},
-  {0x1ed1, {1|U, {0x1ed0}}},
-  {0x1ed3, {1|U, {0x1ed2}}},
-  {0x1ed5, {1|U, {0x1ed4}}},
-  {0x1ed7, {1|U, {0x1ed6}}},
-  {0x1ed9, {1|U, {0x1ed8}}},
-  {0x1edb, {1|U, {0x1eda}}},
-  {0x1edd, {1|U, {0x1edc}}},
-  {0x1edf, {1|U, {0x1ede}}},
-  {0x1ee1, {1|U, {0x1ee0}}},
-  {0x1ee3, {1|U, {0x1ee2}}},
-  {0x1ee5, {1|U, {0x1ee4}}},
-  {0x1ee7, {1|U, {0x1ee6}}},
-  {0x1ee9, {1|U, {0x1ee8}}},
-  {0x1eeb, {1|U, {0x1eea}}},
-  {0x1eed, {1|U, {0x1eec}}},
-  {0x1eef, {1|U, {0x1eee}}},
-  {0x1ef1, {1|U, {0x1ef0}}},
-  {0x1ef3, {1|U, {0x1ef2}}},
-  {0x1ef5, {1|U, {0x1ef4}}},
-  {0x1ef7, {1|U, {0x1ef6}}},
-  {0x1ef9, {1|U, {0x1ef8}}},
-  {0x1efb, {1|U, {0x1efa}}},
-  {0x1efd, {1|U, {0x1efc}}},
-  {0x1eff, {1|U, {0x1efe}}},
-  {0x1f00, {1|U, {0x1f08}}},
-  {0x1f01, {1|U, {0x1f09}}},
-  {0x1f02, {1|U, {0x1f0a}}},
-  {0x1f03, {1|U, {0x1f0b}}},
-  {0x1f04, {1|U, {0x1f0c}}},
-  {0x1f05, {1|U, {0x1f0d}}},
-  {0x1f06, {1|U, {0x1f0e}}},
-  {0x1f07, {1|U, {0x1f0f}}},
-  {0x1f10, {1|U, {0x1f18}}},
-  {0x1f11, {1|U, {0x1f19}}},
-  {0x1f12, {1|U, {0x1f1a}}},
-  {0x1f13, {1|U, {0x1f1b}}},
-  {0x1f14, {1|U, {0x1f1c}}},
-  {0x1f15, {1|U, {0x1f1d}}},
-  {0x1f20, {1|U, {0x1f28}}},
-  {0x1f21, {1|U, {0x1f29}}},
-  {0x1f22, {1|U, {0x1f2a}}},
-  {0x1f23, {1|U, {0x1f2b}}},
-  {0x1f24, {1|U, {0x1f2c}}},
-  {0x1f25, {1|U, {0x1f2d}}},
-  {0x1f26, {1|U, {0x1f2e}}},
-  {0x1f27, {1|U, {0x1f2f}}},
-  {0x1f30, {1|U, {0x1f38}}},
-  {0x1f31, {1|U, {0x1f39}}},
-  {0x1f32, {1|U, {0x1f3a}}},
-  {0x1f33, {1|U, {0x1f3b}}},
-  {0x1f34, {1|U, {0x1f3c}}},
-  {0x1f35, {1|U, {0x1f3d}}},
-  {0x1f36, {1|U, {0x1f3e}}},
-  {0x1f37, {1|U, {0x1f3f}}},
-  {0x1f40, {1|U, {0x1f48}}},
-  {0x1f41, {1|U, {0x1f49}}},
-  {0x1f42, {1|U, {0x1f4a}}},
-  {0x1f43, {1|U, {0x1f4b}}},
-  {0x1f44, {1|U, {0x1f4c}}},
-  {0x1f45, {1|U, {0x1f4d}}},
-  {0x1f51, {1|U, {0x1f59}}},
-  {0x1f53, {1|U, {0x1f5b}}},
-  {0x1f55, {1|U, {0x1f5d}}},
-  {0x1f57, {1|U, {0x1f5f}}},
-  {0x1f60, {1|U, {0x1f68}}},
-  {0x1f61, {1|U, {0x1f69}}},
-  {0x1f62, {1|U, {0x1f6a}}},
-  {0x1f63, {1|U, {0x1f6b}}},
-  {0x1f64, {1|U, {0x1f6c}}},
-  {0x1f65, {1|U, {0x1f6d}}},
-  {0x1f66, {1|U, {0x1f6e}}},
-  {0x1f67, {1|U, {0x1f6f}}},
-  {0x1f70, {1|U, {0x1fba}}},
-  {0x1f71, {1|U, {0x1fbb}}},
-  {0x1f72, {1|U, {0x1fc8}}},
-  {0x1f73, {1|U, {0x1fc9}}},
-  {0x1f74, {1|U, {0x1fca}}},
-  {0x1f75, {1|U, {0x1fcb}}},
-  {0x1f76, {1|U, {0x1fda}}},
-  {0x1f77, {1|U, {0x1fdb}}},
-  {0x1f78, {1|U, {0x1ff8}}},
-  {0x1f79, {1|U, {0x1ff9}}},
-  {0x1f7a, {1|U, {0x1fea}}},
-  {0x1f7b, {1|U, {0x1feb}}},
-  {0x1f7c, {1|U, {0x1ffa}}},
-  {0x1f7d, {1|U, {0x1ffb}}},
-  {0x1fb0, {1|U, {0x1fb8}}},
-  {0x1fb1, {1|U, {0x1fb9}}},
-  {0x1fd0, {1|U, {0x1fd8}}},
-  {0x1fd1, {1|U, {0x1fd9}}},
-  {0x1fe0, {1|U, {0x1fe8}}},
-  {0x1fe1, {1|U, {0x1fe9}}},
-  {0x1fe5, {1|U, {0x1fec}}},
-  {0x214e, {1|U, {0x2132}}},
-  {0x2170, {1|U, {0x2160}}},
-  {0x2171, {1|U, {0x2161}}},
-  {0x2172, {1|U, {0x2162}}},
-  {0x2173, {1|U, {0x2163}}},
-  {0x2174, {1|U, {0x2164}}},
-  {0x2175, {1|U, {0x2165}}},
-  {0x2176, {1|U, {0x2166}}},
-  {0x2177, {1|U, {0x2167}}},
-  {0x2178, {1|U, {0x2168}}},
-  {0x2179, {1|U, {0x2169}}},
-  {0x217a, {1|U, {0x216a}}},
-  {0x217b, {1|U, {0x216b}}},
-  {0x217c, {1|U, {0x216c}}},
-  {0x217d, {1|U, {0x216d}}},
-  {0x217e, {1|U, {0x216e}}},
-  {0x217f, {1|U, {0x216f}}},
-  {0x2184, {1|U, {0x2183}}},
-  {0x24d0, {1|U, {0x24b6}}},
-  {0x24d1, {1|U, {0x24b7}}},
-  {0x24d2, {1|U, {0x24b8}}},
-  {0x24d3, {1|U, {0x24b9}}},
-  {0x24d4, {1|U, {0x24ba}}},
-  {0x24d5, {1|U, {0x24bb}}},
-  {0x24d6, {1|U, {0x24bc}}},
-  {0x24d7, {1|U, {0x24bd}}},
-  {0x24d8, {1|U, {0x24be}}},
-  {0x24d9, {1|U, {0x24bf}}},
-  {0x24da, {1|U, {0x24c0}}},
-  {0x24db, {1|U, {0x24c1}}},
-  {0x24dc, {1|U, {0x24c2}}},
-  {0x24dd, {1|U, {0x24c3}}},
-  {0x24de, {1|U, {0x24c4}}},
-  {0x24df, {1|U, {0x24c5}}},
-  {0x24e0, {1|U, {0x24c6}}},
-  {0x24e1, {1|U, {0x24c7}}},
-  {0x24e2, {1|U, {0x24c8}}},
-  {0x24e3, {1|U, {0x24c9}}},
-  {0x24e4, {1|U, {0x24ca}}},
-  {0x24e5, {1|U, {0x24cb}}},
-  {0x24e6, {1|U, {0x24cc}}},
-  {0x24e7, {1|U, {0x24cd}}},
-  {0x24e8, {1|U, {0x24ce}}},
-  {0x24e9, {1|U, {0x24cf}}},
-  {0x2c30, {1|U, {0x2c00}}},
-  {0x2c31, {1|U, {0x2c01}}},
-  {0x2c32, {1|U, {0x2c02}}},
-  {0x2c33, {1|U, {0x2c03}}},
-  {0x2c34, {1|U, {0x2c04}}},
-  {0x2c35, {1|U, {0x2c05}}},
-  {0x2c36, {1|U, {0x2c06}}},
-  {0x2c37, {1|U, {0x2c07}}},
-  {0x2c38, {1|U, {0x2c08}}},
-  {0x2c39, {1|U, {0x2c09}}},
-  {0x2c3a, {1|U, {0x2c0a}}},
-  {0x2c3b, {1|U, {0x2c0b}}},
-  {0x2c3c, {1|U, {0x2c0c}}},
-  {0x2c3d, {1|U, {0x2c0d}}},
-  {0x2c3e, {1|U, {0x2c0e}}},
-  {0x2c3f, {1|U, {0x2c0f}}},
-  {0x2c40, {1|U, {0x2c10}}},
-  {0x2c41, {1|U, {0x2c11}}},
-  {0x2c42, {1|U, {0x2c12}}},
-  {0x2c43, {1|U, {0x2c13}}},
-  {0x2c44, {1|U, {0x2c14}}},
-  {0x2c45, {1|U, {0x2c15}}},
-  {0x2c46, {1|U, {0x2c16}}},
-  {0x2c47, {1|U, {0x2c17}}},
-  {0x2c48, {1|U, {0x2c18}}},
-  {0x2c49, {1|U, {0x2c19}}},
-  {0x2c4a, {1|U, {0x2c1a}}},
-  {0x2c4b, {1|U, {0x2c1b}}},
-  {0x2c4c, {1|U, {0x2c1c}}},
-  {0x2c4d, {1|U, {0x2c1d}}},
-  {0x2c4e, {1|U, {0x2c1e}}},
-  {0x2c4f, {1|U, {0x2c1f}}},
-  {0x2c50, {1|U, {0x2c20}}},
-  {0x2c51, {1|U, {0x2c21}}},
-  {0x2c52, {1|U, {0x2c22}}},
-  {0x2c53, {1|U, {0x2c23}}},
-  {0x2c54, {1|U, {0x2c24}}},
-  {0x2c55, {1|U, {0x2c25}}},
-  {0x2c56, {1|U, {0x2c26}}},
-  {0x2c57, {1|U, {0x2c27}}},
-  {0x2c58, {1|U, {0x2c28}}},
-  {0x2c59, {1|U, {0x2c29}}},
-  {0x2c5a, {1|U, {0x2c2a}}},
-  {0x2c5b, {1|U, {0x2c2b}}},
-  {0x2c5c, {1|U, {0x2c2c}}},
-  {0x2c5d, {1|U, {0x2c2d}}},
-  {0x2c5e, {1|U, {0x2c2e}}},
-  {0x2c61, {1|U, {0x2c60}}},
-  {0x2c65, {1|U, {0x023a}}},
-  {0x2c66, {1|U, {0x023e}}},
-  {0x2c68, {1|U, {0x2c67}}},
-  {0x2c6a, {1|U, {0x2c69}}},
-  {0x2c6c, {1|U, {0x2c6b}}},
-  {0x2c73, {1|U, {0x2c72}}},
-  {0x2c76, {1|U, {0x2c75}}},
-  {0x2c81, {1|U, {0x2c80}}},
-  {0x2c83, {1|U, {0x2c82}}},
-  {0x2c85, {1|U, {0x2c84}}},
-  {0x2c87, {1|U, {0x2c86}}},
-  {0x2c89, {1|U, {0x2c88}}},
-  {0x2c8b, {1|U, {0x2c8a}}},
-  {0x2c8d, {1|U, {0x2c8c}}},
-  {0x2c8f, {1|U, {0x2c8e}}},
-  {0x2c91, {1|U, {0x2c90}}},
-  {0x2c93, {1|U, {0x2c92}}},
-  {0x2c95, {1|U, {0x2c94}}},
-  {0x2c97, {1|U, {0x2c96}}},
-  {0x2c99, {1|U, {0x2c98}}},
-  {0x2c9b, {1|U, {0x2c9a}}},
-  {0x2c9d, {1|U, {0x2c9c}}},
-  {0x2c9f, {1|U, {0x2c9e}}},
-  {0x2ca1, {1|U, {0x2ca0}}},
-  {0x2ca3, {1|U, {0x2ca2}}},
-  {0x2ca5, {1|U, {0x2ca4}}},
-  {0x2ca7, {1|U, {0x2ca6}}},
-  {0x2ca9, {1|U, {0x2ca8}}},
-  {0x2cab, {1|U, {0x2caa}}},
-  {0x2cad, {1|U, {0x2cac}}},
-  {0x2caf, {1|U, {0x2cae}}},
-  {0x2cb1, {1|U, {0x2cb0}}},
-  {0x2cb3, {1|U, {0x2cb2}}},
-  {0x2cb5, {1|U, {0x2cb4}}},
-  {0x2cb7, {1|U, {0x2cb6}}},
-  {0x2cb9, {1|U, {0x2cb8}}},
-  {0x2cbb, {1|U, {0x2cba}}},
-  {0x2cbd, {1|U, {0x2cbc}}},
-  {0x2cbf, {1|U, {0x2cbe}}},
-  {0x2cc1, {1|U, {0x2cc0}}},
-  {0x2cc3, {1|U, {0x2cc2}}},
-  {0x2cc5, {1|U, {0x2cc4}}},
-  {0x2cc7, {1|U, {0x2cc6}}},
-  {0x2cc9, {1|U, {0x2cc8}}},
-  {0x2ccb, {1|U, {0x2cca}}},
-  {0x2ccd, {1|U, {0x2ccc}}},
-  {0x2ccf, {1|U, {0x2cce}}},
-  {0x2cd1, {1|U, {0x2cd0}}},
-  {0x2cd3, {1|U, {0x2cd2}}},
-  {0x2cd5, {1|U, {0x2cd4}}},
-  {0x2cd7, {1|U, {0x2cd6}}},
-  {0x2cd9, {1|U, {0x2cd8}}},
-  {0x2cdb, {1|U, {0x2cda}}},
-  {0x2cdd, {1|U, {0x2cdc}}},
-  {0x2cdf, {1|U, {0x2cde}}},
-  {0x2ce1, {1|U, {0x2ce0}}},
-  {0x2ce3, {1|U, {0x2ce2}}},
-  {0x2cec, {1|U, {0x2ceb}}},
-  {0x2cee, {1|U, {0x2ced}}},
-  {0x2cf3, {1|U, {0x2cf2}}},
-  {0x2d00, {1|U, {0x10a0}}},
-  {0x2d01, {1|U, {0x10a1}}},
-  {0x2d02, {1|U, {0x10a2}}},
-  {0x2d03, {1|U, {0x10a3}}},
-  {0x2d04, {1|U, {0x10a4}}},
-  {0x2d05, {1|U, {0x10a5}}},
-  {0x2d06, {1|U, {0x10a6}}},
-  {0x2d07, {1|U, {0x10a7}}},
-  {0x2d08, {1|U, {0x10a8}}},
-  {0x2d09, {1|U, {0x10a9}}},
-  {0x2d0a, {1|U, {0x10aa}}},
-  {0x2d0b, {1|U, {0x10ab}}},
-  {0x2d0c, {1|U, {0x10ac}}},
-  {0x2d0d, {1|U, {0x10ad}}},
-  {0x2d0e, {1|U, {0x10ae}}},
-  {0x2d0f, {1|U, {0x10af}}},
-  {0x2d10, {1|U, {0x10b0}}},
-  {0x2d11, {1|U, {0x10b1}}},
-  {0x2d12, {1|U, {0x10b2}}},
-  {0x2d13, {1|U, {0x10b3}}},
-  {0x2d14, {1|U, {0x10b4}}},
-  {0x2d15, {1|U, {0x10b5}}},
-  {0x2d16, {1|U, {0x10b6}}},
-  {0x2d17, {1|U, {0x10b7}}},
-  {0x2d18, {1|U, {0x10b8}}},
-  {0x2d19, {1|U, {0x10b9}}},
-  {0x2d1a, {1|U, {0x10ba}}},
-  {0x2d1b, {1|U, {0x10bb}}},
-  {0x2d1c, {1|U, {0x10bc}}},
-  {0x2d1d, {1|U, {0x10bd}}},
-  {0x2d1e, {1|U, {0x10be}}},
-  {0x2d1f, {1|U, {0x10bf}}},
-  {0x2d20, {1|U, {0x10c0}}},
-  {0x2d21, {1|U, {0x10c1}}},
-  {0x2d22, {1|U, {0x10c2}}},
-  {0x2d23, {1|U, {0x10c3}}},
-  {0x2d24, {1|U, {0x10c4}}},
-  {0x2d25, {1|U, {0x10c5}}},
-  {0x2d27, {1|U, {0x10c7}}},
-  {0x2d2d, {1|U, {0x10cd}}},
-  {0xa641, {1|U, {0xa640}}},
-  {0xa643, {1|U, {0xa642}}},
-  {0xa645, {1|U, {0xa644}}},
-  {0xa647, {1|U, {0xa646}}},
-  {0xa649, {1|U, {0xa648}}},
-  {0xa64b, {2|U, {0xa64a, 0x1c88}}},
-  {0xa64d, {1|U, {0xa64c}}},
-  {0xa64f, {1|U, {0xa64e}}},
-  {0xa651, {1|U, {0xa650}}},
-  {0xa653, {1|U, {0xa652}}},
-  {0xa655, {1|U, {0xa654}}},
-  {0xa657, {1|U, {0xa656}}},
-  {0xa659, {1|U, {0xa658}}},
-  {0xa65b, {1|U, {0xa65a}}},
-  {0xa65d, {1|U, {0xa65c}}},
-  {0xa65f, {1|U, {0xa65e}}},
-  {0xa661, {1|U, {0xa660}}},
-  {0xa663, {1|U, {0xa662}}},
-  {0xa665, {1|U, {0xa664}}},
-  {0xa667, {1|U, {0xa666}}},
-  {0xa669, {1|U, {0xa668}}},
-  {0xa66b, {1|U, {0xa66a}}},
-  {0xa66d, {1|U, {0xa66c}}},
-  {0xa681, {1|U, {0xa680}}},
-  {0xa683, {1|U, {0xa682}}},
-  {0xa685, {1|U, {0xa684}}},
-  {0xa687, {1|U, {0xa686}}},
-  {0xa689, {1|U, {0xa688}}},
-  {0xa68b, {1|U, {0xa68a}}},
-  {0xa68d, {1|U, {0xa68c}}},
-  {0xa68f, {1|U, {0xa68e}}},
-  {0xa691, {1|U, {0xa690}}},
-  {0xa693, {1|U, {0xa692}}},
-  {0xa695, {1|U, {0xa694}}},
-  {0xa697, {1|U, {0xa696}}},
-  {0xa699, {1|U, {0xa698}}},
-  {0xa69b, {1|U, {0xa69a}}},
-  {0xa723, {1|U, {0xa722}}},
-  {0xa725, {1|U, {0xa724}}},
-  {0xa727, {1|U, {0xa726}}},
-  {0xa729, {1|U, {0xa728}}},
-  {0xa72b, {1|U, {0xa72a}}},
-  {0xa72d, {1|U, {0xa72c}}},
-  {0xa72f, {1|U, {0xa72e}}},
-  {0xa733, {1|U, {0xa732}}},
-  {0xa735, {1|U, {0xa734}}},
-  {0xa737, {1|U, {0xa736}}},
-  {0xa739, {1|U, {0xa738}}},
-  {0xa73b, {1|U, {0xa73a}}},
-  {0xa73d, {1|U, {0xa73c}}},
-  {0xa73f, {1|U, {0xa73e}}},
-  {0xa741, {1|U, {0xa740}}},
-  {0xa743, {1|U, {0xa742}}},
-  {0xa745, {1|U, {0xa744}}},
-  {0xa747, {1|U, {0xa746}}},
-  {0xa749, {1|U, {0xa748}}},
-  {0xa74b, {1|U, {0xa74a}}},
-  {0xa74d, {1|U, {0xa74c}}},
-  {0xa74f, {1|U, {0xa74e}}},
-  {0xa751, {1|U, {0xa750}}},
-  {0xa753, {1|U, {0xa752}}},
-  {0xa755, {1|U, {0xa754}}},
-  {0xa757, {1|U, {0xa756}}},
-  {0xa759, {1|U, {0xa758}}},
-  {0xa75b, {1|U, {0xa75a}}},
-  {0xa75d, {1|U, {0xa75c}}},
-  {0xa75f, {1|U, {0xa75e}}},
-  {0xa761, {1|U, {0xa760}}},
-  {0xa763, {1|U, {0xa762}}},
-  {0xa765, {1|U, {0xa764}}},
-  {0xa767, {1|U, {0xa766}}},
-  {0xa769, {1|U, {0xa768}}},
-  {0xa76b, {1|U, {0xa76a}}},
-  {0xa76d, {1|U, {0xa76c}}},
-  {0xa76f, {1|U, {0xa76e}}},
-  {0xa77a, {1|U, {0xa779}}},
-  {0xa77c, {1|U, {0xa77b}}},
-  {0xa77f, {1|U, {0xa77e}}},
-  {0xa781, {1|U, {0xa780}}},
-  {0xa783, {1|U, {0xa782}}},
-  {0xa785, {1|U, {0xa784}}},
-  {0xa787, {1|U, {0xa786}}},
-  {0xa78c, {1|U, {0xa78b}}},
-  {0xa791, {1|U, {0xa790}}},
-  {0xa793, {1|U, {0xa792}}},
-  {0xa797, {1|U, {0xa796}}},
-  {0xa799, {1|U, {0xa798}}},
-  {0xa79b, {1|U, {0xa79a}}},
-  {0xa79d, {1|U, {0xa79c}}},
-  {0xa79f, {1|U, {0xa79e}}},
-  {0xa7a1, {1|U, {0xa7a0}}},
-  {0xa7a3, {1|U, {0xa7a2}}},
-  {0xa7a5, {1|U, {0xa7a4}}},
-  {0xa7a7, {1|U, {0xa7a6}}},
-  {0xa7a9, {1|U, {0xa7a8}}},
-  {0xa7b5, {1|U, {0xa7b4}}},
-  {0xa7b7, {1|U, {0xa7b6}}},
-  {0xab53, {1|U, {0xa7b3}}},
-  {0xff41, {1|U, {0xff21}}},
-  {0xff42, {1|U, {0xff22}}},
-  {0xff43, {1|U, {0xff23}}},
-  {0xff44, {1|U, {0xff24}}},
-  {0xff45, {1|U, {0xff25}}},
-  {0xff46, {1|U, {0xff26}}},
-  {0xff47, {1|U, {0xff27}}},
-  {0xff48, {1|U, {0xff28}}},
-  {0xff49, {1|U, {0xff29}}},
-  {0xff4a, {1|U, {0xff2a}}},
-  {0xff4b, {1|U, {0xff2b}}},
-  {0xff4c, {1|U, {0xff2c}}},
-  {0xff4d, {1|U, {0xff2d}}},
-  {0xff4e, {1|U, {0xff2e}}},
-  {0xff4f, {1|U, {0xff2f}}},
-  {0xff50, {1|U, {0xff30}}},
-  {0xff51, {1|U, {0xff31}}},
-  {0xff52, {1|U, {0xff32}}},
-  {0xff53, {1|U, {0xff33}}},
-  {0xff54, {1|U, {0xff34}}},
-  {0xff55, {1|U, {0xff35}}},
-  {0xff56, {1|U, {0xff36}}},
-  {0xff57, {1|U, {0xff37}}},
-  {0xff58, {1|U, {0xff38}}},
-  {0xff59, {1|U, {0xff39}}},
-  {0xff5a, {1|U, {0xff3a}}},
-  {0x10428, {1|U, {0x10400}}},
-  {0x10429, {1|U, {0x10401}}},
-  {0x1042a, {1|U, {0x10402}}},
-  {0x1042b, {1|U, {0x10403}}},
-  {0x1042c, {1|U, {0x10404}}},
-  {0x1042d, {1|U, {0x10405}}},
-  {0x1042e, {1|U, {0x10406}}},
-  {0x1042f, {1|U, {0x10407}}},
-  {0x10430, {1|U, {0x10408}}},
-  {0x10431, {1|U, {0x10409}}},
-  {0x10432, {1|U, {0x1040a}}},
-  {0x10433, {1|U, {0x1040b}}},
-  {0x10434, {1|U, {0x1040c}}},
-  {0x10435, {1|U, {0x1040d}}},
-  {0x10436, {1|U, {0x1040e}}},
-  {0x10437, {1|U, {0x1040f}}},
-  {0x10438, {1|U, {0x10410}}},
-  {0x10439, {1|U, {0x10411}}},
-  {0x1043a, {1|U, {0x10412}}},
-  {0x1043b, {1|U, {0x10413}}},
-  {0x1043c, {1|U, {0x10414}}},
-  {0x1043d, {1|U, {0x10415}}},
-  {0x1043e, {1|U, {0x10416}}},
-  {0x1043f, {1|U, {0x10417}}},
-  {0x10440, {1|U, {0x10418}}},
-  {0x10441, {1|U, {0x10419}}},
-  {0x10442, {1|U, {0x1041a}}},
-  {0x10443, {1|U, {0x1041b}}},
-  {0x10444, {1|U, {0x1041c}}},
-  {0x10445, {1|U, {0x1041d}}},
-  {0x10446, {1|U, {0x1041e}}},
-  {0x10447, {1|U, {0x1041f}}},
-  {0x10448, {1|U, {0x10420}}},
-  {0x10449, {1|U, {0x10421}}},
-  {0x1044a, {1|U, {0x10422}}},
-  {0x1044b, {1|U, {0x10423}}},
-  {0x1044c, {1|U, {0x10424}}},
-  {0x1044d, {1|U, {0x10425}}},
-  {0x1044e, {1|U, {0x10426}}},
-  {0x1044f, {1|U, {0x10427}}},
-  {0x104d8, {1|U, {0x104b0}}},
-  {0x104d9, {1|U, {0x104b1}}},
-  {0x104da, {1|U, {0x104b2}}},
-  {0x104db, {1|U, {0x104b3}}},
-  {0x104dc, {1|U, {0x104b4}}},
-  {0x104dd, {1|U, {0x104b5}}},
-  {0x104de, {1|U, {0x104b6}}},
-  {0x104df, {1|U, {0x104b7}}},
-  {0x104e0, {1|U, {0x104b8}}},
-  {0x104e1, {1|U, {0x104b9}}},
-  {0x104e2, {1|U, {0x104ba}}},
-  {0x104e3, {1|U, {0x104bb}}},
-  {0x104e4, {1|U, {0x104bc}}},
-  {0x104e5, {1|U, {0x104bd}}},
-  {0x104e6, {1|U, {0x104be}}},
-  {0x104e7, {1|U, {0x104bf}}},
-  {0x104e8, {1|U, {0x104c0}}},
-  {0x104e9, {1|U, {0x104c1}}},
-  {0x104ea, {1|U, {0x104c2}}},
-  {0x104eb, {1|U, {0x104c3}}},
-  {0x104ec, {1|U, {0x104c4}}},
-  {0x104ed, {1|U, {0x104c5}}},
-  {0x104ee, {1|U, {0x104c6}}},
-  {0x104ef, {1|U, {0x104c7}}},
-  {0x104f0, {1|U, {0x104c8}}},
-  {0x104f1, {1|U, {0x104c9}}},
-  {0x104f2, {1|U, {0x104ca}}},
-  {0x104f3, {1|U, {0x104cb}}},
-  {0x104f4, {1|U, {0x104cc}}},
-  {0x104f5, {1|U, {0x104cd}}},
-  {0x104f6, {1|U, {0x104ce}}},
-  {0x104f7, {1|U, {0x104cf}}},
-  {0x104f8, {1|U, {0x104d0}}},
-  {0x104f9, {1|U, {0x104d1}}},
-  {0x104fa, {1|U, {0x104d2}}},
-  {0x104fb, {1|U, {0x104d3}}},
-  {0x10cc0, {1|U, {0x10c80}}},
-  {0x10cc1, {1|U, {0x10c81}}},
-  {0x10cc2, {1|U, {0x10c82}}},
-  {0x10cc3, {1|U, {0x10c83}}},
-  {0x10cc4, {1|U, {0x10c84}}},
-  {0x10cc5, {1|U, {0x10c85}}},
-  {0x10cc6, {1|U, {0x10c86}}},
-  {0x10cc7, {1|U, {0x10c87}}},
-  {0x10cc8, {1|U, {0x10c88}}},
-  {0x10cc9, {1|U, {0x10c89}}},
-  {0x10cca, {1|U, {0x10c8a}}},
-  {0x10ccb, {1|U, {0x10c8b}}},
-  {0x10ccc, {1|U, {0x10c8c}}},
-  {0x10ccd, {1|U, {0x10c8d}}},
-  {0x10cce, {1|U, {0x10c8e}}},
-  {0x10ccf, {1|U, {0x10c8f}}},
-  {0x10cd0, {1|U, {0x10c90}}},
-  {0x10cd1, {1|U, {0x10c91}}},
-  {0x10cd2, {1|U, {0x10c92}}},
-  {0x10cd3, {1|U, {0x10c93}}},
-  {0x10cd4, {1|U, {0x10c94}}},
-  {0x10cd5, {1|U, {0x10c95}}},
-  {0x10cd6, {1|U, {0x10c96}}},
-  {0x10cd7, {1|U, {0x10c97}}},
-  {0x10cd8, {1|U, {0x10c98}}},
-  {0x10cd9, {1|U, {0x10c99}}},
-  {0x10cda, {1|U, {0x10c9a}}},
-  {0x10cdb, {1|U, {0x10c9b}}},
-  {0x10cdc, {1|U, {0x10c9c}}},
-  {0x10cdd, {1|U, {0x10c9d}}},
-  {0x10cde, {1|U, {0x10c9e}}},
-  {0x10cdf, {1|U, {0x10c9f}}},
-  {0x10ce0, {1|U, {0x10ca0}}},
-  {0x10ce1, {1|U, {0x10ca1}}},
-  {0x10ce2, {1|U, {0x10ca2}}},
-  {0x10ce3, {1|U, {0x10ca3}}},
-  {0x10ce4, {1|U, {0x10ca4}}},
-  {0x10ce5, {1|U, {0x10ca5}}},
-  {0x10ce6, {1|U, {0x10ca6}}},
-  {0x10ce7, {1|U, {0x10ca7}}},
-  {0x10ce8, {1|U, {0x10ca8}}},
-  {0x10ce9, {1|U, {0x10ca9}}},
-  {0x10cea, {1|U, {0x10caa}}},
-  {0x10ceb, {1|U, {0x10cab}}},
-  {0x10cec, {1|U, {0x10cac}}},
-  {0x10ced, {1|U, {0x10cad}}},
-  {0x10cee, {1|U, {0x10cae}}},
-  {0x10cef, {1|U, {0x10caf}}},
-  {0x10cf0, {1|U, {0x10cb0}}},
-  {0x10cf1, {1|U, {0x10cb1}}},
-  {0x10cf2, {1|U, {0x10cb2}}},
-  {0x118c0, {1|U, {0x118a0}}},
-  {0x118c1, {1|U, {0x118a1}}},
-  {0x118c2, {1|U, {0x118a2}}},
-  {0x118c3, {1|U, {0x118a3}}},
-  {0x118c4, {1|U, {0x118a4}}},
-  {0x118c5, {1|U, {0x118a5}}},
-  {0x118c6, {1|U, {0x118a6}}},
-  {0x118c7, {1|U, {0x118a7}}},
-  {0x118c8, {1|U, {0x118a8}}},
-  {0x118c9, {1|U, {0x118a9}}},
-  {0x118ca, {1|U, {0x118aa}}},
-  {0x118cb, {1|U, {0x118ab}}},
-  {0x118cc, {1|U, {0x118ac}}},
-  {0x118cd, {1|U, {0x118ad}}},
-  {0x118ce, {1|U, {0x118ae}}},
-  {0x118cf, {1|U, {0x118af}}},
-  {0x118d0, {1|U, {0x118b0}}},
-  {0x118d1, {1|U, {0x118b1}}},
-  {0x118d2, {1|U, {0x118b2}}},
-  {0x118d3, {1|U, {0x118b3}}},
-  {0x118d4, {1|U, {0x118b4}}},
-  {0x118d5, {1|U, {0x118b5}}},
-  {0x118d6, {1|U, {0x118b6}}},
-  {0x118d7, {1|U, {0x118b7}}},
-  {0x118d8, {1|U, {0x118b8}}},
-  {0x118d9, {1|U, {0x118b9}}},
-  {0x118da, {1|U, {0x118ba}}},
-  {0x118db, {1|U, {0x118bb}}},
-  {0x118dc, {1|U, {0x118bc}}},
-  {0x118dd, {1|U, {0x118bd}}},
-  {0x118de, {1|U, {0x118be}}},
-  {0x118df, {1|U, {0x118bf}}},
-  {0x1e922, {1|U, {0x1e900}}},
-  {0x1e923, {1|U, {0x1e901}}},
-  {0x1e924, {1|U, {0x1e902}}},
-  {0x1e925, {1|U, {0x1e903}}},
-  {0x1e926, {1|U, {0x1e904}}},
-  {0x1e927, {1|U, {0x1e905}}},
-  {0x1e928, {1|U, {0x1e906}}},
-  {0x1e929, {1|U, {0x1e907}}},
-  {0x1e92a, {1|U, {0x1e908}}},
-  {0x1e92b, {1|U, {0x1e909}}},
-  {0x1e92c, {1|U, {0x1e90a}}},
-  {0x1e92d, {1|U, {0x1e90b}}},
-  {0x1e92e, {1|U, {0x1e90c}}},
-  {0x1e92f, {1|U, {0x1e90d}}},
-  {0x1e930, {1|U, {0x1e90e}}},
-  {0x1e931, {1|U, {0x1e90f}}},
-  {0x1e932, {1|U, {0x1e910}}},
-  {0x1e933, {1|U, {0x1e911}}},
-  {0x1e934, {1|U, {0x1e912}}},
-  {0x1e935, {1|U, {0x1e913}}},
-  {0x1e936, {1|U, {0x1e914}}},
-  {0x1e937, {1|U, {0x1e915}}},
-  {0x1e938, {1|U, {0x1e916}}},
-  {0x1e939, {1|U, {0x1e917}}},
-  {0x1e93a, {1|U, {0x1e918}}},
-  {0x1e93b, {1|U, {0x1e919}}},
-  {0x1e93c, {1|U, {0x1e91a}}},
-  {0x1e93d, {1|U, {0x1e91b}}},
-  {0x1e93e, {1|U, {0x1e91c}}},
-  {0x1e93f, {1|U, {0x1e91d}}},
-  {0x1e940, {1|U, {0x1e91e}}},
-  {0x1e941, {1|U, {0x1e91f}}},
-  {0x1e942, {1|U, {0x1e920}}},
-  {0x1e943, {1|U, {0x1e921}}},
-#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1266))
-  {0x0069, {1|U, {0x0049}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
-
-/* maximum key range = 2216, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
-{
-  static const unsigned short asso_values[] =
-    {
-         1, 2219,    2,   14,    4,  807,    9,  379,   10,  179,
-        70,  161,    2,    3,  411,    4, 2219, 2219, 2219, 2219,
-      2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219,   80,
-      2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219, 2219,
-      2219, 2219, 2219,    1, 2219, 2219, 2219, 2219, 2219, 2219,
-      2219, 2219, 2219,  210, 2219, 2219, 2219, 2219, 2219, 2219,
-      2219, 2219,   53, 2219,    7,    8,  306,  607,  169,  844,
-       431,  722,  125, 1047,  489, 1394,   15,   16,  324, 1361,
-       140,  521,   47,  461,  221,  985,   70,  965,    9, 1085,
-        51, 1029,  223,   11,  430, 1168,  122, 1457,  344,  930,
-        91,  711,   31,  651,  157,  772,  224,  876,  262,  900,
-       254,  686,  221,  830, 1335,  755,  432,  623, 1382,  675,
-      1275,  587,   99,  821, 1530,  958,  195,  810, 1518,  739,
-       330,  361,  767,  313,  941,  400,  925,  384, 1142,  295,
-      1295,  242, 1103,  229, 1082,  206, 1066,  104, 1317,  137,
-      1249,  263, 1229,  115, 1154,   71,  135,   60, 1211,  158,
-      1472,  175, 1232,    1, 1345,   27, 1269,   38, 1111,   87,
-      1189,   49, 1256,  503, 1157,  574, 1410,  556, 1200,  787,
-       948,  486, 1316,  797, 1218, 1044, 1282, 1007, 1126,  996,
-       818, 1019,  218, 1072
-    };
-  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList3 *
-onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x61,
-      MAX_CODE_VALUE = 0x1e943,
-      TOTAL_KEYWORDS = 1267,
-      MIN_WORD_LENGTH = 3,
-      MAX_WORD_LENGTH = 3,
-      MIN_HASH_VALUE = 3,
-      MAX_HASH_VALUE = 2218
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1,
-      /*0x13e1*/ 542,
-      /*0x0461*/ 339,
-      /*0x04e1*/ 399,
-      /*0x0061*/ 0,
-      -1,
-      /*0x104e1*/ 1122,
-      /*0x1e61*/ 613,
-      /*0x1ee1*/ 672,
-      /*0x0161*/ 102,
-      /*0x0261*/ 210,
-      /*0x2ce1*/ 904,
-      -1,
-      /*0x049b*/ 364,
-      -1, -1,
-      /*0x24e1*/ 792,
-      /*0x1e1b*/ 578,
-      /*0x048b*/ 356,
-      /*0x011b*/ 69,
-      /*0x021b*/ 178,
-      /*0x2c9b*/ 869,
-      /*0x1e0b*/ 570,
-      /*0x1e8b*/ 634,
-      /*0x010b*/ 61,
-      /*0x020b*/ 170,
-      /*0x2c8b*/ 861,
-      /*0x13e3*/ 544,
-      /*0x0463*/ 340,
-      /*0x04e3*/ 400,
-      /*0x0063*/ 2,
-      /*0x13a4*/ 481,
-      /*0x104e3*/ 1124,
-      /*0x1e63*/ 614,
-      /*0x1ee3*/ 673,
-      /*0x0163*/ 103,
-      /*0x0263*/ 211,
-      /*0x2ce3*/ 905,
-      /*0x13e5*/ 546,
-      /*0x0465*/ 341,
-      /*0x04e5*/ 401,
-      /*0x0065*/ 4,
-      /*0x24e3*/ 794,
-      /*0x104e5*/ 1126,
-      /*0x1e65*/ 615,
-      /*0x1ee5*/ 674,
-      /*0x0165*/ 104,
-      /*0x0265*/ 212,
-      /*0xa761*/ 1016,
-      /*0x13e9*/ 550,
-      /*0x0469*/ 343,
-      /*0x04e9*/ 403,
-      /*0x0069*/ 1266,
-      /*0x24e5*/ 796,
-      /*0x104e9*/ 1130,
-      /*0x1e69*/ 617,
-      /*0x1ee9*/ 676,
-      /*0x0169*/ 106,
-      /*0x0269*/ 215,
-      -1,
-      /*0x13db*/ 536,
-      /*0x045b*/ 334,
-      /*0x04db*/ 396,
-      -1,
-      /*0x24e9*/ 800,
-      /*0x104db*/ 1116,
-      /*0x1e5b*/ 610,
-      /*0x1edb*/ 669,
-      /*0x015b*/ 99,
-      /*0x025b*/ 207,
-      /*0x2cdb*/ 901,
-      /*0x13d9*/ 534,
-      /*0x0459*/ 332,
-      /*0x04d9*/ 395,
-      /*0xa763*/ 1017,
-      /*0x24db*/ 786,
-      /*0x104d9*/ 1114,
-      /*0x1e59*/ 609,
-      /*0x1ed9*/ 668,
-      /*0x0159*/ 98,
-      /*0x0259*/ 206,
-      /*0x2cd9*/ 900,
-      -1,
-      /*0x10ce1*/ 1182,
-      -1,
-      /*0xa765*/ 1018,
-      /*0x24d9*/ 784,
-      /*0x13e7*/ 548,
-      /*0x0467*/ 342,
-      /*0x04e7*/ 402,
-      /*0x0067*/ 6,
-      /*0x13a2*/ 479,
-      /*0x104e7*/ 1128,
-      /*0x1e67*/ 616,
-      /*0x1ee7*/ 675,
-      /*0x0167*/ 105,
-      /*0xa769*/ 1020,
-      -1, -1,
-      /*0x13b8*/ 501,
-      /*0x0438*/ 299,
-      -1,
-      /*0x24e7*/ 798,
-      /*0x10438*/ 1089,
-      /*0x13d1*/ 526,
-      /*0x0451*/ 324,
-      /*0x04d1*/ 391,
-      /*0xa75b*/ 1013,
-      -1,
-      /*0x10ce3*/ 1184,
-      /*0x1e51*/ 605,
-      /*0x1ed1*/ 664,
-      /*0x0151*/ 94,
-      /*0x0251*/ 200,
-      /*0x2cd1*/ 896,
-      /*0x13d7*/ 532,
-      /*0x0457*/ 330,
-      /*0x04d7*/ 394,
-      /*0xa759*/ 1012,
-      /*0x24d1*/ 776,
-      /*0x10ce5*/ 1186,
-      /*0x1e57*/ 608,
-      /*0x1ed7*/ 667,
-      /*0x0157*/ 97,
-      /*0x0257*/ 205,
-      /*0x2cd7*/ 899,
-      -1, -1,
-      /*0x0586*/ 476,
-      -1,
-      /*0x24d7*/ 782,
-      /*0x10ce9*/ 1190,
-      -1, -1,
-      /*0xa767*/ 1019,
-      /*0x13da*/ 535,
-      /*0x045a*/ 333,
-      /*0x13d3*/ 528,
-      /*0x0453*/ 326,
-      /*0x04d3*/ 392,
-      /*0x104da*/ 1115,
-      /*0xa661*/ 965,
-      /*0x10cdb*/ 1176,
-      /*0x1e53*/ 606,
-      /*0x1ed3*/ 665,
-      /*0x0153*/ 95,
-      /*0x0253*/ 202,
-      /*0x2cd3*/ 897,
-      -1, -1,
-      /*0x24da*/ 785,
-      /*0xa751*/ 1008,
-      /*0x24d3*/ 778,
-      /*0x10cd9*/ 1174,
-      -1, -1, -1,
-      /*0x13a6*/ 483,
-      /*0x13dd*/ 538,
-      /*0x045d*/ 336,
-      /*0x04dd*/ 397,
-      /*0x03e1*/ 279,
-      /*0xa757*/ 1011,
-      /*0x104dd*/ 1118,
-      /*0x1e5d*/ 611,
-      /*0x1edd*/ 670,
-      /*0x015d*/ 100,
-      /*0xa663*/ 966,
-      /*0x2cdd*/ 902,
-      /*0x10ce7*/ 1188,
-      -1, -1,
-      /*0x0582*/ 472,
-      /*0x24dd*/ 788,
-      -1,
-      /*0x13df*/ 540,
-      /*0x045f*/ 338,
-      /*0x04df*/ 398,
-      /*0xa665*/ 967,
-      -1,
-      /*0x104df*/ 1120,
-      /*0x1e5f*/ 612,
-      /*0x1edf*/ 671,
-      /*0x015f*/ 101,
-      /*0xa753*/ 1009,
-      /*0x2cdf*/ 903,
-      /*0x10cd1*/ 1166,
-      /*0x03e3*/ 280,
-      /*0xab53*/ 1046,
-      /*0xa669*/ 969,
-      /*0x24df*/ 790,
-      -1, -1,
-      /*0x028a*/ 229,
-      /*0x028b*/ 230,
-      /*0x13bc*/ 505,
-      /*0x043c*/ 303,
-      /*0x10cd7*/ 1172,
-      /*0x03e5*/ 281,
-      /*0x1043c*/ 1093,
-      /*0xa65b*/ 962,
-      -1, -1,
-      /*0x013c*/ 84,
-      /*0x023c*/ 190,
-      /*0xa75d*/ 1014,
-      /*0x13cf*/ 524,
-      /*0x044f*/ 322,
-      /*0x04cf*/ 390,
-      /*0x03e9*/ 283,
-      /*0x1044f*/ 1112,
-      /*0xa659*/ 961,
-      /*0x1e4f*/ 604,
-      /*0x1ecf*/ 663,
-      /*0x014f*/ 93,
-      /*0x024f*/ 198,
-      /*0x2ccf*/ 895,
-      /*0x10cda*/ 1175,
-      -1,
-      /*0x10cd3*/ 1168,
-      /*0x03db*/ 276,
-      /*0x13ae*/ 491,
-      /*0xa75f*/ 1015,
-      /*0x2c61*/ 848,
-      /*0x13a8*/ 485,
-      /*0x1042e*/ 1079,
-      /*0x017e*/ 116,
-      /*0xa667*/ 968,
-      /*0x10428*/ 1073,
-      /*0x13cd*/ 522,
-      /*0x044d*/ 320,
-      /*0x03d9*/ 275,
-      -1,
-      /*0x1044d*/ 1110,
-      -1,
-      /*0x1e4d*/ 603,
-      /*0x1ecd*/ 662,
-      /*0x014d*/ 92,
-      /*0x024d*/ 197,
-      /*0x2ccd*/ 894,
-      /*0x10cdd*/ 1178,
-      -1,
-      /*0x13cb*/ 520,
-      /*0x044b*/ 318,
-      /*0xa651*/ 957,
-      -1,
-      /*0x1044b*/ 1108,
-      /*0x03e7*/ 282,
-      /*0x1e4b*/ 602,
-      /*0x1ecb*/ 661,
-      /*0x014b*/ 91,
-      /*0x024b*/ 196,
-      /*0x2ccb*/ 893,
-      /*0xa74f*/ 1007,
-      /*0x13ac*/ 489,
-      /*0xa657*/ 960,
-      -1,
-      /*0x10cdf*/ 1180,
-      /*0x1042c*/ 1077,
-      /*0x03b8*/ 252,
-      /*0x2c65*/ 849,
-      -1,
-      /*0x13aa*/ 487,
-      /*0x13d5*/ 530,
-      /*0x0455*/ 328,
-      /*0x04d5*/ 393,
-      /*0x1042a*/ 1075,
-      -1, -1,
-      /*0x1e55*/ 607,
-      /*0x1ed5*/ 666,
-      /*0x0155*/ 96,
-      /*0x118db*/ 1227,
-      /*0x2cd5*/ 898,
-      -1,
-      /*0x03d7*/ 274,
-      /*0xa74d*/ 1006,
-      /*0xa653*/ 958,
-      /*0x24d5*/ 780,
-      -1, -1, -1,
-      /*0x2c5b*/ 844,
-      /*0x118d9*/ 1225,
-      -1, -1, -1, -1,
-      /*0x10ccf*/ 1164,
-      /*0xa74b*/ 1005,
-      -1, -1, -1,
-      /*0x2c59*/ 842,
-      -1,
-      /*0x13c9*/ 518,
-      /*0x0449*/ 316,
-      -1,
-      /*0xa65d*/ 963,
-      /*0x10449*/ 1106,
-      /*0x029e*/ 234,
-      /*0x1e49*/ 601,
-      /*0x1ec9*/ 660,
-      -1,
-      /*0x0249*/ 195,
-      /*0x2cc9*/ 892,
-      /*0x1f61*/ 729,
-      -1, -1,
-      /*0x0580*/ 470,
-      /*0xa755*/ 1010,
-      /*0x10ccd*/ 1162,
-      -1,
-      /*0x13c3*/ 512,
-      /*0x0443*/ 310,
-      /*0xa65f*/ 964,
-      /*0x118d1*/ 1217,
-      /*0x10443*/ 1100,
-      /*0x03dd*/ 277,
-      /*0x1e43*/ 598,
-      /*0x1ec3*/ 657,
-      /*0x2c38*/ 809,
-      -1,
-      /*0x2cc3*/ 889,
-      /*0x10ccb*/ 1160,
-      -1,
-      /*0x2c51*/ 834,
-      /*0x118d7*/ 1223,
-      -1, -1,
-      /*0x13c0*/ 509,
-      /*0x0440*/ 307,
-      /*0x1f63*/ 731,
-      -1,
-      /*0x10440*/ 1097,
-      /*0x03df*/ 278,
-      /*0x1f24*/ 706,
-      /*0x2c57*/ 840,
-      /*0x0140*/ 86,
-      /*0x0240*/ 192,
-      -1, -1,
-      /*0xa749*/ 1004,
-      /*0x1f65*/ 733,
-      /*0x13a0*/ 477,
-      /*0x10cd5*/ 1170,
-      /*0xa64f*/ 956,
-      /*0x118da*/ 1226,
-      -1,
-      /*0x118d3*/ 1219,
-      -1, -1,
-      /*0x1f10*/ 696,
-      -1, -1,
-      /*0x03bc*/ 256,
-      -1,
-      /*0x2c5a*/ 843,
-      -1,
-      /*0x2c53*/ 836,
-      /*0xa743*/ 1001,
-      /*0x13c1*/ 510,
-      /*0x0441*/ 308,
-      -1, -1,
-      /*0x10441*/ 1098,
-      -1,
-      /*0x1e41*/ 597,
-      /*0x1ec1*/ 656,
-      /*0xa64d*/ 955,
-      /*0x118dd*/ 1229,
-      /*0x2cc1*/ 888,
-      -1, -1, -1,
-      /*0x1f14*/ 700,
-      -1,
-      /*0x10cc9*/ 1158,
-      -1,
-      /*0x01e1*/ 151,
-      /*0x2c5d*/ 846,
-      /*0x03ae*/ 243,
-      /*0xa64b*/ 954,
-      -1,
-      /*0x13c7*/ 516,
-      /*0x0447*/ 314,
-      -1,
-      /*0x118df*/ 1231,
-      /*0x10447*/ 1104,
-      /*0x03cd*/ 272,
-      /*0x1e47*/ 600,
-      /*0x1ec7*/ 659,
-      /*0x1f67*/ 735,
-      /*0x0247*/ 194,
-      /*0x2cc7*/ 891,
-      /*0x10cc3*/ 1152,
-      /*0x1f22*/ 704,
-      -1, -1,
-      /*0x0292*/ 232,
-      /*0x13c5*/ 514,
-      /*0x0445*/ 312,
-      /*0x03cb*/ 270,
-      /*0xa655*/ 959,
-      /*0x10445*/ 1102,
-      /*0x01e3*/ 152,
-      /*0x1e45*/ 599,
-      /*0x1ec5*/ 658,
-      /*0xa741*/ 1000,
-      /*0x1f51*/ 724,
-      /*0x2cc5*/ 890,
-      /*0x0561*/ 439,
-      /*0x10cc0*/ 1149,
-      /*0xff59*/ 1071,
-      /*0x03ac*/ 241,
-      -1,
-      /*0x01e5*/ 153,
-      /*0x2c3c*/ 813,
-      /*0x118cf*/ 1215,
-      -1,
-      /*0x1f57*/ 727,
-      /*0x051b*/ 428,
-      -1, -1, -1, -1,
-      /*0x050b*/ 420,
-      /*0x01e9*/ 155,
-      /*0x2c4f*/ 832,
-      -1,
-      /*0x1f06*/ 694,
-      /*0xa747*/ 1003,
-      /*0x13b2*/ 495,
-      /*0x0432*/ 293,
-      /*0x0584*/ 474,
-      /*0xa649*/ 953,
-      /*0x10432*/ 1083,
-      /*0x0563*/ 441,
-      /*0x2d16*/ 931,
-      -1,
-      /*0x2d1b*/ 936,
-      /*0x118cd*/ 1213,
-      /*0x1f53*/ 725,
-      /*0x10cc1*/ 1150,
-      /*0x2d0a*/ 919,
-      /*0x2d0b*/ 920,
-      /*0xff51*/ 1063,
-      /*0xa745*/ 1002,
-      /*0x0565*/ 443,
-      -1, -1,
-      /*0x2c4d*/ 830,
-      -1,
-      /*0xa643*/ 950,
-      /*0x118cb*/ 1211,
-      /*0x03c9*/ 268,
-      -1,
-      /*0xff57*/ 1069,
-      -1,
-      /*0x0569*/ 447,
-      /*0x2d24*/ 945,
-      -1,
-      /*0x1f26*/ 708,
-      /*0x0491*/ 359,
-      /*0x2c4b*/ 828,
-      /*0x01e7*/ 154,
-      /*0x10cc7*/ 1156,
-      /*0x1e11*/ 573,
-      /*0x1e91*/ 637,
-      /*0x0111*/ 64,
-      /*0x0211*/ 173,
-      /*0x2c91*/ 864,
-      /*0xa79b*/ 1036,
-      /*0x03c3*/ 262,
-      /*0x1f02*/ 690,
-      /*0x118d5*/ 1221,
-      /*0x2d10*/ 925,
-      /*0xff5a*/ 1072,
-      /*0x1e924*/ 1234,
-      /*0xff53*/ 1065,
-      /*0x2d18*/ 933,
-      -1,
-      /*0x10cc5*/ 1154,
-      -1,
-      /*0x0280*/ 224,
-      /*0x2c55*/ 838,
-      /*0x13f3*/ 560,
-      /*0x0473*/ 348,
-      /*0x04f3*/ 408,
-      /*0x0073*/ 17,
-      /*0x03c0*/ 260,
-      /*0x104f3*/ 1140,
-      /*0x1e73*/ 622,
-      /*0x1ef3*/ 681,
-      /*0x0173*/ 111,
-      -1,
-      /*0x2cf3*/ 908,
-      /*0x0567*/ 445,
-      -1,
-      /*0x2d14*/ 929,
-      /*0x019e*/ 126,
-      /*0xa641*/ 949,
-      /*0x028c*/ 231,
-      /*0x13eb*/ 552,
-      /*0x046b*/ 344,
-      /*0x04eb*/ 404,
-      /*0x006b*/ 9,
-      /*0x118c9*/ 1209,
-      /*0x104eb*/ 1132,
-      /*0x1e6b*/ 618,
-      /*0x1eeb*/ 677,
-      /*0x016b*/ 107,
-      /*0x026b*/ 217,
-      /*0x01da*/ 147,
-      -1, -1, -1,
-      /*0x2c49*/ 826,
-      -1, -1,
-      /*0x2d22*/ 943,
-      /*0x03c1*/ 261,
-      -1,
-      /*0x048f*/ 358,
-      /*0xa647*/ 952,
-      /*0x118c3*/ 1203,
-      /*0x1f12*/ 698,
-      /*0x1e0f*/ 572,
-      /*0x1e8f*/ 636,
-      /*0x010f*/ 63,
-      /*0x020f*/ 172,
-      /*0x2c8f*/ 863,
-      /*0xa69b*/ 985,
-      -1, -1,
-      /*0x2c43*/ 820,
-      /*0x01dd*/ 149,
-      /*0xa68b*/ 977,
-      /*0x1e922*/ 1232,
-      -1,
-      /*0xa645*/ 951,
-      -1,
-      /*0x118c0*/ 1200,
-      -1,
-      /*0x03c7*/ 266,
-      -1,
-      /*0x1e938*/ 1254,
-      -1,
-      /*0xff4f*/ 1061,
-      -1,
-      /*0xa76b*/ 1021,
-      /*0x2d1e*/ 939,
-      /*0x2c40*/ 817,
-      /*0x01df*/ 150,
-      /*0x2d06*/ 915,
-      /*0x0373*/ 236,
-      /*0x13ef*/ 556,
-      /*0x046f*/ 346,
-      /*0x04ef*/ 406,
-      /*0x006f*/ 13,
-      /*0x03c5*/ 264,
-      /*0x104ef*/ 1136,
-      /*0x1e6f*/ 620,
-      /*0x1eef*/ 679,
-      /*0x016f*/ 109,
-      /*0x026f*/ 219,
-      -1, -1,
-      /*0x1f55*/ 726,
-      /*0x2d0e*/ 923,
-      -1,
-      /*0xff4d*/ 1059,
-      -1,
-      /*0x118c1*/ 1201,
-      /*0x13ed*/ 554,
-      /*0x046d*/ 345,
-      /*0x04ed*/ 405,
-      /*0x006d*/ 11,
-      -1,
-      /*0x104ed*/ 1134,
-      /*0x1e6d*/ 619,
-      /*0x1eed*/ 678,
-      /*0x016d*/ 108,
-      /*0x2c41*/ 818,
-      /*0xff4b*/ 1057,
-      /*0x10ceb*/ 1192,
-      -1,
-      /*0x13b7*/ 500,
-      /*0x0437*/ 298,
-      /*0x04b7*/ 378,
-      -1,
-      /*0x10437*/ 1088,
-      /*0x03b2*/ 246,
-      /*0x1e37*/ 592,
-      /*0x1eb7*/ 651,
-      /*0x0137*/ 82,
-      /*0x118c7*/ 1207,
-      /*0x2cb7*/ 883,
-      /*0x2d02*/ 911,
-      /*0x0192*/ 122,
-      -1,
-      /*0x019a*/ 125,
-      /*0x01a8*/ 130,
-      /*0xa76f*/ 1023,
-      /*0x1e926*/ 1236,
-      /*0xff55*/ 1067,
-      /*0x2c47*/ 824,
-      /*0x1fe1*/ 755,
-      -1,
-      /*0x0481*/ 355,
-      /*0x0581*/ 471,
-      /*0x1f00*/ 688,
-      /*0x118c5*/ 1205,
-      /*0x1e01*/ 565,
-      /*0x1e81*/ 629,
-      /*0x0101*/ 56,
-      /*0x0201*/ 165,
-      /*0x2c81*/ 856,
-      /*0x1f43*/ 721,
-      -1, -1,
-      /*0xa76d*/ 1022,
-      /*0x2c45*/ 822,
-      /*0x13b3*/ 496,
-      /*0x0433*/ 294,
-      /*0x04b3*/ 376,
-      -1,
-      /*0x10433*/ 1084,
-      /*0x057e*/ 468,
-      /*0x1e33*/ 590,
-      /*0x1eb3*/ 649,
-      /*0x0133*/ 80,
-      /*0x0233*/ 189,
-      /*0x2cb3*/ 881,
-      /*0xa737*/ 995,
-      /*0x1f40*/ 718,
-      -1,
-      /*0xff49*/ 1055,
-      /*0x10cef*/ 1196,
-      -1, -1, -1,
-      /*0x1e93c*/ 1258,
-      /*0xa66b*/ 970,
-      /*0x1fe5*/ 756,
-      -1,
-      /*0x03f3*/ 288,
-      -1,
-      /*0x217e*/ 772,
-      /*0x1f20*/ 702,
-      /*0x2d12*/ 927,
-      /*0x13a5*/ 482,
-      /*0x2d1a*/ 935,
-      /*0x04a5*/ 369,
-      /*0x2c32*/ 803,
-      /*0xff43*/ 1049,
-      /*0x10ced*/ 1194,
-      /*0x1e25*/ 583,
-      /*0x1ea5*/ 642,
-      /*0x0125*/ 74,
-      /*0x0225*/ 182,
-      /*0x2ca5*/ 874,
-      -1,
-      /*0x03eb*/ 284,
-      -1, -1,
-      /*0x1f41*/ 719,
-      /*0x0288*/ 227,
-      /*0x1e92e*/ 1244,
-      -1,
-      /*0xa733*/ 993,
-      /*0x1e928*/ 1238,
-      -1,
-      /*0x01c9*/ 139,
-      -1,
-      /*0x13b5*/ 498,
-      /*0x0435*/ 296,
-      /*0x04b5*/ 377,
-      -1,
-      /*0x10435*/ 1086,
-      -1,
-      /*0x1e35*/ 591,
-      /*0x1eb5*/ 650,
-      /*0x0135*/ 81,
-      /*0x0180*/ 117,
-      /*0x2cb5*/ 882,
-      /*0x13ad*/ 490,
-      -1,
-      /*0x04ad*/ 373,
-      -1,
-      /*0x1042d*/ 1078,
-      -1,
-      /*0x1e2d*/ 587,
-      /*0x1ead*/ 646,
-      /*0x012d*/ 78,
-      /*0x022d*/ 186,
-      /*0x2cad*/ 878,
-      -1,
-      /*0xa725*/ 987,
-      -1, -1,
-      /*0x1e92c*/ 1242,
-      /*0x018c*/ 121,
-      /*0xff41*/ 1047,
-      -1,
-      /*0x1f45*/ 723,
-      -1, -1,
-      /*0x2c73*/ 854,
-      /*0x1e92a*/ 1240,
-      /*0x1fd1*/ 753,
-      /*0x13a3*/ 480,
-      -1,
-      /*0x04a3*/ 368,
-      /*0xa66d*/ 971,
-      -1,
-      /*0x03ef*/ 286,
-      /*0x1e23*/ 582,
-      /*0x1ea3*/ 641,
-      /*0x0123*/ 73,
-      /*0x0223*/ 181,
-      /*0x2ca3*/ 873,
-      /*0xa735*/ 994,
-      -1, -1,
-      /*0x0585*/ 475,
-      /*0xff47*/ 1053,
-      -1,
-      /*0x1e05*/ 567,
-      /*0x1e85*/ 631,
-      /*0x0105*/ 58,
-      /*0x0205*/ 167,
-      /*0x2c85*/ 858,
-      /*0xa72d*/ 991,
-      /*0x03ed*/ 285,
-      /*0x2d00*/ 909,
-      /*0x1f04*/ 692,
-      /*0x1f32*/ 712,
-      -1,
-      /*0x13bf*/ 508,
-      /*0x043f*/ 306,
-      /*0x04bf*/ 382,
-      /*0xff45*/ 1051,
-      /*0x1043f*/ 1096,
-      -1,
-      /*0x1e3f*/ 596,
-      /*0x1ebf*/ 655,
-      /*0x03b7*/ 251,
-      /*0x023f*/ 191,
-      /*0x2cbf*/ 887,
-      -1, -1, -1,
-      /*0x2d0c*/ 921,
-      -1,
-      /*0x13b1*/ 494,
-      /*0x0431*/ 292,
-      /*0x04b1*/ 375,
-      /*0xa723*/ 986,
-      /*0x10431*/ 1082,
-      /*0x1e943*/ 1265,
-      /*0x1e31*/ 589,
-      /*0x1eb1*/ 648,
-      -1,
-      /*0x0231*/ 188,
-      /*0x2cb1*/ 880,
-      /*0x1f11*/ 697,
-      /*0x13c2*/ 511,
-      /*0x0442*/ 309,
-      /*0x04c2*/ 383,
-      -1,
-      /*0x10442*/ 1099,
-      /*0x13a7*/ 484,
-      /*0x2d20*/ 941,
-      /*0x04a7*/ 370,
-      /*0x0142*/ 87,
-      /*0x0242*/ 193,
-      /*0x1e940*/ 1262,
-      /*0x1e27*/ 584,
-      /*0x1ea7*/ 643,
-      /*0x0127*/ 75,
-      /*0x0227*/ 183,
-      /*0x2ca7*/ 875,
-      /*0x03b3*/ 247,
-      -1,
-      /*0xa78c*/ 1031,
-      /*0xa73f*/ 999,
-      /*0x13f1*/ 558,
-      /*0x0471*/ 347,
-      /*0x04f1*/ 407,
-      /*0x0071*/ 15,
-      /*0x1f73*/ 739,
-      /*0x104f1*/ 1138,
-      /*0x1e71*/ 621,
-      /*0x1ef1*/ 680,
-      /*0x0171*/ 110,
-      /*0x0271*/ 220,
-      /*0x13f5*/ 562,
-      /*0x0475*/ 349,
-      /*0x04f5*/ 409,
-      /*0x0075*/ 19,
-      -1,
-      /*0x104f5*/ 1142,
-      /*0x1e75*/ 623,
-      /*0x1ef5*/ 682,
-      /*0x0175*/ 112,
-      /*0x0275*/ 222,
-      /*0x00e1*/ 26,
-      /*0x1e941*/ 1263,
-      /*0x2c37*/ 808,
-      /*0x13bd*/ 506,
-      /*0x043d*/ 304,
-      /*0x04bd*/ 381,
-      -1,
-      /*0x1043d*/ 1094,
-      -1,
-      /*0x1e3d*/ 595,
-      /*0x1ebd*/ 654,
-      -1,
-      /*0xa727*/ 988,
-      /*0x2cbd*/ 886,
-      /*0x13b9*/ 502,
-      /*0x0439*/ 300,
-      /*0x04b9*/ 379,
-      -1,
-      /*0x10439*/ 1090,
-      /*0x017c*/ 115,
-      /*0x1e39*/ 593,
-      /*0x1eb9*/ 652,
-      -1,
-      /*0x13af*/ 492,
-      /*0x2cb9*/ 884,
-      /*0x04af*/ 374,
-      /*0x00e3*/ 28,
-      /*0x1042f*/ 1080,
-      /*0x03b5*/ 249,
-      /*0x1e2f*/ 588,
-      /*0x1eaf*/ 647,
-      /*0x012f*/ 79,
-      /*0x022f*/ 187,
-      /*0x2caf*/ 879,
-      -1, -1, -1,
-      /*0x00e5*/ 30,
-      /*0x2c33*/ 804,
-      /*0x03ad*/ 242,
-      /*0x0583*/ 473,
-      -1,
-      /*0x10cc2*/ 1151,
-      /*0x1e03*/ 566,
-      /*0x1e83*/ 630,
-      /*0x0103*/ 57,
-      /*0x0203*/ 166,
-      /*0x2c83*/ 857,
-      /*0x00e9*/ 34,
-      /*0x0371*/ 235,
-      /*0xa73d*/ 998,
-      -1,
-      /*0x2d1c*/ 937,
-      /*0x2d04*/ 913,
-      -1, -1, -1,
-      /*0x01f3*/ 159,
-      /*0xa77c*/ 1025,
-      -1,
-      /*0x0188*/ 120,
-      /*0xa739*/ 996,
-      /*0x10cf1*/ 1198,
-      -1,
-      /*0x0511*/ 423,
-      -1, -1, -1, -1,
-      /*0x13a9*/ 486,
-      /*0xa72f*/ 992,
-      /*0x04a9*/ 371,
-      /*0x1e932*/ 1248,
-      /*0x10429*/ 1074,
-      /*0x01eb*/ 156,
-      /*0x1e29*/ 585,
-      /*0x1ea9*/ 644,
-      /*0x0129*/ 76,
-      /*0x0229*/ 184,
-      /*0x2ca9*/ 876,
-      /*0x037c*/ 239,
-      -1, -1,
-      /*0x2d11*/ 926,
-      -1,
-      /*0x1f37*/ 717,
-      /*0x00e7*/ 32,
-      -1, -1,
-      /*0x0573*/ 457,
-      /*0x2c35*/ 806,
-      -1,
-      /*0x03bf*/ 259,
-      /*0x13ab*/ 488,
-      -1,
-      /*0x04ab*/ 372,
-      -1,
-      /*0x1042b*/ 1076,
-      -1,
-      /*0x1e2b*/ 586,
-      /*0x1eab*/ 645,
-      /*0x012b*/ 77,
-      /*0x022b*/ 185,
-      /*0x2cab*/ 877,
-      -1,
-      /*0x1f01*/ 689,
-      /*0x056b*/ 449,
-      -1,
-      /*0x03b1*/ 245,
-      /*0x2173*/ 761,
-      -1,
-      /*0x2d08*/ 917,
-      -1, -1, -1,
-      /*0xa791*/ 1032,
-      /*0xa729*/ 989,
-      -1,
-      /*0x13c6*/ 515,
-      /*0x0446*/ 313,
-      /*0x04c6*/ 385,
-      /*0x1f33*/ 713,
-      /*0x10446*/ 1103,
-      /*0x13a1*/ 478,
-      /*0x050f*/ 422,
-      /*0x04a1*/ 367,
-      /*0x0146*/ 89,
-      /*0x01ef*/ 158,
-      -1,
-      /*0x1e21*/ 581,
-      /*0x1ea1*/ 640,
-      /*0x0121*/ 72,
-      -1,
-      /*0x2ca1*/ 872,
-      /*0x13c4*/ 513,
-      /*0x0444*/ 311,
-      /*0x04c4*/ 384,
-      -1,
-      /*0x10444*/ 1101,
-      -1,
-      /*0xa72b*/ 990,
-      /*0x13f2*/ 559,
-      /*0x0144*/ 88,
-      /*0x2d0f*/ 924,
-      /*0x0072*/ 16,
-      /*0x01ed*/ 157,
-      /*0x104f2*/ 1139,
-      -1, -1,
-      /*0x1f25*/ 707,
-      /*0x0272*/ 221,
-      /*0x13bb*/ 504,
-      /*0x043b*/ 302,
-      /*0x04bb*/ 380,
-      /*0x2c3f*/ 816,
-      /*0x1043b*/ 1092,
-      -1,
-      /*0x1e3b*/ 594,
-      /*0x1ebb*/ 653,
-      /*0x056f*/ 453,
-      /*0x0495*/ 361,
-      /*0x2cbb*/ 885,
-      -1,
-      /*0x03bd*/ 257,
-      /*0x1e15*/ 575,
-      /*0x1e95*/ 639,
-      /*0x0115*/ 66,
-      /*0x0215*/ 175,
-      /*0x2c95*/ 866,
-      -1,
-      /*0x2c31*/ 802,
-      -1,
-      /*0x118c2*/ 1202,
-      /*0x1f35*/ 715,
-      /*0x03b9*/ 253,
-      /*0xa691*/ 980,
-      -1,
-      /*0x056d*/ 451,
-      -1, -1,
-      /*0x0493*/ 360,
-      -1,
-      /*0x2c42*/ 819,
-      /*0x03af*/ 244,
-      /*0x1e13*/ 574,
-      /*0x1e93*/ 638,
-      /*0x0113*/ 65,
-      /*0x0213*/ 174,
-      /*0x2c93*/ 865,
-      -1,
-      /*0x047b*/ 352,
-      /*0x04fb*/ 412,
-      -1, -1,
-      /*0x104fb*/ 1148,
-      /*0x1e7b*/ 626,
-      /*0x1efb*/ 685,
-      -1,
-      /*0xa73b*/ 997,
-      -1,
-      /*0x10cc6*/ 1155,
-      /*0x0479*/ 351,
-      /*0x04f9*/ 411,
-      /*0x0079*/ 23,
-      -1,
-      /*0x104f9*/ 1146,
-      /*0x1e79*/ 625,
-      /*0x1ef9*/ 684,
-      -1,
-      /*0x1f23*/ 705,
-      /*0x0501*/ 415,
-      -1, -1,
-      /*0x047d*/ 353,
-      /*0x04fd*/ 413,
-      /*0x0283*/ 225,
-      /*0x10cc4*/ 1153,
-      /*0x00fe*/ 54,
-      /*0x1e7d*/ 627,
-      /*0x1efd*/ 686,
-      /*0x1f05*/ 693,
-      /*0x027d*/ 223,
-      /*0x01a5*/ 129,
-      /*0x10cf2*/ 1199,
-      /*0x0499*/ 363,
-      /*0x2c3d*/ 814,
-      -1,
-      /*0x1e937*/ 1253,
-      /*0x1e19*/ 577,
-      /*0x2d01*/ 910,
-      /*0x0119*/ 68,
-      /*0x0219*/ 177,
-      /*0x2c99*/ 868,
-      -1, -1,
-      /*0xa68f*/ 979,
-      /*0x2c39*/ 810,
-      -1,
-      /*0x0477*/ 350,
-      /*0x04f7*/ 410,
-      /*0x0077*/ 21,
-      /*0xa7b7*/ 1045,
-      /*0x104f7*/ 1144,
-      /*0x1e77*/ 624,
-      /*0x1ef7*/ 683,
-      /*0x0177*/ 113,
-      /*0x1e07*/ 568,
-      /*0x1e87*/ 632,
-      /*0x0107*/ 59,
-      /*0x0207*/ 168,
-      /*0x2c87*/ 859,
-      -1,
-      /*0x1d79*/ 563,
-      /*0x1f31*/ 711,
-      /*0x0525*/ 433,
-      -1, -1,
-      /*0x01ad*/ 131,
-      /*0x037b*/ 238,
-      /*0x13d0*/ 525,
-      /*0x0450*/ 323,
-      /*0xa781*/ 1027,
-      -1,
-      /*0x1e933*/ 1249,
-      /*0x1d7d*/ 564,
-      /*0x1f42*/ 720,
-      /*0x047f*/ 354,
-      /*0x04ff*/ 414,
-      /*0x0250*/ 199,
-      -1,
-      /*0x1f27*/ 709,
-      /*0x1e7f*/ 628,
-      /*0x1eff*/ 687,
-      /*0x2d25*/ 946,
-      /*0x24d0*/ 775,
-      /*0x13ce*/ 523,
-      /*0x044e*/ 321,
-      /*0x04ce*/ 389,
-      /*0x03c6*/ 265,
-      /*0x1044e*/ 1111,
-      /*0x0497*/ 362,
-      /*0x037d*/ 240,
-      /*0x01a3*/ 128,
-      -1,
-      /*0x1e17*/ 576,
-      /*0x1f71*/ 737,
-      /*0x0117*/ 67,
-      /*0x0217*/ 176,
-      /*0x2c97*/ 867,
-      /*0x052d*/ 437,
-      -1,
-      /*0x1e925*/ 1235,
-      -1,
-      /*0x0185*/ 119,
-      /*0x03c4*/ 263,
-      /*0x1f75*/ 741,
-      /*0x13cc*/ 521,
-      /*0x044c*/ 319,
-      /*0x04cc*/ 388,
-      -1,
-      /*0x1044c*/ 1109,
-      /*0x03f2*/ 287,
-      /*0xff42*/ 1048,
-      -1,
-      /*0x13e6*/ 547,
-      /*0xa7a5*/ 1041,
-      /*0x0377*/ 237,
-      /*0x0066*/ 5,
-      /*0x2d2d*/ 948,
-      /*0x104e6*/ 1127,
-      /*0x01bf*/ 137,
-      /*0x03bb*/ 255,
-      /*0xa77f*/ 1026,
-      /*0x0266*/ 213,
-      /*0x0523*/ 432,
-      /*0x1e935*/ 1251,
-      /*0x1f7c*/ 748,
-      -1, -1,
-      /*0x24e6*/ 797,
-      -1,
-      /*0xa681*/ 972,
-      /*0x007a*/ 24,
-      -1,
-      /*0x104fa*/ 1147,
-      /*0x0505*/ 417,
-      /*0x1e92d*/ 1243,
-      /*0x017a*/ 114,
-      -1,
-      /*0xa7b5*/ 1044,
-      /*0x118c6*/ 1206,
-      -1, -1,
-      /*0x2d23*/ 944,
-      -1,
-      /*0x13c8*/ 517,
-      /*0x0448*/ 315,
-      /*0x04c8*/ 386,
-      -1,
-      /*0x10448*/ 1105,
-      /*0x2c46*/ 823,
-      /*0x10cd0*/ 1165,
-      /*0x1f03*/ 691,
-      /*0x0148*/ 90,
-      /*0x2d05*/ 914,
-      /*0x2184*/ 774,
-      /*0x118c4*/ 1204,
-      /*0x13d8*/ 533,
-      /*0x0458*/ 331,
-      /*0x03fb*/ 290,
-      /*0x13ec*/ 553,
-      /*0x1e923*/ 1233,
-      /*0x104d8*/ 1113,
-      /*0x006c*/ 10,
-      -1,
-      /*0x104ec*/ 1133,
-      /*0x2c44*/ 821,
-      /*0x10cce*/ 1163,
-      -1,
-      /*0x026c*/ 218,
-      /*0x2cec*/ 906,
-      -1,
-      /*0x24d8*/ 783,
-      /*0x049d*/ 365,
-      -1,
-      /*0xa7a3*/ 1040,
-      /*0xa77a*/ 1024,
-      /*0x1e1d*/ 579,
-      /*0x01f5*/ 160,
-      /*0x011d*/ 70,
-      /*0x021d*/ 179,
-      /*0x2c9d*/ 870,
-      -1,
-      /*0x2c3b*/ 812,
-      -1,
-      /*0x0527*/ 434,
-      /*0xa785*/ 1029,
-      -1,
-      /*0x10ccc*/ 1161,
-      /*0x1e93f*/ 1261,
-      -1,
-      /*0x01bd*/ 136,
-      /*0x13e8*/ 549,
-      -1, -1,
-      /*0x0068*/ 7,
-      /*0x10ce6*/ 1187,
-      /*0x104e8*/ 1129,
-      -1, -1,
-      /*0x0571*/ 455,
-      /*0x0268*/ 214,
-      /*0x01b9*/ 135,
-      /*0x13f0*/ 557,
-      /*0x2d27*/ 947,
-      /*0x1e931*/ 1247,
-      /*0x0070*/ 14,
-      /*0x24e8*/ 799,
-      /*0x104f0*/ 1137,
-      -1,
-      /*0x0575*/ 459,
-      -1, -1, -1,
-      /*0x13dc*/ 537,
-      /*0x045c*/ 335,
-      -1,
-      /*0x1e942*/ 1264,
-      -1,
-      /*0x104dc*/ 1117,
-      /*0x2171*/ 759,
-      -1,
-      /*0x1e927*/ 1237,
-      /*0x025c*/ 208,
-      /*0x0076*/ 20,
-      /*0x0183*/ 118,
-      /*0x104f6*/ 1143,
-      /*0x10cc8*/ 1157,
-      /*0x0287*/ 226,
-      /*0x24dc*/ 787,
-      /*0x2175*/ 763,
-      /*0x057c*/ 466,
-      /*0x13d6*/ 531,
-      /*0x0456*/ 329,
-      -1,
-      /*0x13e0*/ 541,
-      /*0xa7a7*/ 1042,
-      -1,
-      /*0x1f21*/ 703,
-      /*0x10cd8*/ 1173,
-      /*0x104e0*/ 1121,
-      /*0x0256*/ 204,
-      /*0x10cec*/ 1193,
-      /*0x052f*/ 438,
-      /*0x0260*/ 209,
-      /*0x03ce*/ 273,
-      /*0xa685*/ 974,
-      /*0x24d6*/ 781,
-      -1,
-      /*0x1f44*/ 722,
-      /*0x24e0*/ 791,
-      /*0x217c*/ 770,
-      /*0x13d4*/ 529,
-      /*0x0454*/ 327,
-      -1, -1,
-      /*0x1f72*/ 738,
-      /*0x0503*/ 416,
-      -1,
-      /*0x13ea*/ 551,
-      /*0x1e93d*/ 1259,
-      /*0x0254*/ 203,
-      /*0x006a*/ 8,
-      -1,
-      /*0x104ea*/ 1131,
-      -1,
-      /*0x03cc*/ 271,
-      /*0x24d4*/ 779,
-      /*0x026a*/ 216,
-      -1,
-      /*0xff46*/ 1052,
-      /*0x1e939*/ 1255,
-      /*0x13e4*/ 545,
-      /*0x1f15*/ 701,
-      /*0x10ce8*/ 1189,
-      /*0x0064*/ 3,
-      /*0x2d03*/ 912,
-      /*0x104e4*/ 1125,
-      /*0x13b6*/ 499,
-      /*0x0436*/ 297,
-      /*0x1e92f*/ 1245,
-      /*0x118d0*/ 1216,
-      /*0x10436*/ 1087,
-      -1, -1,
-      /*0x10cf0*/ 1197,
-      /*0xff44*/ 1050,
-      /*0x24e4*/ 795,
-      /*0x0078*/ 22,
-      /*0x0529*/ 435,
-      /*0x104f8*/ 1145,
-      /*0x2c50*/ 833,
-      -1,
-      /*0x1f13*/ 699,
-      -1,
-      /*0x00f3*/ 44,
-      /*0x10cdc*/ 1177,
-      /*0x118ce*/ 1214,
-      /*0x13ca*/ 519,
-      /*0x044a*/ 317,
-      /*0x04ca*/ 387,
-      -1,
-      /*0x1044a*/ 1107,
-      -1,
-      /*0x1f7b*/ 747,
-      /*0x03c8*/ 267,
-      /*0x01c6*/ 138,
-      /*0x2c4e*/ 831,
-      /*0xa783*/ 1028,
-      -1, -1,
-      /*0x01a1*/ 127,
-      /*0x00eb*/ 36,
-      /*0x052b*/ 436,
-      /*0x10cd6*/ 1171,
-      /*0x1f79*/ 745,
-      -1,
-      /*0x10ce0*/ 1181,
-      /*0x118cc*/ 1212,
-      /*0x13f4*/ 561,
-      /*0x13d2*/ 527,
-      /*0x0452*/ 325,
-      /*0x0074*/ 18,
-      -1,
-      /*0x104f4*/ 1141,
-      -1,
-      /*0x1e929*/ 1239,
-      /*0x1f7d*/ 749,
-      /*0x2c4c*/ 829,
-      /*0x0252*/ 201,
-      -1, -1, -1, -1,
-      /*0x10cd4*/ 1169,
-      /*0x24d2*/ 777,
-      /*0x2c66*/ 850,
-      -1,
-      /*0x13b0*/ 493,
-      /*0x0430*/ 291,
-      /*0xa7a9*/ 1043,
-      /*0x10cea*/ 1191,
-      /*0x10430*/ 1081,
-      /*0x0521*/ 431,
-      -1, -1,
-      /*0x0195*/ 123,
-      -1,
-      /*0x13e2*/ 543,
-      /*0x029d*/ 233,
-      /*0x1e92b*/ 1241,
-      /*0x0062*/ 1,
-      /*0x1f77*/ 743,
-      /*0x104e2*/ 1123,
-      /*0x10ce4*/ 1185,
-      /*0x1f07*/ 695,
-      -1,
-      /*0x118c8*/ 1208,
-      -1, -1, -1,
-      /*0x0572*/ 456,
-      /*0x2d21*/ 942,
-      /*0x24e2*/ 793,
-      /*0x1fb1*/ 751,
-      /*0x00ef*/ 40,
-      /*0x048d*/ 357,
-      /*0x2c48*/ 825,
-      /*0xa683*/ 973,
-      /*0x118d8*/ 1224,
-      /*0x1e0d*/ 571,
-      /*0x1e8d*/ 635,
-      /*0x010d*/ 62,
-      /*0x020d*/ 171,
-      /*0x2c8d*/ 862,
-      -1, -1,
-      /*0x01fb*/ 162,
-      /*0x0515*/ 425,
-      /*0x2c58*/ 841,
-      /*0x10cca*/ 1159,
-      /*0x2172*/ 760,
-      /*0x2c6c*/ 853,
-      /*0x00ed*/ 38,
-      -1,
-      /*0x13b4*/ 497,
-      /*0x0434*/ 295,
-      -1,
-      /*0x01f9*/ 161,
-      /*0x10434*/ 1085,
-      -1, -1, -1, -1,
-      /*0xa7a1*/ 1039,
-      -1, -1,
-      /*0x2d15*/ 930,
-      /*0x0513*/ 424,
-      -1,
-      /*0x01fd*/ 163,
-      -1,
-      /*0x10cd2*/ 1167,
-      /*0x1e09*/ 569,
-      /*0x1e89*/ 633,
-      /*0x0109*/ 60,
-      /*0x0209*/ 169,
-      /*0x2c89*/ 860,
-      /*0x1e93b*/ 1257,
-      /*0x057b*/ 465,
-      /*0x0199*/ 124,
-      /*0xff50*/ 1062,
-      -1,
-      /*0x13ee*/ 555,
-      /*0x2c68*/ 851,
-      -1,
-      /*0x006e*/ 12,
-      /*0x2d13*/ 928,
-      /*0x104ee*/ 1135,
-      /*0x1f66*/ 734,
-      /*0x0579*/ 463,
-      -1, -1,
-      /*0x2cee*/ 907,
-      -1, -1,
-      /*0x118dc*/ 1228,
-      /*0xff4e*/ 1060,
-      -1,
-      /*0x217b*/ 769,
-      /*0x10ce2*/ 1183,
-      -1,
-      /*0x057d*/ 467,
-      -1,
-      /*0x1f7a*/ 746,
-      -1,
-      /*0x2c5c*/ 845,
-      -1,
-      /*0x03b6*/ 250,
-      -1,
-      /*0x2179*/ 767,
-      -1,
-      /*0x0519*/ 427,
-      /*0x2c76*/ 855,
-      /*0x118d6*/ 1222,
-      /*0x03f8*/ 289,
-      -1,
-      /*0x01d0*/ 142,
-      /*0xff4c*/ 1058,
-      /*0xa793*/ 1033,
-      -1, -1,
-      /*0x217d*/ 771,
-      /*0x01ff*/ 164,
-      /*0x2c56*/ 839,
-      -1, -1,
-      /*0x0577*/ 461,
-      /*0x03ca*/ 269,
-      -1,
-      /*0x0507*/ 418,
-      /*0x2d19*/ 934,
-      /*0x049f*/ 366,
-      /*0x01ce*/ 141,
-      /*0x118d4*/ 1220,
-      -1,
-      /*0x1e1f*/ 580,
-      -1,
-      /*0x011f*/ 71,
-      /*0x021f*/ 180,
-      /*0x2c9f*/ 871,
-      -1, -1, -1,
-      /*0x2c54*/ 837,
-      /*0x13de*/ 539,
-      /*0x045e*/ 337,
-      /*0x2177*/ 765,
-      -1,
-      /*0x2d07*/ 916,
-      /*0x104de*/ 1119,
-      /*0x2c6a*/ 852,
-      -1, -1,
-      /*0x01cc*/ 140,
-      /*0x057f*/ 469,
-      -1,
-      /*0xff48*/ 1054,
-      -1,
-      /*0xa695*/ 982,
-      /*0x24de*/ 789,
-      -1, -1,
-      /*0xa799*/ 1035,
-      -1,
-      /*0x10cee*/ 1195,
-      -1, -1,
-      /*0x0517*/ 426,
-      /*0xff58*/ 1070,
-      /*0x2c36*/ 807,
-      -1, -1, -1, -1,
-      /*0x217f*/ 773,
-      -1, -1,
-      /*0x1f70*/ 736,
-      /*0xa693*/ 981,
-      /*0x118ca*/ 1210,
-      /*0xa787*/ 1030,
-      -1, -1, -1,
-      /*0x214e*/ 757,
-      -1,
-      /*0x2d17*/ 932,
-      -1, -1,
-      /*0x2c4a*/ 827,
-      /*0x13be*/ 507,
-      /*0x043e*/ 305,
-      -1,
-      /*0x0566*/ 444,
-      /*0x1043e*/ 1095,
-      /*0x1f76*/ 742,
-      -1, -1,
-      /*0x013e*/ 85,
-      -1, -1,
-      /*0x118d2*/ 1218,
-      /*0x13ba*/ 503,
-      /*0x043a*/ 301,
-      /*0x01d8*/ 146,
-      -1,
-      /*0x1043a*/ 1091,
-      -1,
-      /*0x057a*/ 464,
-      /*0x1f60*/ 728,
-      /*0x013a*/ 83,
-      /*0x2c52*/ 835,
-      -1, -1,
-      /*0x03b4*/ 248,
-      -1, -1, -1,
-      /*0xa797*/ 1034,
-      -1, -1, -1,
-      /*0xa699*/ 984,
-      -1, -1, -1,
-      /*0x10cde*/ 1179,
-      -1,
-      /*0x217a*/ 768,
-      /*0x2c30*/ 801,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x056c*/ 450,
-      /*0xa687*/ 975,
-      -1, -1,
-      /*0xff56*/ 1068,
-      /*0x0289*/ 228,
-      -1,
-      /*0x1f64*/ 732,
-      -1, -1, -1,
-      /*0x051d*/ 429,
-      -1,
-      /*0x1f36*/ 716,
-      -1, -1, -1, -1, -1, -1,
-      /*0x1f78*/ 744,
-      -1,
-      /*0x01dc*/ 148,
-      -1,
-      /*0xff54*/ 1066,
-      -1,
-      /*0x00f1*/ 42,
-      -1, -1, -1,
-      /*0x2d1d*/ 938,
-      -1,
-      /*0x0568*/ 446,
-      -1, -1, -1,
-      /*0x00f5*/ 46,
-      /*0x2c34*/ 805,
-      -1,
-      /*0xa697*/ 983,
-      /*0x01d6*/ 145,
-      -1, -1,
-      /*0x0570*/ 454,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x1f74*/ 740,
-      -1, -1,
-      /*0x00fc*/ 52,
-      -1, -1,
-      /*0x01d4*/ 144,
-      /*0x0576*/ 460,
-      /*0xa79d*/ 1037,
-      /*0x2170*/ 758,
-      -1, -1, -1, -1, -1, -1,
-      /*0xff4a*/ 1056,
-      -1, -1,
-      /*0x1f30*/ 710,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x2176*/ 764,
-      -1,
-      /*0x1f62*/ 730,
-      -1, -1,
-      /*0x01b6*/ 134,
-      -1, -1, -1, -1, -1,
-      /*0xff52*/ 1064,
-      -1, -1, -1, -1, -1, -1,
-      /*0x056a*/ 448,
-      -1, -1, -1, -1, -1,
-      /*0x1fd0*/ 752,
-      -1, -1, -1, -1, -1,
-      /*0x03be*/ 258,
-      /*0x0564*/ 442,
-      -1, -1, -1, -1,
-      /*0x118de*/ 1230,
-      -1, -1,
-      /*0x1f34*/ 714,
-      -1, -1,
-      /*0x03ba*/ 254,
-      -1,
-      /*0x0578*/ 462,
-      -1,
-      /*0x2c5e*/ 847,
-      /*0x01d2*/ 143,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x2178*/ 766,
-      /*0x01b0*/ 132,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1e936*/ 1252,
-      -1, -1, -1,
-      /*0x0574*/ 458,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x2c3e*/ 815,
-      -1, -1, -1, -1, -1,
-      /*0x2174*/ 762,
-      -1, -1, -1, -1, -1,
-      /*0x2c3a*/ 811,
-      -1,
-      /*0x00f2*/ 43,
-      /*0x0562*/ 440,
-      -1, -1, -1, -1,
-      /*0x01b4*/ 133,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x050d*/ 421,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x1e930*/ 1246,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x2d0d*/ 922,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x00fb*/ 51,
-      -1,
-      /*0x0509*/ 419,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x00f9*/ 49,
-      -1, -1, -1, -1, -1, -1,
-      /*0x056e*/ 452,
-      -1, -1,
-      /*0x2d09*/ 918,
-      -1,
-      /*0x00fd*/ 53,
-      -1, -1, -1,
-      /*0x1e934*/ 1250,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1fe0*/ 754,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x051f*/ 430,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x00ff*/ 55,
-      -1, -1, -1,
-      /*0xa68d*/ 978,
-      -1, -1, -1,
-      /*0x2d1f*/ 940,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0xa689*/ 976,
-      -1,
-      /*0x00e6*/ 31,
-      /*0xa79f*/ 1038,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x00fa*/ 50,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1,
-      /*0x1fb0*/ 750,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x00ec*/ 37,
-      -1,
-      /*0x1e93e*/ 1260,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x1e93a*/ 1256,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x00e8*/ 33,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x00f0*/ 41,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x00f6*/ 47,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1,
-      /*0x00e0*/ 25,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x00ea*/ 35,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x00e4*/ 29,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x00f8*/ 48,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x00f4*/ 45,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x00e2*/ 27,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1,
-      /*0x00ee*/ 39
-    };
-
-  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseUnfold_11_hash(code);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
-            return &CaseUnfold_11_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
-#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
-  {{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}, {2, {0x00df, 0x1e9e}}},
-  {{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, {0x1f80, 0x1f88}}},
-  {{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}}},
-#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
-  {{0x0069, 0x0307}, {1, {0x0130}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
-
-/* maximum key range = 71, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
-{
-  static const unsigned char asso_values[] =
-    {
-       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
-       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
-      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
-      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
-      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
-      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
-      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
-      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
-      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
-      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
-      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
-      82, 15, 82, 82, 23, 82,  8, 82
-    };
-  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList2 *
-onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x61,
-      MAX_CODE_VALUE = 0x1f7c,
-      TOTAL_KEYWORDS = 59,
-      MIN_WORD_LENGTH = 6,
-      MAX_WORD_LENGTH = 6,
-      MIN_HASH_VALUE = 11,
-      MAX_HASH_VALUE = 81
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1,
-      /*0x1f66,0x03b9*/ 53,
-      /*0x1f07,0x03b9*/ 38,
-      /*0x1f00,0x03b9*/ 31,
-      /*0x0066,0x0066*/ 1,
-      /*0x1f74,0x03b9*/ 56,
-      /*0x0073,0x0073*/ 6,
-      /*0x0066,0x0069*/ 2,
-      /*0x1f06,0x03b9*/ 37,
-      /*0x0073,0x0074*/ 7,
-      /*0x03b9,0x0342*/ 18,
-      /*0x03c9,0x03b9*/ 23,
-      /*0x03b7,0x03b9*/ 17,
-      /*0x0069,0x0307*/ 58,
-      /*0x03b1,0x03b9*/ 15,
-      /*0x1f61,0x03b9*/ 48,
-      /*0x1f05,0x03b9*/ 36,
-      /*0x1f65,0x03b9*/ 52,
-      /*0x0574,0x0576*/ 29,
-      /*0x03c9,0x0342*/ 22,
-      /*0x03b7,0x0342*/ 16,
-      /*0x057e,0x0576*/ 30,
-      /*0x03b1,0x0342*/ 14,
-      /*0x1f7c,0x03b9*/ 57,
-      /*0x0574,0x0565*/ 26,
-      /*0x0079,0x030a*/ 10,
-      /*0x0077,0x030a*/ 9,
-      /*0x1f70,0x03b9*/ 55,
-      /*0x0574,0x056d*/ 28,
-      /*0x0066,0x006c*/ 3,
-      /*0x0574,0x056b*/ 27,
-      /*0x0061,0x02be*/ 0,
-      /*0x0068,0x0331*/ 4,
-      /*0x1f67,0x03b9*/ 54,
-      /*0x1f64,0x03b9*/ 51,
-      /*0x1f63,0x03b9*/ 50,
-      /*0x1f62,0x03b9*/ 49,
-      /*0x1f60,0x03b9*/ 47,
-      /*0x03ce,0x03b9*/ 24,
-      /*0x03c5,0x0342*/ 21,
-      /*0x03c5,0x0313*/ 20,
-      /*0x03c1,0x0313*/ 19,
-      /*0x02bc,0x006e*/ 11,
-      /*0x03ae,0x03b9*/ 13,
-      /*0x03ac,0x03b9*/ 12,
-      /*0x1f27,0x03b9*/ 46,
-      /*0x1f26,0x03b9*/ 45,
-      /*0x1f25,0x03b9*/ 44,
-      /*0x1f24,0x03b9*/ 43,
-      /*0x1f23,0x03b9*/ 42,
-      /*0x1f22,0x03b9*/ 41,
-      /*0x1f21,0x03b9*/ 40,
-      /*0x1f20,0x03b9*/ 39,
-      /*0x006a,0x030c*/ 5,
-      /*0x1f02,0x03b9*/ 33,
-      /*0x0074,0x0308*/ 8,
-      /*0x1f04,0x03b9*/ 35,
-      /*0x1f03,0x03b9*/ 34,
-      /*0x1f01,0x03b9*/ 32,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0565,0x0582*/ 25
-    };
-
-  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
-      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseUnfold_12_hash(codes);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
-            return &CaseUnfold_12_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
-#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
-  {{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}}},
-};
-
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
-
-/* maximum key range = 20, duplicates = 0 */
-
-#ifdef __GNUC__
-__inline
-#else
-#ifdef __cplusplus
-inline
-#endif
-#endif
-/*ARGSUSED*/
-static unsigned int
-onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
-{
-  static const unsigned char asso_values[] =
-    {
-       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
-      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
-      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
-      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
-      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
-      47, 47, 47, 47, 47, 47, 47, 47
-    };
-  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
-}
-
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-static const CodePointList2 *
-onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
-{
-  enum
-    {
-      MIN_CODE_VALUE = 0x66,
-      MAX_CODE_VALUE = 0x3c9,
-      TOTAL_KEYWORDS = 14,
-      MIN_WORD_LENGTH = 9,
-      MAX_WORD_LENGTH = 9,
-      MIN_HASH_VALUE = 27,
-      MAX_HASH_VALUE = 46
-    };
-
-  static const short wordlist[] =
-    {
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1, -1, -1, -1,
-      -1, -1, -1,
-      /*0x03c5,0x0313,0x0342*/ 12,
-      /*0x03c5,0x0308,0x0342*/ 9,
-      /*0x03b9,0x0308,0x0342*/ 6,
-      /*0x03c5,0x0313,0x0301*/ 11,
-      /*0x03c5,0x0308,0x0301*/ 8,
-      /*0x03b9,0x0308,0x0301*/ 5,
-      /*0x03c5,0x0313,0x0300*/ 10,
-      /*0x03c5,0x0308,0x0300*/ 7,
-      /*0x03b9,0x0308,0x0300*/ 4,
-      /*0x03c9,0x0342,0x03b9*/ 13,
-      /*0x03b7,0x0342,0x03b9*/ 3,
-      /*0x03b1,0x0342,0x03b9*/ 2,
-      -1, -1, -1, -1, -1, -1,
-      /*0x0066,0x0066,0x006c*/ 1,
-      /*0x0066,0x0066,0x0069*/ 0
-    };
-
-  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
-      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
-      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
-    {
-      register int key = onigenc_unicode_CaseUnfold_13_hash(codes);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register short s = wordlist[key];
-
-          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
-            return &CaseUnfold_13_Table[s].to;
-        }
-    }
-  return 0;
-}
-
-static const OnigCodePoint CaseMappingSpecials[] = {
-    L(1)|0x039C,
-    L(2)|0x0053, 0x0073, L(2)|0x0053, 0x0053,
-    L(2)|0x02BC, 0x004E,
-    L(1)|0x0053,
-    L(1)|0x01C5,
-    L(2)|0x0064, 0x017D, L(1)|0x01C4,
-    L(1)|0x01C8,
-    L(2)|0x006C, 0x004A, L(1)|0x01C7,
-    L(1)|0x01CB,
-    L(2)|0x006E, 0x004A, L(1)|0x01CA,
-    L(2)|0x004A, 0x030C,
-    L(1)|0x01F2,
-    L(2)|0x0064, 0x005A, L(1)|0x01F1,
-    L(1)|0x0399,
-    L(3)|0x0399, 0x0308, 0x0301,
-    L(3)|0x03A5, 0x0308, 0x0301,
-    L(1)|0x03A3,
-    L(1)|0x0392,
-    L(1)|0x0398,
-    L(1)|0x03A6,
-    L(1)|0x03A0,
-    L(1)|0x039A,
-    L(1)|0x03A1,
-    L(1)|0x0395,
-    L(2)|0x0535, 0x0582, L(2)|0x0535, 0x0552,
-    L(1)|0x0412,
-    L(1)|0x0414,
-    L(1)|0x041E,
-    L(1)|0x0421,
-    L(1)|0x0422,
-    L(1)|0x0422,
-    L(1)|0x042A,
-    L(1)|0x0462,
-    L(1)|0xA64A,
-    L(2)|0x0048, 0x0331,
-    L(2)|0x0054, 0x0308,
-    L(2)|0x0057, 0x030A,
-    L(2)|0x0059, 0x030A,
-    L(2)|0x0041, 0x02BE,
-    L(1)|0x1E60,
-    L(1)|0x00DF,
-    L(2)|0x03A5, 0x0313,
-    L(3)|0x03A5, 0x0313, 0x0300,
-    L(3)|0x03A5, 0x0313, 0x0301,
-    L(3)|0x03A5, 0x0313, 0x0342,
-    L(1)|0x1F88, L(2)|0x1F08, 0x0399,
-    L(1)|0x1F89, L(2)|0x1F09, 0x0399,
-    L(1)|0x1F8A, L(2)|0x1F0A, 0x0399,
-    L(1)|0x1F8B, L(2)|0x1F0B, 0x0399,
-    L(1)|0x1F8C, L(2)|0x1F0C, 0x0399,
-    L(1)|0x1F8D, L(2)|0x1F0D, 0x0399,
-    L(1)|0x1F8E, L(2)|0x1F0E, 0x0399,
-    L(1)|0x1F8F, L(2)|0x1F0F, 0x0399,
-    L(2)|0x1F00, 0x0399, L(1)|0x1F80, L(2)|0x1F08, 0x0399,
-    L(2)|0x1F01, 0x0399, L(1)|0x1F81, L(2)|0x1F09, 0x0399,
-    L(2)|0x1F02, 0x0399, L(1)|0x1F82, L(2)|0x1F0A, 0x0399,
-    L(2)|0x1F03, 0x0399, L(1)|0x1F83, L(2)|0x1F0B, 0x0399,
-    L(2)|0x1F04, 0x0399, L(1)|0x1F84, L(2)|0x1F0C, 0x0399,
-    L(2)|0x1F05, 0x0399, L(1)|0x1F85, L(2)|0x1F0D, 0x0399,
-    L(2)|0x1F06, 0x0399, L(1)|0x1F86, L(2)|0x1F0E, 0x0399,
-    L(2)|0x1F07, 0x0399, L(1)|0x1F87, L(2)|0x1F0F, 0x0399,
-    L(1)|0x1F98, L(2)|0x1F28, 0x0399,
-    L(1)|0x1F99, L(2)|0x1F29, 0x0399,
-    L(1)|0x1F9A, L(2)|0x1F2A, 0x0399,
-    L(1)|0x1F9B, L(2)|0x1F2B, 0x0399,
-    L(1)|0x1F9C, L(2)|0x1F2C, 0x0399,
-    L(1)|0x1F9D, L(2)|0x1F2D, 0x0399,
-    L(1)|0x1F9E, L(2)|0x1F2E, 0x0399,
-    L(1)|0x1F9F, L(2)|0x1F2F, 0x0399,
-    L(2)|0x1F20, 0x0399, L(1)|0x1F90, L(2)|0x1F28, 0x0399,
-    L(2)|0x1F21, 0x0399, L(1)|0x1F91, L(2)|0x1F29, 0x0399,
-    L(2)|0x1F22, 0x0399, L(1)|0x1F92, L(2)|0x1F2A, 0x0399,
-    L(2)|0x1F23, 0x0399, L(1)|0x1F93, L(2)|0x1F2B, 0x0399,
-    L(2)|0x1F24, 0x0399, L(1)|0x1F94, L(2)|0x1F2C, 0x0399,
-    L(2)|0x1F25, 0x0399, L(1)|0x1F95, L(2)|0x1F2D, 0x0399,
-    L(2)|0x1F26, 0x0399, L(1)|0x1F96, L(2)|0x1F2E, 0x0399,
-    L(2)|0x1F27, 0x0399, L(1)|0x1F97, L(2)|0x1F2F, 0x0399,
-    L(1)|0x1FA8, L(2)|0x1F68, 0x0399,
-    L(1)|0x1FA9, L(2)|0x1F69, 0x0399,
-    L(1)|0x1FAA, L(2)|0x1F6A, 0x0399,
-    L(1)|0x1FAB, L(2)|0x1F6B, 0x0399,
-    L(1)|0x1FAC, L(2)|0x1F6C, 0x0399,
-    L(1)|0x1FAD, L(2)|0x1F6D, 0x0399,
-    L(1)|0x1FAE, L(2)|0x1F6E, 0x0399,
-    L(1)|0x1FAF, L(2)|0x1F6F, 0x0399,
-    L(2)|0x1F60, 0x0399, L(1)|0x1FA0, L(2)|0x1F68, 0x0399,
-    L(2)|0x1F61, 0x0399, L(1)|0x1FA1, L(2)|0x1F69, 0x0399,
-    L(2)|0x1F62, 0x0399, L(1)|0x1FA2, L(2)|0x1F6A, 0x0399,
-    L(2)|0x1F63, 0x0399, L(1)|0x1FA3, L(2)|0x1F6B, 0x0399,
-    L(2)|0x1F64, 0x0399, L(1)|0x1FA4, L(2)|0x1F6C, 0x0399,
-    L(2)|0x1F65, 0x0399, L(1)|0x1FA5, L(2)|0x1F6D, 0x0399,
-    L(2)|0x1F66, 0x0399, L(1)|0x1FA6, L(2)|0x1F6E, 0x0399,
-    L(2)|0x1F67, 0x0399, L(1)|0x1FA7, L(2)|0x1F6F, 0x0399,
-    L(2)|0x1FBA, 0x0345, L(2)|0x1FBA, 0x0399,
-    L(1)|0x1FBC, L(2)|0x0391, 0x0399,
-    L(2)|0x0386, 0x0345, L(2)|0x0386, 0x0399,
-    L(2)|0x0391, 0x0342,
-    L(3)|0x0391, 0x0342, 0x0345, L(3)|0x0391, 0x0342, 0x0399,
-    L(2)|0x03B1, 0x0399, L(1)|0x1FB3, L(2)|0x0391, 0x0399,
-    L(1)|0x0399,
-    L(2)|0x1FCA, 0x0345, L(2)|0x1FCA, 0x0399,
-    L(1)|0x1FCC, L(2)|0x0397, 0x0399,
-    L(2)|0x0389, 0x0345, L(2)|0x0389, 0x0399,
-    L(2)|0x0397, 0x0342,
-    L(3)|0x0397, 0x0342, 0x0345, L(3)|0x0397, 0x0342, 0x0399,
-    L(2)|0x03B7, 0x0399, L(1)|0x1FC3, L(2)|0x0397, 0x0399,
-    L(3)|0x0399, 0x0308, 0x0300,
-    L(3)|0x0399, 0x0308, 0x0301,
-    L(2)|0x0399, 0x0342,
-    L(3)|0x0399, 0x0308, 0x0342,
-    L(3)|0x03A5, 0x0308, 0x0300,
-    L(3)|0x03A5, 0x0308, 0x0301,
-    L(2)|0x03A1, 0x0313,
-    L(2)|0x03A5, 0x0342,
-    L(3)|0x03A5, 0x0308, 0x0342,
-    L(2)|0x1FFA, 0x0345, L(2)|0x1FFA, 0x0399,
-    L(1)|0x1FFC, L(2)|0x03A9, 0x0399,
-    L(2)|0x038F, 0x0345, L(2)|0x038F, 0x0399,
-    L(2)|0x03A9, 0x0342,
-    L(3)|0x03A9, 0x0342, 0x0345, L(3)|0x03A9, 0x0342, 0x0399,
-    L(2)|0x03C9, 0x0399, L(1)|0x1FF3, L(2)|0x03A9, 0x0399,
-    L(2)|0x0046, 0x0066, L(2)|0x0046, 0x0046,
-    L(2)|0x0046, 0x0069, L(2)|0x0046, 0x0049,
-    L(2)|0x0046, 0x006C, L(2)|0x0046, 0x004C,
-    L(3)|0x0046, 0x0066, 0x0069, L(3)|0x0046, 0x0046, 0x0049,
-    L(3)|0x0046, 0x0066, 0x006C, L(3)|0x0046, 0x0046, 0x004C,
-    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
-    L(2)|0x0053, 0x0074, L(2)|0x0053, 0x0054,
-    L(2)|0x0544, 0x0576, L(2)|0x0544, 0x0546,
-    L(2)|0x0544, 0x0565, L(2)|0x0544, 0x0535,
-    L(2)|0x0544, 0x056B, L(2)|0x0544, 0x053B,
-    L(2)|0x054E, 0x0576, L(2)|0x054E, 0x0546,
-    L(2)|0x0544, 0x056D, L(2)|0x0544, 0x053D,
-};
diff --git a/enc/unicode/9.0.0/name2ctype.h b/enc/unicode/9.0.0/name2ctype.h
deleted file mode 100644
index 20918666f5..0000000000
--- a/enc/unicode/9.0.0/name2ctype.h
+++ /dev/null
@@ -1,36639 +0,0 @@
-/* C code produced by gperf version 3.0.4 */
-/* 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,5-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
-
-
-
-/* 'NEWLINE': [[:NEWLINE:]] */
-static const OnigCodePoint CR_NEWLINE[] = {
-	1,
-	0x000a, 0x000a,
-}; /* CR_NEWLINE */
-
-/* 'Alpha': [[:Alpha:]] */
-static const OnigCodePoint CR_Alpha[] = {
-	644,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 0x065f,
-	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,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 0x08df,
-	0x08e3, 0x08e9,
-	0x08f0, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0971, 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,
-	0x0af9, 0x0af9,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c80, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce3,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d54, 0x0d57,
-	0x0d5f, 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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x103f,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1bac, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
-	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, 0x209c,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8c5, 0xa8c5,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11045,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x11100, 0x11132,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11234,
-	0x11237, 0x11237,
-	0x1123e, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112e8,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11400, 0x11441,
-	0x11443, 0x11445,
-	0x11447, 0x1144a,
-	0x11480, 0x114c1,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115b5,
-	0x115b8, 0x115be,
-	0x115d8, 0x115dd,
-	0x11600, 0x1163e,
-	0x11640, 0x11640,
-	0x11644, 0x11644,
-	0x11680, 0x116b5,
-	0x11700, 0x11719,
-	0x1171d, 0x1172a,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c3e,
-	0x11c40, 0x11c40,
-	0x11c72, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9e, 0x1bc9e,
-	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,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e900, 0x1e943,
-	0x1e947, 0x1e947,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alpha */
-
-/* 'Blank': [[:Blank:]] */
-static const OnigCodePoint CR_Blank[] = {
-	8,
-	0x0009, 0x0009,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Blank */
-
-/* 'Cntrl': [[:Cntrl:]] */
-static const OnigCodePoint CR_Cntrl[] = {
-	2,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-}; /* CR_Cntrl */
-
-/* 'Digit': [[:Digit:]] */
-static const OnigCodePoint CR_Digit[] = {
-	54,
-	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,
-	0x0de6, 0x0def,
-	0x0e50, 0x0e59,
-	0x0ed0, 0x0ed9,
-	0x0f20, 0x0f29,
-	0x1040, 0x1049,
-	0x1090, 0x1099,
-	0x17e0, 0x17e9,
-	0x1810, 0x1819,
-	0x1946, 0x194f,
-	0x19d0, 0x19d9,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1b50, 0x1b59,
-	0x1bb0, 0x1bb9,
-	0x1c40, 0x1c49,
-	0x1c50, 0x1c59,
-	0xa620, 0xa629,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xa9f0, 0xa9f9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x104a0, 0x104a9,
-	0x11066, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x112f0, 0x112f9,
-	0x11450, 0x11459,
-	0x114d0, 0x114d9,
-	0x11650, 0x11659,
-	0x116c0, 0x116c9,
-	0x11730, 0x11739,
-	0x118e0, 0x118e9,
-	0x11c50, 0x11c59,
-	0x16a60, 0x16a69,
-	0x16b50, 0x16b59,
-	0x1d7ce, 0x1d7ff,
-	0x1e950, 0x1e959,
-}; /* CR_Digit */
-
-/* 'Graph': [[:Graph:]] */
-static const OnigCodePoint CR_Graph[] = {
-	643,
-	0x0021, 0x007e,
-	0x00a1, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 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, 0x0af1,
-	0x0af9, 0x0af9,
-	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, 0x0b77,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4f,
-	0x0d54, 0x0d63,
-	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x167f,
-	0x1681, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e44,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3001, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c5,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11660, 0x1166c,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c45,
-	0x11c50, 0x11c6c,
-	0x11c70, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	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, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1e95e, 0x1e95f,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Graph */
-
-/* 'Lower': [[:Lower:]] */
-static const OnigCodePoint CR_Lower[] = {
-	640,
-	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,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	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,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	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,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	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,
-	0xa661, 0xa661,
-	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,
-	0xa699, 0xa699,
-	0xa69b, 0xa69d,
-	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,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa795,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xa7f8, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x104d8, 0x104fb,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-	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,
-	0x1e922, 0x1e943,
-}; /* CR_Lower */
-
-/* 'Print': [[:Print:]] */
-static const OnigCodePoint CR_Print[] = {
-	640,
-	0x0020, 0x007e,
-	0x00a0, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 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, 0x0af1,
-	0x0af9, 0x0af9,
-	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, 0x0b77,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4f,
-	0x0d54, 0x0d63,
-	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e44,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c5,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xe000, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11660, 0x1166c,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c45,
-	0x11c50, 0x11c6c,
-	0x11c70, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	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, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1e95e, 0x1e95f,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Print */
-
-/* 'Punct': [[:Punct:]] */
-static const OnigCodePoint CR_Punct[] = {
-	168,
-	0x0021, 0x0023,
-	0x0025, 0x002a,
-	0x002c, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005b, 0x005d,
-	0x005f, 0x005f,
-	0x007b, 0x007b,
-	0x007d, 0x007d,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00ab, 0x00ab,
-	0x00b6, 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,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f3a, 0x0f3d,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x1400, 0x1400,
-	0x166d, 0x166e,
-	0x169b, 0x169c,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2010, 0x2027,
-	0x2030, 0x2043,
-	0x2045, 0x2051,
-	0x2053, 0x205e,
-	0x207d, 0x207e,
-	0x208d, 0x208e,
-	0x2308, 0x230b,
-	0x2329, 0x232a,
-	0x2768, 0x2775,
-	0x27c5, 0x27c6,
-	0x27e6, 0x27ef,
-	0x2983, 0x2998,
-	0x29d8, 0x29db,
-	0x29fc, 0x29fd,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e2e,
-	0x2e30, 0x2e44,
-	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,
-	0xa8fc, 0xa8fc,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x1056f, 0x1056f,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10af0, 0x10af6,
-	0x10b39, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x11174, 0x11175,
-	0x111c5, 0x111c9,
-	0x111cd, 0x111cd,
-	0x111db, 0x111db,
-	0x111dd, 0x111df,
-	0x11238, 0x1123d,
-	0x112a9, 0x112a9,
-	0x1144b, 0x1144f,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x114c6, 0x114c6,
-	0x115c1, 0x115d7,
-	0x11641, 0x11643,
-	0x11660, 0x1166c,
-	0x1173c, 0x1173e,
-	0x11c41, 0x11c45,
-	0x11c70, 0x11c71,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b3b,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da87, 0x1da8b,
-	0x1e95e, 0x1e95f,
-}; /* CR_Punct */
-
-/* 'Space': [[:Space:]] */
-static const OnigCodePoint CR_Space[] = {
-	10,
-	0x0009, 0x000d,
-	0x0020, 0x0020,
-	0x0085, 0x0085,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x2028, 0x2029,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Space */
-
-/* 'Upper': [[:Upper:]] */
-static const OnigCodePoint CR_Upper[] = {
-	632,
-	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,
-	0x037f, 0x037f,
-	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,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	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,
-	0x2cf2, 0x2cf2,
-	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,
-	0xa660, 0xa660,
-	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,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	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,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ae,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x104b0, 0x104d3,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-	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,
-	0x1e900, 0x1e921,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Upper */
-
-/* 'XDigit': [[:XDigit:]] */
-static const OnigCodePoint CR_XDigit[] = {
-	3,
-	0x0030, 0x0039,
-	0x0041, 0x0046,
-	0x0061, 0x0066,
-}; /* CR_XDigit */
-
-/* 'Word': [[:Word:]] */
-static const OnigCodePoint CR_Word[] = {
-	679,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 0x08e1,
-	0x08e3, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0af9, 0x0af9,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c80, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d54, 0x0d57,
-	0x0d5f, 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,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1380, 0x138f,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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, 0x209c,
-	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, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c5,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0xfe2f,
-	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,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111ca, 0x111cc,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x1123e, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x1144a,
-	0x11450, 0x11459,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115d8, 0x115dd,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c40,
-	0x11c50, 0x11c59,
-	0x11c72, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_Word */
-
-/* 'Alnum': [[:Alnum:]] */
-static const OnigCodePoint CR_Alnum[] = {
-	678,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0657,
-	0x0659, 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,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 0x08df,
-	0x08e3, 0x08e9,
-	0x08f0, 0x093b,
-	0x093d, 0x094c,
-	0x094e, 0x0950,
-	0x0955, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0af9, 0x0af9,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c80, 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,
-	0x0cf1, 0x0cf2,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4e,
-	0x0d54, 0x0d57,
-	0x0d5f, 0x0d63,
-	0x0d66, 0x0d6f,
-	0x0d7a, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f20, 0x0f29,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f81,
-	0x0f88, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x1000, 0x1036,
-	0x1038, 0x1038,
-	0x103b, 0x1049,
-	0x1050, 0x1062,
-	0x1065, 0x1068,
-	0x106e, 0x1086,
-	0x108e, 0x108e,
-	0x1090, 0x1099,
-	0x109c, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	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, 0x191e,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1946, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x1a00, 0x1a1b,
-	0x1a20, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1a80, 0x1a89,
-	0x1a90, 0x1a99,
-	0x1aa7, 0x1aa7,
-	0x1b00, 0x1b33,
-	0x1b35, 0x1b43,
-	0x1b45, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b80, 0x1ba9,
-	0x1bac, 0x1be5,
-	0x1be7, 0x1bf1,
-	0x1c00, 0x1c35,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x1d00, 0x1dbf,
-	0x1de7, 0x1df4,
-	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, 0x209c,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66e,
-	0xa674, 0xa67b,
-	0xa67f, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c3,
-	0xa8c5, 0xa8c5,
-	0xa8d0, 0xa8d9,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92a,
-	0xa930, 0xa952,
-	0xa960, 0xa97c,
-	0xa980, 0xa9b2,
-	0xa9b4, 0xa9bf,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaabe,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11045,
-	0x11066, 0x1106f,
-	0x11082, 0x110b8,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11132,
-	0x11136, 0x1113f,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11180, 0x111bf,
-	0x111c1, 0x111c4,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11234,
-	0x11237, 0x11237,
-	0x1123e, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112e8,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11400, 0x11441,
-	0x11443, 0x11445,
-	0x11447, 0x1144a,
-	0x11450, 0x11459,
-	0x11480, 0x114c1,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115be,
-	0x115d8, 0x115dd,
-	0x11600, 0x1163e,
-	0x11640, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b5,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172a,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c3e,
-	0x11c40, 0x11c40,
-	0x11c50, 0x11c59,
-	0x11c72, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9e, 0x1bc9e,
-	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,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e900, 0x1e943,
-	0x1e947, 0x1e947,
-	0x1e950, 0x1e959,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Alnum */
-
-/* 'ASCII': [[:ASCII:]] */
-static const OnigCodePoint CR_ASCII[] = {
-	1,
-	0x0000, 0x007f,
-}; /* CR_ASCII */
-
-#ifdef USE_UNICODE_PROPERTIES
-/* 'Any': - */
-static const OnigCodePoint CR_Any[] = {
-	1,
-	0x0000, 0x10ffff,
-}; /* CR_Any */
-
-/* 'Assigned': - */
-static const OnigCodePoint CR_Assigned[] = {
-	638,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 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, 0x0af1,
-	0x0af9, 0x0af9,
-	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, 0x0b77,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4f,
-	0x0d54, 0x0d63,
-	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e44,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c5,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11660, 0x1166c,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c45,
-	0x11c50, 0x11c6c,
-	0x11c70, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	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, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1e95e, 0x1e95f,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xf0000, 0xffffd,
-	0x100000, 0x10fffd,
-}; /* CR_Assigned */
-
-/* 'C': Major Category */
-static const OnigCodePoint CR_C[] = {
-	642,
-	0x0000, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x0605,
-	0x061c, 0x061d,
-	0x06dd, 0x06dd,
-	0x070e, 0x070f,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b5, 0x08b5,
-	0x08be, 0x08d3,
-	0x08e2, 0x08e2,
-	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,
-	0x0af2, 0x0af8,
-	0x0afa, 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,
-	0x0b78, 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, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5b, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	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, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d50, 0x0d53,
-	0x0d64, 0x0d65,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f6, 0x13f7,
-	0x13fe, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 0x16ff,
-	0x170d, 0x170d,
-	0x1715, 0x171f,
-	0x1737, 0x173f,
-	0x1754, 0x175f,
-	0x176d, 0x176d,
-	0x1771, 0x1771,
-	0x1774, 0x177f,
-	0x17de, 0x17df,
-	0x17ea, 0x17ef,
-	0x17fa, 0x17ff,
-	0x180e, 0x180f,
-	0x181a, 0x181f,
-	0x1878, 0x187f,
-	0x18ab, 0x18af,
-	0x18f6, 0x18ff,
-	0x191f, 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, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c89, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfa,
-	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,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x206f,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20bf, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218c, 0x218f,
-	0x23ff, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2beb,
-	0x2bf0, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e45, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fd6, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa6f8, 0xa6ff,
-	0xa7af, 0xa7af,
-	0xa7b8, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c6, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fe, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab66, 0xab6f,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	0xfe53, 0xfe53,
-	0xfe67, 0xfe67,
-	0xfe6c, 0xfe6f,
-	0xfe75, 0xfe75,
-	0xfefd, 0xff00,
-	0xffbf, 0xffc1,
-	0xffc8, 0xffc9,
-	0xffd0, 0xffd1,
-	0xffd8, 0xffd9,
-	0xffdd, 0xffdf,
-	0xffe7, 0xffe7,
-	0xffef, 0xfffb,
-	0xfffe, 0xffff,
-	0x1000c, 0x1000c,
-	0x10027, 0x10027,
-	0x1003b, 0x1003b,
-	0x1003e, 0x1003e,
-	0x1004e, 0x1004f,
-	0x1005e, 0x1007f,
-	0x100fb, 0x100ff,
-	0x10103, 0x10106,
-	0x10134, 0x10136,
-	0x1018f, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104af,
-	0x104d4, 0x104d7,
-	0x104fc, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108df,
-	0x108f3, 0x108f3,
-	0x108f6, 0x108fa,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bb,
-	0x109d0, 0x109d1,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10c7f,
-	0x10cb3, 0x10cbf,
-	0x10cf3, 0x10cf9,
-	0x10d00, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110bd, 0x110bd,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111ce, 0x111cf,
-	0x111e0, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123f, 0x1127f,
-	0x11287, 0x11287,
-	0x11289, 0x11289,
-	0x1128e, 0x1128e,
-	0x1129e, 0x1129e,
-	0x112aa, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x112ff,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x1134f,
-	0x11351, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x113ff,
-	0x1145a, 0x1145a,
-	0x1145c, 0x1145c,
-	0x1145e, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115de, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1165f,
-	0x1166d, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x116ff,
-	0x1171a, 0x1171c,
-	0x1172c, 0x1172f,
-	0x11740, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11bff,
-	0x11c09, 0x11c09,
-	0x11c37, 0x11c37,
-	0x11c46, 0x11c4f,
-	0x11c6d, 0x11c6f,
-	0x11c90, 0x11c91,
-	0x11ca8, 0x11ca8,
-	0x11cb7, 0x11fff,
-	0x1239a, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x1247f,
-	0x12544, 0x12fff,
-	0x1342f, 0x143ff,
-	0x14647, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x16fdf,
-	0x16fe1, 0x16fff,
-	0x187ed, 0x187ff,
-	0x18af3, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca0, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d173, 0x1d17a,
-	0x1d1e9, 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,
-	0x1da8c, 0x1da9a,
-	0x1daa0, 0x1daa0,
-	0x1dab0, 0x1dfff,
-	0x1e007, 0x1e007,
-	0x1e019, 0x1e01a,
-	0x1e022, 0x1e022,
-	0x1e025, 0x1e025,
-	0x1e02b, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1e8ff,
-	0x1e94b, 0x1e94f,
-	0x1e95a, 0x1e95d,
-	0x1e960, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f1ad, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23c, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f6d3, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f7, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1f90f,
-	0x1f91f, 0x1f91f,
-	0x1f928, 0x1f92f,
-	0x1f931, 0x1f932,
-	0x1f93f, 0x1f93f,
-	0x1f94c, 0x1f94f,
-	0x1f95f, 0x1f97f,
-	0x1f992, 0x1f9bf,
-	0x1f9c1, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2b81f,
-	0x2cea2, 0x2f7ff,
-	0x2fa1e, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_C */
-
-/* 'Cc': General Category */
-#define CR_Cc CR_Cntrl
-
-/* 'Cf': General Category */
-static const OnigCodePoint CR_Cf[] = {
-	18,
-	0x00ad, 0x00ad,
-	0x0600, 0x0605,
-	0x061c, 0x061c,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x08e2, 0x08e2,
-	0x180e, 0x180e,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x2064,
-	0x2066, 0x206f,
-	0xfeff, 0xfeff,
-	0xfff9, 0xfffb,
-	0x110bd, 0x110bd,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Cf */
-
-/* 'Cn': General Category */
-static const OnigCodePoint CR_Cn[] = {
-	638,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x061d, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b5, 0x08b5,
-	0x08be, 0x08d3,
-	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,
-	0x0af2, 0x0af8,
-	0x0afa, 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,
-	0x0b78, 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, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5b, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	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, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d50, 0x0d53,
-	0x0d64, 0x0d65,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f6, 0x13f7,
-	0x13fe, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 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,
-	0x191f, 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, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c89, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfa,
-	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, 0x2065,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20bf, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218c, 0x218f,
-	0x23ff, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2beb,
-	0x2bf0, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e45, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fd6, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa6f8, 0xa6ff,
-	0xa7af, 0xa7af,
-	0xa7b8, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c6, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fe, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab66, 0xab6f,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xd7ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	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,
-	0x1018f, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104af,
-	0x104d4, 0x104d7,
-	0x104fc, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108df,
-	0x108f3, 0x108f3,
-	0x108f6, 0x108fa,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bb,
-	0x109d0, 0x109d1,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10c7f,
-	0x10cb3, 0x10cbf,
-	0x10cf3, 0x10cf9,
-	0x10d00, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111ce, 0x111cf,
-	0x111e0, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123f, 0x1127f,
-	0x11287, 0x11287,
-	0x11289, 0x11289,
-	0x1128e, 0x1128e,
-	0x1129e, 0x1129e,
-	0x112aa, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x112ff,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x1134f,
-	0x11351, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x113ff,
-	0x1145a, 0x1145a,
-	0x1145c, 0x1145c,
-	0x1145e, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115de, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1165f,
-	0x1166d, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x116ff,
-	0x1171a, 0x1171c,
-	0x1172c, 0x1172f,
-	0x11740, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11bff,
-	0x11c09, 0x11c09,
-	0x11c37, 0x11c37,
-	0x11c46, 0x11c4f,
-	0x11c6d, 0x11c6f,
-	0x11c90, 0x11c91,
-	0x11ca8, 0x11ca8,
-	0x11cb7, 0x11fff,
-	0x1239a, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x1247f,
-	0x12544, 0x12fff,
-	0x1342f, 0x143ff,
-	0x14647, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x16fdf,
-	0x16fe1, 0x16fff,
-	0x187ed, 0x187ff,
-	0x18af3, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1e9, 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,
-	0x1da8c, 0x1da9a,
-	0x1daa0, 0x1daa0,
-	0x1dab0, 0x1dfff,
-	0x1e007, 0x1e007,
-	0x1e019, 0x1e01a,
-	0x1e022, 0x1e022,
-	0x1e025, 0x1e025,
-	0x1e02b, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1e8ff,
-	0x1e94b, 0x1e94f,
-	0x1e95a, 0x1e95d,
-	0x1e960, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f1ad, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23c, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f6d3, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f7, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1f90f,
-	0x1f91f, 0x1f91f,
-	0x1f928, 0x1f92f,
-	0x1f931, 0x1f932,
-	0x1f93f, 0x1f93f,
-	0x1f94c, 0x1f94f,
-	0x1f95f, 0x1f97f,
-	0x1f992, 0x1f9bf,
-	0x1f9c1, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2b81f,
-	0x2cea2, 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[] = {
-	571,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 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,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c80, 0x0c80,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d54, 0x0d56,
-	0x0d5f, 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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16f1, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dc,
-	0x1820, 0x1877,
-	0x1880, 0x1884,
-	0x1887, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	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, 0x209c,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6e5,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0x1031f,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10400, 0x1049d,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11400, 0x11434,
-	0x11447, 0x1144a,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c2e,
-	0x11c40, 0x11c40,
-	0x11c72, 0x11c8f,
-	0x12000, 0x12399,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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,
-	0x1e800, 0x1e8c4,
-	0x1e900, 0x1e943,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_L */
-
-/* 'LC': General Category */
-static const OnigCodePoint CR_LC[] = {
-	126,
-	0x0041, 0x005a,
-	0x0061, 0x007a,
-	0x00b5, 0x00b5,
-	0x00c0, 0x00d6,
-	0x00d8, 0x00f6,
-	0x00f8, 0x01ba,
-	0x01bc, 0x01bf,
-	0x01c4, 0x0293,
-	0x0295, 0x02af,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	0x1d00, 0x1d2b,
-	0x1d6b, 0x1d77,
-	0x1d79, 0x1d9a,
-	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,
-	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,
-	0x2183, 0x2184,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c7b,
-	0x2c7e, 0x2ce4,
-	0x2ceb, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69b,
-	0xa722, 0xa76f,
-	0xa771, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7fa, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab60, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x118a0, 0x118df,
-	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,
-	0x1e900, 0x1e943,
-}; /* CR_LC */
-
-/* 'Ll': General Category */
-static const OnigCodePoint CR_Ll[] = {
-	633,
-	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, 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,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	0x1d00, 0x1d2b,
-	0x1d6b, 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, 0x2c7b,
-	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,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	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,
-	0xa661, 0xa661,
-	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,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	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,
-	0xa78e, 0xa78e,
-	0xa791, 0xa791,
-	0xa793, 0xa795,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xa7fa, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab60, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x104d8, 0x104fb,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-	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,
-	0x1e922, 0x1e943,
-}; /* CR_Ll */
-
-/* 'Lm': General Category */
-static const OnigCodePoint CR_Lm[] = {
-	57,
-	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, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2c7c, 0x2c7d,
-	0x2d6f, 0x2d6f,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69d,
-	0xa717, 0xa71f,
-	0xa770, 0xa770,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa9cf, 0xa9cf,
-	0xa9e6, 0xa9e6,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xab5c, 0xab5f,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0x16b40, 0x16b43,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-}; /* CR_Lm */
-
-/* 'Lo': General Category */
-static const OnigCodePoint CR_Lo[] = {
-	445,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x01bb, 0x01bb,
-	0x01c0, 0x01c3,
-	0x0294, 0x0294,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 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,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0972, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c80, 0x0c80,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d54, 0x0d56,
-	0x0d5f, 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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10d0, 0x10fa,
-	0x10fd, 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,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16f1, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1711,
-	0x1720, 0x1731,
-	0x1740, 0x1751,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1780, 0x17b3,
-	0x17dc, 0x17dc,
-	0x1820, 0x1842,
-	0x1844, 0x1877,
-	0x1880, 0x1884,
-	0x1887, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c77,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	0x2135, 0x2138,
-	0x2d30, 0x2d67,
-	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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa014,
-	0xa016, 0xa48c,
-	0xa4d0, 0xa4f7,
-	0xa500, 0xa60b,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa66e, 0xa66e,
-	0xa6a0, 0xa6e5,
-	0xa78f, 0xa78f,
-	0xa7f7, 0xa7f7,
-	0xa7fb, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9e0, 0xa9e4,
-	0xa9e7, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa6f,
-	0xaa71, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadc,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf2,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0x1031f,
-	0x10330, 0x10340,
-	0x10342, 0x10349,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x10450, 0x1049d,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11400, 0x11434,
-	0x11447, 0x1144a,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c2e,
-	0x11c40, 0x11c40,
-	0x11c72, 0x11c8f,
-	0x12000, 0x12399,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1e800, 0x1e8c4,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	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[] = {
-	627,
-	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,
-	0x037f, 0x037f,
-	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,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	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,
-	0x2cf2, 0x2cf2,
-	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,
-	0xa660, 0xa660,
-	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,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	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,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ae,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x104b0, 0x104d3,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-	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,
-	0x1e900, 0x1e921,
-}; /* CR_Lu */
-
-/* 'M': Major Category */
-static const OnigCodePoint CR_M[] = {
-	250,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	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,
-	0x0859, 0x085b,
-	0x08d4, 0x08e1,
-	0x08e3, 0x0903,
-	0x093a, 0x093c,
-	0x093e, 0x094f,
-	0x0951, 0x0957,
-	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,
-	0x0c00, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0cbc, 0x0cbc,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 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,
-	0x0f8d, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x102b, 0x103e,
-	0x1056, 0x1059,
-	0x105e, 0x1060,
-	0x1062, 0x1064,
-	0x1067, 0x106d,
-	0x1071, 0x1074,
-	0x1082, 0x108d,
-	0x108f, 0x108f,
-	0x109a, 0x109d,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x1885, 0x1886,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a60, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b04,
-	0x1b34, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1bad,
-	0x1be6, 0x1bf3,
-	0x1c24, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf2, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfb, 0x1dff,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69e, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c5,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa953,
-	0xa980, 0xa983,
-	0xa9b3, 0xa9c0,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaa7b, 0xaa7d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf6,
-	0xabe3, 0xabea,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11000, 0x11002,
-	0x11038, 0x11046,
-	0x1107f, 0x11082,
-	0x110b0, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11182,
-	0x111b3, 0x111c0,
-	0x111ca, 0x111cc,
-	0x1122c, 0x11237,
-	0x1123e, 0x1123e,
-	0x112df, 0x112ea,
-	0x11300, 0x11303,
-	0x1133c, 0x1133c,
-	0x1133e, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11435, 0x11446,
-	0x114b0, 0x114c3,
-	0x115af, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11630, 0x11640,
-	0x116ab, 0x116b7,
-	0x1171d, 0x1172b,
-	0x11c2f, 0x11c36,
-	0x11c38, 0x11c3f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f51, 0x16f7e,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d165, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e8d0, 0x1e8d6,
-	0x1e944, 0x1e94a,
-	0xe0100, 0xe01ef,
-}; /* CR_M */
-
-/* 'Mc': General Category */
-static const OnigCodePoint CR_Mc[] = {
-	155,
-	0x0903, 0x0903,
-	0x093b, 0x093b,
-	0x093e, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x094f,
-	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,
-	0x1a19, 0x1a1a,
-	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,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf3,
-	0x302e, 0x302f,
-	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,
-	0xaa7d, 0xaa7d,
-	0xaaeb, 0xaaeb,
-	0xaaee, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	0x1112c, 0x1112c,
-	0x11182, 0x11182,
-	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
-	0x1122c, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x112e0, 0x112e2,
-	0x11302, 0x11303,
-	0x1133e, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x11435, 0x11437,
-	0x11440, 0x11441,
-	0x11445, 0x11445,
-	0x114b0, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114be,
-	0x114c1, 0x114c1,
-	0x115af, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x11630, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x11720, 0x11721,
-	0x11726, 0x11726,
-	0x11c2f, 0x11c2f,
-	0x11c3e, 0x11c3e,
-	0x11ca9, 0x11ca9,
-	0x11cb1, 0x11cb1,
-	0x11cb4, 0x11cb4,
-	0x16f51, 0x16f7e,
-	0x1d165, 0x1d166,
-	0x1d16d, 0x1d172,
-}; /* CR_Mc */
-
-/* 'Me': General Category */
-static const OnigCodePoint CR_Me[] = {
-	5,
-	0x0488, 0x0489,
-	0x1abe, 0x1abe,
-	0x20dd, 0x20e0,
-	0x20e2, 0x20e4,
-	0xa670, 0xa672,
-}; /* CR_Me */
-
-/* 'Mn': General Category */
-static const OnigCodePoint CR_Mn[] = {
-	285,
-	0x0300, 0x036f,
-	0x0483, 0x0487,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	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,
-	0x0859, 0x085b,
-	0x08d4, 0x08e1,
-	0x08e3, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	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,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	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,
-	0x0f8d, 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,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x1885, 0x1886,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfb, 0x1dff,
-	0x20d0, 0x20dc,
-	0x20e1, 0x20e1,
-	0x20e5, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xa66f, 0xa66f,
-	0xa674, 0xa67d,
-	0xa69e, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c5,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x111ca, 0x111cc,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x1123e, 0x1123e,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11300, 0x11301,
-	0x1133c, 0x1133c,
-	0x11340, 0x11340,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11438, 0x1143f,
-	0x11442, 0x11444,
-	0x11446, 0x11446,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
-	0x11722, 0x11725,
-	0x11727, 0x1172b,
-	0x11c30, 0x11c36,
-	0x11c38, 0x11c3d,
-	0x11c3f, 0x11c3f,
-	0x11c92, 0x11ca7,
-	0x11caa, 0x11cb0,
-	0x11cb2, 0x11cb3,
-	0x11cb5, 0x11cb6,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d167, 0x1d169,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e8d0, 0x1e8d6,
-	0x1e944, 0x1e94a,
-	0xe0100, 0xe01ef,
-}; /* CR_Mn */
-
-/* 'N': Major Category */
-static const OnigCodePoint CR_N[] = {
-	115,
-	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,
-	0x0b72, 0x0b77,
-	0x0be6, 0x0bf2,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7e,
-	0x0ce6, 0x0cef,
-	0x0d58, 0x0d5e,
-	0x0d66, 0x0d78,
-	0x0de6, 0x0def,
-	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,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa620, 0xa629,
-	0xa6e6, 0xa6ef,
-	0xa830, 0xa835,
-	0xa8d0, 0xa8d9,
-	0xa900, 0xa909,
-	0xa9d0, 0xa9d9,
-	0xa9f0, 0xa9f9,
-	0xaa50, 0xaa59,
-	0xabf0, 0xabf9,
-	0xff10, 0xff19,
-	0x10107, 0x10133,
-	0x10140, 0x10178,
-	0x1018a, 0x1018b,
-	0x102e1, 0x102fb,
-	0x10320, 0x10323,
-	0x10341, 0x10341,
-	0x1034a, 0x1034a,
-	0x103d1, 0x103d5,
-	0x104a0, 0x104a9,
-	0x10858, 0x1085f,
-	0x10879, 0x1087f,
-	0x108a7, 0x108af,
-	0x108fb, 0x108ff,
-	0x10916, 0x1091b,
-	0x109bc, 0x109bd,
-	0x109c0, 0x109cf,
-	0x109d2, 0x109ff,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10a9d, 0x10a9f,
-	0x10aeb, 0x10aef,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10ba9, 0x10baf,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11052, 0x1106f,
-	0x110f0, 0x110f9,
-	0x11136, 0x1113f,
-	0x111d0, 0x111d9,
-	0x111e1, 0x111f4,
-	0x112f0, 0x112f9,
-	0x11450, 0x11459,
-	0x114d0, 0x114d9,
-	0x11650, 0x11659,
-	0x116c0, 0x116c9,
-	0x11730, 0x1173b,
-	0x118e0, 0x118f2,
-	0x11c50, 0x11c6c,
-	0x12400, 0x1246e,
-	0x16a60, 0x16a69,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x1d360, 0x1d371,
-	0x1d7ce, 0x1d7ff,
-	0x1e8c7, 0x1e8cf,
-	0x1e950, 0x1e959,
-	0x1f100, 0x1f10c,
-}; /* CR_N */
-
-/* 'Nd': General Category */
-#define CR_Nd CR_Digit
-
-/* '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, 0x1246e,
-}; /* CR_Nl */
-
-/* 'No': General Category */
-static const OnigCodePoint CR_No[] = {
-	60,
-	0x00b2, 0x00b3,
-	0x00b9, 0x00b9,
-	0x00bc, 0x00be,
-	0x09f4, 0x09f9,
-	0x0b72, 0x0b77,
-	0x0bf0, 0x0bf2,
-	0x0c78, 0x0c7e,
-	0x0d58, 0x0d5e,
-	0x0d70, 0x0d78,
-	0x0f2a, 0x0f33,
-	0x1369, 0x137c,
-	0x17f0, 0x17f9,
-	0x19da, 0x19da,
-	0x2070, 0x2070,
-	0x2074, 0x2079,
-	0x2080, 0x2089,
-	0x2150, 0x215f,
-	0x2189, 0x2189,
-	0x2460, 0x249b,
-	0x24ea, 0x24ff,
-	0x2776, 0x2793,
-	0x2cfd, 0x2cfd,
-	0x3192, 0x3195,
-	0x3220, 0x3229,
-	0x3248, 0x324f,
-	0x3251, 0x325f,
-	0x3280, 0x3289,
-	0x32b1, 0x32bf,
-	0xa830, 0xa835,
-	0x10107, 0x10133,
-	0x10175, 0x10178,
-	0x1018a, 0x1018b,
-	0x102e1, 0x102fb,
-	0x10320, 0x10323,
-	0x10858, 0x1085f,
-	0x10879, 0x1087f,
-	0x108a7, 0x108af,
-	0x108fb, 0x108ff,
-	0x10916, 0x1091b,
-	0x109bc, 0x109bd,
-	0x109c0, 0x109cf,
-	0x109d2, 0x109ff,
-	0x10a40, 0x10a47,
-	0x10a7d, 0x10a7e,
-	0x10a9d, 0x10a9f,
-	0x10aeb, 0x10aef,
-	0x10b58, 0x10b5f,
-	0x10b78, 0x10b7f,
-	0x10ba9, 0x10baf,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11052, 0x11065,
-	0x111e1, 0x111f4,
-	0x1173a, 0x1173b,
-	0x118ea, 0x118f2,
-	0x11c5a, 0x11c6c,
-	0x16b5b, 0x16b61,
-	0x1d360, 0x1d371,
-	0x1e8c7, 0x1e8cf,
-	0x1f100, 0x1f10c,
-}; /* CR_No */
-
-/* 'P': Major Category */
-#define CR_P CR_Punct
-
-/* '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[] = {
-	17,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x2e40, 0x2e40,
-	0x301c, 0x301c,
-	0x3030, 0x3030,
-	0x30a0, 0x30a0,
-	0xfe31, 0xfe32,
-	0xfe58, 0xfe58,
-	0xfe63, 0xfe63,
-	0xff0d, 0xff0d,
-}; /* CR_Pd */
-
-/* 'Pe': General Category */
-static const OnigCodePoint CR_Pe[] = {
-	72,
-	0x0029, 0x0029,
-	0x005d, 0x005d,
-	0x007d, 0x007d,
-	0x0f3b, 0x0f3b,
-	0x0f3d, 0x0f3d,
-	0x169c, 0x169c,
-	0x2046, 0x2046,
-	0x207e, 0x207e,
-	0x208e, 0x208e,
-	0x2309, 0x2309,
-	0x230b, 0x230b,
-	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,
-	0xfd3e, 0xfd3e,
-	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[] = {
-	165,
-	0x0021, 0x0023,
-	0x0025, 0x0027,
-	0x002a, 0x002a,
-	0x002c, 0x002c,
-	0x002e, 0x002f,
-	0x003a, 0x003b,
-	0x003f, 0x0040,
-	0x005c, 0x005c,
-	0x00a1, 0x00a1,
-	0x00a7, 0x00a7,
-	0x00b6, 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,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0970, 0x0970,
-	0x0af0, 0x0af0,
-	0x0df4, 0x0df4,
-	0x0e4f, 0x0e4f,
-	0x0e5a, 0x0e5b,
-	0x0f04, 0x0f12,
-	0x0f14, 0x0f14,
-	0x0f85, 0x0f85,
-	0x0fd0, 0x0fd4,
-	0x0fd9, 0x0fda,
-	0x104a, 0x104f,
-	0x10fb, 0x10fb,
-	0x1360, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x17d4, 0x17d6,
-	0x17d8, 0x17da,
-	0x1800, 0x1805,
-	0x1807, 0x180a,
-	0x1944, 0x1945,
-	0x1a1e, 0x1a1f,
-	0x1aa0, 0x1aa6,
-	0x1aa8, 0x1aad,
-	0x1b5a, 0x1b60,
-	0x1bfc, 0x1bff,
-	0x1c3b, 0x1c3f,
-	0x1c7e, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x2016, 0x2017,
-	0x2020, 0x2027,
-	0x2030, 0x2038,
-	0x203b, 0x203e,
-	0x2041, 0x2043,
-	0x2047, 0x2051,
-	0x2053, 0x2053,
-	0x2055, 0x205e,
-	0x2cf9, 0x2cfc,
-	0x2cfe, 0x2cff,
-	0x2d70, 0x2d70,
-	0x2e00, 0x2e01,
-	0x2e06, 0x2e08,
-	0x2e0b, 0x2e0b,
-	0x2e0e, 0x2e16,
-	0x2e18, 0x2e19,
-	0x2e1b, 0x2e1b,
-	0x2e1e, 0x2e1f,
-	0x2e2a, 0x2e2e,
-	0x2e30, 0x2e39,
-	0x2e3c, 0x2e3f,
-	0x2e41, 0x2e41,
-	0x2e43, 0x2e44,
-	0x3001, 0x3003,
-	0x303d, 0x303d,
-	0x30fb, 0x30fb,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa673, 0xa673,
-	0xa67e, 0xa67e,
-	0xa6f2, 0xa6f7,
-	0xa874, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa8f8, 0xa8fa,
-	0xa8fc, 0xa8fc,
-	0xa92e, 0xa92f,
-	0xa95f, 0xa95f,
-	0xa9c1, 0xa9cd,
-	0xa9de, 0xa9df,
-	0xaa5c, 0xaa5f,
-	0xaade, 0xaadf,
-	0xaaf0, 0xaaf1,
-	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, 0x10102,
-	0x1039f, 0x1039f,
-	0x103d0, 0x103d0,
-	0x1056f, 0x1056f,
-	0x10857, 0x10857,
-	0x1091f, 0x1091f,
-	0x1093f, 0x1093f,
-	0x10a50, 0x10a58,
-	0x10a7f, 0x10a7f,
-	0x10af0, 0x10af6,
-	0x10b39, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x11140, 0x11143,
-	0x11174, 0x11175,
-	0x111c5, 0x111c9,
-	0x111cd, 0x111cd,
-	0x111db, 0x111db,
-	0x111dd, 0x111df,
-	0x11238, 0x1123d,
-	0x112a9, 0x112a9,
-	0x1144b, 0x1144f,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x114c6, 0x114c6,
-	0x115c1, 0x115d7,
-	0x11641, 0x11643,
-	0x11660, 0x1166c,
-	0x1173c, 0x1173e,
-	0x11c41, 0x11c45,
-	0x11c70, 0x11c71,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b3b,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da87, 0x1da8b,
-	0x1e95e, 0x1e95f,
-}; /* CR_Po */
-
-/* 'Ps': General Category */
-static const OnigCodePoint CR_Ps[] = {
-	75,
-	0x0028, 0x0028,
-	0x005b, 0x005b,
-	0x007b, 0x007b,
-	0x0f3a, 0x0f3a,
-	0x0f3c, 0x0f3c,
-	0x169b, 0x169b,
-	0x201a, 0x201a,
-	0x201e, 0x201e,
-	0x2045, 0x2045,
-	0x207d, 0x207d,
-	0x208d, 0x208d,
-	0x2308, 0x2308,
-	0x230a, 0x230a,
-	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,
-	0x2e42, 0x2e42,
-	0x3008, 0x3008,
-	0x300a, 0x300a,
-	0x300c, 0x300c,
-	0x300e, 0x300e,
-	0x3010, 0x3010,
-	0x3014, 0x3014,
-	0x3016, 0x3016,
-	0x3018, 0x3018,
-	0x301a, 0x301a,
-	0x301d, 0x301d,
-	0xfd3f, 0xfd3f,
-	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[] = {
-	218,
-	0x0024, 0x0024,
-	0x002b, 0x002b,
-	0x003c, 0x003e,
-	0x005e, 0x005e,
-	0x0060, 0x0060,
-	0x007c, 0x007c,
-	0x007e, 0x007e,
-	0x00a2, 0x00a6,
-	0x00a8, 0x00a9,
-	0x00ac, 0x00ac,
-	0x00ae, 0x00b1,
-	0x00b4, 0x00b4,
-	0x00b8, 0x00b8,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02c2, 0x02c5,
-	0x02d2, 0x02df,
-	0x02e5, 0x02eb,
-	0x02ed, 0x02ed,
-	0x02ef, 0x02ff,
-	0x0375, 0x0375,
-	0x0384, 0x0385,
-	0x03f6, 0x03f6,
-	0x0482, 0x0482,
-	0x058d, 0x058f,
-	0x0606, 0x0608,
-	0x060b, 0x060b,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09f2, 0x09f3,
-	0x09fa, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d4f, 0x0d4f,
-	0x0d79, 0x0d79,
-	0x0e3f, 0x0e3f,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x17db, 0x17db,
-	0x1940, 0x1940,
-	0x19de, 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, 0x20be,
-	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,
-	0x218a, 0x218b,
-	0x2190, 0x2307,
-	0x230c, 0x2328,
-	0x232b, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x2767,
-	0x2794, 0x27c4,
-	0x27c7, 0x27e5,
-	0x27f0, 0x2982,
-	0x2999, 0x29d7,
-	0x29dc, 0x29fb,
-	0x29fe, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	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, 0x3247,
-	0x3250, 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,
-	0xab5b, 0xab5b,
-	0xfb29, 0xfb29,
-	0xfbb2, 0xfbc1,
-	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,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x1018c, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10877, 0x10878,
-	0x10ac8, 0x10ac8,
-	0x1173f, 0x1173f,
-	0x16b3c, 0x16b3f,
-	0x16b45, 0x16b45,
-	0x1bc9c, 0x1bc9c,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	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,
-	0x1d800, 0x1d9ff,
-	0x1da37, 0x1da3a,
-	0x1da6d, 0x1da74,
-	0x1da76, 0x1da83,
-	0x1da85, 0x1da86,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-}; /* CR_S */
-
-/* 'Sc': General Category */
-static const OnigCodePoint CR_Sc[] = {
-	17,
-	0x0024, 0x0024,
-	0x00a2, 0x00a5,
-	0x058f, 0x058f,
-	0x060b, 0x060b,
-	0x09f2, 0x09f3,
-	0x09fb, 0x09fb,
-	0x0af1, 0x0af1,
-	0x0bf9, 0x0bf9,
-	0x0e3f, 0x0e3f,
-	0x17db, 0x17db,
-	0x20a0, 0x20be,
-	0xa838, 0xa838,
-	0xfdfc, 0xfdfc,
-	0xfe69, 0xfe69,
-	0xff04, 0xff04,
-	0xffe0, 0xffe1,
-	0xffe5, 0xffe6,
-}; /* CR_Sc */
-
-/* 'Sk': General Category */
-static const OnigCodePoint CR_Sk[] = {
-	29,
-	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,
-	0xab5b, 0xab5b,
-	0xfbb2, 0xfbc1,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xffe3, 0xffe3,
-	0x1f3fb, 0x1f3ff,
-}; /* CR_Sk */
-
-/* 'Sm': General Category */
-static const OnigCodePoint CR_Sm[] = {
-	64,
-	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,
-	0x2118, 0x2118,
-	0x2140, 0x2144,
-	0x214b, 0x214b,
-	0x2190, 0x2194,
-	0x219a, 0x219b,
-	0x21a0, 0x21a0,
-	0x21a3, 0x21a3,
-	0x21a6, 0x21a6,
-	0x21ae, 0x21ae,
-	0x21ce, 0x21cf,
-	0x21d2, 0x21d2,
-	0x21d4, 0x21d4,
-	0x21f4, 0x22ff,
-	0x2320, 0x2321,
-	0x237c, 0x237c,
-	0x239b, 0x23b3,
-	0x23dc, 0x23e1,
-	0x25b7, 0x25b7,
-	0x25c1, 0x25c1,
-	0x25f8, 0x25ff,
-	0x266f, 0x266f,
-	0x27c0, 0x27c4,
-	0x27c7, 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,
-	0x1eef0, 0x1eef1,
-}; /* CR_Sm */
-
-/* 'So': General Category */
-static const OnigCodePoint CR_So[] = {
-	174,
-	0x00a6, 0x00a6,
-	0x00a9, 0x00a9,
-	0x00ae, 0x00ae,
-	0x00b0, 0x00b0,
-	0x0482, 0x0482,
-	0x058d, 0x058e,
-	0x060e, 0x060f,
-	0x06de, 0x06de,
-	0x06e9, 0x06e9,
-	0x06fd, 0x06fe,
-	0x07f6, 0x07f6,
-	0x09fa, 0x09fa,
-	0x0b70, 0x0b70,
-	0x0bf3, 0x0bf8,
-	0x0bfa, 0x0bfa,
-	0x0c7f, 0x0c7f,
-	0x0d4f, 0x0d4f,
-	0x0d79, 0x0d79,
-	0x0f01, 0x0f03,
-	0x0f13, 0x0f13,
-	0x0f15, 0x0f17,
-	0x0f1a, 0x0f1f,
-	0x0f34, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fcf,
-	0x0fd5, 0x0fd8,
-	0x109e, 0x109f,
-	0x1390, 0x1399,
-	0x1940, 0x1940,
-	0x19de, 0x19ff,
-	0x1b61, 0x1b6a,
-	0x1b74, 0x1b7c,
-	0x2100, 0x2101,
-	0x2103, 0x2106,
-	0x2108, 0x2109,
-	0x2114, 0x2114,
-	0x2116, 0x2117,
-	0x211e, 0x2123,
-	0x2125, 0x2125,
-	0x2127, 0x2127,
-	0x2129, 0x2129,
-	0x212e, 0x212e,
-	0x213a, 0x213b,
-	0x214a, 0x214a,
-	0x214c, 0x214d,
-	0x214f, 0x214f,
-	0x218a, 0x218b,
-	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, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x249c, 0x24e9,
-	0x2500, 0x25b6,
-	0x25b8, 0x25c0,
-	0x25c2, 0x25f7,
-	0x2600, 0x266e,
-	0x2670, 0x2767,
-	0x2794, 0x27bf,
-	0x2800, 0x28ff,
-	0x2b00, 0x2b2f,
-	0x2b45, 0x2b46,
-	0x2b4d, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	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, 0x3247,
-	0x3250, 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,
-	0x10137, 0x1013f,
-	0x10179, 0x10189,
-	0x1018c, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10877, 0x10878,
-	0x10ac8, 0x10ac8,
-	0x1173f, 0x1173f,
-	0x16b3c, 0x16b3f,
-	0x16b45, 0x16b45,
-	0x1bc9c, 0x1bc9c,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d16a, 0x1d16c,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	0x1d200, 0x1d241,
-	0x1d245, 0x1d245,
-	0x1d300, 0x1d356,
-	0x1d800, 0x1d9ff,
-	0x1da37, 0x1da3a,
-	0x1da6d, 0x1da74,
-	0x1da76, 0x1da83,
-	0x1da85, 0x1da86,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f3fa,
-	0x1f400, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-}; /* CR_So */
-
-/* 'Z': Major Category */
-static const OnigCodePoint CR_Z[] = {
-	8,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	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[] = {
-	7,
-	0x0020, 0x0020,
-	0x00a0, 0x00a0,
-	0x1680, 0x1680,
-	0x2000, 0x200a,
-	0x202f, 0x202f,
-	0x205f, 0x205f,
-	0x3000, 0x3000,
-}; /* CR_Zs */
-
-/* 'Math': Derived Property */
-static const OnigCodePoint CR_Math[] = {
-	138,
-	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,
-	0x2107, 0x2107,
-	0x210a, 0x2113,
-	0x2115, 0x2115,
-	0x2118, 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, 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,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* CR_Math */
-
-/* 'Alphabetic': Derived Property */
-#define CR_Alphabetic CR_Alpha
-
-/* 'Lowercase': Derived Property */
-#define CR_Lowercase CR_Lower
-
-/* 'Uppercase': Derived Property */
-#define CR_Uppercase CR_Upper
-
-/* 'Cased': Derived Property */
-static const OnigCodePoint CR_Cased[] = {
-	135,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	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, 0x209c,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69d,
-	0xa722, 0xa787,
-	0xa78b, 0xa78e,
-	0xa790, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f8, 0xa7fa,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x118a0, 0x118df,
-	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,
-	0x1e900, 0x1e943,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Cased */
-
-/* 'Case_Ignorable': Derived Property */
-static const OnigCodePoint CR_Case_Ignorable[] = {
-	365,
-	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, 0x0605,
-	0x0610, 0x061a,
-	0x061c, 0x061c,
-	0x0640, 0x0640,
-	0x064b, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dd,
-	0x06df, 0x06e8,
-	0x06ea, 0x06ed,
-	0x070f, 0x070f,
-	0x0711, 0x0711,
-	0x0730, 0x074a,
-	0x07a6, 0x07b0,
-	0x07eb, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0816, 0x082d,
-	0x0859, 0x085b,
-	0x08d4, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	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,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	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,
-	0x0f8d, 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,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dd, 0x17dd,
-	0x180b, 0x180e,
-	0x1843, 0x1843,
-	0x1885, 0x1886,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1aa7, 0x1aa7,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1df5,
-	0x1dfb, 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,
-	0x2066, 0x206f,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x20d0, 0x20f0,
-	0x2c7c, 0x2c7d,
-	0x2cef, 0x2cf1,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x2e2f, 0x2e2f,
-	0x3005, 0x3005,
-	0x302a, 0x302d,
-	0x3031, 0x3035,
-	0x303b, 0x303b,
-	0x3099, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa4f8, 0xa4fd,
-	0xa60c, 0xa60c,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa67f, 0xa67f,
-	0xa69c, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa700, 0xa721,
-	0xa770, 0xa770,
-	0xa788, 0xa78a,
-	0xa7f8, 0xa7f9,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c5,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9cf, 0xa9cf,
-	0xa9e5, 0xa9e6,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa70, 0xaa70,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaadd, 0xaadd,
-	0xaaec, 0xaaed,
-	0xaaf3, 0xaaf4,
-	0xaaf6, 0xaaf6,
-	0xab5b, 0xab5f,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfbb2, 0xfbc1,
-	0xfe00, 0xfe0f,
-	0xfe13, 0xfe13,
-	0xfe20, 0xfe2f,
-	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,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x110bd, 0x110bd,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x111ca, 0x111cc,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x1123e, 0x1123e,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11300, 0x11301,
-	0x1133c, 0x1133c,
-	0x11340, 0x11340,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11438, 0x1143f,
-	0x11442, 0x11444,
-	0x11446, 0x11446,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
-	0x11722, 0x11725,
-	0x11727, 0x1172b,
-	0x11c30, 0x11c36,
-	0x11c38, 0x11c3d,
-	0x11c3f, 0x11c3f,
-	0x11c92, 0x11ca7,
-	0x11caa, 0x11cb0,
-	0x11cb2, 0x11cb3,
-	0x11cb5, 0x11cb6,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x1bc9d, 0x1bc9e,
-	0x1bca0, 0x1bca3,
-	0x1d167, 0x1d169,
-	0x1d173, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e8d0, 0x1e8d6,
-	0x1e944, 0x1e94a,
-	0x1f3fb, 0x1f3ff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-}; /* CR_Case_Ignorable */
-
-/* 'Changes_When_Lowercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Lowercased[] = {
-	590,
-	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,
-	0x037f, 0x037f,
-	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,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	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,
-	0x2cf2, 0x2cf2,
-	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,
-	0xa660, 0xa660,
-	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,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	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,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ae,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x104b0, 0x104d3,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-	0x1e900, 0x1e921,
-}; /* CR_Changes_When_Lowercased */
-
-/* 'Changes_When_Uppercased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Uppercased[] = {
-	607,
-	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, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029d, 0x029e,
-	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, 0x03f3,
-	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,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	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,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	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,
-	0xa661, 0xa661,
-	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,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	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,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xab53, 0xab53,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x104d8, 0x104fb,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-	0x1e922, 0x1e943,
-}; /* CR_Changes_When_Uppercased */
-
-/* 'Changes_When_Titlecased': Derived Property */
-static const OnigCodePoint CR_Changes_When_Titlecased[] = {
-	608,
-	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, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029d, 0x029e,
-	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, 0x03f3,
-	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,
-	0x0527, 0x0527,
-	0x0529, 0x0529,
-	0x052b, 0x052b,
-	0x052d, 0x052d,
-	0x052f, 0x052f,
-	0x0561, 0x0587,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	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,
-	0x2cf3, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	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,
-	0xa661, 0xa661,
-	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,
-	0xa699, 0xa699,
-	0xa69b, 0xa69b,
-	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,
-	0xa791, 0xa791,
-	0xa793, 0xa793,
-	0xa797, 0xa797,
-	0xa799, 0xa799,
-	0xa79b, 0xa79b,
-	0xa79d, 0xa79d,
-	0xa79f, 0xa79f,
-	0xa7a1, 0xa7a1,
-	0xa7a3, 0xa7a3,
-	0xa7a5, 0xa7a5,
-	0xa7a7, 0xa7a7,
-	0xa7a9, 0xa7a9,
-	0xa7b5, 0xa7b5,
-	0xa7b7, 0xa7b7,
-	0xab53, 0xab53,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff41, 0xff5a,
-	0x10428, 0x1044f,
-	0x104d8, 0x104fb,
-	0x10cc0, 0x10cf2,
-	0x118c0, 0x118df,
-	0x1e922, 0x1e943,
-}; /* CR_Changes_When_Titlecased */
-
-/* 'Changes_When_Casefolded': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casefolded[] = {
-	603,
-	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,
-	0x037f, 0x037f,
-	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,
-	0x0526, 0x0526,
-	0x0528, 0x0528,
-	0x052a, 0x052a,
-	0x052c, 0x052c,
-	0x052e, 0x052e,
-	0x0531, 0x0556,
-	0x0587, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	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,
-	0x2cf2, 0x2cf2,
-	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,
-	0xa660, 0xa660,
-	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,
-	0xa698, 0xa698,
-	0xa69a, 0xa69a,
-	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,
-	0xa78d, 0xa78d,
-	0xa790, 0xa790,
-	0xa792, 0xa792,
-	0xa796, 0xa796,
-	0xa798, 0xa798,
-	0xa79a, 0xa79a,
-	0xa79c, 0xa79c,
-	0xa79e, 0xa79e,
-	0xa7a0, 0xa7a0,
-	0xa7a2, 0xa7a2,
-	0xa7a4, 0xa7a4,
-	0xa7a6, 0xa7a6,
-	0xa7a8, 0xa7a8,
-	0xa7aa, 0xa7ae,
-	0xa7b0, 0xa7b4,
-	0xa7b6, 0xa7b6,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0x10400, 0x10427,
-	0x104b0, 0x104d3,
-	0x10c80, 0x10cb2,
-	0x118a0, 0x118bf,
-	0x1e900, 0x1e921,
-}; /* CR_Changes_When_Casefolded */
-
-/* 'Changes_When_Casemapped': Derived Property */
-static const OnigCodePoint CR_Changes_When_Casemapped[] = {
-	116,
-	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, 0x025c,
-	0x0260, 0x0261,
-	0x0263, 0x0263,
-	0x0265, 0x0266,
-	0x0268, 0x026c,
-	0x026f, 0x026f,
-	0x0271, 0x0272,
-	0x0275, 0x0275,
-	0x027d, 0x027d,
-	0x0280, 0x0280,
-	0x0283, 0x0283,
-	0x0287, 0x028c,
-	0x0292, 0x0292,
-	0x029d, 0x029e,
-	0x0345, 0x0345,
-	0x0370, 0x0373,
-	0x0376, 0x0377,
-	0x037b, 0x037d,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03d1,
-	0x03d5, 0x03f5,
-	0x03f7, 0x03fb,
-	0x03fd, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0561, 0x0587,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1c80, 0x1c88,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0xa640, 0xa66d,
-	0xa680, 0xa69b,
-	0xa722, 0xa72f,
-	0xa732, 0xa76f,
-	0xa779, 0xa787,
-	0xa78b, 0xa78d,
-	0xa790, 0xa793,
-	0xa796, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xab53, 0xab53,
-	0xab70, 0xabbf,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-	0x10400, 0x1044f,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x118a0, 0x118df,
-	0x1e900, 0x1e943,
-}; /* CR_Changes_When_Casemapped */
-
-/* 'ID_Start': Derived Property */
-static const OnigCodePoint CR_ID_Start[] = {
-	571,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 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,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c80, 0x0c80,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d54, 0x0d56,
-	0x0d5f, 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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	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, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	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, 0x209c,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11400, 0x11434,
-	0x11447, 0x1144a,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c2e,
-	0x11c40, 0x11c40,
-	0x11c72, 0x11c8f,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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,
-	0x1e800, 0x1e8c4,
-	0x1e900, 0x1e943,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_ID_Start */
-
-/* 'ID_Continue': Derived Property */
-static const OnigCodePoint CR_ID_Continue[] = {
-	676,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 0x08e1,
-	0x08e3, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0af9, 0x0af9,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c80, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d54, 0x0d57,
-	0x0d5f, 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,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	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,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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, 0x209c,
-	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, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c5,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0xfe2f,
-	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,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111ca, 0x111cc,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x1123e, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x1144a,
-	0x11450, 0x11459,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115d8, 0x115dd,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c40,
-	0x11c50, 0x11c59,
-	0x11c72, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_ID_Continue */
-
-/* 'XID_Start': Derived Property */
-static const OnigCodePoint CR_XID_Start[] = {
-	578,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x0386,
-	0x0388, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0620, 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,
-	0x0840, 0x0858,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x0904, 0x0939,
-	0x093d, 0x093d,
-	0x0950, 0x0950,
-	0x0958, 0x0961,
-	0x0971, 0x0980,
-	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,
-	0x0af9, 0x0af9,
-	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, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c80, 0x0c80,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbd, 0x0cbd,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0cf1, 0x0cf2,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d4e, 0x0d4e,
-	0x0d54, 0x0d56,
-	0x0d5f, 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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f40, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f88, 0x0f8c,
-	0x1000, 0x102a,
-	0x103f, 0x103f,
-	0x1050, 0x1055,
-	0x105a, 0x105d,
-	0x1061, 0x1061,
-	0x1065, 0x1066,
-	0x106e, 0x1070,
-	0x1075, 0x1081,
-	0x108e, 0x108e,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	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, 0x191e,
-	0x1950, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x1a00, 0x1a16,
-	0x1a20, 0x1a54,
-	0x1aa7, 0x1aa7,
-	0x1b05, 0x1b33,
-	0x1b45, 0x1b4b,
-	0x1b83, 0x1ba0,
-	0x1bae, 0x1baf,
-	0x1bba, 0x1be5,
-	0x1c00, 0x1c23,
-	0x1c4d, 0x1c4f,
-	0x1c5a, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf1,
-	0x1cf5, 0x1cf6,
-	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, 0x209c,
-	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,
-	0x2cf2, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa61f,
-	0xa62a, 0xa62b,
-	0xa640, 0xa66e,
-	0xa67f, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa822,
-	0xa840, 0xa873,
-	0xa882, 0xa8b3,
-	0xa8f2, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa90a, 0xa925,
-	0xa930, 0xa946,
-	0xa960, 0xa97c,
-	0xa984, 0xa9b2,
-	0xa9cf, 0xa9cf,
-	0xa9e0, 0xa9e4,
-	0xa9e6, 0xa9ef,
-	0xa9fa, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaa7a,
-	0xaa7e, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaea,
-	0xaaf2, 0xaaf4,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabe2,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae4,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11003, 0x11037,
-	0x11083, 0x110af,
-	0x110d0, 0x110e8,
-	0x11103, 0x11126,
-	0x11150, 0x11172,
-	0x11176, 0x11176,
-	0x11183, 0x111b2,
-	0x111c1, 0x111c4,
-	0x111da, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x1122b,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112de,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x11350, 0x11350,
-	0x1135d, 0x11361,
-	0x11400, 0x11434,
-	0x11447, 0x1144a,
-	0x11480, 0x114af,
-	0x114c4, 0x114c5,
-	0x114c7, 0x114c7,
-	0x11580, 0x115ae,
-	0x115d8, 0x115db,
-	0x11600, 0x1162f,
-	0x11644, 0x11644,
-	0x11680, 0x116aa,
-	0x11700, 0x11719,
-	0x118a0, 0x118df,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c2e,
-	0x11c40, 0x11c40,
-	0x11c72, 0x11c8f,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16ad0, 0x16aed,
-	0x16b00, 0x16b2f,
-	0x16b40, 0x16b43,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f50,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	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,
-	0x1e800, 0x1e8c4,
-	0x1e900, 0x1e943,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_XID_Start */
-
-/* 'XID_Continue': Derived Property */
-static const OnigCodePoint CR_XID_Continue[] = {
-	683,
-	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,
-	0x037f, 0x037f,
-	0x0386, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03f5,
-	0x03f7, 0x0481,
-	0x0483, 0x0487,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x0559,
-	0x0561, 0x0587,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f2,
-	0x0610, 0x061a,
-	0x0620, 0x0669,
-	0x066e, 0x06d3,
-	0x06d5, 0x06dc,
-	0x06df, 0x06e8,
-	0x06ea, 0x06fc,
-	0x06ff, 0x06ff,
-	0x0710, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07f5,
-	0x07fa, 0x07fa,
-	0x0800, 0x082d,
-	0x0840, 0x085b,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 0x08e1,
-	0x08e3, 0x0963,
-	0x0966, 0x096f,
-	0x0971, 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,
-	0x0af9, 0x0af9,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c80, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d54, 0x0d57,
-	0x0d5f, 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,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f00,
-	0x0f18, 0x0f19,
-	0x0f20, 0x0f29,
-	0x0f35, 0x0f35,
-	0x0f37, 0x0f37,
-	0x0f39, 0x0f39,
-	0x0f3e, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f84,
-	0x0f86, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fc6, 0x0fc6,
-	0x1000, 0x1049,
-	0x1050, 0x109d,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 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,
-	0x135d, 0x135f,
-	0x1369, 0x1371,
-	0x1380, 0x138f,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1401, 0x166c,
-	0x166f, 0x167f,
-	0x1681, 0x169a,
-	0x16a0, 0x16ea,
-	0x16ee, 0x16f8,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1734,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17d3,
-	0x17d7, 0x17d7,
-	0x17dc, 0x17dd,
-	0x17e0, 0x17e9,
-	0x180b, 0x180d,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	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,
-	0x1ab0, 0x1abd,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b59,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1bf3,
-	0x1c00, 0x1c37,
-	0x1c40, 0x1c49,
-	0x1c4d, 0x1c7d,
-	0x1c80, 0x1c88,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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, 0x209c,
-	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, 0x2cf3,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d6f,
-	0x2d7f, 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, 0x31ba,
-	0x31f0, 0x31ff,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa4d0, 0xa4fd,
-	0xa500, 0xa60c,
-	0xa610, 0xa62b,
-	0xa640, 0xa66f,
-	0xa674, 0xa67d,
-	0xa67f, 0xa6f1,
-	0xa717, 0xa71f,
-	0xa722, 0xa788,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa827,
-	0xa840, 0xa873,
-	0xa880, 0xa8c5,
-	0xa8d0, 0xa8d9,
-	0xa8e0, 0xa8f7,
-	0xa8fb, 0xa8fb,
-	0xa8fd, 0xa8fd,
-	0xa900, 0xa92d,
-	0xa930, 0xa953,
-	0xa960, 0xa97c,
-	0xa980, 0xa9c0,
-	0xa9cf, 0xa9d9,
-	0xa9e0, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa60, 0xaa76,
-	0xaa7a, 0xaac2,
-	0xaadb, 0xaadd,
-	0xaae0, 0xaaef,
-	0xaaf2, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5a,
-	0xab5c, 0xab65,
-	0xab70, 0xabea,
-	0xabec, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 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, 0xfe2f,
-	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,
-	0x102e0, 0x102e0,
-	0x10300, 0x1031f,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x103a0, 0x103c3,
-	0x103c8, 0x103cf,
-	0x103d1, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10860, 0x10876,
-	0x10880, 0x1089e,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x10900, 0x10915,
-	0x10920, 0x10939,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10a60, 0x10a7c,
-	0x10a80, 0x10a9c,
-	0x10ac0, 0x10ac7,
-	0x10ac9, 0x10ae6,
-	0x10b00, 0x10b35,
-	0x10b40, 0x10b55,
-	0x10b60, 0x10b72,
-	0x10b80, 0x10b91,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x11000, 0x11046,
-	0x11066, 0x1106f,
-	0x1107f, 0x110ba,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x1113f,
-	0x11150, 0x11173,
-	0x11176, 0x11176,
-	0x11180, 0x111c4,
-	0x111ca, 0x111cc,
-	0x111d0, 0x111da,
-	0x111dc, 0x111dc,
-	0x11200, 0x11211,
-	0x11213, 0x11237,
-	0x1123e, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a8,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x1144a,
-	0x11450, 0x11459,
-	0x11480, 0x114c5,
-	0x114c7, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c0,
-	0x115d8, 0x115dd,
-	0x11600, 0x11640,
-	0x11644, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x11739,
-	0x118a0, 0x118e9,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c40,
-	0x11c50, 0x11c59,
-	0x11c72, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af4,
-	0x16b00, 0x16b36,
-	0x16b40, 0x16b43,
-	0x16b50, 0x16b59,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9d, 0x1bc9e,
-	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,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8d0, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0xe0100, 0xe01ef,
-}; /* CR_XID_Continue */
-
-/* 'Default_Ignorable_Code_Point': Derived Property */
-static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
-	17,
-	0x00ad, 0x00ad,
-	0x034f, 0x034f,
-	0x061c, 0x061c,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x180b, 0x180e,
-	0x200b, 0x200f,
-	0x202a, 0x202e,
-	0x2060, 0x206f,
-	0x3164, 0x3164,
-	0xfe00, 0xfe0f,
-	0xfeff, 0xfeff,
-	0xffa0, 0xffa0,
-	0xfff0, 0xfff8,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0000, 0xe0fff,
-}; /* CR_Default_Ignorable_Code_Point */
-
-/* 'Grapheme_Extend': Derived Property */
-static const OnigCodePoint CR_Grapheme_Extend[] = {
-	303,
-	0x0300, 0x036f,
-	0x0483, 0x0489,
-	0x0591, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x065f,
-	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,
-	0x0859, 0x085b,
-	0x08d4, 0x08e1,
-	0x08e3, 0x0902,
-	0x093a, 0x093a,
-	0x093c, 0x093c,
-	0x0941, 0x0948,
-	0x094d, 0x094d,
-	0x0951, 0x0957,
-	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,
-	0x0c00, 0x0c00,
-	0x0c3e, 0x0c40,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c81,
-	0x0cbc, 0x0cbc,
-	0x0cbf, 0x0cbf,
-	0x0cc2, 0x0cc2,
-	0x0cc6, 0x0cc6,
-	0x0ccc, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 0x0d01,
-	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,
-	0x0f8d, 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,
-	0x135d, 0x135f,
-	0x1712, 0x1714,
-	0x1732, 0x1734,
-	0x1752, 0x1753,
-	0x1772, 0x1773,
-	0x17b4, 0x17b5,
-	0x17b7, 0x17bd,
-	0x17c6, 0x17c6,
-	0x17c9, 0x17d3,
-	0x17dd, 0x17dd,
-	0x180b, 0x180d,
-	0x1885, 0x1886,
-	0x18a9, 0x18a9,
-	0x1920, 0x1922,
-	0x1927, 0x1928,
-	0x1932, 0x1932,
-	0x1939, 0x193b,
-	0x1a17, 0x1a18,
-	0x1a1b, 0x1a1b,
-	0x1a56, 0x1a56,
-	0x1a58, 0x1a5e,
-	0x1a60, 0x1a60,
-	0x1a62, 0x1a62,
-	0x1a65, 0x1a6c,
-	0x1a73, 0x1a7c,
-	0x1a7f, 0x1a7f,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b03,
-	0x1b34, 0x1b34,
-	0x1b36, 0x1b3a,
-	0x1b3c, 0x1b3c,
-	0x1b42, 0x1b42,
-	0x1b6b, 0x1b73,
-	0x1b80, 0x1b81,
-	0x1ba2, 0x1ba5,
-	0x1ba8, 0x1ba9,
-	0x1bab, 0x1bad,
-	0x1be6, 0x1be6,
-	0x1be8, 0x1be9,
-	0x1bed, 0x1bed,
-	0x1bef, 0x1bf1,
-	0x1c2c, 0x1c33,
-	0x1c36, 0x1c37,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfb, 0x1dff,
-	0x200c, 0x200c,
-	0x20d0, 0x20f0,
-	0x2cef, 0x2cf1,
-	0x2d7f, 0x2d7f,
-	0x2de0, 0x2dff,
-	0x302a, 0x302f,
-	0x3099, 0x309a,
-	0xa66f, 0xa672,
-	0xa674, 0xa67d,
-	0xa69e, 0xa69f,
-	0xa6f0, 0xa6f1,
-	0xa802, 0xa802,
-	0xa806, 0xa806,
-	0xa80b, 0xa80b,
-	0xa825, 0xa826,
-	0xa8c4, 0xa8c5,
-	0xa8e0, 0xa8f1,
-	0xa926, 0xa92d,
-	0xa947, 0xa951,
-	0xa980, 0xa982,
-	0xa9b3, 0xa9b3,
-	0xa9b6, 0xa9b9,
-	0xa9bc, 0xa9bc,
-	0xa9e5, 0xa9e5,
-	0xaa29, 0xaa2e,
-	0xaa31, 0xaa32,
-	0xaa35, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4c,
-	0xaa7c, 0xaa7c,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabf,
-	0xaac1, 0xaac1,
-	0xaaec, 0xaaed,
-	0xaaf6, 0xaaf6,
-	0xabe5, 0xabe5,
-	0xabe8, 0xabe8,
-	0xabed, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2f,
-	0xff9e, 0xff9f,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a3f,
-	0x10ae5, 0x10ae6,
-	0x11001, 0x11001,
-	0x11038, 0x11046,
-	0x1107f, 0x11081,
-	0x110b3, 0x110b6,
-	0x110b9, 0x110ba,
-	0x11100, 0x11102,
-	0x11127, 0x1112b,
-	0x1112d, 0x11134,
-	0x11173, 0x11173,
-	0x11180, 0x11181,
-	0x111b6, 0x111be,
-	0x111ca, 0x111cc,
-	0x1122f, 0x11231,
-	0x11234, 0x11234,
-	0x11236, 0x11237,
-	0x1123e, 0x1123e,
-	0x112df, 0x112df,
-	0x112e3, 0x112ea,
-	0x11300, 0x11301,
-	0x1133c, 0x1133c,
-	0x1133e, 0x1133e,
-	0x11340, 0x11340,
-	0x11357, 0x11357,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11438, 0x1143f,
-	0x11442, 0x11444,
-	0x11446, 0x11446,
-	0x114b0, 0x114b0,
-	0x114b3, 0x114b8,
-	0x114ba, 0x114ba,
-	0x114bd, 0x114bd,
-	0x114bf, 0x114c0,
-	0x114c2, 0x114c3,
-	0x115af, 0x115af,
-	0x115b2, 0x115b5,
-	0x115bc, 0x115bd,
-	0x115bf, 0x115c0,
-	0x115dc, 0x115dd,
-	0x11633, 0x1163a,
-	0x1163d, 0x1163d,
-	0x1163f, 0x11640,
-	0x116ab, 0x116ab,
-	0x116ad, 0x116ad,
-	0x116b0, 0x116b5,
-	0x116b7, 0x116b7,
-	0x1171d, 0x1171f,
-	0x11722, 0x11725,
-	0x11727, 0x1172b,
-	0x11c30, 0x11c36,
-	0x11c38, 0x11c3d,
-	0x11c3f, 0x11c3f,
-	0x11c92, 0x11ca7,
-	0x11caa, 0x11cb0,
-	0x11cb2, 0x11cb3,
-	0x11cb5, 0x11cb6,
-	0x16af0, 0x16af4,
-	0x16b30, 0x16b36,
-	0x16f8f, 0x16f92,
-	0x1bc9d, 0x1bc9e,
-	0x1d165, 0x1d165,
-	0x1d167, 0x1d169,
-	0x1d16e, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1d242, 0x1d244,
-	0x1da00, 0x1da36,
-	0x1da3b, 0x1da6c,
-	0x1da75, 0x1da75,
-	0x1da84, 0x1da84,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e8d0, 0x1e8d6,
-	0x1e944, 0x1e94a,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-}; /* CR_Grapheme_Extend */
-
-/* 'Grapheme_Base': Derived Property */
-static const OnigCodePoint CR_Grapheme_Base[] = {
-	772,
-	0x0020, 0x007e,
-	0x00a0, 0x00ac,
-	0x00ae, 0x02ff,
-	0x0370, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0482,
-	0x048a, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x05be, 0x05be,
-	0x05c0, 0x05c0,
-	0x05c3, 0x05c3,
-	0x05c6, 0x05c6,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0606, 0x060f,
-	0x061b, 0x061b,
-	0x061e, 0x064a,
-	0x0660, 0x066f,
-	0x0671, 0x06d5,
-	0x06de, 0x06de,
-	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,
-	0x0840, 0x0858,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x0903, 0x0939,
-	0x093b, 0x093b,
-	0x093d, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x0950,
-	0x0958, 0x0961,
-	0x0964, 0x0980,
-	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, 0x0af1,
-	0x0af9, 0x0af9,
-	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, 0x0b77,
-	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, 0x0c39,
-	0x0c3d, 0x0c3d,
-	0x0c41, 0x0c44,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c80,
-	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, 0x0d3a,
-	0x0d3d, 0x0d3d,
-	0x0d3f, 0x0d40,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d4e, 0x0d4f,
-	0x0d54, 0x0d56,
-	0x0d58, 0x0d61,
-	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dd0, 0x0dd1,
-	0x0dd8, 0x0dde,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f17,
-	0x0f1a, 0x0f34,
-	0x0f36, 0x0f36,
-	0x0f38, 0x0f38,
-	0x0f3a, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f7f, 0x0f7f,
-	0x0f85, 0x0f85,
-	0x0f88, 0x0f8c,
-	0x0fbe, 0x0fc5,
-	0x0fc7, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x102c,
-	0x1031, 0x1031,
-	0x1038, 0x1038,
-	0x103b, 0x103c,
-	0x103f, 0x1057,
-	0x105a, 0x105d,
-	0x1061, 0x1070,
-	0x1075, 0x1081,
-	0x1083, 0x1084,
-	0x1087, 0x108c,
-	0x108e, 0x109c,
-	0x109e, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x1884,
-	0x1887, 0x18a8,
-	0x18aa, 0x18aa,
-	0x18b0, 0x18f5,
-	0x1900, 0x191e,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19ab,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19da,
-	0x19de, 0x1a16,
-	0x1a19, 0x1a1a,
-	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, 0x1be5,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1bfc, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	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, 0x209c,
-	0x20a0, 0x20be,
-	0x2100, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cee,
-	0x2cf2, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2e00, 0x2e44,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x3029,
-	0x3030, 0x303f,
-	0x3041, 0x3096,
-	0x309b, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa66e,
-	0xa673, 0xa673,
-	0xa67e, 0xa69d,
-	0xa6a0, 0xa6ef,
-	0xa6f2, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa801,
-	0xa803, 0xa805,
-	0xa807, 0xa80a,
-	0xa80c, 0xa824,
-	0xa827, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c3,
-	0xa8ce, 0xa8d9,
-	0xa8f2, 0xa8fd,
-	0xa900, 0xa925,
-	0xa92e, 0xa946,
-	0xa952, 0xa953,
-	0xa95f, 0xa97c,
-	0xa983, 0xa9b2,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9e4,
-	0xa9e6, 0xa9fe,
-	0xaa00, 0xaa28,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa40, 0xaa42,
-	0xaa44, 0xaa4b,
-	0xaa4d, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa7b,
-	0xaa7d, 0xaaaf,
-	0xaab1, 0xaab1,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaabd,
-	0xaac0, 0xaac0,
-	0xaac2, 0xaac2,
-	0xaadb, 0xaaeb,
-	0xaaee, 0xaaf5,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabec,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb1d,
-	0xfb1f, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	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, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fc,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e1, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x10375,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a00,
-	0x10a10, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a40, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae4,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x11000,
-	0x11002, 0x11037,
-	0x11047, 0x1104d,
-	0x11052, 0x1106f,
-	0x11082, 0x110b2,
-	0x110b7, 0x110b8,
-	0x110bb, 0x110bc,
-	0x110be, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11103, 0x11126,
-	0x1112c, 0x1112c,
-	0x11136, 0x11143,
-	0x11150, 0x11172,
-	0x11174, 0x11176,
-	0x11182, 0x111b5,
-	0x111bf, 0x111c9,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x11238, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112de,
-	0x112e0, 0x112e2,
-	0x112f0, 0x112f9,
-	0x11302, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133d, 0x1133d,
-	0x1133f, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x1135d, 0x11363,
-	0x11400, 0x11437,
-	0x11440, 0x11441,
-	0x11445, 0x11445,
-	0x11447, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x11480, 0x114af,
-	0x114b1, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114bc,
-	0x114be, 0x114be,
-	0x114c1, 0x114c1,
-	0x114c4, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115ae,
-	0x115b0, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x115c1, 0x115db,
-	0x11600, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x11641, 0x11644,
-	0x11650, 0x11659,
-	0x11660, 0x1166c,
-	0x11680, 0x116aa,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x11720, 0x11721,
-	0x11726, 0x11726,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c2f,
-	0x11c3e, 0x11c3e,
-	0x11c40, 0x11c45,
-	0x11c50, 0x11c6c,
-	0x11c70, 0x11c8f,
-	0x11ca9, 0x11ca9,
-	0x11cb1, 0x11cb1,
-	0x11cb4, 0x11cb4,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af5, 0x16af5,
-	0x16b00, 0x16b2f,
-	0x16b37, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f93, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bc9c,
-	0x1bc9f, 0x1bc9f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d164,
-	0x1d166, 0x1d166,
-	0x1d16a, 0x1d16d,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	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, 0x1d9ff,
-	0x1da37, 0x1da3a,
-	0x1da6d, 0x1da74,
-	0x1da76, 0x1da83,
-	0x1da85, 0x1da8b,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8cf,
-	0x1e900, 0x1e943,
-	0x1e950, 0x1e959,
-	0x1e95e, 0x1e95f,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Grapheme_Base */
-
-/* 'Grapheme_Link': Derived Property */
-static const OnigCodePoint CR_Grapheme_Link[] = {
-	43,
-	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, 0x1bab,
-	0x1bf2, 0x1bf3,
-	0x2d7f, 0x2d7f,
-	0xa806, 0xa806,
-	0xa8c4, 0xa8c4,
-	0xa953, 0xa953,
-	0xa9c0, 0xa9c0,
-	0xaaf6, 0xaaf6,
-	0xabed, 0xabed,
-	0x10a3f, 0x10a3f,
-	0x11046, 0x11046,
-	0x1107f, 0x1107f,
-	0x110b9, 0x110b9,
-	0x11133, 0x11134,
-	0x111c0, 0x111c0,
-	0x11235, 0x11235,
-	0x112ea, 0x112ea,
-	0x1134d, 0x1134d,
-	0x11442, 0x11442,
-	0x114c2, 0x114c2,
-	0x115bf, 0x115bf,
-	0x1163f, 0x1163f,
-	0x116b6, 0x116b6,
-	0x1172b, 0x1172b,
-	0x11c3f, 0x11c3f,
-}; /* CR_Grapheme_Link */
-
-/* 'Common': Script */
-static const OnigCodePoint CR_Common[] = {
-	165,
-	0x0000, 0x0040,
-	0x005b, 0x0060,
-	0x007b, 0x00a9,
-	0x00ab, 0x00b9,
-	0x00bb, 0x00bf,
-	0x00d7, 0x00d7,
-	0x00f7, 0x00f7,
-	0x02b9, 0x02df,
-	0x02e5, 0x02e9,
-	0x02ec, 0x02ff,
-	0x0374, 0x0374,
-	0x037e, 0x037e,
-	0x0385, 0x0385,
-	0x0387, 0x0387,
-	0x0589, 0x0589,
-	0x0605, 0x0605,
-	0x060c, 0x060c,
-	0x061b, 0x061c,
-	0x061f, 0x061f,
-	0x0640, 0x0640,
-	0x06dd, 0x06dd,
-	0x08e2, 0x08e2,
-	0x0964, 0x0965,
-	0x0e3f, 0x0e3f,
-	0x0fd5, 0x0fd8,
-	0x10fb, 0x10fb,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	0x1802, 0x1803,
-	0x1805, 0x1805,
-	0x1cd3, 0x1cd3,
-	0x1ce1, 0x1ce1,
-	0x1ce9, 0x1cec,
-	0x1cee, 0x1cf3,
-	0x1cf5, 0x1cf6,
-	0x2000, 0x200b,
-	0x200e, 0x2064,
-	0x2066, 0x2070,
-	0x2074, 0x207e,
-	0x2080, 0x208e,
-	0x20a0, 0x20be,
-	0x2100, 0x2125,
-	0x2127, 0x2129,
-	0x212c, 0x2131,
-	0x2133, 0x214d,
-	0x214f, 0x215f,
-	0x2189, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x27ff,
-	0x2900, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2e00, 0x2e44,
-	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,
-	0xa92e, 0xa92e,
-	0xa9cf, 0xa9cf,
-	0xab5b, 0xab5b,
-	0xfd3e, 0xfd3f,
-	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,
-	0x102e1, 0x102fb,
-	0x1bca0, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d166,
-	0x1d16a, 0x1d17a,
-	0x1d183, 0x1d184,
-	0x1d18c, 0x1d1a9,
-	0x1d1ae, 0x1d1e8,
-	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,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f1ff,
-	0x1f201, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-}; /* CR_Common */
-
-/* 'Latin': Script */
-static const OnigCodePoint CR_Latin[] = {
-	31,
-	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, 0x209c,
-	0x212a, 0x212b,
-	0x2132, 0x2132,
-	0x214e, 0x214e,
-	0x2160, 0x2188,
-	0x2c60, 0x2c7f,
-	0xa722, 0xa787,
-	0xa78b, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa7ff,
-	0xab30, 0xab5a,
-	0xab5c, 0xab64,
-	0xfb00, 0xfb06,
-	0xff21, 0xff3a,
-	0xff41, 0xff5a,
-}; /* CR_Latin */
-
-/* 'Greek': Script */
-static const OnigCodePoint CR_Greek[] = {
-	36,
-	0x0370, 0x0373,
-	0x0375, 0x0377,
-	0x037a, 0x037d,
-	0x037f, 0x037f,
-	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,
-	0xab65, 0xab65,
-	0x10140, 0x1018e,
-	0x101a0, 0x101a0,
-	0x1d200, 0x1d245,
-}; /* CR_Greek */
-
-/* 'Cyrillic': Script */
-static const OnigCodePoint CR_Cyrillic[] = {
-	8,
-	0x0400, 0x0484,
-	0x0487, 0x052f,
-	0x1c80, 0x1c88,
-	0x1d2b, 0x1d2b,
-	0x1d78, 0x1d78,
-	0x2de0, 0x2dff,
-	0xa640, 0xa69f,
-	0xfe2e, 0xfe2f,
-}; /* CR_Cyrillic */
-
-/* 'Armenian': Script */
-static const OnigCodePoint CR_Armenian[] = {
-	6,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x058a, 0x058a,
-	0x058d, 0x058f,
-	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[] = {
-	56,
-	0x0600, 0x0604,
-	0x0606, 0x060b,
-	0x060d, 0x061a,
-	0x061e, 0x061e,
-	0x0620, 0x063f,
-	0x0641, 0x064a,
-	0x0656, 0x066f,
-	0x0671, 0x06dc,
-	0x06de, 0x06ff,
-	0x0750, 0x077f,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 0x08e1,
-	0x08e3, 0x08ff,
-	0xfb50, 0xfbc1,
-	0xfbd3, 0xfd3d,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfd,
-	0xfe70, 0xfe74,
-	0xfe76, 0xfefc,
-	0x10e60, 0x10e7e,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-}; /* 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[] = {
-	4,
-	0x0900, 0x0950,
-	0x0953, 0x0963,
-	0x0966, 0x097f,
-	0xa8e0, 0xa8fd,
-}; /* CR_Devanagari */
-
-/* 'Bengali': Script */
-static const OnigCodePoint CR_Bengali[] = {
-	14,
-	0x0980, 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, 0x0af1,
-	0x0af9, 0x0af9,
-}; /* 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, 0x0b77,
-}; /* 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[] = {
-	13,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-}; /* CR_Telugu */
-
-/* 'Kannada': Script */
-static const OnigCodePoint CR_Kannada[] = {
-	14,
-	0x0c80, 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,
-}; /* CR_Kannada */
-
-/* 'Malayalam': Script */
-static const OnigCodePoint CR_Malayalam[] = {
-	9,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4f,
-	0x0d54, 0x0d63,
-	0x0d66, 0x0d7f,
-}; /* CR_Malayalam */
-
-/* 'Sinhala': Script */
-static const OnigCodePoint CR_Sinhala[] = {
-	13,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	0x0df2, 0x0df4,
-	0x111e1, 0x111f4,
-}; /* 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, 0x0edf,
-}; /* CR_Lao */
-
-/* 'Tibetan': Script */
-static const OnigCodePoint CR_Tibetan[] = {
-	7,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fd4,
-	0x0fd9, 0x0fda,
-}; /* CR_Tibetan */
-
-/* 'Myanmar': Script */
-static const OnigCodePoint CR_Myanmar[] = {
-	3,
-	0x1000, 0x109f,
-	0xa9e0, 0xa9fe,
-	0xaa60, 0xaa7f,
-}; /* CR_Myanmar */
-
-/* 'Georgian': Script */
-static const OnigCodePoint CR_Georgian[] = {
-	8,
-	0x10a0, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 0x10fa,
-	0x10fc, 0x10ff,
-	0x2d00, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-}; /* CR_Georgian */
-
-/* 'Hangul': Script */
-static const OnigCodePoint CR_Hangul[] = {
-	14,
-	0x1100, 0x11ff,
-	0x302e, 0x302f,
-	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[] = {
-	32,
-	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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x2d80, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-}; /* CR_Ethiopic */
-
-/* 'Cherokee': Script */
-static const OnigCodePoint CR_Cherokee[] = {
-	3,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0xab70, 0xabbf,
-}; /* 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, 0x16f8,
-}; /* 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[] = {
-	7,
-	0x1800, 0x1801,
-	0x1804, 0x1804,
-	0x1806, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18aa,
-	0x11660, 0x1166c,
-}; /* CR_Mongolian */
-
-/* 'Hiragana': Script */
-static const OnigCodePoint CR_Hiragana[] = {
-	4,
-	0x3041, 0x3096,
-	0x309d, 0x309f,
-	0x1b001, 0x1b001,
-	0x1f200, 0x1f200,
-}; /* CR_Hiragana */
-
-/* 'Katakana': Script */
-static const OnigCodePoint CR_Katakana[] = {
-	8,
-	0x30a1, 0x30fa,
-	0x30fd, 0x30ff,
-	0x31f0, 0x31ff,
-	0x32d0, 0x32fe,
-	0x3300, 0x3357,
-	0xff66, 0xff6f,
-	0xff71, 0xff9d,
-	0x1b000, 0x1b000,
-}; /* CR_Katakana */
-
-/* 'Bopomofo': Script */
-static const OnigCodePoint CR_Bopomofo[] = {
-	3,
-	0x02ea, 0x02eb,
-	0x3105, 0x312d,
-	0x31a0, 0x31ba,
-}; /* CR_Bopomofo */
-
-/* 'Han': Script */
-static const OnigCodePoint CR_Han[] = {
-	16,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x3005, 0x3005,
-	0x3007, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303b,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	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[] = {
-	1,
-	0x10300, 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[] = {
-	27,
-	0x0300, 0x036f,
-	0x0485, 0x0486,
-	0x064b, 0x0655,
-	0x0670, 0x0670,
-	0x0951, 0x0952,
-	0x1ab0, 0x1abe,
-	0x1cd0, 0x1cd2,
-	0x1cd4, 0x1ce0,
-	0x1ce2, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1dc0, 0x1df5,
-	0x1dfb, 0x1dff,
-	0x200c, 0x200d,
-	0x20d0, 0x20f0,
-	0x302a, 0x302d,
-	0x3099, 0x309a,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe2d,
-	0x101fd, 0x101fd,
-	0x102e0, 0x102e0,
-	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, 0x191e,
-	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, 0x2cf3,
-	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[] = {
-	7,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-}; /* CR_Glagolitic */
-
-/* 'Tifinagh': Script */
-static const OnigCodePoint CR_Tifinagh[] = {
-	3,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d7f,
-}; /* 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[] = {
-	4,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-}; /* 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, 0x1bbf,
-	0x1cc0, 0x1cc7,
-}; /* 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, 0xa8c5,
-	0xa8ce, 0xa8d9,
-}; /* CR_Saurashtra */
-
-/* 'Kayah_Li': Script */
-static const OnigCodePoint CR_Kayah_Li[] = {
-	2,
-	0xa900, 0xa92d,
-	0xa92f, 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[] = {
-	2,
-	0xa6a0, 0xa6f7,
-	0x16800, 0x16a38,
-}; /* CR_Bamum */
-
-/* 'Javanese': Script */
-static const OnigCodePoint CR_Javanese[] = {
-	3,
-	0xa980, 0xa9cd,
-	0xa9d0, 0xa9d9,
-	0xa9de, 0xa9df,
-}; /* CR_Javanese */
-
-/* 'Meetei_Mayek': Script */
-static const OnigCodePoint CR_Meetei_Mayek[] = {
-	3,
-	0xaae0, 0xaaf6,
-	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 */
-
-/* 'Batak': Script */
-static const OnigCodePoint CR_Batak[] = {
-	2,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1bff,
-}; /* CR_Batak */
-
-/* 'Brahmi': Script */
-static const OnigCodePoint CR_Brahmi[] = {
-	3,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x1107f,
-}; /* CR_Brahmi */
-
-/* 'Mandaic': Script */
-static const OnigCodePoint CR_Mandaic[] = {
-	2,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-}; /* CR_Mandaic */
-
-/* 'Chakma': Script */
-static const OnigCodePoint CR_Chakma[] = {
-	2,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-}; /* CR_Chakma */
-
-/* 'Meroitic_Cursive': Script */
-static const OnigCodePoint CR_Meroitic_Cursive[] = {
-	3,
-	0x109a0, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x109ff,
-}; /* CR_Meroitic_Cursive */
-
-/* 'Meroitic_Hieroglyphs': Script */
-static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
-	1,
-	0x10980, 0x1099f,
-}; /* CR_Meroitic_Hieroglyphs */
-
-/* 'Miao': Script */
-static const OnigCodePoint CR_Miao[] = {
-	3,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-}; /* CR_Miao */
-
-/* 'Sharada': Script */
-static const OnigCodePoint CR_Sharada[] = {
-	2,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-}; /* CR_Sharada */
-
-/* 'Sora_Sompeng': Script */
-static const OnigCodePoint CR_Sora_Sompeng[] = {
-	2,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-}; /* CR_Sora_Sompeng */
-
-/* 'Takri': Script */
-static const OnigCodePoint CR_Takri[] = {
-	2,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-}; /* CR_Takri */
-
-/* 'Caucasian_Albanian': Script */
-static const OnigCodePoint CR_Caucasian_Albanian[] = {
-	2,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-}; /* CR_Caucasian_Albanian */
-
-/* 'Bassa_Vah': Script */
-static const OnigCodePoint CR_Bassa_Vah[] = {
-	2,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-}; /* CR_Bassa_Vah */
-
-/* 'Duployan': Script */
-static const OnigCodePoint CR_Duployan[] = {
-	5,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bc9f,
-}; /* CR_Duployan */
-
-/* 'Elbasan': Script */
-static const OnigCodePoint CR_Elbasan[] = {
-	1,
-	0x10500, 0x10527,
-}; /* CR_Elbasan */
-
-/* 'Grantha': Script */
-static const OnigCodePoint CR_Grantha[] = {
-	15,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-}; /* CR_Grantha */
-
-/* 'Pahawh_Hmong': Script */
-static const OnigCodePoint CR_Pahawh_Hmong[] = {
-	5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-}; /* CR_Pahawh_Hmong */
-
-/* 'Khojki': Script */
-static const OnigCodePoint CR_Khojki[] = {
-	2,
-	0x11200, 0x11211,
-	0x11213, 0x1123e,
-}; /* CR_Khojki */
-
-/* 'Linear_A': Script */
-static const OnigCodePoint CR_Linear_A[] = {
-	3,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-}; /* CR_Linear_A */
-
-/* 'Mahajani': Script */
-static const OnigCodePoint CR_Mahajani[] = {
-	1,
-	0x11150, 0x11176,
-}; /* CR_Mahajani */
-
-/* 'Manichaean': Script */
-static const OnigCodePoint CR_Manichaean[] = {
-	2,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-}; /* CR_Manichaean */
-
-/* 'Mende_Kikakui': Script */
-static const OnigCodePoint CR_Mende_Kikakui[] = {
-	2,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-}; /* CR_Mende_Kikakui */
-
-/* 'Modi': Script */
-static const OnigCodePoint CR_Modi[] = {
-	2,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-}; /* CR_Modi */
-
-/* 'Mro': Script */
-static const OnigCodePoint CR_Mro[] = {
-	3,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-}; /* CR_Mro */
-
-/* 'Old_North_Arabian': Script */
-static const OnigCodePoint CR_Old_North_Arabian[] = {
-	1,
-	0x10a80, 0x10a9f,
-}; /* CR_Old_North_Arabian */
-
-/* 'Nabataean': Script */
-static const OnigCodePoint CR_Nabataean[] = {
-	2,
-	0x10880, 0x1089e,
-	0x108a7, 0x108af,
-}; /* CR_Nabataean */
-
-/* 'Palmyrene': Script */
-static const OnigCodePoint CR_Palmyrene[] = {
-	1,
-	0x10860, 0x1087f,
-}; /* CR_Palmyrene */
-
-/* 'Pau_Cin_Hau': Script */
-static const OnigCodePoint CR_Pau_Cin_Hau[] = {
-	1,
-	0x11ac0, 0x11af8,
-}; /* CR_Pau_Cin_Hau */
-
-/* 'Old_Permic': Script */
-static const OnigCodePoint CR_Old_Permic[] = {
-	1,
-	0x10350, 0x1037a,
-}; /* CR_Old_Permic */
-
-/* 'Psalter_Pahlavi': Script */
-static const OnigCodePoint CR_Psalter_Pahlavi[] = {
-	3,
-	0x10b80, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-}; /* CR_Psalter_Pahlavi */
-
-/* 'Siddham': Script */
-static const OnigCodePoint CR_Siddham[] = {
-	2,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-}; /* CR_Siddham */
-
-/* 'Khudawadi': Script */
-static const OnigCodePoint CR_Khudawadi[] = {
-	2,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-}; /* CR_Khudawadi */
-
-/* 'Tirhuta': Script */
-static const OnigCodePoint CR_Tirhuta[] = {
-	2,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-}; /* CR_Tirhuta */
-
-/* 'Warang_Citi': Script */
-static const OnigCodePoint CR_Warang_Citi[] = {
-	2,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-}; /* CR_Warang_Citi */
-
-/* 'Ahom': Script */
-static const OnigCodePoint CR_Ahom[] = {
-	3,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-}; /* CR_Ahom */
-
-/* 'Anatolian_Hieroglyphs': Script */
-static const OnigCodePoint CR_Anatolian_Hieroglyphs[] = {
-	1,
-	0x14400, 0x14646,
-}; /* CR_Anatolian_Hieroglyphs */
-
-/* 'Hatran': Script */
-static const OnigCodePoint CR_Hatran[] = {
-	3,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x108ff,
-}; /* CR_Hatran */
-
-/* 'Multani': Script */
-static const OnigCodePoint CR_Multani[] = {
-	5,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-}; /* CR_Multani */
-
-/* 'Old_Hungarian': Script */
-static const OnigCodePoint CR_Old_Hungarian[] = {
-	3,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-}; /* CR_Old_Hungarian */
-
-/* 'SignWriting': Script */
-static const OnigCodePoint CR_SignWriting[] = {
-	3,
-	0x1d800, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-}; /* CR_SignWriting */
-
-/* 'Adlam': Script */
-static const OnigCodePoint CR_Adlam[] = {
-	3,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1e95e, 0x1e95f,
-}; /* CR_Adlam */
-
-/* 'Bhaiksuki': Script */
-static const OnigCodePoint CR_Bhaiksuki[] = {
-	4,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c45,
-	0x11c50, 0x11c6c,
-}; /* CR_Bhaiksuki */
-
-/* 'Marchen': Script */
-static const OnigCodePoint CR_Marchen[] = {
-	3,
-	0x11c70, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-}; /* CR_Marchen */
-
-/* 'Newa': Script */
-static const OnigCodePoint CR_Newa[] = {
-	3,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-}; /* CR_Newa */
-
-/* 'Osage': Script */
-static const OnigCodePoint CR_Osage[] = {
-	2,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-}; /* CR_Osage */
-
-/* 'Tangut': Script */
-static const OnigCodePoint CR_Tangut[] = {
-	3,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-}; /* CR_Tangut */
-
-/* 'White_Space': Binary Property */
-#define CR_White_Space CR_Space
-
-/* 'Bidi_Control': Binary Property */
-static const OnigCodePoint CR_Bidi_Control[] = {
-	4,
-	0x061c, 0x061c,
-	0x200e, 0x200f,
-	0x202a, 0x202e,
-	0x2066, 0x2069,
-}; /* 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[] = {
-	21,
-	0x002d, 0x002d,
-	0x058a, 0x058a,
-	0x05be, 0x05be,
-	0x1400, 0x1400,
-	0x1806, 0x1806,
-	0x2010, 0x2015,
-	0x2053, 0x2053,
-	0x207b, 0x207b,
-	0x208b, 0x208b,
-	0x2212, 0x2212,
-	0x2e17, 0x2e17,
-	0x2e1a, 0x2e1a,
-	0x2e3a, 0x2e3b,
-	0x2e40, 0x2e40,
-	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[] = {
-	13,
-	0x0022, 0x0022,
-	0x0027, 0x0027,
-	0x00ab, 0x00ab,
-	0x00bb, 0x00bb,
-	0x2018, 0x201f,
-	0x2039, 0x203a,
-	0x2e42, 0x2e42,
-	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[] = {
-	94,
-	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,
-	0x085e, 0x085e,
-	0x0964, 0x0965,
-	0x0e5a, 0x0e5b,
-	0x0f08, 0x0f08,
-	0x0f0d, 0x0f12,
-	0x104a, 0x104b,
-	0x1361, 0x1368,
-	0x166d, 0x166e,
-	0x16eb, 0x16ed,
-	0x1735, 0x1736,
-	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,
-	0x2e3c, 0x2e3c,
-	0x2e41, 0x2e41,
-	0x3001, 0x3002,
-	0xa4fe, 0xa4ff,
-	0xa60d, 0xa60f,
-	0xa6f3, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c7, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaadf, 0xaadf,
-	0xaaf0, 0xaaf1,
-	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,
-	0x10a56, 0x10a57,
-	0x10af0, 0x10af5,
-	0x10b3a, 0x10b3f,
-	0x10b99, 0x10b9c,
-	0x11047, 0x1104d,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x111cd, 0x111cd,
-	0x111de, 0x111df,
-	0x11238, 0x1123c,
-	0x112a9, 0x112a9,
-	0x1144b, 0x1144d,
-	0x1145b, 0x1145b,
-	0x115c2, 0x115c5,
-	0x115c9, 0x115d7,
-	0x11641, 0x11642,
-	0x1173c, 0x1173e,
-	0x11c41, 0x11c43,
-	0x11c71, 0x11c71,
-	0x12470, 0x12474,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b39,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da87, 0x1da8a,
-}; /* CR_Terminal_Punctuation */
-
-/* 'Other_Math': Binary Property */
-static const OnigCodePoint CR_Other_Math[] = {
-	134,
-	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,
-	0x2107, 0x2107,
-	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,
-	0x2308, 0x230b,
-	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,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-}; /* 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 */
-#define CR_ASCII_Hex_Digit CR_XDigit
-
-/* 'Other_Alphabetic': Binary Property */
-static const OnigCodePoint CR_Other_Alphabetic[] = {
-	194,
-	0x0345, 0x0345,
-	0x05b0, 0x05bd,
-	0x05bf, 0x05bf,
-	0x05c1, 0x05c2,
-	0x05c4, 0x05c5,
-	0x05c7, 0x05c7,
-	0x0610, 0x061a,
-	0x064b, 0x0657,
-	0x0659, 0x065f,
-	0x0670, 0x0670,
-	0x06d6, 0x06dc,
-	0x06e1, 0x06e4,
-	0x06e7, 0x06e8,
-	0x06ed, 0x06ed,
-	0x0711, 0x0711,
-	0x0730, 0x073f,
-	0x07a6, 0x07b0,
-	0x0816, 0x0817,
-	0x081b, 0x0823,
-	0x0825, 0x0827,
-	0x0829, 0x082c,
-	0x08d4, 0x08df,
-	0x08e3, 0x08e9,
-	0x08f0, 0x0903,
-	0x093a, 0x093b,
-	0x093e, 0x094c,
-	0x094e, 0x094f,
-	0x0955, 0x0957,
-	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,
-	0x0c00, 0x0c03,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4c,
-	0x0c55, 0x0c56,
-	0x0c62, 0x0c63,
-	0x0c81, 0x0c83,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccc,
-	0x0cd5, 0x0cd6,
-	0x0ce2, 0x0ce3,
-	0x0d01, 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,
-	0x0f8d, 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,
-	0x1885, 0x1886,
-	0x18a9, 0x18a9,
-	0x1920, 0x192b,
-	0x1930, 0x1938,
-	0x1a17, 0x1a1b,
-	0x1a55, 0x1a5e,
-	0x1a61, 0x1a74,
-	0x1b00, 0x1b04,
-	0x1b35, 0x1b43,
-	0x1b80, 0x1b82,
-	0x1ba1, 0x1ba9,
-	0x1bac, 0x1bad,
-	0x1be7, 0x1bf1,
-	0x1c24, 0x1c35,
-	0x1cf2, 0x1cf3,
-	0x1de7, 0x1df4,
-	0x24b6, 0x24e9,
-	0x2de0, 0x2dff,
-	0xa674, 0xa67b,
-	0xa69e, 0xa69f,
-	0xa823, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa8c5, 0xa8c5,
-	0xa926, 0xa92a,
-	0xa947, 0xa952,
-	0xa980, 0xa983,
-	0xa9b4, 0xa9bf,
-	0xaa29, 0xaa36,
-	0xaa43, 0xaa43,
-	0xaa4c, 0xaa4d,
-	0xaab0, 0xaab0,
-	0xaab2, 0xaab4,
-	0xaab7, 0xaab8,
-	0xaabe, 0xaabe,
-	0xaaeb, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabea,
-	0xfb1e, 0xfb1e,
-	0x10376, 0x1037a,
-	0x10a01, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a0f,
-	0x11000, 0x11002,
-	0x11038, 0x11045,
-	0x11082, 0x11082,
-	0x110b0, 0x110b8,
-	0x11100, 0x11102,
-	0x11127, 0x11132,
-	0x11180, 0x11182,
-	0x111b3, 0x111bf,
-	0x1122c, 0x11234,
-	0x11237, 0x11237,
-	0x1123e, 0x1123e,
-	0x112df, 0x112e8,
-	0x11300, 0x11303,
-	0x1133e, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134c,
-	0x11357, 0x11357,
-	0x11362, 0x11363,
-	0x11435, 0x11441,
-	0x11443, 0x11445,
-	0x114b0, 0x114c1,
-	0x115af, 0x115b5,
-	0x115b8, 0x115be,
-	0x115dc, 0x115dd,
-	0x11630, 0x1163e,
-	0x11640, 0x11640,
-	0x116ab, 0x116b5,
-	0x1171d, 0x1172a,
-	0x11c2f, 0x11c36,
-	0x11c38, 0x11c3e,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x16b30, 0x16b36,
-	0x16f51, 0x16f7e,
-	0x1bc9e, 0x1bc9e,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e947, 0x1e947,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* CR_Other_Alphabetic */
-
-/* 'Ideographic': Binary Property */
-static const OnigCodePoint CR_Ideographic[] = {
-	14,
-	0x3006, 0x3007,
-	0x3021, 0x3029,
-	0x3038, 0x303a,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xf900, 0xfa6d,
-	0xfa70, 0xfad9,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-}; /* CR_Ideographic */
-
-/* 'Diacritic': Binary Property */
-static const OnigCodePoint CR_Diacritic[] = {
-	152,
-	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,
-	0x08e3, 0x08fe,
-	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,
-	0x1ab0, 0x1abd,
-	0x1b34, 0x1b34,
-	0x1b44, 0x1b44,
-	0x1b6b, 0x1b73,
-	0x1baa, 0x1bab,
-	0x1c36, 0x1c37,
-	0x1c78, 0x1c7d,
-	0x1cd0, 0x1ce8,
-	0x1ced, 0x1ced,
-	0x1cf4, 0x1cf4,
-	0x1cf8, 0x1cf9,
-	0x1d2c, 0x1d6a,
-	0x1dc4, 0x1dcf,
-	0x1df5, 0x1df5,
-	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,
-	0xa69c, 0xa69d,
-	0xa6f0, 0xa6f1,
-	0xa717, 0xa721,
-	0xa788, 0xa788,
-	0xa7f8, 0xa7f9,
-	0xa8c4, 0xa8c4,
-	0xa8e0, 0xa8f1,
-	0xa92b, 0xa92e,
-	0xa953, 0xa953,
-	0xa9b3, 0xa9b3,
-	0xa9c0, 0xa9c0,
-	0xa9e5, 0xa9e5,
-	0xaa7b, 0xaa7d,
-	0xaabf, 0xaac2,
-	0xaaf6, 0xaaf6,
-	0xab5b, 0xab5f,
-	0xabec, 0xabed,
-	0xfb1e, 0xfb1e,
-	0xfe20, 0xfe2f,
-	0xff3e, 0xff3e,
-	0xff40, 0xff40,
-	0xff70, 0xff70,
-	0xff9e, 0xff9f,
-	0xffe3, 0xffe3,
-	0x102e0, 0x102e0,
-	0x10ae5, 0x10ae6,
-	0x110b9, 0x110ba,
-	0x11133, 0x11134,
-	0x11173, 0x11173,
-	0x111c0, 0x111c0,
-	0x111ca, 0x111cc,
-	0x11235, 0x11236,
-	0x112e9, 0x112ea,
-	0x1133c, 0x1133c,
-	0x1134d, 0x1134d,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11442, 0x11442,
-	0x11446, 0x11446,
-	0x114c2, 0x114c3,
-	0x115bf, 0x115c0,
-	0x1163f, 0x1163f,
-	0x116b6, 0x116b7,
-	0x1172b, 0x1172b,
-	0x11c3f, 0x11c3f,
-	0x16af0, 0x16af4,
-	0x16f8f, 0x16f9f,
-	0x1d167, 0x1d169,
-	0x1d16d, 0x1d172,
-	0x1d17b, 0x1d182,
-	0x1d185, 0x1d18b,
-	0x1d1aa, 0x1d1ad,
-	0x1e8d0, 0x1e8d6,
-	0x1e944, 0x1e946,
-	0x1e948, 0x1e94a,
-}; /* CR_Diacritic */
-
-/* 'Extender': Binary Property */
-static const OnigCodePoint CR_Extender[] = {
-	28,
-	0x00b7, 0x00b7,
-	0x02d0, 0x02d1,
-	0x0640, 0x0640,
-	0x07fa, 0x07fa,
-	0x0e46, 0x0e46,
-	0x0ec6, 0x0ec6,
-	0x180a, 0x180a,
-	0x1843, 0x1843,
-	0x1aa7, 0x1aa7,
-	0x1c36, 0x1c36,
-	0x1c7b, 0x1c7b,
-	0x3005, 0x3005,
-	0x3031, 0x3035,
-	0x309d, 0x309e,
-	0x30fc, 0x30fe,
-	0xa015, 0xa015,
-	0xa60c, 0xa60c,
-	0xa9cf, 0xa9cf,
-	0xa9e6, 0xa9e6,
-	0xaa70, 0xaa70,
-	0xaadd, 0xaadd,
-	0xaaf3, 0xaaf4,
-	0xff70, 0xff70,
-	0x1135d, 0x1135d,
-	0x115c6, 0x115c8,
-	0x16b42, 0x16b43,
-	0x16fe0, 0x16fe0,
-	0x1e944, 0x1e946,
-}; /* CR_Extender */
-
-/* 'Other_Lowercase': Binary Property */
-static const OnigCodePoint CR_Other_Lowercase[] = {
-	20,
-	0x00aa, 0x00aa,
-	0x00ba, 0x00ba,
-	0x02b0, 0x02b8,
-	0x02c0, 0x02c1,
-	0x02e0, 0x02e4,
-	0x0345, 0x0345,
-	0x037a, 0x037a,
-	0x1d2c, 0x1d6a,
-	0x1d78, 0x1d78,
-	0x1d9b, 0x1dbf,
-	0x2071, 0x2071,
-	0x207f, 0x207f,
-	0x2090, 0x209c,
-	0x2170, 0x217f,
-	0x24d0, 0x24e9,
-	0x2c7c, 0x2c7d,
-	0xa69c, 0xa69d,
-	0xa770, 0xa770,
-	0xa7f8, 0xa7f9,
-	0xab5c, 0xab5f,
-}; /* CR_Other_Lowercase */
-
-/* 'Other_Uppercase': Binary Property */
-static const OnigCodePoint CR_Other_Uppercase[] = {
-	5,
-	0x2160, 0x216f,
-	0x24b6, 0x24cf,
-	0x1f130, 0x1f149,
-	0x1f150, 0x1f169,
-	0x1f170, 0x1f189,
-}; /* 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[] = {
-	23,
-	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, 0x200c,
-	0x302e, 0x302f,
-	0xff9e, 0xff9f,
-	0x1133e, 0x1133e,
-	0x11357, 0x11357,
-	0x114b0, 0x114b0,
-	0x114bd, 0x114bd,
-	0x115af, 0x115af,
-	0x1d165, 0x1d165,
-	0x1d16e, 0x1d172,
-	0xe0020, 0xe007f,
-}; /* 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[] = {
-	13,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fd5,
-	0xfa0e, 0xfa0f,
-	0xfa11, 0xfa11,
-	0xfa13, 0xfa14,
-	0xfa1f, 0xfa1f,
-	0xfa21, 0xfa21,
-	0xfa23, 0xfa24,
-	0xfa27, 0xfa29,
-	0x20000, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-}; /* CR_Unified_Ideograph */
-
-/* 'Other_Default_Ignorable_Code_Point': Binary Property */
-static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
-	11,
-	0x034f, 0x034f,
-	0x115f, 0x1160,
-	0x17b4, 0x17b5,
-	0x2065, 0x2065,
-	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,
-	0x0673, 0x0673,
-	0x0f77, 0x0f77,
-	0x0f79, 0x0f79,
-	0x17a3, 0x17a4,
-	0x206a, 0x206f,
-	0x2329, 0x232a,
-	0xe0001, 0xe0001,
-}; /* 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[] = {
-	7,
-	0x0e40, 0x0e44,
-	0x0ec0, 0x0ec4,
-	0x19b5, 0x19b7,
-	0x19ba, 0x19ba,
-	0xaab5, 0xaab6,
-	0xaab9, 0xaab9,
-	0xaabb, 0xaabc,
-}; /* CR_Logical_Order_Exception */
-
-/* 'Other_ID_Start': Binary Property */
-static const OnigCodePoint CR_Other_ID_Start[] = {
-	4,
-	0x1885, 0x1886,
-	0x2118, 0x2118,
-	0x212e, 0x212e,
-	0x309b, 0x309c,
-}; /* CR_Other_ID_Start */
-
-/* 'Other_ID_Continue': Binary Property */
-static const OnigCodePoint CR_Other_ID_Continue[] = {
-	4,
-	0x00b7, 0x00b7,
-	0x0387, 0x0387,
-	0x1369, 0x1371,
-	0x19da, 0x19da,
-}; /* CR_Other_ID_Continue */
-
-/* 'Sentence_Terminal': Binary Property */
-static const OnigCodePoint CR_Sentence_Terminal[] = {
-	66,
-	0x0021, 0x0021,
-	0x002e, 0x002e,
-	0x003f, 0x003f,
-	0x0589, 0x0589,
-	0x061f, 0x061f,
-	0x06d4, 0x06d4,
-	0x0700, 0x0702,
-	0x07f9, 0x07f9,
-	0x0964, 0x0965,
-	0x104a, 0x104b,
-	0x1362, 0x1362,
-	0x1367, 0x1368,
-	0x166e, 0x166e,
-	0x1735, 0x1736,
-	0x1803, 0x1803,
-	0x1809, 0x1809,
-	0x1944, 0x1945,
-	0x1aa8, 0x1aab,
-	0x1b5a, 0x1b5b,
-	0x1b5e, 0x1b5f,
-	0x1c3b, 0x1c3c,
-	0x1c7e, 0x1c7f,
-	0x203c, 0x203d,
-	0x2047, 0x2049,
-	0x2e2e, 0x2e2e,
-	0x2e3c, 0x2e3c,
-	0x3002, 0x3002,
-	0xa4ff, 0xa4ff,
-	0xa60e, 0xa60f,
-	0xa6f3, 0xa6f3,
-	0xa6f7, 0xa6f7,
-	0xa876, 0xa877,
-	0xa8ce, 0xa8cf,
-	0xa92f, 0xa92f,
-	0xa9c8, 0xa9c9,
-	0xaa5d, 0xaa5f,
-	0xaaf0, 0xaaf1,
-	0xabeb, 0xabeb,
-	0xfe52, 0xfe52,
-	0xfe56, 0xfe57,
-	0xff01, 0xff01,
-	0xff0e, 0xff0e,
-	0xff1f, 0xff1f,
-	0xff61, 0xff61,
-	0x10a56, 0x10a57,
-	0x11047, 0x11048,
-	0x110be, 0x110c1,
-	0x11141, 0x11143,
-	0x111c5, 0x111c6,
-	0x111cd, 0x111cd,
-	0x111de, 0x111df,
-	0x11238, 0x11239,
-	0x1123b, 0x1123c,
-	0x112a9, 0x112a9,
-	0x1144b, 0x1144c,
-	0x115c2, 0x115c3,
-	0x115c9, 0x115d7,
-	0x11641, 0x11642,
-	0x1173c, 0x1173e,
-	0x11c41, 0x11c42,
-	0x16a6e, 0x16a6f,
-	0x16af5, 0x16af5,
-	0x16b37, 0x16b38,
-	0x16b44, 0x16b44,
-	0x1bc9f, 0x1bc9f,
-	0x1da88, 0x1da88,
-}; /* CR_Sentence_Terminal */
-
-/* '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 */
-
-/* 'Prepended_Concatenation_Mark': Binary Property */
-static const OnigCodePoint CR_Prepended_Concatenation_Mark[] = {
-	5,
-	0x0600, 0x0605,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x08e2, 0x08e2,
-	0x110bd, 0x110bd,
-}; /* CR_Prepended_Concatenation_Mark */
-
-/* 'Unknown': Script */
-static const OnigCodePoint CR_Unknown[] = {
-	636,
-	0x0378, 0x0379,
-	0x0380, 0x0383,
-	0x038b, 0x038b,
-	0x038d, 0x038d,
-	0x03a2, 0x03a2,
-	0x0530, 0x0530,
-	0x0557, 0x0558,
-	0x0560, 0x0560,
-	0x0588, 0x0588,
-	0x058b, 0x058c,
-	0x0590, 0x0590,
-	0x05c8, 0x05cf,
-	0x05eb, 0x05ef,
-	0x05f5, 0x05ff,
-	0x061d, 0x061d,
-	0x070e, 0x070e,
-	0x074b, 0x074c,
-	0x07b2, 0x07bf,
-	0x07fb, 0x07ff,
-	0x082e, 0x082f,
-	0x083f, 0x083f,
-	0x085c, 0x085d,
-	0x085f, 0x089f,
-	0x08b5, 0x08b5,
-	0x08be, 0x08d3,
-	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,
-	0x0af2, 0x0af8,
-	0x0afa, 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,
-	0x0b78, 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, 0x0bff,
-	0x0c04, 0x0c04,
-	0x0c0d, 0x0c0d,
-	0x0c11, 0x0c11,
-	0x0c29, 0x0c29,
-	0x0c3a, 0x0c3c,
-	0x0c45, 0x0c45,
-	0x0c49, 0x0c49,
-	0x0c4e, 0x0c54,
-	0x0c57, 0x0c57,
-	0x0c5b, 0x0c5f,
-	0x0c64, 0x0c65,
-	0x0c70, 0x0c77,
-	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, 0x0d00,
-	0x0d04, 0x0d04,
-	0x0d0d, 0x0d0d,
-	0x0d11, 0x0d11,
-	0x0d3b, 0x0d3c,
-	0x0d45, 0x0d45,
-	0x0d49, 0x0d49,
-	0x0d50, 0x0d53,
-	0x0d64, 0x0d65,
-	0x0d80, 0x0d81,
-	0x0d84, 0x0d84,
-	0x0d97, 0x0d99,
-	0x0db2, 0x0db2,
-	0x0dbc, 0x0dbc,
-	0x0dbe, 0x0dbf,
-	0x0dc7, 0x0dc9,
-	0x0dcb, 0x0dce,
-	0x0dd5, 0x0dd5,
-	0x0dd7, 0x0dd7,
-	0x0de0, 0x0de5,
-	0x0df0, 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,
-	0x0ee0, 0x0eff,
-	0x0f48, 0x0f48,
-	0x0f6d, 0x0f70,
-	0x0f98, 0x0f98,
-	0x0fbd, 0x0fbd,
-	0x0fcd, 0x0fcd,
-	0x0fdb, 0x0fff,
-	0x10c6, 0x10c6,
-	0x10c8, 0x10cc,
-	0x10ce, 0x10cf,
-	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, 0x135c,
-	0x137d, 0x137f,
-	0x139a, 0x139f,
-	0x13f6, 0x13f7,
-	0x13fe, 0x13ff,
-	0x169d, 0x169f,
-	0x16f9, 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,
-	0x191f, 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, 0x1aaf,
-	0x1abf, 0x1aff,
-	0x1b4c, 0x1b4f,
-	0x1b7d, 0x1b7f,
-	0x1bf4, 0x1bfb,
-	0x1c38, 0x1c3a,
-	0x1c4a, 0x1c4c,
-	0x1c89, 0x1cbf,
-	0x1cc8, 0x1ccf,
-	0x1cf7, 0x1cf7,
-	0x1cfa, 0x1cff,
-	0x1df6, 0x1dfa,
-	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, 0x2065,
-	0x2072, 0x2073,
-	0x208f, 0x208f,
-	0x209d, 0x209f,
-	0x20bf, 0x20cf,
-	0x20f1, 0x20ff,
-	0x218c, 0x218f,
-	0x23ff, 0x23ff,
-	0x2427, 0x243f,
-	0x244b, 0x245f,
-	0x2b74, 0x2b75,
-	0x2b96, 0x2b97,
-	0x2bba, 0x2bbc,
-	0x2bc9, 0x2bc9,
-	0x2bd2, 0x2beb,
-	0x2bf0, 0x2bff,
-	0x2c2f, 0x2c2f,
-	0x2c5f, 0x2c5f,
-	0x2cf4, 0x2cf8,
-	0x2d26, 0x2d26,
-	0x2d28, 0x2d2c,
-	0x2d2e, 0x2d2f,
-	0x2d68, 0x2d6e,
-	0x2d71, 0x2d7e,
-	0x2d97, 0x2d9f,
-	0x2da7, 0x2da7,
-	0x2daf, 0x2daf,
-	0x2db7, 0x2db7,
-	0x2dbf, 0x2dbf,
-	0x2dc7, 0x2dc7,
-	0x2dcf, 0x2dcf,
-	0x2dd7, 0x2dd7,
-	0x2ddf, 0x2ddf,
-	0x2e45, 0x2e7f,
-	0x2e9a, 0x2e9a,
-	0x2ef4, 0x2eff,
-	0x2fd6, 0x2fef,
-	0x2ffc, 0x2fff,
-	0x3040, 0x3040,
-	0x3097, 0x3098,
-	0x3100, 0x3104,
-	0x312e, 0x3130,
-	0x318f, 0x318f,
-	0x31bb, 0x31bf,
-	0x31e4, 0x31ef,
-	0x321f, 0x321f,
-	0x32ff, 0x32ff,
-	0x4db6, 0x4dbf,
-	0x9fd6, 0x9fff,
-	0xa48d, 0xa48f,
-	0xa4c7, 0xa4cf,
-	0xa62c, 0xa63f,
-	0xa6f8, 0xa6ff,
-	0xa7af, 0xa7af,
-	0xa7b8, 0xa7f6,
-	0xa82c, 0xa82f,
-	0xa83a, 0xa83f,
-	0xa878, 0xa87f,
-	0xa8c6, 0xa8cd,
-	0xa8da, 0xa8df,
-	0xa8fe, 0xa8ff,
-	0xa954, 0xa95e,
-	0xa97d, 0xa97f,
-	0xa9ce, 0xa9ce,
-	0xa9da, 0xa9dd,
-	0xa9ff, 0xa9ff,
-	0xaa37, 0xaa3f,
-	0xaa4e, 0xaa4f,
-	0xaa5a, 0xaa5b,
-	0xaac3, 0xaada,
-	0xaaf7, 0xab00,
-	0xab07, 0xab08,
-	0xab0f, 0xab10,
-	0xab17, 0xab1f,
-	0xab27, 0xab27,
-	0xab2f, 0xab2f,
-	0xab66, 0xab6f,
-	0xabee, 0xabef,
-	0xabfa, 0xabff,
-	0xd7a4, 0xd7af,
-	0xd7c7, 0xd7ca,
-	0xd7fc, 0xf8ff,
-	0xfa6e, 0xfa6f,
-	0xfada, 0xfaff,
-	0xfb07, 0xfb12,
-	0xfb18, 0xfb1c,
-	0xfb37, 0xfb37,
-	0xfb3d, 0xfb3d,
-	0xfb3f, 0xfb3f,
-	0xfb42, 0xfb42,
-	0xfb45, 0xfb45,
-	0xfbc2, 0xfbd2,
-	0xfd40, 0xfd4f,
-	0xfd90, 0xfd91,
-	0xfdc8, 0xfdef,
-	0xfdfe, 0xfdff,
-	0xfe1a, 0xfe1f,
-	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,
-	0x1018f, 0x1018f,
-	0x1019c, 0x1019f,
-	0x101a1, 0x101cf,
-	0x101fe, 0x1027f,
-	0x1029d, 0x1029f,
-	0x102d1, 0x102df,
-	0x102fc, 0x102ff,
-	0x10324, 0x1032f,
-	0x1034b, 0x1034f,
-	0x1037b, 0x1037f,
-	0x1039e, 0x1039e,
-	0x103c4, 0x103c7,
-	0x103d6, 0x103ff,
-	0x1049e, 0x1049f,
-	0x104aa, 0x104af,
-	0x104d4, 0x104d7,
-	0x104fc, 0x104ff,
-	0x10528, 0x1052f,
-	0x10564, 0x1056e,
-	0x10570, 0x105ff,
-	0x10737, 0x1073f,
-	0x10756, 0x1075f,
-	0x10768, 0x107ff,
-	0x10806, 0x10807,
-	0x10809, 0x10809,
-	0x10836, 0x10836,
-	0x10839, 0x1083b,
-	0x1083d, 0x1083e,
-	0x10856, 0x10856,
-	0x1089f, 0x108a6,
-	0x108b0, 0x108df,
-	0x108f3, 0x108f3,
-	0x108f6, 0x108fa,
-	0x1091c, 0x1091e,
-	0x1093a, 0x1093e,
-	0x10940, 0x1097f,
-	0x109b8, 0x109bb,
-	0x109d0, 0x109d1,
-	0x10a04, 0x10a04,
-	0x10a07, 0x10a0b,
-	0x10a14, 0x10a14,
-	0x10a18, 0x10a18,
-	0x10a34, 0x10a37,
-	0x10a3b, 0x10a3e,
-	0x10a48, 0x10a4f,
-	0x10a59, 0x10a5f,
-	0x10aa0, 0x10abf,
-	0x10ae7, 0x10aea,
-	0x10af7, 0x10aff,
-	0x10b36, 0x10b38,
-	0x10b56, 0x10b57,
-	0x10b73, 0x10b77,
-	0x10b92, 0x10b98,
-	0x10b9d, 0x10ba8,
-	0x10bb0, 0x10bff,
-	0x10c49, 0x10c7f,
-	0x10cb3, 0x10cbf,
-	0x10cf3, 0x10cf9,
-	0x10d00, 0x10e5f,
-	0x10e7f, 0x10fff,
-	0x1104e, 0x11051,
-	0x11070, 0x1107e,
-	0x110c2, 0x110cf,
-	0x110e9, 0x110ef,
-	0x110fa, 0x110ff,
-	0x11135, 0x11135,
-	0x11144, 0x1114f,
-	0x11177, 0x1117f,
-	0x111ce, 0x111cf,
-	0x111e0, 0x111e0,
-	0x111f5, 0x111ff,
-	0x11212, 0x11212,
-	0x1123f, 0x1127f,
-	0x11287, 0x11287,
-	0x11289, 0x11289,
-	0x1128e, 0x1128e,
-	0x1129e, 0x1129e,
-	0x112aa, 0x112af,
-	0x112eb, 0x112ef,
-	0x112fa, 0x112ff,
-	0x11304, 0x11304,
-	0x1130d, 0x1130e,
-	0x11311, 0x11312,
-	0x11329, 0x11329,
-	0x11331, 0x11331,
-	0x11334, 0x11334,
-	0x1133a, 0x1133b,
-	0x11345, 0x11346,
-	0x11349, 0x1134a,
-	0x1134e, 0x1134f,
-	0x11351, 0x11356,
-	0x11358, 0x1135c,
-	0x11364, 0x11365,
-	0x1136d, 0x1136f,
-	0x11375, 0x113ff,
-	0x1145a, 0x1145a,
-	0x1145c, 0x1145c,
-	0x1145e, 0x1147f,
-	0x114c8, 0x114cf,
-	0x114da, 0x1157f,
-	0x115b6, 0x115b7,
-	0x115de, 0x115ff,
-	0x11645, 0x1164f,
-	0x1165a, 0x1165f,
-	0x1166d, 0x1167f,
-	0x116b8, 0x116bf,
-	0x116ca, 0x116ff,
-	0x1171a, 0x1171c,
-	0x1172c, 0x1172f,
-	0x11740, 0x1189f,
-	0x118f3, 0x118fe,
-	0x11900, 0x11abf,
-	0x11af9, 0x11bff,
-	0x11c09, 0x11c09,
-	0x11c37, 0x11c37,
-	0x11c46, 0x11c4f,
-	0x11c6d, 0x11c6f,
-	0x11c90, 0x11c91,
-	0x11ca8, 0x11ca8,
-	0x11cb7, 0x11fff,
-	0x1239a, 0x123ff,
-	0x1246f, 0x1246f,
-	0x12475, 0x1247f,
-	0x12544, 0x12fff,
-	0x1342f, 0x143ff,
-	0x14647, 0x167ff,
-	0x16a39, 0x16a3f,
-	0x16a5f, 0x16a5f,
-	0x16a6a, 0x16a6d,
-	0x16a70, 0x16acf,
-	0x16aee, 0x16aef,
-	0x16af6, 0x16aff,
-	0x16b46, 0x16b4f,
-	0x16b5a, 0x16b5a,
-	0x16b62, 0x16b62,
-	0x16b78, 0x16b7c,
-	0x16b90, 0x16eff,
-	0x16f45, 0x16f4f,
-	0x16f7f, 0x16f8e,
-	0x16fa0, 0x16fdf,
-	0x16fe1, 0x16fff,
-	0x187ed, 0x187ff,
-	0x18af3, 0x1afff,
-	0x1b002, 0x1bbff,
-	0x1bc6b, 0x1bc6f,
-	0x1bc7d, 0x1bc7f,
-	0x1bc89, 0x1bc8f,
-	0x1bc9a, 0x1bc9b,
-	0x1bca4, 0x1cfff,
-	0x1d0f6, 0x1d0ff,
-	0x1d127, 0x1d128,
-	0x1d1e9, 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,
-	0x1da8c, 0x1da9a,
-	0x1daa0, 0x1daa0,
-	0x1dab0, 0x1dfff,
-	0x1e007, 0x1e007,
-	0x1e019, 0x1e01a,
-	0x1e022, 0x1e022,
-	0x1e025, 0x1e025,
-	0x1e02b, 0x1e7ff,
-	0x1e8c5, 0x1e8c6,
-	0x1e8d7, 0x1e8ff,
-	0x1e94b, 0x1e94f,
-	0x1e95a, 0x1e95d,
-	0x1e960, 0x1edff,
-	0x1ee04, 0x1ee04,
-	0x1ee20, 0x1ee20,
-	0x1ee23, 0x1ee23,
-	0x1ee25, 0x1ee26,
-	0x1ee28, 0x1ee28,
-	0x1ee33, 0x1ee33,
-	0x1ee38, 0x1ee38,
-	0x1ee3a, 0x1ee3a,
-	0x1ee3c, 0x1ee41,
-	0x1ee43, 0x1ee46,
-	0x1ee48, 0x1ee48,
-	0x1ee4a, 0x1ee4a,
-	0x1ee4c, 0x1ee4c,
-	0x1ee50, 0x1ee50,
-	0x1ee53, 0x1ee53,
-	0x1ee55, 0x1ee56,
-	0x1ee58, 0x1ee58,
-	0x1ee5a, 0x1ee5a,
-	0x1ee5c, 0x1ee5c,
-	0x1ee5e, 0x1ee5e,
-	0x1ee60, 0x1ee60,
-	0x1ee63, 0x1ee63,
-	0x1ee65, 0x1ee66,
-	0x1ee6b, 0x1ee6b,
-	0x1ee73, 0x1ee73,
-	0x1ee78, 0x1ee78,
-	0x1ee7d, 0x1ee7d,
-	0x1ee7f, 0x1ee7f,
-	0x1ee8a, 0x1ee8a,
-	0x1ee9c, 0x1eea0,
-	0x1eea4, 0x1eea4,
-	0x1eeaa, 0x1eeaa,
-	0x1eebc, 0x1eeef,
-	0x1eef2, 0x1efff,
-	0x1f02c, 0x1f02f,
-	0x1f094, 0x1f09f,
-	0x1f0af, 0x1f0b0,
-	0x1f0c0, 0x1f0c0,
-	0x1f0d0, 0x1f0d0,
-	0x1f0f6, 0x1f0ff,
-	0x1f10d, 0x1f10f,
-	0x1f12f, 0x1f12f,
-	0x1f16c, 0x1f16f,
-	0x1f1ad, 0x1f1e5,
-	0x1f203, 0x1f20f,
-	0x1f23c, 0x1f23f,
-	0x1f249, 0x1f24f,
-	0x1f252, 0x1f2ff,
-	0x1f6d3, 0x1f6df,
-	0x1f6ed, 0x1f6ef,
-	0x1f6f7, 0x1f6ff,
-	0x1f774, 0x1f77f,
-	0x1f7d5, 0x1f7ff,
-	0x1f80c, 0x1f80f,
-	0x1f848, 0x1f84f,
-	0x1f85a, 0x1f85f,
-	0x1f888, 0x1f88f,
-	0x1f8ae, 0x1f90f,
-	0x1f91f, 0x1f91f,
-	0x1f928, 0x1f92f,
-	0x1f931, 0x1f932,
-	0x1f93f, 0x1f93f,
-	0x1f94c, 0x1f94f,
-	0x1f95f, 0x1f97f,
-	0x1f992, 0x1f9bf,
-	0x1f9c1, 0x1ffff,
-	0x2a6d7, 0x2a6ff,
-	0x2b735, 0x2b73f,
-	0x2b81e, 0x2b81f,
-	0x2cea2, 0x2f7ff,
-	0x2fa1e, 0xe0000,
-	0xe0002, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0x10ffff,
-}; /* CR_Unknown */
-
-#ifdef USE_UNICODE_AGE_PROPERTIES
-/* 'Age_1_1': Derived Age 1.1 */
-static const OnigCodePoint CR_Age_1_1[] = {
-	288,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x05b0, 0x05b9,
-	0x05bb, 0x05c3,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9a,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20aa,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xe000, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 0xffff,
-}; /* CR_Age_1_1 */
-
-/* 'Age_2_0': Derived Age 2.0 */
-static const OnigCodePoint CR_Age_2_0[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ab,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffd, 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, 0x10ffff,
-}; /* CR_Age_2_0 */
-
-/* 'Age_2_1': Derived Age 2.1 */
-static const OnigCodePoint CR_Age_2_1[] = {
-	312,
-	0x0000, 0x01f5,
-	0x01fa, 0x0217,
-	0x0250, 0x02a8,
-	0x02b0, 0x02de,
-	0x02e0, 0x02e9,
-	0x0300, 0x0345,
-	0x0360, 0x0361,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d6,
-	0x03da, 0x03da,
-	0x03dc, 0x03dc,
-	0x03de, 0x03de,
-	0x03e0, 0x03e0,
-	0x03e2, 0x03f3,
-	0x0401, 0x040c,
-	0x040e, 0x044f,
-	0x0451, 0x045c,
-	0x045e, 0x0486,
-	0x0490, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04eb,
-	0x04ee, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x0589,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0652,
-	0x0660, 0x066d,
-	0x0670, 0x06b7,
-	0x06ba, 0x06be,
-	0x06c0, 0x06ce,
-	0x06d0, 0x06ed,
-	0x06f0, 0x06f9,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f69,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f95,
-	0x0f97, 0x0f97,
-	0x0f99, 0x0fad,
-	0x0fb1, 0x0fb7,
-	0x0fb9, 0x0fb9,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x202e,
-	0x2030, 0x2046,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20ac,
-	0x20d0, 0x20e1,
-	0x2100, 0x2138,
-	0x2153, 0x2182,
-	0x2190, 0x21ea,
-	0x2200, 0x22f1,
-	0x2300, 0x2300,
-	0x2302, 0x237a,
-	0x2400, 0x2424,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25ef,
-	0x2600, 0x2613,
-	0x261a, 0x266f,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x3000, 0x3037,
-	0x303f, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x319f,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x4e00, 0x9fa5,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1e, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfffc, 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, 0x10ffff,
-}; /* CR_Age_2_1 */
-
-/* 'Age_3_0': Derived Age 3.0 */
-static const OnigCodePoint CR_Age_3_0[] = {
-	369,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f3,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f6a,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdf0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 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, 0x10ffff,
-}; /* CR_Age_3_0 */
-
-/* 'Age_3_1': Derived Age 3.1 */
-static const OnigCodePoint CR_Age_3_1[] = {
-	402,
-	0x0000, 0x021f,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034e,
-	0x0360, 0x0362,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03d7,
-	0x03da, 0x03f5,
-	0x0400, 0x0486,
-	0x0488, 0x0489,
-	0x048c, 0x04c4,
-	0x04c7, 0x04c8,
-	0x04cb, 0x04cc,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x066d,
-	0x0670, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b0,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f6a,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f6,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x2046,
-	0x2048, 0x204d,
-	0x206a, 0x2070,
-	0x2074, 0x208e,
-	0x20a0, 0x20af,
-	0x20d0, 0x20e3,
-	0x2100, 0x213a,
-	0x2153, 0x2183,
-	0x2190, 0x21f3,
-	0x2200, 0x22f1,
-	0x2300, 0x237b,
-	0x237d, 0x239a,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24ea,
-	0x2500, 0x2595,
-	0x25a0, 0x25f7,
-	0x2600, 0x2613,
-	0x2619, 0x2671,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2767,
-	0x2776, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x2800, 0x28ff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303a,
-	0x303e, 0x303f,
-	0x3041, 0x3094,
-	0x3099, 0x309e,
-	0x30a1, 0x30fe,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x3200, 0x321c,
-	0x3220, 0x3243,
-	0x3260, 0x327b,
-	0x327f, 0x32b0,
-	0x32c0, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4a1,
-	0xa4a4, 0xa4b3,
-	0xa4b5, 0xa4c0,
-	0xa4c2, 0xa4c4,
-	0xa4c6, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfb,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe44,
-	0xfe49, 0xfe52,
-	0xfe54, 0xfe66,
-	0xfe68, 0xfe6b,
-	0xfe70, 0xfe72,
-	0xfe74, 0xfe74,
-	0xfe76, 0xfefc,
-	0xfeff, 0xfeff,
-	0xff01, 0xff5e,
-	0xff61, 0xffbe,
-	0xffc2, 0xffc7,
-	0xffca, 0xffcf,
-	0xffd2, 0xffd7,
-	0xffda, 0xffdc,
-	0xffe0, 0xffe6,
-	0xffe8, 0xffee,
-	0xfff9, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_1 */
-
-/* 'Age_3_2': Derived Age 3.2 */
-static const OnigCodePoint CR_Age_3_2[] = {
-	397,
-	0x0000, 0x0220,
-	0x0222, 0x0233,
-	0x0250, 0x02ad,
-	0x02b0, 0x02ee,
-	0x0300, 0x034f,
-	0x0360, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03f6,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x060c, 0x060c,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0655,
-	0x0660, 0x06ed,
-	0x06f0, 0x06fe,
-	0x0700, 0x070d,
-	0x070f, 0x072c,
-	0x0730, 0x074a,
-	0x0780, 0x07b1,
-	0x0901, 0x0903,
-	0x0905, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09bc,
-	0x09be, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a02, 0x0a02,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	0x0a81, 0x0a83,
-	0x0a85, 0x0a8b,
-	0x0a8d, 0x0a8d,
-	0x0a8f, 0x0a91,
-	0x0a93, 0x0aa8,
-	0x0aaa, 0x0ab0,
-	0x0ab2, 0x0ab3,
-	0x0ab5, 0x0ab9,
-	0x0abc, 0x0ac5,
-	0x0ac7, 0x0ac9,
-	0x0acb, 0x0acd,
-	0x0ad0, 0x0ad0,
-	0x0ae0, 0x0ae0,
-	0x0ae6, 0x0aef,
-	0x0b01, 0x0b03,
-	0x0b05, 0x0b0c,
-	0x0b0f, 0x0b10,
-	0x0b13, 0x0b28,
-	0x0b2a, 0x0b30,
-	0x0b32, 0x0b33,
-	0x0b36, 0x0b39,
-	0x0b3c, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b70,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bf2,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	0x0c66, 0x0c6f,
-	0x0c82, 0x0c83,
-	0x0c85, 0x0c8c,
-	0x0c8e, 0x0c90,
-	0x0c92, 0x0ca8,
-	0x0caa, 0x0cb3,
-	0x0cb5, 0x0cb9,
-	0x0cbe, 0x0cc4,
-	0x0cc6, 0x0cc8,
-	0x0cca, 0x0ccd,
-	0x0cd5, 0x0cd6,
-	0x0cde, 0x0cde,
-	0x0ce0, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f6a,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 0x169c,
-	0x16a0, 0x16f0,
-	0x1700, 0x170c,
-	0x170e, 0x1714,
-	0x1720, 0x1736,
-	0x1740, 0x1753,
-	0x1760, 0x176c,
-	0x176e, 0x1770,
-	0x1772, 0x1773,
-	0x1780, 0x17dc,
-	0x17e0, 0x17e9,
-	0x1800, 0x180e,
-	0x1810, 0x1819,
-	0x1820, 0x1877,
-	0x1880, 0x18a9,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x2052,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213a,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23ce,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x24fe,
-	0x2500, 0x2613,
-	0x2616, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2689,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2aff,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321c,
-	0x3220, 0x3243,
-	0x3251, 0x327b,
-	0x327f, 0x32cb,
-	0x32d0, 0x32fe,
-	0x3300, 0x3376,
-	0x337b, 0x33dd,
-	0x33e0, 0x33fe,
-	0x3400, 0x4db5,
-	0x4e00, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfc,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe23,
-	0xfe30, 0xfe46,
-	0xfe49, 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, 0xffff,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10400, 0x10425,
-	0x10428, 0x1044d,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d400, 0x1d454,
-	0x1d456, 0x1d49c,
-	0x1d49e, 0x1d49f,
-	0x1d4a2, 0x1d4a2,
-	0x1d4a5, 0x1d4a6,
-	0x1d4a9, 0x1d4ac,
-	0x1d4ae, 0x1d4b9,
-	0x1d4bb, 0x1d4bb,
-	0x1d4bd, 0x1d4c0,
-	0x1d4c2, 0x1d4c3,
-	0x1d4c5, 0x1d505,
-	0x1d507, 0x1d50a,
-	0x1d50d, 0x1d514,
-	0x1d516, 0x1d51c,
-	0x1d51e, 0x1d539,
-	0x1d53b, 0x1d53e,
-	0x1d540, 0x1d544,
-	0x1d546, 0x1d546,
-	0x1d54a, 0x1d550,
-	0x1d552, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_3_2 */
-
-/* 'Age_4_0': Derived Age 4.0 */
-static const OnigCodePoint CR_Age_4_0[] = {
-	412,
-	0x0000, 0x0236,
-	0x0250, 0x0357,
-	0x035d, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x03fb,
-	0x0400, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f5,
-	0x04f8, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05a1,
-	0x05a3, 0x05b9,
-	0x05bb, 0x05c4,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060c, 0x0615,
-	0x061b, 0x061b,
-	0x061f, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x0658,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x074f,
-	0x0780, 0x07b1,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x0981, 0x0983,
-	0x0985, 0x098c,
-	0x098f, 0x0990,
-	0x0993, 0x09a8,
-	0x09aa, 0x09b0,
-	0x09b2, 0x09b2,
-	0x09b6, 0x09b9,
-	0x09bc, 0x09c4,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cd,
-	0x09d7, 0x09d7,
-	0x09dc, 0x09dd,
-	0x09df, 0x09e3,
-	0x09e6, 0x09fa,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	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, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	0x0b66, 0x0b71,
-	0x0b82, 0x0b83,
-	0x0b85, 0x0b8a,
-	0x0b8e, 0x0b90,
-	0x0b92, 0x0b95,
-	0x0b99, 0x0b9a,
-	0x0b9c, 0x0b9c,
-	0x0b9e, 0x0b9f,
-	0x0ba3, 0x0ba4,
-	0x0ba8, 0x0baa,
-	0x0bae, 0x0bb5,
-	0x0bb7, 0x0bb9,
-	0x0bbe, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcd,
-	0x0bd7, 0x0bd7,
-	0x0be7, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	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, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f6a,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fcf,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10f8,
-	0x10fb, 0x10fb,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	0x1200, 0x1206,
-	0x1208, 0x1246,
-	0x1248, 0x1248,
-	0x124a, 0x124d,
-	0x1250, 0x1256,
-	0x1258, 0x1258,
-	0x125a, 0x125d,
-	0x1260, 0x1286,
-	0x1288, 0x1288,
-	0x128a, 0x128d,
-	0x1290, 0x12ae,
-	0x12b0, 0x12b0,
-	0x12b2, 0x12b5,
-	0x12b8, 0x12be,
-	0x12c0, 0x12c0,
-	0x12c2, 0x12c5,
-	0x12c8, 0x12ce,
-	0x12d0, 0x12d6,
-	0x12d8, 0x12ee,
-	0x12f0, 0x130e,
-	0x1310, 0x1310,
-	0x1312, 0x1315,
-	0x1318, 0x131e,
-	0x1320, 0x1346,
-	0x1348, 0x135a,
-	0x1361, 0x137c,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 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, 0x18a9,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x19e0, 0x19ff,
-	0x1d00, 0x1d6b,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x2054,
-	0x2057, 0x2057,
-	0x205f, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x20a0, 0x20b1,
-	0x20d0, 0x20ea,
-	0x2100, 0x213b,
-	0x213d, 0x214b,
-	0x2153, 0x2183,
-	0x2190, 0x23d0,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2617,
-	0x2619, 0x267d,
-	0x2680, 0x2691,
-	0x26a0, 0x26a1,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b0d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x327d,
-	0x327f, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fa5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe0f,
-	0xfe20, 0xfe23,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1013f,
-	0x10300, 0x1031e,
-	0x10320, 0x10323,
-	0x10330, 0x1034a,
-	0x10380, 0x1039d,
-	0x1039f, 0x1039f,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x1083f,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d300, 0x1d356,
-	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, 0x1d6a3,
-	0x1d6a8, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_0 */
-
-/* 'Age_4_1': Derived Age 4.1 */
-static const OnigCodePoint CR_Age_4_1[] = {
-	430,
-	0x0000, 0x0241,
-	0x0250, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037a,
-	0x037e, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x04ce,
-	0x04d0, 0x04f9,
-	0x0500, 0x050f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05b9,
-	0x05bb, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060b, 0x0615,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x076d,
-	0x0780, 0x07b1,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097d, 0x097d,
-	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, 0x09fa,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	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, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	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,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	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, 0x0ce1,
-	0x0ce6, 0x0cef,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f6a,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fd1,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 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, 0x18a9,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1d00, 0x1dc3,
-	0x1e00, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20eb,
-	0x2100, 0x214c,
-	0x2153, 0x2183,
-	0x2190, 0x23db,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b1,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27c6,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b13,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c80, 0x2cea,
-	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, 0x2e17,
-	0x2e1c, 0x2e1d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31cf,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fbb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa700, 0xa716,
-	0xa800, 0xa82b,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe23,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	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, 0x1083f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 0x1d1dd,
-	0x1d200, 0x1d245,
-	0x1d300, 0x1d356,
-	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, 0x1d7c9,
-	0x1d7ce, 0x1d7ff,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_4_1 */
-
-/* 'Age_5_0': Derived Age 5.0 */
-static const OnigCodePoint CR_Age_5_0[] = {
-	440,
-	0x0000, 0x036f,
-	0x0374, 0x0375,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x03ce,
-	0x03d0, 0x0486,
-	0x0488, 0x0513,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x060b, 0x0615,
-	0x061b, 0x061b,
-	0x061e, 0x061f,
-	0x0621, 0x063a,
-	0x0640, 0x065e,
-	0x0660, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x076d,
-	0x0780, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0970,
-	0x097b, 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, 0x09fa,
-	0x0a01, 0x0a03,
-	0x0a05, 0x0a0a,
-	0x0a0f, 0x0a10,
-	0x0a13, 0x0a28,
-	0x0a2a, 0x0a30,
-	0x0a32, 0x0a33,
-	0x0a35, 0x0a36,
-	0x0a38, 0x0a39,
-	0x0a3c, 0x0a3c,
-	0x0a3e, 0x0a42,
-	0x0a47, 0x0a48,
-	0x0a4b, 0x0a4d,
-	0x0a59, 0x0a5c,
-	0x0a5e, 0x0a5e,
-	0x0a66, 0x0a74,
-	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, 0x0b43,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4d,
-	0x0b56, 0x0b57,
-	0x0b5c, 0x0b5d,
-	0x0b5f, 0x0b61,
-	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,
-	0x0bd7, 0x0bd7,
-	0x0be6, 0x0bfa,
-	0x0c01, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c33,
-	0x0c35, 0x0c39,
-	0x0c3e, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c60, 0x0c61,
-	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,
-	0x0cf1, 0x0cf2,
-	0x0d02, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d28,
-	0x0d2a, 0x0d39,
-	0x0d3e, 0x0d43,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4d,
-	0x0d57, 0x0d57,
-	0x0d60, 0x0d61,
-	0x0d66, 0x0d6f,
-	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, 0x0f6a,
-	0x0f71, 0x0f8b,
-	0x0f90, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fcf, 0x0fd1,
-	0x1000, 0x1021,
-	0x1023, 0x1027,
-	0x1029, 0x102a,
-	0x102c, 0x1032,
-	0x1036, 0x1039,
-	0x1040, 0x1059,
-	0x10a0, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 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, 0x18a9,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1d00, 0x1dca,
-	0x1dfe, 0x1e9b,
-	0x1ea0, 0x1ef9,
-	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,
-	0x2000, 0x2063,
-	0x206a, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x2094,
-	0x20a0, 0x20b5,
-	0x20d0, 0x20ef,
-	0x2100, 0x214e,
-	0x2153, 0x2184,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269c,
-	0x26a0, 0x26b2,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27d0, 0x27eb,
-	0x27f0, 0x2b1a,
-	0x2b20, 0x2b23,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6c,
-	0x2c74, 0x2c77,
-	0x2c80, 0x2cea,
-	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, 0x2e17,
-	0x2e1c, 0x2e1d,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312c,
-	0x3131, 0x318e,
-	0x3190, 0x31b7,
-	0x31c0, 0x31cf,
-	0x31f0, 0x321e,
-	0x3220, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fbb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa700, 0xa71a,
-	0xa720, 0xa721,
-	0xa800, 0xa82b,
-	0xa840, 0xa877,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe23,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018a,
-	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, 0x1083f,
-	0x10900, 0x10919,
-	0x1091f, 0x1091f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d12a, 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,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_0 */
-
-/* 'Age_5_1': Derived Age 5.1 */
-static const OnigCodePoint CR_Age_5_1[] = {
-	455,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0523,
-	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,
-	0x0901, 0x0939,
-	0x093c, 0x094d,
-	0x0950, 0x0954,
-	0x0958, 0x0972,
-	0x097b, 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, 0x09fa,
-	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, 0x0fd4,
-	0x1000, 0x1099,
-	0x109e, 0x10c5,
-	0x10d0, 0x10fc,
-	0x1100, 0x1159,
-	0x115f, 0x11a2,
-	0x11a8, 0x11f9,
-	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,
-	0x13a0, 0x13f4,
-	0x1401, 0x1676,
-	0x1680, 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,
-	0x1900, 0x191c,
-	0x1920, 0x192b,
-	0x1930, 0x193b,
-	0x1940, 0x1940,
-	0x1944, 0x196d,
-	0x1970, 0x1974,
-	0x1980, 0x19a9,
-	0x19b0, 0x19c9,
-	0x19d0, 0x19d9,
-	0x19de, 0x1a1b,
-	0x1a1e, 0x1a1f,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1baa,
-	0x1bae, 0x1bb9,
-	0x1c00, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1d00, 0x1de6,
-	0x1dfe, 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, 0x20b5,
-	0x20d0, 0x20f0,
-	0x2100, 0x214f,
-	0x2153, 0x2188,
-	0x2190, 0x23e7,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x269d,
-	0x26a0, 0x26bc,
-	0x26c0, 0x26c3,
-	0x2701, 0x2704,
-	0x2706, 0x2709,
-	0x270c, 0x2727,
-	0x2729, 0x274b,
-	0x274d, 0x274d,
-	0x274f, 0x2752,
-	0x2756, 0x2756,
-	0x2758, 0x275e,
-	0x2761, 0x2794,
-	0x2798, 0x27af,
-	0x27b1, 0x27be,
-	0x27c0, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27d0, 0x2b4c,
-	0x2b50, 0x2b54,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2c6f,
-	0x2c71, 0x2c7d,
-	0x2c80, 0x2cea,
-	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, 0x2e30,
-	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, 0x3243,
-	0x3250, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fc3,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa500, 0xa62b,
-	0xa640, 0xa65f,
-	0xa662, 0xa673,
-	0xa67c, 0xa697,
-	0xa700, 0xa78c,
-	0xa7fb, 0xa82b,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa900, 0xa953,
-	0xa95f, 0xa95f,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaa5f,
-	0xac00, 0xd7a3,
-	0xd800, 0xfa2d,
-	0xfa30, 0xfa6a,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbb1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 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, 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, 0x1083f,
-	0x10900, 0x10919,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	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,
-	0x1fffe, 0x2a6d6,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_1 */
-
-/* 'Age_5_2': Derived Age 5.2 */
-static const OnigCodePoint CR_Age_5_2[] = {
-	495,
-	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,
-	0xfdd0, 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, 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,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_5_2 */
-
-/* 'Age_6_0': Derived Age 6.0 */
-static const OnigCodePoint CR_Age_6_0[] = {
-	511,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0603,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x0900, 0x0977,
-	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, 0x0b77,
-	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, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	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, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	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,
-	0x135d, 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,
-	0x1bc0, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cd0, 0x1cf2,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x27ca,
-	0x27cc, 0x27cc,
-	0x27ce, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf1,
-	0x2cf9, 0x2d25,
-	0x2d30, 0x2d65,
-	0x2d6f, 0x2d70,
-	0x2d7f, 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, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcb,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa673,
-	0xa67c, 0xa697,
-	0xa6a0, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa791,
-	0xa7a0, 0xa7a9,
-	0xa7fa, 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,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	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, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 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, 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,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x1b000, 0x1b001,
-	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,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f169,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f5ff,
-	0x1f601, 0x1f610,
-	0x1f612, 0x1f614,
-	0x1f616, 0x1f616,
-	0x1f618, 0x1f618,
-	0x1f61a, 0x1f61a,
-	0x1f61c, 0x1f61e,
-	0x1f620, 0x1f625,
-	0x1f628, 0x1f62b,
-	0x1f62d, 0x1f62d,
-	0x1f630, 0x1f633,
-	0x1f635, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_0 */
-
-/* 'Age_6_1': Derived Age 6.1 */
-static const OnigCodePoint CR_Age_6_1[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	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, 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, 0x0b77,
-	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, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 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, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x209c,
-	0x20a0, 0x20b9,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 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, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 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, 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,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	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,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_1 */
-
-/* 'Age_6_2': Derived Age 6.2 */
-static const OnigCodePoint CR_Age_6_2[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061b,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	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, 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, 0x0b77,
-	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, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 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, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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, 0x209c,
-	0x20a0, 0x20ba,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 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, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 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, 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,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	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,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_2 */
-
-/* 'Age_6_3': Derived Age 6.3 */
-static const OnigCodePoint CR_Age_6_3[] = {
-	549,
-	0x0000, 0x0377,
-	0x037a, 0x037e,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x0527,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058f, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x0604,
-	0x0606, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08a0,
-	0x08a2, 0x08ac,
-	0x08e4, 0x08fe,
-	0x0900, 0x0977,
-	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, 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, 0x0b77,
-	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, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 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, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1d00, 0x1de6,
-	0x1dfc, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20ba,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23f3,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x26ff,
-	0x2701, 0x2b4c,
-	0x2b50, 0x2b59,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e3b,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa697,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa793,
-	0xa7a0, 0xa7aa,
-	0xa7f8, 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, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 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, 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,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	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,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x11080, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11180, 0x111c8,
-	0x111d0, 0x111d9,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x12000, 0x1236e,
-	0x12400, 0x12462,
-	0x12470, 0x12473,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	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,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0be,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0df,
-	0x1f100, 0x1f10a,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f320,
-	0x1f330, 0x1f335,
-	0x1f337, 0x1f37c,
-	0x1f380, 0x1f393,
-	0x1f3a0, 0x1f3c4,
-	0x1f3c6, 0x1f3ca,
-	0x1f3e0, 0x1f3f0,
-	0x1f400, 0x1f43e,
-	0x1f440, 0x1f440,
-	0x1f442, 0x1f4f7,
-	0x1f4f9, 0x1f4fc,
-	0x1f500, 0x1f53d,
-	0x1f540, 0x1f543,
-	0x1f550, 0x1f567,
-	0x1f5fb, 0x1f640,
-	0x1f645, 0x1f64f,
-	0x1f680, 0x1f6c5,
-	0x1f700, 0x1f773,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_6_3 */
-
-/* 'Age_7_0': Derived Age 7.0 */
-static const OnigCodePoint CR_Age_7_0[] = {
-	610,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b2,
-	0x08e4, 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, 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, 0x0b77,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c59,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	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,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f4,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20bd,
-	0x20d0, 0x20f0,
-	0x2100, 0x2189,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fcc,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa69d,
-	0xa69f, 0xa6f7,
-	0xa700, 0xa78e,
-	0xa790, 0xa7ad,
-	0xa7b0, 0xa7b1,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fb,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab5f,
-	0xab64, 0xab65,
-	0xabc0, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 0xfe2d,
-	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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x10900, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109be, 0x109bf,
-	0x10a00, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111c8,
-	0x111cd, 0x111cd,
-	0x111d0, 0x111da,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11301, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115c9,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12398,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x13000, 0x1342e,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	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,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f32c,
-	0x1f330, 0x1f37d,
-	0x1f380, 0x1f3ce,
-	0x1f3d4, 0x1f3f7,
-	0x1f400, 0x1f4fe,
-	0x1f500, 0x1f54a,
-	0x1f550, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f642,
-	0x1f645, 0x1f6cf,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_7_0 */
-
-/* 'Age_8_0': Derived Age 8.0 */
-static const OnigCodePoint CR_Age_8_0[] = {
-	623,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08e3, 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, 0x0af1,
-	0x0af9, 0x0af9,
-	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, 0x0b77,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 0x0c7f,
-	0x0c81, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4e,
-	0x0d57, 0x0d57,
-	0x0d5f, 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,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c7f,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfc, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fa,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e42,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ad,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c4,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018c,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123d,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	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, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f19a,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23a,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f579,
-	0x1f57b, 0x1f5a3,
-	0x1f5a5, 0x1f6d0,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f3,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f918,
-	0x1f980, 0x1f984,
-	0x1f9c0, 0x1f9c0,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_8_0 */
-
-/* 'Age_9_0': Derived Age 9.0 */
-static const OnigCodePoint CR_Age_9_0[] = {
-	648,
-	0x0000, 0x0377,
-	0x037a, 0x037f,
-	0x0384, 0x038a,
-	0x038c, 0x038c,
-	0x038e, 0x03a1,
-	0x03a3, 0x052f,
-	0x0531, 0x0556,
-	0x0559, 0x055f,
-	0x0561, 0x0587,
-	0x0589, 0x058a,
-	0x058d, 0x058f,
-	0x0591, 0x05c7,
-	0x05d0, 0x05ea,
-	0x05f0, 0x05f4,
-	0x0600, 0x061c,
-	0x061e, 0x070d,
-	0x070f, 0x074a,
-	0x074d, 0x07b1,
-	0x07c0, 0x07fa,
-	0x0800, 0x082d,
-	0x0830, 0x083e,
-	0x0840, 0x085b,
-	0x085e, 0x085e,
-	0x08a0, 0x08b4,
-	0x08b6, 0x08bd,
-	0x08d4, 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, 0x0af1,
-	0x0af9, 0x0af9,
-	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, 0x0b77,
-	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,
-	0x0c00, 0x0c03,
-	0x0c05, 0x0c0c,
-	0x0c0e, 0x0c10,
-	0x0c12, 0x0c28,
-	0x0c2a, 0x0c39,
-	0x0c3d, 0x0c44,
-	0x0c46, 0x0c48,
-	0x0c4a, 0x0c4d,
-	0x0c55, 0x0c56,
-	0x0c58, 0x0c5a,
-	0x0c60, 0x0c63,
-	0x0c66, 0x0c6f,
-	0x0c78, 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,
-	0x0d01, 0x0d03,
-	0x0d05, 0x0d0c,
-	0x0d0e, 0x0d10,
-	0x0d12, 0x0d3a,
-	0x0d3d, 0x0d44,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4f,
-	0x0d54, 0x0d63,
-	0x0d66, 0x0d7f,
-	0x0d82, 0x0d83,
-	0x0d85, 0x0d96,
-	0x0d9a, 0x0db1,
-	0x0db3, 0x0dbb,
-	0x0dbd, 0x0dbd,
-	0x0dc0, 0x0dc6,
-	0x0dca, 0x0dca,
-	0x0dcf, 0x0dd4,
-	0x0dd6, 0x0dd6,
-	0x0dd8, 0x0ddf,
-	0x0de6, 0x0def,
-	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, 0x0edf,
-	0x0f00, 0x0f47,
-	0x0f49, 0x0f6c,
-	0x0f71, 0x0f97,
-	0x0f99, 0x0fbc,
-	0x0fbe, 0x0fcc,
-	0x0fce, 0x0fda,
-	0x1000, 0x10c5,
-	0x10c7, 0x10c7,
-	0x10cd, 0x10cd,
-	0x10d0, 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,
-	0x135d, 0x137c,
-	0x1380, 0x1399,
-	0x13a0, 0x13f5,
-	0x13f8, 0x13fd,
-	0x1400, 0x169c,
-	0x16a0, 0x16f8,
-	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, 0x191e,
-	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,
-	0x1ab0, 0x1abe,
-	0x1b00, 0x1b4b,
-	0x1b50, 0x1b7c,
-	0x1b80, 0x1bf3,
-	0x1bfc, 0x1c37,
-	0x1c3b, 0x1c49,
-	0x1c4d, 0x1c88,
-	0x1cc0, 0x1cc7,
-	0x1cd0, 0x1cf6,
-	0x1cf8, 0x1cf9,
-	0x1d00, 0x1df5,
-	0x1dfb, 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,
-	0x2066, 0x2071,
-	0x2074, 0x208e,
-	0x2090, 0x209c,
-	0x20a0, 0x20be,
-	0x20d0, 0x20f0,
-	0x2100, 0x218b,
-	0x2190, 0x23fe,
-	0x2400, 0x2426,
-	0x2440, 0x244a,
-	0x2460, 0x2b73,
-	0x2b76, 0x2b95,
-	0x2b98, 0x2bb9,
-	0x2bbd, 0x2bc8,
-	0x2bca, 0x2bd1,
-	0x2bec, 0x2bef,
-	0x2c00, 0x2c2e,
-	0x2c30, 0x2c5e,
-	0x2c60, 0x2cf3,
-	0x2cf9, 0x2d25,
-	0x2d27, 0x2d27,
-	0x2d2d, 0x2d2d,
-	0x2d30, 0x2d67,
-	0x2d6f, 0x2d70,
-	0x2d7f, 0x2d96,
-	0x2da0, 0x2da6,
-	0x2da8, 0x2dae,
-	0x2db0, 0x2db6,
-	0x2db8, 0x2dbe,
-	0x2dc0, 0x2dc6,
-	0x2dc8, 0x2dce,
-	0x2dd0, 0x2dd6,
-	0x2dd8, 0x2dde,
-	0x2de0, 0x2e44,
-	0x2e80, 0x2e99,
-	0x2e9b, 0x2ef3,
-	0x2f00, 0x2fd5,
-	0x2ff0, 0x2ffb,
-	0x3000, 0x303f,
-	0x3041, 0x3096,
-	0x3099, 0x30ff,
-	0x3105, 0x312d,
-	0x3131, 0x318e,
-	0x3190, 0x31ba,
-	0x31c0, 0x31e3,
-	0x31f0, 0x321e,
-	0x3220, 0x32fe,
-	0x3300, 0x4db5,
-	0x4dc0, 0x9fd5,
-	0xa000, 0xa48c,
-	0xa490, 0xa4c6,
-	0xa4d0, 0xa62b,
-	0xa640, 0xa6f7,
-	0xa700, 0xa7ae,
-	0xa7b0, 0xa7b7,
-	0xa7f7, 0xa82b,
-	0xa830, 0xa839,
-	0xa840, 0xa877,
-	0xa880, 0xa8c5,
-	0xa8ce, 0xa8d9,
-	0xa8e0, 0xa8fd,
-	0xa900, 0xa953,
-	0xa95f, 0xa97c,
-	0xa980, 0xa9cd,
-	0xa9cf, 0xa9d9,
-	0xa9de, 0xa9fe,
-	0xaa00, 0xaa36,
-	0xaa40, 0xaa4d,
-	0xaa50, 0xaa59,
-	0xaa5c, 0xaac2,
-	0xaadb, 0xaaf6,
-	0xab01, 0xab06,
-	0xab09, 0xab0e,
-	0xab11, 0xab16,
-	0xab20, 0xab26,
-	0xab28, 0xab2e,
-	0xab30, 0xab65,
-	0xab70, 0xabed,
-	0xabf0, 0xabf9,
-	0xac00, 0xd7a3,
-	0xd7b0, 0xd7c6,
-	0xd7cb, 0xd7fb,
-	0xd800, 0xfa6d,
-	0xfa70, 0xfad9,
-	0xfb00, 0xfb06,
-	0xfb13, 0xfb17,
-	0xfb1d, 0xfb36,
-	0xfb38, 0xfb3c,
-	0xfb3e, 0xfb3e,
-	0xfb40, 0xfb41,
-	0xfb43, 0xfb44,
-	0xfb46, 0xfbc1,
-	0xfbd3, 0xfd3f,
-	0xfd50, 0xfd8f,
-	0xfd92, 0xfdc7,
-	0xfdd0, 0xfdfd,
-	0xfe00, 0xfe19,
-	0xfe20, 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, 0x1000b,
-	0x1000d, 0x10026,
-	0x10028, 0x1003a,
-	0x1003c, 0x1003d,
-	0x1003f, 0x1004d,
-	0x10050, 0x1005d,
-	0x10080, 0x100fa,
-	0x10100, 0x10102,
-	0x10107, 0x10133,
-	0x10137, 0x1018e,
-	0x10190, 0x1019b,
-	0x101a0, 0x101a0,
-	0x101d0, 0x101fd,
-	0x10280, 0x1029c,
-	0x102a0, 0x102d0,
-	0x102e0, 0x102fb,
-	0x10300, 0x10323,
-	0x10330, 0x1034a,
-	0x10350, 0x1037a,
-	0x10380, 0x1039d,
-	0x1039f, 0x103c3,
-	0x103c8, 0x103d5,
-	0x10400, 0x1049d,
-	0x104a0, 0x104a9,
-	0x104b0, 0x104d3,
-	0x104d8, 0x104fb,
-	0x10500, 0x10527,
-	0x10530, 0x10563,
-	0x1056f, 0x1056f,
-	0x10600, 0x10736,
-	0x10740, 0x10755,
-	0x10760, 0x10767,
-	0x10800, 0x10805,
-	0x10808, 0x10808,
-	0x1080a, 0x10835,
-	0x10837, 0x10838,
-	0x1083c, 0x1083c,
-	0x1083f, 0x10855,
-	0x10857, 0x1089e,
-	0x108a7, 0x108af,
-	0x108e0, 0x108f2,
-	0x108f4, 0x108f5,
-	0x108fb, 0x1091b,
-	0x1091f, 0x10939,
-	0x1093f, 0x1093f,
-	0x10980, 0x109b7,
-	0x109bc, 0x109cf,
-	0x109d2, 0x10a03,
-	0x10a05, 0x10a06,
-	0x10a0c, 0x10a13,
-	0x10a15, 0x10a17,
-	0x10a19, 0x10a33,
-	0x10a38, 0x10a3a,
-	0x10a3f, 0x10a47,
-	0x10a50, 0x10a58,
-	0x10a60, 0x10a9f,
-	0x10ac0, 0x10ae6,
-	0x10aeb, 0x10af6,
-	0x10b00, 0x10b35,
-	0x10b39, 0x10b55,
-	0x10b58, 0x10b72,
-	0x10b78, 0x10b91,
-	0x10b99, 0x10b9c,
-	0x10ba9, 0x10baf,
-	0x10c00, 0x10c48,
-	0x10c80, 0x10cb2,
-	0x10cc0, 0x10cf2,
-	0x10cfa, 0x10cff,
-	0x10e60, 0x10e7e,
-	0x11000, 0x1104d,
-	0x11052, 0x1106f,
-	0x1107f, 0x110c1,
-	0x110d0, 0x110e8,
-	0x110f0, 0x110f9,
-	0x11100, 0x11134,
-	0x11136, 0x11143,
-	0x11150, 0x11176,
-	0x11180, 0x111cd,
-	0x111d0, 0x111df,
-	0x111e1, 0x111f4,
-	0x11200, 0x11211,
-	0x11213, 0x1123e,
-	0x11280, 0x11286,
-	0x11288, 0x11288,
-	0x1128a, 0x1128d,
-	0x1128f, 0x1129d,
-	0x1129f, 0x112a9,
-	0x112b0, 0x112ea,
-	0x112f0, 0x112f9,
-	0x11300, 0x11303,
-	0x11305, 0x1130c,
-	0x1130f, 0x11310,
-	0x11313, 0x11328,
-	0x1132a, 0x11330,
-	0x11332, 0x11333,
-	0x11335, 0x11339,
-	0x1133c, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11350, 0x11350,
-	0x11357, 0x11357,
-	0x1135d, 0x11363,
-	0x11366, 0x1136c,
-	0x11370, 0x11374,
-	0x11400, 0x11459,
-	0x1145b, 0x1145b,
-	0x1145d, 0x1145d,
-	0x11480, 0x114c7,
-	0x114d0, 0x114d9,
-	0x11580, 0x115b5,
-	0x115b8, 0x115dd,
-	0x11600, 0x11644,
-	0x11650, 0x11659,
-	0x11660, 0x1166c,
-	0x11680, 0x116b7,
-	0x116c0, 0x116c9,
-	0x11700, 0x11719,
-	0x1171d, 0x1172b,
-	0x11730, 0x1173f,
-	0x118a0, 0x118f2,
-	0x118ff, 0x118ff,
-	0x11ac0, 0x11af8,
-	0x11c00, 0x11c08,
-	0x11c0a, 0x11c36,
-	0x11c38, 0x11c45,
-	0x11c50, 0x11c6c,
-	0x11c70, 0x11c8f,
-	0x11c92, 0x11ca7,
-	0x11ca9, 0x11cb6,
-	0x12000, 0x12399,
-	0x12400, 0x1246e,
-	0x12470, 0x12474,
-	0x12480, 0x12543,
-	0x13000, 0x1342e,
-	0x14400, 0x14646,
-	0x16800, 0x16a38,
-	0x16a40, 0x16a5e,
-	0x16a60, 0x16a69,
-	0x16a6e, 0x16a6f,
-	0x16ad0, 0x16aed,
-	0x16af0, 0x16af5,
-	0x16b00, 0x16b45,
-	0x16b50, 0x16b59,
-	0x16b5b, 0x16b61,
-	0x16b63, 0x16b77,
-	0x16b7d, 0x16b8f,
-	0x16f00, 0x16f44,
-	0x16f50, 0x16f7e,
-	0x16f8f, 0x16f9f,
-	0x16fe0, 0x16fe0,
-	0x17000, 0x187ec,
-	0x18800, 0x18af2,
-	0x1b000, 0x1b001,
-	0x1bc00, 0x1bc6a,
-	0x1bc70, 0x1bc7c,
-	0x1bc80, 0x1bc88,
-	0x1bc90, 0x1bc99,
-	0x1bc9c, 0x1bca3,
-	0x1d000, 0x1d0f5,
-	0x1d100, 0x1d126,
-	0x1d129, 0x1d1e8,
-	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, 0x1da8b,
-	0x1da9b, 0x1da9f,
-	0x1daa1, 0x1daaf,
-	0x1e000, 0x1e006,
-	0x1e008, 0x1e018,
-	0x1e01b, 0x1e021,
-	0x1e023, 0x1e024,
-	0x1e026, 0x1e02a,
-	0x1e800, 0x1e8c4,
-	0x1e8c7, 0x1e8d6,
-	0x1e900, 0x1e94a,
-	0x1e950, 0x1e959,
-	0x1e95e, 0x1e95f,
-	0x1ee00, 0x1ee03,
-	0x1ee05, 0x1ee1f,
-	0x1ee21, 0x1ee22,
-	0x1ee24, 0x1ee24,
-	0x1ee27, 0x1ee27,
-	0x1ee29, 0x1ee32,
-	0x1ee34, 0x1ee37,
-	0x1ee39, 0x1ee39,
-	0x1ee3b, 0x1ee3b,
-	0x1ee42, 0x1ee42,
-	0x1ee47, 0x1ee47,
-	0x1ee49, 0x1ee49,
-	0x1ee4b, 0x1ee4b,
-	0x1ee4d, 0x1ee4f,
-	0x1ee51, 0x1ee52,
-	0x1ee54, 0x1ee54,
-	0x1ee57, 0x1ee57,
-	0x1ee59, 0x1ee59,
-	0x1ee5b, 0x1ee5b,
-	0x1ee5d, 0x1ee5d,
-	0x1ee5f, 0x1ee5f,
-	0x1ee61, 0x1ee62,
-	0x1ee64, 0x1ee64,
-	0x1ee67, 0x1ee6a,
-	0x1ee6c, 0x1ee72,
-	0x1ee74, 0x1ee77,
-	0x1ee79, 0x1ee7c,
-	0x1ee7e, 0x1ee7e,
-	0x1ee80, 0x1ee89,
-	0x1ee8b, 0x1ee9b,
-	0x1eea1, 0x1eea3,
-	0x1eea5, 0x1eea9,
-	0x1eeab, 0x1eebb,
-	0x1eef0, 0x1eef1,
-	0x1f000, 0x1f02b,
-	0x1f030, 0x1f093,
-	0x1f0a0, 0x1f0ae,
-	0x1f0b1, 0x1f0bf,
-	0x1f0c1, 0x1f0cf,
-	0x1f0d1, 0x1f0f5,
-	0x1f100, 0x1f10c,
-	0x1f110, 0x1f12e,
-	0x1f130, 0x1f16b,
-	0x1f170, 0x1f1ac,
-	0x1f1e6, 0x1f202,
-	0x1f210, 0x1f23b,
-	0x1f240, 0x1f248,
-	0x1f250, 0x1f251,
-	0x1f300, 0x1f6d2,
-	0x1f6e0, 0x1f6ec,
-	0x1f6f0, 0x1f6f6,
-	0x1f700, 0x1f773,
-	0x1f780, 0x1f7d4,
-	0x1f800, 0x1f80b,
-	0x1f810, 0x1f847,
-	0x1f850, 0x1f859,
-	0x1f860, 0x1f887,
-	0x1f890, 0x1f8ad,
-	0x1f910, 0x1f91e,
-	0x1f920, 0x1f927,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f93e,
-	0x1f940, 0x1f94b,
-	0x1f950, 0x1f95e,
-	0x1f980, 0x1f991,
-	0x1f9c0, 0x1f9c0,
-	0x1fffe, 0x2a6d6,
-	0x2a700, 0x2b734,
-	0x2b740, 0x2b81d,
-	0x2b820, 0x2cea1,
-	0x2f800, 0x2fa1d,
-	0x2fffe, 0x2ffff,
-	0x3fffe, 0x3ffff,
-	0x4fffe, 0x4ffff,
-	0x5fffe, 0x5ffff,
-	0x6fffe, 0x6ffff,
-	0x7fffe, 0x7ffff,
-	0x8fffe, 0x8ffff,
-	0x9fffe, 0x9ffff,
-	0xafffe, 0xaffff,
-	0xbfffe, 0xbffff,
-	0xcfffe, 0xcffff,
-	0xdfffe, 0xdffff,
-	0xe0001, 0xe0001,
-	0xe0020, 0xe007f,
-	0xe0100, 0xe01ef,
-	0xefffe, 0x10ffff,
-}; /* CR_Age_9_0 */
-
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-/* 'Grapheme_Cluster_Break_Prepend': Grapheme_Cluster_Break=Prepend */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_Prepend[] = {
-	7,
-	0x0600, 0x0605,
-	0x06dd, 0x06dd,
-	0x070f, 0x070f,
-	0x08e2, 0x08e2,
-	0x0d4e, 0x0d4e,
-	0x110bd, 0x110bd,
-	0x111c2, 0x111c3,
-}; /* CR_Grapheme_Cluster_Break_Prepend */
-
-/* 'Grapheme_Cluster_Break_CR': Grapheme_Cluster_Break=CR */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_CR[] = {
-	1,
-	0x000d, 0x000d,
-}; /* CR_Grapheme_Cluster_Break_CR */
-
-/* 'Grapheme_Cluster_Break_LF': Grapheme_Cluster_Break=LF */
-#define CR_Grapheme_Cluster_Break_LF CR_NEWLINE
-
-/* 'Grapheme_Cluster_Break_Control': Grapheme_Cluster_Break=Control */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_Control[] = {
-	19,
-	0x0000, 0x0009,
-	0x000b, 0x000c,
-	0x000e, 0x001f,
-	0x007f, 0x009f,
-	0x00ad, 0x00ad,
-	0x061c, 0x061c,
-	0x180e, 0x180e,
-	0x200b, 0x200b,
-	0x200e, 0x200f,
-	0x2028, 0x202e,
-	0x2060, 0x206f,
-	0xd800, 0xdfff,
-	0xfeff, 0xfeff,
-	0xfff0, 0xfffb,
-	0x1bca0, 0x1bca3,
-	0x1d173, 0x1d17a,
-	0xe0000, 0xe001f,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xe0fff,
-}; /* CR_Grapheme_Cluster_Break_Control */
-
-/* 'Grapheme_Cluster_Break_Extend': Grapheme_Cluster_Break=Extend */
-#define CR_Grapheme_Cluster_Break_Extend CR_Grapheme_Extend
-
-/* 'Grapheme_Cluster_Break_Regional_Indicator': Grapheme_Cluster_Break=Regional_Indicator */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_Regional_Indicator[] = {
-	1,
-	0x1f1e6, 0x1f1ff,
-}; /* CR_Grapheme_Cluster_Break_Regional_Indicator */
-
-/* 'Grapheme_Cluster_Break_SpacingMark': Grapheme_Cluster_Break=SpacingMark */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_SpacingMark[] = {
-	140,
-	0x0903, 0x0903,
-	0x093b, 0x093b,
-	0x093e, 0x0940,
-	0x0949, 0x094c,
-	0x094e, 0x094f,
-	0x0982, 0x0983,
-	0x09bf, 0x09c0,
-	0x09c7, 0x09c8,
-	0x09cb, 0x09cc,
-	0x0a03, 0x0a03,
-	0x0a3e, 0x0a40,
-	0x0a83, 0x0a83,
-	0x0abe, 0x0ac0,
-	0x0ac9, 0x0ac9,
-	0x0acb, 0x0acc,
-	0x0b02, 0x0b03,
-	0x0b40, 0x0b40,
-	0x0b47, 0x0b48,
-	0x0b4b, 0x0b4c,
-	0x0bbf, 0x0bbf,
-	0x0bc1, 0x0bc2,
-	0x0bc6, 0x0bc8,
-	0x0bca, 0x0bcc,
-	0x0c01, 0x0c03,
-	0x0c41, 0x0c44,
-	0x0c82, 0x0c83,
-	0x0cbe, 0x0cbe,
-	0x0cc0, 0x0cc1,
-	0x0cc3, 0x0cc4,
-	0x0cc7, 0x0cc8,
-	0x0cca, 0x0ccb,
-	0x0d02, 0x0d03,
-	0x0d3f, 0x0d40,
-	0x0d46, 0x0d48,
-	0x0d4a, 0x0d4c,
-	0x0d82, 0x0d83,
-	0x0dd0, 0x0dd1,
-	0x0dd8, 0x0dde,
-	0x0df2, 0x0df3,
-	0x0e33, 0x0e33,
-	0x0eb3, 0x0eb3,
-	0x0f3e, 0x0f3f,
-	0x0f7f, 0x0f7f,
-	0x1031, 0x1031,
-	0x103b, 0x103c,
-	0x1056, 0x1057,
-	0x1084, 0x1084,
-	0x17b6, 0x17b6,
-	0x17be, 0x17c5,
-	0x17c7, 0x17c8,
-	0x1923, 0x1926,
-	0x1929, 0x192b,
-	0x1930, 0x1931,
-	0x1933, 0x1938,
-	0x1a19, 0x1a1a,
-	0x1a55, 0x1a55,
-	0x1a57, 0x1a57,
-	0x1a6d, 0x1a72,
-	0x1b04, 0x1b04,
-	0x1b35, 0x1b35,
-	0x1b3b, 0x1b3b,
-	0x1b3d, 0x1b41,
-	0x1b43, 0x1b44,
-	0x1b82, 0x1b82,
-	0x1ba1, 0x1ba1,
-	0x1ba6, 0x1ba7,
-	0x1baa, 0x1baa,
-	0x1be7, 0x1be7,
-	0x1bea, 0x1bec,
-	0x1bee, 0x1bee,
-	0x1bf2, 0x1bf3,
-	0x1c24, 0x1c2b,
-	0x1c34, 0x1c35,
-	0x1ce1, 0x1ce1,
-	0x1cf2, 0x1cf3,
-	0xa823, 0xa824,
-	0xa827, 0xa827,
-	0xa880, 0xa881,
-	0xa8b4, 0xa8c3,
-	0xa952, 0xa953,
-	0xa983, 0xa983,
-	0xa9b4, 0xa9b5,
-	0xa9ba, 0xa9bb,
-	0xa9bd, 0xa9c0,
-	0xaa2f, 0xaa30,
-	0xaa33, 0xaa34,
-	0xaa4d, 0xaa4d,
-	0xaaeb, 0xaaeb,
-	0xaaee, 0xaaef,
-	0xaaf5, 0xaaf5,
-	0xabe3, 0xabe4,
-	0xabe6, 0xabe7,
-	0xabe9, 0xabea,
-	0xabec, 0xabec,
-	0x11000, 0x11000,
-	0x11002, 0x11002,
-	0x11082, 0x11082,
-	0x110b0, 0x110b2,
-	0x110b7, 0x110b8,
-	0x1112c, 0x1112c,
-	0x11182, 0x11182,
-	0x111b3, 0x111b5,
-	0x111bf, 0x111c0,
-	0x1122c, 0x1122e,
-	0x11232, 0x11233,
-	0x11235, 0x11235,
-	0x112e0, 0x112e2,
-	0x11302, 0x11303,
-	0x1133f, 0x1133f,
-	0x11341, 0x11344,
-	0x11347, 0x11348,
-	0x1134b, 0x1134d,
-	0x11362, 0x11363,
-	0x11435, 0x11437,
-	0x11440, 0x11441,
-	0x11445, 0x11445,
-	0x114b1, 0x114b2,
-	0x114b9, 0x114b9,
-	0x114bb, 0x114bc,
-	0x114be, 0x114be,
-	0x114c1, 0x114c1,
-	0x115b0, 0x115b1,
-	0x115b8, 0x115bb,
-	0x115be, 0x115be,
-	0x11630, 0x11632,
-	0x1163b, 0x1163c,
-	0x1163e, 0x1163e,
-	0x116ac, 0x116ac,
-	0x116ae, 0x116af,
-	0x116b6, 0x116b6,
-	0x11720, 0x11721,
-	0x11726, 0x11726,
-	0x11c2f, 0x11c2f,
-	0x11c3e, 0x11c3e,
-	0x11ca9, 0x11ca9,
-	0x11cb1, 0x11cb1,
-	0x11cb4, 0x11cb4,
-	0x16f51, 0x16f7e,
-	0x1d166, 0x1d166,
-	0x1d16d, 0x1d16d,
-}; /* CR_Grapheme_Cluster_Break_SpacingMark */
-
-/* 'Grapheme_Cluster_Break_L': Grapheme_Cluster_Break=L */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_L[] = {
-	2,
-	0x1100, 0x115f,
-	0xa960, 0xa97c,
-}; /* CR_Grapheme_Cluster_Break_L */
-
-/* 'Grapheme_Cluster_Break_V': Grapheme_Cluster_Break=V */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_V[] = {
-	2,
-	0x1160, 0x11a7,
-	0xd7b0, 0xd7c6,
-}; /* CR_Grapheme_Cluster_Break_V */
-
-/* 'Grapheme_Cluster_Break_T': Grapheme_Cluster_Break=T */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_T[] = {
-	2,
-	0x11a8, 0x11ff,
-	0xd7cb, 0xd7fb,
-}; /* CR_Grapheme_Cluster_Break_T */
-
-/* 'Grapheme_Cluster_Break_LV': Grapheme_Cluster_Break=LV */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_LV[] = {
-	399,
-	0xac00, 0xac00,
-	0xac1c, 0xac1c,
-	0xac38, 0xac38,
-	0xac54, 0xac54,
-	0xac70, 0xac70,
-	0xac8c, 0xac8c,
-	0xaca8, 0xaca8,
-	0xacc4, 0xacc4,
-	0xace0, 0xace0,
-	0xacfc, 0xacfc,
-	0xad18, 0xad18,
-	0xad34, 0xad34,
-	0xad50, 0xad50,
-	0xad6c, 0xad6c,
-	0xad88, 0xad88,
-	0xada4, 0xada4,
-	0xadc0, 0xadc0,
-	0xaddc, 0xaddc,
-	0xadf8, 0xadf8,
-	0xae14, 0xae14,
-	0xae30, 0xae30,
-	0xae4c, 0xae4c,
-	0xae68, 0xae68,
-	0xae84, 0xae84,
-	0xaea0, 0xaea0,
-	0xaebc, 0xaebc,
-	0xaed8, 0xaed8,
-	0xaef4, 0xaef4,
-	0xaf10, 0xaf10,
-	0xaf2c, 0xaf2c,
-	0xaf48, 0xaf48,
-	0xaf64, 0xaf64,
-	0xaf80, 0xaf80,
-	0xaf9c, 0xaf9c,
-	0xafb8, 0xafb8,
-	0xafd4, 0xafd4,
-	0xaff0, 0xaff0,
-	0xb00c, 0xb00c,
-	0xb028, 0xb028,
-	0xb044, 0xb044,
-	0xb060, 0xb060,
-	0xb07c, 0xb07c,
-	0xb098, 0xb098,
-	0xb0b4, 0xb0b4,
-	0xb0d0, 0xb0d0,
-	0xb0ec, 0xb0ec,
-	0xb108, 0xb108,
-	0xb124, 0xb124,
-	0xb140, 0xb140,
-	0xb15c, 0xb15c,
-	0xb178, 0xb178,
-	0xb194, 0xb194,
-	0xb1b0, 0xb1b0,
-	0xb1cc, 0xb1cc,
-	0xb1e8, 0xb1e8,
-	0xb204, 0xb204,
-	0xb220, 0xb220,
-	0xb23c, 0xb23c,
-	0xb258, 0xb258,
-	0xb274, 0xb274,
-	0xb290, 0xb290,
-	0xb2ac, 0xb2ac,
-	0xb2c8, 0xb2c8,
-	0xb2e4, 0xb2e4,
-	0xb300, 0xb300,
-	0xb31c, 0xb31c,
-	0xb338, 0xb338,
-	0xb354, 0xb354,
-	0xb370, 0xb370,
-	0xb38c, 0xb38c,
-	0xb3a8, 0xb3a8,
-	0xb3c4, 0xb3c4,
-	0xb3e0, 0xb3e0,
-	0xb3fc, 0xb3fc,
-	0xb418, 0xb418,
-	0xb434, 0xb434,
-	0xb450, 0xb450,
-	0xb46c, 0xb46c,
-	0xb488, 0xb488,
-	0xb4a4, 0xb4a4,
-	0xb4c0, 0xb4c0,
-	0xb4dc, 0xb4dc,
-	0xb4f8, 0xb4f8,
-	0xb514, 0xb514,
-	0xb530, 0xb530,
-	0xb54c, 0xb54c,
-	0xb568, 0xb568,
-	0xb584, 0xb584,
-	0xb5a0, 0xb5a0,
-	0xb5bc, 0xb5bc,
-	0xb5d8, 0xb5d8,
-	0xb5f4, 0xb5f4,
-	0xb610, 0xb610,
-	0xb62c, 0xb62c,
-	0xb648, 0xb648,
-	0xb664, 0xb664,
-	0xb680, 0xb680,
-	0xb69c, 0xb69c,
-	0xb6b8, 0xb6b8,
-	0xb6d4, 0xb6d4,
-	0xb6f0, 0xb6f0,
-	0xb70c, 0xb70c,
-	0xb728, 0xb728,
-	0xb744, 0xb744,
-	0xb760, 0xb760,
-	0xb77c, 0xb77c,
-	0xb798, 0xb798,
-	0xb7b4, 0xb7b4,
-	0xb7d0, 0xb7d0,
-	0xb7ec, 0xb7ec,
-	0xb808, 0xb808,
-	0xb824, 0xb824,
-	0xb840, 0xb840,
-	0xb85c, 0xb85c,
-	0xb878, 0xb878,
-	0xb894, 0xb894,
-	0xb8b0, 0xb8b0,
-	0xb8cc, 0xb8cc,
-	0xb8e8, 0xb8e8,
-	0xb904, 0xb904,
-	0xb920, 0xb920,
-	0xb93c, 0xb93c,
-	0xb958, 0xb958,
-	0xb974, 0xb974,
-	0xb990, 0xb990,
-	0xb9ac, 0xb9ac,
-	0xb9c8, 0xb9c8,
-	0xb9e4, 0xb9e4,
-	0xba00, 0xba00,
-	0xba1c, 0xba1c,
-	0xba38, 0xba38,
-	0xba54, 0xba54,
-	0xba70, 0xba70,
-	0xba8c, 0xba8c,
-	0xbaa8, 0xbaa8,
-	0xbac4, 0xbac4,
-	0xbae0, 0xbae0,
-	0xbafc, 0xbafc,
-	0xbb18, 0xbb18,
-	0xbb34, 0xbb34,
-	0xbb50, 0xbb50,
-	0xbb6c, 0xbb6c,
-	0xbb88, 0xbb88,
-	0xbba4, 0xbba4,
-	0xbbc0, 0xbbc0,
-	0xbbdc, 0xbbdc,
-	0xbbf8, 0xbbf8,
-	0xbc14, 0xbc14,
-	0xbc30, 0xbc30,
-	0xbc4c, 0xbc4c,
-	0xbc68, 0xbc68,
-	0xbc84, 0xbc84,
-	0xbca0, 0xbca0,
-	0xbcbc, 0xbcbc,
-	0xbcd8, 0xbcd8,
-	0xbcf4, 0xbcf4,
-	0xbd10, 0xbd10,
-	0xbd2c, 0xbd2c,
-	0xbd48, 0xbd48,
-	0xbd64, 0xbd64,
-	0xbd80, 0xbd80,
-	0xbd9c, 0xbd9c,
-	0xbdb8, 0xbdb8,
-	0xbdd4, 0xbdd4,
-	0xbdf0, 0xbdf0,
-	0xbe0c, 0xbe0c,
-	0xbe28, 0xbe28,
-	0xbe44, 0xbe44,
-	0xbe60, 0xbe60,
-	0xbe7c, 0xbe7c,
-	0xbe98, 0xbe98,
-	0xbeb4, 0xbeb4,
-	0xbed0, 0xbed0,
-	0xbeec, 0xbeec,
-	0xbf08, 0xbf08,
-	0xbf24, 0xbf24,
-	0xbf40, 0xbf40,
-	0xbf5c, 0xbf5c,
-	0xbf78, 0xbf78,
-	0xbf94, 0xbf94,
-	0xbfb0, 0xbfb0,
-	0xbfcc, 0xbfcc,
-	0xbfe8, 0xbfe8,
-	0xc004, 0xc004,
-	0xc020, 0xc020,
-	0xc03c, 0xc03c,
-	0xc058, 0xc058,
-	0xc074, 0xc074,
-	0xc090, 0xc090,
-	0xc0ac, 0xc0ac,
-	0xc0c8, 0xc0c8,
-	0xc0e4, 0xc0e4,
-	0xc100, 0xc100,
-	0xc11c, 0xc11c,
-	0xc138, 0xc138,
-	0xc154, 0xc154,
-	0xc170, 0xc170,
-	0xc18c, 0xc18c,
-	0xc1a8, 0xc1a8,
-	0xc1c4, 0xc1c4,
-	0xc1e0, 0xc1e0,
-	0xc1fc, 0xc1fc,
-	0xc218, 0xc218,
-	0xc234, 0xc234,
-	0xc250, 0xc250,
-	0xc26c, 0xc26c,
-	0xc288, 0xc288,
-	0xc2a4, 0xc2a4,
-	0xc2c0, 0xc2c0,
-	0xc2dc, 0xc2dc,
-	0xc2f8, 0xc2f8,
-	0xc314, 0xc314,
-	0xc330, 0xc330,
-	0xc34c, 0xc34c,
-	0xc368, 0xc368,
-	0xc384, 0xc384,
-	0xc3a0, 0xc3a0,
-	0xc3bc, 0xc3bc,
-	0xc3d8, 0xc3d8,
-	0xc3f4, 0xc3f4,
-	0xc410, 0xc410,
-	0xc42c, 0xc42c,
-	0xc448, 0xc448,
-	0xc464, 0xc464,
-	0xc480, 0xc480,
-	0xc49c, 0xc49c,
-	0xc4b8, 0xc4b8,
-	0xc4d4, 0xc4d4,
-	0xc4f0, 0xc4f0,
-	0xc50c, 0xc50c,
-	0xc528, 0xc528,
-	0xc544, 0xc544,
-	0xc560, 0xc560,
-	0xc57c, 0xc57c,
-	0xc598, 0xc598,
-	0xc5b4, 0xc5b4,
-	0xc5d0, 0xc5d0,
-	0xc5ec, 0xc5ec,
-	0xc608, 0xc608,
-	0xc624, 0xc624,
-	0xc640, 0xc640,
-	0xc65c, 0xc65c,
-	0xc678, 0xc678,
-	0xc694, 0xc694,
-	0xc6b0, 0xc6b0,
-	0xc6cc, 0xc6cc,
-	0xc6e8, 0xc6e8,
-	0xc704, 0xc704,
-	0xc720, 0xc720,
-	0xc73c, 0xc73c,
-	0xc758, 0xc758,
-	0xc774, 0xc774,
-	0xc790, 0xc790,
-	0xc7ac, 0xc7ac,
-	0xc7c8, 0xc7c8,
-	0xc7e4, 0xc7e4,
-	0xc800, 0xc800,
-	0xc81c, 0xc81c,
-	0xc838, 0xc838,
-	0xc854, 0xc854,
-	0xc870, 0xc870,
-	0xc88c, 0xc88c,
-	0xc8a8, 0xc8a8,
-	0xc8c4, 0xc8c4,
-	0xc8e0, 0xc8e0,
-	0xc8fc, 0xc8fc,
-	0xc918, 0xc918,
-	0xc934, 0xc934,
-	0xc950, 0xc950,
-	0xc96c, 0xc96c,
-	0xc988, 0xc988,
-	0xc9a4, 0xc9a4,
-	0xc9c0, 0xc9c0,
-	0xc9dc, 0xc9dc,
-	0xc9f8, 0xc9f8,
-	0xca14, 0xca14,
-	0xca30, 0xca30,
-	0xca4c, 0xca4c,
-	0xca68, 0xca68,
-	0xca84, 0xca84,
-	0xcaa0, 0xcaa0,
-	0xcabc, 0xcabc,
-	0xcad8, 0xcad8,
-	0xcaf4, 0xcaf4,
-	0xcb10, 0xcb10,
-	0xcb2c, 0xcb2c,
-	0xcb48, 0xcb48,
-	0xcb64, 0xcb64,
-	0xcb80, 0xcb80,
-	0xcb9c, 0xcb9c,
-	0xcbb8, 0xcbb8,
-	0xcbd4, 0xcbd4,
-	0xcbf0, 0xcbf0,
-	0xcc0c, 0xcc0c,
-	0xcc28, 0xcc28,
-	0xcc44, 0xcc44,
-	0xcc60, 0xcc60,
-	0xcc7c, 0xcc7c,
-	0xcc98, 0xcc98,
-	0xccb4, 0xccb4,
-	0xccd0, 0xccd0,
-	0xccec, 0xccec,
-	0xcd08, 0xcd08,
-	0xcd24, 0xcd24,
-	0xcd40, 0xcd40,
-	0xcd5c, 0xcd5c,
-	0xcd78, 0xcd78,
-	0xcd94, 0xcd94,
-	0xcdb0, 0xcdb0,
-	0xcdcc, 0xcdcc,
-	0xcde8, 0xcde8,
-	0xce04, 0xce04,
-	0xce20, 0xce20,
-	0xce3c, 0xce3c,
-	0xce58, 0xce58,
-	0xce74, 0xce74,
-	0xce90, 0xce90,
-	0xceac, 0xceac,
-	0xcec8, 0xcec8,
-	0xcee4, 0xcee4,
-	0xcf00, 0xcf00,
-	0xcf1c, 0xcf1c,
-	0xcf38, 0xcf38,
-	0xcf54, 0xcf54,
-	0xcf70, 0xcf70,
-	0xcf8c, 0xcf8c,
-	0xcfa8, 0xcfa8,
-	0xcfc4, 0xcfc4,
-	0xcfe0, 0xcfe0,
-	0xcffc, 0xcffc,
-	0xd018, 0xd018,
-	0xd034, 0xd034,
-	0xd050, 0xd050,
-	0xd06c, 0xd06c,
-	0xd088, 0xd088,
-	0xd0a4, 0xd0a4,
-	0xd0c0, 0xd0c0,
-	0xd0dc, 0xd0dc,
-	0xd0f8, 0xd0f8,
-	0xd114, 0xd114,
-	0xd130, 0xd130,
-	0xd14c, 0xd14c,
-	0xd168, 0xd168,
-	0xd184, 0xd184,
-	0xd1a0, 0xd1a0,
-	0xd1bc, 0xd1bc,
-	0xd1d8, 0xd1d8,
-	0xd1f4, 0xd1f4,
-	0xd210, 0xd210,
-	0xd22c, 0xd22c,
-	0xd248, 0xd248,
-	0xd264, 0xd264,
-	0xd280, 0xd280,
-	0xd29c, 0xd29c,
-	0xd2b8, 0xd2b8,
-	0xd2d4, 0xd2d4,
-	0xd2f0, 0xd2f0,
-	0xd30c, 0xd30c,
-	0xd328, 0xd328,
-	0xd344, 0xd344,
-	0xd360, 0xd360,
-	0xd37c, 0xd37c,
-	0xd398, 0xd398,
-	0xd3b4, 0xd3b4,
-	0xd3d0, 0xd3d0,
-	0xd3ec, 0xd3ec,
-	0xd408, 0xd408,
-	0xd424, 0xd424,
-	0xd440, 0xd440,
-	0xd45c, 0xd45c,
-	0xd478, 0xd478,
-	0xd494, 0xd494,
-	0xd4b0, 0xd4b0,
-	0xd4cc, 0xd4cc,
-	0xd4e8, 0xd4e8,
-	0xd504, 0xd504,
-	0xd520, 0xd520,
-	0xd53c, 0xd53c,
-	0xd558, 0xd558,
-	0xd574, 0xd574,
-	0xd590, 0xd590,
-	0xd5ac, 0xd5ac,
-	0xd5c8, 0xd5c8,
-	0xd5e4, 0xd5e4,
-	0xd600, 0xd600,
-	0xd61c, 0xd61c,
-	0xd638, 0xd638,
-	0xd654, 0xd654,
-	0xd670, 0xd670,
-	0xd68c, 0xd68c,
-	0xd6a8, 0xd6a8,
-	0xd6c4, 0xd6c4,
-	0xd6e0, 0xd6e0,
-	0xd6fc, 0xd6fc,
-	0xd718, 0xd718,
-	0xd734, 0xd734,
-	0xd750, 0xd750,
-	0xd76c, 0xd76c,
-	0xd788, 0xd788,
-}; /* CR_Grapheme_Cluster_Break_LV */
-
-/* 'Grapheme_Cluster_Break_LVT': Grapheme_Cluster_Break=LVT */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_LVT[] = {
-	399,
-	0xac01, 0xac1b,
-	0xac1d, 0xac37,
-	0xac39, 0xac53,
-	0xac55, 0xac6f,
-	0xac71, 0xac8b,
-	0xac8d, 0xaca7,
-	0xaca9, 0xacc3,
-	0xacc5, 0xacdf,
-	0xace1, 0xacfb,
-	0xacfd, 0xad17,
-	0xad19, 0xad33,
-	0xad35, 0xad4f,
-	0xad51, 0xad6b,
-	0xad6d, 0xad87,
-	0xad89, 0xada3,
-	0xada5, 0xadbf,
-	0xadc1, 0xaddb,
-	0xaddd, 0xadf7,
-	0xadf9, 0xae13,
-	0xae15, 0xae2f,
-	0xae31, 0xae4b,
-	0xae4d, 0xae67,
-	0xae69, 0xae83,
-	0xae85, 0xae9f,
-	0xaea1, 0xaebb,
-	0xaebd, 0xaed7,
-	0xaed9, 0xaef3,
-	0xaef5, 0xaf0f,
-	0xaf11, 0xaf2b,
-	0xaf2d, 0xaf47,
-	0xaf49, 0xaf63,
-	0xaf65, 0xaf7f,
-	0xaf81, 0xaf9b,
-	0xaf9d, 0xafb7,
-	0xafb9, 0xafd3,
-	0xafd5, 0xafef,
-	0xaff1, 0xb00b,
-	0xb00d, 0xb027,
-	0xb029, 0xb043,
-	0xb045, 0xb05f,
-	0xb061, 0xb07b,
-	0xb07d, 0xb097,
-	0xb099, 0xb0b3,
-	0xb0b5, 0xb0cf,
-	0xb0d1, 0xb0eb,
-	0xb0ed, 0xb107,
-	0xb109, 0xb123,
-	0xb125, 0xb13f,
-	0xb141, 0xb15b,
-	0xb15d, 0xb177,
-	0xb179, 0xb193,
-	0xb195, 0xb1af,
-	0xb1b1, 0xb1cb,
-	0xb1cd, 0xb1e7,
-	0xb1e9, 0xb203,
-	0xb205, 0xb21f,
-	0xb221, 0xb23b,
-	0xb23d, 0xb257,
-	0xb259, 0xb273,
-	0xb275, 0xb28f,
-	0xb291, 0xb2ab,
-	0xb2ad, 0xb2c7,
-	0xb2c9, 0xb2e3,
-	0xb2e5, 0xb2ff,
-	0xb301, 0xb31b,
-	0xb31d, 0xb337,
-	0xb339, 0xb353,
-	0xb355, 0xb36f,
-	0xb371, 0xb38b,
-	0xb38d, 0xb3a7,
-	0xb3a9, 0xb3c3,
-	0xb3c5, 0xb3df,
-	0xb3e1, 0xb3fb,
-	0xb3fd, 0xb417,
-	0xb419, 0xb433,
-	0xb435, 0xb44f,
-	0xb451, 0xb46b,
-	0xb46d, 0xb487,
-	0xb489, 0xb4a3,
-	0xb4a5, 0xb4bf,
-	0xb4c1, 0xb4db,
-	0xb4dd, 0xb4f7,
-	0xb4f9, 0xb513,
-	0xb515, 0xb52f,
-	0xb531, 0xb54b,
-	0xb54d, 0xb567,
-	0xb569, 0xb583,
-	0xb585, 0xb59f,
-	0xb5a1, 0xb5bb,
-	0xb5bd, 0xb5d7,
-	0xb5d9, 0xb5f3,
-	0xb5f5, 0xb60f,
-	0xb611, 0xb62b,
-	0xb62d, 0xb647,
-	0xb649, 0xb663,
-	0xb665, 0xb67f,
-	0xb681, 0xb69b,
-	0xb69d, 0xb6b7,
-	0xb6b9, 0xb6d3,
-	0xb6d5, 0xb6ef,
-	0xb6f1, 0xb70b,
-	0xb70d, 0xb727,
-	0xb729, 0xb743,
-	0xb745, 0xb75f,
-	0xb761, 0xb77b,
-	0xb77d, 0xb797,
-	0xb799, 0xb7b3,
-	0xb7b5, 0xb7cf,
-	0xb7d1, 0xb7eb,
-	0xb7ed, 0xb807,
-	0xb809, 0xb823,
-	0xb825, 0xb83f,
-	0xb841, 0xb85b,
-	0xb85d, 0xb877,
-	0xb879, 0xb893,
-	0xb895, 0xb8af,
-	0xb8b1, 0xb8cb,
-	0xb8cd, 0xb8e7,
-	0xb8e9, 0xb903,
-	0xb905, 0xb91f,
-	0xb921, 0xb93b,
-	0xb93d, 0xb957,
-	0xb959, 0xb973,
-	0xb975, 0xb98f,
-	0xb991, 0xb9ab,
-	0xb9ad, 0xb9c7,
-	0xb9c9, 0xb9e3,
-	0xb9e5, 0xb9ff,
-	0xba01, 0xba1b,
-	0xba1d, 0xba37,
-	0xba39, 0xba53,
-	0xba55, 0xba6f,
-	0xba71, 0xba8b,
-	0xba8d, 0xbaa7,
-	0xbaa9, 0xbac3,
-	0xbac5, 0xbadf,
-	0xbae1, 0xbafb,
-	0xbafd, 0xbb17,
-	0xbb19, 0xbb33,
-	0xbb35, 0xbb4f,
-	0xbb51, 0xbb6b,
-	0xbb6d, 0xbb87,
-	0xbb89, 0xbba3,
-	0xbba5, 0xbbbf,
-	0xbbc1, 0xbbdb,
-	0xbbdd, 0xbbf7,
-	0xbbf9, 0xbc13,
-	0xbc15, 0xbc2f,
-	0xbc31, 0xbc4b,
-	0xbc4d, 0xbc67,
-	0xbc69, 0xbc83,
-	0xbc85, 0xbc9f,
-	0xbca1, 0xbcbb,
-	0xbcbd, 0xbcd7,
-	0xbcd9, 0xbcf3,
-	0xbcf5, 0xbd0f,
-	0xbd11, 0xbd2b,
-	0xbd2d, 0xbd47,
-	0xbd49, 0xbd63,
-	0xbd65, 0xbd7f,
-	0xbd81, 0xbd9b,
-	0xbd9d, 0xbdb7,
-	0xbdb9, 0xbdd3,
-	0xbdd5, 0xbdef,
-	0xbdf1, 0xbe0b,
-	0xbe0d, 0xbe27,
-	0xbe29, 0xbe43,
-	0xbe45, 0xbe5f,
-	0xbe61, 0xbe7b,
-	0xbe7d, 0xbe97,
-	0xbe99, 0xbeb3,
-	0xbeb5, 0xbecf,
-	0xbed1, 0xbeeb,
-	0xbeed, 0xbf07,
-	0xbf09, 0xbf23,
-	0xbf25, 0xbf3f,
-	0xbf41, 0xbf5b,
-	0xbf5d, 0xbf77,
-	0xbf79, 0xbf93,
-	0xbf95, 0xbfaf,
-	0xbfb1, 0xbfcb,
-	0xbfcd, 0xbfe7,
-	0xbfe9, 0xc003,
-	0xc005, 0xc01f,
-	0xc021, 0xc03b,
-	0xc03d, 0xc057,
-	0xc059, 0xc073,
-	0xc075, 0xc08f,
-	0xc091, 0xc0ab,
-	0xc0ad, 0xc0c7,
-	0xc0c9, 0xc0e3,
-	0xc0e5, 0xc0ff,
-	0xc101, 0xc11b,
-	0xc11d, 0xc137,
-	0xc139, 0xc153,
-	0xc155, 0xc16f,
-	0xc171, 0xc18b,
-	0xc18d, 0xc1a7,
-	0xc1a9, 0xc1c3,
-	0xc1c5, 0xc1df,
-	0xc1e1, 0xc1fb,
-	0xc1fd, 0xc217,
-	0xc219, 0xc233,
-	0xc235, 0xc24f,
-	0xc251, 0xc26b,
-	0xc26d, 0xc287,
-	0xc289, 0xc2a3,
-	0xc2a5, 0xc2bf,
-	0xc2c1, 0xc2db,
-	0xc2dd, 0xc2f7,
-	0xc2f9, 0xc313,
-	0xc315, 0xc32f,
-	0xc331, 0xc34b,
-	0xc34d, 0xc367,
-	0xc369, 0xc383,
-	0xc385, 0xc39f,
-	0xc3a1, 0xc3bb,
-	0xc3bd, 0xc3d7,
-	0xc3d9, 0xc3f3,
-	0xc3f5, 0xc40f,
-	0xc411, 0xc42b,
-	0xc42d, 0xc447,
-	0xc449, 0xc463,
-	0xc465, 0xc47f,
-	0xc481, 0xc49b,
-	0xc49d, 0xc4b7,
-	0xc4b9, 0xc4d3,
-	0xc4d5, 0xc4ef,
-	0xc4f1, 0xc50b,
-	0xc50d, 0xc527,
-	0xc529, 0xc543,
-	0xc545, 0xc55f,
-	0xc561, 0xc57b,
-	0xc57d, 0xc597,
-	0xc599, 0xc5b3,
-	0xc5b5, 0xc5cf,
-	0xc5d1, 0xc5eb,
-	0xc5ed, 0xc607,
-	0xc609, 0xc623,
-	0xc625, 0xc63f,
-	0xc641, 0xc65b,
-	0xc65d, 0xc677,
-	0xc679, 0xc693,
-	0xc695, 0xc6af,
-	0xc6b1, 0xc6cb,
-	0xc6cd, 0xc6e7,
-	0xc6e9, 0xc703,
-	0xc705, 0xc71f,
-	0xc721, 0xc73b,
-	0xc73d, 0xc757,
-	0xc759, 0xc773,
-	0xc775, 0xc78f,
-	0xc791, 0xc7ab,
-	0xc7ad, 0xc7c7,
-	0xc7c9, 0xc7e3,
-	0xc7e5, 0xc7ff,
-	0xc801, 0xc81b,
-	0xc81d, 0xc837,
-	0xc839, 0xc853,
-	0xc855, 0xc86f,
-	0xc871, 0xc88b,
-	0xc88d, 0xc8a7,
-	0xc8a9, 0xc8c3,
-	0xc8c5, 0xc8df,
-	0xc8e1, 0xc8fb,
-	0xc8fd, 0xc917,
-	0xc919, 0xc933,
-	0xc935, 0xc94f,
-	0xc951, 0xc96b,
-	0xc96d, 0xc987,
-	0xc989, 0xc9a3,
-	0xc9a5, 0xc9bf,
-	0xc9c1, 0xc9db,
-	0xc9dd, 0xc9f7,
-	0xc9f9, 0xca13,
-	0xca15, 0xca2f,
-	0xca31, 0xca4b,
-	0xca4d, 0xca67,
-	0xca69, 0xca83,
-	0xca85, 0xca9f,
-	0xcaa1, 0xcabb,
-	0xcabd, 0xcad7,
-	0xcad9, 0xcaf3,
-	0xcaf5, 0xcb0f,
-	0xcb11, 0xcb2b,
-	0xcb2d, 0xcb47,
-	0xcb49, 0xcb63,
-	0xcb65, 0xcb7f,
-	0xcb81, 0xcb9b,
-	0xcb9d, 0xcbb7,
-	0xcbb9, 0xcbd3,
-	0xcbd5, 0xcbef,
-	0xcbf1, 0xcc0b,
-	0xcc0d, 0xcc27,
-	0xcc29, 0xcc43,
-	0xcc45, 0xcc5f,
-	0xcc61, 0xcc7b,
-	0xcc7d, 0xcc97,
-	0xcc99, 0xccb3,
-	0xccb5, 0xcccf,
-	0xccd1, 0xcceb,
-	0xcced, 0xcd07,
-	0xcd09, 0xcd23,
-	0xcd25, 0xcd3f,
-	0xcd41, 0xcd5b,
-	0xcd5d, 0xcd77,
-	0xcd79, 0xcd93,
-	0xcd95, 0xcdaf,
-	0xcdb1, 0xcdcb,
-	0xcdcd, 0xcde7,
-	0xcde9, 0xce03,
-	0xce05, 0xce1f,
-	0xce21, 0xce3b,
-	0xce3d, 0xce57,
-	0xce59, 0xce73,
-	0xce75, 0xce8f,
-	0xce91, 0xceab,
-	0xcead, 0xcec7,
-	0xcec9, 0xcee3,
-	0xcee5, 0xceff,
-	0xcf01, 0xcf1b,
-	0xcf1d, 0xcf37,
-	0xcf39, 0xcf53,
-	0xcf55, 0xcf6f,
-	0xcf71, 0xcf8b,
-	0xcf8d, 0xcfa7,
-	0xcfa9, 0xcfc3,
-	0xcfc5, 0xcfdf,
-	0xcfe1, 0xcffb,
-	0xcffd, 0xd017,
-	0xd019, 0xd033,
-	0xd035, 0xd04f,
-	0xd051, 0xd06b,
-	0xd06d, 0xd087,
-	0xd089, 0xd0a3,
-	0xd0a5, 0xd0bf,
-	0xd0c1, 0xd0db,
-	0xd0dd, 0xd0f7,
-	0xd0f9, 0xd113,
-	0xd115, 0xd12f,
-	0xd131, 0xd14b,
-	0xd14d, 0xd167,
-	0xd169, 0xd183,
-	0xd185, 0xd19f,
-	0xd1a1, 0xd1bb,
-	0xd1bd, 0xd1d7,
-	0xd1d9, 0xd1f3,
-	0xd1f5, 0xd20f,
-	0xd211, 0xd22b,
-	0xd22d, 0xd247,
-	0xd249, 0xd263,
-	0xd265, 0xd27f,
-	0xd281, 0xd29b,
-	0xd29d, 0xd2b7,
-	0xd2b9, 0xd2d3,
-	0xd2d5, 0xd2ef,
-	0xd2f1, 0xd30b,
-	0xd30d, 0xd327,
-	0xd329, 0xd343,
-	0xd345, 0xd35f,
-	0xd361, 0xd37b,
-	0xd37d, 0xd397,
-	0xd399, 0xd3b3,
-	0xd3b5, 0xd3cf,
-	0xd3d1, 0xd3eb,
-	0xd3ed, 0xd407,
-	0xd409, 0xd423,
-	0xd425, 0xd43f,
-	0xd441, 0xd45b,
-	0xd45d, 0xd477,
-	0xd479, 0xd493,
-	0xd495, 0xd4af,
-	0xd4b1, 0xd4cb,
-	0xd4cd, 0xd4e7,
-	0xd4e9, 0xd503,
-	0xd505, 0xd51f,
-	0xd521, 0xd53b,
-	0xd53d, 0xd557,
-	0xd559, 0xd573,
-	0xd575, 0xd58f,
-	0xd591, 0xd5ab,
-	0xd5ad, 0xd5c7,
-	0xd5c9, 0xd5e3,
-	0xd5e5, 0xd5ff,
-	0xd601, 0xd61b,
-	0xd61d, 0xd637,
-	0xd639, 0xd653,
-	0xd655, 0xd66f,
-	0xd671, 0xd68b,
-	0xd68d, 0xd6a7,
-	0xd6a9, 0xd6c3,
-	0xd6c5, 0xd6df,
-	0xd6e1, 0xd6fb,
-	0xd6fd, 0xd717,
-	0xd719, 0xd733,
-	0xd735, 0xd74f,
-	0xd751, 0xd76b,
-	0xd76d, 0xd787,
-	0xd789, 0xd7a3,
-}; /* CR_Grapheme_Cluster_Break_LVT */
-
-/* 'Grapheme_Cluster_Break_E_Base': Grapheme_Cluster_Break=E_Base */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_E_Base[] = {
-	28,
-	0x261d, 0x261d,
-	0x26f9, 0x26f9,
-	0x270a, 0x270d,
-	0x1f385, 0x1f385,
-	0x1f3c3, 0x1f3c4,
-	0x1f3ca, 0x1f3cb,
-	0x1f442, 0x1f443,
-	0x1f446, 0x1f450,
-	0x1f46e, 0x1f46e,
-	0x1f470, 0x1f478,
-	0x1f47c, 0x1f47c,
-	0x1f481, 0x1f483,
-	0x1f485, 0x1f487,
-	0x1f4aa, 0x1f4aa,
-	0x1f575, 0x1f575,
-	0x1f57a, 0x1f57a,
-	0x1f590, 0x1f590,
-	0x1f595, 0x1f596,
-	0x1f645, 0x1f647,
-	0x1f64b, 0x1f64f,
-	0x1f6a3, 0x1f6a3,
-	0x1f6b4, 0x1f6b6,
-	0x1f6c0, 0x1f6c0,
-	0x1f918, 0x1f91e,
-	0x1f926, 0x1f926,
-	0x1f930, 0x1f930,
-	0x1f933, 0x1f939,
-	0x1f93c, 0x1f93e,
-}; /* CR_Grapheme_Cluster_Break_E_Base */
-
-/* 'Grapheme_Cluster_Break_E_Modifier': Grapheme_Cluster_Break=E_Modifier */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_E_Modifier[] = {
-	1,
-	0x1f3fb, 0x1f3ff,
-}; /* CR_Grapheme_Cluster_Break_E_Modifier */
-
-/* 'Grapheme_Cluster_Break_ZWJ': Grapheme_Cluster_Break=ZWJ */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_ZWJ[] = {
-	1,
-	0x200d, 0x200d,
-}; /* CR_Grapheme_Cluster_Break_ZWJ */
-
-/* 'Grapheme_Cluster_Break_Glue_After_Zwj': Grapheme_Cluster_Break=Glue_After_Zwj */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_Glue_After_Zwj[] = {
-	3,
-	0x2764, 0x2764,
-	0x1f48b, 0x1f48b,
-	0x1f5e8, 0x1f5e8,
-}; /* CR_Grapheme_Cluster_Break_Glue_After_Zwj */
-
-/* 'Grapheme_Cluster_Break_E_Base_GAZ': Grapheme_Cluster_Break=E_Base_GAZ */
-static const OnigCodePoint CR_Grapheme_Cluster_Break_E_Base_GAZ[] = {
-	1,
-	0x1f466, 0x1f469,
-}; /* CR_Grapheme_Cluster_Break_E_Base_GAZ */
-
-/* 'In_Basic_Latin': Block */
-#define CR_In_Basic_Latin CR_ASCII
-
-/* 'In_Latin_1_Supplement': Block */
-static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
-	1,
-	0x0080, 0x00ff,
-}; /* CR_In_Latin_1_Supplement */
-
-/* 'In_Latin_Extended_A': Block */
-static const OnigCodePoint CR_In_Latin_Extended_A[] = {
-	1,
-	0x0100, 0x017f,
-}; /* CR_In_Latin_Extended_A */
-
-/* 'In_Latin_Extended_B': Block */
-static const OnigCodePoint CR_In_Latin_Extended_B[] = {
-	1,
-	0x0180, 0x024f,
-}; /* CR_In_Latin_Extended_B */
-
-/* 'In_IPA_Extensions': Block */
-static const OnigCodePoint CR_In_IPA_Extensions[] = {
-	1,
-	0x0250, 0x02af,
-}; /* CR_In_IPA_Extensions */
-
-/* 'In_Spacing_Modifier_Letters': Block */
-static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
-	1,
-	0x02b0, 0x02ff,
-}; /* CR_In_Spacing_Modifier_Letters */
-
-/* 'In_Combining_Diacritical_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
-	1,
-	0x0300, 0x036f,
-}; /* CR_In_Combining_Diacritical_Marks */
-
-/* 'In_Greek_and_Coptic': Block */
-static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
-	1,
-	0x0370, 0x03ff,
-}; /* CR_In_Greek_and_Coptic */
-
-/* 'In_Cyrillic': Block */
-static const OnigCodePoint CR_In_Cyrillic[] = {
-	1,
-	0x0400, 0x04ff,
-}; /* CR_In_Cyrillic */
-
-/* 'In_Cyrillic_Supplement': Block */
-static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
-	1,
-	0x0500, 0x052f,
-}; /* CR_In_Cyrillic_Supplement */
-
-/* 'In_Armenian': Block */
-static const OnigCodePoint CR_In_Armenian[] = {
-	1,
-	0x0530, 0x058f,
-}; /* CR_In_Armenian */
-
-/* 'In_Hebrew': Block */
-static const OnigCodePoint CR_In_Hebrew[] = {
-	1,
-	0x0590, 0x05ff,
-}; /* CR_In_Hebrew */
-
-/* 'In_Arabic': Block */
-static const OnigCodePoint CR_In_Arabic[] = {
-	1,
-	0x0600, 0x06ff,
-}; /* CR_In_Arabic */
-
-/* 'In_Syriac': Block */
-static const OnigCodePoint CR_In_Syriac[] = {
-	1,
-	0x0700, 0x074f,
-}; /* CR_In_Syriac */
-
-/* 'In_Arabic_Supplement': Block */
-static const OnigCodePoint CR_In_Arabic_Supplement[] = {
-	1,
-	0x0750, 0x077f,
-}; /* CR_In_Arabic_Supplement */
-
-/* 'In_Thaana': Block */
-static const OnigCodePoint CR_In_Thaana[] = {
-	1,
-	0x0780, 0x07bf,
-}; /* CR_In_Thaana */
-
-/* 'In_NKo': Block */
-static const OnigCodePoint CR_In_NKo[] = {
-	1,
-	0x07c0, 0x07ff,
-}; /* CR_In_NKo */
-
-/* 'In_Samaritan': Block */
-static const OnigCodePoint CR_In_Samaritan[] = {
-	1,
-	0x0800, 0x083f,
-}; /* CR_In_Samaritan */
-
-/* 'In_Mandaic': Block */
-static const OnigCodePoint CR_In_Mandaic[] = {
-	1,
-	0x0840, 0x085f,
-}; /* CR_In_Mandaic */
-
-/* 'In_Arabic_Extended_A': Block */
-static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
-	1,
-	0x08a0, 0x08ff,
-}; /* CR_In_Arabic_Extended_A */
-
-/* 'In_Devanagari': Block */
-static const OnigCodePoint CR_In_Devanagari[] = {
-	1,
-	0x0900, 0x097f,
-}; /* CR_In_Devanagari */
-
-/* 'In_Bengali': Block */
-static const OnigCodePoint CR_In_Bengali[] = {
-	1,
-	0x0980, 0x09ff,
-}; /* CR_In_Bengali */
-
-/* 'In_Gurmukhi': Block */
-static const OnigCodePoint CR_In_Gurmukhi[] = {
-	1,
-	0x0a00, 0x0a7f,
-}; /* CR_In_Gurmukhi */
-
-/* 'In_Gujarati': Block */
-static const OnigCodePoint CR_In_Gujarati[] = {
-	1,
-	0x0a80, 0x0aff,
-}; /* CR_In_Gujarati */
-
-/* 'In_Oriya': Block */
-static const OnigCodePoint CR_In_Oriya[] = {
-	1,
-	0x0b00, 0x0b7f,
-}; /* CR_In_Oriya */
-
-/* 'In_Tamil': Block */
-static const OnigCodePoint CR_In_Tamil[] = {
-	1,
-	0x0b80, 0x0bff,
-}; /* CR_In_Tamil */
-
-/* 'In_Telugu': Block */
-static const OnigCodePoint CR_In_Telugu[] = {
-	1,
-	0x0c00, 0x0c7f,
-}; /* CR_In_Telugu */
-
-/* 'In_Kannada': Block */
-static const OnigCodePoint CR_In_Kannada[] = {
-	1,
-	0x0c80, 0x0cff,
-}; /* CR_In_Kannada */
-
-/* 'In_Malayalam': Block */
-static const OnigCodePoint CR_In_Malayalam[] = {
-	1,
-	0x0d00, 0x0d7f,
-}; /* CR_In_Malayalam */
-
-/* 'In_Sinhala': Block */
-static const OnigCodePoint CR_In_Sinhala[] = {
-	1,
-	0x0d80, 0x0dff,
-}; /* CR_In_Sinhala */
-
-/* 'In_Thai': Block */
-static const OnigCodePoint CR_In_Thai[] = {
-	1,
-	0x0e00, 0x0e7f,
-}; /* CR_In_Thai */
-
-/* 'In_Lao': Block */
-static const OnigCodePoint CR_In_Lao[] = {
-	1,
-	0x0e80, 0x0eff,
-}; /* CR_In_Lao */
-
-/* 'In_Tibetan': Block */
-static const OnigCodePoint CR_In_Tibetan[] = {
-	1,
-	0x0f00, 0x0fff,
-}; /* CR_In_Tibetan */
-
-/* 'In_Myanmar': Block */
-static const OnigCodePoint CR_In_Myanmar[] = {
-	1,
-	0x1000, 0x109f,
-}; /* CR_In_Myanmar */
-
-/* 'In_Georgian': Block */
-static const OnigCodePoint CR_In_Georgian[] = {
-	1,
-	0x10a0, 0x10ff,
-}; /* CR_In_Georgian */
-
-/* 'In_Hangul_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo[] = {
-	1,
-	0x1100, 0x11ff,
-}; /* CR_In_Hangul_Jamo */
-
-/* 'In_Ethiopic': Block */
-static const OnigCodePoint CR_In_Ethiopic[] = {
-	1,
-	0x1200, 0x137f,
-}; /* CR_In_Ethiopic */
-
-/* 'In_Ethiopic_Supplement': Block */
-static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
-	1,
-	0x1380, 0x139f,
-}; /* CR_In_Ethiopic_Supplement */
-
-/* 'In_Cherokee': Block */
-static const OnigCodePoint CR_In_Cherokee[] = {
-	1,
-	0x13a0, 0x13ff,
-}; /* CR_In_Cherokee */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
-	1,
-	0x1400, 0x167f,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
-
-/* 'In_Ogham': Block */
-static const OnigCodePoint CR_In_Ogham[] = {
-	1,
-	0x1680, 0x169f,
-}; /* CR_In_Ogham */
-
-/* 'In_Runic': Block */
-static const OnigCodePoint CR_In_Runic[] = {
-	1,
-	0x16a0, 0x16ff,
-}; /* CR_In_Runic */
-
-/* 'In_Tagalog': Block */
-static const OnigCodePoint CR_In_Tagalog[] = {
-	1,
-	0x1700, 0x171f,
-}; /* CR_In_Tagalog */
-
-/* 'In_Hanunoo': Block */
-static const OnigCodePoint CR_In_Hanunoo[] = {
-	1,
-	0x1720, 0x173f,
-}; /* CR_In_Hanunoo */
-
-/* 'In_Buhid': Block */
-static const OnigCodePoint CR_In_Buhid[] = {
-	1,
-	0x1740, 0x175f,
-}; /* CR_In_Buhid */
-
-/* 'In_Tagbanwa': Block */
-static const OnigCodePoint CR_In_Tagbanwa[] = {
-	1,
-	0x1760, 0x177f,
-}; /* CR_In_Tagbanwa */
-
-/* 'In_Khmer': Block */
-static const OnigCodePoint CR_In_Khmer[] = {
-	1,
-	0x1780, 0x17ff,
-}; /* CR_In_Khmer */
-
-/* 'In_Mongolian': Block */
-static const OnigCodePoint CR_In_Mongolian[] = {
-	1,
-	0x1800, 0x18af,
-}; /* CR_In_Mongolian */
-
-/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
-static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
-	1,
-	0x18b0, 0x18ff,
-}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
-
-/* 'In_Limbu': Block */
-static const OnigCodePoint CR_In_Limbu[] = {
-	1,
-	0x1900, 0x194f,
-}; /* CR_In_Limbu */
-
-/* 'In_Tai_Le': Block */
-static const OnigCodePoint CR_In_Tai_Le[] = {
-	1,
-	0x1950, 0x197f,
-}; /* CR_In_Tai_Le */
-
-/* 'In_New_Tai_Lue': Block */
-static const OnigCodePoint CR_In_New_Tai_Lue[] = {
-	1,
-	0x1980, 0x19df,
-}; /* CR_In_New_Tai_Lue */
-
-/* 'In_Khmer_Symbols': Block */
-static const OnigCodePoint CR_In_Khmer_Symbols[] = {
-	1,
-	0x19e0, 0x19ff,
-}; /* CR_In_Khmer_Symbols */
-
-/* 'In_Buginese': Block */
-static const OnigCodePoint CR_In_Buginese[] = {
-	1,
-	0x1a00, 0x1a1f,
-}; /* CR_In_Buginese */
-
-/* 'In_Tai_Tham': Block */
-static const OnigCodePoint CR_In_Tai_Tham[] = {
-	1,
-	0x1a20, 0x1aaf,
-}; /* CR_In_Tai_Tham */
-
-/* 'In_Combining_Diacritical_Marks_Extended': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Extended[] = {
-	1,
-	0x1ab0, 0x1aff,
-}; /* CR_In_Combining_Diacritical_Marks_Extended */
-
-/* 'In_Balinese': Block */
-static const OnigCodePoint CR_In_Balinese[] = {
-	1,
-	0x1b00, 0x1b7f,
-}; /* CR_In_Balinese */
-
-/* 'In_Sundanese': Block */
-static const OnigCodePoint CR_In_Sundanese[] = {
-	1,
-	0x1b80, 0x1bbf,
-}; /* CR_In_Sundanese */
-
-/* 'In_Batak': Block */
-static const OnigCodePoint CR_In_Batak[] = {
-	1,
-	0x1bc0, 0x1bff,
-}; /* CR_In_Batak */
-
-/* 'In_Lepcha': Block */
-static const OnigCodePoint CR_In_Lepcha[] = {
-	1,
-	0x1c00, 0x1c4f,
-}; /* CR_In_Lepcha */
-
-/* 'In_Ol_Chiki': Block */
-#define CR_In_Ol_Chiki CR_Ol_Chiki
-
-/* 'In_Cyrillic_Extended_C': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_C[] = {
-	1,
-	0x1c80, 0x1c8f,
-}; /* CR_In_Cyrillic_Extended_C */
-
-/* 'In_Sundanese_Supplement': Block */
-static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
-	1,
-	0x1cc0, 0x1ccf,
-}; /* CR_In_Sundanese_Supplement */
-
-/* 'In_Vedic_Extensions': Block */
-static const OnigCodePoint CR_In_Vedic_Extensions[] = {
-	1,
-	0x1cd0, 0x1cff,
-}; /* CR_In_Vedic_Extensions */
-
-/* 'In_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
-	1,
-	0x1d00, 0x1d7f,
-}; /* CR_In_Phonetic_Extensions */
-
-/* 'In_Phonetic_Extensions_Supplement': Block */
-static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
-	1,
-	0x1d80, 0x1dbf,
-}; /* CR_In_Phonetic_Extensions_Supplement */
-
-/* 'In_Combining_Diacritical_Marks_Supplement': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
-	1,
-	0x1dc0, 0x1dff,
-}; /* CR_In_Combining_Diacritical_Marks_Supplement */
-
-/* 'In_Latin_Extended_Additional': Block */
-static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
-	1,
-	0x1e00, 0x1eff,
-}; /* CR_In_Latin_Extended_Additional */
-
-/* 'In_Greek_Extended': Block */
-static const OnigCodePoint CR_In_Greek_Extended[] = {
-	1,
-	0x1f00, 0x1fff,
-}; /* CR_In_Greek_Extended */
-
-/* 'In_General_Punctuation': Block */
-static const OnigCodePoint CR_In_General_Punctuation[] = {
-	1,
-	0x2000, 0x206f,
-}; /* CR_In_General_Punctuation */
-
-/* 'In_Superscripts_and_Subscripts': Block */
-static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
-	1,
-	0x2070, 0x209f,
-}; /* CR_In_Superscripts_and_Subscripts */
-
-/* 'In_Currency_Symbols': Block */
-static const OnigCodePoint CR_In_Currency_Symbols[] = {
-	1,
-	0x20a0, 0x20cf,
-}; /* CR_In_Currency_Symbols */
-
-/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
-static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
-	1,
-	0x20d0, 0x20ff,
-}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
-
-/* 'In_Letterlike_Symbols': Block */
-static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
-	1,
-	0x2100, 0x214f,
-}; /* CR_In_Letterlike_Symbols */
-
-/* 'In_Number_Forms': Block */
-static const OnigCodePoint CR_In_Number_Forms[] = {
-	1,
-	0x2150, 0x218f,
-}; /* CR_In_Number_Forms */
-
-/* 'In_Arrows': Block */
-static const OnigCodePoint CR_In_Arrows[] = {
-	1,
-	0x2190, 0x21ff,
-}; /* CR_In_Arrows */
-
-/* 'In_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Mathematical_Operators[] = {
-	1,
-	0x2200, 0x22ff,
-}; /* CR_In_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Technical': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
-	1,
-	0x2300, 0x23ff,
-}; /* CR_In_Miscellaneous_Technical */
-
-/* 'In_Control_Pictures': Block */
-static const OnigCodePoint CR_In_Control_Pictures[] = {
-	1,
-	0x2400, 0x243f,
-}; /* CR_In_Control_Pictures */
-
-/* 'In_Optical_Character_Recognition': Block */
-static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
-	1,
-	0x2440, 0x245f,
-}; /* CR_In_Optical_Character_Recognition */
-
-/* 'In_Enclosed_Alphanumerics': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
-	1,
-	0x2460, 0x24ff,
-}; /* CR_In_Enclosed_Alphanumerics */
-
-/* 'In_Box_Drawing': Block */
-static const OnigCodePoint CR_In_Box_Drawing[] = {
-	1,
-	0x2500, 0x257f,
-}; /* CR_In_Box_Drawing */
-
-/* 'In_Block_Elements': Block */
-static const OnigCodePoint CR_In_Block_Elements[] = {
-	1,
-	0x2580, 0x259f,
-}; /* CR_In_Block_Elements */
-
-/* 'In_Geometric_Shapes': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes[] = {
-	1,
-	0x25a0, 0x25ff,
-}; /* CR_In_Geometric_Shapes */
-
-/* 'In_Miscellaneous_Symbols': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
-	1,
-	0x2600, 0x26ff,
-}; /* CR_In_Miscellaneous_Symbols */
-
-/* 'In_Dingbats': Block */
-static const OnigCodePoint CR_In_Dingbats[] = {
-	1,
-	0x2700, 0x27bf,
-}; /* CR_In_Dingbats */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
-	1,
-	0x27c0, 0x27ef,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
-
-/* 'In_Supplemental_Arrows_A': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
-	1,
-	0x27f0, 0x27ff,
-}; /* CR_In_Supplemental_Arrows_A */
-
-/* 'In_Braille_Patterns': Block */
-#define CR_In_Braille_Patterns CR_Braille
-
-/* 'In_Supplemental_Arrows_B': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
-	1,
-	0x2900, 0x297f,
-}; /* CR_In_Supplemental_Arrows_B */
-
-/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
-	1,
-	0x2980, 0x29ff,
-}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
-
-/* 'In_Supplemental_Mathematical_Operators': Block */
-static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
-	1,
-	0x2a00, 0x2aff,
-}; /* CR_In_Supplemental_Mathematical_Operators */
-
-/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
-	1,
-	0x2b00, 0x2bff,
-}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
-
-/* 'In_Glagolitic': Block */
-static const OnigCodePoint CR_In_Glagolitic[] = {
-	1,
-	0x2c00, 0x2c5f,
-}; /* CR_In_Glagolitic */
-
-/* 'In_Latin_Extended_C': Block */
-static const OnigCodePoint CR_In_Latin_Extended_C[] = {
-	1,
-	0x2c60, 0x2c7f,
-}; /* CR_In_Latin_Extended_C */
-
-/* 'In_Coptic': Block */
-static const OnigCodePoint CR_In_Coptic[] = {
-	1,
-	0x2c80, 0x2cff,
-}; /* CR_In_Coptic */
-
-/* 'In_Georgian_Supplement': Block */
-static const OnigCodePoint CR_In_Georgian_Supplement[] = {
-	1,
-	0x2d00, 0x2d2f,
-}; /* CR_In_Georgian_Supplement */
-
-/* 'In_Tifinagh': Block */
-static const OnigCodePoint CR_In_Tifinagh[] = {
-	1,
-	0x2d30, 0x2d7f,
-}; /* CR_In_Tifinagh */
-
-/* 'In_Ethiopic_Extended': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
-	1,
-	0x2d80, 0x2ddf,
-}; /* CR_In_Ethiopic_Extended */
-
-/* 'In_Cyrillic_Extended_A': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
-	1,
-	0x2de0, 0x2dff,
-}; /* CR_In_Cyrillic_Extended_A */
-
-/* 'In_Supplemental_Punctuation': Block */
-static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
-	1,
-	0x2e00, 0x2e7f,
-}; /* CR_In_Supplemental_Punctuation */
-
-/* 'In_CJK_Radicals_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
-	1,
-	0x2e80, 0x2eff,
-}; /* CR_In_CJK_Radicals_Supplement */
-
-/* 'In_Kangxi_Radicals': Block */
-static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
-	1,
-	0x2f00, 0x2fdf,
-}; /* CR_In_Kangxi_Radicals */
-
-/* 'In_Ideographic_Description_Characters': Block */
-static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
-	1,
-	0x2ff0, 0x2fff,
-}; /* CR_In_Ideographic_Description_Characters */
-
-/* 'In_CJK_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
-	1,
-	0x3000, 0x303f,
-}; /* CR_In_CJK_Symbols_and_Punctuation */
-
-/* 'In_Hiragana': Block */
-static const OnigCodePoint CR_In_Hiragana[] = {
-	1,
-	0x3040, 0x309f,
-}; /* CR_In_Hiragana */
-
-/* 'In_Katakana': Block */
-static const OnigCodePoint CR_In_Katakana[] = {
-	1,
-	0x30a0, 0x30ff,
-}; /* CR_In_Katakana */
-
-/* 'In_Bopomofo': Block */
-static const OnigCodePoint CR_In_Bopomofo[] = {
-	1,
-	0x3100, 0x312f,
-}; /* CR_In_Bopomofo */
-
-/* 'In_Hangul_Compatibility_Jamo': Block */
-static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
-	1,
-	0x3130, 0x318f,
-}; /* CR_In_Hangul_Compatibility_Jamo */
-
-/* 'In_Kanbun': Block */
-static const OnigCodePoint CR_In_Kanbun[] = {
-	1,
-	0x3190, 0x319f,
-}; /* CR_In_Kanbun */
-
-/* 'In_Bopomofo_Extended': Block */
-static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
-	1,
-	0x31a0, 0x31bf,
-}; /* CR_In_Bopomofo_Extended */
-
-/* 'In_CJK_Strokes': Block */
-static const OnigCodePoint CR_In_CJK_Strokes[] = {
-	1,
-	0x31c0, 0x31ef,
-}; /* CR_In_CJK_Strokes */
-
-/* 'In_Katakana_Phonetic_Extensions': Block */
-static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
-	1,
-	0x31f0, 0x31ff,
-}; /* CR_In_Katakana_Phonetic_Extensions */
-
-/* 'In_Enclosed_CJK_Letters_and_Months': Block */
-static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
-	1,
-	0x3200, 0x32ff,
-}; /* CR_In_Enclosed_CJK_Letters_and_Months */
-
-/* 'In_CJK_Compatibility': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility[] = {
-	1,
-	0x3300, 0x33ff,
-}; /* CR_In_CJK_Compatibility */
-
-/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
-	1,
-	0x3400, 0x4dbf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
-
-/* 'In_Yijing_Hexagram_Symbols': Block */
-static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
-	1,
-	0x4dc0, 0x4dff,
-}; /* CR_In_Yijing_Hexagram_Symbols */
-
-/* 'In_CJK_Unified_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
-	1,
-	0x4e00, 0x9fff,
-}; /* CR_In_CJK_Unified_Ideographs */
-
-/* 'In_Yi_Syllables': Block */
-static const OnigCodePoint CR_In_Yi_Syllables[] = {
-	1,
-	0xa000, 0xa48f,
-}; /* CR_In_Yi_Syllables */
-
-/* 'In_Yi_Radicals': Block */
-static const OnigCodePoint CR_In_Yi_Radicals[] = {
-	1,
-	0xa490, 0xa4cf,
-}; /* CR_In_Yi_Radicals */
-
-/* 'In_Lisu': Block */
-#define CR_In_Lisu CR_Lisu
-
-/* 'In_Vai': Block */
-static const OnigCodePoint CR_In_Vai[] = {
-	1,
-	0xa500, 0xa63f,
-}; /* CR_In_Vai */
-
-/* 'In_Cyrillic_Extended_B': Block */
-static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
-	1,
-	0xa640, 0xa69f,
-}; /* CR_In_Cyrillic_Extended_B */
-
-/* 'In_Bamum': Block */
-static const OnigCodePoint CR_In_Bamum[] = {
-	1,
-	0xa6a0, 0xa6ff,
-}; /* CR_In_Bamum */
-
-/* 'In_Modifier_Tone_Letters': Block */
-static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
-	1,
-	0xa700, 0xa71f,
-}; /* CR_In_Modifier_Tone_Letters */
-
-/* 'In_Latin_Extended_D': Block */
-static const OnigCodePoint CR_In_Latin_Extended_D[] = {
-	1,
-	0xa720, 0xa7ff,
-}; /* CR_In_Latin_Extended_D */
-
-/* 'In_Syloti_Nagri': Block */
-static const OnigCodePoint CR_In_Syloti_Nagri[] = {
-	1,
-	0xa800, 0xa82f,
-}; /* CR_In_Syloti_Nagri */
-
-/* 'In_Common_Indic_Number_Forms': Block */
-static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
-	1,
-	0xa830, 0xa83f,
-}; /* CR_In_Common_Indic_Number_Forms */
-
-/* 'In_Phags_pa': Block */
-static const OnigCodePoint CR_In_Phags_pa[] = {
-	1,
-	0xa840, 0xa87f,
-}; /* CR_In_Phags_pa */
-
-/* 'In_Saurashtra': Block */
-static const OnigCodePoint CR_In_Saurashtra[] = {
-	1,
-	0xa880, 0xa8df,
-}; /* CR_In_Saurashtra */
-
-/* 'In_Devanagari_Extended': Block */
-static const OnigCodePoint CR_In_Devanagari_Extended[] = {
-	1,
-	0xa8e0, 0xa8ff,
-}; /* CR_In_Devanagari_Extended */
-
-/* 'In_Kayah_Li': Block */
-static const OnigCodePoint CR_In_Kayah_Li[] = {
-	1,
-	0xa900, 0xa92f,
-}; /* CR_In_Kayah_Li */
-
-/* 'In_Rejang': Block */
-static const OnigCodePoint CR_In_Rejang[] = {
-	1,
-	0xa930, 0xa95f,
-}; /* CR_In_Rejang */
-
-/* 'In_Hangul_Jamo_Extended_A': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
-	1,
-	0xa960, 0xa97f,
-}; /* CR_In_Hangul_Jamo_Extended_A */
-
-/* 'In_Javanese': Block */
-static const OnigCodePoint CR_In_Javanese[] = {
-	1,
-	0xa980, 0xa9df,
-}; /* CR_In_Javanese */
-
-/* 'In_Myanmar_Extended_B': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_B[] = {
-	1,
-	0xa9e0, 0xa9ff,
-}; /* CR_In_Myanmar_Extended_B */
-
-/* 'In_Cham': Block */
-static const OnigCodePoint CR_In_Cham[] = {
-	1,
-	0xaa00, 0xaa5f,
-}; /* CR_In_Cham */
-
-/* 'In_Myanmar_Extended_A': Block */
-static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
-	1,
-	0xaa60, 0xaa7f,
-}; /* CR_In_Myanmar_Extended_A */
-
-/* 'In_Tai_Viet': Block */
-static const OnigCodePoint CR_In_Tai_Viet[] = {
-	1,
-	0xaa80, 0xaadf,
-}; /* CR_In_Tai_Viet */
-
-/* 'In_Meetei_Mayek_Extensions': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
-	1,
-	0xaae0, 0xaaff,
-}; /* CR_In_Meetei_Mayek_Extensions */
-
-/* 'In_Ethiopic_Extended_A': Block */
-static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
-	1,
-	0xab00, 0xab2f,
-}; /* CR_In_Ethiopic_Extended_A */
-
-/* 'In_Latin_Extended_E': Block */
-static const OnigCodePoint CR_In_Latin_Extended_E[] = {
-	1,
-	0xab30, 0xab6f,
-}; /* CR_In_Latin_Extended_E */
-
-/* 'In_Cherokee_Supplement': Block */
-static const OnigCodePoint CR_In_Cherokee_Supplement[] = {
-	1,
-	0xab70, 0xabbf,
-}; /* CR_In_Cherokee_Supplement */
-
-/* 'In_Meetei_Mayek': Block */
-static const OnigCodePoint CR_In_Meetei_Mayek[] = {
-	1,
-	0xabc0, 0xabff,
-}; /* CR_In_Meetei_Mayek */
-
-/* 'In_Hangul_Syllables': Block */
-static const OnigCodePoint CR_In_Hangul_Syllables[] = {
-	1,
-	0xac00, 0xd7af,
-}; /* CR_In_Hangul_Syllables */
-
-/* 'In_Hangul_Jamo_Extended_B': Block */
-static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
-	1,
-	0xd7b0, 0xd7ff,
-}; /* CR_In_Hangul_Jamo_Extended_B */
-
-/* 'In_High_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Surrogates[] = {
-	1,
-	0xd800, 0xdb7f,
-}; /* CR_In_High_Surrogates */
-
-/* 'In_High_Private_Use_Surrogates': Block */
-static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
-	1,
-	0xdb80, 0xdbff,
-}; /* CR_In_High_Private_Use_Surrogates */
-
-/* 'In_Low_Surrogates': Block */
-static const OnigCodePoint CR_In_Low_Surrogates[] = {
-	1,
-	0xdc00, 0xdfff,
-}; /* CR_In_Low_Surrogates */
-
-/* 'In_Private_Use_Area': Block */
-static const OnigCodePoint CR_In_Private_Use_Area[] = {
-	1,
-	0xe000, 0xf8ff,
-}; /* CR_In_Private_Use_Area */
-
-/* 'In_CJK_Compatibility_Ideographs': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
-	1,
-	0xf900, 0xfaff,
-}; /* CR_In_CJK_Compatibility_Ideographs */
-
-/* 'In_Alphabetic_Presentation_Forms': Block */
-static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
-	1,
-	0xfb00, 0xfb4f,
-}; /* CR_In_Alphabetic_Presentation_Forms */
-
-/* 'In_Arabic_Presentation_Forms_A': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
-	1,
-	0xfb50, 0xfdff,
-}; /* CR_In_Arabic_Presentation_Forms_A */
-
-/* 'In_Variation_Selectors': Block */
-static const OnigCodePoint CR_In_Variation_Selectors[] = {
-	1,
-	0xfe00, 0xfe0f,
-}; /* CR_In_Variation_Selectors */
-
-/* 'In_Vertical_Forms': Block */
-static const OnigCodePoint CR_In_Vertical_Forms[] = {
-	1,
-	0xfe10, 0xfe1f,
-}; /* CR_In_Vertical_Forms */
-
-/* 'In_Combining_Half_Marks': Block */
-static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
-	1,
-	0xfe20, 0xfe2f,
-}; /* CR_In_Combining_Half_Marks */
-
-/* 'In_CJK_Compatibility_Forms': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
-	1,
-	0xfe30, 0xfe4f,
-}; /* CR_In_CJK_Compatibility_Forms */
-
-/* 'In_Small_Form_Variants': Block */
-static const OnigCodePoint CR_In_Small_Form_Variants[] = {
-	1,
-	0xfe50, 0xfe6f,
-}; /* CR_In_Small_Form_Variants */
-
-/* 'In_Arabic_Presentation_Forms_B': Block */
-static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
-	1,
-	0xfe70, 0xfeff,
-}; /* CR_In_Arabic_Presentation_Forms_B */
-
-/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
-static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
-	1,
-	0xff00, 0xffef,
-}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
-
-/* 'In_Specials': Block */
-static const OnigCodePoint CR_In_Specials[] = {
-	1,
-	0xfff0, 0xffff,
-}; /* CR_In_Specials */
-
-/* 'In_Linear_B_Syllabary': Block */
-static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
-	1,
-	0x10000, 0x1007f,
-}; /* CR_In_Linear_B_Syllabary */
-
-/* 'In_Linear_B_Ideograms': Block */
-static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
-	1,
-	0x10080, 0x100ff,
-}; /* CR_In_Linear_B_Ideograms */
-
-/* 'In_Aegean_Numbers': Block */
-static const OnigCodePoint CR_In_Aegean_Numbers[] = {
-	1,
-	0x10100, 0x1013f,
-}; /* CR_In_Aegean_Numbers */
-
-/* 'In_Ancient_Greek_Numbers': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
-	1,
-	0x10140, 0x1018f,
-}; /* CR_In_Ancient_Greek_Numbers */
-
-/* 'In_Ancient_Symbols': Block */
-static const OnigCodePoint CR_In_Ancient_Symbols[] = {
-	1,
-	0x10190, 0x101cf,
-}; /* CR_In_Ancient_Symbols */
-
-/* 'In_Phaistos_Disc': Block */
-static const OnigCodePoint CR_In_Phaistos_Disc[] = {
-	1,
-	0x101d0, 0x101ff,
-}; /* CR_In_Phaistos_Disc */
-
-/* 'In_Lycian': Block */
-static const OnigCodePoint CR_In_Lycian[] = {
-	1,
-	0x10280, 0x1029f,
-}; /* CR_In_Lycian */
-
-/* 'In_Carian': Block */
-static const OnigCodePoint CR_In_Carian[] = {
-	1,
-	0x102a0, 0x102df,
-}; /* CR_In_Carian */
-
-/* 'In_Coptic_Epact_Numbers': Block */
-static const OnigCodePoint CR_In_Coptic_Epact_Numbers[] = {
-	1,
-	0x102e0, 0x102ff,
-}; /* CR_In_Coptic_Epact_Numbers */
-
-/* 'In_Old_Italic': Block */
-static const OnigCodePoint CR_In_Old_Italic[] = {
-	1,
-	0x10300, 0x1032f,
-}; /* CR_In_Old_Italic */
-
-/* 'In_Gothic': Block */
-static const OnigCodePoint CR_In_Gothic[] = {
-	1,
-	0x10330, 0x1034f,
-}; /* CR_In_Gothic */
-
-/* 'In_Old_Permic': Block */
-static const OnigCodePoint CR_In_Old_Permic[] = {
-	1,
-	0x10350, 0x1037f,
-}; /* CR_In_Old_Permic */
-
-/* 'In_Ugaritic': Block */
-static const OnigCodePoint CR_In_Ugaritic[] = {
-	1,
-	0x10380, 0x1039f,
-}; /* CR_In_Ugaritic */
-
-/* 'In_Old_Persian': Block */
-static const OnigCodePoint CR_In_Old_Persian[] = {
-	1,
-	0x103a0, 0x103df,
-}; /* CR_In_Old_Persian */
-
-/* 'In_Deseret': Block */
-#define CR_In_Deseret CR_Deseret
-
-/* 'In_Shavian': Block */
-#define CR_In_Shavian CR_Shavian
-
-/* 'In_Osmanya': Block */
-static const OnigCodePoint CR_In_Osmanya[] = {
-	1,
-	0x10480, 0x104af,
-}; /* CR_In_Osmanya */
-
-/* 'In_Osage': Block */
-static const OnigCodePoint CR_In_Osage[] = {
-	1,
-	0x104b0, 0x104ff,
-}; /* CR_In_Osage */
-
-/* 'In_Elbasan': Block */
-static const OnigCodePoint CR_In_Elbasan[] = {
-	1,
-	0x10500, 0x1052f,
-}; /* CR_In_Elbasan */
-
-/* 'In_Caucasian_Albanian': Block */
-static const OnigCodePoint CR_In_Caucasian_Albanian[] = {
-	1,
-	0x10530, 0x1056f,
-}; /* CR_In_Caucasian_Albanian */
-
-/* 'In_Linear_A': Block */
-static const OnigCodePoint CR_In_Linear_A[] = {
-	1,
-	0x10600, 0x1077f,
-}; /* CR_In_Linear_A */
-
-/* 'In_Cypriot_Syllabary': Block */
-static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
-	1,
-	0x10800, 0x1083f,
-}; /* CR_In_Cypriot_Syllabary */
-
-/* 'In_Imperial_Aramaic': Block */
-static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
-	1,
-	0x10840, 0x1085f,
-}; /* CR_In_Imperial_Aramaic */
-
-/* 'In_Palmyrene': Block */
-#define CR_In_Palmyrene CR_Palmyrene
-
-/* 'In_Nabataean': Block */
-static const OnigCodePoint CR_In_Nabataean[] = {
-	1,
-	0x10880, 0x108af,
-}; /* CR_In_Nabataean */
-
-/* 'In_Hatran': Block */
-static const OnigCodePoint CR_In_Hatran[] = {
-	1,
-	0x108e0, 0x108ff,
-}; /* CR_In_Hatran */
-
-/* 'In_Phoenician': Block */
-static const OnigCodePoint CR_In_Phoenician[] = {
-	1,
-	0x10900, 0x1091f,
-}; /* CR_In_Phoenician */
-
-/* 'In_Lydian': Block */
-static const OnigCodePoint CR_In_Lydian[] = {
-	1,
-	0x10920, 0x1093f,
-}; /* CR_In_Lydian */
-
-/* 'In_Meroitic_Hieroglyphs': Block */
-#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
-
-/* 'In_Meroitic_Cursive': Block */
-static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
-	1,
-	0x109a0, 0x109ff,
-}; /* CR_In_Meroitic_Cursive */
-
-/* 'In_Kharoshthi': Block */
-static const OnigCodePoint CR_In_Kharoshthi[] = {
-	1,
-	0x10a00, 0x10a5f,
-}; /* CR_In_Kharoshthi */
-
-/* 'In_Old_South_Arabian': Block */
-#define CR_In_Old_South_Arabian CR_Old_South_Arabian
-
-/* 'In_Old_North_Arabian': Block */
-#define CR_In_Old_North_Arabian CR_Old_North_Arabian
-
-/* 'In_Manichaean': Block */
-static const OnigCodePoint CR_In_Manichaean[] = {
-	1,
-	0x10ac0, 0x10aff,
-}; /* CR_In_Manichaean */
-
-/* 'In_Avestan': Block */
-static const OnigCodePoint CR_In_Avestan[] = {
-	1,
-	0x10b00, 0x10b3f,
-}; /* CR_In_Avestan */
-
-/* 'In_Inscriptional_Parthian': Block */
-static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
-	1,
-	0x10b40, 0x10b5f,
-}; /* CR_In_Inscriptional_Parthian */
-
-/* 'In_Inscriptional_Pahlavi': Block */
-static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
-	1,
-	0x10b60, 0x10b7f,
-}; /* CR_In_Inscriptional_Pahlavi */
-
-/* 'In_Psalter_Pahlavi': Block */
-static const OnigCodePoint CR_In_Psalter_Pahlavi[] = {
-	1,
-	0x10b80, 0x10baf,
-}; /* CR_In_Psalter_Pahlavi */
-
-/* 'In_Old_Turkic': Block */
-static const OnigCodePoint CR_In_Old_Turkic[] = {
-	1,
-	0x10c00, 0x10c4f,
-}; /* CR_In_Old_Turkic */
-
-/* 'In_Old_Hungarian': Block */
-static const OnigCodePoint CR_In_Old_Hungarian[] = {
-	1,
-	0x10c80, 0x10cff,
-}; /* CR_In_Old_Hungarian */
-
-/* 'In_Rumi_Numeral_Symbols': Block */
-static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
-	1,
-	0x10e60, 0x10e7f,
-}; /* CR_In_Rumi_Numeral_Symbols */
-
-/* 'In_Brahmi': Block */
-static const OnigCodePoint CR_In_Brahmi[] = {
-	1,
-	0x11000, 0x1107f,
-}; /* CR_In_Brahmi */
-
-/* 'In_Kaithi': Block */
-static const OnigCodePoint CR_In_Kaithi[] = {
-	1,
-	0x11080, 0x110cf,
-}; /* CR_In_Kaithi */
-
-/* 'In_Sora_Sompeng': Block */
-static const OnigCodePoint CR_In_Sora_Sompeng[] = {
-	1,
-	0x110d0, 0x110ff,
-}; /* CR_In_Sora_Sompeng */
-
-/* 'In_Chakma': Block */
-static const OnigCodePoint CR_In_Chakma[] = {
-	1,
-	0x11100, 0x1114f,
-}; /* CR_In_Chakma */
-
-/* 'In_Mahajani': Block */
-static const OnigCodePoint CR_In_Mahajani[] = {
-	1,
-	0x11150, 0x1117f,
-}; /* CR_In_Mahajani */
-
-/* 'In_Sharada': Block */
-static const OnigCodePoint CR_In_Sharada[] = {
-	1,
-	0x11180, 0x111df,
-}; /* CR_In_Sharada */
-
-/* 'In_Sinhala_Archaic_Numbers': Block */
-static const OnigCodePoint CR_In_Sinhala_Archaic_Numbers[] = {
-	1,
-	0x111e0, 0x111ff,
-}; /* CR_In_Sinhala_Archaic_Numbers */
-
-/* 'In_Khojki': Block */
-static const OnigCodePoint CR_In_Khojki[] = {
-	1,
-	0x11200, 0x1124f,
-}; /* CR_In_Khojki */
-
-/* 'In_Multani': Block */
-static const OnigCodePoint CR_In_Multani[] = {
-	1,
-	0x11280, 0x112af,
-}; /* CR_In_Multani */
-
-/* 'In_Khudawadi': Block */
-static const OnigCodePoint CR_In_Khudawadi[] = {
-	1,
-	0x112b0, 0x112ff,
-}; /* CR_In_Khudawadi */
-
-/* 'In_Grantha': Block */
-static const OnigCodePoint CR_In_Grantha[] = {
-	1,
-	0x11300, 0x1137f,
-}; /* CR_In_Grantha */
-
-/* 'In_Newa': Block */
-static const OnigCodePoint CR_In_Newa[] = {
-	1,
-	0x11400, 0x1147f,
-}; /* CR_In_Newa */
-
-/* 'In_Tirhuta': Block */
-static const OnigCodePoint CR_In_Tirhuta[] = {
-	1,
-	0x11480, 0x114df,
-}; /* CR_In_Tirhuta */
-
-/* 'In_Siddham': Block */
-static const OnigCodePoint CR_In_Siddham[] = {
-	1,
-	0x11580, 0x115ff,
-}; /* CR_In_Siddham */
-
-/* 'In_Modi': Block */
-static const OnigCodePoint CR_In_Modi[] = {
-	1,
-	0x11600, 0x1165f,
-}; /* CR_In_Modi */
-
-/* 'In_Mongolian_Supplement': Block */
-static const OnigCodePoint CR_In_Mongolian_Supplement[] = {
-	1,
-	0x11660, 0x1167f,
-}; /* CR_In_Mongolian_Supplement */
-
-/* 'In_Takri': Block */
-static const OnigCodePoint CR_In_Takri[] = {
-	1,
-	0x11680, 0x116cf,
-}; /* CR_In_Takri */
-
-/* 'In_Ahom': Block */
-static const OnigCodePoint CR_In_Ahom[] = {
-	1,
-	0x11700, 0x1173f,
-}; /* CR_In_Ahom */
-
-/* 'In_Warang_Citi': Block */
-static const OnigCodePoint CR_In_Warang_Citi[] = {
-	1,
-	0x118a0, 0x118ff,
-}; /* CR_In_Warang_Citi */
-
-/* 'In_Pau_Cin_Hau': Block */
-static const OnigCodePoint CR_In_Pau_Cin_Hau[] = {
-	1,
-	0x11ac0, 0x11aff,
-}; /* CR_In_Pau_Cin_Hau */
-
-/* 'In_Bhaiksuki': Block */
-static const OnigCodePoint CR_In_Bhaiksuki[] = {
-	1,
-	0x11c00, 0x11c6f,
-}; /* CR_In_Bhaiksuki */
-
-/* 'In_Marchen': Block */
-static const OnigCodePoint CR_In_Marchen[] = {
-	1,
-	0x11c70, 0x11cbf,
-}; /* CR_In_Marchen */
-
-/* 'In_Cuneiform': Block */
-static const OnigCodePoint CR_In_Cuneiform[] = {
-	1,
-	0x12000, 0x123ff,
-}; /* CR_In_Cuneiform */
-
-/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
-	1,
-	0x12400, 0x1247f,
-}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
-
-/* 'In_Early_Dynastic_Cuneiform': Block */
-static const OnigCodePoint CR_In_Early_Dynastic_Cuneiform[] = {
-	1,
-	0x12480, 0x1254f,
-}; /* CR_In_Early_Dynastic_Cuneiform */
-
-/* 'In_Egyptian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
-	1,
-	0x13000, 0x1342f,
-}; /* CR_In_Egyptian_Hieroglyphs */
-
-/* 'In_Anatolian_Hieroglyphs': Block */
-static const OnigCodePoint CR_In_Anatolian_Hieroglyphs[] = {
-	1,
-	0x14400, 0x1467f,
-}; /* CR_In_Anatolian_Hieroglyphs */
-
-/* 'In_Bamum_Supplement': Block */
-static const OnigCodePoint CR_In_Bamum_Supplement[] = {
-	1,
-	0x16800, 0x16a3f,
-}; /* CR_In_Bamum_Supplement */
-
-/* 'In_Mro': Block */
-static const OnigCodePoint CR_In_Mro[] = {
-	1,
-	0x16a40, 0x16a6f,
-}; /* CR_In_Mro */
-
-/* 'In_Bassa_Vah': Block */
-static const OnigCodePoint CR_In_Bassa_Vah[] = {
-	1,
-	0x16ad0, 0x16aff,
-}; /* CR_In_Bassa_Vah */
-
-/* 'In_Pahawh_Hmong': Block */
-static const OnigCodePoint CR_In_Pahawh_Hmong[] = {
-	1,
-	0x16b00, 0x16b8f,
-}; /* CR_In_Pahawh_Hmong */
-
-/* 'In_Miao': Block */
-static const OnigCodePoint CR_In_Miao[] = {
-	1,
-	0x16f00, 0x16f9f,
-}; /* CR_In_Miao */
-
-/* 'In_Ideographic_Symbols_and_Punctuation': Block */
-static const OnigCodePoint CR_In_Ideographic_Symbols_and_Punctuation[] = {
-	1,
-	0x16fe0, 0x16fff,
-}; /* CR_In_Ideographic_Symbols_and_Punctuation */
-
-/* 'In_Tangut': Block */
-static const OnigCodePoint CR_In_Tangut[] = {
-	1,
-	0x17000, 0x187ff,
-}; /* CR_In_Tangut */
-
-/* 'In_Tangut_Components': Block */
-static const OnigCodePoint CR_In_Tangut_Components[] = {
-	1,
-	0x18800, 0x18aff,
-}; /* CR_In_Tangut_Components */
-
-/* 'In_Kana_Supplement': Block */
-static const OnigCodePoint CR_In_Kana_Supplement[] = {
-	1,
-	0x1b000, 0x1b0ff,
-}; /* CR_In_Kana_Supplement */
-
-/* 'In_Duployan': Block */
-static const OnigCodePoint CR_In_Duployan[] = {
-	1,
-	0x1bc00, 0x1bc9f,
-}; /* CR_In_Duployan */
-
-/* 'In_Shorthand_Format_Controls': Block */
-static const OnigCodePoint CR_In_Shorthand_Format_Controls[] = {
-	1,
-	0x1bca0, 0x1bcaf,
-}; /* CR_In_Shorthand_Format_Controls */
-
-/* 'In_Byzantine_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
-	1,
-	0x1d000, 0x1d0ff,
-}; /* CR_In_Byzantine_Musical_Symbols */
-
-/* 'In_Musical_Symbols': Block */
-static const OnigCodePoint CR_In_Musical_Symbols[] = {
-	1,
-	0x1d100, 0x1d1ff,
-}; /* CR_In_Musical_Symbols */
-
-/* 'In_Ancient_Greek_Musical_Notation': Block */
-static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
-	1,
-	0x1d200, 0x1d24f,
-}; /* CR_In_Ancient_Greek_Musical_Notation */
-
-/* 'In_Tai_Xuan_Jing_Symbols': Block */
-static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
-	1,
-	0x1d300, 0x1d35f,
-}; /* CR_In_Tai_Xuan_Jing_Symbols */
-
-/* 'In_Counting_Rod_Numerals': Block */
-static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
-	1,
-	0x1d360, 0x1d37f,
-}; /* CR_In_Counting_Rod_Numerals */
-
-/* 'In_Mathematical_Alphanumeric_Symbols': Block */
-static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
-	1,
-	0x1d400, 0x1d7ff,
-}; /* CR_In_Mathematical_Alphanumeric_Symbols */
-
-/* 'In_Sutton_SignWriting': Block */
-static const OnigCodePoint CR_In_Sutton_SignWriting[] = {
-	1,
-	0x1d800, 0x1daaf,
-}; /* CR_In_Sutton_SignWriting */
-
-/* 'In_Glagolitic_Supplement': Block */
-static const OnigCodePoint CR_In_Glagolitic_Supplement[] = {
-	1,
-	0x1e000, 0x1e02f,
-}; /* CR_In_Glagolitic_Supplement */
-
-/* 'In_Mende_Kikakui': Block */
-static const OnigCodePoint CR_In_Mende_Kikakui[] = {
-	1,
-	0x1e800, 0x1e8df,
-}; /* CR_In_Mende_Kikakui */
-
-/* 'In_Adlam': Block */
-static const OnigCodePoint CR_In_Adlam[] = {
-	1,
-	0x1e900, 0x1e95f,
-}; /* CR_In_Adlam */
-
-/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
-static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
-	1,
-	0x1ee00, 0x1eeff,
-}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
-
-/* 'In_Mahjong_Tiles': Block */
-static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
-	1,
-	0x1f000, 0x1f02f,
-}; /* CR_In_Mahjong_Tiles */
-
-/* 'In_Domino_Tiles': Block */
-static const OnigCodePoint CR_In_Domino_Tiles[] = {
-	1,
-	0x1f030, 0x1f09f,
-}; /* CR_In_Domino_Tiles */
-
-/* 'In_Playing_Cards': Block */
-static const OnigCodePoint CR_In_Playing_Cards[] = {
-	1,
-	0x1f0a0, 0x1f0ff,
-}; /* CR_In_Playing_Cards */
-
-/* 'In_Enclosed_Alphanumeric_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
-	1,
-	0x1f100, 0x1f1ff,
-}; /* CR_In_Enclosed_Alphanumeric_Supplement */
-
-/* 'In_Enclosed_Ideographic_Supplement': Block */
-static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
-	1,
-	0x1f200, 0x1f2ff,
-}; /* CR_In_Enclosed_Ideographic_Supplement */
-
-/* 'In_Miscellaneous_Symbols_and_Pictographs': Block */
-static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Pictographs[] = {
-	1,
-	0x1f300, 0x1f5ff,
-}; /* CR_In_Miscellaneous_Symbols_and_Pictographs */
-
-/* 'In_Emoticons': Block */
-static const OnigCodePoint CR_In_Emoticons[] = {
-	1,
-	0x1f600, 0x1f64f,
-}; /* CR_In_Emoticons */
-
-/* 'In_Ornamental_Dingbats': Block */
-static const OnigCodePoint CR_In_Ornamental_Dingbats[] = {
-	1,
-	0x1f650, 0x1f67f,
-}; /* CR_In_Ornamental_Dingbats */
-
-/* 'In_Transport_and_Map_Symbols': Block */
-static const OnigCodePoint CR_In_Transport_and_Map_Symbols[] = {
-	1,
-	0x1f680, 0x1f6ff,
-}; /* CR_In_Transport_and_Map_Symbols */
-
-/* 'In_Alchemical_Symbols': Block */
-static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
-	1,
-	0x1f700, 0x1f77f,
-}; /* CR_In_Alchemical_Symbols */
-
-/* 'In_Geometric_Shapes_Extended': Block */
-static const OnigCodePoint CR_In_Geometric_Shapes_Extended[] = {
-	1,
-	0x1f780, 0x1f7ff,
-}; /* CR_In_Geometric_Shapes_Extended */
-
-/* 'In_Supplemental_Arrows_C': Block */
-static const OnigCodePoint CR_In_Supplemental_Arrows_C[] = {
-	1,
-	0x1f800, 0x1f8ff,
-}; /* CR_In_Supplemental_Arrows_C */
-
-/* 'In_Supplemental_Symbols_and_Pictographs': Block */
-static const OnigCodePoint CR_In_Supplemental_Symbols_and_Pictographs[] = {
-	1,
-	0x1f900, 0x1f9ff,
-}; /* CR_In_Supplemental_Symbols_and_Pictographs */
-
-/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
-	1,
-	0x20000, 0x2a6df,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
-
-/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
-	1,
-	0x2a700, 0x2b73f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
-
-/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
-	1,
-	0x2b740, 0x2b81f,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
-
-/* 'In_CJK_Unified_Ideographs_Extension_E': Block */
-static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_E[] = {
-	1,
-	0x2b820, 0x2ceaf,
-}; /* CR_In_CJK_Unified_Ideographs_Extension_E */
-
-/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
-static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
-	1,
-	0x2f800, 0x2fa1f,
-}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
-
-/* 'In_Tags': Block */
-static const OnigCodePoint CR_In_Tags[] = {
-	1,
-	0xe0000, 0xe007f,
-}; /* CR_In_Tags */
-
-/* 'In_Variation_Selectors_Supplement': Block */
-static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
-	1,
-	0xe0100, 0xe01ef,
-}; /* CR_In_Variation_Selectors_Supplement */
-
-/* 'In_Supplementary_Private_Use_Area_A': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
-	1,
-	0xf0000, 0xfffff,
-}; /* CR_In_Supplementary_Private_Use_Area_A */
-
-/* 'In_Supplementary_Private_Use_Area_B': Block */
-static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
-	1,
-	0x100000, 0x10ffff,
-}; /* CR_In_Supplementary_Private_Use_Area_B */
-
-/* 'In_No_Block': Block */
-static const OnigCodePoint CR_In_No_Block[] = {
-	44,
-	0x0860, 0x089f,
-	0x1c90, 0x1cbf,
-	0x2fe0, 0x2fef,
-	0x10200, 0x1027f,
-	0x103e0, 0x103ff,
-	0x10570, 0x105ff,
-	0x10780, 0x107ff,
-	0x108b0, 0x108df,
-	0x10940, 0x1097f,
-	0x10aa0, 0x10abf,
-	0x10bb0, 0x10bff,
-	0x10c50, 0x10c7f,
-	0x10d00, 0x10e5f,
-	0x10e80, 0x10fff,
-	0x11250, 0x1127f,
-	0x11380, 0x113ff,
-	0x114e0, 0x1157f,
-	0x116d0, 0x116ff,
-	0x11740, 0x1189f,
-	0x11900, 0x11abf,
-	0x11b00, 0x11bff,
-	0x11cc0, 0x11fff,
-	0x12550, 0x12fff,
-	0x13430, 0x143ff,
-	0x14680, 0x167ff,
-	0x16a70, 0x16acf,
-	0x16b90, 0x16eff,
-	0x16fa0, 0x16fdf,
-	0x18b00, 0x1afff,
-	0x1b100, 0x1bbff,
-	0x1bcb0, 0x1cfff,
-	0x1d250, 0x1d2ff,
-	0x1d380, 0x1d3ff,
-	0x1dab0, 0x1dfff,
-	0x1e030, 0x1e7ff,
-	0x1e8e0, 0x1e8ff,
-	0x1e960, 0x1edff,
-	0x1ef00, 0x1efff,
-	0x1fa00, 0x1ffff,
-	0x2a6e0, 0x2a6ff,
-	0x2ceb0, 0x2f7ff,
-	0x2fa20, 0xdffff,
-	0xe0080, 0xe00ff,
-	0xe01f0, 0xeffff,
-}; /* CR_In_No_Block */
-
-#endif /* USE_UNICODE_PROPERTIES */
-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_LC,
-  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_Batak,
-  CR_Brahmi,
-  CR_Mandaic,
-  CR_Chakma,
-  CR_Meroitic_Cursive,
-  CR_Meroitic_Hieroglyphs,
-  CR_Miao,
-  CR_Sharada,
-  CR_Sora_Sompeng,
-  CR_Takri,
-  CR_Caucasian_Albanian,
-  CR_Bassa_Vah,
-  CR_Duployan,
-  CR_Elbasan,
-  CR_Grantha,
-  CR_Pahawh_Hmong,
-  CR_Khojki,
-  CR_Linear_A,
-  CR_Mahajani,
-  CR_Manichaean,
-  CR_Mende_Kikakui,
-  CR_Modi,
-  CR_Mro,
-  CR_Old_North_Arabian,
-  CR_Nabataean,
-  CR_Palmyrene,
-  CR_Pau_Cin_Hau,
-  CR_Old_Permic,
-  CR_Psalter_Pahlavi,
-  CR_Siddham,
-  CR_Khudawadi,
-  CR_Tirhuta,
-  CR_Warang_Citi,
-  CR_Ahom,
-  CR_Anatolian_Hieroglyphs,
-  CR_Hatran,
-  CR_Multani,
-  CR_Old_Hungarian,
-  CR_SignWriting,
-  CR_Adlam,
-  CR_Bhaiksuki,
-  CR_Marchen,
-  CR_Newa,
-  CR_Osage,
-  CR_Tangut,
-  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_Sentence_Terminal,
-  CR_Variation_Selector,
-  CR_Pattern_White_Space,
-  CR_Pattern_Syntax,
-  CR_Prepended_Concatenation_Mark,
-  CR_Unknown,
-#ifdef USE_UNICODE_AGE_PROPERTIES
-  CR_Age_1_1,
-  CR_Age_2_0,
-  CR_Age_2_1,
-  CR_Age_3_0,
-  CR_Age_3_1,
-  CR_Age_3_2,
-  CR_Age_4_0,
-  CR_Age_4_1,
-  CR_Age_5_0,
-  CR_Age_5_1,
-  CR_Age_5_2,
-  CR_Age_6_0,
-  CR_Age_6_1,
-  CR_Age_6_2,
-  CR_Age_6_3,
-  CR_Age_7_0,
-  CR_Age_8_0,
-  CR_Age_9_0,
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-  CR_Grapheme_Cluster_Break_Prepend,
-  CR_Grapheme_Cluster_Break_CR,
-  CR_Grapheme_Cluster_Break_LF,
-  CR_Grapheme_Cluster_Break_Control,
-  CR_Grapheme_Cluster_Break_Extend,
-  CR_Grapheme_Cluster_Break_Regional_Indicator,
-  CR_Grapheme_Cluster_Break_SpacingMark,
-  CR_Grapheme_Cluster_Break_L,
-  CR_Grapheme_Cluster_Break_V,
-  CR_Grapheme_Cluster_Break_T,
-  CR_Grapheme_Cluster_Break_LV,
-  CR_Grapheme_Cluster_Break_LVT,
-  CR_Grapheme_Cluster_Break_E_Base,
-  CR_Grapheme_Cluster_Break_E_Modifier,
-  CR_Grapheme_Cluster_Break_ZWJ,
-  CR_Grapheme_Cluster_Break_Glue_After_Zwj,
-  CR_Grapheme_Cluster_Break_E_Base_GAZ,
-  CR_In_Basic_Latin,
-  CR_In_Latin_1_Supplement,
-  CR_In_Latin_Extended_A,
-  CR_In_Latin_Extended_B,
-  CR_In_IPA_Extensions,
-  CR_In_Spacing_Modifier_Letters,
-  CR_In_Combining_Diacritical_Marks,
-  CR_In_Greek_and_Coptic,
-  CR_In_Cyrillic,
-  CR_In_Cyrillic_Supplement,
-  CR_In_Armenian,
-  CR_In_Hebrew,
-  CR_In_Arabic,
-  CR_In_Syriac,
-  CR_In_Arabic_Supplement,
-  CR_In_Thaana,
-  CR_In_NKo,
-  CR_In_Samaritan,
-  CR_In_Mandaic,
-  CR_In_Arabic_Extended_A,
-  CR_In_Devanagari,
-  CR_In_Bengali,
-  CR_In_Gurmukhi,
-  CR_In_Gujarati,
-  CR_In_Oriya,
-  CR_In_Tamil,
-  CR_In_Telugu,
-  CR_In_Kannada,
-  CR_In_Malayalam,
-  CR_In_Sinhala,
-  CR_In_Thai,
-  CR_In_Lao,
-  CR_In_Tibetan,
-  CR_In_Myanmar,
-  CR_In_Georgian,
-  CR_In_Hangul_Jamo,
-  CR_In_Ethiopic,
-  CR_In_Ethiopic_Supplement,
-  CR_In_Cherokee,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics,
-  CR_In_Ogham,
-  CR_In_Runic,
-  CR_In_Tagalog,
-  CR_In_Hanunoo,
-  CR_In_Buhid,
-  CR_In_Tagbanwa,
-  CR_In_Khmer,
-  CR_In_Mongolian,
-  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
-  CR_In_Limbu,
-  CR_In_Tai_Le,
-  CR_In_New_Tai_Lue,
-  CR_In_Khmer_Symbols,
-  CR_In_Buginese,
-  CR_In_Tai_Tham,
-  CR_In_Combining_Diacritical_Marks_Extended,
-  CR_In_Balinese,
-  CR_In_Sundanese,
-  CR_In_Batak,
-  CR_In_Lepcha,
-  CR_In_Ol_Chiki,
-  CR_In_Cyrillic_Extended_C,
-  CR_In_Sundanese_Supplement,
-  CR_In_Vedic_Extensions,
-  CR_In_Phonetic_Extensions,
-  CR_In_Phonetic_Extensions_Supplement,
-  CR_In_Combining_Diacritical_Marks_Supplement,
-  CR_In_Latin_Extended_Additional,
-  CR_In_Greek_Extended,
-  CR_In_General_Punctuation,
-  CR_In_Superscripts_and_Subscripts,
-  CR_In_Currency_Symbols,
-  CR_In_Combining_Diacritical_Marks_for_Symbols,
-  CR_In_Letterlike_Symbols,
-  CR_In_Number_Forms,
-  CR_In_Arrows,
-  CR_In_Mathematical_Operators,
-  CR_In_Miscellaneous_Technical,
-  CR_In_Control_Pictures,
-  CR_In_Optical_Character_Recognition,
-  CR_In_Enclosed_Alphanumerics,
-  CR_In_Box_Drawing,
-  CR_In_Block_Elements,
-  CR_In_Geometric_Shapes,
-  CR_In_Miscellaneous_Symbols,
-  CR_In_Dingbats,
-  CR_In_Miscellaneous_Mathematical_Symbols_A,
-  CR_In_Supplemental_Arrows_A,
-  CR_In_Braille_Patterns,
-  CR_In_Supplemental_Arrows_B,
-  CR_In_Miscellaneous_Mathematical_Symbols_B,
-  CR_In_Supplemental_Mathematical_Operators,
-  CR_In_Miscellaneous_Symbols_and_Arrows,
-  CR_In_Glagolitic,
-  CR_In_Latin_Extended_C,
-  CR_In_Coptic,
-  CR_In_Georgian_Supplement,
-  CR_In_Tifinagh,
-  CR_In_Ethiopic_Extended,
-  CR_In_Cyrillic_Extended_A,
-  CR_In_Supplemental_Punctuation,
-  CR_In_CJK_Radicals_Supplement,
-  CR_In_Kangxi_Radicals,
-  CR_In_Ideographic_Description_Characters,
-  CR_In_CJK_Symbols_and_Punctuation,
-  CR_In_Hiragana,
-  CR_In_Katakana,
-  CR_In_Bopomofo,
-  CR_In_Hangul_Compatibility_Jamo,
-  CR_In_Kanbun,
-  CR_In_Bopomofo_Extended,
-  CR_In_CJK_Strokes,
-  CR_In_Katakana_Phonetic_Extensions,
-  CR_In_Enclosed_CJK_Letters_and_Months,
-  CR_In_CJK_Compatibility,
-  CR_In_CJK_Unified_Ideographs_Extension_A,
-  CR_In_Yijing_Hexagram_Symbols,
-  CR_In_CJK_Unified_Ideographs,
-  CR_In_Yi_Syllables,
-  CR_In_Yi_Radicals,
-  CR_In_Lisu,
-  CR_In_Vai,
-  CR_In_Cyrillic_Extended_B,
-  CR_In_Bamum,
-  CR_In_Modifier_Tone_Letters,
-  CR_In_Latin_Extended_D,
-  CR_In_Syloti_Nagri,
-  CR_In_Common_Indic_Number_Forms,
-  CR_In_Phags_pa,
-  CR_In_Saurashtra,
-  CR_In_Devanagari_Extended,
-  CR_In_Kayah_Li,
-  CR_In_Rejang,
-  CR_In_Hangul_Jamo_Extended_A,
-  CR_In_Javanese,
-  CR_In_Myanmar_Extended_B,
-  CR_In_Cham,
-  CR_In_Myanmar_Extended_A,
-  CR_In_Tai_Viet,
-  CR_In_Meetei_Mayek_Extensions,
-  CR_In_Ethiopic_Extended_A,
-  CR_In_Latin_Extended_E,
-  CR_In_Cherokee_Supplement,
-  CR_In_Meetei_Mayek,
-  CR_In_Hangul_Syllables,
-  CR_In_Hangul_Jamo_Extended_B,
-  CR_In_High_Surrogates,
-  CR_In_High_Private_Use_Surrogates,
-  CR_In_Low_Surrogates,
-  CR_In_Private_Use_Area,
-  CR_In_CJK_Compatibility_Ideographs,
-  CR_In_Alphabetic_Presentation_Forms,
-  CR_In_Arabic_Presentation_Forms_A,
-  CR_In_Variation_Selectors,
-  CR_In_Vertical_Forms,
-  CR_In_Combining_Half_Marks,
-  CR_In_CJK_Compatibility_Forms,
-  CR_In_Small_Form_Variants,
-  CR_In_Arabic_Presentation_Forms_B,
-  CR_In_Halfwidth_and_Fullwidth_Forms,
-  CR_In_Specials,
-  CR_In_Linear_B_Syllabary,
-  CR_In_Linear_B_Ideograms,
-  CR_In_Aegean_Numbers,
-  CR_In_Ancient_Greek_Numbers,
-  CR_In_Ancient_Symbols,
-  CR_In_Phaistos_Disc,
-  CR_In_Lycian,
-  CR_In_Carian,
-  CR_In_Coptic_Epact_Numbers,
-  CR_In_Old_Italic,
-  CR_In_Gothic,
-  CR_In_Old_Permic,
-  CR_In_Ugaritic,
-  CR_In_Old_Persian,
-  CR_In_Deseret,
-  CR_In_Shavian,
-  CR_In_Osmanya,
-  CR_In_Osage,
-  CR_In_Elbasan,
-  CR_In_Caucasian_Albanian,
-  CR_In_Linear_A,
-  CR_In_Cypriot_Syllabary,
-  CR_In_Imperial_Aramaic,
-  CR_In_Palmyrene,
-  CR_In_Nabataean,
-  CR_In_Hatran,
-  CR_In_Phoenician,
-  CR_In_Lydian,
-  CR_In_Meroitic_Hieroglyphs,
-  CR_In_Meroitic_Cursive,
-  CR_In_Kharoshthi,
-  CR_In_Old_South_Arabian,
-  CR_In_Old_North_Arabian,
-  CR_In_Manichaean,
-  CR_In_Avestan,
-  CR_In_Inscriptional_Parthian,
-  CR_In_Inscriptional_Pahlavi,
-  CR_In_Psalter_Pahlavi,
-  CR_In_Old_Turkic,
-  CR_In_Old_Hungarian,
-  CR_In_Rumi_Numeral_Symbols,
-  CR_In_Brahmi,
-  CR_In_Kaithi,
-  CR_In_Sora_Sompeng,
-  CR_In_Chakma,
-  CR_In_Mahajani,
-  CR_In_Sharada,
-  CR_In_Sinhala_Archaic_Numbers,
-  CR_In_Khojki,
-  CR_In_Multani,
-  CR_In_Khudawadi,
-  CR_In_Grantha,
-  CR_In_Newa,
-  CR_In_Tirhuta,
-  CR_In_Siddham,
-  CR_In_Modi,
-  CR_In_Mongolian_Supplement,
-  CR_In_Takri,
-  CR_In_Ahom,
-  CR_In_Warang_Citi,
-  CR_In_Pau_Cin_Hau,
-  CR_In_Bhaiksuki,
-  CR_In_Marchen,
-  CR_In_Cuneiform,
-  CR_In_Cuneiform_Numbers_and_Punctuation,
-  CR_In_Early_Dynastic_Cuneiform,
-  CR_In_Egyptian_Hieroglyphs,
-  CR_In_Anatolian_Hieroglyphs,
-  CR_In_Bamum_Supplement,
-  CR_In_Mro,
-  CR_In_Bassa_Vah,
-  CR_In_Pahawh_Hmong,
-  CR_In_Miao,
-  CR_In_Ideographic_Symbols_and_Punctuation,
-  CR_In_Tangut,
-  CR_In_Tangut_Components,
-  CR_In_Kana_Supplement,
-  CR_In_Duployan,
-  CR_In_Shorthand_Format_Controls,
-  CR_In_Byzantine_Musical_Symbols,
-  CR_In_Musical_Symbols,
-  CR_In_Ancient_Greek_Musical_Notation,
-  CR_In_Tai_Xuan_Jing_Symbols,
-  CR_In_Counting_Rod_Numerals,
-  CR_In_Mathematical_Alphanumeric_Symbols,
-  CR_In_Sutton_SignWriting,
-  CR_In_Glagolitic_Supplement,
-  CR_In_Mende_Kikakui,
-  CR_In_Adlam,
-  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
-  CR_In_Mahjong_Tiles,
-  CR_In_Domino_Tiles,
-  CR_In_Playing_Cards,
-  CR_In_Enclosed_Alphanumeric_Supplement,
-  CR_In_Enclosed_Ideographic_Supplement,
-  CR_In_Miscellaneous_Symbols_and_Pictographs,
-  CR_In_Emoticons,
-  CR_In_Ornamental_Dingbats,
-  CR_In_Transport_and_Map_Symbols,
-  CR_In_Alchemical_Symbols,
-  CR_In_Geometric_Shapes_Extended,
-  CR_In_Supplemental_Arrows_C,
-  CR_In_Supplemental_Symbols_and_Pictographs,
-  CR_In_CJK_Unified_Ideographs_Extension_B,
-  CR_In_CJK_Unified_Ideographs_Extension_C,
-  CR_In_CJK_Unified_Ideographs_Extension_D,
-  CR_In_CJK_Unified_Ideographs_Extension_E,
-  CR_In_CJK_Compatibility_Ideographs_Supplement,
-  CR_In_Tags,
-  CR_In_Variation_Selectors_Supplement,
-  CR_In_Supplementary_Private_Use_Area_A,
-  CR_In_Supplementary_Private_Use_Area_B,
-  CR_In_No_Block,
-#endif /* USE_UNICODE_PROPERTIES */
-};
-struct uniname2ctype_struct {
-  short name;
-  unsigned short ctype;
-};
-
-static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
-
-#ifndef USE_UNICODE_PROPERTIES
-#define TOTAL_KEYWORDS 14
-#define MIN_WORD_LENGTH 4
-#define MAX_WORD_LENGTH 6
-#define MIN_HASH_VALUE 6
-#define MAX_HASH_VALUE 19
-/* maximum key range = 14, duplicates = 0 */
-#else /* USE_UNICODE_PROPERTIES */
-#ifndef USE_UNICODE_AGE_PROPERTIES
-#define TOTAL_KEYWORDS 752
-#else /* USE_UNICODE_AGE_PROPERTIES */
-#define TOTAL_KEYWORDS 770
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-#define MIN_WORD_LENGTH 1
-#define MAX_WORD_LENGTH 44
-#define MIN_HASH_VALUE 3
-#define MAX_HASH_VALUE 5275
-/* maximum key range = 5273, 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
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-      20, 20, 20, 20, 20, 20, 20,  3, 11,  5,
-       4, 20, 20,  9, 20,  1, 20, 20, 10, 20,
-       2, 20,  1, 20,  1,  7,  4,  6, 20,  1,
-       4, 20, 20, 20, 20, 20, 20, 20
-#else /* USE_UNICODE_PROPERTIES */
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      5276, 5276, 5276, 5276, 5276, 5276,    1, 5276,    8,    1,
-         2,   11,   25,   22,    7,   19,   14,   13, 5276, 5276,
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276, 5276,
-      5276, 5276, 5276, 5276, 5276, 5276, 5276,   13, 1100,   20,
-       497,   25,  315,  494,  322,    4,  279, 1693,  169,    7,
-         1,  267, 1336,    2,  214,   40,   92, 1301,  615,  434,
-       494, 1306,   17, 5276, 5276, 5276, 5276, 5276
-#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:
-        hval += asso_values[(unsigned char)str[4]];
-      /*FALLTHROUGH*/
-      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_str6[sizeof("word")];
-    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("upper")];
-    char uniname2ctype_pool_str13[sizeof("ascii")];
-    char uniname2ctype_pool_str14[sizeof("cntrl")];
-    char uniname2ctype_pool_str15[sizeof("space")];
-    char uniname2ctype_pool_str16[sizeof("lower")];
-    char uniname2ctype_pool_str17[sizeof("graph")];
-    char uniname2ctype_pool_str18[sizeof("digit")];
-    char uniname2ctype_pool_str19[sizeof("blank")];
-#else /* USE_UNICODE_PROPERTIES */
-    char uniname2ctype_pool_str3[sizeof("n")];
-    char uniname2ctype_pool_str11[sizeof("mn")];
-    char uniname2ctype_pool_str15[sizeof("m")];
-    char uniname2ctype_pool_str24[sizeof("cn")];
-    char uniname2ctype_pool_str29[sizeof("mani")];
-    char uniname2ctype_pool_str30[sizeof("ci")];
-    char uniname2ctype_pool_str31[sizeof("inmanichaean")];
-    char uniname2ctype_pool_str35[sizeof("z")];
-    char uniname2ctype_pool_str36[sizeof("qaai")];
-    char uniname2ctype_pool_str41[sizeof("c")];
-    char uniname2ctype_pool_str49[sizeof("mc")];
-    char uniname2ctype_pool_str52[sizeof("qaac")];
-    char uniname2ctype_pool_str56[sizeof("sm")];
-    char uniname2ctype_pool_str58[sizeof("incham")];
-    char uniname2ctype_pool_str59[sizeof("me")];
-    char uniname2ctype_pool_str61[sizeof("inarmenian")];
-    char uniname2ctype_pool_str62[sizeof("cc")];
-    char uniname2ctype_pool_str65[sizeof("mandaic")];
-    char uniname2ctype_pool_str69[sizeof("incuneiform")];
-    char uniname2ctype_pool_str72[sizeof("zzzz")];
-    char uniname2ctype_pool_str77[sizeof("insamaritan")];
-    char uniname2ctype_pool_str78[sizeof("cans")];
-    char uniname2ctype_pool_str81[sizeof("s")];
-    char uniname2ctype_pool_str82[sizeof("sc")];
-    char uniname2ctype_pool_str86[sizeof("ascii")];
-    char uniname2ctype_pool_str93[sizeof("inavestan")];
-    char uniname2ctype_pool_str99[sizeof("zs")];
-    char uniname2ctype_pool_str102[sizeof("cs")];
-    char uniname2ctype_pool_str106[sizeof("inipaextensions")];
-    char uniname2ctype_pool_str110[sizeof("incuneiformnumbersandpunctuation")];
-    char uniname2ctype_pool_str114[sizeof("incommonindicnumberforms")];
-    char uniname2ctype_pool_str124[sizeof("inthai")];
-    char uniname2ctype_pool_str132[sizeof("mtei")];
-    char uniname2ctype_pool_str140[sizeof("inspecials")];
-    char uniname2ctype_pool_str141[sizeof("initialpunctuation")];
-    char uniname2ctype_pool_str144[sizeof("inthaana")];
-    char uniname2ctype_pool_str145[sizeof("inancientsymbols")];
-    char uniname2ctype_pool_str152[sizeof("inmiscellaneousmathematicalsymbolsa")];
-    char uniname2ctype_pool_str159[sizeof("inmusicalsymbols")];
-    char uniname2ctype_pool_str164[sizeof("taile")];
-    char uniname2ctype_pool_str174[sizeof("inmyanmarextendeda")];
-    char uniname2ctype_pool_str176[sizeof("sterm")];
-    char uniname2ctype_pool_str185[sizeof("lm")];
-    char uniname2ctype_pool_str191[sizeof("lina")];
-    char uniname2ctype_pool_str199[sizeof("inmiscellaneoussymbols")];
-    char uniname2ctype_pool_str200[sizeof("lana")];
-    char uniname2ctype_pool_str201[sizeof("intransportandmapsymbols")];
-    char uniname2ctype_pool_str202[sizeof("alnum")];
-    char uniname2ctype_pool_str207[sizeof("inlycian")];
-    char uniname2ctype_pool_str208[sizeof("inmiscellaneoussymbolsandarrows")];
-    char uniname2ctype_pool_str209[sizeof("intaitham")];
-    char uniname2ctype_pool_str211[sizeof("lc")];
-    char uniname2ctype_pool_str212[sizeof("inmalayalam")];
-    char uniname2ctype_pool_str213[sizeof("inmiscellaneoussymbolsandpictographs")];
-    char uniname2ctype_pool_str214[sizeof("inadlam")];
-    char uniname2ctype_pool_str220[sizeof("incontrolpictures")];
-    char uniname2ctype_pool_str222[sizeof("inlineara")];
-    char uniname2ctype_pool_str237[sizeof("taiviet")];
-    char uniname2ctype_pool_str239[sizeof("armn")];
-    char uniname2ctype_pool_str242[sizeof("armi")];
-    char uniname2ctype_pool_str247[sizeof("sinhala")];
-    char uniname2ctype_pool_str248[sizeof("armenian")];
-    char uniname2ctype_pool_str249[sizeof("inmyanmar")];
-    char uniname2ctype_pool_str251[sizeof("inrunic")];
-    char uniname2ctype_pool_str252[sizeof("incarian")];
-    char uniname2ctype_pool_str255[sizeof("cari")];
-    char uniname2ctype_pool_str256[sizeof("inmarchen")];
-    char uniname2ctype_pool_str258[sizeof("marc")];
-    char uniname2ctype_pool_str268[sizeof("carian")];
-    char uniname2ctype_pool_str270[sizeof("merc")];
-    char uniname2ctype_pool_str273[sizeof("incyrillic")];
-    char uniname2ctype_pool_str278[sizeof("samr")];
-    char uniname2ctype_pool_str279[sizeof("latn")];
-    char uniname2ctype_pool_str281[sizeof("latin")];
-    char uniname2ctype_pool_str282[sizeof("ital")];
-    char uniname2ctype_pool_str284[sizeof("intamil")];
-    char uniname2ctype_pool_str285[sizeof("taml")];
-    char uniname2ctype_pool_str286[sizeof("inmultani")];
-    char uniname2ctype_pool_str288[sizeof("samaritan")];
-    char uniname2ctype_pool_str290[sizeof("arabic")];
-    char uniname2ctype_pool_str291[sizeof("insyriac")];
-    char uniname2ctype_pool_str294[sizeof("insharada")];
-    char uniname2ctype_pool_str295[sizeof("miao")];
-    char uniname2ctype_pool_str296[sizeof("inlinearbideograms")];
-    char uniname2ctype_pool_str299[sizeof("incherokee")];
-    char uniname2ctype_pool_str302[sizeof("intaile")];
-    char uniname2ctype_pool_str303[sizeof("tale")];
-    char uniname2ctype_pool_str305[sizeof("inahom")];
-    char uniname2ctype_pool_str309[sizeof("inmeeteimayekextensions")];
-    char uniname2ctype_pool_str310[sizeof("inruminumeralsymbols")];
-    char uniname2ctype_pool_str313[sizeof("inlatinextendeda")];
-    char uniname2ctype_pool_str314[sizeof("inosmanya")];
-    char uniname2ctype_pool_str327[sizeof("inlatinextendedc")];
-    char uniname2ctype_pool_str331[sizeof("osma")];
-    char uniname2ctype_pool_str337[sizeof("inlatinextendede")];
-    char uniname2ctype_pool_str339[sizeof("l")];
-    char uniname2ctype_pool_str340[sizeof("han")];
-    char uniname2ctype_pool_str341[sizeof("nl")];
-    char uniname2ctype_pool_str342[sizeof("term")];
-    char uniname2ctype_pool_str344[sizeof("hani")];
-    char uniname2ctype_pool_str347[sizeof("inideographicsymbolsandpunctuation")];
-    char uniname2ctype_pool_str348[sizeof("zinh")];
-    char uniname2ctype_pool_str355[sizeof("lt")];
-    char uniname2ctype_pool_str357[sizeof("zl")];
-    char uniname2ctype_pool_str361[sizeof("inmahajani")];
-    char uniname2ctype_pool_str366[sizeof("cham")];
-    char uniname2ctype_pool_str368[sizeof("connectorpunctuation")];
-    char uniname2ctype_pool_str371[sizeof("sinh")];
-    char uniname2ctype_pool_str374[sizeof("manichaean")];
-    char uniname2ctype_pool_str375[sizeof("osage")];
-    char uniname2ctype_pool_str382[sizeof("inmiscellaneoustechnical")];
-    char uniname2ctype_pool_str386[sizeof("inethiopic")];
-    char uniname2ctype_pool_str390[sizeof("insinhala")];
-    char uniname2ctype_pool_str394[sizeof("chakma")];
-    char uniname2ctype_pool_str400[sizeof("shavian")];
-    char uniname2ctype_pool_str419[sizeof("inideographicdescriptioncharacters")];
-    char uniname2ctype_pool_str421[sizeof("lineara")];
-    char uniname2ctype_pool_str422[sizeof("meroiticcursive")];
-    char uniname2ctype_pool_str435[sizeof("thai")];
-    char uniname2ctype_pool_str438[sizeof("math")];
-    char uniname2ctype_pool_str440[sizeof("inemoticons")];
-    char uniname2ctype_pool_str444[sizeof("thaa")];
-    char uniname2ctype_pool_str447[sizeof("ethi")];
-    char uniname2ctype_pool_str448[sizeof("hatran")];
-    char uniname2ctype_pool_str452[sizeof("inenclosedalphanumerics")];
-    char uniname2ctype_pool_str453[sizeof("sentenceterminal")];
-    char uniname2ctype_pool_str455[sizeof("tamil")];
-    char uniname2ctype_pool_str456[sizeof("cntrl")];
-    char uniname2ctype_pool_str458[sizeof("taitham")];
-    char uniname2ctype_pool_str460[sizeof("thaana")];
-    char uniname2ctype_pool_str468[sizeof("terminalpunctuation")];
-    char uniname2ctype_pool_str471[sizeof("insinhalaarchaicnumbers")];
-    char uniname2ctype_pool_str472[sizeof("innewa")];
-    char uniname2ctype_pool_str477[sizeof("newa")];
-    char uniname2ctype_pool_str478[sizeof("inlatinextendedadditional")];
-    char uniname2ctype_pool_str485[sizeof("cwcm")];
-    char uniname2ctype_pool_str489[sizeof("loe")];
-    char uniname2ctype_pool_str503[sizeof("inopticalcharacterrecognition")];
-    char uniname2ctype_pool_str504[sizeof("inearlydynasticcuneiform")];
-    char uniname2ctype_pool_str507[sizeof("di")];
-    char uniname2ctype_pool_str508[sizeof("asciihexdigit")];
-    char uniname2ctype_pool_str509[sizeof("ll")];
-    char uniname2ctype_pool_str511[sizeof("newtailue")];
-    char uniname2ctype_pool_str512[sizeof("inscriptionalparthian")];
-    char uniname2ctype_pool_str513[sizeof("inenclosedalphanumericsupplement")];
-    char uniname2ctype_pool_str516[sizeof("oriya")];
-    char uniname2ctype_pool_str517[sizeof("mero")];
-    char uniname2ctype_pool_str519[sizeof("inmongolian")];
-    char uniname2ctype_pool_str522[sizeof("mand")];
-    char uniname2ctype_pool_str523[sizeof("inmodi")];
-    char uniname2ctype_pool_str530[sizeof("dia")];
-    char uniname2ctype_pool_str534[sizeof("mend")];
-    char uniname2ctype_pool_str535[sizeof("ingrantha")];
-    char uniname2ctype_pool_str537[sizeof("no")];
-    char uniname2ctype_pool_str538[sizeof("sora")];
-    char uniname2ctype_pool_str539[sizeof("inmandaic")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str542[sizeof("age=1.1")];
-    char uniname2ctype_pool_str543[sizeof("age=2.1")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str544[sizeof("idc")];
-    char uniname2ctype_pool_str545[sizeof("innko")];
-    char uniname2ctype_pool_str546[sizeof("sind")];
-    char uniname2ctype_pool_str547[sizeof("inarrows")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str548[sizeof("age=6.1")];
-    char uniname2ctype_pool_str549[sizeof("age=6.2")];
-    char uniname2ctype_pool_str550[sizeof("age=2.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str551[sizeof("inmro")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str552[sizeof("age=3.1")];
-    char uniname2ctype_pool_str553[sizeof("age=3.2")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str554[sizeof("titlecaseletter")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str555[sizeof("age=6.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str556[sizeof("co")];
-    char uniname2ctype_pool_str557[sizeof("hira")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str558[sizeof("age=6.3")];
-    char uniname2ctype_pool_str559[sizeof("age=3.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str560[sizeof("ingeneralpunctuation")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str561[sizeof("age=9.0")];
-    char uniname2ctype_pool_str562[sizeof("age=8.0")];
-    char uniname2ctype_pool_str563[sizeof("age=5.1")];
-    char uniname2ctype_pool_str564[sizeof("age=5.2")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str565[sizeof("inmiao")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str566[sizeof("age=4.1")];
-    char uniname2ctype_pool_str567[sizeof("age=7.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str568[sizeof("innewtailue")];
-    char uniname2ctype_pool_str569[sizeof("common")];
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    char uniname2ctype_pool_str570[sizeof("age=5.0")];
-    char uniname2ctype_pool_str573[sizeof("age=4.0")];
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    char uniname2ctype_pool_str576[sizeof("so")];
-    char uniname2ctype_pool_str577[sizeof("inhiragana")];
-    char uniname2ctype_pool_str579[sizeof("insundanese")];
-    char uniname2ctype_pool_str584[sizeof("ids")];
-    char uniname2ctype_pool_str585[sizeof("cher")];
-    char uniname2ctype_pool_str589[sizeof("marchen")];
-    char uniname2ctype_pool_str591[sizeof("indominotiles")];
-    char uniname2ctype_pool_str595[sizeof("joinc")];
-    char uniname2ctype_pool_str604[sizeof("tang")];
-    char uniname2ctype_pool_str607[sizeof("hano")];
-    char uniname2ctype_pool_str613[sizeof("ahom")];
-    char uniname2ctype_pool_str621[sizeof("inogham")];
-    char uniname2ctype_pool_str622[sizeof("inscriptionalpahlavi")];
-    char uniname2ctype_pool_str625[sizeof("mahj")];
-    char uniname2ctype_pool_str627[sizeof("inolchiki")];
-    char uniname2ctype_pool_str633[sizeof("invai")];
-    char uniname2ctype_pool_str634[sizeof("tagbanwa")];
-    char uniname2ctype_pool_str636[sizeof("tirh")];
-    char uniname2ctype_pool_str637[sizeof("idst")];
-    char uniname2ctype_pool_str639[sizeof("vai")];
-    char uniname2ctype_pool_str640[sizeof("vaii")];
-    char uniname2ctype_pool_str641[sizeof("cwt")];
-    char uniname2ctype_pool_str642[sizeof("inhatran")];
-    char uniname2ctype_pool_str645[sizeof("hatr")];
-    char uniname2ctype_pool_str646[sizeof("mahajani")];
-    char uniname2ctype_pool_str649[sizeof("idcontinue")];
-    char uniname2ctype_pool_str652[sizeof("cf")];
-    char uniname2ctype_pool_str655[sizeof("intirhuta")];
-    char uniname2ctype_pool_str659[sizeof("inenclosedcjklettersandmonths")];
-    char uniname2ctype_pool_str663[sizeof("intaixuanjingsymbols")];
-    char uniname2ctype_pool_str664[sizeof("inspacingmodifierletters")];
-    char uniname2ctype_pool_str668[sizeof("indeseret")];
-    char uniname2ctype_pool_str677[sizeof("intags")];
-    char uniname2ctype_pool_str678[sizeof("wara")];
-    char uniname2ctype_pool_str683[sizeof("inshavian")];
-    char uniname2ctype_pool_str684[sizeof("inlydian")];
-    char uniname2ctype_pool_str686[sizeof("inwarangciti")];
-    char uniname2ctype_pool_str688[sizeof("inmathematicalalphanumericsymbols")];
-    char uniname2ctype_pool_str690[sizeof("adlm")];
-    char uniname2ctype_pool_str692[sizeof("intangut")];
-    char uniname2ctype_pool_str697[sizeof("vs")];
-    char uniname2ctype_pool_str698[sizeof("adlam")];
-    char uniname2ctype_pool_str705[sizeof("lo")];
-    char uniname2ctype_pool_str706[sizeof("ext")];
-    char uniname2ctype_pool_str712[sizeof("insylotinagri")];
-    char uniname2ctype_pool_str713[sizeof("inlao")];
-    char uniname2ctype_pool_str716[sizeof("inlowsurrogates")];
-    char uniname2ctype_pool_str717[sizeof("anatolianhieroglyphs")];
-    char uniname2ctype_pool_str719[sizeof("lao")];
-    char uniname2ctype_pool_str720[sizeof("laoo")];
-    char uniname2ctype_pool_str721[sizeof("mongolian")];
-    char uniname2ctype_pool_str726[sizeof("gran")];
-    char uniname2ctype_pool_str733[sizeof("lineseparator")];
-    char uniname2ctype_pool_str734[sizeof("ingurmukhi")];
-    char uniname2ctype_pool_str745[sizeof("letter")];
-    char uniname2ctype_pool_str748[sizeof("intifinagh")];
-    char uniname2ctype_pool_str755[sizeof("tifinagh")];
-    char uniname2ctype_pool_str758[sizeof("mro")];
-    char uniname2ctype_pool_str759[sizeof("mroo")];
-    char uniname2ctype_pool_str761[sizeof("diacritic")];
-    char uniname2ctype_pool_str764[sizeof("avst")];
-    char uniname2ctype_pool_str766[sizeof("avestan")];
-    char uniname2ctype_pool_str773[sizeof("mong")];
-    char uniname2ctype_pool_str774[sizeof("inanatolianhieroglyphs")];
-    char uniname2ctype_pool_str775[sizeof("odi")];
-    char uniname2ctype_pool_str776[sizeof("nchar")];
-    char uniname2ctype_pool_str778[sizeof("caseignorable")];
-    char uniname2ctype_pool_str779[sizeof("modi")];
-    char uniname2ctype_pool_str780[sizeof("insorasompeng")];
-    char uniname2ctype_pool_str785[sizeof("ogam")];
-    char uniname2ctype_pool_str792[sizeof("oidc")];
-    char uniname2ctype_pool_str793[sizeof("cwcf")];
-    char uniname2ctype_pool_str795[sizeof("cwl")];
-    char uniname2ctype_pool_str797[sizeof("ideo")];
-    char uniname2ctype_pool_str803[sizeof("oalpha")];
-    char uniname2ctype_pool_str804[sizeof("inolditalic")];
-    char uniname2ctype_pool_str805[sizeof("ingujarati")];
-    char uniname2ctype_pool_str811[sizeof("inosage")];
-    char uniname2ctype_pool_str812[sizeof("oids")];
-    char uniname2ctype_pool_str813[sizeof("shaw")];
-    char uniname2ctype_pool_str814[sizeof("decimalnumber")];
-    char uniname2ctype_pool_str816[sizeof("tavt")];
-    char uniname2ctype_pool_str817[sizeof("intaiviet")];
-    char uniname2ctype_pool_str828[sizeof("hmng")];
-    char uniname2ctype_pool_str829[sizeof("inmongoliansupplement")];
-    char uniname2ctype_pool_str830[sizeof("osge")];
-    char uniname2ctype_pool_str834[sizeof("hang")];
-    char uniname2ctype_pool_str835[sizeof("insuttonsignwriting")];
-    char uniname2ctype_pool_str836[sizeof("inmahjongtiles")];
-    char uniname2ctype_pool_str847[sizeof("dsrt")];
-    char uniname2ctype_pool_str858[sizeof("ahex")];
-    char uniname2ctype_pool_str860[sizeof("whitespace")];
-    char uniname2ctype_pool_str865[sizeof("insundanesesupplement")];
-    char uniname2ctype_pool_str866[sizeof("inmodifiertoneletters")];
-    char uniname2ctype_pool_str867[sizeof("idstart")];
-    char uniname2ctype_pool_str872[sizeof("ingreekandcoptic")];
-    char uniname2ctype_pool_str876[sizeof("dash")];
-    char uniname2ctype_pool_str878[sizeof("hanunoo")];
-    char uniname2ctype_pool_str890[sizeof("siddham")];
-    char uniname2ctype_pool_str892[sizeof("inoldturkic")];
-    char uniname2ctype_pool_str895[sizeof("ingeometricshapes")];
-    char uniname2ctype_pool_str900[sizeof("deseret")];
-    char uniname2ctype_pool_str903[sizeof("gothic")];
-    char uniname2ctype_pool_str905[sizeof("sharada")];
-    char uniname2ctype_pool_str906[sizeof("tfng")];
-    char uniname2ctype_pool_str914[sizeof("insmallformvariants")];
-    char uniname2ctype_pool_str919[sizeof("inshorthandformatcontrols")];
-    char uniname2ctype_pool_str922[sizeof("grext")];
-    char uniname2ctype_pool_str924[sizeof("java")];
-    char uniname2ctype_pool_str933[sizeof("radical")];
-    char uniname2ctype_pool_str936[sizeof("omath")];
-    char uniname2ctype_pool_str937[sizeof("canadianaboriginal")];
-    char uniname2ctype_pool_str941[sizeof("ingothic")];
-    char uniname2ctype_pool_str943[sizeof("otheridcontinue")];
-    char uniname2ctype_pool_str945[sizeof("control")];
-    char uniname2ctype_pool_str947[sizeof("injavanese")];
-    char uniname2ctype_pool_str956[sizeof("noncharactercodepoint")];
-    char uniname2ctype_pool_str958[sizeof("invariationselectors")];
-    char uniname2ctype_pool_str964[sizeof("casedletter")];
-    char uniname2ctype_pool_str965[sizeof("letternumber")];
-    char uniname2ctype_pool_str966[sizeof("javanese")];
-    char uniname2ctype_pool_str968[sizeof("otheralphabetic")];
-    char uniname2ctype_pool_str973[sizeof("sgnw")];
-    char uniname2ctype_pool_str991[sizeof("ingeorgian")];
-    char uniname2ctype_pool_str992[sizeof("rjng")];
-    char uniname2ctype_pool_str997[sizeof("nd")];
-    char uniname2ctype_pool_str999[sizeof("format")];
-    char uniname2ctype_pool_str1004[sizeof("geor")];
-    char uniname2ctype_pool_str1009[sizeof("inornamentaldingbats")];
-    char uniname2ctype_pool_str1013[sizeof("inrejang")];
-    char uniname2ctype_pool_str1015[sizeof("inoldnortharabian")];
-    char uniname2ctype_pool_str1017[sizeof("joincontrol")];
-    char uniname2ctype_pool_str1019[sizeof("xidc")];
-    char uniname2ctype_pool_str1020[sizeof("invariationselectorssupplement")];
-    char uniname2ctype_pool_str1036[sizeof("sd")];
-    char uniname2ctype_pool_str1039[sizeof("xids")];
-    char uniname2ctype_pool_str1042[sizeof("sidd")];
-    char uniname2ctype_pool_str1047[sizeof("indingbats")];
-    char uniname2ctype_pool_str1051[sizeof("inherited")];
-    char uniname2ctype_pool_str1052[sizeof("inmeroitichieroglyphs")];
-    char uniname2ctype_pool_str1053[sizeof("inenclosedideographicsupplement")];
-    char uniname2ctype_pool_str1054[sizeof("inoldsoutharabian")];
-    char uniname2ctype_pool_str1055[sizeof("insiddham")];
-    char uniname2ctype_pool_str1058[sizeof("inglagolitic")];
-    char uniname2ctype_pool_str1062[sizeof("ingreekextended")];
-    char uniname2ctype_pool_str1067[sizeof("olditalic")];
-    char uniname2ctype_pool_str1068[sizeof("hiragana")];
-    char uniname2ctype_pool_str1069[sizeof("idsbinaryoperator")];
-    char uniname2ctype_pool_str1072[sizeof("cased")];
-    char uniname2ctype_pool_str1073[sizeof("inhangulsyllables")];
-    char uniname2ctype_pool_str1077[sizeof("shrd")];
-    char uniname2ctype_pool_str1093[sizeof("assigned")];
-    char uniname2ctype_pool_str1095[sizeof("otheridstart")];
-    char uniname2ctype_pool_str1102[sizeof("ogham")];
-    char uniname2ctype_pool_str1107[sizeof("intagalog")];
-    char uniname2ctype_pool_str1110[sizeof("inoldhungarian")];
-    char uniname2ctype_pool_str1114[sizeof("other")];
-    char uniname2ctype_pool_str1115[sizeof("othersymbol")];
-    char uniname2ctype_pool_str1116[sizeof("otherlowercase")];
-    char uniname2ctype_pool_str1121[sizeof("othernumber")];
-    char uniname2ctype_pool_str1130[sizeof("graphemebase")];
-    char uniname2ctype_pool_str1131[sizeof("innabataean")];
-    char uniname2ctype_pool_str1137[sizeof("inbhaiksuki")];
-    char uniname2ctype_pool_str1138[sizeof("lowercase")];
-    char uniname2ctype_pool_str1139[sizeof("bamum")];
-    char uniname2ctype_pool_str1142[sizeof("glagolitic")];
-    char uniname2ctype_pool_str1148[sizeof("inhanguljamoextendeda")];
-    char uniname2ctype_pool_str1150[sizeof("indevanagari")];
-    char uniname2ctype_pool_str1153[sizeof("inelbasan")];
-    char uniname2ctype_pool_str1154[sizeof("deva")];
-    char uniname2ctype_pool_str1155[sizeof("grantha")];
-    char uniname2ctype_pool_str1159[sizeof("inarabic")];
-    char uniname2ctype_pool_str1162[sizeof("olower")];
-    char uniname2ctype_pool_str1163[sizeof("inbasiclatin")];
-    char uniname2ctype_pool_str1165[sizeof("devanagari")];
-    char uniname2ctype_pool_str1170[sizeof("warangciti")];
-    char uniname2ctype_pool_str1173[sizeof("innumberforms")];
-    char uniname2ctype_pool_str1174[sizeof("glag")];
-    char uniname2ctype_pool_str1179[sizeof("goth")];
-    char uniname2ctype_pool_str1180[sizeof("invedicextensions")];
-    char uniname2ctype_pool_str1183[sizeof("oldpersian")];
-    char uniname2ctype_pool_str1184[sizeof("digit")];
-    char uniname2ctype_pool_str1189[sizeof("xdigit")];
-    char uniname2ctype_pool_str1197[sizeof("bass")];
-    char uniname2ctype_pool_str1200[sizeof("xidstart")];
-    char uniname2ctype_pool_str1201[sizeof("oldpermic")];
-    char uniname2ctype_pool_str1210[sizeof("nbat")];
-    char uniname2ctype_pool_str1223[sizeof("inarabicpresentationformsa")];
-    char uniname2ctype_pool_str1224[sizeof("logicalorderexception")];
-    char uniname2ctype_pool_str1227[sizeof("inbyzantinemusicalsymbols")];
-    char uniname2ctype_pool_str1229[sizeof("nabataean")];
-    char uniname2ctype_pool_str1232[sizeof("intibetan")];
-    char uniname2ctype_pool_str1233[sizeof("othermath")];
-    char uniname2ctype_pool_str1239[sizeof("inmiscellaneousmathematicalsymbolsb")];
-    char uniname2ctype_pool_str1248[sizeof("inverticalforms")];
-    char uniname2ctype_pool_str1253[sizeof("tglg")];
-    char uniname2ctype_pool_str1261[sizeof("inmyanmarextendedb")];
-    char uniname2ctype_pool_str1265[sizeof("ideographic")];
-    char uniname2ctype_pool_str1266[sizeof("incyrillicextendeda")];
-    char uniname2ctype_pool_str1272[sizeof("inbraillepatterns")];
-    char uniname2ctype_pool_str1273[sizeof("incyrillicextendedc")];
-    char uniname2ctype_pool_str1278[sizeof("linb")];
-    char uniname2ctype_pool_str1281[sizeof("inlatinextendedd")];
-    char uniname2ctype_pool_str1284[sizeof("limb")];
-    char uniname2ctype_pool_str1289[sizeof("otherletter")];
-    char uniname2ctype_pool_str1290[sizeof("bali")];
-    char uniname2ctype_pool_str1292[sizeof("tibt")];
-    char uniname2ctype_pool_str1293[sizeof("georgian")];
-    char uniname2ctype_pool_str1299[sizeof("xidcontinue")];
-    char uniname2ctype_pool_str1303[sizeof("lower")];
-    char uniname2ctype_pool_str1309[sizeof("tibetan")];
-    char uniname2ctype_pool_str1311[sizeof("elba")];
-    char uniname2ctype_pool_str1313[sizeof("inbalinese")];
-    char uniname2ctype_pool_str1316[sizeof("yi")];
-    char uniname2ctype_pool_str1319[sizeof("bengali")];
-    char uniname2ctype_pool_str1322[sizeof("yiii")];
-    char uniname2ctype_pool_str1326[sizeof("inhighprivateusesurrogates")];
-    char uniname2ctype_pool_str1331[sizeof("extender")];
-    char uniname2ctype_pool_str1332[sizeof("narb")];
-    char uniname2ctype_pool_str1333[sizeof("sorasompeng")];
-    char uniname2ctype_pool_str1335[sizeof("brai")];
-    char uniname2ctype_pool_str1338[sizeof("hex")];
-    char uniname2ctype_pool_str1341[sizeof("balinese")];
-    char uniname2ctype_pool_str1344[sizeof("arab")];
-    char uniname2ctype_pool_str1346[sizeof("pi")];
-    char uniname2ctype_pool_str1348[sizeof("brahmi")];
-    char uniname2ctype_pool_str1355[sizeof("elbasan")];
-    char uniname2ctype_pool_str1360[sizeof("ingeometricshapesextended")];
-    char uniname2ctype_pool_str1368[sizeof("inhanguljamo")];
-    char uniname2ctype_pool_str1370[sizeof("graph")];
-    char uniname2ctype_pool_str1371[sizeof("sarb")];
-    char uniname2ctype_pool_str1373[sizeof("pcm")];
-    char uniname2ctype_pool_str1378[sizeof("pc")];
-    char uniname2ctype_pool_str1379[sizeof("inethiopicextendeda")];
-    char uniname2ctype_pool_str1380[sizeof("incaucasianalbanian")];
-    char uniname2ctype_pool_str1388[sizeof("pe")];
-    char uniname2ctype_pool_str1390[sizeof("sundanese")];
-    char uniname2ctype_pool_str1396[sizeof("inphaistosdisc")];
-    char uniname2ctype_pool_str1398[sizeof("inancientgreekmusicalnotation")];
-    char uniname2ctype_pool_str1410[sizeof("modifierletter")];
-    char uniname2ctype_pool_str1416[sizeof("word")];
-    char uniname2ctype_pool_str1418[sizeof("ps")];
-    char uniname2ctype_pool_str1419[sizeof("changeswhencasemapped")];
-    char uniname2ctype_pool_str1425[sizeof("lowercaseletter")];
-    char uniname2ctype_pool_str1429[sizeof("inancientgreeknumbers")];
-    char uniname2ctype_pool_str1430[sizeof("saurashtra")];
-    char uniname2ctype_pool_str1439[sizeof("hexdigit")];
-    char uniname2ctype_pool_str1444[sizeof("space")];
-    char uniname2ctype_pool_str1452[sizeof("inbrahmi")];
-    char uniname2ctype_pool_str1472[sizeof("inblockelements")];
-    char uniname2ctype_pool_str1481[sizeof("incoptic")];
-    char uniname2ctype_pool_str1493[sizeof("mlym")];
-    char uniname2ctype_pool_str1502[sizeof("multani")];
-    char uniname2ctype_pool_str1503[sizeof("lyci")];
-    char uniname2ctype_pool_str1508[sizeof("linearb")];
-    char uniname2ctype_pool_str1509[sizeof("changeswhentitlecased")];
-    char uniname2ctype_pool_str1513[sizeof("rejang")];
-    char uniname2ctype_pool_str1516[sizeof("lycian")];
-    char uniname2ctype_pool_str1517[sizeof("inbassavah")];
-    char uniname2ctype_pool_str1518[sizeof("lisu")];
-    char uniname2ctype_pool_str1521[sizeof("incombininghalfmarks")];
-    char uniname2ctype_pool_str1524[sizeof("malayalam")];
-    char uniname2ctype_pool_str1526[sizeof("patws")];
-    char uniname2ctype_pool_str1529[sizeof("palm")];
-    char uniname2ctype_pool_str1536[sizeof("tagalog")];
-    char uniname2ctype_pool_str1537[sizeof("psalterpahlavi")];
-    char uniname2ctype_pool_str1538[sizeof("mymr")];
-    char uniname2ctype_pool_str1540[sizeof("incopticepactnumbers")];
-    char uniname2ctype_pool_str1542[sizeof("inletterlikesymbols")];
-    char uniname2ctype_pool_str1549[sizeof("alpha")];
-    char uniname2ctype_pool_str1551[sizeof("inlepcha")];
-    char uniname2ctype_pool_str1553[sizeof("inpalmyrene")];
-    char uniname2ctype_pool_str1554[sizeof("lepc")];
-    char uniname2ctype_pool_str1561[sizeof("runic")];
-    char uniname2ctype_pool_str1563[sizeof("inugaritic")];
-    char uniname2ctype_pool_str1567[sizeof("myanmar")];
-    char uniname2ctype_pool_str1572[sizeof("saur")];
-    char uniname2ctype_pool_str1573[sizeof("mult")];
-    char uniname2ctype_pool_str1579[sizeof("talu")];
-    char uniname2ctype_pool_str1584[sizeof("syrc")];
-    char uniname2ctype_pool_str1586[sizeof("perm")];
-    char uniname2ctype_pool_str1591[sizeof("telu")];
-    char uniname2ctype_pool_str1597[sizeof("tangut")];
-    char uniname2ctype_pool_str1598[sizeof("insaurashtra")];
-    char uniname2ctype_pool_str1602[sizeof("inoriya")];
-    char uniname2ctype_pool_str1604[sizeof("graphemeextend")];
-    char uniname2ctype_pool_str1607[sizeof("imperialaramaic")];
-    char uniname2ctype_pool_str1613[sizeof("inbengali")];
-    char uniname2ctype_pool_str1614[sizeof("variationselector")];
-    char uniname2ctype_pool_str1619[sizeof("syriac")];
-    char uniname2ctype_pool_str1622[sizeof("inarabicmathematicalalphabeticsymbols")];
-    char uniname2ctype_pool_str1624[sizeof("beng")];
-    char uniname2ctype_pool_str1625[sizeof("inimperialaramaic")];
-    char uniname2ctype_pool_str1626[sizeof("sylotinagri")];
-    char uniname2ctype_pool_str1630[sizeof("inyiradicals")];
-    char uniname2ctype_pool_str1637[sizeof("mathsymbol")];
-    char uniname2ctype_pool_str1638[sizeof("inbuginese")];
-    char uniname2ctype_pool_str1641[sizeof("osmanya")];
-    char uniname2ctype_pool_str1645[sizeof("idsb")];
-    char uniname2ctype_pool_str1646[sizeof("bidic")];
-    char uniname2ctype_pool_str1647[sizeof("inphoenician")];
-    char uniname2ctype_pool_str1650[sizeof("prti")];
-    char uniname2ctype_pool_str1653[sizeof("brah")];
-    char uniname2ctype_pool_str1657[sizeof("cuneiform")];
-    char uniname2ctype_pool_str1659[sizeof("ogrext")];
-    char uniname2ctype_pool_str1662[sizeof("incountingrodnumerals")];
-    char uniname2ctype_pool_str1665[sizeof("hebr")];
-    char uniname2ctype_pool_str1666[sizeof("cprt")];
-    char uniname2ctype_pool_str1673[sizeof("coptic")];
-    char uniname2ctype_pool_str1676[sizeof("indevanagariextended")];
-    char uniname2ctype_pool_str1677[sizeof("inyijinghexagramsymbols")];
-    char uniname2ctype_pool_str1681[sizeof("incyrillicsupplement")];
-    char uniname2ctype_pool_str1683[sizeof("inarabicextendeda")];
-    char uniname2ctype_pool_str1688[sizeof("inalchemicalsymbols")];
-    char uniname2ctype_pool_str1691[sizeof("signwriting")];
-    char uniname2ctype_pool_str1692[sizeof("inaegeannumbers")];
-    char uniname2ctype_pool_str1694[sizeof("privateuse")];
-    char uniname2ctype_pool_str1696[sizeof("ininscriptionalparthian")];
-    char uniname2ctype_pool_str1697[sizeof("braille")];
-    char uniname2ctype_pool_str1698[sizeof("ininscriptionalpahlavi")];
-    char uniname2ctype_pool_str1702[sizeof("incherokeesupplement")];
-    char uniname2ctype_pool_str1703[sizeof("tagb")];
-    char uniname2ctype_pool_str1706[sizeof("inlinearbsyllabary")];
-    char uniname2ctype_pool_str1713[sizeof("cyrl")];
-    char uniname2ctype_pool_str1714[sizeof("intagbanwa")];
-    char uniname2ctype_pool_str1715[sizeof("inunifiedcanadianaboriginalsyllabics")];
-    char uniname2ctype_pool_str1719[sizeof("copt")];
-    char uniname2ctype_pool_str1722[sizeof("inkannada")];
-    char uniname2ctype_pool_str1723[sizeof("tirhuta")];
-    char uniname2ctype_pool_str1724[sizeof("kana")];
-    char uniname2ctype_pool_str1727[sizeof("changeswhencasefolded")];
-    char uniname2ctype_pool_str1733[sizeof("inhighsurrogates")];
-    char uniname2ctype_pool_str1734[sizeof("runr")];
-    char uniname2ctype_pool_str1737[sizeof("cakm")];
-    char uniname2ctype_pool_str1741[sizeof("inlatin1supplement")];
-    char uniname2ctype_pool_str1743[sizeof("print")];
-    char uniname2ctype_pool_str1752[sizeof("inchakma")];
-    char uniname2ctype_pool_str1767[sizeof("patternwhitespace")];
-    char uniname2ctype_pool_str1768[sizeof("number")];
-    char uniname2ctype_pool_str1771[sizeof("mendekikakui")];
-    char uniname2ctype_pool_str1774[sizeof("spaceseparator")];
-    char uniname2ctype_pool_str1775[sizeof("changeswhenlowercased")];
-    char uniname2ctype_pool_str1786[sizeof("sylo")];
-    char uniname2ctype_pool_str1790[sizeof("meeteimayek")];
-    char uniname2ctype_pool_str1794[sizeof("inethiopicsupplement")];
-    char uniname2ctype_pool_str1804[sizeof("orya")];
-    char uniname2ctype_pool_str1805[sizeof("inalphabeticpresentationforms")];
-    char uniname2ctype_pool_str1806[sizeof("inkaithi")];
-    char uniname2ctype_pool_str1809[sizeof("incjkcompatibilityforms")];
-    char uniname2ctype_pool_str1811[sizeof("takri")];
-    char uniname2ctype_pool_str1814[sizeof("incjkcompatibilityideographs")];
-    char uniname2ctype_pool_str1826[sizeof("inkatakana")];
-    char uniname2ctype_pool_str1835[sizeof("phli")];
-    char uniname2ctype_pool_str1843[sizeof("sund")];
-    char uniname2ctype_pool_str1845[sizeof("inmathematicaloperators")];
-    char uniname2ctype_pool_str1848[sizeof("closepunctuation")];
-    char uniname2ctype_pool_str1850[sizeof("incjkstrokes")];
-    char uniname2ctype_pool_str1851[sizeof("separator")];
-    char uniname2ctype_pool_str1856[sizeof("finalpunctuation")];
-    char uniname2ctype_pool_str1860[sizeof("inmeeteimayek")];
-    char uniname2ctype_pool_str1862[sizeof("inethiopicextended")];
-    char uniname2ctype_pool_str1866[sizeof("unassigned")];
-    char uniname2ctype_pool_str1869[sizeof("inpsalterpahlavi")];
-    char uniname2ctype_pool_str1870[sizeof("inphagspa")];
-    char uniname2ctype_pool_str1872[sizeof("po")];
-    char uniname2ctype_pool_str1873[sizeof("otherdefaultignorablecodepoint")];
-    char uniname2ctype_pool_str1876[sizeof("incjkcompatibilityideographssupplement")];
-    char uniname2ctype_pool_str1883[sizeof("kali")];
-    char uniname2ctype_pool_str1884[sizeof("lepcha")];
-    char uniname2ctype_pool_str1886[sizeof("wspace")];
-    char uniname2ctype_pool_str1893[sizeof("softdotted")];
-    char uniname2ctype_pool_str1904[sizeof("grbase")];
-    char uniname2ctype_pool_str1905[sizeof("inhanunoo")];
-    char uniname2ctype_pool_str1906[sizeof("cyrillic")];
-    char uniname2ctype_pool_str1910[sizeof("incombiningdiacriticalmarks")];
-    char uniname2ctype_pool_str1920[sizeof("incombiningdiacriticalmarksforsymbols")];
-    char uniname2ctype_pool_str1921[sizeof("meroitichieroglyphs")];
-    char uniname2ctype_pool_str1931[sizeof("mark")];
-    char uniname2ctype_pool_str1932[sizeof("ugaritic")];
-    char uniname2ctype_pool_str1933[sizeof("aghb")];
-    char uniname2ctype_pool_str1935[sizeof("inbuhid")];
-    char uniname2ctype_pool_str1937[sizeof("inkanasupplement")];
-    char uniname2ctype_pool_str1941[sizeof("phoenician")];
-    char uniname2ctype_pool_str1945[sizeof("inkharoshthi")];
-    char uniname2ctype_pool_str1951[sizeof("inkhmer")];
-    char uniname2ctype_pool_str1964[sizeof("symbol")];
-    char uniname2ctype_pool_str1968[sizeof("pf")];
-    char uniname2ctype_pool_str1972[sizeof("incombiningdiacriticalmarkssupplement")];
-    char uniname2ctype_pool_str1980[sizeof("lydi")];
-    char uniname2ctype_pool_str1981[sizeof("hangul")];
-    char uniname2ctype_pool_str1985[sizeof("incurrencysymbols")];
-    char uniname2ctype_pool_str1987[sizeof("intangutcomponents")];
-    char uniname2ctype_pool_str1993[sizeof("lydian")];
-    char uniname2ctype_pool_str2004[sizeof("othergraphemeextend")];
-    char uniname2ctype_pool_str2015[sizeof("intakri")];
-    char uniname2ctype_pool_str2016[sizeof("takr")];
-    char uniname2ctype_pool_str2018[sizeof("induployan")];
-    char uniname2ctype_pool_str2026[sizeof("ugar")];
-    char uniname2ctype_pool_str2027[sizeof("inprivateusearea")];
-    char uniname2ctype_pool_str2046[sizeof("kaithi")];
-    char uniname2ctype_pool_str2051[sizeof("inkhmersymbols")];
-    char uniname2ctype_pool_str2068[sizeof("bidicontrol")];
-    char uniname2ctype_pool_str2070[sizeof("ethiopic")];
-    char uniname2ctype_pool_str2083[sizeof("inhebrew")];
-    char uniname2ctype_pool_str2111[sizeof("bassavah")];
-    char uniname2ctype_pool_str2115[sizeof("kthi")];
-    char uniname2ctype_pool_str2119[sizeof("inoldpersian")];
-    char uniname2ctype_pool_str2122[sizeof("hung")];
-    char uniname2ctype_pool_str2126[sizeof("xpeo")];
-    char uniname2ctype_pool_str2136[sizeof("inoldpermic")];
-    char uniname2ctype_pool_str2153[sizeof("olck")];
-    char uniname2ctype_pool_str2157[sizeof("phnx")];
-    char uniname2ctype_pool_str2164[sizeof("olchiki")];
-    char uniname2ctype_pool_str2169[sizeof("phag")];
-    char uniname2ctype_pool_str2180[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
-    char uniname2ctype_pool_str2184[sizeof("inpahawhhmong")];
-    char uniname2ctype_pool_str2193[sizeof("inhalfwidthandfullwidthforms")];
-    char uniname2ctype_pool_str2200[sizeof("patternsyntax")];
-    char uniname2ctype_pool_str2203[sizeof("inphoneticextensions")];
-    char uniname2ctype_pool_str2208[sizeof("knda")];
-    char uniname2ctype_pool_str2219[sizeof("combiningmark")];
-    char uniname2ctype_pool_str2220[sizeof("plrd")];
-    char uniname2ctype_pool_str2221[sizeof("inmendekikakui")];
-    char uniname2ctype_pool_str2230[sizeof("hluw")];
-    char uniname2ctype_pool_str2231[sizeof("nko")];
-    char uniname2ctype_pool_str2232[sizeof("nkoo")];
-    char uniname2ctype_pool_str2235[sizeof("inhanguljamoextendedb")];
-    char uniname2ctype_pool_str2237[sizeof("kannada")];
-    char uniname2ctype_pool_str2240[sizeof("khmr")];
-    char uniname2ctype_pool_str2246[sizeof("khar")];
-    char uniname2ctype_pool_str2248[sizeof("otheruppercase")];
-    char uniname2ctype_pool_str2249[sizeof("oldhungarian")];
-    char uniname2ctype_pool_str2254[sizeof("graphemeclusterbreak=ebasegaz")];
-    char uniname2ctype_pool_str2256[sizeof("inkhojki")];
-    char uniname2ctype_pool_str2259[sizeof("graphemeclusterbreak=ebase")];
-    char uniname2ctype_pool_str2262[sizeof("otherpunctuation")];
-    char uniname2ctype_pool_str2265[sizeof("inphoneticextensionssupplement")];
-    char uniname2ctype_pool_str2273[sizeof("enclosingmark")];
-    char uniname2ctype_pool_str2285[sizeof("inkatakanaphoneticextensions")];
-    char uniname2ctype_pool_str2292[sizeof("gujr")];
-    char uniname2ctype_pool_str2293[sizeof("inkangxiradicals")];
-    char uniname2ctype_pool_str2310[sizeof("inarabicpresentationformsb")];
-    char uniname2ctype_pool_str2313[sizeof("gujarati")];
-    char uniname2ctype_pool_str2322[sizeof("graphemeclusterbreak=t")];
-    char uniname2ctype_pool_str2324[sizeof("graphemeclusterbreak=lvt")];
-    char uniname2ctype_pool_str2332[sizeof("pd")];
-    char uniname2ctype_pool_str2333[sizeof("xsux")];
-    char uniname2ctype_pool_str2341[sizeof("uideo")];
-    char uniname2ctype_pool_str2346[sizeof("hebrew")];
-    char uniname2ctype_pool_str2349[sizeof("kharoshthi")];
-    char uniname2ctype_pool_str2350[sizeof("surrogate")];
-    char uniname2ctype_pool_str2353[sizeof("incyrillicextendedb")];
-    char uniname2ctype_pool_str2360[sizeof("cherokee")];
-    char uniname2ctype_pool_str2373[sizeof("modifiersymbol")];
-    char uniname2ctype_pool_str2375[sizeof("incombiningdiacriticalmarksextended")];
-    char uniname2ctype_pool_str2399[sizeof("graphemeclusterbreak=l")];
-    char uniname2ctype_pool_str2405[sizeof("graphemeclusterbreak=control")];
-    char uniname2ctype_pool_str2410[sizeof("deprecated")];
-    char uniname2ctype_pool_str2418[sizeof("ingeorgiansupplement")];
-    char uniname2ctype_pool_str2419[sizeof("idstrinaryoperator")];
-    char uniname2ctype_pool_str2425[sizeof("bamu")];
-    char uniname2ctype_pool_str2427[sizeof("inbamum")];
-    char uniname2ctype_pool_str2430[sizeof("grek")];
-    char uniname2ctype_pool_str2445[sizeof("graphemeclusterbreak=cr")];
-    char uniname2ctype_pool_str2451[sizeof("inmeroiticcursive")];
-    char uniname2ctype_pool_str2452[sizeof("graphemeclusterbreak=emodifier")];
-    char uniname2ctype_pool_str2455[sizeof("khmer")];
-    char uniname2ctype_pool_str2460[sizeof("graphemeclusterbreak=regionalindicator")];
-    char uniname2ctype_pool_str2476[sizeof("inglagoliticsupplement")];
-    char uniname2ctype_pool_str2477[sizeof("oldturkic")];
-    char uniname2ctype_pool_str2487[sizeof("inlatinextendedb")];
-    char uniname2ctype_pool_str2489[sizeof("unifiedideograph")];
-    char uniname2ctype_pool_str2500[sizeof("orkh")];
-    char uniname2ctype_pool_str2511[sizeof("graphemeclusterbreak=zwj")];
-    char uniname2ctype_pool_str2518[sizeof("caucasianalbanian")];
-    char uniname2ctype_pool_str2520[sizeof("graphemeclusterbreak=glueafterzwj")];
-    char uniname2ctype_pool_str2530[sizeof("oldnortharabian")];
-    char uniname2ctype_pool_str2546[sizeof("graphemeclusterbreak=lf")];
-    char uniname2ctype_pool_str2565[sizeof("khoj")];
-    char uniname2ctype_pool_str2589[sizeof("inlimbu")];
-    char uniname2ctype_pool_str2602[sizeof("inarabicsupplement")];
-    char uniname2ctype_pool_str2629[sizeof("any")];
-    char uniname2ctype_pool_str2661[sizeof("alphabetic")];
-    char uniname2ctype_pool_str2663[sizeof("defaultignorablecodepoint")];
-    char uniname2ctype_pool_str2673[sizeof("p")];
-    char uniname2ctype_pool_str2674[sizeof("pauc")];
-    char uniname2ctype_pool_str2691[sizeof("zp")];
-    char uniname2ctype_pool_str2692[sizeof("inbamumsupplement")];
-    char uniname2ctype_pool_str2732[sizeof("graphemeclusterbreak=extend")];
-    char uniname2ctype_pool_str2733[sizeof("graphemeclusterbreak=prepend")];
-    char uniname2ctype_pool_str2735[sizeof("inyisyllables")];
-    char uniname2ctype_pool_str2755[sizeof("patsyn")];
-    char uniname2ctype_pool_str2773[sizeof("lu")];
-    char uniname2ctype_pool_str2787[sizeof("limbu")];
-    char uniname2ctype_pool_str2808[sizeof("inkanbun")];
-    char uniname2ctype_pool_str2810[sizeof("insuperscriptsandsubscripts")];
-    char uniname2ctype_pool_str2822[sizeof("inlisu")];
-    char uniname2ctype_pool_str2827[sizeof("punct")];
-    char uniname2ctype_pool_str2844[sizeof("currencysymbol")];
-    char uniname2ctype_pool_str2845[sizeof("graphemeclusterbreak=v")];
-    char uniname2ctype_pool_str2846[sizeof("graphemeclusterbreak=lv")];
-    char uniname2ctype_pool_str2876[sizeof("intelugu")];
-    char uniname2ctype_pool_str2897[sizeof("insupplementalmathematicaloperators")];
-    char uniname2ctype_pool_str2902[sizeof("batk")];
-    char uniname2ctype_pool_str2903[sizeof("bugi")];
-    char uniname2ctype_pool_str2907[sizeof("changeswhenuppercased")];
-    char uniname2ctype_pool_str2910[sizeof("inbatak")];
-    char uniname2ctype_pool_str2928[sizeof("inplayingcards")];
-    char uniname2ctype_pool_str2932[sizeof("pahawhhmong")];
-    char uniname2ctype_pool_str2954[sizeof("buginese")];
-    char uniname2ctype_pool_str2974[sizeof("bopo")];
-    char uniname2ctype_pool_str2977[sizeof("innoblock")];
-    char uniname2ctype_pool_str2985[sizeof("inbopomofo")];
-    char uniname2ctype_pool_str2997[sizeof("hyphen")];
-    char uniname2ctype_pool_str3030[sizeof("inkayahli")];
-    char uniname2ctype_pool_str3032[sizeof("cypriot")];
-    char uniname2ctype_pool_str3057[sizeof("insupplementalarrowsa")];
-    char uniname2ctype_pool_str3059[sizeof("cwu")];
-    char uniname2ctype_pool_str3064[sizeof("insupplementalarrowsc")];
-    char uniname2ctype_pool_str3067[sizeof("phagspa")];
-    char uniname2ctype_pool_str3070[sizeof("incjkcompatibility")];
-    char uniname2ctype_pool_str3072[sizeof("palmyrene")];
-    char uniname2ctype_pool_str3081[sizeof("incypriotsyllabary")];
-    char uniname2ctype_pool_str3096[sizeof("inboxdrawing")];
-    char uniname2ctype_pool_str3098[sizeof("spacingmark")];
-    char uniname2ctype_pool_str3159[sizeof("bhks")];
-    char uniname2ctype_pool_str3161[sizeof("incjksymbolsandpunctuation")];
-    char uniname2ctype_pool_str3165[sizeof("egyp")];
-    char uniname2ctype_pool_str3167[sizeof("phlp")];
-    char uniname2ctype_pool_str3181[sizeof("bhaiksuki")];
-    char uniname2ctype_pool_str3197[sizeof("dep")];
-    char uniname2ctype_pool_str3224[sizeof("buhd")];
-    char uniname2ctype_pool_str3231[sizeof("inegyptianhieroglyphs")];
-    char uniname2ctype_pool_str3252[sizeof("bopomofo")];
-    char uniname2ctype_pool_str3295[sizeof("dashpunctuation")];
-    char uniname2ctype_pool_str3307[sizeof("dupl")];
-    char uniname2ctype_pool_str3314[sizeof("guru")];
-    char uniname2ctype_pool_str3338[sizeof("nonspacingmark")];
-    char uniname2ctype_pool_str3346[sizeof("prependedconcatenationmark")];
-    char uniname2ctype_pool_str3363[sizeof("oupper")];
-    char uniname2ctype_pool_str3388[sizeof("telugu")];
-    char uniname2ctype_pool_str3413[sizeof("qmark")];
-    char uniname2ctype_pool_str3428[sizeof("sk")];
-    char uniname2ctype_pool_str3500[sizeof("egyptianhieroglyphs")];
-    char uniname2ctype_pool_str3511[sizeof("inkhudawadi")];
-    char uniname2ctype_pool_str3514[sizeof("kayahli")];
-    char uniname2ctype_pool_str3525[sizeof("katakana")];
-    char uniname2ctype_pool_str3550[sizeof("inhangulcompatibilityjamo")];
-    char uniname2ctype_pool_str3552[sizeof("incjkradicalssupplement")];
-    char uniname2ctype_pool_str3595[sizeof("quotationmark")];
-    char uniname2ctype_pool_str3617[sizeof("oldsoutharabian")];
-    char uniname2ctype_pool_str3704[sizeof("unknown")];
-    char uniname2ctype_pool_str3722[sizeof("buhid")];
-    char uniname2ctype_pool_str3776[sizeof("khudawadi")];
-    char uniname2ctype_pool_str3828[sizeof("incjkunifiedideographsextensiona")];
-    char uniname2ctype_pool_str3835[sizeof("incjkunifiedideographsextensionc")];
-    char uniname2ctype_pool_str3840[sizeof("incjkunifiedideographsextensione")];
-    char uniname2ctype_pool_str3845[sizeof("incjkunifiedideographs")];
-    char uniname2ctype_pool_str3931[sizeof("paragraphseparator")];
-    char uniname2ctype_pool_str3933[sizeof("graphemeclusterbreak=spacingmark")];
-    char uniname2ctype_pool_str3939[sizeof("zyyy")];
-    char uniname2ctype_pool_str3965[sizeof("paucinhau")];
-    char uniname2ctype_pool_str3974[sizeof("inpaucinhau")];
-    char uniname2ctype_pool_str3989[sizeof("khojki")];
-    char uniname2ctype_pool_str4043[sizeof("punctuation")];
-    char uniname2ctype_pool_str4124[sizeof("greek")];
-    char uniname2ctype_pool_str4136[sizeof("insupplementalpunctuation")];
-    char uniname2ctype_pool_str4144[sizeof("insupplementalarrowsb")];
-    char uniname2ctype_pool_str4188[sizeof("insupplementaryprivateuseareaa")];
-    char uniname2ctype_pool_str4190[sizeof("insupplementalsymbolsandpictographs")];
-    char uniname2ctype_pool_str4214[sizeof("inbopomofoextended")];
-    char uniname2ctype_pool_str4241[sizeof("uppercase")];
-    char uniname2ctype_pool_str4270[sizeof("grlink")];
-    char uniname2ctype_pool_str4312[sizeof("incjkunifiedideographsextensiond")];
-    char uniname2ctype_pool_str4373[sizeof("openpunctuation")];
-    char uniname2ctype_pool_str4406[sizeof("upper")];
-    char uniname2ctype_pool_str4466[sizeof("graphemelink")];
-    char uniname2ctype_pool_str4528[sizeof("uppercaseletter")];
-    char uniname2ctype_pool_str4596[sizeof("batak")];
-    char uniname2ctype_pool_str4673[sizeof("blank")];
-    char uniname2ctype_pool_str4716[sizeof("duployan")];
-    char uniname2ctype_pool_str4915[sizeof("incjkunifiedideographsextensionb")];
-    char uniname2ctype_pool_str5015[sizeof("gurmukhi")];
-    char uniname2ctype_pool_str5275[sizeof("insupplementaryprivateuseareab")];
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
-  {
-#ifndef USE_UNICODE_PROPERTIES
-    "word",
-    "print",
-    "punct",
-    "alpha",
-    "alnum",
-    "xdigit",
-    "upper",
-#else /* USE_UNICODE_PROPERTIES */
-    "n",
-    "mn",
-    "m",
-    "cn",
-    "mani",
-    "ci",
-    "inmanichaean",
-    "z",
-    "qaai",
-    "c",
-    "mc",
-    "qaac",
-    "sm",
-    "incham",
-    "me",
-    "inarmenian",
-    "cc",
-    "mandaic",
-    "incuneiform",
-    "zzzz",
-    "insamaritan",
-    "cans",
-    "s",
-    "sc",
-#endif /* USE_UNICODE_PROPERTIES */
-    "ascii",
-#ifdef USE_UNICODE_PROPERTIES
-    "inavestan",
-    "zs",
-    "cs",
-    "inipaextensions",
-    "incuneiformnumbersandpunctuation",
-    "incommonindicnumberforms",
-    "inthai",
-    "mtei",
-    "inspecials",
-    "initialpunctuation",
-    "inthaana",
-    "inancientsymbols",
-    "inmiscellaneousmathematicalsymbolsa",
-    "inmusicalsymbols",
-    "taile",
-    "inmyanmarextendeda",
-    "sterm",
-    "lm",
-    "lina",
-    "inmiscellaneoussymbols",
-    "lana",
-    "intransportandmapsymbols",
-    "alnum",
-    "inlycian",
-    "inmiscellaneoussymbolsandarrows",
-    "intaitham",
-    "lc",
-    "inmalayalam",
-    "inmiscellaneoussymbolsandpictographs",
-    "inadlam",
-    "incontrolpictures",
-    "inlineara",
-    "taiviet",
-    "armn",
-    "armi",
-    "sinhala",
-    "armenian",
-    "inmyanmar",
-    "inrunic",
-    "incarian",
-    "cari",
-    "inmarchen",
-    "marc",
-    "carian",
-    "merc",
-    "incyrillic",
-    "samr",
-    "latn",
-    "latin",
-    "ital",
-    "intamil",
-    "taml",
-    "inmultani",
-    "samaritan",
-    "arabic",
-    "insyriac",
-    "insharada",
-    "miao",
-    "inlinearbideograms",
-    "incherokee",
-    "intaile",
-    "tale",
-    "inahom",
-    "inmeeteimayekextensions",
-    "inruminumeralsymbols",
-    "inlatinextendeda",
-    "inosmanya",
-    "inlatinextendedc",
-    "osma",
-    "inlatinextendede",
-    "l",
-    "han",
-    "nl",
-    "term",
-    "hani",
-    "inideographicsymbolsandpunctuation",
-    "zinh",
-    "lt",
-    "zl",
-    "inmahajani",
-    "cham",
-    "connectorpunctuation",
-    "sinh",
-    "manichaean",
-    "osage",
-    "inmiscellaneoustechnical",
-    "inethiopic",
-    "insinhala",
-    "chakma",
-    "shavian",
-    "inideographicdescriptioncharacters",
-    "lineara",
-    "meroiticcursive",
-    "thai",
-    "math",
-    "inemoticons",
-    "thaa",
-    "ethi",
-    "hatran",
-    "inenclosedalphanumerics",
-    "sentenceterminal",
-    "tamil",
-#endif /* USE_UNICODE_PROPERTIES */
-    "cntrl",
-#ifndef USE_UNICODE_PROPERTIES
-    "space",
-#else /* USE_UNICODE_PROPERTIES */
-    "taitham",
-    "thaana",
-    "terminalpunctuation",
-    "insinhalaarchaicnumbers",
-    "innewa",
-    "newa",
-    "inlatinextendedadditional",
-    "cwcm",
-    "loe",
-    "inopticalcharacterrecognition",
-    "inearlydynasticcuneiform",
-    "di",
-    "asciihexdigit",
-    "ll",
-    "newtailue",
-    "inscriptionalparthian",
-    "inenclosedalphanumericsupplement",
-    "oriya",
-    "mero",
-    "inmongolian",
-    "mand",
-    "inmodi",
-    "dia",
-    "mend",
-    "ingrantha",
-    "no",
-    "sora",
-    "inmandaic",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=1.1",
-    "age=2.1",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "idc",
-    "innko",
-    "sind",
-    "inarrows",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.1",
-    "age=6.2",
-    "age=2.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "inmro",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=3.1",
-    "age=3.2",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "titlecaseletter",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "co",
-    "hira",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=6.3",
-    "age=3.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "ingeneralpunctuation",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=9.0",
-    "age=8.0",
-    "age=5.1",
-    "age=5.2",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "inmiao",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=4.1",
-    "age=7.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "innewtailue",
-    "common",
-#ifdef USE_UNICODE_AGE_PROPERTIES
-    "age=5.0",
-    "age=4.0",
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-    "so",
-    "inhiragana",
-    "insundanese",
-    "ids",
-    "cher",
-    "marchen",
-    "indominotiles",
-    "joinc",
-    "tang",
-    "hano",
-    "ahom",
-    "inogham",
-    "inscriptionalpahlavi",
-    "mahj",
-    "inolchiki",
-    "invai",
-    "tagbanwa",
-    "tirh",
-    "idst",
-    "vai",
-    "vaii",
-    "cwt",
-    "inhatran",
-    "hatr",
-    "mahajani",
-    "idcontinue",
-    "cf",
-    "intirhuta",
-    "inenclosedcjklettersandmonths",
-    "intaixuanjingsymbols",
-    "inspacingmodifierletters",
-    "indeseret",
-    "intags",
-    "wara",
-    "inshavian",
-    "inlydian",
-    "inwarangciti",
-    "inmathematicalalphanumericsymbols",
-    "adlm",
-    "intangut",
-    "vs",
-    "adlam",
-    "lo",
-    "ext",
-    "insylotinagri",
-    "inlao",
-    "inlowsurrogates",
-    "anatolianhieroglyphs",
-    "lao",
-    "laoo",
-    "mongolian",
-    "gran",
-    "lineseparator",
-    "ingurmukhi",
-    "letter",
-    "intifinagh",
-    "tifinagh",
-    "mro",
-    "mroo",
-    "diacritic",
-    "avst",
-    "avestan",
-    "mong",
-    "inanatolianhieroglyphs",
-    "odi",
-    "nchar",
-    "caseignorable",
-    "modi",
-    "insorasompeng",
-    "ogam",
-    "oidc",
-    "cwcf",
-    "cwl",
-    "ideo",
-    "oalpha",
-    "inolditalic",
-    "ingujarati",
-    "inosage",
-    "oids",
-    "shaw",
-    "decimalnumber",
-    "tavt",
-    "intaiviet",
-    "hmng",
-    "inmongoliansupplement",
-    "osge",
-    "hang",
-    "insuttonsignwriting",
-    "inmahjongtiles",
-    "dsrt",
-    "ahex",
-    "whitespace",
-    "insundanesesupplement",
-    "inmodifiertoneletters",
-    "idstart",
-    "ingreekandcoptic",
-    "dash",
-    "hanunoo",
-    "siddham",
-    "inoldturkic",
-    "ingeometricshapes",
-    "deseret",
-    "gothic",
-    "sharada",
-    "tfng",
-    "insmallformvariants",
-    "inshorthandformatcontrols",
-    "grext",
-    "java",
-    "radical",
-    "omath",
-    "canadianaboriginal",
-    "ingothic",
-    "otheridcontinue",
-    "control",
-    "injavanese",
-    "noncharactercodepoint",
-    "invariationselectors",
-    "casedletter",
-    "letternumber",
-    "javanese",
-    "otheralphabetic",
-    "sgnw",
-    "ingeorgian",
-    "rjng",
-    "nd",
-    "format",
-    "geor",
-    "inornamentaldingbats",
-    "inrejang",
-    "inoldnortharabian",
-    "joincontrol",
-    "xidc",
-    "invariationselectorssupplement",
-    "sd",
-    "xids",
-    "sidd",
-    "indingbats",
-    "inherited",
-    "inmeroitichieroglyphs",
-    "inenclosedideographicsupplement",
-    "inoldsoutharabian",
-    "insiddham",
-    "inglagolitic",
-    "ingreekextended",
-    "olditalic",
-    "hiragana",
-    "idsbinaryoperator",
-    "cased",
-    "inhangulsyllables",
-    "shrd",
-    "assigned",
-    "otheridstart",
-    "ogham",
-    "intagalog",
-    "inoldhungarian",
-    "other",
-    "othersymbol",
-    "otherlowercase",
-    "othernumber",
-    "graphemebase",
-    "innabataean",
-    "inbhaiksuki",
-    "lowercase",
-    "bamum",
-    "glagolitic",
-    "inhanguljamoextendeda",
-    "indevanagari",
-    "inelbasan",
-    "deva",
-    "grantha",
-    "inarabic",
-    "olower",
-    "inbasiclatin",
-    "devanagari",
-    "warangciti",
-    "innumberforms",
-    "glag",
-    "goth",
-    "invedicextensions",
-    "oldpersian",
-    "digit",
-    "xdigit",
-    "bass",
-    "xidstart",
-    "oldpermic",
-    "nbat",
-    "inarabicpresentationformsa",
-    "logicalorderexception",
-    "inbyzantinemusicalsymbols",
-    "nabataean",
-    "intibetan",
-    "othermath",
-    "inmiscellaneousmathematicalsymbolsb",
-    "inverticalforms",
-    "tglg",
-    "inmyanmarextendedb",
-    "ideographic",
-    "incyrillicextendeda",
-    "inbraillepatterns",
-    "incyrillicextendedc",
-    "linb",
-    "inlatinextendedd",
-    "limb",
-    "otherletter",
-    "bali",
-    "tibt",
-    "georgian",
-    "xidcontinue",
-#endif /* USE_UNICODE_PROPERTIES */
-    "lower",
-#ifdef USE_UNICODE_PROPERTIES
-    "tibetan",
-    "elba",
-    "inbalinese",
-    "yi",
-    "bengali",
-    "yiii",
-    "inhighprivateusesurrogates",
-    "extender",
-    "narb",
-    "sorasompeng",
-    "brai",
-    "hex",
-    "balinese",
-    "arab",
-    "pi",
-    "brahmi",
-    "elbasan",
-    "ingeometricshapesextended",
-    "inhanguljamo",
-#endif /* USE_UNICODE_PROPERTIES */
-    "graph",
-#ifndef USE_UNICODE_PROPERTIES
-    "digit",
-    "blank"
-#else /* USE_UNICODE_PROPERTIES */
-    "sarb",
-    "pcm",
-    "pc",
-    "inethiopicextendeda",
-    "incaucasianalbanian",
-    "pe",
-    "sundanese",
-    "inphaistosdisc",
-    "inancientgreekmusicalnotation",
-    "modifierletter",
-    "word",
-    "ps",
-    "changeswhencasemapped",
-    "lowercaseletter",
-    "inancientgreeknumbers",
-    "saurashtra",
-    "hexdigit",
-    "space",
-    "inbrahmi",
-    "inblockelements",
-    "incoptic",
-    "mlym",
-    "multani",
-    "lyci",
-    "linearb",
-    "changeswhentitlecased",
-    "rejang",
-    "lycian",
-    "inbassavah",
-    "lisu",
-    "incombininghalfmarks",
-    "malayalam",
-    "patws",
-    "palm",
-    "tagalog",
-    "psalterpahlavi",
-    "mymr",
-    "incopticepactnumbers",
-    "inletterlikesymbols",
-    "alpha",
-    "inlepcha",
-    "inpalmyrene",
-    "lepc",
-    "runic",
-    "inugaritic",
-    "myanmar",
-    "saur",
-    "mult",
-    "talu",
-    "syrc",
-    "perm",
-    "telu",
-    "tangut",
-    "insaurashtra",
-    "inoriya",
-    "graphemeextend",
-    "imperialaramaic",
-    "inbengali",
-    "variationselector",
-    "syriac",
-    "inarabicmathematicalalphabeticsymbols",
-    "beng",
-    "inimperialaramaic",
-    "sylotinagri",
-    "inyiradicals",
-    "mathsymbol",
-    "inbuginese",
-    "osmanya",
-    "idsb",
-    "bidic",
-    "inphoenician",
-    "prti",
-    "brah",
-    "cuneiform",
-    "ogrext",
-    "incountingrodnumerals",
-    "hebr",
-    "cprt",
-    "coptic",
-    "indevanagariextended",
-    "inyijinghexagramsymbols",
-    "incyrillicsupplement",
-    "inarabicextendeda",
-    "inalchemicalsymbols",
-    "signwriting",
-    "inaegeannumbers",
-    "privateuse",
-    "ininscriptionalparthian",
-    "braille",
-    "ininscriptionalpahlavi",
-    "incherokeesupplement",
-    "tagb",
-    "inlinearbsyllabary",
-    "cyrl",
-    "intagbanwa",
-    "inunifiedcanadianaboriginalsyllabics",
-    "copt",
-    "inkannada",
-    "tirhuta",
-    "kana",
-    "changeswhencasefolded",
-    "inhighsurrogates",
-    "runr",
-    "cakm",
-    "inlatin1supplement",
-    "print",
-    "inchakma",
-    "patternwhitespace",
-    "number",
-    "mendekikakui",
-    "spaceseparator",
-    "changeswhenlowercased",
-    "sylo",
-    "meeteimayek",
-    "inethiopicsupplement",
-    "orya",
-    "inalphabeticpresentationforms",
-    "inkaithi",
-    "incjkcompatibilityforms",
-    "takri",
-    "incjkcompatibilityideographs",
-    "inkatakana",
-    "phli",
-    "sund",
-    "inmathematicaloperators",
-    "closepunctuation",
-    "incjkstrokes",
-    "separator",
-    "finalpunctuation",
-    "inmeeteimayek",
-    "inethiopicextended",
-    "unassigned",
-    "inpsalterpahlavi",
-    "inphagspa",
-    "po",
-    "otherdefaultignorablecodepoint",
-    "incjkcompatibilityideographssupplement",
-    "kali",
-    "lepcha",
-    "wspace",
-    "softdotted",
-    "grbase",
-    "inhanunoo",
-    "cyrillic",
-    "incombiningdiacriticalmarks",
-    "incombiningdiacriticalmarksforsymbols",
-    "meroitichieroglyphs",
-    "mark",
-    "ugaritic",
-    "aghb",
-    "inbuhid",
-    "inkanasupplement",
-    "phoenician",
-    "inkharoshthi",
-    "inkhmer",
-    "symbol",
-    "pf",
-    "incombiningdiacriticalmarkssupplement",
-    "lydi",
-    "hangul",
-    "incurrencysymbols",
-    "intangutcomponents",
-    "lydian",
-    "othergraphemeextend",
-    "intakri",
-    "takr",
-    "induployan",
-    "ugar",
-    "inprivateusearea",
-    "kaithi",
-    "inkhmersymbols",
-    "bidicontrol",
-    "ethiopic",
-    "inhebrew",
-    "bassavah",
-    "kthi",
-    "inoldpersian",
-    "hung",
-    "xpeo",
-    "inoldpermic",
-    "olck",
-    "phnx",
-    "olchiki",
-    "phag",
-    "inunifiedcanadianaboriginalsyllabicsextended",
-    "inpahawhhmong",
-    "inhalfwidthandfullwidthforms",
-    "patternsyntax",
-    "inphoneticextensions",
-    "knda",
-    "combiningmark",
-    "plrd",
-    "inmendekikakui",
-    "hluw",
-    "nko",
-    "nkoo",
-    "inhanguljamoextendedb",
-    "kannada",
-    "khmr",
-    "khar",
-    "otheruppercase",
-    "oldhungarian",
-    "graphemeclusterbreak=ebasegaz",
-    "inkhojki",
-    "graphemeclusterbreak=ebase",
-    "otherpunctuation",
-    "inphoneticextensionssupplement",
-    "enclosingmark",
-    "inkatakanaphoneticextensions",
-    "gujr",
-    "inkangxiradicals",
-    "inarabicpresentationformsb",
-    "gujarati",
-    "graphemeclusterbreak=t",
-    "graphemeclusterbreak=lvt",
-    "pd",
-    "xsux",
-    "uideo",
-    "hebrew",
-    "kharoshthi",
-    "surrogate",
-    "incyrillicextendedb",
-    "cherokee",
-    "modifiersymbol",
-    "incombiningdiacriticalmarksextended",
-    "graphemeclusterbreak=l",
-    "graphemeclusterbreak=control",
-    "deprecated",
-    "ingeorgiansupplement",
-    "idstrinaryoperator",
-    "bamu",
-    "inbamum",
-    "grek",
-    "graphemeclusterbreak=cr",
-    "inmeroiticcursive",
-    "graphemeclusterbreak=emodifier",
-    "khmer",
-    "graphemeclusterbreak=regionalindicator",
-    "inglagoliticsupplement",
-    "oldturkic",
-    "inlatinextendedb",
-    "unifiedideograph",
-    "orkh",
-    "graphemeclusterbreak=zwj",
-    "caucasianalbanian",
-    "graphemeclusterbreak=glueafterzwj",
-    "oldnortharabian",
-    "graphemeclusterbreak=lf",
-    "khoj",
-    "inlimbu",
-    "inarabicsupplement",
-    "any",
-    "alphabetic",
-    "defaultignorablecodepoint",
-    "p",
-    "pauc",
-    "zp",
-    "inbamumsupplement",
-    "graphemeclusterbreak=extend",
-    "graphemeclusterbreak=prepend",
-    "inyisyllables",
-    "patsyn",
-    "lu",
-    "limbu",
-    "inkanbun",
-    "insuperscriptsandsubscripts",
-    "inlisu",
-    "punct",
-    "currencysymbol",
-    "graphemeclusterbreak=v",
-    "graphemeclusterbreak=lv",
-    "intelugu",
-    "insupplementalmathematicaloperators",
-    "batk",
-    "bugi",
-    "changeswhenuppercased",
-    "inbatak",
-    "inplayingcards",
-    "pahawhhmong",
-    "buginese",
-    "bopo",
-    "innoblock",
-    "inbopomofo",
-    "hyphen",
-    "inkayahli",
-    "cypriot",
-    "insupplementalarrowsa",
-    "cwu",
-    "insupplementalarrowsc",
-    "phagspa",
-    "incjkcompatibility",
-    "palmyrene",
-    "incypriotsyllabary",
-    "inboxdrawing",
-    "spacingmark",
-    "bhks",
-    "incjksymbolsandpunctuation",
-    "egyp",
-    "phlp",
-    "bhaiksuki",
-    "dep",
-    "buhd",
-    "inegyptianhieroglyphs",
-    "bopomofo",
-    "dashpunctuation",
-    "dupl",
-    "guru",
-    "nonspacingmark",
-    "prependedconcatenationmark",
-    "oupper",
-    "telugu",
-    "qmark",
-    "sk",
-    "egyptianhieroglyphs",
-    "inkhudawadi",
-    "kayahli",
-    "katakana",
-    "inhangulcompatibilityjamo",
-    "incjkradicalssupplement",
-    "quotationmark",
-    "oldsoutharabian",
-    "unknown",
-    "buhid",
-    "khudawadi",
-    "incjkunifiedideographsextensiona",
-    "incjkunifiedideographsextensionc",
-    "incjkunifiedideographsextensione",
-    "incjkunifiedideographs",
-    "paragraphseparator",
-    "graphemeclusterbreak=spacingmark",
-    "zyyy",
-    "paucinhau",
-    "inpaucinhau",
-    "khojki",
-    "punctuation",
-    "greek",
-    "insupplementalpunctuation",
-    "insupplementalarrowsb",
-    "insupplementaryprivateuseareaa",
-    "insupplementalsymbolsandpictographs",
-    "inbopomofoextended",
-    "uppercase",
-    "grlink",
-    "incjkunifiedideographsextensiond",
-    "openpunctuation",
-    "upper",
-    "graphemelink",
-    "uppercaseletter",
-    "batak",
-    "blank",
-    "duployan",
-    "incjkunifiedideographsextensionb",
-    "gurmukhi",
-    "insupplementaryprivateuseareab"
-#endif /* USE_UNICODE_PROPERTIES */
-  };
-#define uniname2ctype_pool ((const char *) &uniname2ctype_pool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_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},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3), 34},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str11), 33},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str15), 30},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str24), 20},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str29), 185},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str30), 60},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str31), 474},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str35), 51},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str36), 114},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str41), 17},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str49), 31},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str52), 128},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str56), 49},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str58), 416},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str59), 32},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str61), 290},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str62), 18},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str65), 168},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str69), 504},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str72), 244},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str77), 297},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str78), 101},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str81), 46},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str82), 47},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str86), 14},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str93), 475},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str99), 54},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str102), 22},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str106), 284},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str110), 505},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str114), 407},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str124), 310},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str132), 159},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str140), 440},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str141), 43},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str144), 295},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str145), 445},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str152), 366},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str159), 521},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str164), 120},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str174), 417},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str176), 239},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str185), 26},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str191), 183},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str199), 364},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str200), 151},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str201), 539},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str202), 13},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str207), 447},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str208), 372},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str209), 334},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str211), 24},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str212), 308},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str213), 536},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str214), 529},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str220), 358},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str222), 461},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str237), 152},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str239), 78},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str242), 160},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str247), 92},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str248), 78},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str249), 313},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str251), 321},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str252), 448},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str255), 148},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str256), 503},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str258), 207},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str268), 148},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str270), 170},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str273), 288},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str278), 155},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str279), 75},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str281), 75},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str282), 111},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str284), 305},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str285), 88},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str286), 490},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str288), 155},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str290), 80},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str291), 293},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str294), 487},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str295), 172},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str296), 442},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str299), 318},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str302), 330},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str303), 120},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str305), 499},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str309), 419},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str310), 481},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str313), 282},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str314), 457},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str327), 374},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str331), 124},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str337), 421},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str339), 23},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str340), 109},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str341), 36},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str342), 217},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str344), 109},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str347), 514},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str348), 114},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str355), 28},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str357), 52},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str361), 486},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str366), 150},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str368), 39},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str371), 92},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str374), 185},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str375), 209},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str382), 357},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str386), 316},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str390), 309},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str394), 169},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str400), 123},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str419), 383},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str421), 183},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str422), 170},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str435), 93},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str438), 55},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str440), 537},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str444), 82},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str447), 99},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str448), 201},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str452), 360},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str453), 239},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str455), 88},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str456), 3},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str458), 151},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str460), 82},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str468), 217},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str471), 488},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str472), 493},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str477), 208},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str478), 347},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str485), 65},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str489), 236},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str503), 359},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str504), 506},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str507), 70},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str508), 220},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str509), 25},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str511), 129},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str512), 162},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str513), 534},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str516), 87},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str517), 171},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str519), 327},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str522), 168},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str523), 496},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str530), 223},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str534), 186},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str535), 492},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str537), 37},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str538), 174},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str539), 298},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str542), 245},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str543), 247},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str544), 67},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str545), 296},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str546), 196},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str547), 355},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str548), 257},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str549), 258},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str550), 246},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str551), 510},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str552), 249},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str553), 250},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str554), 28},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str555), 256},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str556), 21},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str557), 106},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str558), 259},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str559), 248},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str560), 349},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str561), 262},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str562), 261},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str563), 254},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str564), 255},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str565), 513},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str566), 252},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str567), 260},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str568), 331},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str569), 74},
-#ifndef USE_UNICODE_AGE_PROPERTIES
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#else /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str570), 253},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str573), 251},
-      {-1}, {-1},
-#endif /* USE_UNICODE_AGE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str576), 50},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str577), 385},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str579), 337},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str584), 66},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str585), 100},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str589), 207},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str591), 532},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str595), 213},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str604), 210},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str607), 116},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str613), 199},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str621), 320},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str622), 163},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str625), 184},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str627), 340},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str633), 401},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str634), 118},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str636), 197},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str637), 230},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str639), 143},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str640), 143},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str641), 63},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str642), 466},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str645), 201},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str646), 184},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str649), 67},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str652), 19},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str655), 494},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str659), 393},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str663), 523},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str664), 285},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str668), 455},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str677), 549},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str678), 198},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str683), 456},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str684), 468},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str686), 500},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str688), 525},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str690), 205},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str692), 515},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str697), 240},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str698), 205},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str705), 27},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str706), 224},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str712), 406},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str713), 311},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str716), 428},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str717), 200},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str719), 94},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str720), 94},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str721), 105},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str726), 180},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str733), 52},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str734), 302},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str745), 23},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str748), 377},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str755), 131},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str758), 188},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str759), 188},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str761), 223},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str764), 153},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str766), 153},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str773), 105},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str774), 508},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str775), 233},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str776), 227},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str778), 60},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str779), 187},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str780), 484},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str785), 102},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str792), 238},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str793), 64},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str795), 61},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str797), 222},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str803), 221},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str804), 450},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str805), 303},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str811), 458},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str812), 237},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str813), 123},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str814), 35},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str816), 152},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str817), 418},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str828), 181},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str829), 497},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str830), 209},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str834), 98},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str835), 526},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str836), 531},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str847), 113},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str858), 220},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str860), 211},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str865), 342},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str866), 404},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str867), 66},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str872), 287},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str876), 214},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str878), 116},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str890), 195},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str892), 479},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str895), 363},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str900), 113},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str903), 112},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str905), 173},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str906), 131},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str914), 437},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str919), 519},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str922), 71},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str924), 158},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str933), 231},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str936), 218},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str937), 101},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str941), 451},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str943), 238},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str945), 18},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str947), 414},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str956), 227},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str958), 433},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str964), 24},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str965), 36},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str966), 158},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str968), 221},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str973), 204},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str991), 314},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str992), 146},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str997), 35},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str999), 19},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1004), 97},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1009), 538},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1013), 412},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1015), 473},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1017), 213},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1019), 69},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1020), 550},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1036), 235},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1039), 68},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1042), 195},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1047), 365},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1051), 114},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1052), 469},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1053), 535},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1054), 472},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1055), 495},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1058), 373},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1062), 348},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1067), 111},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1068), 106},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1069), 229},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1072), 59},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1073), 424},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1077), 173},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1093), 16},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1095), 237},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1102), 102},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1107), 322},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1110), 480},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1114), 17},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1115), 50},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1116), 225},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1121), 37},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1130), 72},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1131), 465},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1137), 502},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1138), 57},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1139), 157},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1142), 130},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1148), 413},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1150), 300},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1153), 459},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1154), 83},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1155), 180},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1159), 292},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1162), 225},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1163), 280},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1165), 83},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1170), 198},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1173), 354},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1174), 130},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1179), 112},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1180), 343},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1183), 133},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1184), 4},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1189), 11},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1197), 177},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1200), 68},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1201), 193},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1210), 190},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1223), 432},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1224), 236},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1227), 520},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1229), 190},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1232), 312},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1233), 218},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1239), 370},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1248), 434},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1253), 115},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1261), 415},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1265), 222},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1266), 379},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1272), 368},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1273), 341},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1278), 121},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1281), 405},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1284), 119},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1289), 27},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1290), 135},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1292), 95},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1293), 97},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1299), 69},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1303), 6},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1309), 95},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1311), 179},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1313), 336},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1316), 110},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1319), 84},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1322), 110},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1326), 427},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1331), 224},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1332), 189},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1333), 174},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1335), 126},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1338), 219},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1341), 135},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1344), 80},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1346), 43},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1348), 167},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1355), 179},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1360), 541},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1368), 315},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1370), 5},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1371), 161},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1373), 243},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1378), 39},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1379), 420},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1380), 460},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1388), 41},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1390), 140},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1396), 446},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1398), 522},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1410), 26},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1416), 12},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1418), 45},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1419), 65},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1425), 25},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1429), 444},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1430), 144},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1439), 219},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1444), 9},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1452), 482},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1472), 362},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1481), 375},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1493), 91},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1502), 202},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1503), 147},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1508), 121},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1509), 63},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1513), 146},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1516), 147},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1517), 511},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1518), 156},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1521), 435},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1524), 91},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1526), 241},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1529), 191},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1536), 115},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1537), 194},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1538), 96},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1540), 449},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1542), 353},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1549), 1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1551), 339},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1553), 464},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1554), 141},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1561), 103},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1563), 453},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1567), 96},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1572), 144},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1573), 202},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1579), 129},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1584), 81},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1586), 193},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1591), 89},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1597), 210},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1598), 409},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1602), 304},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1604), 71},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1607), 160},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1613), 301},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1614), 240},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1619), 81},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1622), 530},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1624), 84},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1625), 463},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1626), 132},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1630), 399},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1637), 49},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1638), 333},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1641), 124},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1645), 229},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1646), 212},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1647), 467},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1650), 162},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1653), 167},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1657), 136},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1659), 228},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1662), 524},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1665), 79},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1666), 125},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1673), 128},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1676), 410},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1677), 396},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1681), 289},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1683), 299},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1688), 540},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1691), 204},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1692), 443},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1694), 21},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1696), 476},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1697), 126},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1698), 477},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1702), 422},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1703), 118},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1706), 441},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1713), 77},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1714), 325},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1715), 319},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1719), 128},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1722), 307},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1723), 197},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1724), 107},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1727), 64},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1733), 426},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1734), 103},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1737), 169},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1741), 281},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1743), 7},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1752), 485},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1767), 241},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1768), 34},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1771), 186},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1774), 54},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1775), 61},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1786), 132},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1790), 159},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1794), 317},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1804), 87},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1805), 431},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1806), 483},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1809), 436},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1811), 175},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1814), 430},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1826), 386},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1835), 163},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1843), 140},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1845), 356},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1848), 41},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1850), 391},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1851), 51},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1856), 42},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1860), 423},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1862), 378},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1866), 20},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1869), 478},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1870), 408},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1872), 44},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1873), 233},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1876), 548},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1883), 145},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1884), 141},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1886), 211},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1893), 235},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1904), 72},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1905), 323},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1906), 77},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1910), 286},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1920), 352},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1921), 171},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1931), 30},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1932), 122},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1933), 176},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1935), 324},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1937), 517},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1941), 137},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1945), 471},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1951), 326},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1964), 46},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1968), 42},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1972), 346},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1980), 149},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1981), 98},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1985), 351},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1987), 516},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str1993), 149},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2004), 228},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2015), 498},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2016), 175},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2018), 518},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2026), 122},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2027), 429},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2046), 165},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2051), 332},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2068), 212},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2070), 99},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2083), 291},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2111), 177},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2115), 165},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2119), 454},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2122), 203},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2126), 133},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2136), 452},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2153), 142},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2157), 137},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2164), 142},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2169), 138},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2180), 328},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2184), 512},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2193), 439},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2200), 242},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2203), 344},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2208), 90},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2219), 30},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2220), 172},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2221), 528},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2230), 200},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2231), 139},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2232), 139},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2235), 425},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2237), 90},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2240), 104},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2246), 134},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2248), 226},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2249), 203},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2254), 279},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2256), 489},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2259), 275},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2262), 44},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2265), 345},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2273), 32},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2285), 392},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2292), 86},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2293), 382},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2310), 438},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2313), 86},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2322), 272},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2324), 274},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2332), 40},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2333), 136},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2341), 232},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2346), 79},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2349), 134},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2350), 22},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2353), 402},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2360), 100},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2373), 48},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2375), 335},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2399), 270},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2405), 266},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2410), 234},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2418), 376},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2419), 230},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2425), 157},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2427), 403},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2430), 76},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2445), 264},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2451), 470},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2452), 276},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2455), 104},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2460), 268},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2476), 527},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2477), 164},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2487), 283},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2489), 232},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2500), 164},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2511), 277},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2518), 176},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2520), 278},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2530), 189},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2546), 265},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2565), 182},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2589), 329},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2602), 294},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2629), 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},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2661), 56},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2663), 70},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2673), 38},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2674), 192},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2691), 53},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2692), 509},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2732), 267},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2733), 263},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2735), 398},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2755), 242},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2773), 29},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2787), 119},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2808), 389},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2810), 350},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2822), 400},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2827), 8},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2844), 47},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2845), 271},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2846), 273},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2876), 306},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2897), 371},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2902), 166},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2903), 127},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2907), 62},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2910), 338},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2928), 533},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2932), 181},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2954), 127},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2974), 108},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2977), 553},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2985), 387},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str2997), 215},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3030), 411},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3032), 125},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3057), 367},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3059), 62},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3064), 542},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3067), 138},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3070), 394},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3072), 191},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3081), 462},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3096), 361},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3098), 31},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3159), 206},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3161), 384},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3165), 154},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3167), 194},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3181), 206},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3197), 234},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3224), 117},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3231), 507},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3252), 108},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3295), 40},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3307), 178},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3314), 85},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3338), 33},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3346), 243},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3363), 226},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3388), 89},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3413), 216},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3428), 48},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3500), 154},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3511), 491},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3514), 145},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3525), 107},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3550), 388},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3552), 381},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3595), 216},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3617), 161},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3704), 244},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3722), 117},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3776), 196},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3828), 395},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3835), 545},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3840), 547},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3845), 397},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3931), 53},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3933), 269},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3939), 74},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3965), 192},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3974), 501},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str3989), 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},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4043), 38},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4124), 76},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4136), 380},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4144), 369},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4188), 551},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4190), 543},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4214), 390},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4241), 58},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4270), 73},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4312), 546},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4373), 45},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4406), 10},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4466), 73},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4528), 29},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4596), 166},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4673), 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},
-#endif /* USE_UNICODE_PROPERTIES */
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#ifndef USE_UNICODE_PROPERTIES
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str6), 12},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str7), 7},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str8), 8},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str9), 1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str10), 13},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str11), 11},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str12), 10},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str13), 14},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str14), 3},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str15), 9},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str16), 6},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str17), 5},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str18), 4},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str19), 2}
-#else /* USE_UNICODE_PROPERTIES */
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4716), 178},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str4915), 544},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str5015), 85},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {offsetof(struct uniname2ctype_pool_t, uniname2ctype_pool_str5275), 552}
-#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;
-}
-#if defined ONIG_UNICODE_VERSION_STRING && !( \
-      ONIG_UNICODE_VERSION_MAJOR == 9 && \
-      ONIG_UNICODE_VERSION_MINOR == 0 && \
-      ONIG_UNICODE_VERSION_TEENY == 0 && \
-      1)
-# error ONIG_UNICODE_VERSION_STRING mismatch
-#endif
-#define ONIG_UNICODE_VERSION_STRING "9.0.0"
-#define ONIG_UNICODE_VERSION_MAJOR 9
-#define ONIG_UNICODE_VERSION_MINOR 0
-#define ONIG_UNICODE_VERSION_TEENY 0
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
index 829efefaf1..d93de6581b 100755
--- a/enc/unicode/case-folding.rb
+++ b/enc/unicode/case-folding.rb
@@ -1,47 +1,32 @@
 #!/usr/bin/ruby
-require 'stringio'
 
-# Usage (for case folding only):
+# Usage:
 #   $ wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
 #   $ ruby case-folding.rb CaseFolding.txt -o casefold.h
-#  or (for case folding and case mapping):
-#   $ wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
-#   $ wget http://www.unicode.org/Public/UNIDATA/UnicodeData.txt
-#   $ wget http://www.unicode.org/Public/UNIDATA/SpecialCasing.txt
-#   $ ruby case-folding.rb -m . -o casefold.h
-# using -d or --debug will include UTF-8 characters in comments for debugging
 
 class CaseFolding
   module Util
     module_function
 
     def hex_seq(v)
-      v.map { |i| "0x%04x" % i }.join(", ")
+      v.map {|i| "0x%04x" % i}.join(", ")
     end
 
-    def print_table_1(dest, type, mapping_data, data)
+    def print_table_1(dest, data)
       for k, v in data = data.sort
         sk = (Array === k and k.length > 1) ? "{#{hex_seq(k)}}" : ("0x%04x" % k)
-        if type=='CaseUnfold_11' and v.length>1
-          # reorder CaseUnfold_11 entries to avoid special treatment for U+03B9/U+03BC/U+A64B
-          item = mapping_data.map("%04X" % k[0])
-          upper = item.upper if item
-          v = v.sort_by { |i| ("%04X"%i) == upper ? 0 : 1 }
-        end
-        ck = @debug ? ' /* ' + Array(k).pack("U*") + ' */' : ''
-        cv = @debug ? ' /* ' + Array(v).map{|c|[c].pack("U*")}.join(", ") + ' */' : ''
-        dest.print("  {#{sk}#{ck}, {#{v.length}#{mapping_data.flags(k, type, v)}, {#{hex_seq(v)}#{cv}}}},\n")
+        dest.print("  {#{sk}, {#{v.length}, {#{hex_seq(v)}}}},\n")
       end
       data
     end
 
-    def print_table(dest, type, mapping_data, data)
+    def print_table(dest, type, data)
       dest.print("static const #{type}_Type #{type}_Table[] = {\n")
       i = 0
       ret = data.inject([]) do |a, (n, d)|
         dest.print("#define #{n} (*(#{type}_Type (*)[#{d.size}])(#{type}_Table+#{i}))\n")
         i += d.size
-        a.concat(print_table_1(dest, type, mapping_data, d))
+        a.concat(print_table_1(dest, d))
       end
       dest.print("};\n\n")
       ret
@@ -50,19 +35,16 @@ class CaseFolding
 
   include Util
 
-  attr_reader :fold, :fold_locale, :unfold, :unfold_locale, :version
+  attr_reader :fold, :fold_locale, :unfold, :unfold_locale
 
   def load(filename)
     pattern = /([0-9A-F]{4,6}); ([CFT]); ([0-9A-F]{4,6})(?: ([0-9A-F]{4,6}))?(?: ([0-9A-F]{4,6}))?;/
 
     @fold = fold = {}
     @unfold = unfold = [{}, {}, {}]
-    @debug = false
-    @version = nil
     turkic = []
 
-    IO.foreach(filename, mode: "rb") do |line|
-      @version ||= line[/-([0-9.]+).txt/, 1]
+    IO.foreach(filename) do |line|
       next unless res = pattern.match(line)
       ch_from = res[1].to_i(16)
 
@@ -104,7 +86,7 @@ class CaseFolding
     hash = "onigenc_unicode_#{key}_hash"
     lookup = "onigenc_unicode_#{key}_lookup"
     arity = Array(data[0][0]).size
-    gperf = %W"gperf -7 -k#{[*1..(arity*3)].join(',')} -F,-1 -c -j1 -i1 -t -T -E -C -H #{hash} -N #{lookup} -n"
+    gperf = %W"gperf -7 -k#{[*1..(arity*3)].join(",")} -F,-1 -c -j1 -i1 -t -T -E -C -H #{hash} -N #{lookup} -n"
     argname = arity > 1 ? "codes" : "code"
     argdecl = "const OnigCodePoint #{arity > 1 ? "*": ""}#{argname}"
     n = 7
@@ -155,55 +137,34 @@ class CaseFolding
     src
   end
 
-  def display(dest, mapping_data)
+  def display(dest)
     # print the header
     dest.print("/* DO NOT EDIT THIS FILE. */\n")
     dest.print("/* Generated by enc/unicode/case-folding.rb */\n\n")
 
-    versions = version.scan(/\d+/)
-    dest.print("#if defined ONIG_UNICODE_VERSION_STRING && !( \\\n")
-    %w[MAJOR MINOR TEENY].zip(versions) do |n, v|
-      dest.print("      ONIG_UNICODE_VERSION_#{n} == #{v} && \\\n")
-    end
-    dest.print("      1)\n")
-    dest.print("# error ONIG_UNICODE_VERSION_STRING mismatch\n")
-    dest.print("#endif\n")
-    dest.print("#define ONIG_UNICODE_VERSION_STRING #{version.dump}\n")
-    %w[MAJOR MINOR TEENY].zip(versions) do |n, v|
-      dest.print("#define ONIG_UNICODE_VERSION_#{n} #{v}\n")
-    end
-    dest.print("\n")
-
     # print folding data
 
     # CaseFold + CaseFold_Locale
     name = "CaseFold_11"
-    data = print_table(dest, name, mapping_data, "CaseFold"=>fold, "CaseFold_Locale"=>fold_locale)
+    data = print_table(dest, name, "CaseFold"=>fold, "CaseFold_Locale"=>fold_locale)
     dest.print lookup_hash(name, "CodePointList3", data)
 
     # print unfolding data
 
     # CaseUnfold_11 + CaseUnfold_11_Locale
     name = "CaseUnfold_11"
-    data = print_table(dest, name, mapping_data, name=>unfold[0], "#{name}_Locale"=>unfold_locale[0])
+    data = print_table(dest, name, name=>unfold[0], "#{name}_Locale"=>unfold_locale[0])
     dest.print lookup_hash(name, "CodePointList3", data)
 
     # CaseUnfold_12 + CaseUnfold_12_Locale
     name = "CaseUnfold_12"
-    data = print_table(dest, name, mapping_data, name=>unfold[1], "#{name}_Locale"=>unfold_locale[1])
+    data = print_table(dest, name, name=>unfold[1], "#{name}_Locale"=>unfold_locale[1])
     dest.print lookup_hash(name, "CodePointList2", data)
 
     # CaseUnfold_13
     name = "CaseUnfold_13"
-    data = print_table(dest, name, mapping_data, name=>unfold[2])
+    data = print_table(dest, name, name=>unfold[2])
     dest.print lookup_hash(name, "CodePointList2", data)
-
-    # TitleCase
-    dest.print mapping_data.specials_output
-  end
-
-  def debug!
-    @debug = true
   end
 
   def self.load(*args)
@@ -211,209 +172,25 @@ class CaseFolding
   end
 end
 
-class MapItem
-  attr_accessor :upper, :lower, :title, :code
-
-  def initialize(code, upper, lower, title)
-    @code = code
-    @upper = upper unless upper == ''
-    @lower = lower unless lower == ''
-    @title = title unless title == ''
-  end
-end
-
-class CaseMapping
-  attr_reader :filename, :version
-
-  def initialize(mapping_directory)
-    @mappings = {}
-    @specials = []
-    @specials_length = 0
-    @version = nil
-    IO.foreach(File.join(mapping_directory, 'UnicodeData.txt'), mode: "rb") do |line|
-      next if line =~ /^</
-      code, _1,_2,_3,_4,_5,_6,_7,_8,_9,_10,_11, upper, lower, title = line.chomp.split ';'
-      unless upper and lower and title and (upper+lower+title)==''
-        @mappings[code] = MapItem.new(code, upper, lower, title)
-      end
-    end
-
-    @filename = File.join(mapping_directory, 'SpecialCasing.txt')
-    IO.foreach(@filename, mode: "rb") do |line|
-      @version ||= line[/-([0-9.]+).txt/, 1]
-      line.chomp!
-      line, comment = line.split(/ *#/)
-      next if not line or line == ''
-      code, lower, title, upper, conditions = line.split(/ *; */)
-      unless conditions
-        item = @mappings[code]
-        item.lower = lower
-        item.title = title
-        item.upper = upper
-      end
-    end
-  end
-
-  def map (from)
-    @mappings[from]
-  end
-
-  def flags(from, type, to)
-    # types: CaseFold_11, CaseUnfold_11, CaseUnfold_12, CaseUnfold_13
-    flags = ""
-    from = Array(from).map {|i| "%04X" % i}.join(" ")
-    to   = Array(to).map {|i| "%04X" % i}.join(" ")
-    item = map(from)
-    specials_index = nil
-    specials = []
-    case type
-    when 'CaseFold_11'
-      flags += '|F'
-      if item
-        flags += '|U'  if to==item.upper
-        flags += '|D'  if to==item.lower
-        unless item.upper == item.title
-          if item.code == item.title
-            flags += '|IT'
-            swap = case item.code
-            when '01C5' then '0064 017D'
-            when '01C8' then '006C 004A'
-            when '01CB' then '006E 004A'
-            when '01F2' then '0064 005A'
-            else # Greek
-              to.split(' ').first + ' 0399'
-            end
-            specials << swap
-          else
-            flags += '|ST'
-            specials << item.title
-          end
-        end
-        unless item.lower.nil? or item.lower==from or item.lower==to
-          specials << item.lower
-          flags += '|SL'
-        end
-        unless item.upper.nil? or item.upper==from or item.upper==to
-          specials << item.upper
-          flags += '|SU'
-        end
-      end
-    when 'CaseUnfold_11'
-      to = to.split(/ /)
-      if item
-        case to.first
-        when item.upper  then  flags += '|U'
-        when item.lower  then  flags += '|D'
-        else
-          raise "Unpredicted case 0 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
-        end
-        unless item.upper == item.title
-          if item.code == item.title
-            raise "Unpredicted case 1 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
-          elsif item.title==to[1]
-            flags += '|ST'
-          else
-            raise "Unpredicted case 2 in enc/unicode/case_folding.rb. Please contact https://bugs.ruby-lang.org/."
-          end
-        end
-      end
-    end
-    unless specials.empty?
-      flags += "|I(#{@specials_length})"
-      @specials_length += specials.map { |s| s.split(/ /).length }.reduce(:+)
-      @specials << specials
-    end
-    flags
-  end
-
-  def debug!
-    @debug = true
-  end
-
-  def specials_output
-    "static const OnigCodePoint CaseMappingSpecials[] = {\n" +
-    @specials.map do |sps|
-      '   ' + sps.map do |sp|
-        chars = sp.split(/ /)
-        ct = ' /* ' + Array(chars).map{|c|[c.to_i(16)].pack("U*")}.join(", ") + ' */' if @debug
-        " L(#{chars.length})|#{chars.map {|c| "0x"+c }.join(', ')}#{ct},"
-      end.join + "\n"
-    end.join + "};\n"
-  end
-
-  def self.load(*args)
-    new(*args)
-  end
-end
-
-class CaseMappingDummy
-  def flags(from, type, to)
-    ""
-  end
-
-  def titlecase_output()  ''  end
-  def debug!()  end
-end
-
 if $0 == __FILE__
   require 'optparse'
   dest = nil
-  mapping_directory = nil
-  mapping_data = nil
-  debug = false
   fold_1 = false
   ARGV.options do |opt|
     opt.banner << " [INPUT]"
     opt.on("--output-file=FILE", "-o", "output to the FILE instead of STDOUT") {|output|
       dest = (output unless output == '-')
     }
-    opt.on('--mapping-data-directory=DIRECTORY', '-m', 'data DIRECTORY of mapping files') { |directory|
-      mapping_directory = directory
-    }
-    opt.on('--debug', '-d') {
-      debug = true
-    }
     opt.parse!
     abort(opt.to_s) if ARGV.size > 1
   end
-  if mapping_directory
-    if ARGV[0]
-      warn "Either specify directory or individual file, but not both."
-      exit
-    end
-    filename = File.join(mapping_directory, 'CaseFolding.txt')
-    mapping_data = CaseMapping.load(mapping_directory)
-  end
-  filename ||= ARGV[0] || 'CaseFolding.txt'
+  filename = ARGV[0] || 'CaseFolding.txt'
   data = CaseFolding.load(filename)
-  if mapping_data and data.version != mapping_data.version
-    abort "Unicode data version mismatch\n" \
-          "  #{filename} = #{data.version}\n" \
-          "  #{mapping_data.filename} = #{mapping_data.version}"
-  end
-  mapping_data ||= CaseMappingDummy.new
-
-  if debug
-    data.debug!
-    mapping_data.debug!
-  end
-  f = StringIO.new
-  begin
-    data.display(f, mapping_data)
-  rescue Errno::ENOENT => e
-    raise unless /gperf/ =~ e.message
-    warn e.message
-    abort unless dest
-    File.utime(nil, nil, dest) # assume existing file is OK
-    exit
-  else
-    s = f.string
-  end
   if dest
     open(dest, "wb") do |f|
-      f.print(s)
+      data.display(f)
     end
   else
-    STDOUT.print(s)
+    data.display(STDOUT)
   end
 end
diff --git a/enc/unicode/casefold.h b/enc/unicode/casefold.h
new file mode 100644
index 0000000000..475a20a48e
--- /dev/null
+++ b/enc/unicode/casefold.h
@@ -0,0 +1,5619 @@
+/* DO NOT EDIT THIS FILE. */
+/* Generated by enc/unicode/case-folding.rb */
+
+static const CaseFold_11_Type CaseFold_11_Table[] = {
+#define CaseFold (*(CaseFold_11_Type (*)[1178])(CaseFold_11_Table+0))
+  {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}}},
+  {0x023a, {1, {0x2c65}}},
+  {0x023b, {1, {0x023c}}},
+  {0x023d, {1, {0x019a}}},
+  {0x023e, {1, {0x2c66}}},
+  {0x0241, {1, {0x0242}}},
+  {0x0243, {1, {0x0180}}},
+  {0x0244, {1, {0x0289}}},
+  {0x0245, {1, {0x028c}}},
+  {0x0246, {1, {0x0247}}},
+  {0x0248, {1, {0x0249}}},
+  {0x024a, {1, {0x024b}}},
+  {0x024c, {1, {0x024d}}},
+  {0x024e, {1, {0x024f}}},
+  {0x0345, {1, {0x03b9}}},
+  {0x0370, {1, {0x0371}}},
+  {0x0372, {1, {0x0373}}},
+  {0x0376, {1, {0x0377}}},
+  {0x037f, {1, {0x03f3}}},
+  {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}}},
+  {0x03cf, {1, {0x03d7}}},
+  {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}}},
+  {0x03fd, {1, {0x037b}}},
+  {0x03fe, {1, {0x037c}}},
+  {0x03ff, {1, {0x037d}}},
+  {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}}},
+  {0x04c0, {1, {0x04cf}}},
+  {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}}},
+  {0x04fa, {1, {0x04fb}}},
+  {0x04fc, {1, {0x04fd}}},
+  {0x04fe, {1, {0x04ff}}},
+  {0x0500, {1, {0x0501}}},
+  {0x0502, {1, {0x0503}}},
+  {0x0504, {1, {0x0505}}},
+  {0x0506, {1, {0x0507}}},
+  {0x0508, {1, {0x0509}}},
+  {0x050a, {1, {0x050b}}},
+  {0x050c, {1, {0x050d}}},
+  {0x050e, {1, {0x050f}}},
+  {0x0510, {1, {0x0511}}},
+  {0x0512, {1, {0x0513}}},
+  {0x0514, {1, {0x0515}}},
+  {0x0516, {1, {0x0517}}},
+  {0x0518, {1, {0x0519}}},
+  {0x051a, {1, {0x051b}}},
+  {0x051c, {1, {0x051d}}},
+  {0x051e, {1, {0x051f}}},
+  {0x0520, {1, {0x0521}}},
+  {0x0522, {1, {0x0523}}},
+  {0x0524, {1, {0x0525}}},
+  {0x0526, {1, {0x0527}}},
+  {0x0528, {1, {0x0529}}},
+  {0x052a, {1, {0x052b}}},
+  {0x052c, {1, {0x052d}}},
+  {0x052e, {1, {0x052f}}},
+  {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}}},
+  {0x10c7, {1, {0x2d27}}},
+  {0x10cd, {1, {0x2d2d}}},
+  {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}}},
+  {0x1e9e, {2, {0x0073, 0x0073}}},
+  {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}}},
+  {0x1efa, {1, {0x1efb}}},
+  {0x1efc, {1, {0x1efd}}},
+  {0x1efe, {1, {0x1eff}}},
+  {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}}},
+  {0x2132, {1, {0x214e}}},
+  {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}}},
+  {0x2183, {1, {0x2184}}},
+  {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}}},
+  {0x2c60, {1, {0x2c61}}},
+  {0x2c62, {1, {0x026b}}},
+  {0x2c63, {1, {0x1d7d}}},
+  {0x2c64, {1, {0x027d}}},
+  {0x2c67, {1, {0x2c68}}},
+  {0x2c69, {1, {0x2c6a}}},
+  {0x2c6b, {1, {0x2c6c}}},
+  {0x2c6d, {1, {0x0251}}},
+  {0x2c6e, {1, {0x0271}}},
+  {0x2c6f, {1, {0x0250}}},
+  {0x2c70, {1, {0x0252}}},
+  {0x2c72, {1, {0x2c73}}},
+  {0x2c75, {1, {0x2c76}}},
+  {0x2c7e, {1, {0x023f}}},
+  {0x2c7f, {1, {0x0240}}},
+  {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}}},
+  {0x2ceb, {1, {0x2cec}}},
+  {0x2ced, {1, {0x2cee}}},
+  {0x2cf2, {1, {0x2cf3}}},
+  {0xa640, {1, {0xa641}}},
+  {0xa642, {1, {0xa643}}},
+  {0xa644, {1, {0xa645}}},
+  {0xa646, {1, {0xa647}}},
+  {0xa648, {1, {0xa649}}},
+  {0xa64a, {1, {0xa64b}}},
+  {0xa64c, {1, {0xa64d}}},
+  {0xa64e, {1, {0xa64f}}},
+  {0xa650, {1, {0xa651}}},
+  {0xa652, {1, {0xa653}}},
+  {0xa654, {1, {0xa655}}},
+  {0xa656, {1, {0xa657}}},
+  {0xa658, {1, {0xa659}}},
+  {0xa65a, {1, {0xa65b}}},
+  {0xa65c, {1, {0xa65d}}},
+  {0xa65e, {1, {0xa65f}}},
+  {0xa660, {1, {0xa661}}},
+  {0xa662, {1, {0xa663}}},
+  {0xa664, {1, {0xa665}}},
+  {0xa666, {1, {0xa667}}},
+  {0xa668, {1, {0xa669}}},
+  {0xa66a, {1, {0xa66b}}},
+  {0xa66c, {1, {0xa66d}}},
+  {0xa680, {1, {0xa681}}},
+  {0xa682, {1, {0xa683}}},
+  {0xa684, {1, {0xa685}}},
+  {0xa686, {1, {0xa687}}},
+  {0xa688, {1, {0xa689}}},
+  {0xa68a, {1, {0xa68b}}},
+  {0xa68c, {1, {0xa68d}}},
+  {0xa68e, {1, {0xa68f}}},
+  {0xa690, {1, {0xa691}}},
+  {0xa692, {1, {0xa693}}},
+  {0xa694, {1, {0xa695}}},
+  {0xa696, {1, {0xa697}}},
+  {0xa698, {1, {0xa699}}},
+  {0xa69a, {1, {0xa69b}}},
+  {0xa722, {1, {0xa723}}},
+  {0xa724, {1, {0xa725}}},
+  {0xa726, {1, {0xa727}}},
+  {0xa728, {1, {0xa729}}},
+  {0xa72a, {1, {0xa72b}}},
+  {0xa72c, {1, {0xa72d}}},
+  {0xa72e, {1, {0xa72f}}},
+  {0xa732, {1, {0xa733}}},
+  {0xa734, {1, {0xa735}}},
+  {0xa736, {1, {0xa737}}},
+  {0xa738, {1, {0xa739}}},
+  {0xa73a, {1, {0xa73b}}},
+  {0xa73c, {1, {0xa73d}}},
+  {0xa73e, {1, {0xa73f}}},
+  {0xa740, {1, {0xa741}}},
+  {0xa742, {1, {0xa743}}},
+  {0xa744, {1, {0xa745}}},
+  {0xa746, {1, {0xa747}}},
+  {0xa748, {1, {0xa749}}},
+  {0xa74a, {1, {0xa74b}}},
+  {0xa74c, {1, {0xa74d}}},
+  {0xa74e, {1, {0xa74f}}},
+  {0xa750, {1, {0xa751}}},
+  {0xa752, {1, {0xa753}}},
+  {0xa754, {1, {0xa755}}},
+  {0xa756, {1, {0xa757}}},
+  {0xa758, {1, {0xa759}}},
+  {0xa75a, {1, {0xa75b}}},
+  {0xa75c, {1, {0xa75d}}},
+  {0xa75e, {1, {0xa75f}}},
+  {0xa760, {1, {0xa761}}},
+  {0xa762, {1, {0xa763}}},
+  {0xa764, {1, {0xa765}}},
+  {0xa766, {1, {0xa767}}},
+  {0xa768, {1, {0xa769}}},
+  {0xa76a, {1, {0xa76b}}},
+  {0xa76c, {1, {0xa76d}}},
+  {0xa76e, {1, {0xa76f}}},
+  {0xa779, {1, {0xa77a}}},
+  {0xa77b, {1, {0xa77c}}},
+  {0xa77d, {1, {0x1d79}}},
+  {0xa77e, {1, {0xa77f}}},
+  {0xa780, {1, {0xa781}}},
+  {0xa782, {1, {0xa783}}},
+  {0xa784, {1, {0xa785}}},
+  {0xa786, {1, {0xa787}}},
+  {0xa78b, {1, {0xa78c}}},
+  {0xa78d, {1, {0x0265}}},
+  {0xa790, {1, {0xa791}}},
+  {0xa792, {1, {0xa793}}},
+  {0xa796, {1, {0xa797}}},
+  {0xa798, {1, {0xa799}}},
+  {0xa79a, {1, {0xa79b}}},
+  {0xa79c, {1, {0xa79d}}},
+  {0xa79e, {1, {0xa79f}}},
+  {0xa7a0, {1, {0xa7a1}}},
+  {0xa7a2, {1, {0xa7a3}}},
+  {0xa7a4, {1, {0xa7a5}}},
+  {0xa7a6, {1, {0xa7a7}}},
+  {0xa7a8, {1, {0xa7a9}}},
+  {0xa7aa, {1, {0x0266}}},
+  {0xa7ab, {1, {0x025c}}},
+  {0xa7ac, {1, {0x0261}}},
+  {0xa7ad, {1, {0x026c}}},
+  {0xa7b0, {1, {0x029e}}},
+  {0xa7b1, {1, {0x0287}}},
+  {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}}},
+  {0x118a0, {1, {0x118c0}}},
+  {0x118a1, {1, {0x118c1}}},
+  {0x118a2, {1, {0x118c2}}},
+  {0x118a3, {1, {0x118c3}}},
+  {0x118a4, {1, {0x118c4}}},
+  {0x118a5, {1, {0x118c5}}},
+  {0x118a6, {1, {0x118c6}}},
+  {0x118a7, {1, {0x118c7}}},
+  {0x118a8, {1, {0x118c8}}},
+  {0x118a9, {1, {0x118c9}}},
+  {0x118aa, {1, {0x118ca}}},
+  {0x118ab, {1, {0x118cb}}},
+  {0x118ac, {1, {0x118cc}}},
+  {0x118ad, {1, {0x118cd}}},
+  {0x118ae, {1, {0x118ce}}},
+  {0x118af, {1, {0x118cf}}},
+  {0x118b0, {1, {0x118d0}}},
+  {0x118b1, {1, {0x118d1}}},
+  {0x118b2, {1, {0x118d2}}},
+  {0x118b3, {1, {0x118d3}}},
+  {0x118b4, {1, {0x118d4}}},
+  {0x118b5, {1, {0x118d5}}},
+  {0x118b6, {1, {0x118d6}}},
+  {0x118b7, {1, {0x118d7}}},
+  {0x118b8, {1, {0x118d8}}},
+  {0x118b9, {1, {0x118d9}}},
+  {0x118ba, {1, {0x118da}}},
+  {0x118bb, {1, {0x118db}}},
+  {0x118bc, {1, {0x118dc}}},
+  {0x118bd, {1, {0x118dd}}},
+  {0x118be, {1, {0x118de}}},
+  {0x118bf, {1, {0x118df}}},
+#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1178))
+  {0x0049, {1, {0x0069}}},
+  {0x0130, {2, {0x0069, 0x0307}}},
+};
+
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
+
+/* maximum key range = 1867, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+        12,  212,    5,  217,    6, 1878,  173,   13,    2,   11,
+       123,    5, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,
+      1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,
+      1878, 1878, 1878,  220, 1878, 1878, 1878, 1878, 1878, 1878,
+      1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,  382,
+      1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,
+         8,    4,  219,    1, 1878,  343,  607,  274, 1202,  305,
+      1362,  209,  259,  412, 1443,  174,  290,   35,  442,   21,
+      1434,   70, 1472,  105,  362,  193,  591,   51,    3,    7,
+      1414,   86, 1391,  371, 1358,  398, 1456,  149, 1266,  245,
+      1263,  135, 1231,  121, 1096,  446,  932,  323, 1033,  428,
+      1155,  466, 1084,  991, 1160,  474, 1131,  977,  298,  749,
+       990,  491, 1010,  482, 1021,  696,  161,  729,   46,  966,
+      1209,  813, 1043,  616,  848,  917, 1019,  594, 1201,  526,
+      1127,  540,  943,  900,  171,  774, 1283,  760,  626,  935,
+      1025,  554,  288,  955,  103,  788,  423, 1113,   24, 1005,
+        20,  711,    9,  573,  358,  668,    5,  885,  228,  649,
+       102,  628,  612,  515,  800,  871,   77, 1132,   17, 1072,
+         1, 1188,   47, 1276,  244, 1326,  887, 1289,  202,  740,
+       258, 1168,  222
+    };
+  return asso_values[bits_of(code, 2)+65] + asso_values[bits_of(code, 1)] + asso_values[bits_of(code, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList3 *
+onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x41,
+      MAX_CODE_VALUE = 0x118bf,
+      TOTAL_KEYWORDS = 1180,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 11,
+      MAX_HASH_VALUE = 1877
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x10417*/ 1129,
+      -1, -1,
+      /*0x1ff3*/ 794,
+      /*0x10418*/ 1130,
+      /*0x1f97*/ 729,
+      /*0x0417*/ 320,
+      /*0x2c17*/ 873,
+      /*0x1e97*/ 600,
+      /*0x1f98*/ 730,
+      /*0x0418*/ 321,
+      /*0x2c18*/ 874,
+      /*0x1e98*/ 601,
+      /*0x0118*/ 69,
+      /*0x0218*/ 202,
+      /*0x2c98*/ 924,
+      /*0x1e18*/ 536,
+      /*0x0397*/ 248,
+      /*0x1040e*/ 1120,
+      /*0x0498*/ 369,
+      -1,
+      /*0x0398*/ 249,
+      /*0xa798*/ 1053,
+      /*0x1f8e*/ 720,
+      /*0x040e*/ 311,
+      /*0x2c0e*/ 864,
+      /*0x1e8e*/ 595,
+      /*0x010e*/ 64,
+      /*0x020e*/ 197,
+      /*0x2c8e*/ 919,
+      /*0x1e0e*/ 531,
+      /*0x03f1*/ 288,
+      /*0x1040c*/ 1118,
+      /*0x048e*/ 364,
+      -1,
+      /*0x038e*/ 239,
+      /*0xa698*/ 1000,
+      /*0x1f8c*/ 718,
+      /*0x040c*/ 309,
+      /*0x2c0c*/ 862,
+      /*0x1e8c*/ 594,
+      /*0x010c*/ 63,
+      /*0x020c*/ 196,
+      /*0x2c8c*/ 918,
+      /*0x1e0c*/ 530,
+      -1, -1,
+      /*0x048c*/ 363,
+      /*0x10416*/ 1128,
+      /*0x038c*/ 238,
+      /*0xa68e*/ 995,
+      /*0x2c75*/ 909,
+      /*0x013f*/ 87,
+      /*0x1f96*/ 728,
+      /*0x0416*/ 319,
+      /*0x2c16*/ 872,
+      /*0x1e96*/ 599,
+      /*0x0116*/ 68,
+      /*0x0216*/ 201,
+      /*0x2c96*/ 923,
+      /*0x1e16*/ 535,
+      /*0x03f5*/ 290,
+      -1,
+      /*0x0496*/ 368,
+      /*0xa68c*/ 994,
+      /*0x0396*/ 247,
+      /*0xa796*/ 1052,
+      /*0x10410*/ 1122,
+      -1, -1, -1, -1,
+      /*0x1f90*/ 722,
+      /*0x0410*/ 313,
+      /*0x2c10*/ 866,
+      /*0x1e90*/ 596,
+      /*0x0110*/ 65,
+      /*0x0210*/ 198,
+      /*0x2c90*/ 920,
+      /*0x1e10*/ 532,
+      /*0xa696*/ 999,
+      /*0x2c6f*/ 906,
+      /*0x0490*/ 365,
+      /*0x1041a*/ 1132,
+      /*0x0390*/ 241,
+      /*0xa790*/ 1050,
+      -1, -1,
+      /*0x1f9a*/ 732,
+      /*0x041a*/ 323,
+      /*0x2c1a*/ 876,
+      /*0x1e9a*/ 603,
+      /*0x011a*/ 70,
+      /*0x021a*/ 203,
+      /*0x2c9a*/ 925,
+      /*0x1e1a*/ 537,
+      -1, -1,
+      /*0x049a*/ 370,
+      /*0xa690*/ 996,
+      /*0x039a*/ 251,
+      /*0xa79a*/ 1054,
+      /*0x10412*/ 1124,
+      -1,
+      /*0x1fe9*/ 789,
+      /*0x1fd9*/ 780,
+      /*0x2c69*/ 902,
+      /*0x1f92*/ 724,
+      /*0x0412*/ 315,
+      /*0x2c12*/ 868,
+      /*0x1e92*/ 597,
+      /*0x0112*/ 66,
+      /*0x0212*/ 199,
+      /*0x2c92*/ 921,
+      /*0x1e12*/ 533,
+      /*0xa69a*/ 1001,
+      /*0x0059*/ 23,
+      /*0x0492*/ 366,
+      /*0x10426*/ 1144,
+      /*0x0392*/ 243,
+      /*0xa792*/ 1051,
+      -1, -1,
+      /*0x1fa6*/ 744,
+      /*0x0426*/ 335,
+      /*0x2c26*/ 888,
+      /*0x1ea6*/ 609,
+      /*0x0126*/ 76,
+      /*0x0226*/ 209,
+      /*0x2ca6*/ 931,
+      /*0x1e26*/ 543,
+      /*0x0518*/ 433,
+      /*0x10424*/ 1142,
+      /*0x04a6*/ 376,
+      /*0xa692*/ 997,
+      /*0x03a6*/ 262,
+      /*0xa7a6*/ 1060,
+      /*0x1fa4*/ 742,
+      /*0x0424*/ 333,
+      /*0x2c24*/ 886,
+      /*0x1ea4*/ 608,
+      /*0x0124*/ 75,
+      /*0x0224*/ 208,
+      /*0x2ca4*/ 930,
+      /*0x1e24*/ 542,
+      /*0x050e*/ 428,
+      /*0x10420*/ 1138,
+      /*0x04a4*/ 375,
+      -1,
+      /*0x03a4*/ 260,
+      /*0xa7a4*/ 1059,
+      /*0x1fa0*/ 738,
+      /*0x0420*/ 329,
+      /*0x2c20*/ 882,
+      /*0x1ea0*/ 606,
+      /*0x0120*/ 73,
+      /*0x0220*/ 206,
+      /*0x2ca0*/ 928,
+      /*0x1e20*/ 540,
+      /*0x050c*/ 427,
+      -1,
+      /*0x04a0*/ 373,
+      -1,
+      /*0x03a0*/ 257,
+      /*0xa7a0*/ 1057,
+      -1, -1,
+      /*0x013d*/ 86,
+      /*0x023d*/ 218,
+      -1,
+      /*0x053f*/ 459,
+      /*0x1040a*/ 1116,
+      -1, -1, -1,
+      /*0x0516*/ 432,
+      /*0x1f8a*/ 716,
+      /*0x040a*/ 307,
+      /*0x2c0a*/ 860,
+      /*0x1e8a*/ 593,
+      /*0x010a*/ 62,
+      /*0x020a*/ 195,
+      /*0x2c8a*/ 917,
+      /*0x1e0a*/ 529,
+      /*0x004f*/ 13,
+      /*0x03cf*/ 270,
+      /*0x048a*/ 362,
+      -1,
+      /*0x038a*/ 237,
+      -1,
+      /*0x10414*/ 1126,
+      -1, -1, -1,
+      /*0x0510*/ 429,
+      /*0x1f94*/ 726,
+      /*0x0414*/ 317,
+      /*0x2c14*/ 870,
+      /*0x1e94*/ 598,
+      /*0x0114*/ 67,
+      /*0x0214*/ 200,
+      /*0x2c94*/ 922,
+      /*0x1e14*/ 534,
+      /*0xa68a*/ 993,
+      /*0x1ffb*/ 801,
+      /*0x0494*/ 367,
+      /*0x10406*/ 1112,
+      /*0x0394*/ 245,
+      /*0x017b*/ 118,
+      -1,
+      /*0x051a*/ 434,
+      /*0x1f86*/ 712,
+      /*0x0406*/ 303,
+      /*0x2c06*/ 856,
+      /*0x1e86*/ 591,
+      /*0x0106*/ 60,
+      /*0x0206*/ 193,
+      /*0x2c86*/ 915,
+      /*0x1e06*/ 527,
+      -1, -1,
+      /*0x0197*/ 136,
+      /*0xa694*/ 998,
+      /*0x0386*/ 234,
+      /*0xa786*/ 1047,
+      /*0x0198*/ 137,
+      /*0x2c7f*/ 911,
+      /*0x1f18*/ 662,
+      /*0x017f*/ 120,
+      /*0x0512*/ 430,
+      /*0x1fe7*/ 787,
+      -1,
+      /*0x2c67*/ 901,
+      /*0x00df*/ 56,
+      -1,
+      /*0x01f1*/ 181,
+      /*0x03ff*/ 296,
+      /*0x00dd*/ 54,
+      /*0xa686*/ 991,
+      /*0x018e*/ 129,
+      /*0x1f5f*/ 697,
+      /*0x1f0e*/ 660,
+      /*0x10422*/ 1140,
+      -1,
+      /*0x1f5d*/ 696,
+      /*0x0526*/ 440,
+      /*0x1ff7*/ 797,
+      /*0x1fa2*/ 740,
+      /*0x0422*/ 331,
+      /*0x2c22*/ 884,
+      /*0x1ea2*/ 607,
+      /*0x0122*/ 74,
+      /*0x0222*/ 207,
+      /*0x2ca2*/ 929,
+      /*0x1e22*/ 541,
+      /*0x1f0c*/ 658,
+      /*0x10407*/ 1113,
+      /*0x04a2*/ 374,
+      /*0x03f7*/ 291,
+      /*0x0524*/ 439,
+      /*0xa7a2*/ 1058,
+      /*0x1f87*/ 713,
+      /*0x0407*/ 304,
+      /*0x2c07*/ 857,
+      /*0x017d*/ 119,
+      /*0x0587*/ 483,
+      /*0x1f3f*/ 683,
+      /*0x10bf*/ 515,
+      -1,
+      /*0x0196*/ 135,
+      -1,
+      /*0x10402*/ 1108,
+      /*0x03fd*/ 294,
+      /*0x0520*/ 437,
+      -1, -1,
+      /*0x1f82*/ 708,
+      /*0x0402*/ 299,
+      /*0x2c02*/ 852,
+      /*0x1e82*/ 589,
+      /*0x0102*/ 58,
+      /*0x0202*/ 191,
+      /*0x2c82*/ 913,
+      /*0x1e02*/ 525,
+      -1,
+      /*0x053d*/ 457,
+      -1,
+      /*0x1040b*/ 1117,
+      /*0x0190*/ 131,
+      /*0xa782*/ 1045,
+      /*0x1fd7*/ 778,
+      -1,
+      /*0x1f8b*/ 717,
+      /*0x040b*/ 308,
+      /*0x2c0b*/ 861,
+      /*0x054f*/ 475,
+      -1,
+      /*0x1f6f*/ 705,
+      /*0x050a*/ 426,
+      -1, -1,
+      /*0x0057*/ 21,
+      /*0x10404*/ 1110,
+      /*0xa682*/ 989,
+      -1,
+      /*0xa78b*/ 1048,
+      /*0x1f1a*/ 664,
+      /*0x1f84*/ 710,
+      /*0x0404*/ 301,
+      /*0x2c04*/ 854,
+      /*0x1e84*/ 590,
+      /*0x0104*/ 59,
+      /*0x0204*/ 192,
+      /*0x2c84*/ 914,
+      /*0x1e04*/ 526,
+      -1,
+      /*0x00d9*/ 50,
+      /*0x0514*/ 431,
+      -1, -1,
+      /*0xa784*/ 1046,
+      /*0x01d9*/ 169,
+      /*0x1f69*/ 699,
+      /*0x1f59*/ 694,
+      -1,
+      /*0x1faa*/ 748,
+      /*0x042a*/ 339,
+      /*0x2c2a*/ 892,
+      /*0x1eaa*/ 611,
+      /*0x012a*/ 78,
+      /*0x022a*/ 211,
+      /*0x2caa*/ 933,
+      /*0x1e2a*/ 545,
+      /*0x0506*/ 424,
+      /*0xa684*/ 990,
+      /*0x04aa*/ 378,
+      -1,
+      /*0x03aa*/ 266,
+      /*0xa7aa*/ 1062,
+      /*0x01a6*/ 144,
+      /*0x10400*/ 1106,
+      -1,
+      /*0x10a6*/ 490,
+      -1, -1,
+      /*0x1f80*/ 706,
+      /*0x0400*/ 297,
+      /*0x2c00*/ 850,
+      /*0x1e80*/ 588,
+      /*0x0100*/ 57,
+      /*0x0200*/ 190,
+      /*0x2c80*/ 912,
+      /*0x1e00*/ 524,
+      /*0x01a4*/ 143,
+      -1,
+      /*0x0480*/ 361,
+      /*0x10a4*/ 488,
+      -1,
+      /*0xa780*/ 1044,
+      /*0x10413*/ 1125,
+      /*0x1fe3*/ 784,
+      -1,
+      /*0x2c63*/ 899,
+      -1,
+      /*0x1f93*/ 725,
+      /*0x0413*/ 316,
+      /*0x2c13*/ 869,
+      /*0x01a0*/ 141,
+      /*0x1041c*/ 1134,
+      /*0x0522*/ 438,
+      /*0x10a0*/ 484,
+      -1,
+      /*0xa680*/ 988,
+      /*0x1f9c*/ 734,
+      /*0x041c*/ 325,
+      /*0x2c1c*/ 878,
+      /*0x0393*/ 244,
+      /*0x011c*/ 71,
+      /*0x021c*/ 204,
+      /*0x2c9c*/ 926,
+      /*0x1e1c*/ 538,
+      /*0x1f3d*/ 681,
+      /*0x10bd*/ 513,
+      /*0x049c*/ 371,
+      /*0x00cf*/ 41,
+      /*0x039c*/ 253,
+      /*0xa79c*/ 1055,
+      -1, -1,
+      /*0x01cf*/ 164,
+      -1, -1,
+      /*0x018a*/ 127,
+      -1,
+      /*0x1f0a*/ 656,
+      /*0x1041e*/ 1136,
+      /*0x037f*/ 233,
+      -1,
+      /*0x0502*/ 422,
+      -1,
+      /*0x1f9e*/ 736,
+      /*0x041e*/ 327,
+      /*0x2c1e*/ 880,
+      /*0x1e9e*/ 605,
+      /*0x011e*/ 72,
+      /*0x021e*/ 205,
+      /*0x2c9e*/ 927,
+      /*0x1e1e*/ 539,
+      -1,
+      /*0x10408*/ 1114,
+      /*0x049e*/ 372,
+      /*0x0194*/ 134,
+      /*0x039e*/ 255,
+      /*0xa79e*/ 1056,
+      /*0x1f88*/ 714,
+      /*0x0408*/ 305,
+      /*0x2c08*/ 858,
+      /*0x1e88*/ 592,
+      /*0x0108*/ 61,
+      /*0x0208*/ 194,
+      /*0x2c88*/ 916,
+      /*0x1e08*/ 528,
+      /*0x0535*/ 449,
+      /*0x118bf*/ 1177,
+      -1,
+      /*0x1fdb*/ 782,
+      /*0x0388*/ 235,
+      /*0x0186*/ 124,
+      -1,
+      /*0x0504*/ 423,
+      /*0x1fac*/ 750,
+      /*0x042c*/ 341,
+      /*0x2c2c*/ 894,
+      /*0x1eac*/ 612,
+      /*0x012c*/ 79,
+      /*0x022c*/ 212,
+      /*0x2cac*/ 934,
+      /*0x1e2c*/ 546,
+      -1,
+      /*0x1040d*/ 1119,
+      /*0x04ac*/ 379,
+      /*0xa688*/ 992,
+      -1,
+      /*0xa7ac*/ 1064,
+      /*0x1f8d*/ 719,
+      /*0x040d*/ 310,
+      /*0x2c0d*/ 863,
+      /*0x052a*/ 442,
+      /*0x1fa8*/ 746,
+      /*0x0428*/ 337,
+      /*0x2c28*/ 890,
+      /*0x1ea8*/ 610,
+      /*0x0128*/ 77,
+      /*0x0228*/ 210,
+      /*0x2ca8*/ 932,
+      /*0x1e28*/ 544,
+      -1,
+      /*0xa78d*/ 1049,
+      /*0x04a8*/ 377,
+      /*0x24bf*/ 833,
+      /*0x03a8*/ 264,
+      /*0xa7a8*/ 1061,
+      /*0x01f7*/ 185,
+      /*0x01a2*/ 142,
+      -1, -1,
+      /*0x10a2*/ 486,
+      /*0x0500*/ 421,
+      /*0x1fae*/ 752,
+      /*0x042e*/ 343,
+      /*0x2c2e*/ 896,
+      /*0x1eae*/ 613,
+      /*0x012e*/ 80,
+      /*0x022e*/ 213,
+      /*0x2cae*/ 935,
+      /*0x1e2e*/ 547,
+      /*0x1fb2*/ 754,
+      /*0x0187*/ 125,
+      /*0x04ae*/ 380,
+      /*0x1eb2*/ 615,
+      /*0x0132*/ 81,
+      /*0x0232*/ 215,
+      /*0x2cb2*/ 937,
+      /*0x1e32*/ 549,
+      /*0x1fba*/ 761,
+      -1,
+      /*0x04b2*/ 382,
+      /*0x1eba*/ 619,
+      /*0xff26*/ 1085,
+      /*0x023a*/ 216,
+      /*0x2cba*/ 941,
+      /*0x1e3a*/ 553,
+      /*0x0182*/ 122,
+      /*0x1fb8*/ 759,
+      /*0x04ba*/ 386,
+      /*0x051c*/ 435,
+      /*0x1eb8*/ 618,
+      -1,
+      /*0x118a6*/ 1152,
+      /*0x2cb8*/ 940,
+      /*0x1e38*/ 552,
+      -1,
+      /*0xff24*/ 1083,
+      /*0x04b8*/ 385,
+      -1, -1,
+      /*0x01d7*/ 168,
+      /*0xfb17*/ 1079,
+      /*0x018b*/ 128,
+      -1,
+      /*0x1f0b*/ 657,
+      /*0x00b5*/ 25,
+      /*0x118a4*/ 1150,
+      -1, -1, -1,
+      /*0x01b5*/ 153,
+      /*0x1fec*/ 792,
+      /*0x046c*/ 351,
+      /*0x10b5*/ 505,
+      /*0x1eec*/ 644,
+      /*0x016c*/ 110,
+      /*0x051e*/ 436,
+      /*0x0184*/ 123,
+      /*0x1e6c*/ 578,
+      -1,
+      /*0x118a0*/ 1146,
+      /*0x04ec*/ 411,
+      /*0x1fca*/ 772,
+      /*0x03ec*/ 285,
+      -1,
+      /*0x1eca*/ 627,
+      /*0x014a*/ 93,
+      /*0x024a*/ 226,
+      /*0x2cca*/ 949,
+      /*0x1e4a*/ 561,
+      /*0x0508*/ 425,
+      -1,
+      /*0x118bd*/ 1175,
+      /*0x004a*/ 8,
+      -1, -1,
+      /*0x1fcc*/ 774,
+      /*0x1f2a*/ 670,
+      /*0x10aa*/ 494,
+      /*0x1ecc*/ 628,
+      /*0x014c*/ 94,
+      /*0x024c*/ 227,
+      /*0x2ccc*/ 950,
+      /*0x1e4c*/ 562,
+      -1, -1,
+      /*0x052c*/ 443,
+      /*0x004c*/ 10,
+      -1,
+      /*0xfb16*/ 1078,
+      /*0x1fd6*/ 777,
+      /*0xa726*/ 1004,
+      -1,
+      /*0x1ed6*/ 633,
+      /*0x0156*/ 99,
+      -1,
+      /*0x2cd6*/ 955,
+      /*0x1e56*/ 567,
+      -1, -1,
+      /*0x04d6*/ 400,
+      /*0x0056*/ 20,
+      /*0x03d6*/ 274,
+      -1,
+      /*0x0528*/ 441,
+      /*0xa724*/ 1003,
+      -1, -1,
+      /*0x24bd*/ 831,
+      /*0x1fe2*/ 783,
+      /*0x0462*/ 346,
+      /*0x2c62*/ 898,
+      /*0x1ee2*/ 639,
+      /*0x0162*/ 105,
+      /*0x0193*/ 133,
+      /*0x2ce2*/ 961,
+      /*0x1e62*/ 573,
+      -1,
+      /*0x24cf*/ 849,
+      /*0x04e2*/ 406,
+      -1,
+      /*0x03e2*/ 280,
+      /*0x10415*/ 1127,
+      /*0x019c*/ 138,
+      /*0x052e*/ 444,
+      /*0x1f1c*/ 666,
+      -1,
+      /*0x1f95*/ 727,
+      /*0x0415*/ 318,
+      /*0x2c15*/ 871,
+      /*0x1fc8*/ 770,
+      -1,
+      /*0x0532*/ 446,
+      /*0x1ec8*/ 626,
+      -1,
+      /*0x0248*/ 225,
+      /*0x2cc8*/ 948,
+      /*0x1e48*/ 560,
+      /*0x10401*/ 1107,
+      /*0x0395*/ 246,
+      /*0x053a*/ 454,
+      /*0x0048*/ 7,
+      -1,
+      /*0x1f81*/ 707,
+      /*0x0401*/ 298,
+      /*0x2c01*/ 851,
+      /*0xff22*/ 1081,
+      /*0x2165*/ 812,
+      /*0x1feb*/ 791,
+      /*0x0538*/ 452,
+      /*0x2c6b*/ 903,
+      /*0x2161*/ 808,
+      /*0x1fc4*/ 767,
+      -1,
+      /*0x2ceb*/ 962,
+      /*0x1ec4*/ 624,
+      /*0x118a2*/ 1148,
+      /*0x0244*/ 222,
+      /*0x2cc4*/ 946,
+      /*0x1e44*/ 558,
+      -1, -1,
+      /*0x1fd3*/ 776,
+      /*0x0044*/ 3,
+      /*0x1fea*/ 790,
+      /*0x046a*/ 350,
+      /*0x1f08*/ 654,
+      /*0x1eea*/ 643,
+      /*0x016a*/ 109,
+      -1,
+      /*0x00db*/ 52,
+      /*0x1e6a*/ 577,
+      /*0xa77b*/ 1041,
+      /*0x0053*/ 17,
+      /*0x04ea*/ 410,
+      /*0x01db*/ 170,
+      /*0x03ea*/ 284,
+      /*0x1f5b*/ 695,
+      -1, -1,
+      /*0x01ac*/ 147,
+      -1,
+      /*0x1f2c*/ 672,
+      /*0x10ac*/ 496,
+      /*0x054a*/ 470,
+      /*0x1fe8*/ 788,
+      /*0x0468*/ 349,
+      -1,
+      /*0x1ee8*/ 642,
+      /*0x0168*/ 108,
+      -1, -1,
+      /*0x1e68*/ 576,
+      -1, -1,
+      /*0x04e8*/ 409,
+      /*0x1f0d*/ 659,
+      /*0x03e8*/ 283,
+      /*0x054c*/ 472,
+      /*0xff35*/ 1100,
+      /*0x1f28*/ 668,
+      /*0x10a8*/ 492,
+      -1, -1,
+      /*0x1fe4*/ 785,
+      /*0x0464*/ 347,
+      /*0x2c64*/ 900,
+      /*0x1ee4*/ 640,
+      /*0x0164*/ 106,
+      /*0x118b5*/ 1167,
+      -1,
+      /*0x1e64*/ 574,
+      /*0x0556*/ 482,
+      -1,
+      /*0x04e4*/ 407,
+      /*0xa722*/ 1002,
+      /*0x03e4*/ 281,
+      -1,
+      /*0x01ae*/ 148,
+      /*0x216f*/ 822,
+      /*0x1f2e*/ 674,
+      /*0x10ae*/ 498,
+      -1, -1,
+      /*0xff2a*/ 1089,
+      -1,
+      /*0x01b2*/ 151,
+      -1,
+      /*0xa77d*/ 1042,
+      /*0x10b2*/ 502,
+      -1,
+      /*0xfb14*/ 1076,
+      /*0x1fbc*/ 763,
+      -1,
+      /*0x118aa*/ 1156,
+      /*0x1ebc*/ 620,
+      /*0x1f3a*/ 678,
+      /*0x10ba*/ 510,
+      /*0x2cbc*/ 942,
+      /*0x1e3c*/ 554,
+      -1, -1,
+      /*0x04bc*/ 387,
+      /*0x01b8*/ 155,
+      /*0x2169*/ 816,
+      /*0x1f38*/ 676,
+      /*0x10b8*/ 508,
+      /*0xfb06*/ 1074,
+      /*0x0460*/ 345,
+      /*0x2c60*/ 897,
+      /*0x1ee0*/ 638,
+      /*0x0160*/ 104,
+      /*0x0548*/ 468,
+      /*0x2ce0*/ 960,
+      /*0x1e60*/ 572,
+      -1, -1,
+      /*0x04e0*/ 405,
+      -1,
+      /*0x03e0*/ 279,
+      -1, -1, -1,
+      /*0x2126*/ 803,
+      -1,
+      /*0x1fbe*/ 764,
+      -1,
+      /*0x01ec*/ 178,
+      /*0x1ebe*/ 621,
+      /*0x1f6c*/ 702,
+      /*0x023e*/ 219,
+      /*0x2cbe*/ 943,
+      /*0x1e3e*/ 555,
+      /*0x00ca*/ 36,
+      /*0x0544*/ 464,
+      /*0x04be*/ 388,
+      /*0x1ffc*/ 802,
+      /*0x047c*/ 359,
+      /*0x01ca*/ 161,
+      /*0x1efc*/ 652,
+      /*0x1f4a*/ 686,
+      -1, -1,
+      /*0x1e7c*/ 586,
+      /*0x0553*/ 479,
+      /*0x1fb6*/ 757,
+      /*0x04fc*/ 419,
+      /*0x00cc*/ 38,
+      /*0x1eb6*/ 617,
+      /*0x0136*/ 83,
+      -1,
+      /*0x2cb6*/ 939,
+      /*0x1e36*/ 551,
+      /*0xa72a*/ 1006,
+      /*0x1f4c*/ 688,
+      /*0x04b6*/ 384,
+      /*0x1fd2*/ 775,
+      -1, -1,
+      /*0x1ed2*/ 631,
+      /*0x0152*/ 97,
+      /*0x00d6*/ 48,
+      /*0x2cd2*/ 953,
+      /*0x1e52*/ 565,
+      -1, -1,
+      /*0x04d2*/ 398,
+      /*0x0052*/ 16,
+      /*0x1f56*/ 693,
+      -1, -1, -1,
+      /*0xfb02*/ 1070,
+      /*0x1ed0*/ 630,
+      /*0x0150*/ 96,
+      -1,
+      /*0x2cd0*/ 952,
+      /*0x1e50*/ 564,
+      -1, -1,
+      /*0x04d0*/ 397,
+      /*0x0050*/ 14,
+      /*0x03d0*/ 271,
+      -1,
+      /*0x1fda*/ 781,
+      /*0x01e2*/ 173,
+      -1,
+      /*0x1eda*/ 635,
+      /*0x015a*/ 101,
+      /*0xff2c*/ 1091,
+      /*0x2cda*/ 957,
+      /*0x1e5a*/ 569,
+      -1,
+      /*0xa66c*/ 987,
+      /*0x04da*/ 402,
+      /*0x005a*/ 24,
+      /*0x03da*/ 276,
+      -1,
+      /*0x2c6d*/ 904,
+      /*0x118ac*/ 1158,
+      -1,
+      /*0x00c8*/ 34,
+      /*0x2ced*/ 963,
+      /*0xfb04*/ 1072,
+      /*0xa64a*/ 970,
+      -1,
+      /*0x01c8*/ 160,
+      /*0xff28*/ 1087,
+      /*0x1f48*/ 684,
+      /*0x1fc2*/ 765,
+      -1, -1,
+      /*0x1ec2*/ 623,
+      -1,
+      /*0x053c*/ 456,
+      /*0x2cc2*/ 945,
+      /*0x1e42*/ 557,
+      /*0x118a8*/ 1154,
+      /*0xa64c*/ 971,
+      /*0x0181*/ 121,
+      /*0x0042*/ 1,
+      /*0x03c2*/ 269,
+      -1,
+      /*0x00c4*/ 30,
+      -1, -1,
+      /*0x1f6b*/ 701,
+      /*0xff2e*/ 1093,
+      /*0x01c4*/ 157,
+      -1,
+      /*0x2167*/ 814,
+      /*0x10c4*/ 520,
+      /*0xa656*/ 976,
+      /*0x00d3*/ 45,
+      -1,
+      /*0xff32*/ 1097,
+      -1,
+      /*0x118ae*/ 1160,
+      /*0x01d3*/ 166,
+      -1,
+      /*0x01ea*/ 177,
+      /*0xfb00*/ 1068,
+      /*0x1f6a*/ 700,
+      /*0xff3a*/ 1105,
+      -1,
+      /*0x118b2*/ 1164,
+      -1,
+      /*0x053e*/ 458,
+      /*0x0145*/ 90,
+      /*0x0245*/ 223,
+      -1,
+      /*0xa662*/ 982,
+      /*0xff38*/ 1103,
+      /*0x118ba*/ 1172,
+      /*0x04c5*/ 392,
+      /*0x0045*/ 4,
+      -1, -1,
+      /*0xa72c*/ 1007,
+      -1,
+      /*0xfb13*/ 1075,
+      /*0x01e8*/ 176,
+      /*0x118b8*/ 1170,
+      /*0x1f68*/ 698,
+      -1, -1, -1,
+      /*0x0536*/ 450,
+      /*0x046e*/ 352,
+      /*0x2c6e*/ 905,
+      /*0x1eee*/ 645,
+      /*0x016e*/ 111,
+      /*0xa648*/ 969,
+      -1,
+      /*0x1e6e*/ 579,
+      -1,
+      /*0xa728*/ 1005,
+      /*0x04ee*/ 412,
+      /*0x0552*/ 478,
+      /*0x03ee*/ 286,
+      /*0x01e4*/ 174,
+      /*0x1fe6*/ 786,
+      /*0x0466*/ 348,
+      /*0x1ff9*/ 799,
+      /*0x1ee6*/ 641,
+      /*0x0166*/ 107,
+      -1,
+      /*0x0179*/ 117,
+      /*0x1e66*/ 575,
+      /*0x24ba*/ 828,
+      -1,
+      /*0x04e6*/ 408,
+      /*0x0550*/ 476,
+      /*0x03e6*/ 282,
+      /*0xa644*/ 967,
+      /*0x03f9*/ 292,
+      /*0xa72e*/ 1008,
+      -1,
+      /*0x24b8*/ 826,
+      /*0x1ece*/ 629,
+      /*0x014e*/ 95,
+      /*0x024e*/ 228,
+      /*0x2cce*/ 951,
+      /*0x1e4e*/ 563,
+      /*0xa732*/ 1009,
+      -1,
+      /*0xa66a*/ 986,
+      /*0x004e*/ 12,
+      /*0x01bc*/ 156,
+      -1,
+      /*0x1f3c*/ 680,
+      /*0x10bc*/ 512,
+      /*0xa73a*/ 1013,
+      /*0x1fc6*/ 768,
+      -1, -1,
+      /*0x1ec6*/ 625,
+      -1,
+      /*0x0246*/ 224,
+      /*0x2cc6*/ 947,
+      /*0x1e46*/ 559,
+      /*0xa738*/ 1012,
+      -1,
+      /*0x01e0*/ 172,
+      /*0x0046*/ 5,
+      /*0x212a*/ 804,
+      -1,
+      /*0xa668*/ 985,
+      /*0x1fa9*/ 747,
+      /*0x0429*/ 338,
+      /*0x2c29*/ 891,
+      /*0x0542*/ 462,
+      -1,
+      /*0x24ca*/ 844,
+      /*0x1ed4*/ 632,
+      /*0x0154*/ 98,
+      -1,
+      /*0x2cd4*/ 954,
+      /*0x1e54*/ 566,
+      -1,
+      /*0x03a9*/ 265,
+      /*0x04d4*/ 399,
+      /*0x0054*/ 18,
+      /*0x1f3e*/ 682,
+      /*0x10be*/ 514,
+      /*0xa76c*/ 1038,
+      /*0xa664*/ 983,
+      /*0x24cc*/ 846,
+      -1,
+      /*0x04cd*/ 396,
+      /*0x004d*/ 11,
+      /*0x1fd8*/ 779,
+      /*0x01fc*/ 188,
+      -1,
+      /*0x1ed8*/ 634,
+      /*0x0158*/ 100,
+      /*0xa74a*/ 1021,
+      /*0x2cd8*/ 956,
+      /*0x1e58*/ 568,
+      -1,
+      /*0x2163*/ 810,
+      /*0x04d8*/ 401,
+      /*0x0058*/ 22,
+      /*0x03d8*/ 275,
+      /*0x10b6*/ 506,
+      /*0x1ec0*/ 622,
+      /*0x0545*/ 465,
+      /*0x00d2*/ 44,
+      /*0x2cc0*/ 944,
+      /*0x1e40*/ 556,
+      /*0xa74c*/ 1022,
+      -1,
+      /*0x04c0*/ 389,
+      /*0x1fb4*/ 756,
+      /*0x1f52*/ 691,
+      -1,
+      /*0x1eb4*/ 616,
+      /*0x0134*/ 82,
+      -1,
+      /*0x2cb4*/ 938,
+      /*0x1e34*/ 550,
+      /*0x00d0*/ 42,
+      -1,
+      /*0x04b4*/ 383,
+      /*0xa756*/ 1027,
+      -1,
+      /*0x1fb7*/ 758,
+      -1,
+      /*0x1f50*/ 690,
+      /*0xa660*/ 981,
+      /*0x1eb0*/ 614,
+      /*0x0130*/ 1179,
+      /*0x0230*/ 214,
+      /*0x2cb0*/ 936,
+      /*0x1e30*/ 548,
+      /*0x00da*/ 51,
+      -1,
+      /*0x04b0*/ 381,
+      -1,
+      /*0x03b0*/ 268,
+      /*0xa7b0*/ 1066,
+      /*0x24c8*/ 842,
+      -1,
+      /*0xa762*/ 1033,
+      /*0x1ede*/ 637,
+      /*0x015e*/ 103,
+      /*0x1fb9*/ 760,
+      /*0x2cde*/ 959,
+      /*0x1e5e*/ 571,
+      -1,
+      /*0x0139*/ 84,
+      /*0x04de*/ 404,
+      -1,
+      /*0x03de*/ 278,
+      /*0x1f6d*/ 703,
+      /*0x1fc7*/ 769,
+      /*0x0345*/ 229,
+      /*0x1fbb*/ 762,
+      /*0x054e*/ 474,
+      /*0x0147*/ 91,
+      /*0x00c2*/ 28,
+      /*0x013b*/ 85,
+      /*0x023b*/ 217,
+      /*0x24c4*/ 838,
+      /*0xa748*/ 1020,
+      /*0x04c7*/ 393,
+      /*0x0047*/ 6,
+      -1,
+      /*0x10c2*/ 518,
+      /*0x1fab*/ 749,
+      /*0x042b*/ 340,
+      /*0x2c2b*/ 893,
+      /*0x0055*/ 19,
+      /*0x03d5*/ 273,
+      -1,
+      /*0x0546*/ 466,
+      -1, -1,
+      /*0xa652*/ 974,
+      /*0x1fc3*/ 766,
+      -1,
+      /*0x03ab*/ 267,
+      /*0xa7ab*/ 1063,
+      /*0x0143*/ 89,
+      /*0x0243*/ 221,
+      -1,
+      /*0xa744*/ 1018,
+      -1, -1,
+      /*0x04c3*/ 391,
+      /*0x0043*/ 2,
+      -1,
+      /*0xa650*/ 973,
+      /*0x0554*/ 480,
+      -1,
+      /*0x00c5*/ 31,
+      -1, -1,
+      /*0xa76a*/ 1037,
+      -1,
+      /*0x01c5*/ 158,
+      /*0x054d*/ 473,
+      -1,
+      /*0x10c5*/ 521,
+      -1, -1,
+      /*0xa65a*/ 978,
+      /*0x118bc*/ 1174,
+      /*0x1ff2*/ 793,
+      /*0x0472*/ 354,
+      /*0x2c72*/ 908,
+      /*0x1ef2*/ 647,
+      /*0x0172*/ 113,
+      -1,
+      /*0x2cf2*/ 964,
+      /*0x1e72*/ 581,
+      /*0x2132*/ 806,
+      -1,
+      /*0x04f2*/ 414,
+      /*0xa768*/ 1036,
+      /*0x1faf*/ 753,
+      /*0x042f*/ 344,
+      -1,
+      /*0x01ee*/ 179,
+      /*0x0540*/ 460,
+      /*0x1f6e*/ 704,
+      -1,
+      /*0x10427*/ 1145,
+      -1,
+      /*0xfb15*/ 1077,
+      -1,
+      /*0xa642*/ 966,
+      /*0x1fa7*/ 745,
+      /*0x0427*/ 336,
+      /*0x2c27*/ 889,
+      /*0x0534*/ 448,
+      -1,
+      /*0x01e6*/ 175,
+      /*0xa764*/ 1034,
+      -1,
+      /*0x118be*/ 1176,
+      -1, -1,
+      /*0x24bc*/ 830,
+      /*0x03a7*/ 263,
+      /*0xfb01*/ 1069,
+      -1,
+      /*0x00ce*/ 40,
+      /*0x0537*/ 451,
+      -1,
+      /*0xff36*/ 1101,
+      -1,
+      /*0x1edc*/ 636,
+      /*0x015c*/ 102,
+      -1,
+      /*0x2cdc*/ 958,
+      /*0x1e5c*/ 570,
+      /*0x216c*/ 819,
+      -1,
+      /*0x04dc*/ 403,
+      /*0x118b6*/ 1168,
+      /*0x03dc*/ 277,
+      -1,
+      /*0x1fcb*/ 773,
+      /*0x00c6*/ 32,
+      -1,
+      /*0xa73c*/ 1014,
+      /*0x1fb3*/ 755,
+      /*0x0539*/ 453,
+      /*0x0470*/ 353,
+      /*0x2c70*/ 907,
+      /*0x1ef0*/ 646,
+      /*0x0170*/ 112,
+      /*0x04cb*/ 395,
+      /*0x004b*/ 9,
+      /*0x1e70*/ 580,
+      /*0x24be*/ 832,
+      /*0x0547*/ 467,
+      /*0x04f0*/ 413,
+      /*0x053b*/ 455,
+      /*0x03f0*/ 287,
+      /*0xa760*/ 1032,
+      /*0x00d4*/ 46,
+      /*0x0555*/ 481,
+      /*0x01a9*/ 146,
+      -1,
+      /*0x1f29*/ 669,
+      /*0x10a9*/ 493,
+      -1,
+      /*0x1f54*/ 692,
+      /*0x00cd*/ 39,
+      /*0x1fad*/ 751,
+      /*0x042d*/ 342,
+      /*0x2c2d*/ 895,
+      -1,
+      /*0x01cd*/ 163,
+      /*0x24b6*/ 824,
+      /*0x1f4d*/ 689,
+      /*0x10cd*/ 523,
+      /*0xa73e*/ 1015,
+      -1,
+      /*0x0543*/ 463,
+      /*0x00d8*/ 49,
+      /*0xa666*/ 984,
+      /*0xa7ad*/ 1065,
+      /*0x047e*/ 360,
+      /*0x2c7e*/ 910,
+      /*0x1efe*/ 653,
+      -1,
+      /*0xa7b1*/ 1067,
+      -1,
+      /*0x1e7e*/ 587,
+      -1,
+      /*0x00c0*/ 26,
+      /*0x04fe*/ 420,
+      /*0x2162*/ 809,
+      /*0x03fe*/ 295,
+      -1,
+      /*0xa64e*/ 972,
+      /*0xa736*/ 1011,
+      -1,
+      /*0x10c0*/ 516,
+      -1, -1,
+      /*0x1ff4*/ 795,
+      /*0x0474*/ 355,
+      -1,
+      /*0x1ef4*/ 648,
+      /*0x0174*/ 114,
+      -1,
+      /*0xa752*/ 1025,
+      /*0x1e74*/ 582,
+      /*0x10b4*/ 504,
+      /*0x10403*/ 1109,
+      /*0x04f4*/ 415,
+      /*0xa646*/ 968,
+      /*0x03f4*/ 289,
+      /*0x1fc9*/ 771,
+      /*0x1f83*/ 709,
+      /*0x0403*/ 300,
+      /*0x2c03*/ 853,
+      /*0x0149*/ 92,
+      /*0x01b7*/ 154,
+      -1,
+      /*0xa750*/ 1024,
+      /*0x10b7*/ 507,
+      /*0x10b0*/ 500,
+      /*0x04c9*/ 394,
+      /*0x0049*/ 1178,
+      /*0x0141*/ 88,
+      /*0x0241*/ 220,
+      -1,
+      /*0x00de*/ 55,
+      /*0xa654*/ 975,
+      /*0x216b*/ 818,
+      /*0x04c1*/ 390,
+      /*0x0041*/ 0,
+      /*0x01de*/ 171,
+      /*0xa75a*/ 1029,
+      -1,
+      /*0x24c2*/ 836,
+      -1,
+      /*0x10425*/ 1143,
+      -1,
+      /*0x1f39*/ 677,
+      /*0x10b9*/ 509,
+      /*0x00c7*/ 33,
+      /*0x1fa5*/ 743,
+      /*0x0425*/ 334,
+      /*0x2c25*/ 887,
+      /*0x216a*/ 817,
+      /*0x01c7*/ 159,
+      /*0x00d5*/ 47,
+      /*0xa658*/ 977,
+      /*0x10c7*/ 522,
+      /*0x1f3b*/ 679,
+      /*0x10bb*/ 511,
+      /*0x01d5*/ 167,
+      -1,
+      /*0x03a5*/ 261,
+      /*0x0372*/ 231,
+      -1, -1,
+      /*0xa742*/ 1017,
+      /*0xa640*/ 965,
+      /*0x054b*/ 471,
+      -1,
+      /*0x1f2b*/ 671,
+      /*0x10ab*/ 495,
+      /*0x0533*/ 447,
+      /*0x00c3*/ 29,
+      /*0x2168*/ 815,
+      -1, -1,
+      /*0x10423*/ 1141,
+      /*0x24c5*/ 839,
+      -1,
+      /*0x10421*/ 1139,
+      /*0x10c3*/ 519,
+      /*0x1fa3*/ 741,
+      /*0x0423*/ 332,
+      /*0x2c23*/ 885,
+      /*0x1fa1*/ 739,
+      /*0x0421*/ 330,
+      /*0x2c21*/ 883,
+      -1, -1, -1, -1, -1,
+      /*0x2164*/ 811,
+      /*0x03a3*/ 259,
+      /*0x1ff6*/ 796,
+      /*0x0476*/ 356,
+      /*0x03a1*/ 258,
+      /*0x1ef6*/ 649,
+      /*0x0176*/ 115,
+      -1,
+      /*0x0531*/ 445,
+      /*0x1e76*/ 583,
+      -1, -1,
+      /*0x04f6*/ 416,
+      /*0xa65e*/ 980,
+      /*0x01f2*/ 182,
+      /*0x1ffa*/ 800,
+      /*0x047a*/ 358,
+      -1,
+      /*0x1efa*/ 651,
+      -1,
+      /*0x0051*/ 15,
+      /*0x03d1*/ 272,
+      /*0x1e7a*/ 585,
+      /*0xff29*/ 1088,
+      -1,
+      /*0x04fa*/ 418,
+      /*0x01af*/ 149,
+      /*0x03fa*/ 293,
+      /*0x1f2f*/ 675,
+      /*0x10af*/ 499,
+      /*0x0370*/ 230,
+      /*0xa76e*/ 1039,
+      -1,
+      /*0x118a9*/ 1155,
+      -1, -1, -1,
+      /*0x24ce*/ 848,
+      /*0x01a7*/ 145,
+      -1, -1,
+      /*0x10a7*/ 491,
+      -1,
+      /*0x2160*/ 807,
+      -1,
+      /*0xa766*/ 1035,
+      -1,
+      /*0xa779*/ 1040,
+      -1,
+      /*0x0549*/ 469,
+      /*0x00dc*/ 53,
+      -1,
+      /*0x1ff8*/ 798,
+      /*0x0478*/ 357,
+      /*0x24c6*/ 840,
+      /*0x1ef8*/ 650,
+      /*0x0178*/ 116,
+      /*0x0541*/ 461,
+      -1,
+      /*0x1e78*/ 584,
+      /*0xa74e*/ 1023,
+      -1,
+      /*0x04f8*/ 417,
+      -1,
+      /*0x00cb*/ 37,
+      -1, -1, -1,
+      /*0xff34*/ 1099,
+      /*0x01cb*/ 162,
+      -1,
+      /*0x1f4b*/ 687,
+      -1,
+      /*0x01b3*/ 152,
+      /*0x01f0*/ 180,
+      -1,
+      /*0x10b3*/ 503,
+      /*0xa746*/ 1019,
+      /*0x118b4*/ 1166,
+      /*0x1041d*/ 1135,
+      /*0x24cd*/ 847,
+      /*0xff37*/ 1102,
+      /*0xff30*/ 1095,
+      /*0x10405*/ 1111,
+      /*0x1f9d*/ 735,
+      /*0x041d*/ 326,
+      /*0x2c1d*/ 879,
+      -1,
+      /*0x1f85*/ 711,
+      /*0x0405*/ 302,
+      /*0x2c05*/ 855,
+      /*0x118b7*/ 1169,
+      /*0x118b0*/ 1162,
+      -1, -1,
+      /*0xa754*/ 1026,
+      /*0x039d*/ 254,
+      -1, -1,
+      /*0x1f2d*/ 673,
+      /*0x10ad*/ 497,
+      /*0xff39*/ 1104,
+      /*0x01b1*/ 150,
+      /*0x24c0*/ 834,
+      -1,
+      /*0x10b1*/ 501,
+      -1, -1, -1, -1,
+      /*0x01fe*/ 189,
+      /*0x118b9*/ 1171,
+      /*0x1041b*/ 1133,
+      -1, -1,
+      /*0xa758*/ 1028,
+      -1,
+      /*0x1f9b*/ 733,
+      /*0x041b*/ 324,
+      /*0x2c1b*/ 877,
+      /*0x1e9b*/ 604,
+      /*0xa65c*/ 979,
+      /*0x118bb*/ 1173,
+      -1,
+      /*0xff2b*/ 1090,
+      -1,
+      /*0xa740*/ 1016,
+      /*0x24b7*/ 825,
+      -1,
+      /*0x039b*/ 252,
+      /*0x01f4*/ 183,
+      /*0x0551*/ 477,
+      /*0x216d*/ 820,
+      -1,
+      /*0x118ab*/ 1157,
+      /*0x10419*/ 1131,
+      -1,
+      /*0xa734*/ 1010,
+      /*0x00c9*/ 35,
+      -1,
+      /*0x1f99*/ 731,
+      /*0x0419*/ 322,
+      /*0x2c19*/ 875,
+      /*0x1e99*/ 602,
+      -1,
+      /*0x1f49*/ 685,
+      /*0x00c1*/ 27,
+      /*0x24b9*/ 827,
+      -1, -1, -1, -1,
+      /*0x0399*/ 250,
+      -1,
+      /*0x10c1*/ 517,
+      /*0x1040f*/ 1121,
+      /*0x24c7*/ 841,
+      -1,
+      /*0x24bb*/ 829,
+      -1,
+      /*0x1f8f*/ 721,
+      /*0x040f*/ 312,
+      /*0x2c0f*/ 865,
+      -1,
+      /*0x10409*/ 1115,
+      /*0xa75e*/ 1031,
+      -1, -1, -1,
+      /*0x1f89*/ 715,
+      /*0x0409*/ 306,
+      /*0x2c09*/ 859,
+      /*0x038f*/ 240,
+      -1,
+      /*0x0376*/ 232,
+      /*0xff2f*/ 1094,
+      /*0x10a5*/ 489,
+      /*0x1041f*/ 1137,
+      -1, -1,
+      /*0x24c3*/ 837,
+      /*0x0389*/ 236,
+      /*0x1f9f*/ 737,
+      /*0x041f*/ 328,
+      /*0x2c1f*/ 881,
+      /*0x118af*/ 1161,
+      -1,
+      /*0xff27*/ 1086,
+      -1, -1, -1, -1, -1,
+      /*0x10411*/ 1123,
+      /*0x039f*/ 256,
+      -1, -1,
+      /*0x118a7*/ 1153,
+      /*0x1f91*/ 723,
+      /*0x0411*/ 314,
+      /*0x2c11*/ 867,
+      /*0x2183*/ 823,
+      -1,
+      /*0x216e*/ 821,
+      -1, -1, -1, -1,
+      /*0x10a3*/ 487,
+      -1,
+      /*0x0391*/ 242,
+      /*0x10a1*/ 485,
+      -1, -1, -1, -1, -1,
+      /*0x2166*/ 813,
+      /*0x01f6*/ 184,
+      -1,
+      /*0x00d1*/ 43,
+      -1,
+      /*0xff33*/ 1098,
+      -1, -1,
+      /*0x01d1*/ 165,
+      -1, -1, -1, -1, -1,
+      /*0x01fa*/ 187,
+      /*0x118b3*/ 1165,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff2d*/ 1092,
+      -1, -1, -1, -1,
+      /*0xff31*/ 1096,
+      -1, -1, -1, -1,
+      /*0x118ad*/ 1159,
+      -1, -1, -1, -1,
+      /*0x118b1*/ 1163,
+      -1, -1,
+      /*0x24cb*/ 845,
+      -1, -1, -1,
+      /*0x01f8*/ 186,
+      -1, -1, -1, -1,
+      /*0xa75c*/ 1030,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x019d*/ 139,
+      -1,
+      /*0x1f1d*/ 667,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff25*/ 1084,
+      -1, -1, -1, -1, -1,
+      /*0xa77e*/ 1043,
+      -1, -1, -1,
+      /*0x118a5*/ 1151,
+      -1, -1,
+      /*0x1f1b*/ 665,
+      -1, -1,
+      /*0x24c9*/ 843,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x24c1*/ 835,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff23*/ 1082,
+      -1, -1,
+      /*0xff21*/ 1080,
+      /*0x1f19*/ 663,
+      -1, -1, -1, -1, -1,
+      /*0x118a3*/ 1149,
+      /*0x212b*/ 805,
+      -1,
+      /*0x118a1*/ 1147,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x018f*/ 130,
+      -1,
+      /*0x1f0f*/ 661,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0189*/ 126,
+      -1,
+      /*0x1f09*/ 655,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x019f*/ 140,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x0191*/ 132,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xfb03*/ 1071,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xfb05*/ 1073
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseFold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
+            return &CaseFold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
+#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1054])(CaseUnfold_11_Table+0))
+  {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, {0x004b, 0x212a}}},
+  {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, {0x00c5, 0x212b}}},
+  {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}}},
+  {0x0180, {1, {0x0243}}},
+  {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}}},
+  {0x023f, {1, {0x2c7e}}},
+  {0x0240, {1, {0x2c7f}}},
+  {0x0242, {1, {0x0241}}},
+  {0x0247, {1, {0x0246}}},
+  {0x0249, {1, {0x0248}}},
+  {0x024b, {1, {0x024a}}},
+  {0x024d, {1, {0x024c}}},
+  {0x024f, {1, {0x024e}}},
+  {0x0250, {1, {0x2c6f}}},
+  {0x0251, {1, {0x2c6d}}},
+  {0x0252, {1, {0x2c70}}},
+  {0x0253, {1, {0x0181}}},
+  {0x0254, {1, {0x0186}}},
+  {0x0256, {1, {0x0189}}},
+  {0x0257, {1, {0x018a}}},
+  {0x0259, {1, {0x018f}}},
+  {0x025b, {1, {0x0190}}},
+  {0x025c, {1, {0xa7ab}}},
+  {0x0260, {1, {0x0193}}},
+  {0x0261, {1, {0xa7ac}}},
+  {0x0263, {1, {0x0194}}},
+  {0x0265, {1, {0xa78d}}},
+  {0x0266, {1, {0xa7aa}}},
+  {0x0268, {1, {0x0197}}},
+  {0x0269, {1, {0x0196}}},
+  {0x026b, {1, {0x2c62}}},
+  {0x026c, {1, {0xa7ad}}},
+  {0x026f, {1, {0x019c}}},
+  {0x0271, {1, {0x2c6e}}},
+  {0x0272, {1, {0x019d}}},
+  {0x0275, {1, {0x019f}}},
+  {0x027d, {1, {0x2c64}}},
+  {0x0280, {1, {0x01a6}}},
+  {0x0283, {1, {0x01a9}}},
+  {0x0287, {1, {0xa7b1}}},
+  {0x0288, {1, {0x01ae}}},
+  {0x0289, {1, {0x0244}}},
+  {0x028a, {1, {0x01b1}}},
+  {0x028b, {1, {0x01b2}}},
+  {0x028c, {1, {0x0245}}},
+  {0x0292, {1, {0x01b7}}},
+  {0x029e, {1, {0xa7b0}}},
+  {0x0371, {1, {0x0370}}},
+  {0x0373, {1, {0x0372}}},
+  {0x0377, {1, {0x0376}}},
+  {0x037b, {1, {0x03fd}}},
+  {0x037c, {1, {0x03fe}}},
+  {0x037d, {1, {0x03ff}}},
+  {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, {0x0395, 0x03f5}}},
+  {0x03b6, {1, {0x0396}}},
+  {0x03b7, {1, {0x0397}}},
+  {0x03b8, {3, {0x0398, 0x03d1, 0x03f4}}},
+  {0x03b9, {3, {0x0345, 0x0399, 0x1fbe}}},
+  {0x03ba, {2, {0x039a, 0x03f0}}},
+  {0x03bb, {1, {0x039b}}},
+  {0x03bc, {2, {0x00b5, 0x039c}}},
+  {0x03bd, {1, {0x039d}}},
+  {0x03be, {1, {0x039e}}},
+  {0x03bf, {1, {0x039f}}},
+  {0x03c0, {2, {0x03a0, 0x03d6}}},
+  {0x03c1, {2, {0x03a1, 0x03f1}}},
+  {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}}},
+  {0x03d7, {1, {0x03cf}}},
+  {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}}},
+  {0x03f3, {1, {0x037f}}},
+  {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}}},
+  {0x04cf, {1, {0x04c0}}},
+  {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}}},
+  {0x04fb, {1, {0x04fa}}},
+  {0x04fd, {1, {0x04fc}}},
+  {0x04ff, {1, {0x04fe}}},
+  {0x0501, {1, {0x0500}}},
+  {0x0503, {1, {0x0502}}},
+  {0x0505, {1, {0x0504}}},
+  {0x0507, {1, {0x0506}}},
+  {0x0509, {1, {0x0508}}},
+  {0x050b, {1, {0x050a}}},
+  {0x050d, {1, {0x050c}}},
+  {0x050f, {1, {0x050e}}},
+  {0x0511, {1, {0x0510}}},
+  {0x0513, {1, {0x0512}}},
+  {0x0515, {1, {0x0514}}},
+  {0x0517, {1, {0x0516}}},
+  {0x0519, {1, {0x0518}}},
+  {0x051b, {1, {0x051a}}},
+  {0x051d, {1, {0x051c}}},
+  {0x051f, {1, {0x051e}}},
+  {0x0521, {1, {0x0520}}},
+  {0x0523, {1, {0x0522}}},
+  {0x0525, {1, {0x0524}}},
+  {0x0527, {1, {0x0526}}},
+  {0x0529, {1, {0x0528}}},
+  {0x052b, {1, {0x052a}}},
+  {0x052d, {1, {0x052c}}},
+  {0x052f, {1, {0x052e}}},
+  {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}}},
+  {0x1d79, {1, {0xa77d}}},
+  {0x1d7d, {1, {0x2c63}}},
+  {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, {0x1e60, 0x1e9b}}},
+  {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}}},
+  {0x1efb, {1, {0x1efa}}},
+  {0x1efd, {1, {0x1efc}}},
+  {0x1eff, {1, {0x1efe}}},
+  {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}}},
+  {0x214e, {1, {0x2132}}},
+  {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}}},
+  {0x2184, {1, {0x2183}}},
+  {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}}},
+  {0x2c61, {1, {0x2c60}}},
+  {0x2c65, {1, {0x023a}}},
+  {0x2c66, {1, {0x023e}}},
+  {0x2c68, {1, {0x2c67}}},
+  {0x2c6a, {1, {0x2c69}}},
+  {0x2c6c, {1, {0x2c6b}}},
+  {0x2c73, {1, {0x2c72}}},
+  {0x2c76, {1, {0x2c75}}},
+  {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}}},
+  {0x2cec, {1, {0x2ceb}}},
+  {0x2cee, {1, {0x2ced}}},
+  {0x2cf3, {1, {0x2cf2}}},
+  {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}}},
+  {0x2d27, {1, {0x10c7}}},
+  {0x2d2d, {1, {0x10cd}}},
+  {0xa641, {1, {0xa640}}},
+  {0xa643, {1, {0xa642}}},
+  {0xa645, {1, {0xa644}}},
+  {0xa647, {1, {0xa646}}},
+  {0xa649, {1, {0xa648}}},
+  {0xa64b, {1, {0xa64a}}},
+  {0xa64d, {1, {0xa64c}}},
+  {0xa64f, {1, {0xa64e}}},
+  {0xa651, {1, {0xa650}}},
+  {0xa653, {1, {0xa652}}},
+  {0xa655, {1, {0xa654}}},
+  {0xa657, {1, {0xa656}}},
+  {0xa659, {1, {0xa658}}},
+  {0xa65b, {1, {0xa65a}}},
+  {0xa65d, {1, {0xa65c}}},
+  {0xa65f, {1, {0xa65e}}},
+  {0xa661, {1, {0xa660}}},
+  {0xa663, {1, {0xa662}}},
+  {0xa665, {1, {0xa664}}},
+  {0xa667, {1, {0xa666}}},
+  {0xa669, {1, {0xa668}}},
+  {0xa66b, {1, {0xa66a}}},
+  {0xa66d, {1, {0xa66c}}},
+  {0xa681, {1, {0xa680}}},
+  {0xa683, {1, {0xa682}}},
+  {0xa685, {1, {0xa684}}},
+  {0xa687, {1, {0xa686}}},
+  {0xa689, {1, {0xa688}}},
+  {0xa68b, {1, {0xa68a}}},
+  {0xa68d, {1, {0xa68c}}},
+  {0xa68f, {1, {0xa68e}}},
+  {0xa691, {1, {0xa690}}},
+  {0xa693, {1, {0xa692}}},
+  {0xa695, {1, {0xa694}}},
+  {0xa697, {1, {0xa696}}},
+  {0xa699, {1, {0xa698}}},
+  {0xa69b, {1, {0xa69a}}},
+  {0xa723, {1, {0xa722}}},
+  {0xa725, {1, {0xa724}}},
+  {0xa727, {1, {0xa726}}},
+  {0xa729, {1, {0xa728}}},
+  {0xa72b, {1, {0xa72a}}},
+  {0xa72d, {1, {0xa72c}}},
+  {0xa72f, {1, {0xa72e}}},
+  {0xa733, {1, {0xa732}}},
+  {0xa735, {1, {0xa734}}},
+  {0xa737, {1, {0xa736}}},
+  {0xa739, {1, {0xa738}}},
+  {0xa73b, {1, {0xa73a}}},
+  {0xa73d, {1, {0xa73c}}},
+  {0xa73f, {1, {0xa73e}}},
+  {0xa741, {1, {0xa740}}},
+  {0xa743, {1, {0xa742}}},
+  {0xa745, {1, {0xa744}}},
+  {0xa747, {1, {0xa746}}},
+  {0xa749, {1, {0xa748}}},
+  {0xa74b, {1, {0xa74a}}},
+  {0xa74d, {1, {0xa74c}}},
+  {0xa74f, {1, {0xa74e}}},
+  {0xa751, {1, {0xa750}}},
+  {0xa753, {1, {0xa752}}},
+  {0xa755, {1, {0xa754}}},
+  {0xa757, {1, {0xa756}}},
+  {0xa759, {1, {0xa758}}},
+  {0xa75b, {1, {0xa75a}}},
+  {0xa75d, {1, {0xa75c}}},
+  {0xa75f, {1, {0xa75e}}},
+  {0xa761, {1, {0xa760}}},
+  {0xa763, {1, {0xa762}}},
+  {0xa765, {1, {0xa764}}},
+  {0xa767, {1, {0xa766}}},
+  {0xa769, {1, {0xa768}}},
+  {0xa76b, {1, {0xa76a}}},
+  {0xa76d, {1, {0xa76c}}},
+  {0xa76f, {1, {0xa76e}}},
+  {0xa77a, {1, {0xa779}}},
+  {0xa77c, {1, {0xa77b}}},
+  {0xa77f, {1, {0xa77e}}},
+  {0xa781, {1, {0xa780}}},
+  {0xa783, {1, {0xa782}}},
+  {0xa785, {1, {0xa784}}},
+  {0xa787, {1, {0xa786}}},
+  {0xa78c, {1, {0xa78b}}},
+  {0xa791, {1, {0xa790}}},
+  {0xa793, {1, {0xa792}}},
+  {0xa797, {1, {0xa796}}},
+  {0xa799, {1, {0xa798}}},
+  {0xa79b, {1, {0xa79a}}},
+  {0xa79d, {1, {0xa79c}}},
+  {0xa79f, {1, {0xa79e}}},
+  {0xa7a1, {1, {0xa7a0}}},
+  {0xa7a3, {1, {0xa7a2}}},
+  {0xa7a5, {1, {0xa7a4}}},
+  {0xa7a7, {1, {0xa7a6}}},
+  {0xa7a9, {1, {0xa7a8}}},
+  {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}}},
+  {0x118c0, {1, {0x118a0}}},
+  {0x118c1, {1, {0x118a1}}},
+  {0x118c2, {1, {0x118a2}}},
+  {0x118c3, {1, {0x118a3}}},
+  {0x118c4, {1, {0x118a4}}},
+  {0x118c5, {1, {0x118a5}}},
+  {0x118c6, {1, {0x118a6}}},
+  {0x118c7, {1, {0x118a7}}},
+  {0x118c8, {1, {0x118a8}}},
+  {0x118c9, {1, {0x118a9}}},
+  {0x118ca, {1, {0x118aa}}},
+  {0x118cb, {1, {0x118ab}}},
+  {0x118cc, {1, {0x118ac}}},
+  {0x118cd, {1, {0x118ad}}},
+  {0x118ce, {1, {0x118ae}}},
+  {0x118cf, {1, {0x118af}}},
+  {0x118d0, {1, {0x118b0}}},
+  {0x118d1, {1, {0x118b1}}},
+  {0x118d2, {1, {0x118b2}}},
+  {0x118d3, {1, {0x118b3}}},
+  {0x118d4, {1, {0x118b4}}},
+  {0x118d5, {1, {0x118b5}}},
+  {0x118d6, {1, {0x118b6}}},
+  {0x118d7, {1, {0x118b7}}},
+  {0x118d8, {1, {0x118b8}}},
+  {0x118d9, {1, {0x118b9}}},
+  {0x118da, {1, {0x118ba}}},
+  {0x118db, {1, {0x118bb}}},
+  {0x118dc, {1, {0x118bc}}},
+  {0x118dd, {1, {0x118bd}}},
+  {0x118de, {1, {0x118be}}},
+  {0x118df, {1, {0x118bf}}},
+#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1054))
+  {0x0069, {1, {0x0049}}},
+};
+
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
+
+/* maximum key range = 1907, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+         1, 1915,    4,   12,  199,  716,    4,  230,    6,  134,
+       355,  116,    9,    3,    7,   13, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915,   40, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915,   21, 1915,    2,    1,   11,   49,   50,  667,
+       131,  651,   26,  872,  251, 1136,   24,   42,  295, 1145,
+       111,   27,   47,   12,  812,  806,  107,  786,   21, 1070,
+        13,  967,   41,    5,  523, 1152,   71, 1077,   73,  948,
+        14,  601,   10,  575,   15,  764,    1,  929,   27, 1057,
+        23,  498,   15,  918, 1208,  753, 1211,  512, 1180,  736,
+      1082,  711,  441,  898,  410, 1028,  277,  887,  238,  684,
+       336,  425,  740,  406, 1016,  360,  972,  382, 1006,  354,
+      1168,  302,  999,  286,  901,  252,  546,  106, 1159,  148,
+      1121,  224, 1061,  132, 1152,  182,  871,  210, 1163,  235,
+      1183,  371, 1197,   64,  954,   90,  339,   79,  604,  168,
+       982,  159,  448,  328,  525,  634,  195,  620,  261,  852,
+       934,  312,  210,  836,  668,  983,  586,  823,  460,  955,
+      1176,  697,  119,  998
+    };
+  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList3 *
+onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x118df,
+      TOTAL_KEYWORDS = 1055,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 8,
+      MAX_HASH_VALUE = 1914
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1e1b*/ 490,
+      /*0x049b*/ 362,
+      /*0x011b*/ 69,
+      /*0x2c9b*/ 781,
+      /*0x021b*/ 178,
+      /*0x051b*/ 426,
+      /*0x1e91*/ 549,
+      /*0x1e11*/ 485,
+      /*0x0491*/ 357,
+      /*0x0111*/ 64,
+      /*0x2c91*/ 776,
+      /*0x0211*/ 173,
+      /*0x0511*/ 421,
+      /*0xa79b*/ 948,
+      /*0x1f24*/ 618,
+      /*0x1f00*/ 600,
+      /*0x1f11*/ 609,
+      /*0x0580*/ 468,
+      /*0x1f22*/ 616,
+      /*0x1f26*/ 620,
+      /*0xa791*/ 944,
+      /*0x1e8f*/ 548,
+      /*0x1e0f*/ 484,
+      /*0x048f*/ 356,
+      /*0x010f*/ 63,
+      /*0x2c8f*/ 775,
+      /*0x020f*/ 172,
+      /*0x050f*/ 420,
+      /*0xa69b*/ 897,
+      -1,
+      /*0x1f06*/ 606,
+      -1,
+      /*0x0586*/ 474,
+      -1, -1,
+      /*0xa691*/ 892,
+      /*0x1e8b*/ 546,
+      /*0x1e0b*/ 482,
+      /*0x048b*/ 354,
+      /*0x010b*/ 61,
+      /*0x2c8b*/ 773,
+      /*0x020b*/ 170,
+      /*0x050b*/ 418,
+      /*0x1e81*/ 541,
+      /*0x1e01*/ 477,
+      /*0x0481*/ 353,
+      /*0x0101*/ 56,
+      /*0x2c81*/ 768,
+      /*0x0201*/ 165,
+      /*0x0501*/ 413,
+      /*0xa68f*/ 891,
+      /*0x1f10*/ 608,
+      -1,
+      /*0x1f01*/ 601,
+      /*0x1f02*/ 602,
+      /*0x0581*/ 469,
+      /*0x0582*/ 470,
+      /*0xa781*/ 939,
+      /*0x1ee1*/ 584,
+      /*0x1e61*/ 525,
+      /*0x04e1*/ 397,
+      /*0x0161*/ 102,
+      /*0x2ce1*/ 816,
+      /*0x0261*/ 210,
+      /*0x0561*/ 437,
+      /*0xa68b*/ 889,
+      /*0x0461*/ 337,
+      -1,
+      /*0x1f61*/ 641,
+      -1, -1, -1,
+      /*0xa681*/ 884,
+      /*0x1ee5*/ 586,
+      /*0x1e65*/ 527,
+      /*0x04e5*/ 399,
+      /*0x0165*/ 104,
+      /*0x1f20*/ 614,
+      /*0x0265*/ 212,
+      /*0x0565*/ 441,
+      -1,
+      /*0x0465*/ 339,
+      -1,
+      /*0x1f65*/ 645,
+      /*0x1ee3*/ 585,
+      /*0x1e63*/ 526,
+      /*0x04e3*/ 398,
+      /*0x0163*/ 103,
+      /*0x2ce3*/ 817,
+      /*0x0263*/ 211,
+      /*0x0563*/ 439,
+      -1,
+      /*0x0463*/ 338,
+      -1,
+      /*0x1f63*/ 643,
+      -1, -1, -1,
+      /*0x2c61*/ 760,
+      /*0x24e1*/ 704,
+      /*0x1ed1*/ 576,
+      /*0x1e51*/ 517,
+      /*0x04d1*/ 389,
+      /*0x0151*/ 94,
+      /*0x2cd1*/ 808,
+      /*0x0251*/ 200,
+      /*0x1fe1*/ 667,
+      /*0xa761*/ 928,
+      /*0x0451*/ 322,
+      -1,
+      /*0x1f51*/ 636,
+      /*0x1f14*/ 612,
+      -1,
+      /*0x2c65*/ 761,
+      /*0x24e5*/ 708,
+      -1,
+      /*0x017e*/ 116,
+      -1, -1,
+      /*0x057e*/ 466,
+      -1,
+      /*0x1fe5*/ 668,
+      /*0xa765*/ 930,
+      -1,
+      /*0x03ae*/ 241,
+      /*0x24e3*/ 706,
+      /*0x1ed7*/ 579,
+      /*0x1e57*/ 520,
+      /*0x04d7*/ 392,
+      /*0x0157*/ 97,
+      /*0x2cd7*/ 811,
+      /*0x0257*/ 205,
+      /*0x03ac*/ 239,
+      /*0xa763*/ 929,
+      /*0x0457*/ 328,
+      /*0x1f04*/ 604,
+      /*0x1f57*/ 639,
+      /*0x0584*/ 472,
+      /*0x0280*/ 223,
+      -1,
+      /*0x2c51*/ 746,
+      /*0x24d1*/ 688,
+      /*0x1ed3*/ 577,
+      /*0x1e53*/ 518,
+      /*0x04d3*/ 390,
+      /*0x0153*/ 95,
+      /*0x2cd3*/ 809,
+      /*0x0253*/ 202,
+      /*0x1fd1*/ 665,
+      /*0xa751*/ 920,
+      /*0x0453*/ 324,
+      /*0x028a*/ 228,
+      /*0x1f53*/ 637,
+      /*0x1ee9*/ 588,
+      /*0x1e69*/ 529,
+      /*0x04e9*/ 401,
+      /*0x0169*/ 106,
+      -1,
+      /*0x0269*/ 215,
+      /*0x0569*/ 445,
+      -1,
+      /*0x0469*/ 341,
+      /*0x1ee7*/ 587,
+      /*0x1e67*/ 528,
+      /*0x04e7*/ 400,
+      /*0x0167*/ 105,
+      /*0x2c57*/ 752,
+      /*0x24d7*/ 694,
+      /*0x0567*/ 443,
+      /*0x028b*/ 229,
+      /*0x0467*/ 340,
+      /*0xa661*/ 877,
+      /*0x1f67*/ 647,
+      /*0x03e1*/ 277,
+      -1,
+      /*0xa757*/ 923,
+      /*0x1ed9*/ 580,
+      /*0x1e59*/ 521,
+      /*0x04d9*/ 393,
+      /*0x0159*/ 98,
+      /*0x2cd9*/ 812,
+      /*0x0259*/ 206,
+      /*0x2c53*/ 748,
+      /*0x24d3*/ 690,
+      /*0x0459*/ 330,
+      -1,
+      /*0xa665*/ 879,
+      -1,
+      /*0x03e5*/ 279,
+      -1, -1,
+      /*0xa753*/ 921,
+      -1,
+      /*0x2cee*/ 819,
+      /*0x24e9*/ 712,
+      /*0x056e*/ 450,
+      -1,
+      /*0xa663*/ 878,
+      /*0x029e*/ 232,
+      /*0x03e3*/ 278,
+      -1,
+      /*0x10428*/ 982,
+      /*0xa769*/ 932,
+      /*0x24e7*/ 710,
+      /*0x1edb*/ 581,
+      /*0x1e5b*/ 522,
+      /*0x04db*/ 394,
+      /*0x015b*/ 99,
+      /*0x2cdb*/ 813,
+      /*0x025b*/ 207,
+      /*0x0574*/ 456,
+      /*0xa767*/ 931,
+      /*0x045b*/ 332,
+      /*0xa651*/ 869,
+      /*0x1f74*/ 652,
+      /*0x1042e*/ 988,
+      /*0x2c59*/ 754,
+      /*0x24d9*/ 696,
+      /*0x1ed5*/ 578,
+      /*0x1e55*/ 519,
+      /*0x04d5*/ 391,
+      /*0x0155*/ 96,
+      /*0x2cd5*/ 810,
+      /*0x1042c*/ 986,
+      /*0x01a8*/ 130,
+      /*0xa759*/ 924,
+      /*0x0455*/ 326,
+      /*0x1042a*/ 984,
+      /*0x1f55*/ 638,
+      /*0x1edd*/ 582,
+      /*0x1e5d*/ 523,
+      /*0x04dd*/ 395,
+      /*0x015d*/ 100,
+      /*0x2cdd*/ 814,
+      /*0x0180*/ 117,
+      /*0x013e*/ 85,
+      -1,
+      /*0x045d*/ 334,
+      -1,
+      /*0xa657*/ 872,
+      /*0x043e*/ 303,
+      /*0x03d7*/ 272,
+      -1,
+      /*0x217e*/ 684,
+      /*0x2c5b*/ 756,
+      /*0x24db*/ 698,
+      /*0x1ecf*/ 575,
+      /*0x1e4f*/ 516,
+      /*0x04cf*/ 388,
+      /*0x014f*/ 93,
+      /*0x2ccf*/ 807,
+      /*0x024f*/ 198,
+      -1,
+      /*0xa75b*/ 925,
+      /*0x044f*/ 320,
+      /*0xa653*/ 870,
+      /*0x0061*/ 0,
+      -1,
+      /*0x2c55*/ 750,
+      /*0x24d5*/ 692,
+      -1,
+      /*0x0570*/ 452,
+      -1, -1,
+      /*0x019a*/ 125,
+      /*0x1f70*/ 648,
+      /*0xa669*/ 881,
+      /*0xa755*/ 922,
+      /*0x03e9*/ 281,
+      /*0x2c5d*/ 758,
+      /*0x24dd*/ 700,
+      /*0x0065*/ 4,
+      /*0x2c3e*/ 727,
+      -1,
+      /*0x013c*/ 84,
+      /*0xa667*/ 880,
+      /*0x023c*/ 190,
+      /*0x03e7*/ 280,
+      /*0xa75d*/ 926,
+      /*0x043c*/ 301,
+      /*0x1ecd*/ 574,
+      /*0x1e4d*/ 515,
+      /*0x0063*/ 2,
+      /*0x014d*/ 92,
+      /*0x2ccd*/ 806,
+      /*0x024d*/ 197,
+      /*0x2c4f*/ 744,
+      /*0x01e1*/ 151,
+      /*0x044d*/ 318,
+      /*0xa659*/ 873,
+      -1,
+      /*0x03d9*/ 273,
+      -1, -1,
+      /*0x019e*/ 126,
+      /*0xa74f*/ 919,
+      /*0x1ecb*/ 573,
+      /*0x1e4b*/ 514,
+      -1,
+      /*0x014b*/ 91,
+      /*0x2ccb*/ 805,
+      /*0x024b*/ 196,
+      /*0x01e5*/ 153,
+      /*0xa78c*/ 943,
+      /*0x044b*/ 316,
+      -1,
+      /*0x1ef3*/ 593,
+      /*0x1e73*/ 534,
+      /*0x04f3*/ 406,
+      /*0x0173*/ 111,
+      /*0x2cf3*/ 820,
+      /*0x2c3c*/ 725,
+      /*0x0573*/ 455,
+      /*0x01e3*/ 152,
+      /*0x0473*/ 346,
+      -1,
+      /*0x1f73*/ 651,
+      /*0xa65b*/ 874,
+      -1,
+      /*0x03db*/ 274,
+      /*0x2c4d*/ 742,
+      -1,
+      /*0x1eeb*/ 589,
+      /*0x1e6b*/ 530,
+      /*0x04eb*/ 402,
+      /*0x016b*/ 107,
+      -1,
+      /*0x026b*/ 216,
+      /*0x056b*/ 447,
+      /*0xa74d*/ 918,
+      /*0x046b*/ 342,
+      /*0xa655*/ 871,
+      -1,
+      /*0x0140*/ 86,
+      /*0x2174*/ 674,
+      /*0x0240*/ 192,
+      /*0x2c4b*/ 740,
+      /*0x118d1*/ 1039,
+      /*0x0440*/ 305,
+      /*0x0564*/ 440,
+      /*0x1f40*/ 630,
+      -1,
+      /*0xa65d*/ 875,
+      /*0x1f64*/ 644,
+      /*0x03dd*/ 275,
+      /*0xa74b*/ 917,
+      /*0x2c73*/ 766,
+      /*0x03be*/ 256,
+      /*0x1ec9*/ 572,
+      /*0x1e49*/ 513,
+      -1,
+      /*0x0069*/ 1054,
+      /*0x2cc9*/ 804,
+      /*0x0249*/ 195,
+      /*0x1ec5*/ 570,
+      /*0x1e45*/ 511,
+      /*0x0449*/ 314,
+      -1,
+      /*0x2cc5*/ 802,
+      /*0xa64f*/ 868,
+      /*0x0067*/ 6,
+      -1,
+      /*0x0445*/ 310,
+      /*0x118d7*/ 1045,
+      /*0x1f45*/ 635,
+      /*0x1edf*/ 583,
+      /*0x1e5f*/ 524,
+      /*0x04df*/ 396,
+      /*0x015f*/ 101,
+      /*0x2cdf*/ 815,
+      /*0x2c40*/ 729,
+      /*0xa76b*/ 933,
+      -1,
+      /*0x045f*/ 336,
+      /*0x24e4*/ 707,
+      -1,
+      /*0x1ec7*/ 571,
+      /*0x1e47*/ 512,
+      /*0x0288*/ 226,
+      /*0x118d3*/ 1041,
+      /*0x2cc7*/ 803,
+      /*0x0247*/ 194,
+      /*0x01e9*/ 155,
+      -1,
+      /*0x0447*/ 312,
+      /*0x2170*/ 670,
+      /*0x03bc*/ 254,
+      /*0x006e*/ 12,
+      /*0x2c49*/ 738,
+      -1, -1,
+      /*0x01e7*/ 154,
+      -1,
+      /*0xa64d*/ 867,
+      /*0x2c45*/ 734,
+      /*0x03cd*/ 270,
+      -1,
+      /*0xa749*/ 916,
+      -1, -1,
+      /*0x1ec3*/ 569,
+      /*0x1e43*/ 510,
+      /*0x0074*/ 18,
+      /*0xa745*/ 914,
+      /*0x2cc3*/ 801,
+      -1,
+      /*0x24df*/ 702,
+      /*0x013a*/ 83,
+      /*0x0443*/ 308,
+      /*0xa64b*/ 866,
+      /*0x1f43*/ 633,
+      /*0x03cb*/ 268,
+      /*0x043a*/ 299,
+      /*0x118d9*/ 1047,
+      /*0xa75f*/ 927,
+      -1,
+      /*0x2c47*/ 736,
+      -1, -1,
+      /*0x1ec1*/ 568,
+      /*0x1e41*/ 509,
+      /*0x03f3*/ 286,
+      /*0x028c*/ 230,
+      /*0x2cc1*/ 800,
+      -1,
+      /*0xa747*/ 915,
+      -1,
+      /*0x0441*/ 306,
+      -1,
+      /*0x1f41*/ 631,
+      -1, -1, -1, -1, -1,
+      /*0xa66b*/ 882,
+      /*0x2173*/ 673,
+      /*0x03eb*/ 282,
+      /*0x1043e*/ 1004,
+      -1,
+      /*0x2c43*/ 732,
+      /*0x118db*/ 1049,
+      -1,
+      /*0x0438*/ 297,
+      /*0x2c3a*/ 723,
+      /*0x03c0*/ 258,
+      /*0xff51*/ 972,
+      -1,
+      /*0x056a*/ 446,
+      /*0xa743*/ 913,
+      -1, -1,
+      /*0x1044f*/ 1021,
+      /*0x0070*/ 14,
+      -1,
+      /*0x118d5*/ 1043,
+      -1,
+      /*0x017a*/ 114,
+      /*0x01dd*/ 149,
+      /*0x2c41*/ 730,
+      /*0x057a*/ 462,
+      /*0xa649*/ 865,
+      -1,
+      /*0x03c9*/ 266,
+      /*0x1f7a*/ 658,
+      -1,
+      /*0x118dd*/ 1051,
+      /*0xa645*/ 863,
+      /*0xa741*/ 912,
+      /*0x03c5*/ 262,
+      -1, -1,
+      /*0xff57*/ 978,
+      -1,
+      /*0x0188*/ 120,
+      /*0x2c38*/ 721,
+      -1,
+      /*0x1043c*/ 1002,
+      /*0xa65f*/ 876,
+      -1,
+      /*0x03df*/ 276,
+      -1,
+      /*0x2c6a*/ 764,
+      /*0x118cf*/ 1037,
+      -1, -1,
+      /*0x1044d*/ 1019,
+      -1,
+      /*0xff53*/ 974,
+      /*0xa647*/ 864,
+      -1,
+      /*0x03c7*/ 264,
+      /*0x1ead*/ 558,
+      /*0x1e2d*/ 499,
+      /*0x04ad*/ 371,
+      /*0x012d*/ 78,
+      /*0x2cad*/ 790,
+      /*0x022d*/ 186,
+      /*0x052d*/ 435,
+      -1, -1, -1,
+      /*0x1044b*/ 1017,
+      /*0xa77a*/ 936,
+      /*0x0073*/ 17,
+      -1,
+      /*0x1eb3*/ 561,
+      /*0x1e33*/ 502,
+      /*0x04b3*/ 374,
+      /*0x0133*/ 80,
+      /*0x2cb3*/ 793,
+      /*0x0233*/ 189,
+      -1,
+      /*0xa643*/ 862,
+      /*0x0433*/ 292,
+      /*0x03c3*/ 260,
+      /*0x1f33*/ 625,
+      /*0x118cd*/ 1035,
+      /*0x018c*/ 121,
+      /*0x03ba*/ 252,
+      /*0x006b*/ 9,
+      /*0x2d1b*/ 848,
+      /*0xff59*/ 980,
+      /*0x2cec*/ 818,
+      /*0x026c*/ 217,
+      /*0x056c*/ 448,
+      /*0x2d24*/ 857,
+      /*0x2d00*/ 821,
+      /*0x2d11*/ 838,
+      /*0x2d18*/ 845,
+      /*0x2d22*/ 855,
+      /*0x0064*/ 3,
+      /*0xa641*/ 861,
+      /*0x118cb*/ 1033,
+      /*0x03c1*/ 259,
+      /*0x01f3*/ 159,
+      /*0x10440*/ 1006,
+      /*0x2d16*/ 843,
+      -1, -1,
+      /*0x2d0a*/ 831,
+      /*0xa72d*/ 903,
+      /*0x2d06*/ 827,
+      /*0x2d0f*/ 836,
+      -1,
+      /*0x0250*/ 199,
+      /*0x2c33*/ 716,
+      -1,
+      /*0x0450*/ 321,
+      -1,
+      /*0x03b8*/ 250,
+      /*0x01eb*/ 156,
+      -1, -1,
+      /*0x10449*/ 1015,
+      /*0xa733*/ 905,
+      -1,
+      /*0x2d1a*/ 847,
+      /*0x2d0b*/ 832,
+      /*0x2c6c*/ 765,
+      /*0x10445*/ 1011,
+      -1, -1,
+      /*0x2d10*/ 837,
+      /*0xff55*/ 976,
+      /*0x2d01*/ 822,
+      /*0x2d02*/ 823,
+      /*0x118c0*/ 1022,
+      -1,
+      /*0x1ea5*/ 554,
+      /*0x1e25*/ 495,
+      /*0x04a5*/ 367,
+      /*0x0125*/ 74,
+      /*0x2ca5*/ 786,
+      /*0x0225*/ 182,
+      /*0x0525*/ 431,
+      -1,
+      /*0x01c9*/ 139,
+      -1,
+      /*0x1f25*/ 619,
+      /*0x2c50*/ 745,
+      /*0x24d0*/ 687,
+      /*0x10447*/ 1013,
+      /*0xa7a5*/ 953,
+      /*0x217a*/ 680,
+      /*0x118c9*/ 1031,
+      /*0x0578*/ 460,
+      /*0x2d1e*/ 851,
+      /*0x1fd0*/ 664,
+      /*0x2d20*/ 853,
+      /*0x1f78*/ 656,
+      /*0x118c5*/ 1027,
+      /*0xff4f*/ 970,
+      -1,
+      /*0x01df*/ 150,
+      /*0x1ea3*/ 553,
+      /*0x1e23*/ 494,
+      /*0x04a3*/ 366,
+      /*0x0123*/ 73,
+      /*0x2ca3*/ 785,
+      /*0x0223*/ 181,
+      /*0x0523*/ 430,
+      /*0x118df*/ 1053,
+      /*0x0266*/ 213,
+      /*0x0566*/ 442,
+      /*0x1f23*/ 617,
+      /*0x10443*/ 1009,
+      /*0x03ad*/ 240,
+      /*0x1f66*/ 646,
+      /*0xa7a3*/ 952,
+      /*0x1043a*/ 1000,
+      -1, -1,
+      /*0x118c7*/ 1029,
+      /*0x1eef*/ 591,
+      /*0x1e6f*/ 532,
+      /*0x04ef*/ 404,
+      /*0x016f*/ 109,
+      /*0xa725*/ 899,
+      /*0x026f*/ 218,
+      /*0x056f*/ 451,
+      /*0x03b3*/ 245,
+      /*0x046f*/ 344,
+      /*0x2d14*/ 841,
+      -1,
+      /*0x10441*/ 1007,
+      /*0xff4d*/ 968,
+      /*0x2d0e*/ 835,
+      /*0x1eed*/ 590,
+      /*0x1e6d*/ 531,
+      /*0x04ed*/ 403,
+      /*0x016d*/ 108,
+      -1, -1,
+      /*0x056d*/ 449,
+      -1,
+      /*0x046d*/ 343,
+      /*0x118c3*/ 1025,
+      /*0x2c66*/ 762,
+      /*0x24e6*/ 709,
+      /*0x006a*/ 8,
+      /*0x10438*/ 998,
+      /*0xff4b*/ 966,
+      -1,
+      /*0xa723*/ 898,
+      /*0x1e85*/ 543,
+      /*0x1e05*/ 479,
+      /*0x2d04*/ 825,
+      /*0x0105*/ 58,
+      /*0x2c85*/ 770,
+      /*0x0205*/ 167,
+      /*0x0505*/ 415,
+      /*0x007a*/ 24,
+      -1, -1,
+      /*0x1f05*/ 605,
+      /*0x118c1*/ 1023,
+      /*0x0585*/ 473,
+      -1,
+      /*0xa785*/ 941,
+      /*0x0373*/ 234,
+      /*0x1e83*/ 542,
+      /*0x1e03*/ 478,
+      /*0xa76f*/ 935,
+      /*0x0103*/ 57,
+      /*0x2c83*/ 769,
+      /*0x0203*/ 166,
+      /*0x0503*/ 414,
+      /*0x0576*/ 458,
+      -1, -1,
+      /*0x1f03*/ 603,
+      /*0x1f76*/ 654,
+      /*0x0583*/ 471,
+      /*0xa685*/ 886,
+      /*0xa783*/ 940,
+      -1,
+      /*0xa76d*/ 934,
+      /*0x1ebf*/ 567,
+      /*0x1e3f*/ 508,
+      /*0x04bf*/ 380,
+      -1,
+      /*0x2cbf*/ 799,
+      /*0x023f*/ 191,
+      -1, -1,
+      /*0x043f*/ 304,
+      -1, -1, -1,
+      /*0xa683*/ 885,
+      /*0x1efd*/ 598,
+      /*0x1e7d*/ 539,
+      /*0x04fd*/ 411,
+      /*0xff49*/ 964,
+      /*0x03f8*/ 287,
+      /*0x027d*/ 222,
+      /*0x057d*/ 465,
+      /*0x1042d*/ 987,
+      /*0x047d*/ 351,
+      /*0xff45*/ 960,
+      /*0x1f7d*/ 661,
+      /*0x2c76*/ 767,
+      -1, -1,
+      /*0x1eb7*/ 563,
+      /*0x1e37*/ 504,
+      /*0x04b7*/ 376,
+      /*0x0137*/ 82,
+      /*0x2cb7*/ 795,
+      /*0x2178*/ 678,
+      /*0x1d7d*/ 476,
+      /*0x10433*/ 993,
+      /*0x0437*/ 296,
+      -1,
+      /*0x1f37*/ 629,
+      -1,
+      /*0x006c*/ 10,
+      /*0x2c3f*/ 728,
+      -1, -1,
+      /*0x01ad*/ 131,
+      /*0xff47*/ 962,
+      -1, -1, -1, -1,
+      /*0xa73f*/ 911,
+      -1,
+      /*0x03ef*/ 284,
+      /*0x1eb5*/ 562,
+      /*0x1e35*/ 503,
+      /*0x04b5*/ 375,
+      /*0x0135*/ 81,
+      /*0x2cb5*/ 794,
+      -1,
+      /*0x04c2*/ 381,
+      /*0x0142*/ 87,
+      /*0x0435*/ 294,
+      /*0x0242*/ 193,
+      /*0x1f35*/ 627,
+      /*0xa66d*/ 883,
+      /*0x0442*/ 307,
+      /*0x03ed*/ 283,
+      /*0x1f42*/ 632,
+      /*0x2c37*/ 720,
+      /*0xff43*/ 958,
+      /*0x1eb1*/ 560,
+      /*0x1e31*/ 501,
+      /*0x04b1*/ 373,
+      -1,
+      /*0x2cb1*/ 792,
+      /*0x0231*/ 188,
+      -1,
+      /*0xa737*/ 907,
+      /*0x0431*/ 290,
+      -1,
+      /*0x1f31*/ 623,
+      /*0x1ea7*/ 555,
+      /*0x1e27*/ 496,
+      /*0x04a7*/ 368,
+      /*0x0127*/ 75,
+      /*0x2ca7*/ 787,
+      /*0x0227*/ 183,
+      /*0x0527*/ 432,
+      /*0xff41*/ 956,
+      -1,
+      /*0x2d08*/ 829,
+      /*0x1f27*/ 621,
+      /*0x01d0*/ 142,
+      /*0x2c35*/ 718,
+      -1,
+      /*0xa7a7*/ 954,
+      /*0x00e1*/ 26,
+      /*0x2c42*/ 731,
+      /*0x2184*/ 686,
+      -1,
+      /*0x118d0*/ 1038,
+      /*0x0078*/ 22,
+      /*0xa735*/ 906,
+      /*0x1e95*/ 551,
+      /*0x1e15*/ 487,
+      /*0x0495*/ 359,
+      /*0x0115*/ 66,
+      /*0x2c95*/ 778,
+      /*0x0215*/ 175,
+      /*0x0515*/ 423,
+      /*0x2c31*/ 714,
+      /*0x00e5*/ 30,
+      -1,
+      /*0x1f15*/ 613,
+      -1,
+      /*0x2176*/ 676,
+      /*0x03bf*/ 257,
+      /*0x0283*/ 224,
+      /*0x1fb1*/ 663,
+      /*0x0066*/ 5,
+      -1,
+      /*0x01a5*/ 129,
+      /*0x00e3*/ 28,
+      /*0x1e93*/ 550,
+      /*0x1e13*/ 486,
+      /*0x0493*/ 358,
+      /*0x0113*/ 65,
+      /*0x2c93*/ 777,
+      /*0x0213*/ 174,
+      /*0x0513*/ 422,
+      /*0xa727*/ 900,
+      -1,
+      /*0xa695*/ 894,
+      /*0x1f13*/ 611,
+      /*0x2d0c*/ 833,
+      /*0x006f*/ 13,
+      -1,
+      /*0xa793*/ 945,
+      -1,
+      /*0x1f12*/ 610,
+      /*0x1ef9*/ 596,
+      /*0x1e79*/ 537,
+      /*0x04f9*/ 409,
+      /*0x03b7*/ 249,
+      /*0x217d*/ 683,
+      -1,
+      /*0x0579*/ 461,
+      /*0x01a3*/ 128,
+      /*0x0479*/ 349,
+      /*0x006d*/ 11,
+      /*0x1f79*/ 657,
+      /*0x00fe*/ 54,
+      /*0xa693*/ 893,
+      /*0x1ef5*/ 594,
+      /*0x1e75*/ 535,
+      /*0x04f5*/ 407,
+      /*0x0175*/ 112,
+      -1,
+      /*0x0275*/ 221,
+      /*0x0575*/ 457,
+      /*0x1d79*/ 475,
+      /*0x0475*/ 347,
+      -1,
+      /*0x1f75*/ 653,
+      -1, -1,
+      /*0x01ef*/ 158,
+      -1,
+      /*0x03b5*/ 247,
+      /*0x1ef1*/ 592,
+      /*0x1e71*/ 533,
+      /*0x04f1*/ 405,
+      /*0x0171*/ 110,
+      -1,
+      /*0x0271*/ 219,
+      /*0x0571*/ 453,
+      -1,
+      /*0x0471*/ 345,
+      -1,
+      /*0x1f71*/ 649,
+      /*0x01ed*/ 157,
+      -1, -1,
+      /*0x0076*/ 20,
+      -1,
+      /*0x03b1*/ 243,
+      -1, -1, -1,
+      /*0x1e87*/ 544,
+      /*0x1e07*/ 480,
+      /*0x00e9*/ 34,
+      /*0x0107*/ 59,
+      /*0x2c87*/ 771,
+      /*0x0207*/ 168,
+      /*0x0507*/ 416,
+      /*0x045a*/ 331,
+      /*0x0185*/ 119,
+      -1,
+      /*0x1f07*/ 607,
+      /*0x00e7*/ 32,
+      -1, -1,
+      /*0xa787*/ 942,
+      /*0x1ebd*/ 566,
+      /*0x1e3d*/ 507,
+      /*0x04bd*/ 379,
+      /*0x1043f*/ 1005,
+      /*0x2cbd*/ 798,
+      /*0xff50*/ 971,
+      -1, -1,
+      /*0x043d*/ 302,
+      /*0x0183*/ 118,
+      -1,
+      /*0x1eb9*/ 564,
+      /*0x1e39*/ 505,
+      /*0x04b9*/ 377,
+      /*0xa687*/ 887,
+      /*0x2cb9*/ 796,
+      /*0x04ce*/ 387,
+      -1, -1,
+      /*0x0439*/ 298,
+      -1, -1,
+      /*0x044e*/ 319,
+      /*0x00ee*/ 39,
+      /*0x2c5a*/ 755,
+      /*0x24da*/ 697,
+      /*0x01bf*/ 137,
+      -1, -1, -1,
+      /*0x10437*/ 997,
+      /*0x1eaf*/ 559,
+      /*0x1e2f*/ 500,
+      /*0x04af*/ 372,
+      /*0x012f*/ 79,
+      /*0x2caf*/ 791,
+      /*0x022f*/ 187,
+      /*0x052f*/ 436,
+      /*0x00f4*/ 45,
+      /*0x01fd*/ 163,
+      /*0x2c3d*/ 726,
+      -1,
+      /*0x1ea9*/ 556,
+      /*0x1e29*/ 497,
+      /*0x04a9*/ 369,
+      /*0x0129*/ 76,
+      /*0x2ca9*/ 788,
+      /*0x0229*/ 184,
+      /*0x0529*/ 433,
+      /*0xa73d*/ 910,
+      -1,
+      /*0x2c39*/ 722,
+      /*0x0272*/ 220,
+      /*0x0572*/ 454,
+      /*0x2c4e*/ 743,
+      /*0x10435*/ 995,
+      /*0xa7a9*/ 955,
+      /*0x1f72*/ 650,
+      /*0x0292*/ 231,
+      /*0x10442*/ 1008,
+      /*0xa739*/ 908,
+      /*0x1ea1*/ 552,
+      /*0x1e21*/ 493,
+      /*0x04a1*/ 365,
+      /*0x0121*/ 72,
+      /*0x2ca1*/ 784,
+      /*0x2179*/ 679,
+      /*0x0521*/ 429,
+      /*0x1efb*/ 597,
+      /*0x1e7b*/ 538,
+      /*0x04fb*/ 410,
+      /*0x1f21*/ 615,
+      /*0x10431*/ 991,
+      /*0x0562*/ 438,
+      /*0x057b*/ 463,
+      /*0xa7a1*/ 951,
+      /*0x047b*/ 350,
+      /*0x1f62*/ 642,
+      /*0x1f7b*/ 659,
+      /*0x2175*/ 675,
+      /*0xa72f*/ 904,
+      /*0x1e19*/ 489,
+      /*0x0499*/ 361,
+      /*0x0119*/ 68,
+      /*0x2c99*/ 780,
+      /*0x0219*/ 177,
+      /*0x0519*/ 425,
+      /*0x04c6*/ 383,
+      /*0x0146*/ 89,
+      /*0x00f0*/ 41,
+      /*0x118c2*/ 1024,
+      /*0xa729*/ 901,
+      -1,
+      /*0x0446*/ 311,
+      /*0xa799*/ 947,
+      /*0x2171*/ 671,
+      /*0x1ef7*/ 595,
+      /*0x1e77*/ 536,
+      /*0x04f7*/ 408,
+      /*0x0177*/ 113,
+      /*0x0268*/ 214,
+      /*0x0568*/ 444,
+      /*0x0577*/ 459,
+      -1,
+      /*0x0477*/ 348,
+      -1,
+      /*0x1f77*/ 655,
+      -1,
+      /*0x24e2*/ 705,
+      /*0xa699*/ 896,
+      -1,
+      /*0x1eff*/ 599,
+      /*0x1e7f*/ 540,
+      /*0x04ff*/ 412,
+      /*0x04cc*/ 386,
+      /*0x03bd*/ 255,
+      -1,
+      /*0x057f*/ 467,
+      /*0x0287*/ 225,
+      /*0x047f*/ 352,
+      /*0x044c*/ 317,
+      /*0x04c8*/ 384,
+      /*0x0148*/ 90,
+      -1, -1,
+      /*0x2c46*/ 735,
+      /*0x03b9*/ 251,
+      /*0x0448*/ 313,
+      /*0x0195*/ 123,
+      /*0x03ce*/ 271,
+      -1,
+      /*0x04c4*/ 382,
+      /*0x0144*/ 88,
+      /*0x2d2d*/ 860,
+      /*0x0079*/ 23,
+      /*0x2c68*/ 763,
+      /*0x24e8*/ 711,
+      /*0x0444*/ 309,
+      -1,
+      /*0x1f44*/ 634,
+      /*0x00f3*/ 44,
+      /*0x1ebb*/ 565,
+      /*0x1e3b*/ 506,
+      /*0x04bb*/ 378,
+      /*0x214e*/ 669,
+      /*0x2cbb*/ 797,
+      /*0x03af*/ 242,
+      /*0x0075*/ 19,
+      -1,
+      /*0x043b*/ 300,
+      -1, -1,
+      /*0x2c4c*/ 741,
+      -1,
+      /*0x0192*/ 122,
+      -1,
+      /*0x00eb*/ 36,
+      -1,
+      /*0x2d1c*/ 849,
+      /*0x2c48*/ 737,
+      /*0xa77f*/ 938,
+      -1,
+      /*0x03f2*/ 285,
+      /*0x0071*/ 15,
+      /*0x037d*/ 238,
+      /*0x01f9*/ 161,
+      -1,
+      /*0x00e4*/ 29,
+      -1,
+      /*0x2c44*/ 733,
+      /*0x1eab*/ 557,
+      /*0x1e2b*/ 498,
+      /*0x04ab*/ 370,
+      /*0x012b*/ 77,
+      /*0x2cab*/ 789,
+      /*0x022b*/ 185,
+      /*0x052b*/ 434,
+      /*0x2172*/ 672,
+      /*0x01f5*/ 160,
+      /*0x0256*/ 204,
+      -1,
+      /*0x2c3b*/ 724,
+      /*0x0456*/ 327,
+      /*0x03fb*/ 288,
+      /*0x1e17*/ 488,
+      /*0x0497*/ 360,
+      /*0x0117*/ 67,
+      /*0x2c97*/ 779,
+      /*0x0217*/ 176,
+      /*0x0517*/ 424,
+      /*0xa73b*/ 909,
+      /*0x1e1f*/ 492,
+      /*0x049f*/ 364,
+      /*0x011f*/ 71,
+      /*0x2c9f*/ 783,
+      /*0x021f*/ 180,
+      /*0x051f*/ 428,
+      /*0xa797*/ 946,
+      /*0x217b*/ 681,
+      /*0xff42*/ 957,
+      /*0x03c6*/ 263,
+      -1, -1,
+      /*0x0436*/ 295,
+      /*0xa79f*/ 950,
+      /*0x1f36*/ 628,
+      /*0x1043d*/ 1003,
+      -1, -1, -1,
+      /*0x2d25*/ 858,
+      -1,
+      /*0xa697*/ 895,
+      /*0x01da*/ 147,
+      /*0x2c56*/ 751,
+      /*0x24d6*/ 693,
+      -1,
+      /*0x10439*/ 999,
+      -1,
+      /*0xa72b*/ 902,
+      /*0x1044e*/ 1020,
+      /*0x118da*/ 1048,
+      -1, -1, -1, -1,
+      /*0x2177*/ 677,
+      /*0x03cc*/ 269,
+      -1,
+      /*0x01bd*/ 136,
+      -1, -1, -1, -1,
+      /*0x03c8*/ 265,
+      /*0x2c36*/ 719,
+      /*0x2d23*/ 856,
+      /*0x1042f*/ 989,
+      -1,
+      /*0x0254*/ 203,
+      /*0x01b9*/ 135,
+      /*0x217f*/ 685,
+      /*0x0454*/ 325,
+      /*0x01ce*/ 141,
+      /*0x03c4*/ 261,
+      /*0x0072*/ 16,
+      -1, -1,
+      /*0x10429*/ 983,
+      /*0x1e89*/ 545,
+      /*0x1e09*/ 481,
+      /*0x118ce*/ 1036,
+      /*0x0109*/ 60,
+      /*0x2c89*/ 772,
+      /*0x0209*/ 169,
+      /*0x0509*/ 417,
+      /*0x03bb*/ 253,
+      -1,
+      /*0x1e8d*/ 547,
+      /*0x1e0d*/ 483,
+      /*0x048d*/ 355,
+      /*0x010d*/ 62,
+      /*0x2c8d*/ 774,
+      /*0x020d*/ 171,
+      /*0x050d*/ 419,
+      /*0x0062*/ 1,
+      /*0x1e1d*/ 491,
+      /*0x049d*/ 363,
+      /*0x011d*/ 70,
+      /*0x2c9d*/ 782,
+      /*0x021d*/ 179,
+      /*0x051d*/ 427,
+      -1,
+      /*0x0458*/ 329,
+      /*0x2c54*/ 749,
+      /*0x24d4*/ 691,
+      /*0x00ea*/ 35,
+      /*0x0252*/ 201,
+      /*0xa689*/ 888,
+      /*0xa79d*/ 949,
+      /*0x0452*/ 323,
+      /*0x025c*/ 208,
+      -1,
+      /*0x04ca*/ 385,
+      /*0x045c*/ 333,
+      -1,
+      /*0x2d05*/ 826,
+      /*0xa68d*/ 890,
+      /*0x00fa*/ 50,
+      /*0x044a*/ 315,
+      /*0x01a1*/ 127,
+      /*0x10446*/ 1012,
+      /*0x017c*/ 115,
+      /*0x0068*/ 7,
+      /*0x0077*/ 21,
+      /*0x057c*/ 464,
+      -1,
+      /*0x01fb*/ 162,
+      -1,
+      /*0x1f7c*/ 660,
+      -1,
+      /*0x0434*/ 293,
+      /*0x2d03*/ 824,
+      /*0x1f34*/ 626,
+      /*0x045e*/ 335,
+      /*0x2c58*/ 753,
+      /*0x24d8*/ 695,
+      -1, -1,
+      /*0x0199*/ 124,
+      /*0x03b6*/ 248,
+      -1,
+      /*0x2c52*/ 747,
+      /*0x24d2*/ 689,
+      /*0x01c6*/ 138,
+      /*0x0260*/ 209,
+      /*0x2c5c*/ 757,
+      /*0x24dc*/ 699,
+      /*0x1044c*/ 1018,
+      /*0x0371*/ 233,
+      /*0x1f60*/ 640,
+      /*0x2c4a*/ 739,
+      /*0x118c6*/ 1028,
+      -1, -1,
+      /*0x10448*/ 1014,
+      -1, -1, -1,
+      /*0x0430*/ 289,
+      /*0xff5a*/ 981,
+      /*0x1f30*/ 622,
+      /*0x0432*/ 291,
+      /*0x2c34*/ 717,
+      /*0x1f32*/ 624,
+      /*0x10444*/ 1010,
+      /*0x2c5e*/ 759,
+      /*0x24de*/ 701,
+      /*0xa77c*/ 937,
+      -1,
+      /*0x01ff*/ 164,
+      /*0x01cc*/ 140,
+      -1, -1, -1, -1, -1,
+      /*0x1043b*/ 1001,
+      -1,
+      /*0x118cc*/ 1034,
+      -1,
+      /*0x24e0*/ 703,
+      -1,
+      /*0x00ec*/ 37,
+      -1, -1,
+      /*0x118c8*/ 1030,
+      -1,
+      /*0x1fe0*/ 666,
+      -1,
+      /*0xff4e*/ 969,
+      /*0x2c30*/ 713,
+      -1, -1,
+      /*0x2c32*/ 715,
+      -1,
+      /*0x118c4*/ 1026,
+      -1, -1,
+      /*0x1fb0*/ 662,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1042b*/ 985,
+      -1, -1, -1, -1, -1,
+      /*0x0289*/ 227,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x03ca*/ 267,
+      -1, -1,
+      /*0x2d27*/ 859,
+      -1,
+      /*0x10436*/ 996,
+      -1,
+      /*0x01d6*/ 145,
+      -1, -1, -1, -1,
+      /*0x03b4*/ 246,
+      -1, -1,
+      /*0x118d6*/ 1044,
+      -1, -1,
+      /*0x00f8*/ 48,
+      -1, -1, -1, -1,
+      /*0x217c*/ 682,
+      -1,
+      /*0x2d15*/ 842,
+      /*0x037b*/ 236,
+      -1,
+      /*0x01b6*/ 134,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff46*/ 961,
+      /*0x00e6*/ 31,
+      -1, -1, -1, -1, -1, -1,
+      /*0x03b2*/ 244,
+      -1,
+      /*0x2d13*/ 840,
+      -1, -1, -1, -1, -1,
+      /*0x2d12*/ 839,
+      /*0x00ef*/ 40,
+      -1,
+      /*0x0377*/ 235,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff4c*/ 967,
+      -1, -1, -1,
+      /*0x00ed*/ 38,
+      /*0x01d4*/ 144,
+      -1,
+      /*0xff48*/ 963,
+      -1, -1, -1, -1, -1,
+      /*0x118d4*/ 1042,
+      -1, -1, -1,
+      /*0xff44*/ 959,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1044a*/ 1016,
+      -1, -1, -1, -1, -1, -1,
+      /*0x01d8*/ 146,
+      -1,
+      /*0x00f6*/ 47,
+      -1, -1,
+      /*0x10434*/ 994,
+      -1,
+      /*0x01d2*/ 143,
+      /*0x118d8*/ 1046,
+      -1, -1,
+      /*0x01dc*/ 148,
+      -1,
+      /*0x2d07*/ 828,
+      -1,
+      /*0x118d2*/ 1040,
+      -1, -1, -1,
+      /*0x118dc*/ 1050,
+      -1, -1, -1, -1,
+      /*0x118ca*/ 1032,
+      -1,
+      /*0xff56*/ 977,
+      -1,
+      /*0x01b4*/ 133,
+      -1, -1,
+      /*0x00fd*/ 53,
+      -1,
+      /*0x10430*/ 990,
+      -1, -1,
+      /*0x10432*/ 992,
+      -1, -1,
+      /*0x118de*/ 1052,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x01b0*/ 132,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xff54*/ 975,
+      -1, -1,
+      /*0x2d21*/ 854,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d19*/ 846,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff58*/ 979,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff52*/ 973,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff4a*/ 965,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x037c*/ 237,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00f9*/ 49,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00f5*/ 46,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00f1*/ 42,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d17*/ 844,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d1f*/ 852,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00f2*/ 43,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x2d09*/ 830,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x2d0d*/ 834,
+      -1,
+      /*0x00e2*/ 27,
+      /*0x00fb*/ 51,
+      -1, -1, -1,
+      /*0x2d1d*/ 850,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x00e8*/ 33,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00ff*/ 55,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00fc*/ 52,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x00e0*/ 25
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseUnfold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
+            return &CaseUnfold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
+#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
+  {{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}, {2, {0x00df, 0x1e9e}}},
+  {{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, {0x1f80, 0x1f88}}},
+  {{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}}},
+#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
+  {{0x0069, 0x0307}, {1, {0x0130}}},
+};
+
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
+
+/* maximum key range = 71, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
+       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
+      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
+      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
+      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
+      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
+      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
+      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
+      82, 15, 82, 82, 23, 82,  8, 82
+    };
+  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1f7c,
+      TOTAL_KEYWORDS = 59,
+      MIN_WORD_LENGTH = 6,
+      MAX_WORD_LENGTH = 6,
+      MIN_HASH_VALUE = 11,
+      MAX_HASH_VALUE = 81
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1f66,0x03b9*/ 53,
+      /*0x1f07,0x03b9*/ 38,
+      /*0x1f00,0x03b9*/ 31,
+      /*0x0066,0x0066*/ 1,
+      /*0x1f74,0x03b9*/ 56,
+      /*0x0073,0x0073*/ 6,
+      /*0x0066,0x0069*/ 2,
+      /*0x1f06,0x03b9*/ 37,
+      /*0x0073,0x0074*/ 7,
+      /*0x03b9,0x0342*/ 18,
+      /*0x03c9,0x03b9*/ 23,
+      /*0x03b7,0x03b9*/ 17,
+      /*0x0069,0x0307*/ 58,
+      /*0x03b1,0x03b9*/ 15,
+      /*0x1f61,0x03b9*/ 48,
+      /*0x1f05,0x03b9*/ 36,
+      /*0x1f65,0x03b9*/ 52,
+      /*0x0574,0x0576*/ 29,
+      /*0x03c9,0x0342*/ 22,
+      /*0x03b7,0x0342*/ 16,
+      /*0x057e,0x0576*/ 30,
+      /*0x03b1,0x0342*/ 14,
+      /*0x1f7c,0x03b9*/ 57,
+      /*0x0574,0x0565*/ 26,
+      /*0x0079,0x030a*/ 10,
+      /*0x0077,0x030a*/ 9,
+      /*0x1f70,0x03b9*/ 55,
+      /*0x0574,0x056d*/ 28,
+      /*0x0066,0x006c*/ 3,
+      /*0x0574,0x056b*/ 27,
+      /*0x0061,0x02be*/ 0,
+      /*0x0068,0x0331*/ 4,
+      /*0x1f67,0x03b9*/ 54,
+      /*0x1f64,0x03b9*/ 51,
+      /*0x1f63,0x03b9*/ 50,
+      /*0x1f62,0x03b9*/ 49,
+      /*0x1f60,0x03b9*/ 47,
+      /*0x03ce,0x03b9*/ 24,
+      /*0x03c5,0x0342*/ 21,
+      /*0x03c5,0x0313*/ 20,
+      /*0x03c1,0x0313*/ 19,
+      /*0x02bc,0x006e*/ 11,
+      /*0x03ae,0x03b9*/ 13,
+      /*0x03ac,0x03b9*/ 12,
+      /*0x1f27,0x03b9*/ 46,
+      /*0x1f26,0x03b9*/ 45,
+      /*0x1f25,0x03b9*/ 44,
+      /*0x1f24,0x03b9*/ 43,
+      /*0x1f23,0x03b9*/ 42,
+      /*0x1f22,0x03b9*/ 41,
+      /*0x1f21,0x03b9*/ 40,
+      /*0x1f20,0x03b9*/ 39,
+      /*0x006a,0x030c*/ 5,
+      /*0x1f02,0x03b9*/ 33,
+      /*0x0074,0x0308*/ 8,
+      /*0x1f04,0x03b9*/ 35,
+      /*0x1f03,0x03b9*/ 34,
+      /*0x1f01,0x03b9*/ 32,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0565,0x0582*/ 25
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseUnfold_12_hash(codes);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
+            return &CaseUnfold_12_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
+#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
+  {{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}}},
+};
+
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
+
+/* maximum key range = 20, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
+      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
+      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
+      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47
+    };
+  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x66,
+      MAX_CODE_VALUE = 0x3c9,
+      TOTAL_KEYWORDS = 14,
+      MIN_WORD_LENGTH = 9,
+      MAX_WORD_LENGTH = 9,
+      MIN_HASH_VALUE = 27,
+      MAX_HASH_VALUE = 46
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x03c5,0x0313,0x0342*/ 12,
+      /*0x03c5,0x0308,0x0342*/ 9,
+      /*0x03b9,0x0308,0x0342*/ 6,
+      /*0x03c5,0x0313,0x0301*/ 11,
+      /*0x03c5,0x0308,0x0301*/ 8,
+      /*0x03b9,0x0308,0x0301*/ 5,
+      /*0x03c5,0x0313,0x0300*/ 10,
+      /*0x03c5,0x0308,0x0300*/ 7,
+      /*0x03b9,0x0308,0x0300*/ 4,
+      /*0x03c9,0x0342,0x03b9*/ 13,
+      /*0x03b7,0x0342,0x03b9*/ 3,
+      /*0x03b1,0x0342,0x03b9*/ 2,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0066,0x0066,0x006c*/ 1,
+      /*0x0066,0x0066,0x0069*/ 0
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
+      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseUnfold_13_hash(codes);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
+            return &CaseUnfold_13_Table[s].to;
+        }
+    }
+  return 0;
+}
+
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h
new file mode 100644
index 0000000000..80b79abc3e
--- /dev/null
+++ b/enc/unicode/name2ctype.h
@@ -0,0 +1,32679 @@
+/* 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,5-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
+
+
+#define long size_t
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+static const OnigCodePoint CR_Alpha[] = {
+	600,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
+	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,
+	0x0840, 0x0858,
+	0x08a0, 0x08b2,
+	0x08e4, 0x08e9,
+	0x08f0, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c81, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce3,
+	0x0cf1, 0x0cf2,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x16f8,
+	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, 0x191e,
+	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,
+	0x1bac, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1d00, 0x1dbf,
+	0x1de7, 0x1df4,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa69d,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x11100, 0x11132,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x11234,
+	0x11237, 0x11237,
+	0x112b0, 0x112e8,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134c,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11480, 0x114c1,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115b5,
+	0x115b8, 0x115be,
+	0x11600, 0x1163e,
+	0x11640, 0x11640,
+	0x11644, 0x11644,
+	0x11680, 0x116b5,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9e, 0x1bc9e,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alpha */
+
+/* 'Blank': [[:Blank:]] */
+static const OnigCodePoint CR_Blank[] = {
+	8,
+	0x0009, 0x0009,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Blank */
+
+/* 'Cntrl': [[:Cntrl:]] */
+static const OnigCodePoint CR_Cntrl[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cntrl */
+
+/* 'Digit': [[:Digit:]] */
+static const OnigCodePoint CR_Digit[] = {
+	50,
+	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,
+	0x0de6, 0x0def,
+	0x0e50, 0x0e59,
+	0x0ed0, 0x0ed9,
+	0x0f20, 0x0f29,
+	0x1040, 0x1049,
+	0x1090, 0x1099,
+	0x17e0, 0x17e9,
+	0x1810, 0x1819,
+	0x1946, 0x194f,
+	0x19d0, 0x19d9,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1b50, 0x1b59,
+	0x1bb0, 0x1bb9,
+	0x1c40, 0x1c49,
+	0x1c50, 0x1c59,
+	0xa620, 0xa629,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xa9f0, 0xa9f9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x104a0, 0x104a9,
+	0x11066, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x112f0, 0x112f9,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x118e0, 0x118e9,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	605,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b2,
+	0x08e4, 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, 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, 0x0b77,
+	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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x167f,
+	0x1681, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x191e,
+	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,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bd,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa69d,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe2d,
+	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, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+static const OnigCodePoint CR_Lower[] = {
+	633,
+	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,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa699, 0xa699,
+	0xa69b, 0xa69d,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa795,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x118c0, 0x118df,
+	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_Lower */
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	602,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b2,
+	0x08e4, 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, 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, 0x0b77,
+	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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x191e,
+	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,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bd,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa69d,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe2d,
+	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, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+static const OnigCodePoint CR_Punct[] = {
+	155,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00ab, 0x00ab,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2010, 0x2027,
+	0x2030, 0x2043,
+	0x2045, 0x2051,
+	0x2053, 0x205e,
+	0x207d, 0x207e,
+	0x208d, 0x208e,
+	0x2308, 0x230b,
+	0x2329, 0x232a,
+	0x2768, 0x2775,
+	0x27c5, 0x27c6,
+	0x27e6, 0x27ef,
+	0x2983, 0x2998,
+	0x29d8, 0x29db,
+	0x29fc, 0x29fd,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e42,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x1056f, 0x1056f,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10af0, 0x10af6,
+	0x10b39, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	0x111cd, 0x111cd,
+	0x11238, 0x1123d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115c9,
+	0x11641, 0x11643,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x1bc9f, 0x1bc9f,
+}; /* CR_Punct */
+
+/* 'Space': [[:Space:]] */
+static const OnigCodePoint CR_Space[] = {
+	10,
+	0x0009, 0x000d,
+	0x0020, 0x0020,
+	0x0085, 0x0085,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x2000, 0x200a,
+	0x2028, 0x2029,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Space */
+
+/* 'Upper': [[:Upper:]] */
+static const OnigCodePoint CR_Upper[] = {
+	627,
+	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,
+	0x037f, 0x037f,
+	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,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x118a0, 0x118bf,
+	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,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Upper */
+
+/* 'XDigit': [[:XDigit:]] */
+static const OnigCodePoint CR_XDigit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_XDigit */
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	629,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08b2,
+	0x08e4, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 0x135f,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa69d,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0xfe2d,
+	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,
+	0x102e0, 0x102e0,
+	0x10300, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae6,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111d0, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x11237,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af4,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9d, 0x1bc9e,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	630,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08b2,
+	0x08e4, 0x08e9,
+	0x08f0, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c81, 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,
+	0x0cf1, 0x0cf2,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x16f8,
+	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, 0x191e,
+	0x1920, 0x192b,
+	0x1930, 0x1938,
+	0x1946, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x1d00, 0x1dbf,
+	0x1de7, 0x1df4,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa69d,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11132,
+	0x11136, 0x1113f,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111d0, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x11234,
+	0x11237, 0x11237,
+	0x112b0, 0x112e8,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134c,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11480, 0x114c1,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115be,
+	0x11600, 0x1163e,
+	0x11640, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b5,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9e, 0x1bc9e,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	600,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b2,
+	0x08e4, 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, 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, 0x0b77,
+	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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x191e,
+	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,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bd,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa69d,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe2d,
+	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, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	603,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x0605,
+	0x061c, 0x061d,
+	0x06dd, 0x06dd,
+	0x070e, 0x070f,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08b3, 0x08e3,
+	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,
+	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,
+	0x0b78, 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, 0x0bff,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c80,
+	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, 0x0d00,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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, 0x0de5,
+	0x0df0, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f9, 0x16ff,
+	0x170d, 0x170d,
+	0x1715, 0x171f,
+	0x1737, 0x173f,
+	0x1754, 0x175f,
+	0x176d, 0x176d,
+	0x1771, 0x1771,
+	0x1774, 0x177f,
+	0x17de, 0x17df,
+	0x17ea, 0x17ef,
+	0x17fa, 0x17ff,
+	0x180e, 0x180f,
+	0x181a, 0x181f,
+	0x1878, 0x187f,
+	0x18ab, 0x18af,
+	0x18f6, 0x18ff,
+	0x191f, 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, 0x1aaf,
+	0x1abf, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cf7,
+	0x1cfa, 0x1cff,
+	0x1df6, 0x1dfb,
+	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,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20be, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23fb, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	0x2bba, 0x2bbc,
+	0x2bc9, 0x2bc9,
+	0x2bd2, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e43, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa69e, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa7ae, 0xa7af,
+	0xa7b2, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9ff, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaac3, 0xaada,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xab2f,
+	0xab60, 0xab63,
+	0xab66, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe2e, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfffb,
+	0xfffe, 0xffff,
+	0x1000c, 0x1000c,
+	0x10027, 0x10027,
+	0x1003b, 0x1003b,
+	0x1003e, 0x1003e,
+	0x1004e, 0x1004f,
+	0x1005e, 0x1007f,
+	0x100fb, 0x100ff,
+	0x10103, 0x10106,
+	0x10134, 0x10136,
+	0x1018d, 0x1018f,
+	0x1019c, 0x1019f,
+	0x101a1, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102df,
+	0x102fc, 0x102ff,
+	0x10324, 0x1032f,
+	0x1034b, 0x1034f,
+	0x1037b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x104ff,
+	0x10528, 0x1052f,
+	0x10564, 0x1056e,
+	0x10570, 0x105ff,
+	0x10737, 0x1073f,
+	0x10756, 0x1075f,
+	0x10768, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x1089f, 0x108a6,
+	0x108b0, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10aa0, 0x10abf,
+	0x10ae7, 0x10aea,
+	0x10af7, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b92, 0x10b98,
+	0x10b9d, 0x10ba8,
+	0x10bb0, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110bd, 0x110bd,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1114f,
+	0x11177, 0x1117f,
+	0x111c9, 0x111cc,
+	0x111ce, 0x111cf,
+	0x111db, 0x111e0,
+	0x111f5, 0x111ff,
+	0x11212, 0x11212,
+	0x1123e, 0x112af,
+	0x112eb, 0x112ef,
+	0x112fa, 0x11300,
+	0x11304, 0x11304,
+	0x1130d, 0x1130e,
+	0x11311, 0x11312,
+	0x11329, 0x11329,
+	0x11331, 0x11331,
+	0x11334, 0x11334,
+	0x1133a, 0x1133b,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115ca, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x11abf,
+	0x11af9, 0x11fff,
+	0x12399, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca0, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d173, 0x1d17a,
+	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, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0c0, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0f6, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f32d, 0x1f32f,
+	0x1f37e, 0x1f37f,
+	0x1f3cf, 0x1f3d3,
+	0x1f3f8, 0x1f3ff,
+	0x1f4ff, 0x1f4ff,
+	0x1f54b, 0x1f54f,
+	0x1f57a, 0x1f57a,
+	0x1f5a4, 0x1f5a4,
+	0x1f643, 0x1f644,
+	0x1f6d0, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6f4, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+#define CR_Cc CR_Cntrl
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	17,
+	0x00ad, 0x00ad,
+	0x0600, 0x0605,
+	0x061c, 0x061c,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	0x180e, 0x180e,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x2064,
+	0x2066, 0x206f,
+	0xfeff, 0xfeff,
+	0xfff9, 0xfffb,
+	0x110bd, 0x110bd,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Cf */
+
+/* 'Cn': General Category */
+static const OnigCodePoint CR_Cn[] = {
+	600,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x061d, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08b3, 0x08e3,
+	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,
+	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,
+	0x0b78, 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, 0x0bff,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c80,
+	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, 0x0d00,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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, 0x0de5,
+	0x0df0, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f9, 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,
+	0x191f, 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, 0x1aaf,
+	0x1abf, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cf7,
+	0x1cfa, 0x1cff,
+	0x1df6, 0x1dfb,
+	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, 0x2065,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20be, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23fb, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	0x2bba, 0x2bbc,
+	0x2bc9, 0x2bc9,
+	0x2bd2, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e43, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa69e, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa7ae, 0xa7af,
+	0xa7b2, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9ff, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaac3, 0xaada,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xab2f,
+	0xab60, 0xab63,
+	0xab66, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe2e, 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,
+	0x1018d, 0x1018f,
+	0x1019c, 0x1019f,
+	0x101a1, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102df,
+	0x102fc, 0x102ff,
+	0x10324, 0x1032f,
+	0x1034b, 0x1034f,
+	0x1037b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x104ff,
+	0x10528, 0x1052f,
+	0x10564, 0x1056e,
+	0x10570, 0x105ff,
+	0x10737, 0x1073f,
+	0x10756, 0x1075f,
+	0x10768, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x1089f, 0x108a6,
+	0x108b0, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10aa0, 0x10abf,
+	0x10ae7, 0x10aea,
+	0x10af7, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b92, 0x10b98,
+	0x10b9d, 0x10ba8,
+	0x10bb0, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1114f,
+	0x11177, 0x1117f,
+	0x111c9, 0x111cc,
+	0x111ce, 0x111cf,
+	0x111db, 0x111e0,
+	0x111f5, 0x111ff,
+	0x11212, 0x11212,
+	0x1123e, 0x112af,
+	0x112eb, 0x112ef,
+	0x112fa, 0x11300,
+	0x11304, 0x11304,
+	0x1130d, 0x1130e,
+	0x11311, 0x11312,
+	0x11329, 0x11329,
+	0x11331, 0x11331,
+	0x11334, 0x11334,
+	0x1133a, 0x1133b,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115ca, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x11abf,
+	0x11af9, 0x11fff,
+	0x12399, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca4, 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, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0c0, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0f6, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f32d, 0x1f32f,
+	0x1f37e, 0x1f37f,
+	0x1f3cf, 0x1f3d3,
+	0x1f3f8, 0x1f3ff,
+	0x1f4ff, 0x1f4ff,
+	0x1f54b, 0x1f54f,
+	0x1f57a, 0x1f57a,
+	0x1f5a4, 0x1f5a4,
+	0x1f643, 0x1f644,
+	0x1f6d0, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6f4, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 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[] = {
+	537,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08b2,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0980,
+	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, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x16f1, 0x16f8,
+	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, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 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,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0x1031f,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10400, 0x1049d,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x1135d, 0x11361,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'LC': General Category */
+static const OnigCodePoint CR_LC[] = {
+	117,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02af,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x1d00, 0x1d2b,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1d9a,
+	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,
+	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,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c7b,
+	0x2c7e, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa69b,
+	0xa722, 0xa76f,
+	0xa771, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab64, 0xab65,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x118a0, 0x118df,
+	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_LC */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	625,
+	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, 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,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d6b, 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, 0x2c7b,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa699, 0xa699,
+	0xa69b, 0xa69b,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa795,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab64, 0xab65,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x118c0, 0x118df,
+	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[] = {
+	56,
+	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, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2c7c, 0x2c7d,
+	0x2d6f, 0x2d6f,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa67f, 0xa67f,
+	0xa69c, 0xa69d,
+	0xa717, 0xa71f,
+	0xa770, 0xa770,
+	0xa788, 0xa788,
+	0xa7f8, 0xa7f9,
+	0xa9cf, 0xa9cf,
+	0xa9e6, 0xa9e6,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xab5c, 0xab5f,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0x16b40, 0x16b43,
+	0x16f93, 0x16f9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	417,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08b2,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0980,
+	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, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x10fd, 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,
+	0x16f1, 0x16f8,
+	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, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	0x2135, 0x2138,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa014,
+	0xa016, 0xa48c,
+	0xa4d0, 0xa4f7,
+	0xa500, 0xa60b,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa66e, 0xa66e,
+	0xa6a0, 0xa6e5,
+	0xa7f7, 0xa7f7,
+	0xa7fb, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa822,
+	0xa840, 0xa873,
+	0xa882, 0xa8b3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa925,
+	0xa930, 0xa946,
+	0xa960, 0xa97c,
+	0xa984, 0xa9b2,
+	0xa9e0, 0xa9e4,
+	0xa9e7, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa6f,
+	0xaa71, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadc,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf2,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0x1031f,
+	0x10330, 0x10340,
+	0x10342, 0x10349,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x10450, 0x1049d,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x1135d, 0x11361,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	622,
+	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,
+	0x037f, 0x037f,
+	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,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x118a0, 0x118bf,
+	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[] = {
+	229,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x0903,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
+	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,
+	0x0c00, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c83,
+	0x0cbc, 0x0cbc,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d01, 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,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x19b0, 0x19c0,
+	0x19c8, 0x19c9,
+	0x1a17, 0x1a1b,
+	0x1a55, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b04,
+	0x1b34, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b82,
+	0x1ba1, 0x1bad,
+	0x1be6, 0x1bf3,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df5,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa802, 0xa802,
+	0xa806, 0xa806,
+	0xa80b, 0xa80b,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa926, 0xa92d,
+	0xa947, 0xa953,
+	0xa980, 0xa983,
+	0xa9b3, 0xa9c0,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaa7b, 0xaa7d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf6,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2d,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
+	0x1107f, 0x11082,
+	0x110b0, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11182,
+	0x111b3, 0x111c0,
+	0x1122c, 0x11237,
+	0x112df, 0x112ea,
+	0x11301, 0x11303,
+	0x1133c, 0x1133c,
+	0x1133e, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x114b0, 0x114c3,
+	0x115af, 0x115b5,
+	0x115b8, 0x115c0,
+	0x11630, 0x11640,
+	0x116ab, 0x116b7,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f51, 0x16f7e,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1e8d0, 0x1e8d6,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	147,
+	0x0903, 0x0903,
+	0x093b, 0x093b,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094f,
+	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, 0x1a1a,
+	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,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf3,
+	0x302e, 0x302f,
+	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,
+	0xaa7d, 0xaa7d,
+	0xaaeb, 0xaaeb,
+	0xaaee, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1112c, 0x1112c,
+	0x11182, 0x11182,
+	0x111b3, 0x111b5,
+	0x111bf, 0x111c0,
+	0x1122c, 0x1122e,
+	0x11232, 0x11233,
+	0x11235, 0x11235,
+	0x112e0, 0x112e2,
+	0x11302, 0x11303,
+	0x1133e, 0x1133f,
+	0x11341, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x114b0, 0x114b2,
+	0x114b9, 0x114b9,
+	0x114bb, 0x114be,
+	0x114c1, 0x114c1,
+	0x115af, 0x115b1,
+	0x115b8, 0x115bb,
+	0x115be, 0x115be,
+	0x11630, 0x11632,
+	0x1163b, 0x1163c,
+	0x1163e, 0x1163e,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x16f51, 0x16f7e,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	5,
+	0x0488, 0x0489,
+	0x1abe, 0x1abe,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	255,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0c00, 0x0c00,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d01, 0x0d01,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abd,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df5,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2d,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11301, 0x11301,
+	0x1133c, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1e8d0, 0x1e8d6,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	105,
+	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,
+	0x0b72, 0x0b77,
+	0x0be6, 0x0bf2,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7e,
+	0x0ce6, 0x0cef,
+	0x0d66, 0x0d75,
+	0x0de6, 0x0def,
+	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,
+	0x3248, 0x324f,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa620, 0xa629,
+	0xa6e6, 0xa6ef,
+	0xa830, 0xa835,
+	0xa8d0, 0xa8d9,
+	0xa900, 0xa909,
+	0xa9d0, 0xa9d9,
+	0xa9f0, 0xa9f9,
+	0xaa50, 0xaa59,
+	0xabf0, 0xabf9,
+	0xff10, 0xff19,
+	0x10107, 0x10133,
+	0x10140, 0x10178,
+	0x1018a, 0x1018b,
+	0x102e1, 0x102fb,
+	0x10320, 0x10323,
+	0x10341, 0x10341,
+	0x1034a, 0x1034a,
+	0x103d1, 0x103d5,
+	0x104a0, 0x104a9,
+	0x10858, 0x1085f,
+	0x10879, 0x1087f,
+	0x108a7, 0x108af,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10a9d, 0x10a9f,
+	0x10aeb, 0x10aef,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10ba9, 0x10baf,
+	0x10e60, 0x10e7e,
+	0x11052, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x111e1, 0x111f4,
+	0x112f0, 0x112f9,
+	0x114d0, 0x114d9,
+	0x11650, 0x11659,
+	0x116c0, 0x116c9,
+	0x118e0, 0x118f2,
+	0x12400, 0x1246e,
+	0x16a60, 0x16a69,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1e8c7, 0x1e8cf,
+	0x1f100, 0x1f10c,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+#define CR_Nd CR_Digit
+
+/* '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, 0x1246e,
+}; /* CR_Nl */
+
+/* 'No': General Category */
+static const OnigCodePoint CR_No[] = {
+	52,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x19da, 0x19da,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3248, 0x324f,
+	0x3251, 0x325f,
+	0x3280, 0x3289,
+	0x32b1, 0x32bf,
+	0xa830, 0xa835,
+	0x10107, 0x10133,
+	0x10175, 0x10178,
+	0x1018a, 0x1018b,
+	0x102e1, 0x102fb,
+	0x10320, 0x10323,
+	0x10858, 0x1085f,
+	0x10879, 0x1087f,
+	0x108a7, 0x108af,
+	0x10916, 0x1091b,
+	0x10a40, 0x10a47,
+	0x10a7d, 0x10a7e,
+	0x10a9d, 0x10a9f,
+	0x10aeb, 0x10aef,
+	0x10b58, 0x10b5f,
+	0x10b78, 0x10b7f,
+	0x10ba9, 0x10baf,
+	0x10e60, 0x10e7e,
+	0x11052, 0x11065,
+	0x111e1, 0x111f4,
+	0x118ea, 0x118f2,
+	0x16b5b, 0x16b61,
+	0x1d360, 0x1d371,
+	0x1e8c7, 0x1e8cf,
+	0x1f100, 0x1f10c,
+}; /* CR_No */
+
+/* 'P': Major Category */
+#define CR_P CR_Punct
+
+/* '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[] = {
+	17,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	0x2e40, 0x2e40,
+	0x301c, 0x301c,
+	0x3030, 0x3030,
+	0x30a0, 0x30a0,
+	0xfe31, 0xfe32,
+	0xfe58, 0xfe58,
+	0xfe63, 0xfe63,
+	0xff0d, 0xff0d,
+}; /* CR_Pd */
+
+/* 'Pe': General Category */
+static const OnigCodePoint CR_Pe[] = {
+	72,
+	0x0029, 0x0029,
+	0x005d, 0x005d,
+	0x007d, 0x007d,
+	0x0f3b, 0x0f3b,
+	0x0f3d, 0x0f3d,
+	0x169c, 0x169c,
+	0x2046, 0x2046,
+	0x207e, 0x207e,
+	0x208e, 0x208e,
+	0x2309, 0x2309,
+	0x230b, 0x230b,
+	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,
+	0xfd3e, 0xfd3e,
+	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[] = {
+	151,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e39,
+	0x2e3c, 0x2e3f,
+	0x2e41, 0x2e41,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x1056f, 0x1056f,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10af0, 0x10af6,
+	0x10b39, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x11174, 0x11175,
+	0x111c5, 0x111c8,
+	0x111cd, 0x111cd,
+	0x11238, 0x1123d,
+	0x114c6, 0x114c6,
+	0x115c1, 0x115c9,
+	0x11641, 0x11643,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b3b,
+	0x16b44, 0x16b44,
+	0x1bc9f, 0x1bc9f,
+}; /* CR_Po */
+
+/* 'Ps': General Category */
+static const OnigCodePoint CR_Ps[] = {
+	75,
+	0x0028, 0x0028,
+	0x005b, 0x005b,
+	0x007b, 0x007b,
+	0x0f3a, 0x0f3a,
+	0x0f3c, 0x0f3c,
+	0x169b, 0x169b,
+	0x201a, 0x201a,
+	0x201e, 0x201e,
+	0x2045, 0x2045,
+	0x207d, 0x207d,
+	0x208d, 0x208d,
+	0x2308, 0x2308,
+	0x230a, 0x230a,
+	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,
+	0x2e42, 0x2e42,
+	0x3008, 0x3008,
+	0x300a, 0x300a,
+	0x300c, 0x300c,
+	0x300e, 0x300e,
+	0x3010, 0x3010,
+	0x3014, 0x3014,
+	0x3016, 0x3016,
+	0x3018, 0x3018,
+	0x301a, 0x301a,
+	0x301d, 0x301d,
+	0xfd3f, 0xfd3f,
+	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[] = {
+	210,
+	0x0024, 0x0024,
+	0x002b, 0x002b,
+	0x003c, 0x003e,
+	0x005e, 0x005e,
+	0x0060, 0x0060,
+	0x007c, 0x007c,
+	0x007e, 0x007e,
+	0x00a2, 0x00a6,
+	0x00a8, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x058d, 0x058f,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19de, 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, 0x20bd,
+	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, 0x2307,
+	0x230c, 0x2328,
+	0x232b, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x2767,
+	0x2794, 0x27c4,
+	0x27c7, 0x27e5,
+	0x27f0, 0x2982,
+	0x2999, 0x29d7,
+	0x29dc, 0x29fb,
+	0x29fe, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	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, 0x3247,
+	0x3250, 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,
+	0xab5b, 0xab5b,
+	0xfb29, 0xfb29,
+	0xfbb2, 0xfbc1,
+	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,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x1018c, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fc,
+	0x10877, 0x10878,
+	0x10ac8, 0x10ac8,
+	0x16b3c, 0x16b3f,
+	0x16b45, 0x16b45,
+	0x1bc9c, 0x1bc9c,
+	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,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	17,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x058f, 0x058f,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20bd,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	28,
+	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,
+	0xab5b, 0xab5b,
+	0xfbb2, 0xfbc1,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xffe3, 0xffe3,
+}; /* CR_Sk */
+
+/* 'Sm': General Category */
+static const OnigCodePoint CR_Sm[] = {
+	64,
+	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,
+	0x2118, 0x2118,
+	0x2140, 0x2144,
+	0x214b, 0x214b,
+	0x2190, 0x2194,
+	0x219a, 0x219b,
+	0x21a0, 0x21a0,
+	0x21a3, 0x21a3,
+	0x21a6, 0x21a6,
+	0x21ae, 0x21ae,
+	0x21ce, 0x21cf,
+	0x21d2, 0x21d2,
+	0x21d4, 0x21d4,
+	0x21f4, 0x22ff,
+	0x2320, 0x2321,
+	0x237c, 0x237c,
+	0x239b, 0x23b3,
+	0x23dc, 0x23e1,
+	0x25b7, 0x25b7,
+	0x25c1, 0x25c1,
+	0x25f8, 0x25ff,
+	0x266f, 0x266f,
+	0x27c0, 0x27c4,
+	0x27c7, 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,
+	0x1eef0, 0x1eef1,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	165,
+	0x00a6, 0x00a6,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x0482, 0x0482,
+	0x058d, 0x058e,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19de, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2117,
+	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, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x2767,
+	0x2794, 0x27bf,
+	0x2800, 0x28ff,
+	0x2b00, 0x2b2f,
+	0x2b45, 0x2b46,
+	0x2b4d, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	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, 0x3247,
+	0x3250, 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,
+	0x10137, 0x1013f,
+	0x10179, 0x10189,
+	0x1018c, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fc,
+	0x10877, 0x10878,
+	0x10ac8, 0x10ac8,
+	0x16b3c, 0x16b3f,
+	0x16b45, 0x16b45,
+	0x1bc9c, 0x1bc9c,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d129, 0x1d164,
+	0x1d16a, 0x1d16c,
+	0x1d183, 0x1d184,
+	0x1d18c, 0x1d1a9,
+	0x1d1ae, 0x1d1dd,
+	0x1d200, 0x1d241,
+	0x1d245, 0x1d245,
+	0x1d300, 0x1d356,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+}; /* CR_So */
+
+/* 'Z': Major Category */
+static const OnigCodePoint CR_Z[] = {
+	8,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	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[] = {
+	7,
+	0x0020, 0x0020,
+	0x00a0, 0x00a0,
+	0x1680, 0x1680,
+	0x2000, 0x200a,
+	0x202f, 0x202f,
+	0x205f, 0x205f,
+	0x3000, 0x3000,
+}; /* CR_Zs */
+
+/* 'Math': Derived Property */
+static const OnigCodePoint CR_Math[] = {
+	138,
+	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,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 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, 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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+#define CR_Alphabetic CR_Alpha
+
+/* 'Lowercase': Derived Property */
+#define CR_Lowercase CR_Lower
+
+/* 'Uppercase': Derived Property */
+#define CR_Uppercase CR_Upper
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	127,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa69d,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f8, 0xa7fa,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x118a0, 0x118df,
+	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,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Cased */
+
+/* 'Case_Ignorable': Derived Property */
+static const OnigCodePoint CR_Case_Ignorable[] = {
+	335,
+	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, 0x0605,
+	0x0610, 0x061a,
+	0x061c, 0x061c,
+	0x0640, 0x0640,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0859, 0x085b,
+	0x08e4, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0c00, 0x0c00,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0ce2, 0x0ce3,
+	0x0d01, 0x0d01,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dd, 0x17dd,
+	0x180b, 0x180e,
+	0x1843, 0x1843,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1aa7, 0x1aa7,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1df5,
+	0x1dfc, 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,
+	0x2066, 0x206f,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x20d0, 0x20f0,
+	0x2c7c, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302d,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa69c, 0xa69d,
+	0xa69f, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa7f8, 0xa7f9,
+	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,
+	0xa9e5, 0xa9e6,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa70, 0xaa70,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaadd, 0xaadd,
+	0xaaec, 0xaaed,
+	0xaaf3, 0xaaf4,
+	0xaaf6, 0xaaf6,
+	0xab5b, 0xab5f,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
+	0xfe00, 0xfe0f,
+	0xfe13, 0xfe13,
+	0xfe20, 0xfe2d,
+	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,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11301, 0x11301,
+	0x1133c, 0x1133c,
+	0x11340, 0x11340,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16f8f, 0x16f9f,
+	0x1bc9d, 0x1bc9e,
+	0x1bca0, 0x1bca3,
+	0x1d167, 0x1d169,
+	0x1d173, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1e8d0, 0x1e8d6,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+}; /* CR_Case_Ignorable */
+
+/* 'Changes_When_Lowercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Lowercased[] = {
+	585,
+	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,
+	0x037f, 0x037f,
+	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,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x118a0, 0x118bf,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	599,
+	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, 0x025c,
+	0x0260, 0x0261,
+	0x0263, 0x0263,
+	0x0265, 0x0266,
+	0x0268, 0x0269,
+	0x026b, 0x026c,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0287, 0x028c,
+	0x0292, 0x0292,
+	0x029e, 0x029e,
+	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, 0x03f3,
+	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,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa699, 0xa699,
+	0xa69b, 0xa69b,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x118c0, 0x118df,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	600,
+	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, 0x025c,
+	0x0260, 0x0261,
+	0x0263, 0x0263,
+	0x0265, 0x0266,
+	0x0268, 0x0269,
+	0x026b, 0x026c,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0287, 0x028c,
+	0x0292, 0x0292,
+	0x029e, 0x029e,
+	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, 0x03f3,
+	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,
+	0x0527, 0x0527,
+	0x0529, 0x0529,
+	0x052b, 0x052b,
+	0x052d, 0x052d,
+	0x052f, 0x052f,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa699, 0xa699,
+	0xa69b, 0xa69b,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa797, 0xa797,
+	0xa799, 0xa799,
+	0xa79b, 0xa79b,
+	0xa79d, 0xa79d,
+	0xa79f, 0xa79f,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+	0x118c0, 0x118df,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	596,
+	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,
+	0x037f, 0x037f,
+	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,
+	0x0526, 0x0526,
+	0x0528, 0x0528,
+	0x052a, 0x052a,
+	0x052c, 0x052c,
+	0x052e, 0x052e,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa698, 0xa698,
+	0xa69a, 0xa69a,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa796, 0xa796,
+	0xa798, 0xa798,
+	0xa79a, 0xa79a,
+	0xa79c, 0xa79c,
+	0xa79e, 0xa79e,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+	0x118a0, 0x118bf,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	107,
+	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, 0x025c,
+	0x0260, 0x0261,
+	0x0263, 0x0263,
+	0x0265, 0x0266,
+	0x0268, 0x0269,
+	0x026b, 0x026c,
+	0x026f, 0x026f,
+	0x0271, 0x0272,
+	0x0275, 0x0275,
+	0x027d, 0x027d,
+	0x0280, 0x0280,
+	0x0283, 0x0283,
+	0x0287, 0x028c,
+	0x0292, 0x0292,
+	0x029e, 0x029e,
+	0x0345, 0x0345,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03d1,
+	0x03d5, 0x03f5,
+	0x03f7, 0x03fb,
+	0x03fd, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa69b,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78d,
+	0xa790, 0xa793,
+	0xa796, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+	0x118a0, 0x118df,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	538,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08b2,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0980,
+	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, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x16f8,
+	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, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 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,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x1135d, 0x11361,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	626,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08b2,
+	0x08e4, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	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,
+	0x1ab0, 0x1abd,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa69d,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0xfe2d,
+	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,
+	0x102e0, 0x102e0,
+	0x10300, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae6,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111d0, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x11237,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af4,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9d, 0x1bc9e,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	545,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08b2,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0980,
+	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, 0x0c39,
+	0x0c3d, 0x0c3d,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c61,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbd, 0x0cbd,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x16f8,
+	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, 0x191e,
+	0x1950, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19c1, 0x19c7,
+	0x1a00, 0x1a16,
+	0x1a20, 0x1a54,
+	0x1aa7, 0x1aa7,
+	0x1b05, 0x1b33,
+	0x1b45, 0x1b4b,
+	0x1b83, 0x1ba0,
+	0x1bae, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 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,
+	0xa9e0, 0xa9e4,
+	0xa9e6, 0xa9ef,
+	0xa9fa, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa7e, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae4,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11150, 0x11172,
+	0x11176, 0x11176,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x111da, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x1122b,
+	0x112b0, 0x112de,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x1135d, 0x11361,
+	0x11480, 0x114af,
+	0x114c4, 0x114c5,
+	0x114c7, 0x114c7,
+	0x11580, 0x115ae,
+	0x11600, 0x1162f,
+	0x11644, 0x11644,
+	0x11680, 0x116aa,
+	0x118a0, 0x118df,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16ad0, 0x16aed,
+	0x16b00, 0x16b2f,
+	0x16b40, 0x16b43,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	633,
+	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,
+	0x037f, 0x037f,
+	0x0386, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x0483, 0x0487,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08b2,
+	0x08e4, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 0x135f,
+	0x1369, 0x1371,
+	0x1380, 0x138f,
+	0x13a0, 0x13f4,
+	0x1401, 0x166c,
+	0x166f, 0x167f,
+	0x1681, 0x169a,
+	0x16a0, 0x16ea,
+	0x16ee, 0x16f8,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1734,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17d3,
+	0x17d7, 0x17d7,
+	0x17dc, 0x17dd,
+	0x17e0, 0x17e9,
+	0x180b, 0x180d,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	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,
+	0x1ab0, 0x1abd,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa69d,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c4,
+	0xa8d0, 0xa8d9,
+	0xa8e0, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92d,
+	0xa930, 0xa953,
+	0xa960, 0xa97c,
+	0xa980, 0xa9c0,
+	0xa9cf, 0xa9d9,
+	0xa9e0, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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, 0xfe2d,
+	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,
+	0x102e0, 0x102e0,
+	0x10300, 0x1031f,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x103a0, 0x103c3,
+	0x103c8, 0x103cf,
+	0x103d1, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10860, 0x10876,
+	0x10880, 0x1089e,
+	0x10900, 0x10915,
+	0x10920, 0x10939,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10a80, 0x10a9c,
+	0x10ac0, 0x10ac7,
+	0x10ac9, 0x10ae6,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10b80, 0x10b91,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x1107f, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11150, 0x11173,
+	0x11176, 0x11176,
+	0x11180, 0x111c4,
+	0x111d0, 0x111da,
+	0x11200, 0x11211,
+	0x11213, 0x11237,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c5,
+	0x114c7, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c0,
+	0x11600, 0x11640,
+	0x11644, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118e9,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af4,
+	0x16b00, 0x16b36,
+	0x16b40, 0x16b43,
+	0x16b50, 0x16b59,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9d, 0x1bc9e,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8d0, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_XID_Continue */
+
+/* 'Default_Ignorable_Code_Point': Derived Property */
+static const OnigCodePoint CR_Default_Ignorable_Code_Point[] = {
+	17,
+	0x00ad, 0x00ad,
+	0x034f, 0x034f,
+	0x061c, 0x061c,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x180b, 0x180e,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x3164, 0x3164,
+	0xfe00, 0xfe0f,
+	0xfeff, 0xfeff,
+	0xffa0, 0xffa0,
+	0xfff0, 0xfff8,
+	0x1bca0, 0x1bca3,
+	0x1d173, 0x1d17a,
+	0xe0000, 0xe0fff,
+}; /* CR_Default_Ignorable_Code_Point */
+
+/* 'Grapheme_Extend': Derived Property */
+static const OnigCodePoint CR_Grapheme_Extend[] = {
+	272,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0c00, 0x0c00,
+	0x0c3e, 0x0c40,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c81,
+	0x0cbc, 0x0cbc,
+	0x0cbf, 0x0cbf,
+	0x0cc2, 0x0cc2,
+	0x0cc6, 0x0cc6,
+	0x0ccc, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d01, 0x0d01,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	0x17b7, 0x17bd,
+	0x17c6, 0x17c6,
+	0x17c9, 0x17d3,
+	0x17dd, 0x17dd,
+	0x180b, 0x180d,
+	0x18a9, 0x18a9,
+	0x1920, 0x1922,
+	0x1927, 0x1928,
+	0x1932, 0x1932,
+	0x1939, 0x193b,
+	0x1a17, 0x1a18,
+	0x1a1b, 0x1a1b,
+	0x1a56, 0x1a56,
+	0x1a58, 0x1a5e,
+	0x1a60, 0x1a60,
+	0x1a62, 0x1a62,
+	0x1a65, 0x1a6c,
+	0x1a73, 0x1a7c,
+	0x1a7f, 0x1a7f,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b03,
+	0x1b34, 0x1b34,
+	0x1b36, 0x1b3a,
+	0x1b3c, 0x1b3c,
+	0x1b42, 0x1b42,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1b81,
+	0x1ba2, 0x1ba5,
+	0x1ba8, 0x1ba9,
+	0x1bab, 0x1bad,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df5,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xa9e5, 0xa9e5,
+	0xaa29, 0xaa2e,
+	0xaa31, 0xaa32,
+	0xaa35, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4c,
+	0xaa7c, 0xaa7c,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabf,
+	0xaac1, 0xaac1,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2d,
+	0xff9e, 0xff9f,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10ae5, 0x10ae6,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x1107f, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11173, 0x11173,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x1122f, 0x11231,
+	0x11234, 0x11234,
+	0x11236, 0x11237,
+	0x112df, 0x112df,
+	0x112e3, 0x112ea,
+	0x11301, 0x11301,
+	0x1133c, 0x1133c,
+	0x1133e, 0x1133e,
+	0x11340, 0x11340,
+	0x11357, 0x11357,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x114b0, 0x114b0,
+	0x114b3, 0x114b8,
+	0x114ba, 0x114ba,
+	0x114bd, 0x114bd,
+	0x114bf, 0x114c0,
+	0x114c2, 0x114c3,
+	0x115af, 0x115af,
+	0x115b2, 0x115b5,
+	0x115bc, 0x115bd,
+	0x115bf, 0x115c0,
+	0x11633, 0x1163a,
+	0x1163d, 0x1163d,
+	0x1163f, 0x11640,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16af0, 0x16af4,
+	0x16b30, 0x16b36,
+	0x16f8f, 0x16f92,
+	0x1bc9d, 0x1bc9e,
+	0x1d165, 0x1d165,
+	0x1d167, 0x1d169,
+	0x1d16e, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0x1e8d0, 0x1e8d6,
+	0xe0100, 0xe01ef,
+}; /* CR_Grapheme_Extend */
+
+/* 'Grapheme_Base': Derived Property */
+static const OnigCodePoint CR_Grapheme_Base[] = {
+	724,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06de, 0x06de,
+	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,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
+	0x08a0, 0x08b2,
+	0x0903, 0x0939,
+	0x093b, 0x093b,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0980,
+	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, 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, 0x0b77,
+	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, 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, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dd0, 0x0dd1,
+	0x0dd8, 0x0dde,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8c,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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, 0x16f8,
+	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,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a8,
+	0x18aa, 0x18aa,
+	0x18b0, 0x18f5,
+	0x1900, 0x191e,
+	0x1923, 0x1926,
+	0x1929, 0x192b,
+	0x1930, 0x1931,
+	0x1933, 0x1938,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19ab,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19da,
+	0x19de, 0x1a16,
+	0x1a19, 0x1a1a,
+	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, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	0x20a0, 0x20bd,
+	0x2100, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa69d,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 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, 0xa9e4,
+	0xa9e6, 0xa9fe,
+	0xaa00, 0xaa28,
+	0xaa2f, 0xaa30,
+	0xaa33, 0xaa34,
+	0xaa40, 0xaa42,
+	0xaa44, 0xaa4b,
+	0xaa4d, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa7b,
+	0xaa7d, 0xaaaf,
+	0xaab1, 0xaab1,
+	0xaab5, 0xaab6,
+	0xaab9, 0xaabd,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaaeb,
+	0xaaee, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fc,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e1, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x10375,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a40, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae4,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11103, 0x11126,
+	0x1112c, 0x1112c,
+	0x11136, 0x11143,
+	0x11150, 0x11172,
+	0x11174, 0x11176,
+	0x11182, 0x111b5,
+	0x111bf, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1122e,
+	0x11232, 0x11233,
+	0x11235, 0x11235,
+	0x11238, 0x1123d,
+	0x112b0, 0x112de,
+	0x112e0, 0x112e2,
+	0x112f0, 0x112f9,
+	0x11302, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133d, 0x1133d,
+	0x1133f, 0x1133f,
+	0x11341, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x1135d, 0x11363,
+	0x11480, 0x114af,
+	0x114b1, 0x114b2,
+	0x114b9, 0x114b9,
+	0x114bb, 0x114bc,
+	0x114be, 0x114be,
+	0x114c1, 0x114c1,
+	0x114c4, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115ae,
+	0x115b0, 0x115b1,
+	0x115b8, 0x115bb,
+	0x115be, 0x115be,
+	0x115c1, 0x115c9,
+	0x11600, 0x11632,
+	0x1163b, 0x1163c,
+	0x1163e, 0x1163e,
+	0x11641, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116aa,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af5, 0x16af5,
+	0x16b00, 0x16b2f,
+	0x16b37, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bc9c,
+	0x1bc9f, 0x1bc9f,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8cf,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	40,
+	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, 0x1bab,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xaaf6, 0xaaf6,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
+	0x1107f, 0x1107f,
+	0x110b9, 0x110b9,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x11235, 0x11235,
+	0x112ea, 0x112ea,
+	0x1134d, 0x1134d,
+	0x114c2, 0x114c2,
+	0x115bf, 0x115bf,
+	0x1163f, 0x1163f,
+	0x116b6, 0x116b6,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	165,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x0605, 0x0605,
+	0x060c, 0x060c,
+	0x061b, 0x061c,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x2066, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20bd,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x27ff,
+	0x2900, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2e00, 0x2e42,
+	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,
+	0xa92e, 0xa92e,
+	0xa9cf, 0xa9cf,
+	0xab5b, 0xab5b,
+	0xfd3e, 0xfd3f,
+	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,
+	0x102e1, 0x102fb,
+	0x1bca0, 0x1bca3,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	33,
+	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, 0x209c,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa7ff,
+	0xab30, 0xab5a,
+	0xab5c, 0xab5f,
+	0xab64, 0xab64,
+	0xfb00, 0xfb06,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+}; /* CR_Latin */
+
+/* 'Greek': Script */
+static const OnigCodePoint CR_Greek[] = {
+	36,
+	0x0370, 0x0373,
+	0x0375, 0x0377,
+	0x037a, 0x037d,
+	0x037f, 0x037f,
+	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,
+	0xab65, 0xab65,
+	0x10140, 0x1018c,
+	0x101a0, 0x101a0,
+	0x1d200, 0x1d245,
+}; /* CR_Greek */
+
+/* 'Cyrillic': Script */
+static const OnigCodePoint CR_Cyrillic[] = {
+	7,
+	0x0400, 0x0484,
+	0x0487, 0x052f,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa69d,
+	0xa69f, 0xa69f,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	6,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0x058d, 0x058f,
+	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[] = {
+	55,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065f,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08b2,
+	0x08e4, 0x08ff,
+	0xfb50, 0xfbc1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfd,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* 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[] = {
+	4,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
+	0x0966, 0x097f,
+	0xa8e0, 0xa8fb,
+}; /* CR_Devanagari */
+
+/* 'Bengali': Script */
+static const OnigCodePoint CR_Bengali[] = {
+	14,
+	0x0980, 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[] = {
+	13,
+	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, 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, 0x0b77,
+}; /* 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[] = {
+	13,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 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[] = {
+	14,
+	0x0c81, 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,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	11,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d63,
+	0x0d66, 0x0d75,
+	0x0d79, 0x0d7f,
+}; /* CR_Malayalam */
+
+/* 'Sinhala': Script */
+static const OnigCodePoint CR_Sinhala[] = {
+	13,
+	0x0d82, 0x0d83,
+	0x0d85, 0x0d96,
+	0x0d9a, 0x0db1,
+	0x0db3, 0x0dbb,
+	0x0dbd, 0x0dbd,
+	0x0dc0, 0x0dc6,
+	0x0dca, 0x0dca,
+	0x0dcf, 0x0dd4,
+	0x0dd6, 0x0dd6,
+	0x0dd8, 0x0ddf,
+	0x0de6, 0x0def,
+	0x0df2, 0x0df4,
+	0x111e1, 0x111f4,
+}; /* 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, 0x0edf,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	3,
+	0x1000, 0x109f,
+	0xa9e0, 0xa9fe,
+	0xaa60, 0xaa7f,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	8,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10ff,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	14,
+	0x1100, 0x11ff,
+	0x302e, 0x302f,
+	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[] = {
+	32,
+	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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+}; /* 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, 0x16f8,
+}; /* 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[] = {
+	4,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1b001, 0x1b001,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	8,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	3,
+	0x02ea, 0x02eb,
+	0x3105, 0x312d,
+	0x31a0, 0x31ba,
+}; /* 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, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	1,
+	0x10300, 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[] = {
+	27,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1ab0, 0x1abe,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1dc0, 0x1df5,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe2d,
+	0x101fd, 0x101fd,
+	0x102e0, 0x102e0,
+	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, 0x191e,
+	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, 0x2cf3,
+	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[] = {
+	3,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
+}; /* 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, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+}; /* 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, 0x1bbf,
+	0x1cc0, 0x1cc7,
+}; /* 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[] = {
+	2,
+	0xa900, 0xa92d,
+	0xa92f, 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[] = {
+	2,
+	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
+}; /* CR_Bamum */
+
+/* 'Javanese': Script */
+static const OnigCodePoint CR_Javanese[] = {
+	3,
+	0xa980, 0xa9cd,
+	0xa9d0, 0xa9d9,
+	0xa9de, 0xa9df,
+}; /* CR_Javanese */
+
+/* 'Meetei_Mayek': Script */
+static const OnigCodePoint CR_Meetei_Mayek[] = {
+	3,
+	0xaae0, 0xaaf6,
+	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 */
+
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	3,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x1107f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
+/* 'Chakma': Script */
+static const OnigCodePoint CR_Chakma[] = {
+	2,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+}; /* CR_Chakma */
+
+/* 'Meroitic_Cursive': Script */
+static const OnigCodePoint CR_Meroitic_Cursive[] = {
+	2,
+	0x109a0, 0x109b7,
+	0x109be, 0x109bf,
+}; /* CR_Meroitic_Cursive */
+
+/* 'Meroitic_Hieroglyphs': Script */
+static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
+	1,
+	0x10980, 0x1099f,
+}; /* CR_Meroitic_Hieroglyphs */
+
+/* 'Miao': Script */
+static const OnigCodePoint CR_Miao[] = {
+	3,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+}; /* CR_Miao */
+
+/* 'Sharada': Script */
+static const OnigCodePoint CR_Sharada[] = {
+	3,
+	0x11180, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+}; /* CR_Sharada */
+
+/* 'Sora_Sompeng': Script */
+static const OnigCodePoint CR_Sora_Sompeng[] = {
+	2,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+}; /* CR_Sora_Sompeng */
+
+/* 'Takri': Script */
+static const OnigCodePoint CR_Takri[] = {
+	2,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+}; /* CR_Takri */
+
+/* 'Caucasian_Albanian': Script */
+static const OnigCodePoint CR_Caucasian_Albanian[] = {
+	2,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+}; /* CR_Caucasian_Albanian */
+
+/* 'Bassa_Vah': Script */
+static const OnigCodePoint CR_Bassa_Vah[] = {
+	2,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+}; /* CR_Bassa_Vah */
+
+/* 'Duployan': Script */
+static const OnigCodePoint CR_Duployan[] = {
+	5,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bc9f,
+}; /* CR_Duployan */
+
+/* 'Elbasan': Script */
+static const OnigCodePoint CR_Elbasan[] = {
+	1,
+	0x10500, 0x10527,
+}; /* CR_Elbasan */
+
+/* 'Grantha': Script */
+static const OnigCodePoint CR_Grantha[] = {
+	14,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+}; /* CR_Grantha */
+
+/* 'Pahawh_Hmong': Script */
+static const OnigCodePoint CR_Pahawh_Hmong[] = {
+	5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+}; /* CR_Pahawh_Hmong */
+
+/* 'Khojki': Script */
+static const OnigCodePoint CR_Khojki[] = {
+	2,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+}; /* CR_Khojki */
+
+/* 'Linear_A': Script */
+static const OnigCodePoint CR_Linear_A[] = {
+	3,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+}; /* CR_Linear_A */
+
+/* 'Mahajani': Script */
+static const OnigCodePoint CR_Mahajani[] = {
+	1,
+	0x11150, 0x11176,
+}; /* CR_Mahajani */
+
+/* 'Manichaean': Script */
+static const OnigCodePoint CR_Manichaean[] = {
+	2,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+}; /* CR_Manichaean */
+
+/* 'Mende_Kikakui': Script */
+static const OnigCodePoint CR_Mende_Kikakui[] = {
+	2,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+}; /* CR_Mende_Kikakui */
+
+/* 'Modi': Script */
+static const OnigCodePoint CR_Modi[] = {
+	2,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+}; /* CR_Modi */
+
+/* 'Mro': Script */
+static const OnigCodePoint CR_Mro[] = {
+	3,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+}; /* CR_Mro */
+
+/* 'Old_North_Arabian': Script */
+static const OnigCodePoint CR_Old_North_Arabian[] = {
+	1,
+	0x10a80, 0x10a9f,
+}; /* CR_Old_North_Arabian */
+
+/* 'Nabataean': Script */
+static const OnigCodePoint CR_Nabataean[] = {
+	2,
+	0x10880, 0x1089e,
+	0x108a7, 0x108af,
+}; /* CR_Nabataean */
+
+/* 'Palmyrene': Script */
+static const OnigCodePoint CR_Palmyrene[] = {
+	1,
+	0x10860, 0x1087f,
+}; /* CR_Palmyrene */
+
+/* 'Pau_Cin_Hau': Script */
+static const OnigCodePoint CR_Pau_Cin_Hau[] = {
+	1,
+	0x11ac0, 0x11af8,
+}; /* CR_Pau_Cin_Hau */
+
+/* 'Old_Permic': Script */
+static const OnigCodePoint CR_Old_Permic[] = {
+	1,
+	0x10350, 0x1037a,
+}; /* CR_Old_Permic */
+
+/* 'Psalter_Pahlavi': Script */
+static const OnigCodePoint CR_Psalter_Pahlavi[] = {
+	3,
+	0x10b80, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+}; /* CR_Psalter_Pahlavi */
+
+/* 'Siddham': Script */
+static const OnigCodePoint CR_Siddham[] = {
+	2,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+}; /* CR_Siddham */
+
+/* 'Khudawadi': Script */
+static const OnigCodePoint CR_Khudawadi[] = {
+	2,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+}; /* CR_Khudawadi */
+
+/* 'Tirhuta': Script */
+static const OnigCodePoint CR_Tirhuta[] = {
+	2,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+}; /* CR_Tirhuta */
+
+/* 'Warang_Citi': Script */
+static const OnigCodePoint CR_Warang_Citi[] = {
+	2,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+}; /* CR_Warang_Citi */
+
+/* 'White_Space': Binary Property */
+#define CR_White_Space CR_Space
+
+/* 'Bidi_Control': Binary Property */
+static const OnigCodePoint CR_Bidi_Control[] = {
+	4,
+	0x061c, 0x061c,
+	0x200e, 0x200f,
+	0x202a, 0x202e,
+	0x2066, 0x2069,
+}; /* 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[] = {
+	21,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	0x2e40, 0x2e40,
+	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[] = {
+	13,
+	0x0022, 0x0022,
+	0x0027, 0x0027,
+	0x00ab, 0x00ab,
+	0x00bb, 0x00bb,
+	0x2018, 0x201f,
+	0x2039, 0x203a,
+	0x2e42, 0x2e42,
+	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[] = {
+	86,
+	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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0e5a, 0x0e5b,
+	0x0f08, 0x0f08,
+	0x0f0d, 0x0f12,
+	0x104a, 0x104b,
+	0x1361, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	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,
+	0x2e3c, 0x2e3c,
+	0x2e41, 0x2e41,
+	0x3001, 0x3002,
+	0xa4fe, 0xa4ff,
+	0xa60d, 0xa60f,
+	0xa6f3, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c7, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaadf, 0xaadf,
+	0xaaf0, 0xaaf1,
+	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,
+	0x10a56, 0x10a57,
+	0x10af0, 0x10af5,
+	0x10b3a, 0x10b3f,
+	0x10b99, 0x10b9c,
+	0x11047, 0x1104d,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x111cd, 0x111cd,
+	0x11238, 0x1123c,
+	0x115c2, 0x115c5,
+	0x115c9, 0x115c9,
+	0x11641, 0x11642,
+	0x12470, 0x12474,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b39,
+	0x16b44, 0x16b44,
+	0x1bc9f, 0x1bc9f,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	134,
+	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,
+	0x2107, 0x2107,
+	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,
+	0x2308, 0x230b,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+}; /* 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 */
+#define CR_ASCII_Hex_Digit CR_XDigit
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	178,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x08e4, 0x08e9,
+	0x08f0, 0x0903,
+	0x093a, 0x093b,
+	0x093e, 0x094c,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
+	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,
+	0x0c00, 0x0c03,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4c,
+	0x0c55, 0x0c56,
+	0x0c62, 0x0c63,
+	0x0c81, 0x0c83,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccc,
+	0x0cd5, 0x0cd6,
+	0x0ce2, 0x0ce3,
+	0x0d01, 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,
+	0x0f8d, 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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1bf1,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf3,
+	0x1de7, 0x1df4,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69f, 0xa69f,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b4, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10376, 0x1037a,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+	0x11100, 0x11102,
+	0x11127, 0x11132,
+	0x11180, 0x11182,
+	0x111b3, 0x111bf,
+	0x1122c, 0x11234,
+	0x11237, 0x11237,
+	0x112df, 0x112e8,
+	0x11301, 0x11303,
+	0x1133e, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134c,
+	0x11357, 0x11357,
+	0x11362, 0x11363,
+	0x114b0, 0x114c1,
+	0x115af, 0x115b5,
+	0x115b8, 0x115be,
+	0x11630, 0x1163e,
+	0x11640, 0x11640,
+	0x116ab, 0x116b5,
+	0x16b30, 0x16b36,
+	0x16f51, 0x16f7e,
+	0x1bc9e, 0x1bc9e,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	145,
+	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,
+	0x08e4, 0x08fe,
+	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,
+	0x1ab0, 0x1abd,
+	0x1b34, 0x1b34,
+	0x1b44, 0x1b44,
+	0x1b6b, 0x1b73,
+	0x1baa, 0x1bab,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1cf8, 0x1cf9,
+	0x1d2c, 0x1d6a,
+	0x1dc4, 0x1dcf,
+	0x1df5, 0x1df5,
+	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,
+	0xa69c, 0xa69d,
+	0xa6f0, 0xa6f1,
+	0xa717, 0xa721,
+	0xa788, 0xa788,
+	0xa7f8, 0xa7f9,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xa9e5, 0xa9e5,
+	0xaa7b, 0xaa7d,
+	0xaabf, 0xaac2,
+	0xaaf6, 0xaaf6,
+	0xab5b, 0xab5f,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe2d,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x102e0, 0x102e0,
+	0x10ae5, 0x10ae6,
+	0x110b9, 0x110ba,
+	0x11133, 0x11134,
+	0x11173, 0x11173,
+	0x111c0, 0x111c0,
+	0x11235, 0x11236,
+	0x112e9, 0x112ea,
+	0x1133c, 0x1133c,
+	0x1134d, 0x1134d,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x114c2, 0x114c3,
+	0x115bf, 0x115c0,
+	0x1163f, 0x1163f,
+	0x116b6, 0x116b7,
+	0x16af0, 0x16af4,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1e8d0, 0x1e8d6,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	26,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x180a, 0x180a,
+	0x1843, 0x1843,
+	0x1aa7, 0x1aa7,
+	0x1c36, 0x1c36,
+	0x1c7b, 0x1c7b,
+	0x3005, 0x3005,
+	0x3031, 0x3035,
+	0x309d, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa60c, 0xa60c,
+	0xa9cf, 0xa9cf,
+	0xa9e6, 0xa9e6,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+	0x1135d, 0x1135d,
+	0x115c6, 0x115c8,
+	0x16b42, 0x16b43,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	20,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7c, 0x2c7d,
+	0xa69c, 0xa69d,
+	0xa770, 0xa770,
+	0xa7f8, 0xa7f9,
+	0xab5c, 0xab5f,
+}; /* CR_Other_Lowercase */
+
+/* 'Other_Uppercase': Binary Property */
+static const OnigCodePoint CR_Other_Uppercase[] = {
+	5,
+	0x2160, 0x216f,
+	0x24b6, 0x24cf,
+	0x1f130, 0x1f149,
+	0x1f150, 0x1f169,
+	0x1f170, 0x1f189,
+}; /* 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[] = {
+	22,
+	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,
+	0x302e, 0x302f,
+	0xff9e, 0xff9f,
+	0x1133e, 0x1133e,
+	0x11357, 0x11357,
+	0x114b0, 0x114b0,
+	0x114bd, 0x114bd,
+	0x115af, 0x115af,
+	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[] = {
+	12,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	11,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	0x2065, 0x2065,
+	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[] = {
+	9,
+	0x0149, 0x0149,
+	0x0673, 0x0673,
+	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[] = {
+	4,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+	0x19da, 0x19da,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	60,
+	0x0021, 0x0021,
+	0x002e, 0x002e,
+	0x003f, 0x003f,
+	0x0589, 0x0589,
+	0x061f, 0x061f,
+	0x06d4, 0x06d4,
+	0x0700, 0x0702,
+	0x07f9, 0x07f9,
+	0x0964, 0x0965,
+	0x104a, 0x104b,
+	0x1362, 0x1362,
+	0x1367, 0x1368,
+	0x166e, 0x166e,
+	0x1735, 0x1736,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	0x1b5a, 0x1b5b,
+	0x1b5e, 0x1b5f,
+	0x1c3b, 0x1c3c,
+	0x1c7e, 0x1c7f,
+	0x203c, 0x203d,
+	0x2047, 0x2049,
+	0x2e2e, 0x2e2e,
+	0x2e3c, 0x2e3c,
+	0x3002, 0x3002,
+	0xa4ff, 0xa4ff,
+	0xa60e, 0xa60f,
+	0xa6f3, 0xa6f3,
+	0xa6f7, 0xa6f7,
+	0xa876, 0xa877,
+	0xa8ce, 0xa8cf,
+	0xa92f, 0xa92f,
+	0xa9c8, 0xa9c9,
+	0xaa5d, 0xaa5f,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x111cd, 0x111cd,
+	0x11238, 0x11239,
+	0x1123b, 0x1123c,
+	0x115c2, 0x115c3,
+	0x115c9, 0x115c9,
+	0x11641, 0x11642,
+	0x16a6e, 0x16a6f,
+	0x16af5, 0x16af5,
+	0x16b37, 0x16b38,
+	0x16b44, 0x16b44,
+	0x1bc9f, 0x1bc9f,
+}; /* 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 */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	598,
+	0x0378, 0x0379,
+	0x0380, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0530, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058c,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x061d, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08b3, 0x08e3,
+	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,
+	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,
+	0x0b78, 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, 0x0bff,
+	0x0c04, 0x0c04,
+	0x0c0d, 0x0c0d,
+	0x0c11, 0x0c11,
+	0x0c29, 0x0c29,
+	0x0c3a, 0x0c3c,
+	0x0c45, 0x0c45,
+	0x0c49, 0x0c49,
+	0x0c4e, 0x0c54,
+	0x0c57, 0x0c57,
+	0x0c5a, 0x0c5f,
+	0x0c64, 0x0c65,
+	0x0c70, 0x0c77,
+	0x0c80, 0x0c80,
+	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, 0x0d00,
+	0x0d04, 0x0d04,
+	0x0d0d, 0x0d0d,
+	0x0d11, 0x0d11,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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, 0x0de5,
+	0x0df0, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	0x137d, 0x137f,
+	0x139a, 0x139f,
+	0x13f5, 0x13ff,
+	0x169d, 0x169f,
+	0x16f9, 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,
+	0x191f, 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, 0x1aaf,
+	0x1abf, 0x1aff,
+	0x1b4c, 0x1b4f,
+	0x1b7d, 0x1b7f,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cf7,
+	0x1cfa, 0x1cff,
+	0x1df6, 0x1dfb,
+	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, 0x2065,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20be, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23fb, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2b74, 0x2b75,
+	0x2b96, 0x2b97,
+	0x2bba, 0x2bbc,
+	0x2bc9, 0x2bc9,
+	0x2bd2, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e43, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa69e, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa7ae, 0xa7af,
+	0xa7b2, 0xa7f6,
+	0xa82c, 0xa82f,
+	0xa83a, 0xa83f,
+	0xa878, 0xa87f,
+	0xa8c5, 0xa8cd,
+	0xa8da, 0xa8df,
+	0xa8fc, 0xa8ff,
+	0xa954, 0xa95e,
+	0xa97d, 0xa97f,
+	0xa9ce, 0xa9ce,
+	0xa9da, 0xa9dd,
+	0xa9ff, 0xa9ff,
+	0xaa37, 0xaa3f,
+	0xaa4e, 0xaa4f,
+	0xaa5a, 0xaa5b,
+	0xaac3, 0xaada,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xab2f,
+	0xab60, 0xab63,
+	0xab66, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe2e, 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,
+	0x1018d, 0x1018f,
+	0x1019c, 0x1019f,
+	0x101a1, 0x101cf,
+	0x101fe, 0x1027f,
+	0x1029d, 0x1029f,
+	0x102d1, 0x102df,
+	0x102fc, 0x102ff,
+	0x10324, 0x1032f,
+	0x1034b, 0x1034f,
+	0x1037b, 0x1037f,
+	0x1039e, 0x1039e,
+	0x103c4, 0x103c7,
+	0x103d6, 0x103ff,
+	0x1049e, 0x1049f,
+	0x104aa, 0x104ff,
+	0x10528, 0x1052f,
+	0x10564, 0x1056e,
+	0x10570, 0x105ff,
+	0x10737, 0x1073f,
+	0x10756, 0x1075f,
+	0x10768, 0x107ff,
+	0x10806, 0x10807,
+	0x10809, 0x10809,
+	0x10836, 0x10836,
+	0x10839, 0x1083b,
+	0x1083d, 0x1083e,
+	0x10856, 0x10856,
+	0x1089f, 0x108a6,
+	0x108b0, 0x108ff,
+	0x1091c, 0x1091e,
+	0x1093a, 0x1093e,
+	0x10940, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 0x109ff,
+	0x10a04, 0x10a04,
+	0x10a07, 0x10a0b,
+	0x10a14, 0x10a14,
+	0x10a18, 0x10a18,
+	0x10a34, 0x10a37,
+	0x10a3b, 0x10a3e,
+	0x10a48, 0x10a4f,
+	0x10a59, 0x10a5f,
+	0x10aa0, 0x10abf,
+	0x10ae7, 0x10aea,
+	0x10af7, 0x10aff,
+	0x10b36, 0x10b38,
+	0x10b56, 0x10b57,
+	0x10b73, 0x10b77,
+	0x10b92, 0x10b98,
+	0x10b9d, 0x10ba8,
+	0x10bb0, 0x10bff,
+	0x10c49, 0x10e5f,
+	0x10e7f, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107e,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1114f,
+	0x11177, 0x1117f,
+	0x111c9, 0x111cc,
+	0x111ce, 0x111cf,
+	0x111db, 0x111e0,
+	0x111f5, 0x111ff,
+	0x11212, 0x11212,
+	0x1123e, 0x112af,
+	0x112eb, 0x112ef,
+	0x112fa, 0x11300,
+	0x11304, 0x11304,
+	0x1130d, 0x1130e,
+	0x11311, 0x11312,
+	0x11329, 0x11329,
+	0x11331, 0x11331,
+	0x11334, 0x11334,
+	0x1133a, 0x1133b,
+	0x11345, 0x11346,
+	0x11349, 0x1134a,
+	0x1134e, 0x11356,
+	0x11358, 0x1135c,
+	0x11364, 0x11365,
+	0x1136d, 0x1136f,
+	0x11375, 0x1147f,
+	0x114c8, 0x114cf,
+	0x114da, 0x1157f,
+	0x115b6, 0x115b7,
+	0x115ca, 0x115ff,
+	0x11645, 0x1164f,
+	0x1165a, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x1189f,
+	0x118f3, 0x118fe,
+	0x11900, 0x11abf,
+	0x11af9, 0x11fff,
+	0x12399, 0x123ff,
+	0x1246f, 0x1246f,
+	0x12475, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16a3f,
+	0x16a5f, 0x16a5f,
+	0x16a6a, 0x16a6d,
+	0x16a70, 0x16acf,
+	0x16aee, 0x16aef,
+	0x16af6, 0x16aff,
+	0x16b46, 0x16b4f,
+	0x16b5a, 0x16b5a,
+	0x16b62, 0x16b62,
+	0x16b78, 0x16b7c,
+	0x16b90, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 0x1bbff,
+	0x1bc6b, 0x1bc6f,
+	0x1bc7d, 0x1bc7f,
+	0x1bc89, 0x1bc8f,
+	0x1bc9a, 0x1bc9b,
+	0x1bca4, 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, 0x1e7ff,
+	0x1e8c5, 0x1e8c6,
+	0x1e8d7, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0c0, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0f6, 0x1f0ff,
+	0x1f10d, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f32d, 0x1f32f,
+	0x1f37e, 0x1f37f,
+	0x1f3cf, 0x1f3d3,
+	0x1f3f8, 0x1f3ff,
+	0x1f4ff, 0x1f4ff,
+	0x1f54b, 0x1f54f,
+	0x1f57a, 0x1f57a,
+	0x1f5a4, 0x1f5a4,
+	0x1f643, 0x1f644,
+	0x1f6d0, 0x1f6df,
+	0x1f6ed, 0x1f6ef,
+	0x1f6f4, 0x1f6ff,
+	0x1f774, 0x1f77f,
+	0x1f7d5, 0x1f7ff,
+	0x1f80c, 0x1f80f,
+	0x1f848, 0x1f84f,
+	0x1f85a, 0x1f85f,
+	0x1f888, 0x1f88f,
+	0x1f8ae, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_Unknown */
+
+#ifdef USE_UNICODE_AGE_PROPERTIES
+/* 'Age_1_1': Derived Age 1.1 */
+static const OnigCodePoint CR_Age_1_1[] = {
+	288,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x05b0, 0x05b9,
+	0x05bb, 0x05c3,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9a,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20aa,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xe000, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+}; /* CR_Age_1_1 */
+
+/* 'Age_2_0': Derived Age 2.0 */
+static const OnigCodePoint CR_Age_2_0[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ab,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 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, 0x10ffff,
+}; /* CR_Age_2_0 */
+
+/* 'Age_2_1': Derived Age 2.1 */
+static const OnigCodePoint CR_Age_2_1[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ac,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 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, 0x10ffff,
+}; /* CR_Age_2_1 */
+
+/* 'Age_3_0': Derived Age 3.0 */
+static const OnigCodePoint CR_Age_3_0[] = {
+	369,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f3,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 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, 0x10ffff,
+}; /* CR_Age_3_0 */
+
+/* 'Age_3_1': Derived Age 3.1 */
+static const OnigCodePoint CR_Age_3_1[] = {
+	402,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f5,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_1 */
+
+/* 'Age_3_2': Derived Age 3.2 */
+static const OnigCodePoint CR_Age_3_2[] = {
+	397,
+	0x0000, 0x0220,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034f,
+	0x0360, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03f6,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b1,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2052,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213a,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23ce,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24fe,
+	0x2500, 0x2613,
+	0x2616, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2689,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2aff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321c,
+	0x3220, 0x3243,
+	0x3251, 0x327b,
+	0x327f, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfc,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe46,
+	0xfe49, 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, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_2 */
+
+/* 'Age_4_0': Derived Age 4.0 */
+static const OnigCodePoint CR_Age_4_0[] = {
+	412,
+	0x0000, 0x0236,
+	0x0250, 0x0357,
+	0x035d, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03fb,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060c, 0x0615,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0658,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x19e0, 0x19ff,
+	0x1d00, 0x1d6b,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2054,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213b,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23d0,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2691,
+	0x26a0, 0x26a1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b0d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x327d,
+	0x327f, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d300, 0x1d356,
+	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, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_0 */
+
+/* 'Age_4_1': Derived Age 4.1 */
+static const OnigCodePoint CR_Age_4_1[] = {
+	430,
+	0x0000, 0x0241,
+	0x0250, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05b9,
+	0x05bb, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097d, 0x097d,
+	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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1d00, 0x1dc3,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20eb,
+	0x2100, 0x214c,
+	0x2153, 0x2183,
+	0x2190, 0x23db,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c6,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b13,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa800, 0xa82b,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	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, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_1 */
+
+/* 'Age_5_0': Derived Age 5.0 */
+static const OnigCodePoint CR_Age_5_0[] = {
+	440,
+	0x0000, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x0513,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097b, 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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1d00, 0x1dca,
+	0x1dfe, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20ef,
+	0x2100, 0x214e,
+	0x2153, 0x2184,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b2,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b1a,
+	0x2b20, 0x2b23,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6c,
+	0x2c74, 0x2c77,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa71a,
+	0xa720, 0xa721,
+	0xa800, 0xa82b,
+	0xa840, 0xa877,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x1091f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_0 */
+
+/* 'Age_5_1': Derived Age 5.1 */
+static const OnigCodePoint CR_Age_5_1[] = {
+	455,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0523,
+	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,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0972,
+	0x097b, 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, 0x09fa,
+	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, 0x0fd4,
+	0x1000, 0x1099,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1d00, 0x1de6,
+	0x1dfe, 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, 0x20b5,
+	0x20d0, 0x20f0,
+	0x2100, 0x214f,
+	0x2153, 0x2188,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269d,
+	0x26a0, 0x26bc,
+	0x26c0, 0x26c3,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b54,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6f,
+	0x2c71, 0x2c7d,
+	0x2c80, 0x2cea,
+	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, 0x2e30,
+	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, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fc3,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa500, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa900, 0xa953,
+	0xa95f, 0xa95f,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_1 */
+
+/* 'Age_5_2': Derived Age 5.2 */
+static const OnigCodePoint CR_Age_5_2[] = {
+	495,
+	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,
+	0xfdd0, 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, 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,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_2 */
+
+/* 'Age_6_0': Derived Age 6.0 */
+static const OnigCodePoint CR_Age_6_0[] = {
+	511,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
+	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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	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,
+	0x135d, 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,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27ce, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d70,
+	0x2d7f, 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, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 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,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	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, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_0 */
+
+/* 'Age_6_1': Derived Age 6.1 */
+static const OnigCodePoint CR_Age_6_1[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_1 */
+
+/* 'Age_6_2': Derived Age 6.2 */
+static const OnigCodePoint CR_Age_6_2[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20ba,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_2 */
+
+/* 'Age_6_3': Derived Age 6.3 */
+static const OnigCodePoint CR_Age_6_3[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20ba,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_3 */
+
+/* 'Age_7_0': Derived Age 7.0 */
+static const OnigCodePoint CR_Age_7_0[] = {
+	610,
+	0x0000, 0x0377,
+	0x037a, 0x037f,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x052f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058d, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x061c,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08b2,
+	0x08e4, 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, 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, 0x0b77,
+	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,
+	0x0c00, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c39,
+	0x0c3d, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c58, 0x0c59,
+	0x0c60, 0x0c63,
+	0x0c66, 0x0c6f,
+	0x0c78, 0x0c7f,
+	0x0c81, 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,
+	0x0d01, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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,
+	0x0de6, 0x0def,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x13a0, 0x13f4,
+	0x1400, 0x169c,
+	0x16a0, 0x16f8,
+	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, 0x191e,
+	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,
+	0x1ab0, 0x1abe,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1cf8, 0x1cf9,
+	0x1d00, 0x1df5,
+	0x1dfc, 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,
+	0x2066, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x209c,
+	0x20a0, 0x20bd,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23fa,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2b73,
+	0x2b76, 0x2b95,
+	0x2b98, 0x2bb9,
+	0x2bbd, 0x2bc8,
+	0x2bca, 0x2bd1,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e42,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa69d,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa7ad,
+	0xa7b0, 0xa7b1,
+	0xa7f7, 0xa82b,
+	0xa830, 0xa839,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa8e0, 0xa8fb,
+	0xa900, 0xa953,
+	0xa95f, 0xa97c,
+	0xa980, 0xa9cd,
+	0xa9cf, 0xa9d9,
+	0xa9de, 0xa9fe,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaac2,
+	0xaadb, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xab30, 0xab5f,
+	0xab64, 0xab65,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe2d,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018c,
+	0x10190, 0x1019b,
+	0x101a0, 0x101a0,
+	0x101d0, 0x101fd,
+	0x10280, 0x1029c,
+	0x102a0, 0x102d0,
+	0x102e0, 0x102fb,
+	0x10300, 0x10323,
+	0x10330, 0x1034a,
+	0x10350, 0x1037a,
+	0x10380, 0x1039d,
+	0x1039f, 0x103c3,
+	0x103c8, 0x103d5,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10500, 0x10527,
+	0x10530, 0x10563,
+	0x1056f, 0x1056f,
+	0x10600, 0x10736,
+	0x10740, 0x10755,
+	0x10760, 0x10767,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x10855,
+	0x10857, 0x1089e,
+	0x108a7, 0x108af,
+	0x10900, 0x1091b,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x10a60, 0x10a9f,
+	0x10ac0, 0x10ae6,
+	0x10aeb, 0x10af6,
+	0x10b00, 0x10b35,
+	0x10b39, 0x10b55,
+	0x10b58, 0x10b72,
+	0x10b78, 0x10b91,
+	0x10b99, 0x10b9c,
+	0x10ba9, 0x10baf,
+	0x10c00, 0x10c48,
+	0x10e60, 0x10e7e,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x1107f, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11150, 0x11176,
+	0x11180, 0x111c8,
+	0x111cd, 0x111cd,
+	0x111d0, 0x111da,
+	0x111e1, 0x111f4,
+	0x11200, 0x11211,
+	0x11213, 0x1123d,
+	0x112b0, 0x112ea,
+	0x112f0, 0x112f9,
+	0x11301, 0x11303,
+	0x11305, 0x1130c,
+	0x1130f, 0x11310,
+	0x11313, 0x11328,
+	0x1132a, 0x11330,
+	0x11332, 0x11333,
+	0x11335, 0x11339,
+	0x1133c, 0x11344,
+	0x11347, 0x11348,
+	0x1134b, 0x1134d,
+	0x11357, 0x11357,
+	0x1135d, 0x11363,
+	0x11366, 0x1136c,
+	0x11370, 0x11374,
+	0x11480, 0x114c7,
+	0x114d0, 0x114d9,
+	0x11580, 0x115b5,
+	0x115b8, 0x115c9,
+	0x11600, 0x11644,
+	0x11650, 0x11659,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x118a0, 0x118f2,
+	0x118ff, 0x118ff,
+	0x11ac0, 0x11af8,
+	0x12000, 0x12398,
+	0x12400, 0x1246e,
+	0x12470, 0x12474,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16a40, 0x16a5e,
+	0x16a60, 0x16a69,
+	0x16a6e, 0x16a6f,
+	0x16ad0, 0x16aed,
+	0x16af0, 0x16af5,
+	0x16b00, 0x16b45,
+	0x16b50, 0x16b59,
+	0x16b5b, 0x16b61,
+	0x16b63, 0x16b77,
+	0x16b7d, 0x16b8f,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	0x1bc00, 0x1bc6a,
+	0x1bc70, 0x1bc7c,
+	0x1bc80, 0x1bc88,
+	0x1bc90, 0x1bc99,
+	0x1bc9c, 0x1bca3,
+	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,
+	0x1e800, 0x1e8c4,
+	0x1e8c7, 0x1e8d6,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0bf,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0f5,
+	0x1f100, 0x1f10c,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f32c,
+	0x1f330, 0x1f37d,
+	0x1f380, 0x1f3ce,
+	0x1f3d4, 0x1f3f7,
+	0x1f400, 0x1f4fe,
+	0x1f500, 0x1f54a,
+	0x1f550, 0x1f579,
+	0x1f57b, 0x1f5a3,
+	0x1f5a5, 0x1f642,
+	0x1f645, 0x1f6cf,
+	0x1f6e0, 0x1f6ec,
+	0x1f6f0, 0x1f6f3,
+	0x1f700, 0x1f773,
+	0x1f780, 0x1f7d4,
+	0x1f800, 0x1f80b,
+	0x1f810, 0x1f847,
+	0x1f850, 0x1f859,
+	0x1f860, 0x1f887,
+	0x1f890, 0x1f8ad,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_7_0 */
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+
+/* 'In_Basic_Latin': Block */
+#define CR_In_Basic_Latin CR_ASCII
+
+/* 'In_Latin_1_Supplement': Block */
+static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
+	1,
+	0x0080, 0x00ff,
+}; /* CR_In_Latin_1_Supplement */
+
+/* 'In_Latin_Extended_A': Block */
+static const OnigCodePoint CR_In_Latin_Extended_A[] = {
+	1,
+	0x0100, 0x017f,
+}; /* CR_In_Latin_Extended_A */
+
+/* 'In_Latin_Extended_B': Block */
+static const OnigCodePoint CR_In_Latin_Extended_B[] = {
+	1,
+	0x0180, 0x024f,
+}; /* CR_In_Latin_Extended_B */
+
+/* 'In_IPA_Extensions': Block */
+static const OnigCodePoint CR_In_IPA_Extensions[] = {
+	1,
+	0x0250, 0x02af,
+}; /* CR_In_IPA_Extensions */
+
+/* 'In_Spacing_Modifier_Letters': Block */
+static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
+	1,
+	0x02b0, 0x02ff,
+}; /* CR_In_Spacing_Modifier_Letters */
+
+/* 'In_Combining_Diacritical_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
+	1,
+	0x0300, 0x036f,
+}; /* CR_In_Combining_Diacritical_Marks */
+
+/* 'In_Greek_and_Coptic': Block */
+static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
+	1,
+	0x0370, 0x03ff,
+}; /* CR_In_Greek_and_Coptic */
+
+/* 'In_Cyrillic': Block */
+static const OnigCodePoint CR_In_Cyrillic[] = {
+	1,
+	0x0400, 0x04ff,
+}; /* CR_In_Cyrillic */
+
+/* 'In_Cyrillic_Supplement': Block */
+static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
+	1,
+	0x0500, 0x052f,
+}; /* CR_In_Cyrillic_Supplement */
+
+/* 'In_Armenian': Block */
+static const OnigCodePoint CR_In_Armenian[] = {
+	1,
+	0x0530, 0x058f,
+}; /* CR_In_Armenian */
+
+/* 'In_Hebrew': Block */
+static const OnigCodePoint CR_In_Hebrew[] = {
+	1,
+	0x0590, 0x05ff,
+}; /* CR_In_Hebrew */
+
+/* 'In_Arabic': Block */
+static const OnigCodePoint CR_In_Arabic[] = {
+	1,
+	0x0600, 0x06ff,
+}; /* CR_In_Arabic */
+
+/* 'In_Syriac': Block */
+static const OnigCodePoint CR_In_Syriac[] = {
+	1,
+	0x0700, 0x074f,
+}; /* CR_In_Syriac */
+
+/* 'In_Arabic_Supplement': Block */
+static const OnigCodePoint CR_In_Arabic_Supplement[] = {
+	1,
+	0x0750, 0x077f,
+}; /* CR_In_Arabic_Supplement */
+
+/* 'In_Thaana': Block */
+static const OnigCodePoint CR_In_Thaana[] = {
+	1,
+	0x0780, 0x07bf,
+}; /* CR_In_Thaana */
+
+/* 'In_NKo': Block */
+static const OnigCodePoint CR_In_NKo[] = {
+	1,
+	0x07c0, 0x07ff,
+}; /* CR_In_NKo */
+
+/* 'In_Samaritan': Block */
+static const OnigCodePoint CR_In_Samaritan[] = {
+	1,
+	0x0800, 0x083f,
+}; /* CR_In_Samaritan */
+
+/* 'In_Mandaic': Block */
+static const OnigCodePoint CR_In_Mandaic[] = {
+	1,
+	0x0840, 0x085f,
+}; /* CR_In_Mandaic */
+
+/* 'In_Arabic_Extended_A': Block */
+static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
+	1,
+	0x08a0, 0x08ff,
+}; /* CR_In_Arabic_Extended_A */
+
+/* 'In_Devanagari': Block */
+static const OnigCodePoint CR_In_Devanagari[] = {
+	1,
+	0x0900, 0x097f,
+}; /* CR_In_Devanagari */
+
+/* 'In_Bengali': Block */
+static const OnigCodePoint CR_In_Bengali[] = {
+	1,
+	0x0980, 0x09ff,
+}; /* CR_In_Bengali */
+
+/* 'In_Gurmukhi': Block */
+static const OnigCodePoint CR_In_Gurmukhi[] = {
+	1,
+	0x0a00, 0x0a7f,
+}; /* CR_In_Gurmukhi */
+
+/* 'In_Gujarati': Block */
+static const OnigCodePoint CR_In_Gujarati[] = {
+	1,
+	0x0a80, 0x0aff,
+}; /* CR_In_Gujarati */
+
+/* 'In_Oriya': Block */
+static const OnigCodePoint CR_In_Oriya[] = {
+	1,
+	0x0b00, 0x0b7f,
+}; /* CR_In_Oriya */
+
+/* 'In_Tamil': Block */
+static const OnigCodePoint CR_In_Tamil[] = {
+	1,
+	0x0b80, 0x0bff,
+}; /* CR_In_Tamil */
+
+/* 'In_Telugu': Block */
+static const OnigCodePoint CR_In_Telugu[] = {
+	1,
+	0x0c00, 0x0c7f,
+}; /* CR_In_Telugu */
+
+/* 'In_Kannada': Block */
+static const OnigCodePoint CR_In_Kannada[] = {
+	1,
+	0x0c80, 0x0cff,
+}; /* CR_In_Kannada */
+
+/* 'In_Malayalam': Block */
+static const OnigCodePoint CR_In_Malayalam[] = {
+	1,
+	0x0d00, 0x0d7f,
+}; /* CR_In_Malayalam */
+
+/* 'In_Sinhala': Block */
+static const OnigCodePoint CR_In_Sinhala[] = {
+	1,
+	0x0d80, 0x0dff,
+}; /* CR_In_Sinhala */
+
+/* 'In_Thai': Block */
+static const OnigCodePoint CR_In_Thai[] = {
+	1,
+	0x0e00, 0x0e7f,
+}; /* CR_In_Thai */
+
+/* 'In_Lao': Block */
+static const OnigCodePoint CR_In_Lao[] = {
+	1,
+	0x0e80, 0x0eff,
+}; /* CR_In_Lao */
+
+/* 'In_Tibetan': Block */
+static const OnigCodePoint CR_In_Tibetan[] = {
+	1,
+	0x0f00, 0x0fff,
+}; /* CR_In_Tibetan */
+
+/* 'In_Myanmar': Block */
+static const OnigCodePoint CR_In_Myanmar[] = {
+	1,
+	0x1000, 0x109f,
+}; /* CR_In_Myanmar */
+
+/* 'In_Georgian': Block */
+static const OnigCodePoint CR_In_Georgian[] = {
+	1,
+	0x10a0, 0x10ff,
+}; /* CR_In_Georgian */
+
+/* 'In_Hangul_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo[] = {
+	1,
+	0x1100, 0x11ff,
+}; /* CR_In_Hangul_Jamo */
+
+/* 'In_Ethiopic': Block */
+static const OnigCodePoint CR_In_Ethiopic[] = {
+	1,
+	0x1200, 0x137f,
+}; /* CR_In_Ethiopic */
+
+/* 'In_Ethiopic_Supplement': Block */
+static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
+	1,
+	0x1380, 0x139f,
+}; /* CR_In_Ethiopic_Supplement */
+
+/* 'In_Cherokee': Block */
+static const OnigCodePoint CR_In_Cherokee[] = {
+	1,
+	0x13a0, 0x13ff,
+}; /* CR_In_Cherokee */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
+	1,
+	0x1400, 0x167f,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
+
+/* 'In_Ogham': Block */
+static const OnigCodePoint CR_In_Ogham[] = {
+	1,
+	0x1680, 0x169f,
+}; /* CR_In_Ogham */
+
+/* 'In_Runic': Block */
+static const OnigCodePoint CR_In_Runic[] = {
+	1,
+	0x16a0, 0x16ff,
+}; /* CR_In_Runic */
+
+/* 'In_Tagalog': Block */
+static const OnigCodePoint CR_In_Tagalog[] = {
+	1,
+	0x1700, 0x171f,
+}; /* CR_In_Tagalog */
+
+/* 'In_Hanunoo': Block */
+static const OnigCodePoint CR_In_Hanunoo[] = {
+	1,
+	0x1720, 0x173f,
+}; /* CR_In_Hanunoo */
+
+/* 'In_Buhid': Block */
+static const OnigCodePoint CR_In_Buhid[] = {
+	1,
+	0x1740, 0x175f,
+}; /* CR_In_Buhid */
+
+/* 'In_Tagbanwa': Block */
+static const OnigCodePoint CR_In_Tagbanwa[] = {
+	1,
+	0x1760, 0x177f,
+}; /* CR_In_Tagbanwa */
+
+/* 'In_Khmer': Block */
+static const OnigCodePoint CR_In_Khmer[] = {
+	1,
+	0x1780, 0x17ff,
+}; /* CR_In_Khmer */
+
+/* 'In_Mongolian': Block */
+static const OnigCodePoint CR_In_Mongolian[] = {
+	1,
+	0x1800, 0x18af,
+}; /* CR_In_Mongolian */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
+	1,
+	0x18b0, 0x18ff,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
+
+/* 'In_Limbu': Block */
+static const OnigCodePoint CR_In_Limbu[] = {
+	1,
+	0x1900, 0x194f,
+}; /* CR_In_Limbu */
+
+/* 'In_Tai_Le': Block */
+static const OnigCodePoint CR_In_Tai_Le[] = {
+	1,
+	0x1950, 0x197f,
+}; /* CR_In_Tai_Le */
+
+/* 'In_New_Tai_Lue': Block */
+static const OnigCodePoint CR_In_New_Tai_Lue[] = {
+	1,
+	0x1980, 0x19df,
+}; /* CR_In_New_Tai_Lue */
+
+/* 'In_Khmer_Symbols': Block */
+static const OnigCodePoint CR_In_Khmer_Symbols[] = {
+	1,
+	0x19e0, 0x19ff,
+}; /* CR_In_Khmer_Symbols */
+
+/* 'In_Buginese': Block */
+static const OnigCodePoint CR_In_Buginese[] = {
+	1,
+	0x1a00, 0x1a1f,
+}; /* CR_In_Buginese */
+
+/* 'In_Tai_Tham': Block */
+static const OnigCodePoint CR_In_Tai_Tham[] = {
+	1,
+	0x1a20, 0x1aaf,
+}; /* CR_In_Tai_Tham */
+
+/* 'In_Combining_Diacritical_Marks_Extended': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Extended[] = {
+	1,
+	0x1ab0, 0x1aff,
+}; /* CR_In_Combining_Diacritical_Marks_Extended */
+
+/* 'In_Balinese': Block */
+static const OnigCodePoint CR_In_Balinese[] = {
+	1,
+	0x1b00, 0x1b7f,
+}; /* CR_In_Balinese */
+
+/* 'In_Sundanese': Block */
+static const OnigCodePoint CR_In_Sundanese[] = {
+	1,
+	0x1b80, 0x1bbf,
+}; /* CR_In_Sundanese */
+
+/* 'In_Batak': Block */
+static const OnigCodePoint CR_In_Batak[] = {
+	1,
+	0x1bc0, 0x1bff,
+}; /* CR_In_Batak */
+
+/* 'In_Lepcha': Block */
+static const OnigCodePoint CR_In_Lepcha[] = {
+	1,
+	0x1c00, 0x1c4f,
+}; /* CR_In_Lepcha */
+
+/* 'In_Ol_Chiki': Block */
+#define CR_In_Ol_Chiki CR_Ol_Chiki
+
+/* 'In_Sundanese_Supplement': Block */
+static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
+	1,
+	0x1cc0, 0x1ccf,
+}; /* CR_In_Sundanese_Supplement */
+
+/* 'In_Vedic_Extensions': Block */
+static const OnigCodePoint CR_In_Vedic_Extensions[] = {
+	1,
+	0x1cd0, 0x1cff,
+}; /* CR_In_Vedic_Extensions */
+
+/* 'In_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
+	1,
+	0x1d00, 0x1d7f,
+}; /* CR_In_Phonetic_Extensions */
+
+/* 'In_Phonetic_Extensions_Supplement': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
+	1,
+	0x1d80, 0x1dbf,
+}; /* CR_In_Phonetic_Extensions_Supplement */
+
+/* 'In_Combining_Diacritical_Marks_Supplement': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
+	1,
+	0x1dc0, 0x1dff,
+}; /* CR_In_Combining_Diacritical_Marks_Supplement */
+
+/* 'In_Latin_Extended_Additional': Block */
+static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
+	1,
+	0x1e00, 0x1eff,
+}; /* CR_In_Latin_Extended_Additional */
+
+/* 'In_Greek_Extended': Block */
+static const OnigCodePoint CR_In_Greek_Extended[] = {
+	1,
+	0x1f00, 0x1fff,
+}; /* CR_In_Greek_Extended */
+
+/* 'In_General_Punctuation': Block */
+static const OnigCodePoint CR_In_General_Punctuation[] = {
+	1,
+	0x2000, 0x206f,
+}; /* CR_In_General_Punctuation */
+
+/* 'In_Superscripts_and_Subscripts': Block */
+static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
+	1,
+	0x2070, 0x209f,
+}; /* CR_In_Superscripts_and_Subscripts */
+
+/* 'In_Currency_Symbols': Block */
+static const OnigCodePoint CR_In_Currency_Symbols[] = {
+	1,
+	0x20a0, 0x20cf,
+}; /* CR_In_Currency_Symbols */
+
+/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
+	1,
+	0x20d0, 0x20ff,
+}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
+
+/* 'In_Letterlike_Symbols': Block */
+static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
+	1,
+	0x2100, 0x214f,
+}; /* CR_In_Letterlike_Symbols */
+
+/* 'In_Number_Forms': Block */
+static const OnigCodePoint CR_In_Number_Forms[] = {
+	1,
+	0x2150, 0x218f,
+}; /* CR_In_Number_Forms */
+
+/* 'In_Arrows': Block */
+static const OnigCodePoint CR_In_Arrows[] = {
+	1,
+	0x2190, 0x21ff,
+}; /* CR_In_Arrows */
+
+/* 'In_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Mathematical_Operators[] = {
+	1,
+	0x2200, 0x22ff,
+}; /* CR_In_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Technical': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
+	1,
+	0x2300, 0x23ff,
+}; /* CR_In_Miscellaneous_Technical */
+
+/* 'In_Control_Pictures': Block */
+static const OnigCodePoint CR_In_Control_Pictures[] = {
+	1,
+	0x2400, 0x243f,
+}; /* CR_In_Control_Pictures */
+
+/* 'In_Optical_Character_Recognition': Block */
+static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
+	1,
+	0x2440, 0x245f,
+}; /* CR_In_Optical_Character_Recognition */
+
+/* 'In_Enclosed_Alphanumerics': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
+	1,
+	0x2460, 0x24ff,
+}; /* CR_In_Enclosed_Alphanumerics */
+
+/* 'In_Box_Drawing': Block */
+static const OnigCodePoint CR_In_Box_Drawing[] = {
+	1,
+	0x2500, 0x257f,
+}; /* CR_In_Box_Drawing */
+
+/* 'In_Block_Elements': Block */
+static const OnigCodePoint CR_In_Block_Elements[] = {
+	1,
+	0x2580, 0x259f,
+}; /* CR_In_Block_Elements */
+
+/* 'In_Geometric_Shapes': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes[] = {
+	1,
+	0x25a0, 0x25ff,
+}; /* CR_In_Geometric_Shapes */
+
+/* 'In_Miscellaneous_Symbols': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
+	1,
+	0x2600, 0x26ff,
+}; /* CR_In_Miscellaneous_Symbols */
+
+/* 'In_Dingbats': Block */
+static const OnigCodePoint CR_In_Dingbats[] = {
+	1,
+	0x2700, 0x27bf,
+}; /* CR_In_Dingbats */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
+	1,
+	0x27c0, 0x27ef,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
+
+/* 'In_Supplemental_Arrows_A': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
+	1,
+	0x27f0, 0x27ff,
+}; /* CR_In_Supplemental_Arrows_A */
+
+/* 'In_Braille_Patterns': Block */
+#define CR_In_Braille_Patterns CR_Braille
+
+/* 'In_Supplemental_Arrows_B': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
+	1,
+	0x2900, 0x297f,
+}; /* CR_In_Supplemental_Arrows_B */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
+	1,
+	0x2980, 0x29ff,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
+
+/* 'In_Supplemental_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
+	1,
+	0x2a00, 0x2aff,
+}; /* CR_In_Supplemental_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
+	1,
+	0x2b00, 0x2bff,
+}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
+
+/* 'In_Glagolitic': Block */
+static const OnigCodePoint CR_In_Glagolitic[] = {
+	1,
+	0x2c00, 0x2c5f,
+}; /* CR_In_Glagolitic */
+
+/* 'In_Latin_Extended_C': Block */
+static const OnigCodePoint CR_In_Latin_Extended_C[] = {
+	1,
+	0x2c60, 0x2c7f,
+}; /* CR_In_Latin_Extended_C */
+
+/* 'In_Coptic': Block */
+static const OnigCodePoint CR_In_Coptic[] = {
+	1,
+	0x2c80, 0x2cff,
+}; /* CR_In_Coptic */
+
+/* 'In_Georgian_Supplement': Block */
+static const OnigCodePoint CR_In_Georgian_Supplement[] = {
+	1,
+	0x2d00, 0x2d2f,
+}; /* CR_In_Georgian_Supplement */
+
+/* 'In_Tifinagh': Block */
+static const OnigCodePoint CR_In_Tifinagh[] = {
+	1,
+	0x2d30, 0x2d7f,
+}; /* CR_In_Tifinagh */
+
+/* 'In_Ethiopic_Extended': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
+	1,
+	0x2d80, 0x2ddf,
+}; /* CR_In_Ethiopic_Extended */
+
+/* 'In_Cyrillic_Extended_A': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
+	1,
+	0x2de0, 0x2dff,
+}; /* CR_In_Cyrillic_Extended_A */
+
+/* 'In_Supplemental_Punctuation': Block */
+static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
+	1,
+	0x2e00, 0x2e7f,
+}; /* CR_In_Supplemental_Punctuation */
+
+/* 'In_CJK_Radicals_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
+	1,
+	0x2e80, 0x2eff,
+}; /* CR_In_CJK_Radicals_Supplement */
+
+/* 'In_Kangxi_Radicals': Block */
+static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
+	1,
+	0x2f00, 0x2fdf,
+}; /* CR_In_Kangxi_Radicals */
+
+/* 'In_Ideographic_Description_Characters': Block */
+static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
+	1,
+	0x2ff0, 0x2fff,
+}; /* CR_In_Ideographic_Description_Characters */
+
+/* 'In_CJK_Symbols_and_Punctuation': Block */
+static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
+	1,
+	0x3000, 0x303f,
+}; /* CR_In_CJK_Symbols_and_Punctuation */
+
+/* 'In_Hiragana': Block */
+static const OnigCodePoint CR_In_Hiragana[] = {
+	1,
+	0x3040, 0x309f,
+}; /* CR_In_Hiragana */
+
+/* 'In_Katakana': Block */
+static const OnigCodePoint CR_In_Katakana[] = {
+	1,
+	0x30a0, 0x30ff,
+}; /* CR_In_Katakana */
+
+/* 'In_Bopomofo': Block */
+static const OnigCodePoint CR_In_Bopomofo[] = {
+	1,
+	0x3100, 0x312f,
+}; /* CR_In_Bopomofo */
+
+/* 'In_Hangul_Compatibility_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
+	1,
+	0x3130, 0x318f,
+}; /* CR_In_Hangul_Compatibility_Jamo */
+
+/* 'In_Kanbun': Block */
+static const OnigCodePoint CR_In_Kanbun[] = {
+	1,
+	0x3190, 0x319f,
+}; /* CR_In_Kanbun */
+
+/* 'In_Bopomofo_Extended': Block */
+static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
+	1,
+	0x31a0, 0x31bf,
+}; /* CR_In_Bopomofo_Extended */
+
+/* 'In_CJK_Strokes': Block */
+static const OnigCodePoint CR_In_CJK_Strokes[] = {
+	1,
+	0x31c0, 0x31ef,
+}; /* CR_In_CJK_Strokes */
+
+/* 'In_Katakana_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
+	1,
+	0x31f0, 0x31ff,
+}; /* CR_In_Katakana_Phonetic_Extensions */
+
+/* 'In_Enclosed_CJK_Letters_and_Months': Block */
+static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
+	1,
+	0x3200, 0x32ff,
+}; /* CR_In_Enclosed_CJK_Letters_and_Months */
+
+/* 'In_CJK_Compatibility': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility[] = {
+	1,
+	0x3300, 0x33ff,
+}; /* CR_In_CJK_Compatibility */
+
+/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
+	1,
+	0x3400, 0x4dbf,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
+
+/* 'In_Yijing_Hexagram_Symbols': Block */
+static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
+	1,
+	0x4dc0, 0x4dff,
+}; /* CR_In_Yijing_Hexagram_Symbols */
+
+/* 'In_CJK_Unified_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
+	1,
+	0x4e00, 0x9fff,
+}; /* CR_In_CJK_Unified_Ideographs */
+
+/* 'In_Yi_Syllables': Block */
+static const OnigCodePoint CR_In_Yi_Syllables[] = {
+	1,
+	0xa000, 0xa48f,
+}; /* CR_In_Yi_Syllables */
+
+/* 'In_Yi_Radicals': Block */
+static const OnigCodePoint CR_In_Yi_Radicals[] = {
+	1,
+	0xa490, 0xa4cf,
+}; /* CR_In_Yi_Radicals */
+
+/* 'In_Lisu': Block */
+#define CR_In_Lisu CR_Lisu
+
+/* 'In_Vai': Block */
+static const OnigCodePoint CR_In_Vai[] = {
+	1,
+	0xa500, 0xa63f,
+}; /* CR_In_Vai */
+
+/* 'In_Cyrillic_Extended_B': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
+	1,
+	0xa640, 0xa69f,
+}; /* CR_In_Cyrillic_Extended_B */
+
+/* 'In_Bamum': Block */
+static const OnigCodePoint CR_In_Bamum[] = {
+	1,
+	0xa6a0, 0xa6ff,
+}; /* CR_In_Bamum */
+
+/* 'In_Modifier_Tone_Letters': Block */
+static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
+	1,
+	0xa700, 0xa71f,
+}; /* CR_In_Modifier_Tone_Letters */
+
+/* 'In_Latin_Extended_D': Block */
+static const OnigCodePoint CR_In_Latin_Extended_D[] = {
+	1,
+	0xa720, 0xa7ff,
+}; /* CR_In_Latin_Extended_D */
+
+/* 'In_Syloti_Nagri': Block */
+static const OnigCodePoint CR_In_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82f,
+}; /* CR_In_Syloti_Nagri */
+
+/* 'In_Common_Indic_Number_Forms': Block */
+static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
+	1,
+	0xa830, 0xa83f,
+}; /* CR_In_Common_Indic_Number_Forms */
+
+/* 'In_Phags_pa': Block */
+static const OnigCodePoint CR_In_Phags_pa[] = {
+	1,
+	0xa840, 0xa87f,
+}; /* CR_In_Phags_pa */
+
+/* 'In_Saurashtra': Block */
+static const OnigCodePoint CR_In_Saurashtra[] = {
+	1,
+	0xa880, 0xa8df,
+}; /* CR_In_Saurashtra */
+
+/* 'In_Devanagari_Extended': Block */
+static const OnigCodePoint CR_In_Devanagari_Extended[] = {
+	1,
+	0xa8e0, 0xa8ff,
+}; /* CR_In_Devanagari_Extended */
+
+/* 'In_Kayah_Li': Block */
+static const OnigCodePoint CR_In_Kayah_Li[] = {
+	1,
+	0xa900, 0xa92f,
+}; /* CR_In_Kayah_Li */
+
+/* 'In_Rejang': Block */
+static const OnigCodePoint CR_In_Rejang[] = {
+	1,
+	0xa930, 0xa95f,
+}; /* CR_In_Rejang */
+
+/* 'In_Hangul_Jamo_Extended_A': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
+	1,
+	0xa960, 0xa97f,
+}; /* CR_In_Hangul_Jamo_Extended_A */
+
+/* 'In_Javanese': Block */
+static const OnigCodePoint CR_In_Javanese[] = {
+	1,
+	0xa980, 0xa9df,
+}; /* CR_In_Javanese */
+
+/* 'In_Myanmar_Extended_B': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_B[] = {
+	1,
+	0xa9e0, 0xa9ff,
+}; /* CR_In_Myanmar_Extended_B */
+
+/* 'In_Cham': Block */
+static const OnigCodePoint CR_In_Cham[] = {
+	1,
+	0xaa00, 0xaa5f,
+}; /* CR_In_Cham */
+
+/* 'In_Myanmar_Extended_A': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
+	1,
+	0xaa60, 0xaa7f,
+}; /* CR_In_Myanmar_Extended_A */
+
+/* 'In_Tai_Viet': Block */
+static const OnigCodePoint CR_In_Tai_Viet[] = {
+	1,
+	0xaa80, 0xaadf,
+}; /* CR_In_Tai_Viet */
+
+/* 'In_Meetei_Mayek_Extensions': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
+	1,
+	0xaae0, 0xaaff,
+}; /* CR_In_Meetei_Mayek_Extensions */
+
+/* 'In_Ethiopic_Extended_A': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
+	1,
+	0xab00, 0xab2f,
+}; /* CR_In_Ethiopic_Extended_A */
+
+/* 'In_Latin_Extended_E': Block */
+static const OnigCodePoint CR_In_Latin_Extended_E[] = {
+	1,
+	0xab30, 0xab6f,
+}; /* CR_In_Latin_Extended_E */
+
+/* 'In_Meetei_Mayek': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek[] = {
+	1,
+	0xabc0, 0xabff,
+}; /* CR_In_Meetei_Mayek */
+
+/* 'In_Hangul_Syllables': Block */
+static const OnigCodePoint CR_In_Hangul_Syllables[] = {
+	1,
+	0xac00, 0xd7af,
+}; /* CR_In_Hangul_Syllables */
+
+/* 'In_Hangul_Jamo_Extended_B': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
+	1,
+	0xd7b0, 0xd7ff,
+}; /* CR_In_Hangul_Jamo_Extended_B */
+
+/* 'In_High_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Surrogates[] = {
+	1,
+	0xd800, 0xdb7f,
+}; /* CR_In_High_Surrogates */
+
+/* 'In_High_Private_Use_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
+	1,
+	0xdb80, 0xdbff,
+}; /* CR_In_High_Private_Use_Surrogates */
+
+/* 'In_Low_Surrogates': Block */
+static const OnigCodePoint CR_In_Low_Surrogates[] = {
+	1,
+	0xdc00, 0xdfff,
+}; /* CR_In_Low_Surrogates */
+
+/* 'In_Private_Use_Area': Block */
+static const OnigCodePoint CR_In_Private_Use_Area[] = {
+	1,
+	0xe000, 0xf8ff,
+}; /* CR_In_Private_Use_Area */
+
+/* 'In_CJK_Compatibility_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
+	1,
+	0xf900, 0xfaff,
+}; /* CR_In_CJK_Compatibility_Ideographs */
+
+/* 'In_Alphabetic_Presentation_Forms': Block */
+static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
+	1,
+	0xfb00, 0xfb4f,
+}; /* CR_In_Alphabetic_Presentation_Forms */
+
+/* 'In_Arabic_Presentation_Forms_A': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
+	1,
+	0xfb50, 0xfdff,
+}; /* CR_In_Arabic_Presentation_Forms_A */
+
+/* 'In_Variation_Selectors': Block */
+static const OnigCodePoint CR_In_Variation_Selectors[] = {
+	1,
+	0xfe00, 0xfe0f,
+}; /* CR_In_Variation_Selectors */
+
+/* 'In_Vertical_Forms': Block */
+static const OnigCodePoint CR_In_Vertical_Forms[] = {
+	1,
+	0xfe10, 0xfe1f,
+}; /* CR_In_Vertical_Forms */
+
+/* 'In_Combining_Half_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
+	1,
+	0xfe20, 0xfe2f,
+}; /* CR_In_Combining_Half_Marks */
+
+/* 'In_CJK_Compatibility_Forms': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
+	1,
+	0xfe30, 0xfe4f,
+}; /* CR_In_CJK_Compatibility_Forms */
+
+/* 'In_Small_Form_Variants': Block */
+static const OnigCodePoint CR_In_Small_Form_Variants[] = {
+	1,
+	0xfe50, 0xfe6f,
+}; /* CR_In_Small_Form_Variants */
+
+/* 'In_Arabic_Presentation_Forms_B': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
+	1,
+	0xfe70, 0xfeff,
+}; /* CR_In_Arabic_Presentation_Forms_B */
+
+/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
+static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
+	1,
+	0xff00, 0xffef,
+}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
+
+/* 'In_Specials': Block */
+static const OnigCodePoint CR_In_Specials[] = {
+	1,
+	0xfff0, 0xffff,
+}; /* CR_In_Specials */
+
+/* 'In_Linear_B_Syllabary': Block */
+static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
+	1,
+	0x10000, 0x1007f,
+}; /* CR_In_Linear_B_Syllabary */
+
+/* 'In_Linear_B_Ideograms': Block */
+static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
+	1,
+	0x10080, 0x100ff,
+}; /* CR_In_Linear_B_Ideograms */
+
+/* 'In_Aegean_Numbers': Block */
+static const OnigCodePoint CR_In_Aegean_Numbers[] = {
+	1,
+	0x10100, 0x1013f,
+}; /* CR_In_Aegean_Numbers */
+
+/* 'In_Ancient_Greek_Numbers': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
+	1,
+	0x10140, 0x1018f,
+}; /* CR_In_Ancient_Greek_Numbers */
+
+/* 'In_Ancient_Symbols': Block */
+static const OnigCodePoint CR_In_Ancient_Symbols[] = {
+	1,
+	0x10190, 0x101cf,
+}; /* CR_In_Ancient_Symbols */
+
+/* 'In_Phaistos_Disc': Block */
+static const OnigCodePoint CR_In_Phaistos_Disc[] = {
+	1,
+	0x101d0, 0x101ff,
+}; /* CR_In_Phaistos_Disc */
+
+/* 'In_Lycian': Block */
+static const OnigCodePoint CR_In_Lycian[] = {
+	1,
+	0x10280, 0x1029f,
+}; /* CR_In_Lycian */
+
+/* 'In_Carian': Block */
+static const OnigCodePoint CR_In_Carian[] = {
+	1,
+	0x102a0, 0x102df,
+}; /* CR_In_Carian */
+
+/* 'In_Coptic_Epact_Numbers': Block */
+static const OnigCodePoint CR_In_Coptic_Epact_Numbers[] = {
+	1,
+	0x102e0, 0x102ff,
+}; /* CR_In_Coptic_Epact_Numbers */
+
+/* 'In_Old_Italic': Block */
+static const OnigCodePoint CR_In_Old_Italic[] = {
+	1,
+	0x10300, 0x1032f,
+}; /* CR_In_Old_Italic */
+
+/* 'In_Gothic': Block */
+static const OnigCodePoint CR_In_Gothic[] = {
+	1,
+	0x10330, 0x1034f,
+}; /* CR_In_Gothic */
+
+/* 'In_Old_Permic': Block */
+static const OnigCodePoint CR_In_Old_Permic[] = {
+	1,
+	0x10350, 0x1037f,
+}; /* CR_In_Old_Permic */
+
+/* 'In_Ugaritic': Block */
+static const OnigCodePoint CR_In_Ugaritic[] = {
+	1,
+	0x10380, 0x1039f,
+}; /* CR_In_Ugaritic */
+
+/* 'In_Old_Persian': Block */
+static const OnigCodePoint CR_In_Old_Persian[] = {
+	1,
+	0x103a0, 0x103df,
+}; /* CR_In_Old_Persian */
+
+/* 'In_Deseret': Block */
+#define CR_In_Deseret CR_Deseret
+
+/* 'In_Shavian': Block */
+#define CR_In_Shavian CR_Shavian
+
+/* 'In_Osmanya': Block */
+static const OnigCodePoint CR_In_Osmanya[] = {
+	1,
+	0x10480, 0x104af,
+}; /* CR_In_Osmanya */
+
+/* 'In_Elbasan': Block */
+static const OnigCodePoint CR_In_Elbasan[] = {
+	1,
+	0x10500, 0x1052f,
+}; /* CR_In_Elbasan */
+
+/* 'In_Caucasian_Albanian': Block */
+static const OnigCodePoint CR_In_Caucasian_Albanian[] = {
+	1,
+	0x10530, 0x1056f,
+}; /* CR_In_Caucasian_Albanian */
+
+/* 'In_Linear_A': Block */
+static const OnigCodePoint CR_In_Linear_A[] = {
+	1,
+	0x10600, 0x1077f,
+}; /* CR_In_Linear_A */
+
+/* 'In_Cypriot_Syllabary': Block */
+static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
+	1,
+	0x10800, 0x1083f,
+}; /* CR_In_Cypriot_Syllabary */
+
+/* 'In_Imperial_Aramaic': Block */
+static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
+	1,
+	0x10840, 0x1085f,
+}; /* CR_In_Imperial_Aramaic */
+
+/* 'In_Palmyrene': Block */
+#define CR_In_Palmyrene CR_Palmyrene
+
+/* 'In_Nabataean': Block */
+static const OnigCodePoint CR_In_Nabataean[] = {
+	1,
+	0x10880, 0x108af,
+}; /* CR_In_Nabataean */
+
+/* 'In_Phoenician': Block */
+static const OnigCodePoint CR_In_Phoenician[] = {
+	1,
+	0x10900, 0x1091f,
+}; /* CR_In_Phoenician */
+
+/* 'In_Lydian': Block */
+static const OnigCodePoint CR_In_Lydian[] = {
+	1,
+	0x10920, 0x1093f,
+}; /* CR_In_Lydian */
+
+/* 'In_Meroitic_Hieroglyphs': Block */
+#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
+
+/* 'In_Meroitic_Cursive': Block */
+static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
+	1,
+	0x109a0, 0x109ff,
+}; /* CR_In_Meroitic_Cursive */
+
+/* 'In_Kharoshthi': Block */
+static const OnigCodePoint CR_In_Kharoshthi[] = {
+	1,
+	0x10a00, 0x10a5f,
+}; /* CR_In_Kharoshthi */
+
+/* 'In_Old_South_Arabian': Block */
+#define CR_In_Old_South_Arabian CR_Old_South_Arabian
+
+/* 'In_Old_North_Arabian': Block */
+#define CR_In_Old_North_Arabian CR_Old_North_Arabian
+
+/* 'In_Manichaean': Block */
+static const OnigCodePoint CR_In_Manichaean[] = {
+	1,
+	0x10ac0, 0x10aff,
+}; /* CR_In_Manichaean */
+
+/* 'In_Avestan': Block */
+static const OnigCodePoint CR_In_Avestan[] = {
+	1,
+	0x10b00, 0x10b3f,
+}; /* CR_In_Avestan */
+
+/* 'In_Inscriptional_Parthian': Block */
+static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
+	1,
+	0x10b40, 0x10b5f,
+}; /* CR_In_Inscriptional_Parthian */
+
+/* 'In_Inscriptional_Pahlavi': Block */
+static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
+	1,
+	0x10b60, 0x10b7f,
+}; /* CR_In_Inscriptional_Pahlavi */
+
+/* 'In_Psalter_Pahlavi': Block */
+static const OnigCodePoint CR_In_Psalter_Pahlavi[] = {
+	1,
+	0x10b80, 0x10baf,
+}; /* CR_In_Psalter_Pahlavi */
+
+/* 'In_Old_Turkic': Block */
+static const OnigCodePoint CR_In_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c4f,
+}; /* CR_In_Old_Turkic */
+
+/* 'In_Rumi_Numeral_Symbols': Block */
+static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
+	1,
+	0x10e60, 0x10e7f,
+}; /* CR_In_Rumi_Numeral_Symbols */
+
+/* 'In_Brahmi': Block */
+static const OnigCodePoint CR_In_Brahmi[] = {
+	1,
+	0x11000, 0x1107f,
+}; /* CR_In_Brahmi */
+
+/* 'In_Kaithi': Block */
+static const OnigCodePoint CR_In_Kaithi[] = {
+	1,
+	0x11080, 0x110cf,
+}; /* CR_In_Kaithi */
+
+/* 'In_Sora_Sompeng': Block */
+static const OnigCodePoint CR_In_Sora_Sompeng[] = {
+	1,
+	0x110d0, 0x110ff,
+}; /* CR_In_Sora_Sompeng */
+
+/* 'In_Chakma': Block */
+static const OnigCodePoint CR_In_Chakma[] = {
+	1,
+	0x11100, 0x1114f,
+}; /* CR_In_Chakma */
+
+/* 'In_Mahajani': Block */
+static const OnigCodePoint CR_In_Mahajani[] = {
+	1,
+	0x11150, 0x1117f,
+}; /* CR_In_Mahajani */
+
+/* 'In_Sharada': Block */
+static const OnigCodePoint CR_In_Sharada[] = {
+	1,
+	0x11180, 0x111df,
+}; /* CR_In_Sharada */
+
+/* 'In_Sinhala_Archaic_Numbers': Block */
+static const OnigCodePoint CR_In_Sinhala_Archaic_Numbers[] = {
+	1,
+	0x111e0, 0x111ff,
+}; /* CR_In_Sinhala_Archaic_Numbers */
+
+/* 'In_Khojki': Block */
+static const OnigCodePoint CR_In_Khojki[] = {
+	1,
+	0x11200, 0x1124f,
+}; /* CR_In_Khojki */
+
+/* 'In_Khudawadi': Block */
+static const OnigCodePoint CR_In_Khudawadi[] = {
+	1,
+	0x112b0, 0x112ff,
+}; /* CR_In_Khudawadi */
+
+/* 'In_Grantha': Block */
+static const OnigCodePoint CR_In_Grantha[] = {
+	1,
+	0x11300, 0x1137f,
+}; /* CR_In_Grantha */
+
+/* 'In_Tirhuta': Block */
+static const OnigCodePoint CR_In_Tirhuta[] = {
+	1,
+	0x11480, 0x114df,
+}; /* CR_In_Tirhuta */
+
+/* 'In_Siddham': Block */
+static const OnigCodePoint CR_In_Siddham[] = {
+	1,
+	0x11580, 0x115ff,
+}; /* CR_In_Siddham */
+
+/* 'In_Modi': Block */
+static const OnigCodePoint CR_In_Modi[] = {
+	1,
+	0x11600, 0x1165f,
+}; /* CR_In_Modi */
+
+/* 'In_Takri': Block */
+static const OnigCodePoint CR_In_Takri[] = {
+	1,
+	0x11680, 0x116cf,
+}; /* CR_In_Takri */
+
+/* 'In_Warang_Citi': Block */
+static const OnigCodePoint CR_In_Warang_Citi[] = {
+	1,
+	0x118a0, 0x118ff,
+}; /* CR_In_Warang_Citi */
+
+/* 'In_Pau_Cin_Hau': Block */
+static const OnigCodePoint CR_In_Pau_Cin_Hau[] = {
+	1,
+	0x11ac0, 0x11aff,
+}; /* CR_In_Pau_Cin_Hau */
+
+/* 'In_Cuneiform': Block */
+static const OnigCodePoint CR_In_Cuneiform[] = {
+	1,
+	0x12000, 0x123ff,
+}; /* CR_In_Cuneiform */
+
+/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
+static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
+	1,
+	0x12400, 0x1247f,
+}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
+
+/* 'In_Egyptian_Hieroglyphs': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342f,
+}; /* CR_In_Egyptian_Hieroglyphs */
+
+/* 'In_Bamum_Supplement': Block */
+static const OnigCodePoint CR_In_Bamum_Supplement[] = {
+	1,
+	0x16800, 0x16a3f,
+}; /* CR_In_Bamum_Supplement */
+
+/* 'In_Mro': Block */
+static const OnigCodePoint CR_In_Mro[] = {
+	1,
+	0x16a40, 0x16a6f,
+}; /* CR_In_Mro */
+
+/* 'In_Bassa_Vah': Block */
+static const OnigCodePoint CR_In_Bassa_Vah[] = {
+	1,
+	0x16ad0, 0x16aff,
+}; /* CR_In_Bassa_Vah */
+
+/* 'In_Pahawh_Hmong': Block */
+static const OnigCodePoint CR_In_Pahawh_Hmong[] = {
+	1,
+	0x16b00, 0x16b8f,
+}; /* CR_In_Pahawh_Hmong */
+
+/* 'In_Miao': Block */
+static const OnigCodePoint CR_In_Miao[] = {
+	1,
+	0x16f00, 0x16f9f,
+}; /* CR_In_Miao */
+
+/* 'In_Kana_Supplement': Block */
+static const OnigCodePoint CR_In_Kana_Supplement[] = {
+	1,
+	0x1b000, 0x1b0ff,
+}; /* CR_In_Kana_Supplement */
+
+/* 'In_Duployan': Block */
+static const OnigCodePoint CR_In_Duployan[] = {
+	1,
+	0x1bc00, 0x1bc9f,
+}; /* CR_In_Duployan */
+
+/* 'In_Shorthand_Format_Controls': Block */
+static const OnigCodePoint CR_In_Shorthand_Format_Controls[] = {
+	1,
+	0x1bca0, 0x1bcaf,
+}; /* CR_In_Shorthand_Format_Controls */
+
+/* 'In_Byzantine_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
+	1,
+	0x1d000, 0x1d0ff,
+}; /* CR_In_Byzantine_Musical_Symbols */
+
+/* 'In_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Musical_Symbols[] = {
+	1,
+	0x1d100, 0x1d1ff,
+}; /* CR_In_Musical_Symbols */
+
+/* 'In_Ancient_Greek_Musical_Notation': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
+	1,
+	0x1d200, 0x1d24f,
+}; /* CR_In_Ancient_Greek_Musical_Notation */
+
+/* 'In_Tai_Xuan_Jing_Symbols': Block */
+static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
+	1,
+	0x1d300, 0x1d35f,
+}; /* CR_In_Tai_Xuan_Jing_Symbols */
+
+/* 'In_Counting_Rod_Numerals': Block */
+static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
+	1,
+	0x1d360, 0x1d37f,
+}; /* CR_In_Counting_Rod_Numerals */
+
+/* 'In_Mathematical_Alphanumeric_Symbols': Block */
+static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
+	1,
+	0x1d400, 0x1d7ff,
+}; /* CR_In_Mathematical_Alphanumeric_Symbols */
+
+/* 'In_Mende_Kikakui': Block */
+static const OnigCodePoint CR_In_Mende_Kikakui[] = {
+	1,
+	0x1e800, 0x1e8df,
+}; /* CR_In_Mende_Kikakui */
+
+/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
+static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
+	1,
+	0x1ee00, 0x1eeff,
+}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
+
+/* 'In_Mahjong_Tiles': Block */
+static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
+	1,
+	0x1f000, 0x1f02f,
+}; /* CR_In_Mahjong_Tiles */
+
+/* 'In_Domino_Tiles': Block */
+static const OnigCodePoint CR_In_Domino_Tiles[] = {
+	1,
+	0x1f030, 0x1f09f,
+}; /* CR_In_Domino_Tiles */
+
+/* 'In_Playing_Cards': Block */
+static const OnigCodePoint CR_In_Playing_Cards[] = {
+	1,
+	0x1f0a0, 0x1f0ff,
+}; /* CR_In_Playing_Cards */
+
+/* 'In_Enclosed_Alphanumeric_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
+	1,
+	0x1f100, 0x1f1ff,
+}; /* CR_In_Enclosed_Alphanumeric_Supplement */
+
+/* 'In_Enclosed_Ideographic_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
+	1,
+	0x1f200, 0x1f2ff,
+}; /* CR_In_Enclosed_Ideographic_Supplement */
+
+/* 'In_Miscellaneous_Symbols_and_Pictographs': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Pictographs[] = {
+	1,
+	0x1f300, 0x1f5ff,
+}; /* CR_In_Miscellaneous_Symbols_and_Pictographs */
+
+/* 'In_Emoticons': Block */
+static const OnigCodePoint CR_In_Emoticons[] = {
+	1,
+	0x1f600, 0x1f64f,
+}; /* CR_In_Emoticons */
+
+/* 'In_Ornamental_Dingbats': Block */
+static const OnigCodePoint CR_In_Ornamental_Dingbats[] = {
+	1,
+	0x1f650, 0x1f67f,
+}; /* CR_In_Ornamental_Dingbats */
+
+/* 'In_Transport_and_Map_Symbols': Block */
+static const OnigCodePoint CR_In_Transport_and_Map_Symbols[] = {
+	1,
+	0x1f680, 0x1f6ff,
+}; /* CR_In_Transport_and_Map_Symbols */
+
+/* 'In_Alchemical_Symbols': Block */
+static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
+	1,
+	0x1f700, 0x1f77f,
+}; /* CR_In_Alchemical_Symbols */
+
+/* 'In_Geometric_Shapes_Extended': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes_Extended[] = {
+	1,
+	0x1f780, 0x1f7ff,
+}; /* CR_In_Geometric_Shapes_Extended */
+
+/* 'In_Supplemental_Arrows_C': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_C[] = {
+	1,
+	0x1f800, 0x1f8ff,
+}; /* CR_In_Supplemental_Arrows_C */
+
+/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
+	1,
+	0x20000, 0x2a6df,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
+
+/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
+	1,
+	0x2a700, 0x2b73f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
+
+/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
+	1,
+	0x2b740, 0x2b81f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
+
+/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
+	1,
+	0x2f800, 0x2fa1f,
+}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
+
+/* 'In_Tags': Block */
+static const OnigCodePoint CR_In_Tags[] = {
+	1,
+	0xe0000, 0xe007f,
+}; /* CR_In_Tags */
+
+/* 'In_Variation_Selectors_Supplement': Block */
+static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
+	1,
+	0xe0100, 0xe01ef,
+}; /* CR_In_Variation_Selectors_Supplement */
+
+/* 'In_Supplementary_Private_Use_Area_A': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
+	1,
+	0xf0000, 0xfffff,
+}; /* CR_In_Supplementary_Private_Use_Area_A */
+
+/* 'In_Supplementary_Private_Use_Area_B': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+	1,
+	0x100000, 0x10ffff,
+}; /* CR_In_Supplementary_Private_Use_Area_B */
+
+/* 'In_No_Block': Block */
+static const OnigCodePoint CR_In_No_Block[] = {
+	40,
+	0x0860, 0x089f,
+	0x1c80, 0x1cbf,
+	0x2fe0, 0x2fef,
+	0xab70, 0xabbf,
+	0x10200, 0x1027f,
+	0x103e0, 0x103ff,
+	0x104b0, 0x104ff,
+	0x10570, 0x105ff,
+	0x10780, 0x107ff,
+	0x108b0, 0x108ff,
+	0x10940, 0x1097f,
+	0x10aa0, 0x10abf,
+	0x10bb0, 0x10bff,
+	0x10c50, 0x10e5f,
+	0x10e80, 0x10fff,
+	0x11250, 0x112af,
+	0x11380, 0x1147f,
+	0x114e0, 0x1157f,
+	0x11660, 0x1167f,
+	0x116d0, 0x1189f,
+	0x11900, 0x11abf,
+	0x11b00, 0x11fff,
+	0x12480, 0x12fff,
+	0x13430, 0x167ff,
+	0x16a70, 0x16acf,
+	0x16b90, 0x16eff,
+	0x16fa0, 0x1afff,
+	0x1b100, 0x1bbff,
+	0x1bcb0, 0x1cfff,
+	0x1d250, 0x1d2ff,
+	0x1d380, 0x1d3ff,
+	0x1d800, 0x1e7ff,
+	0x1e8e0, 0x1edff,
+	0x1ef00, 0x1efff,
+	0x1f900, 0x1ffff,
+	0x2a6e0, 0x2a6ff,
+	0x2b820, 0x2f7ff,
+	0x2fa20, 0xdffff,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+}; /* CR_In_No_Block */
+#endif /* USE_UNICODE_PROPERTIES */
+
+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_LC,
+  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_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
+  CR_Chakma,
+  CR_Meroitic_Cursive,
+  CR_Meroitic_Hieroglyphs,
+  CR_Miao,
+  CR_Sharada,
+  CR_Sora_Sompeng,
+  CR_Takri,
+  CR_Caucasian_Albanian,
+  CR_Bassa_Vah,
+  CR_Duployan,
+  CR_Elbasan,
+  CR_Grantha,
+  CR_Pahawh_Hmong,
+  CR_Khojki,
+  CR_Linear_A,
+  CR_Mahajani,
+  CR_Manichaean,
+  CR_Mende_Kikakui,
+  CR_Modi,
+  CR_Mro,
+  CR_Old_North_Arabian,
+  CR_Nabataean,
+  CR_Palmyrene,
+  CR_Pau_Cin_Hau,
+  CR_Old_Permic,
+  CR_Psalter_Pahlavi,
+  CR_Siddham,
+  CR_Khudawadi,
+  CR_Tirhuta,
+  CR_Warang_Citi,
+  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,
+  CR_Unknown,
+#ifdef USE_UNICODE_AGE_PROPERTIES
+  CR_Age_1_1,
+  CR_Age_2_0,
+  CR_Age_2_1,
+  CR_Age_3_0,
+  CR_Age_3_1,
+  CR_Age_3_2,
+  CR_Age_4_0,
+  CR_Age_4_1,
+  CR_Age_5_0,
+  CR_Age_5_1,
+  CR_Age_5_2,
+  CR_Age_6_0,
+  CR_Age_6_1,
+  CR_Age_6_2,
+  CR_Age_6_3,
+  CR_Age_7_0,
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+  CR_In_Basic_Latin,
+  CR_In_Latin_1_Supplement,
+  CR_In_Latin_Extended_A,
+  CR_In_Latin_Extended_B,
+  CR_In_IPA_Extensions,
+  CR_In_Spacing_Modifier_Letters,
+  CR_In_Combining_Diacritical_Marks,
+  CR_In_Greek_and_Coptic,
+  CR_In_Cyrillic,
+  CR_In_Cyrillic_Supplement,
+  CR_In_Armenian,
+  CR_In_Hebrew,
+  CR_In_Arabic,
+  CR_In_Syriac,
+  CR_In_Arabic_Supplement,
+  CR_In_Thaana,
+  CR_In_NKo,
+  CR_In_Samaritan,
+  CR_In_Mandaic,
+  CR_In_Arabic_Extended_A,
+  CR_In_Devanagari,
+  CR_In_Bengali,
+  CR_In_Gurmukhi,
+  CR_In_Gujarati,
+  CR_In_Oriya,
+  CR_In_Tamil,
+  CR_In_Telugu,
+  CR_In_Kannada,
+  CR_In_Malayalam,
+  CR_In_Sinhala,
+  CR_In_Thai,
+  CR_In_Lao,
+  CR_In_Tibetan,
+  CR_In_Myanmar,
+  CR_In_Georgian,
+  CR_In_Hangul_Jamo,
+  CR_In_Ethiopic,
+  CR_In_Ethiopic_Supplement,
+  CR_In_Cherokee,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics,
+  CR_In_Ogham,
+  CR_In_Runic,
+  CR_In_Tagalog,
+  CR_In_Hanunoo,
+  CR_In_Buhid,
+  CR_In_Tagbanwa,
+  CR_In_Khmer,
+  CR_In_Mongolian,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
+  CR_In_Limbu,
+  CR_In_Tai_Le,
+  CR_In_New_Tai_Lue,
+  CR_In_Khmer_Symbols,
+  CR_In_Buginese,
+  CR_In_Tai_Tham,
+  CR_In_Combining_Diacritical_Marks_Extended,
+  CR_In_Balinese,
+  CR_In_Sundanese,
+  CR_In_Batak,
+  CR_In_Lepcha,
+  CR_In_Ol_Chiki,
+  CR_In_Sundanese_Supplement,
+  CR_In_Vedic_Extensions,
+  CR_In_Phonetic_Extensions,
+  CR_In_Phonetic_Extensions_Supplement,
+  CR_In_Combining_Diacritical_Marks_Supplement,
+  CR_In_Latin_Extended_Additional,
+  CR_In_Greek_Extended,
+  CR_In_General_Punctuation,
+  CR_In_Superscripts_and_Subscripts,
+  CR_In_Currency_Symbols,
+  CR_In_Combining_Diacritical_Marks_for_Symbols,
+  CR_In_Letterlike_Symbols,
+  CR_In_Number_Forms,
+  CR_In_Arrows,
+  CR_In_Mathematical_Operators,
+  CR_In_Miscellaneous_Technical,
+  CR_In_Control_Pictures,
+  CR_In_Optical_Character_Recognition,
+  CR_In_Enclosed_Alphanumerics,
+  CR_In_Box_Drawing,
+  CR_In_Block_Elements,
+  CR_In_Geometric_Shapes,
+  CR_In_Miscellaneous_Symbols,
+  CR_In_Dingbats,
+  CR_In_Miscellaneous_Mathematical_Symbols_A,
+  CR_In_Supplemental_Arrows_A,
+  CR_In_Braille_Patterns,
+  CR_In_Supplemental_Arrows_B,
+  CR_In_Miscellaneous_Mathematical_Symbols_B,
+  CR_In_Supplemental_Mathematical_Operators,
+  CR_In_Miscellaneous_Symbols_and_Arrows,
+  CR_In_Glagolitic,
+  CR_In_Latin_Extended_C,
+  CR_In_Coptic,
+  CR_In_Georgian_Supplement,
+  CR_In_Tifinagh,
+  CR_In_Ethiopic_Extended,
+  CR_In_Cyrillic_Extended_A,
+  CR_In_Supplemental_Punctuation,
+  CR_In_CJK_Radicals_Supplement,
+  CR_In_Kangxi_Radicals,
+  CR_In_Ideographic_Description_Characters,
+  CR_In_CJK_Symbols_and_Punctuation,
+  CR_In_Hiragana,
+  CR_In_Katakana,
+  CR_In_Bopomofo,
+  CR_In_Hangul_Compatibility_Jamo,
+  CR_In_Kanbun,
+  CR_In_Bopomofo_Extended,
+  CR_In_CJK_Strokes,
+  CR_In_Katakana_Phonetic_Extensions,
+  CR_In_Enclosed_CJK_Letters_and_Months,
+  CR_In_CJK_Compatibility,
+  CR_In_CJK_Unified_Ideographs_Extension_A,
+  CR_In_Yijing_Hexagram_Symbols,
+  CR_In_CJK_Unified_Ideographs,
+  CR_In_Yi_Syllables,
+  CR_In_Yi_Radicals,
+  CR_In_Lisu,
+  CR_In_Vai,
+  CR_In_Cyrillic_Extended_B,
+  CR_In_Bamum,
+  CR_In_Modifier_Tone_Letters,
+  CR_In_Latin_Extended_D,
+  CR_In_Syloti_Nagri,
+  CR_In_Common_Indic_Number_Forms,
+  CR_In_Phags_pa,
+  CR_In_Saurashtra,
+  CR_In_Devanagari_Extended,
+  CR_In_Kayah_Li,
+  CR_In_Rejang,
+  CR_In_Hangul_Jamo_Extended_A,
+  CR_In_Javanese,
+  CR_In_Myanmar_Extended_B,
+  CR_In_Cham,
+  CR_In_Myanmar_Extended_A,
+  CR_In_Tai_Viet,
+  CR_In_Meetei_Mayek_Extensions,
+  CR_In_Ethiopic_Extended_A,
+  CR_In_Latin_Extended_E,
+  CR_In_Meetei_Mayek,
+  CR_In_Hangul_Syllables,
+  CR_In_Hangul_Jamo_Extended_B,
+  CR_In_High_Surrogates,
+  CR_In_High_Private_Use_Surrogates,
+  CR_In_Low_Surrogates,
+  CR_In_Private_Use_Area,
+  CR_In_CJK_Compatibility_Ideographs,
+  CR_In_Alphabetic_Presentation_Forms,
+  CR_In_Arabic_Presentation_Forms_A,
+  CR_In_Variation_Selectors,
+  CR_In_Vertical_Forms,
+  CR_In_Combining_Half_Marks,
+  CR_In_CJK_Compatibility_Forms,
+  CR_In_Small_Form_Variants,
+  CR_In_Arabic_Presentation_Forms_B,
+  CR_In_Halfwidth_and_Fullwidth_Forms,
+  CR_In_Specials,
+  CR_In_Linear_B_Syllabary,
+  CR_In_Linear_B_Ideograms,
+  CR_In_Aegean_Numbers,
+  CR_In_Ancient_Greek_Numbers,
+  CR_In_Ancient_Symbols,
+  CR_In_Phaistos_Disc,
+  CR_In_Lycian,
+  CR_In_Carian,
+  CR_In_Coptic_Epact_Numbers,
+  CR_In_Old_Italic,
+  CR_In_Gothic,
+  CR_In_Old_Permic,
+  CR_In_Ugaritic,
+  CR_In_Old_Persian,
+  CR_In_Deseret,
+  CR_In_Shavian,
+  CR_In_Osmanya,
+  CR_In_Elbasan,
+  CR_In_Caucasian_Albanian,
+  CR_In_Linear_A,
+  CR_In_Cypriot_Syllabary,
+  CR_In_Imperial_Aramaic,
+  CR_In_Palmyrene,
+  CR_In_Nabataean,
+  CR_In_Phoenician,
+  CR_In_Lydian,
+  CR_In_Meroitic_Hieroglyphs,
+  CR_In_Meroitic_Cursive,
+  CR_In_Kharoshthi,
+  CR_In_Old_South_Arabian,
+  CR_In_Old_North_Arabian,
+  CR_In_Manichaean,
+  CR_In_Avestan,
+  CR_In_Inscriptional_Parthian,
+  CR_In_Inscriptional_Pahlavi,
+  CR_In_Psalter_Pahlavi,
+  CR_In_Old_Turkic,
+  CR_In_Rumi_Numeral_Symbols,
+  CR_In_Brahmi,
+  CR_In_Kaithi,
+  CR_In_Sora_Sompeng,
+  CR_In_Chakma,
+  CR_In_Mahajani,
+  CR_In_Sharada,
+  CR_In_Sinhala_Archaic_Numbers,
+  CR_In_Khojki,
+  CR_In_Khudawadi,
+  CR_In_Grantha,
+  CR_In_Tirhuta,
+  CR_In_Siddham,
+  CR_In_Modi,
+  CR_In_Takri,
+  CR_In_Warang_Citi,
+  CR_In_Pau_Cin_Hau,
+  CR_In_Cuneiform,
+  CR_In_Cuneiform_Numbers_and_Punctuation,
+  CR_In_Egyptian_Hieroglyphs,
+  CR_In_Bamum_Supplement,
+  CR_In_Mro,
+  CR_In_Bassa_Vah,
+  CR_In_Pahawh_Hmong,
+  CR_In_Miao,
+  CR_In_Kana_Supplement,
+  CR_In_Duployan,
+  CR_In_Shorthand_Format_Controls,
+  CR_In_Byzantine_Musical_Symbols,
+  CR_In_Musical_Symbols,
+  CR_In_Ancient_Greek_Musical_Notation,
+  CR_In_Tai_Xuan_Jing_Symbols,
+  CR_In_Counting_Rod_Numerals,
+  CR_In_Mathematical_Alphanumeric_Symbols,
+  CR_In_Mende_Kikakui,
+  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
+  CR_In_Mahjong_Tiles,
+  CR_In_Domino_Tiles,
+  CR_In_Playing_Cards,
+  CR_In_Enclosed_Alphanumeric_Supplement,
+  CR_In_Enclosed_Ideographic_Supplement,
+  CR_In_Miscellaneous_Symbols_and_Pictographs,
+  CR_In_Emoticons,
+  CR_In_Ornamental_Dingbats,
+  CR_In_Transport_and_Map_Symbols,
+  CR_In_Alchemical_Symbols,
+  CR_In_Geometric_Shapes_Extended,
+  CR_In_Supplemental_Arrows_C,
+  CR_In_CJK_Unified_Ideographs_Extension_B,
+  CR_In_CJK_Unified_Ideographs_Extension_C,
+  CR_In_CJK_Unified_Ideographs_Extension_D,
+  CR_In_CJK_Compatibility_Ideographs_Supplement,
+  CR_In_Tags,
+  CR_In_Variation_Selectors_Supplement,
+  CR_In_Supplementary_Private_Use_Area_A,
+  CR_In_Supplementary_Private_Use_Area_B,
+  CR_In_No_Block,
+#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 14
+#define MIN_WORD_LENGTH 4
+#define MAX_WORD_LENGTH 6
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 19
+/* maximum key range = 14, duplicates = 0 */
+#else /* USE_UNICODE_PROPERTIES */
+#ifndef USE_UNICODE_AGE_PROPERTIES
+#define TOTAL_KEYWORDS 689
+#else /* USE_UNICODE_AGE_PROPERTIES */
+#define TOTAL_KEYWORDS 705
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 44
+#define MIN_HASH_VALUE 3
+#define MAX_HASH_VALUE 4322
+/* maximum key range = 4320, 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
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20,  3, 11,  5,
+       4, 20, 20,  9, 20,  1, 20, 20, 10, 20,
+       2, 20,  1, 20,  1,  7,  4,  6, 20,  1,
+       4, 20, 20, 20, 20, 20, 20, 20
+#else /* USE_UNICODE_PROPERTIES */
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      4323, 4323, 4323, 4323, 4323, 4323,    1, 4323,   12,    1,
+         2,    9,   18,   11,    6,   10, 4323, 4323, 4323, 4323,
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323, 4323,
+      4323, 4323, 4323, 4323, 4323, 4323, 4323,   13,  931,    6,
+       382,   25,  311,  891,  277,    4,  272, 1436,  120,    7,
+         1,  303,  456,    1,  232,   32,   65,  732, 1411,  163,
+       883, 1255,    8, 4323, 4323, 4323, 4323, 4323
+#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:
+        hval += asso_values[(unsigned char)str[4]];
+      /*FALLTHROUGH*/
+      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_str6[sizeof("word")];
+    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("upper")];
+    char uniname2ctype_pool_str13[sizeof("ascii")];
+    char uniname2ctype_pool_str14[sizeof("cntrl")];
+    char uniname2ctype_pool_str15[sizeof("space")];
+    char uniname2ctype_pool_str16[sizeof("lower")];
+    char uniname2ctype_pool_str17[sizeof("graph")];
+    char uniname2ctype_pool_str18[sizeof("digit")];
+    char uniname2ctype_pool_str19[sizeof("blank")];
+#else /* USE_UNICODE_PROPERTIES */
+    char uniname2ctype_pool_str3[sizeof("n")];
+    char uniname2ctype_pool_str10[sizeof("cn")];
+    char uniname2ctype_pool_str11[sizeof("mn")];
+    char uniname2ctype_pool_str13[sizeof("c")];
+    char uniname2ctype_pool_str15[sizeof("m")];
+    char uniname2ctype_pool_str16[sizeof("ci")];
+    char uniname2ctype_pool_str17[sizeof("z")];
+    char uniname2ctype_pool_str20[sizeof("cc")];
+    char uniname2ctype_pool_str21[sizeof("mc")];
+    char uniname2ctype_pool_str29[sizeof("mani")];
+    char uniname2ctype_pool_str31[sizeof("inmanichaean")];
+    char uniname2ctype_pool_str35[sizeof("qaai")];
+    char uniname2ctype_pool_str36[sizeof("zzzz")];
+    char uniname2ctype_pool_str37[sizeof("qaac")];
+    char uniname2ctype_pool_str44[sizeof("incham")];
+    char uniname2ctype_pool_str46[sizeof("sc")];
+    char uniname2ctype_pool_str48[sizeof("sm")];
+    char uniname2ctype_pool_str51[sizeof("mandaic")];
+    char uniname2ctype_pool_str55[sizeof("incuneiform")];
+    char uniname2ctype_pool_str56[sizeof("cans")];
+    char uniname2ctype_pool_str59[sizeof("me")];
+    char uniname2ctype_pool_str61[sizeof("inarmenian")];
+    char uniname2ctype_pool_str64[sizeof("ascii")];
+    char uniname2ctype_pool_str65[sizeof("s")];
+    char uniname2ctype_pool_str69[sizeof("insamaritan")];
+    char uniname2ctype_pool_str72[sizeof("cs")];
+    char uniname2ctype_pool_str74[sizeof("zs")];
+    char uniname2ctype_pool_str85[sizeof("inavestan")];
+    char uniname2ctype_pool_str92[sizeof("incommonindicnumberforms")];
+    char uniname2ctype_pool_str96[sizeof("incuneiformnumbersandpunctuation")];
+    char uniname2ctype_pool_str97[sizeof("inthai")];
+    char uniname2ctype_pool_str98[sizeof("inipaextensions")];
+    char uniname2ctype_pool_str105[sizeof("mtei")];
+    char uniname2ctype_pool_str110[sizeof("inspecials")];
+    char uniname2ctype_pool_str114[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str115[sizeof("inancientsymbols")];
+    char uniname2ctype_pool_str117[sizeof("inthaana")];
+    char uniname2ctype_pool_str130[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str134[sizeof("lc")];
+    char uniname2ctype_pool_str135[sizeof("inmusicalsymbols")];
+    char uniname2ctype_pool_str136[sizeof("lm")];
+    char uniname2ctype_pool_str137[sizeof("taile")];
+    char uniname2ctype_pool_str141[sizeof("sterm")];
+    char uniname2ctype_pool_str142[sizeof("lina")];
+    char uniname2ctype_pool_str144[sizeof("inlycian")];
+    char uniname2ctype_pool_str147[sizeof("inmyanmarextendeda")];
+    char uniname2ctype_pool_str151[sizeof("lana")];
+    char uniname2ctype_pool_str153[sizeof("alnum")];
+    char uniname2ctype_pool_str155[sizeof("intaitham")];
+    char uniname2ctype_pool_str157[sizeof("incontrolpictures")];
+    char uniname2ctype_pool_str161[sizeof("inmiscellaneoussymbols")];
+    char uniname2ctype_pool_str163[sizeof("inmalayalam")];
+    char uniname2ctype_pool_str166[sizeof("intransportandmapsymbols")];
+    char uniname2ctype_pool_str170[sizeof("inmiscellaneoussymbolsandarrows")];
+    char uniname2ctype_pool_str173[sizeof("inlineara")];
+    char uniname2ctype_pool_str175[sizeof("inmiscellaneoussymbolsandpictographs")];
+    char uniname2ctype_pool_str183[sizeof("taiviet")];
+    char uniname2ctype_pool_str186[sizeof("cwcm")];
+    char uniname2ctype_pool_str190[sizeof("sinhala")];
+    char uniname2ctype_pool_str203[sizeof("latn")];
+    char uniname2ctype_pool_str205[sizeof("latin")];
+    char uniname2ctype_pool_str206[sizeof("ital")];
+    char uniname2ctype_pool_str208[sizeof("intamil")];
+    char uniname2ctype_pool_str209[sizeof("taml")];
+    char uniname2ctype_pool_str223[sizeof("inlatinextendedc")];
+    char uniname2ctype_pool_str226[sizeof("intaile")];
+    char uniname2ctype_pool_str227[sizeof("tale")];
+    char uniname2ctype_pool_str237[sizeof("inlatinextendeda")];
+    char uniname2ctype_pool_str239[sizeof("inlinearbideograms")];
+    char uniname2ctype_pool_str240[sizeof("newtailue")];
+    char uniname2ctype_pool_str241[sizeof("l")];
+    char uniname2ctype_pool_str243[sizeof("nl")];
+    char uniname2ctype_pool_str247[sizeof("inmeeteimayekextensions")];
+    char uniname2ctype_pool_str250[sizeof("zl")];
+    char uniname2ctype_pool_str252[sizeof("lt")];
+    char uniname2ctype_pool_str255[sizeof("inrunic")];
+    char uniname2ctype_pool_str256[sizeof("incarian")];
+    char uniname2ctype_pool_str257[sizeof("armn")];
+    char uniname2ctype_pool_str259[sizeof("cari")];
+    char uniname2ctype_pool_str260[sizeof("armi")];
+    char uniname2ctype_pool_str261[sizeof("inlatinextendede")];
+    char uniname2ctype_pool_str263[sizeof("incyrillic")];
+    char uniname2ctype_pool_str266[sizeof("armenian")];
+    char uniname2ctype_pool_str267[sizeof("inmyanmar")];
+    char uniname2ctype_pool_str270[sizeof("innewtailue")];
+    char uniname2ctype_pool_str272[sizeof("carian")];
+    char uniname2ctype_pool_str274[sizeof("merc")];
+    char uniname2ctype_pool_str280[sizeof("arabic")];
+    char uniname2ctype_pool_str284[sizeof("inmiscellaneoustechnical")];
+    char uniname2ctype_pool_str287[sizeof("insyriac")];
+    char uniname2ctype_pool_str288[sizeof("samr")];
+    char uniname2ctype_pool_str294[sizeof("zinh")];
+    char uniname2ctype_pool_str295[sizeof("han")];
+    char uniname2ctype_pool_str298[sizeof("samaritan")];
+    char uniname2ctype_pool_str299[sizeof("hani")];
+    char uniname2ctype_pool_str302[sizeof("cwt")];
+    char uniname2ctype_pool_str303[sizeof("incherokee")];
+    char uniname2ctype_pool_str304[sizeof("insharada")];
+    char uniname2ctype_pool_str307[sizeof("cham")];
+    char uniname2ctype_pool_str315[sizeof("manichaean")];
+    char uniname2ctype_pool_str316[sizeof("inmahajani")];
+    char uniname2ctype_pool_str317[sizeof("cntrl")];
+    char uniname2ctype_pool_str318[sizeof("sinh")];
+    char uniname2ctype_pool_str320[sizeof("inruminumeralsymbols")];
+    char uniname2ctype_pool_str327[sizeof("inethiopic")];
+    char uniname2ctype_pool_str330[sizeof("tamil")];
+    char uniname2ctype_pool_str331[sizeof("miao")];
+    char uniname2ctype_pool_str332[sizeof("inenclosedalphanumerics")];
+    char uniname2ctype_pool_str333[sizeof("term")];
+    char uniname2ctype_pool_str335[sizeof("chakma")];
+    char uniname2ctype_pool_str337[sizeof("insinhala")];
+    char uniname2ctype_pool_str347[sizeof("shavian")];
+    char uniname2ctype_pool_str350[sizeof("inosmanya")];
+    char uniname2ctype_pool_str353[sizeof("inlatinextendedadditional")];
+    char uniname2ctype_pool_str359[sizeof("osma")];
+    char uniname2ctype_pool_str362[sizeof("ll")];
+    char uniname2ctype_pool_str363[sizeof("thai")];
+    char uniname2ctype_pool_str366[sizeof("math")];
+    char uniname2ctype_pool_str372[sizeof("thaa")];
+    char uniname2ctype_pool_str374[sizeof("inenclosedalphanumericsupplement")];
+    char uniname2ctype_pool_str375[sizeof("ethi")];
+    char uniname2ctype_pool_str376[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str380[sizeof("inlowsurrogates")];
+    char uniname2ctype_pool_str382[sizeof("insinhalaarchaicnumbers")];
+    char uniname2ctype_pool_str386[sizeof("taitham")];
+    char uniname2ctype_pool_str388[sizeof("thaana")];
+    char uniname2ctype_pool_str390[sizeof("lineara")];
+    char uniname2ctype_pool_str392[sizeof("di")];
+    char uniname2ctype_pool_str401[sizeof("idc")];
+    char uniname2ctype_pool_str405[sizeof("meroiticcursive")];
+    char uniname2ctype_pool_str407[sizeof("mand")];
+    char uniname2ctype_pool_str408[sizeof("inmodi")];
+    char uniname2ctype_pool_str410[sizeof("inmandaic")];
+    char uniname2ctype_pool_str412[sizeof("cwl")];
+    char uniname2ctype_pool_str414[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str415[sizeof("dia")];
+    char uniname2ctype_pool_str418[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str419[sizeof("mend")];
+    char uniname2ctype_pool_str423[sizeof("sind")];
+    char uniname2ctype_pool_str425[sizeof("wara")];
+    char uniname2ctype_pool_str433[sizeof("inwarangciti")];
+    char uniname2ctype_pool_str439[sizeof("inideographicdescriptioncharacters")];
+    char uniname2ctype_pool_str441[sizeof("inemoticons")];
+    char uniname2ctype_pool_str453[sizeof("ids")];
+    char uniname2ctype_pool_str456[sizeof("insundanese")];
+    char uniname2ctype_pool_str466[sizeof("pi")];
+    char uniname2ctype_pool_str468[sizeof("indominotiles")];
+    char uniname2ctype_pool_str470[sizeof("pc")];
+    char uniname2ctype_pool_str476[sizeof("loe")];
+    char uniname2ctype_pool_str477[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str485[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str487[sizeof("idst")];
+    char uniname2ctype_pool_str489[sizeof("shaw")];
+    char uniname2ctype_pool_str490[sizeof("cwcf")];
+    char uniname2ctype_pool_str493[sizeof("idcontinue")];
+    char uniname2ctype_pool_str502[sizeof("inphaistosdisc")];
+    char uniname2ctype_pool_str508[sizeof("pe")];
+    char uniname2ctype_pool_str518[sizeof("indeseret")];
+    char uniname2ctype_pool_str519[sizeof("inspacingmodifierletters")];
+    char uniname2ctype_pool_str520[sizeof("inlydian")];
+    char uniname2ctype_pool_str522[sizeof("ps")];
+    char uniname2ctype_pool_str530[sizeof("hira")];
+    char uniname2ctype_pool_str536[sizeof("whitespace")];
+    char uniname2ctype_pool_str540[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str544[sizeof("cher")];
+    char uniname2ctype_pool_str545[sizeof("inmathematicalalphanumericsymbols")];
+    char uniname2ctype_pool_str546[sizeof("incoptic")];
+    char uniname2ctype_pool_str550[sizeof("inhiragana")];
+    char uniname2ctype_pool_str554[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str556[sizeof("space")];
+    char uniname2ctype_pool_str570[sizeof("oriya")];
+    char uniname2ctype_pool_str571[sizeof("mero")];
+    char uniname2ctype_pool_str573[sizeof("mahj")];
+    char uniname2ctype_pool_str582[sizeof("tirh")];
+    char uniname2ctype_pool_str584[sizeof("sora")];
+    char uniname2ctype_pool_str587[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str593[sizeof("inarrows")];
+    char uniname2ctype_pool_str594[sizeof("mahajani")];
+    char uniname2ctype_pool_str596[sizeof("joinc")];
+    char uniname2ctype_pool_str597[sizeof("incopticepactnumbers")];
+    char uniname2ctype_pool_str598[sizeof("hano")];
+    char uniname2ctype_pool_str600[sizeof("palm")];
+    char uniname2ctype_pool_str601[sizeof("intirhuta")];
+    char uniname2ctype_pool_str603[sizeof("patws")];
+    char uniname2ctype_pool_str604[sizeof("inolchiki")];
+    char uniname2ctype_pool_str608[sizeof("inlepcha")];
+    char uniname2ctype_pool_str609[sizeof("no")];
+    char uniname2ctype_pool_str611[sizeof("lepc")];
+    char uniname2ctype_pool_str612[sizeof("inogham")];
+    char uniname2ctype_pool_str614[sizeof("co")];
+    char uniname2ctype_pool_str617[sizeof("innko")];
+    char uniname2ctype_pool_str620[sizeof("alpha")];
+    char uniname2ctype_pool_str622[sizeof("psalterpahlavi")];
+    char uniname2ctype_pool_str623[sizeof("inmro")];
+    char uniname2ctype_pool_str624[sizeof("inpalmyrene")];
+    char uniname2ctype_pool_str627[sizeof("common")];
+    char uniname2ctype_pool_str630[sizeof("cf")];
+    char uniname2ctype_pool_str637[sizeof("inmiao")];
+    char uniname2ctype_pool_str640[sizeof("so")];
+    char uniname2ctype_pool_str650[sizeof("diacritic")];
+    char uniname2ctype_pool_str658[sizeof("insundanesesupplement")];
+    char uniname2ctype_pool_str672[sizeof("intifinagh")];
+    char uniname2ctype_pool_str679[sizeof("tifinagh")];
+    char uniname2ctype_pool_str696[sizeof("odi")];
+    char uniname2ctype_pool_str699[sizeof("oidc")];
+    char uniname2ctype_pool_str700[sizeof("modi")];
+    char uniname2ctype_pool_str703[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str705[sizeof("letter")];
+    char uniname2ctype_pool_str708[sizeof("dash")];
+    char uniname2ctype_pool_str709[sizeof("insylotinagri")];
+    char uniname2ctype_pool_str711[sizeof("inolditalic")];
+    char uniname2ctype_pool_str713[sizeof("wspace")];
+    char uniname2ctype_pool_str715[sizeof("dsrt")];
+    char uniname2ctype_pool_str718[sizeof("ideo")];
+    char uniname2ctype_pool_str722[sizeof("siddham")];
+    char uniname2ctype_pool_str724[sizeof("perm")];
+    char uniname2ctype_pool_str725[sizeof("oids")];
+    char uniname2ctype_pool_str727[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str728[sizeof("lo")];
+    char uniname2ctype_pool_str730[sizeof("lineseparator")];
+    char uniname2ctype_pool_str731[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str735[sizeof("idstart")];
+    char uniname2ctype_pool_str736[sizeof("inlao")];
+    char uniname2ctype_pool_str737[sizeof("sharada")];
+    char uniname2ctype_pool_str742[sizeof("lao")];
+    char uniname2ctype_pool_str743[sizeof("laoo")];
+    char uniname2ctype_pool_str744[sizeof("mongolian")];
+    char uniname2ctype_pool_str745[sizeof("oalpha")];
+    char uniname2ctype_pool_str749[sizeof("inimperialaramaic")];
+    char uniname2ctype_pool_str753[sizeof("nchar")];
+    char uniname2ctype_pool_str758[sizeof("inlatin1supplement")];
+    char uniname2ctype_pool_str761[sizeof("prti")];
+    char uniname2ctype_pool_str763[sizeof("cprt")];
+    char uniname2ctype_pool_str767[sizeof("nd")];
+    char uniname2ctype_pool_str768[sizeof("deseret")];
+    char uniname2ctype_pool_str772[sizeof("inoldturkic")];
+    char uniname2ctype_pool_str773[sizeof("radical")];
+    char uniname2ctype_pool_str777[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str779[sizeof("inmodifiertoneletters")];
+    char uniname2ctype_pool_str783[sizeof("incaucasianalbanian")];
+    char uniname2ctype_pool_str787[sizeof("coptic")];
+    char uniname2ctype_pool_str796[sizeof("casedletter")];
+    char uniname2ctype_pool_str798[sizeof("sd")];
+    char uniname2ctype_pool_str803[sizeof("inphoenician")];
+    char uniname2ctype_pool_str804[sizeof("sidd")];
+    char uniname2ctype_pool_str805[sizeof("privateuse")];
+    char uniname2ctype_pool_str813[sizeof("sundanese")];
+    char uniname2ctype_pool_str815[sizeof("inancientgreekmusicalnotation")];
+    char uniname2ctype_pool_str817[sizeof("insiddham")];
+    char uniname2ctype_pool_str820[sizeof("cased")];
+    char uniname2ctype_pool_str827[sizeof("print")];
+    char uniname2ctype_pool_str830[sizeof("ininscriptionalparthian")];
+    char uniname2ctype_pool_str832[sizeof("ininscriptionalpahlavi")];
+    char uniname2ctype_pool_str834[sizeof("copt")];
+    char uniname2ctype_pool_str838[sizeof("inancientgreeknumbers")];
+    char uniname2ctype_pool_str845[sizeof("saurashtra")];
+    char uniname2ctype_pool_str848[sizeof("mro")];
+    char uniname2ctype_pool_str849[sizeof("mroo")];
+    char uniname2ctype_pool_str850[sizeof("inalphabeticpresentationforms")];
+    char uniname2ctype_pool_str858[sizeof("lowercase")];
+    char uniname2ctype_pool_str861[sizeof("phli")];
+    char uniname2ctype_pool_str864[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str866[sizeof("inenclosedideographicsupplement")];
+    char uniname2ctype_pool_str869[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str871[sizeof("inmathematicaloperators")];
+    char uniname2ctype_pool_str882[sizeof("omath")];
+    char uniname2ctype_pool_str892[sizeof("lisu")];
+    char uniname2ctype_pool_str895[sizeof("inpsalterpahlavi")];
+    char uniname2ctype_pool_str898[sizeof("olditalic")];
+    char uniname2ctype_pool_str905[sizeof("hanunoo")];
+    char uniname2ctype_pool_str909[sizeof("inherited")];
+    char uniname2ctype_pool_str910[sizeof("lepcha")];
+    char uniname2ctype_pool_str913[sizeof("p")];
+    char uniname2ctype_pool_str916[sizeof("inmongolian")];
+    char uniname2ctype_pool_str922[sizeof("zp")];
+    char uniname2ctype_pool_str923[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str925[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str927[sizeof("shrd")];
+    char uniname2ctype_pool_str932[sizeof("ingrantha")];
+    char uniname2ctype_pool_str934[sizeof("talu")];
+    char uniname2ctype_pool_str936[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str938[sizeof("noncharactercodepoint")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str939[sizeof("age=1.1")];
+    char uniname2ctype_pool_str940[sizeof("age=2.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str941[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str943[sizeof("letternumber")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str944[sizeof("age=6.1")];
+    char uniname2ctype_pool_str945[sizeof("age=6.2")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str946[sizeof("telu")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str947[sizeof("age=3.1")];
+    char uniname2ctype_pool_str948[sizeof("age=3.2")];
+    char uniname2ctype_pool_str949[sizeof("age=5.1")];
+    char uniname2ctype_pool_str950[sizeof("age=5.2")];
+    char uniname2ctype_pool_str951[sizeof("age=2.0")];
+    char uniname2ctype_pool_str952[sizeof("age=6.3")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str953[sizeof("inshorthandformatcontrols")];
+    char uniname2ctype_pool_str954[sizeof("inoldnortharabian")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str955[sizeof("age=6.0")];
+    char uniname2ctype_pool_str956[sizeof("age=4.1")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str957[sizeof("ingeneralpunctuation")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str958[sizeof("age=3.0")];
+    char uniname2ctype_pool_str959[sizeof("age=7.0")];
+    char uniname2ctype_pool_str960[sizeof("age=5.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str962[sizeof("innabataean")];
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    char uniname2ctype_pool_str967[sizeof("age=4.0")];
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    char uniname2ctype_pool_str970[sizeof("bamum")];
+    char uniname2ctype_pool_str972[sizeof("control")];
+    char uniname2ctype_pool_str974[sizeof("induployan")];
+    char uniname2ctype_pool_str975[sizeof("inlatinextendedd")];
+    char uniname2ctype_pool_str976[sizeof("inarabic")];
+    char uniname2ctype_pool_str982[sizeof("runic")];
+    char uniname2ctype_pool_str984[sizeof("inelbasan")];
+    char uniname2ctype_pool_str985[sizeof("inoldsoutharabian")];
+    char uniname2ctype_pool_str986[sizeof("inbasiclatin")];
+    char uniname2ctype_pool_str995[sizeof("format")];
+    char uniname2ctype_pool_str996[sizeof("innumberforms")];
+    char uniname2ctype_pool_str998[sizeof("inugaritic")];
+    char uniname2ctype_pool_str999[sizeof("separator")];
+    char uniname2ctype_pool_str1000[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str1004[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str1012[sizeof("bass")];
+    char uniname2ctype_pool_str1013[sizeof("saur")];
+    char uniname2ctype_pool_str1014[sizeof("nbat")];
+    char uniname2ctype_pool_str1017[sizeof("intaixuanjingsymbols")];
+    char uniname2ctype_pool_str1019[sizeof("joincontrol")];
+    char uniname2ctype_pool_str1023[sizeof("otheridstart")];
+    char uniname2ctype_pool_str1027[sizeof("inbyzantinemusicalsymbols")];
+    char uniname2ctype_pool_str1031[sizeof("intags")];
+    char uniname2ctype_pool_str1033[sizeof("nabataean")];
+    char uniname2ctype_pool_str1034[sizeof("insuperscriptsandsubscripts")];
+    char uniname2ctype_pool_str1036[sizeof("intibetan")];
+    char uniname2ctype_pool_str1039[sizeof("insaurashtra")];
+    char uniname2ctype_pool_str1040[sizeof("othersymbol")];
+    char uniname2ctype_pool_str1041[sizeof("ext")];
+    char uniname2ctype_pool_str1046[sizeof("inarabicpresentationformsa")];
+    char uniname2ctype_pool_str1048[sizeof("inmiscellaneousmathematicalsymbolsb")];
+    char uniname2ctype_pool_str1049[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str1052[sizeof("phoenician")];
+    char uniname2ctype_pool_str1055[sizeof("lower")];
+    char uniname2ctype_pool_str1060[sizeof("linb")];
+    char uniname2ctype_pool_str1064[sizeof("po")];
+    char uniname2ctype_pool_str1065[sizeof("inmyanmarextendedb")];
+    char uniname2ctype_pool_str1066[sizeof("limb")];
+    char uniname2ctype_pool_str1068[sizeof("inbraillepatterns")];
+    char uniname2ctype_pool_str1069[sizeof("tibt")];
+    char uniname2ctype_pool_str1070[sizeof("cuneiform")];
+    char uniname2ctype_pool_str1072[sizeof("bali")];
+    char uniname2ctype_pool_str1073[sizeof("oldpersian")];
+    char uniname2ctype_pool_str1077[sizeof("oldpermic")];
+    char uniname2ctype_pool_str1080[sizeof("pf")];
+    char uniname2ctype_pool_str1084[sizeof("word")];
+    char uniname2ctype_pool_str1086[sizeof("tibetan")];
+    char uniname2ctype_pool_str1089[sizeof("incyrillicsupplement")];
+    char uniname2ctype_pool_str1093[sizeof("elba")];
+    char uniname2ctype_pool_str1094[sizeof("insupplementalmathematicaloperators")];
+    char uniname2ctype_pool_str1095[sizeof("inbalinese")];
+    char uniname2ctype_pool_str1101[sizeof("bengali")];
+    char uniname2ctype_pool_str1104[sizeof("caseignorable")];
+    char uniname2ctype_pool_str1107[sizeof("incountingrodnumerals")];
+    char uniname2ctype_pool_str1114[sizeof("other")];
+    char uniname2ctype_pool_str1118[sizeof("tirhuta")];
+    char uniname2ctype_pool_str1121[sizeof("othernumber")];
+    char uniname2ctype_pool_str1123[sizeof("balinese")];
+    char uniname2ctype_pool_str1129[sizeof("elbasan")];
+    char uniname2ctype_pool_str1134[sizeof("inunifiedcanadianaboriginalsyllabics")];
+    char uniname2ctype_pool_str1136[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str1140[sizeof("ethiopic")];
+    char uniname2ctype_pool_str1141[sizeof("gran")];
+    char uniname2ctype_pool_str1149[sizeof("ingurmukhi")];
+    char uniname2ctype_pool_str1151[sizeof("sund")];
+    char uniname2ctype_pool_str1153[sizeof("inethiopicsupplement")];
+    char uniname2ctype_pool_str1160[sizeof("inoldpersian")];
+    char uniname2ctype_pool_str1163[sizeof("inoldpermic")];
+    char uniname2ctype_pool_str1170[sizeof("othermath")];
+    char uniname2ctype_pool_str1174[sizeof("unassigned")];
+    char uniname2ctype_pool_str1180[sizeof("hmng")];
+    char uniname2ctype_pool_str1181[sizeof("narb")];
+    char uniname2ctype_pool_str1184[sizeof("brai")];
+    char uniname2ctype_pool_str1186[sizeof("hang")];
+    char uniname2ctype_pool_str1187[sizeof("insorasompeng")];
+    char uniname2ctype_pool_str1193[sizeof("arab")];
+    char uniname2ctype_pool_str1194[sizeof("plrd")];
+    char uniname2ctype_pool_str1195[sizeof("ingujarati")];
+    char uniname2ctype_pool_str1197[sizeof("brahmi")];
+    char uniname2ctype_pool_str1201[sizeof("runr")];
+    char uniname2ctype_pool_str1202[sizeof("ahex")];
+    char uniname2ctype_pool_str1206[sizeof("mong")];
+    char uniname2ctype_pool_str1211[sizeof("pauc")];
+    char uniname2ctype_pool_str1212[sizeof("sarb")];
+    char uniname2ctype_pool_str1218[sizeof("ogam")];
+    char uniname2ctype_pool_str1221[sizeof("olower")];
+    char uniname2ctype_pool_str1222[sizeof("pd")];
+    char uniname2ctype_pool_str1235[sizeof("number")];
+    char uniname2ctype_pool_str1238[sizeof("inbrahmi")];
+    char uniname2ctype_pool_str1240[sizeof("otherletter")];
+    char uniname2ctype_pool_str1252[sizeof("ingothic")];
+    char uniname2ctype_pool_str1254[sizeof("phagspa")];
+    char uniname2ctype_pool_str1262[sizeof("inletterlikesymbols")];
+    char uniname2ctype_pool_str1265[sizeof("yi")];
+    char uniname2ctype_pool_str1269[sizeof("hangul")];
+    char uniname2ctype_pool_str1271[sizeof("yiii")];
+    char uniname2ctype_pool_str1272[sizeof("tfng")];
+    char uniname2ctype_pool_str1273[sizeof("insupplementalarrowsc")];
+    char uniname2ctype_pool_str1277[sizeof("ingreekandcoptic")];
+    char uniname2ctype_pool_str1279[sizeof("xidc")];
+    char uniname2ctype_pool_str1280[sizeof("insupplementalarrowsa")];
+    char uniname2ctype_pool_str1281[sizeof("gothic")];
+    char uniname2ctype_pool_str1283[sizeof("grext")];
+    char uniname2ctype_pool_str1285[sizeof("incombininghalfmarks")];
+    char uniname2ctype_pool_str1286[sizeof("deprecated")];
+    char uniname2ctype_pool_str1287[sizeof("inbassavah")];
+    char uniname2ctype_pool_str1305[sizeof("xids")];
+    char uniname2ctype_pool_str1308[sizeof("linearb")];
+    char uniname2ctype_pool_str1312[sizeof("ingeometricshapes")];
+    char uniname2ctype_pool_str1313[sizeof("phlp")];
+    char uniname2ctype_pool_str1314[sizeof("warangciti")];
+    char uniname2ctype_pool_str1317[sizeof("inblockelements")];
+    char uniname2ctype_pool_str1318[sizeof("modifierletter")];
+    char uniname2ctype_pool_str1321[sizeof("indingbats")];
+    char uniname2ctype_pool_str1322[sizeof("dep")];
+    char uniname2ctype_pool_str1324[sizeof("punct")];
+    char uniname2ctype_pool_str1327[sizeof("inhanunoo")];
+    char uniname2ctype_pool_str1334[sizeof("bidic")];
+    char uniname2ctype_pool_str1344[sizeof("ingreekextended")];
+    char uniname2ctype_pool_str1353[sizeof("idsb")];
+    char uniname2ctype_pool_str1359[sizeof("assigned")];
+    char uniname2ctype_pool_str1364[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str1368[sizeof("inhangulsyllables")];
+    char uniname2ctype_pool_str1373[sizeof("inarabicmathematicalalphabeticsymbols")];
+    char uniname2ctype_pool_str1385[sizeof("inornamentaldingbats")];
+    char uniname2ctype_pool_str1387[sizeof("inphagspa")];
+    char uniname2ctype_pool_str1389[sizeof("lyci")];
+    char uniname2ctype_pool_str1393[sizeof("mlym")];
+    char uniname2ctype_pool_str1399[sizeof("inarabicextendeda")];
+    char uniname2ctype_pool_str1400[sizeof("rjng")];
+    char uniname2ctype_pool_str1402[sizeof("lycian")];
+    char uniname2ctype_pool_str1403[sizeof("inalchemicalsymbols")];
+    char uniname2ctype_pool_str1409[sizeof("xdigit")];
+    char uniname2ctype_pool_str1412[sizeof("digit")];
+    char uniname2ctype_pool_str1420[sizeof("xidstart")];
+    char uniname2ctype_pool_str1421[sizeof("inrejang")];
+    char uniname2ctype_pool_str1424[sizeof("malayalam")];
+    char uniname2ctype_pool_str1425[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str1429[sizeof("invai")];
+    char uniname2ctype_pool_str1435[sizeof("vai")];
+    char uniname2ctype_pool_str1436[sizeof("vaii")];
+    char uniname2ctype_pool_str1438[sizeof("hiragana")];
+    char uniname2ctype_pool_str1442[sizeof("ingeorgian")];
+    char uniname2ctype_pool_str1448[sizeof("braille")];
+    char uniname2ctype_pool_str1455[sizeof("geor")];
+    char uniname2ctype_pool_str1457[sizeof("brah")];
+    char uniname2ctype_pool_str1463[sizeof("glagolitic")];
+    char uniname2ctype_pool_str1465[sizeof("inkannada")];
+    char uniname2ctype_pool_str1466[sizeof("cakm")];
+    char uniname2ctype_pool_str1467[sizeof("kana")];
+    char uniname2ctype_pool_str1469[sizeof("hebr")];
+    char uniname2ctype_pool_str1471[sizeof("inshavian")];
+    char uniname2ctype_pool_str1477[sizeof("vs")];
+    char uniname2ctype_pool_str1481[sizeof("inchakma")];
+    char uniname2ctype_pool_str1490[sizeof("ogham")];
+    char uniname2ctype_pool_str1491[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str1492[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
+    char uniname2ctype_pool_str1495[sizeof("inmeroitichieroglyphs")];
+    char uniname2ctype_pool_str1498[sizeof("grantha")];
+    char uniname2ctype_pool_str1500[sizeof("graphemebase")];
+    char uniname2ctype_pool_str1502[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str1505[sizeof("mymr")];
+    char uniname2ctype_pool_str1513[sizeof("insupplementaryprivateuseareaa")];
+    char uniname2ctype_pool_str1514[sizeof("mendekikakui")];
+    char uniname2ctype_pool_str1516[sizeof("incjkcompatibilityforms")];
+    char uniname2ctype_pool_str1518[sizeof("inhalfwidthandfullwidthforms")];
+    char uniname2ctype_pool_str1521[sizeof("incjkcompatibilityideographs")];
+    char uniname2ctype_pool_str1522[sizeof("inkaithi")];
+    char uniname2ctype_pool_str1525[sizeof("avst")];
+    char uniname2ctype_pool_str1526[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str1527[sizeof("takri")];
+    char uniname2ctype_pool_str1529[sizeof("syrc")];
+    char uniname2ctype_pool_str1533[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str1534[sizeof("myanmar")];
+    char uniname2ctype_pool_str1535[sizeof("avestan")];
+    char uniname2ctype_pool_str1536[sizeof("inhanguljamoextendeda")];
+    char uniname2ctype_pool_str1540[sizeof("goth")];
+    char uniname2ctype_pool_str1542[sizeof("inkatakana")];
+    char uniname2ctype_pool_str1544[sizeof("incyrillicextendeda")];
+    char uniname2ctype_pool_str1549[sizeof("alphabetic")];
+    char uniname2ctype_pool_str1550[sizeof("syriac")];
+    char uniname2ctype_pool_str1551[sizeof("ideographic")];
+    char uniname2ctype_pool_str1555[sizeof("incjkstrokes")];
+    char uniname2ctype_pool_str1557[sizeof("inlinearbsyllabary")];
+    char uniname2ctype_pool_str1558[sizeof("tavt")];
+    char uniname2ctype_pool_str1559[sizeof("intaiviet")];
+    char uniname2ctype_pool_str1564[sizeof("incjkcompatibilityideographssupplement")];
+    char uniname2ctype_pool_str1576[sizeof("inmeeteimayek")];
+    char uniname2ctype_pool_str1577[sizeof("kali")];
+    char uniname2ctype_pool_str1581[sizeof("inyiradicals")];
+    char uniname2ctype_pool_str1586[sizeof("lu")];
+    char uniname2ctype_pool_str1587[sizeof("inoriya")];
+    char uniname2ctype_pool_str1590[sizeof("hebrew")];
+    char uniname2ctype_pool_str1596[sizeof("extender")];
+    char uniname2ctype_pool_str1598[sizeof("inhighprivateusesurrogates")];
+    char uniname2ctype_pool_str1600[sizeof("limbu")];
+    char uniname2ctype_pool_str1606[sizeof("inbuhid")];
+    char uniname2ctype_pool_str1608[sizeof("inethiopicextendeda")];
+    char uniname2ctype_pool_str1609[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str1611[sizeof("inyijinghexagramsymbols")];
+    char uniname2ctype_pool_str1612[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str1616[sizeof("inhebrew")];
+    char uniname2ctype_pool_str1617[sizeof("cyrl")];
+    char uniname2ctype_pool_str1618[sizeof("osmanya")];
+    char uniname2ctype_pool_str1621[sizeof("phnx")];
+    char uniname2ctype_pool_str1622[sizeof("incombiningdiacriticalmarks")];
+    char uniname2ctype_pool_str1626[sizeof("inkanasupplement")];
+    char uniname2ctype_pool_str1627[sizeof("inlisu")];
+    char uniname2ctype_pool_str1628[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str1632[sizeof("incombiningdiacriticalmarksforsymbols")];
+    char uniname2ctype_pool_str1636[sizeof("cwu")];
+    char uniname2ctype_pool_str1641[sizeof("phag")];
+    char uniname2ctype_pool_str1645[sizeof("insmallformvariants")];
+    char uniname2ctype_pool_str1656[sizeof("inpahawhhmong")];
+    char uniname2ctype_pool_str1661[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str1662[sizeof("intelugu")];
+    char uniname2ctype_pool_str1665[sizeof("incombiningdiacriticalmarkssupplement")];
+    char uniname2ctype_pool_str1670[sizeof("ingeometricshapesextended")];
+    char uniname2ctype_pool_str1671[sizeof("xpeo")];
+    char uniname2ctype_pool_str1687[sizeof("bamu")];
+    char uniname2ctype_pool_str1689[sizeof("inbamum")];
+    char uniname2ctype_pool_str1692[sizeof("mark")];
+    char uniname2ctype_pool_str1694[sizeof("dupl")];
+    char uniname2ctype_pool_str1695[sizeof("graph")];
+    char uniname2ctype_pool_str1696[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str1700[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str1705[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str1706[sizeof("inkharoshthi")];
+    char uniname2ctype_pool_str1712[sizeof("inkhmer")];
+    char uniname2ctype_pool_str1713[sizeof("java")];
+    char uniname2ctype_pool_str1714[sizeof("sylo")];
+    char uniname2ctype_pool_str1719[sizeof("ugaritic")];
+    char uniname2ctype_pool_str1722[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str1723[sizeof("softdotted")];
+    char uniname2ctype_pool_str1729[sizeof("uideo")];
+    char uniname2ctype_pool_str1732[sizeof("inphoneticextensions")];
+    char uniname2ctype_pool_str1736[sizeof("injavanese")];
+    char uniname2ctype_pool_str1742[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str1744[sizeof("kaithi")];
+    char uniname2ctype_pool_str1747[sizeof("cyrillic")];
+    char uniname2ctype_pool_str1749[sizeof("intakri")];
+    char uniname2ctype_pool_str1750[sizeof("takr")];
+    char uniname2ctype_pool_str1755[sizeof("javanese")];
+    char uniname2ctype_pool_str1757[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str1758[sizeof("caucasianalbanian")];
+    char uniname2ctype_pool_str1765[sizeof("lydi")];
+    char uniname2ctype_pool_str1772[sizeof("insupplementalpunctuation")];
+    char uniname2ctype_pool_str1775[sizeof("inphoneticextensionssupplement")];
+    char uniname2ctype_pool_str1778[sizeof("lydian")];
+    char uniname2ctype_pool_str1784[sizeof("oldturkic")];
+    char uniname2ctype_pool_str1785[sizeof("invariationselectorssupplement")];
+    char uniname2ctype_pool_str1786[sizeof("kthi")];
+    char uniname2ctype_pool_str1792[sizeof("inhanguljamo")];
+    char uniname2ctype_pool_str1797[sizeof("patsyn")];
+    char uniname2ctype_pool_str1802[sizeof("inlimbu")];
+    char uniname2ctype_pool_str1804[sizeof("sorasompeng")];
+    char uniname2ctype_pool_str1807[sizeof("orya")];
+    char uniname2ctype_pool_str1822[sizeof("inkhmersymbols")];
+    char uniname2ctype_pool_str1824[sizeof("inglagolitic")];
+    char uniname2ctype_pool_str1831[sizeof("indevanagari")];
+    char uniname2ctype_pool_str1835[sizeof("deva")];
+    char uniname2ctype_pool_str1836[sizeof("knda")];
+    char uniname2ctype_pool_str1841[sizeof("inbengali")];
+    char uniname2ctype_pool_str1843[sizeof("symbol")];
+    char uniname2ctype_pool_str1846[sizeof("devanagari")];
+    char uniname2ctype_pool_str1849[sizeof("inmendekikakui")];
+    char uniname2ctype_pool_str1852[sizeof("beng")];
+    char uniname2ctype_pool_str1853[sizeof("invedicextensions")];
+    char uniname2ctype_pool_str1859[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str1865[sizeof("kannada")];
+    char uniname2ctype_pool_str1866[sizeof("inbuginese")];
+    char uniname2ctype_pool_str1869[sizeof("olck")];
+    char uniname2ctype_pool_str1871[sizeof("meroitichieroglyphs")];
+    char uniname2ctype_pool_str1872[sizeof("ugar")];
+    char uniname2ctype_pool_str1874[sizeof("intagalog")];
+    char uniname2ctype_pool_str1878[sizeof("inbamumsupplement")];
+    char uniname2ctype_pool_str1880[sizeof("olchiki")];
+    char uniname2ctype_pool_str1899[sizeof("incurrencysymbols")];
+    char uniname2ctype_pool_str1904[sizeof("tagb")];
+    char uniname2ctype_pool_str1912[sizeof("inaegeannumbers")];
+    char uniname2ctype_pool_str1915[sizeof("intagbanwa")];
+    char uniname2ctype_pool_str1916[sizeof("uppercase")];
+    char uniname2ctype_pool_str1917[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str1919[sizeof("glag")];
+    char uniname2ctype_pool_str1921[sizeof("inkatakanaphoneticextensions")];
+    char uniname2ctype_pool_str1932[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str1942[sizeof("inpaucinhau")];
+    char uniname2ctype_pool_str1943[sizeof("inprivateusearea")];
+    char uniname2ctype_pool_str1947[sizeof("paucinhau")];
+    char uniname2ctype_pool_str1953[sizeof("spacingmark")];
+    char uniname2ctype_pool_str1956[sizeof("khmr")];
+    char uniname2ctype_pool_str1962[sizeof("khar")];
+    char uniname2ctype_pool_str1964[sizeof("inarabicpresentationformsb")];
+    char uniname2ctype_pool_str1967[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str1971[sizeof("tglg")];
+    char uniname2ctype_pool_str1976[sizeof("inethiopicextended")];
+    char uniname2ctype_pool_str1980[sizeof("incombiningdiacriticalmarksextended")];
+    char uniname2ctype_pool_str1986[sizeof("oupper")];
+    char uniname2ctype_pool_str1994[sizeof("incjksymbolsandpunctuation")];
+    char uniname2ctype_pool_str1997[sizeof("bopo")];
+    char uniname2ctype_pool_str1998[sizeof("punctuation")];
+    char uniname2ctype_pool_str2002[sizeof("combiningmark")];
+    char uniname2ctype_pool_str2007[sizeof("inplayingcards")];
+    char uniname2ctype_pool_str2008[sizeof("inbopomofo")];
+    char uniname2ctype_pool_str2021[sizeof("hyphen")];
+    char uniname2ctype_pool_str2028[sizeof("inkhojki")];
+    char uniname2ctype_pool_str2046[sizeof("nko")];
+    char uniname2ctype_pool_str2047[sizeof("nkoo")];
+    char uniname2ctype_pool_str2048[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str2053[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str2061[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str2063[sizeof("inverticalforms")];
+    char uniname2ctype_pool_str2071[sizeof("hex")];
+    char uniname2ctype_pool_str2072[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str2073[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str2075[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str2080[sizeof("cherokee")];
+    char uniname2ctype_pool_str2088[sizeof("pahawhhmong")];
+    char uniname2ctype_pool_str2096[sizeof("cypriot")];
+    char uniname2ctype_pool_str2105[sizeof("incypriotsyllabary")];
+    char uniname2ctype_pool_str2110[sizeof("palmyrene")];
+    char uniname2ctype_pool_str2113[sizeof("upper")];
+    char uniname2ctype_pool_str2116[sizeof("aghb")];
+    char uniname2ctype_pool_str2123[sizeof("georgian")];
+    char uniname2ctype_pool_str2131[sizeof("gujr")];
+    char uniname2ctype_pool_str2142[sizeof("grbase")];
+    char uniname2ctype_pool_str2152[sizeof("gujarati")];
+    char uniname2ctype_pool_str2153[sizeof("hexdigit")];
+    char uniname2ctype_pool_str2189[sizeof("khmer")];
+    char uniname2ctype_pool_str2194[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str2198[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str2224[sizeof("surrogate")];
+    char uniname2ctype_pool_str2227[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str2237[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str2241[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str2242[sizeof("indevanagariextended")];
+    char uniname2ctype_pool_str2252[sizeof("orkh")];
+    char uniname2ctype_pool_str2273[sizeof("ingeorgiansupplement")];
+    char uniname2ctype_pool_str2287[sizeof("oldnortharabian")];
+    char uniname2ctype_pool_str2290[sizeof("tagalog")];
+    char uniname2ctype_pool_str2292[sizeof("khoj")];
+    char uniname2ctype_pool_str2311[sizeof("bopomofo")];
+    char uniname2ctype_pool_str2318[sizeof("rejang")];
+    char uniname2ctype_pool_str2326[sizeof("buhd")];
+    char uniname2ctype_pool_str2343[sizeof("incjkradicalssupplement")];
+    char uniname2ctype_pool_str2382[sizeof("inkanbun")];
+    char uniname2ctype_pool_str2406[sizeof("variationselector")];
+    char uniname2ctype_pool_str2417[sizeof("inkangxiradicals")];
+    char uniname2ctype_pool_str2421[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str2431[sizeof("insupplementaryprivateuseareab")];
+    char uniname2ctype_pool_str2445[sizeof("ogrext")];
+    char uniname2ctype_pool_str2449[sizeof("batk")];
+    char uniname2ctype_pool_str2454[sizeof("inhanguljamoextendedb")];
+    char uniname2ctype_pool_str2457[sizeof("inbatak")];
+    char uniname2ctype_pool_str2462[sizeof("incyrillicextendedb")];
+    char uniname2ctype_pool_str2502[sizeof("innoblock")];
+    char uniname2ctype_pool_str2527[sizeof("any")];
+    char uniname2ctype_pool_str2534[sizeof("xsux")];
+    char uniname2ctype_pool_str2562[sizeof("bugi")];
+    char uniname2ctype_pool_str2570[sizeof("inkhudawadi")];
+    char uniname2ctype_pool_str2571[sizeof("telugu")];
+    char uniname2ctype_pool_str2579[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str2588[sizeof("grek")];
+    char uniname2ctype_pool_str2591[sizeof("guru")];
+    char uniname2ctype_pool_str2595[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str2613[sizeof("buginese")];
+    char uniname2ctype_pool_str2617[sizeof("inyisyllables")];
+    char uniname2ctype_pool_str2631[sizeof("egyp")];
+    char uniname2ctype_pool_str2634[sizeof("khudawadi")];
+    char uniname2ctype_pool_str2643[sizeof("unknown")];
+    char uniname2ctype_pool_str2685[sizeof("bassavah")];
+    char uniname2ctype_pool_str2689[sizeof("inegyptianhieroglyphs")];
+    char uniname2ctype_pool_str2709[sizeof("buhid")];
+    char uniname2ctype_pool_str2722[sizeof("inkayahli")];
+    char uniname2ctype_pool_str2732[sizeof("inmeroiticcursive")];
+    char uniname2ctype_pool_str2734[sizeof("incjkcompatibility")];
+    char uniname2ctype_pool_str2787[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str2795[sizeof("quotationmark")];
+    char uniname2ctype_pool_str2889[sizeof("inhangulcompatibilityjamo")];
+    char uniname2ctype_pool_str2898[sizeof("qmark")];
+    char uniname2ctype_pool_str2902[sizeof("incjkunifiedideographsextensionc")];
+    char uniname2ctype_pool_str2906[sizeof("sk")];
+    char uniname2ctype_pool_str2909[sizeof("incjkunifiedideographsextensiona")];
+    char uniname2ctype_pool_str2918[sizeof("incjkunifiedideographs")];
+    char uniname2ctype_pool_str2984[sizeof("katakana")];
+    char uniname2ctype_pool_str3112[sizeof("kayahli")];
+    char uniname2ctype_pool_str3137[sizeof("duployan")];
+    char uniname2ctype_pool_str3278[sizeof("incjkunifiedideographsextensiond")];
+    char uniname2ctype_pool_str3360[sizeof("inbopomofoextended")];
+    char uniname2ctype_pool_str3466[sizeof("khojki")];
+    char uniname2ctype_pool_str3777[sizeof("zyyy")];
+    char uniname2ctype_pool_str3778[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str3827[sizeof("incjkunifiedideographsextensionb")];
+    char uniname2ctype_pool_str3886[sizeof("batak")];
+    char uniname2ctype_pool_str3941[sizeof("blank")];
+    char uniname2ctype_pool_str3995[sizeof("inboxdrawing")];
+    char uniname2ctype_pool_str4025[sizeof("greek")];
+    char uniname2ctype_pool_str4035[sizeof("gurmukhi")];
+    char uniname2ctype_pool_str4122[sizeof("grlink")];
+    char uniname2ctype_pool_str4322[sizeof("graphemelink")];
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    "word",
+    "print",
+    "punct",
+    "alpha",
+    "alnum",
+    "xdigit",
+    "upper",
+#else /* USE_UNICODE_PROPERTIES */
+    "n",
+    "cn",
+    "mn",
+    "c",
+    "m",
+    "ci",
+    "z",
+    "cc",
+    "mc",
+    "mani",
+    "inmanichaean",
+    "qaai",
+    "zzzz",
+    "qaac",
+    "incham",
+    "sc",
+    "sm",
+    "mandaic",
+    "incuneiform",
+    "cans",
+    "me",
+    "inarmenian",
+#endif /* USE_UNICODE_PROPERTIES */
+    "ascii",
+#ifdef USE_UNICODE_PROPERTIES
+    "s",
+    "insamaritan",
+    "cs",
+    "zs",
+    "inavestan",
+    "incommonindicnumberforms",
+    "incuneiformnumbersandpunctuation",
+    "inthai",
+    "inipaextensions",
+    "mtei",
+    "inspecials",
+    "initialpunctuation",
+    "inancientsymbols",
+    "inthaana",
+    "inmiscellaneousmathematicalsymbolsa",
+    "lc",
+    "inmusicalsymbols",
+    "lm",
+    "taile",
+    "sterm",
+    "lina",
+    "inlycian",
+    "inmyanmarextendeda",
+    "lana",
+    "alnum",
+    "intaitham",
+    "incontrolpictures",
+    "inmiscellaneoussymbols",
+    "inmalayalam",
+    "intransportandmapsymbols",
+    "inmiscellaneoussymbolsandarrows",
+    "inlineara",
+    "inmiscellaneoussymbolsandpictographs",
+    "taiviet",
+    "cwcm",
+    "sinhala",
+    "latn",
+    "latin",
+    "ital",
+    "intamil",
+    "taml",
+    "inlatinextendedc",
+    "intaile",
+    "tale",
+    "inlatinextendeda",
+    "inlinearbideograms",
+    "newtailue",
+    "l",
+    "nl",
+    "inmeeteimayekextensions",
+    "zl",
+    "lt",
+    "inrunic",
+    "incarian",
+    "armn",
+    "cari",
+    "armi",
+    "inlatinextendede",
+    "incyrillic",
+    "armenian",
+    "inmyanmar",
+    "innewtailue",
+    "carian",
+    "merc",
+    "arabic",
+    "inmiscellaneoustechnical",
+    "insyriac",
+    "samr",
+    "zinh",
+    "han",
+    "samaritan",
+    "hani",
+    "cwt",
+    "incherokee",
+    "insharada",
+    "cham",
+    "manichaean",
+    "inmahajani",
+#endif /* USE_UNICODE_PROPERTIES */
+    "cntrl",
+#ifdef USE_UNICODE_PROPERTIES
+    "sinh",
+    "inruminumeralsymbols",
+    "inethiopic",
+    "tamil",
+    "miao",
+    "inenclosedalphanumerics",
+    "term",
+    "chakma",
+    "insinhala",
+    "shavian",
+    "inosmanya",
+    "inlatinextendedadditional",
+    "osma",
+    "ll",
+    "thai",
+    "math",
+    "thaa",
+    "inenclosedalphanumericsupplement",
+    "ethi",
+    "connectorpunctuation",
+    "inlowsurrogates",
+    "insinhalaarchaicnumbers",
+    "taitham",
+    "thaana",
+    "lineara",
+    "di",
+    "idc",
+    "meroiticcursive",
+    "mand",
+    "inmodi",
+    "inmandaic",
+    "cwl",
+    "asciihexdigit",
+    "dia",
+    "terminalpunctuation",
+    "mend",
+    "sind",
+    "wara",
+    "inwarangciti",
+    "inideographicdescriptioncharacters",
+    "inemoticons",
+    "ids",
+    "insundanese",
+    "pi",
+    "indominotiles",
+    "pc",
+    "loe",
+    "titlecaseletter",
+    "inopticalcharacterrecognition",
+    "idst",
+    "shaw",
+    "cwcf",
+    "idcontinue",
+    "inphaistosdisc",
+    "pe",
+    "indeseret",
+    "inspacingmodifierletters",
+    "inlydian",
+    "ps",
+    "hira",
+    "whitespace",
+    "inscriptionalparthian",
+    "cher",
+    "inmathematicalalphanumericsymbols",
+    "incoptic",
+    "inhiragana",
+    "inenclosedcjklettersandmonths",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "oriya",
+    "mero",
+    "mahj",
+    "tirh",
+    "sora",
+    "inscriptionalpahlavi",
+    "inarrows",
+    "mahajani",
+    "joinc",
+    "incopticepactnumbers",
+    "hano",
+    "palm",
+    "intirhuta",
+    "patws",
+    "inolchiki",
+    "inlepcha",
+    "no",
+    "lepc",
+    "inogham",
+    "co",
+    "innko",
+    "alpha",
+    "psalterpahlavi",
+    "inmro",
+    "inpalmyrene",
+    "common",
+    "cf",
+    "inmiao",
+    "so",
+    "diacritic",
+    "insundanesesupplement",
+    "intifinagh",
+    "tifinagh",
+    "odi",
+    "oidc",
+    "modi",
+    "decimalnumber",
+    "letter",
+    "dash",
+    "insylotinagri",
+    "inolditalic",
+    "wspace",
+    "dsrt",
+    "ideo",
+    "siddham",
+    "perm",
+    "oids",
+    "inmahjongtiles",
+    "lo",
+    "lineseparator",
+    "imperialaramaic",
+    "idstart",
+    "inlao",
+    "sharada",
+    "lao",
+    "laoo",
+    "mongolian",
+    "oalpha",
+    "inimperialaramaic",
+    "nchar",
+    "inlatin1supplement",
+    "prti",
+    "cprt",
+    "nd",
+    "deseret",
+    "inoldturkic",
+    "radical",
+    "canadianaboriginal",
+    "inmodifiertoneletters",
+    "incaucasianalbanian",
+    "coptic",
+    "casedletter",
+    "sd",
+    "inphoenician",
+    "sidd",
+    "privateuse",
+    "sundanese",
+    "inancientgreekmusicalnotation",
+    "insiddham",
+    "cased",
+    "print",
+    "ininscriptionalparthian",
+    "ininscriptionalpahlavi",
+    "copt",
+    "inancientgreeknumbers",
+    "saurashtra",
+    "mro",
+    "mroo",
+    "inalphabeticpresentationforms",
+    "lowercase",
+    "phli",
+    "patternwhitespace",
+    "inenclosedideographicsupplement",
+    "spaceseparator",
+    "inmathematicaloperators",
+    "omath",
+    "lisu",
+    "inpsalterpahlavi",
+    "olditalic",
+    "hanunoo",
+    "inherited",
+    "lepcha",
+    "p",
+    "inmongolian",
+    "zp",
+    "finalpunctuation",
+    "otheridcontinue",
+    "shrd",
+    "ingrantha",
+    "talu",
+    "otheralphabetic",
+    "noncharactercodepoint",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=1.1",
+    "age=2.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "closepunctuation",
+    "letternumber",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.1",
+    "age=6.2",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "telu",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=3.1",
+    "age=3.2",
+    "age=5.1",
+    "age=5.2",
+    "age=2.0",
+    "age=6.3",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "inshorthandformatcontrols",
+    "inoldnortharabian",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=6.0",
+    "age=4.1",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "ingeneralpunctuation",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=3.0",
+    "age=7.0",
+    "age=5.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "innabataean",
+#ifdef USE_UNICODE_AGE_PROPERTIES
+    "age=4.0",
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+    "bamum",
+    "control",
+    "induployan",
+    "inlatinextendedd",
+    "inarabic",
+    "runic",
+    "inelbasan",
+    "inoldsoutharabian",
+    "inbasiclatin",
+    "format",
+    "innumberforms",
+    "inugaritic",
+    "separator",
+    "idsbinaryoperator",
+    "tagbanwa",
+    "bass",
+    "saur",
+    "nbat",
+    "intaixuanjingsymbols",
+    "joincontrol",
+    "otheridstart",
+    "inbyzantinemusicalsymbols",
+    "intags",
+    "nabataean",
+    "insuperscriptsandsubscripts",
+    "intibetan",
+    "insaurashtra",
+    "othersymbol",
+    "ext",
+    "inarabicpresentationformsa",
+    "inmiscellaneousmathematicalsymbolsb",
+    "otherlowercase",
+    "phoenician",
+#endif /* USE_UNICODE_PROPERTIES */
+    "lower",
+#ifndef USE_UNICODE_PROPERTIES
+    "graph",
+#else /* USE_UNICODE_PROPERTIES */
+    "linb",
+    "po",
+    "inmyanmarextendedb",
+    "limb",
+    "inbraillepatterns",
+    "tibt",
+    "cuneiform",
+    "bali",
+    "oldpersian",
+    "oldpermic",
+    "pf",
+    "word",
+    "tibetan",
+    "incyrillicsupplement",
+    "elba",
+    "insupplementalmathematicaloperators",
+    "inbalinese",
+    "bengali",
+    "caseignorable",
+    "incountingrodnumerals",
+    "other",
+    "tirhuta",
+    "othernumber",
+    "balinese",
+    "elbasan",
+    "inunifiedcanadianaboriginalsyllabics",
+    "lowercaseletter",
+    "ethiopic",
+    "gran",
+    "ingurmukhi",
+    "sund",
+    "inethiopicsupplement",
+    "inoldpersian",
+    "inoldpermic",
+    "othermath",
+    "unassigned",
+    "hmng",
+    "narb",
+    "brai",
+    "hang",
+    "insorasompeng",
+    "arab",
+    "plrd",
+    "ingujarati",
+    "brahmi",
+    "runr",
+    "ahex",
+    "mong",
+    "pauc",
+    "sarb",
+    "ogam",
+    "olower",
+    "pd",
+    "number",
+    "inbrahmi",
+    "otherletter",
+    "ingothic",
+    "phagspa",
+    "inletterlikesymbols",
+    "yi",
+    "hangul",
+    "yiii",
+    "tfng",
+    "insupplementalarrowsc",
+    "ingreekandcoptic",
+    "xidc",
+    "insupplementalarrowsa",
+    "gothic",
+    "grext",
+    "incombininghalfmarks",
+    "deprecated",
+    "inbassavah",
+    "xids",
+    "linearb",
+    "ingeometricshapes",
+    "phlp",
+    "warangciti",
+    "inblockelements",
+    "modifierletter",
+    "indingbats",
+    "dep",
+    "punct",
+    "inhanunoo",
+    "bidic",
+    "ingreekextended",
+    "idsb",
+    "assigned",
+    "otherpunctuation",
+    "inhangulsyllables",
+    "inarabicmathematicalalphabeticsymbols",
+    "inornamentaldingbats",
+    "inphagspa",
+    "lyci",
+    "mlym",
+    "inarabicextendeda",
+    "rjng",
+    "lycian",
+    "inalchemicalsymbols",
+    "xdigit",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "xidstart",
+    "inrejang",
+    "malayalam",
+    "idstrinaryoperator",
+    "invai",
+    "vai",
+    "vaii",
+    "hiragana",
+    "ingeorgian",
+    "braille",
+    "geor",
+    "brah",
+    "glagolitic",
+    "inkannada",
+    "cakm",
+    "kana",
+    "hebr",
+    "inshavian",
+    "vs",
+    "inchakma",
+    "ogham",
+    "sylotinagri",
+    "inunifiedcanadianaboriginalsyllabicsextended",
+    "inmeroitichieroglyphs",
+    "grantha",
+    "graphemebase",
+    "mathsymbol",
+    "mymr",
+    "insupplementaryprivateuseareaa",
+    "mendekikakui",
+    "incjkcompatibilityforms",
+    "inhalfwidthandfullwidthforms",
+    "incjkcompatibilityideographs",
+    "inkaithi",
+    "avst",
+    "inarabicsupplement",
+    "takri",
+    "syrc",
+    "meeteimayek",
+    "myanmar",
+    "avestan",
+    "inhanguljamoextendeda",
+    "goth",
+    "inkatakana",
+    "incyrillicextendeda",
+    "alphabetic",
+    "syriac",
+    "ideographic",
+    "incjkstrokes",
+    "inlinearbsyllabary",
+    "tavt",
+    "intaiviet",
+    "incjkcompatibilityideographssupplement",
+    "inmeeteimayek",
+    "kali",
+    "inyiradicals",
+    "lu",
+    "inoriya",
+    "hebrew",
+    "extender",
+    "inhighprivateusesurrogates",
+    "limbu",
+    "inbuhid",
+    "inethiopicextendeda",
+    "xidcontinue",
+    "inyijinghexagramsymbols",
+    "logicalorderexception",
+    "inhebrew",
+    "cyrl",
+    "osmanya",
+    "phnx",
+    "incombiningdiacriticalmarks",
+    "inkanasupplement",
+    "inlisu",
+    "changeswhencasemapped",
+    "incombiningdiacriticalmarksforsymbols",
+    "cwu",
+    "phag",
+    "insmallformvariants",
+    "inpahawhhmong",
+    "otheruppercase",
+    "intelugu",
+    "incombiningdiacriticalmarkssupplement",
+    "ingeometricshapesextended",
+    "xpeo",
+    "bamu",
+    "inbamum",
+    "mark",
+    "dupl",
+    "graph",
+    "dashpunctuation",
+    "patternsyntax",
+    "changeswhentitlecased",
+    "inkharoshthi",
+    "inkhmer",
+    "java",
+    "sylo",
+    "ugaritic",
+    "otherdefaultignorablecodepoint",
+    "softdotted",
+    "uideo",
+    "inphoneticextensions",
+    "injavanese",
+    "invariationselectors",
+    "kaithi",
+    "cyrillic",
+    "intakri",
+    "takr",
+    "javanese",
+    "bidicontrol",
+    "caucasianalbanian",
+    "lydi",
+    "insupplementalpunctuation",
+    "inphoneticextensionssupplement",
+    "lydian",
+    "oldturkic",
+    "invariationselectorssupplement",
+    "kthi",
+    "inhanguljamo",
+    "patsyn",
+    "inlimbu",
+    "sorasompeng",
+    "orya",
+    "inkhmersymbols",
+    "inglagolitic",
+    "indevanagari",
+    "deva",
+    "knda",
+    "inbengali",
+    "symbol",
+    "devanagari",
+    "inmendekikakui",
+    "beng",
+    "invedicextensions",
+    "graphemeextend",
+    "kannada",
+    "inbuginese",
+    "olck",
+    "meroitichieroglyphs",
+    "ugar",
+    "intagalog",
+    "inbamumsupplement",
+    "olchiki",
+    "incurrencysymbols",
+    "tagb",
+    "inaegeannumbers",
+    "intagbanwa",
+    "uppercase",
+    "defaultignorablecodepoint",
+    "glag",
+    "inkatakanaphoneticextensions",
+    "changeswhencasefolded",
+    "inpaucinhau",
+    "inprivateusearea",
+    "paucinhau",
+    "spacingmark",
+    "khmr",
+    "khar",
+    "inarabicpresentationformsb",
+    "changeswhenlowercased",
+    "tglg",
+    "inethiopicextended",
+    "incombiningdiacriticalmarksextended",
+    "oupper",
+    "incjksymbolsandpunctuation",
+    "bopo",
+    "punctuation",
+    "combiningmark",
+    "inplayingcards",
+    "inbopomofo",
+    "hyphen",
+    "inkhojki",
+    "nko",
+    "nkoo",
+    "enclosingmark",
+    "openpunctuation",
+    "currencysymbol",
+    "inverticalforms",
+    "hex",
+    "modifiersymbol",
+    "inlatinextendedb",
+    "kharoshthi",
+    "cherokee",
+    "pahawhhmong",
+    "cypriot",
+    "incypriotsyllabary",
+    "palmyrene",
+    "upper",
+    "aghb",
+    "georgian",
+    "gujr",
+    "grbase",
+    "gujarati",
+    "hexdigit",
+    "khmer",
+    "uppercaseletter",
+    "insupplementalarrowsb",
+    "surrogate",
+    "unifiedideograph",
+    "nonspacingmark",
+    "othergraphemeextend",
+    "indevanagariextended",
+    "orkh",
+    "ingeorgiansupplement",
+    "oldnortharabian",
+    "tagalog",
+    "khoj",
+    "bopomofo",
+    "rejang",
+    "buhd",
+    "incjkradicalssupplement",
+    "inkanbun",
+    "variationselector",
+    "inkangxiradicals",
+    "inhighsurrogates",
+    "insupplementaryprivateuseareab",
+    "ogrext",
+    "batk",
+    "inhanguljamoextendedb",
+    "inbatak",
+    "incyrillicextendedb",
+    "innoblock",
+    "any",
+    "xsux",
+    "bugi",
+    "inkhudawadi",
+    "telugu",
+    "changeswhenuppercased",
+    "grek",
+    "guru",
+    "paragraphseparator",
+    "buginese",
+    "inyisyllables",
+    "egyp",
+    "khudawadi",
+    "unknown",
+    "bassavah",
+    "inegyptianhieroglyphs",
+    "buhid",
+    "inkayahli",
+    "inmeroiticcursive",
+    "incjkcompatibility",
+    "oldsoutharabian",
+    "quotationmark",
+    "inhangulcompatibilityjamo",
+    "qmark",
+    "incjkunifiedideographsextensionc",
+    "sk",
+    "incjkunifiedideographsextensiona",
+    "incjkunifiedideographs",
+    "katakana",
+    "kayahli",
+    "duployan",
+    "incjkunifiedideographsextensiond",
+    "inbopomofoextended",
+    "khojki",
+    "zyyy",
+    "egyptianhieroglyphs",
+    "incjkunifiedideographsextensionb",
+    "batak",
+    "blank",
+    "inboxdrawing",
+    "greek",
+    "gurmukhi",
+    "grlink",
+    "graphemelink"
+#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,                                        34},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str10,                                       20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str11,                                       33},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                        17},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                        30},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                       60},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                        51},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       18},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str21,                                       31},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29,                                    185},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str31,                            438},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35,                                    114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str36,                                    231},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str37,                                    128},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                  383},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str46,                                       47},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str48,                                       49},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str51,                                 168},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str55,                             461},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str56,                                    101},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str59,                                       32},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str61,                              258},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str65,                                        46},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69,                             265},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72,                                       22},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                       54},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str85,                               439},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,                374},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96,        462},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str97,                                  278},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str98,                         252},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str105,                                    159},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str110,                              406},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str115,                        411},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str117,                                263},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str130,     333},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134,                                       24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                        473},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                                       26},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str137,                                   120},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str141,                                   227},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142,                                    183},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str144,                                413},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str147,                      384},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                                    151},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str153,                                    13},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str155,                               302},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str157,                       325},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str161,                  331},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str163,                             276},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str166,                488},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str170,         339},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str173,                               426},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175,    485},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str183,                                 152},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                     65},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str190,                                  92},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str203,                                     75},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                                    75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str206,                                    111},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str208,                                 273},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                                     88},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223,                        341},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str226,                                 298},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                    120},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str237,                        250},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239,                      408},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str240,                               129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str241,                                        23},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str243,                                       36},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247,                 386},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str250,                                       52},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                                       28},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255,                                 289},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                                414},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str257,                                     78},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str259,                                    148},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str260,                                    160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261,                        388},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                              256},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str266,                                 78},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str267,                               281},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str270,                             299},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str272,                                  148},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str274,                                    170},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str280,                                   80},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str284,                324},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str287,                                261},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                    155},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str294,                                    114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str295,                                     109},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str298,                               155},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str299,                                    109},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str302,                                      63},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                              286},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str304,                               450},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str307,                                    150},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str315,                              185},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str316,                              449},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str317,                                     3},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str318,                                     92},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                    444},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str327,                              284},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                    88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str331,                                    172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str332,                 327},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str333,                                    205},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str335,                                  169},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str337,                               277},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347,                                 123},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str350,                               423},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,               314},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                                    124},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str362,                                       25},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str363,                                     93},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str366,                                     55},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                                     82},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str374,        483},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                     99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str376,                     39},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str380,                         394},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str382,                 451},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386,                                 151},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str388,                                   82},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str390,                                 183},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str392,                                       70},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str401,                                      67},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405,                         170},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str407,                                    168},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str408,                                  457},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str410,                               266},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412,                                      61},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                           208},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str415,                                     211},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str418,                     205},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str419,                                    186},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str423,                                    196},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str425,                                    198},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str433,                            459},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str439,      350},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str441,                             486},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str453,                                      66},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str456,                             305},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str466,                                       43},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468,                           481},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str470,                                       39},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     224},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str477,                          28},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,           326},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str487,                                    218},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str489,                                    123},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                     64},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str493,                               67},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str502,                          412},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str508,                                       41},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str518,                               421},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str519,                253},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                                432},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                                       45},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str530,                                    106},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str536,                              199},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str540,                   162},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str544,                                    100},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545,       477},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str546,                                342},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str550,                              352},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str554,           360},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str556,                                     9},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str570,                                    87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str571,                                    171},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str573,                                    184},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str582,                                    197},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str584,                                    174},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                    163},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str593,                                322},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                184},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str596,                                   201},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str597,                    415},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str598,                                    116},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str600,                                    191},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str601,                               455},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str603,                                   229},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str604,                               308},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                307},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str609,                                       37},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str611,                                    141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str612,                                 288},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str614,                                       21},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                   264},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620,                                     1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622,                          194},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                   465},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str624,                             429},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627,                                   74},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630,                                       19},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637,                                  468},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                                       50},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str650,                               211},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str658,                   309},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672,                              344},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679,                                131},
+      {-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_str696,                                     221},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str699,                                    226},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str700,                                    187},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703,                            35},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                   23},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str708,                                    202},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                           373},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str711,                             416},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713,                                  199},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str715,                                    113},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str718,                                    210},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str722,                                 195},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str724,                                    193},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                    225},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str727,                          480},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str728,                                       27},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730,                            52},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str731,                         160},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str735,                                  66},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str736,                                   279},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str737,                                 173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str742,                                      94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str743,                                     94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str744,                               105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str745,                                  209},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str749,                       428},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str753,                                   215},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str758,                      249},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str761,                                    162},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str763,                                    125},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str767,                                       35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str768,                                 113},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str772,                             443},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str773,                                 219},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777,                      101},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str779,                   371},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str783,                     425},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str787,                                  128},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str796,                              24},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str798,                                      223},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str803,                            431},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str804,                                    195},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str805,                               21},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str813,                               140},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str815,           474},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str817,                               456},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str820,                                    59},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str827,                                     7},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830,                 440},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str832,                  441},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str834,                                    128},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str838,                   410},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str845,                              144},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str848,                                     188},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str849,                                    188},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str850,           397},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str858,                                57},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str861,                                    163},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str864,                       229},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str866,         484},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869,                           54},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str871,                 323},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str882,                                   206},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str892,                                    156},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str895,                        442},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str898,                               111},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str905,                                 116},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str909,                               114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str910,                                  141},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str913,                                        38},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str916,                             295},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str922,                                       53},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str923,                         42},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str925,                         226},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str927,                                    173},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str932,                               454},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str934,                                    129},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936,                         209},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938,                   215},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939,                                 232},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str940,                                 234},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str941,                         41},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str943,                             36},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str944,                                 244},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str945,                                 245},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str946,                                     89},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                                 236},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str948,                                 237},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str949,                                 241},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950,                                 242},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                                 233},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str952,                                 246},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str953,               471},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str954,                       437},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str955,                                 243},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956,                                 239},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str957,                    316},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str958,                                 235},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str959,                                 247},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960,                                 240},
+      {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str962,                             430},
+#ifndef USE_UNICODE_AGE_PROPERTIES
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+#else /* USE_UNICODE_AGE_PROPERTIES */
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str967,                                 238},
+      {-1}, {-1},
+#endif /* USE_UNICODE_AGE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str970,                                   157},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972,                                  18},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str974,                              470},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str975,                        372},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str976,                                260},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str982,                                   103},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str984,                               424},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str985,                       436},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str986,                            248},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str995,                                   19},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str996,                           321},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str998,                              419},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str999,                                51},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1000,                       217},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1004,                                118},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1012,                                    177},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1013,                                    144},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1014,                                    190},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1017,                    475},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1019,                             201},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1023,                            225},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1027,               472},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1031,                                  496},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1033,                               190},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1034,             317},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1036,                               280},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1039,                            376},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1040,                              50},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1041,                                     212},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1046,              398},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1048,     337},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1049,                          213},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1052,                              137},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1055,                                     6},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1060,                                    121},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1064,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                      382},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1066,                                    119},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1068,                       335},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,                                     95},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1070,                               136},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                                    135},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1073,                              133},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1077,                               193},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1080,                                       42},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1084,                                     12},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1086,                                  95},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1089,                    257},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1093,                                    179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1094,     338},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1095,                              304},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1101,                                  84},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1104,                            60},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1107,                   476},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114,                                    17},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1118,                                 197},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1121,                              37},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1123,                                135},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129,                                 179},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1134,    287},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1136,                          25},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1140,                                 99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1141,                                    180},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1149,                              270},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1151,                                    140},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1153,                    285},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1160,                            420},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1163,                             418},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1170,                               206},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1174,                               20},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1180,                                    181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1181,                                    189},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1184,                                    126},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1186,                                     98},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1187,                           447},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1193,                                     80},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1194,                                    172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1195,                              271},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1197,                                  167},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1201,                                    103},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1202,                                    208},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1206,                                    105},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1211,                                    192},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1212,                                    161},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1218,                                    102},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1221,                                  213},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1222,                                       40},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1235,                                   34},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1238,                                445},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1240,                              27},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1252,                                417},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1254,                                 138},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1262,                     320},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1265,                                      110},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1269,                                   98},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1271,                                    110},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1272,                                    131},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1273,                   491},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1277,                        255},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1279,                                     69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1280,                   334},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1281,                                  112},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1283,                                    71},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1285,                    401},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1286,                              222},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1287,                              466},
+      {-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_str1305,                                     68},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1308,                                 121},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1312,                       330},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1313,                                    194},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1314,                              198},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1317,                         329},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1318,                           26},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1321,                              332},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1322,                                     222},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1324,                                     8},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1327,                               291},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1334,                                   200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1344,                         315},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1353,                                    217},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1359,                                 16},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1364,                         44},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1368,                       390},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1373,   479},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1385,                    487},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1387,                               375},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1389,                                    147},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1393,                                     91},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1399,                       267},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1400,                                    146},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1402,                                  147},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1403,                     489},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1409,                                   11},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1412,                                     4},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1420,                                 68},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1421,                                379},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1424,                                91},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1425,                      218},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1429,                                   368},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435,                                     143},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1436,                                    143},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1438,                                106},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1442,                              282},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1448,                                 126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1455,                                     97},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1457,                                    167},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463,                              130},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1465,                               275},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1466,                                    169},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1467,                                    107},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1469,                                     79},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1471,                               422},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1477,                                      228},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1481,                                448},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1490,                                   102},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1491,                             132},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1492, 296},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1495,                   433},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1498,                                 180},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1500,                             72},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1502,                               49},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1505,                                     96},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1513,          498},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1514,                            186},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1516,                 402},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1518,            405},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1521,            396},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1522,                                446},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1525,                                    153},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1526,                      262},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1527,                                   175},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1529,                                     81},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1533,                             159},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1534,                                  96},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1535,                                 153},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1536,                   380},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1540,                                    112},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1542,                              353},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1544,                     346},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1549,                               56},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1550,                                   81},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1551,                             210},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1555,                            358},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1557,                      407},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1558,                                    152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1559,                               385},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1564,  495},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1576,                           389},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1577,                                    145},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1581,                            366},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1586,                                       29},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1587,                                 272},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1590,                                   79},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1596,                                212},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1598,              393},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1600,                                   119},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1606,                                 292},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1608,                     387},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1609,                              69},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1611,                 363},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1612,                   224},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1616,                                259},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1617,                                     77},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1618,                                 124},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1621,                                    137},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1622,             254},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1626,                        469},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1627,                                  367},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1628,                    65},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1632,   319},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636,                                      62},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1641,                                    138},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1645,                     403},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1656,                           467},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1661,                          214},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1662,                                274},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1665,   313},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1670,               490},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1671,                                    133},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1687,                                    157},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1689,                                 370},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1692,                                     30},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1694,                                    178},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1695,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1696,                          40},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1700,                           230},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1705,                    63},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1706,                            435},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1712,                                 294},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1713,                                    158},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1714,                                    132},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1719,                                122},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1722,          221},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1723,                              223},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1729,                                   220},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1732,                    311},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1736,                              381},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1742,                    399},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1744,                                  165},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1747,                                 77},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1749,                                 458},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1750,                                    175},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1755,                                158},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1757,                             200},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1758,                       176},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1765,                                    149},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1772,               347},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1775,          312},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1778,                                  149},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1784,                               164},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1785,          497},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1786,                                    165},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1792,                            283},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1797,                                  230},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1802,                                 297},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1804,                             174},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1807,                                     87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1822,                          300},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1824,                            340},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1831,                            268},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1835,                                     83},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1836,                                     90},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1841,                               269},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1843,                                   46},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1846,                               83},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1849,                          478},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1852,                                     84},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1853,                       310},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1859,                           71},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1865,                                  90},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1866,                              301},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1869,                                    142},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1871,                     171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1872,                                    122},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1874,                               290},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1878,                       464},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1880,                                 142},
+      {-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_str1899,                       318},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1904,                                    118},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1912,                         409},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1915,                              293},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1916,                                58},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1917,                70},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1919,                                    130},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1921,            359},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1932,                    64},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1942,                             460},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1943,                        395},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1947,                               192},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1953,                              31},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1956,                                    104},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1962,                                    134},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1964,              404},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1967,                    61},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1971,                                    115},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1976,                      345},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1980,     303},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1986,                                  214},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1994,              351},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1997,                                    108},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1998,                              38},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2002,                            30},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2007,                          482},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2008,                              354},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2021,                                  203},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2028,                                452},
+      {-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_str2046,                                     139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2047,                                    139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2048,                            32},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2053,                          45},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2061,                           47},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2063,                         400},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2071,                                     207},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2072,                           48},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2073,                        251},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2075,                              134},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2080,                                100},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2088,                             181},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2096,                                 125},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2105,                      427},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2110,                               191},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2113,                                    10},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2116,                                    176},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2123,                                 97},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2131,                                     86},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2142,                                   72},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2152,                                 86},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2153,                                207},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-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_str2189,                                   104},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2194,                          29},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2198,                   336},
+      {-1}, {-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_str2224,                                22},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2227,                        220},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2237,                           33},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2241,                     216},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2242,                    377},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2252,                                    164},
+      {-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_str2273,                    343},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2287,                         189},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2290,                                 115},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2292,                                    182},
+      {-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_str2311,                                108},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2318,                                  146},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2326,                                    117},
+      {-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_str2343,                 348},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2382,                                356},
+      {-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_str2406,                       228},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2417,                        349},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2421,                        392},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2431,          499},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2445,                                  216},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2449,                                    166},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2454,                   391},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2457,                                 306},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2462,                     369},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2502,                               500},
+      {-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_str2527,                                      15},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2534,                                    136},
+      {-1}, {-1}, {-1}, {-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_str2562,                                    127},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2570,                             453},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2571,                                   89},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2579,                    62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2588,                                     76},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2591,                                     85},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2595,                       53},
+      {-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_str2613,                                127},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2617,                           365},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2631,                                    154},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2634,                               196},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2643,                                 231},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2685,                                177},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2689,                   463},
+      {-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_str2709,                                   117},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2722,                               378},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2732,                       434},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2734,                      361},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-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_str2787,                         161},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2795,                           204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2889,               355},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2898,                                   204},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2902,        493},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2906,                                       48},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2909,        362},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2918,                  364},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2984,                                107},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str3112,                                 145},
+      {-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_str3137,                                178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3278,        494},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-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_str3360,                      357},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-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},
+#ifndef USE_UNICODE_PROPERTIES
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6,                                     12},
+      {(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,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                     3},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     9},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     6},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     2}
+#else /* USE_UNICODE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3466,                                  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},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3777,                                     74},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3778,                     154},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3827,        492},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3886,                                   166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-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_str3941,                                     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},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3995,                            328},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str4025,                                    76},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str4035,                                 85},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str4122,                                   73},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str4322,                             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..2e80edf525
--- /dev/null
+++ b/enc/unicode/name2ctype.h.blt
@@ -0,0 +1,28722 @@
+/* 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,5-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
+
+
+#define long size_t
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+static const OnigCodePoint CR_Alpha[] = {
+	540,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
+	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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bac, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x11100, 0x11132,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x11680, 0x116b5,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alpha */
+
+/* '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:]] */
+static const OnigCodePoint CR_Cntrl[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cntrl */
+
+/* 'Digit': [[:Digit:]] */
+static const OnigCodePoint CR_Digit[] = {
+	42,
+	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, 0x19d9,
+	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,
+	0x11066, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x116c0, 0x116c9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	544,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+static const OnigCodePoint CR_Lower[] = {
+	618,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7f8, 0xa7fa,
+	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_Lower */
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	541,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+static const OnigCodePoint CR_Punct[] = {
+	140,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00ab, 0x00ab,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	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,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e3b,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x111c5, 0x111c8,
+	0x12470, 0x12473,
+}; /* CR_Punct */
+
+/* 'Space': [[:Space:]] */
+static const OnigCodePoint CR_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_Space */
+
+/* 'Upper': [[:Upper:]] */
+static const OnigCodePoint CR_Upper[] = {
+	610,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	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_Upper */
+
+/* 'XDigit': [[:XDigit:]] */
+static const OnigCodePoint CR_XDigit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_XDigit */
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	564,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	566,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11132,
+	0x11136, 0x1113f,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b5,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	539,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	541,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x0605,
+	0x061c, 0x061d,
+	0x06dd, 0x06dd,
+	0x070e, 0x070f,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfffb,
+	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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110bd, 0x110bd,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d173, 0x1d17a,
+	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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+#define CR_Cc CR_Cntrl
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	14,
+	0x00ad, 0x00ad,
+	0x0600, 0x0604,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	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[] = {
+	539,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0605, 0x0605,
+	0x061c, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 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[] = {
+	486,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'LC': General Category */
+static const OnigCodePoint CR_LC[] = {
+	113,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02af,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x1d00, 0x1d2b,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1d9a,
+	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,
+	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,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c7b,
+	0x2c7e, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa76f,
+	0xa771, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7fa, 0xa7fa,
+	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_LC */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	611,
+	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, 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,
+	0x0527, 0x0527,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d6b, 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, 0x2c7b,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
+	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[] = {
+	52,
+	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, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2c7c, 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,
+	0xa7f8, 0xa7f9,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0x16f93, 0x16f9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	371,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x10fd, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	0x2135, 0x2138,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf2,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x1b000, 0x1b001,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	608,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	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[] = {
+	204,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0903,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 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, 0x1bad,
+	0x1be6, 0x1bf3,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf6,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x11134,
+	0x11180, 0x11182,
+	0x111b3, 0x111c0,
+	0x116ab, 0x116b7,
+	0x16f51, 0x16f7e,
+	0x16f8f, 0x16f92,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	126,
+	0x0903, 0x0903,
+	0x093b, 0x093b,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094f,
+	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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf3,
+	0x302e, 0x302f,
+	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,
+	0xaaeb, 0xaaeb,
+	0xaaee, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1112c, 0x1112c,
+	0x11182, 0x11182,
+	0x111b3, 0x111b5,
+	0x111bf, 0x111c0,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x16f51, 0x16f7e,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	4,
+	0x0488, 0x0489,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	220,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f92,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	88,
+	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,
+	0x0b72, 0x0b77,
+	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,
+	0x3248, 0x324f,
+	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,
+	0x11052, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x116c0, 0x116c9,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+#define CR_Nd CR_Digit
+
+/* '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[] = {
+	42,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x19da, 0x19da,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3248, 0x324f,
+	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,
+	0x11052, 0x11065,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+#define CR_P CR_Punct
+
+/* '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[] = {
+	16,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	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[] = {
+	135,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e39,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x111c5, 0x111c8,
+	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, 0x00a6,
+	0x00a8, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x058f, 0x058f,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19de, 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, 0x20b9,
+	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, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
+	0x27c7, 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, 0x3247,
+	0x3250, 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,
+	0xfbb2, 0xfbc1,
+	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,
+	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,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	17,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x058f, 0x058f,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b9,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	27,
+	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,
+	0xfbb2, 0xfbc1,
+	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,
+	0x2118, 0x2118,
+	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, 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,
+	0x1eef0, 0x1eef1,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	153,
+	0x00a6, 0x00a6,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19de, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2117,
+	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, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
+	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, 0x3247,
+	0x3250, 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,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+}; /* 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[] = {
+	138,
+	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,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 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, 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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+#define CR_Alphabetic CR_Alpha
+
+/* 'Lowercase': Derived Property */
+#define CR_Lowercase CR_Lower
+
+/* 'Uppercase': Derived Property */
+#define CR_Uppercase CR_Upper
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	119,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa7fa,
+	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[] = {
+	295,
+	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, 0x0604,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20d0, 0x20f0,
+	0x2c7c, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302d,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa69f, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa7f8, 0xa7f9,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf3, 0xaaf4,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
+	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,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f9f,
+	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[] = {
+	571,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	586,
+	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,
+	0x0265, 0x0266,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	587,
+	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,
+	0x0265, 0x0266,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	582,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	104,
+	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,
+	0x0265, 0x0266,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78d,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	488,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	564,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	495,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	571,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	232,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	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,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f92,
+	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[] = {
+	643,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06de, 0x06de,
+	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,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0903, 0x0939,
+	0x093b, 0x093b,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8c,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	0x20a0, 0x20b9,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaeb,
+	0xaaee, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11103, 0x11126,
+	0x1112c, 0x1112c,
+	0x11136, 0x11143,
+	0x11182, 0x111b5,
+	0x111bf, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116aa,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	33,
+	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, 0x1bab,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xaaf6, 0xaaf6,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
+	0x110b9, 0x110b9,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x116b6, 0x116b6,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	157,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b9,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e3b,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	30,
+	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, 0x209c,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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[] = {
+	7,
+	0x0400, 0x0484,
+	0x0487, 0x0527,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa697,
+	0xa69f, 0xa69f,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	6,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0x058f, 0x058f,
+	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[] = {
+	56,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0xfb50, 0xfbc1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* 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[] = {
+	5,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
+	0x0966, 0x0977,
+	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[] = {
+	13,
+	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, 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, 0x0b77,
+}; /* 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[] = {
+	14,
+	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,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	11,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	8,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10ff,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	14,
+	0x1100, 0x11ff,
+	0x302e, 0x302f,
+	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[] = {
+	32,
+	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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+}; /* 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[] = {
+	4,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1b001, 0x1b001,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	8,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	3,
+	0x02ea, 0x02eb,
+	0x3105, 0x312d,
+	0x31a0, 0x31ba,
+}; /* 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, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	25,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x065f, 0x065f,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302d,
+	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, 0x2cf3,
+	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[] = {
+	3,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
+}; /* 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, 0x1bbf,
+	0x1cc0, 0x1cc7,
+}; /* 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[] = {
+	2,
+	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
+}; /* 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[] = {
+	3,
+	0xaae0, 0xaaf6,
+	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 */
+
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
+/* 'Chakma': Script */
+static const OnigCodePoint CR_Chakma[] = {
+	2,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+}; /* CR_Chakma */
+
+/* 'Meroitic_Cursive': Script */
+static const OnigCodePoint CR_Meroitic_Cursive[] = {
+	2,
+	0x109a0, 0x109b7,
+	0x109be, 0x109bf,
+}; /* CR_Meroitic_Cursive */
+
+/* 'Meroitic_Hieroglyphs': Script */
+static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
+	1,
+	0x10980, 0x1099f,
+}; /* CR_Meroitic_Hieroglyphs */
+
+/* 'Miao': Script */
+static const OnigCodePoint CR_Miao[] = {
+	3,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+}; /* CR_Miao */
+
+/* 'Sharada': Script */
+static const OnigCodePoint CR_Sharada[] = {
+	2,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+}; /* CR_Sharada */
+
+/* 'Sora_Sompeng': Script */
+static const OnigCodePoint CR_Sora_Sompeng[] = {
+	2,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+}; /* CR_Sora_Sompeng */
+
+/* 'Takri': Script */
+static const OnigCodePoint CR_Takri[] = {
+	2,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+}; /* CR_Takri */
+
+/* 'White_Space': Binary Property */
+#define CR_White_Space CR_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[] = {
+	20,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	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[] = {
+	70,
+	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,
+	0x085e, 0x085e,
+	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,
+	0xaaf0, 0xaaf1,
+	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,
+	0x11047, 0x1104d,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	133,
+	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,
+	0x2107, 0x2107,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+}; /* 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 */
+#define CR_ASCII_Hex_Digit CR_XDigit
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	158,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x0903,
+	0x093a, 0x093b,
+	0x093e, 0x094c,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1bf1,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf3,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69f, 0xa69f,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b4, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+	0x11100, 0x11102,
+	0x11127, 0x11132,
+	0x11180, 0x11182,
+	0x111b3, 0x111bf,
+	0x116ab, 0x116b5,
+	0x16f51, 0x16f7e,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	125,
+	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,
+	0x08e4, 0x08fe,
+	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, 0x1bab,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	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,
+	0xa7f8, 0xa7f9,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xaaf6, 0xaaf6,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x116b6, 0x116b7,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	22,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x180a, 0x180a,
+	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,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	18,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7c, 0x2c7d,
+	0xa770, 0xa770,
+	0xa7f8, 0xa7f9,
+}; /* 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[] = {
+	17,
+	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,
+	0x302e, 0x302f,
+	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[] = {
+	12,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	11,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	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[] = {
+	9,
+	0x0149, 0x0149,
+	0x0673, 0x0673,
+	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[] = {
+	4,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+	0x19da, 0x19da,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	50,
+	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,
+	0x1735, 0x1736,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	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,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+}; /* 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 */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	537,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0605, 0x0605,
+	0x061c, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_Unknown */
+
+/* 'Age_1_1': Derived Age 1.1 */
+static const OnigCodePoint CR_Age_1_1[] = {
+	288,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x05b0, 0x05b9,
+	0x05bb, 0x05c3,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9a,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20aa,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xe000, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+}; /* CR_Age_1_1 */
+
+/* 'Age_2_0': Derived Age 2.0 */
+static const OnigCodePoint CR_Age_2_0[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ab,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 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, 0x10ffff,
+}; /* CR_Age_2_0 */
+
+/* 'Age_2_1': Derived Age 2.1 */
+static const OnigCodePoint CR_Age_2_1[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ac,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 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, 0x10ffff,
+}; /* CR_Age_2_1 */
+
+/* 'Age_3_0': Derived Age 3.0 */
+static const OnigCodePoint CR_Age_3_0[] = {
+	369,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f3,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 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, 0x10ffff,
+}; /* CR_Age_3_0 */
+
+/* 'Age_3_1': Derived Age 3.1 */
+static const OnigCodePoint CR_Age_3_1[] = {
+	402,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f5,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_1 */
+
+/* 'Age_3_2': Derived Age 3.2 */
+static const OnigCodePoint CR_Age_3_2[] = {
+	397,
+	0x0000, 0x0220,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034f,
+	0x0360, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03f6,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b1,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2052,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213a,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23ce,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24fe,
+	0x2500, 0x2613,
+	0x2616, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2689,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2aff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321c,
+	0x3220, 0x3243,
+	0x3251, 0x327b,
+	0x327f, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfc,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe46,
+	0xfe49, 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, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_2 */
+
+/* 'Age_4_0': Derived Age 4.0 */
+static const OnigCodePoint CR_Age_4_0[] = {
+	412,
+	0x0000, 0x0236,
+	0x0250, 0x0357,
+	0x035d, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03fb,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060c, 0x0615,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0658,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x19e0, 0x19ff,
+	0x1d00, 0x1d6b,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2054,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213b,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23d0,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2691,
+	0x26a0, 0x26a1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b0d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x327d,
+	0x327f, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d300, 0x1d356,
+	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, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_0 */
+
+/* 'Age_4_1': Derived Age 4.1 */
+static const OnigCodePoint CR_Age_4_1[] = {
+	430,
+	0x0000, 0x0241,
+	0x0250, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05b9,
+	0x05bb, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097d, 0x097d,
+	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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1d00, 0x1dc3,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20eb,
+	0x2100, 0x214c,
+	0x2153, 0x2183,
+	0x2190, 0x23db,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c6,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b13,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa800, 0xa82b,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	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, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_1 */
+
+/* 'Age_5_0': Derived Age 5.0 */
+static const OnigCodePoint CR_Age_5_0[] = {
+	440,
+	0x0000, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x0513,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097b, 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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1d00, 0x1dca,
+	0x1dfe, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20ef,
+	0x2100, 0x214e,
+	0x2153, 0x2184,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b2,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b1a,
+	0x2b20, 0x2b23,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6c,
+	0x2c74, 0x2c77,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa71a,
+	0xa720, 0xa721,
+	0xa800, 0xa82b,
+	0xa840, 0xa877,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x1091f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_0 */
+
+/* 'Age_5_1': Derived Age 5.1 */
+static const OnigCodePoint CR_Age_5_1[] = {
+	455,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0523,
+	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,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0972,
+	0x097b, 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, 0x09fa,
+	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, 0x0fd4,
+	0x1000, 0x1099,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1d00, 0x1de6,
+	0x1dfe, 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, 0x20b5,
+	0x20d0, 0x20f0,
+	0x2100, 0x214f,
+	0x2153, 0x2188,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269d,
+	0x26a0, 0x26bc,
+	0x26c0, 0x26c3,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b54,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6f,
+	0x2c71, 0x2c7d,
+	0x2c80, 0x2cea,
+	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, 0x2e30,
+	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, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fc3,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa500, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa900, 0xa953,
+	0xa95f, 0xa95f,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_1 */
+
+/* 'Age_5_2': Derived Age 5.2 */
+static const OnigCodePoint CR_Age_5_2[] = {
+	495,
+	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,
+	0xfdd0, 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, 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,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_2 */
+
+/* 'Age_6_0': Derived Age 6.0 */
+static const OnigCodePoint CR_Age_6_0[] = {
+	511,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
+	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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	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,
+	0x135d, 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,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27ce, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d70,
+	0x2d7f, 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, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 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,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	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, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_0 */
+
+/* 'Age_6_1': Derived Age 6.1 */
+static const OnigCodePoint CR_Age_6_1[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_1 */
+
+/* 'In_Basic_Latin': Block */
+#define CR_In_Basic_Latin CR_ASCII
+
+/* 'In_Latin_1_Supplement': Block */
+static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
+	1,
+	0x0080, 0x00ff,
+}; /* CR_In_Latin_1_Supplement */
+
+/* 'In_Latin_Extended_A': Block */
+static const OnigCodePoint CR_In_Latin_Extended_A[] = {
+	1,
+	0x0100, 0x017f,
+}; /* CR_In_Latin_Extended_A */
+
+/* 'In_Latin_Extended_B': Block */
+static const OnigCodePoint CR_In_Latin_Extended_B[] = {
+	1,
+	0x0180, 0x024f,
+}; /* CR_In_Latin_Extended_B */
+
+/* 'In_IPA_Extensions': Block */
+static const OnigCodePoint CR_In_IPA_Extensions[] = {
+	1,
+	0x0250, 0x02af,
+}; /* CR_In_IPA_Extensions */
+
+/* 'In_Spacing_Modifier_Letters': Block */
+static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
+	1,
+	0x02b0, 0x02ff,
+}; /* CR_In_Spacing_Modifier_Letters */
+
+/* 'In_Combining_Diacritical_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
+	1,
+	0x0300, 0x036f,
+}; /* CR_In_Combining_Diacritical_Marks */
+
+/* 'In_Greek_and_Coptic': Block */
+static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
+	1,
+	0x0370, 0x03ff,
+}; /* CR_In_Greek_and_Coptic */
+
+/* 'In_Cyrillic': Block */
+static const OnigCodePoint CR_In_Cyrillic[] = {
+	1,
+	0x0400, 0x04ff,
+}; /* CR_In_Cyrillic */
+
+/* 'In_Cyrillic_Supplement': Block */
+static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
+	1,
+	0x0500, 0x052f,
+}; /* CR_In_Cyrillic_Supplement */
+
+/* 'In_Armenian': Block */
+static const OnigCodePoint CR_In_Armenian[] = {
+	1,
+	0x0530, 0x058f,
+}; /* CR_In_Armenian */
+
+/* 'In_Hebrew': Block */
+static const OnigCodePoint CR_In_Hebrew[] = {
+	1,
+	0x0590, 0x05ff,
+}; /* CR_In_Hebrew */
+
+/* 'In_Arabic': Block */
+static const OnigCodePoint CR_In_Arabic[] = {
+	1,
+	0x0600, 0x06ff,
+}; /* CR_In_Arabic */
+
+/* 'In_Syriac': Block */
+static const OnigCodePoint CR_In_Syriac[] = {
+	1,
+	0x0700, 0x074f,
+}; /* CR_In_Syriac */
+
+/* 'In_Arabic_Supplement': Block */
+static const OnigCodePoint CR_In_Arabic_Supplement[] = {
+	1,
+	0x0750, 0x077f,
+}; /* CR_In_Arabic_Supplement */
+
+/* 'In_Thaana': Block */
+static const OnigCodePoint CR_In_Thaana[] = {
+	1,
+	0x0780, 0x07bf,
+}; /* CR_In_Thaana */
+
+/* 'In_NKo': Block */
+static const OnigCodePoint CR_In_NKo[] = {
+	1,
+	0x07c0, 0x07ff,
+}; /* CR_In_NKo */
+
+/* 'In_Samaritan': Block */
+static const OnigCodePoint CR_In_Samaritan[] = {
+	1,
+	0x0800, 0x083f,
+}; /* CR_In_Samaritan */
+
+/* 'In_Mandaic': Block */
+static const OnigCodePoint CR_In_Mandaic[] = {
+	1,
+	0x0840, 0x085f,
+}; /* CR_In_Mandaic */
+
+/* 'In_Arabic_Extended_A': Block */
+static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
+	1,
+	0x08a0, 0x08ff,
+}; /* CR_In_Arabic_Extended_A */
+
+/* 'In_Devanagari': Block */
+static const OnigCodePoint CR_In_Devanagari[] = {
+	1,
+	0x0900, 0x097f,
+}; /* CR_In_Devanagari */
+
+/* 'In_Bengali': Block */
+static const OnigCodePoint CR_In_Bengali[] = {
+	1,
+	0x0980, 0x09ff,
+}; /* CR_In_Bengali */
+
+/* 'In_Gurmukhi': Block */
+static const OnigCodePoint CR_In_Gurmukhi[] = {
+	1,
+	0x0a00, 0x0a7f,
+}; /* CR_In_Gurmukhi */
+
+/* 'In_Gujarati': Block */
+static const OnigCodePoint CR_In_Gujarati[] = {
+	1,
+	0x0a80, 0x0aff,
+}; /* CR_In_Gujarati */
+
+/* 'In_Oriya': Block */
+static const OnigCodePoint CR_In_Oriya[] = {
+	1,
+	0x0b00, 0x0b7f,
+}; /* CR_In_Oriya */
+
+/* 'In_Tamil': Block */
+static const OnigCodePoint CR_In_Tamil[] = {
+	1,
+	0x0b80, 0x0bff,
+}; /* CR_In_Tamil */
+
+/* 'In_Telugu': Block */
+static const OnigCodePoint CR_In_Telugu[] = {
+	1,
+	0x0c00, 0x0c7f,
+}; /* CR_In_Telugu */
+
+/* 'In_Kannada': Block */
+static const OnigCodePoint CR_In_Kannada[] = {
+	1,
+	0x0c80, 0x0cff,
+}; /* CR_In_Kannada */
+
+/* 'In_Malayalam': Block */
+static const OnigCodePoint CR_In_Malayalam[] = {
+	1,
+	0x0d00, 0x0d7f,
+}; /* CR_In_Malayalam */
+
+/* 'In_Sinhala': Block */
+static const OnigCodePoint CR_In_Sinhala[] = {
+	1,
+	0x0d80, 0x0dff,
+}; /* CR_In_Sinhala */
+
+/* 'In_Thai': Block */
+static const OnigCodePoint CR_In_Thai[] = {
+	1,
+	0x0e00, 0x0e7f,
+}; /* CR_In_Thai */
+
+/* 'In_Lao': Block */
+static const OnigCodePoint CR_In_Lao[] = {
+	1,
+	0x0e80, 0x0eff,
+}; /* CR_In_Lao */
+
+/* 'In_Tibetan': Block */
+static const OnigCodePoint CR_In_Tibetan[] = {
+	1,
+	0x0f00, 0x0fff,
+}; /* CR_In_Tibetan */
+
+/* 'In_Myanmar': Block */
+static const OnigCodePoint CR_In_Myanmar[] = {
+	1,
+	0x1000, 0x109f,
+}; /* CR_In_Myanmar */
+
+/* 'In_Georgian': Block */
+static const OnigCodePoint CR_In_Georgian[] = {
+	1,
+	0x10a0, 0x10ff,
+}; /* CR_In_Georgian */
+
+/* 'In_Hangul_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo[] = {
+	1,
+	0x1100, 0x11ff,
+}; /* CR_In_Hangul_Jamo */
+
+/* 'In_Ethiopic': Block */
+static const OnigCodePoint CR_In_Ethiopic[] = {
+	1,
+	0x1200, 0x137f,
+}; /* CR_In_Ethiopic */
+
+/* 'In_Ethiopic_Supplement': Block */
+static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
+	1,
+	0x1380, 0x139f,
+}; /* CR_In_Ethiopic_Supplement */
+
+/* 'In_Cherokee': Block */
+static const OnigCodePoint CR_In_Cherokee[] = {
+	1,
+	0x13a0, 0x13ff,
+}; /* CR_In_Cherokee */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
+	1,
+	0x1400, 0x167f,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
+
+/* 'In_Ogham': Block */
+static const OnigCodePoint CR_In_Ogham[] = {
+	1,
+	0x1680, 0x169f,
+}; /* CR_In_Ogham */
+
+/* 'In_Runic': Block */
+static const OnigCodePoint CR_In_Runic[] = {
+	1,
+	0x16a0, 0x16ff,
+}; /* CR_In_Runic */
+
+/* 'In_Tagalog': Block */
+static const OnigCodePoint CR_In_Tagalog[] = {
+	1,
+	0x1700, 0x171f,
+}; /* CR_In_Tagalog */
+
+/* 'In_Hanunoo': Block */
+static const OnigCodePoint CR_In_Hanunoo[] = {
+	1,
+	0x1720, 0x173f,
+}; /* CR_In_Hanunoo */
+
+/* 'In_Buhid': Block */
+static const OnigCodePoint CR_In_Buhid[] = {
+	1,
+	0x1740, 0x175f,
+}; /* CR_In_Buhid */
+
+/* 'In_Tagbanwa': Block */
+static const OnigCodePoint CR_In_Tagbanwa[] = {
+	1,
+	0x1760, 0x177f,
+}; /* CR_In_Tagbanwa */
+
+/* 'In_Khmer': Block */
+static const OnigCodePoint CR_In_Khmer[] = {
+	1,
+	0x1780, 0x17ff,
+}; /* CR_In_Khmer */
+
+/* 'In_Mongolian': Block */
+static const OnigCodePoint CR_In_Mongolian[] = {
+	1,
+	0x1800, 0x18af,
+}; /* CR_In_Mongolian */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
+	1,
+	0x18b0, 0x18ff,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
+
+/* 'In_Limbu': Block */
+static const OnigCodePoint CR_In_Limbu[] = {
+	1,
+	0x1900, 0x194f,
+}; /* CR_In_Limbu */
+
+/* 'In_Tai_Le': Block */
+static const OnigCodePoint CR_In_Tai_Le[] = {
+	1,
+	0x1950, 0x197f,
+}; /* CR_In_Tai_Le */
+
+/* 'In_New_Tai_Lue': Block */
+static const OnigCodePoint CR_In_New_Tai_Lue[] = {
+	1,
+	0x1980, 0x19df,
+}; /* CR_In_New_Tai_Lue */
+
+/* 'In_Khmer_Symbols': Block */
+static const OnigCodePoint CR_In_Khmer_Symbols[] = {
+	1,
+	0x19e0, 0x19ff,
+}; /* CR_In_Khmer_Symbols */
+
+/* 'In_Buginese': Block */
+static const OnigCodePoint CR_In_Buginese[] = {
+	1,
+	0x1a00, 0x1a1f,
+}; /* CR_In_Buginese */
+
+/* 'In_Tai_Tham': Block */
+static const OnigCodePoint CR_In_Tai_Tham[] = {
+	1,
+	0x1a20, 0x1aaf,
+}; /* CR_In_Tai_Tham */
+
+/* 'In_Balinese': Block */
+static const OnigCodePoint CR_In_Balinese[] = {
+	1,
+	0x1b00, 0x1b7f,
+}; /* CR_In_Balinese */
+
+/* 'In_Sundanese': Block */
+static const OnigCodePoint CR_In_Sundanese[] = {
+	1,
+	0x1b80, 0x1bbf,
+}; /* CR_In_Sundanese */
+
+/* 'In_Batak': Block */
+static const OnigCodePoint CR_In_Batak[] = {
+	1,
+	0x1bc0, 0x1bff,
+}; /* CR_In_Batak */
+
+/* 'In_Lepcha': Block */
+static const OnigCodePoint CR_In_Lepcha[] = {
+	1,
+	0x1c00, 0x1c4f,
+}; /* CR_In_Lepcha */
+
+/* 'In_Ol_Chiki': Block */
+#define CR_In_Ol_Chiki CR_Ol_Chiki
+
+/* 'In_Sundanese_Supplement': Block */
+static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
+	1,
+	0x1cc0, 0x1ccf,
+}; /* CR_In_Sundanese_Supplement */
+
+/* 'In_Vedic_Extensions': Block */
+static const OnigCodePoint CR_In_Vedic_Extensions[] = {
+	1,
+	0x1cd0, 0x1cff,
+}; /* CR_In_Vedic_Extensions */
+
+/* 'In_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
+	1,
+	0x1d00, 0x1d7f,
+}; /* CR_In_Phonetic_Extensions */
+
+/* 'In_Phonetic_Extensions_Supplement': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
+	1,
+	0x1d80, 0x1dbf,
+}; /* CR_In_Phonetic_Extensions_Supplement */
+
+/* 'In_Combining_Diacritical_Marks_Supplement': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
+	1,
+	0x1dc0, 0x1dff,
+}; /* CR_In_Combining_Diacritical_Marks_Supplement */
+
+/* 'In_Latin_Extended_Additional': Block */
+static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
+	1,
+	0x1e00, 0x1eff,
+}; /* CR_In_Latin_Extended_Additional */
+
+/* 'In_Greek_Extended': Block */
+static const OnigCodePoint CR_In_Greek_Extended[] = {
+	1,
+	0x1f00, 0x1fff,
+}; /* CR_In_Greek_Extended */
+
+/* 'In_General_Punctuation': Block */
+static const OnigCodePoint CR_In_General_Punctuation[] = {
+	1,
+	0x2000, 0x206f,
+}; /* CR_In_General_Punctuation */
+
+/* 'In_Superscripts_and_Subscripts': Block */
+static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
+	1,
+	0x2070, 0x209f,
+}; /* CR_In_Superscripts_and_Subscripts */
+
+/* 'In_Currency_Symbols': Block */
+static const OnigCodePoint CR_In_Currency_Symbols[] = {
+	1,
+	0x20a0, 0x20cf,
+}; /* CR_In_Currency_Symbols */
+
+/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
+	1,
+	0x20d0, 0x20ff,
+}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
+
+/* 'In_Letterlike_Symbols': Block */
+static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
+	1,
+	0x2100, 0x214f,
+}; /* CR_In_Letterlike_Symbols */
+
+/* 'In_Number_Forms': Block */
+static const OnigCodePoint CR_In_Number_Forms[] = {
+	1,
+	0x2150, 0x218f,
+}; /* CR_In_Number_Forms */
+
+/* 'In_Arrows': Block */
+static const OnigCodePoint CR_In_Arrows[] = {
+	1,
+	0x2190, 0x21ff,
+}; /* CR_In_Arrows */
+
+/* 'In_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Mathematical_Operators[] = {
+	1,
+	0x2200, 0x22ff,
+}; /* CR_In_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Technical': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
+	1,
+	0x2300, 0x23ff,
+}; /* CR_In_Miscellaneous_Technical */
+
+/* 'In_Control_Pictures': Block */
+static const OnigCodePoint CR_In_Control_Pictures[] = {
+	1,
+	0x2400, 0x243f,
+}; /* CR_In_Control_Pictures */
+
+/* 'In_Optical_Character_Recognition': Block */
+static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
+	1,
+	0x2440, 0x245f,
+}; /* CR_In_Optical_Character_Recognition */
+
+/* 'In_Enclosed_Alphanumerics': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
+	1,
+	0x2460, 0x24ff,
+}; /* CR_In_Enclosed_Alphanumerics */
+
+/* 'In_Box_Drawing': Block */
+static const OnigCodePoint CR_In_Box_Drawing[] = {
+	1,
+	0x2500, 0x257f,
+}; /* CR_In_Box_Drawing */
+
+/* 'In_Block_Elements': Block */
+static const OnigCodePoint CR_In_Block_Elements[] = {
+	1,
+	0x2580, 0x259f,
+}; /* CR_In_Block_Elements */
+
+/* 'In_Geometric_Shapes': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes[] = {
+	1,
+	0x25a0, 0x25ff,
+}; /* CR_In_Geometric_Shapes */
+
+/* 'In_Miscellaneous_Symbols': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
+	1,
+	0x2600, 0x26ff,
+}; /* CR_In_Miscellaneous_Symbols */
+
+/* 'In_Dingbats': Block */
+static const OnigCodePoint CR_In_Dingbats[] = {
+	1,
+	0x2700, 0x27bf,
+}; /* CR_In_Dingbats */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
+	1,
+	0x27c0, 0x27ef,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
+
+/* 'In_Supplemental_Arrows_A': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
+	1,
+	0x27f0, 0x27ff,
+}; /* CR_In_Supplemental_Arrows_A */
+
+/* 'In_Braille_Patterns': Block */
+#define CR_In_Braille_Patterns CR_Braille
+
+/* 'In_Supplemental_Arrows_B': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
+	1,
+	0x2900, 0x297f,
+}; /* CR_In_Supplemental_Arrows_B */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
+	1,
+	0x2980, 0x29ff,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
+
+/* 'In_Supplemental_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
+	1,
+	0x2a00, 0x2aff,
+}; /* CR_In_Supplemental_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
+	1,
+	0x2b00, 0x2bff,
+}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
+
+/* 'In_Glagolitic': Block */
+static const OnigCodePoint CR_In_Glagolitic[] = {
+	1,
+	0x2c00, 0x2c5f,
+}; /* CR_In_Glagolitic */
+
+/* 'In_Latin_Extended_C': Block */
+static const OnigCodePoint CR_In_Latin_Extended_C[] = {
+	1,
+	0x2c60, 0x2c7f,
+}; /* CR_In_Latin_Extended_C */
+
+/* 'In_Coptic': Block */
+static const OnigCodePoint CR_In_Coptic[] = {
+	1,
+	0x2c80, 0x2cff,
+}; /* CR_In_Coptic */
+
+/* 'In_Georgian_Supplement': Block */
+static const OnigCodePoint CR_In_Georgian_Supplement[] = {
+	1,
+	0x2d00, 0x2d2f,
+}; /* CR_In_Georgian_Supplement */
+
+/* 'In_Tifinagh': Block */
+static const OnigCodePoint CR_In_Tifinagh[] = {
+	1,
+	0x2d30, 0x2d7f,
+}; /* CR_In_Tifinagh */
+
+/* 'In_Ethiopic_Extended': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
+	1,
+	0x2d80, 0x2ddf,
+}; /* CR_In_Ethiopic_Extended */
+
+/* 'In_Cyrillic_Extended_A': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
+	1,
+	0x2de0, 0x2dff,
+}; /* CR_In_Cyrillic_Extended_A */
+
+/* 'In_Supplemental_Punctuation': Block */
+static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
+	1,
+	0x2e00, 0x2e7f,
+}; /* CR_In_Supplemental_Punctuation */
+
+/* 'In_CJK_Radicals_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
+	1,
+	0x2e80, 0x2eff,
+}; /* CR_In_CJK_Radicals_Supplement */
+
+/* 'In_Kangxi_Radicals': Block */
+static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
+	1,
+	0x2f00, 0x2fdf,
+}; /* CR_In_Kangxi_Radicals */
+
+/* 'In_Ideographic_Description_Characters': Block */
+static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
+	1,
+	0x2ff0, 0x2fff,
+}; /* CR_In_Ideographic_Description_Characters */
+
+/* 'In_CJK_Symbols_and_Punctuation': Block */
+static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
+	1,
+	0x3000, 0x303f,
+}; /* CR_In_CJK_Symbols_and_Punctuation */
+
+/* 'In_Hiragana': Block */
+static const OnigCodePoint CR_In_Hiragana[] = {
+	1,
+	0x3040, 0x309f,
+}; /* CR_In_Hiragana */
+
+/* 'In_Katakana': Block */
+static const OnigCodePoint CR_In_Katakana[] = {
+	1,
+	0x30a0, 0x30ff,
+}; /* CR_In_Katakana */
+
+/* 'In_Bopomofo': Block */
+static const OnigCodePoint CR_In_Bopomofo[] = {
+	1,
+	0x3100, 0x312f,
+}; /* CR_In_Bopomofo */
+
+/* 'In_Hangul_Compatibility_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
+	1,
+	0x3130, 0x318f,
+}; /* CR_In_Hangul_Compatibility_Jamo */
+
+/* 'In_Kanbun': Block */
+static const OnigCodePoint CR_In_Kanbun[] = {
+	1,
+	0x3190, 0x319f,
+}; /* CR_In_Kanbun */
+
+/* 'In_Bopomofo_Extended': Block */
+static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
+	1,
+	0x31a0, 0x31bf,
+}; /* CR_In_Bopomofo_Extended */
+
+/* 'In_CJK_Strokes': Block */
+static const OnigCodePoint CR_In_CJK_Strokes[] = {
+	1,
+	0x31c0, 0x31ef,
+}; /* CR_In_CJK_Strokes */
+
+/* 'In_Katakana_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
+	1,
+	0x31f0, 0x31ff,
+}; /* CR_In_Katakana_Phonetic_Extensions */
+
+/* 'In_Enclosed_CJK_Letters_and_Months': Block */
+static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
+	1,
+	0x3200, 0x32ff,
+}; /* CR_In_Enclosed_CJK_Letters_and_Months */
+
+/* 'In_CJK_Compatibility': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility[] = {
+	1,
+	0x3300, 0x33ff,
+}; /* CR_In_CJK_Compatibility */
+
+/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
+	1,
+	0x3400, 0x4dbf,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
+
+/* 'In_Yijing_Hexagram_Symbols': Block */
+static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
+	1,
+	0x4dc0, 0x4dff,
+}; /* CR_In_Yijing_Hexagram_Symbols */
+
+/* 'In_CJK_Unified_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
+	1,
+	0x4e00, 0x9fff,
+}; /* CR_In_CJK_Unified_Ideographs */
+
+/* 'In_Yi_Syllables': Block */
+static const OnigCodePoint CR_In_Yi_Syllables[] = {
+	1,
+	0xa000, 0xa48f,
+}; /* CR_In_Yi_Syllables */
+
+/* 'In_Yi_Radicals': Block */
+static const OnigCodePoint CR_In_Yi_Radicals[] = {
+	1,
+	0xa490, 0xa4cf,
+}; /* CR_In_Yi_Radicals */
+
+/* 'In_Lisu': Block */
+#define CR_In_Lisu CR_Lisu
+
+/* 'In_Vai': Block */
+static const OnigCodePoint CR_In_Vai[] = {
+	1,
+	0xa500, 0xa63f,
+}; /* CR_In_Vai */
+
+/* 'In_Cyrillic_Extended_B': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
+	1,
+	0xa640, 0xa69f,
+}; /* CR_In_Cyrillic_Extended_B */
+
+/* 'In_Bamum': Block */
+static const OnigCodePoint CR_In_Bamum[] = {
+	1,
+	0xa6a0, 0xa6ff,
+}; /* CR_In_Bamum */
+
+/* 'In_Modifier_Tone_Letters': Block */
+static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
+	1,
+	0xa700, 0xa71f,
+}; /* CR_In_Modifier_Tone_Letters */
+
+/* 'In_Latin_Extended_D': Block */
+static const OnigCodePoint CR_In_Latin_Extended_D[] = {
+	1,
+	0xa720, 0xa7ff,
+}; /* CR_In_Latin_Extended_D */
+
+/* 'In_Syloti_Nagri': Block */
+static const OnigCodePoint CR_In_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82f,
+}; /* CR_In_Syloti_Nagri */
+
+/* 'In_Common_Indic_Number_Forms': Block */
+static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
+	1,
+	0xa830, 0xa83f,
+}; /* CR_In_Common_Indic_Number_Forms */
+
+/* 'In_Phags_pa': Block */
+static const OnigCodePoint CR_In_Phags_pa[] = {
+	1,
+	0xa840, 0xa87f,
+}; /* CR_In_Phags_pa */
+
+/* 'In_Saurashtra': Block */
+static const OnigCodePoint CR_In_Saurashtra[] = {
+	1,
+	0xa880, 0xa8df,
+}; /* CR_In_Saurashtra */
+
+/* 'In_Devanagari_Extended': Block */
+static const OnigCodePoint CR_In_Devanagari_Extended[] = {
+	1,
+	0xa8e0, 0xa8ff,
+}; /* CR_In_Devanagari_Extended */
+
+/* 'In_Kayah_Li': Block */
+#define CR_In_Kayah_Li CR_Kayah_Li
+
+/* 'In_Rejang': Block */
+static const OnigCodePoint CR_In_Rejang[] = {
+	1,
+	0xa930, 0xa95f,
+}; /* CR_In_Rejang */
+
+/* 'In_Hangul_Jamo_Extended_A': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
+	1,
+	0xa960, 0xa97f,
+}; /* CR_In_Hangul_Jamo_Extended_A */
+
+/* 'In_Javanese': Block */
+static const OnigCodePoint CR_In_Javanese[] = {
+	1,
+	0xa980, 0xa9df,
+}; /* CR_In_Javanese */
+
+/* 'In_Cham': Block */
+static const OnigCodePoint CR_In_Cham[] = {
+	1,
+	0xaa00, 0xaa5f,
+}; /* CR_In_Cham */
+
+/* 'In_Myanmar_Extended_A': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
+	1,
+	0xaa60, 0xaa7f,
+}; /* CR_In_Myanmar_Extended_A */
+
+/* 'In_Tai_Viet': Block */
+static const OnigCodePoint CR_In_Tai_Viet[] = {
+	1,
+	0xaa80, 0xaadf,
+}; /* CR_In_Tai_Viet */
+
+/* 'In_Meetei_Mayek_Extensions': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
+	1,
+	0xaae0, 0xaaff,
+}; /* CR_In_Meetei_Mayek_Extensions */
+
+/* 'In_Ethiopic_Extended_A': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
+	1,
+	0xab00, 0xab2f,
+}; /* CR_In_Ethiopic_Extended_A */
+
+/* 'In_Meetei_Mayek': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek[] = {
+	1,
+	0xabc0, 0xabff,
+}; /* CR_In_Meetei_Mayek */
+
+/* 'In_Hangul_Syllables': Block */
+static const OnigCodePoint CR_In_Hangul_Syllables[] = {
+	1,
+	0xac00, 0xd7af,
+}; /* CR_In_Hangul_Syllables */
+
+/* 'In_Hangul_Jamo_Extended_B': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
+	1,
+	0xd7b0, 0xd7ff,
+}; /* CR_In_Hangul_Jamo_Extended_B */
+
+/* 'In_High_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Surrogates[] = {
+	1,
+	0xd800, 0xdb7f,
+}; /* CR_In_High_Surrogates */
+
+/* 'In_High_Private_Use_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
+	1,
+	0xdb80, 0xdbff,
+}; /* CR_In_High_Private_Use_Surrogates */
+
+/* 'In_Low_Surrogates': Block */
+static const OnigCodePoint CR_In_Low_Surrogates[] = {
+	1,
+	0xdc00, 0xdfff,
+}; /* CR_In_Low_Surrogates */
+
+/* 'In_Private_Use_Area': Block */
+static const OnigCodePoint CR_In_Private_Use_Area[] = {
+	1,
+	0xe000, 0xf8ff,
+}; /* CR_In_Private_Use_Area */
+
+/* 'In_CJK_Compatibility_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
+	1,
+	0xf900, 0xfaff,
+}; /* CR_In_CJK_Compatibility_Ideographs */
+
+/* 'In_Alphabetic_Presentation_Forms': Block */
+static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
+	1,
+	0xfb00, 0xfb4f,
+}; /* CR_In_Alphabetic_Presentation_Forms */
+
+/* 'In_Arabic_Presentation_Forms_A': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
+	1,
+	0xfb50, 0xfdff,
+}; /* CR_In_Arabic_Presentation_Forms_A */
+
+/* 'In_Variation_Selectors': Block */
+static const OnigCodePoint CR_In_Variation_Selectors[] = {
+	1,
+	0xfe00, 0xfe0f,
+}; /* CR_In_Variation_Selectors */
+
+/* 'In_Vertical_Forms': Block */
+static const OnigCodePoint CR_In_Vertical_Forms[] = {
+	1,
+	0xfe10, 0xfe1f,
+}; /* CR_In_Vertical_Forms */
+
+/* 'In_Combining_Half_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
+	1,
+	0xfe20, 0xfe2f,
+}; /* CR_In_Combining_Half_Marks */
+
+/* 'In_CJK_Compatibility_Forms': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
+	1,
+	0xfe30, 0xfe4f,
+}; /* CR_In_CJK_Compatibility_Forms */
+
+/* 'In_Small_Form_Variants': Block */
+static const OnigCodePoint CR_In_Small_Form_Variants[] = {
+	1,
+	0xfe50, 0xfe6f,
+}; /* CR_In_Small_Form_Variants */
+
+/* 'In_Arabic_Presentation_Forms_B': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
+	1,
+	0xfe70, 0xfeff,
+}; /* CR_In_Arabic_Presentation_Forms_B */
+
+/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
+static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
+	1,
+	0xff00, 0xffef,
+}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
+
+/* 'In_Specials': Block */
+static const OnigCodePoint CR_In_Specials[] = {
+	1,
+	0xfff0, 0xffff,
+}; /* CR_In_Specials */
+
+/* 'In_Linear_B_Syllabary': Block */
+static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
+	1,
+	0x10000, 0x1007f,
+}; /* CR_In_Linear_B_Syllabary */
+
+/* 'In_Linear_B_Ideograms': Block */
+static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
+	1,
+	0x10080, 0x100ff,
+}; /* CR_In_Linear_B_Ideograms */
+
+/* 'In_Aegean_Numbers': Block */
+static const OnigCodePoint CR_In_Aegean_Numbers[] = {
+	1,
+	0x10100, 0x1013f,
+}; /* CR_In_Aegean_Numbers */
+
+/* 'In_Ancient_Greek_Numbers': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
+	1,
+	0x10140, 0x1018f,
+}; /* CR_In_Ancient_Greek_Numbers */
+
+/* 'In_Ancient_Symbols': Block */
+static const OnigCodePoint CR_In_Ancient_Symbols[] = {
+	1,
+	0x10190, 0x101cf,
+}; /* CR_In_Ancient_Symbols */
+
+/* 'In_Phaistos_Disc': Block */
+static const OnigCodePoint CR_In_Phaistos_Disc[] = {
+	1,
+	0x101d0, 0x101ff,
+}; /* CR_In_Phaistos_Disc */
+
+/* 'In_Lycian': Block */
+static const OnigCodePoint CR_In_Lycian[] = {
+	1,
+	0x10280, 0x1029f,
+}; /* CR_In_Lycian */
+
+/* 'In_Carian': Block */
+static const OnigCodePoint CR_In_Carian[] = {
+	1,
+	0x102a0, 0x102df,
+}; /* CR_In_Carian */
+
+/* 'In_Old_Italic': Block */
+static const OnigCodePoint CR_In_Old_Italic[] = {
+	1,
+	0x10300, 0x1032f,
+}; /* CR_In_Old_Italic */
+
+/* 'In_Gothic': Block */
+static const OnigCodePoint CR_In_Gothic[] = {
+	1,
+	0x10330, 0x1034f,
+}; /* CR_In_Gothic */
+
+/* 'In_Ugaritic': Block */
+static const OnigCodePoint CR_In_Ugaritic[] = {
+	1,
+	0x10380, 0x1039f,
+}; /* CR_In_Ugaritic */
+
+/* 'In_Old_Persian': Block */
+static const OnigCodePoint CR_In_Old_Persian[] = {
+	1,
+	0x103a0, 0x103df,
+}; /* CR_In_Old_Persian */
+
+/* 'In_Deseret': Block */
+#define CR_In_Deseret CR_Deseret
+
+/* 'In_Shavian': Block */
+#define CR_In_Shavian CR_Shavian
+
+/* 'In_Osmanya': Block */
+static const OnigCodePoint CR_In_Osmanya[] = {
+	1,
+	0x10480, 0x104af,
+}; /* CR_In_Osmanya */
+
+/* 'In_Cypriot_Syllabary': Block */
+static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
+	1,
+	0x10800, 0x1083f,
+}; /* CR_In_Cypriot_Syllabary */
+
+/* 'In_Imperial_Aramaic': Block */
+static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
+	1,
+	0x10840, 0x1085f,
+}; /* CR_In_Imperial_Aramaic */
+
+/* 'In_Phoenician': Block */
+static const OnigCodePoint CR_In_Phoenician[] = {
+	1,
+	0x10900, 0x1091f,
+}; /* CR_In_Phoenician */
+
+/* 'In_Lydian': Block */
+static const OnigCodePoint CR_In_Lydian[] = {
+	1,
+	0x10920, 0x1093f,
+}; /* CR_In_Lydian */
+
+/* 'In_Meroitic_Hieroglyphs': Block */
+#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
+
+/* 'In_Meroitic_Cursive': Block */
+static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
+	1,
+	0x109a0, 0x109ff,
+}; /* CR_In_Meroitic_Cursive */
+
+/* 'In_Kharoshthi': Block */
+static const OnigCodePoint CR_In_Kharoshthi[] = {
+	1,
+	0x10a00, 0x10a5f,
+}; /* CR_In_Kharoshthi */
+
+/* 'In_Old_South_Arabian': Block */
+#define CR_In_Old_South_Arabian CR_Old_South_Arabian
+
+/* 'In_Avestan': Block */
+static const OnigCodePoint CR_In_Avestan[] = {
+	1,
+	0x10b00, 0x10b3f,
+}; /* CR_In_Avestan */
+
+/* 'In_Inscriptional_Parthian': Block */
+static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
+	1,
+	0x10b40, 0x10b5f,
+}; /* CR_In_Inscriptional_Parthian */
+
+/* 'In_Inscriptional_Pahlavi': Block */
+static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
+	1,
+	0x10b60, 0x10b7f,
+}; /* CR_In_Inscriptional_Pahlavi */
+
+/* 'In_Old_Turkic': Block */
+static const OnigCodePoint CR_In_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c4f,
+}; /* CR_In_Old_Turkic */
+
+/* 'In_Rumi_Numeral_Symbols': Block */
+static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
+	1,
+	0x10e60, 0x10e7f,
+}; /* CR_In_Rumi_Numeral_Symbols */
+
+/* 'In_Brahmi': Block */
+static const OnigCodePoint CR_In_Brahmi[] = {
+	1,
+	0x11000, 0x1107f,
+}; /* CR_In_Brahmi */
+
+/* 'In_Kaithi': Block */
+static const OnigCodePoint CR_In_Kaithi[] = {
+	1,
+	0x11080, 0x110cf,
+}; /* CR_In_Kaithi */
+
+/* 'In_Sora_Sompeng': Block */
+static const OnigCodePoint CR_In_Sora_Sompeng[] = {
+	1,
+	0x110d0, 0x110ff,
+}; /* CR_In_Sora_Sompeng */
+
+/* 'In_Chakma': Block */
+static const OnigCodePoint CR_In_Chakma[] = {
+	1,
+	0x11100, 0x1114f,
+}; /* CR_In_Chakma */
+
+/* 'In_Sharada': Block */
+static const OnigCodePoint CR_In_Sharada[] = {
+	1,
+	0x11180, 0x111df,
+}; /* CR_In_Sharada */
+
+/* 'In_Takri': Block */
+static const OnigCodePoint CR_In_Takri[] = {
+	1,
+	0x11680, 0x116cf,
+}; /* CR_In_Takri */
+
+/* 'In_Cuneiform': Block */
+static const OnigCodePoint CR_In_Cuneiform[] = {
+	1,
+	0x12000, 0x123ff,
+}; /* CR_In_Cuneiform */
+
+/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
+static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
+	1,
+	0x12400, 0x1247f,
+}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
+
+/* 'In_Egyptian_Hieroglyphs': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342f,
+}; /* CR_In_Egyptian_Hieroglyphs */
+
+/* 'In_Bamum_Supplement': Block */
+static const OnigCodePoint CR_In_Bamum_Supplement[] = {
+	1,
+	0x16800, 0x16a3f,
+}; /* CR_In_Bamum_Supplement */
+
+/* 'In_Miao': Block */
+static const OnigCodePoint CR_In_Miao[] = {
+	1,
+	0x16f00, 0x16f9f,
+}; /* CR_In_Miao */
+
+/* 'In_Kana_Supplement': Block */
+static const OnigCodePoint CR_In_Kana_Supplement[] = {
+	1,
+	0x1b000, 0x1b0ff,
+}; /* CR_In_Kana_Supplement */
+
+/* 'In_Byzantine_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
+	1,
+	0x1d000, 0x1d0ff,
+}; /* CR_In_Byzantine_Musical_Symbols */
+
+/* 'In_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Musical_Symbols[] = {
+	1,
+	0x1d100, 0x1d1ff,
+}; /* CR_In_Musical_Symbols */
+
+/* 'In_Ancient_Greek_Musical_Notation': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
+	1,
+	0x1d200, 0x1d24f,
+}; /* CR_In_Ancient_Greek_Musical_Notation */
+
+/* 'In_Tai_Xuan_Jing_Symbols': Block */
+static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
+	1,
+	0x1d300, 0x1d35f,
+}; /* CR_In_Tai_Xuan_Jing_Symbols */
+
+/* 'In_Counting_Rod_Numerals': Block */
+static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
+	1,
+	0x1d360, 0x1d37f,
+}; /* CR_In_Counting_Rod_Numerals */
+
+/* 'In_Mathematical_Alphanumeric_Symbols': Block */
+static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
+	1,
+	0x1d400, 0x1d7ff,
+}; /* CR_In_Mathematical_Alphanumeric_Symbols */
+
+/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
+static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
+	1,
+	0x1ee00, 0x1eeff,
+}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
+
+/* 'In_Mahjong_Tiles': Block */
+static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
+	1,
+	0x1f000, 0x1f02f,
+}; /* CR_In_Mahjong_Tiles */
+
+/* 'In_Domino_Tiles': Block */
+static const OnigCodePoint CR_In_Domino_Tiles[] = {
+	1,
+	0x1f030, 0x1f09f,
+}; /* CR_In_Domino_Tiles */
+
+/* 'In_Playing_Cards': Block */
+static const OnigCodePoint CR_In_Playing_Cards[] = {
+	1,
+	0x1f0a0, 0x1f0ff,
+}; /* CR_In_Playing_Cards */
+
+/* 'In_Enclosed_Alphanumeric_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
+	1,
+	0x1f100, 0x1f1ff,
+}; /* CR_In_Enclosed_Alphanumeric_Supplement */
+
+/* 'In_Enclosed_Ideographic_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
+	1,
+	0x1f200, 0x1f2ff,
+}; /* CR_In_Enclosed_Ideographic_Supplement */
+
+/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
+	1,
+	0x1f300, 0x1f5ff,
+}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
+
+/* 'In_Emoticons': Block */
+static const OnigCodePoint CR_In_Emoticons[] = {
+	1,
+	0x1f600, 0x1f64f,
+}; /* CR_In_Emoticons */
+
+/* 'In_Transport_And_Map_Symbols': Block */
+static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
+	1,
+	0x1f680, 0x1f6ff,
+}; /* CR_In_Transport_And_Map_Symbols */
+
+/* 'In_Alchemical_Symbols': Block */
+static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
+	1,
+	0x1f700, 0x1f77f,
+}; /* CR_In_Alchemical_Symbols */
+
+/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
+	1,
+	0x20000, 0x2a6df,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
+
+/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
+	1,
+	0x2a700, 0x2b73f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
+
+/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
+	1,
+	0x2b740, 0x2b81f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
+
+/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
+	1,
+	0x2f800, 0x2fa1f,
+}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
+
+/* 'In_Tags': Block */
+static const OnigCodePoint CR_In_Tags[] = {
+	1,
+	0xe0000, 0xe007f,
+}; /* CR_In_Tags */
+
+/* 'In_Variation_Selectors_Supplement': Block */
+static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
+	1,
+	0xe0100, 0xe01ef,
+}; /* CR_In_Variation_Selectors_Supplement */
+
+/* 'In_Supplementary_Private_Use_Area_A': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
+	1,
+	0xf0000, 0xfffff,
+}; /* CR_In_Supplementary_Private_Use_Area_A */
+
+/* 'In_Supplementary_Private_Use_Area_B': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+	1,
+	0x100000, 0x10ffff,
+}; /* CR_In_Supplementary_Private_Use_Area_B */
+
+/* 'In_No_Block': Block */
+static const OnigCodePoint CR_In_No_Block[] = {
+	36,
+	0x0860, 0x089f,
+	0x1ab0, 0x1aff,
+	0x1c80, 0x1cbf,
+	0x2fe0, 0x2fef,
+	0xa9e0, 0xa9ff,
+	0xab30, 0xabbf,
+	0x10200, 0x1027f,
+	0x102e0, 0x102ff,
+	0x10350, 0x1037f,
+	0x103e0, 0x103ff,
+	0x104b0, 0x107ff,
+	0x10860, 0x108ff,
+	0x10940, 0x1097f,
+	0x10a80, 0x10aff,
+	0x10b80, 0x10bff,
+	0x10c50, 0x10e5f,
+	0x10e80, 0x10fff,
+	0x11150, 0x1117f,
+	0x111e0, 0x1167f,
+	0x116d0, 0x11fff,
+	0x12480, 0x12fff,
+	0x13430, 0x167ff,
+	0x16a40, 0x16eff,
+	0x16fa0, 0x1afff,
+	0x1b100, 0x1cfff,
+	0x1d250, 0x1d2ff,
+	0x1d380, 0x1d3ff,
+	0x1d800, 0x1edff,
+	0x1ef00, 0x1efff,
+	0x1f650, 0x1f67f,
+	0x1f780, 0x1ffff,
+	0x2a6e0, 0x2a6ff,
+	0x2b820, 0x2f7ff,
+	0x2fa20, 0xdffff,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+}; /* CR_In_No_Block */
+#endif /* USE_UNICODE_PROPERTIES */
+
+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_LC,
+  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_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
+  CR_Chakma,
+  CR_Meroitic_Cursive,
+  CR_Meroitic_Hieroglyphs,
+  CR_Miao,
+  CR_Sharada,
+  CR_Sora_Sompeng,
+  CR_Takri,
+  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,
+  CR_Unknown,
+  CR_Age_1_1,
+  CR_Age_2_0,
+  CR_Age_2_1,
+  CR_Age_3_0,
+  CR_Age_3_1,
+  CR_Age_3_2,
+  CR_Age_4_0,
+  CR_Age_4_1,
+  CR_Age_5_0,
+  CR_Age_5_1,
+  CR_Age_5_2,
+  CR_Age_6_0,
+  CR_Age_6_1,
+  CR_In_Basic_Latin,
+  CR_In_Latin_1_Supplement,
+  CR_In_Latin_Extended_A,
+  CR_In_Latin_Extended_B,
+  CR_In_IPA_Extensions,
+  CR_In_Spacing_Modifier_Letters,
+  CR_In_Combining_Diacritical_Marks,
+  CR_In_Greek_and_Coptic,
+  CR_In_Cyrillic,
+  CR_In_Cyrillic_Supplement,
+  CR_In_Armenian,
+  CR_In_Hebrew,
+  CR_In_Arabic,
+  CR_In_Syriac,
+  CR_In_Arabic_Supplement,
+  CR_In_Thaana,
+  CR_In_NKo,
+  CR_In_Samaritan,
+  CR_In_Mandaic,
+  CR_In_Arabic_Extended_A,
+  CR_In_Devanagari,
+  CR_In_Bengali,
+  CR_In_Gurmukhi,
+  CR_In_Gujarati,
+  CR_In_Oriya,
+  CR_In_Tamil,
+  CR_In_Telugu,
+  CR_In_Kannada,
+  CR_In_Malayalam,
+  CR_In_Sinhala,
+  CR_In_Thai,
+  CR_In_Lao,
+  CR_In_Tibetan,
+  CR_In_Myanmar,
+  CR_In_Georgian,
+  CR_In_Hangul_Jamo,
+  CR_In_Ethiopic,
+  CR_In_Ethiopic_Supplement,
+  CR_In_Cherokee,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics,
+  CR_In_Ogham,
+  CR_In_Runic,
+  CR_In_Tagalog,
+  CR_In_Hanunoo,
+  CR_In_Buhid,
+  CR_In_Tagbanwa,
+  CR_In_Khmer,
+  CR_In_Mongolian,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
+  CR_In_Limbu,
+  CR_In_Tai_Le,
+  CR_In_New_Tai_Lue,
+  CR_In_Khmer_Symbols,
+  CR_In_Buginese,
+  CR_In_Tai_Tham,
+  CR_In_Balinese,
+  CR_In_Sundanese,
+  CR_In_Batak,
+  CR_In_Lepcha,
+  CR_In_Ol_Chiki,
+  CR_In_Sundanese_Supplement,
+  CR_In_Vedic_Extensions,
+  CR_In_Phonetic_Extensions,
+  CR_In_Phonetic_Extensions_Supplement,
+  CR_In_Combining_Diacritical_Marks_Supplement,
+  CR_In_Latin_Extended_Additional,
+  CR_In_Greek_Extended,
+  CR_In_General_Punctuation,
+  CR_In_Superscripts_and_Subscripts,
+  CR_In_Currency_Symbols,
+  CR_In_Combining_Diacritical_Marks_for_Symbols,
+  CR_In_Letterlike_Symbols,
+  CR_In_Number_Forms,
+  CR_In_Arrows,
+  CR_In_Mathematical_Operators,
+  CR_In_Miscellaneous_Technical,
+  CR_In_Control_Pictures,
+  CR_In_Optical_Character_Recognition,
+  CR_In_Enclosed_Alphanumerics,
+  CR_In_Box_Drawing,
+  CR_In_Block_Elements,
+  CR_In_Geometric_Shapes,
+  CR_In_Miscellaneous_Symbols,
+  CR_In_Dingbats,
+  CR_In_Miscellaneous_Mathematical_Symbols_A,
+  CR_In_Supplemental_Arrows_A,
+  CR_In_Braille_Patterns,
+  CR_In_Supplemental_Arrows_B,
+  CR_In_Miscellaneous_Mathematical_Symbols_B,
+  CR_In_Supplemental_Mathematical_Operators,
+  CR_In_Miscellaneous_Symbols_and_Arrows,
+  CR_In_Glagolitic,
+  CR_In_Latin_Extended_C,
+  CR_In_Coptic,
+  CR_In_Georgian_Supplement,
+  CR_In_Tifinagh,
+  CR_In_Ethiopic_Extended,
+  CR_In_Cyrillic_Extended_A,
+  CR_In_Supplemental_Punctuation,
+  CR_In_CJK_Radicals_Supplement,
+  CR_In_Kangxi_Radicals,
+  CR_In_Ideographic_Description_Characters,
+  CR_In_CJK_Symbols_and_Punctuation,
+  CR_In_Hiragana,
+  CR_In_Katakana,
+  CR_In_Bopomofo,
+  CR_In_Hangul_Compatibility_Jamo,
+  CR_In_Kanbun,
+  CR_In_Bopomofo_Extended,
+  CR_In_CJK_Strokes,
+  CR_In_Katakana_Phonetic_Extensions,
+  CR_In_Enclosed_CJK_Letters_and_Months,
+  CR_In_CJK_Compatibility,
+  CR_In_CJK_Unified_Ideographs_Extension_A,
+  CR_In_Yijing_Hexagram_Symbols,
+  CR_In_CJK_Unified_Ideographs,
+  CR_In_Yi_Syllables,
+  CR_In_Yi_Radicals,
+  CR_In_Lisu,
+  CR_In_Vai,
+  CR_In_Cyrillic_Extended_B,
+  CR_In_Bamum,
+  CR_In_Modifier_Tone_Letters,
+  CR_In_Latin_Extended_D,
+  CR_In_Syloti_Nagri,
+  CR_In_Common_Indic_Number_Forms,
+  CR_In_Phags_pa,
+  CR_In_Saurashtra,
+  CR_In_Devanagari_Extended,
+  CR_In_Kayah_Li,
+  CR_In_Rejang,
+  CR_In_Hangul_Jamo_Extended_A,
+  CR_In_Javanese,
+  CR_In_Cham,
+  CR_In_Myanmar_Extended_A,
+  CR_In_Tai_Viet,
+  CR_In_Meetei_Mayek_Extensions,
+  CR_In_Ethiopic_Extended_A,
+  CR_In_Meetei_Mayek,
+  CR_In_Hangul_Syllables,
+  CR_In_Hangul_Jamo_Extended_B,
+  CR_In_High_Surrogates,
+  CR_In_High_Private_Use_Surrogates,
+  CR_In_Low_Surrogates,
+  CR_In_Private_Use_Area,
+  CR_In_CJK_Compatibility_Ideographs,
+  CR_In_Alphabetic_Presentation_Forms,
+  CR_In_Arabic_Presentation_Forms_A,
+  CR_In_Variation_Selectors,
+  CR_In_Vertical_Forms,
+  CR_In_Combining_Half_Marks,
+  CR_In_CJK_Compatibility_Forms,
+  CR_In_Small_Form_Variants,
+  CR_In_Arabic_Presentation_Forms_B,
+  CR_In_Halfwidth_and_Fullwidth_Forms,
+  CR_In_Specials,
+  CR_In_Linear_B_Syllabary,
+  CR_In_Linear_B_Ideograms,
+  CR_In_Aegean_Numbers,
+  CR_In_Ancient_Greek_Numbers,
+  CR_In_Ancient_Symbols,
+  CR_In_Phaistos_Disc,
+  CR_In_Lycian,
+  CR_In_Carian,
+  CR_In_Old_Italic,
+  CR_In_Gothic,
+  CR_In_Ugaritic,
+  CR_In_Old_Persian,
+  CR_In_Deseret,
+  CR_In_Shavian,
+  CR_In_Osmanya,
+  CR_In_Cypriot_Syllabary,
+  CR_In_Imperial_Aramaic,
+  CR_In_Phoenician,
+  CR_In_Lydian,
+  CR_In_Meroitic_Hieroglyphs,
+  CR_In_Meroitic_Cursive,
+  CR_In_Kharoshthi,
+  CR_In_Old_South_Arabian,
+  CR_In_Avestan,
+  CR_In_Inscriptional_Parthian,
+  CR_In_Inscriptional_Pahlavi,
+  CR_In_Old_Turkic,
+  CR_In_Rumi_Numeral_Symbols,
+  CR_In_Brahmi,
+  CR_In_Kaithi,
+  CR_In_Sora_Sompeng,
+  CR_In_Chakma,
+  CR_In_Sharada,
+  CR_In_Takri,
+  CR_In_Cuneiform,
+  CR_In_Cuneiform_Numbers_and_Punctuation,
+  CR_In_Egyptian_Hieroglyphs,
+  CR_In_Bamum_Supplement,
+  CR_In_Miao,
+  CR_In_Kana_Supplement,
+  CR_In_Byzantine_Musical_Symbols,
+  CR_In_Musical_Symbols,
+  CR_In_Ancient_Greek_Musical_Notation,
+  CR_In_Tai_Xuan_Jing_Symbols,
+  CR_In_Counting_Rod_Numerals,
+  CR_In_Mathematical_Alphanumeric_Symbols,
+  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
+  CR_In_Mahjong_Tiles,
+  CR_In_Domino_Tiles,
+  CR_In_Playing_Cards,
+  CR_In_Enclosed_Alphanumeric_Supplement,
+  CR_In_Enclosed_Ideographic_Supplement,
+  CR_In_Miscellaneous_Symbols_And_Pictographs,
+  CR_In_Emoticons,
+  CR_In_Transport_And_Map_Symbols,
+  CR_In_Alchemical_Symbols,
+  CR_In_CJK_Unified_Ideographs_Extension_B,
+  CR_In_CJK_Unified_Ideographs_Extension_C,
+  CR_In_CJK_Unified_Ideographs_Extension_D,
+  CR_In_CJK_Compatibility_Ideographs_Supplement,
+  CR_In_Tags,
+  CR_In_Variation_Selectors_Supplement,
+  CR_In_Supplementary_Private_Use_Area_A,
+  CR_In_Supplementary_Private_Use_Area_B,
+  CR_In_No_Block,
+#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 14
+#define MIN_WORD_LENGTH 4
+#define MAX_WORD_LENGTH 6
+#define MIN_HASH_VALUE 6
+#define MAX_HASH_VALUE 19
+/* maximum key range = 14, duplicates = 0 */
+#else /* USE_UNICODE_PROPERTIES */
+#define TOTAL_KEYWORDS 625
+#define MIN_WORD_LENGTH 1
+#define MAX_WORD_LENGTH 44
+#define MIN_HASH_VALUE 3
+#define MAX_HASH_VALUE 4167
+/* maximum key range = 4165, 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
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+      20, 20, 20, 20, 20, 20, 20,  3, 11,  5,
+       4, 20, 20,  9, 20,  1, 20, 20, 10, 20,
+       2, 20,  1, 20,  1,  7,  4,  6, 20,  1,
+       4, 20, 20, 20, 20, 20, 20, 20
+#else /* USE_UNICODE_PROPERTIES */
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168,    1, 4168,   13,    1,
+         3,   28,   31,   10,   27, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168, 4168,
+      4168, 4168, 4168, 4168, 4168, 4168, 4168,   13,  854,   14,
+       443,   19,    7,  570,  335,    4,   66, 1159,  102,   34,
+         1,  178,  474,    1,  192,    2,   64, 1117,  491,  264,
+       256, 1305,    3, 4168, 4168, 4168, 4168, 4168
+#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:
+        hval += asso_values[(unsigned char)str[4]];
+      /*FALLTHROUGH*/
+      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_str6[sizeof("word")];
+    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("upper")];
+    char uniname2ctype_pool_str13[sizeof("ascii")];
+    char uniname2ctype_pool_str14[sizeof("cntrl")];
+    char uniname2ctype_pool_str15[sizeof("space")];
+    char uniname2ctype_pool_str16[sizeof("lower")];
+    char uniname2ctype_pool_str17[sizeof("graph")];
+    char uniname2ctype_pool_str18[sizeof("digit")];
+    char uniname2ctype_pool_str19[sizeof("blank")];
+#else /* USE_UNICODE_PROPERTIES */
+    char uniname2ctype_pool_str3[sizeof("n")];
+    char uniname2ctype_pool_str5[sizeof("s")];
+    char uniname2ctype_pool_str7[sizeof("z")];
+    char uniname2ctype_pool_str9[sizeof("zs")];
+    char uniname2ctype_pool_str16[sizeof("zzzz")];
+    char uniname2ctype_pool_str18[sizeof("cn")];
+    char uniname2ctype_pool_str20[sizeof("cs")];
+    char uniname2ctype_pool_str24[sizeof("ci")];
+    char uniname2ctype_pool_str29[sizeof("c")];
+    char uniname2ctype_pool_str30[sizeof("cf")];
+    char uniname2ctype_pool_str32[sizeof("sc")];
+    char uniname2ctype_pool_str34[sizeof("cans")];
+    char uniname2ctype_pool_str35[sizeof("qaai")];
+    char uniname2ctype_pool_str38[sizeof("mn")];
+    char uniname2ctype_pool_str42[sizeof("ascii")];
+    char uniname2ctype_pool_str44[sizeof("cc")];
+    char uniname2ctype_pool_str45[sizeof("qaac")];
+    char uniname2ctype_pool_str49[sizeof("inavestan")];
+    char uniname2ctype_pool_str52[sizeof("inspecials")];
+    char uniname2ctype_pool_str62[sizeof("inipaextensions")];
+    char uniname2ctype_pool_str64[sizeof("mc")];
+    char uniname2ctype_pool_str66[sizeof("insamaritan")];
+    char uniname2ctype_pool_str69[sizeof("m")];
+    char uniname2ctype_pool_str72[sizeof("sm")];
+    char uniname2ctype_pool_str74[sizeof("me")];
+    char uniname2ctype_pool_str82[sizeof("inarmenian")];
+    char uniname2ctype_pool_str84[sizeof("incuneiform")];
+    char uniname2ctype_pool_str86[sizeof("mandaic")];
+    char uniname2ctype_pool_str90[sizeof("inancientsymbols")];
+    char uniname2ctype_pool_str92[sizeof("incuneiformnumbersandpunctuation")];
+    char uniname2ctype_pool_str96[sizeof("inthai")];
+    char uniname2ctype_pool_str99[sizeof("inmusicalsymbols")];
+    char uniname2ctype_pool_str100[sizeof("inmiscellaneoussymbols")];
+    char uniname2ctype_pool_str106[sizeof("incham")];
+    char uniname2ctype_pool_str109[sizeof("inmiscellaneoussymbolsandarrows")];
+    char uniname2ctype_pool_str113[sizeof("initialpunctuation")];
+    char uniname2ctype_pool_str114[sizeof("inmiscellaneoussymbolsandpictographs")];
+    char uniname2ctype_pool_str116[sizeof("inthaana")];
+    char uniname2ctype_pool_str124[sizeof("taile")];
+    char uniname2ctype_pool_str125[sizeof("mtei")];
+    char uniname2ctype_pool_str132[sizeof("lc")];
+    char uniname2ctype_pool_str133[sizeof("lana")];
+    char uniname2ctype_pool_str134[sizeof("inlycian")];
+    char uniname2ctype_pool_str135[sizeof("intransportandmapsymbols")];
+    char uniname2ctype_pool_str136[sizeof("incontrolpictures")];
+    char uniname2ctype_pool_str142[sizeof("sinhala")];
+    char uniname2ctype_pool_str151[sizeof("incommonindicnumberforms")];
+    char uniname2ctype_pool_str156[sizeof("inmiscellaneousmathematicalsymbolsa")];
+    char uniname2ctype_pool_str158[sizeof("sterm")];
+    char uniname2ctype_pool_str167[sizeof("inmyanmarextendeda")];
+    char uniname2ctype_pool_str172[sizeof("lm")];
+    char uniname2ctype_pool_str175[sizeof("taiviet")];
+    char uniname2ctype_pool_str179[sizeof("inlinearbideograms")];
+    char uniname2ctype_pool_str180[sizeof("intaitham")];
+    char uniname2ctype_pool_str184[sizeof("latn")];
+    char uniname2ctype_pool_str186[sizeof("latin")];
+    char uniname2ctype_pool_str187[sizeof("ital")];
+    char uniname2ctype_pool_str189[sizeof("alnum")];
+    char uniname2ctype_pool_str199[sizeof("inmalayalam")];
+    char uniname2ctype_pool_str201[sizeof("intaile")];
+    char uniname2ctype_pool_str202[sizeof("tale")];
+    char uniname2ctype_pool_str205[sizeof("l")];
+    char uniname2ctype_pool_str207[sizeof("nl")];
+    char uniname2ctype_pool_str209[sizeof("zl")];
+    char uniname2ctype_pool_str216[sizeof("intamil")];
+    char uniname2ctype_pool_str217[sizeof("taml")];
+    char uniname2ctype_pool_str218[sizeof("inlatinextendeda")];
+    char uniname2ctype_pool_str220[sizeof("inlatinextendedc")];
+    char uniname2ctype_pool_str223[sizeof("inrunic")];
+    char uniname2ctype_pool_str224[sizeof("incarian")];
+    char uniname2ctype_pool_str225[sizeof("insyriac")];
+    char uniname2ctype_pool_str227[sizeof("cari")];
+    char uniname2ctype_pool_str230[sizeof("inmeeteimayekextensions")];
+    char uniname2ctype_pool_str231[sizeof("osma")];
+    char uniname2ctype_pool_str232[sizeof("lt")];
+    char uniname2ctype_pool_str233[sizeof("miao")];
+    char uniname2ctype_pool_str234[sizeof("insharada")];
+    char uniname2ctype_pool_str239[sizeof("incyrillic")];
+    char uniname2ctype_pool_str240[sizeof("carian")];
+    char uniname2ctype_pool_str244[sizeof("armn")];
+    char uniname2ctype_pool_str245[sizeof("samr")];
+    char uniname2ctype_pool_str247[sizeof("armi")];
+    char uniname2ctype_pool_str248[sizeof("inideographicdescriptioncharacters")];
+    char uniname2ctype_pool_str252[sizeof("inosmanya")];
+    char uniname2ctype_pool_str253[sizeof("armenian")];
+    char uniname2ctype_pool_str254[sizeof("inmyanmar")];
+    char uniname2ctype_pool_str255[sizeof("samaritan")];
+    char uniname2ctype_pool_str256[sizeof("arabic")];
+    char uniname2ctype_pool_str259[sizeof("incherokee")];
+    char uniname2ctype_pool_str261[sizeof("connectorpunctuation")];
+    char uniname2ctype_pool_str263[sizeof("merc")];
+    char uniname2ctype_pool_str264[sizeof("inmiscellaneoustechnical")];
+    char uniname2ctype_pool_str268[sizeof("inenclosedalphanumerics")];
+    char uniname2ctype_pool_str279[sizeof("inemoticons")];
+    char uniname2ctype_pool_str281[sizeof("joinc")];
+    char uniname2ctype_pool_str288[sizeof("cntrl")];
+    char uniname2ctype_pool_str301[sizeof("inenclosedcjklettersandmonths")];
+    char uniname2ctype_pool_str303[sizeof("cwcf")];
+    char uniname2ctype_pool_str304[sizeof("inruminumeralsymbols")];
+    char uniname2ctype_pool_str308[sizeof("ll")];
+    char uniname2ctype_pool_str313[sizeof("term")];
+    char uniname2ctype_pool_str316[sizeof("inlatinextendedadditional")];
+    char uniname2ctype_pool_str320[sizeof("tamil")];
+    char uniname2ctype_pool_str321[sizeof("loe")];
+    char uniname2ctype_pool_str329[sizeof("newtailue")];
+    char uniname2ctype_pool_str330[sizeof("cwcm")];
+    char uniname2ctype_pool_str339[sizeof("inenclosedalphanumericsupplement")];
+    char uniname2ctype_pool_str346[sizeof("sinh")];
+    char uniname2ctype_pool_str347[sizeof("zinh")];
+    char uniname2ctype_pool_str349[sizeof("meroiticcursive")];
+    char uniname2ctype_pool_str353[sizeof("han")];
+    char uniname2ctype_pool_str357[sizeof("hani")];
+    char uniname2ctype_pool_str358[sizeof("inopticalcharacterrecognition")];
+    char uniname2ctype_pool_str359[sizeof("no")];
+    char uniname2ctype_pool_str360[sizeof("so")];
+    char uniname2ctype_pool_str364[sizeof("innewtailue")];
+    char uniname2ctype_pool_str365[sizeof("insinhala")];
+    char uniname2ctype_pool_str367[sizeof("innko")];
+    char uniname2ctype_pool_str372[sizeof("co")];
+    char uniname2ctype_pool_str375[sizeof("shavian")];
+    char uniname2ctype_pool_str378[sizeof("terminalpunctuation")];
+    char uniname2ctype_pool_str386[sizeof("intaixuanjingsymbols")];
+    char uniname2ctype_pool_str387[sizeof("inethiopic")];
+    char uniname2ctype_pool_str389[sizeof("sora")];
+    char uniname2ctype_pool_str398[sizeof("inarrows")];
+    char uniname2ctype_pool_str400[sizeof("cham")];
+    char uniname2ctype_pool_str403[sizeof("inlowsurrogates")];
+    char uniname2ctype_pool_str405[sizeof("oriya")];
+    char uniname2ctype_pool_str406[sizeof("ext")];
+    char uniname2ctype_pool_str409[sizeof("cwt")];
+    char uniname2ctype_pool_str412[sizeof("common")];
+    char uniname2ctype_pool_str414[sizeof("inmiao")];
+    char uniname2ctype_pool_str420[sizeof("thai")];
+    char uniname2ctype_pool_str425[sizeof("intifinagh")];
+    char uniname2ctype_pool_str426[sizeof("ethi")];
+    char uniname2ctype_pool_str427[sizeof("mero")];
+    char uniname2ctype_pool_str428[sizeof("chakma")];
+    char uniname2ctype_pool_str429[sizeof("thaa")];
+    char uniname2ctype_pool_str430[sizeof("inscriptionalparthian")];
+    char uniname2ctype_pool_str432[sizeof("tifinagh")];
+    char uniname2ctype_pool_str436[sizeof("titlecaseletter")];
+    char uniname2ctype_pool_str445[sizeof("thaana")];
+    char uniname2ctype_pool_str449[sizeof("asciihexdigit")];
+    char uniname2ctype_pool_str450[sizeof("math")];
+    char uniname2ctype_pool_str453[sizeof("di")];
+    char uniname2ctype_pool_str454[sizeof("ids")];
+    char uniname2ctype_pool_str460[sizeof("lo")];
+    char uniname2ctype_pool_str468[sizeof("inlao")];
+    char uniname2ctype_pool_str470[sizeof("taitham")];
+    char uniname2ctype_pool_str474[sizeof("lao")];
+    char uniname2ctype_pool_str475[sizeof("laoo")];
+    char uniname2ctype_pool_str476[sizeof("dia")];
+    char uniname2ctype_pool_str478[sizeof("idc")];
+    char uniname2ctype_pool_str480[sizeof("ps")];
+    char uniname2ctype_pool_str481[sizeof("insundanese")];
+    char uniname2ctype_pool_str484[sizeof("pi")];
+    char uniname2ctype_pool_str485[sizeof("cwl")];
+    char uniname2ctype_pool_str490[sizeof("pf")];
+    char uniname2ctype_pool_str495[sizeof("mand")];
+    char uniname2ctype_pool_str496[sizeof("insylotinagri")];
+    char uniname2ctype_pool_str497[sizeof("vs")];
+    char uniname2ctype_pool_str503[sizeof("mongolian")];
+    char uniname2ctype_pool_str504[sizeof("pc")];
+    char uniname2ctype_pool_str506[sizeof("inmandaic")];
+    char uniname2ctype_pool_str509[sizeof("invai")];
+    char uniname2ctype_pool_str511[sizeof("lineseparator")];
+    char uniname2ctype_pool_str514[sizeof("pe")];
+    char uniname2ctype_pool_str515[sizeof("vai")];
+    char uniname2ctype_pool_str516[sizeof("vaii")];
+    char uniname2ctype_pool_str517[sizeof("idst")];
+    char uniname2ctype_pool_str520[sizeof("indominotiles")];
+    char uniname2ctype_pool_str521[sizeof("inshavian")];
+    char uniname2ctype_pool_str522[sizeof("inspacingmodifierletters")];
+    char uniname2ctype_pool_str524[sizeof("format")];
+    char uniname2ctype_pool_str528[sizeof("inphaistosdisc")];
+    char uniname2ctype_pool_str531[sizeof("hano")];
+    char uniname2ctype_pool_str532[sizeof("space")];
+    char uniname2ctype_pool_str542[sizeof("indeseret")];
+    char uniname2ctype_pool_str545[sizeof("inolchiki")];
+    char uniname2ctype_pool_str548[sizeof("hira")];
+    char uniname2ctype_pool_str553[sizeof("joincontrol")];
+    char uniname2ctype_pool_str555[sizeof("idcontinue")];
+    char uniname2ctype_pool_str558[sizeof("inmahjongtiles")];
+    char uniname2ctype_pool_str560[sizeof("patws")];
+    char uniname2ctype_pool_str563[sizeof("inlydian")];
+    char uniname2ctype_pool_str564[sizeof("cher")];
+    char uniname2ctype_pool_str568[sizeof("inhiragana")];
+    char uniname2ctype_pool_str572[sizeof("inogham")];
+    char uniname2ctype_pool_str574[sizeof("avst")];
+    char uniname2ctype_pool_str575[sizeof("inscriptionalpahlavi")];
+    char uniname2ctype_pool_str579[sizeof("incoptic")];
+    char uniname2ctype_pool_str587[sizeof("java")];
+    char uniname2ctype_pool_str589[sizeof("inmathematicalalphanumericsymbols")];
+    char uniname2ctype_pool_str594[sizeof("letter")];
+    char uniname2ctype_pool_str604[sizeof("injavanese")];
+    char uniname2ctype_pool_str608[sizeof("avestan")];
+    char uniname2ctype_pool_str612[sizeof("age=1.1")];
+    char uniname2ctype_pool_str613[sizeof("lepc")];
+    char uniname2ctype_pool_str614[sizeof("age=2.1")];
+    char uniname2ctype_pool_str616[sizeof("inlepcha")];
+    char uniname2ctype_pool_str617[sizeof("javanese")];
+    char uniname2ctype_pool_str618[sizeof("shaw")];
+    char uniname2ctype_pool_str619[sizeof("finalpunctuation")];
+    char uniname2ctype_pool_str620[sizeof("alpha")];
+    char uniname2ctype_pool_str621[sizeof("age=5.1")];
+    char uniname2ctype_pool_str622[sizeof("inmongolian")];
+    char uniname2ctype_pool_str623[sizeof("age=5.2")];
+    char uniname2ctype_pool_str626[sizeof("age=2.0")];
+    char uniname2ctype_pool_str627[sizeof("ahex")];
+    char uniname2ctype_pool_str630[sizeof("ingeneralpunctuation")];
+    char uniname2ctype_pool_str631[sizeof("oids")];
+    char uniname2ctype_pool_str632[sizeof("odi")];
+    char uniname2ctype_pool_str633[sizeof("age=5.0")];
+    char uniname2ctype_pool_str636[sizeof("tavt")];
+    char uniname2ctype_pool_str637[sizeof("intaiviet")];
+    char uniname2ctype_pool_str638[sizeof("age=6.1")];
+    char uniname2ctype_pool_str639[sizeof("age=3.1")];
+    char uniname2ctype_pool_str640[sizeof("insundanesesupplement")];
+    char uniname2ctype_pool_str641[sizeof("age=3.2")];
+    char uniname2ctype_pool_str642[sizeof("age=4.1")];
+    char uniname2ctype_pool_str643[sizeof("oidc")];
+    char uniname2ctype_pool_str646[sizeof("tfng")];
+    char uniname2ctype_pool_str647[sizeof("insmallformvariants")];
+    char uniname2ctype_pool_str648[sizeof("ideo")];
+    char uniname2ctype_pool_str649[sizeof("intags")];
+    char uniname2ctype_pool_str650[sizeof("age=6.0")];
+    char uniname2ctype_pool_str651[sizeof("age=3.0")];
+    char uniname2ctype_pool_str653[sizeof("whitespace")];
+    char uniname2ctype_pool_str654[sizeof("age=4.0")];
+    char uniname2ctype_pool_str655[sizeof("inolditalic")];
+    char uniname2ctype_pool_str660[sizeof("oalpha")];
+    char uniname2ctype_pool_str668[sizeof("ingujarati")];
+    char uniname2ctype_pool_str672[sizeof("control")];
+    char uniname2ctype_pool_str679[sizeof("diacritic")];
+    char uniname2ctype_pool_str682[sizeof("tagbanwa")];
+    char uniname2ctype_pool_str690[sizeof("inphoenician")];
+    char uniname2ctype_pool_str701[sizeof("ininscriptionalparthian")];
+    char uniname2ctype_pool_str703[sizeof("ininscriptionalpahlavi")];
+    char uniname2ctype_pool_str704[sizeof("coptic")];
+    char uniname2ctype_pool_str705[sizeof("dsrt")];
+    char uniname2ctype_pool_str706[sizeof("inmodifiertoneletters")];
+    char uniname2ctype_pool_str709[sizeof("xids")];
+    char uniname2ctype_pool_str713[sizeof("hanunoo")];
+    char uniname2ctype_pool_str715[sizeof("inoldturkic")];
+    char uniname2ctype_pool_str721[sizeof("xidc")];
+    char uniname2ctype_pool_str725[sizeof("idstart")];
+    char uniname2ctype_pool_str729[sizeof("inimperialaramaic")];
+    char uniname2ctype_pool_str730[sizeof("invariationselectors")];
+    char uniname2ctype_pool_str734[sizeof("copt")];
+    char uniname2ctype_pool_str737[sizeof("caseignorable")];
+    char uniname2ctype_pool_str738[sizeof("prti")];
+    char uniname2ctype_pool_str739[sizeof("nchar")];
+    char uniname2ctype_pool_str746[sizeof("deseret")];
+    char uniname2ctype_pool_str747[sizeof("decimalnumber")];
+    char uniname2ctype_pool_str748[sizeof("cprt")];
+    char uniname2ctype_pool_str750[sizeof("inlatin1supplement")];
+    char uniname2ctype_pool_str771[sizeof("imperialaramaic")];
+    char uniname2ctype_pool_str776[sizeof("privateuse")];
+    char uniname2ctype_pool_str777[sizeof("casedletter")];
+    char uniname2ctype_pool_str778[sizeof("lowercase")];
+    char uniname2ctype_pool_str780[sizeof("spaceseparator")];
+    char uniname2ctype_pool_str784[sizeof("radical")];
+    char uniname2ctype_pool_str787[sizeof("mong")];
+    char uniname2ctype_pool_str788[sizeof("canadianaboriginal")];
+    char uniname2ctype_pool_str792[sizeof("letternumber")];
+    char uniname2ctype_pool_str796[sizeof("insorasompeng")];
+    char uniname2ctype_pool_str797[sizeof("dash")];
+    char uniname2ctype_pool_str798[sizeof("wspace")];
+    char uniname2ctype_pool_str799[sizeof("ogam")];
+    char uniname2ctype_pool_str802[sizeof("invariationselectorssupplement")];
+    char uniname2ctype_pool_str803[sizeof("print")];
+    char uniname2ctype_pool_str811[sizeof("otheridcontinue")];
+    char uniname2ctype_pool_str815[sizeof("ingurmukhi")];
+    char uniname2ctype_pool_str818[sizeof("closepunctuation")];
+    char uniname2ctype_pool_str823[sizeof("olditalic")];
+    char uniname2ctype_pool_str824[sizeof("noncharactercodepoint")];
+    char uniname2ctype_pool_str826[sizeof("sharada")];
+    char uniname2ctype_pool_str827[sizeof("ingeometricshapes")];
+    char uniname2ctype_pool_str830[sizeof("otheralphabetic")];
+    char uniname2ctype_pool_str831[sizeof("patternwhitespace")];
+    char uniname2ctype_pool_str832[sizeof("po")];
+    char uniname2ctype_pool_str833[sizeof("rjng")];
+    char uniname2ctype_pool_str835[sizeof("ingreekandcoptic")];
+    char uniname2ctype_pool_str841[sizeof("xdigit")];
+    char uniname2ctype_pool_str850[sizeof("gothic")];
+    char uniname2ctype_pool_str851[sizeof("inoldsoutharabian")];
+    char uniname2ctype_pool_str852[sizeof("xidstart")];
+    char uniname2ctype_pool_str854[sizeof("inrejang")];
+    char uniname2ctype_pool_str860[sizeof("idsbinaryoperator")];
+    char uniname2ctype_pool_str867[sizeof("olower")];
+    char uniname2ctype_pool_str869[sizeof("hex")];
+    char uniname2ctype_pool_str870[sizeof("inenclosedideographicsupplement")];
+    char uniname2ctype_pool_str874[sizeof("inalphabeticpresentationforms")];
+    char uniname2ctype_pool_str879[sizeof("inbasiclatin")];
+    char uniname2ctype_pool_str884[sizeof("othersymbol")];
+    char uniname2ctype_pool_str889[sizeof("nd")];
+    char uniname2ctype_pool_str890[sizeof("sd")];
+    char uniname2ctype_pool_str900[sizeof("omath")];
+    char uniname2ctype_pool_str901[sizeof("separator")];
+    char uniname2ctype_pool_str907[sizeof("inarabic")];
+    char uniname2ctype_pool_str912[sizeof("xidcontinue")];
+    char uniname2ctype_pool_str913[sizeof("otheridstart")];
+    char uniname2ctype_pool_str914[sizeof("grext")];
+    char uniname2ctype_pool_str917[sizeof("otherlowercase")];
+    char uniname2ctype_pool_str919[sizeof("phli")];
+    char uniname2ctype_pool_str920[sizeof("cased")];
+    char uniname2ctype_pool_str923[sizeof("hang")];
+    char uniname2ctype_pool_str931[sizeof("xpeo")];
+    char uniname2ctype_pool_str933[sizeof("lower")];
+    char uniname2ctype_pool_str936[sizeof("modifierletter")];
+    char uniname2ctype_pool_str938[sizeof("inphoneticextensions")];
+    char uniname2ctype_pool_str939[sizeof("inarabicpresentationformsa")];
+    char uniname2ctype_pool_str943[sizeof("innumberforms")];
+    char uniname2ctype_pool_str945[sizeof("oldpersian")];
+    char uniname2ctype_pool_str946[sizeof("incyrillicextendeda")];
+    char uniname2ctype_pool_str947[sizeof("inverticalforms")];
+    char uniname2ctype_pool_str949[sizeof("p")];
+    char uniname2ctype_pool_str950[sizeof("inbyzantinemusicalsymbols")];
+    char uniname2ctype_pool_str951[sizeof("inmathematicaloperators")];
+    char uniname2ctype_pool_str952[sizeof("intibetan")];
+    char uniname2ctype_pool_str953[sizeof("zp")];
+    char uniname2ctype_pool_str956[sizeof("ingeorgian")];
+    char uniname2ctype_pool_str960[sizeof("inbraillepatterns")];
+    char uniname2ctype_pool_str962[sizeof("lepcha")];
+    char uniname2ctype_pool_str963[sizeof("geor")];
+    char uniname2ctype_pool_str964[sizeof("invedicextensions")];
+    char uniname2ctype_pool_str965[sizeof("linb")];
+    char uniname2ctype_pool_str966[sizeof("other")];
+    char uniname2ctype_pool_str970[sizeof("deva")];
+    char uniname2ctype_pool_str972[sizeof("indevanagari")];
+    char uniname2ctype_pool_str973[sizeof("othernumber")];
+    char uniname2ctype_pool_str974[sizeof("bamum")];
+    char uniname2ctype_pool_str976[sizeof("shrd")];
+    char uniname2ctype_pool_str977[sizeof("bali")];
+    char uniname2ctype_pool_str981[sizeof("devanagari")];
+    char uniname2ctype_pool_str983[sizeof("extender")];
+    char uniname2ctype_pool_str988[sizeof("inherited")];
+    char uniname2ctype_pool_str989[sizeof("glagolitic")];
+    char uniname2ctype_pool_str990[sizeof("tibt")];
+    char uniname2ctype_pool_str994[sizeof("inbalinese")];
+    char uniname2ctype_pool_str996[sizeof("ingothic")];
+    char uniname2ctype_pool_str997[sizeof("inmiscellaneousmathematicalsymbolsb")];
+    char uniname2ctype_pool_str998[sizeof("limb")];
+    char uniname2ctype_pool_str1000[sizeof("bengali")];
+    char uniname2ctype_pool_str1003[sizeof("phoenician")];
+    char uniname2ctype_pool_str1004[sizeof("insuperscriptsandsubscripts")];
+    char uniname2ctype_pool_str1006[sizeof("inmeroitichieroglyphs")];
+    char uniname2ctype_pool_str1007[sizeof("tibetan")];
+    char uniname2ctype_pool_str1010[sizeof("inphoneticextensionssupplement")];
+    char uniname2ctype_pool_str1016[sizeof("balinese")];
+    char uniname2ctype_pool_str1021[sizeof("lowercaseletter")];
+    char uniname2ctype_pool_str1031[sizeof("indingbats")];
+    char uniname2ctype_pool_str1035[sizeof("inprivateusearea")];
+    char uniname2ctype_pool_str1039[sizeof("assigned")];
+    char uniname2ctype_pool_str1044[sizeof("patternsyntax")];
+    char uniname2ctype_pool_str1051[sizeof("inhangulsyllables")];
+    char uniname2ctype_pool_str1065[sizeof("sarb")];
+    char uniname2ctype_pool_str1067[sizeof("brai")];
+    char uniname2ctype_pool_str1069[sizeof("insupplementalmathematicaloperators")];
+    char uniname2ctype_pool_str1070[sizeof("phnx")];
+    char uniname2ctype_pool_str1072[sizeof("ingreekextended")];
+    char uniname2ctype_pool_str1074[sizeof("otherletter")];
+    char uniname2ctype_pool_str1076[sizeof("arab")];
+    char uniname2ctype_pool_str1078[sizeof("inlatinextendedd")];
+    char uniname2ctype_pool_str1081[sizeof("word")];
+    char uniname2ctype_pool_str1084[sizeof("inphagspa")];
+    char uniname2ctype_pool_str1087[sizeof("inblockelements")];
+    char uniname2ctype_pool_str1092[sizeof("ethiopic")];
+    char uniname2ctype_pool_str1094[sizeof("inethiopicextendeda")];
+    char uniname2ctype_pool_str1107[sizeof("brahmi")];
+    char uniname2ctype_pool_str1110[sizeof("logicalorderexception")];
+    char uniname2ctype_pool_str1114[sizeof("inoldpersian")];
+    char uniname2ctype_pool_str1129[sizeof("inletterlikesymbols")];
+    char uniname2ctype_pool_str1133[sizeof("sorasompeng")];
+    char uniname2ctype_pool_str1135[sizeof("hiragana")];
+    char uniname2ctype_pool_str1142[sizeof("inhanguljamoextendeda")];
+    char uniname2ctype_pool_str1147[sizeof("othermath")];
+    char uniname2ctype_pool_str1150[sizeof("digit")];
+    char uniname2ctype_pool_str1151[sizeof("goth")];
+    char uniname2ctype_pool_str1156[sizeof("ogham")];
+    char uniname2ctype_pool_str1162[sizeof("sundanese")];
+    char uniname2ctype_pool_str1170[sizeof("saurashtra")];
+    char uniname2ctype_pool_str1173[sizeof("linearb")];
+    char uniname2ctype_pool_str1179[sizeof("graphemebase")];
+    char uniname2ctype_pool_str1185[sizeof("inunifiedcanadianaboriginalsyllabics")];
+    char uniname2ctype_pool_str1186[sizeof("cuneiform")];
+    char uniname2ctype_pool_str1188[sizeof("inkannada")];
+    char uniname2ctype_pool_str1190[sizeof("kana")];
+    char uniname2ctype_pool_str1195[sizeof("inancientgreeknumbers")];
+    char uniname2ctype_pool_str1196[sizeof("incjkstrokes")];
+    char uniname2ctype_pool_str1198[sizeof("inglagolitic")];
+    char uniname2ctype_pool_str1202[sizeof("inancientgreekmusicalnotation")];
+    char uniname2ctype_pool_str1212[sizeof("inchakma")];
+    char uniname2ctype_pool_str1215[sizeof("plrd")];
+    char uniname2ctype_pool_str1219[sizeof("inbrahmi")];
+    char uniname2ctype_pool_str1224[sizeof("cakm")];
+    char uniname2ctype_pool_str1225[sizeof("incjkcompatibilityforms")];
+    char uniname2ctype_pool_str1229[sizeof("lisu")];
+    char uniname2ctype_pool_str1230[sizeof("incjkcompatibilityideographs")];
+    char uniname2ctype_pool_str1231[sizeof("intagalog")];
+    char uniname2ctype_pool_str1244[sizeof("inkaithi")];
+    char uniname2ctype_pool_str1245[sizeof("insupplementalarrowsa")];
+    char uniname2ctype_pool_str1249[sizeof("takri")];
+    char uniname2ctype_pool_str1253[sizeof("ideographic")];
+    char uniname2ctype_pool_str1256[sizeof("hexdigit")];
+    char uniname2ctype_pool_str1259[sizeof("glag")];
+    char uniname2ctype_pool_str1261[sizeof("softdotted")];
+    char uniname2ctype_pool_str1262[sizeof("variationselector")];
+    char uniname2ctype_pool_str1264[sizeof("inkatakana")];
+    char uniname2ctype_pool_str1265[sizeof("meeteimayek")];
+    char uniname2ctype_pool_str1274[sizeof("otherpunctuation")];
+    char uniname2ctype_pool_str1279[sizeof("inhanguljamo")];
+    char uniname2ctype_pool_str1282[sizeof("kali")];
+    char uniname2ctype_pool_str1289[sizeof("braille")];
+    char uniname2ctype_pool_str1298[sizeof("incombininghalfmarks")];
+    char uniname2ctype_pool_str1300[sizeof("talu")];
+    char uniname2ctype_pool_str1302[sizeof("incjkcompatibilityideographssupplement")];
+    char uniname2ctype_pool_str1306[sizeof("telu")];
+    char uniname2ctype_pool_str1307[sizeof("idsb")];
+    char uniname2ctype_pool_str1310[sizeof("tglg")];
+    char uniname2ctype_pool_str1313[sizeof("inmeeteimayek")];
+    char uniname2ctype_pool_str1315[sizeof("yi")];
+    char uniname2ctype_pool_str1318[sizeof("phagspa")];
+    char uniname2ctype_pool_str1321[sizeof("yiii")];
+    char uniname2ctype_pool_str1323[sizeof("inarabicmathematicalalphabeticsymbols")];
+    char uniname2ctype_pool_str1328[sizeof("saur")];
+    char uniname2ctype_pool_str1330[sizeof("ogrext")];
+    char uniname2ctype_pool_str1334[sizeof("bidic")];
+    char uniname2ctype_pool_str1341[sizeof("inkanasupplement")];
+    char uniname2ctype_pool_str1343[sizeof("runic")];
+    char uniname2ctype_pool_str1344[sizeof("inalchemicalsymbols")];
+    char uniname2ctype_pool_str1350[sizeof("georgian")];
+    char uniname2ctype_pool_str1351[sizeof("inugaritic")];
+    char uniname2ctype_pool_str1354[sizeof("insaurashtra")];
+    char uniname2ctype_pool_str1356[sizeof("inhighprivateusesurrogates")];
+    char uniname2ctype_pool_str1362[sizeof("pd")];
+    char uniname2ctype_pool_str1372[sizeof("incountingrodnumerals")];
+    char uniname2ctype_pool_str1377[sizeof("inarabicextendeda")];
+    char uniname2ctype_pool_str1389[sizeof("inkharoshthi")];
+    char uniname2ctype_pool_str1393[sizeof("idstrinaryoperator")];
+    char uniname2ctype_pool_str1396[sizeof("phag")];
+    char uniname2ctype_pool_str1398[sizeof("brah")];
+    char uniname2ctype_pool_str1402[sizeof("mark")];
+    char uniname2ctype_pool_str1404[sizeof("hebr")];
+    char uniname2ctype_pool_str1411[sizeof("inkhmersymbols")];
+    char uniname2ctype_pool_str1413[sizeof("dep")];
+    char uniname2ctype_pool_str1416[sizeof("inkhmer")];
+    char uniname2ctype_pool_str1422[sizeof("deprecated")];
+    char uniname2ctype_pool_str1424[sizeof("rejang")];
+    char uniname2ctype_pool_str1429[sizeof("lyci")];
+    char uniname2ctype_pool_str1431[sizeof("intakri")];
+    char uniname2ctype_pool_str1432[sizeof("takr")];
+    char uniname2ctype_pool_str1435[sizeof("incyrillicsupplement")];
+    char uniname2ctype_pool_str1436[sizeof("changeswhencasefolded")];
+    char uniname2ctype_pool_str1438[sizeof("indevanagariextended")];
+    char uniname2ctype_pool_str1442[sizeof("lycian")];
+    char uniname2ctype_pool_str1443[sizeof("inbengali")];
+    char uniname2ctype_pool_str1448[sizeof("beng")];
+    char uniname2ctype_pool_str1450[sizeof("graph")];
+    char uniname2ctype_pool_str1452[sizeof("inyijinghexagramsymbols")];
+    char uniname2ctype_pool_str1457[sizeof("olck")];
+    char uniname2ctype_pool_str1460[sizeof("inarabicsupplement")];
+    char uniname2ctype_pool_str1462[sizeof("inbuginese")];
+    char uniname2ctype_pool_str1463[sizeof("changeswhencasemapped")];
+    char uniname2ctype_pool_str1468[sizeof("olchiki")];
+    char uniname2ctype_pool_str1478[sizeof("inaegeannumbers")];
+    char uniname2ctype_pool_str1479[sizeof("mlym")];
+    char uniname2ctype_pool_str1480[sizeof("alphabetic")];
+    char uniname2ctype_pool_str1492[sizeof("sylotinagri")];
+    char uniname2ctype_pool_str1498[sizeof("changeswhentitlecased")];
+    char uniname2ctype_pool_str1504[sizeof("tagalog")];
+    char uniname2ctype_pool_str1505[sizeof("tagb")];
+    char uniname2ctype_pool_str1506[sizeof("runr")];
+    char uniname2ctype_pool_str1510[sizeof("malayalam")];
+    char uniname2ctype_pool_str1512[sizeof("inoriya")];
+    char uniname2ctype_pool_str1516[sizeof("intagbanwa")];
+    char uniname2ctype_pool_str1517[sizeof("syrc")];
+    char uniname2ctype_pool_str1519[sizeof("nko")];
+    char uniname2ctype_pool_str1520[sizeof("nkoo")];
+    char uniname2ctype_pool_str1523[sizeof("inethiopicextended")];
+    char uniname2ctype_pool_str1525[sizeof("kaithi")];
+    char uniname2ctype_pool_str1530[sizeof("mathsymbol")];
+    char uniname2ctype_pool_str1531[sizeof("inyiradicals")];
+    char uniname2ctype_pool_str1536[sizeof("insupplementaryprivateuseareaa")];
+    char uniname2ctype_pool_str1540[sizeof("osmanya")];
+    char uniname2ctype_pool_str1546[sizeof("syriac")];
+    char uniname2ctype_pool_str1548[sizeof("otherdefaultignorablecodepoint")];
+    char uniname2ctype_pool_str1561[sizeof("number")];
+    char uniname2ctype_pool_str1565[sizeof("inlinearbsyllabary")];
+    char uniname2ctype_pool_str1566[sizeof("kthi")];
+    char uniname2ctype_pool_str1567[sizeof("sund")];
+    char uniname2ctype_pool_str1569[sizeof("mymr")];
+    char uniname2ctype_pool_str1571[sizeof("incombiningdiacriticalmarks")];
+    char uniname2ctype_pool_str1578[sizeof("enclosingmark")];
+    char uniname2ctype_pool_str1581[sizeof("incombiningdiacriticalmarksforsymbols")];
+    char uniname2ctype_pool_str1583[sizeof("inethiopicsupplement")];
+    char uniname2ctype_pool_str1590[sizeof("unassigned")];
+    char uniname2ctype_pool_str1591[sizeof("sylo")];
+    char uniname2ctype_pool_str1595[sizeof("combiningmark")];
+    char uniname2ctype_pool_str1598[sizeof("myanmar")];
+    char uniname2ctype_pool_str1605[sizeof("graphemeextend")];
+    char uniname2ctype_pool_str1606[sizeof("bidicontrol")];
+    char uniname2ctype_pool_str1609[sizeof("inhalfwidthandfullwidthforms")];
+    char uniname2ctype_pool_str1617[sizeof("cyrl")];
+    char uniname2ctype_pool_str1620[sizeof("knda")];
+    char uniname2ctype_pool_str1634[sizeof("inunifiedcanadianaboriginalsyllabicsextended")];
+    char uniname2ctype_pool_str1635[sizeof("xsux")];
+    char uniname2ctype_pool_str1636[sizeof("modifiersymbol")];
+    char uniname2ctype_pool_str1643[sizeof("incombiningdiacriticalmarkssupplement")];
+    char uniname2ctype_pool_str1645[sizeof("inhanunoo")];
+    char uniname2ctype_pool_str1648[sizeof("inbuhid")];
+    char uniname2ctype_pool_str1649[sizeof("kannada")];
+    char uniname2ctype_pool_str1658[sizeof("inhebrew")];
+    char uniname2ctype_pool_str1662[sizeof("grbase")];
+    char uniname2ctype_pool_str1664[sizeof("spacingmark")];
+    char uniname2ctype_pool_str1670[sizeof("inkatakanaphoneticextensions")];
+    char uniname2ctype_pool_str1676[sizeof("hangul")];
+    char uniname2ctype_pool_str1683[sizeof("incjksymbolsandpunctuation")];
+    char uniname2ctype_pool_str1688[sizeof("bopo")];
+    char uniname2ctype_pool_str1692[sizeof("orya")];
+    char uniname2ctype_pool_str1699[sizeof("inbopomofo")];
+    char uniname2ctype_pool_str1701[sizeof("kharoshthi")];
+    char uniname2ctype_pool_str1703[sizeof("khar")];
+    char uniname2ctype_pool_str1709[sizeof("changeswhenlowercased")];
+    char uniname2ctype_pool_str1724[sizeof("khmr")];
+    char uniname2ctype_pool_str1725[sizeof("punct")];
+    char uniname2ctype_pool_str1729[sizeof("symbol")];
+    char uniname2ctype_pool_str1732[sizeof("cherokee")];
+    char uniname2ctype_pool_str1737[sizeof("cyrillic")];
+    char uniname2ctype_pool_str1759[sizeof("inkangxiradicals")];
+    char uniname2ctype_pool_str1761[sizeof("hebrew")];
+    char uniname2ctype_pool_str1780[sizeof("inarabicpresentationformsb")];
+    char uniname2ctype_pool_str1787[sizeof("incyrillicextendedb")];
+    char uniname2ctype_pool_str1790[sizeof("ugaritic")];
+    char uniname2ctype_pool_str1829[sizeof("incurrencysymbols")];
+    char uniname2ctype_pool_str1831[sizeof("meroitichieroglyphs")];
+    char uniname2ctype_pool_str1835[sizeof("inhighsurrogates")];
+    char uniname2ctype_pool_str1853[sizeof("nonspacingmark")];
+    char uniname2ctype_pool_str1858[sizeof("lydi")];
+    char uniname2ctype_pool_str1864[sizeof("patsyn")];
+    char uniname2ctype_pool_str1868[sizeof("orkh")];
+    char uniname2ctype_pool_str1871[sizeof("lydian")];
+    char uniname2ctype_pool_str1896[sizeof("ugar")];
+    char uniname2ctype_pool_str1899[sizeof("othergraphemeextend")];
+    char uniname2ctype_pool_str1900[sizeof("inlatinextendedb")];
+    char uniname2ctype_pool_str1904[sizeof("bopomofo")];
+    char uniname2ctype_pool_str1917[sizeof("khmer")];
+    char uniname2ctype_pool_str1925[sizeof("uideo")];
+    char uniname2ctype_pool_str1932[sizeof("otheruppercase")];
+    char uniname2ctype_pool_str1944[sizeof("grek")];
+    char uniname2ctype_pool_str1949[sizeof("gujr")];
+    char uniname2ctype_pool_str1970[sizeof("gujarati")];
+    char uniname2ctype_pool_str1983[sizeof("inhanguljamoextendedb")];
+    char uniname2ctype_pool_str1988[sizeof("defaultignorablecodepoint")];
+    char uniname2ctype_pool_str2005[sizeof("inplayingcards")];
+    char uniname2ctype_pool_str2022[sizeof("bamu")];
+    char uniname2ctype_pool_str2028[sizeof("inkanbun")];
+    char uniname2ctype_pool_str2033[sizeof("incjkradicalssupplement")];
+    char uniname2ctype_pool_str2046[sizeof("cypriot")];
+    char uniname2ctype_pool_str2051[sizeof("inbamum")];
+    char uniname2ctype_pool_str2053[sizeof("inmeroiticcursive")];
+    char uniname2ctype_pool_str2055[sizeof("oldturkic")];
+    char uniname2ctype_pool_str2086[sizeof("insupplementalarrowsb")];
+    char uniname2ctype_pool_str2087[sizeof("surrogate")];
+    char uniname2ctype_pool_str2094[sizeof("batk")];
+    char uniname2ctype_pool_str2102[sizeof("inbatak")];
+    char uniname2ctype_pool_str2119[sizeof("inlimbu")];
+    char uniname2ctype_pool_str2123[sizeof("incypriotsyllabary")];
+    char uniname2ctype_pool_str2129[sizeof("dashpunctuation")];
+    char uniname2ctype_pool_str2130[sizeof("innoblock")];
+    char uniname2ctype_pool_str2141[sizeof("hyphen")];
+    char uniname2ctype_pool_str2162[sizeof("insupplementalpunctuation")];
+    char uniname2ctype_pool_str2165[sizeof("ingeorgiansupplement")];
+    char uniname2ctype_pool_str2178[sizeof("oupper")];
+    char uniname2ctype_pool_str2189[sizeof("paragraphseparator")];
+    char uniname2ctype_pool_str2194[sizeof("inbamumsupplement")];
+    char uniname2ctype_pool_str2299[sizeof("uppercase")];
+    char uniname2ctype_pool_str2313[sizeof("currencysymbol")];
+    char uniname2ctype_pool_str2322[sizeof("sk")];
+    char uniname2ctype_pool_str2338[sizeof("lu")];
+    char uniname2ctype_pool_str2342[sizeof("openpunctuation")];
+    char uniname2ctype_pool_str2349[sizeof("inlisu")];
+    char uniname2ctype_pool_str2371[sizeof("qmark")];
+    char uniname2ctype_pool_str2372[sizeof("egyp")];
+    char uniname2ctype_pool_str2377[sizeof("insupplementaryprivateuseareab")];
+    char uniname2ctype_pool_str2379[sizeof("limbu")];
+    char uniname2ctype_pool_str2400[sizeof("inegyptianhieroglyphs")];
+    char uniname2ctype_pool_str2401[sizeof("unifiedideograph")];
+    char uniname2ctype_pool_str2413[sizeof("intelugu")];
+    char uniname2ctype_pool_str2429[sizeof("katakana")];
+    char uniname2ctype_pool_str2442[sizeof("inhangulcompatibilityjamo")];
+    char uniname2ctype_pool_str2454[sizeof("upper")];
+    char uniname2ctype_pool_str2495[sizeof("inkayahli")];
+    char uniname2ctype_pool_str2515[sizeof("cwu")];
+    char uniname2ctype_pool_str2523[sizeof("incjkcompatibility")];
+    char uniname2ctype_pool_str2542[sizeof("uppercaseletter")];
+    char uniname2ctype_pool_str2549[sizeof("bugi")];
+    char uniname2ctype_pool_str2588[sizeof("buginese")];
+    char uniname2ctype_pool_str2627[sizeof("any")];
+    char uniname2ctype_pool_str2651[sizeof("inyisyllables")];
+    char uniname2ctype_pool_str2671[sizeof("inbopomofoextended")];
+    char uniname2ctype_pool_str2710[sizeof("inboxdrawing")];
+    char uniname2ctype_pool_str2724[sizeof("changeswhenuppercased")];
+    char uniname2ctype_pool_str2727[sizeof("unknown")];
+    char uniname2ctype_pool_str2737[sizeof("quotationmark")];
+    char uniname2ctype_pool_str2753[sizeof("buhd")];
+    char uniname2ctype_pool_str2785[sizeof("punctuation")];
+    char uniname2ctype_pool_str2888[sizeof("oldsoutharabian")];
+    char uniname2ctype_pool_str2925[sizeof("kayahli")];
+    char uniname2ctype_pool_str2940[sizeof("incjkunifiedideographs")];
+    char uniname2ctype_pool_str2961[sizeof("incjkunifiedideographsextensiona")];
+    char uniname2ctype_pool_str2962[sizeof("incjkunifiedideographsextensionc")];
+    char uniname2ctype_pool_str2995[sizeof("telugu")];
+    char uniname2ctype_pool_str3000[sizeof("guru")];
+    char uniname2ctype_pool_str3104[sizeof("greek")];
+    char uniname2ctype_pool_str3189[sizeof("grlink")];
+    char uniname2ctype_pool_str3197[sizeof("buhid")];
+    char uniname2ctype_pool_str3254[sizeof("batak")];
+    char uniname2ctype_pool_str3292[sizeof("blank")];
+    char uniname2ctype_pool_str3391[sizeof("incjkunifiedideographsextensiond")];
+    char uniname2ctype_pool_str3459[sizeof("graphemelink")];
+    char uniname2ctype_pool_str3480[sizeof("egyptianhieroglyphs")];
+    char uniname2ctype_pool_str3802[sizeof("incjkunifiedideographsextensionb")];
+    char uniname2ctype_pool_str3922[sizeof("zyyy")];
+    char uniname2ctype_pool_str4167[sizeof("gurmukhi")];
+#endif /* USE_UNICODE_PROPERTIES */
+  };
+static const struct uniname2ctype_pool_t uniname2ctype_pool_contents =
+  {
+#ifndef USE_UNICODE_PROPERTIES
+    "word",
+    "print",
+    "punct",
+    "alpha",
+    "alnum",
+    "xdigit",
+    "upper",
+#else /* USE_UNICODE_PROPERTIES */
+    "n",
+    "s",
+    "z",
+    "zs",
+    "zzzz",
+    "cn",
+    "cs",
+    "ci",
+    "c",
+    "cf",
+    "sc",
+    "cans",
+    "qaai",
+    "mn",
+#endif /* USE_UNICODE_PROPERTIES */
+    "ascii",
+#ifdef USE_UNICODE_PROPERTIES
+    "cc",
+    "qaac",
+    "inavestan",
+    "inspecials",
+    "inipaextensions",
+    "mc",
+    "insamaritan",
+    "m",
+    "sm",
+    "me",
+    "inarmenian",
+    "incuneiform",
+    "mandaic",
+    "inancientsymbols",
+    "incuneiformnumbersandpunctuation",
+    "inthai",
+    "inmusicalsymbols",
+    "inmiscellaneoussymbols",
+    "incham",
+    "inmiscellaneoussymbolsandarrows",
+    "initialpunctuation",
+    "inmiscellaneoussymbolsandpictographs",
+    "inthaana",
+    "taile",
+    "mtei",
+    "lc",
+    "lana",
+    "inlycian",
+    "intransportandmapsymbols",
+    "incontrolpictures",
+    "sinhala",
+    "incommonindicnumberforms",
+    "inmiscellaneousmathematicalsymbolsa",
+    "sterm",
+    "inmyanmarextendeda",
+    "lm",
+    "taiviet",
+    "inlinearbideograms",
+    "intaitham",
+    "latn",
+    "latin",
+    "ital",
+    "alnum",
+    "inmalayalam",
+    "intaile",
+    "tale",
+    "l",
+    "nl",
+    "zl",
+    "intamil",
+    "taml",
+    "inlatinextendeda",
+    "inlatinextendedc",
+    "inrunic",
+    "incarian",
+    "insyriac",
+    "cari",
+    "inmeeteimayekextensions",
+    "osma",
+    "lt",
+    "miao",
+    "insharada",
+    "incyrillic",
+    "carian",
+    "armn",
+    "samr",
+    "armi",
+    "inideographicdescriptioncharacters",
+    "inosmanya",
+    "armenian",
+    "inmyanmar",
+    "samaritan",
+    "arabic",
+    "incherokee",
+    "connectorpunctuation",
+    "merc",
+    "inmiscellaneoustechnical",
+    "inenclosedalphanumerics",
+    "inemoticons",
+    "joinc",
+#endif /* USE_UNICODE_PROPERTIES */
+    "cntrl",
+#ifdef USE_UNICODE_PROPERTIES
+    "inenclosedcjklettersandmonths",
+    "cwcf",
+    "inruminumeralsymbols",
+    "ll",
+    "term",
+    "inlatinextendedadditional",
+    "tamil",
+    "loe",
+    "newtailue",
+    "cwcm",
+    "inenclosedalphanumericsupplement",
+    "sinh",
+    "zinh",
+    "meroiticcursive",
+    "han",
+    "hani",
+    "inopticalcharacterrecognition",
+    "no",
+    "so",
+    "innewtailue",
+    "insinhala",
+    "innko",
+    "co",
+    "shavian",
+    "terminalpunctuation",
+    "intaixuanjingsymbols",
+    "inethiopic",
+    "sora",
+    "inarrows",
+    "cham",
+    "inlowsurrogates",
+    "oriya",
+    "ext",
+    "cwt",
+    "common",
+    "inmiao",
+    "thai",
+    "intifinagh",
+    "ethi",
+    "mero",
+    "chakma",
+    "thaa",
+    "inscriptionalparthian",
+    "tifinagh",
+    "titlecaseletter",
+    "thaana",
+    "asciihexdigit",
+    "math",
+    "di",
+    "ids",
+    "lo",
+    "inlao",
+    "taitham",
+    "lao",
+    "laoo",
+    "dia",
+    "idc",
+    "ps",
+    "insundanese",
+    "pi",
+    "cwl",
+    "pf",
+    "mand",
+    "insylotinagri",
+    "vs",
+    "mongolian",
+    "pc",
+    "inmandaic",
+    "invai",
+    "lineseparator",
+    "pe",
+    "vai",
+    "vaii",
+    "idst",
+    "indominotiles",
+    "inshavian",
+    "inspacingmodifierletters",
+    "format",
+    "inphaistosdisc",
+    "hano",
+#endif /* USE_UNICODE_PROPERTIES */
+    "space",
+#ifdef USE_UNICODE_PROPERTIES
+    "indeseret",
+    "inolchiki",
+    "hira",
+    "joincontrol",
+    "idcontinue",
+    "inmahjongtiles",
+    "patws",
+    "inlydian",
+    "cher",
+    "inhiragana",
+    "inogham",
+    "avst",
+    "inscriptionalpahlavi",
+    "incoptic",
+    "java",
+    "inmathematicalalphanumericsymbols",
+    "letter",
+    "injavanese",
+    "avestan",
+    "age=1.1",
+    "lepc",
+    "age=2.1",
+    "inlepcha",
+    "javanese",
+    "shaw",
+    "finalpunctuation",
+    "alpha",
+    "age=5.1",
+    "inmongolian",
+    "age=5.2",
+    "age=2.0",
+    "ahex",
+    "ingeneralpunctuation",
+    "oids",
+    "odi",
+    "age=5.0",
+    "tavt",
+    "intaiviet",
+    "age=6.1",
+    "age=3.1",
+    "insundanesesupplement",
+    "age=3.2",
+    "age=4.1",
+    "oidc",
+    "tfng",
+    "insmallformvariants",
+    "ideo",
+    "intags",
+    "age=6.0",
+    "age=3.0",
+    "whitespace",
+    "age=4.0",
+    "inolditalic",
+    "oalpha",
+    "ingujarati",
+    "control",
+    "diacritic",
+    "tagbanwa",
+    "inphoenician",
+    "ininscriptionalparthian",
+    "ininscriptionalpahlavi",
+    "coptic",
+    "dsrt",
+    "inmodifiertoneletters",
+    "xids",
+    "hanunoo",
+    "inoldturkic",
+    "xidc",
+    "idstart",
+    "inimperialaramaic",
+    "invariationselectors",
+    "copt",
+    "caseignorable",
+    "prti",
+    "nchar",
+    "deseret",
+    "decimalnumber",
+    "cprt",
+    "inlatin1supplement",
+    "imperialaramaic",
+    "privateuse",
+    "casedletter",
+    "lowercase",
+    "spaceseparator",
+    "radical",
+    "mong",
+    "canadianaboriginal",
+    "letternumber",
+    "insorasompeng",
+    "dash",
+    "wspace",
+    "ogam",
+    "invariationselectorssupplement",
+    "print",
+    "otheridcontinue",
+    "ingurmukhi",
+    "closepunctuation",
+    "olditalic",
+    "noncharactercodepoint",
+    "sharada",
+    "ingeometricshapes",
+    "otheralphabetic",
+    "patternwhitespace",
+    "po",
+    "rjng",
+    "ingreekandcoptic",
+    "xdigit",
+    "gothic",
+    "inoldsoutharabian",
+    "xidstart",
+    "inrejang",
+    "idsbinaryoperator",
+    "olower",
+    "hex",
+    "inenclosedideographicsupplement",
+    "inalphabeticpresentationforms",
+    "inbasiclatin",
+    "othersymbol",
+    "nd",
+    "sd",
+    "omath",
+    "separator",
+    "inarabic",
+    "xidcontinue",
+    "otheridstart",
+    "grext",
+    "otherlowercase",
+    "phli",
+    "cased",
+    "hang",
+    "xpeo",
+#endif /* USE_UNICODE_PROPERTIES */
+    "lower",
+#ifndef USE_UNICODE_PROPERTIES
+    "graph",
+#else /* USE_UNICODE_PROPERTIES */
+    "modifierletter",
+    "inphoneticextensions",
+    "inarabicpresentationformsa",
+    "innumberforms",
+    "oldpersian",
+    "incyrillicextendeda",
+    "inverticalforms",
+    "p",
+    "inbyzantinemusicalsymbols",
+    "inmathematicaloperators",
+    "intibetan",
+    "zp",
+    "ingeorgian",
+    "inbraillepatterns",
+    "lepcha",
+    "geor",
+    "invedicextensions",
+    "linb",
+    "other",
+    "deva",
+    "indevanagari",
+    "othernumber",
+    "bamum",
+    "shrd",
+    "bali",
+    "devanagari",
+    "extender",
+    "inherited",
+    "glagolitic",
+    "tibt",
+    "inbalinese",
+    "ingothic",
+    "inmiscellaneousmathematicalsymbolsb",
+    "limb",
+    "bengali",
+    "phoenician",
+    "insuperscriptsandsubscripts",
+    "inmeroitichieroglyphs",
+    "tibetan",
+    "inphoneticextensionssupplement",
+    "balinese",
+    "lowercaseletter",
+    "indingbats",
+    "inprivateusearea",
+    "assigned",
+    "patternsyntax",
+    "inhangulsyllables",
+    "sarb",
+    "brai",
+    "insupplementalmathematicaloperators",
+    "phnx",
+    "ingreekextended",
+    "otherletter",
+    "arab",
+    "inlatinextendedd",
+    "word",
+    "inphagspa",
+    "inblockelements",
+    "ethiopic",
+    "inethiopicextendeda",
+    "brahmi",
+    "logicalorderexception",
+    "inoldpersian",
+    "inletterlikesymbols",
+    "sorasompeng",
+    "hiragana",
+    "inhanguljamoextendeda",
+    "othermath",
+#endif /* USE_UNICODE_PROPERTIES */
+    "digit",
+#ifndef USE_UNICODE_PROPERTIES
+    "blank"
+#else /* USE_UNICODE_PROPERTIES */
+    "goth",
+    "ogham",
+    "sundanese",
+    "saurashtra",
+    "linearb",
+    "graphemebase",
+    "inunifiedcanadianaboriginalsyllabics",
+    "cuneiform",
+    "inkannada",
+    "kana",
+    "inancientgreeknumbers",
+    "incjkstrokes",
+    "inglagolitic",
+    "inancientgreekmusicalnotation",
+    "inchakma",
+    "plrd",
+    "inbrahmi",
+    "cakm",
+    "incjkcompatibilityforms",
+    "lisu",
+    "incjkcompatibilityideographs",
+    "intagalog",
+    "inkaithi",
+    "insupplementalarrowsa",
+    "takri",
+    "ideographic",
+    "hexdigit",
+    "glag",
+    "softdotted",
+    "variationselector",
+    "inkatakana",
+    "meeteimayek",
+    "otherpunctuation",
+    "inhanguljamo",
+    "kali",
+    "braille",
+    "incombininghalfmarks",
+    "talu",
+    "incjkcompatibilityideographssupplement",
+    "telu",
+    "idsb",
+    "tglg",
+    "inmeeteimayek",
+    "yi",
+    "phagspa",
+    "yiii",
+    "inarabicmathematicalalphabeticsymbols",
+    "saur",
+    "ogrext",
+    "bidic",
+    "inkanasupplement",
+    "runic",
+    "inalchemicalsymbols",
+    "georgian",
+    "inugaritic",
+    "insaurashtra",
+    "inhighprivateusesurrogates",
+    "pd",
+    "incountingrodnumerals",
+    "inarabicextendeda",
+    "inkharoshthi",
+    "idstrinaryoperator",
+    "phag",
+    "brah",
+    "mark",
+    "hebr",
+    "inkhmersymbols",
+    "dep",
+    "inkhmer",
+    "deprecated",
+    "rejang",
+    "lyci",
+    "intakri",
+    "takr",
+    "incyrillicsupplement",
+    "changeswhencasefolded",
+    "indevanagariextended",
+    "lycian",
+    "inbengali",
+    "beng",
+    "graph",
+    "inyijinghexagramsymbols",
+    "olck",
+    "inarabicsupplement",
+    "inbuginese",
+    "changeswhencasemapped",
+    "olchiki",
+    "inaegeannumbers",
+    "mlym",
+    "alphabetic",
+    "sylotinagri",
+    "changeswhentitlecased",
+    "tagalog",
+    "tagb",
+    "runr",
+    "malayalam",
+    "inoriya",
+    "intagbanwa",
+    "syrc",
+    "nko",
+    "nkoo",
+    "inethiopicextended",
+    "kaithi",
+    "mathsymbol",
+    "inyiradicals",
+    "insupplementaryprivateuseareaa",
+    "osmanya",
+    "syriac",
+    "otherdefaultignorablecodepoint",
+    "number",
+    "inlinearbsyllabary",
+    "kthi",
+    "sund",
+    "mymr",
+    "incombiningdiacriticalmarks",
+    "enclosingmark",
+    "incombiningdiacriticalmarksforsymbols",
+    "inethiopicsupplement",
+    "unassigned",
+    "sylo",
+    "combiningmark",
+    "myanmar",
+    "graphemeextend",
+    "bidicontrol",
+    "inhalfwidthandfullwidthforms",
+    "cyrl",
+    "knda",
+    "inunifiedcanadianaboriginalsyllabicsextended",
+    "xsux",
+    "modifiersymbol",
+    "incombiningdiacriticalmarkssupplement",
+    "inhanunoo",
+    "inbuhid",
+    "kannada",
+    "inhebrew",
+    "grbase",
+    "spacingmark",
+    "inkatakanaphoneticextensions",
+    "hangul",
+    "incjksymbolsandpunctuation",
+    "bopo",
+    "orya",
+    "inbopomofo",
+    "kharoshthi",
+    "khar",
+    "changeswhenlowercased",
+    "khmr",
+    "punct",
+    "symbol",
+    "cherokee",
+    "cyrillic",
+    "inkangxiradicals",
+    "hebrew",
+    "inarabicpresentationformsb",
+    "incyrillicextendedb",
+    "ugaritic",
+    "incurrencysymbols",
+    "meroitichieroglyphs",
+    "inhighsurrogates",
+    "nonspacingmark",
+    "lydi",
+    "patsyn",
+    "orkh",
+    "lydian",
+    "ugar",
+    "othergraphemeextend",
+    "inlatinextendedb",
+    "bopomofo",
+    "khmer",
+    "uideo",
+    "otheruppercase",
+    "grek",
+    "gujr",
+    "gujarati",
+    "inhanguljamoextendedb",
+    "defaultignorablecodepoint",
+    "inplayingcards",
+    "bamu",
+    "inkanbun",
+    "incjkradicalssupplement",
+    "cypriot",
+    "inbamum",
+    "inmeroiticcursive",
+    "oldturkic",
+    "insupplementalarrowsb",
+    "surrogate",
+    "batk",
+    "inbatak",
+    "inlimbu",
+    "incypriotsyllabary",
+    "dashpunctuation",
+    "innoblock",
+    "hyphen",
+    "insupplementalpunctuation",
+    "ingeorgiansupplement",
+    "oupper",
+    "paragraphseparator",
+    "inbamumsupplement",
+    "uppercase",
+    "currencysymbol",
+    "sk",
+    "lu",
+    "openpunctuation",
+    "inlisu",
+    "qmark",
+    "egyp",
+    "insupplementaryprivateuseareab",
+    "limbu",
+    "inegyptianhieroglyphs",
+    "unifiedideograph",
+    "intelugu",
+    "katakana",
+    "inhangulcompatibilityjamo",
+    "upper",
+    "inkayahli",
+    "cwu",
+    "incjkcompatibility",
+    "uppercaseletter",
+    "bugi",
+    "buginese",
+    "any",
+    "inyisyllables",
+    "inbopomofoextended",
+    "inboxdrawing",
+    "changeswhenuppercased",
+    "unknown",
+    "quotationmark",
+    "buhd",
+    "punctuation",
+    "oldsoutharabian",
+    "kayahli",
+    "incjkunifiedideographs",
+    "incjkunifiedideographsextensiona",
+    "incjkunifiedideographsextensionc",
+    "telugu",
+    "guru",
+    "greek",
+    "grlink",
+    "buhid",
+    "batak",
+    "blank",
+    "incjkunifiedideographsextensiond",
+    "graphemelink",
+    "egyptianhieroglyphs",
+    "incjkunifiedideographsextensionb",
+    "zyyy",
+    "gurmukhi"
+#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,                                        34},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str5,                                        46},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str7,                                        51},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str9,                                       54},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                    208},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                       20},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str20,                                       22},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str24,                                       60},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str29,                                        17},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str30,                                       19},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str32,                                       47},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str34,                                    101},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str35,                                    114},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str38,                                       33},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str42,                                    14},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str44,                                       18},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str45,                                    128},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str49,                               401},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str52,                              377},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str62,                         226},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str64,                                       31},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str66,                             239},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str69,                                        30},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str72,                                       49},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str74,                                       32},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str82,                              232},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str84,                             412},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str86,                                 168},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str90,                        382},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str92,        413},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str96,                                  252},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str99,                        419},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str100,                  304},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str106,                                  355},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str109,         312},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str113,                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str114,    430},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str116,                                237},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str124,                                   120},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str125,                                    159},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str132,                                       24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str133,                                    151},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str134,                                384},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str135,                432},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str136,                       298},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str142,                                  92},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str151,                347},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str156,     306},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str158,                                   204},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str167,                      356},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str172,                                       26},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str175,                                 152},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str179,                      379},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str180,                               276},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str184,                                     75},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str186,                                    75},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str187,                                    111},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str189,                                    13},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str199,                             250},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str201,                                 272},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str202,                                    120},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str205,                                        23},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str207,                                       36},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str209,                                       52},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str216,                                 247},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str217,                                     88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str218,                        224},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str220,                        314},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str223,                                 263},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str224,                                385},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str225,                                235},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str227,                                    148},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str230,                 358},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str231,                                    124},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str232,                                       28},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str233,                                    172},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str234,                               410},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str239,                              230},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str240,                                  148},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str244,                                     78},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str245,                                    155},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str247,                                    160},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str248,      323},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str252,                               392},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str253,                                 78},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str254,                               255},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str255,                               155},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str256,                                   80},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str259,                              260},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str261,                     39},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str263,                                    170},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str264,                297},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str268,                 300},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str279,                             431},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str281,                                   178},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str288,                                     3},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str301,           333},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str303,                                     64},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str304,                    405},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str308,                                       25},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str313,                                    182},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str316,               287},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str320,                                    88},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str321,                                     201},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str329,                               129},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str330,                                     65},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str339,        428},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str346,                                     92},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str347,                                    114},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str349,                         170},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str353,                                     109},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str357,                                    109},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str358,           299},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str359,                                       37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str360,                                       50},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str364,                             273},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str365,                               251},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str367,                                   238},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str372,                                       21},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str375,                                 123},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str378,                     182},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str386,                    421},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str387,                              258},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str389,                                    174},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str398,                                295},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str400,                                    150},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str403,                         365},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str405,                                    87},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str406,                                     189},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str409,                                      63},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str412,                                   74},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str414,                                  416},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str420,                                     93},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str425,                              317},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str426,                                     99},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str427,                                    171},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str428,                                  169},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str429,                                     82},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str430,                   162},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str432,                                131},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str436,                          28},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str445,                                   82},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str449,                           185},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str450,                                     55},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str453,                                       70},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str454,                                      66},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str460,                                       27},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str468,                                   253},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str470,                                 151},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str474,                                      94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str475,                                     94},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str476,                                     188},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str478,                                      67},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str480,                                       45},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str481,                             278},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str484,                                       43},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str485,                                      61},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str490,                                       42},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str495,                                    168},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str496,                           346},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str497,                                      205},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str503,                               105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str504,                                       39},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str506,                               240},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str509,                                   341},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str511,                            52},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str514,                                       41},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str515,                                     143},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str516,                                    143},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str517,                                    195},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str520,                           426},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str521,                               391},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str522,                227},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str524,                                   19},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str528,                          383},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str531,                                    116},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str532,                                     9},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str542,                               390},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str545,                               281},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str548,                                    106},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str553,                             178},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str555,                               67},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str558,                          425},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str560,                                   206},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str563,                                396},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str564,                                    100},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str568,                              325},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str572,                                 262},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str574,                                    153},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str575,                    163},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str579,                                315},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str587,                                    158},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str589,       423},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str594,                                   23},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str604,                              354},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str608,                                 153},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str612,                                 209},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str613,                                    141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str614,                                 211},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str616,                                280},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str617,                                158},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str618,                                    123},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str619,                         42},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str620,                                     1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str621,                                 218},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str622,                             269},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str623,                                 219},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str626,                                 210},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str627,                                    185},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str630,                    289},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str631,                                    202},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str632,                                     198},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str633,                                 217},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str636,                                    152},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str637,                               357},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str638,                                 221},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str639,                                 213},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str640,                   282},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str641,                                 214},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str642,                                 216},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str643,                                    203},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str646,                                    131},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str647,                     374},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str648,                                    187},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str649,                                  438},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str650,                                 220},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str651,                                 212},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str653,                              176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str654,                                 215},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str655,                             386},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str660,                                  186},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str668,                              245},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str672,                                  18},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str679,                               188},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str682,                                118},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str690,                            395},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str701,                 402},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str703,                  403},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str704,                                  128},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str705,                                    113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str706,                   344},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str709,                                     68},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str713,                                 116},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str715,                             404},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str721,                                     69},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str725,                                  66},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str729,                       394},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str730,                    370},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str734,                                    128},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str737,                            60},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str738,                                    162},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str739,                                   192},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str746,                                 113},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str747,                            35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str748,                                    125},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str750,                      223},
+      {-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_str771,                         160},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str776,                               21},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str777,                              24},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str778,                                57},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str780,                           54},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str784,                                 196},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str787,                                    105},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str788,                      101},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str792,                             36},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str796,                           408},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str797,                                    179},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str798,                                  176},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str799,                                    102},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str802,          439},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str803,                                     7},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str811,                         203},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str815,                              244},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str818,                         41},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str823,                               111},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str824,                   192},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str826,                                 173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str827,                       303},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str830,                         186},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str831,                       206},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str832,                                       44},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str833,                                    146},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str835,                        229},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str841,                                   11},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str850,                                  112},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str851,                       400},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str852,                                 68},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str854,                                352},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str860,                       194},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str867,                                  190},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str869,                                     184},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str870,         429},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str874,           368},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str879,                            222},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str884,                              50},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str889,                                       35},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str890,                                      200},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str900,                                   183},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str901,                                51},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str907,                                234},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str912,                              69},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str913,                            202},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str914,                                    71},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str917,                          190},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str919,                                    163},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str920,                                    59},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str923,                                     98},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str931,                                    133},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str933,                                     6},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str936,                           26},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str938,                    284},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str939,              369},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str943,                           294},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str945,                              133},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str946,                     319},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str947,                         371},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str949,                                        38},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str950,               418},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str951,                 296},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str952,                               254},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str953,                                       53},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str956,                              256},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str960,                       308},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str962,                                  141},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str963,                                     97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str964,                       283},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str965,                                    121},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str966,                                    17},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str970,                                     83},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str972,                            242},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str973,                              37},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str974,                                   157},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str976,                                    173},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str977,                                    135},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str981,                               83},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str983,                                189},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str988,                               114},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str989,                              130},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str990,                                     95},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str994,                              277},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str996,                                387},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str997,     310},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str998,                                    119},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1000,                                  84},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1003,                              137},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1004,             290},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1006,                   397},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1007,                                  95},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1010,          285},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1016,                                135},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1021,                          25},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1031,                              305},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1035,                        366},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1039,                                 16},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1044,                           207},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1051,                       361},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1065,                                    161},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1067,                                    126},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1069,     311},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1070,                                    137},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1072,                         288},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1074,                              27},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1076,                                     80},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1078,                        345},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1081,                                     12},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1084,                               348},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1087,                         302},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1092,                                 99},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1094,                     359},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1107,                                  167},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1110,                   201},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1114,                            389},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1129,                     293},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1133,                             174},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1135,                                106},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1142,                   353},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1147,                               183},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1150,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1151,                                    112},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1156,                                   102},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1162,                               140},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1170,                              144},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1173,                                 121},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1179,                             72},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1185,    261},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1186,                               136},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1188,                               249},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1190,                                    107},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1195,                   381},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1196,                            331},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1198,                            313},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1202,           420},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1212,                                409},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1215,                                    172},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1219,                                406},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1224,                                    169},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1225,                 373},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1229,                                    156},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1230,            367},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1231,                               264},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1244,                                407},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1245,                   307},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1249,                                   175},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1253,                             187},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1256,                                184},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1259,                                    130},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1261,                              200},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1262,                       205},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1264,                              326},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1265,                             159},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1274,                         44},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1279,                            257},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1282,                                    145},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1289,                                 126},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1298,                    372},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1300,                                    129},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1302,  437},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1306,                                     89},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1307,                                    194},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1310,                                    115},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1313,                           360},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1315,                                      110},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1318,                                 138},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1321,                                    110},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1323,   424},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1328,                                    144},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1330,                                  193},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1334,                                   177},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1341,                        417},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1343,                                   103},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1344,                     433},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1350,                                 97},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1351,                              388},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1354,                            349},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1356,              364},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1362,                                       40},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1372,                   422},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1377,                       241},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1389,                            399},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1393,                      195},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1396,                                    138},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1398,                                    167},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1402,                                     30},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1404,                                     79},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1411,                          274},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1413,                                     199},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1416,                                 268},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1422,                              199},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1424,                                  146},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1429,                                    147},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1431,                                 411},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1432,                                    175},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1435,                    231},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1436,                    64},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1438,                    350},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1442,                                  147},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1443,                               243},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1448,                                     84},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1450,                                     5},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1452,                 336},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1457,                                    142},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1460,                      236},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1462,                              275},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1463,                    65},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1468,                                 142},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1478,                         380},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1479,                                     91},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1480,                               56},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1492,                             132},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1498,                    63},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1504,                                 115},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1505,                                    118},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1506,                                    103},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1510,                                91},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1512,                                 246},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1516,                              267},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1517,                                     81},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1519,                                     139},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1520,                                    139},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1523,                      318},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1525,                                  165},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1530,                               49},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1531,                            339},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1536,          440},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1540,                                 124},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1546,                                   81},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1548,          198},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1561,                                   34},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1565,                      378},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1566,                                    165},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1567,                                    140},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1569,                                     96},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1571,             228},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1578,                            32},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1581,   292},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1583,                    259},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1590,                               20},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1591,                                    132},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1595,                            30},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1598,                                  96},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1605,                           71},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1606,                             177},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1609,            376},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1617,                                     77},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1620,                                     90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1634, 270},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1635,                                    136},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1636,                           48},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1643,   286},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1645,                               265},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1648,                                 266},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1649,                                  90},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1658,                                233},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1662,                                   72},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1664,                              31},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1670,            332},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1676,                                   98},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1683,              324},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1688,                                    108},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1692,                                     87},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1699,                              327},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1701,                              134},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1703,                                    134},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1709,                    61},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1724,                                    104},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1725,                                     8},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1729,                                   46},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1732,                                100},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1737,                                 77},
+      {-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_str1759,                        322},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1761,                                   79},
+      {-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_str1780,              375},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1787,                     342},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1790,                                122},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str1829,                       291},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1831,                     171},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1835,                        363},
+      {-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_str1853,                           33},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1858,                                    149},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1864,                                  207},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1868,                                    164},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1871,                                  149},
+      {-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_str1896,                                    122},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1899,                     193},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1900,                        225},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1904,                                108},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1917,                                   104},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1925,                                   197},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1932,                          191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1944,                                     76},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1949,                                     86},
+      {-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_str1970,                                 86},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1983,                   362},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str1988,                70},
+      {-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_str2005,                          427},
+      {-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_str2022,                                    157},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2028,                                329},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2033,                 321},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2046,                                 125},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2051,                                 343},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2053,                       398},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2055,                               164},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2086,                   309},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2087,                                22},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2094,                                    166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2102,                                 279},
+      {-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_str2119,                                 271},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2123,                      393},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2129,                          40},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2130,                               442},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2141,                                  180},
+      {-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_str2162,               320},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2165,                    316},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2178,                                  191},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2189,                       53},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2194,                       415},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2299,                                58},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2313,                           47},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2322,                                       48},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2338,                                       29},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2342,                          45},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2349,                                  340},
+      {-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_str2371,                                   181},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2372,                                    154},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2377,          441},
+      {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2379,                                   119},
+      {-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_str2400,                   414},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2401,                        197},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2413,                                248},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2429,                                107},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2442,               328},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2454,                                    10},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2495,                               351},
+      {-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_str2515,                                      62},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2523,                      334},
+      {-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_str2542,                          29},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2549,                                    127},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2588,                                127},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2627,                                      15},
+      {-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_str2651,                           338},
+      {-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_str2671,                      330},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2710,                            301},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2724,                    62},
+      {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2727,                                 208},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2737,                           181},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2753,                                    117},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2785,                              38},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2888,                         161},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-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_str2925,                                 145},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2940,                  337},
+      {-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_str2961,        335},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str2962,        435},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str2995,                                   89},
+      {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3000,                                     85},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3104,                                    76},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3189,                                   73},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3197,                                   117},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3254,                                   166},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str3292,                                     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}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-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_str3391,        436},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3459,                             73},
+      {-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_str3480,                     154},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-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},
+#ifndef USE_UNICODE_PROPERTIES
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str6,                                     12},
+      {(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,                                    10},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str13,                                    14},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str14,                                     3},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str15,                                     9},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str16,                                     6},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str17,                                     5},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str18,                                     4},
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str19,                                     2}
+#else /* USE_UNICODE_PROPERTIES */
+      {(int)(long)&((struct uniname2ctype_pool_t *)0)->uniname2ctype_pool_str3802,        434},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-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_str3922,                                     74},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
+      {-1}, {-1}, {-1}, {-1}, {-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_str4167,                                 85}
+#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..ff94d68b3b
--- /dev/null
+++ b/enc/unicode/name2ctype.kwd
@@ -0,0 +1,26550 @@
+%{
+#define long size_t
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+static const OnigCodePoint CR_Alpha[] = {
+	540,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
+	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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bac, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x11100, 0x11132,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x11680, 0x116b5,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alpha */
+
+/* '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:]] */
+static const OnigCodePoint CR_Cntrl[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cntrl */
+
+/* 'Digit': [[:Digit:]] */
+static const OnigCodePoint CR_Digit[] = {
+	42,
+	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, 0x19d9,
+	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,
+	0x11066, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x116c0, 0x116c9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	544,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+static const OnigCodePoint CR_Lower[] = {
+	618,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7f8, 0xa7fa,
+	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_Lower */
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	541,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+static const OnigCodePoint CR_Punct[] = {
+	140,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00ab, 0x00ab,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	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,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e3b,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x111c5, 0x111c8,
+	0x12470, 0x12473,
+}; /* CR_Punct */
+
+/* 'Space': [[:Space:]] */
+static const OnigCodePoint CR_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_Space */
+
+/* 'Upper': [[:Upper:]] */
+static const OnigCodePoint CR_Upper[] = {
+	610,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	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_Upper */
+
+/* 'XDigit': [[:XDigit:]] */
+static const OnigCodePoint CR_XDigit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_XDigit */
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	564,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	566,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11132,
+	0x11136, 0x1113f,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b5,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	539,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	541,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x0605,
+	0x061c, 0x061d,
+	0x06dd, 0x06dd,
+	0x070e, 0x070f,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfffb,
+	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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110bd, 0x110bd,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d173, 0x1d17a,
+	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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+#define CR_Cc CR_Cntrl
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	14,
+	0x00ad, 0x00ad,
+	0x0600, 0x0604,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	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[] = {
+	539,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0605, 0x0605,
+	0x061c, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 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[] = {
+	486,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'LC': General Category */
+static const OnigCodePoint CR_LC[] = {
+	113,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02af,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x1d00, 0x1d2b,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1d9a,
+	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,
+	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,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c7b,
+	0x2c7e, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa76f,
+	0xa771, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7fa, 0xa7fa,
+	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_LC */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	611,
+	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, 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,
+	0x0527, 0x0527,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d6b, 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, 0x2c7b,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
+	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[] = {
+	52,
+	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, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2c7c, 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,
+	0xa7f8, 0xa7f9,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0x16f93, 0x16f9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	371,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x10fd, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	0x2135, 0x2138,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf2,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x1b000, 0x1b001,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	608,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	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[] = {
+	204,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0903,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 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, 0x1bad,
+	0x1be6, 0x1bf3,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf6,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x11134,
+	0x11180, 0x11182,
+	0x111b3, 0x111c0,
+	0x116ab, 0x116b7,
+	0x16f51, 0x16f7e,
+	0x16f8f, 0x16f92,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	126,
+	0x0903, 0x0903,
+	0x093b, 0x093b,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094f,
+	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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf3,
+	0x302e, 0x302f,
+	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,
+	0xaaeb, 0xaaeb,
+	0xaaee, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1112c, 0x1112c,
+	0x11182, 0x11182,
+	0x111b3, 0x111b5,
+	0x111bf, 0x111c0,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x16f51, 0x16f7e,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	4,
+	0x0488, 0x0489,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	220,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f92,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	88,
+	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,
+	0x0b72, 0x0b77,
+	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,
+	0x3248, 0x324f,
+	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,
+	0x11052, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x116c0, 0x116c9,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+#define CR_Nd CR_Digit
+
+/* '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[] = {
+	42,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x19da, 0x19da,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3248, 0x324f,
+	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,
+	0x11052, 0x11065,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+#define CR_P CR_Punct
+
+/* '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[] = {
+	16,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	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[] = {
+	135,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e39,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x111c5, 0x111c8,
+	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, 0x00a6,
+	0x00a8, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x058f, 0x058f,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19de, 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, 0x20b9,
+	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, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
+	0x27c7, 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, 0x3247,
+	0x3250, 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,
+	0xfbb2, 0xfbc1,
+	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,
+	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,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	17,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x058f, 0x058f,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b9,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	27,
+	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,
+	0xfbb2, 0xfbc1,
+	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,
+	0x2118, 0x2118,
+	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, 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,
+	0x1eef0, 0x1eef1,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	153,
+	0x00a6, 0x00a6,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19de, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2117,
+	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, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
+	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, 0x3247,
+	0x3250, 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,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+}; /* 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[] = {
+	138,
+	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,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 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, 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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+#define CR_Alphabetic CR_Alpha
+
+/* 'Lowercase': Derived Property */
+#define CR_Lowercase CR_Lower
+
+/* 'Uppercase': Derived Property */
+#define CR_Uppercase CR_Upper
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	119,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa7fa,
+	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[] = {
+	295,
+	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, 0x0604,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20d0, 0x20f0,
+	0x2c7c, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302d,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa69f, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa7f8, 0xa7f9,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf3, 0xaaf4,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
+	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,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f9f,
+	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[] = {
+	571,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	586,
+	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,
+	0x0265, 0x0266,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	587,
+	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,
+	0x0265, 0x0266,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	582,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	104,
+	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,
+	0x0265, 0x0266,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78d,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	488,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	564,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	495,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	571,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	232,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	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,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f92,
+	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[] = {
+	643,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06de, 0x06de,
+	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,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0903, 0x0939,
+	0x093b, 0x093b,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8c,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	0x20a0, 0x20b9,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaeb,
+	0xaaee, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11103, 0x11126,
+	0x1112c, 0x1112c,
+	0x11136, 0x11143,
+	0x11182, 0x111b5,
+	0x111bf, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116aa,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	33,
+	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, 0x1bab,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xaaf6, 0xaaf6,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
+	0x110b9, 0x110b9,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x116b6, 0x116b6,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	157,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b9,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e3b,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	30,
+	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, 0x209c,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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[] = {
+	7,
+	0x0400, 0x0484,
+	0x0487, 0x0527,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa697,
+	0xa69f, 0xa69f,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	6,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0x058f, 0x058f,
+	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[] = {
+	56,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0xfb50, 0xfbc1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* 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[] = {
+	5,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
+	0x0966, 0x0977,
+	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[] = {
+	13,
+	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, 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, 0x0b77,
+}; /* 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[] = {
+	14,
+	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,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	11,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	8,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10ff,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	14,
+	0x1100, 0x11ff,
+	0x302e, 0x302f,
+	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[] = {
+	32,
+	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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+}; /* 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[] = {
+	4,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1b001, 0x1b001,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	8,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	3,
+	0x02ea, 0x02eb,
+	0x3105, 0x312d,
+	0x31a0, 0x31ba,
+}; /* 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, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	25,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x065f, 0x065f,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302d,
+	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, 0x2cf3,
+	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[] = {
+	3,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
+}; /* 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, 0x1bbf,
+	0x1cc0, 0x1cc7,
+}; /* 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[] = {
+	2,
+	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
+}; /* 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[] = {
+	3,
+	0xaae0, 0xaaf6,
+	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 */
+
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
+/* 'Chakma': Script */
+static const OnigCodePoint CR_Chakma[] = {
+	2,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+}; /* CR_Chakma */
+
+/* 'Meroitic_Cursive': Script */
+static const OnigCodePoint CR_Meroitic_Cursive[] = {
+	2,
+	0x109a0, 0x109b7,
+	0x109be, 0x109bf,
+}; /* CR_Meroitic_Cursive */
+
+/* 'Meroitic_Hieroglyphs': Script */
+static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
+	1,
+	0x10980, 0x1099f,
+}; /* CR_Meroitic_Hieroglyphs */
+
+/* 'Miao': Script */
+static const OnigCodePoint CR_Miao[] = {
+	3,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+}; /* CR_Miao */
+
+/* 'Sharada': Script */
+static const OnigCodePoint CR_Sharada[] = {
+	2,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+}; /* CR_Sharada */
+
+/* 'Sora_Sompeng': Script */
+static const OnigCodePoint CR_Sora_Sompeng[] = {
+	2,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+}; /* CR_Sora_Sompeng */
+
+/* 'Takri': Script */
+static const OnigCodePoint CR_Takri[] = {
+	2,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+}; /* CR_Takri */
+
+/* 'White_Space': Binary Property */
+#define CR_White_Space CR_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[] = {
+	20,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	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[] = {
+	70,
+	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,
+	0x085e, 0x085e,
+	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,
+	0xaaf0, 0xaaf1,
+	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,
+	0x11047, 0x1104d,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	133,
+	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,
+	0x2107, 0x2107,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+}; /* 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 */
+#define CR_ASCII_Hex_Digit CR_XDigit
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	158,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x0903,
+	0x093a, 0x093b,
+	0x093e, 0x094c,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1bf1,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf3,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69f, 0xa69f,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b4, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+	0x11100, 0x11102,
+	0x11127, 0x11132,
+	0x11180, 0x11182,
+	0x111b3, 0x111bf,
+	0x116ab, 0x116b5,
+	0x16f51, 0x16f7e,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	125,
+	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,
+	0x08e4, 0x08fe,
+	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, 0x1bab,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	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,
+	0xa7f8, 0xa7f9,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xaaf6, 0xaaf6,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x116b6, 0x116b7,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	22,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x180a, 0x180a,
+	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,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	18,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7c, 0x2c7d,
+	0xa770, 0xa770,
+	0xa7f8, 0xa7f9,
+}; /* 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[] = {
+	17,
+	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,
+	0x302e, 0x302f,
+	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[] = {
+	12,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	11,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	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[] = {
+	9,
+	0x0149, 0x0149,
+	0x0673, 0x0673,
+	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[] = {
+	4,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+	0x19da, 0x19da,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	50,
+	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,
+	0x1735, 0x1736,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	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,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+}; /* 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 */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	537,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0605, 0x0605,
+	0x061c, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_Unknown */
+
+/* 'Age_1_1': Derived Age 1.1 */
+static const OnigCodePoint CR_Age_1_1[] = {
+	288,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x05b0, 0x05b9,
+	0x05bb, 0x05c3,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9a,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20aa,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xe000, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+}; /* CR_Age_1_1 */
+
+/* 'Age_2_0': Derived Age 2.0 */
+static const OnigCodePoint CR_Age_2_0[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ab,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 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, 0x10ffff,
+}; /* CR_Age_2_0 */
+
+/* 'Age_2_1': Derived Age 2.1 */
+static const OnigCodePoint CR_Age_2_1[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ac,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 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, 0x10ffff,
+}; /* CR_Age_2_1 */
+
+/* 'Age_3_0': Derived Age 3.0 */
+static const OnigCodePoint CR_Age_3_0[] = {
+	369,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f3,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 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, 0x10ffff,
+}; /* CR_Age_3_0 */
+
+/* 'Age_3_1': Derived Age 3.1 */
+static const OnigCodePoint CR_Age_3_1[] = {
+	402,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f5,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_1 */
+
+/* 'Age_3_2': Derived Age 3.2 */
+static const OnigCodePoint CR_Age_3_2[] = {
+	397,
+	0x0000, 0x0220,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034f,
+	0x0360, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03f6,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b1,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2052,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213a,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23ce,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24fe,
+	0x2500, 0x2613,
+	0x2616, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2689,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2aff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321c,
+	0x3220, 0x3243,
+	0x3251, 0x327b,
+	0x327f, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfc,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe46,
+	0xfe49, 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, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_2 */
+
+/* 'Age_4_0': Derived Age 4.0 */
+static const OnigCodePoint CR_Age_4_0[] = {
+	412,
+	0x0000, 0x0236,
+	0x0250, 0x0357,
+	0x035d, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03fb,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060c, 0x0615,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0658,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x19e0, 0x19ff,
+	0x1d00, 0x1d6b,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2054,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213b,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23d0,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2691,
+	0x26a0, 0x26a1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b0d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x327d,
+	0x327f, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d300, 0x1d356,
+	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, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_0 */
+
+/* 'Age_4_1': Derived Age 4.1 */
+static const OnigCodePoint CR_Age_4_1[] = {
+	430,
+	0x0000, 0x0241,
+	0x0250, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05b9,
+	0x05bb, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097d, 0x097d,
+	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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1d00, 0x1dc3,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20eb,
+	0x2100, 0x214c,
+	0x2153, 0x2183,
+	0x2190, 0x23db,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c6,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b13,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa800, 0xa82b,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	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, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_1 */
+
+/* 'Age_5_0': Derived Age 5.0 */
+static const OnigCodePoint CR_Age_5_0[] = {
+	440,
+	0x0000, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x0513,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097b, 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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1d00, 0x1dca,
+	0x1dfe, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20ef,
+	0x2100, 0x214e,
+	0x2153, 0x2184,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b2,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b1a,
+	0x2b20, 0x2b23,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6c,
+	0x2c74, 0x2c77,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa71a,
+	0xa720, 0xa721,
+	0xa800, 0xa82b,
+	0xa840, 0xa877,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x1091f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_0 */
+
+/* 'Age_5_1': Derived Age 5.1 */
+static const OnigCodePoint CR_Age_5_1[] = {
+	455,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0523,
+	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,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0972,
+	0x097b, 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, 0x09fa,
+	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, 0x0fd4,
+	0x1000, 0x1099,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1d00, 0x1de6,
+	0x1dfe, 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, 0x20b5,
+	0x20d0, 0x20f0,
+	0x2100, 0x214f,
+	0x2153, 0x2188,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269d,
+	0x26a0, 0x26bc,
+	0x26c0, 0x26c3,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b54,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6f,
+	0x2c71, 0x2c7d,
+	0x2c80, 0x2cea,
+	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, 0x2e30,
+	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, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fc3,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa500, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa900, 0xa953,
+	0xa95f, 0xa95f,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_1 */
+
+/* 'Age_5_2': Derived Age 5.2 */
+static const OnigCodePoint CR_Age_5_2[] = {
+	495,
+	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,
+	0xfdd0, 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, 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,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_2 */
+
+/* 'Age_6_0': Derived Age 6.0 */
+static const OnigCodePoint CR_Age_6_0[] = {
+	511,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
+	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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	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,
+	0x135d, 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,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27ce, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d70,
+	0x2d7f, 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, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 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,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	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, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_0 */
+
+/* 'Age_6_1': Derived Age 6.1 */
+static const OnigCodePoint CR_Age_6_1[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_1 */
+
+/* 'In_Basic_Latin': Block */
+#define CR_In_Basic_Latin CR_ASCII
+
+/* 'In_Latin_1_Supplement': Block */
+static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
+	1,
+	0x0080, 0x00ff,
+}; /* CR_In_Latin_1_Supplement */
+
+/* 'In_Latin_Extended_A': Block */
+static const OnigCodePoint CR_In_Latin_Extended_A[] = {
+	1,
+	0x0100, 0x017f,
+}; /* CR_In_Latin_Extended_A */
+
+/* 'In_Latin_Extended_B': Block */
+static const OnigCodePoint CR_In_Latin_Extended_B[] = {
+	1,
+	0x0180, 0x024f,
+}; /* CR_In_Latin_Extended_B */
+
+/* 'In_IPA_Extensions': Block */
+static const OnigCodePoint CR_In_IPA_Extensions[] = {
+	1,
+	0x0250, 0x02af,
+}; /* CR_In_IPA_Extensions */
+
+/* 'In_Spacing_Modifier_Letters': Block */
+static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
+	1,
+	0x02b0, 0x02ff,
+}; /* CR_In_Spacing_Modifier_Letters */
+
+/* 'In_Combining_Diacritical_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
+	1,
+	0x0300, 0x036f,
+}; /* CR_In_Combining_Diacritical_Marks */
+
+/* 'In_Greek_and_Coptic': Block */
+static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
+	1,
+	0x0370, 0x03ff,
+}; /* CR_In_Greek_and_Coptic */
+
+/* 'In_Cyrillic': Block */
+static const OnigCodePoint CR_In_Cyrillic[] = {
+	1,
+	0x0400, 0x04ff,
+}; /* CR_In_Cyrillic */
+
+/* 'In_Cyrillic_Supplement': Block */
+static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
+	1,
+	0x0500, 0x052f,
+}; /* CR_In_Cyrillic_Supplement */
+
+/* 'In_Armenian': Block */
+static const OnigCodePoint CR_In_Armenian[] = {
+	1,
+	0x0530, 0x058f,
+}; /* CR_In_Armenian */
+
+/* 'In_Hebrew': Block */
+static const OnigCodePoint CR_In_Hebrew[] = {
+	1,
+	0x0590, 0x05ff,
+}; /* CR_In_Hebrew */
+
+/* 'In_Arabic': Block */
+static const OnigCodePoint CR_In_Arabic[] = {
+	1,
+	0x0600, 0x06ff,
+}; /* CR_In_Arabic */
+
+/* 'In_Syriac': Block */
+static const OnigCodePoint CR_In_Syriac[] = {
+	1,
+	0x0700, 0x074f,
+}; /* CR_In_Syriac */
+
+/* 'In_Arabic_Supplement': Block */
+static const OnigCodePoint CR_In_Arabic_Supplement[] = {
+	1,
+	0x0750, 0x077f,
+}; /* CR_In_Arabic_Supplement */
+
+/* 'In_Thaana': Block */
+static const OnigCodePoint CR_In_Thaana[] = {
+	1,
+	0x0780, 0x07bf,
+}; /* CR_In_Thaana */
+
+/* 'In_NKo': Block */
+static const OnigCodePoint CR_In_NKo[] = {
+	1,
+	0x07c0, 0x07ff,
+}; /* CR_In_NKo */
+
+/* 'In_Samaritan': Block */
+static const OnigCodePoint CR_In_Samaritan[] = {
+	1,
+	0x0800, 0x083f,
+}; /* CR_In_Samaritan */
+
+/* 'In_Mandaic': Block */
+static const OnigCodePoint CR_In_Mandaic[] = {
+	1,
+	0x0840, 0x085f,
+}; /* CR_In_Mandaic */
+
+/* 'In_Arabic_Extended_A': Block */
+static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
+	1,
+	0x08a0, 0x08ff,
+}; /* CR_In_Arabic_Extended_A */
+
+/* 'In_Devanagari': Block */
+static const OnigCodePoint CR_In_Devanagari[] = {
+	1,
+	0x0900, 0x097f,
+}; /* CR_In_Devanagari */
+
+/* 'In_Bengali': Block */
+static const OnigCodePoint CR_In_Bengali[] = {
+	1,
+	0x0980, 0x09ff,
+}; /* CR_In_Bengali */
+
+/* 'In_Gurmukhi': Block */
+static const OnigCodePoint CR_In_Gurmukhi[] = {
+	1,
+	0x0a00, 0x0a7f,
+}; /* CR_In_Gurmukhi */
+
+/* 'In_Gujarati': Block */
+static const OnigCodePoint CR_In_Gujarati[] = {
+	1,
+	0x0a80, 0x0aff,
+}; /* CR_In_Gujarati */
+
+/* 'In_Oriya': Block */
+static const OnigCodePoint CR_In_Oriya[] = {
+	1,
+	0x0b00, 0x0b7f,
+}; /* CR_In_Oriya */
+
+/* 'In_Tamil': Block */
+static const OnigCodePoint CR_In_Tamil[] = {
+	1,
+	0x0b80, 0x0bff,
+}; /* CR_In_Tamil */
+
+/* 'In_Telugu': Block */
+static const OnigCodePoint CR_In_Telugu[] = {
+	1,
+	0x0c00, 0x0c7f,
+}; /* CR_In_Telugu */
+
+/* 'In_Kannada': Block */
+static const OnigCodePoint CR_In_Kannada[] = {
+	1,
+	0x0c80, 0x0cff,
+}; /* CR_In_Kannada */
+
+/* 'In_Malayalam': Block */
+static const OnigCodePoint CR_In_Malayalam[] = {
+	1,
+	0x0d00, 0x0d7f,
+}; /* CR_In_Malayalam */
+
+/* 'In_Sinhala': Block */
+static const OnigCodePoint CR_In_Sinhala[] = {
+	1,
+	0x0d80, 0x0dff,
+}; /* CR_In_Sinhala */
+
+/* 'In_Thai': Block */
+static const OnigCodePoint CR_In_Thai[] = {
+	1,
+	0x0e00, 0x0e7f,
+}; /* CR_In_Thai */
+
+/* 'In_Lao': Block */
+static const OnigCodePoint CR_In_Lao[] = {
+	1,
+	0x0e80, 0x0eff,
+}; /* CR_In_Lao */
+
+/* 'In_Tibetan': Block */
+static const OnigCodePoint CR_In_Tibetan[] = {
+	1,
+	0x0f00, 0x0fff,
+}; /* CR_In_Tibetan */
+
+/* 'In_Myanmar': Block */
+static const OnigCodePoint CR_In_Myanmar[] = {
+	1,
+	0x1000, 0x109f,
+}; /* CR_In_Myanmar */
+
+/* 'In_Georgian': Block */
+static const OnigCodePoint CR_In_Georgian[] = {
+	1,
+	0x10a0, 0x10ff,
+}; /* CR_In_Georgian */
+
+/* 'In_Hangul_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo[] = {
+	1,
+	0x1100, 0x11ff,
+}; /* CR_In_Hangul_Jamo */
+
+/* 'In_Ethiopic': Block */
+static const OnigCodePoint CR_In_Ethiopic[] = {
+	1,
+	0x1200, 0x137f,
+}; /* CR_In_Ethiopic */
+
+/* 'In_Ethiopic_Supplement': Block */
+static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
+	1,
+	0x1380, 0x139f,
+}; /* CR_In_Ethiopic_Supplement */
+
+/* 'In_Cherokee': Block */
+static const OnigCodePoint CR_In_Cherokee[] = {
+	1,
+	0x13a0, 0x13ff,
+}; /* CR_In_Cherokee */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
+	1,
+	0x1400, 0x167f,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
+
+/* 'In_Ogham': Block */
+static const OnigCodePoint CR_In_Ogham[] = {
+	1,
+	0x1680, 0x169f,
+}; /* CR_In_Ogham */
+
+/* 'In_Runic': Block */
+static const OnigCodePoint CR_In_Runic[] = {
+	1,
+	0x16a0, 0x16ff,
+}; /* CR_In_Runic */
+
+/* 'In_Tagalog': Block */
+static const OnigCodePoint CR_In_Tagalog[] = {
+	1,
+	0x1700, 0x171f,
+}; /* CR_In_Tagalog */
+
+/* 'In_Hanunoo': Block */
+static const OnigCodePoint CR_In_Hanunoo[] = {
+	1,
+	0x1720, 0x173f,
+}; /* CR_In_Hanunoo */
+
+/* 'In_Buhid': Block */
+static const OnigCodePoint CR_In_Buhid[] = {
+	1,
+	0x1740, 0x175f,
+}; /* CR_In_Buhid */
+
+/* 'In_Tagbanwa': Block */
+static const OnigCodePoint CR_In_Tagbanwa[] = {
+	1,
+	0x1760, 0x177f,
+}; /* CR_In_Tagbanwa */
+
+/* 'In_Khmer': Block */
+static const OnigCodePoint CR_In_Khmer[] = {
+	1,
+	0x1780, 0x17ff,
+}; /* CR_In_Khmer */
+
+/* 'In_Mongolian': Block */
+static const OnigCodePoint CR_In_Mongolian[] = {
+	1,
+	0x1800, 0x18af,
+}; /* CR_In_Mongolian */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
+	1,
+	0x18b0, 0x18ff,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
+
+/* 'In_Limbu': Block */
+static const OnigCodePoint CR_In_Limbu[] = {
+	1,
+	0x1900, 0x194f,
+}; /* CR_In_Limbu */
+
+/* 'In_Tai_Le': Block */
+static const OnigCodePoint CR_In_Tai_Le[] = {
+	1,
+	0x1950, 0x197f,
+}; /* CR_In_Tai_Le */
+
+/* 'In_New_Tai_Lue': Block */
+static const OnigCodePoint CR_In_New_Tai_Lue[] = {
+	1,
+	0x1980, 0x19df,
+}; /* CR_In_New_Tai_Lue */
+
+/* 'In_Khmer_Symbols': Block */
+static const OnigCodePoint CR_In_Khmer_Symbols[] = {
+	1,
+	0x19e0, 0x19ff,
+}; /* CR_In_Khmer_Symbols */
+
+/* 'In_Buginese': Block */
+static const OnigCodePoint CR_In_Buginese[] = {
+	1,
+	0x1a00, 0x1a1f,
+}; /* CR_In_Buginese */
+
+/* 'In_Tai_Tham': Block */
+static const OnigCodePoint CR_In_Tai_Tham[] = {
+	1,
+	0x1a20, 0x1aaf,
+}; /* CR_In_Tai_Tham */
+
+/* 'In_Balinese': Block */
+static const OnigCodePoint CR_In_Balinese[] = {
+	1,
+	0x1b00, 0x1b7f,
+}; /* CR_In_Balinese */
+
+/* 'In_Sundanese': Block */
+static const OnigCodePoint CR_In_Sundanese[] = {
+	1,
+	0x1b80, 0x1bbf,
+}; /* CR_In_Sundanese */
+
+/* 'In_Batak': Block */
+static const OnigCodePoint CR_In_Batak[] = {
+	1,
+	0x1bc0, 0x1bff,
+}; /* CR_In_Batak */
+
+/* 'In_Lepcha': Block */
+static const OnigCodePoint CR_In_Lepcha[] = {
+	1,
+	0x1c00, 0x1c4f,
+}; /* CR_In_Lepcha */
+
+/* 'In_Ol_Chiki': Block */
+#define CR_In_Ol_Chiki CR_Ol_Chiki
+
+/* 'In_Sundanese_Supplement': Block */
+static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
+	1,
+	0x1cc0, 0x1ccf,
+}; /* CR_In_Sundanese_Supplement */
+
+/* 'In_Vedic_Extensions': Block */
+static const OnigCodePoint CR_In_Vedic_Extensions[] = {
+	1,
+	0x1cd0, 0x1cff,
+}; /* CR_In_Vedic_Extensions */
+
+/* 'In_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
+	1,
+	0x1d00, 0x1d7f,
+}; /* CR_In_Phonetic_Extensions */
+
+/* 'In_Phonetic_Extensions_Supplement': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
+	1,
+	0x1d80, 0x1dbf,
+}; /* CR_In_Phonetic_Extensions_Supplement */
+
+/* 'In_Combining_Diacritical_Marks_Supplement': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
+	1,
+	0x1dc0, 0x1dff,
+}; /* CR_In_Combining_Diacritical_Marks_Supplement */
+
+/* 'In_Latin_Extended_Additional': Block */
+static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
+	1,
+	0x1e00, 0x1eff,
+}; /* CR_In_Latin_Extended_Additional */
+
+/* 'In_Greek_Extended': Block */
+static const OnigCodePoint CR_In_Greek_Extended[] = {
+	1,
+	0x1f00, 0x1fff,
+}; /* CR_In_Greek_Extended */
+
+/* 'In_General_Punctuation': Block */
+static const OnigCodePoint CR_In_General_Punctuation[] = {
+	1,
+	0x2000, 0x206f,
+}; /* CR_In_General_Punctuation */
+
+/* 'In_Superscripts_and_Subscripts': Block */
+static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
+	1,
+	0x2070, 0x209f,
+}; /* CR_In_Superscripts_and_Subscripts */
+
+/* 'In_Currency_Symbols': Block */
+static const OnigCodePoint CR_In_Currency_Symbols[] = {
+	1,
+	0x20a0, 0x20cf,
+}; /* CR_In_Currency_Symbols */
+
+/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
+	1,
+	0x20d0, 0x20ff,
+}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
+
+/* 'In_Letterlike_Symbols': Block */
+static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
+	1,
+	0x2100, 0x214f,
+}; /* CR_In_Letterlike_Symbols */
+
+/* 'In_Number_Forms': Block */
+static const OnigCodePoint CR_In_Number_Forms[] = {
+	1,
+	0x2150, 0x218f,
+}; /* CR_In_Number_Forms */
+
+/* 'In_Arrows': Block */
+static const OnigCodePoint CR_In_Arrows[] = {
+	1,
+	0x2190, 0x21ff,
+}; /* CR_In_Arrows */
+
+/* 'In_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Mathematical_Operators[] = {
+	1,
+	0x2200, 0x22ff,
+}; /* CR_In_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Technical': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
+	1,
+	0x2300, 0x23ff,
+}; /* CR_In_Miscellaneous_Technical */
+
+/* 'In_Control_Pictures': Block */
+static const OnigCodePoint CR_In_Control_Pictures[] = {
+	1,
+	0x2400, 0x243f,
+}; /* CR_In_Control_Pictures */
+
+/* 'In_Optical_Character_Recognition': Block */
+static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
+	1,
+	0x2440, 0x245f,
+}; /* CR_In_Optical_Character_Recognition */
+
+/* 'In_Enclosed_Alphanumerics': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
+	1,
+	0x2460, 0x24ff,
+}; /* CR_In_Enclosed_Alphanumerics */
+
+/* 'In_Box_Drawing': Block */
+static const OnigCodePoint CR_In_Box_Drawing[] = {
+	1,
+	0x2500, 0x257f,
+}; /* CR_In_Box_Drawing */
+
+/* 'In_Block_Elements': Block */
+static const OnigCodePoint CR_In_Block_Elements[] = {
+	1,
+	0x2580, 0x259f,
+}; /* CR_In_Block_Elements */
+
+/* 'In_Geometric_Shapes': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes[] = {
+	1,
+	0x25a0, 0x25ff,
+}; /* CR_In_Geometric_Shapes */
+
+/* 'In_Miscellaneous_Symbols': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
+	1,
+	0x2600, 0x26ff,
+}; /* CR_In_Miscellaneous_Symbols */
+
+/* 'In_Dingbats': Block */
+static const OnigCodePoint CR_In_Dingbats[] = {
+	1,
+	0x2700, 0x27bf,
+}; /* CR_In_Dingbats */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
+	1,
+	0x27c0, 0x27ef,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
+
+/* 'In_Supplemental_Arrows_A': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
+	1,
+	0x27f0, 0x27ff,
+}; /* CR_In_Supplemental_Arrows_A */
+
+/* 'In_Braille_Patterns': Block */
+#define CR_In_Braille_Patterns CR_Braille
+
+/* 'In_Supplemental_Arrows_B': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
+	1,
+	0x2900, 0x297f,
+}; /* CR_In_Supplemental_Arrows_B */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
+	1,
+	0x2980, 0x29ff,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
+
+/* 'In_Supplemental_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
+	1,
+	0x2a00, 0x2aff,
+}; /* CR_In_Supplemental_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
+	1,
+	0x2b00, 0x2bff,
+}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
+
+/* 'In_Glagolitic': Block */
+static const OnigCodePoint CR_In_Glagolitic[] = {
+	1,
+	0x2c00, 0x2c5f,
+}; /* CR_In_Glagolitic */
+
+/* 'In_Latin_Extended_C': Block */
+static const OnigCodePoint CR_In_Latin_Extended_C[] = {
+	1,
+	0x2c60, 0x2c7f,
+}; /* CR_In_Latin_Extended_C */
+
+/* 'In_Coptic': Block */
+static const OnigCodePoint CR_In_Coptic[] = {
+	1,
+	0x2c80, 0x2cff,
+}; /* CR_In_Coptic */
+
+/* 'In_Georgian_Supplement': Block */
+static const OnigCodePoint CR_In_Georgian_Supplement[] = {
+	1,
+	0x2d00, 0x2d2f,
+}; /* CR_In_Georgian_Supplement */
+
+/* 'In_Tifinagh': Block */
+static const OnigCodePoint CR_In_Tifinagh[] = {
+	1,
+	0x2d30, 0x2d7f,
+}; /* CR_In_Tifinagh */
+
+/* 'In_Ethiopic_Extended': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
+	1,
+	0x2d80, 0x2ddf,
+}; /* CR_In_Ethiopic_Extended */
+
+/* 'In_Cyrillic_Extended_A': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
+	1,
+	0x2de0, 0x2dff,
+}; /* CR_In_Cyrillic_Extended_A */
+
+/* 'In_Supplemental_Punctuation': Block */
+static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
+	1,
+	0x2e00, 0x2e7f,
+}; /* CR_In_Supplemental_Punctuation */
+
+/* 'In_CJK_Radicals_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
+	1,
+	0x2e80, 0x2eff,
+}; /* CR_In_CJK_Radicals_Supplement */
+
+/* 'In_Kangxi_Radicals': Block */
+static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
+	1,
+	0x2f00, 0x2fdf,
+}; /* CR_In_Kangxi_Radicals */
+
+/* 'In_Ideographic_Description_Characters': Block */
+static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
+	1,
+	0x2ff0, 0x2fff,
+}; /* CR_In_Ideographic_Description_Characters */
+
+/* 'In_CJK_Symbols_and_Punctuation': Block */
+static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
+	1,
+	0x3000, 0x303f,
+}; /* CR_In_CJK_Symbols_and_Punctuation */
+
+/* 'In_Hiragana': Block */
+static const OnigCodePoint CR_In_Hiragana[] = {
+	1,
+	0x3040, 0x309f,
+}; /* CR_In_Hiragana */
+
+/* 'In_Katakana': Block */
+static const OnigCodePoint CR_In_Katakana[] = {
+	1,
+	0x30a0, 0x30ff,
+}; /* CR_In_Katakana */
+
+/* 'In_Bopomofo': Block */
+static const OnigCodePoint CR_In_Bopomofo[] = {
+	1,
+	0x3100, 0x312f,
+}; /* CR_In_Bopomofo */
+
+/* 'In_Hangul_Compatibility_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
+	1,
+	0x3130, 0x318f,
+}; /* CR_In_Hangul_Compatibility_Jamo */
+
+/* 'In_Kanbun': Block */
+static const OnigCodePoint CR_In_Kanbun[] = {
+	1,
+	0x3190, 0x319f,
+}; /* CR_In_Kanbun */
+
+/* 'In_Bopomofo_Extended': Block */
+static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
+	1,
+	0x31a0, 0x31bf,
+}; /* CR_In_Bopomofo_Extended */
+
+/* 'In_CJK_Strokes': Block */
+static const OnigCodePoint CR_In_CJK_Strokes[] = {
+	1,
+	0x31c0, 0x31ef,
+}; /* CR_In_CJK_Strokes */
+
+/* 'In_Katakana_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
+	1,
+	0x31f0, 0x31ff,
+}; /* CR_In_Katakana_Phonetic_Extensions */
+
+/* 'In_Enclosed_CJK_Letters_and_Months': Block */
+static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
+	1,
+	0x3200, 0x32ff,
+}; /* CR_In_Enclosed_CJK_Letters_and_Months */
+
+/* 'In_CJK_Compatibility': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility[] = {
+	1,
+	0x3300, 0x33ff,
+}; /* CR_In_CJK_Compatibility */
+
+/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
+	1,
+	0x3400, 0x4dbf,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
+
+/* 'In_Yijing_Hexagram_Symbols': Block */
+static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
+	1,
+	0x4dc0, 0x4dff,
+}; /* CR_In_Yijing_Hexagram_Symbols */
+
+/* 'In_CJK_Unified_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
+	1,
+	0x4e00, 0x9fff,
+}; /* CR_In_CJK_Unified_Ideographs */
+
+/* 'In_Yi_Syllables': Block */
+static const OnigCodePoint CR_In_Yi_Syllables[] = {
+	1,
+	0xa000, 0xa48f,
+}; /* CR_In_Yi_Syllables */
+
+/* 'In_Yi_Radicals': Block */
+static const OnigCodePoint CR_In_Yi_Radicals[] = {
+	1,
+	0xa490, 0xa4cf,
+}; /* CR_In_Yi_Radicals */
+
+/* 'In_Lisu': Block */
+#define CR_In_Lisu CR_Lisu
+
+/* 'In_Vai': Block */
+static const OnigCodePoint CR_In_Vai[] = {
+	1,
+	0xa500, 0xa63f,
+}; /* CR_In_Vai */
+
+/* 'In_Cyrillic_Extended_B': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
+	1,
+	0xa640, 0xa69f,
+}; /* CR_In_Cyrillic_Extended_B */
+
+/* 'In_Bamum': Block */
+static const OnigCodePoint CR_In_Bamum[] = {
+	1,
+	0xa6a0, 0xa6ff,
+}; /* CR_In_Bamum */
+
+/* 'In_Modifier_Tone_Letters': Block */
+static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
+	1,
+	0xa700, 0xa71f,
+}; /* CR_In_Modifier_Tone_Letters */
+
+/* 'In_Latin_Extended_D': Block */
+static const OnigCodePoint CR_In_Latin_Extended_D[] = {
+	1,
+	0xa720, 0xa7ff,
+}; /* CR_In_Latin_Extended_D */
+
+/* 'In_Syloti_Nagri': Block */
+static const OnigCodePoint CR_In_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82f,
+}; /* CR_In_Syloti_Nagri */
+
+/* 'In_Common_Indic_Number_Forms': Block */
+static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
+	1,
+	0xa830, 0xa83f,
+}; /* CR_In_Common_Indic_Number_Forms */
+
+/* 'In_Phags_pa': Block */
+static const OnigCodePoint CR_In_Phags_pa[] = {
+	1,
+	0xa840, 0xa87f,
+}; /* CR_In_Phags_pa */
+
+/* 'In_Saurashtra': Block */
+static const OnigCodePoint CR_In_Saurashtra[] = {
+	1,
+	0xa880, 0xa8df,
+}; /* CR_In_Saurashtra */
+
+/* 'In_Devanagari_Extended': Block */
+static const OnigCodePoint CR_In_Devanagari_Extended[] = {
+	1,
+	0xa8e0, 0xa8ff,
+}; /* CR_In_Devanagari_Extended */
+
+/* 'In_Kayah_Li': Block */
+#define CR_In_Kayah_Li CR_Kayah_Li
+
+/* 'In_Rejang': Block */
+static const OnigCodePoint CR_In_Rejang[] = {
+	1,
+	0xa930, 0xa95f,
+}; /* CR_In_Rejang */
+
+/* 'In_Hangul_Jamo_Extended_A': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
+	1,
+	0xa960, 0xa97f,
+}; /* CR_In_Hangul_Jamo_Extended_A */
+
+/* 'In_Javanese': Block */
+static const OnigCodePoint CR_In_Javanese[] = {
+	1,
+	0xa980, 0xa9df,
+}; /* CR_In_Javanese */
+
+/* 'In_Cham': Block */
+static const OnigCodePoint CR_In_Cham[] = {
+	1,
+	0xaa00, 0xaa5f,
+}; /* CR_In_Cham */
+
+/* 'In_Myanmar_Extended_A': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
+	1,
+	0xaa60, 0xaa7f,
+}; /* CR_In_Myanmar_Extended_A */
+
+/* 'In_Tai_Viet': Block */
+static const OnigCodePoint CR_In_Tai_Viet[] = {
+	1,
+	0xaa80, 0xaadf,
+}; /* CR_In_Tai_Viet */
+
+/* 'In_Meetei_Mayek_Extensions': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
+	1,
+	0xaae0, 0xaaff,
+}; /* CR_In_Meetei_Mayek_Extensions */
+
+/* 'In_Ethiopic_Extended_A': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
+	1,
+	0xab00, 0xab2f,
+}; /* CR_In_Ethiopic_Extended_A */
+
+/* 'In_Meetei_Mayek': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek[] = {
+	1,
+	0xabc0, 0xabff,
+}; /* CR_In_Meetei_Mayek */
+
+/* 'In_Hangul_Syllables': Block */
+static const OnigCodePoint CR_In_Hangul_Syllables[] = {
+	1,
+	0xac00, 0xd7af,
+}; /* CR_In_Hangul_Syllables */
+
+/* 'In_Hangul_Jamo_Extended_B': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
+	1,
+	0xd7b0, 0xd7ff,
+}; /* CR_In_Hangul_Jamo_Extended_B */
+
+/* 'In_High_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Surrogates[] = {
+	1,
+	0xd800, 0xdb7f,
+}; /* CR_In_High_Surrogates */
+
+/* 'In_High_Private_Use_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
+	1,
+	0xdb80, 0xdbff,
+}; /* CR_In_High_Private_Use_Surrogates */
+
+/* 'In_Low_Surrogates': Block */
+static const OnigCodePoint CR_In_Low_Surrogates[] = {
+	1,
+	0xdc00, 0xdfff,
+}; /* CR_In_Low_Surrogates */
+
+/* 'In_Private_Use_Area': Block */
+static const OnigCodePoint CR_In_Private_Use_Area[] = {
+	1,
+	0xe000, 0xf8ff,
+}; /* CR_In_Private_Use_Area */
+
+/* 'In_CJK_Compatibility_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
+	1,
+	0xf900, 0xfaff,
+}; /* CR_In_CJK_Compatibility_Ideographs */
+
+/* 'In_Alphabetic_Presentation_Forms': Block */
+static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
+	1,
+	0xfb00, 0xfb4f,
+}; /* CR_In_Alphabetic_Presentation_Forms */
+
+/* 'In_Arabic_Presentation_Forms_A': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
+	1,
+	0xfb50, 0xfdff,
+}; /* CR_In_Arabic_Presentation_Forms_A */
+
+/* 'In_Variation_Selectors': Block */
+static const OnigCodePoint CR_In_Variation_Selectors[] = {
+	1,
+	0xfe00, 0xfe0f,
+}; /* CR_In_Variation_Selectors */
+
+/* 'In_Vertical_Forms': Block */
+static const OnigCodePoint CR_In_Vertical_Forms[] = {
+	1,
+	0xfe10, 0xfe1f,
+}; /* CR_In_Vertical_Forms */
+
+/* 'In_Combining_Half_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
+	1,
+	0xfe20, 0xfe2f,
+}; /* CR_In_Combining_Half_Marks */
+
+/* 'In_CJK_Compatibility_Forms': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
+	1,
+	0xfe30, 0xfe4f,
+}; /* CR_In_CJK_Compatibility_Forms */
+
+/* 'In_Small_Form_Variants': Block */
+static const OnigCodePoint CR_In_Small_Form_Variants[] = {
+	1,
+	0xfe50, 0xfe6f,
+}; /* CR_In_Small_Form_Variants */
+
+/* 'In_Arabic_Presentation_Forms_B': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
+	1,
+	0xfe70, 0xfeff,
+}; /* CR_In_Arabic_Presentation_Forms_B */
+
+/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
+static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
+	1,
+	0xff00, 0xffef,
+}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
+
+/* 'In_Specials': Block */
+static const OnigCodePoint CR_In_Specials[] = {
+	1,
+	0xfff0, 0xffff,
+}; /* CR_In_Specials */
+
+/* 'In_Linear_B_Syllabary': Block */
+static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
+	1,
+	0x10000, 0x1007f,
+}; /* CR_In_Linear_B_Syllabary */
+
+/* 'In_Linear_B_Ideograms': Block */
+static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
+	1,
+	0x10080, 0x100ff,
+}; /* CR_In_Linear_B_Ideograms */
+
+/* 'In_Aegean_Numbers': Block */
+static const OnigCodePoint CR_In_Aegean_Numbers[] = {
+	1,
+	0x10100, 0x1013f,
+}; /* CR_In_Aegean_Numbers */
+
+/* 'In_Ancient_Greek_Numbers': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
+	1,
+	0x10140, 0x1018f,
+}; /* CR_In_Ancient_Greek_Numbers */
+
+/* 'In_Ancient_Symbols': Block */
+static const OnigCodePoint CR_In_Ancient_Symbols[] = {
+	1,
+	0x10190, 0x101cf,
+}; /* CR_In_Ancient_Symbols */
+
+/* 'In_Phaistos_Disc': Block */
+static const OnigCodePoint CR_In_Phaistos_Disc[] = {
+	1,
+	0x101d0, 0x101ff,
+}; /* CR_In_Phaistos_Disc */
+
+/* 'In_Lycian': Block */
+static const OnigCodePoint CR_In_Lycian[] = {
+	1,
+	0x10280, 0x1029f,
+}; /* CR_In_Lycian */
+
+/* 'In_Carian': Block */
+static const OnigCodePoint CR_In_Carian[] = {
+	1,
+	0x102a0, 0x102df,
+}; /* CR_In_Carian */
+
+/* 'In_Old_Italic': Block */
+static const OnigCodePoint CR_In_Old_Italic[] = {
+	1,
+	0x10300, 0x1032f,
+}; /* CR_In_Old_Italic */
+
+/* 'In_Gothic': Block */
+static const OnigCodePoint CR_In_Gothic[] = {
+	1,
+	0x10330, 0x1034f,
+}; /* CR_In_Gothic */
+
+/* 'In_Ugaritic': Block */
+static const OnigCodePoint CR_In_Ugaritic[] = {
+	1,
+	0x10380, 0x1039f,
+}; /* CR_In_Ugaritic */
+
+/* 'In_Old_Persian': Block */
+static const OnigCodePoint CR_In_Old_Persian[] = {
+	1,
+	0x103a0, 0x103df,
+}; /* CR_In_Old_Persian */
+
+/* 'In_Deseret': Block */
+#define CR_In_Deseret CR_Deseret
+
+/* 'In_Shavian': Block */
+#define CR_In_Shavian CR_Shavian
+
+/* 'In_Osmanya': Block */
+static const OnigCodePoint CR_In_Osmanya[] = {
+	1,
+	0x10480, 0x104af,
+}; /* CR_In_Osmanya */
+
+/* 'In_Cypriot_Syllabary': Block */
+static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
+	1,
+	0x10800, 0x1083f,
+}; /* CR_In_Cypriot_Syllabary */
+
+/* 'In_Imperial_Aramaic': Block */
+static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
+	1,
+	0x10840, 0x1085f,
+}; /* CR_In_Imperial_Aramaic */
+
+/* 'In_Phoenician': Block */
+static const OnigCodePoint CR_In_Phoenician[] = {
+	1,
+	0x10900, 0x1091f,
+}; /* CR_In_Phoenician */
+
+/* 'In_Lydian': Block */
+static const OnigCodePoint CR_In_Lydian[] = {
+	1,
+	0x10920, 0x1093f,
+}; /* CR_In_Lydian */
+
+/* 'In_Meroitic_Hieroglyphs': Block */
+#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
+
+/* 'In_Meroitic_Cursive': Block */
+static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
+	1,
+	0x109a0, 0x109ff,
+}; /* CR_In_Meroitic_Cursive */
+
+/* 'In_Kharoshthi': Block */
+static const OnigCodePoint CR_In_Kharoshthi[] = {
+	1,
+	0x10a00, 0x10a5f,
+}; /* CR_In_Kharoshthi */
+
+/* 'In_Old_South_Arabian': Block */
+#define CR_In_Old_South_Arabian CR_Old_South_Arabian
+
+/* 'In_Avestan': Block */
+static const OnigCodePoint CR_In_Avestan[] = {
+	1,
+	0x10b00, 0x10b3f,
+}; /* CR_In_Avestan */
+
+/* 'In_Inscriptional_Parthian': Block */
+static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
+	1,
+	0x10b40, 0x10b5f,
+}; /* CR_In_Inscriptional_Parthian */
+
+/* 'In_Inscriptional_Pahlavi': Block */
+static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
+	1,
+	0x10b60, 0x10b7f,
+}; /* CR_In_Inscriptional_Pahlavi */
+
+/* 'In_Old_Turkic': Block */
+static const OnigCodePoint CR_In_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c4f,
+}; /* CR_In_Old_Turkic */
+
+/* 'In_Rumi_Numeral_Symbols': Block */
+static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
+	1,
+	0x10e60, 0x10e7f,
+}; /* CR_In_Rumi_Numeral_Symbols */
+
+/* 'In_Brahmi': Block */
+static const OnigCodePoint CR_In_Brahmi[] = {
+	1,
+	0x11000, 0x1107f,
+}; /* CR_In_Brahmi */
+
+/* 'In_Kaithi': Block */
+static const OnigCodePoint CR_In_Kaithi[] = {
+	1,
+	0x11080, 0x110cf,
+}; /* CR_In_Kaithi */
+
+/* 'In_Sora_Sompeng': Block */
+static const OnigCodePoint CR_In_Sora_Sompeng[] = {
+	1,
+	0x110d0, 0x110ff,
+}; /* CR_In_Sora_Sompeng */
+
+/* 'In_Chakma': Block */
+static const OnigCodePoint CR_In_Chakma[] = {
+	1,
+	0x11100, 0x1114f,
+}; /* CR_In_Chakma */
+
+/* 'In_Sharada': Block */
+static const OnigCodePoint CR_In_Sharada[] = {
+	1,
+	0x11180, 0x111df,
+}; /* CR_In_Sharada */
+
+/* 'In_Takri': Block */
+static const OnigCodePoint CR_In_Takri[] = {
+	1,
+	0x11680, 0x116cf,
+}; /* CR_In_Takri */
+
+/* 'In_Cuneiform': Block */
+static const OnigCodePoint CR_In_Cuneiform[] = {
+	1,
+	0x12000, 0x123ff,
+}; /* CR_In_Cuneiform */
+
+/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
+static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
+	1,
+	0x12400, 0x1247f,
+}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
+
+/* 'In_Egyptian_Hieroglyphs': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342f,
+}; /* CR_In_Egyptian_Hieroglyphs */
+
+/* 'In_Bamum_Supplement': Block */
+static const OnigCodePoint CR_In_Bamum_Supplement[] = {
+	1,
+	0x16800, 0x16a3f,
+}; /* CR_In_Bamum_Supplement */
+
+/* 'In_Miao': Block */
+static const OnigCodePoint CR_In_Miao[] = {
+	1,
+	0x16f00, 0x16f9f,
+}; /* CR_In_Miao */
+
+/* 'In_Kana_Supplement': Block */
+static const OnigCodePoint CR_In_Kana_Supplement[] = {
+	1,
+	0x1b000, 0x1b0ff,
+}; /* CR_In_Kana_Supplement */
+
+/* 'In_Byzantine_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
+	1,
+	0x1d000, 0x1d0ff,
+}; /* CR_In_Byzantine_Musical_Symbols */
+
+/* 'In_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Musical_Symbols[] = {
+	1,
+	0x1d100, 0x1d1ff,
+}; /* CR_In_Musical_Symbols */
+
+/* 'In_Ancient_Greek_Musical_Notation': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
+	1,
+	0x1d200, 0x1d24f,
+}; /* CR_In_Ancient_Greek_Musical_Notation */
+
+/* 'In_Tai_Xuan_Jing_Symbols': Block */
+static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
+	1,
+	0x1d300, 0x1d35f,
+}; /* CR_In_Tai_Xuan_Jing_Symbols */
+
+/* 'In_Counting_Rod_Numerals': Block */
+static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
+	1,
+	0x1d360, 0x1d37f,
+}; /* CR_In_Counting_Rod_Numerals */
+
+/* 'In_Mathematical_Alphanumeric_Symbols': Block */
+static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
+	1,
+	0x1d400, 0x1d7ff,
+}; /* CR_In_Mathematical_Alphanumeric_Symbols */
+
+/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
+static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
+	1,
+	0x1ee00, 0x1eeff,
+}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
+
+/* 'In_Mahjong_Tiles': Block */
+static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
+	1,
+	0x1f000, 0x1f02f,
+}; /* CR_In_Mahjong_Tiles */
+
+/* 'In_Domino_Tiles': Block */
+static const OnigCodePoint CR_In_Domino_Tiles[] = {
+	1,
+	0x1f030, 0x1f09f,
+}; /* CR_In_Domino_Tiles */
+
+/* 'In_Playing_Cards': Block */
+static const OnigCodePoint CR_In_Playing_Cards[] = {
+	1,
+	0x1f0a0, 0x1f0ff,
+}; /* CR_In_Playing_Cards */
+
+/* 'In_Enclosed_Alphanumeric_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
+	1,
+	0x1f100, 0x1f1ff,
+}; /* CR_In_Enclosed_Alphanumeric_Supplement */
+
+/* 'In_Enclosed_Ideographic_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
+	1,
+	0x1f200, 0x1f2ff,
+}; /* CR_In_Enclosed_Ideographic_Supplement */
+
+/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
+	1,
+	0x1f300, 0x1f5ff,
+}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
+
+/* 'In_Emoticons': Block */
+static const OnigCodePoint CR_In_Emoticons[] = {
+	1,
+	0x1f600, 0x1f64f,
+}; /* CR_In_Emoticons */
+
+/* 'In_Transport_And_Map_Symbols': Block */
+static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
+	1,
+	0x1f680, 0x1f6ff,
+}; /* CR_In_Transport_And_Map_Symbols */
+
+/* 'In_Alchemical_Symbols': Block */
+static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
+	1,
+	0x1f700, 0x1f77f,
+}; /* CR_In_Alchemical_Symbols */
+
+/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
+	1,
+	0x20000, 0x2a6df,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
+
+/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
+	1,
+	0x2a700, 0x2b73f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
+
+/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
+	1,
+	0x2b740, 0x2b81f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
+
+/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
+	1,
+	0x2f800, 0x2fa1f,
+}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
+
+/* 'In_Tags': Block */
+static const OnigCodePoint CR_In_Tags[] = {
+	1,
+	0xe0000, 0xe007f,
+}; /* CR_In_Tags */
+
+/* 'In_Variation_Selectors_Supplement': Block */
+static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
+	1,
+	0xe0100, 0xe01ef,
+}; /* CR_In_Variation_Selectors_Supplement */
+
+/* 'In_Supplementary_Private_Use_Area_A': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
+	1,
+	0xf0000, 0xfffff,
+}; /* CR_In_Supplementary_Private_Use_Area_A */
+
+/* 'In_Supplementary_Private_Use_Area_B': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+	1,
+	0x100000, 0x10ffff,
+}; /* CR_In_Supplementary_Private_Use_Area_B */
+
+/* 'In_No_Block': Block */
+static const OnigCodePoint CR_In_No_Block[] = {
+	36,
+	0x0860, 0x089f,
+	0x1ab0, 0x1aff,
+	0x1c80, 0x1cbf,
+	0x2fe0, 0x2fef,
+	0xa9e0, 0xa9ff,
+	0xab30, 0xabbf,
+	0x10200, 0x1027f,
+	0x102e0, 0x102ff,
+	0x10350, 0x1037f,
+	0x103e0, 0x103ff,
+	0x104b0, 0x107ff,
+	0x10860, 0x108ff,
+	0x10940, 0x1097f,
+	0x10a80, 0x10aff,
+	0x10b80, 0x10bff,
+	0x10c50, 0x10e5f,
+	0x10e80, 0x10fff,
+	0x11150, 0x1117f,
+	0x111e0, 0x1167f,
+	0x116d0, 0x11fff,
+	0x12480, 0x12fff,
+	0x13430, 0x167ff,
+	0x16a40, 0x16eff,
+	0x16fa0, 0x1afff,
+	0x1b100, 0x1cfff,
+	0x1d250, 0x1d2ff,
+	0x1d380, 0x1d3ff,
+	0x1d800, 0x1edff,
+	0x1ef00, 0x1efff,
+	0x1f650, 0x1f67f,
+	0x1f780, 0x1ffff,
+	0x2a6e0, 0x2a6ff,
+	0x2b820, 0x2f7ff,
+	0x2fa20, 0xdffff,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+}; /* CR_In_No_Block */
+#endif /* USE_UNICODE_PROPERTIES */
+
+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_LC,
+  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_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
+  CR_Chakma,
+  CR_Meroitic_Cursive,
+  CR_Meroitic_Hieroglyphs,
+  CR_Miao,
+  CR_Sharada,
+  CR_Sora_Sompeng,
+  CR_Takri,
+  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,
+  CR_Unknown,
+  CR_Age_1_1,
+  CR_Age_2_0,
+  CR_Age_2_1,
+  CR_Age_3_0,
+  CR_Age_3_1,
+  CR_Age_3_2,
+  CR_Age_4_0,
+  CR_Age_4_1,
+  CR_Age_5_0,
+  CR_Age_5_1,
+  CR_Age_5_2,
+  CR_Age_6_0,
+  CR_Age_6_1,
+  CR_In_Basic_Latin,
+  CR_In_Latin_1_Supplement,
+  CR_In_Latin_Extended_A,
+  CR_In_Latin_Extended_B,
+  CR_In_IPA_Extensions,
+  CR_In_Spacing_Modifier_Letters,
+  CR_In_Combining_Diacritical_Marks,
+  CR_In_Greek_and_Coptic,
+  CR_In_Cyrillic,
+  CR_In_Cyrillic_Supplement,
+  CR_In_Armenian,
+  CR_In_Hebrew,
+  CR_In_Arabic,
+  CR_In_Syriac,
+  CR_In_Arabic_Supplement,
+  CR_In_Thaana,
+  CR_In_NKo,
+  CR_In_Samaritan,
+  CR_In_Mandaic,
+  CR_In_Arabic_Extended_A,
+  CR_In_Devanagari,
+  CR_In_Bengali,
+  CR_In_Gurmukhi,
+  CR_In_Gujarati,
+  CR_In_Oriya,
+  CR_In_Tamil,
+  CR_In_Telugu,
+  CR_In_Kannada,
+  CR_In_Malayalam,
+  CR_In_Sinhala,
+  CR_In_Thai,
+  CR_In_Lao,
+  CR_In_Tibetan,
+  CR_In_Myanmar,
+  CR_In_Georgian,
+  CR_In_Hangul_Jamo,
+  CR_In_Ethiopic,
+  CR_In_Ethiopic_Supplement,
+  CR_In_Cherokee,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics,
+  CR_In_Ogham,
+  CR_In_Runic,
+  CR_In_Tagalog,
+  CR_In_Hanunoo,
+  CR_In_Buhid,
+  CR_In_Tagbanwa,
+  CR_In_Khmer,
+  CR_In_Mongolian,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
+  CR_In_Limbu,
+  CR_In_Tai_Le,
+  CR_In_New_Tai_Lue,
+  CR_In_Khmer_Symbols,
+  CR_In_Buginese,
+  CR_In_Tai_Tham,
+  CR_In_Balinese,
+  CR_In_Sundanese,
+  CR_In_Batak,
+  CR_In_Lepcha,
+  CR_In_Ol_Chiki,
+  CR_In_Sundanese_Supplement,
+  CR_In_Vedic_Extensions,
+  CR_In_Phonetic_Extensions,
+  CR_In_Phonetic_Extensions_Supplement,
+  CR_In_Combining_Diacritical_Marks_Supplement,
+  CR_In_Latin_Extended_Additional,
+  CR_In_Greek_Extended,
+  CR_In_General_Punctuation,
+  CR_In_Superscripts_and_Subscripts,
+  CR_In_Currency_Symbols,
+  CR_In_Combining_Diacritical_Marks_for_Symbols,
+  CR_In_Letterlike_Symbols,
+  CR_In_Number_Forms,
+  CR_In_Arrows,
+  CR_In_Mathematical_Operators,
+  CR_In_Miscellaneous_Technical,
+  CR_In_Control_Pictures,
+  CR_In_Optical_Character_Recognition,
+  CR_In_Enclosed_Alphanumerics,
+  CR_In_Box_Drawing,
+  CR_In_Block_Elements,
+  CR_In_Geometric_Shapes,
+  CR_In_Miscellaneous_Symbols,
+  CR_In_Dingbats,
+  CR_In_Miscellaneous_Mathematical_Symbols_A,
+  CR_In_Supplemental_Arrows_A,
+  CR_In_Braille_Patterns,
+  CR_In_Supplemental_Arrows_B,
+  CR_In_Miscellaneous_Mathematical_Symbols_B,
+  CR_In_Supplemental_Mathematical_Operators,
+  CR_In_Miscellaneous_Symbols_and_Arrows,
+  CR_In_Glagolitic,
+  CR_In_Latin_Extended_C,
+  CR_In_Coptic,
+  CR_In_Georgian_Supplement,
+  CR_In_Tifinagh,
+  CR_In_Ethiopic_Extended,
+  CR_In_Cyrillic_Extended_A,
+  CR_In_Supplemental_Punctuation,
+  CR_In_CJK_Radicals_Supplement,
+  CR_In_Kangxi_Radicals,
+  CR_In_Ideographic_Description_Characters,
+  CR_In_CJK_Symbols_and_Punctuation,
+  CR_In_Hiragana,
+  CR_In_Katakana,
+  CR_In_Bopomofo,
+  CR_In_Hangul_Compatibility_Jamo,
+  CR_In_Kanbun,
+  CR_In_Bopomofo_Extended,
+  CR_In_CJK_Strokes,
+  CR_In_Katakana_Phonetic_Extensions,
+  CR_In_Enclosed_CJK_Letters_and_Months,
+  CR_In_CJK_Compatibility,
+  CR_In_CJK_Unified_Ideographs_Extension_A,
+  CR_In_Yijing_Hexagram_Symbols,
+  CR_In_CJK_Unified_Ideographs,
+  CR_In_Yi_Syllables,
+  CR_In_Yi_Radicals,
+  CR_In_Lisu,
+  CR_In_Vai,
+  CR_In_Cyrillic_Extended_B,
+  CR_In_Bamum,
+  CR_In_Modifier_Tone_Letters,
+  CR_In_Latin_Extended_D,
+  CR_In_Syloti_Nagri,
+  CR_In_Common_Indic_Number_Forms,
+  CR_In_Phags_pa,
+  CR_In_Saurashtra,
+  CR_In_Devanagari_Extended,
+  CR_In_Kayah_Li,
+  CR_In_Rejang,
+  CR_In_Hangul_Jamo_Extended_A,
+  CR_In_Javanese,
+  CR_In_Cham,
+  CR_In_Myanmar_Extended_A,
+  CR_In_Tai_Viet,
+  CR_In_Meetei_Mayek_Extensions,
+  CR_In_Ethiopic_Extended_A,
+  CR_In_Meetei_Mayek,
+  CR_In_Hangul_Syllables,
+  CR_In_Hangul_Jamo_Extended_B,
+  CR_In_High_Surrogates,
+  CR_In_High_Private_Use_Surrogates,
+  CR_In_Low_Surrogates,
+  CR_In_Private_Use_Area,
+  CR_In_CJK_Compatibility_Ideographs,
+  CR_In_Alphabetic_Presentation_Forms,
+  CR_In_Arabic_Presentation_Forms_A,
+  CR_In_Variation_Selectors,
+  CR_In_Vertical_Forms,
+  CR_In_Combining_Half_Marks,
+  CR_In_CJK_Compatibility_Forms,
+  CR_In_Small_Form_Variants,
+  CR_In_Arabic_Presentation_Forms_B,
+  CR_In_Halfwidth_and_Fullwidth_Forms,
+  CR_In_Specials,
+  CR_In_Linear_B_Syllabary,
+  CR_In_Linear_B_Ideograms,
+  CR_In_Aegean_Numbers,
+  CR_In_Ancient_Greek_Numbers,
+  CR_In_Ancient_Symbols,
+  CR_In_Phaistos_Disc,
+  CR_In_Lycian,
+  CR_In_Carian,
+  CR_In_Old_Italic,
+  CR_In_Gothic,
+  CR_In_Ugaritic,
+  CR_In_Old_Persian,
+  CR_In_Deseret,
+  CR_In_Shavian,
+  CR_In_Osmanya,
+  CR_In_Cypriot_Syllabary,
+  CR_In_Imperial_Aramaic,
+  CR_In_Phoenician,
+  CR_In_Lydian,
+  CR_In_Meroitic_Hieroglyphs,
+  CR_In_Meroitic_Cursive,
+  CR_In_Kharoshthi,
+  CR_In_Old_South_Arabian,
+  CR_In_Avestan,
+  CR_In_Inscriptional_Parthian,
+  CR_In_Inscriptional_Pahlavi,
+  CR_In_Old_Turkic,
+  CR_In_Rumi_Numeral_Symbols,
+  CR_In_Brahmi,
+  CR_In_Kaithi,
+  CR_In_Sora_Sompeng,
+  CR_In_Chakma,
+  CR_In_Sharada,
+  CR_In_Takri,
+  CR_In_Cuneiform,
+  CR_In_Cuneiform_Numbers_and_Punctuation,
+  CR_In_Egyptian_Hieroglyphs,
+  CR_In_Bamum_Supplement,
+  CR_In_Miao,
+  CR_In_Kana_Supplement,
+  CR_In_Byzantine_Musical_Symbols,
+  CR_In_Musical_Symbols,
+  CR_In_Ancient_Greek_Musical_Notation,
+  CR_In_Tai_Xuan_Jing_Symbols,
+  CR_In_Counting_Rod_Numerals,
+  CR_In_Mathematical_Alphanumeric_Symbols,
+  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
+  CR_In_Mahjong_Tiles,
+  CR_In_Domino_Tiles,
+  CR_In_Playing_Cards,
+  CR_In_Enclosed_Alphanumeric_Supplement,
+  CR_In_Enclosed_Ideographic_Supplement,
+  CR_In_Miscellaneous_Symbols_And_Pictographs,
+  CR_In_Emoticons,
+  CR_In_Transport_And_Map_Symbols,
+  CR_In_Alchemical_Symbols,
+  CR_In_CJK_Unified_Ideographs_Extension_B,
+  CR_In_CJK_Unified_Ideographs_Extension_C,
+  CR_In_CJK_Unified_Ideographs_Extension_D,
+  CR_In_CJK_Compatibility_Ideographs_Supplement,
+  CR_In_Tags,
+  CR_In_Variation_Selectors_Supplement,
+  CR_In_Supplementary_Private_Use_Area_A,
+  CR_In_Supplementary_Private_Use_Area_B,
+  CR_In_No_Block,
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  int name, ctype;
+};
+
+static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
+%}
+struct uniname2ctype_struct;
+%%
+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
+lc,                                       24
+ll,                                       25
+lm,                                       26
+lo,                                       27
+lt,                                       28
+lu,                                       29
+m,                                        30
+mc,                                       31
+me,                                       32
+mn,                                       33
+n,                                        34
+nd,                                       35
+nl,                                       36
+no,                                       37
+p,                                        38
+pc,                                       39
+pd,                                       40
+pe,                                       41
+pf,                                       42
+pi,                                       43
+po,                                       44
+ps,                                       45
+s,                                        46
+sc,                                       47
+sk,                                       48
+sm,                                       49
+so,                                       50
+z,                                        51
+zl,                                       52
+zp,                                       53
+zs,                                       54
+math,                                     55
+alphabetic,                               56
+lowercase,                                57
+uppercase,                                58
+cased,                                    59
+caseignorable,                            60
+changeswhenlowercased,                    61
+changeswhenuppercased,                    62
+changeswhentitlecased,                    63
+changeswhencasefolded,                    64
+changeswhencasemapped,                    65
+idstart,                                  66
+idcontinue,                               67
+xidstart,                                 68
+xidcontinue,                              69
+defaultignorablecodepoint,                70
+graphemeextend,                           71
+graphemebase,                             72
+graphemelink,                             73
+common,                                   74
+latin,                                    75
+greek,                                    76
+cyrillic,                                 77
+armenian,                                 78
+hebrew,                                   79
+arabic,                                   80
+syriac,                                   81
+thaana,                                   82
+devanagari,                               83
+bengali,                                  84
+gurmukhi,                                 85
+gujarati,                                 86
+oriya,                                    87
+tamil,                                    88
+telugu,                                   89
+kannada,                                  90
+malayalam,                                91
+sinhala,                                  92
+thai,                                     93
+lao,                                      94
+tibetan,                                  95
+myanmar,                                  96
+georgian,                                 97
+hangul,                                   98
+ethiopic,                                 99
+cherokee,                                100
+canadianaboriginal,                      101
+ogham,                                   102
+runic,                                   103
+khmer,                                   104
+mongolian,                               105
+hiragana,                                106
+katakana,                                107
+bopomofo,                                108
+han,                                     109
+yi,                                      110
+olditalic,                               111
+gothic,                                  112
+deseret,                                 113
+inherited,                               114
+tagalog,                                 115
+hanunoo,                                 116
+buhid,                                   117
+tagbanwa,                                118
+limbu,                                   119
+taile,                                   120
+linearb,                                 121
+ugaritic,                                122
+shavian,                                 123
+osmanya,                                 124
+cypriot,                                 125
+braille,                                 126
+buginese,                                127
+coptic,                                  128
+newtailue,                               129
+glagolitic,                              130
+tifinagh,                                131
+sylotinagri,                             132
+oldpersian,                              133
+kharoshthi,                              134
+balinese,                                135
+cuneiform,                               136
+phoenician,                              137
+phagspa,                                 138
+nko,                                     139
+sundanese,                               140
+lepcha,                                  141
+olchiki,                                 142
+vai,                                     143
+saurashtra,                              144
+kayahli,                                 145
+rejang,                                  146
+lycian,                                  147
+carian,                                  148
+lydian,                                  149
+cham,                                    150
+taitham,                                 151
+taiviet,                                 152
+avestan,                                 153
+egyptianhieroglyphs,                     154
+samaritan,                               155
+lisu,                                    156
+bamum,                                   157
+javanese,                                158
+meeteimayek,                             159
+imperialaramaic,                         160
+oldsoutharabian,                         161
+inscriptionalparthian,                   162
+inscriptionalpahlavi,                    163
+oldturkic,                               164
+kaithi,                                  165
+batak,                                   166
+brahmi,                                  167
+mandaic,                                 168
+chakma,                                  169
+meroiticcursive,                         170
+meroitichieroglyphs,                     171
+miao,                                    172
+sharada,                                 173
+sorasompeng,                             174
+takri,                                   175
+whitespace,                              176
+bidicontrol,                             177
+joincontrol,                             178
+dash,                                    179
+hyphen,                                  180
+quotationmark,                           181
+terminalpunctuation,                     182
+othermath,                               183
+hexdigit,                                184
+asciihexdigit,                           185
+otheralphabetic,                         186
+ideographic,                             187
+diacritic,                               188
+extender,                                189
+otherlowercase,                          190
+otheruppercase,                          191
+noncharactercodepoint,                   192
+othergraphemeextend,                     193
+idsbinaryoperator,                       194
+idstrinaryoperator,                      195
+radical,                                 196
+unifiedideograph,                        197
+otherdefaultignorablecodepoint,          198
+deprecated,                              199
+softdotted,                              200
+logicalorderexception,                   201
+otheridstart,                            202
+otheridcontinue,                         203
+sterm,                                   204
+variationselector,                       205
+patternwhitespace,                       206
+patternsyntax,                           207
+unknown,                                 208
+ahex,                                    185
+bidic,                                   177
+ci,                                       60
+cwcf,                                     64
+cwcm,                                     65
+cwl,                                      61
+cwt,                                      63
+cwu,                                      62
+dep,                                     199
+di,                                       70
+dia,                                     188
+ext,                                     189
+grbase,                                   72
+grext,                                    71
+grlink,                                   73
+hex,                                     184
+idc,                                      67
+ideo,                                    187
+ids,                                      66
+idsb,                                    194
+idst,                                    195
+joinc,                                   178
+loe,                                     201
+nchar,                                   192
+oalpha,                                  186
+odi,                                     198
+ogrext,                                  193
+oidc,                                    203
+oids,                                    202
+olower,                                  190
+omath,                                   183
+oupper,                                  191
+patsyn,                                  207
+patws,                                   206
+qmark,                                   181
+sd,                                      200
+term,                                    182
+uideo,                                   197
+vs,                                      205
+wspace,                                  176
+xidc,                                     69
+xids,                                     68
+other,                                    17
+control,                                  18
+format,                                   19
+unassigned,                               20
+privateuse,                               21
+surrogate,                                22
+letter,                                   23
+casedletter,                              24
+lowercaseletter,                          25
+modifierletter,                           26
+otherletter,                              27
+titlecaseletter,                          28
+uppercaseletter,                          29
+mark,                                     30
+combiningmark,                            30
+spacingmark,                              31
+enclosingmark,                            32
+nonspacingmark,                           33
+number,                                   34
+decimalnumber,                            35
+letternumber,                             36
+othernumber,                              37
+punctuation,                              38
+connectorpunctuation,                     39
+dashpunctuation,                          40
+closepunctuation,                         41
+finalpunctuation,                         42
+initialpunctuation,                       43
+otherpunctuation,                         44
+openpunctuation,                          45
+symbol,                                   46
+currencysymbol,                           47
+modifiersymbol,                           48
+mathsymbol,                               49
+othersymbol,                              50
+separator,                                51
+lineseparator,                            52
+paragraphseparator,                       53
+spaceseparator,                           54
+arab,                                     80
+armi,                                    160
+armn,                                     78
+avst,                                    153
+bali,                                    135
+bamu,                                    157
+batk,                                    166
+beng,                                     84
+bopo,                                    108
+brah,                                    167
+brai,                                    126
+bugi,                                    127
+buhd,                                    117
+cakm,                                    169
+cans,                                    101
+cari,                                    148
+cher,                                    100
+copt,                                    128
+qaac,                                    128
+cprt,                                    125
+cyrl,                                     77
+deva,                                     83
+dsrt,                                    113
+egyp,                                    154
+ethi,                                     99
+geor,                                     97
+glag,                                    130
+goth,                                    112
+grek,                                     76
+gujr,                                     86
+guru,                                     85
+hang,                                     98
+hani,                                    109
+hano,                                    116
+hebr,                                     79
+hira,                                    106
+ital,                                    111
+java,                                    158
+kali,                                    145
+kana,                                    107
+khar,                                    134
+khmr,                                    104
+knda,                                     90
+kthi,                                    165
+lana,                                    151
+laoo,                                     94
+latn,                                     75
+lepc,                                    141
+limb,                                    119
+linb,                                    121
+lyci,                                    147
+lydi,                                    149
+mand,                                    168
+merc,                                    170
+mero,                                    171
+mlym,                                     91
+mong,                                    105
+mtei,                                    159
+mymr,                                     96
+nkoo,                                    139
+ogam,                                    102
+olck,                                    142
+orkh,                                    164
+orya,                                     87
+osma,                                    124
+phag,                                    138
+phli,                                    163
+phnx,                                    137
+plrd,                                    172
+prti,                                    162
+rjng,                                    146
+runr,                                    103
+samr,                                    155
+sarb,                                    161
+saur,                                    144
+shaw,                                    123
+shrd,                                    173
+sinh,                                     92
+sora,                                    174
+sund,                                    140
+sylo,                                    132
+syrc,                                     81
+tagb,                                    118
+takr,                                    175
+tale,                                    120
+talu,                                    129
+taml,                                     88
+tavt,                                    152
+telu,                                     89
+tfng,                                    131
+tglg,                                    115
+thaa,                                     82
+tibt,                                     95
+ugar,                                    122
+vaii,                                    143
+xpeo,                                    133
+xsux,                                    136
+yiii,                                    110
+zinh,                                    114
+qaai,                                    114
+zyyy,                                     74
+zzzz,                                    208
+age=1.1,                                 209
+age=2.0,                                 210
+age=2.1,                                 211
+age=3.0,                                 212
+age=3.1,                                 213
+age=3.2,                                 214
+age=4.0,                                 215
+age=4.1,                                 216
+age=5.0,                                 217
+age=5.1,                                 218
+age=5.2,                                 219
+age=6.0,                                 220
+age=6.1,                                 221
+inbasiclatin,                            222
+inlatin1supplement,                      223
+inlatinextendeda,                        224
+inlatinextendedb,                        225
+inipaextensions,                         226
+inspacingmodifierletters,                227
+incombiningdiacriticalmarks,             228
+ingreekandcoptic,                        229
+incyrillic,                              230
+incyrillicsupplement,                    231
+inarmenian,                              232
+inhebrew,                                233
+inarabic,                                234
+insyriac,                                235
+inarabicsupplement,                      236
+inthaana,                                237
+innko,                                   238
+insamaritan,                             239
+inmandaic,                               240
+inarabicextendeda,                       241
+indevanagari,                            242
+inbengali,                               243
+ingurmukhi,                              244
+ingujarati,                              245
+inoriya,                                 246
+intamil,                                 247
+intelugu,                                248
+inkannada,                               249
+inmalayalam,                             250
+insinhala,                               251
+inthai,                                  252
+inlao,                                   253
+intibetan,                               254
+inmyanmar,                               255
+ingeorgian,                              256
+inhanguljamo,                            257
+inethiopic,                              258
+inethiopicsupplement,                    259
+incherokee,                              260
+inunifiedcanadianaboriginalsyllabics,    261
+inogham,                                 262
+inrunic,                                 263
+intagalog,                               264
+inhanunoo,                               265
+inbuhid,                                 266
+intagbanwa,                              267
+inkhmer,                                 268
+inmongolian,                             269
+inunifiedcanadianaboriginalsyllabicsextended, 270
+inlimbu,                                 271
+intaile,                                 272
+innewtailue,                             273
+inkhmersymbols,                          274
+inbuginese,                              275
+intaitham,                               276
+inbalinese,                              277
+insundanese,                             278
+inbatak,                                 279
+inlepcha,                                280
+inolchiki,                               281
+insundanesesupplement,                   282
+invedicextensions,                       283
+inphoneticextensions,                    284
+inphoneticextensionssupplement,          285
+incombiningdiacriticalmarkssupplement,   286
+inlatinextendedadditional,               287
+ingreekextended,                         288
+ingeneralpunctuation,                    289
+insuperscriptsandsubscripts,             290
+incurrencysymbols,                       291
+incombiningdiacriticalmarksforsymbols,   292
+inletterlikesymbols,                     293
+innumberforms,                           294
+inarrows,                                295
+inmathematicaloperators,                 296
+inmiscellaneoustechnical,                297
+incontrolpictures,                       298
+inopticalcharacterrecognition,           299
+inenclosedalphanumerics,                 300
+inboxdrawing,                            301
+inblockelements,                         302
+ingeometricshapes,                       303
+inmiscellaneoussymbols,                  304
+indingbats,                              305
+inmiscellaneousmathematicalsymbolsa,     306
+insupplementalarrowsa,                   307
+inbraillepatterns,                       308
+insupplementalarrowsb,                   309
+inmiscellaneousmathematicalsymbolsb,     310
+insupplementalmathematicaloperators,     311
+inmiscellaneoussymbolsandarrows,         312
+inglagolitic,                            313
+inlatinextendedc,                        314
+incoptic,                                315
+ingeorgiansupplement,                    316
+intifinagh,                              317
+inethiopicextended,                      318
+incyrillicextendeda,                     319
+insupplementalpunctuation,               320
+incjkradicalssupplement,                 321
+inkangxiradicals,                        322
+inideographicdescriptioncharacters,      323
+incjksymbolsandpunctuation,              324
+inhiragana,                              325
+inkatakana,                              326
+inbopomofo,                              327
+inhangulcompatibilityjamo,               328
+inkanbun,                                329
+inbopomofoextended,                      330
+incjkstrokes,                            331
+inkatakanaphoneticextensions,            332
+inenclosedcjklettersandmonths,           333
+incjkcompatibility,                      334
+incjkunifiedideographsextensiona,        335
+inyijinghexagramsymbols,                 336
+incjkunifiedideographs,                  337
+inyisyllables,                           338
+inyiradicals,                            339
+inlisu,                                  340
+invai,                                   341
+incyrillicextendedb,                     342
+inbamum,                                 343
+inmodifiertoneletters,                   344
+inlatinextendedd,                        345
+insylotinagri,                           346
+incommonindicnumberforms,                347
+inphagspa,                               348
+insaurashtra,                            349
+indevanagariextended,                    350
+inkayahli,                               351
+inrejang,                                352
+inhanguljamoextendeda,                   353
+injavanese,                              354
+incham,                                  355
+inmyanmarextendeda,                      356
+intaiviet,                               357
+inmeeteimayekextensions,                 358
+inethiopicextendeda,                     359
+inmeeteimayek,                           360
+inhangulsyllables,                       361
+inhanguljamoextendedb,                   362
+inhighsurrogates,                        363
+inhighprivateusesurrogates,              364
+inlowsurrogates,                         365
+inprivateusearea,                        366
+incjkcompatibilityideographs,            367
+inalphabeticpresentationforms,           368
+inarabicpresentationformsa,              369
+invariationselectors,                    370
+inverticalforms,                         371
+incombininghalfmarks,                    372
+incjkcompatibilityforms,                 373
+insmallformvariants,                     374
+inarabicpresentationformsb,              375
+inhalfwidthandfullwidthforms,            376
+inspecials,                              377
+inlinearbsyllabary,                      378
+inlinearbideograms,                      379
+inaegeannumbers,                         380
+inancientgreeknumbers,                   381
+inancientsymbols,                        382
+inphaistosdisc,                          383
+inlycian,                                384
+incarian,                                385
+inolditalic,                             386
+ingothic,                                387
+inugaritic,                              388
+inoldpersian,                            389
+indeseret,                               390
+inshavian,                               391
+inosmanya,                               392
+incypriotsyllabary,                      393
+inimperialaramaic,                       394
+inphoenician,                            395
+inlydian,                                396
+inmeroitichieroglyphs,                   397
+inmeroiticcursive,                       398
+inkharoshthi,                            399
+inoldsoutharabian,                       400
+inavestan,                               401
+ininscriptionalparthian,                 402
+ininscriptionalpahlavi,                  403
+inoldturkic,                             404
+inruminumeralsymbols,                    405
+inbrahmi,                                406
+inkaithi,                                407
+insorasompeng,                           408
+inchakma,                                409
+insharada,                               410
+intakri,                                 411
+incuneiform,                             412
+incuneiformnumbersandpunctuation,        413
+inegyptianhieroglyphs,                   414
+inbamumsupplement,                       415
+inmiao,                                  416
+inkanasupplement,                        417
+inbyzantinemusicalsymbols,               418
+inmusicalsymbols,                        419
+inancientgreekmusicalnotation,           420
+intaixuanjingsymbols,                    421
+incountingrodnumerals,                   422
+inmathematicalalphanumericsymbols,       423
+inarabicmathematicalalphabeticsymbols,   424
+inmahjongtiles,                          425
+indominotiles,                           426
+inplayingcards,                          427
+inenclosedalphanumericsupplement,        428
+inenclosedideographicsupplement,         429
+inmiscellaneoussymbolsandpictographs,    430
+inemoticons,                             431
+intransportandmapsymbols,                432
+inalchemicalsymbols,                     433
+incjkunifiedideographsextensionb,        434
+incjkunifiedideographsextensionc,        435
+incjkunifiedideographsextensiond,        436
+incjkcompatibilityideographssupplement,  437
+intags,                                  438
+invariationselectorssupplement,          439
+insupplementaryprivateuseareaa,          440
+insupplementaryprivateuseareab,          441
+innoblock,                               442
+#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..ff94d68b3b
--- /dev/null
+++ b/enc/unicode/name2ctype.src
@@ -0,0 +1,26550 @@
+%{
+#define long size_t
+
+/* 'NEWLINE': [[:NEWLINE:]] */
+static const OnigCodePoint CR_NEWLINE[] = {
+	1,
+	0x000a, 0x000a,
+}; /* CR_NEWLINE */
+
+/* 'Alpha': [[:Alpha:]] */
+static const OnigCodePoint CR_Alpha[] = {
+	540,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 0x065f,
+	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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x103f,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bac, 0x1baf,
+	0x1bba, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa90a, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9cf,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x11100, 0x11132,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x11680, 0x116b5,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alpha */
+
+/* '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:]] */
+static const OnigCodePoint CR_Cntrl[] = {
+	2,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+}; /* CR_Cntrl */
+
+/* 'Digit': [[:Digit:]] */
+static const OnigCodePoint CR_Digit[] = {
+	42,
+	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, 0x19d9,
+	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,
+	0x11066, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x116c0, 0x116c9,
+	0x1d7ce, 0x1d7ff,
+}; /* CR_Digit */
+
+/* 'Graph': [[:Graph:]] */
+static const OnigCodePoint CR_Graph[] = {
+	544,
+	0x0021, 0x007e,
+	0x00a1, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3001, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Graph */
+
+/* 'Lower': [[:Lower:]] */
+static const OnigCodePoint CR_Lower[] = {
+	618,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7f8, 0xa7fa,
+	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_Lower */
+
+/* 'Print': [[:Print:]] */
+static const OnigCodePoint CR_Print[] = {
+	541,
+	0x0020, 0x007e,
+	0x00a0, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xe000, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Print */
+
+/* 'Punct': [[:Punct:]] */
+static const OnigCodePoint CR_Punct[] = {
+	140,
+	0x0021, 0x0023,
+	0x0025, 0x002a,
+	0x002c, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005b, 0x005d,
+	0x005f, 0x005f,
+	0x007b, 0x007b,
+	0x007d, 0x007d,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00ab, 0x00ab,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f3a, 0x0f3d,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x1400, 0x1400,
+	0x166d, 0x166e,
+	0x169b, 0x169c,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	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,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e2e,
+	0x2e30, 0x2e3b,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x111c5, 0x111c8,
+	0x12470, 0x12473,
+}; /* CR_Punct */
+
+/* 'Space': [[:Space:]] */
+static const OnigCodePoint CR_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_Space */
+
+/* 'Upper': [[:Upper:]] */
+static const OnigCodePoint CR_Upper[] = {
+	610,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	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_Upper */
+
+/* 'XDigit': [[:XDigit:]] */
+static const OnigCodePoint CR_XDigit[] = {
+	3,
+	0x0030, 0x0039,
+	0x0041, 0x0046,
+	0x0061, 0x0066,
+}; /* CR_XDigit */
+
+/* 'Word': [[:Word:]] */
+static const OnigCodePoint CR_Word[] = {
+	564,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a60, 0x1a7c,
+	0x1a7f, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b6b, 0x1b73,
+	0x1b80, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_Word */
+
+/* 'Alnum': [[:Alnum:]] */
+static const OnigCodePoint CR_Alnum[] = {
+	566,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0657,
+	0x0659, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x093b,
+	0x093d, 0x094c,
+	0x094e, 0x0950,
+	0x0955, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f20, 0x0f29,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f81,
+	0x0f88, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x1000, 0x1036,
+	0x1038, 0x1038,
+	0x103b, 0x1049,
+	0x1050, 0x1062,
+	0x1065, 0x1068,
+	0x106e, 0x1086,
+	0x108e, 0x108e,
+	0x1090, 0x1099,
+	0x109c, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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, 0x19d9,
+	0x1a00, 0x1a1b,
+	0x1a20, 0x1a5e,
+	0x1a61, 0x1a74,
+	0x1a80, 0x1a89,
+	0x1a90, 0x1a99,
+	0x1aa7, 0x1aa7,
+	0x1b00, 0x1b33,
+	0x1b35, 0x1b43,
+	0x1b45, 0x1b4b,
+	0x1b50, 0x1b59,
+	0x1b80, 0x1ba9,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1bf1,
+	0x1c00, 0x1c35,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66e,
+	0xa674, 0xa67b,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa801,
+	0xa803, 0xa805,
+	0xa807, 0xa80a,
+	0xa80c, 0xa827,
+	0xa840, 0xa873,
+	0xa880, 0xa8c3,
+	0xa8d0, 0xa8d9,
+	0xa8f2, 0xa8f7,
+	0xa8fb, 0xa8fb,
+	0xa900, 0xa92a,
+	0xa930, 0xa952,
+	0xa960, 0xa97c,
+	0xa980, 0xa9b2,
+	0xa9b4, 0xa9bf,
+	0xa9cf, 0xa9d9,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa60, 0xaa76,
+	0xaa7a, 0xaa7a,
+	0xaa80, 0xaabe,
+	0xaac0, 0xaac0,
+	0xaac2, 0xaac2,
+	0xaadb, 0xaadd,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11045,
+	0x11066, 0x1106f,
+	0x11082, 0x110b8,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11132,
+	0x11136, 0x1113f,
+	0x11180, 0x111bf,
+	0x111c1, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b5,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Alnum */
+
+/* 'ASCII': [[:ASCII:]] */
+static const OnigCodePoint CR_ASCII[] = {
+	1,
+	0x0000, 0x007f,
+}; /* CR_ASCII */
+
+#ifdef USE_UNICODE_PROPERTIES
+/* 'Any': - */
+static const OnigCodePoint CR_Any[] = {
+	1,
+	0x0000, 0x10ffff,
+}; /* CR_Any */
+
+/* 'Assigned': - */
+static const OnigCodePoint CR_Assigned[] = {
+	539,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xf0000, 0xffffd,
+	0x100000, 0x10fffd,
+}; /* CR_Assigned */
+
+/* 'C': Major Category */
+static const OnigCodePoint CR_C[] = {
+	541,
+	0x0000, 0x001f,
+	0x007f, 0x009f,
+	0x00ad, 0x00ad,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x0605,
+	0x061c, 0x061d,
+	0x06dd, 0x06dd,
+	0x070e, 0x070f,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x200b, 0x200f,
+	0x202a, 0x202e,
+	0x2060, 0x206f,
+	0x2072, 0x2073,
+	0x208f, 0x208f,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 0xfbd2,
+	0xfd40, 0xfd4f,
+	0xfd90, 0xfd91,
+	0xfdc8, 0xfdef,
+	0xfdfe, 0xfdff,
+	0xfe1a, 0xfe1f,
+	0xfe27, 0xfe2f,
+	0xfe53, 0xfe53,
+	0xfe67, 0xfe67,
+	0xfe6c, 0xfe6f,
+	0xfe75, 0xfe75,
+	0xfefd, 0xff00,
+	0xffbf, 0xffc1,
+	0xffc8, 0xffc9,
+	0xffd0, 0xffd1,
+	0xffd8, 0xffd9,
+	0xffdd, 0xffdf,
+	0xffe7, 0xffe7,
+	0xffef, 0xfffb,
+	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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110bd, 0x110bd,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 0x1cfff,
+	0x1d0f6, 0x1d0ff,
+	0x1d127, 0x1d128,
+	0x1d173, 0x1d17a,
+	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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_C */
+
+/* 'Cc': General Category */
+#define CR_Cc CR_Cntrl
+
+/* 'Cf': General Category */
+static const OnigCodePoint CR_Cf[] = {
+	14,
+	0x00ad, 0x00ad,
+	0x0600, 0x0604,
+	0x06dd, 0x06dd,
+	0x070f, 0x070f,
+	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[] = {
+	539,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0605, 0x0605,
+	0x061c, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xd7ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 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[] = {
+	486,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6e5,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_L */
+
+/* 'LC': General Category */
+static const OnigCodePoint CR_LC[] = {
+	113,
+	0x0041, 0x005a,
+	0x0061, 0x007a,
+	0x00b5, 0x00b5,
+	0x00c0, 0x00d6,
+	0x00d8, 0x00f6,
+	0x00f8, 0x01ba,
+	0x01bc, 0x01bf,
+	0x01c4, 0x0293,
+	0x0295, 0x02af,
+	0x0370, 0x0373,
+	0x0376, 0x0377,
+	0x037b, 0x037d,
+	0x0386, 0x0386,
+	0x0388, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03f5,
+	0x03f7, 0x0481,
+	0x048a, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x1d00, 0x1d2b,
+	0x1d6b, 0x1d77,
+	0x1d79, 0x1d9a,
+	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,
+	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,
+	0x2183, 0x2184,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c7b,
+	0x2c7e, 0x2ce4,
+	0x2ceb, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa76f,
+	0xa771, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7fa, 0xa7fa,
+	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_LC */
+
+/* 'Ll': General Category */
+static const OnigCodePoint CR_Ll[] = {
+	611,
+	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, 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,
+	0x0527, 0x0527,
+	0x0561, 0x0587,
+	0x1d00, 0x1d2b,
+	0x1d6b, 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, 0x2c7b,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa78e, 0xa78e,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xa7fa, 0xa7fa,
+	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[] = {
+	52,
+	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, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2c7c, 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,
+	0xa7f8, 0xa7f9,
+	0xa9cf, 0xa9cf,
+	0xaa70, 0xaa70,
+	0xaadd, 0xaadd,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0x16f93, 0x16f9f,
+}; /* CR_Lm */
+
+/* 'Lo': General Category */
+static const OnigCodePoint CR_Lo[] = {
+	371,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x01bb, 0x01bb,
+	0x01c0, 0x01c3,
+	0x0294, 0x0294,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0972, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10d0, 0x10fa,
+	0x10fd, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c77,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	0x2135, 0x2138,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf2,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x1b000, 0x1b001,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	608,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	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[] = {
+	204,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0903,
+	0x093a, 0x093c,
+	0x093e, 0x094f,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x102b, 0x103e,
+	0x1056, 0x1059,
+	0x105e, 0x1060,
+	0x1062, 0x1064,
+	0x1067, 0x106d,
+	0x1071, 0x1074,
+	0x1082, 0x108d,
+	0x108f, 0x108f,
+	0x109a, 0x109d,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 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, 0x1bad,
+	0x1be6, 0x1bf3,
+	0x1c24, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf2, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf6,
+	0xabe3, 0xabea,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11000, 0x11002,
+	0x11038, 0x11046,
+	0x11080, 0x11082,
+	0x110b0, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x11134,
+	0x11180, 0x11182,
+	0x111b3, 0x111c0,
+	0x116ab, 0x116b7,
+	0x16f51, 0x16f7e,
+	0x16f8f, 0x16f92,
+	0x1d165, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_M */
+
+/* 'Mc': General Category */
+static const OnigCodePoint CR_Mc[] = {
+	126,
+	0x0903, 0x0903,
+	0x093b, 0x093b,
+	0x093e, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x094f,
+	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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1c24, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1ce1, 0x1ce1,
+	0x1cf2, 0x1cf3,
+	0x302e, 0x302f,
+	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,
+	0xaaeb, 0xaaeb,
+	0xaaee, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabea,
+	0xabec, 0xabec,
+	0x11000, 0x11000,
+	0x11002, 0x11002,
+	0x11082, 0x11082,
+	0x110b0, 0x110b2,
+	0x110b7, 0x110b8,
+	0x1112c, 0x1112c,
+	0x11182, 0x11182,
+	0x111b3, 0x111b5,
+	0x111bf, 0x111c0,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x16f51, 0x16f7e,
+	0x1d165, 0x1d166,
+	0x1d16d, 0x1d172,
+}; /* CR_Mc */
+
+/* 'Me': General Category */
+static const OnigCodePoint CR_Me[] = {
+	4,
+	0x0488, 0x0489,
+	0x20dd, 0x20e0,
+	0x20e2, 0x20e4,
+	0xa670, 0xa672,
+}; /* CR_Me */
+
+/* 'Mn': General Category */
+static const OnigCodePoint CR_Mn[] = {
+	220,
+	0x0300, 0x036f,
+	0x0483, 0x0487,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x20d0, 0x20dc,
+	0x20e1, 0x20e1,
+	0x20e5, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302d,
+	0x3099, 0x309a,
+	0xa66f, 0xa66f,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe26,
+	0x101fd, 0x101fd,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f92,
+	0x1d167, 0x1d169,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+	0x1d242, 0x1d244,
+	0xe0100, 0xe01ef,
+}; /* CR_Mn */
+
+/* 'N': Major Category */
+static const OnigCodePoint CR_N[] = {
+	88,
+	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,
+	0x0b72, 0x0b77,
+	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,
+	0x3248, 0x324f,
+	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,
+	0x11052, 0x1106f,
+	0x110f0, 0x110f9,
+	0x11136, 0x1113f,
+	0x111d0, 0x111d9,
+	0x116c0, 0x116c9,
+	0x12400, 0x12462,
+	0x1d360, 0x1d371,
+	0x1d7ce, 0x1d7ff,
+	0x1f100, 0x1f10a,
+}; /* CR_N */
+
+/* 'Nd': General Category */
+#define CR_Nd CR_Digit
+
+/* '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[] = {
+	42,
+	0x00b2, 0x00b3,
+	0x00b9, 0x00b9,
+	0x00bc, 0x00be,
+	0x09f4, 0x09f9,
+	0x0b72, 0x0b77,
+	0x0bf0, 0x0bf2,
+	0x0c78, 0x0c7e,
+	0x0d70, 0x0d75,
+	0x0f2a, 0x0f33,
+	0x1369, 0x137c,
+	0x17f0, 0x17f9,
+	0x19da, 0x19da,
+	0x2070, 0x2070,
+	0x2074, 0x2079,
+	0x2080, 0x2089,
+	0x2150, 0x215f,
+	0x2189, 0x2189,
+	0x2460, 0x249b,
+	0x24ea, 0x24ff,
+	0x2776, 0x2793,
+	0x2cfd, 0x2cfd,
+	0x3192, 0x3195,
+	0x3220, 0x3229,
+	0x3248, 0x324f,
+	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,
+	0x11052, 0x11065,
+	0x1d360, 0x1d371,
+	0x1f100, 0x1f10a,
+}; /* CR_No */
+
+/* 'P': Major Category */
+#define CR_P CR_Punct
+
+/* '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[] = {
+	16,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	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[] = {
+	135,
+	0x0021, 0x0023,
+	0x0025, 0x0027,
+	0x002a, 0x002a,
+	0x002c, 0x002c,
+	0x002e, 0x002f,
+	0x003a, 0x003b,
+	0x003f, 0x0040,
+	0x005c, 0x005c,
+	0x00a1, 0x00a1,
+	0x00a7, 0x00a7,
+	0x00b6, 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,
+	0x085e, 0x085e,
+	0x0964, 0x0965,
+	0x0970, 0x0970,
+	0x0af0, 0x0af0,
+	0x0df4, 0x0df4,
+	0x0e4f, 0x0e4f,
+	0x0e5a, 0x0e5b,
+	0x0f04, 0x0f12,
+	0x0f14, 0x0f14,
+	0x0f85, 0x0f85,
+	0x0fd0, 0x0fd4,
+	0x0fd9, 0x0fda,
+	0x104a, 0x104f,
+	0x10fb, 0x10fb,
+	0x1360, 0x1368,
+	0x166d, 0x166e,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x17d4, 0x17d6,
+	0x17d8, 0x17da,
+	0x1800, 0x1805,
+	0x1807, 0x180a,
+	0x1944, 0x1945,
+	0x1a1e, 0x1a1f,
+	0x1aa0, 0x1aa6,
+	0x1aa8, 0x1aad,
+	0x1b5a, 0x1b60,
+	0x1bfc, 0x1bff,
+	0x1c3b, 0x1c3f,
+	0x1c7e, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x2016, 0x2017,
+	0x2020, 0x2027,
+	0x2030, 0x2038,
+	0x203b, 0x203e,
+	0x2041, 0x2043,
+	0x2047, 0x2051,
+	0x2053, 0x2053,
+	0x2055, 0x205e,
+	0x2cf9, 0x2cfc,
+	0x2cfe, 0x2cff,
+	0x2d70, 0x2d70,
+	0x2e00, 0x2e01,
+	0x2e06, 0x2e08,
+	0x2e0b, 0x2e0b,
+	0x2e0e, 0x2e16,
+	0x2e18, 0x2e19,
+	0x2e1b, 0x2e1b,
+	0x2e1e, 0x2e1f,
+	0x2e2a, 0x2e2e,
+	0x2e30, 0x2e39,
+	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,
+	0xaaf0, 0xaaf1,
+	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, 0x10102,
+	0x1039f, 0x1039f,
+	0x103d0, 0x103d0,
+	0x10857, 0x10857,
+	0x1091f, 0x1091f,
+	0x1093f, 0x1093f,
+	0x10a50, 0x10a58,
+	0x10a7f, 0x10a7f,
+	0x10b39, 0x10b3f,
+	0x11047, 0x1104d,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x11140, 0x11143,
+	0x111c5, 0x111c8,
+	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, 0x00a6,
+	0x00a8, 0x00a9,
+	0x00ac, 0x00ac,
+	0x00ae, 0x00b1,
+	0x00b4, 0x00b4,
+	0x00b8, 0x00b8,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02c2, 0x02c5,
+	0x02d2, 0x02df,
+	0x02e5, 0x02eb,
+	0x02ed, 0x02ed,
+	0x02ef, 0x02ff,
+	0x0375, 0x0375,
+	0x0384, 0x0385,
+	0x03f6, 0x03f6,
+	0x0482, 0x0482,
+	0x058f, 0x058f,
+	0x0606, 0x0608,
+	0x060b, 0x060b,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09f2, 0x09f3,
+	0x09fa, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0e3f, 0x0e3f,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x17db, 0x17db,
+	0x1940, 0x1940,
+	0x19de, 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, 0x20b9,
+	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, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27c4,
+	0x27c7, 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, 0x3247,
+	0x3250, 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,
+	0xfbb2, 0xfbc1,
+	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,
+	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,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+}; /* CR_S */
+
+/* 'Sc': General Category */
+static const OnigCodePoint CR_Sc[] = {
+	17,
+	0x0024, 0x0024,
+	0x00a2, 0x00a5,
+	0x058f, 0x058f,
+	0x060b, 0x060b,
+	0x09f2, 0x09f3,
+	0x09fb, 0x09fb,
+	0x0af1, 0x0af1,
+	0x0bf9, 0x0bf9,
+	0x0e3f, 0x0e3f,
+	0x17db, 0x17db,
+	0x20a0, 0x20b9,
+	0xa838, 0xa838,
+	0xfdfc, 0xfdfc,
+	0xfe69, 0xfe69,
+	0xff04, 0xff04,
+	0xffe0, 0xffe1,
+	0xffe5, 0xffe6,
+}; /* CR_Sc */
+
+/* 'Sk': General Category */
+static const OnigCodePoint CR_Sk[] = {
+	27,
+	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,
+	0xfbb2, 0xfbc1,
+	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,
+	0x2118, 0x2118,
+	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, 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,
+	0x1eef0, 0x1eef1,
+}; /* CR_Sm */
+
+/* 'So': General Category */
+static const OnigCodePoint CR_So[] = {
+	153,
+	0x00a6, 0x00a6,
+	0x00a9, 0x00a9,
+	0x00ae, 0x00ae,
+	0x00b0, 0x00b0,
+	0x0482, 0x0482,
+	0x060e, 0x060f,
+	0x06de, 0x06de,
+	0x06e9, 0x06e9,
+	0x06fd, 0x06fe,
+	0x07f6, 0x07f6,
+	0x09fa, 0x09fa,
+	0x0b70, 0x0b70,
+	0x0bf3, 0x0bf8,
+	0x0bfa, 0x0bfa,
+	0x0c7f, 0x0c7f,
+	0x0d79, 0x0d79,
+	0x0f01, 0x0f03,
+	0x0f13, 0x0f13,
+	0x0f15, 0x0f17,
+	0x0f1a, 0x0f1f,
+	0x0f34, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fcf,
+	0x0fd5, 0x0fd8,
+	0x109e, 0x109f,
+	0x1390, 0x1399,
+	0x1940, 0x1940,
+	0x19de, 0x19ff,
+	0x1b61, 0x1b6a,
+	0x1b74, 0x1b7c,
+	0x2100, 0x2101,
+	0x2103, 0x2106,
+	0x2108, 0x2109,
+	0x2114, 0x2114,
+	0x2116, 0x2117,
+	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, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x249c, 0x24e9,
+	0x2500, 0x25b6,
+	0x25b8, 0x25c0,
+	0x25c2, 0x25f7,
+	0x2600, 0x266e,
+	0x2670, 0x26ff,
+	0x2701, 0x2767,
+	0x2794, 0x27bf,
+	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, 0x3247,
+	0x3250, 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,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+}; /* 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[] = {
+	138,
+	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,
+	0x2107, 0x2107,
+	0x210a, 0x2113,
+	0x2115, 0x2115,
+	0x2118, 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, 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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* CR_Math */
+
+/* 'Alphabetic': Derived Property */
+#define CR_Alphabetic CR_Alpha
+
+/* 'Lowercase': Derived Property */
+#define CR_Lowercase CR_Lower
+
+/* 'Uppercase': Derived Property */
+#define CR_Uppercase CR_Upper
+
+/* 'Cased': Derived Property */
+static const OnigCodePoint CR_Cased[] = {
+	119,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 0xa7fa,
+	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[] = {
+	295,
+	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, 0x0604,
+	0x0610, 0x061a,
+	0x0640, 0x0640,
+	0x064b, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dd,
+	0x06df, 0x06e8,
+	0x06ea, 0x06ed,
+	0x070f, 0x070f,
+	0x0711, 0x0711,
+	0x0730, 0x074a,
+	0x07a6, 0x07b0,
+	0x07eb, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0816, 0x082d,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20d0, 0x20f0,
+	0x2c7c, 0x2c7d,
+	0x2cef, 0x2cf1,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x2e2f, 0x2e2f,
+	0x3005, 0x3005,
+	0x302a, 0x302d,
+	0x3031, 0x3035,
+	0x303b, 0x303b,
+	0x3099, 0x309e,
+	0x30fc, 0x30fe,
+	0xa015, 0xa015,
+	0xa4f8, 0xa4fd,
+	0xa60c, 0xa60c,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa67f, 0xa67f,
+	0xa69f, 0xa69f,
+	0xa6f0, 0xa6f1,
+	0xa700, 0xa721,
+	0xa770, 0xa770,
+	0xa788, 0xa78a,
+	0xa7f8, 0xa7f9,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf3, 0xaaf4,
+	0xaaf6, 0xaaf6,
+	0xabe5, 0xabe5,
+	0xabe8, 0xabe8,
+	0xabed, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfbb2, 0xfbc1,
+	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,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x110bd, 0x110bd,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f9f,
+	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[] = {
+	571,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Lowercased */
+
+/* 'Changes_When_Uppercased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Uppercased[] = {
+	586,
+	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,
+	0x0265, 0x0266,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Uppercased */
+
+/* 'Changes_When_Titlecased': Derived Property */
+static const OnigCodePoint CR_Changes_When_Titlecased[] = {
+	587,
+	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,
+	0x0265, 0x0266,
+	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,
+	0x0527, 0x0527,
+	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,
+	0x2cf3, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	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,
+	0xa661, 0xa661,
+	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,
+	0xa791, 0xa791,
+	0xa793, 0xa793,
+	0xa7a1, 0xa7a1,
+	0xa7a3, 0xa7a3,
+	0xa7a5, 0xa7a5,
+	0xa7a7, 0xa7a7,
+	0xa7a9, 0xa7a9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff41, 0xff5a,
+	0x10428, 0x1044f,
+}; /* CR_Changes_When_Titlecased */
+
+/* 'Changes_When_Casefolded': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casefolded[] = {
+	582,
+	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,
+	0x0526, 0x0526,
+	0x0531, 0x0556,
+	0x0587, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf2,
+	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,
+	0xa660, 0xa660,
+	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,
+	0xa78d, 0xa78d,
+	0xa790, 0xa790,
+	0xa792, 0xa792,
+	0xa7a0, 0xa7a0,
+	0xa7a2, 0xa7a2,
+	0xa7a4, 0xa7a4,
+	0xa7a6, 0xa7a6,
+	0xa7a8, 0xa7a8,
+	0xa7aa, 0xa7aa,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0x10400, 0x10427,
+}; /* CR_Changes_When_Casefolded */
+
+/* 'Changes_When_Casemapped': Derived Property */
+static const OnigCodePoint CR_Changes_When_Casemapped[] = {
+	104,
+	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,
+	0x0265, 0x0266,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0561, 0x0587,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0xa640, 0xa66d,
+	0xa680, 0xa697,
+	0xa722, 0xa72f,
+	0xa732, 0xa76f,
+	0xa779, 0xa787,
+	0xa78b, 0xa78d,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xff21, 0xff3a,
+	0xff41, 0xff5a,
+	0x10400, 0x1044f,
+}; /* CR_Changes_When_Casemapped */
+
+/* 'ID_Start': Derived Property */
+static const OnigCodePoint CR_ID_Start[] = {
+	488,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_ID_Start */
+
+/* 'ID_Continue': Derived Property */
+static const OnigCodePoint CR_ID_Continue[] = {
+	564,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0xe0100, 0xe01ef,
+}; /* CR_ID_Continue */
+
+/* 'XID_Start': Derived Property */
+static const OnigCodePoint CR_XID_Start[] = {
+	495,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0620, 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,
+	0x0840, 0x0858,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0904, 0x0939,
+	0x093d, 0x093d,
+	0x0950, 0x0950,
+	0x0958, 0x0961,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f40, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f88, 0x0f8c,
+	0x1000, 0x102a,
+	0x103f, 0x103f,
+	0x1050, 0x1055,
+	0x105a, 0x105d,
+	0x1061, 0x1061,
+	0x1065, 0x1066,
+	0x106e, 0x1070,
+	0x1075, 0x1081,
+	0x108e, 0x108e,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x1bba, 0x1be5,
+	0x1c00, 0x1c23,
+	0x1c4d, 0x1c4f,
+	0x1c5a, 0x1c7d,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf1,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	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,
+	0x2cf2, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa61f,
+	0xa62a, 0xa62b,
+	0xa640, 0xa66e,
+	0xa67f, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaea,
+	0xaaf2, 0xaaf4,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe2,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a00,
+	0x10a10, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11003, 0x11037,
+	0x11083, 0x110af,
+	0x110d0, 0x110e8,
+	0x11103, 0x11126,
+	0x11183, 0x111b2,
+	0x111c1, 0x111c4,
+	0x11680, 0x116aa,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f50,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_XID_Start */
+
+/* 'XID_Continue': Derived Property */
+static const OnigCodePoint CR_XID_Continue[] = {
+	571,
+	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, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x0559,
+	0x0561, 0x0587,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f2,
+	0x0610, 0x061a,
+	0x0620, 0x0669,
+	0x066e, 0x06d3,
+	0x06d5, 0x06dc,
+	0x06df, 0x06e8,
+	0x06ea, 0x06fc,
+	0x06ff, 0x06ff,
+	0x0710, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07f5,
+	0x07fa, 0x07fa,
+	0x0800, 0x082d,
+	0x0840, 0x085b,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0963,
+	0x0966, 0x096f,
+	0x0971, 0x0977,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f00,
+	0x0f18, 0x0f19,
+	0x0f20, 0x0f29,
+	0x0f35, 0x0f35,
+	0x0f37, 0x0f37,
+	0x0f39, 0x0f39,
+	0x0f3e, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f84,
+	0x0f86, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fc6, 0x0fc6,
+	0x1000, 0x1049,
+	0x1050, 0x109d,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 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,
+	0x135d, 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, 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, 0x1bf3,
+	0x1c00, 0x1c37,
+	0x1c40, 0x1c49,
+	0x1c4d, 0x1c7d,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	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, 0x2cf3,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d6f,
+	0x2d7f, 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, 0x31ba,
+	0x31f0, 0x31ff,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa4d0, 0xa4fd,
+	0xa500, 0xa60c,
+	0xa610, 0xa62b,
+	0xa640, 0xa66f,
+	0xa674, 0xa67d,
+	0xa67f, 0xa697,
+	0xa69f, 0xa6f1,
+	0xa717, 0xa71f,
+	0xa722, 0xa788,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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,
+	0xaae0, 0xaaef,
+	0xaaf2, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabea,
+	0xabec, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a3f,
+	0x10a60, 0x10a7c,
+	0x10b00, 0x10b35,
+	0x10b40, 0x10b55,
+	0x10b60, 0x10b72,
+	0x10c00, 0x10c48,
+	0x11000, 0x11046,
+	0x11066, 0x1106f,
+	0x11080, 0x110ba,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x1113f,
+	0x11180, 0x111c4,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	232,
+	0x0300, 0x036f,
+	0x0483, 0x0489,
+	0x0591, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x065f,
+	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,
+	0x0859, 0x085b,
+	0x08e4, 0x08fe,
+	0x0900, 0x0902,
+	0x093a, 0x093a,
+	0x093c, 0x093c,
+	0x0941, 0x0948,
+	0x094d, 0x094d,
+	0x0951, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x135d, 0x135f,
+	0x1712, 0x1714,
+	0x1732, 0x1734,
+	0x1752, 0x1753,
+	0x1772, 0x1773,
+	0x17b4, 0x17b5,
+	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,
+	0x1bab, 0x1bab,
+	0x1be6, 0x1be6,
+	0x1be8, 0x1be9,
+	0x1bed, 0x1bed,
+	0x1bef, 0x1bf1,
+	0x1c2c, 0x1c33,
+	0x1c36, 0x1c37,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x2cef, 0x2cf1,
+	0x2d7f, 0x2d7f,
+	0x2de0, 0x2dff,
+	0x302a, 0x302f,
+	0x3099, 0x309a,
+	0xa66f, 0xa672,
+	0xa674, 0xa67d,
+	0xa69f, 0xa69f,
+	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,
+	0xaaec, 0xaaed,
+	0xaaf6, 0xaaf6,
+	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,
+	0x11001, 0x11001,
+	0x11038, 0x11046,
+	0x11080, 0x11081,
+	0x110b3, 0x110b6,
+	0x110b9, 0x110ba,
+	0x11100, 0x11102,
+	0x11127, 0x1112b,
+	0x1112d, 0x11134,
+	0x11180, 0x11181,
+	0x111b6, 0x111be,
+	0x116ab, 0x116ab,
+	0x116ad, 0x116ad,
+	0x116b0, 0x116b5,
+	0x116b7, 0x116b7,
+	0x16f8f, 0x16f92,
+	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[] = {
+	643,
+	0x0020, 0x007e,
+	0x00a0, 0x00ac,
+	0x00ae, 0x02ff,
+	0x0370, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0482,
+	0x048a, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x05be, 0x05be,
+	0x05c0, 0x05c0,
+	0x05c3, 0x05c3,
+	0x05c6, 0x05c6,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0606, 0x060f,
+	0x061b, 0x061b,
+	0x061e, 0x064a,
+	0x0660, 0x066f,
+	0x0671, 0x06d5,
+	0x06de, 0x06de,
+	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,
+	0x0840, 0x0858,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x0903, 0x0939,
+	0x093b, 0x093b,
+	0x093d, 0x0940,
+	0x0949, 0x094c,
+	0x094e, 0x0950,
+	0x0958, 0x0961,
+	0x0964, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d3d,
+	0x0d3f, 0x0d40,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4c,
+	0x0d4e, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f17,
+	0x0f1a, 0x0f34,
+	0x0f36, 0x0f36,
+	0x0f38, 0x0f38,
+	0x0f3a, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f7f, 0x0f7f,
+	0x0f85, 0x0f85,
+	0x0f88, 0x0f8c,
+	0x0fbe, 0x0fc5,
+	0x0fc7, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x102c,
+	0x1031, 0x1031,
+	0x1038, 0x1038,
+	0x103b, 0x103c,
+	0x103f, 0x1057,
+	0x105a, 0x105d,
+	0x1061, 0x1070,
+	0x1075, 0x1081,
+	0x1083, 0x1084,
+	0x1087, 0x108c,
+	0x108e, 0x109c,
+	0x109e, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x1bac, 0x1be5,
+	0x1be7, 0x1be7,
+	0x1bea, 0x1bec,
+	0x1bee, 0x1bee,
+	0x1bf2, 0x1bf3,
+	0x1bfc, 0x1c2b,
+	0x1c34, 0x1c35,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	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, 0x209c,
+	0x20a0, 0x20b9,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cee,
+	0x2cf2, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2e00, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x3029,
+	0x3030, 0x303f,
+	0x3041, 0x3096,
+	0x309b, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa66e,
+	0xa673, 0xa673,
+	0xa67e, 0xa697,
+	0xa6a0, 0xa6ef,
+	0xa6f2, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaeb,
+	0xaaee, 0xaaf5,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabe4,
+	0xabe6, 0xabe7,
+	0xabe9, 0xabec,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb1d,
+	0xfb1f, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x11000,
+	0x11002, 0x11037,
+	0x11047, 0x1104d,
+	0x11052, 0x1106f,
+	0x11082, 0x110b2,
+	0x110b7, 0x110b8,
+	0x110bb, 0x110bc,
+	0x110be, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11103, 0x11126,
+	0x1112c, 0x1112c,
+	0x11136, 0x11143,
+	0x11182, 0x111b5,
+	0x111bf, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116aa,
+	0x116ac, 0x116ac,
+	0x116ae, 0x116af,
+	0x116b6, 0x116b6,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f93, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Grapheme_Base */
+
+/* 'Grapheme_Link': Derived Property */
+static const OnigCodePoint CR_Grapheme_Link[] = {
+	33,
+	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, 0x1bab,
+	0x1bf2, 0x1bf3,
+	0x2d7f, 0x2d7f,
+	0xa806, 0xa806,
+	0xa8c4, 0xa8c4,
+	0xa953, 0xa953,
+	0xa9c0, 0xa9c0,
+	0xaaf6, 0xaaf6,
+	0xabed, 0xabed,
+	0x10a3f, 0x10a3f,
+	0x11046, 0x11046,
+	0x110b9, 0x110b9,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x116b6, 0x116b6,
+}; /* CR_Grapheme_Link */
+
+/* 'Common': Script */
+static const OnigCodePoint CR_Common[] = {
+	157,
+	0x0000, 0x0040,
+	0x005b, 0x0060,
+	0x007b, 0x00a9,
+	0x00ab, 0x00b9,
+	0x00bb, 0x00bf,
+	0x00d7, 0x00d7,
+	0x00f7, 0x00f7,
+	0x02b9, 0x02df,
+	0x02e5, 0x02e9,
+	0x02ec, 0x02ff,
+	0x0374, 0x0374,
+	0x037e, 0x037e,
+	0x0385, 0x0385,
+	0x0387, 0x0387,
+	0x0589, 0x0589,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0640, 0x0640,
+	0x0660, 0x0669,
+	0x06dd, 0x06dd,
+	0x0964, 0x0965,
+	0x0e3f, 0x0e3f,
+	0x0fd5, 0x0fd8,
+	0x10fb, 0x10fb,
+	0x16eb, 0x16ed,
+	0x1735, 0x1736,
+	0x1802, 0x1803,
+	0x1805, 0x1805,
+	0x1cd3, 0x1cd3,
+	0x1ce1, 0x1ce1,
+	0x1ce9, 0x1cec,
+	0x1cee, 0x1cf3,
+	0x1cf5, 0x1cf6,
+	0x2000, 0x200b,
+	0x200e, 0x2064,
+	0x206a, 0x2070,
+	0x2074, 0x207e,
+	0x2080, 0x208e,
+	0x20a0, 0x20b9,
+	0x2100, 0x2125,
+	0x2127, 0x2129,
+	0x212c, 0x2131,
+	0x2133, 0x214d,
+	0x214f, 0x215f,
+	0x2189, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ff,
+	0x2900, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2e00, 0x2e3b,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f1ff,
+	0x1f201, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+}; /* CR_Common */
+
+/* 'Latin': Script */
+static const OnigCodePoint CR_Latin[] = {
+	30,
+	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, 0x209c,
+	0x212a, 0x212b,
+	0x2132, 0x2132,
+	0x214e, 0x214e,
+	0x2160, 0x2188,
+	0x2c60, 0x2c7f,
+	0xa722, 0xa787,
+	0xa78b, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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[] = {
+	7,
+	0x0400, 0x0484,
+	0x0487, 0x0527,
+	0x1d2b, 0x1d2b,
+	0x1d78, 0x1d78,
+	0x2de0, 0x2dff,
+	0xa640, 0xa697,
+	0xa69f, 0xa69f,
+}; /* CR_Cyrillic */
+
+/* 'Armenian': Script */
+static const OnigCodePoint CR_Armenian[] = {
+	6,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x058a, 0x058a,
+	0x058f, 0x058f,
+	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[] = {
+	56,
+	0x0600, 0x0604,
+	0x0606, 0x060b,
+	0x060d, 0x061a,
+	0x061e, 0x061e,
+	0x0620, 0x063f,
+	0x0641, 0x064a,
+	0x0656, 0x065e,
+	0x066a, 0x066f,
+	0x0671, 0x06dc,
+	0x06de, 0x06ff,
+	0x0750, 0x077f,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0xfb50, 0xfbc1,
+	0xfbd3, 0xfd3d,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfc,
+	0xfe70, 0xfe74,
+	0xfe76, 0xfefc,
+	0x10e60, 0x10e7e,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+}; /* 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[] = {
+	5,
+	0x0900, 0x0950,
+	0x0953, 0x0963,
+	0x0966, 0x0977,
+	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[] = {
+	13,
+	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, 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, 0x0b77,
+}; /* 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[] = {
+	14,
+	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,
+}; /* CR_Kannada */
+
+/* 'Malayalam': Script */
+static const OnigCodePoint CR_Malayalam[] = {
+	11,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+}; /* CR_Lao */
+
+/* 'Tibetan': Script */
+static const OnigCodePoint CR_Tibetan[] = {
+	7,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fd4,
+	0x0fd9, 0x0fda,
+}; /* CR_Tibetan */
+
+/* 'Myanmar': Script */
+static const OnigCodePoint CR_Myanmar[] = {
+	2,
+	0x1000, 0x109f,
+	0xaa60, 0xaa7b,
+}; /* CR_Myanmar */
+
+/* 'Georgian': Script */
+static const OnigCodePoint CR_Georgian[] = {
+	8,
+	0x10a0, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 0x10fa,
+	0x10fc, 0x10ff,
+	0x2d00, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+}; /* CR_Georgian */
+
+/* 'Hangul': Script */
+static const OnigCodePoint CR_Hangul[] = {
+	14,
+	0x1100, 0x11ff,
+	0x302e, 0x302f,
+	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[] = {
+	32,
+	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,
+	0x135d, 0x137c,
+	0x1380, 0x1399,
+	0x2d80, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+}; /* 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[] = {
+	4,
+	0x3041, 0x3096,
+	0x309d, 0x309f,
+	0x1b001, 0x1b001,
+	0x1f200, 0x1f200,
+}; /* CR_Hiragana */
+
+/* 'Katakana': Script */
+static const OnigCodePoint CR_Katakana[] = {
+	8,
+	0x30a1, 0x30fa,
+	0x30fd, 0x30ff,
+	0x31f0, 0x31ff,
+	0x32d0, 0x32fe,
+	0x3300, 0x3357,
+	0xff66, 0xff6f,
+	0xff71, 0xff9d,
+	0x1b000, 0x1b000,
+}; /* CR_Katakana */
+
+/* 'Bopomofo': Script */
+static const OnigCodePoint CR_Bopomofo[] = {
+	3,
+	0x02ea, 0x02eb,
+	0x3105, 0x312d,
+	0x31a0, 0x31ba,
+}; /* 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, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	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[] = {
+	25,
+	0x0300, 0x036f,
+	0x0485, 0x0486,
+	0x064b, 0x0655,
+	0x065f, 0x065f,
+	0x0670, 0x0670,
+	0x0951, 0x0952,
+	0x1cd0, 0x1cd2,
+	0x1cd4, 0x1ce0,
+	0x1ce2, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	0x1dc0, 0x1de6,
+	0x1dfc, 0x1dff,
+	0x200c, 0x200d,
+	0x20d0, 0x20f0,
+	0x302a, 0x302d,
+	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, 0x2cf3,
+	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[] = {
+	3,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d7f,
+}; /* 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, 0x1bbf,
+	0x1cc0, 0x1cc7,
+}; /* 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[] = {
+	2,
+	0xa6a0, 0xa6f7,
+	0x16800, 0x16a38,
+}; /* 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[] = {
+	3,
+	0xaae0, 0xaaf6,
+	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 */
+
+/* 'Batak': Script */
+static const OnigCodePoint CR_Batak[] = {
+	2,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1bff,
+}; /* CR_Batak */
+
+/* 'Brahmi': Script */
+static const OnigCodePoint CR_Brahmi[] = {
+	2,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+}; /* CR_Brahmi */
+
+/* 'Mandaic': Script */
+static const OnigCodePoint CR_Mandaic[] = {
+	2,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+}; /* CR_Mandaic */
+
+/* 'Chakma': Script */
+static const OnigCodePoint CR_Chakma[] = {
+	2,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+}; /* CR_Chakma */
+
+/* 'Meroitic_Cursive': Script */
+static const OnigCodePoint CR_Meroitic_Cursive[] = {
+	2,
+	0x109a0, 0x109b7,
+	0x109be, 0x109bf,
+}; /* CR_Meroitic_Cursive */
+
+/* 'Meroitic_Hieroglyphs': Script */
+static const OnigCodePoint CR_Meroitic_Hieroglyphs[] = {
+	1,
+	0x10980, 0x1099f,
+}; /* CR_Meroitic_Hieroglyphs */
+
+/* 'Miao': Script */
+static const OnigCodePoint CR_Miao[] = {
+	3,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+}; /* CR_Miao */
+
+/* 'Sharada': Script */
+static const OnigCodePoint CR_Sharada[] = {
+	2,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+}; /* CR_Sharada */
+
+/* 'Sora_Sompeng': Script */
+static const OnigCodePoint CR_Sora_Sompeng[] = {
+	2,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+}; /* CR_Sora_Sompeng */
+
+/* 'Takri': Script */
+static const OnigCodePoint CR_Takri[] = {
+	2,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+}; /* CR_Takri */
+
+/* 'White_Space': Binary Property */
+#define CR_White_Space CR_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[] = {
+	20,
+	0x002d, 0x002d,
+	0x058a, 0x058a,
+	0x05be, 0x05be,
+	0x1400, 0x1400,
+	0x1806, 0x1806,
+	0x2010, 0x2015,
+	0x2053, 0x2053,
+	0x207b, 0x207b,
+	0x208b, 0x208b,
+	0x2212, 0x2212,
+	0x2e17, 0x2e17,
+	0x2e1a, 0x2e1a,
+	0x2e3a, 0x2e3b,
+	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[] = {
+	70,
+	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,
+	0x085e, 0x085e,
+	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,
+	0xaaf0, 0xaaf1,
+	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,
+	0x11047, 0x1104d,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+	0x12470, 0x12473,
+}; /* CR_Terminal_Punctuation */
+
+/* 'Other_Math': Binary Property */
+static const OnigCodePoint CR_Other_Math[] = {
+	133,
+	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,
+	0x2107, 0x2107,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+}; /* 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 */
+#define CR_ASCII_Hex_Digit CR_XDigit
+
+/* 'Other_Alphabetic': Binary Property */
+static const OnigCodePoint CR_Other_Alphabetic[] = {
+	158,
+	0x0345, 0x0345,
+	0x05b0, 0x05bd,
+	0x05bf, 0x05bf,
+	0x05c1, 0x05c2,
+	0x05c4, 0x05c5,
+	0x05c7, 0x05c7,
+	0x0610, 0x061a,
+	0x064b, 0x0657,
+	0x0659, 0x065f,
+	0x0670, 0x0670,
+	0x06d6, 0x06dc,
+	0x06e1, 0x06e4,
+	0x06e7, 0x06e8,
+	0x06ed, 0x06ed,
+	0x0711, 0x0711,
+	0x0730, 0x073f,
+	0x07a6, 0x07b0,
+	0x0816, 0x0817,
+	0x081b, 0x0823,
+	0x0825, 0x0827,
+	0x0829, 0x082c,
+	0x08e4, 0x08e9,
+	0x08f0, 0x08fe,
+	0x0900, 0x0903,
+	0x093a, 0x093b,
+	0x093e, 0x094c,
+	0x094e, 0x094f,
+	0x0955, 0x0957,
+	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,
+	0x0f8d, 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,
+	0x1bac, 0x1bad,
+	0x1be7, 0x1bf1,
+	0x1c24, 0x1c35,
+	0x1cf2, 0x1cf3,
+	0x24b6, 0x24e9,
+	0x2de0, 0x2dff,
+	0xa674, 0xa67b,
+	0xa69f, 0xa69f,
+	0xa823, 0xa827,
+	0xa880, 0xa881,
+	0xa8b4, 0xa8c3,
+	0xa926, 0xa92a,
+	0xa947, 0xa952,
+	0xa980, 0xa983,
+	0xa9b4, 0xa9bf,
+	0xaa29, 0xaa36,
+	0xaa43, 0xaa43,
+	0xaa4c, 0xaa4d,
+	0xaab0, 0xaab0,
+	0xaab2, 0xaab4,
+	0xaab7, 0xaab8,
+	0xaabe, 0xaabe,
+	0xaaeb, 0xaaef,
+	0xaaf5, 0xaaf5,
+	0xabe3, 0xabea,
+	0xfb1e, 0xfb1e,
+	0x10a01, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a0f,
+	0x11000, 0x11002,
+	0x11038, 0x11045,
+	0x11082, 0x11082,
+	0x110b0, 0x110b8,
+	0x11100, 0x11102,
+	0x11127, 0x11132,
+	0x11180, 0x11182,
+	0x111b3, 0x111bf,
+	0x116ab, 0x116b5,
+	0x16f51, 0x16f7e,
+}; /* CR_Other_Alphabetic */
+
+/* 'Ideographic': Binary Property */
+static const OnigCodePoint CR_Ideographic[] = {
+	11,
+	0x3006, 0x3007,
+	0x3021, 0x3029,
+	0x3038, 0x303a,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xf900, 0xfa6d,
+	0xfa70, 0xfad9,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+}; /* CR_Ideographic */
+
+/* 'Diacritic': Binary Property */
+static const OnigCodePoint CR_Diacritic[] = {
+	125,
+	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,
+	0x08e4, 0x08fe,
+	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, 0x1bab,
+	0x1c36, 0x1c37,
+	0x1c78, 0x1c7d,
+	0x1cd0, 0x1ce8,
+	0x1ced, 0x1ced,
+	0x1cf4, 0x1cf4,
+	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,
+	0xa7f8, 0xa7f9,
+	0xa8c4, 0xa8c4,
+	0xa8e0, 0xa8f1,
+	0xa92b, 0xa92e,
+	0xa953, 0xa953,
+	0xa9b3, 0xa9b3,
+	0xa9c0, 0xa9c0,
+	0xaa7b, 0xaa7b,
+	0xaabf, 0xaac2,
+	0xaaf6, 0xaaf6,
+	0xabec, 0xabed,
+	0xfb1e, 0xfb1e,
+	0xfe20, 0xfe26,
+	0xff3e, 0xff3e,
+	0xff40, 0xff40,
+	0xff70, 0xff70,
+	0xff9e, 0xff9f,
+	0xffe3, 0xffe3,
+	0x110b9, 0x110ba,
+	0x11133, 0x11134,
+	0x111c0, 0x111c0,
+	0x116b6, 0x116b7,
+	0x16f8f, 0x16f9f,
+	0x1d167, 0x1d169,
+	0x1d16d, 0x1d172,
+	0x1d17b, 0x1d182,
+	0x1d185, 0x1d18b,
+	0x1d1aa, 0x1d1ad,
+}; /* CR_Diacritic */
+
+/* 'Extender': Binary Property */
+static const OnigCodePoint CR_Extender[] = {
+	22,
+	0x00b7, 0x00b7,
+	0x02d0, 0x02d1,
+	0x0640, 0x0640,
+	0x07fa, 0x07fa,
+	0x0e46, 0x0e46,
+	0x0ec6, 0x0ec6,
+	0x180a, 0x180a,
+	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,
+	0xaaf3, 0xaaf4,
+	0xff70, 0xff70,
+}; /* CR_Extender */
+
+/* 'Other_Lowercase': Binary Property */
+static const OnigCodePoint CR_Other_Lowercase[] = {
+	18,
+	0x00aa, 0x00aa,
+	0x00ba, 0x00ba,
+	0x02b0, 0x02b8,
+	0x02c0, 0x02c1,
+	0x02e0, 0x02e4,
+	0x0345, 0x0345,
+	0x037a, 0x037a,
+	0x1d2c, 0x1d6a,
+	0x1d78, 0x1d78,
+	0x1d9b, 0x1dbf,
+	0x2071, 0x2071,
+	0x207f, 0x207f,
+	0x2090, 0x209c,
+	0x2170, 0x217f,
+	0x24d0, 0x24e9,
+	0x2c7c, 0x2c7d,
+	0xa770, 0xa770,
+	0xa7f8, 0xa7f9,
+}; /* 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[] = {
+	17,
+	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,
+	0x302e, 0x302f,
+	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[] = {
+	12,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fcc,
+	0xfa0e, 0xfa0f,
+	0xfa11, 0xfa11,
+	0xfa13, 0xfa14,
+	0xfa1f, 0xfa1f,
+	0xfa21, 0xfa21,
+	0xfa23, 0xfa24,
+	0xfa27, 0xfa29,
+	0x20000, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+}; /* CR_Unified_Ideograph */
+
+/* 'Other_Default_Ignorable_Code_Point': Binary Property */
+static const OnigCodePoint CR_Other_Default_Ignorable_Code_Point[] = {
+	11,
+	0x034f, 0x034f,
+	0x115f, 0x1160,
+	0x17b4, 0x17b5,
+	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[] = {
+	9,
+	0x0149, 0x0149,
+	0x0673, 0x0673,
+	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[] = {
+	4,
+	0x00b7, 0x00b7,
+	0x0387, 0x0387,
+	0x1369, 0x1371,
+	0x19da, 0x19da,
+}; /* CR_Other_ID_Continue */
+
+/* 'STerm': Binary Property */
+static const OnigCodePoint CR_STerm[] = {
+	50,
+	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,
+	0x1735, 0x1736,
+	0x1803, 0x1803,
+	0x1809, 0x1809,
+	0x1944, 0x1945,
+	0x1aa8, 0x1aab,
+	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,
+	0xaaf0, 0xaaf1,
+	0xabeb, 0xabeb,
+	0xfe52, 0xfe52,
+	0xfe56, 0xfe57,
+	0xff01, 0xff01,
+	0xff0e, 0xff0e,
+	0xff1f, 0xff1f,
+	0xff61, 0xff61,
+	0x10a56, 0x10a57,
+	0x11047, 0x11048,
+	0x110be, 0x110c1,
+	0x11141, 0x11143,
+	0x111c5, 0x111c6,
+}; /* 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 */
+
+/* 'Unknown': Script */
+static const OnigCodePoint CR_Unknown[] = {
+	537,
+	0x0378, 0x0379,
+	0x037f, 0x0383,
+	0x038b, 0x038b,
+	0x038d, 0x038d,
+	0x03a2, 0x03a2,
+	0x0528, 0x0530,
+	0x0557, 0x0558,
+	0x0560, 0x0560,
+	0x0588, 0x0588,
+	0x058b, 0x058e,
+	0x0590, 0x0590,
+	0x05c8, 0x05cf,
+	0x05eb, 0x05ef,
+	0x05f5, 0x05ff,
+	0x0605, 0x0605,
+	0x061c, 0x061d,
+	0x070e, 0x070e,
+	0x074b, 0x074c,
+	0x07b2, 0x07bf,
+	0x07fb, 0x07ff,
+	0x082e, 0x082f,
+	0x083f, 0x083f,
+	0x085c, 0x085d,
+	0x085f, 0x089f,
+	0x08a1, 0x08a1,
+	0x08ad, 0x08e3,
+	0x08ff, 0x08ff,
+	0x0978, 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,
+	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,
+	0x0b78, 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,
+	0x0d3b, 0x0d3c,
+	0x0d45, 0x0d45,
+	0x0d49, 0x0d49,
+	0x0d4f, 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,
+	0x0ee0, 0x0eff,
+	0x0f48, 0x0f48,
+	0x0f6d, 0x0f70,
+	0x0f98, 0x0f98,
+	0x0fbd, 0x0fbd,
+	0x0fcd, 0x0fcd,
+	0x0fdb, 0x0fff,
+	0x10c6, 0x10c6,
+	0x10c8, 0x10cc,
+	0x10ce, 0x10cf,
+	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, 0x135c,
+	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,
+	0x1bf4, 0x1bfb,
+	0x1c38, 0x1c3a,
+	0x1c4a, 0x1c4c,
+	0x1c80, 0x1cbf,
+	0x1cc8, 0x1ccf,
+	0x1cf7, 0x1cff,
+	0x1de7, 0x1dfb,
+	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,
+	0x209d, 0x209f,
+	0x20ba, 0x20cf,
+	0x20f1, 0x20ff,
+	0x218a, 0x218f,
+	0x23f4, 0x23ff,
+	0x2427, 0x243f,
+	0x244b, 0x245f,
+	0x2700, 0x2700,
+	0x2b4d, 0x2b4f,
+	0x2b5a, 0x2bff,
+	0x2c2f, 0x2c2f,
+	0x2c5f, 0x2c5f,
+	0x2cf4, 0x2cf8,
+	0x2d26, 0x2d26,
+	0x2d28, 0x2d2c,
+	0x2d2e, 0x2d2f,
+	0x2d68, 0x2d6e,
+	0x2d71, 0x2d7e,
+	0x2d97, 0x2d9f,
+	0x2da7, 0x2da7,
+	0x2daf, 0x2daf,
+	0x2db7, 0x2db7,
+	0x2dbf, 0x2dbf,
+	0x2dc7, 0x2dc7,
+	0x2dcf, 0x2dcf,
+	0x2dd7, 0x2dd7,
+	0x2ddf, 0x2ddf,
+	0x2e3c, 0x2e7f,
+	0x2e9a, 0x2e9a,
+	0x2ef4, 0x2eff,
+	0x2fd6, 0x2fef,
+	0x2ffc, 0x2fff,
+	0x3040, 0x3040,
+	0x3097, 0x3098,
+	0x3100, 0x3104,
+	0x312e, 0x3130,
+	0x318f, 0x318f,
+	0x31bb, 0x31bf,
+	0x31e4, 0x31ef,
+	0x321f, 0x321f,
+	0x32ff, 0x32ff,
+	0x4db6, 0x4dbf,
+	0x9fcd, 0x9fff,
+	0xa48d, 0xa48f,
+	0xa4c7, 0xa4cf,
+	0xa62c, 0xa63f,
+	0xa698, 0xa69e,
+	0xa6f8, 0xa6ff,
+	0xa78f, 0xa78f,
+	0xa794, 0xa79f,
+	0xa7ab, 0xa7f7,
+	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,
+	0xaaf7, 0xab00,
+	0xab07, 0xab08,
+	0xab0f, 0xab10,
+	0xab17, 0xab1f,
+	0xab27, 0xab27,
+	0xab2f, 0xabbf,
+	0xabee, 0xabef,
+	0xabfa, 0xabff,
+	0xd7a4, 0xd7af,
+	0xd7c7, 0xd7ca,
+	0xd7fc, 0xf8ff,
+	0xfa6e, 0xfa6f,
+	0xfada, 0xfaff,
+	0xfb07, 0xfb12,
+	0xfb18, 0xfb1c,
+	0xfb37, 0xfb37,
+	0xfb3d, 0xfb3d,
+	0xfb3f, 0xfb3f,
+	0xfb42, 0xfb42,
+	0xfb45, 0xfb45,
+	0xfbc2, 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, 0x1097f,
+	0x109b8, 0x109bd,
+	0x109c0, 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, 0x10fff,
+	0x1104e, 0x11051,
+	0x11070, 0x1107f,
+	0x110c2, 0x110cf,
+	0x110e9, 0x110ef,
+	0x110fa, 0x110ff,
+	0x11135, 0x11135,
+	0x11144, 0x1117f,
+	0x111c9, 0x111cf,
+	0x111da, 0x1167f,
+	0x116b8, 0x116bf,
+	0x116ca, 0x11fff,
+	0x1236f, 0x123ff,
+	0x12463, 0x1246f,
+	0x12474, 0x12fff,
+	0x1342f, 0x167ff,
+	0x16a39, 0x16eff,
+	0x16f45, 0x16f4f,
+	0x16f7f, 0x16f8e,
+	0x16fa0, 0x1afff,
+	0x1b002, 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, 0x1edff,
+	0x1ee04, 0x1ee04,
+	0x1ee20, 0x1ee20,
+	0x1ee23, 0x1ee23,
+	0x1ee25, 0x1ee26,
+	0x1ee28, 0x1ee28,
+	0x1ee33, 0x1ee33,
+	0x1ee38, 0x1ee38,
+	0x1ee3a, 0x1ee3a,
+	0x1ee3c, 0x1ee41,
+	0x1ee43, 0x1ee46,
+	0x1ee48, 0x1ee48,
+	0x1ee4a, 0x1ee4a,
+	0x1ee4c, 0x1ee4c,
+	0x1ee50, 0x1ee50,
+	0x1ee53, 0x1ee53,
+	0x1ee55, 0x1ee56,
+	0x1ee58, 0x1ee58,
+	0x1ee5a, 0x1ee5a,
+	0x1ee5c, 0x1ee5c,
+	0x1ee5e, 0x1ee5e,
+	0x1ee60, 0x1ee60,
+	0x1ee63, 0x1ee63,
+	0x1ee65, 0x1ee66,
+	0x1ee6b, 0x1ee6b,
+	0x1ee73, 0x1ee73,
+	0x1ee78, 0x1ee78,
+	0x1ee7d, 0x1ee7d,
+	0x1ee7f, 0x1ee7f,
+	0x1ee8a, 0x1ee8a,
+	0x1ee9c, 0x1eea0,
+	0x1eea4, 0x1eea4,
+	0x1eeaa, 0x1eeaa,
+	0x1eebc, 0x1eeef,
+	0x1eef2, 0x1efff,
+	0x1f02c, 0x1f02f,
+	0x1f094, 0x1f09f,
+	0x1f0af, 0x1f0b0,
+	0x1f0bf, 0x1f0c0,
+	0x1f0d0, 0x1f0d0,
+	0x1f0e0, 0x1f0ff,
+	0x1f10b, 0x1f10f,
+	0x1f12f, 0x1f12f,
+	0x1f16c, 0x1f16f,
+	0x1f19b, 0x1f1e5,
+	0x1f203, 0x1f20f,
+	0x1f23b, 0x1f23f,
+	0x1f249, 0x1f24f,
+	0x1f252, 0x1f2ff,
+	0x1f321, 0x1f32f,
+	0x1f336, 0x1f336,
+	0x1f37d, 0x1f37f,
+	0x1f394, 0x1f39f,
+	0x1f3c5, 0x1f3c5,
+	0x1f3cb, 0x1f3df,
+	0x1f3f1, 0x1f3ff,
+	0x1f43f, 0x1f43f,
+	0x1f441, 0x1f441,
+	0x1f4f8, 0x1f4f8,
+	0x1f4fd, 0x1f4ff,
+	0x1f53e, 0x1f53f,
+	0x1f544, 0x1f54f,
+	0x1f568, 0x1f5fa,
+	0x1f641, 0x1f644,
+	0x1f650, 0x1f67f,
+	0x1f6c6, 0x1f6ff,
+	0x1f774, 0x1ffff,
+	0x2a6d7, 0x2a6ff,
+	0x2b735, 0x2b73f,
+	0x2b81e, 0x2f7ff,
+	0x2fa1e, 0xe0000,
+	0xe0002, 0xe001f,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0x10ffff,
+}; /* CR_Unknown */
+
+/* 'Age_1_1': Derived Age 1.1 */
+static const OnigCodePoint CR_Age_1_1[] = {
+	288,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x05b0, 0x05b9,
+	0x05bb, 0x05c3,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9a,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20aa,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xe000, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 0xffff,
+}; /* CR_Age_1_1 */
+
+/* 'Age_2_0': Derived Age 2.0 */
+static const OnigCodePoint CR_Age_2_0[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ab,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffd, 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, 0x10ffff,
+}; /* CR_Age_2_0 */
+
+/* 'Age_2_1': Derived Age 2.1 */
+static const OnigCodePoint CR_Age_2_1[] = {
+	312,
+	0x0000, 0x01f5,
+	0x01fa, 0x0217,
+	0x0250, 0x02a8,
+	0x02b0, 0x02de,
+	0x02e0, 0x02e9,
+	0x0300, 0x0345,
+	0x0360, 0x0361,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d6,
+	0x03da, 0x03da,
+	0x03dc, 0x03dc,
+	0x03de, 0x03de,
+	0x03e0, 0x03e0,
+	0x03e2, 0x03f3,
+	0x0401, 0x040c,
+	0x040e, 0x044f,
+	0x0451, 0x045c,
+	0x045e, 0x0486,
+	0x0490, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04eb,
+	0x04ee, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x0589,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0652,
+	0x0660, 0x066d,
+	0x0670, 0x06b7,
+	0x06ba, 0x06be,
+	0x06c0, 0x06ce,
+	0x06d0, 0x06ed,
+	0x06f0, 0x06f9,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f69,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f95,
+	0x0f97, 0x0f97,
+	0x0f99, 0x0fad,
+	0x0fb1, 0x0fb7,
+	0x0fb9, 0x0fb9,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x202e,
+	0x2030, 0x2046,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20ac,
+	0x20d0, 0x20e1,
+	0x2100, 0x2138,
+	0x2153, 0x2182,
+	0x2190, 0x21ea,
+	0x2200, 0x22f1,
+	0x2300, 0x2300,
+	0x2302, 0x237a,
+	0x2400, 0x2424,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25ef,
+	0x2600, 0x2613,
+	0x261a, 0x266f,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x3000, 0x3037,
+	0x303f, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x319f,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x4e00, 0x9fa5,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1e, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfffc, 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, 0x10ffff,
+}; /* CR_Age_2_1 */
+
+/* 'Age_3_0': Derived Age 3.0 */
+static const OnigCodePoint CR_Age_3_0[] = {
+	369,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f3,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdf0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 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, 0x10ffff,
+}; /* CR_Age_3_0 */
+
+/* 'Age_3_1': Derived Age 3.1 */
+static const OnigCodePoint CR_Age_3_1[] = {
+	402,
+	0x0000, 0x021f,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034e,
+	0x0360, 0x0362,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03d7,
+	0x03da, 0x03f5,
+	0x0400, 0x0486,
+	0x0488, 0x0489,
+	0x048c, 0x04c4,
+	0x04c7, 0x04c8,
+	0x04cb, 0x04cc,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x066d,
+	0x0670, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b0,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f6,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2046,
+	0x2048, 0x204d,
+	0x206a, 0x2070,
+	0x2074, 0x208e,
+	0x20a0, 0x20af,
+	0x20d0, 0x20e3,
+	0x2100, 0x213a,
+	0x2153, 0x2183,
+	0x2190, 0x21f3,
+	0x2200, 0x22f1,
+	0x2300, 0x237b,
+	0x237d, 0x239a,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24ea,
+	0x2500, 0x2595,
+	0x25a0, 0x25f7,
+	0x2600, 0x2613,
+	0x2619, 0x2671,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2767,
+	0x2776, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x2800, 0x28ff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303a,
+	0x303e, 0x303f,
+	0x3041, 0x3094,
+	0x3099, 0x309e,
+	0x30a1, 0x30fe,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x3200, 0x321c,
+	0x3220, 0x3243,
+	0x3260, 0x327b,
+	0x327f, 0x32b0,
+	0x32c0, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4a1,
+	0xa4a4, 0xa4b3,
+	0xa4b5, 0xa4c0,
+	0xa4c2, 0xa4c4,
+	0xa4c6, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfb,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe44,
+	0xfe49, 0xfe52,
+	0xfe54, 0xfe66,
+	0xfe68, 0xfe6b,
+	0xfe70, 0xfe72,
+	0xfe74, 0xfe74,
+	0xfe76, 0xfefc,
+	0xfeff, 0xfeff,
+	0xff01, 0xff5e,
+	0xff61, 0xffbe,
+	0xffc2, 0xffc7,
+	0xffca, 0xffcf,
+	0xffd2, 0xffd7,
+	0xffda, 0xffdc,
+	0xffe0, 0xffe6,
+	0xffe8, 0xffee,
+	0xfff9, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_1 */
+
+/* 'Age_3_2': Derived Age 3.2 */
+static const OnigCodePoint CR_Age_3_2[] = {
+	397,
+	0x0000, 0x0220,
+	0x0222, 0x0233,
+	0x0250, 0x02ad,
+	0x02b0, 0x02ee,
+	0x0300, 0x034f,
+	0x0360, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03f6,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x060c, 0x060c,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0655,
+	0x0660, 0x06ed,
+	0x06f0, 0x06fe,
+	0x0700, 0x070d,
+	0x070f, 0x072c,
+	0x0730, 0x074a,
+	0x0780, 0x07b1,
+	0x0901, 0x0903,
+	0x0905, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09bc,
+	0x09be, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a02, 0x0a02,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	0x0a81, 0x0a83,
+	0x0a85, 0x0a8b,
+	0x0a8d, 0x0a8d,
+	0x0a8f, 0x0a91,
+	0x0a93, 0x0aa8,
+	0x0aaa, 0x0ab0,
+	0x0ab2, 0x0ab3,
+	0x0ab5, 0x0ab9,
+	0x0abc, 0x0ac5,
+	0x0ac7, 0x0ac9,
+	0x0acb, 0x0acd,
+	0x0ad0, 0x0ad0,
+	0x0ae0, 0x0ae0,
+	0x0ae6, 0x0aef,
+	0x0b01, 0x0b03,
+	0x0b05, 0x0b0c,
+	0x0b0f, 0x0b10,
+	0x0b13, 0x0b28,
+	0x0b2a, 0x0b30,
+	0x0b32, 0x0b33,
+	0x0b36, 0x0b39,
+	0x0b3c, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b70,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bf2,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	0x0c66, 0x0c6f,
+	0x0c82, 0x0c83,
+	0x0c85, 0x0c8c,
+	0x0c8e, 0x0c90,
+	0x0c92, 0x0ca8,
+	0x0caa, 0x0cb3,
+	0x0cb5, 0x0cb9,
+	0x0cbe, 0x0cc4,
+	0x0cc6, 0x0cc8,
+	0x0cca, 0x0ccd,
+	0x0cd5, 0x0cd6,
+	0x0cde, 0x0cde,
+	0x0ce0, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 0x169c,
+	0x16a0, 0x16f0,
+	0x1700, 0x170c,
+	0x170e, 0x1714,
+	0x1720, 0x1736,
+	0x1740, 0x1753,
+	0x1760, 0x176c,
+	0x176e, 0x1770,
+	0x1772, 0x1773,
+	0x1780, 0x17dc,
+	0x17e0, 0x17e9,
+	0x1800, 0x180e,
+	0x1810, 0x1819,
+	0x1820, 0x1877,
+	0x1880, 0x18a9,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2052,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213a,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23ce,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x24fe,
+	0x2500, 0x2613,
+	0x2616, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2689,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2aff,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321c,
+	0x3220, 0x3243,
+	0x3251, 0x327b,
+	0x327f, 0x32cb,
+	0x32d0, 0x32fe,
+	0x3300, 0x3376,
+	0x337b, 0x33dd,
+	0x33e0, 0x33fe,
+	0x3400, 0x4db5,
+	0x4e00, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfc,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	0xfe30, 0xfe46,
+	0xfe49, 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, 0xffff,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10400, 0x10425,
+	0x10428, 0x1044d,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d400, 0x1d454,
+	0x1d456, 0x1d49c,
+	0x1d49e, 0x1d49f,
+	0x1d4a2, 0x1d4a2,
+	0x1d4a5, 0x1d4a6,
+	0x1d4a9, 0x1d4ac,
+	0x1d4ae, 0x1d4b9,
+	0x1d4bb, 0x1d4bb,
+	0x1d4bd, 0x1d4c0,
+	0x1d4c2, 0x1d4c3,
+	0x1d4c5, 0x1d505,
+	0x1d507, 0x1d50a,
+	0x1d50d, 0x1d514,
+	0x1d516, 0x1d51c,
+	0x1d51e, 0x1d539,
+	0x1d53b, 0x1d53e,
+	0x1d540, 0x1d544,
+	0x1d546, 0x1d546,
+	0x1d54a, 0x1d550,
+	0x1d552, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_3_2 */
+
+/* 'Age_4_0': Derived Age 4.0 */
+static const OnigCodePoint CR_Age_4_0[] = {
+	412,
+	0x0000, 0x0236,
+	0x0250, 0x0357,
+	0x035d, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x03fb,
+	0x0400, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f5,
+	0x04f8, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05a1,
+	0x05a3, 0x05b9,
+	0x05bb, 0x05c4,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060c, 0x0615,
+	0x061b, 0x061b,
+	0x061f, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x0658,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x074f,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x0981, 0x0983,
+	0x0985, 0x098c,
+	0x098f, 0x0990,
+	0x0993, 0x09a8,
+	0x09aa, 0x09b0,
+	0x09b2, 0x09b2,
+	0x09b6, 0x09b9,
+	0x09bc, 0x09c4,
+	0x09c7, 0x09c8,
+	0x09cb, 0x09cd,
+	0x09d7, 0x09d7,
+	0x09dc, 0x09dd,
+	0x09df, 0x09e3,
+	0x09e6, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	0x0b66, 0x0b71,
+	0x0b82, 0x0b83,
+	0x0b85, 0x0b8a,
+	0x0b8e, 0x0b90,
+	0x0b92, 0x0b95,
+	0x0b99, 0x0b9a,
+	0x0b9c, 0x0b9c,
+	0x0b9e, 0x0b9f,
+	0x0ba3, 0x0ba4,
+	0x0ba8, 0x0baa,
+	0x0bae, 0x0bb5,
+	0x0bb7, 0x0bb9,
+	0x0bbe, 0x0bc2,
+	0x0bc6, 0x0bc8,
+	0x0bca, 0x0bcd,
+	0x0bd7, 0x0bd7,
+	0x0be7, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fcf,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10f8,
+	0x10fb, 0x10fb,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	0x1200, 0x1206,
+	0x1208, 0x1246,
+	0x1248, 0x1248,
+	0x124a, 0x124d,
+	0x1250, 0x1256,
+	0x1258, 0x1258,
+	0x125a, 0x125d,
+	0x1260, 0x1286,
+	0x1288, 0x1288,
+	0x128a, 0x128d,
+	0x1290, 0x12ae,
+	0x12b0, 0x12b0,
+	0x12b2, 0x12b5,
+	0x12b8, 0x12be,
+	0x12c0, 0x12c0,
+	0x12c2, 0x12c5,
+	0x12c8, 0x12ce,
+	0x12d0, 0x12d6,
+	0x12d8, 0x12ee,
+	0x12f0, 0x130e,
+	0x1310, 0x1310,
+	0x1312, 0x1315,
+	0x1318, 0x131e,
+	0x1320, 0x1346,
+	0x1348, 0x135a,
+	0x1361, 0x137c,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x19e0, 0x19ff,
+	0x1d00, 0x1d6b,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2054,
+	0x2057, 0x2057,
+	0x205f, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x20a0, 0x20b1,
+	0x20d0, 0x20ea,
+	0x2100, 0x213b,
+	0x213d, 0x214b,
+	0x2153, 0x2183,
+	0x2190, 0x23d0,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x2617,
+	0x2619, 0x267d,
+	0x2680, 0x2691,
+	0x26a0, 0x26a1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b0d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x327d,
+	0x327f, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fa5,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe0f,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1013f,
+	0x10300, 0x1031e,
+	0x10320, 0x10323,
+	0x10330, 0x1034a,
+	0x10380, 0x1039d,
+	0x1039f, 0x1039f,
+	0x10400, 0x1049d,
+	0x104a0, 0x104a9,
+	0x10800, 0x10805,
+	0x10808, 0x10808,
+	0x1080a, 0x10835,
+	0x10837, 0x10838,
+	0x1083c, 0x1083c,
+	0x1083f, 0x1083f,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d300, 0x1d356,
+	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, 0x1d6a3,
+	0x1d6a8, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_0 */
+
+/* 'Age_4_1': Derived Age 4.1 */
+static const OnigCodePoint CR_Age_4_1[] = {
+	430,
+	0x0000, 0x0241,
+	0x0250, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037a,
+	0x037e, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x04ce,
+	0x04d0, 0x04f9,
+	0x0500, 0x050f,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05b9,
+	0x05bb, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097d, 0x097d,
+	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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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, 0x0ce1,
+	0x0ce6, 0x0cef,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1d00, 0x1dc3,
+	0x1e00, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20eb,
+	0x2100, 0x214c,
+	0x2153, 0x2183,
+	0x2190, 0x23db,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b1,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27c6,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b13,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa716,
+	0xa800, 0xa82b,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 0x1d1dd,
+	0x1d200, 0x1d245,
+	0x1d300, 0x1d356,
+	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, 0x1d7c9,
+	0x1d7ce, 0x1d7ff,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_4_1 */
+
+/* 'Age_5_0': Derived Age 5.0 */
+static const OnigCodePoint CR_Age_5_0[] = {
+	440,
+	0x0000, 0x036f,
+	0x0374, 0x0375,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x03ce,
+	0x03d0, 0x0486,
+	0x0488, 0x0513,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x060b, 0x0615,
+	0x061b, 0x061b,
+	0x061e, 0x061f,
+	0x0621, 0x063a,
+	0x0640, 0x065e,
+	0x0660, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x076d,
+	0x0780, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0970,
+	0x097b, 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, 0x09fa,
+	0x0a01, 0x0a03,
+	0x0a05, 0x0a0a,
+	0x0a0f, 0x0a10,
+	0x0a13, 0x0a28,
+	0x0a2a, 0x0a30,
+	0x0a32, 0x0a33,
+	0x0a35, 0x0a36,
+	0x0a38, 0x0a39,
+	0x0a3c, 0x0a3c,
+	0x0a3e, 0x0a42,
+	0x0a47, 0x0a48,
+	0x0a4b, 0x0a4d,
+	0x0a59, 0x0a5c,
+	0x0a5e, 0x0a5e,
+	0x0a66, 0x0a74,
+	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, 0x0b43,
+	0x0b47, 0x0b48,
+	0x0b4b, 0x0b4d,
+	0x0b56, 0x0b57,
+	0x0b5c, 0x0b5d,
+	0x0b5f, 0x0b61,
+	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,
+	0x0bd7, 0x0bd7,
+	0x0be6, 0x0bfa,
+	0x0c01, 0x0c03,
+	0x0c05, 0x0c0c,
+	0x0c0e, 0x0c10,
+	0x0c12, 0x0c28,
+	0x0c2a, 0x0c33,
+	0x0c35, 0x0c39,
+	0x0c3e, 0x0c44,
+	0x0c46, 0x0c48,
+	0x0c4a, 0x0c4d,
+	0x0c55, 0x0c56,
+	0x0c60, 0x0c61,
+	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,
+	0x0cf1, 0x0cf2,
+	0x0d02, 0x0d03,
+	0x0d05, 0x0d0c,
+	0x0d0e, 0x0d10,
+	0x0d12, 0x0d28,
+	0x0d2a, 0x0d39,
+	0x0d3e, 0x0d43,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4d,
+	0x0d57, 0x0d57,
+	0x0d60, 0x0d61,
+	0x0d66, 0x0d6f,
+	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, 0x0f6a,
+	0x0f71, 0x0f8b,
+	0x0f90, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fcf, 0x0fd1,
+	0x1000, 0x1021,
+	0x1023, 0x1027,
+	0x1029, 0x102a,
+	0x102c, 0x1032,
+	0x1036, 0x1039,
+	0x1040, 0x1059,
+	0x10a0, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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, 0x18a9,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1d00, 0x1dca,
+	0x1dfe, 0x1e9b,
+	0x1ea0, 0x1ef9,
+	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,
+	0x2000, 0x2063,
+	0x206a, 0x2071,
+	0x2074, 0x208e,
+	0x2090, 0x2094,
+	0x20a0, 0x20b5,
+	0x20d0, 0x20ef,
+	0x2100, 0x214e,
+	0x2153, 0x2184,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269c,
+	0x26a0, 0x26b2,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27d0, 0x27eb,
+	0x27f0, 0x2b1a,
+	0x2b20, 0x2b23,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6c,
+	0x2c74, 0x2c77,
+	0x2c80, 0x2cea,
+	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, 0x2e17,
+	0x2e1c, 0x2e1d,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312c,
+	0x3131, 0x318e,
+	0x3190, 0x31b7,
+	0x31c0, 0x31cf,
+	0x31f0, 0x321e,
+	0x3220, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fbb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa700, 0xa71a,
+	0xa720, 0xa721,
+	0xa800, 0xa82b,
+	0xa840, 0xa877,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 0xfdfd,
+	0xfe00, 0xfe19,
+	0xfe20, 0xfe23,
+	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, 0x1000b,
+	0x1000d, 0x10026,
+	0x10028, 0x1003a,
+	0x1003c, 0x1003d,
+	0x1003f, 0x1004d,
+	0x10050, 0x1005d,
+	0x10080, 0x100fa,
+	0x10100, 0x10102,
+	0x10107, 0x10133,
+	0x10137, 0x1018a,
+	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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x1091f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x1d000, 0x1d0f5,
+	0x1d100, 0x1d126,
+	0x1d12a, 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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_0 */
+
+/* 'Age_5_1': Derived Age 5.1 */
+static const OnigCodePoint CR_Age_5_1[] = {
+	455,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0523,
+	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,
+	0x0901, 0x0939,
+	0x093c, 0x094d,
+	0x0950, 0x0954,
+	0x0958, 0x0972,
+	0x097b, 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, 0x09fa,
+	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, 0x0fd4,
+	0x1000, 0x1099,
+	0x109e, 0x10c5,
+	0x10d0, 0x10fc,
+	0x1100, 0x1159,
+	0x115f, 0x11a2,
+	0x11a8, 0x11f9,
+	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,
+	0x13a0, 0x13f4,
+	0x1401, 0x1676,
+	0x1680, 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,
+	0x1900, 0x191c,
+	0x1920, 0x192b,
+	0x1930, 0x193b,
+	0x1940, 0x1940,
+	0x1944, 0x196d,
+	0x1970, 0x1974,
+	0x1980, 0x19a9,
+	0x19b0, 0x19c9,
+	0x19d0, 0x19d9,
+	0x19de, 0x1a1b,
+	0x1a1e, 0x1a1f,
+	0x1b00, 0x1b4b,
+	0x1b50, 0x1b7c,
+	0x1b80, 0x1baa,
+	0x1bae, 0x1bb9,
+	0x1c00, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1d00, 0x1de6,
+	0x1dfe, 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, 0x20b5,
+	0x20d0, 0x20f0,
+	0x2100, 0x214f,
+	0x2153, 0x2188,
+	0x2190, 0x23e7,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x269d,
+	0x26a0, 0x26bc,
+	0x26c0, 0x26c3,
+	0x2701, 0x2704,
+	0x2706, 0x2709,
+	0x270c, 0x2727,
+	0x2729, 0x274b,
+	0x274d, 0x274d,
+	0x274f, 0x2752,
+	0x2756, 0x2756,
+	0x2758, 0x275e,
+	0x2761, 0x2794,
+	0x2798, 0x27af,
+	0x27b1, 0x27be,
+	0x27c0, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27d0, 0x2b4c,
+	0x2b50, 0x2b54,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2c6f,
+	0x2c71, 0x2c7d,
+	0x2c80, 0x2cea,
+	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, 0x2e30,
+	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, 0x3243,
+	0x3250, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fc3,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa500, 0xa62b,
+	0xa640, 0xa65f,
+	0xa662, 0xa673,
+	0xa67c, 0xa697,
+	0xa700, 0xa78c,
+	0xa7fb, 0xa82b,
+	0xa840, 0xa877,
+	0xa880, 0xa8c4,
+	0xa8ce, 0xa8d9,
+	0xa900, 0xa953,
+	0xa95f, 0xa95f,
+	0xaa00, 0xaa36,
+	0xaa40, 0xaa4d,
+	0xaa50, 0xaa59,
+	0xaa5c, 0xaa5f,
+	0xac00, 0xd7a3,
+	0xd800, 0xfa2d,
+	0xfa30, 0xfa6a,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbb1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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, 0x1083f,
+	0x10900, 0x10919,
+	0x1091f, 0x10939,
+	0x1093f, 0x1093f,
+	0x10a00, 0x10a03,
+	0x10a05, 0x10a06,
+	0x10a0c, 0x10a13,
+	0x10a15, 0x10a17,
+	0x10a19, 0x10a33,
+	0x10a38, 0x10a3a,
+	0x10a3f, 0x10a47,
+	0x10a50, 0x10a58,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	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,
+	0x1fffe, 0x2a6d6,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_1 */
+
+/* 'Age_5_2': Derived Age 5.2 */
+static const OnigCodePoint CR_Age_5_2[] = {
+	495,
+	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,
+	0xfdd0, 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, 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,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_5_2 */
+
+/* 'Age_6_0': Derived Age 6.0 */
+static const OnigCodePoint CR_Age_6_0[] = {
+	511,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0603,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x0900, 0x0977,
+	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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	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,
+	0x135d, 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,
+	0x1bc0, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cd0, 0x1cf2,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x27ca,
+	0x27cc, 0x27cc,
+	0x27ce, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf1,
+	0x2cf9, 0x2d25,
+	0x2d30, 0x2d65,
+	0x2d6f, 0x2d70,
+	0x2d7f, 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, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcb,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa673,
+	0xa67c, 0xa697,
+	0xa6a0, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa791,
+	0xa7a0, 0xa7a9,
+	0xa7fa, 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,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	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, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x1b000, 0x1b001,
+	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,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f169,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f5ff,
+	0x1f601, 0x1f610,
+	0x1f612, 0x1f614,
+	0x1f616, 0x1f616,
+	0x1f618, 0x1f618,
+	0x1f61a, 0x1f61a,
+	0x1f61c, 0x1f61e,
+	0x1f620, 0x1f625,
+	0x1f628, 0x1f62b,
+	0x1f62d, 0x1f62d,
+	0x1f630, 0x1f633,
+	0x1f635, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_0 */
+
+/* 'Age_6_1': Derived Age 6.1 */
+static const OnigCodePoint CR_Age_6_1[] = {
+	549,
+	0x0000, 0x0377,
+	0x037a, 0x037e,
+	0x0384, 0x038a,
+	0x038c, 0x038c,
+	0x038e, 0x03a1,
+	0x03a3, 0x0527,
+	0x0531, 0x0556,
+	0x0559, 0x055f,
+	0x0561, 0x0587,
+	0x0589, 0x058a,
+	0x058f, 0x058f,
+	0x0591, 0x05c7,
+	0x05d0, 0x05ea,
+	0x05f0, 0x05f4,
+	0x0600, 0x0604,
+	0x0606, 0x061b,
+	0x061e, 0x070d,
+	0x070f, 0x074a,
+	0x074d, 0x07b1,
+	0x07c0, 0x07fa,
+	0x0800, 0x082d,
+	0x0830, 0x083e,
+	0x0840, 0x085b,
+	0x085e, 0x085e,
+	0x08a0, 0x08a0,
+	0x08a2, 0x08ac,
+	0x08e4, 0x08fe,
+	0x0900, 0x0977,
+	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, 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, 0x0b77,
+	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, 0x0d3a,
+	0x0d3d, 0x0d44,
+	0x0d46, 0x0d48,
+	0x0d4a, 0x0d4e,
+	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, 0x0edf,
+	0x0f00, 0x0f47,
+	0x0f49, 0x0f6c,
+	0x0f71, 0x0f97,
+	0x0f99, 0x0fbc,
+	0x0fbe, 0x0fcc,
+	0x0fce, 0x0fda,
+	0x1000, 0x10c5,
+	0x10c7, 0x10c7,
+	0x10cd, 0x10cd,
+	0x10d0, 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,
+	0x135d, 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, 0x1bf3,
+	0x1bfc, 0x1c37,
+	0x1c3b, 0x1c49,
+	0x1c4d, 0x1c7f,
+	0x1cc0, 0x1cc7,
+	0x1cd0, 0x1cf6,
+	0x1d00, 0x1de6,
+	0x1dfc, 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, 0x209c,
+	0x20a0, 0x20b9,
+	0x20d0, 0x20f0,
+	0x2100, 0x2189,
+	0x2190, 0x23f3,
+	0x2400, 0x2426,
+	0x2440, 0x244a,
+	0x2460, 0x26ff,
+	0x2701, 0x2b4c,
+	0x2b50, 0x2b59,
+	0x2c00, 0x2c2e,
+	0x2c30, 0x2c5e,
+	0x2c60, 0x2cf3,
+	0x2cf9, 0x2d25,
+	0x2d27, 0x2d27,
+	0x2d2d, 0x2d2d,
+	0x2d30, 0x2d67,
+	0x2d6f, 0x2d70,
+	0x2d7f, 0x2d96,
+	0x2da0, 0x2da6,
+	0x2da8, 0x2dae,
+	0x2db0, 0x2db6,
+	0x2db8, 0x2dbe,
+	0x2dc0, 0x2dc6,
+	0x2dc8, 0x2dce,
+	0x2dd0, 0x2dd6,
+	0x2dd8, 0x2dde,
+	0x2de0, 0x2e3b,
+	0x2e80, 0x2e99,
+	0x2e9b, 0x2ef3,
+	0x2f00, 0x2fd5,
+	0x2ff0, 0x2ffb,
+	0x3000, 0x303f,
+	0x3041, 0x3096,
+	0x3099, 0x30ff,
+	0x3105, 0x312d,
+	0x3131, 0x318e,
+	0x3190, 0x31ba,
+	0x31c0, 0x31e3,
+	0x31f0, 0x321e,
+	0x3220, 0x32fe,
+	0x3300, 0x4db5,
+	0x4dc0, 0x9fcc,
+	0xa000, 0xa48c,
+	0xa490, 0xa4c6,
+	0xa4d0, 0xa62b,
+	0xa640, 0xa697,
+	0xa69f, 0xa6f7,
+	0xa700, 0xa78e,
+	0xa790, 0xa793,
+	0xa7a0, 0xa7aa,
+	0xa7f8, 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, 0xaaf6,
+	0xab01, 0xab06,
+	0xab09, 0xab0e,
+	0xab11, 0xab16,
+	0xab20, 0xab26,
+	0xab28, 0xab2e,
+	0xabc0, 0xabed,
+	0xabf0, 0xabf9,
+	0xac00, 0xd7a3,
+	0xd7b0, 0xd7c6,
+	0xd7cb, 0xd7fb,
+	0xd800, 0xfa6d,
+	0xfa70, 0xfad9,
+	0xfb00, 0xfb06,
+	0xfb13, 0xfb17,
+	0xfb1d, 0xfb36,
+	0xfb38, 0xfb3c,
+	0xfb3e, 0xfb3e,
+	0xfb40, 0xfb41,
+	0xfb43, 0xfb44,
+	0xfb46, 0xfbc1,
+	0xfbd3, 0xfd3f,
+	0xfd50, 0xfd8f,
+	0xfd92, 0xfdc7,
+	0xfdd0, 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, 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,
+	0x10980, 0x109b7,
+	0x109be, 0x109bf,
+	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,
+	0x11000, 0x1104d,
+	0x11052, 0x1106f,
+	0x11080, 0x110c1,
+	0x110d0, 0x110e8,
+	0x110f0, 0x110f9,
+	0x11100, 0x11134,
+	0x11136, 0x11143,
+	0x11180, 0x111c8,
+	0x111d0, 0x111d9,
+	0x11680, 0x116b7,
+	0x116c0, 0x116c9,
+	0x12000, 0x1236e,
+	0x12400, 0x12462,
+	0x12470, 0x12473,
+	0x13000, 0x1342e,
+	0x16800, 0x16a38,
+	0x16f00, 0x16f44,
+	0x16f50, 0x16f7e,
+	0x16f8f, 0x16f9f,
+	0x1b000, 0x1b001,
+	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,
+	0x1ee00, 0x1ee03,
+	0x1ee05, 0x1ee1f,
+	0x1ee21, 0x1ee22,
+	0x1ee24, 0x1ee24,
+	0x1ee27, 0x1ee27,
+	0x1ee29, 0x1ee32,
+	0x1ee34, 0x1ee37,
+	0x1ee39, 0x1ee39,
+	0x1ee3b, 0x1ee3b,
+	0x1ee42, 0x1ee42,
+	0x1ee47, 0x1ee47,
+	0x1ee49, 0x1ee49,
+	0x1ee4b, 0x1ee4b,
+	0x1ee4d, 0x1ee4f,
+	0x1ee51, 0x1ee52,
+	0x1ee54, 0x1ee54,
+	0x1ee57, 0x1ee57,
+	0x1ee59, 0x1ee59,
+	0x1ee5b, 0x1ee5b,
+	0x1ee5d, 0x1ee5d,
+	0x1ee5f, 0x1ee5f,
+	0x1ee61, 0x1ee62,
+	0x1ee64, 0x1ee64,
+	0x1ee67, 0x1ee6a,
+	0x1ee6c, 0x1ee72,
+	0x1ee74, 0x1ee77,
+	0x1ee79, 0x1ee7c,
+	0x1ee7e, 0x1ee7e,
+	0x1ee80, 0x1ee89,
+	0x1ee8b, 0x1ee9b,
+	0x1eea1, 0x1eea3,
+	0x1eea5, 0x1eea9,
+	0x1eeab, 0x1eebb,
+	0x1eef0, 0x1eef1,
+	0x1f000, 0x1f02b,
+	0x1f030, 0x1f093,
+	0x1f0a0, 0x1f0ae,
+	0x1f0b1, 0x1f0be,
+	0x1f0c1, 0x1f0cf,
+	0x1f0d1, 0x1f0df,
+	0x1f100, 0x1f10a,
+	0x1f110, 0x1f12e,
+	0x1f130, 0x1f16b,
+	0x1f170, 0x1f19a,
+	0x1f1e6, 0x1f202,
+	0x1f210, 0x1f23a,
+	0x1f240, 0x1f248,
+	0x1f250, 0x1f251,
+	0x1f300, 0x1f320,
+	0x1f330, 0x1f335,
+	0x1f337, 0x1f37c,
+	0x1f380, 0x1f393,
+	0x1f3a0, 0x1f3c4,
+	0x1f3c6, 0x1f3ca,
+	0x1f3e0, 0x1f3f0,
+	0x1f400, 0x1f43e,
+	0x1f440, 0x1f440,
+	0x1f442, 0x1f4f7,
+	0x1f4f9, 0x1f4fc,
+	0x1f500, 0x1f53d,
+	0x1f540, 0x1f543,
+	0x1f550, 0x1f567,
+	0x1f5fb, 0x1f640,
+	0x1f645, 0x1f64f,
+	0x1f680, 0x1f6c5,
+	0x1f700, 0x1f773,
+	0x1fffe, 0x2a6d6,
+	0x2a700, 0x2b734,
+	0x2b740, 0x2b81d,
+	0x2f800, 0x2fa1d,
+	0x2fffe, 0x2ffff,
+	0x3fffe, 0x3ffff,
+	0x4fffe, 0x4ffff,
+	0x5fffe, 0x5ffff,
+	0x6fffe, 0x6ffff,
+	0x7fffe, 0x7ffff,
+	0x8fffe, 0x8ffff,
+	0x9fffe, 0x9ffff,
+	0xafffe, 0xaffff,
+	0xbfffe, 0xbffff,
+	0xcfffe, 0xcffff,
+	0xdfffe, 0xdffff,
+	0xe0001, 0xe0001,
+	0xe0020, 0xe007f,
+	0xe0100, 0xe01ef,
+	0xefffe, 0x10ffff,
+}; /* CR_Age_6_1 */
+
+/* 'In_Basic_Latin': Block */
+#define CR_In_Basic_Latin CR_ASCII
+
+/* 'In_Latin_1_Supplement': Block */
+static const OnigCodePoint CR_In_Latin_1_Supplement[] = {
+	1,
+	0x0080, 0x00ff,
+}; /* CR_In_Latin_1_Supplement */
+
+/* 'In_Latin_Extended_A': Block */
+static const OnigCodePoint CR_In_Latin_Extended_A[] = {
+	1,
+	0x0100, 0x017f,
+}; /* CR_In_Latin_Extended_A */
+
+/* 'In_Latin_Extended_B': Block */
+static const OnigCodePoint CR_In_Latin_Extended_B[] = {
+	1,
+	0x0180, 0x024f,
+}; /* CR_In_Latin_Extended_B */
+
+/* 'In_IPA_Extensions': Block */
+static const OnigCodePoint CR_In_IPA_Extensions[] = {
+	1,
+	0x0250, 0x02af,
+}; /* CR_In_IPA_Extensions */
+
+/* 'In_Spacing_Modifier_Letters': Block */
+static const OnigCodePoint CR_In_Spacing_Modifier_Letters[] = {
+	1,
+	0x02b0, 0x02ff,
+}; /* CR_In_Spacing_Modifier_Letters */
+
+/* 'In_Combining_Diacritical_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks[] = {
+	1,
+	0x0300, 0x036f,
+}; /* CR_In_Combining_Diacritical_Marks */
+
+/* 'In_Greek_and_Coptic': Block */
+static const OnigCodePoint CR_In_Greek_and_Coptic[] = {
+	1,
+	0x0370, 0x03ff,
+}; /* CR_In_Greek_and_Coptic */
+
+/* 'In_Cyrillic': Block */
+static const OnigCodePoint CR_In_Cyrillic[] = {
+	1,
+	0x0400, 0x04ff,
+}; /* CR_In_Cyrillic */
+
+/* 'In_Cyrillic_Supplement': Block */
+static const OnigCodePoint CR_In_Cyrillic_Supplement[] = {
+	1,
+	0x0500, 0x052f,
+}; /* CR_In_Cyrillic_Supplement */
+
+/* 'In_Armenian': Block */
+static const OnigCodePoint CR_In_Armenian[] = {
+	1,
+	0x0530, 0x058f,
+}; /* CR_In_Armenian */
+
+/* 'In_Hebrew': Block */
+static const OnigCodePoint CR_In_Hebrew[] = {
+	1,
+	0x0590, 0x05ff,
+}; /* CR_In_Hebrew */
+
+/* 'In_Arabic': Block */
+static const OnigCodePoint CR_In_Arabic[] = {
+	1,
+	0x0600, 0x06ff,
+}; /* CR_In_Arabic */
+
+/* 'In_Syriac': Block */
+static const OnigCodePoint CR_In_Syriac[] = {
+	1,
+	0x0700, 0x074f,
+}; /* CR_In_Syriac */
+
+/* 'In_Arabic_Supplement': Block */
+static const OnigCodePoint CR_In_Arabic_Supplement[] = {
+	1,
+	0x0750, 0x077f,
+}; /* CR_In_Arabic_Supplement */
+
+/* 'In_Thaana': Block */
+static const OnigCodePoint CR_In_Thaana[] = {
+	1,
+	0x0780, 0x07bf,
+}; /* CR_In_Thaana */
+
+/* 'In_NKo': Block */
+static const OnigCodePoint CR_In_NKo[] = {
+	1,
+	0x07c0, 0x07ff,
+}; /* CR_In_NKo */
+
+/* 'In_Samaritan': Block */
+static const OnigCodePoint CR_In_Samaritan[] = {
+	1,
+	0x0800, 0x083f,
+}; /* CR_In_Samaritan */
+
+/* 'In_Mandaic': Block */
+static const OnigCodePoint CR_In_Mandaic[] = {
+	1,
+	0x0840, 0x085f,
+}; /* CR_In_Mandaic */
+
+/* 'In_Arabic_Extended_A': Block */
+static const OnigCodePoint CR_In_Arabic_Extended_A[] = {
+	1,
+	0x08a0, 0x08ff,
+}; /* CR_In_Arabic_Extended_A */
+
+/* 'In_Devanagari': Block */
+static const OnigCodePoint CR_In_Devanagari[] = {
+	1,
+	0x0900, 0x097f,
+}; /* CR_In_Devanagari */
+
+/* 'In_Bengali': Block */
+static const OnigCodePoint CR_In_Bengali[] = {
+	1,
+	0x0980, 0x09ff,
+}; /* CR_In_Bengali */
+
+/* 'In_Gurmukhi': Block */
+static const OnigCodePoint CR_In_Gurmukhi[] = {
+	1,
+	0x0a00, 0x0a7f,
+}; /* CR_In_Gurmukhi */
+
+/* 'In_Gujarati': Block */
+static const OnigCodePoint CR_In_Gujarati[] = {
+	1,
+	0x0a80, 0x0aff,
+}; /* CR_In_Gujarati */
+
+/* 'In_Oriya': Block */
+static const OnigCodePoint CR_In_Oriya[] = {
+	1,
+	0x0b00, 0x0b7f,
+}; /* CR_In_Oriya */
+
+/* 'In_Tamil': Block */
+static const OnigCodePoint CR_In_Tamil[] = {
+	1,
+	0x0b80, 0x0bff,
+}; /* CR_In_Tamil */
+
+/* 'In_Telugu': Block */
+static const OnigCodePoint CR_In_Telugu[] = {
+	1,
+	0x0c00, 0x0c7f,
+}; /* CR_In_Telugu */
+
+/* 'In_Kannada': Block */
+static const OnigCodePoint CR_In_Kannada[] = {
+	1,
+	0x0c80, 0x0cff,
+}; /* CR_In_Kannada */
+
+/* 'In_Malayalam': Block */
+static const OnigCodePoint CR_In_Malayalam[] = {
+	1,
+	0x0d00, 0x0d7f,
+}; /* CR_In_Malayalam */
+
+/* 'In_Sinhala': Block */
+static const OnigCodePoint CR_In_Sinhala[] = {
+	1,
+	0x0d80, 0x0dff,
+}; /* CR_In_Sinhala */
+
+/* 'In_Thai': Block */
+static const OnigCodePoint CR_In_Thai[] = {
+	1,
+	0x0e00, 0x0e7f,
+}; /* CR_In_Thai */
+
+/* 'In_Lao': Block */
+static const OnigCodePoint CR_In_Lao[] = {
+	1,
+	0x0e80, 0x0eff,
+}; /* CR_In_Lao */
+
+/* 'In_Tibetan': Block */
+static const OnigCodePoint CR_In_Tibetan[] = {
+	1,
+	0x0f00, 0x0fff,
+}; /* CR_In_Tibetan */
+
+/* 'In_Myanmar': Block */
+static const OnigCodePoint CR_In_Myanmar[] = {
+	1,
+	0x1000, 0x109f,
+}; /* CR_In_Myanmar */
+
+/* 'In_Georgian': Block */
+static const OnigCodePoint CR_In_Georgian[] = {
+	1,
+	0x10a0, 0x10ff,
+}; /* CR_In_Georgian */
+
+/* 'In_Hangul_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo[] = {
+	1,
+	0x1100, 0x11ff,
+}; /* CR_In_Hangul_Jamo */
+
+/* 'In_Ethiopic': Block */
+static const OnigCodePoint CR_In_Ethiopic[] = {
+	1,
+	0x1200, 0x137f,
+}; /* CR_In_Ethiopic */
+
+/* 'In_Ethiopic_Supplement': Block */
+static const OnigCodePoint CR_In_Ethiopic_Supplement[] = {
+	1,
+	0x1380, 0x139f,
+}; /* CR_In_Ethiopic_Supplement */
+
+/* 'In_Cherokee': Block */
+static const OnigCodePoint CR_In_Cherokee[] = {
+	1,
+	0x13a0, 0x13ff,
+}; /* CR_In_Cherokee */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics[] = {
+	1,
+	0x1400, 0x167f,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics */
+
+/* 'In_Ogham': Block */
+static const OnigCodePoint CR_In_Ogham[] = {
+	1,
+	0x1680, 0x169f,
+}; /* CR_In_Ogham */
+
+/* 'In_Runic': Block */
+static const OnigCodePoint CR_In_Runic[] = {
+	1,
+	0x16a0, 0x16ff,
+}; /* CR_In_Runic */
+
+/* 'In_Tagalog': Block */
+static const OnigCodePoint CR_In_Tagalog[] = {
+	1,
+	0x1700, 0x171f,
+}; /* CR_In_Tagalog */
+
+/* 'In_Hanunoo': Block */
+static const OnigCodePoint CR_In_Hanunoo[] = {
+	1,
+	0x1720, 0x173f,
+}; /* CR_In_Hanunoo */
+
+/* 'In_Buhid': Block */
+static const OnigCodePoint CR_In_Buhid[] = {
+	1,
+	0x1740, 0x175f,
+}; /* CR_In_Buhid */
+
+/* 'In_Tagbanwa': Block */
+static const OnigCodePoint CR_In_Tagbanwa[] = {
+	1,
+	0x1760, 0x177f,
+}; /* CR_In_Tagbanwa */
+
+/* 'In_Khmer': Block */
+static const OnigCodePoint CR_In_Khmer[] = {
+	1,
+	0x1780, 0x17ff,
+}; /* CR_In_Khmer */
+
+/* 'In_Mongolian': Block */
+static const OnigCodePoint CR_In_Mongolian[] = {
+	1,
+	0x1800, 0x18af,
+}; /* CR_In_Mongolian */
+
+/* 'In_Unified_Canadian_Aboriginal_Syllabics_Extended': Block */
+static const OnigCodePoint CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended[] = {
+	1,
+	0x18b0, 0x18ff,
+}; /* CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended */
+
+/* 'In_Limbu': Block */
+static const OnigCodePoint CR_In_Limbu[] = {
+	1,
+	0x1900, 0x194f,
+}; /* CR_In_Limbu */
+
+/* 'In_Tai_Le': Block */
+static const OnigCodePoint CR_In_Tai_Le[] = {
+	1,
+	0x1950, 0x197f,
+}; /* CR_In_Tai_Le */
+
+/* 'In_New_Tai_Lue': Block */
+static const OnigCodePoint CR_In_New_Tai_Lue[] = {
+	1,
+	0x1980, 0x19df,
+}; /* CR_In_New_Tai_Lue */
+
+/* 'In_Khmer_Symbols': Block */
+static const OnigCodePoint CR_In_Khmer_Symbols[] = {
+	1,
+	0x19e0, 0x19ff,
+}; /* CR_In_Khmer_Symbols */
+
+/* 'In_Buginese': Block */
+static const OnigCodePoint CR_In_Buginese[] = {
+	1,
+	0x1a00, 0x1a1f,
+}; /* CR_In_Buginese */
+
+/* 'In_Tai_Tham': Block */
+static const OnigCodePoint CR_In_Tai_Tham[] = {
+	1,
+	0x1a20, 0x1aaf,
+}; /* CR_In_Tai_Tham */
+
+/* 'In_Balinese': Block */
+static const OnigCodePoint CR_In_Balinese[] = {
+	1,
+	0x1b00, 0x1b7f,
+}; /* CR_In_Balinese */
+
+/* 'In_Sundanese': Block */
+static const OnigCodePoint CR_In_Sundanese[] = {
+	1,
+	0x1b80, 0x1bbf,
+}; /* CR_In_Sundanese */
+
+/* 'In_Batak': Block */
+static const OnigCodePoint CR_In_Batak[] = {
+	1,
+	0x1bc0, 0x1bff,
+}; /* CR_In_Batak */
+
+/* 'In_Lepcha': Block */
+static const OnigCodePoint CR_In_Lepcha[] = {
+	1,
+	0x1c00, 0x1c4f,
+}; /* CR_In_Lepcha */
+
+/* 'In_Ol_Chiki': Block */
+#define CR_In_Ol_Chiki CR_Ol_Chiki
+
+/* 'In_Sundanese_Supplement': Block */
+static const OnigCodePoint CR_In_Sundanese_Supplement[] = {
+	1,
+	0x1cc0, 0x1ccf,
+}; /* CR_In_Sundanese_Supplement */
+
+/* 'In_Vedic_Extensions': Block */
+static const OnigCodePoint CR_In_Vedic_Extensions[] = {
+	1,
+	0x1cd0, 0x1cff,
+}; /* CR_In_Vedic_Extensions */
+
+/* 'In_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions[] = {
+	1,
+	0x1d00, 0x1d7f,
+}; /* CR_In_Phonetic_Extensions */
+
+/* 'In_Phonetic_Extensions_Supplement': Block */
+static const OnigCodePoint CR_In_Phonetic_Extensions_Supplement[] = {
+	1,
+	0x1d80, 0x1dbf,
+}; /* CR_In_Phonetic_Extensions_Supplement */
+
+/* 'In_Combining_Diacritical_Marks_Supplement': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_Supplement[] = {
+	1,
+	0x1dc0, 0x1dff,
+}; /* CR_In_Combining_Diacritical_Marks_Supplement */
+
+/* 'In_Latin_Extended_Additional': Block */
+static const OnigCodePoint CR_In_Latin_Extended_Additional[] = {
+	1,
+	0x1e00, 0x1eff,
+}; /* CR_In_Latin_Extended_Additional */
+
+/* 'In_Greek_Extended': Block */
+static const OnigCodePoint CR_In_Greek_Extended[] = {
+	1,
+	0x1f00, 0x1fff,
+}; /* CR_In_Greek_Extended */
+
+/* 'In_General_Punctuation': Block */
+static const OnigCodePoint CR_In_General_Punctuation[] = {
+	1,
+	0x2000, 0x206f,
+}; /* CR_In_General_Punctuation */
+
+/* 'In_Superscripts_and_Subscripts': Block */
+static const OnigCodePoint CR_In_Superscripts_and_Subscripts[] = {
+	1,
+	0x2070, 0x209f,
+}; /* CR_In_Superscripts_and_Subscripts */
+
+/* 'In_Currency_Symbols': Block */
+static const OnigCodePoint CR_In_Currency_Symbols[] = {
+	1,
+	0x20a0, 0x20cf,
+}; /* CR_In_Currency_Symbols */
+
+/* 'In_Combining_Diacritical_Marks_for_Symbols': Block */
+static const OnigCodePoint CR_In_Combining_Diacritical_Marks_for_Symbols[] = {
+	1,
+	0x20d0, 0x20ff,
+}; /* CR_In_Combining_Diacritical_Marks_for_Symbols */
+
+/* 'In_Letterlike_Symbols': Block */
+static const OnigCodePoint CR_In_Letterlike_Symbols[] = {
+	1,
+	0x2100, 0x214f,
+}; /* CR_In_Letterlike_Symbols */
+
+/* 'In_Number_Forms': Block */
+static const OnigCodePoint CR_In_Number_Forms[] = {
+	1,
+	0x2150, 0x218f,
+}; /* CR_In_Number_Forms */
+
+/* 'In_Arrows': Block */
+static const OnigCodePoint CR_In_Arrows[] = {
+	1,
+	0x2190, 0x21ff,
+}; /* CR_In_Arrows */
+
+/* 'In_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Mathematical_Operators[] = {
+	1,
+	0x2200, 0x22ff,
+}; /* CR_In_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Technical': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Technical[] = {
+	1,
+	0x2300, 0x23ff,
+}; /* CR_In_Miscellaneous_Technical */
+
+/* 'In_Control_Pictures': Block */
+static const OnigCodePoint CR_In_Control_Pictures[] = {
+	1,
+	0x2400, 0x243f,
+}; /* CR_In_Control_Pictures */
+
+/* 'In_Optical_Character_Recognition': Block */
+static const OnigCodePoint CR_In_Optical_Character_Recognition[] = {
+	1,
+	0x2440, 0x245f,
+}; /* CR_In_Optical_Character_Recognition */
+
+/* 'In_Enclosed_Alphanumerics': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumerics[] = {
+	1,
+	0x2460, 0x24ff,
+}; /* CR_In_Enclosed_Alphanumerics */
+
+/* 'In_Box_Drawing': Block */
+static const OnigCodePoint CR_In_Box_Drawing[] = {
+	1,
+	0x2500, 0x257f,
+}; /* CR_In_Box_Drawing */
+
+/* 'In_Block_Elements': Block */
+static const OnigCodePoint CR_In_Block_Elements[] = {
+	1,
+	0x2580, 0x259f,
+}; /* CR_In_Block_Elements */
+
+/* 'In_Geometric_Shapes': Block */
+static const OnigCodePoint CR_In_Geometric_Shapes[] = {
+	1,
+	0x25a0, 0x25ff,
+}; /* CR_In_Geometric_Shapes */
+
+/* 'In_Miscellaneous_Symbols': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols[] = {
+	1,
+	0x2600, 0x26ff,
+}; /* CR_In_Miscellaneous_Symbols */
+
+/* 'In_Dingbats': Block */
+static const OnigCodePoint CR_In_Dingbats[] = {
+	1,
+	0x2700, 0x27bf,
+}; /* CR_In_Dingbats */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_A': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_A[] = {
+	1,
+	0x27c0, 0x27ef,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_A */
+
+/* 'In_Supplemental_Arrows_A': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_A[] = {
+	1,
+	0x27f0, 0x27ff,
+}; /* CR_In_Supplemental_Arrows_A */
+
+/* 'In_Braille_Patterns': Block */
+#define CR_In_Braille_Patterns CR_Braille
+
+/* 'In_Supplemental_Arrows_B': Block */
+static const OnigCodePoint CR_In_Supplemental_Arrows_B[] = {
+	1,
+	0x2900, 0x297f,
+}; /* CR_In_Supplemental_Arrows_B */
+
+/* 'In_Miscellaneous_Mathematical_Symbols_B': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Mathematical_Symbols_B[] = {
+	1,
+	0x2980, 0x29ff,
+}; /* CR_In_Miscellaneous_Mathematical_Symbols_B */
+
+/* 'In_Supplemental_Mathematical_Operators': Block */
+static const OnigCodePoint CR_In_Supplemental_Mathematical_Operators[] = {
+	1,
+	0x2a00, 0x2aff,
+}; /* CR_In_Supplemental_Mathematical_Operators */
+
+/* 'In_Miscellaneous_Symbols_and_Arrows': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_and_Arrows[] = {
+	1,
+	0x2b00, 0x2bff,
+}; /* CR_In_Miscellaneous_Symbols_and_Arrows */
+
+/* 'In_Glagolitic': Block */
+static const OnigCodePoint CR_In_Glagolitic[] = {
+	1,
+	0x2c00, 0x2c5f,
+}; /* CR_In_Glagolitic */
+
+/* 'In_Latin_Extended_C': Block */
+static const OnigCodePoint CR_In_Latin_Extended_C[] = {
+	1,
+	0x2c60, 0x2c7f,
+}; /* CR_In_Latin_Extended_C */
+
+/* 'In_Coptic': Block */
+static const OnigCodePoint CR_In_Coptic[] = {
+	1,
+	0x2c80, 0x2cff,
+}; /* CR_In_Coptic */
+
+/* 'In_Georgian_Supplement': Block */
+static const OnigCodePoint CR_In_Georgian_Supplement[] = {
+	1,
+	0x2d00, 0x2d2f,
+}; /* CR_In_Georgian_Supplement */
+
+/* 'In_Tifinagh': Block */
+static const OnigCodePoint CR_In_Tifinagh[] = {
+	1,
+	0x2d30, 0x2d7f,
+}; /* CR_In_Tifinagh */
+
+/* 'In_Ethiopic_Extended': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended[] = {
+	1,
+	0x2d80, 0x2ddf,
+}; /* CR_In_Ethiopic_Extended */
+
+/* 'In_Cyrillic_Extended_A': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_A[] = {
+	1,
+	0x2de0, 0x2dff,
+}; /* CR_In_Cyrillic_Extended_A */
+
+/* 'In_Supplemental_Punctuation': Block */
+static const OnigCodePoint CR_In_Supplemental_Punctuation[] = {
+	1,
+	0x2e00, 0x2e7f,
+}; /* CR_In_Supplemental_Punctuation */
+
+/* 'In_CJK_Radicals_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Radicals_Supplement[] = {
+	1,
+	0x2e80, 0x2eff,
+}; /* CR_In_CJK_Radicals_Supplement */
+
+/* 'In_Kangxi_Radicals': Block */
+static const OnigCodePoint CR_In_Kangxi_Radicals[] = {
+	1,
+	0x2f00, 0x2fdf,
+}; /* CR_In_Kangxi_Radicals */
+
+/* 'In_Ideographic_Description_Characters': Block */
+static const OnigCodePoint CR_In_Ideographic_Description_Characters[] = {
+	1,
+	0x2ff0, 0x2fff,
+}; /* CR_In_Ideographic_Description_Characters */
+
+/* 'In_CJK_Symbols_and_Punctuation': Block */
+static const OnigCodePoint CR_In_CJK_Symbols_and_Punctuation[] = {
+	1,
+	0x3000, 0x303f,
+}; /* CR_In_CJK_Symbols_and_Punctuation */
+
+/* 'In_Hiragana': Block */
+static const OnigCodePoint CR_In_Hiragana[] = {
+	1,
+	0x3040, 0x309f,
+}; /* CR_In_Hiragana */
+
+/* 'In_Katakana': Block */
+static const OnigCodePoint CR_In_Katakana[] = {
+	1,
+	0x30a0, 0x30ff,
+}; /* CR_In_Katakana */
+
+/* 'In_Bopomofo': Block */
+static const OnigCodePoint CR_In_Bopomofo[] = {
+	1,
+	0x3100, 0x312f,
+}; /* CR_In_Bopomofo */
+
+/* 'In_Hangul_Compatibility_Jamo': Block */
+static const OnigCodePoint CR_In_Hangul_Compatibility_Jamo[] = {
+	1,
+	0x3130, 0x318f,
+}; /* CR_In_Hangul_Compatibility_Jamo */
+
+/* 'In_Kanbun': Block */
+static const OnigCodePoint CR_In_Kanbun[] = {
+	1,
+	0x3190, 0x319f,
+}; /* CR_In_Kanbun */
+
+/* 'In_Bopomofo_Extended': Block */
+static const OnigCodePoint CR_In_Bopomofo_Extended[] = {
+	1,
+	0x31a0, 0x31bf,
+}; /* CR_In_Bopomofo_Extended */
+
+/* 'In_CJK_Strokes': Block */
+static const OnigCodePoint CR_In_CJK_Strokes[] = {
+	1,
+	0x31c0, 0x31ef,
+}; /* CR_In_CJK_Strokes */
+
+/* 'In_Katakana_Phonetic_Extensions': Block */
+static const OnigCodePoint CR_In_Katakana_Phonetic_Extensions[] = {
+	1,
+	0x31f0, 0x31ff,
+}; /* CR_In_Katakana_Phonetic_Extensions */
+
+/* 'In_Enclosed_CJK_Letters_and_Months': Block */
+static const OnigCodePoint CR_In_Enclosed_CJK_Letters_and_Months[] = {
+	1,
+	0x3200, 0x32ff,
+}; /* CR_In_Enclosed_CJK_Letters_and_Months */
+
+/* 'In_CJK_Compatibility': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility[] = {
+	1,
+	0x3300, 0x33ff,
+}; /* CR_In_CJK_Compatibility */
+
+/* 'In_CJK_Unified_Ideographs_Extension_A': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_A[] = {
+	1,
+	0x3400, 0x4dbf,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_A */
+
+/* 'In_Yijing_Hexagram_Symbols': Block */
+static const OnigCodePoint CR_In_Yijing_Hexagram_Symbols[] = {
+	1,
+	0x4dc0, 0x4dff,
+}; /* CR_In_Yijing_Hexagram_Symbols */
+
+/* 'In_CJK_Unified_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs[] = {
+	1,
+	0x4e00, 0x9fff,
+}; /* CR_In_CJK_Unified_Ideographs */
+
+/* 'In_Yi_Syllables': Block */
+static const OnigCodePoint CR_In_Yi_Syllables[] = {
+	1,
+	0xa000, 0xa48f,
+}; /* CR_In_Yi_Syllables */
+
+/* 'In_Yi_Radicals': Block */
+static const OnigCodePoint CR_In_Yi_Radicals[] = {
+	1,
+	0xa490, 0xa4cf,
+}; /* CR_In_Yi_Radicals */
+
+/* 'In_Lisu': Block */
+#define CR_In_Lisu CR_Lisu
+
+/* 'In_Vai': Block */
+static const OnigCodePoint CR_In_Vai[] = {
+	1,
+	0xa500, 0xa63f,
+}; /* CR_In_Vai */
+
+/* 'In_Cyrillic_Extended_B': Block */
+static const OnigCodePoint CR_In_Cyrillic_Extended_B[] = {
+	1,
+	0xa640, 0xa69f,
+}; /* CR_In_Cyrillic_Extended_B */
+
+/* 'In_Bamum': Block */
+static const OnigCodePoint CR_In_Bamum[] = {
+	1,
+	0xa6a0, 0xa6ff,
+}; /* CR_In_Bamum */
+
+/* 'In_Modifier_Tone_Letters': Block */
+static const OnigCodePoint CR_In_Modifier_Tone_Letters[] = {
+	1,
+	0xa700, 0xa71f,
+}; /* CR_In_Modifier_Tone_Letters */
+
+/* 'In_Latin_Extended_D': Block */
+static const OnigCodePoint CR_In_Latin_Extended_D[] = {
+	1,
+	0xa720, 0xa7ff,
+}; /* CR_In_Latin_Extended_D */
+
+/* 'In_Syloti_Nagri': Block */
+static const OnigCodePoint CR_In_Syloti_Nagri[] = {
+	1,
+	0xa800, 0xa82f,
+}; /* CR_In_Syloti_Nagri */
+
+/* 'In_Common_Indic_Number_Forms': Block */
+static const OnigCodePoint CR_In_Common_Indic_Number_Forms[] = {
+	1,
+	0xa830, 0xa83f,
+}; /* CR_In_Common_Indic_Number_Forms */
+
+/* 'In_Phags_pa': Block */
+static const OnigCodePoint CR_In_Phags_pa[] = {
+	1,
+	0xa840, 0xa87f,
+}; /* CR_In_Phags_pa */
+
+/* 'In_Saurashtra': Block */
+static const OnigCodePoint CR_In_Saurashtra[] = {
+	1,
+	0xa880, 0xa8df,
+}; /* CR_In_Saurashtra */
+
+/* 'In_Devanagari_Extended': Block */
+static const OnigCodePoint CR_In_Devanagari_Extended[] = {
+	1,
+	0xa8e0, 0xa8ff,
+}; /* CR_In_Devanagari_Extended */
+
+/* 'In_Kayah_Li': Block */
+#define CR_In_Kayah_Li CR_Kayah_Li
+
+/* 'In_Rejang': Block */
+static const OnigCodePoint CR_In_Rejang[] = {
+	1,
+	0xa930, 0xa95f,
+}; /* CR_In_Rejang */
+
+/* 'In_Hangul_Jamo_Extended_A': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_A[] = {
+	1,
+	0xa960, 0xa97f,
+}; /* CR_In_Hangul_Jamo_Extended_A */
+
+/* 'In_Javanese': Block */
+static const OnigCodePoint CR_In_Javanese[] = {
+	1,
+	0xa980, 0xa9df,
+}; /* CR_In_Javanese */
+
+/* 'In_Cham': Block */
+static const OnigCodePoint CR_In_Cham[] = {
+	1,
+	0xaa00, 0xaa5f,
+}; /* CR_In_Cham */
+
+/* 'In_Myanmar_Extended_A': Block */
+static const OnigCodePoint CR_In_Myanmar_Extended_A[] = {
+	1,
+	0xaa60, 0xaa7f,
+}; /* CR_In_Myanmar_Extended_A */
+
+/* 'In_Tai_Viet': Block */
+static const OnigCodePoint CR_In_Tai_Viet[] = {
+	1,
+	0xaa80, 0xaadf,
+}; /* CR_In_Tai_Viet */
+
+/* 'In_Meetei_Mayek_Extensions': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek_Extensions[] = {
+	1,
+	0xaae0, 0xaaff,
+}; /* CR_In_Meetei_Mayek_Extensions */
+
+/* 'In_Ethiopic_Extended_A': Block */
+static const OnigCodePoint CR_In_Ethiopic_Extended_A[] = {
+	1,
+	0xab00, 0xab2f,
+}; /* CR_In_Ethiopic_Extended_A */
+
+/* 'In_Meetei_Mayek': Block */
+static const OnigCodePoint CR_In_Meetei_Mayek[] = {
+	1,
+	0xabc0, 0xabff,
+}; /* CR_In_Meetei_Mayek */
+
+/* 'In_Hangul_Syllables': Block */
+static const OnigCodePoint CR_In_Hangul_Syllables[] = {
+	1,
+	0xac00, 0xd7af,
+}; /* CR_In_Hangul_Syllables */
+
+/* 'In_Hangul_Jamo_Extended_B': Block */
+static const OnigCodePoint CR_In_Hangul_Jamo_Extended_B[] = {
+	1,
+	0xd7b0, 0xd7ff,
+}; /* CR_In_Hangul_Jamo_Extended_B */
+
+/* 'In_High_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Surrogates[] = {
+	1,
+	0xd800, 0xdb7f,
+}; /* CR_In_High_Surrogates */
+
+/* 'In_High_Private_Use_Surrogates': Block */
+static const OnigCodePoint CR_In_High_Private_Use_Surrogates[] = {
+	1,
+	0xdb80, 0xdbff,
+}; /* CR_In_High_Private_Use_Surrogates */
+
+/* 'In_Low_Surrogates': Block */
+static const OnigCodePoint CR_In_Low_Surrogates[] = {
+	1,
+	0xdc00, 0xdfff,
+}; /* CR_In_Low_Surrogates */
+
+/* 'In_Private_Use_Area': Block */
+static const OnigCodePoint CR_In_Private_Use_Area[] = {
+	1,
+	0xe000, 0xf8ff,
+}; /* CR_In_Private_Use_Area */
+
+/* 'In_CJK_Compatibility_Ideographs': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs[] = {
+	1,
+	0xf900, 0xfaff,
+}; /* CR_In_CJK_Compatibility_Ideographs */
+
+/* 'In_Alphabetic_Presentation_Forms': Block */
+static const OnigCodePoint CR_In_Alphabetic_Presentation_Forms[] = {
+	1,
+	0xfb00, 0xfb4f,
+}; /* CR_In_Alphabetic_Presentation_Forms */
+
+/* 'In_Arabic_Presentation_Forms_A': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_A[] = {
+	1,
+	0xfb50, 0xfdff,
+}; /* CR_In_Arabic_Presentation_Forms_A */
+
+/* 'In_Variation_Selectors': Block */
+static const OnigCodePoint CR_In_Variation_Selectors[] = {
+	1,
+	0xfe00, 0xfe0f,
+}; /* CR_In_Variation_Selectors */
+
+/* 'In_Vertical_Forms': Block */
+static const OnigCodePoint CR_In_Vertical_Forms[] = {
+	1,
+	0xfe10, 0xfe1f,
+}; /* CR_In_Vertical_Forms */
+
+/* 'In_Combining_Half_Marks': Block */
+static const OnigCodePoint CR_In_Combining_Half_Marks[] = {
+	1,
+	0xfe20, 0xfe2f,
+}; /* CR_In_Combining_Half_Marks */
+
+/* 'In_CJK_Compatibility_Forms': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Forms[] = {
+	1,
+	0xfe30, 0xfe4f,
+}; /* CR_In_CJK_Compatibility_Forms */
+
+/* 'In_Small_Form_Variants': Block */
+static const OnigCodePoint CR_In_Small_Form_Variants[] = {
+	1,
+	0xfe50, 0xfe6f,
+}; /* CR_In_Small_Form_Variants */
+
+/* 'In_Arabic_Presentation_Forms_B': Block */
+static const OnigCodePoint CR_In_Arabic_Presentation_Forms_B[] = {
+	1,
+	0xfe70, 0xfeff,
+}; /* CR_In_Arabic_Presentation_Forms_B */
+
+/* 'In_Halfwidth_and_Fullwidth_Forms': Block */
+static const OnigCodePoint CR_In_Halfwidth_and_Fullwidth_Forms[] = {
+	1,
+	0xff00, 0xffef,
+}; /* CR_In_Halfwidth_and_Fullwidth_Forms */
+
+/* 'In_Specials': Block */
+static const OnigCodePoint CR_In_Specials[] = {
+	1,
+	0xfff0, 0xffff,
+}; /* CR_In_Specials */
+
+/* 'In_Linear_B_Syllabary': Block */
+static const OnigCodePoint CR_In_Linear_B_Syllabary[] = {
+	1,
+	0x10000, 0x1007f,
+}; /* CR_In_Linear_B_Syllabary */
+
+/* 'In_Linear_B_Ideograms': Block */
+static const OnigCodePoint CR_In_Linear_B_Ideograms[] = {
+	1,
+	0x10080, 0x100ff,
+}; /* CR_In_Linear_B_Ideograms */
+
+/* 'In_Aegean_Numbers': Block */
+static const OnigCodePoint CR_In_Aegean_Numbers[] = {
+	1,
+	0x10100, 0x1013f,
+}; /* CR_In_Aegean_Numbers */
+
+/* 'In_Ancient_Greek_Numbers': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Numbers[] = {
+	1,
+	0x10140, 0x1018f,
+}; /* CR_In_Ancient_Greek_Numbers */
+
+/* 'In_Ancient_Symbols': Block */
+static const OnigCodePoint CR_In_Ancient_Symbols[] = {
+	1,
+	0x10190, 0x101cf,
+}; /* CR_In_Ancient_Symbols */
+
+/* 'In_Phaistos_Disc': Block */
+static const OnigCodePoint CR_In_Phaistos_Disc[] = {
+	1,
+	0x101d0, 0x101ff,
+}; /* CR_In_Phaistos_Disc */
+
+/* 'In_Lycian': Block */
+static const OnigCodePoint CR_In_Lycian[] = {
+	1,
+	0x10280, 0x1029f,
+}; /* CR_In_Lycian */
+
+/* 'In_Carian': Block */
+static const OnigCodePoint CR_In_Carian[] = {
+	1,
+	0x102a0, 0x102df,
+}; /* CR_In_Carian */
+
+/* 'In_Old_Italic': Block */
+static const OnigCodePoint CR_In_Old_Italic[] = {
+	1,
+	0x10300, 0x1032f,
+}; /* CR_In_Old_Italic */
+
+/* 'In_Gothic': Block */
+static const OnigCodePoint CR_In_Gothic[] = {
+	1,
+	0x10330, 0x1034f,
+}; /* CR_In_Gothic */
+
+/* 'In_Ugaritic': Block */
+static const OnigCodePoint CR_In_Ugaritic[] = {
+	1,
+	0x10380, 0x1039f,
+}; /* CR_In_Ugaritic */
+
+/* 'In_Old_Persian': Block */
+static const OnigCodePoint CR_In_Old_Persian[] = {
+	1,
+	0x103a0, 0x103df,
+}; /* CR_In_Old_Persian */
+
+/* 'In_Deseret': Block */
+#define CR_In_Deseret CR_Deseret
+
+/* 'In_Shavian': Block */
+#define CR_In_Shavian CR_Shavian
+
+/* 'In_Osmanya': Block */
+static const OnigCodePoint CR_In_Osmanya[] = {
+	1,
+	0x10480, 0x104af,
+}; /* CR_In_Osmanya */
+
+/* 'In_Cypriot_Syllabary': Block */
+static const OnigCodePoint CR_In_Cypriot_Syllabary[] = {
+	1,
+	0x10800, 0x1083f,
+}; /* CR_In_Cypriot_Syllabary */
+
+/* 'In_Imperial_Aramaic': Block */
+static const OnigCodePoint CR_In_Imperial_Aramaic[] = {
+	1,
+	0x10840, 0x1085f,
+}; /* CR_In_Imperial_Aramaic */
+
+/* 'In_Phoenician': Block */
+static const OnigCodePoint CR_In_Phoenician[] = {
+	1,
+	0x10900, 0x1091f,
+}; /* CR_In_Phoenician */
+
+/* 'In_Lydian': Block */
+static const OnigCodePoint CR_In_Lydian[] = {
+	1,
+	0x10920, 0x1093f,
+}; /* CR_In_Lydian */
+
+/* 'In_Meroitic_Hieroglyphs': Block */
+#define CR_In_Meroitic_Hieroglyphs CR_Meroitic_Hieroglyphs
+
+/* 'In_Meroitic_Cursive': Block */
+static const OnigCodePoint CR_In_Meroitic_Cursive[] = {
+	1,
+	0x109a0, 0x109ff,
+}; /* CR_In_Meroitic_Cursive */
+
+/* 'In_Kharoshthi': Block */
+static const OnigCodePoint CR_In_Kharoshthi[] = {
+	1,
+	0x10a00, 0x10a5f,
+}; /* CR_In_Kharoshthi */
+
+/* 'In_Old_South_Arabian': Block */
+#define CR_In_Old_South_Arabian CR_Old_South_Arabian
+
+/* 'In_Avestan': Block */
+static const OnigCodePoint CR_In_Avestan[] = {
+	1,
+	0x10b00, 0x10b3f,
+}; /* CR_In_Avestan */
+
+/* 'In_Inscriptional_Parthian': Block */
+static const OnigCodePoint CR_In_Inscriptional_Parthian[] = {
+	1,
+	0x10b40, 0x10b5f,
+}; /* CR_In_Inscriptional_Parthian */
+
+/* 'In_Inscriptional_Pahlavi': Block */
+static const OnigCodePoint CR_In_Inscriptional_Pahlavi[] = {
+	1,
+	0x10b60, 0x10b7f,
+}; /* CR_In_Inscriptional_Pahlavi */
+
+/* 'In_Old_Turkic': Block */
+static const OnigCodePoint CR_In_Old_Turkic[] = {
+	1,
+	0x10c00, 0x10c4f,
+}; /* CR_In_Old_Turkic */
+
+/* 'In_Rumi_Numeral_Symbols': Block */
+static const OnigCodePoint CR_In_Rumi_Numeral_Symbols[] = {
+	1,
+	0x10e60, 0x10e7f,
+}; /* CR_In_Rumi_Numeral_Symbols */
+
+/* 'In_Brahmi': Block */
+static const OnigCodePoint CR_In_Brahmi[] = {
+	1,
+	0x11000, 0x1107f,
+}; /* CR_In_Brahmi */
+
+/* 'In_Kaithi': Block */
+static const OnigCodePoint CR_In_Kaithi[] = {
+	1,
+	0x11080, 0x110cf,
+}; /* CR_In_Kaithi */
+
+/* 'In_Sora_Sompeng': Block */
+static const OnigCodePoint CR_In_Sora_Sompeng[] = {
+	1,
+	0x110d0, 0x110ff,
+}; /* CR_In_Sora_Sompeng */
+
+/* 'In_Chakma': Block */
+static const OnigCodePoint CR_In_Chakma[] = {
+	1,
+	0x11100, 0x1114f,
+}; /* CR_In_Chakma */
+
+/* 'In_Sharada': Block */
+static const OnigCodePoint CR_In_Sharada[] = {
+	1,
+	0x11180, 0x111df,
+}; /* CR_In_Sharada */
+
+/* 'In_Takri': Block */
+static const OnigCodePoint CR_In_Takri[] = {
+	1,
+	0x11680, 0x116cf,
+}; /* CR_In_Takri */
+
+/* 'In_Cuneiform': Block */
+static const OnigCodePoint CR_In_Cuneiform[] = {
+	1,
+	0x12000, 0x123ff,
+}; /* CR_In_Cuneiform */
+
+/* 'In_Cuneiform_Numbers_and_Punctuation': Block */
+static const OnigCodePoint CR_In_Cuneiform_Numbers_and_Punctuation[] = {
+	1,
+	0x12400, 0x1247f,
+}; /* CR_In_Cuneiform_Numbers_and_Punctuation */
+
+/* 'In_Egyptian_Hieroglyphs': Block */
+static const OnigCodePoint CR_In_Egyptian_Hieroglyphs[] = {
+	1,
+	0x13000, 0x1342f,
+}; /* CR_In_Egyptian_Hieroglyphs */
+
+/* 'In_Bamum_Supplement': Block */
+static const OnigCodePoint CR_In_Bamum_Supplement[] = {
+	1,
+	0x16800, 0x16a3f,
+}; /* CR_In_Bamum_Supplement */
+
+/* 'In_Miao': Block */
+static const OnigCodePoint CR_In_Miao[] = {
+	1,
+	0x16f00, 0x16f9f,
+}; /* CR_In_Miao */
+
+/* 'In_Kana_Supplement': Block */
+static const OnigCodePoint CR_In_Kana_Supplement[] = {
+	1,
+	0x1b000, 0x1b0ff,
+}; /* CR_In_Kana_Supplement */
+
+/* 'In_Byzantine_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Byzantine_Musical_Symbols[] = {
+	1,
+	0x1d000, 0x1d0ff,
+}; /* CR_In_Byzantine_Musical_Symbols */
+
+/* 'In_Musical_Symbols': Block */
+static const OnigCodePoint CR_In_Musical_Symbols[] = {
+	1,
+	0x1d100, 0x1d1ff,
+}; /* CR_In_Musical_Symbols */
+
+/* 'In_Ancient_Greek_Musical_Notation': Block */
+static const OnigCodePoint CR_In_Ancient_Greek_Musical_Notation[] = {
+	1,
+	0x1d200, 0x1d24f,
+}; /* CR_In_Ancient_Greek_Musical_Notation */
+
+/* 'In_Tai_Xuan_Jing_Symbols': Block */
+static const OnigCodePoint CR_In_Tai_Xuan_Jing_Symbols[] = {
+	1,
+	0x1d300, 0x1d35f,
+}; /* CR_In_Tai_Xuan_Jing_Symbols */
+
+/* 'In_Counting_Rod_Numerals': Block */
+static const OnigCodePoint CR_In_Counting_Rod_Numerals[] = {
+	1,
+	0x1d360, 0x1d37f,
+}; /* CR_In_Counting_Rod_Numerals */
+
+/* 'In_Mathematical_Alphanumeric_Symbols': Block */
+static const OnigCodePoint CR_In_Mathematical_Alphanumeric_Symbols[] = {
+	1,
+	0x1d400, 0x1d7ff,
+}; /* CR_In_Mathematical_Alphanumeric_Symbols */
+
+/* 'In_Arabic_Mathematical_Alphabetic_Symbols': Block */
+static const OnigCodePoint CR_In_Arabic_Mathematical_Alphabetic_Symbols[] = {
+	1,
+	0x1ee00, 0x1eeff,
+}; /* CR_In_Arabic_Mathematical_Alphabetic_Symbols */
+
+/* 'In_Mahjong_Tiles': Block */
+static const OnigCodePoint CR_In_Mahjong_Tiles[] = {
+	1,
+	0x1f000, 0x1f02f,
+}; /* CR_In_Mahjong_Tiles */
+
+/* 'In_Domino_Tiles': Block */
+static const OnigCodePoint CR_In_Domino_Tiles[] = {
+	1,
+	0x1f030, 0x1f09f,
+}; /* CR_In_Domino_Tiles */
+
+/* 'In_Playing_Cards': Block */
+static const OnigCodePoint CR_In_Playing_Cards[] = {
+	1,
+	0x1f0a0, 0x1f0ff,
+}; /* CR_In_Playing_Cards */
+
+/* 'In_Enclosed_Alphanumeric_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Alphanumeric_Supplement[] = {
+	1,
+	0x1f100, 0x1f1ff,
+}; /* CR_In_Enclosed_Alphanumeric_Supplement */
+
+/* 'In_Enclosed_Ideographic_Supplement': Block */
+static const OnigCodePoint CR_In_Enclosed_Ideographic_Supplement[] = {
+	1,
+	0x1f200, 0x1f2ff,
+}; /* CR_In_Enclosed_Ideographic_Supplement */
+
+/* 'In_Miscellaneous_Symbols_And_Pictographs': Block */
+static const OnigCodePoint CR_In_Miscellaneous_Symbols_And_Pictographs[] = {
+	1,
+	0x1f300, 0x1f5ff,
+}; /* CR_In_Miscellaneous_Symbols_And_Pictographs */
+
+/* 'In_Emoticons': Block */
+static const OnigCodePoint CR_In_Emoticons[] = {
+	1,
+	0x1f600, 0x1f64f,
+}; /* CR_In_Emoticons */
+
+/* 'In_Transport_And_Map_Symbols': Block */
+static const OnigCodePoint CR_In_Transport_And_Map_Symbols[] = {
+	1,
+	0x1f680, 0x1f6ff,
+}; /* CR_In_Transport_And_Map_Symbols */
+
+/* 'In_Alchemical_Symbols': Block */
+static const OnigCodePoint CR_In_Alchemical_Symbols[] = {
+	1,
+	0x1f700, 0x1f77f,
+}; /* CR_In_Alchemical_Symbols */
+
+/* 'In_CJK_Unified_Ideographs_Extension_B': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_B[] = {
+	1,
+	0x20000, 0x2a6df,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_B */
+
+/* 'In_CJK_Unified_Ideographs_Extension_C': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_C[] = {
+	1,
+	0x2a700, 0x2b73f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_C */
+
+/* 'In_CJK_Unified_Ideographs_Extension_D': Block */
+static const OnigCodePoint CR_In_CJK_Unified_Ideographs_Extension_D[] = {
+	1,
+	0x2b740, 0x2b81f,
+}; /* CR_In_CJK_Unified_Ideographs_Extension_D */
+
+/* 'In_CJK_Compatibility_Ideographs_Supplement': Block */
+static const OnigCodePoint CR_In_CJK_Compatibility_Ideographs_Supplement[] = {
+	1,
+	0x2f800, 0x2fa1f,
+}; /* CR_In_CJK_Compatibility_Ideographs_Supplement */
+
+/* 'In_Tags': Block */
+static const OnigCodePoint CR_In_Tags[] = {
+	1,
+	0xe0000, 0xe007f,
+}; /* CR_In_Tags */
+
+/* 'In_Variation_Selectors_Supplement': Block */
+static const OnigCodePoint CR_In_Variation_Selectors_Supplement[] = {
+	1,
+	0xe0100, 0xe01ef,
+}; /* CR_In_Variation_Selectors_Supplement */
+
+/* 'In_Supplementary_Private_Use_Area_A': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_A[] = {
+	1,
+	0xf0000, 0xfffff,
+}; /* CR_In_Supplementary_Private_Use_Area_A */
+
+/* 'In_Supplementary_Private_Use_Area_B': Block */
+static const OnigCodePoint CR_In_Supplementary_Private_Use_Area_B[] = {
+	1,
+	0x100000, 0x10ffff,
+}; /* CR_In_Supplementary_Private_Use_Area_B */
+
+/* 'In_No_Block': Block */
+static const OnigCodePoint CR_In_No_Block[] = {
+	36,
+	0x0860, 0x089f,
+	0x1ab0, 0x1aff,
+	0x1c80, 0x1cbf,
+	0x2fe0, 0x2fef,
+	0xa9e0, 0xa9ff,
+	0xab30, 0xabbf,
+	0x10200, 0x1027f,
+	0x102e0, 0x102ff,
+	0x10350, 0x1037f,
+	0x103e0, 0x103ff,
+	0x104b0, 0x107ff,
+	0x10860, 0x108ff,
+	0x10940, 0x1097f,
+	0x10a80, 0x10aff,
+	0x10b80, 0x10bff,
+	0x10c50, 0x10e5f,
+	0x10e80, 0x10fff,
+	0x11150, 0x1117f,
+	0x111e0, 0x1167f,
+	0x116d0, 0x11fff,
+	0x12480, 0x12fff,
+	0x13430, 0x167ff,
+	0x16a40, 0x16eff,
+	0x16fa0, 0x1afff,
+	0x1b100, 0x1cfff,
+	0x1d250, 0x1d2ff,
+	0x1d380, 0x1d3ff,
+	0x1d800, 0x1edff,
+	0x1ef00, 0x1efff,
+	0x1f650, 0x1f67f,
+	0x1f780, 0x1ffff,
+	0x2a6e0, 0x2a6ff,
+	0x2b820, 0x2f7ff,
+	0x2fa20, 0xdffff,
+	0xe0080, 0xe00ff,
+	0xe01f0, 0xeffff,
+}; /* CR_In_No_Block */
+#endif /* USE_UNICODE_PROPERTIES */
+
+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_LC,
+  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_Batak,
+  CR_Brahmi,
+  CR_Mandaic,
+  CR_Chakma,
+  CR_Meroitic_Cursive,
+  CR_Meroitic_Hieroglyphs,
+  CR_Miao,
+  CR_Sharada,
+  CR_Sora_Sompeng,
+  CR_Takri,
+  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,
+  CR_Unknown,
+  CR_Age_1_1,
+  CR_Age_2_0,
+  CR_Age_2_1,
+  CR_Age_3_0,
+  CR_Age_3_1,
+  CR_Age_3_2,
+  CR_Age_4_0,
+  CR_Age_4_1,
+  CR_Age_5_0,
+  CR_Age_5_1,
+  CR_Age_5_2,
+  CR_Age_6_0,
+  CR_Age_6_1,
+  CR_In_Basic_Latin,
+  CR_In_Latin_1_Supplement,
+  CR_In_Latin_Extended_A,
+  CR_In_Latin_Extended_B,
+  CR_In_IPA_Extensions,
+  CR_In_Spacing_Modifier_Letters,
+  CR_In_Combining_Diacritical_Marks,
+  CR_In_Greek_and_Coptic,
+  CR_In_Cyrillic,
+  CR_In_Cyrillic_Supplement,
+  CR_In_Armenian,
+  CR_In_Hebrew,
+  CR_In_Arabic,
+  CR_In_Syriac,
+  CR_In_Arabic_Supplement,
+  CR_In_Thaana,
+  CR_In_NKo,
+  CR_In_Samaritan,
+  CR_In_Mandaic,
+  CR_In_Arabic_Extended_A,
+  CR_In_Devanagari,
+  CR_In_Bengali,
+  CR_In_Gurmukhi,
+  CR_In_Gujarati,
+  CR_In_Oriya,
+  CR_In_Tamil,
+  CR_In_Telugu,
+  CR_In_Kannada,
+  CR_In_Malayalam,
+  CR_In_Sinhala,
+  CR_In_Thai,
+  CR_In_Lao,
+  CR_In_Tibetan,
+  CR_In_Myanmar,
+  CR_In_Georgian,
+  CR_In_Hangul_Jamo,
+  CR_In_Ethiopic,
+  CR_In_Ethiopic_Supplement,
+  CR_In_Cherokee,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics,
+  CR_In_Ogham,
+  CR_In_Runic,
+  CR_In_Tagalog,
+  CR_In_Hanunoo,
+  CR_In_Buhid,
+  CR_In_Tagbanwa,
+  CR_In_Khmer,
+  CR_In_Mongolian,
+  CR_In_Unified_Canadian_Aboriginal_Syllabics_Extended,
+  CR_In_Limbu,
+  CR_In_Tai_Le,
+  CR_In_New_Tai_Lue,
+  CR_In_Khmer_Symbols,
+  CR_In_Buginese,
+  CR_In_Tai_Tham,
+  CR_In_Balinese,
+  CR_In_Sundanese,
+  CR_In_Batak,
+  CR_In_Lepcha,
+  CR_In_Ol_Chiki,
+  CR_In_Sundanese_Supplement,
+  CR_In_Vedic_Extensions,
+  CR_In_Phonetic_Extensions,
+  CR_In_Phonetic_Extensions_Supplement,
+  CR_In_Combining_Diacritical_Marks_Supplement,
+  CR_In_Latin_Extended_Additional,
+  CR_In_Greek_Extended,
+  CR_In_General_Punctuation,
+  CR_In_Superscripts_and_Subscripts,
+  CR_In_Currency_Symbols,
+  CR_In_Combining_Diacritical_Marks_for_Symbols,
+  CR_In_Letterlike_Symbols,
+  CR_In_Number_Forms,
+  CR_In_Arrows,
+  CR_In_Mathematical_Operators,
+  CR_In_Miscellaneous_Technical,
+  CR_In_Control_Pictures,
+  CR_In_Optical_Character_Recognition,
+  CR_In_Enclosed_Alphanumerics,
+  CR_In_Box_Drawing,
+  CR_In_Block_Elements,
+  CR_In_Geometric_Shapes,
+  CR_In_Miscellaneous_Symbols,
+  CR_In_Dingbats,
+  CR_In_Miscellaneous_Mathematical_Symbols_A,
+  CR_In_Supplemental_Arrows_A,
+  CR_In_Braille_Patterns,
+  CR_In_Supplemental_Arrows_B,
+  CR_In_Miscellaneous_Mathematical_Symbols_B,
+  CR_In_Supplemental_Mathematical_Operators,
+  CR_In_Miscellaneous_Symbols_and_Arrows,
+  CR_In_Glagolitic,
+  CR_In_Latin_Extended_C,
+  CR_In_Coptic,
+  CR_In_Georgian_Supplement,
+  CR_In_Tifinagh,
+  CR_In_Ethiopic_Extended,
+  CR_In_Cyrillic_Extended_A,
+  CR_In_Supplemental_Punctuation,
+  CR_In_CJK_Radicals_Supplement,
+  CR_In_Kangxi_Radicals,
+  CR_In_Ideographic_Description_Characters,
+  CR_In_CJK_Symbols_and_Punctuation,
+  CR_In_Hiragana,
+  CR_In_Katakana,
+  CR_In_Bopomofo,
+  CR_In_Hangul_Compatibility_Jamo,
+  CR_In_Kanbun,
+  CR_In_Bopomofo_Extended,
+  CR_In_CJK_Strokes,
+  CR_In_Katakana_Phonetic_Extensions,
+  CR_In_Enclosed_CJK_Letters_and_Months,
+  CR_In_CJK_Compatibility,
+  CR_In_CJK_Unified_Ideographs_Extension_A,
+  CR_In_Yijing_Hexagram_Symbols,
+  CR_In_CJK_Unified_Ideographs,
+  CR_In_Yi_Syllables,
+  CR_In_Yi_Radicals,
+  CR_In_Lisu,
+  CR_In_Vai,
+  CR_In_Cyrillic_Extended_B,
+  CR_In_Bamum,
+  CR_In_Modifier_Tone_Letters,
+  CR_In_Latin_Extended_D,
+  CR_In_Syloti_Nagri,
+  CR_In_Common_Indic_Number_Forms,
+  CR_In_Phags_pa,
+  CR_In_Saurashtra,
+  CR_In_Devanagari_Extended,
+  CR_In_Kayah_Li,
+  CR_In_Rejang,
+  CR_In_Hangul_Jamo_Extended_A,
+  CR_In_Javanese,
+  CR_In_Cham,
+  CR_In_Myanmar_Extended_A,
+  CR_In_Tai_Viet,
+  CR_In_Meetei_Mayek_Extensions,
+  CR_In_Ethiopic_Extended_A,
+  CR_In_Meetei_Mayek,
+  CR_In_Hangul_Syllables,
+  CR_In_Hangul_Jamo_Extended_B,
+  CR_In_High_Surrogates,
+  CR_In_High_Private_Use_Surrogates,
+  CR_In_Low_Surrogates,
+  CR_In_Private_Use_Area,
+  CR_In_CJK_Compatibility_Ideographs,
+  CR_In_Alphabetic_Presentation_Forms,
+  CR_In_Arabic_Presentation_Forms_A,
+  CR_In_Variation_Selectors,
+  CR_In_Vertical_Forms,
+  CR_In_Combining_Half_Marks,
+  CR_In_CJK_Compatibility_Forms,
+  CR_In_Small_Form_Variants,
+  CR_In_Arabic_Presentation_Forms_B,
+  CR_In_Halfwidth_and_Fullwidth_Forms,
+  CR_In_Specials,
+  CR_In_Linear_B_Syllabary,
+  CR_In_Linear_B_Ideograms,
+  CR_In_Aegean_Numbers,
+  CR_In_Ancient_Greek_Numbers,
+  CR_In_Ancient_Symbols,
+  CR_In_Phaistos_Disc,
+  CR_In_Lycian,
+  CR_In_Carian,
+  CR_In_Old_Italic,
+  CR_In_Gothic,
+  CR_In_Ugaritic,
+  CR_In_Old_Persian,
+  CR_In_Deseret,
+  CR_In_Shavian,
+  CR_In_Osmanya,
+  CR_In_Cypriot_Syllabary,
+  CR_In_Imperial_Aramaic,
+  CR_In_Phoenician,
+  CR_In_Lydian,
+  CR_In_Meroitic_Hieroglyphs,
+  CR_In_Meroitic_Cursive,
+  CR_In_Kharoshthi,
+  CR_In_Old_South_Arabian,
+  CR_In_Avestan,
+  CR_In_Inscriptional_Parthian,
+  CR_In_Inscriptional_Pahlavi,
+  CR_In_Old_Turkic,
+  CR_In_Rumi_Numeral_Symbols,
+  CR_In_Brahmi,
+  CR_In_Kaithi,
+  CR_In_Sora_Sompeng,
+  CR_In_Chakma,
+  CR_In_Sharada,
+  CR_In_Takri,
+  CR_In_Cuneiform,
+  CR_In_Cuneiform_Numbers_and_Punctuation,
+  CR_In_Egyptian_Hieroglyphs,
+  CR_In_Bamum_Supplement,
+  CR_In_Miao,
+  CR_In_Kana_Supplement,
+  CR_In_Byzantine_Musical_Symbols,
+  CR_In_Musical_Symbols,
+  CR_In_Ancient_Greek_Musical_Notation,
+  CR_In_Tai_Xuan_Jing_Symbols,
+  CR_In_Counting_Rod_Numerals,
+  CR_In_Mathematical_Alphanumeric_Symbols,
+  CR_In_Arabic_Mathematical_Alphabetic_Symbols,
+  CR_In_Mahjong_Tiles,
+  CR_In_Domino_Tiles,
+  CR_In_Playing_Cards,
+  CR_In_Enclosed_Alphanumeric_Supplement,
+  CR_In_Enclosed_Ideographic_Supplement,
+  CR_In_Miscellaneous_Symbols_And_Pictographs,
+  CR_In_Emoticons,
+  CR_In_Transport_And_Map_Symbols,
+  CR_In_Alchemical_Symbols,
+  CR_In_CJK_Unified_Ideographs_Extension_B,
+  CR_In_CJK_Unified_Ideographs_Extension_C,
+  CR_In_CJK_Unified_Ideographs_Extension_D,
+  CR_In_CJK_Compatibility_Ideographs_Supplement,
+  CR_In_Tags,
+  CR_In_Variation_Selectors_Supplement,
+  CR_In_Supplementary_Private_Use_Area_A,
+  CR_In_Supplementary_Private_Use_Area_B,
+  CR_In_No_Block,
+#endif /* USE_UNICODE_PROPERTIES */
+};
+struct uniname2ctype_struct {
+  int name, ctype;
+};
+
+static const struct uniname2ctype_struct *uniname2ctype_p(const char *, unsigned int);
+%}
+struct uniname2ctype_struct;
+%%
+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
+lc,                                       24
+ll,                                       25
+lm,                                       26
+lo,                                       27
+lt,                                       28
+lu,                                       29
+m,                                        30
+mc,                                       31
+me,                                       32
+mn,                                       33
+n,                                        34
+nd,                                       35
+nl,                                       36
+no,                                       37
+p,                                        38
+pc,                                       39
+pd,                                       40
+pe,                                       41
+pf,                                       42
+pi,                                       43
+po,                                       44
+ps,                                       45
+s,                                        46
+sc,                                       47
+sk,                                       48
+sm,                                       49
+so,                                       50
+z,                                        51
+zl,                                       52
+zp,                                       53
+zs,                                       54
+math,                                     55
+alphabetic,                               56
+lowercase,                                57
+uppercase,                                58
+cased,                                    59
+caseignorable,                            60
+changeswhenlowercased,                    61
+changeswhenuppercased,                    62
+changeswhentitlecased,                    63
+changeswhencasefolded,                    64
+changeswhencasemapped,                    65
+idstart,                                  66
+idcontinue,                               67
+xidstart,                                 68
+xidcontinue,                              69
+defaultignorablecodepoint,                70
+graphemeextend,                           71
+graphemebase,                             72
+graphemelink,                             73
+common,                                   74
+latin,                                    75
+greek,                                    76
+cyrillic,                                 77
+armenian,                                 78
+hebrew,                                   79
+arabic,                                   80
+syriac,                                   81
+thaana,                                   82
+devanagari,                               83
+bengali,                                  84
+gurmukhi,                                 85
+gujarati,                                 86
+oriya,                                    87
+tamil,                                    88
+telugu,                                   89
+kannada,                                  90
+malayalam,                                91
+sinhala,                                  92
+thai,                                     93
+lao,                                      94
+tibetan,                                  95
+myanmar,                                  96
+georgian,                                 97
+hangul,                                   98
+ethiopic,                                 99
+cherokee,                                100
+canadianaboriginal,                      101
+ogham,                                   102
+runic,                                   103
+khmer,                                   104
+mongolian,                               105
+hiragana,                                106
+katakana,                                107
+bopomofo,                                108
+han,                                     109
+yi,                                      110
+olditalic,                               111
+gothic,                                  112
+deseret,                                 113
+inherited,                               114
+tagalog,                                 115
+hanunoo,                                 116
+buhid,                                   117
+tagbanwa,                                118
+limbu,                                   119
+taile,                                   120
+linearb,                                 121
+ugaritic,                                122
+shavian,                                 123
+osmanya,                                 124
+cypriot,                                 125
+braille,                                 126
+buginese,                                127
+coptic,                                  128
+newtailue,                               129
+glagolitic,                              130
+tifinagh,                                131
+sylotinagri,                             132
+oldpersian,                              133
+kharoshthi,                              134
+balinese,                                135
+cuneiform,                               136
+phoenician,                              137
+phagspa,                                 138
+nko,                                     139
+sundanese,                               140
+lepcha,                                  141
+olchiki,                                 142
+vai,                                     143
+saurashtra,                              144
+kayahli,                                 145
+rejang,                                  146
+lycian,                                  147
+carian,                                  148
+lydian,                                  149
+cham,                                    150
+taitham,                                 151
+taiviet,                                 152
+avestan,                                 153
+egyptianhieroglyphs,                     154
+samaritan,                               155
+lisu,                                    156
+bamum,                                   157
+javanese,                                158
+meeteimayek,                             159
+imperialaramaic,                         160
+oldsoutharabian,                         161
+inscriptionalparthian,                   162
+inscriptionalpahlavi,                    163
+oldturkic,                               164
+kaithi,                                  165
+batak,                                   166
+brahmi,                                  167
+mandaic,                                 168
+chakma,                                  169
+meroiticcursive,                         170
+meroitichieroglyphs,                     171
+miao,                                    172
+sharada,                                 173
+sorasompeng,                             174
+takri,                                   175
+whitespace,                              176
+bidicontrol,                             177
+joincontrol,                             178
+dash,                                    179
+hyphen,                                  180
+quotationmark,                           181
+terminalpunctuation,                     182
+othermath,                               183
+hexdigit,                                184
+asciihexdigit,                           185
+otheralphabetic,                         186
+ideographic,                             187
+diacritic,                               188
+extender,                                189
+otherlowercase,                          190
+otheruppercase,                          191
+noncharactercodepoint,                   192
+othergraphemeextend,                     193
+idsbinaryoperator,                       194
+idstrinaryoperator,                      195
+radical,                                 196
+unifiedideograph,                        197
+otherdefaultignorablecodepoint,          198
+deprecated,                              199
+softdotted,                              200
+logicalorderexception,                   201
+otheridstart,                            202
+otheridcontinue,                         203
+sterm,                                   204
+variationselector,                       205
+patternwhitespace,                       206
+patternsyntax,                           207
+unknown,                                 208
+ahex,                                    185
+bidic,                                   177
+ci,                                       60
+cwcf,                                     64
+cwcm,                                     65
+cwl,                                      61
+cwt,                                      63
+cwu,                                      62
+dep,                                     199
+di,                                       70
+dia,                                     188
+ext,                                     189
+grbase,                                   72
+grext,                                    71
+grlink,                                   73
+hex,                                     184
+idc,                                      67
+ideo,                                    187
+ids,                                      66
+idsb,                                    194
+idst,                                    195
+joinc,                                   178
+loe,                                     201
+nchar,                                   192
+oalpha,                                  186
+odi,                                     198
+ogrext,                                  193
+oidc,                                    203
+oids,                                    202
+olower,                                  190
+omath,                                   183
+oupper,                                  191
+patsyn,                                  207
+patws,                                   206
+qmark,                                   181
+sd,                                      200
+term,                                    182
+uideo,                                   197
+vs,                                      205
+wspace,                                  176
+xidc,                                     69
+xids,                                     68
+other,                                    17
+control,                                  18
+format,                                   19
+unassigned,                               20
+privateuse,                               21
+surrogate,                                22
+letter,                                   23
+casedletter,                              24
+lowercaseletter,                          25
+modifierletter,                           26
+otherletter,                              27
+titlecaseletter,                          28
+uppercaseletter,                          29
+mark,                                     30
+combiningmark,                            30
+spacingmark,                              31
+enclosingmark,                            32
+nonspacingmark,                           33
+number,                                   34
+decimalnumber,                            35
+letternumber,                             36
+othernumber,                              37
+punctuation,                              38
+connectorpunctuation,                     39
+dashpunctuation,                          40
+closepunctuation,                         41
+finalpunctuation,                         42
+initialpunctuation,                       43
+otherpunctuation,                         44
+openpunctuation,                          45
+symbol,                                   46
+currencysymbol,                           47
+modifiersymbol,                           48
+mathsymbol,                               49
+othersymbol,                              50
+separator,                                51
+lineseparator,                            52
+paragraphseparator,                       53
+spaceseparator,                           54
+arab,                                     80
+armi,                                    160
+armn,                                     78
+avst,                                    153
+bali,                                    135
+bamu,                                    157
+batk,                                    166
+beng,                                     84
+bopo,                                    108
+brah,                                    167
+brai,                                    126
+bugi,                                    127
+buhd,                                    117
+cakm,                                    169
+cans,                                    101
+cari,                                    148
+cher,                                    100
+copt,                                    128
+qaac,                                    128
+cprt,                                    125
+cyrl,                                     77
+deva,                                     83
+dsrt,                                    113
+egyp,                                    154
+ethi,                                     99
+geor,                                     97
+glag,                                    130
+goth,                                    112
+grek,                                     76
+gujr,                                     86
+guru,                                     85
+hang,                                     98
+hani,                                    109
+hano,                                    116
+hebr,                                     79
+hira,                                    106
+ital,                                    111
+java,                                    158
+kali,                                    145
+kana,                                    107
+khar,                                    134
+khmr,                                    104
+knda,                                     90
+kthi,                                    165
+lana,                                    151
+laoo,                                     94
+latn,                                     75
+lepc,                                    141
+limb,                                    119
+linb,                                    121
+lyci,                                    147
+lydi,                                    149
+mand,                                    168
+merc,                                    170
+mero,                                    171
+mlym,                                     91
+mong,                                    105
+mtei,                                    159
+mymr,                                     96
+nkoo,                                    139
+ogam,                                    102
+olck,                                    142
+orkh,                                    164
+orya,                                     87
+osma,                                    124
+phag,                                    138
+phli,                                    163
+phnx,                                    137
+plrd,                                    172
+prti,                                    162
+rjng,                                    146
+runr,                                    103
+samr,                                    155
+sarb,                                    161
+saur,                                    144
+shaw,                                    123
+shrd,                                    173
+sinh,                                     92
+sora,                                    174
+sund,                                    140
+sylo,                                    132
+syrc,                                     81
+tagb,                                    118
+takr,                                    175
+tale,                                    120
+talu,                                    129
+taml,                                     88
+tavt,                                    152
+telu,                                     89
+tfng,                                    131
+tglg,                                    115
+thaa,                                     82
+tibt,                                     95
+ugar,                                    122
+vaii,                                    143
+xpeo,                                    133
+xsux,                                    136
+yiii,                                    110
+zinh,                                    114
+qaai,                                    114
+zyyy,                                     74
+zzzz,                                    208
+age=1.1,                                 209
+age=2.0,                                 210
+age=2.1,                                 211
+age=3.0,                                 212
+age=3.1,                                 213
+age=3.2,                                 214
+age=4.0,                                 215
+age=4.1,                                 216
+age=5.0,                                 217
+age=5.1,                                 218
+age=5.2,                                 219
+age=6.0,                                 220
+age=6.1,                                 221
+inbasiclatin,                            222
+inlatin1supplement,                      223
+inlatinextendeda,                        224
+inlatinextendedb,                        225
+inipaextensions,                         226
+inspacingmodifierletters,                227
+incombiningdiacriticalmarks,             228
+ingreekandcoptic,                        229
+incyrillic,                              230
+incyrillicsupplement,                    231
+inarmenian,                              232
+inhebrew,                                233
+inarabic,                                234
+insyriac,                                235
+inarabicsupplement,                      236
+inthaana,                                237
+innko,                                   238
+insamaritan,                             239
+inmandaic,                               240
+inarabicextendeda,                       241
+indevanagari,                            242
+inbengali,                               243
+ingurmukhi,                              244
+ingujarati,                              245
+inoriya,                                 246
+intamil,                                 247
+intelugu,                                248
+inkannada,                               249
+inmalayalam,                             250
+insinhala,                               251
+inthai,                                  252
+inlao,                                   253
+intibetan,                               254
+inmyanmar,                               255
+ingeorgian,                              256
+inhanguljamo,                            257
+inethiopic,                              258
+inethiopicsupplement,                    259
+incherokee,                              260
+inunifiedcanadianaboriginalsyllabics,    261
+inogham,                                 262
+inrunic,                                 263
+intagalog,                               264
+inhanunoo,                               265
+inbuhid,                                 266
+intagbanwa,                              267
+inkhmer,                                 268
+inmongolian,                             269
+inunifiedcanadianaboriginalsyllabicsextended, 270
+inlimbu,                                 271
+intaile,                                 272
+innewtailue,                             273
+inkhmersymbols,                          274
+inbuginese,                              275
+intaitham,                               276
+inbalinese,                              277
+insundanese,                             278
+inbatak,                                 279
+inlepcha,                                280
+inolchiki,                               281
+insundanesesupplement,                   282
+invedicextensions,                       283
+inphoneticextensions,                    284
+inphoneticextensionssupplement,          285
+incombiningdiacriticalmarkssupplement,   286
+inlatinextendedadditional,               287
+ingreekextended,                         288
+ingeneralpunctuation,                    289
+insuperscriptsandsubscripts,             290
+incurrencysymbols,                       291
+incombiningdiacriticalmarksforsymbols,   292
+inletterlikesymbols,                     293
+innumberforms,                           294
+inarrows,                                295
+inmathematicaloperators,                 296
+inmiscellaneoustechnical,                297
+incontrolpictures,                       298
+inopticalcharacterrecognition,           299
+inenclosedalphanumerics,                 300
+inboxdrawing,                            301
+inblockelements,                         302
+ingeometricshapes,                       303
+inmiscellaneoussymbols,                  304
+indingbats,                              305
+inmiscellaneousmathematicalsymbolsa,     306
+insupplementalarrowsa,                   307
+inbraillepatterns,                       308
+insupplementalarrowsb,                   309
+inmiscellaneousmathematicalsymbolsb,     310
+insupplementalmathematicaloperators,     311
+inmiscellaneoussymbolsandarrows,         312
+inglagolitic,                            313
+inlatinextendedc,                        314
+incoptic,                                315
+ingeorgiansupplement,                    316
+intifinagh,                              317
+inethiopicextended,                      318
+incyrillicextendeda,                     319
+insupplementalpunctuation,               320
+incjkradicalssupplement,                 321
+inkangxiradicals,                        322
+inideographicdescriptioncharacters,      323
+incjksymbolsandpunctuation,              324
+inhiragana,                              325
+inkatakana,                              326
+inbopomofo,                              327
+inhangulcompatibilityjamo,               328
+inkanbun,                                329
+inbopomofoextended,                      330
+incjkstrokes,                            331
+inkatakanaphoneticextensions,            332
+inenclosedcjklettersandmonths,           333
+incjkcompatibility,                      334
+incjkunifiedideographsextensiona,        335
+inyijinghexagramsymbols,                 336
+incjkunifiedideographs,                  337
+inyisyllables,                           338
+inyiradicals,                            339
+inlisu,                                  340
+invai,                                   341
+incyrillicextendedb,                     342
+inbamum,                                 343
+inmodifiertoneletters,                   344
+inlatinextendedd,                        345
+insylotinagri,                           346
+incommonindicnumberforms,                347
+inphagspa,                               348
+insaurashtra,                            349
+indevanagariextended,                    350
+inkayahli,                               351
+inrejang,                                352
+inhanguljamoextendeda,                   353
+injavanese,                              354
+incham,                                  355
+inmyanmarextendeda,                      356
+intaiviet,                               357
+inmeeteimayekextensions,                 358
+inethiopicextendeda,                     359
+inmeeteimayek,                           360
+inhangulsyllables,                       361
+inhanguljamoextendedb,                   362
+inhighsurrogates,                        363
+inhighprivateusesurrogates,              364
+inlowsurrogates,                         365
+inprivateusearea,                        366
+incjkcompatibilityideographs,            367
+inalphabeticpresentationforms,           368
+inarabicpresentationformsa,              369
+invariationselectors,                    370
+inverticalforms,                         371
+incombininghalfmarks,                    372
+incjkcompatibilityforms,                 373
+insmallformvariants,                     374
+inarabicpresentationformsb,              375
+inhalfwidthandfullwidthforms,            376
+inspecials,                              377
+inlinearbsyllabary,                      378
+inlinearbideograms,                      379
+inaegeannumbers,                         380
+inancientgreeknumbers,                   381
+inancientsymbols,                        382
+inphaistosdisc,                          383
+inlycian,                                384
+incarian,                                385
+inolditalic,                             386
+ingothic,                                387
+inugaritic,                              388
+inoldpersian,                            389
+indeseret,                               390
+inshavian,                               391
+inosmanya,                               392
+incypriotsyllabary,                      393
+inimperialaramaic,                       394
+inphoenician,                            395
+inlydian,                                396
+inmeroitichieroglyphs,                   397
+inmeroiticcursive,                       398
+inkharoshthi,                            399
+inoldsoutharabian,                       400
+inavestan,                               401
+ininscriptionalparthian,                 402
+ininscriptionalpahlavi,                  403
+inoldturkic,                             404
+inruminumeralsymbols,                    405
+inbrahmi,                                406
+inkaithi,                                407
+insorasompeng,                           408
+inchakma,                                409
+insharada,                               410
+intakri,                                 411
+incuneiform,                             412
+incuneiformnumbersandpunctuation,        413
+inegyptianhieroglyphs,                   414
+inbamumsupplement,                       415
+inmiao,                                  416
+inkanasupplement,                        417
+inbyzantinemusicalsymbols,               418
+inmusicalsymbols,                        419
+inancientgreekmusicalnotation,           420
+intaixuanjingsymbols,                    421
+incountingrodnumerals,                   422
+inmathematicalalphanumericsymbols,       423
+inarabicmathematicalalphabeticsymbols,   424
+inmahjongtiles,                          425
+indominotiles,                           426
+inplayingcards,                          427
+inenclosedalphanumericsupplement,        428
+inenclosedideographicsupplement,         429
+inmiscellaneoussymbolsandpictographs,    430
+inemoticons,                             431
+intransportandmapsymbols,                432
+inalchemicalsymbols,                     433
+incjkunifiedideographsextensionb,        434
+incjkunifiedideographsextensionc,        435
+incjkunifiedideographsextensiond,        436
+incjkcompatibilityideographssupplement,  437
+intags,                                  438
+invariationselectorssupplement,          439
+insupplementaryprivateuseareaa,          440
+insupplementaryprivateuseareab,          441
+innoblock,                               442
+#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
index 08f9072c43..18d0685040 100644
--- a/enc/us_ascii.c
+++ b/enc/us_ascii.c
@@ -1,11 +1,4 @@
 #include "regenc.h"
-#ifdef RUBY
-# include "encindex.h"
-#endif
-
-#ifndef ENCINDEX_US_ASCII
-# define ENCINDEX_US_ASCII 0
-#endif
 
 static int
 us_ascii_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc)
@@ -32,8 +25,7 @@ OnigEncodingDefine(us_ascii, US_ASCII) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_single_byte_ascii_only_case_map,
-  ENCINDEX_US_ASCII,
+  0,
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ASCII", "US-ASCII")
diff --git a/enc/utf_16_32.h b/enc/utf_16_32.h
index 9f9216d8ff..da58d1b23c 100644
--- a/enc/utf_16_32.h
+++ b/enc/utf_16_32.h
@@ -1,5 +1,5 @@
 #include "regenc.h"
-/* dummy for unsupported, stateful encoding */
+/* dummy for unsupported, statefull encoding */
 #define ENC_DUMMY_UNICODE(name) ENC_REPLICATE(name, name "BE")
 ENC_DUMMY_UNICODE("UTF-16");
 ENC_DUMMY_UNICODE("UTF-32");
diff --git a/enc/utf_16be.c b/enc/utf_16be.c
index f9dd7119d6..a61ae00863 100644
--- a/enc/utf_16be.c
+++ b/enc/utf_16be.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #if 0
 static const int EncLen_UTF16[] = {
@@ -184,7 +183,7 @@ utf16be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e
     int c, v;
 
     p++;
-    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -249,7 +248,6 @@ OnigEncodingDefine(utf_16be, UTF_16BE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf16be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
 };
diff --git a/enc/utf_16le.c b/enc/utf_16le.c
index 2c8438d0be..7d176e710e 100644
--- a/enc/utf_16le.c
+++ b/enc/utf_16le.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 #if 0
 static const int EncLen_UTF16[] = {
@@ -178,7 +177,7 @@ utf16le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp,
   if (*(p+1) == 0) {
     int c, v;
 
-    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -242,7 +241,6 @@ OnigEncodingDefine(utf_16le, UTF_16LE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf16le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
 };
diff --git a/enc/utf_32be.c b/enc/utf_32be.c
index 995c9d8ed5..43c07e2e8f 100644
--- a/enc/utf_32be.c
+++ b/enc/utf_32be.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 static int
 utf32be_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
@@ -127,7 +126,7 @@ utf32be_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e
     int c, v;
 
     p += 3;
-    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -187,8 +186,8 @@ OnigEncodingDefine(utf_32be, UTF_32BE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf32be_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
 };
 ENC_ALIAS("UCS-4BE", "UTF-32BE")
+
diff --git a/enc/utf_32le.c b/enc/utf_32le.c
index e255f0e246..31693eed05 100644
--- a/enc/utf_32le.c
+++ b/enc/utf_32le.c
@@ -28,7 +28,6 @@
  */
 
 #include "regenc.h"
-#include "iso_8859.h"
 
 static int
 utf32le_mbc_enc_len(const UChar* p ARG_UNUSED, const OnigUChar* e ARG_UNUSED,
@@ -127,7 +126,7 @@ utf32le_is_mbc_ambiguous(OnigCaseFoldType flag, const UChar** pp, const UChar* e
   if (*(p+1) == 0 && *(p+2) == 0 && *(p+3) == 0) {
     int c, v;
 
-    if (*p == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
+    if (*p == 0xdf && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
       return TRUE;
     }
 
@@ -187,7 +186,6 @@ OnigEncodingDefine(utf_32le, UTF_32LE) = {
   onigenc_utf16_32_get_ctype_code_range,
   utf32le_left_adjust_char_head,
   onigenc_always_false_is_allowed_reverse_match,
-  onigenc_unicode_case_map,
   0,
   ONIGENC_FLAG_UNICODE,
 };
diff --git a/enc/utf_7.h b/enc/utf_7.h
index 823b317740..fa9f06b1b3 100644
--- a/enc/utf_7.h
+++ b/enc/utf_7.h
@@ -1,5 +1,5 @@
 #include "regenc.h"
-/* dummy for unsupported, stateful encoding */
+/* 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
index 3dad2f729b..b8f38e9d58 100644
--- a/enc/utf_8.c
+++ b/enc/utf_8.c
@@ -28,22 +28,15 @@
  */
 
 #include "regenc.h"
-#ifdef RUBY
-# include "encindex.h"
-#endif
-
-#ifndef ENCINDEX_UTF_8
-# define ENCINDEX_UTF_8 0
-#endif
 
 #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 INVALID_CODE_FE   0xfffffffe
+#define INVALID_CODE_FF   0xffffffff
+#define VALID_CODE_LIMIT  0x7fffffff
 #endif
-#define VALID_CODE_LIMIT  0x0010ffff
 
 #define utf8_islead(c)     ((UChar )((c) & 0xc0) != 0x80)
 
@@ -304,7 +297,9 @@ 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 <= VALID_CODE_LIMIT) return 4;
+  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;
@@ -333,11 +328,24 @@ code_to_mbc(OnigCodePoint code, UChar *buf, OnigEncoding enc ARG_UNUSED)
       *p++ = (UChar )(((code>>12) & 0x0f) | 0xe0);
       *p++ = UTF8_TRAILS(code, 6);
     }
-    else if (code <= VALID_CODE_LIMIT) {
+    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;
@@ -431,8 +439,7 @@ OnigEncodingDefine(utf_8, UTF_8) = {
   get_ctype_code_range,
   left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  onigenc_unicode_case_map,
-  ENCINDEX_UTF_8,
+  0,
   ONIGENC_FLAG_UNICODE,
 };
 ENC_ALIAS("CP65001", "UTF-8")
@@ -447,3 +454,4 @@ ENC_ALIAS("CP65001", "UTF-8")
 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_1250.c b/enc/windows_1250.c
deleted file mode 100644
index d2cf7b16bc..0000000000
--- a/enc/windows_1250.c
+++ /dev/null
@@ -1,271 +0,0 @@
-/**********************************************************************
-  windows_1250.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"
-#include "iso_8859.h"
-
-#define ENC_CP1250_TO_LOWER_CASE(c) EncCP1250_ToLowerCaseTable[c]
-#define ENC_IS_CP1250_CTYPE(code,ctype) \
-  ((EncCP1250_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1250_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', '\232', '\213', '\234', '\235', '\236', '\237',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237',
-  '\240', '\241', '\242', '\263', '\244', '\271', '\246', '\247',
-  '\250', '\251', '\272', '\253', '\254', '\255', '\256', '\277',
-  '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267',
-  '\270', '\271', '\272', '\273', '\276', '\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 EncCP1250_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, 0x0000, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,/* 8 */
-  0x0008, 0x0008, 0x34a2, 0x0008, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x0000, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,/* 9 */
-  0x0008, 0x0008, 0x30e2, 0x0008, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x0284, 0x01a0, 0x00a0, 0x34a2, 0x00a0, 0x34a2, 0x00a0, 0x00a0,/* A */
-  0x00a0, 0x00a0, 0x34a2, 0x01a0, 0x00a0, 0x01a0, 0x00a0, 0x34a2,
-  0x00a0, 0x00a0, 0x10a0, 0x30e2, 0x00a0, 0x30e2, 0x00a0, 0x01a0,/* B */
-  0x00a0, 0x30e2, 0x30e2, 0x01a0, 0x34a2, 0x10a0, 0x30e2, 0x30e2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,/* C */
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2,
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x00a0,/* D */
-  0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x34a2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,/* E */
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2,
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,/* F */
-  0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x00a0,
-};
-
-static int
-cp1250_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_CP1250_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-
-static int
-cp1250_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_CP1250_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0x8a, 0x9a },
-  { 0x8c, 0x9c },
-  { 0x8d, 0x9d },
-  { 0x8e, 0x9e },
-  { 0x8f, 0x9f },
-
-  { 0xa3, 0xb3 },
-  { 0xa5, 0xb9 },
-  { 0xaa, 0xba },
-  { 0xaf, 0xbf },
-
-  { 0xbc, 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
-cp1250_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
-cp1250_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
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncCP1250_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_CP1250_TO_LOWER_CASE(code);
-    }
-    else if (code == 0xB5)
-      ;
-    else if ((EncCP1250_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xB9)
-	code = 0xA5;
-      else if (code == 0xBE)
-	code = 0xBC;
-      else if (code >= 0x8A && code <= 0xBF && code!=0xB9)
-	code -= 0x10;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
-OnigEncodingDefine(windows_1250, Windows_1250) = {
-  onigenc_single_byte_mbc_enc_len,
-  "Windows-1250",      /* 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,
-  cp1250_mbc_case_fold,
-  cp1250_apply_all_case_fold,
-  cp1250_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  cp1250_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match,
-  case_map,
-  0,
-  ONIGENC_FLAG_NONE,
-};
-/*
- * Name: windows-1250
- * MIBenum: 2251
- * 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_ALIAS("CP1250", "Windows-1250")
diff --git a/enc/windows_1251.c b/enc/windows_1251.c
index fcd0f1015d..191d631b88 100644
--- a/enc/windows_1251.c
+++ b/enc/windows_1251.c
@@ -1,5 +1,5 @@
 /**********************************************************************
-  windows_1251.c -  Oniguruma (regular expression library)
+  cp1251.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
  * Copyright (c) 2006-2007  Byte      <byte AT mail DOT kna DOT ru>
@@ -180,51 +180,9 @@ cp1251_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 	     flag, p, end, items);
 }
 
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if ((EncCP1251_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_CP1251_TO_LOWER_CASE(code);
-    }
-    else if (code == 0xB5)
-      ;
-    else if ((EncCP1251_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if ((0x61 <= code && code <= 0x7A) || (0xE0 <= code && code <= 0xFF))
-	code -= 0x20;
-      else if (code == 0xA2 || code == 0xB3 || code == 0xBE)
-	code -= 0x01;
-      else if (code == 0x83)
-	code = 0x81;
-      else if (code == 0xBC)
-	code = 0xA3;
-      else if (code == 0xB4)
-	code = 0xA5;
-      else
-	code -= 0x10;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
 OnigEncodingDefine(windows_1251, Windows_1251) = {
   onigenc_single_byte_mbc_enc_len,
-  "Windows-1251",/* name */
+  "Windows-1251",      /* name */
   1,             /* max enc length */
   1,             /* min enc length */
   onigenc_is_mbc_newline_0x0a,
@@ -239,7 +197,6 @@ OnigEncodingDefine(windows_1251, Windows_1251) = {
   onigenc_not_support_get_ctype_code_range,
   onigenc_single_byte_left_adjust_char_head,
   onigenc_always_true_is_allowed_reverse_match,
-  case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/windows_1252.c b/enc/windows_1252.c
deleted file mode 100644
index 5f90c15601..0000000000
--- a/enc/windows_1252.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/**********************************************************************
-  windows_1252.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"
-#include "iso_8859.h"
-
-#define ENC_CP1252_TO_LOWER_CASE(c) EncCP1252_ToLowerCaseTable[c]
-#define ENC_IS_CP1252_CTYPE(code,ctype) \
-  ((EncCP1252_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1252_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', '\232', '\213', '\234', '\215', '\236', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\377',
-  '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247',
-  '\250', '\251', '\252', '\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', '\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 EncCP1252_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, 0x0000, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x34a2, 0x0008, 0x34a2, 0x0000, 0x34a2, 0x0000,
-  0x0000, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x30e2, 0x0008, 0x30e2, 0x0000, 0x30e2, 0x34a2,
-  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
-cp1252_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_CP1252_TO_LOWER_CASE(*p);
-  (*pp)++;
-  return 1;
-}
-static int
-cp1252_is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSED)
-{
-  if (code < 256)
-    return ENC_IS_CP1252_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
-  { 0x8a, 0x9a },
-  { 0x8c, 0x9c },
-  { 0x8e, 0x9e },
-  { 0x9f, 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
-cp1252_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
-cp1252_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
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncCP1252_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_CP1252_TO_LOWER_CASE(code);
-    }
-    else if (code == 0x83 || code == 0xAA || code == 0xBA || code == 0xB5)
-      ;
-    else if ((EncCP1252_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0x9A || code == 0x9C || code == 0x9E)
-	code -= 0x10;
-      else if (code == 0xFF)
-	code -= 0x60;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
-OnigEncodingDefine(windows_1252, Windows_1252) = {
-  onigenc_single_byte_mbc_enc_len,
-  "Windows-1252",      /* 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,
-  cp1252_mbc_case_fold,
-  cp1252_apply_all_case_fold,
-  cp1252_get_case_fold_codes_by_str,
-  onigenc_minimum_property_name_to_ctype,
-  cp1252_is_code_ctype,
-  onigenc_not_support_get_ctype_code_range,
-  onigenc_single_byte_left_adjust_char_head,
-  onigenc_always_true_is_allowed_reverse_match,
-  case_map,
-  0,
-  ONIGENC_FLAG_NONE,
-};
-/*
- * Name: windows-1252
- * MIBenum: 2251
- * 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_ALIAS("CP1252", "Windows-1252")
diff --git a/enc/windows_1253.c b/enc/windows_1253.c
deleted file mode 100644
index 9e9c63a581..0000000000
--- a/enc/windows_1253.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/**********************************************************************
-  windows_1253.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.
- */
-
-/*
- * 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
- */
-
-#include "regenc.h"
-
-#define ENC_CP1253_TO_LOWER_CASE(c) EncCP1253_ToLowerCaseTable[c]
-#define ENC_IS_CP1253_CTYPE(code,ctype) \
-  ((EncCP1253_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1253_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', '\334', '\243', '\244', '\245', '\246', '\247',
-  '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257',
-  '\260', '\261', '\262', '\263', '\264', '\354', '\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 EncCP1253_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, 0x34a2, 0x00a0, 0x0000, 0x0000, 0x00a0, 0x00a0,
-  0x00a0, 0x00a0, 0x0000, 0x01a0, 0x00a0, 0x01a0, 0x0000, 0x01a0,
-  0x00a0, 0x00a0, 0x10a0, 0x10a0, 0x00a0, 0x30e2, 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_CP1253_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 = (EncCP1253_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_CP1253_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(
-	     numberof(CaseFoldMap), 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(
-	     numberof(CaseFoldMap), CaseFoldMap, 0,
-	     flag, p, end, items);
-}
-
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == 0xF2) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code = 0xD3;
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code = 0xF3;
-      }
-    }
-    else if (code == 0xB5) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code = 0xCC;
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	code = 0xEC;
-      }
-    }
-    else if (code == 0xC0 || code == 0xE0 || code == 0xB6)
-      ;
-    else if ((EncCP1253_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      code = ENC_CP1253_TO_LOWER_CASE(code);
-    }
-    else if ((EncCP1253_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 0xDC)
-	code = 0xA2;
-      else if (code >= 0xDD && code <= 0xDF)
-	code -= 0x25;
-      else if (code == 0xFC)
-	code = 0xBC;
-      else if (code == 0xFD || code == 0xFE)
-	code -= 0x3F;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
-OnigEncodingDefine(windows_1253, Windows_1253) = {
-  onigenc_single_byte_mbc_enc_len,
-  "Windows-1253",  /* 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,
-  case_map,
-  0,
-  ONIGENC_FLAG_NONE,
-};
-ENC_ALIAS("CP1253", "Windows-1253")
diff --git a/enc/windows_1254.c b/enc/windows_1254.c
deleted file mode 100644
index 9ae66978a2..0000000000
--- a/enc/windows_1254.c
+++ /dev/null
@@ -1,302 +0,0 @@
-/**********************************************************************
-  windows_1254.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.
- */
-
-/*
- * 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
- */
-
-#include "regenc.h"
-#include "iso_8859.h"
-
-#define ENC_CP1254_TO_LOWER_CASE(c) EncCP1254_ToLowerCaseTable[c]
-#define ENC_IS_CP1254_CTYPE(code,ctype) \
-  ((EncCP1254_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1254_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', '\232', '\213', '\234', '\215', '\216', '\217',
-  '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227',
-  '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\377',
-  '\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', '\151', '\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 EncCP1254_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, 0x34a2, 0x0008, 0x34a2, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008, 0x0008,
-  0x0008, 0x0008, 0x30e2, 0x0008, 0x30e2, 0x0008, 0x0008, 0x34a2,
-  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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_CP1254_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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncCP1254_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_CP1254_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(
-             numberof(CaseFoldMap), 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(
-	     numberof(CaseFoldMap), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-#define DOTLESS_i        (0xFD)
-#define I_WITH_DOT_ABOVE (0xDD)
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if ((EncCP1254_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
-      else
-        code = ENC_CP1254_TO_LOWER_CASE(code);
-    }
-    else if (code == 0x83 || code == 0xAA || code == 0xBA || code == 0xB5)
-      ;
-    else if ((EncCP1254_CtypeTable[code] & BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'i')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
-      else if (code == DOTLESS_i)
-	code = 'I';
-      else if (code == 0x9A || code == 0x9C || code == 0x9E)
-	code -= 0x10;
-      else if (code == 0xFF)
-	code -= 0x60;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
-OnigEncodingDefine(windows_1254, Windows_1254) = {
-  onigenc_single_byte_mbc_enc_len,
-  "Windows-1254",  /* 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,
-  case_map,
-  0,
-  ONIGENC_FLAG_NONE,
-};
-ENC_ALIAS("CP1254", "Windows-1254")
diff --git a/enc/windows_1257.c b/enc/windows_1257.c
deleted file mode 100644
index 936a94ac76..0000000000
--- a/enc/windows_1257.c
+++ /dev/null
@@ -1,304 +0,0 @@
-/**********************************************************************
-  windows_1257.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"
-#include "iso_8859.h"
-
-/*
- * 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
- */
-
-#define ENC_CP1252_TO_LOWER_CASE(c) EncCP1252_ToLowerCaseTable[c]
-#define ENC_IS_CP1252_CTYPE(code,ctype) \
-  ((EncCP1252_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
-
-static const UChar EncCP1252_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 EncCP1252_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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    *lower++ = 's';
-    *lower   = 's';
-    (*pp)++;
-    return 2;
-  }
-
-  *lower = ENC_CP1252_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 == SHARP_s && (flag & INTERNAL_ONIGENC_CASE_FOLD_MULTI_CHAR) != 0) {
-    (*pp)++;
-    return TRUE;
-  }
-
-  (*pp)++;
-  v = (EncCP1252_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_CP1252_CTYPE(code, ctype);
-  else
-    return FALSE;
-}
-
-static const OnigPairCaseFoldCodes CaseFoldMap[] = {
- { 0xa8, 0xb8 },
- { 0xaa, 0xba },
- { 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(
-             numberof(CaseFoldMap), 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(
-	     numberof(CaseFoldMap), CaseFoldMap, 1,
-	     flag, p, end, items);
-}
-
-#define DOTLESS_i        (0xB9)
-#define I_WITH_DOT_ABOVE (0xA9)
-static int
-case_map(OnigCaseFoldType* flagP, const OnigUChar** pp,
-	 const OnigUChar* end, OnigUChar* to, OnigUChar* to_end,
-	 const struct OnigEncodingTypeST* enc)
-{
-  OnigCodePoint code;
-  OnigUChar *to_start = to;
-  OnigCaseFoldType flags = *flagP;
-
-  while (*pp < end && to < to_end) {
-    code = *(*pp)++;
-    if (code == SHARP_s) {
-      if (flags & ONIGENC_CASE_UPCASE) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 'S';
-	code = (flags & ONIGENC_CASE_TITLECASE) ? 's' : 'S';
-      }
-      else if (flags & ONIGENC_CASE_FOLD) {
-	flags |= ONIGENC_CASE_MODIFIED;
-	*to++ = 's';
-	code = 's';
-      }
-    }
-    else if (code == 0xB5)
-      ;
-    else if ((EncCP1252_CtypeTable[code] & BIT_CTYPE_UPPER)
-	     && (flags & (ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_FOLD))) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'I')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? DOTLESS_i : 'i';
-      else
-	code = ENC_CP1252_TO_LOWER_CASE(code);
-    }
-    else if ((EncCP1252_CtypeTable[code]&BIT_CTYPE_LOWER)
-	     && (flags & ONIGENC_CASE_UPCASE)) {
-      flags |= ONIGENC_CASE_MODIFIED;
-      if (code == 'i')
-	code = flags & ONIGENC_CASE_FOLD_TURKISH_AZERI ? I_WITH_DOT_ABOVE : 'I';
-      else if (code == DOTLESS_i)
-	code = 'I';
-      else if (code >= 0xB0 && code <= 0xBF)
-	code -= 0x10;
-      else
-	code -= 0x20;
-    }
-    *to++ = code;
-    if (flags & ONIGENC_CASE_TITLECASE)  /* switch from titlecase to lowercase for capitalize */
-      flags ^= (ONIGENC_CASE_UPCASE | ONIGENC_CASE_DOWNCASE | ONIGENC_CASE_TITLECASE);
-  }
-  *flagP = flags;
-  return (int )(to - to_start);
-}
-
-OnigEncodingDefine(windows_1257, Windows_1257) = {
-  onigenc_single_byte_mbc_enc_len,
-  "Windows-1257",  /* 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,
-  case_map,
-  0,
-  ONIGENC_FLAG_NONE,
-};
-ENC_ALIAS("CP1257", "Windows-1257")
diff --git a/enc/windows_31j.c b/enc/windows_31j.c
index 174f8983c4..c4193819d4 100644
--- a/enc/windows_31j.c
+++ b/enc/windows_31j.c
@@ -33,7 +33,7 @@
 
 OnigEncodingDefine(windows_31j, Windows_31J) = {
   mbc_enc_len,
-  "Windows-31J", /* name */
+  "Windows-31J",   /* name */
   2,             /* max byte length */
   1,             /* min byte length */
   onigenc_is_mbc_newline_0x0a,
@@ -48,7 +48,6 @@ OnigEncodingDefine(windows_31j, Windows_31J) = {
   get_ctype_code_range,
   left_adjust_char_head,
   is_allowed_reverse_match,
-  onigenc_ascii_only_case_map,
   0,
   ONIGENC_FLAG_NONE,
 };
diff --git a/enc/x_emoji.h b/enc/x_emoji.h
index 23efa1dd9e..92c9bccafd 100644
--- a/enc/x_emoji.h
+++ b/enc/x_emoji.h
@@ -2,8 +2,8 @@
 
 /*
  * Name: UTF8-DoCoMo, SJIS-DoCoMo
- * Link: https://www.nttdocomo.co.jp/english/service/developer/make/content/pictograph/basic/index.html
- * Link: https://www.nttdocomo.co.jp/english/service/developer/make/content/pictograph/extention/index.html
+ * 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")
diff --git a/encindex.h b/encindex.h
deleted file mode 100644
index dcb1646f3a..0000000000
--- a/encindex.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**********************************************************************
-
-  encindex.h -
-
-  $Author$
-  created at: Tue Sep 15 13:21:14 JST 2015
-
-  Copyright (C) 2015 Yukihiro Matsumoto
-
-**********************************************************************/
-
-#ifndef RUBY_ENCINDEX_H
-#define RUBY_ENCINDEX_H 1
-#if defined(__cplusplus)
-extern "C" {
-#if 0
-} /* satisfy cc-mode */
-#endif
-#endif
-
-enum ruby_preserved_encindex {
-    RUBY_ENCINDEX_ASCII,
-    RUBY_ENCINDEX_UTF_8,
-    RUBY_ENCINDEX_US_ASCII,
-
-    /* preserved indexes */
-    RUBY_ENCINDEX_UTF_16BE,
-    RUBY_ENCINDEX_UTF_16LE,
-    RUBY_ENCINDEX_UTF_32BE,
-    RUBY_ENCINDEX_UTF_32LE,
-    RUBY_ENCINDEX_UTF_16,
-    RUBY_ENCINDEX_UTF_32,
-    RUBY_ENCINDEX_UTF8_MAC,
-
-    /* for old options of regexp */
-    RUBY_ENCINDEX_EUC_JP,
-    RUBY_ENCINDEX_Windows_31J,
-
-    RUBY_ENCINDEX_BUILTIN_MAX
-};
-
-#define ENCINDEX_ASCII       RUBY_ENCINDEX_ASCII
-#define ENCINDEX_UTF_8       RUBY_ENCINDEX_UTF_8
-#define ENCINDEX_US_ASCII    RUBY_ENCINDEX_US_ASCII
-#define ENCINDEX_UTF_16BE    RUBY_ENCINDEX_UTF_16BE
-#define ENCINDEX_UTF_16LE    RUBY_ENCINDEX_UTF_16LE
-#define ENCINDEX_UTF_32BE    RUBY_ENCINDEX_UTF_32BE
-#define ENCINDEX_UTF_32LE    RUBY_ENCINDEX_UTF_32LE
-#define ENCINDEX_UTF_16      RUBY_ENCINDEX_UTF_16
-#define ENCINDEX_UTF_32      RUBY_ENCINDEX_UTF_32
-#define ENCINDEX_UTF8_MAC    RUBY_ENCINDEX_UTF8_MAC
-#define ENCINDEX_EUC_JP      RUBY_ENCINDEX_EUC_JP
-#define ENCINDEX_Windows_31J RUBY_ENCINDEX_Windows_31J
-#define ENCINDEX_BUILTIN_MAX RUBY_ENCINDEX_BUILTIN_MAX
-
-#define rb_ascii8bit_encindex() RUBY_ENCINDEX_ASCII
-#define rb_utf8_encindex()      RUBY_ENCINDEX_UTF_8
-#define rb_usascii_encindex()   RUBY_ENCINDEX_US_ASCII
-
-#if defined(__cplusplus)
-#if 0
-{ /* satisfy cc-mode */
-#endif
-}  /* extern "C" { */
-#endif
-
-#endif /* RUBY_ENCINDEX_H */
diff --git a/encoding.c b/encoding.c
index 68871db268..e3a0978253 100644
--- a/encoding.c
+++ b/encoding.c
@@ -9,19 +9,13 @@
 
 **********************************************************************/
 
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
 #include "internal.h"
-#include "encindex.h"
 #include "regenc.h"
 #include <ctype.h>
 #include "ruby/util.h"
 
-#include "ruby_assert.h"
-#ifndef ENC_DEBUG
-#define ENC_DEBUG 0
-#endif
-#define ENC_ASSERT (!ENC_DEBUG)?(void)0:assert
-#define MUST_STRING(str) (ENC_ASSERT(RB_TYPE_P(str, T_STRING)), str)
-
 #undef rb_ascii8bit_encindex
 #undef rb_utf8_encindex
 #undef rb_usascii_encindex
@@ -77,21 +71,21 @@ void rb_enc_init(void);
 
 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, 0,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    {0, 0, enc_memsize,},
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
 #define is_obj_encoding(obj) (RB_TYPE_P((obj), T_DATA) && is_data_encoding(obj))
 
-int
-rb_data_is_encoding(VALUE obj)
-{
-    return is_data_encoding(obj);
-}
-
 static VALUE
 enc_new(rb_encoding *encoding)
 {
@@ -519,7 +513,7 @@ enc_ascii_compatible_p(VALUE enc)
 }
 
 /*
- * Returns non-zero when the encoding is Unicode series other than UTF-7 else 0.
+ * Returns 1 when the encoding is Unicode series other than UTF-7 else 0.
  */
 int
 rb_enc_unicode_p(rb_encoding *enc)
@@ -585,6 +579,9 @@ rb_encdb_set_unicode(int index)
     ((rb_raw_encoding *)rb_enc_from_index(index))->flags |= ONIGENC_FLAG_UNICODE;
 }
 
+extern rb_encoding OnigEncodingUTF_8;
+extern rb_encoding OnigEncodingUS_ASCII;
+
 void
 rb_enc_init(void)
 {
@@ -643,6 +640,13 @@ rb_enc_registered(const char *name)
     return -1;
 }
 
+static VALUE
+require_enc(VALUE enclib)
+{
+    int safe = rb_safe_level();
+    return rb_require_safe(enclib, safe > 3 ? 3 : safe);
+}
+
 static int
 load_encoding(const char *name)
 {
@@ -650,8 +654,8 @@ load_encoding(const char *name)
     VALUE verbose = ruby_verbose;
     VALUE debug = ruby_debug;
     VALUE errinfo;
+    VALUE loaded;
     char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
-    int loaded;
     int idx;
 
     while (s < e) {
@@ -664,11 +668,11 @@ load_encoding(const char *name)
     ruby_verbose = Qfalse;
     ruby_debug = Qfalse;
     errinfo = rb_errinfo();
-    loaded = rb_require_internal(enclib, rb_safe_level());
+    loaded = rb_protect(require_enc, enclib, 0);
     ruby_verbose = verbose;
     ruby_debug = debug;
     rb_set_errinfo(errinfo);
-    if (loaded < 0 || 1 < loaded) return -1;
+    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;
@@ -691,7 +695,6 @@ enc_autoload(rb_encoding *enc)
 	i = enc->ruby_encoding_index;
 	enc_register_at(i & ENC_INDEX_MASK, rb_enc_name(enc), base);
 	((rb_raw_encoding *)enc)->ruby_encoding_index = i;
-	i &= ENC_INDEX_MASK;
     }
     else {
 	i = load_encoding(rb_enc_name(enc));
@@ -756,19 +759,6 @@ rb_id_encoding(void)
     return id_encoding;
 }
 
-static int
-enc_get_index_str(VALUE str)
-{
-    int i = ENCODING_GET_INLINED(str);
-    if (i == ENCODING_INLINE_MAX) {
-	VALUE iv;
-
-	iv = rb_ivar_get(str, rb_id_encoding());
-	i = NUM2INT(iv);
-    }
-    return i;
-}
-
 int
 rb_enc_get_index(VALUE obj)
 {
@@ -784,11 +774,17 @@ rb_enc_get_index(VALUE obj)
       default:
       case T_STRING:
       case T_REGEXP:
-	i = enc_get_index_str(obj);
+	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_funcallv(obj, rb_intern("internal_encoding"), 0, 0);
-	if (NIL_P(tmp)) obj = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0);
+	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:
@@ -843,8 +839,8 @@ rb_enc_associate_index(VALUE obj, int idx)
     }
     termlen = rb_enc_mbminlen(enc);
     oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx));
-    if (oldtermlen != termlen && RB_TYPE_P(obj, T_STRING)) {
-	rb_str_change_terminator_length(obj, oldtermlen, termlen);
+    if (oldtermlen < termlen && RB_TYPE_P(obj, T_STRING)) {
+	rb_str_fill_terminator(obj, termlen);
     }
     enc_set_index(obj, idx);
     return obj;
@@ -862,19 +858,6 @@ rb_enc_get(VALUE obj)
     return rb_enc_from_index(rb_enc_get_index(obj));
 }
 
-static rb_encoding* enc_compatible_str(VALUE str1, VALUE str2);
-
-rb_encoding*
-rb_enc_check_str(VALUE str1, VALUE str2)
-{
-    rb_encoding *enc = enc_compatible_str(MUST_STRING(str1), MUST_STRING(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_check(VALUE str1, VALUE str2)
 {
@@ -886,12 +869,24 @@ rb_enc_check(VALUE str1, VALUE str2)
     return enc;
 }
 
-static rb_encoding*
-enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
+rb_encoding*
+rb_enc_compatible(VALUE str1, VALUE str2)
 {
+    int idx1, idx2;
+    rb_encoding *enc1, *enc2;
     int isstr1, isstr2;
-    rb_encoding *enc1 = rb_enc_from_index(idx1);
-    rb_encoding *enc2 = rb_enc_from_index(idx2);
+
+    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);
 
     isstr2 = RB_TYPE_P(str2, T_STRING);
     if (isstr2 && RSTRING_LEN(str2) == 0)
@@ -941,39 +936,6 @@ enc_compatible_latter(VALUE str1, VALUE str2, int idx1, int idx2)
     return 0;
 }
 
-static rb_encoding*
-enc_compatible_str(VALUE str1, VALUE str2)
-{
-    int idx1 = enc_get_index_str(str1);
-    int idx2 = enc_get_index_str(str2);
-
-    if (idx1 < 0 || idx2 < 0)
-        return 0;
-
-    if (idx1 == idx2) {
-	return rb_enc_from_index(idx1);
-    }
-    else {
-	return enc_compatible_latter(str1, str2, idx1, idx2);
-    }
-}
-
-rb_encoding*
-rb_enc_compatible(VALUE str1, VALUE str2)
-{
-    int idx1 = rb_enc_get_index(str1);
-    int idx2 = rb_enc_get_index(str2);
-
-    if (idx1 < 0 || idx2 < 0)
-        return 0;
-
-    if (idx1 == idx2) {
-	return rb_enc_from_index(idx1);
-    }
-
-    return enc_compatible_latter(str1, str2, idx1, idx2);
-}
-
 void
 rb_enc_copy(VALUE obj1, VALUE obj2)
 {
@@ -1031,8 +993,7 @@ rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc)
 int
 rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc)
 {
-    unsigned int c;
-    int l;
+    unsigned int c, l;
     if (e <= p)
         return -1;
     if (rb_enc_asciicompat(enc)) {
@@ -1141,7 +1102,7 @@ enc_inspect(VALUE self)
 static VALUE
 enc_name(VALUE self)
 {
-    return rb_fstring_cstr(rb_enc_name((rb_encoding*)DATA_PTR(self)));
+    return rb_usascii_str_new2(rb_enc_name((rb_encoding*)DATA_PTR(self)));
 }
 
 static int
@@ -1273,17 +1234,9 @@ enc_compatible_p(VALUE klass, VALUE str1, VALUE str2)
 
 /* :nodoc: */
 static VALUE
-enc_s_alloc(VALUE klass)
-{
-    rb_undefined_alloc(klass);
-    return Qnil;
-}
-
-/* :nodoc: */
-static VALUE
 enc_dump(int argc, VALUE *argv, VALUE self)
 {
-    rb_check_arity(argc, 0, 1);
+    rb_scan_args(argc, argv, "01", 0);
     return enc_name(self);
 }
 
@@ -1291,13 +1244,6 @@ enc_dump(int argc, VALUE *argv, VALUE self)
 static VALUE
 enc_load(VALUE klass, VALUE str)
 {
-    return str;
-}
-
-/* :nodoc: */
-static VALUE
-enc_m_loader(VALUE klass, VALUE str)
-{
     return enc_find(klass, str);
 }
 
@@ -1346,14 +1292,16 @@ rb_usascii_encindex(void)
     return ENCINDEX_US_ASCII;
 }
 
-int rb_locale_charmap_index(void);
-
 int
 rb_locale_encindex(void)
 {
-    int idx = rb_locale_charmap_index();
+    VALUE charmap = rb_locale_charmap(rb_cEncoding);
+    int idx;
 
-    if (idx < 0) idx = ENCINDEX_ASCII;
+    if (NIL_P(charmap))
+        idx = ENCINDEX_US_ASCII;
+    else if ((idx = rb_enc_find_index(StringValueCStr(charmap))) < 0)
+        idx = ENCINDEX_ASCII;
 
     if (rb_enc_registered("locale") < 0) {
 # if defined _WIN32
@@ -1394,6 +1342,8 @@ struct default_encoding {
 
 static struct default_encoding default_external = {0};
 
+extern int Init_enc_set_filesystem_encoding(void);
+
 static int
 enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const char *name)
 {
@@ -1585,6 +1535,34 @@ set_default_internal(VALUE klass, VALUE encoding)
     return encoding;
 }
 
+/*
+ * call-seq:
+ *   Encoding.locale_charmap -> string
+ *
+ * Returns the locale charmap name.
+ * It returns nil if no appropriate information.
+ *
+ *   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);
+
 static void
 set_encoding_const(const char *name, rb_encoding *enc)
 {
@@ -1640,7 +1618,8 @@ 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_fstring_cstr((char *)name);
+    VALUE str = rb_usascii_str_new2((char *)name);
+    OBJ_FREEZE(str);
     rb_ary_push(ary, str);
     return ST_CONTINUE;
 }
@@ -1682,7 +1661,8 @@ rb_enc_aliases_enc_i(st_data_t name, st_data_t orig, st_data_t arg)
 	if (STRCASECMP((char*)name, rb_enc_name(enc)) == 0) {
 	    return ST_CONTINUE;
 	}
-	str = rb_fstring_cstr(rb_enc_name(enc));
+	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);
@@ -1719,7 +1699,7 @@ rb_enc_aliases(VALUE klass)
  * optionally, aliases:
  *
  *   Encoding::ISO_8859_1.name
- *   #=> "ISO-8859-1"
+ *   #=> #<Encoding:ISO-8859-1>
  *
  *   Encoding::ISO_8859_1.names
  *   #=> ["ISO-8859-1", "ISO8859-1"]
@@ -1922,7 +1902,7 @@ Init_Encoding(void)
     int i;
 
     rb_cEncoding = rb_define_class("Encoding", rb_cObject);
-    rb_define_alloc_func(rb_cEncoding, enc_s_alloc);
+    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);
@@ -1944,7 +1924,7 @@ Init_Encoding(void)
     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); /* in localeinit.c */
+    rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0);
 
     list = rb_ary_new2(enc_table.count);
     RBASIC_CLEAR_CLASS(list);
@@ -1954,12 +1934,38 @@ Init_Encoding(void)
     for (i = 0; i < enc_table.count; ++i) {
 	rb_ary_push(list, enc_new(enc_table.list[i].enc));
     }
-
-    rb_marshal_define_compat(rb_cEncoding, Qnil, NULL, enc_m_loader);
 }
 
 /* locale insensitive ctype 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;
+}
+
 void
 rb_enc_foreach_name(int (*func)(st_data_t name, st_data_t idx, st_data_t arg), st_data_t arg)
 {
diff --git a/enum.c b/enum.c
index 5a56dca5c1..7920b93c55 100644
--- a/enum.c
+++ b/enum.c
@@ -9,11 +9,13 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/util.h"
+#include "node.h"
 #include "id.h"
+#include "internal.h"
 
-#include <assert.h>
+VALUE rb_f_send(int argc, VALUE *argv, VALUE recv);
 
 VALUE rb_mEnumerable;
 
@@ -44,11 +46,11 @@ rb_enum_values_pack(int argc, const VALUE *argv)
 static VALUE
 grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcall(memo->v1, id_eqq, 1, i)) == RTEST(memo->u3.value)) {
-	rb_ary_push(memo->v2, i);
+    if (RTEST(rb_funcall(memo->u1.value, id_eqq, 1, i))) {
+	rb_ary_push(memo->u2.value, i);
     }
     return Qnil;
 }
@@ -56,11 +58,11 @@ grep_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 grep_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
     ENUM_WANT_SVALUE();
 
-    if (RTEST(rb_funcall(memo->v1, id_eqq, 1, i)) == RTEST(memo->u3.value)) {
-	rb_ary_push(memo->v2, rb_yield(i));
+    if (RTEST(rb_funcall(memo->u1.value, id_eqq, 1, i))) {
+	rb_ary_push(memo->u2.value, rb_yield(i));
     }
     return Qnil;
 }
@@ -87,33 +89,7 @@ static VALUE
 enum_grep(VALUE obj, VALUE pat)
 {
     VALUE ary = rb_ary_new();
-    struct MEMO *memo = MEMO_NEW(pat, ary, Qtrue);
-
-    rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
-
-    return ary;
-}
-
-/*
- *  call-seq:
- *     enum.grep_v(pattern)                  -> array
- *     enum.grep_v(pattern) { |obj| block }  -> array
- *
- *  Inverted version of Enumerable#grep.
- *  Returns an array of every element in <i>enum</i> for which
- *  not <code>Pattern === element</code>.
- *
- *     (1..10).grep_v 2..5   #=> [1, 6, 7, 8, 9, 10]
- *     res =(1..10).grep_v(2..5) { |v| v * 2 }
- *     res                    #=> [2, 12, 14, 16, 18, 20]
- *
- */
-
-static VALUE
-enum_grep_v(VALUE obj, VALUE pat)
-{
-    VALUE ary = rb_ary_new();
-    struct MEMO *memo = MEMO_NEW(pat, ary, Qfalse);
+    NODE *memo = NEW_MEMO(pat, ary, 0);
 
     rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)memo);
 
@@ -123,11 +99,11 @@ enum_grep_v(VALUE obj, VALUE pat)
 static VALUE
 count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    struct MEMO *memo = MEMO_CAST(memop);
+    NODE *memo = RNODE(memop);
 
     ENUM_WANT_SVALUE();
 
-    if (rb_equal(i, memo->v1)) {
+    if (rb_equal(i, memo->u1.value)) {
 	memo->u3.cnt++;
     }
     return Qnil;
@@ -136,7 +112,7 @@ count_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 static VALUE
 count_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    struct MEMO *memo = MEMO_CAST(memop);
+    NODE *memo = RNODE(memop);
 
     if (RTEST(enum_yield(argc, argv))) {
 	memo->u3.cnt++;
@@ -147,7 +123,7 @@ count_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 static VALUE
 count_all_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    struct MEMO *memo = MEMO_CAST(memop);
+    NODE *memo = RNODE(memop);
 
     memo->u3.cnt++;
     return Qnil;
@@ -175,7 +151,7 @@ static VALUE
 enum_count(int argc, VALUE *argv, VALUE obj)
 {
     VALUE item = Qnil;
-    struct MEMO *memo;
+    NODE *memo;
     rb_block_call_func *func;
 
     if (argc == 0) {
@@ -194,7 +170,7 @@ enum_count(int argc, VALUE *argv, VALUE obj)
         func = count_i;
     }
 
-    memo = MEMO_NEW(item, 0, 0);
+    memo = NEW_MEMO(item, 0, 0);
     rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
     return INT2NUM(memo->u3.cnt);
 }
@@ -205,8 +181,8 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
     ENUM_WANT_SVALUE();
 
     if (RTEST(rb_yield(i))) {
-	struct MEMO *memo = MEMO_CAST(memop);
-	MEMO_V1_SET(memo, i);
+	NODE *memo = RNODE(memop);
+	memo->u1.value = i;
 	memo->u3.cnt = 1;
 	rb_iter_break();
     }
@@ -227,12 +203,7 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
  *
  *  If no block is given, an enumerator is returned instead.
  *
- *     (1..100).detect  => #<Enumerator: 1..100:detect>
- *     (1..100).find    => #<Enumerator: 1..100:find>
- *
  *     (1..10).detect	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..10).find	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> nil
- *     (1..100).detect	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> 35
  *     (1..100).find	{ |i| i % 5 == 0 and i % 7 == 0 }   #=> 35
  *
  */
@@ -240,18 +211,18 @@ find_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 static VALUE
 enum_find(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
     VALUE if_none;
 
     rb_scan_args(argc, argv, "01", &if_none);
     RETURN_ENUMERATOR(obj, argc, argv);
-    memo = MEMO_NEW(Qundef, 0, 0);
+    memo = NEW_MEMO(Qundef, 0, 0);
     rb_block_call(obj, id_each, 0, 0, find_i, (VALUE)memo);
     if (memo->u3.cnt) {
-	return memo->v1;
+	return memo->u1.value;
     }
     if (!NIL_P(if_none)) {
-	return rb_funcallv(if_none, id_call, 0, 0);
+	return rb_funcall(if_none, id_call, 0, 0);
     }
     return Qnil;
 }
@@ -259,12 +230,12 @@ enum_find(int argc, VALUE *argv, VALUE obj)
 static VALUE
 find_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    struct MEMO *memo = MEMO_CAST(memop);
+    NODE *memo = RNODE(memop);
 
     ENUM_WANT_SVALUE();
 
-    if (rb_equal(i, memo->v2)) {
-	MEMO_V1_SET(memo, UINT2NUM(memo->u3.cnt));
+    if (rb_equal(i, memo->u2.value)) {
+	memo->u1.value = UINT2NUM(memo->u3.cnt);
 	rb_iter_break();
     }
     memo->u3.cnt++;
@@ -274,10 +245,10 @@ find_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 static VALUE
 find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 {
-    struct MEMO *memo = MEMO_CAST(memop);
+    NODE *memo = RNODE(memop);
 
     if (RTEST(enum_yield(argc, argv))) {
-	MEMO_V1_SET(memo, UINT2NUM(memo->u3.cnt));
+	memo->u1.value = UINT2NUM(memo->u3.cnt);
 	rb_iter_break();
     }
     memo->u3.cnt++;
@@ -306,7 +277,7 @@ find_index_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memop))
 static VALUE
 enum_find_index(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;	/* [return value, current index, ] */
+    NODE *memo;	/* [return value, current index, ] */
     VALUE condition_value = Qnil;
     rb_block_call_func *func;
 
@@ -322,9 +293,9 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
         func = find_index_i;
     }
 
-    memo = MEMO_NEW(Qnil, condition_value, 0);
+    memo = NEW_MEMO(Qnil, condition_value, 0);
     rb_block_call(obj, id_each, 0, 0, func, (VALUE)memo);
-    return memo->v1;
+    return memo->u1.value;
 }
 
 static VALUE
@@ -346,24 +317,6 @@ enum_size(VALUE self, VALUE args, VALUE eobj)
     return (r == Qundef) ? Qnil : r;
 }
 
-static long
-limit_by_enum_size(VALUE obj, long n)
-{
-    unsigned long limit;
-    VALUE size = rb_check_funcall(obj, id_size, 0, 0);
-    if (!FIXNUM_P(size)) return n;
-    limit = FIX2ULONG(size);
-    return ((unsigned long)n > limit) ? (long)limit : n;
-}
-
-static int
-enum_size_over_p(VALUE obj, long n)
-{
-    VALUE size = rb_check_funcall(obj, id_size, 0, 0);
-    if (!FIXNUM_P(size)) return 0;
-    return ((unsigned long)n > FIX2ULONG(size));
-}
-
 /*
  *  call-seq:
  *     enum.find_all { |obj| block } -> array
@@ -414,7 +367,7 @@ reject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
  *     enum.reject                 -> an_enumerator
  *
  *  Returns an array for all elements of +enum+ for which the given
- *  +block+ returns <code>false</code>.
+ *  +block+ returns false.
  *
  *  If no block is given, an Enumerator is returned instead.
  *
@@ -598,15 +551,16 @@ enum_to_h(int argc, VALUE *argv, VALUE obj)
 static VALUE
 inject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 {
-    struct MEMO *memo = MEMO_CAST(p);
+    NODE *memo = RNODE(p);
 
     ENUM_WANT_SVALUE();
 
-    if (memo->v1 == Qundef) {
-	MEMO_V1_SET(memo, i);
+    if (memo->u2.argc == 0) {
+	memo->u2.argc = 1;
+	memo->u1.value = i;
     }
     else {
-	MEMO_V1_SET(memo, rb_yield_values(2, memo->v1, i));
+	memo->u1.value = rb_yield_values(2, memo->u1.value, i);
     }
     return Qnil;
 }
@@ -614,82 +568,27 @@ inject_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 static VALUE
 inject_op_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, p))
 {
-    struct MEMO *memo = MEMO_CAST(p);
+    NODE *memo = RNODE(p);
     VALUE name;
 
     ENUM_WANT_SVALUE();
 
-    if (memo->v1 == Qundef) {
-	MEMO_V1_SET(memo, i);
+    if (memo->u2.argc == 0) {
+	memo->u2.argc = 1;
+	memo->u1.value = i;
     }
     else if (SYMBOL_P(name = memo->u3.value)) {
-	const ID mid = SYM2ID(name);
-	MEMO_V1_SET(memo, rb_funcall(memo->v1, mid, 1, i));
+	memo->u1.value = rb_funcall(memo->u1.value, SYM2ID(name), 1, i);
     }
     else {
 	VALUE args[2];
 	args[0] = name;
 	args[1] = i;
-	MEMO_V1_SET(memo, rb_f_send(numberof(args), args, memo->v1));
+	memo->u1.value = rb_f_send(numberof(args), args, memo->u1.value);
     }
     return Qnil;
 }
 
-static VALUE
-ary_inject_op(VALUE ary, VALUE init, VALUE op)
-{
-    ID id;
-    VALUE v, e;
-    long i, n;
-
-    if (RARRAY_LEN(ary) == 0)
-        return init == Qundef ? Qnil : init;
-
-    if (init == Qundef) {
-        v = RARRAY_AREF(ary, 0);
-        i = 1;
-        if (RARRAY_LEN(ary) == 1)
-            return v;
-    }
-    else {
-        v = init;
-        i = 0;
-    }
-
-    id = SYM2ID(op);
-    if (id == idPLUS) {
-        if ((FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM)) &&
-             rb_method_basic_definition_p(rb_cInteger, idPLUS)) {
-            n = 0;
-            for (; i < RARRAY_LEN(ary); i++) {
-                e = RARRAY_AREF(ary, i);
-                if (FIXNUM_P(e)) {
-                    n += FIX2LONG(e); /* should not overflow long type */
-                    if (!FIXABLE(n)) {
-                        v = rb_big_plus(LONG2NUM(n), v);
-                        n = 0;
-                    }
-                }
-                else if (RB_TYPE_P(e, T_BIGNUM))
-                    v = rb_big_plus(e, v);
-                else
-                    goto not_integer;
-            }
-            if (n != 0)
-                v = rb_fix_plus(LONG2FIX(n), v);
-            return v;
-
-          not_integer:
-            if (n != 0)
-                v = rb_fix_plus(LONG2FIX(n), v);
-        }
-    }
-    for (; i < RARRAY_LEN(ary); i++) {
-        v = rb_funcall(v, id, 1, RARRAY_AREF(ary, i));
-    }
-    return v;
-}
-
 /*
  *  call-seq:
  *     enum.inject(initial, sym) -> obj
@@ -705,9 +604,6 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
  *  operation, specified by a block or a symbol that names a
  *  method or operator.
  *
- *  The <i>inject</i> and <i>reduce</i> methods are aliases. There
- *  is no performance benefit to either.
- *
  *  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
@@ -739,14 +635,13 @@ ary_inject_op(VALUE ary, VALUE init, VALUE op)
 static VALUE
 enum_inject(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
     VALUE init, op;
     rb_block_call_func *iter = inject_i;
     ID id;
 
     switch (rb_scan_args(argc, argv, "02", &init, &op)) {
       case 0:
-	init = Qundef;
 	break;
       case 1:
 	if (rb_block_given_p()) {
@@ -754,7 +649,8 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
 	}
 	id = rb_check_id(&init);
 	op = id ? ID2SYM(id) : init;
-	init = Qundef;
+	argc = 0;
+	init = Qnil;
 	iter = inject_op_i;
 	break;
       case 2:
@@ -766,32 +662,23 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
 	iter = inject_op_i;
 	break;
     }
-
-    if (iter == inject_op_i &&
-        SYMBOL_P(op) &&
-        RB_TYPE_P(obj, T_ARRAY) &&
-        rb_method_basic_definition_p(CLASS_OF(obj), id_each)) {
-        return ary_inject_op(obj, init, op);
-    }
-
-    memo = MEMO_NEW(init, Qnil, op);
+    memo = NEW_MEMO(init, argc, op);
     rb_block_call(obj, id_each, 0, 0, iter, (VALUE)memo);
-    if (memo->v1 == Qundef) return Qnil;
-    return memo->v1;
+    return memo->u1.value;
 }
 
 static VALUE
 partition_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arys))
 {
-    struct MEMO *memo = MEMO_CAST(arys);
+    NODE *memo = RNODE(arys);
     VALUE ary;
     ENUM_WANT_SVALUE();
 
     if (RTEST(rb_yield(i))) {
-	ary = memo->v1;
+	ary = memo->u1.value;
     }
     else {
-	ary = memo->v2;
+	ary = memo->u2.value;
     }
     rb_ary_push(ary, i);
     return Qnil;
@@ -815,14 +702,14 @@ partition_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arys))
 static VALUE
 enum_partition(VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
 
     RETURN_SIZED_ENUMERATOR(obj, 0, 0, enum_size);
 
-    memo = MEMO_NEW(rb_ary_new(), rb_ary_new(), 0);
+    memo = NEW_MEMO(rb_ary_new(), rb_ary_new(), 0);
     rb_block_call(obj, id_each, 0, 0, partition_i, (VALUE)memo);
 
-    return rb_assoc_new(memo->v1, memo->v2);
+    return rb_assoc_new(memo->u1.value, memo->u2.value);
 }
 
 static VALUE
@@ -877,10 +764,10 @@ enum_group_by(VALUE obj)
 static VALUE
 first_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, params))
 {
-    struct MEMO *memo = MEMO_CAST(params);
+    NODE *memo = RNODE(params);
     ENUM_WANT_SVALUE();
 
-    MEMO_V1_SET(memo, i);
+    memo->u1.value = i;
     rb_iter_break();
 
     UNREACHABLE;
@@ -901,22 +788,21 @@ static VALUE enum_take(VALUE obj, VALUE n);
  *    %w[foo bar baz].first(2)  #=> ["foo", "bar"]
  *    %w[foo bar baz].first(10) #=> ["foo", "bar", "baz"]
  *    [].first                  #=> nil
- *    [].first(10)              #=> []
  *
  */
 
 static VALUE
 enum_first(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
     rb_check_arity(argc, 0, 1);
     if (argc > 0) {
 	return enum_take(obj, argv[0]);
     }
     else {
-	memo = MEMO_NEW(Qnil, 0, 0);
+	memo = NEW_MEMO(Qnil, 0, 0);
 	rb_block_call(obj, id_each, 0, 0, first_i, (VALUE)memo);
-	return memo->v1;
+	return memo->u1.value;
     }
 }
 
@@ -934,9 +820,6 @@ enum_first(int argc, VALUE *argv, VALUE obj)
  *  built-in Schwartzian Transform, useful when key computation or
  *  comparison is expensive.
  *
- *  The result is not guaranteed as stable.  When comparison of two
- *  elements returns +0+, the order of the elements is unpredictable.
- *
  *     %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]
  */
@@ -944,20 +827,20 @@ enum_first(int argc, VALUE *argv, VALUE obj)
 static VALUE
 enum_sort(VALUE obj)
 {
-    return rb_ary_sort_bang(enum_to_a(0, 0, obj));
+    return rb_ary_sort(enum_to_a(0, 0, obj));
 }
 
 #define SORT_BY_BUFSIZE 16
 struct sort_by_data {
-    const VALUE ary;
-    const VALUE buf;
+    VALUE ary;
+    VALUE buf;
     long n;
 };
 
 static VALUE
 sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _data))
 {
-    struct sort_by_data *data = (struct sort_by_data *)&MEMO_CAST(_data)->v1;
+    struct sort_by_data *data = (struct sort_by_data *)&RNODE(_data)->u1;
     VALUE ary = data->ary;
     VALUE v;
 
@@ -1007,9 +890,6 @@ sort_by_cmp(const void *ap, const void *bp, void *data)
  *  Sorts <i>enum</i> using a set of keys generated by mapping the
  *  values in <i>enum</i> through the given block.
  *
- *  The result is not guaranteed as stable.  When two keys are equal,
- *  the order of the corresponding elements is unpredictable.
- *
  *  If no block is given, an enumerator is returned instead.
  *
  *     %w{apple pear fig}.sort_by { |word| word.length}
@@ -1077,7 +957,7 @@ static VALUE
 enum_sort_by(VALUE obj)
 {
     VALUE ary, buf;
-    struct MEMO *memo;
+    NODE *memo;
     long i;
     struct sort_by_data *data;
 
@@ -1092,11 +972,11 @@ enum_sort_by(VALUE obj)
     RBASIC_CLEAR_CLASS(ary);
     buf = rb_ary_tmp_new(SORT_BY_BUFSIZE*2);
     rb_ary_store(buf, SORT_BY_BUFSIZE*2-1, Qnil);
-    memo = MEMO_NEW(0, 0, 0);
+    memo = NEW_MEMO(0, 0, 0);
     OBJ_INFECT(memo, obj);
-    data = (struct sort_by_data *)&memo->v1;
-    RB_OBJ_WRITE(memo, &data->ary, ary);
-    RB_OBJ_WRITE(memo, &data->buf, buf);
+    data = (struct sort_by_data *)&memo->u1;
+    data->ary = ary;
+    data->buf = buf;
     data->n = 0;
     rb_block_call(obj, id_each, 0, 0, sort_by_i, (VALUE)memo);
     ary = data->ary;
@@ -1126,27 +1006,27 @@ enum_sort_by(VALUE obj)
 #define ENUMFUNC(name) rb_block_given_p() ? name##_iter_i : name##_i
 
 #define DEFINE_ENUMFUNCS(name) \
-static VALUE enum_##name##_func(VALUE result, struct MEMO *memo); \
+static VALUE enum_##name##_func(VALUE result, NODE *memo); \
 \
 static VALUE \
 name##_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
 { \
-    return enum_##name##_func(rb_enum_values_pack(argc, argv), MEMO_CAST(memo)); \
+    return enum_##name##_func(rb_enum_values_pack(argc, argv), RNODE(memo)); \
 } \
 \
 static VALUE \
 name##_iter_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo)) \
 { \
-    return enum_##name##_func(enum_yield(argc, argv), MEMO_CAST(memo));	\
+    return enum_##name##_func(enum_yield(argc, argv), RNODE(memo));	\
 } \
 \
 static VALUE \
-enum_##name##_func(VALUE result, struct MEMO *memo)
+enum_##name##_func(VALUE result, NODE *memo)
 
 DEFINE_ENUMFUNCS(all)
 {
     if (!RTEST(result)) {
-	MEMO_V1_SET(memo, Qfalse);
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
@@ -1172,15 +1052,15 @@ DEFINE_ENUMFUNCS(all)
 static VALUE
 enum_all(VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qtrue, 0, 0);
+    NODE *memo = NEW_MEMO(Qtrue, 0, 0);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(all), (VALUE)memo);
-    return memo->v1;
+    return memo->u1.value;
 }
 
 DEFINE_ENUMFUNCS(any)
 {
     if (RTEST(result)) {
-	MEMO_V1_SET(memo, Qtrue);
+	memo->u1.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -1206,19 +1086,19 @@ DEFINE_ENUMFUNCS(any)
 static VALUE
 enum_any(VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qfalse, 0, 0);
+    NODE *memo = NEW_MEMO(Qfalse, 0, 0);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(any), (VALUE)memo);
-    return memo->v1;
+    return memo->u1.value;
 }
 
 DEFINE_ENUMFUNCS(one)
 {
     if (RTEST(result)) {
-	if (memo->v1 == Qundef) {
-	    MEMO_V1_SET(memo, Qtrue);
+	if (memo->u1.value == Qundef) {
+	    memo->u1.value = Qtrue;
 	}
-	else if (memo->v1 == Qtrue) {
-	    MEMO_V1_SET(memo, Qfalse);
+	else if (memo->u1.value == Qtrue) {
+	    memo->u1.value = Qfalse;
 	    rb_iter_break();
 	}
     }
@@ -1230,7 +1110,6 @@ struct nmin_data {
   long bufmax;
   long curlen;
   VALUE buf;
-  VALUE limit;
   int (*cmpfunc)(const void *, const void *, void *);
   int rev; /* max if 1 */
   int by; /* min_by if 1 */
@@ -1271,7 +1150,6 @@ nmin_filter(struct nmin_data *data)
     long numelts;
 
     long left, right;
-    long store_index;
 
     long i, j;
 
@@ -1297,6 +1175,7 @@ nmin_filter(struct nmin_data *data)
 
     while (1) {
 	long pivot_index = left + (right-left)/2;
+	long store_index;
 	long num_pivots = 1;
 
 	SWAP(pivot_index, right);
@@ -1340,7 +1219,6 @@ nmin_filter(struct nmin_data *data)
 #undef GETPTR
 #undef SWAP
 
-    data->limit = RARRAY_PTR(data->buf)[store_index*eltsize]; /* the last pivot */
     data->curlen = data->n;
     rb_ary_resize(data->buf, data->n * eltsize);
 }
@@ -1349,25 +1227,11 @@ static VALUE
 nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
 {
     struct nmin_data *data = (struct nmin_data *)_data;
-    VALUE cmpv;
 
     ENUM_WANT_SVALUE();
 
     if (data->by)
-	cmpv = rb_yield(i);
-    else
-	cmpv = i;
-
-    if (data->limit != Qundef) {
-        int c = data->cmpfunc(&cmpv, &data->limit, data);
-        if (data->rev)
-            c = -c;
-        if (c >= 0)
-            return Qnil;
-    }
-
-    if (data->by)
-	rb_ary_push(data->buf, cmpv);
+	rb_ary_push(data->buf, rb_yield(i));
     rb_ary_push(data->buf, i);
 
     data->curlen++;
@@ -1379,8 +1243,8 @@ nmin_i(VALUE i, VALUE *_data, int argc, VALUE *argv)
     return Qnil;
 }
 
-VALUE
-rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
+static VALUE
+nmin_run(VALUE obj, VALUE num, int by, int rev)
 {
     VALUE result;
     struct nmin_data data;
@@ -1395,7 +1259,6 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
     data.bufmax = data.n * 4;
     data.curlen = 0;
     data.buf = rb_ary_tmp_new(data.bufmax * (by ? 2 : 1));
-    data.limit = Qundef;
     data.cmpfunc = by ? nmin_cmp :
                    rb_block_given_p() ? nmin_block_cmp :
 		   nmin_cmp;
@@ -1403,17 +1266,7 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
     data.by = by;
     data.method = rev ? (by ? "max_by" : "max")
                       : (by ? "min_by" : "min");
-    if (ary) {
-	long i;
-	for (i = 0; i < RARRAY_LEN(obj); i++) {
-	   VALUE args[1];
-	   args[0] = RARRAY_AREF(obj, i);
-	   nmin_i(obj, (VALUE*)&data, 1, args);
-	}
-    }
-    else {
-	rb_block_call(obj, id_each, 0, 0, nmin_i, (VALUE)&data);
-    }
+    rb_block_call(obj, id_each, 0, 0, nmin_i, (VALUE)&data);
     nmin_filter(&data);
     result = data.buf;
     if (by) {
@@ -1431,9 +1284,6 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
 	ruby_qsort(RARRAY_PTR(result), RARRAY_LEN(result), sizeof(VALUE),
 		   data.cmpfunc, (void *)&data);
     }
-    if (rev) {
-        rb_ary_reverse(result);
-    }
     *((VALUE *)&RBASIC(result)->klass) = rb_cArray;
     return result;
 
@@ -1459,11 +1309,11 @@ rb_nmin_run(VALUE obj, VALUE num, int by, int rev, int ary)
 static VALUE
 enum_one(VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qundef, 0, 0);
+    NODE *memo = NEW_MEMO(Qundef, 0, 0);
     VALUE result;
 
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(one), (VALUE)memo);
-    result = memo->v1;
+    result = memo->u1.value;
     if (result == Qundef) return Qfalse;
     return result;
 }
@@ -1471,7 +1321,7 @@ enum_one(VALUE obj)
 DEFINE_ENUMFUNCS(none)
 {
     if (RTEST(result)) {
-	MEMO_V1_SET(memo, Qfalse);
+	memo->u1.value = Qfalse;
 	rb_iter_break();
     }
     return Qnil;
@@ -1491,34 +1341,30 @@ DEFINE_ENUMFUNCS(none)
  *     [].none?                                           #=> true
  *     [nil].none?                                        #=> true
  *     [nil, false].none?                                 #=> true
- *     [nil, false, true].none?                           #=> false
  */
 static VALUE
 enum_none(VALUE obj)
 {
-    struct MEMO *memo = MEMO_NEW(Qtrue, 0, 0);
+    NODE *memo = NEW_MEMO(Qtrue, 0, 0);
     rb_block_call(obj, id_each, 0, 0, ENUMFUNC(none), (VALUE)memo);
-    return memo->v1;
+    return memo->u1.value;
 }
 
-struct min_t {
-    VALUE min;
-    struct cmp_opt_data cmp_opt;
-};
-
 static VALUE
 min_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct min_t *memo = MEMO_FOR(struct min_t, args);
+    VALUE cmp;
+    NODE *memo = RNODE(args);
 
     ENUM_WANT_SVALUE();
 
-    if (memo->min == Qundef) {
-	memo->min = i;
+    if (memo->u1.value == Qundef) {
+	memo->u1.value = i;
     }
     else {
-	if (OPTIMIZED_CMP(i, memo->min, memo->cmp_opt) < 0) {
-	    memo->min = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1528,17 +1374,17 @@ static VALUE
 min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
     VALUE cmp;
-    struct min_t *memo = MEMO_FOR(struct min_t, args);
+    NODE *memo = RNODE(args);
 
     ENUM_WANT_SVALUE();
 
-    if (memo->min == Qundef) {
-	memo->min = i;
+    if (memo->u1.value == Qundef) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, memo->min);
-	if (rb_cmpint(cmp, i, memo->min) < 0) {
-	    memo->min = i;
+	cmp = rb_yield_values(2, i, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) < 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1548,11 +1394,11 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 /*
  *  call-seq:
  *     enum.min                     -> obj
- *     enum.min { |a, b| block }    -> obj
+ *     enum.min {| a,b | block }    -> obj
  *     enum.min(n)                  -> array
- *     enum.min(n) { |a, b| block } -> array
+ *     enum.min(n) {| a,b | block } -> array
  *
- *  Returns the object in _enum_ with the minimum value. The
+ *  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>.
  *
@@ -1571,48 +1417,41 @@ min_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_min(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo;
-    struct min_t *m = NEW_CMP_OPT_MEMO(struct min_t, memo);
+    NODE *memo = NEW_MEMO(Qundef, 0, 0);
     VALUE result;
     VALUE num;
 
     rb_scan_args(argc, argv, "01", &num);
 
     if (!NIL_P(num))
-       return rb_nmin_run(obj, num, 0, 0, 0);
+       return nmin_run(obj, num, 0, 0);
 
-    m->min = Qundef;
-    m->cmp_opt.opt_methods = 0;
-    m->cmp_opt.opt_inited = 0;
     if (rb_block_given_p()) {
-	rb_block_call(obj, id_each, 0, 0, min_ii, memo);
+	rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)memo);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, min_i, memo);
+	rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)memo);
     }
-    result = m->min;
+    result = memo->u1.value;
     if (result == Qundef) return Qnil;
     return result;
 }
 
-struct max_t {
-    VALUE max;
-    struct cmp_opt_data cmp_opt;
-};
-
 static VALUE
 max_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct max_t *memo = MEMO_FOR(struct max_t, args);
+    NODE *memo = RNODE(args);
+    VALUE cmp;
 
     ENUM_WANT_SVALUE();
 
-    if (memo->max == Qundef) {
-	memo->max = i;
+    if (memo->u1.value == Qundef) {
+	memo->u1.value = i;
     }
     else {
-	if (OPTIMIZED_CMP(i, memo->max, memo->cmp_opt) > 0) {
-	    memo->max = i;
+	cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1621,18 +1460,18 @@ max_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct max_t *memo = MEMO_FOR(struct max_t, args);
+    NODE *memo = RNODE(args);
     VALUE cmp;
 
     ENUM_WANT_SVALUE();
 
-    if (memo->max == Qundef) {
-	memo->max = i;
+    if (memo->u1.value == Qundef) {
+	memo->u1.value = i;
     }
     else {
-	cmp = rb_yield_values(2, i, memo->max);
-	if (rb_cmpint(cmp, i, memo->max) > 0) {
-	    memo->max = i;
+	cmp = rb_yield_values(2, i, memo->u1.value);
+	if (rb_cmpint(cmp, i, memo->u1.value) > 0) {
+	    memo->u1.value = i;
 	}
     }
     return Qnil;
@@ -1640,10 +1479,10 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 
 /*
  *  call-seq:
- *     enum.max                     -> obj
- *     enum.max { |a, b| block }    -> obj
- *     enum.max(n)                  -> array
- *     enum.max(n) { |a, b| block } -> array
+ *     enum.max                   -> obj
+ *     enum.max { |a, b| block }  -> obj
+ *     enum.max(n)                -> obj
+ *     enum.max(n) {|a,b| block } -> obj
  *
  *  Returns the object in _enum_ with the maximum value. The
  *  first form assumes all objects implement <code>Comparable</code>;
@@ -1657,33 +1496,29 @@ max_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *  as an array.
  *
  *     a = %w[albatross dog horse]
- *     a.max(2)                                  #=> ["horse", "dog"]
- *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["albatross", "horse"]
+ *     a.max(2)                                  #=> ["dog", "horse"]
+ *     a.max(2) {|a, b| a.length <=> b.length }  #=> ["horse", "albatross"]
  */
 
 static VALUE
 enum_max(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE memo;
-    struct max_t *m = NEW_CMP_OPT_MEMO(struct max_t, memo);
+    NODE *memo = NEW_MEMO(Qundef, 0, 0);
     VALUE result;
     VALUE num;
 
     rb_scan_args(argc, argv, "01", &num);
 
     if (!NIL_P(num))
-       return rb_nmin_run(obj, num, 0, 1, 0);
+       return nmin_run(obj, num, 0, 1);
 
-    m->max = Qundef;
-    m->cmp_opt.opt_methods = 0;
-    m->cmp_opt.opt_inited = 0;
     if (rb_block_given_p()) {
 	rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)memo);
     }
     else {
 	rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)memo);
     }
-    result = m->max;
+    result = memo->u1.value;
     if (result == Qundef) return Qnil;
     return result;
 }
@@ -1692,9 +1527,10 @@ struct minmax_t {
     VALUE min;
     VALUE max;
     VALUE last;
-    struct cmp_opt_data cmp_opt;
 };
 
+STATIC_ASSERT(minmax_t, sizeof(struct minmax_t) <= sizeof(NODE) - offsetof(NODE, u1));
+
 static void
 minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 {
@@ -1705,11 +1541,11 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 	memo->max = j;
     }
     else {
-	n = OPTIMIZED_CMP(i, memo->min, memo->cmp_opt);
+	n = rb_cmpint(rb_funcall(i, id_cmp, 1, memo->min), i, memo->min);
 	if (n < 0) {
 	    memo->min = i;
 	}
-	n = OPTIMIZED_CMP(j, memo->max, memo->cmp_opt);
+	n = rb_cmpint(rb_funcall(j, id_cmp, 1, memo->max), j, memo->max);
 	if (n > 0) {
 	    memo->max = j;
 	}
@@ -1719,7 +1555,7 @@ minmax_i_update(VALUE i, VALUE j, struct minmax_t *memo)
 static VALUE
 minmax_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
-    struct minmax_t *memo = MEMO_FOR(struct minmax_t, _memo);
+    struct minmax_t *memo = (struct minmax_t *)&RNODE(_memo)->u1.value;
     int n;
     VALUE j;
 
@@ -1732,7 +1568,7 @@ minmax_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
     j = memo->last;
     memo->last = Qundef;
 
-    n = OPTIMIZED_CMP(j, i, memo->cmp_opt);
+    n = rb_cmpint(rb_funcall(j, id_cmp, 1, i), j, i);
     if (n == 0)
         i = j;
     else if (n < 0) {
@@ -1771,7 +1607,7 @@ minmax_ii_update(VALUE i, VALUE j, struct minmax_t *memo)
 static VALUE
 minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 {
-    struct minmax_t *memo = MEMO_FOR(struct minmax_t, _memo);
+    struct minmax_t *memo = (struct minmax_t *)&RNODE(_memo)->u1.value;
     int n;
     VALUE j;
 
@@ -1804,7 +1640,7 @@ minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
  *     enum.minmax                  -> [min, max]
  *     enum.minmax { |a, b| block } -> [min, max]
  *
- *  Returns a two element array which contains the minimum and the
+ *  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>.
@@ -1817,45 +1653,45 @@ minmax_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
 static VALUE
 enum_minmax(VALUE obj)
 {
-    VALUE memo;
-    struct minmax_t *m = NEW_CMP_OPT_MEMO(struct minmax_t, memo);
+    NODE *memo = NEW_MEMO(Qundef, Qundef, Qundef);
+    struct minmax_t *m = (struct minmax_t *)&memo->u1.value;
+    VALUE ary = rb_ary_new3(2, Qnil, Qnil);
 
     m->min = Qundef;
     m->last = Qundef;
-    m->cmp_opt.opt_methods = 0;
-    m->cmp_opt.opt_inited = 0;
     if (rb_block_given_p()) {
-	rb_block_call(obj, id_each, 0, 0, minmax_ii, memo);
+	rb_block_call(obj, id_each, 0, 0, minmax_ii, (VALUE)memo);
 	if (m->last != Qundef)
 	    minmax_ii_update(m->last, m->last, m);
     }
     else {
-	rb_block_call(obj, id_each, 0, 0, minmax_i, memo);
+	rb_block_call(obj, id_each, 0, 0, minmax_i, (VALUE)memo);
 	if (m->last != Qundef)
 	    minmax_i_update(m->last, m->last, m);
     }
     if (m->min != Qundef) {
-	return rb_assoc_new(m->min, m->max);
+	rb_ary_store(ary, 0, m->min);
+	rb_ary_store(ary, 1, m->max);
     }
-    return rb_assoc_new(Qnil, Qnil);
+    return ary;
 }
 
 static VALUE
 min_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
     v = rb_yield(i);
-    if (memo->v1 == Qundef) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    if (memo->u1.value == Qundef) {
+	memo->u1.value = v;
+	memo->u2.value = i;
     }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->v1), v, memo->v1) < 0) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->u1.value), v, memo->u1.value) < 0) {
+	memo->u1.value = v;
+	memo->u2.value = i;
     }
     return Qnil;
 }
@@ -1885,7 +1721,7 @@ min_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_min_by(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
     VALUE num;
 
     rb_scan_args(argc, argv, "01", &num);
@@ -1893,29 +1729,29 @@ enum_min_by(int argc, VALUE *argv, VALUE obj)
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
     if (!NIL_P(num))
-        return rb_nmin_run(obj, num, 1, 0, 0);
+        return nmin_run(obj, num, 1, 0);
 
-    memo = MEMO_NEW(Qundef, Qnil, 0);
+    memo = NEW_MEMO(Qundef, Qnil, 0);
     rb_block_call(obj, id_each, 0, 0, min_by_i, (VALUE)memo);
-    return memo->v2;
+    return memo->u2.value;
 }
 
 static VALUE
 max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
     VALUE v;
 
     ENUM_WANT_SVALUE();
 
     v = rb_yield(i);
-    if (memo->v1 == Qundef) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    if (memo->u1.value == Qundef) {
+	memo->u1.value = v;
+	memo->u2.value = i;
     }
-    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->v1), v, memo->v1) > 0) {
-	MEMO_V1_SET(memo, v);
-	MEMO_V2_SET(memo, i);
+    else if (rb_cmpint(rb_funcall(v, id_cmp, 1, memo->u1.value), v, memo->u1.value) > 0) {
+	memo->u1.value = v;
+	memo->u2.value = i;
     }
     return Qnil;
 }
@@ -1939,7 +1775,7 @@ max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
  *  as an array.
  *
  *     a = %w[albatross dog horse]
- *     a.max_by(2) {|x| x.length } #=> ["albatross", "horse"]
+ *     a.max_by(2) {|x| x.length } #=> ["horse", "albatross"]
  *
  *  enum.max_by(n) can be used to implement weighted random sampling.
  *  Following example implements and use Enumerable#wsample.
@@ -1990,7 +1826,7 @@ max_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_max_by(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
     VALUE num;
 
     rb_scan_args(argc, argv, "01", &num);
@@ -1998,11 +1834,11 @@ enum_max_by(int argc, VALUE *argv, VALUE obj)
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
     if (!NIL_P(num))
-        return rb_nmin_run(obj, num, 1, 1, 0);
+        return nmin_run(obj, num, 1, 1);
 
-    memo = MEMO_NEW(Qundef, Qnil, 0);
+    memo = NEW_MEMO(Qundef, Qnil, 0);
     rb_block_call(obj, id_each, 0, 0, max_by_i, (VALUE)memo);
-    return memo->v2;
+    return memo->u2.value;
 }
 
 struct minmax_by_t {
@@ -2114,10 +1950,10 @@ enum_minmax_by(VALUE obj)
 static VALUE
 member_i(RB_BLOCK_CALL_FUNC_ARGLIST(iter, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
 
-    if (rb_equal(rb_enum_values_pack(argc, argv), memo->v1)) {
-	MEMO_V2_SET(memo, Qtrue);
+    if (rb_equal(rb_enum_values_pack(argc, argv), memo->u1.value)) {
+	memo->u2.value = Qtrue;
 	rb_iter_break();
     }
     return Qnil;
@@ -2133,24 +1969,22 @@ member_i(RB_BLOCK_CALL_FUNC_ARGLIST(iter, args))
  *
  *     IO.constants.include? :SEEK_SET          #=> true
  *     IO.constants.include? :SEEK_NO_FURTHER   #=> false
- *     IO.constants.member? :SEEK_SET          #=> true
- *     IO.constants.member? :SEEK_NO_FURTHER   #=> false
  *
  */
 
 static VALUE
 enum_member(VALUE obj, VALUE val)
 {
-    struct MEMO *memo = MEMO_NEW(val, Qfalse, 0);
+    NODE *memo = NEW_MEMO(val, Qfalse, 0);
 
     rb_block_call(obj, id_each, 0, 0, member_i, (VALUE)memo);
-    return memo->v2;
+    return memo->u2.value;
 }
 
 static VALUE
 each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 {
-    long n = MEMO_CAST(memo)->u3.cnt++;
+    long n = RNODE(memo)->u3.cnt++;
 
     return rb_yield_values(2, rb_enum_values_pack(argc, argv), INT2NUM(n));
 }
@@ -2177,11 +2011,11 @@ each_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, memo))
 static VALUE
 enum_each_with_index(int argc, VALUE *argv, VALUE obj)
 {
-    struct MEMO *memo;
+    NODE *memo;
 
     RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_size);
 
-    memo = MEMO_NEW(0, 0, 0);
+    memo = NEW_MEMO(0, 0, 0);
     rb_block_call(obj, id_each, argc, argv, each_with_index_i, (VALUE)memo);
     return obj;
 }
@@ -2269,12 +2103,13 @@ enum_each_entry(int argc, VALUE *argv, VALUE obj)
 }
 
 #define dont_recycle_block_arg(arity) ((arity) == 1 || (arity) < 0)
+#define nd_no_recycle u2.value
 
 static VALUE
 each_slice_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
 {
-    struct MEMO *memo = MEMO_CAST(m);
-    VALUE ary = memo->v1;
+    NODE *memo = RNODE(m);
+    VALUE ary = memo->u1.value;
     VALUE v = Qnil;
     long size = memo->u3.cnt;
     ENUM_WANT_SVALUE();
@@ -2284,8 +2119,8 @@ each_slice_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
     if (RARRAY_LEN(ary) == size) {
 	v = rb_yield(ary);
 
-	if (memo->v2) {
-	    MEMO_V1_SET(memo, rb_ary_new2(size));
+	if (memo->nd_no_recycle) {
+	    memo->u1.value = rb_ary_new2(size);
 	}
 	else {
 	    rb_ary_clear(ary);
@@ -2330,17 +2165,16 @@ enum_each_slice(VALUE obj, VALUE n)
 {
     long size = NUM2LONG(n);
     VALUE ary;
-    struct MEMO *memo;
+    NODE *memo;
     int arity;
 
     if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
     RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_slice_size);
-    size = limit_by_enum_size(obj, size);
     ary = rb_ary_new2(size);
     arity = rb_block_arity();
-    memo = MEMO_NEW(ary, dont_recycle_block_arg(arity), size);
+    memo = NEW_MEMO(ary, dont_recycle_block_arg(arity), size);
     rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)memo);
-    ary = memo->v1;
+    ary = memo->u1.value;
     if (RARRAY_LEN(ary) > 0) rb_yield(ary);
 
     return Qnil;
@@ -2349,8 +2183,8 @@ enum_each_slice(VALUE obj, VALUE n)
 static VALUE
 each_cons_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
-    VALUE ary = memo->v1;
+    NODE *memo = RNODE(args);
+    VALUE ary = memo->u1.value;
     VALUE v = Qnil;
     long size = memo->u3.cnt;
     ENUM_WANT_SVALUE();
@@ -2360,7 +2194,7 @@ each_cons_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
     }
     rb_ary_push(ary, i);
     if (RARRAY_LEN(ary) == size) {
-	if (memo->v2) {
+	if (memo->nd_no_recycle) {
 	    ary = rb_ary_dup(ary);
 	}
 	v = rb_yield(ary);
@@ -2407,14 +2241,13 @@ static VALUE
 enum_each_cons(VALUE obj, VALUE n)
 {
     long size = NUM2LONG(n);
-    struct MEMO *memo;
+    NODE *memo;
     int arity;
 
     if (size <= 0) rb_raise(rb_eArgError, "invalid size");
     RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_cons_size);
     arity = rb_block_arity();
-    if (enum_size_over_p(obj, size)) return Qnil;
-    memo = MEMO_NEW(rb_ary_new2(size), dont_recycle_block_arg(arity), size);
+    memo = NEW_MEMO(rb_ary_new2(size), dont_recycle_block_arg(arity), size);
     rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo);
 
     return Qnil;
@@ -2454,11 +2287,11 @@ enum_each_with_object(VALUE obj, VALUE memo)
 static VALUE
 zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 {
-    struct MEMO *memo = (struct MEMO *)memoval;
-    VALUE result = memo->v1;
-    VALUE args = memo->v2;
+    NODE *memo = (NODE *)memoval;
+    volatile VALUE result = memo->u1.value;
+    volatile VALUE args = memo->u2.value;
     long n = memo->u3.cnt++;
-    VALUE tmp;
+    volatile VALUE tmp;
     int i;
 
     tmp = rb_ary_new2(RARRAY_LEN(args) + 1);
@@ -2479,16 +2312,13 @@ zip_ary(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
     else {
 	rb_ary_push(result, tmp);
     }
-
-    RB_GC_GUARD(args);
-
     return Qnil;
 }
 
 static VALUE
 call_next(VALUE *v)
 {
-    return v[0] = rb_funcallv(v[1], id_next, 0, 0);
+    return v[0] = rb_funcall(v[1], id_next, 0, 0);
 }
 
 static VALUE
@@ -2500,10 +2330,10 @@ call_stop(VALUE *v)
 static VALUE
 zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
 {
-    struct MEMO *memo = (struct MEMO *)memoval;
-    VALUE result = memo->v1;
-    VALUE args = memo->v2;
-    VALUE tmp;
+    NODE *memo = (NODE *)memoval;
+    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);
@@ -2530,9 +2360,6 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
     else {
 	rb_ary_push(result, tmp);
     }
-
-    RB_GC_GUARD(args);
-
     return Qnil;
 }
 
@@ -2558,10 +2385,6 @@ zip_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, memoval))
  *     [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]]
  *
- *     c = []
- *     a.zip(b) { |x, y| c << x + y }  #=> nil
- *     c                               #=> [11, 13, 15]
- *
  */
 
 static VALUE
@@ -2569,7 +2392,7 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 {
     int i;
     ID conv;
-    struct MEMO *memo;
+    NODE *memo;
     VALUE result = Qnil;
     VALUE args = rb_ary_new4(argc, argv);
     int allary = TRUE;
@@ -2587,8 +2410,8 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 	CONST_ID(conv, "to_enum");
 	for (i=0; i<argc; i++) {
 	    if (!rb_respond_to(argv[i], id_each)) {
-		rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
-			 rb_obj_class(argv[i]));
+                rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
+                    rb_obj_classname(argv[i]));
             }
 	    argv[i] = rb_funcall(argv[i], conv, 1, ID2SYM(id_each));
 	}
@@ -2596,9 +2419,8 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
     if (!rb_block_given_p()) {
 	result = rb_ary_new();
     }
-
-    /* TODO: use NODE_DOT2 as memo(v, v, -) */
-    memo = MEMO_NEW(result, args, 0);
+    /* 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;
@@ -2607,8 +2429,8 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
 static VALUE
 take_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
-    rb_ary_push(memo->v1, rb_enum_values_pack(argc, argv));
+    NODE *memo = RNODE(args);
+    rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv));
     if (--memo->u3.cnt == 0) rb_iter_break();
     return Qnil;
 }
@@ -2628,7 +2450,7 @@ take_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 static VALUE
 enum_take(VALUE obj, VALUE n)
 {
-    struct MEMO *memo;
+    NODE *memo;
     VALUE result;
     long len = NUM2LONG(n);
 
@@ -2638,7 +2460,7 @@ enum_take(VALUE obj, VALUE n)
 
     if (len == 0) return rb_ary_new2(0);
     result = rb_ary_new2(len);
-    memo = MEMO_NEW(result, 0, len);
+    memo = NEW_MEMO(result, 0, len);
     rb_block_call(obj, id_each, 0, 0, take_i, (VALUE)memo);
     return result;
 }
@@ -2654,7 +2476,7 @@ take_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
 
 /*
  *  call-seq:
- *     enum.take_while { |obj| block } -> array
+ *     enum.take_while { |arr| block } -> array
  *     enum.take_while                 -> an_enumerator
  *
  *  Passes elements to the block until the block returns +nil+ or +false+,
@@ -2681,9 +2503,9 @@ enum_take_while(VALUE obj)
 static VALUE
 drop_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
     if (memo->u3.cnt == 0) {
-	rb_ary_push(memo->v1, rb_enum_values_pack(argc, argv));
+	rb_ary_push(memo->u1.value, rb_enum_values_pack(argc, argv));
     }
     else {
 	memo->u3.cnt--;
@@ -2707,7 +2529,7 @@ static VALUE
 enum_drop(VALUE obj, VALUE n)
 {
     VALUE result;
-    struct MEMO *memo;
+    NODE *memo;
     long len = NUM2LONG(n);
 
     if (len < 0) {
@@ -2715,7 +2537,7 @@ enum_drop(VALUE obj, VALUE n)
     }
 
     result = rb_ary_new();
-    memo = MEMO_NEW(result, 0, len);
+    memo = NEW_MEMO(result, 0, len);
     rb_block_call(obj, id_each, 0, 0, drop_i, (VALUE)memo);
     return result;
 }
@@ -2724,21 +2546,21 @@ enum_drop(VALUE obj, VALUE n)
 static VALUE
 drop_while_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
 {
-    struct MEMO *memo = MEMO_CAST(args);
+    NODE *memo = RNODE(args);
     ENUM_WANT_SVALUE();
 
     if (!memo->u3.state && !RTEST(rb_yield(i))) {
 	memo->u3.state = TRUE;
     }
     if (memo->u3.state) {
-	rb_ary_push(memo->v1, i);
+	rb_ary_push(memo->u1.value, i);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     enum.drop_while { |obj| block }  -> array
+ *     enum.drop_while { |arr| block }  -> array
  *     enum.drop_while                  -> an_enumerator
  *
  *  Drops elements up to, but not including, the first element for
@@ -2756,11 +2578,11 @@ static VALUE
 enum_drop_while(VALUE obj)
 {
     VALUE result;
-    struct MEMO *memo;
+    NODE *memo;
 
     RETURN_ENUMERATOR(obj, 0, 0);
     result = rb_ary_new();
-    memo = MEMO_NEW(result, 0, FALSE);
+    memo = NEW_MEMO(result, 0, FALSE);
     rb_block_call(obj, id_each, 0, 0, drop_while_i, (VALUE)memo);
     return result;
 }
@@ -2846,6 +2668,7 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
 
 struct chunk_arg {
     VALUE categorize;
+    VALUE state;
     VALUE prev_value;
     VALUE prev_elts;
     VALUE yielder;
@@ -2861,7 +2684,10 @@ chunk_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 
     ENUM_WANT_SVALUE();
 
-    v = rb_funcall(argp->categorize, id_call, 1, i);
+    if (NIL_P(argp->state))
+        v = rb_funcall(argp->categorize, id_call, 1, i);
+    else
+        v = rb_funcall(argp->categorize, id_call, 2, i, argp->state);
 
     if (v == alone) {
         if (!NIL_P(argp->prev_value)) {
@@ -2907,10 +2733,14 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
 
     enumerable = rb_ivar_get(enumerator, rb_intern("chunk_enumerable"));
     memo->categorize = rb_ivar_get(enumerator, rb_intern("chunk_categorize"));
+    memo->state = rb_ivar_get(enumerator, rb_intern("chunk_initial_state"));
     memo->prev_value = Qnil;
     memo->prev_elts = Qnil;
     memo->yielder = yielder;
 
+    if (!NIL_P(memo->state))
+	memo->state = rb_obj_dup(memo->state);
+
     rb_block_call(enumerable, id_each, 0, 0, chunk_ii, arg);
     memo = MEMO_FOR(struct chunk_arg, arg);
     if (!NIL_P(memo->prev_elts))
@@ -2921,6 +2751,7 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
 /*
  *  call-seq:
  *     enum.chunk { |elt| ... }                       -> an_enumerator
+ *     enum.chunk(initial_state) { |elt, state| ... } -> an_enumerator
  *
  *  Enumerates over the items, chunking them together based on the return
  *  value of the block.
@@ -3004,18 +2835,27 @@ chunk_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *      }
  *    }
  *
- *  If no block is given, an enumerator to `chunk` is returned instead.
+ *  If the block needs to maintain state over multiple elements,
+ *  an +initial_state+ argument can be used.
+ *  If a non-nil value is given,
+ *  a reference to it is passed as the 2nd argument of the block for the
+ *  +chunk+ method, so state-changes to it persist across block calls.
+ *
  */
 static VALUE
-enum_chunk(VALUE enumerable)
+enum_chunk(int argc, VALUE *argv, VALUE enumerable)
 {
+    VALUE initial_state;
     VALUE enumerator;
 
-    RETURN_SIZED_ENUMERATOR(enumerable, 0, 0, enum_size);
+    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, idInitialize, 0, 0, chunk_i, enumerator);
     return enumerator;
 }
@@ -3024,6 +2864,7 @@ enum_chunk(VALUE enumerable)
 struct slicebefore_arg {
     VALUE sep_pred;
     VALUE sep_pat;
+    VALUE state;
     VALUE prev_elts;
     VALUE yielder;
 };
@@ -3038,8 +2879,10 @@ slicebefore_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _argp))
 
     if (!NIL_P(argp->sep_pat))
         header_p = rb_funcall(argp->sep_pat, id_eqq, 1, i);
-    else
+    else if (NIL_P(argp->state))
         header_p = rb_funcall(argp->sep_pred, id_call, 1, i);
+    else
+        header_p = rb_funcall(argp->sep_pred, id_call, 2, i, argp->state);
     if (RTEST(header_p)) {
         if (!NIL_P(argp->prev_elts))
             rb_funcall(argp->yielder, id_lshift, 1, argp->prev_elts);
@@ -3065,9 +2908,13 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
     enumerable = rb_ivar_get(enumerator, rb_intern("slicebefore_enumerable"));
     memo->sep_pred = rb_attr_get(enumerator, rb_intern("slicebefore_sep_pred"));
     memo->sep_pat = NIL_P(memo->sep_pred) ? rb_ivar_get(enumerator, rb_intern("slicebefore_sep_pat")) : Qnil;
+    memo->state = rb_attr_get(enumerator, rb_intern("slicebefore_initial_state"));
     memo->prev_elts = Qnil;
     memo->yielder = yielder;
 
+    if (!NIL_P(memo->state))
+        memo->state = rb_obj_dup(memo->state);
+
     rb_block_call(enumerable, id_each, 0, 0, slicebefore_ii, arg);
     memo = MEMO_FOR(struct slicebefore_arg, arg);
     if (!NIL_P(memo->prev_elts))
@@ -3079,6 +2926,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *  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.
@@ -3095,9 +2943,10 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *
  *    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 the Enumerator class and Enumerable module,
- *  such as +to_a+, +map+, etc., are also usable.
+ *  such as map, etc., are also usable.
  *
  *  For example, iteration over ChangeLog entries can be implemented as
  *  follows:
@@ -3128,7 +2977,7 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *  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 (see +chunk_while+ for a better way):
+ *  as follows:
  *
  *    a = [0, 2, 3, 4, 6, 7, 9]
  *    prev = a[0]
@@ -3140,34 +2989,33 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *    }.join(",")
  *    #=> "0,2-4,6,7,9"
  *
- *  However local variables should be used carefully
- *  if the result enumerator is enumerated twice or more.
- *  The local variables should be initialized for each enumeration.
- *  Enumerator.new can be used to do it.
+ *  However local variables are not appropriate to maintain state
+ *  if the result enumerator is used twice or more.
+ *  In such a case, the last state of the 1st +each+ is used in the 2nd +each+.
+ *  The _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)
- *      Enumerator.new {|y|
- *        # cols is initialized in Enumerator.new.
- *        cols = 0
- *        words.slice_before { |w|
- *          cols += 1 if cols != 0
- *          cols += w.length
- *          if maxwidth < cols
- *            cols = w.length
- *            true
- *          else
- *            false
- *          end
- *        }.each {|ws| y.yield ws }
+ *      # 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(" ") } # first enumeration.
- *    puts "-"*10
- *    enum.each { |ws| puts ws.join(" ") } # second enumeration generates same result as the first.
+ *    enum.each { |ws| puts ws.join(" ") }
  *    puts "-"*10
  *    #=> ----------
  *    #   1 2 3 4 5
@@ -3177,13 +3025,6 @@ slicebefore_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
  *    #   17 18 19
  *    #   20
  *    #   ----------
- *    #   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.
@@ -3224,10 +3065,11 @@ enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
     VALUE enumerator;
 
     if (rb_block_given_p()) {
-        if (argc != 0)
-            rb_error_arity(argc, 0, 0);
+        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;
@@ -3348,7 +3190,7 @@ enum_slice_after(int argc, VALUE *argv, VALUE enumerable)
 
     if (rb_block_given_p()) {
         if (0 < argc)
-            rb_raise(rb_eArgError, "both pattern and block are given");
+            rb_raise(rb_eArgError, "both pattan and block are given");
         pred = rb_block_proc();
     }
     else {
@@ -3364,491 +3206,6 @@ enum_slice_after(int argc, VALUE *argv, VALUE enumerable)
     return enumerator;
 }
 
-struct slicewhen_arg {
-    VALUE pred;
-    VALUE prev_elt;
-    VALUE prev_elts;
-    VALUE yielder;
-    int inverted; /* 0 for slice_when and 1 for chunk_while. */
-};
-
-static VALUE
-slicewhen_ii(RB_BLOCK_CALL_FUNC_ARGLIST(i, _memo))
-{
-#define UPDATE_MEMO ((void)(memo = MEMO_FOR(struct slicewhen_arg, _memo)))
-    struct slicewhen_arg *memo;
-    int split_p;
-    UPDATE_MEMO;
-
-    ENUM_WANT_SVALUE();
-
-    if (memo->prev_elt == Qundef) {
-        /* The first element */
-        memo->prev_elt = i;
-        memo->prev_elts = rb_ary_new3(1, i);
-    }
-    else {
-        split_p = RTEST(rb_funcall(memo->pred, id_call, 2, memo->prev_elt, i));
-        UPDATE_MEMO;
-
-        if (memo->inverted)
-            split_p = !split_p;
-
-        if (split_p) {
-            rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
-            UPDATE_MEMO;
-            memo->prev_elts = rb_ary_new3(1, i);
-        }
-        else {
-            rb_ary_push(memo->prev_elts, i);
-        }
-
-        memo->prev_elt = i;
-    }
-
-    return Qnil;
-#undef UPDATE_MEMO
-}
-
-static VALUE
-slicewhen_i(RB_BLOCK_CALL_FUNC_ARGLIST(yielder, enumerator))
-{
-    VALUE enumerable;
-    VALUE arg;
-    struct slicewhen_arg *memo =
-	NEW_PARTIAL_MEMO_FOR(struct slicewhen_arg, arg, inverted);
-
-    enumerable = rb_ivar_get(enumerator, rb_intern("slicewhen_enum"));
-    memo->pred = rb_attr_get(enumerator, rb_intern("slicewhen_pred"));
-    memo->prev_elt = Qundef;
-    memo->prev_elts = Qnil;
-    memo->yielder = yielder;
-    memo->inverted = RTEST(rb_attr_get(enumerator, rb_intern("slicewhen_inverted")));
-
-    rb_block_call(enumerable, id_each, 0, 0, slicewhen_ii, arg);
-    memo = MEMO_FOR(struct slicewhen_arg, arg);
-    if (!NIL_P(memo->prev_elts))
-        rb_funcall(memo->yielder, id_lshift, 1, memo->prev_elts);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.slice_when {|elt_before, elt_after| bool } -> an_enumerator
- *
- *  Creates an enumerator for each chunked elements.
- *  The beginnings of chunks are defined by the block.
- *
- *  This method split each chunk using adjacent elements,
- *  _elt_before_ and _elt_after_,
- *  in the receiver enumerator.
- *  This method split chunks between _elt_before_ and _elt_after_ where
- *  the block returns <code>true</code>.
- *
- *  The block is called the length of the receiver enumerator minus one.
- *
- *  The result enumerator yields the chunked elements as an array.
- *  So +each+ method can be called as follows:
- *
- *    enum.slice_when { |elt_before, elt_after| bool }.each { |ary| ... }
- *
- *  Other methods of the Enumerator class and Enumerable module,
- *  such as +to_a+, +map+, etc., are also usable.
- *
- *  For example, one-by-one increasing subsequence can be chunked as follows:
- *
- *    a = [1,2,4,9,10,11,12,15,16,19,20,21]
- *    b = a.slice_when {|i, j| i+1 != j }
- *    p b.to_a #=> [[1, 2], [4], [9, 10, 11, 12], [15, 16], [19, 20, 21]]
- *    c = b.map {|a| a.length < 3 ? a : "#{a.first}-#{a.last}" }
- *    p c #=> [[1, 2], [4], "9-12", [15, 16], "19-21"]
- *    d = c.join(",")
- *    p d #=> "1,2,4,9-12,15,16,19-21"
- *
- *  Near elements (threshold: 6) in sorted array can be chunked as follows:
- *
- *    a = [3, 11, 14, 25, 28, 29, 29, 41, 55, 57]
- *    p a.slice_when {|i, j| 6 < j - i }.to_a
- *    #=> [[3], [11, 14], [25, 28, 29, 29], [41], [55, 57]]
- *
- *  Increasing (non-decreasing) subsequence can be chunked as follows:
- *
- *    a = [0, 9, 2, 2, 3, 2, 7, 5, 9, 5]
- *    p a.slice_when {|i, j| i > j }.to_a
- *    #=> [[0, 9], [2, 2, 3], [2, 7], [5, 9], [5]]
- *
- *  Adjacent evens and odds can be chunked as follows:
- *  (Enumerable#chunk is another way to do it.)
- *
- *    a = [7, 5, 9, 2, 0, 7, 9, 4, 2, 0]
- *    p a.slice_when {|i, j| i.even? != j.even? }.to_a
- *    #=> [[7, 5, 9], [2, 0], [7, 9], [4, 2, 0]]
- *
- *  Paragraphs (non-empty lines with trailing empty lines) can be chunked as follows:
- *  (See Enumerable#chunk to ignore empty lines.)
- *
- *    lines = ["foo\n", "bar\n", "\n", "baz\n", "qux\n"]
- *    p lines.slice_when {|l1, l2| /\A\s*\z/ =~ l1 && /\S/ =~ l2 }.to_a
- *    #=> [["foo\n", "bar\n", "\n"], ["baz\n", "qux\n"]]
- *
- *  Enumerable#chunk_while does the same, except splitting when the block
- *  returns <code>false</code> instead of <code>true</code>.
- */
-static VALUE
-enum_slice_when(VALUE enumerable)
-{
-    VALUE enumerator;
-    VALUE pred;
-
-    pred = rb_block_proc();
-
-    enumerator = rb_obj_alloc(rb_cEnumerator);
-    rb_ivar_set(enumerator, rb_intern("slicewhen_enum"), enumerable);
-    rb_ivar_set(enumerator, rb_intern("slicewhen_pred"), pred);
-    rb_ivar_set(enumerator, rb_intern("slicewhen_inverted"), Qfalse);
-
-    rb_block_call(enumerator, idInitialize, 0, 0, slicewhen_i, enumerator);
-    return enumerator;
-}
-
-/*
- *  call-seq:
- *     enum.chunk_while {|elt_before, elt_after| bool } -> an_enumerator
- *
- *  Creates an enumerator for each chunked elements.
- *  The beginnings of chunks are defined by the block.
- *
- *  This method split each chunk using adjacent elements,
- *  _elt_before_ and _elt_after_,
- *  in the receiver enumerator.
- *  This method split chunks between _elt_before_ and _elt_after_ where
- *  the block returns <code>false</code>.
- *
- *  The block is called the length of the receiver enumerator minus one.
- *
- *  The result enumerator yields the chunked elements as an array.
- *  So +each+ method can be called as follows:
- *
- *    enum.chunk_while { |elt_before, elt_after| bool }.each { |ary| ... }
- *
- *  Other methods of the Enumerator class and Enumerable module,
- *  such as +to_a+, +map+, etc., are also usable.
- *
- *  For example, one-by-one increasing subsequence can be chunked as follows:
- *
- *    a = [1,2,4,9,10,11,12,15,16,19,20,21]
- *    b = a.chunk_while {|i, j| i+1 == j }
- *    p b.to_a #=> [[1, 2], [4], [9, 10, 11, 12], [15, 16], [19, 20, 21]]
- *    c = b.map {|a| a.length < 3 ? a : "#{a.first}-#{a.last}" }
- *    p c #=> [[1, 2], [4], "9-12", [15, 16], "19-21"]
- *    d = c.join(",")
- *    p d #=> "1,2,4,9-12,15,16,19-21"
- *
- *  Increasing (non-decreasing) subsequence can be chunked as follows:
- *
- *    a = [0, 9, 2, 2, 3, 2, 7, 5, 9, 5]
- *    p a.chunk_while {|i, j| i <= j }.to_a
- *    #=> [[0, 9], [2, 2, 3], [2, 7], [5, 9], [5]]
- *
- *  Adjacent evens and odds can be chunked as follows:
- *  (Enumerable#chunk is another way to do it.)
- *
- *    a = [7, 5, 9, 2, 0, 7, 9, 4, 2, 0]
- *    p a.chunk_while {|i, j| i.even? == j.even? }.to_a
- *    #=> [[7, 5, 9], [2, 0], [7, 9], [4, 2, 0]]
- *
- *  Enumerable#slice_when does the same, except splitting when the block
- *  returns <code>true</code> instead of <code>false</code>.
- */
-static VALUE
-enum_chunk_while(VALUE enumerable)
-{
-    VALUE enumerator;
-    VALUE pred;
-
-    pred = rb_block_proc();
-
-    enumerator = rb_obj_alloc(rb_cEnumerator);
-    rb_ivar_set(enumerator, rb_intern("slicewhen_enum"), enumerable);
-    rb_ivar_set(enumerator, rb_intern("slicewhen_pred"), pred);
-    rb_ivar_set(enumerator, rb_intern("slicewhen_inverted"), Qtrue);
-
-    rb_block_call(enumerator, idInitialize, 0, 0, slicewhen_i, enumerator);
-    return enumerator;
-}
-
-struct enum_sum_memo {
-    VALUE v, r;
-    long n;
-    double f, c;
-    int block_given;
-    int float_value;
-};
-
-static void
-sum_iter(VALUE i, struct enum_sum_memo *memo)
-{
-    const int unused = (assert(memo != NULL), 0);
-
-    long n = memo->n;
-    VALUE v = memo->v;
-    VALUE r = memo->r;
-    double f = memo->f;
-    double c = memo->c;
-
-    if (memo->block_given)
-        i = rb_yield(i);
-
-    if (memo->float_value)
-        goto float_value;
-
-    if (FIXNUM_P(v) || RB_TYPE_P(v, T_BIGNUM) || RB_TYPE_P(v, T_RATIONAL)) {
-        if (FIXNUM_P(i)) {
-            n += FIX2LONG(i); /* should not overflow long type */
-            if (!FIXABLE(n)) {
-                v = rb_big_plus(LONG2NUM(n), v);
-                n = 0;
-            }
-        }
-        else if (RB_TYPE_P(i, T_BIGNUM))
-            v = rb_big_plus(i, v);
-        else if (RB_TYPE_P(i, T_RATIONAL)) {
-            if (r == Qundef)
-                r = i;
-            else
-                r = rb_rational_plus(r, i);
-        }
-        else {
-            if (n != 0) {
-                v = rb_fix_plus(LONG2FIX(n), v);
-                n = 0;
-            }
-            if (r != Qundef) {
-                /* r can be an Integer when mathn is loaded */
-                if (FIXNUM_P(r))
-                    v = rb_fix_plus(r, v);
-                else if (RB_TYPE_P(r, T_BIGNUM))
-                    v = rb_big_plus(r, v);
-                else
-                    v = rb_rational_plus(r, v);
-                r = Qundef;
-            }
-            if (RB_FLOAT_TYPE_P(i)) {
-                f = NUM2DBL(v);
-                c = 0.0;
-                memo->float_value = 1;
-                goto float_value;
-            }
-            else
-                goto some_value;
-        }
-    }
-    else if (RB_FLOAT_TYPE_P(v)) {
-        /*
-         * Kahan-Babuska balancing compensated summation algorithm
-         * See http://link.springer.com/article/10.1007/s00607-005-0139-x
-         */
-        double x, t;
-
-      float_value:
-        if (RB_FLOAT_TYPE_P(i))
-            x = RFLOAT_VALUE(i);
-        else if (FIXNUM_P(i))
-            x = FIX2LONG(i);
-        else if (RB_TYPE_P(i, T_BIGNUM))
-            x = rb_big2dbl(i);
-        else if (RB_TYPE_P(i, T_RATIONAL))
-            x = rb_num2dbl(i);
-        else {
-            v = DBL2NUM(f);
-            memo->float_value = 0;
-            goto some_value;
-        }
-
-        t = f + x;
-        if (fabs(f) >= fabs(x))
-            c += ((f - t) + x);
-        else
-            c += ((x - t) + f);
-        f = t;
-    }
-    else {
-      some_value:
-        v = rb_funcall(v, idPLUS, 1, i);
-    }
-
-    memo->v = v;
-    memo->n = n;
-    memo->r = r;
-    memo->f = f;
-    memo->c = c;
-    (void)unused;
-}
-
-static VALUE
-enum_sum_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, args))
-{
-    ENUM_WANT_SVALUE();
-    sum_iter(i, (struct enum_sum_memo *) args);
-    return Qnil;
-}
-
-static int
-hash_sum_i(VALUE key, VALUE value, VALUE arg)
-{
-    sum_iter(rb_assoc_new(key, value), (struct enum_sum_memo *) arg);
-    return ST_CONTINUE;
-}
-
-static void
-hash_sum(VALUE hash, struct enum_sum_memo *memo)
-{
-    assert(RB_TYPE_P(hash, T_HASH));
-    assert(memo != NULL);
-
-    rb_hash_foreach(hash, hash_sum_i, (VALUE)memo);
-}
-
-static VALUE
-int_range_sum(VALUE beg, VALUE end, int excl, VALUE init)
-{
-    if (excl) {
-        if (FIXNUM_P(end))
-            end = LONG2FIX(FIX2LONG(end) - 1);
-        else
-            end = rb_big_minus(end, LONG2FIX(1));
-    }
-
-    if (rb_int_ge(end, beg)) {
-        VALUE a;
-        a = rb_int_plus(rb_int_minus(end, beg), LONG2FIX(1));
-        a = rb_int_mul(a, rb_int_plus(end, beg));
-        a = rb_int_idiv(a, LONG2FIX(2));
-        return rb_int_plus(init, a);
-    }
-
-    return init;
-}
-
-/*
- * call-seq:
- *   enum.sum(init=0)                   -> number
- *   enum.sum(init=0) {|e| expr }       -> number
- *
- * Returns the sum of elements in an Enumerable.
- *
- * If a block is given, the block is applied to each element
- * before addition.
- *
- * If <i>enum</i> is empty, it returns <i>init</i>.
- *
- * For example:
- *
- *   { 1 => 10, 2 => 20 }.sum {|k, v| k * v }  #=> 50
- *   (1..10).sum                               #=> 55
- *   (1..10).sum {|v| v * 2 }                  #=> 110
- *   [Object.new].each.sum                     #=> TypeError
- *
- * This method can be used for non-numeric objects by
- * explicit <i>init</i> argument.
- *
- *   { 1 => 10, 2 => 20 }.sum([])                   #=> [1, 10, 2, 20]
- *   "a\nb\nc".each_line.lazy.map(&:chomp).sum("")  #=> "abc"
- *
- * Enumerable#sum method may not respect method redefinition of "+"
- * methods such as Integer#+.
- */
-static VALUE
-enum_sum(int argc, VALUE* argv, VALUE obj)
-{
-    struct enum_sum_memo memo;
-    VALUE beg, end;
-    int excl;
-
-    if (rb_scan_args(argc, argv, "01", &memo.v) == 0)
-        memo.v = LONG2FIX(0);
-
-    memo.block_given = rb_block_given_p();
-
-    memo.n = 0;
-    memo.r = Qundef;
-
-    if ((memo.float_value = RB_FLOAT_TYPE_P(memo.v))) {
-        memo.f = RFLOAT_VALUE(memo.v);
-        memo.c = 0.0;
-    }
-
-    if (RTEST(rb_range_values(obj, &beg, &end, &excl))) {
-        if (!memo.block_given && !memo.float_value &&
-                (FIXNUM_P(beg) || RB_TYPE_P(beg, T_BIGNUM)) &&
-                (FIXNUM_P(end) || RB_TYPE_P(end, T_BIGNUM))) {
-            return int_range_sum(beg, end, excl, memo.v);
-        }
-    }
-
-    if (RB_TYPE_P(obj, T_HASH) &&
-            rb_method_basic_definition_p(CLASS_OF(obj), id_each))
-        hash_sum(obj, &memo);
-    else
-        rb_block_call(obj, id_each, 0, 0, enum_sum_i, (VALUE)&memo);
-
-    if (memo.float_value) {
-        return DBL2NUM(memo.f + memo.c);
-    }
-    else {
-        if (memo.n != 0)
-            memo.v = rb_fix_plus(LONG2FIX(memo.n), memo.v);
-        if (memo.r != Qundef) {
-            /* r can be an Integer when mathn is loaded */
-            if (FIXNUM_P(memo.r))
-                memo.v = rb_fix_plus(memo.r, memo.v);
-            else if (RB_TYPE_P(memo.r, T_BIGNUM))
-                memo.v = rb_big_plus(memo.r, memo.v);
-            else
-                memo.v = rb_rational_plus(memo.r, memo.v);
-        }
-        return memo.v;
-    }
-}
-
-static VALUE
-uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
-{
-    rb_hash_add_new_element(hash, i, i);
-    return Qnil;
-}
-
-static VALUE
-uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
-{
-    rb_hash_add_new_element(hash, rb_yield_values2(argc, argv), i);
-    return Qnil;
-}
-
-/*
- *  call-seq:
- *     enum.uniq                -> new_ary
- *     enum.uniq { |item| ... } -> new_ary
- *
- *  Returns a new array by removing duplicate values in +self+.
- *
- *  See also Array#uniq.
- */
-
-static VALUE
-enum_uniq(VALUE obj)
-{
-    VALUE hash, ret;
-    rb_block_call_func *const func =
-	rb_block_given_p() ? uniq_iter : uniq_func;
-
-    hash = rb_obj_hide(rb_hash_new());
-    rb_block_call(obj, id_each, 0, 0, func, hash);
-    ret = rb_hash_values(hash);
-    rb_hash_clear(hash);
-    return ret;
-}
-
 /*
  *  The <code>Enumerable</code> mixin provides collection classes with
  *  several traversal and searching methods, and with the ability to
@@ -3875,7 +3232,6 @@ Init_Enumerable(void)
     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, "grep_v", enum_grep_v, 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);
@@ -3916,13 +3272,9 @@ Init_Enumerable(void)
     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, 0);
+    rb_define_method(rb_mEnumerable, "chunk", enum_chunk, -1);
     rb_define_method(rb_mEnumerable, "slice_before", enum_slice_before, -1);
     rb_define_method(rb_mEnumerable, "slice_after", enum_slice_after, -1);
-    rb_define_method(rb_mEnumerable, "slice_when", enum_slice_when, 0);
-    rb_define_method(rb_mEnumerable, "chunk_while", enum_chunk_while, 0);
-    rb_define_method(rb_mEnumerable, "sum", enum_sum, -1);
-    rb_define_method(rb_mEnumerable, "uniq", enum_uniq, 0);
 
     id_next = rb_intern("next");
     id_call = rb_intern("call");
diff --git a/enumerator.c b/enumerator.c
index 9de08d7d2a..eaa3d73464 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -12,6 +12,8 @@
 
 ************************************************/
 
+#include "ruby/ruby.h"
+#include "node.h"
 #include "internal.h"
 
 /*
@@ -118,7 +120,6 @@ struct enumerator {
     VALUE feedvalue;
     VALUE stop_exc;
     VALUE size;
-    VALUE procs;
     rb_enumerator_size_func *size_fn;
 };
 
@@ -126,26 +127,12 @@ static VALUE rb_cGenerator, rb_cYielder;
 
 struct generator {
     VALUE proc;
-    VALUE obj;
 };
 
 struct yielder {
     VALUE proc;
 };
 
-typedef struct MEMO *lazyenum_proc_func(VALUE, struct MEMO *, VALUE, long);
-typedef VALUE lazyenum_size_func(VALUE, VALUE);
-typedef struct {
-    lazyenum_proc_func *proc;
-    lazyenum_size_func *size;
-} lazyenum_funcs;
-
-struct proc_entry {
-    VALUE proc;
-    VALUE memo;
-    const lazyenum_funcs *fn;
-};
-
 static VALUE generator_allocate(VALUE klass);
 static VALUE generator_init(VALUE obj, VALUE proc);
 
@@ -164,7 +151,6 @@ enumerator_mark(void *p)
     rb_gc_mark(ptr->feedvalue);
     rb_gc_mark(ptr->stop_exc);
     rb_gc_mark(ptr->size);
-    rb_gc_mark(ptr->procs);
 }
 
 #define enumerator_free RUBY_TYPED_DEFAULT_FREE
@@ -172,7 +158,7 @@ enumerator_mark(void *p)
 static size_t
 enumerator_memsize(const void *p)
 {
-    return sizeof(struct enumerator);
+    return p ? sizeof(struct enumerator) : 0;
 }
 
 static const rb_data_type_t enumerator_data_type = {
@@ -182,7 +168,7 @@ static const rb_data_type_t enumerator_data_type = {
 	enumerator_free,
 	enumerator_memsize,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct enumerator *
@@ -197,41 +183,6 @@ enumerator_ptr(VALUE obj)
     return ptr;
 }
 
-static void
-proc_entry_mark(void *p)
-{
-    struct proc_entry *ptr = p;
-    rb_gc_mark(ptr->proc);
-    rb_gc_mark(ptr->memo);
-}
-
-#define proc_entry_free RUBY_TYPED_DEFAULT_FREE
-
-static size_t
-proc_entry_memsize(const void *p)
-{
-    return p ? sizeof(struct proc_entry) : 0;
-}
-
-static const rb_data_type_t proc_entry_data_type = {
-    "proc_entry",
-    {
-	proc_entry_mark,
-	proc_entry_free,
-	proc_entry_memsize,
-    },
-};
-
-static struct proc_entry *
-proc_entry_ptr(VALUE proc_entry)
-{
-    struct proc_entry *ptr;
-
-    TypedData_Get_Struct(proc_entry, struct proc_entry, &proc_entry_data_type, ptr);
-
-    return ptr;
-}
-
 /*
  * call-seq:
  *   obj.to_enum(method = :each, *args)                 -> enum
@@ -544,9 +495,9 @@ enumerator_each(int argc, VALUE *argv, VALUE obj)
 static VALUE
 enumerator_with_index_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    struct MEMO *memo = (struct MEMO *)m;
-    VALUE idx = memo->v1;
-    MEMO_V1_SET(memo, rb_int_succ(idx));
+    NODE *memo = (NODE *)m;
+    VALUE idx = memo->u1.value;
+    memo->u1.value = rb_int_succ(idx);
 
     if (argc <= 1)
 	return rb_yield_values(2, val, idx);
@@ -586,7 +537,7 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
 	memo = INT2FIX(0);
     else
 	memo = rb_to_int(memo);
-    return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)MEMO_NEW(memo, 0, 0));
+    return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)NEW_MEMO(memo, 0, 0));
 }
 
 /*
@@ -981,7 +932,6 @@ enumerator_rewind(VALUE obj)
     return obj;
 }
 
-static struct generator *generator_ptr(VALUE obj);
 static VALUE append_method(VALUE obj, VALUE str, ID default_method, VALUE default_args);
 
 static VALUE
@@ -1004,25 +954,6 @@ inspect_enumerator(VALUE obj, VALUE dummy, int recur)
 	return str;
     }
 
-    if (e->procs) {
-	long i;
-
-	eobj = generator_ptr(e->obj)->obj;
-	/* In case procs chained enumerator traversing all proc entries manually */
-	if (rb_obj_class(eobj) == cname) {
-	    str = rb_inspect(eobj);
-	}
-	else {
-	    str = rb_sprintf("#<%"PRIsVALUE": %+"PRIsVALUE">", rb_class_path(cname), eobj);
-	}
-	for (i = 0; i < RARRAY_LEN(e->procs); i++) {
-	    str = rb_sprintf("#<%"PRIsVALUE": %"PRIsVALUE, cname, str);
-	    append_method(RARRAY_AREF(e->procs, i), str, e->meth, e->args);
-	    rb_str_buf_cat2(str, ">");
-	}
-	return str;
-    }
-
     eobj = rb_attr_get(obj, id_receiver);
     if (NIL_P(eobj)) {
 	eobj = e->obj;
@@ -1111,23 +1042,6 @@ enumerator_size(VALUE obj)
     const VALUE *argv = NULL;
     VALUE size;
 
-    if (e->procs) {
-	struct generator *g = generator_ptr(e->obj);
-	VALUE receiver = rb_check_funcall(g->obj, id_size, 0, 0);
-	long i = 0;
-
-	for (i = 0; i < RARRAY_LEN(e->procs); i++) {
-	    VALUE proc = RARRAY_AREF(e->procs, i);
-	    struct proc_entry *entry = proc_entry_ptr(proc);
-	    lazyenum_size_func *size = entry->fn->size;
-	    if (!size) {
-		return Qnil;
-	    }
-	    receiver = (*size)(proc, receiver);
-	}
-	return receiver;
-    }
-
     if (e->size_fn) {
 	return (*e->size_fn)(e->obj, e->args, obj);
     }
@@ -1155,7 +1069,7 @@ yielder_mark(void *p)
 static size_t
 yielder_memsize(const void *p)
 {
-    return sizeof(struct yielder);
+    return p ? sizeof(struct yielder) : 0;
 }
 
 static const rb_data_type_t yielder_data_type = {
@@ -1165,7 +1079,7 @@ static const rb_data_type_t yielder_data_type = {
 	yielder_free,
 	yielder_memsize,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct yielder *
@@ -1255,7 +1169,6 @@ generator_mark(void *p)
 {
     struct generator *ptr = p;
     rb_gc_mark(ptr->proc);
-    rb_gc_mark(ptr->obj);
 }
 
 #define generator_free RUBY_TYPED_DEFAULT_FREE
@@ -1263,7 +1176,7 @@ generator_mark(void *p)
 static size_t
 generator_memsize(const void *p)
 {
-    return sizeof(struct generator);
+    return p ? sizeof(struct generator) : 0;
 }
 
 static const rb_data_type_t generator_data_type = {
@@ -1273,7 +1186,7 @@ static const rb_data_type_t generator_data_type = {
 	generator_free,
 	generator_memsize,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct generator *
@@ -1334,8 +1247,8 @@ generator_initialize(int argc, VALUE *argv, VALUE obj)
 
 	if (!rb_obj_is_proc(proc))
 	    rb_raise(rb_eTypeError,
-		     "wrong argument type %"PRIsVALUE" (expected Proc)",
-		     rb_obj_class(proc));
+		     "wrong argument type %s (expected Proc)",
+		     rb_obj_classname(proc));
 
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
@@ -1420,14 +1333,14 @@ lazy_init_iterator(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
     else {
 	VALUE args;
 	int len = rb_long2int((long)argc + 1);
-	VALUE *nargv = ALLOCV_N(VALUE, args, len);
 
-	nargv[0] = m;
+	args = rb_ary_tmp_new(len);
+	rb_ary_push(args, m);
 	if (argc > 0) {
-	    MEMCPY(nargv + 1, argv, VALUE, argc);
+	    rb_ary_cat(args, argv, argc);
 	}
-	result = rb_yield_values2(len, nargv);
-	ALLOCV_END(args);
+	result = rb_yield_values2(len, RARRAY_CONST_PTR(args));
+	RB_GC_GUARD(args);
     }
     if (result == Qundef) rb_iter_break();
     return Qnil;
@@ -1440,84 +1353,6 @@ lazy_init_block_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
     return Qnil;
 }
 
-#define memo_value v2
-#define memo_flags u3.state
-#define LAZY_MEMO_BREAK 1
-#define LAZY_MEMO_PACKED 2
-#define LAZY_MEMO_BREAK_P(memo) ((memo)->memo_flags & LAZY_MEMO_BREAK)
-#define LAZY_MEMO_PACKED_P(memo) ((memo)->memo_flags & LAZY_MEMO_PACKED)
-#define LAZY_MEMO_SET_BREAK(memo) ((memo)->memo_flags |= LAZY_MEMO_BREAK)
-#define LAZY_MEMO_SET_VALUE(memo, value) MEMO_V2_SET(memo, value)
-
-static VALUE
-lazy_init_yielder(VALUE val, VALUE m, int argc, VALUE *argv)
-{
-    VALUE yielder = RARRAY_AREF(m, 0);
-    VALUE procs_array = RARRAY_AREF(m, 1);
-    VALUE memos = rb_attr_get(yielder, id_memo);
-    long i = 0;
-    struct MEMO *result;
-    int cont = 1;
-
-    result = MEMO_NEW(Qnil, rb_enum_values_pack(argc, argv),
-		      argc > 1 ? LAZY_MEMO_PACKED : 0);
-
-    for (i = 0; i < RARRAY_LEN(procs_array); i++) {
-	VALUE proc = RARRAY_AREF(procs_array, i);
-	struct proc_entry *entry = proc_entry_ptr(proc);
-	if (!(*entry->fn->proc)(proc, result, memos, i)) {
-	    cont = 0;
-	    break;
-	}
-    }
-
-    if (cont) {
-	rb_funcall2(yielder, id_yield, 1, &(result->memo_value));
-    }
-    if (LAZY_MEMO_BREAK_P(result)) {
-	rb_iter_break();
-    }
-    return result->memo_value;
-}
-
-static VALUE
-lazy_init_block(VALUE val, VALUE m, int argc, VALUE *argv)
-{
-    VALUE procs = RARRAY_AREF(m, 1);
-
-    rb_ivar_set(val, id_memo, rb_ary_new2(RARRAY_LEN(procs)));
-    rb_block_call(RARRAY_AREF(m, 0), id_each, 0, 0,
-		  lazy_init_yielder, rb_ary_new3(2, val, procs));
-    return Qnil;
-}
-
-static VALUE
-lazy_generator_init(VALUE enumerator, VALUE procs)
-{
-    VALUE generator;
-    VALUE obj;
-    struct generator *gen_ptr;
-    struct enumerator *e = enumerator_ptr(enumerator);
-
-    if (RARRAY_LEN(procs) > 0) {
-	struct generator *old_gen_ptr = generator_ptr(e->obj);
-	obj = old_gen_ptr->obj;
-    }
-    else {
-	obj = enumerator;
-    }
-
-    generator = generator_allocate(rb_cGenerator);
-
-    rb_block_call(generator, id_initialize, 0, 0,
-		  lazy_init_block, rb_ary_new3(2, obj, procs));
-
-    gen_ptr = generator_ptr(generator);
-    gen_ptr->obj = obj;
-
-    return generator;
-}
-
 /*
  * call-seq:
  *   Lazy.new(obj, size=nil) { |yielder, *values| ... }
@@ -1568,10 +1403,11 @@ lazy_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static void
-lazy_set_args(VALUE lazy, VALUE args)
+static VALUE
+lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
 {
     ID id = rb_frame_this_func();
+    struct enumerator *e = enumerator_ptr(lazy);
     rb_ivar_set(lazy, id_method, ID2SYM(id));
     if (NIL_P(args)) {
 	/* Qfalse indicates that the arguments are empty */
@@ -1580,63 +1416,16 @@ lazy_set_args(VALUE lazy, VALUE args)
     else {
 	rb_ivar_set(lazy, id_arguments, args);
     }
-}
-
-static VALUE
-lazy_set_method(VALUE lazy, VALUE args, rb_enumerator_size_func *size_fn)
-{
-    struct enumerator *e = enumerator_ptr(lazy);
-    lazy_set_args(lazy, args);
     e->size_fn = size_fn;
     return lazy;
 }
 
-static VALUE
-lazy_add_method(VALUE obj, int argc, VALUE *argv, VALUE args, VALUE memo,
-		const lazyenum_funcs *fn)
-{
-    struct enumerator *new_e;
-    VALUE new_obj;
-    VALUE new_generator;
-    VALUE new_procs;
-    struct enumerator *e = enumerator_ptr(obj);
-    struct proc_entry *entry;
-    VALUE entry_obj = TypedData_Make_Struct(rb_cObject, struct proc_entry,
-					    &proc_entry_data_type, entry);
-    if (rb_block_given_p()) {
-	entry->proc = rb_block_proc();
-    }
-    entry->fn = fn;
-    entry->memo = args;
-
-    lazy_set_args(entry_obj, memo);
-
-    new_procs = RTEST(e->procs) ? rb_ary_dup(e->procs) : rb_ary_new();
-    new_generator = lazy_generator_init(obj, new_procs);
-    rb_ary_push(new_procs, entry_obj);
-
-    new_obj = enumerator_init_copy(enumerator_allocate(rb_cLazy), obj);
-    new_e = DATA_PTR(new_obj);
-    new_e->obj = new_generator;
-    new_e->procs = new_procs;
-
-    if (argc > 0) {
-	new_e->meth = rb_to_id(*argv++);
-	--argc;
-    }
-    else {
-	new_e->meth = id_each;
-    }
-    new_e->args = rb_ary_new4(argc, argv);
-    return new_obj;
-}
-
 /*
  * call-seq:
  *   e.lazy -> lazy_enumerator
  *
  * Returns a lazy enumerator, whose methods map/collect,
- * flat_map/collect_concat, select/find_all, reject, grep, grep_v, zip, take,
+ * flat_map/collect_concat, select/find_all, reject, grep, zip, take,
  * take_while, drop, and drop_while enumerate values only on an
  * as-needed basis.  However, if a block is given to zip, values
  * are enumerated immediately.
@@ -1718,44 +1507,14 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-lazyenum_yield(VALUE proc_entry, struct MEMO *result)
-{
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    return rb_proc_call_with_block(entry->proc, 1, &result->memo_value, Qnil);
-}
-
-static VALUE
-lazyenum_yield_values(VALUE proc_entry, struct MEMO *result)
-{
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    int argc = 1;
-    const VALUE *argv = &result->memo_value;
-    if (LAZY_MEMO_PACKED_P(result)) {
-	const VALUE args = *argv;
-	argc = RARRAY_LENINT(args);
-	argv = RARRAY_CONST_PTR(args);
-    }
-    return rb_proc_call_with_block(entry->proc, argc, argv, Qnil);
-}
-
-static struct MEMO *
-lazy_map_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+lazy_map_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    VALUE value = lazyenum_yield_values(proc_entry, result);
-    LAZY_MEMO_SET_VALUE(result, value);
-    return result;
-}
+    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
 
-static VALUE
-lazy_map_size(VALUE entry, VALUE receiver)
-{
-    return receiver;
+    rb_funcall(argv[0], id_yield, 1, result);
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_map_funcs = {
-    lazy_map_proc, lazy_map_size,
-};
-
 static VALUE
 lazy_map(VALUE obj)
 {
@@ -1763,13 +1522,15 @@ lazy_map(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy map without a block");
     }
 
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_map_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_map_func, 0),
+			   Qnil, lazy_receiver_size);
 }
 
 static VALUE
 lazy_flat_map_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, yielder))
 {
-    return rb_funcallv(yielder, id_yield, argc, argv);
+    return rb_funcall2(yielder, id_yield, argc, argv);
 }
 
 static VALUE
@@ -1796,7 +1557,7 @@ lazy_flat_map_to_ary(VALUE obj, VALUE yielder)
 }
 
 static VALUE
-lazy_flat_map_proc(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+lazy_flat_map_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
     VALUE result = rb_yield_values2(argc - 1, &argv[1]);
     if (RB_TYPE_P(result, T_ARRAY)) {
@@ -1847,21 +1608,20 @@ lazy_flat_map(VALUE obj)
     }
 
     return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 lazy_flat_map_proc, 0),
+					 lazy_flat_map_func, 0),
 			   Qnil, 0);
 }
 
-static struct MEMO *
-lazy_select_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_select_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    VALUE chain = lazyenum_yield(proc_entry, result);
-    if (!RTEST(chain)) return 0;
-    return result;
-}
+    VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
 
-static const lazyenum_funcs lazy_select_funcs = {
-    lazy_select_proc, 0,
-};
+    if (RTEST(rb_yield(element))) {
+	return rb_funcall(argv[0], id_yield, 1, element);
+    }
+    return Qnil;
+}
 
 static VALUE
 lazy_select(VALUE obj)
@@ -1870,20 +1630,21 @@ lazy_select(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy select without a block");
     }
 
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_select_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_select_func, 0),
+			   Qnil, 0);
 }
 
-static struct MEMO *
-lazy_reject_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_reject_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
-    VALUE chain = lazyenum_yield(proc_entry, result);
-    if (RTEST(chain)) return 0;
-    return result;
-}
+    VALUE element = rb_enum_values_pack(argc - 1, argv + 1);
 
-static const lazyenum_funcs lazy_reject_funcs = {
-    lazy_reject_proc, 0,
-};
+    if (!RTEST(rb_yield(element))) {
+	return rb_funcall(argv[0], id_yield, 1, element);
+    }
+    return Qnil;
+}
 
 static VALUE
 lazy_reject(VALUE obj)
@@ -1892,77 +1653,41 @@ lazy_reject(VALUE obj)
 	rb_raise(rb_eArgError, "tried to call lazy reject without a block");
     }
 
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_reject_funcs);
-}
-
-static struct MEMO *
-lazy_grep_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
-{
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
-    if (!RTEST(chain)) return 0;
-    return result;
-}
-
-static struct MEMO *
-lazy_grep_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
-{
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE value, chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
-
-    if (!RTEST(chain)) return 0;
-    value = rb_proc_call_with_block(entry->proc, 1, &(result->memo_value), Qnil);
-    LAZY_MEMO_SET_VALUE(result, value);
-
-    return result;
-}
-
-static const lazyenum_funcs lazy_grep_iter_funcs = {
-    lazy_grep_iter_proc, 0,
-};
-
-static const lazyenum_funcs lazy_grep_funcs = {
-    lazy_grep_proc, 0,
-};
-
-static VALUE
-lazy_grep(VALUE obj, VALUE pattern)
-{
-    const lazyenum_funcs *const funcs = rb_block_given_p() ?
-	&lazy_grep_iter_funcs : &lazy_grep_funcs;
-    return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_reject_func, 0),
+			   Qnil, 0);
 }
 
 static VALUE
-lazy_grep_v_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+lazy_grep_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
     VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
     VALUE result = rb_funcall(m, id_eqq, 1, i);
 
-    if (!RTEST(result)) {
+    if (RTEST(result)) {
 	rb_funcall(argv[0], id_yield, 1, i);
     }
     return Qnil;
 }
 
 static VALUE
-lazy_grep_v_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+lazy_grep_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
 {
     VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
     VALUE result = rb_funcall(m, id_eqq, 1, i);
 
-    if (!RTEST(result)) {
+    if (RTEST(result)) {
 	rb_funcall(argv[0], id_yield, 1, rb_yield(i));
     }
     return Qnil;
 }
 
 static VALUE
-lazy_grep_v(VALUE obj, VALUE pattern)
+lazy_grep(VALUE obj, VALUE pattern)
 {
     return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
 					 rb_block_given_p() ?
-					 lazy_grep_v_iter : lazy_grep_v_func,
+					 lazy_grep_iter : lazy_grep_func,
 					 pattern),
 			   rb_ary_new3(1, pattern), 0);
 }
@@ -2048,8 +1773,8 @@ lazy_zip(int argc, VALUE *argv, VALUE obj)
 	if (NIL_P(v)) {
 	    for (; i < argc; i++) {
 		if (!rb_respond_to(argv[i], id_each)) {
-		    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
-			     rb_obj_class(argv[i]));
+		    rb_raise(rb_eTypeError, "wrong argument type %s (must respond to :each)",
+			rb_obj_classname(argv[i]));
 		}
 	    }
 	    ary = rb_ary_new4(argc, argv);
@@ -2064,90 +1789,80 @@ lazy_zip(int argc, VALUE *argv, VALUE obj)
 			   ary, lazy_receiver_size);
 }
 
-static struct MEMO *
-lazy_take_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_take_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
     long remain;
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE memo = rb_ary_entry(memos, memo_index);
-
+    VALUE memo = rb_attr_get(argv[0], id_memo);
     if (NIL_P(memo)) {
-	memo = entry->memo;
+	memo = args;
     }
 
-    remain = NUM2LONG(memo);
-    if (remain == 0) {
-	LAZY_MEMO_SET_BREAK(result);
+    rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
+    if ((remain = NUM2LONG(memo)-1) == 0) {
+	return Qundef;
     }
     else {
-	if (--remain == 0) LAZY_MEMO_SET_BREAK(result);
-	rb_ary_store(memos, memo_index, LONG2NUM(remain));
+	rb_ivar_set(argv[0], id_memo, LONG2NUM(remain));
+	return Qnil;
     }
-    return result;
 }
 
 static VALUE
-lazy_take_size(VALUE entry, VALUE receiver)
+lazy_take_size(VALUE generator, VALUE args, VALUE lazy)
 {
-    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(entry, id_arguments), 0));
+    VALUE receiver = lazy_size(lazy);
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(lazy, id_arguments), 0));
     if (NIL_P(receiver) || (FIXNUM_P(receiver) && FIX2LONG(receiver) < len))
 	return receiver;
     return LONG2NUM(len);
 }
 
-static const lazyenum_funcs lazy_take_funcs = {
-    lazy_take_proc, lazy_take_size,
-};
-
 static VALUE
 lazy_take(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
-    int argc = 0;
-    VALUE argv[2];
+    VALUE lazy;
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
-
     if (len == 0) {
-       argv[0] = sym_cycle;
-       argv[1] = INT2NUM(0);
-       argc = 2;
+	VALUE len = INT2FIX(0);
+	lazy = lazy_to_enum_i(obj, sym_cycle, 1, &len, 0);
     }
-
-    return lazy_add_method(obj, argc, argv, n, rb_ary_new3(1, n), &lazy_take_funcs);
+    else {
+	lazy = rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_take_func, n);
+    }
+    return lazy_set_method(lazy, rb_ary_new3(1, n), lazy_take_size);
 }
 
-static struct MEMO *
-lazy_take_while_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_take_while_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
-    VALUE take = lazyenum_yield_values(proc_entry, result);
-    if (!RTEST(take)) {
-	LAZY_MEMO_SET_BREAK(result);
-	return 0;
-    }
-    return result;
+    VALUE result = rb_yield_values2(argc - 1, &argv[1]);
+    if (!RTEST(result)) return Qundef;
+    rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_take_while_funcs = {
-    lazy_take_while_proc, 0,
-};
-
 static VALUE
 lazy_take_while(VALUE obj)
 {
     if (!rb_block_given_p()) {
 	rb_raise(rb_eArgError, "tried to call lazy take_while without a block");
     }
-
-    return lazy_add_method(obj, 0, 0, Qnil, Qnil, &lazy_take_while_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_take_while_func, 0),
+			   Qnil, 0);
 }
 
 static VALUE
-lazy_drop_size(VALUE proc_entry, VALUE receiver)
+lazy_drop_size(VALUE generator, VALUE args, VALUE lazy)
 {
-    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(proc_entry, id_arguments), 0));
+    long len = NUM2LONG(RARRAY_AREF(rb_ivar_get(lazy, id_arguments), 0));
+    VALUE receiver = lazy_size(lazy);
     if (NIL_P(receiver))
 	return receiver;
     if (FIXNUM_P(receiver)) {
@@ -2157,110 +1872,58 @@ lazy_drop_size(VALUE proc_entry, VALUE receiver)
     return rb_funcall(receiver, '-', 1, LONG2NUM(len));
 }
 
-static struct MEMO *
-lazy_drop_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
+static VALUE
+lazy_drop_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
     long remain;
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE memo = rb_ary_entry(memos, memo_index);
-
+    VALUE memo = rb_attr_get(argv[0], id_memo);
     if (NIL_P(memo)) {
-	memo = entry->memo;
+	memo = args;
     }
-    remain = NUM2LONG(memo);
-    if (remain > 0) {
-	--remain;
-	rb_ary_store(memos, memo_index, LONG2NUM(remain));
-	return 0;
+    if ((remain = NUM2LONG(memo)) == 0) {
+	rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
     }
-
-    return result;
+    else {
+	rb_ivar_set(argv[0], id_memo, LONG2NUM(--remain));
+    }
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_drop_funcs = {
-    lazy_drop_proc, lazy_drop_size,
-};
-
 static VALUE
 lazy_drop(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
-    VALUE argv[2];
-    argv[0] = sym_each;
-    argv[1] = n;
 
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to drop negative size");
     }
-
-    return lazy_add_method(obj, 2, argv, n, rb_ary_new3(1, n), &lazy_drop_funcs);
+    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
+					 lazy_drop_func, n),
+			   rb_ary_new3(1, n), lazy_drop_size);
 }
 
-static struct MEMO *
-lazy_drop_while_proc(VALUE proc_entry, struct MEMO* result, VALUE memos, long memo_index)
+static VALUE
+lazy_drop_while_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, args))
 {
-    struct proc_entry *entry = proc_entry_ptr(proc_entry);
-    VALUE memo = rb_ary_entry(memos, memo_index);
-
-    if (NIL_P(memo)) {
-	memo = entry->memo;
+    VALUE memo = rb_attr_get(argv[0], id_memo);
+    if (NIL_P(memo) && !RTEST(rb_yield_values2(argc - 1, &argv[1]))) {
+	rb_ivar_set(argv[0], id_memo, memo = Qtrue);
     }
-
-    if (!RTEST(memo)) {
-	VALUE drop = lazyenum_yield_values(proc_entry, result);
-	if (RTEST(drop)) return 0;
-	rb_ary_store(memos, memo_index, Qtrue);
+    if (memo == Qtrue) {
+	rb_funcall2(argv[0], id_yield, argc - 1, argv + 1);
     }
-    return result;
+    return Qnil;
 }
 
-static const lazyenum_funcs lazy_drop_while_funcs = {
-    lazy_drop_while_proc, 0,
-};
-
 static VALUE
 lazy_drop_while(VALUE obj)
 {
     if (!rb_block_given_p()) {
 	rb_raise(rb_eArgError, "tried to call lazy drop_while without a block");
     }
-
-    return lazy_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs);
-}
-
-static VALUE
-lazy_uniq_i(VALUE i, VALUE hash, int argc, const VALUE *argv, VALUE yielder)
-{
-    if (rb_hash_add_new_element(hash, i, Qfalse))
-	return Qnil;
-    return rb_funcallv(yielder, id_yield, argc, argv);
-}
-
-static VALUE
-lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
-{
-    VALUE yielder = (--argc, *argv++);
-    i = rb_enum_values_pack(argc, argv);
-    return lazy_uniq_i(i, hash, argc, argv, yielder);
-}
-
-static VALUE
-lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash))
-{
-    VALUE yielder = (--argc, *argv++);
-    i = rb_yield_values2(argc, argv);
-    return lazy_uniq_i(i, hash, argc, argv, yielder);
-}
-
-static VALUE
-lazy_uniq(VALUE obj)
-{
-    rb_block_call_func *const func =
-	rb_block_given_p() ? lazy_uniq_iter : lazy_uniq_func;
-    VALUE hash = rb_obj_hide(rb_hash_new());
     return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 func, hash),
-			   0, 0);
+					 lazy_drop_while_func, 0),
+			   Qnil, 0);
 }
 
 static VALUE
@@ -2368,7 +2031,6 @@ InitVM_Enumerator(void)
     rb_define_method(rb_cLazy, "find_all", lazy_select, 0);
     rb_define_method(rb_cLazy, "reject", lazy_reject, 0);
     rb_define_method(rb_cLazy, "grep", lazy_grep, 1);
-    rb_define_method(rb_cLazy, "grep_v", lazy_grep_v, 1);
     rb_define_method(rb_cLazy, "zip", lazy_zip, -1);
     rb_define_method(rb_cLazy, "take", lazy_take, 1);
     rb_define_method(rb_cLazy, "take_while", lazy_take_while, 0);
@@ -2378,9 +2040,6 @@ InitVM_Enumerator(void)
     rb_define_method(rb_cLazy, "chunk", lazy_super, -1);
     rb_define_method(rb_cLazy, "slice_before", lazy_super, -1);
     rb_define_method(rb_cLazy, "slice_after", lazy_super, -1);
-    rb_define_method(rb_cLazy, "slice_when", lazy_super, -1);
-    rb_define_method(rb_cLazy, "chunk_while", lazy_super, -1);
-    rb_define_method(rb_cLazy, "uniq", lazy_uniq, 0);
 
     rb_define_alias(rb_cLazy, "force", "to_a");
 
diff --git a/error.c b/error.c
index e03a4eea39..3c2b60ba3b 100644
--- a/error.c
+++ b/error.c
@@ -9,9 +9,10 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/st.h"
-#include "ruby_assert.h"
+#include "ruby/encoding.h"
+#include "internal.h"
 #include "vm_core.h"
 
 #include <stdio.h>
@@ -36,15 +37,9 @@
 #define WEXITSTATUS(status) (status)
 #endif
 
-VALUE rb_iseqw_local_variables(VALUE iseqval);
-VALUE rb_iseqw_new(const rb_iseq_t *);
-
 VALUE rb_eEAGAIN;
 VALUE rb_eEWOULDBLOCK;
 VALUE rb_eEINPROGRESS;
-VALUE rb_mWarning;
-
-static ID id_warn;
 
 extern const char ruby_description[];
 
@@ -54,6 +49,9 @@ static const char REPORTBUG_MSG[] =
 	" or extension libraries.\n" \
 	"Bug reports are welcome.\n" \
 	""
+#if defined __APPLE__
+	"Don't forget to include the above Crash Report log file.\n"
+#endif
 	"For details: http://www.ruby-lang.org/bugreport.html\n\n" \
     ;
 
@@ -83,9 +81,10 @@ err_position_0(char *buf, long len, const char *file, int line)
 }
 
 static VALUE
-err_vcatf(VALUE str, const char *pre, const char *file, int line,
-	  const char *fmt, va_list args)
+compile_snprintf(rb_encoding *enc, const char *pre, const char *file, int line, const char *fmt, va_list args)
 {
+    VALUE str = rb_enc_str_new(0, 0, enc);
+
     if (file) {
 	rb_str_cat2(str, file);
 	if (line) rb_str_catf(str, ":%d", line);
@@ -96,181 +95,154 @@ err_vcatf(VALUE str, const char *pre, const char *file, int line,
     return str;
 }
 
-VALUE
-rb_syntax_error_append(VALUE exc, VALUE file, int line, int column,
-		       rb_encoding *enc, const char *fmt, va_list args)
-{
-    const char *fn = NIL_P(file) ? NULL : RSTRING_PTR(file);
-    if (!exc) {
-	VALUE mesg = rb_enc_str_new(0, 0, enc);
-	err_vcatf(mesg, NULL, fn, line, fmt, args);
-	rb_str_cat2(mesg, "\n");
-	rb_write_error_str(mesg);
+static void
+compile_err_append(VALUE mesg)
+{
+    rb_thread_t *th = GET_THREAD();
+    VALUE err = th->errinfo;
+    rb_block_t *prev_base_block = th->base_block;
+    th->base_block = 0;
+    /* base_block should be zero while normal Ruby execution */
+    /* after this line, any Ruby code *can* run */
+
+    if (th->mild_compile_error) {
+	if (RTEST(err)) {
+	    VALUE str = rb_obj_as_string(err);
+
+	    rb_str_cat2(str, "\n");
+	    rb_str_append(str, mesg);
+	    mesg = str;
+	}
+	err = rb_exc_new3(rb_eSyntaxError, mesg);
+	th->errinfo = err;
     }
     else {
-	VALUE mesg;
-	if (NIL_P(exc)) {
-	    mesg = rb_enc_str_new(0, 0, enc);
-	    exc = rb_class_new_instance(1, &mesg, rb_eSyntaxError);
-	}
-	else {
-	    mesg = rb_attr_get(exc, idMesg);
-	    if (RSTRING_LEN(mesg) > 0 && *(RSTRING_END(mesg)-1) != '\n')
-		rb_str_cat_cstr(mesg, "\n");
+	if (!RTEST(err)) {
+	    err = rb_exc_new2(rb_eSyntaxError, "compile error");
+	    th->errinfo = err;
 	}
-	err_vcatf(mesg, NULL, fn, line, fmt, args);
+	rb_str_cat2(mesg, "\n");
+	rb_write_error_str(mesg);
     }
 
-    return exc;
+    /* returned to the parser world */
+    th->base_block = prev_base_block;
 }
 
 void
 rb_compile_error_with_enc(const char *file, int line, void *enc, const char *fmt, ...)
 {
-    ONLY_FOR_INTERNAL_USE("rb_compile_error_with_enc()");
+    va_list args;
+    VALUE str;
+
+    va_start(args, fmt);
+    str = compile_snprintf(enc, NULL, file, line, fmt, args);
+    va_end(args);
+    compile_err_append(str);
 }
 
 void
 rb_compile_error(const char *file, int line, const char *fmt, ...)
 {
-    ONLY_FOR_INTERNAL_USE("rb_compile_error()");
-}
+    va_list args;
+    VALUE str;
 
-void
-rb_compile_error_append(const char *fmt, ...)
-{
-    ONLY_FOR_INTERNAL_USE("rb_compile_error_append()");
+    va_start(args, fmt);
+    str = compile_snprintf(NULL, NULL, file, line, fmt, args);
+    va_end(args);
+    compile_err_append(str);
 }
 
 void
-ruby_only_for_internal_use(const char *func)
+rb_compile_error_append(const char *fmt, ...)
 {
-    rb_print_backtrace();
-    rb_fatal("%s is only for internal use and deprecated; do not use", func);
-}
+    va_list args;
+    VALUE str;
 
-static VALUE
-rb_warning_s_warn(VALUE mod, VALUE str)
-{
-    Check_Type(str, T_STRING);
-    rb_must_asciicompat(str);
-    rb_write_error_str(str);
-    return Qnil;
+    va_start(args, fmt);
+    str = rb_vsprintf(fmt, args);
+    va_end(args);
+    compile_err_append(str);
 }
 
 static void
-rb_write_warning_str(VALUE str)
-{
-    rb_funcall(rb_mWarning, id_warn, 1, str);
-}
-
-static VALUE
-warn_vsprintf(rb_encoding *enc, const char *file, int line, const char *fmt, va_list args)
+compile_warn_print(const char *file, int line, const char *fmt, va_list args)
 {
-    VALUE str = rb_enc_str_new(0, 0, enc);
+    VALUE str;
 
-    err_vcatf(str, "warning: ", file, line, fmt, args);
-    return rb_str_cat2(str, "\n");
+    str = compile_snprintf(NULL, "warning: ", file, line, fmt, args);
+    rb_str_cat2(str, "\n");
+    rb_write_error_str(str);
 }
 
 void
 rb_compile_warn(const char *file, int line, const char *fmt, ...)
 {
-    VALUE str;
     va_list args;
 
     if (NIL_P(ruby_verbose)) return;
 
     va_start(args, fmt);
-    str = warn_vsprintf(NULL, file, line, fmt, args);
+    compile_warn_print(file, line, fmt, args);
     va_end(args);
-    rb_write_warning_str(str);
 }
 
 /* rb_compile_warning() reports only in verbose mode */
 void
 rb_compile_warning(const char *file, int line, const char *fmt, ...)
 {
-    VALUE str;
     va_list args;
 
     if (!RTEST(ruby_verbose)) return;
 
     va_start(args, fmt);
-    str = warn_vsprintf(NULL, file, line, fmt, args);
+    compile_warn_print(file, line, fmt, args);
     va_end(args);
-    rb_write_warning_str(str);
 }
 
-static VALUE
-warning_string(rb_encoding *enc, const char *fmt, va_list args)
-{
-    int line;
-    VALUE file = rb_source_location(&line);
-
-    return warn_vsprintf(enc,
-			 NIL_P(file) ? NULL : RSTRING_PTR(file), line,
-			 fmt, args);
-}
-
-void
-rb_warn(const char *fmt, ...)
+static void
+warn_print(const char *fmt, va_list args)
 {
-    VALUE mesg;
-    va_list args;
+    VALUE str = rb_str_new(0, 0);
+    VALUE file = rb_sourcefilename();
 
-    if (NIL_P(ruby_verbose)) return;
+    if (!NIL_P(file)) {
+	int line = rb_sourceline();
+	str = rb_str_append(str, file);
+	if (line) rb_str_catf(str, ":%d", line);
+	rb_str_cat2(str, ": ");
+    }
 
-    va_start(args, fmt);
-    mesg = warning_string(0, fmt, args);
-    va_end(args);
-    rb_write_warning_str(mesg);
+    rb_str_cat2(str, "warning: ");
+    rb_str_vcatf(str, fmt, args);
+    rb_str_cat2(str, "\n");
+    rb_write_error_str(str);
 }
 
 void
-rb_enc_warn(rb_encoding *enc, const char *fmt, ...)
+rb_warn(const char *fmt, ...)
 {
-    VALUE mesg;
     va_list args;
 
     if (NIL_P(ruby_verbose)) return;
 
     va_start(args, fmt);
-    mesg = warning_string(enc, fmt, args);
+    warn_print(fmt, args);
     va_end(args);
-    rb_write_warning_str(mesg);
 }
 
 /* rb_warning() reports only in verbose mode */
 void
 rb_warning(const char *fmt, ...)
 {
-    VALUE mesg;
-    va_list args;
-
-    if (!RTEST(ruby_verbose)) return;
-
-    va_start(args, fmt);
-    mesg = warning_string(0, fmt, args);
-    va_end(args);
-    rb_write_warning_str(mesg);
-}
-
-#if 0
-void
-rb_enc_warning(rb_encoding *enc, const char *fmt, ...)
-{
-    VALUE mesg;
     va_list args;
 
     if (!RTEST(ruby_verbose)) return;
 
     va_start(args, fmt);
-    mesg = warning_string(enc, fmt, args);
+    warn_print(fmt, args);
     va_end(args);
-    rb_write_warning_str(mesg);
 }
-#endif
 
 /*
  * call-seq:
@@ -337,7 +309,7 @@ bug_report_file(const char *file, int line)
 }
 
 static void
-bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
+bug_report_begin(FILE *out, const char *fmt, va_list args)
 {
     char buf[REPORT_BUG_BUFSIZ];
 
@@ -351,7 +323,7 @@ bug_report_begin_valist(FILE *out, const char *fmt, va_list args)
 #define bug_report_begin(out, fmt) do { \
     va_list args; \
     va_start(args, fmt); \
-    bug_report_begin_valist(out, fmt, args); \
+    bug_report_begin(out, fmt, args); \
     va_end(args); \
 } while (0)
 
@@ -378,15 +350,6 @@ bug_report_end(FILE *out)
     } \
 } while (0) \
 
-#define report_bug_valist(file, line, fmt, ctx, args) do { \
-    FILE *out = bug_report_file(file, line); \
-    if (out) { \
-	bug_report_begin_valist(out, fmt, args); \
-	rb_vm_bugreport(ctx); \
-	bug_report_end(out); \
-    } \
-} while (0) \
-
 NORETURN(static void die(void));
 static void
 die(void)
@@ -405,7 +368,8 @@ rb_bug(const char *fmt, ...)
     int line = 0;
 
     if (GET_THREAD()) {
-	file = rb_source_loc(&line);
+	file = rb_sourcefile();
+	line = rb_sourceline();
     }
 
     report_bug(file, line, fmt, NULL);
@@ -420,7 +384,8 @@ rb_bug_context(const void *ctx, const char *fmt, ...)
     int line = 0;
 
     if (GET_THREAD()) {
-	file = rb_source_loc(&line);
+	file = rb_sourcefile();
+	line = rb_sourceline();
     }
 
     report_bug(file, line, fmt, ctx);
@@ -475,21 +440,11 @@ rb_async_bug_errno(const char *mesg, int errno_arg)
 }
 
 void
-rb_report_bug_valist(VALUE file, int line, const char *fmt, va_list args)
+rb_compile_bug(const char *file, int line, const char *fmt, ...)
 {
-    report_bug_valist(RSTRING_PTR(file), line, fmt, NULL, args);
-}
+    report_bug(file, line, fmt, NULL);
 
-void
-rb_assert_failure(const char *file, int line, const char *name, const char *expr)
-{
-    FILE *out = stderr;
-    fprintf(out, "Assertion Failed: %s:%d:", file, line);
-    if (name) fprintf(out, "%s:", name);
-    fprintf(out, "%s\n%s\n\n", expr, ruby_description);
-    rb_vm_bugreport(NULL);
-    bug_report_end(out);
-    die();
+    abort();
 }
 
 static const char builtin_types[][10] = {
@@ -515,11 +470,12 @@ static const char builtin_types[][10] = {
     "false",
     "Symbol",			/* :symbol */
     "Fixnum",
-    "undef",			/* internal use: #undef; should not happen */
+    "",				/* 0x16 */
     "",				/* 0x17 */
     "",				/* 0x18 */
     "",				/* 0x19 */
-    "Memo",			/* internal use: general memo */
+    "",				/* 0x1a */
+    "undef",			/* internal use: #undef; should not happen */
     "Node",			/* internal use: syntax tree node */
     "iClass",			/* internal use: mixed-in module holder */
 };
@@ -534,8 +490,9 @@ rb_builtin_type_name(int t)
     return 0;
 }
 
-static const char *
-builtin_class_name(VALUE x)
+#define builtin_class_name rb_builtin_class_name
+const char *
+rb_builtin_class_name(VALUE x)
 {
     const char *etype;
 
@@ -543,7 +500,7 @@ builtin_class_name(VALUE x)
 	etype = "nil";
     }
     else if (FIXNUM_P(x)) {
-	etype = "Integer";
+	etype = "Fixnum";
     }
     else if (SYMBOL_P(x)) {
 	etype = "Symbol";
@@ -555,74 +512,32 @@ builtin_class_name(VALUE x)
 	etype = "false";
     }
     else {
-	etype = NULL;
-    }
-    return etype;
-}
-
-const char *
-rb_builtin_class_name(VALUE x)
-{
-    const char *etype = builtin_class_name(x);
-
-    if (!etype) {
 	etype = rb_obj_classname(x);
     }
     return etype;
 }
 
-NORETURN(static void unexpected_type(VALUE, int, int));
-#define UNDEF_LEAKED "undef leaked to the Ruby space"
-
-static void
-unexpected_type(VALUE x, int xt, int t)
-{
-    const char *tname = rb_builtin_type_name(t);
-    VALUE mesg, exc = rb_eFatal;
-
-    if (tname) {
-	const char *cname = builtin_class_name(x);
-	if (cname)
-	    mesg = rb_sprintf("wrong argument type %s (expected %s)",
-			      cname, tname);
-	else
-	    mesg = rb_sprintf("wrong argument type %"PRIsVALUE" (expected %s)",
-			      rb_obj_class(x), tname);
-	exc = rb_eTypeError;
-    }
-    else if (xt > T_MASK && xt <= 0x3f) {
-	mesg = rb_sprintf("unknown type 0x%x (0x%x given, probably comes"
-			  " from extension library for ruby 1.8)", t, xt);
-    }
-    else {
-	mesg = rb_sprintf("unknown type 0x%x (0x%x given)", t, xt);
-    }
-    rb_exc_raise(rb_exc_new_str(exc, mesg));
-}
-
 void
 rb_check_type(VALUE x, int t)
 {
     int xt;
 
     if (x == Qundef) {
-	rb_bug(UNDEF_LEAKED);
+	rb_bug("undef leaked to the Ruby space");
     }
 
     xt = TYPE(x);
     if (xt != t || (xt == T_DATA && RTYPEDDATA_P(x))) {
-	unexpected_type(x, xt, t);
-    }
-}
-
-void
-rb_unexpected_type(VALUE x, int t)
-{
-    if (x == Qundef) {
-	rb_bug(UNDEF_LEAKED);
+	const char *tname = rb_builtin_type_name(t);
+	if (tname) {
+	    rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
+		     builtin_class_name(x), tname);
+	}
+	if (xt > T_MASK && xt <= 0x3f) {
+	    rb_fatal("unknown type 0x%x (0x%x given, probably comes from extension library for ruby 1.8)", t, xt);
+	}
+	rb_bug("unknown type 0x%x (0x%x given)", t, xt);
     }
-
-    unexpected_type(x, TYPE(x), t);
 }
 
 int
@@ -649,23 +564,19 @@ 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 (!RB_TYPE_P(obj, T_DATA)) {
-      wrong_type:
 	etype = builtin_class_name(obj);
-	if (!etype)
-	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (expected %s)",
-		     rb_obj_class(obj), data_type->wrap_struct_name);
-      wrong_datatype:
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-		 etype, data_type->wrap_struct_name);
+	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
     }
     if (!RTYPEDDATA_P(obj)) {
-	goto wrong_type;
+	etype = rb_obj_classname(obj);
+	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
     }
     else if (!rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) {
 	etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name;
-	goto wrong_datatype;
+	rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name);
     }
     return DATA_PTR(obj);
 }
@@ -700,22 +611,12 @@ VALUE rb_eSystemCallError;
 VALUE rb_mErrno;
 static VALUE rb_eNOERROR;
 
-static ID id_new, id_cause, id_message, id_backtrace;
-static ID id_name, id_args, id_Errno, id_errno, id_i_path;
-static ID id_receiver, id_iseq, id_local_variables;
-static ID id_private_call_p;
-extern ID ruby_static_id_status;
-#define id_bt idBt
-#define id_bt_locations idBt_locations
-#define id_mesg idMesg
-#define id_status ruby_static_id_status
-
 #undef rb_exc_new_cstr
 
 VALUE
 rb_exc_new(VALUE etype, const char *ptr, long len)
 {
-    return rb_funcall(etype, id_new, 1, rb_str_new(ptr, len));
+    return rb_funcall(etype, rb_intern("new"), 1, rb_str_new(ptr, len));
 }
 
 VALUE
@@ -728,7 +629,7 @@ VALUE
 rb_exc_new_str(VALUE etype, VALUE str)
 {
     StringValue(str);
-    return rb_funcall(etype, id_new, 1, str);
+    return rb_funcall(etype, rb_intern("new"), 1, str);
 }
 
 /*
@@ -745,8 +646,8 @@ exc_initialize(int argc, VALUE *argv, VALUE exc)
     VALUE arg;
 
     rb_scan_args(argc, argv, "01", &arg);
-    rb_ivar_set(exc, id_mesg, arg);
-    rb_ivar_set(exc, id_bt, Qnil);
+    rb_iv_set(exc, "mesg", arg);
+    rb_iv_set(exc, "bt", Qnil);
 
     return exc;
 }
@@ -788,7 +689,7 @@ exc_exception(int argc, VALUE *argv, VALUE self)
 static VALUE
 exc_to_s(VALUE exc)
 {
-    VALUE mesg = rb_attr_get(exc, idMesg);
+    VALUE mesg = rb_attr_get(exc, rb_intern("mesg"));
 
     if (NIL_P(mesg)) return rb_class_name(CLASS_OF(exc));
     return rb_String(mesg);
@@ -807,7 +708,7 @@ exc_to_s(VALUE exc)
 static VALUE
 exc_message(VALUE exc)
 {
-    return rb_funcallv(exc, idTo_s, 0, 0);
+    return rb_funcall(exc, rb_intern("to_s"), 0, 0);
 }
 
 /*
@@ -870,53 +771,38 @@ exc_inspect(VALUE exc)
 static VALUE
 exc_backtrace(VALUE exc)
 {
+    ID bt;
     VALUE obj;
 
-    obj = rb_attr_get(exc, id_bt);
+    CONST_ID(bt, "bt");
+    obj = rb_attr_get(exc, bt);
 
     if (rb_backtrace_p(obj)) {
 	obj = rb_backtrace_to_str_ary(obj);
-	/* rb_ivar_set(exc, id_bt, obj); */
+	/* rb_iv_set(exc, "bt", obj); */
     }
 
     return obj;
 }
 
-VALUE
-rb_get_backtrace(VALUE exc)
-{
-    ID mid = id_backtrace;
-    if (rb_method_basic_definition_p(CLASS_OF(exc), id_backtrace)) {
-	VALUE info, klass = rb_eException;
-	rb_thread_t *th = GET_THREAD();
-	if (NIL_P(exc))
-	    return Qnil;
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_C_CALL, exc, mid, mid, klass, Qundef);
-	info = exc_backtrace(exc);
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, exc, mid, mid, klass, info);
-	if (NIL_P(info))
-	    return Qnil;
-	return rb_check_backtrace(info);
-    }
-    return rb_funcall(exc, mid, 0, 0);
-}
-
 /*
  *  call-seq:
  *     exception.backtrace_locations    -> array
  *
  *  Returns any backtrace associated with the exception. This method is
  *  similar to Exception#backtrace, but the backtrace is an array of
- *  Thread::Backtrace::Location.
+ *   Thread::Backtrace::Location.
  *
  *  Now, this method is not affected by Exception#set_backtrace().
  */
 static VALUE
 exc_backtrace_locations(VALUE exc)
 {
+    ID bt_locations;
     VALUE obj;
 
-    obj = rb_attr_get(exc, id_bt_locations);
+    CONST_ID(bt_locations, "bt_locations");
+    obj = rb_attr_get(exc, bt_locations);
     if (!NIL_P(obj)) {
 	obj = rb_backtrace_to_location_ary(obj);
     }
@@ -958,7 +844,7 @@ rb_check_backtrace(VALUE bt)
 static VALUE
 exc_set_backtrace(VALUE exc, VALUE bt)
 {
-    return rb_ivar_set(exc, id_bt, rb_check_backtrace(bt));
+    return rb_iv_set(exc, "bt", rb_check_backtrace(bt));
 }
 
 VALUE
@@ -976,16 +862,20 @@ rb_exc_set_backtrace(VALUE exc, VALUE bt)
  * information.
  */
 
-static VALUE
+VALUE
 exc_cause(VALUE exc)
 {
+    ID id_cause;
+    CONST_ID(id_cause, "cause");
     return rb_attr_get(exc, id_cause);
 }
 
 static VALUE
 try_convert_to_exception(VALUE obj)
 {
-    return rb_check_funcall(obj, idException, 0, 0);
+    ID id_exception;
+    CONST_ID(id_exception, "exception");
+    return rb_check_funcall(obj, id_exception, 0, 0);
 }
 
 /*
@@ -1001,11 +891,16 @@ 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)) {
 	int status = 0;
+	ID id_message, id_backtrace;
+	CONST_ID(id_message, "message");
+	CONST_ID(id_backtrace, "backtrace");
 
 	obj = rb_protect(try_convert_to_exception, obj, &status);
 	if (status || obj == Qundef) {
@@ -1080,14 +975,14 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
 	status = INT2FIX(EXIT_SUCCESS);
     }
     rb_call_super(argc, argv);
-    rb_ivar_set(exc, id_status, status);
+    rb_iv_set(exc, "status", status);
     return exc;
 }
 
 
 /*
  * call-seq:
- *   system_exit.status   -> integer
+ *   system_exit.status   -> fixnum
  *
  * Return the status value associated with this system exit.
  */
@@ -1095,7 +990,7 @@ exit_initialize(int argc, VALUE *argv, VALUE exc)
 static VALUE
 exit_status(VALUE exc)
 {
-    return rb_attr_get(exc, id_status);
+    return rb_attr_get(exc, rb_intern("status"));
 }
 
 
@@ -1109,7 +1004,7 @@ exit_status(VALUE exc)
 static VALUE
 exit_success_p(VALUE exc)
 {
-    VALUE status_val = rb_attr_get(exc, id_status);
+    VALUE status_val = rb_attr_get(exc, rb_intern("status"));
     int status;
 
     if (NIL_P(status_val))
@@ -1153,7 +1048,7 @@ rb_name_error_str(VALUE str, const char *fmt, ...)
 
 /*
  * 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>
@@ -1164,18 +1059,10 @@ static VALUE
 name_err_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE name;
-    VALUE iseqw = Qnil;
 
     name = (argc > 1) ? argv[--argc] : Qnil;
     rb_call_super(argc, argv);
-    rb_ivar_set(self, id_name, name);
-    {
-	rb_thread_t *th = GET_THREAD();
-	rb_control_frame_t *cfp =
-	    rb_vm_get_ruby_level_next_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp));
-	if (cfp) iseqw = rb_iseqw_new(cfp->iseq);
-    }
-    rb_ivar_set(self, id_iseq, iseqw);
+    rb_iv_set(self, "name", name);
     return self;
 }
 
@@ -1189,36 +1076,12 @@ name_err_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 name_err_name(VALUE self)
 {
-    return rb_attr_get(self, id_name);
-}
-
-/*
- *  call-seq:
- *    name_error.local_variables  ->  array
- *
- *  Return a list of the local variable names defined where this
- *  NameError exception was raised.
- *
- *  Internal use only.
- */
-
-static VALUE
-name_err_local_variables(VALUE self)
-{
-    VALUE vars = rb_attr_get(self, id_local_variables);
-
-    if (NIL_P(vars)) {
-	VALUE iseqw = rb_attr_get(self, id_iseq);
-	if (!NIL_P(iseqw)) vars = rb_iseqw_local_variables(iseqw);
-	if (NIL_P(vars)) vars = rb_ary_new();
-	rb_ivar_set(self, id_local_variables, vars);
-    }
-    return vars;
+    return rb_attr_get(self, rb_intern("name"));
 }
 
 /*
  * 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
@@ -1229,21 +1092,14 @@ name_err_local_variables(VALUE self)
 static VALUE
 nometh_err_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE priv = (argc > 3) && (--argc, RTEST(argv[argc])) ? Qtrue : Qfalse;
     VALUE args = (argc > 2) ? argv[--argc] : Qnil;
     name_err_initialize(argc, argv, self);
-    rb_ivar_set(self, id_args, args);
-    rb_ivar_set(self, id_private_call_p, RTEST(priv) ? Qtrue : Qfalse);
+    rb_iv_set(self, "args", args);
     return self;
 }
 
 /* :nodoc: */
-enum {
-    NAME_ERR_MESG__MESG,
-    NAME_ERR_MESG__RECV,
-    NAME_ERR_MESG__NAME,
-    NAME_ERR_MESG_COUNT
-};
+#define NAME_ERR_MESG_COUNT 3
 
 static void
 name_err_mesg_mark(void *p)
@@ -1257,7 +1113,7 @@ name_err_mesg_mark(void *p)
 static size_t
 name_err_mesg_memsize(const void *p)
 {
-    return NAME_ERR_MESG_COUNT * sizeof(VALUE);
+    return p ? (NAME_ERR_MESG_COUNT * sizeof(VALUE)) : 0;
 }
 
 static const rb_data_type_t name_err_mesg_data_type = {
@@ -1267,34 +1123,26 @@ static const rb_data_type_t name_err_mesg_data_type = {
 	name_err_mesg_free,
 	name_err_mesg_memsize,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 /* :nodoc: */
 VALUE
-rb_name_err_mesg_new(VALUE mesg, VALUE recv, VALUE method)
+rb_name_err_mesg_new(VALUE obj, VALUE mesg, VALUE recv, VALUE method)
 {
-    VALUE result = TypedData_Wrap_Struct(rb_cNameErrorMesg, &name_err_mesg_data_type, 0);
     VALUE *ptr = ALLOC_N(VALUE, NAME_ERR_MESG_COUNT);
-
-    ptr[NAME_ERR_MESG__MESG] = mesg;
-    ptr[NAME_ERR_MESG__RECV] = recv;
-    ptr[NAME_ERR_MESG__NAME] = method;
-    RTYPEDDATA_DATA(result) = ptr;
+    VALUE result;
+
+    ptr[0] = mesg;
+    ptr[1] = recv;
+    ptr[2] = method;
+    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;
 }
 
-VALUE
-rb_name_err_new(VALUE mesg, VALUE recv, VALUE method)
-{
-    VALUE exc = rb_obj_alloc(rb_eNameError);
-    rb_ivar_set(exc, id_mesg, rb_name_err_mesg_new(mesg, recv, method));
-    rb_ivar_set(exc, id_bt, Qnil);
-    rb_ivar_set(exc, id_name, method);
-    rb_ivar_set(exc, id_receiver, recv);
-    return exc;
-}
-
 /* :nodoc: */
 static VALUE
 name_err_mesg_equal(VALUE obj1, VALUE obj2)
@@ -1322,25 +1170,23 @@ name_err_mesg_to_str(VALUE obj)
     VALUE *ptr, mesg;
     TypedData_Get_Struct(obj, VALUE, &name_err_mesg_data_type, ptr);
 
-    mesg = ptr[NAME_ERR_MESG__MESG];
+    mesg = ptr[0];
     if (NIL_P(mesg)) return Qnil;
     else {
-	struct RString s_str, d_str;
-	VALUE c, s, d = 0, args[4];
-	int state = 0, singleton = 0;
-	rb_encoding *usascii = rb_usascii_encoding();
+	const char *desc = 0;
+	VALUE d = 0, args[NAME_ERR_MESG_COUNT];
+	int state = 0;
 
-#define FAKE_CSTR(v, str) rb_setup_fake_str((v), (str), rb_strlen_lit(str), usascii)
-	obj = ptr[NAME_ERR_MESG__RECV];
+	obj = ptr[1];
 	switch (obj) {
 	  case Qnil:
-	    d = FAKE_CSTR(&d_str, "nil");
+	    desc = "nil";
 	    break;
 	  case Qtrue:
-	    d = FAKE_CSTR(&d_str, "true");
+	    desc = "true";
 	    break;
 	  case Qfalse:
-	    d = FAKE_CSTR(&d_str, "false");
+	    desc = "false";
 	    break;
 	  default:
 	    d = rb_protect(rb_inspect, obj, &state);
@@ -1349,22 +1195,18 @@ name_err_mesg_to_str(VALUE obj)
 	    if (NIL_P(d) || RSTRING_LEN(d) > 65) {
 		d = rb_any_to_s(obj);
 	    }
-	    singleton = (RSTRING_LEN(d) > 0 && RSTRING_PTR(d)[0] == '#');
-	    d = QUOTE(d);
+	    desc = RSTRING_PTR(d);
 	    break;
 	}
-	if (!singleton) {
-	    s = FAKE_CSTR(&s_str, ":");
-	    c = rb_class_name(CLASS_OF(obj));
-	}
-	else {
-	    c = s = FAKE_CSTR(&s_str, "");
+	if (desc && desc[0] != '#') {
+	    d = d ? rb_str_dup(d) : rb_str_new2(desc);
+	    rb_str_cat2(d, ":");
+	    rb_str_append(d, rb_class_name(CLASS_OF(obj)));
 	}
-	args[0] = QUOTE(rb_obj_as_string(ptr[NAME_ERR_MESG__NAME]));
-	args[1] = d;
-	args[2] = s;
-	args[3] = c;
-	mesg = rb_str_format(4, args, mesg);
+	args[0] = mesg;
+	args[1] = ptr[2];
+	args[2] = d;
+	mesg = rb_f_sprintf(NAME_ERR_MESG_COUNT, args);
     }
     return mesg;
 }
@@ -1385,29 +1227,6 @@ name_err_mesg_load(VALUE klass, VALUE str)
 
 /*
  * call-seq:
- *   name_error.receiver  -> object
- *
- * Return the receiver associated with this NameError exception.
- */
-
-static VALUE
-name_err_receiver(VALUE self)
-{
-    VALUE *ptr, recv, mesg;
-
-    recv = rb_ivar_lookup(self, id_receiver, Qundef);
-    if (recv != Qundef) return recv;
-
-    mesg = rb_attr_get(self, id_mesg);
-    if (!rb_typeddata_is_kind_of(mesg, &name_err_mesg_data_type)) {
-	rb_raise(rb_eArgError, "no receiver is available");
-    }
-    ptr = DATA_PTR(mesg);
-    return ptr[NAME_ERR_MESG__RECV];
-}
-
-/*
- * call-seq:
  *   no_method_error.args  -> obj
  *
  * Return the arguments passed in as the third parameter to
@@ -1417,13 +1236,7 @@ name_err_receiver(VALUE self)
 static VALUE
 nometh_err_args(VALUE self)
 {
-    return rb_attr_get(self, id_args);
-}
-
-static VALUE
-nometh_err_private_call_p(VALUE self)
-{
-    return rb_attr_get(self, id_private_call_p);
+    return rb_attr_get(self, rb_intern("args"));
 }
 
 void
@@ -1435,25 +1248,6 @@ rb_invalid_str(const char *str, const char *type)
 }
 
 /*
- * call-seq:
- *   SyntaxError.new([msg])  -> syntax_error
- *
- * Construct a SyntaxError exception.
- */
-
-static VALUE
-syntax_error_initialize(int argc, VALUE *argv, VALUE self)
-{
-    VALUE mesg;
-    if (argc == 0) {
-	mesg = rb_fstring_cstr("compile error");
-	argc = 1;
-	argv = &mesg;
-    }
-    return rb_call_super(argc, argv);
-}
-
-/*
  *  Document-module: Errno
  *
  *  Ruby exception objects are subclasses of <code>Exception</code>.
@@ -1496,19 +1290,19 @@ set_syserr(int n, const char *name)
 
 	/* capture nonblock errnos for WaitReadable/WaitWritable subclasses */
 	switch (n) {
-	  case EAGAIN:
-	    rb_eEAGAIN = error;
+	    case EAGAIN:
+	        rb_eEAGAIN = error;
 
-#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
-	    break;
-	  case EWOULDBLOCK:
+#if EAGAIN != EWOULDBLOCK
+                break;
+	    case EWOULDBLOCK:
 #endif
 
-	    rb_eEWOULDBLOCK = error;
-	    break;
-	  case EINPROGRESS:
-	    rb_eEINPROGRESS = error;
-	    break;
+		rb_eEWOULDBLOCK = error;
+		break;
+	    case EINPROGRESS:
+		rb_eEINPROGRESS = error;
+		break;
 	}
 
 	rb_define_const(error, "Errno", INT2NUM(n));
@@ -1552,7 +1346,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
     char *strerror();
 #endif
     const char *err;
-    VALUE mesg, error, func, errmsg;
+    VALUE mesg, error, func;
     VALUE klass = rb_obj_class(self);
 
     if (klass == rb_eSystemCallError) {
@@ -1572,29 +1366,37 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
     }
     else {
 	rb_scan_args(argc, argv, "02", &mesg, &func);
-	error = rb_const_get(klass, id_Errno);
+	error = rb_const_get(klass, rb_intern("Errno"));
     }
     if (!NIL_P(error)) err = strerror(NUM2INT(error));
     else err = "unknown error";
-
-    errmsg = rb_enc_str_new_cstr(err, rb_locale_encoding());
     if (!NIL_P(mesg)) {
+	rb_encoding *le = rb_locale_encoding();
 	VALUE str = StringValue(mesg);
+	rb_encoding *me = rb_enc_get(mesg);
 
-	if (!NIL_P(func)) rb_str_catf(errmsg, " @ %"PRIsVALUE, func);
-	rb_str_catf(errmsg, " - %"PRIsVALUE, str);
-	OBJ_INFECT(errmsg, mesg);
+	if (NIL_P(func))
+	    mesg = rb_sprintf("%s - %"PRIsVALUE, err, mesg);
+	else
+	    mesg = rb_sprintf("%s @ %"PRIsVALUE" - %"PRIsVALUE, err, func, mesg);
+	if (le != me && rb_enc_asciicompat(me)) {
+	    le = me;
+	}/* else assume err is non ASCII string. */
+	OBJ_INFECT(mesg, str);
+	rb_enc_associate(mesg, le);
+    }
+    else {
+	mesg = rb_str_new2(err);
+	rb_enc_associate(mesg, rb_locale_encoding());
     }
-    mesg = errmsg;
-
     rb_call_super(1, &mesg);
-    rb_ivar_set(self, id_errno, error);
+    rb_iv_set(self, "errno", error);
     return self;
 }
 
 /*
  * call-seq:
- *   system_call_error.errno   -> integer
+ *   system_call_error.errno   -> fixnum
  *
  * Return this SystemCallError's error number.
  */
@@ -1602,7 +1404,7 @@ syserr_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 syserr_errno(VALUE self)
 {
-    return rb_attr_get(self, id_errno);
+    return rb_attr_get(self, rb_intern("errno"));
 }
 
 /*
@@ -1617,17 +1419,20 @@ static VALUE
 syserr_eqq(VALUE self, VALUE exc)
 {
     VALUE num, e;
+    ID en;
+
+    CONST_ID(en, "errno");
 
     if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) {
-	if (!rb_respond_to(exc, id_errno)) return Qfalse;
+	if (!rb_respond_to(exc, en)) return Qfalse;
     }
     else if (self == rb_eSystemCallError) return Qtrue;
 
-    num = rb_attr_get(exc, id_errno);
+    num = rb_attr_get(exc, rb_intern("errno"));
     if (NIL_P(num)) {
-	num = rb_funcallv(exc, id_errno, 0, 0);
+	num = rb_funcall(exc, en, 0, 0);
     }
-    e = rb_const_get(self, id_Errno);
+    e = rb_const_get(self, rb_intern("Errno"));
     if (FIXNUM_P(num) ? num == e : rb_equal(num, e))
 	return Qtrue;
     return Qfalse;
@@ -1727,7 +1532,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  <em>raises the exception:</em>
  *
- *     ArgumentError: wrong number of arguments (given 2, expected 1)
+ *     ArgumentError: wrong number of arguments (2 for 1)
  *
  *  Ex: passing an argument that is not acceptable:
  *
@@ -1835,7 +1640,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  Since constant names must start with a capital:
  *
- *     Integer.const_set :answer, 42
+ *     Fixnum.const_set :answer, 42
  *
  *  <em>raises the exception:</em>
  *
@@ -1864,7 +1669,7 @@ syserr_eqq(VALUE self, VALUE exc)
  *
  *  <em>raises the exception:</em>
  *
- *     RuntimeError: can't modify frozen Array
+ *     RuntimeError: can't modify frozen array
  *
  *  Kernel.raise will raise a RuntimeError if no Exception class is
  *  specified.
@@ -1988,19 +1793,14 @@ syserr_eqq(VALUE self, VALUE exc)
  *    * LoadError
  *    * NotImplementedError
  *    * SyntaxError
- *  * SecurityError
  *  * SignalException
  *    * Interrupt
  *  * StandardError -- default for +rescue+
  *    * ArgumentError
- *      * UncaughtThrowError
- *    * EncodingError
- *    * FiberError
- *    * IOError
- *      * EOFError
  *    * IndexError
- *      * KeyError
  *      * StopIteration
+ *    * IOError
+ *      * EOFError
  *    * LocalJumpError
  *    * NameError
  *      * NoMethodError
@@ -2008,13 +1808,14 @@ syserr_eqq(VALUE self, VALUE exc)
  *      * FloatDomainError
  *    * RegexpError
  *    * RuntimeError -- default for +raise+
+ *    * SecurityError
  *    * SystemCallError
  *      * Errno::*
+ *    * SystemStackError
  *    * ThreadError
  *    * TypeError
  *    * ZeroDivisionError
  *  * SystemExit
- *  * SystemStackError
  *  * fatal -- impossible to rescue
  */
 
@@ -2052,7 +1853,6 @@ Init_Exception(void)
 
     rb_eScriptError = rb_define_class("ScriptError", rb_eException);
     rb_eSyntaxError = rb_define_class("SyntaxError", rb_eScriptError);
-    rb_define_method(rb_eSyntaxError, "initialize", syntax_error_initialize, -1);
 
     rb_eLoadError   = rb_define_class("LoadError", rb_eScriptError);
     /* the path failed to load */
@@ -2063,9 +1863,8 @@ Init_Exception(void)
     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, "receiver", name_err_receiver, 0);
-    rb_define_method(rb_eNameError, "local_variables", name_err_local_variables, 0);
     rb_cNameErrorMesg = rb_define_class_under(rb_eNameError, "message", rb_cData);
+    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_dump, 1);
@@ -2073,7 +1872,6 @@ Init_Exception(void)
     rb_eNoMethodError = rb_define_class("NoMethodError", rb_eNameError);
     rb_define_method(rb_eNoMethodError, "initialize", nometh_err_initialize, -1);
     rb_define_method(rb_eNoMethodError, "args", nometh_err_args, 0);
-    rb_define_method(rb_eNoMethodError, "private_call?", nometh_err_private_call_p, 0);
 
     rb_eRuntimeError = rb_define_class("RuntimeError", rb_eStandardError);
     rb_eSecurityError = rb_define_class("SecurityError", rb_eException);
@@ -2089,26 +1887,7 @@ Init_Exception(void)
 
     rb_mErrno = rb_define_module("Errno");
 
-    rb_mWarning = rb_define_module("Warning");
-    rb_define_method(rb_mWarning, "warn", rb_warning_s_warn, 1);
-    rb_extend_object(rb_mWarning, rb_mWarning);
-
     rb_define_global_function("warn", rb_warn_m, -1);
-
-    id_new = rb_intern_const("new");
-    id_cause = rb_intern_const("cause");
-    id_message = rb_intern_const("message");
-    id_backtrace = rb_intern_const("backtrace");
-    id_name = rb_intern_const("name");
-    id_args = rb_intern_const("args");
-    id_receiver = rb_intern_const("receiver");
-    id_private_call_p = rb_intern_const("private_call?");
-    id_local_variables = rb_intern_const("local_variables");
-    id_Errno = rb_intern_const("Errno");
-    id_errno = rb_intern_const("errno");
-    id_i_path = rb_intern_const("@path");
-    id_warn = rb_intern_const("warn");
-    id_iseq = rb_make_internal_id();
 }
 
 void
@@ -2142,7 +1921,7 @@ static void
 raise_loaderror(VALUE path, VALUE mesg)
 {
     VALUE err = rb_exc_new3(rb_eLoadError, mesg);
-    rb_ivar_set(err, id_i_path, path);
+    rb_ivar_set(err, rb_intern("@path"), path);
     rb_exc_raise(err);
 }
 
@@ -2174,8 +1953,8 @@ void
 rb_notimplement(void)
 {
     rb_raise(rb_eNotImpError,
-	     "%"PRIsVALUE"() function is unimplemented on this machine",
-	     rb_id2str(rb_frame_this_func()));
+	     "%s() function is unimplemented on this machine",
+	     rb_id2name(rb_frame_this_func()));
 }
 
 void
@@ -2318,7 +2097,7 @@ rb_mod_syserr_fail_str(VALUE mod, int e, VALUE mesg)
 void
 rb_sys_warning(const char *fmt, ...)
 {
-    VALUE mesg;
+    char buf[BUFSIZ];
     va_list args;
     int errno_save;
 
@@ -2326,32 +2105,12 @@ rb_sys_warning(const char *fmt, ...)
 
     if (!RTEST(ruby_verbose)) return;
 
-    va_start(args, fmt);
-    mesg = warning_string(0, fmt, args);
-    va_end(args);
-    rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
-    rb_str_catf(mesg, ": %s\n", strerror(errno_save));
-    rb_write_warning_str(mesg);
-    errno = errno_save;
-}
-
-void
-rb_sys_enc_warning(rb_encoding *enc, const char *fmt, ...)
-{
-    VALUE mesg;
-    va_list args;
-    int errno_save;
-
-    errno_save = errno;
-
-    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);
-    mesg = warning_string(enc, fmt, args);
+    warn_print(buf, args);
     va_end(args);
-    rb_str_set_len(mesg, RSTRING_LEN(mesg)-1);
-    rb_str_catf(mesg, ": %s\n", strerror(errno_save));
-    rb_write_warning_str(mesg);
     errno = errno_save;
 }
 
@@ -2370,25 +2129,6 @@ rb_error_frozen(const char *what)
     rb_raise(rb_eRuntimeError, "can't modify frozen %s", what);
 }
 
-void
-rb_error_frozen_object(VALUE frozen_obj)
-{
-    VALUE debug_info;
-    const ID created_info = id_debug_created_info;
-
-    if (!NIL_P(debug_info = rb_attr_get(frozen_obj, created_info))) {
-	VALUE path = rb_ary_entry(debug_info, 0);
-	VALUE line = rb_ary_entry(debug_info, 1);
-
-	rb_raise(rb_eRuntimeError, "can't modify frozen %"PRIsVALUE", created at %"PRIsVALUE":%"PRIsVALUE,
-		 CLASS_OF(frozen_obj), path, line);
-    }
-    else {
-	rb_raise(rb_eRuntimeError, "can't modify frozen %"PRIsVALUE,
-		 CLASS_OF(frozen_obj));
-    }
-}
-
 #undef rb_check_frozen
 void
 rb_check_frozen(VALUE obj)
diff --git a/eval.c b/eval.c
index 4c6e8e98b4..1dabe2e24b 100644
--- a/eval.c
+++ b/eval.c
@@ -11,11 +11,12 @@
 
 **********************************************************************/
 
-#include "internal.h"
 #include "eval_intern.h"
 #include "iseq.h"
 #include "gc.h"
 #include "ruby/vm.h"
+#include "ruby/encoding.h"
+#include "internal.h"
 #include "vm_core.h"
 #include "probes_helper.h"
 
@@ -24,11 +25,6 @@ NORETURN(void rb_raise_jump(VALUE, VALUE));
 VALUE rb_eLocalJumpError;
 VALUE rb_eSysStackError;
 
-ID ruby_static_id_signo, ruby_static_id_status;
-static ID id_cause;
-#define id_signo ruby_static_id_signo
-#define id_status ruby_static_id_status
-
 #define exception_error GET_VM()->special_exceptions[ruby_error_reenter]
 
 #include "eval_error.c"
@@ -45,15 +41,18 @@ static ID id_cause;
 int
 ruby_setup(void)
 {
+    static int initialized = 0;
     int state;
 
-    if (GET_VM())
+    if (initialized)
 	return 0;
+    initialized = 1;
 
     ruby_init_stack((void *)&state);
     Init_BareVM();
     Init_heap();
     Init_vm_objects();
+    Init_frozen_strings();
 
     PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
@@ -75,8 +74,7 @@ ruby_init(void)
 {
     int state = ruby_setup();
     if (state) {
-        if (RTEST(ruby_debug))
-            error_print(GET_THREAD());
+	error_print();
 	exit(EXIT_FAILURE);
     }
 }
@@ -162,59 +160,70 @@ ruby_cleanup(volatile int ex)
     volatile VALUE errs[2];
     rb_thread_t *th = GET_THREAD();
     int nerr;
-    volatile int sysex = EXIT_SUCCESS;
-    volatile int step = 0;
 
     rb_threadptr_interrupt(th);
     rb_threadptr_check_signal(th);
-    TH_PUSH_TAG(th);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
 	SAVE_ROOT_JMPBUF(th, { RUBY_VM_CHECK_INTS(th); });
+    }
+    POP_TAG();
 
-      step_0: step++;
-	errs[1] = th->errinfo;
-	th->safe_level = 0;
-	ruby_init_stack(&errs[STACK_UPPER(errs, 0, 1)]);
+    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();
 
-      step_1: step++;
-	/* protect from Thread#raise */
-	th->status = THREAD_KILLED;
+    /* protect from Thread#raise */
+    th->status = THREAD_KILLED;
 
-	errs[0] = th->errinfo;
+    errs[0] = th->errinfo;
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
 	SAVE_ROOT_JMPBUF(th, rb_thread_terminate_all());
     }
-    else {
-	switch (step) {
-	  case 0: goto step_0;
-	  case 1: goto step_1;
-	}
-	if (ex == 0) ex = state;
+    else if (ex == 0) {
+	ex = state;
     }
     th->errinfo = errs[1];
-    sysex = error_handle(ex);
+    ex = error_handle(ex);
+
+#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
+    switch (ex) {
+#if EXIT_SUCCESS != 0
+      case 0: ex = EXIT_SUCCESS; break;
+#endif
+#if EXIT_FAILURE != 1
+      case 1: ex = EXIT_FAILURE; break;
+#endif
+    }
+#endif
 
     state = 0;
     for (nerr = 0; nerr < numberof(errs); ++nerr) {
-	VALUE err = ATOMIC_VALUE_EXCHANGE(errs[nerr], Qnil);
+	VALUE err = errs[nerr];
 
 	if (!RTEST(err)) continue;
 
 	/* th->errinfo contains a NODE while break'ing */
-	if (THROW_DATA_P(err)) continue;
+	if (RB_TYPE_P(err, T_NODE)) continue;
 
 	if (rb_obj_is_kind_of(err, rb_eSystemExit)) {
-	    sysex = sysexit_status(err);
+	    ex = sysexit_status(err);
 	    break;
 	}
 	else if (rb_obj_is_kind_of(err, rb_eSignal)) {
-	    VALUE sig = rb_ivar_get(err, id_signo);
+	    VALUE sig = rb_iv_get(err, "signo");
 	    state = NUM2INT(sig);
 	    break;
 	}
-	else if (sysex == EXIT_SUCCESS) {
-	    sysex = EXIT_FAILURE;
+	else if (ex == EXIT_SUCCESS) {
+	    ex = EXIT_FAILURE;
 	}
     }
 
@@ -222,30 +231,31 @@ ruby_cleanup(volatile int ex)
 
     /* unlock again if finalizer took mutexes. */
     rb_threadptr_unlock_all_locking_mutexes(GET_THREAD());
-    TH_POP_TAG();
-    rb_thread_stop_timer_thread();
+    POP_TAG();
+    rb_thread_stop_timer_thread(1);
     ruby_vm_destruct(GET_VM());
     if (state) ruby_default_signal(state);
 
-    return sysex;
+    return ex;
 }
 
 static int
 ruby_exec_internal(void *n)
 {
     volatile int state;
-    rb_iseq_t *iseq = (rb_iseq_t *)n;
+    VALUE iseq = (VALUE)n;
     rb_thread_t *th = GET_THREAD();
 
     if (!n) return 0;
 
-    TH_PUSH_TAG(th);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
 	SAVE_ROOT_JMPBUF(th, {
+	    th->base_block = 0;
 	    rb_iseq_eval_main(iseq);
 	});
     }
-    TH_POP_TAG();
+    POP_TAG();
     return state;
 }
 
@@ -327,15 +337,15 @@ static VALUE
 rb_mod_nesting(void)
 {
     VALUE ary = rb_ary_new();
-    const rb_cref_t *cref = rb_vm_cref();
+    const NODE *cref = rb_vm_cref();
 
-    while (cref && CREF_NEXT(cref)) {
-	VALUE klass = CREF_CLASS(cref);
-	if (!CREF_PUSHED_BY_EVAL(cref) &&
+    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_NEXT(cref);
+	cref = cref->nd_next;
     }
     return ary;
 }
@@ -365,7 +375,7 @@ rb_mod_nesting(void)
 static VALUE
 rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
 {
-    const rb_cref_t *cref = rb_vm_cref();
+    const NODE *cref = rb_vm_cref();
     VALUE klass;
     VALUE cbase = 0;
     void *data = 0;
@@ -375,15 +385,15 @@ rb_mod_s_constants(int argc, VALUE *argv, VALUE mod)
     }
 
     while (cref) {
-	klass = CREF_CLASS(cref);
-	if (!CREF_PUSHED_BY_EVAL(cref) &&
+	klass = cref->nd_clss;
+	if (!(cref->flags & NODE_FL_CREF_PUSHED_BY_EVAL) &&
 	    !NIL_P(klass)) {
-	    data = rb_mod_const_at(CREF_CLASS(cref), data);
+	    data = rb_mod_const_at(cref->nd_clss, data);
 	    if (!cbase) {
 		cbase = klass;
 	    }
 	}
-	cref = CREF_NEXT(cref);
+	cref = cref->nd_next;
     }
 
     if (cbase) {
@@ -441,6 +451,9 @@ static VALUE get_thread_errinfo(rb_thread_t *th);
 static VALUE
 exc_setup_cause(VALUE exc, VALUE cause)
 {
+    ID id_cause;
+    CONST_ID(id_cause, "cause");
+
 #if SUPPORT_JOKE
     if (NIL_P(cause)) {
 	ID id_true_cause;
@@ -457,9 +470,6 @@ exc_setup_cause(VALUE exc, VALUE cause)
 #endif
     if (!NIL_P(cause) && cause != exc) {
 	rb_ivar_set(exc, id_cause, cause);
-	if (!rb_ivar_defined(cause, id_cause)) {
-	    rb_ivar_set(cause, id_cause, Qnil);
-	}
     }
     return exc;
 }
@@ -475,60 +485,45 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
 {
     VALUE e;
     const char *file = 0;
-    int line;
+    volatile int line = 0;
     int nocause = 0;
 
     if (NIL_P(mesg)) {
 	mesg = th->errinfo;
-	if (INTERNAL_EXCEPTION_P(mesg)) TH_JUMP_TAG(th, TAG_FATAL);
+	if (INTERNAL_EXCEPTION_P(mesg)) JUMP_TAG(TAG_FATAL);
 	nocause = 1;
     }
     if (NIL_P(mesg)) {
 	mesg = rb_exc_new(rb_eRuntimeError, 0, 0);
 	nocause = 0;
     }
-    if (cause != Qundef) {
-	exc_setup_cause(mesg, cause);
-    }
-    else if (nocause) {
-	exc_setup_cause(mesg, Qnil);
-    }
-    else if (!rb_ivar_defined(mesg, id_cause)) {
-	exc_setup_cause(mesg, get_thread_errinfo(th));
+    if (cause == Qundef) {
+	cause = nocause ? Qnil : get_thread_errinfo(th);
     }
+    exc_setup_cause(mesg, cause);
 
-    file = rb_source_loc(&line);
+    file = rb_sourcefile();
+    if (file) line = rb_sourceline();
     if (file && !NIL_P(mesg)) {
 	VALUE at;
 	if (sysstack_error_p(mesg)) {
 	    if (NIL_P(rb_attr_get(mesg, idBt))) {
 		at = rb_vm_backtrace_object();
 		if (mesg == sysstack_error) {
+		    VALUE ruby_vm_sysstack_error_copy(void);
 		    mesg = ruby_vm_sysstack_error_copy();
 		}
 		rb_ivar_set(mesg, idBt, at);
 		rb_ivar_set(mesg, idBt_locations, at);
 	    }
 	}
-	else {
-	    int status;
-
-	    TH_PUSH_TAG(th);
-	    if ((status = EXEC_TAG()) == 0) {
-		VALUE bt;
-		if (rb_threadptr_set_raised(th)) goto fatal;
-		bt = rb_get_backtrace(mesg);
-		if (NIL_P(bt)) {
-		    at = rb_vm_backtrace_object();
-		    if (OBJ_FROZEN(mesg)) {
-			mesg = rb_obj_dup(mesg);
-		    }
-		    rb_ivar_set(mesg, idBt_locations, at);
-		    set_backtrace(mesg, at);
-		}
-		rb_threadptr_reset_raised(th);
+	else if (NIL_P(get_backtrace(mesg))) {
+	    at = rb_vm_backtrace_object();
+	    if (OBJ_FROZEN(mesg)) {
+		mesg = rb_obj_dup(mesg);
 	    }
-	    TH_POP_TAG();
+	    rb_ivar_set(mesg, idBt_locations, at);
+	    set_backtrace(mesg, at);
 	}
     }
 
@@ -541,56 +536,47 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
 	int status;
 
 	mesg = e;
-	TH_PUSH_TAG(th);
+	PUSH_TAG();
 	if ((status = EXEC_TAG()) == 0) {
 	    th->errinfo = Qnil;
 	    e = rb_obj_as_string(mesg);
 	    th->errinfo = mesg;
 	    if (file && line) {
-		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
-			       rb_obj_class(mesg), file, line, e);
+		warn_printf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
+			    rb_obj_class(mesg), file, line, e);
 	    }
 	    else if (file) {
-		e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
-			       rb_obj_class(mesg), file, e);
+		warn_printf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
+			    rb_obj_class(mesg), file, e);
 	    }
 	    else {
-		e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
-			       rb_obj_class(mesg), e);
+		warn_printf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
+			    rb_obj_class(mesg), e);
 	    }
-	    warn_print_str(e);
 	}
-	TH_POP_TAG();
+	POP_TAG();
 	if (status == TAG_FATAL && th->errinfo == exception_error) {
 	    th->errinfo = mesg;
 	}
 	else if (status) {
 	    rb_threadptr_reset_raised(th);
-	    TH_JUMP_TAG(th, status);
+	    JUMP_TAG(status);
 	}
     }
 
     if (rb_threadptr_set_raised(th)) {
-      fatal:
 	th->errinfo = exception_error;
 	rb_threadptr_reset_raised(th);
-	TH_JUMP_TAG(th, TAG_FATAL);
+	JUMP_TAG(TAG_FATAL);
     }
 
     if (tag != TAG_FATAL) {
-	RUBY_DTRACE_HOOK(RAISE, rb_obj_classname(th->errinfo));
-	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0, 0, mesg);
-    }
-}
-
-void
-rb_threadptr_setup_exception(rb_thread_t *th, VALUE mesg, VALUE cause)
-{
-    if (cause == Qundef) {
-	cause = get_thread_errinfo(th);
-    }
-    if (cause != mesg) {
-	rb_ivar_set(mesg, id_cause, cause);
+	if (RUBY_DTRACE_RAISE_ENABLED()) {
+	    RUBY_DTRACE_RAISE(rb_obj_classname(th->errinfo),
+			      rb_sourcefile(),
+			      rb_sourceline());
+	}
+	EXEC_EVENT_HOOK(th, RUBY_EVENT_RAISE, th->cfp->self, 0, 0, mesg);
     }
 }
 
@@ -600,7 +586,7 @@ rb_longjmp(int tag, volatile VALUE mesg, VALUE cause)
     rb_thread_t *th = GET_THREAD();
     setup_exception(th, tag, mesg, cause);
     rb_thread_raised_clear(th);
-    TH_JUMP_TAG(th, tag);
+    JUMP_TAG(tag);
 }
 
 static VALUE make_exception(int argc, const VALUE *argv, int isstr);
@@ -632,7 +618,7 @@ rb_interrupt(void)
 enum {raise_opt_cause, raise_max_opt};
 
 static int
-extract_raise_opts(int argc, const VALUE *argv, VALUE *opts)
+extract_raise_opts(int argc, VALUE *argv, VALUE *opts)
 {
     int i;
     if (argc > 0) {
@@ -703,6 +689,7 @@ static VALUE
 make_exception(int argc, const VALUE *argv, int isstr)
 {
     VALUE mesg, exc;
+    ID exception;
     int n;
 
     mesg = Qnil;
@@ -729,7 +716,8 @@ make_exception(int argc, const VALUE *argv, int isstr)
 	n = 1;
       exception_call:
 	if (sysstack_error_p(exc)) return exc;
-	mesg = rb_check_funcall(exc, idException, n, argv+1);
+	CONST_ID(exception, "exception");
+	mesg = rb_check_funcall(exc, exception, n, argv+1);
 	if (mesg == Qundef) {
 	    rb_raise(rb_eTypeError, "exception class/object expected");
 	}
@@ -758,27 +746,23 @@ void
 rb_raise_jump(VALUE mesg, VALUE cause)
 {
     rb_thread_t *th = GET_THREAD();
-    const rb_control_frame_t *cfp = th->cfp;
-    const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
-    VALUE klass = me->owner;
+    rb_control_frame_t *cfp = th->cfp;
+    VALUE klass = cfp->me->klass;
     VALUE self = cfp->self;
-    ID mid = me->called_id;
+    ID mid = cfp->me->called_id;
 
-    rb_vm_pop_frame(th);
-    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, me->def->original_id, mid, klass, Qnil);
+    th->cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp);
+    EXEC_EVENT_HOOK(th, RUBY_EVENT_C_RETURN, self, mid, klass, Qnil);
 
     setup_exception(th, TAG_RAISE, mesg, cause);
 
     rb_thread_raised_clear(th);
-    TH_JUMP_TAG(th, TAG_RAISE);
+    JUMP_TAG(TAG_RAISE);
 }
 
 void
 rb_jump_tag(int tag)
 {
-    if (UNLIKELY(tag < TAG_RETURN || tag > TAG_FATAL)) {
-	unknown_longjmp_status(tag);
-    }
     JUMP_TAG(tag);
 }
 
@@ -786,11 +770,12 @@ int
 rb_block_given_p(void)
 {
     rb_thread_t *th = GET_THREAD();
-    if (rb_vm_frame_block_handler(th->cfp) == VM_BLOCK_HANDLER_NONE) {
-	return FALSE;
+
+    if (rb_vm_control_frame_block_ptr(th->cfp)) {
+	return TRUE;
     }
     else {
-	return TRUE;
+	return FALSE;
     }
 }
 
@@ -816,7 +801,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
 {
     int state;
     rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *volatile cfp = th->cfp;
+    rb_control_frame_t *cfp = th->cfp;
     volatile VALUE result = Qfalse;
     volatile VALUE e_info = th->errinfo;
     va_list args;
@@ -863,7 +848,7 @@ rb_rescue2(VALUE (* b_proc) (ANYARGS), VALUE data1,
     }
     TH_POP_TAG();
     if (state)
-	TH_JUMP_TAG(th, state);
+	JUMP_TAG(state);
 
     return result;
 }
@@ -882,7 +867,7 @@ rb_protect(VALUE (* proc) (VALUE), VALUE data, int * state)
     volatile VALUE result = Qnil;
     volatile int status;
     rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *volatile cfp = th->cfp;
+    rb_control_frame_t *cfp = th->cfp;
     struct rb_vm_protect_tag protect_tag;
     rb_jmpbuf_t org_jmpbuf;
 
@@ -921,44 +906,95 @@ rb_ensure(VALUE (*b_proc)(ANYARGS), VALUE data1, VALUE (*e_proc)(ANYARGS), VALUE
     ensure_list.entry.data2 = data2;
     ensure_list.next = th->ensure_list;
     th->ensure_list = &ensure_list;
-    TH_PUSH_TAG(th);
+    PUSH_TAG();
     if ((state = EXEC_TAG()) == 0) {
 	result = (*b_proc) (data1);
     }
-    TH_POP_TAG();
+    POP_TAG();
+    /* TODO: fix me */
+    /* retval = prot_tag ? prot_tag->retval : Qnil; */     /* save retval */
     errinfo = th->errinfo;
     th->ensure_list=ensure_list.next;
     (*ensure_list.entry.e_proc)(ensure_list.entry.data2);
     th->errinfo = errinfo;
     if (state)
-	TH_JUMP_TAG(th, state);
+	JUMP_TAG(state);
     return result;
 }
 
+static const rb_method_entry_t *
+method_entry_of_iseq(rb_control_frame_t *cfp, rb_iseq_t *iseq)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_control_frame_t *cfp_limit;
+
+    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);
+    }
+    return 0;
+}
+
 static ID
 frame_func_id(rb_control_frame_t *cfp)
 {
-    const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
-
-    if (me) {
-	return me->def->original_id;
+    const rb_method_entry_t *me_local;
+    rb_iseq_t *iseq = cfp->iseq;
+    if (cfp->me) {
+	return cfp->me->def->original_id;
     }
-    else {
-	return 0;
+    while (iseq) {
+	if (RUBY_VM_IFUNC_P(iseq)) {
+	    NODE *ifunc = (NODE *)iseq;
+	    if (ifunc->nd_aid) return ifunc->nd_aid;
+	    return idIFUNC;
+	}
+	me_local = method_entry_of_iseq(cfp, iseq);
+	if (me_local) {
+	    cfp->me = me_local;
+	    return me_local->def->original_id;
+	}
+	if (iseq->defined_method_id) {
+	    return iseq->defined_method_id;
+	}
+	if (iseq->local_iseq == iseq) {
+	    break;
+	}
+	iseq = iseq->parent_iseq;
     }
+    return 0;
 }
 
 static ID
 frame_called_id(rb_control_frame_t *cfp)
 {
-    const rb_callable_method_entry_t *me = rb_vm_frame_method_entry(cfp);
-
-    if (me) {
-	return me->called_id;
+    const rb_method_entry_t *me_local;
+    rb_iseq_t *iseq = cfp->iseq;
+    if (cfp->me) {
+	return cfp->me->called_id;
     }
-    else {
-	return 0;
+    while (iseq) {
+	if (RUBY_VM_IFUNC_P(iseq)) {
+	    NODE *ifunc = (NODE *)iseq;
+	    if (ifunc->nd_aid) return ifunc->nd_aid;
+	    return idIFUNC;
+	}
+	me_local = method_entry_of_iseq(cfp, iseq);
+	if (me_local) {
+	    cfp->me = me_local;
+	    return me_local->called_id;
+	}
+	if (iseq->defined_method_id) {
+	    return iseq->defined_method_id;
+	}
+	if (iseq->local_iseq == iseq) {
+	    break;
+	}
+	iseq = iseq->parent_iseq;
     }
+    return 0;
 }
 
 ID
@@ -1000,19 +1036,6 @@ prev_frame_func(void)
     return frame_func_id(prev_cfp);
 }
 
-ID
-rb_frame_last_func(void)
-{
-    rb_thread_t *th = GET_THREAD();
-    rb_control_frame_t *cfp = th->cfp;
-    ID mid;
-
-    while (!(mid = frame_func_id(cfp)) &&
-	   (cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp),
-	    !RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)));
-    return mid;
-}
-
 /*
  *  call-seq:
  *     append_features(mod)   -> mod
@@ -1052,7 +1075,6 @@ rb_mod_include(int argc, VALUE *argv, VALUE module)
     CONST_ID(id_append_features, "append_features");
     CONST_ID(id_included, "included");
 
-    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++)
 	Check_Type(argv[i], T_MODULE);
     while (argc--) {
@@ -1100,8 +1122,6 @@ rb_mod_prepend(int argc, VALUE *argv, VALUE module)
 
     CONST_ID(id_prepend_features, "prepend_features");
     CONST_ID(id_prepended, "prepended");
-
-    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     for (i = 0; i < argc; i++)
 	Check_Type(argv[i], T_MODULE);
     while (argc--) {
@@ -1111,41 +1131,32 @@ rb_mod_prepend(int argc, VALUE *argv, VALUE module)
     return module;
 }
 
-static void
-ensure_class_or_module(VALUE obj)
-{
-    if (!RB_TYPE_P(obj, T_CLASS) && !RB_TYPE_P(obj, T_MODULE)) {
-	rb_raise(rb_eTypeError,
-		 "wrong argument type %"PRIsVALUE" (expected Class or Module)",
-		 rb_obj_class(obj));
-    }
-}
-
 static VALUE
-hidden_identity_hash_new(void)
+hidden_identity_hash_new()
 {
-    VALUE hash = rb_ident_hash_new();
+    VALUE hash = rb_hash_new();
 
+    rb_funcall(hash, rb_intern("compare_by_identity"), 0);
     RBASIC_CLEAR_CLASS(hash); /* hide from ObjectSpace */
     return hash;
 }
 
 void
-rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
+rb_using_refinement(NODE *cref, VALUE klass, VALUE module)
 {
     VALUE iclass, c, superclass = klass;
 
-    ensure_class_or_module(klass);
+    Check_Type(klass, T_CLASS);
     Check_Type(module, T_MODULE);
-    if (NIL_P(CREF_REFINEMENTS(cref))) {
-	CREF_REFINEMENTS_SET(cref, hidden_identity_hash_new());
+    if (NIL_P(cref->nd_refinements)) {
+	RB_OBJ_WRITE(cref, &cref->nd_refinements, hidden_identity_hash_new());
     }
     else {
-	if (CREF_OMOD_SHARED(cref)) {
-	    CREF_REFINEMENTS_SET(cref, rb_hash_dup(CREF_REFINEMENTS(cref)));
-	    CREF_OMOD_SHARED_UNSET(cref);
+	if (cref->flags & NODE_FL_CREF_OMOD_SHARED) {
+	    RB_OBJ_WRITE(cref, &cref->nd_refinements, rb_hash_dup(cref->nd_refinements));
+	    cref->flags &= ~NODE_FL_CREF_OMOD_SHARED;
 	}
-	if (!NIL_P(c = rb_hash_lookup(CREF_REFINEMENTS(cref), klass))) {
+	if (!NIL_P(c = rb_hash_lookup(cref->nd_refinements, klass))) {
 	    superclass = c;
 	    while (c && RB_TYPE_P(c, T_ICLASS)) {
 		if (RBASIC(c)->klass == module) {
@@ -1160,8 +1171,8 @@ rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
     c = iclass = rb_include_class_new(module, superclass);
     RCLASS_REFINED_CLASS(c) = klass;
 
-    RCLASS_M_TBL(OBJ_WB_UNPROTECT(c)) =
-      RCLASS_M_TBL(OBJ_WB_UNPROTECT(module)); /* TODO: check unprotecting */
+    RCLASS_M_TBL_WRAPPER(OBJ_WB_UNPROTECT(c)) =
+	RCLASS_M_TBL_WRAPPER(OBJ_WB_UNPROTECT(module));
 
     module = RCLASS_SUPER(module);
     while (module && module != klass) {
@@ -1170,20 +1181,20 @@ rb_using_refinement(rb_cref_t *cref, VALUE klass, VALUE module)
 	RCLASS_REFINED_CLASS(c) = klass;
 	module = RCLASS_SUPER(module);
     }
-    rb_hash_aset(CREF_REFINEMENTS(cref), klass, iclass);
+    rb_hash_aset(cref->nd_refinements, klass, iclass);
 }
 
 static int
 using_refinement(VALUE klass, VALUE module, VALUE arg)
 {
-    rb_cref_t *cref = (rb_cref_t *) arg;
+    NODE *cref = (NODE *) arg;
 
     rb_using_refinement(cref, klass, module);
     return ST_CONTINUE;
 }
 
 static void
-using_module_recursive(const rb_cref_t *cref, VALUE klass)
+using_module_recursive(NODE *cref, VALUE klass)
 {
     ID id_refinements;
     VALUE super, module, refinements;
@@ -1213,7 +1224,7 @@ using_module_recursive(const rb_cref_t *cref, VALUE klass)
 }
 
 void
-rb_using_module(const rb_cref_t *cref, VALUE module)
+rb_using_module(NODE *cref, VALUE module)
 {
     Check_Type(module, T_MODULE);
     using_module_recursive(cref, module);
@@ -1249,7 +1260,7 @@ add_activated_refinement(VALUE activated_refinements,
     c = iclass = rb_include_class_new(refinement, superclass);
     RCLASS_REFINED_CLASS(c) = klass;
     refinement = RCLASS_SUPER(refinement);
-    while (refinement && refinement != klass) {
+    while (refinement) {
 	FL_SET(refinement, RMODULE_IS_OVERLAID);
 	c = RCLASS_SET_SUPER(c, rb_include_class_new(refinement, RCLASS_SUPER(c)));
 	RCLASS_REFINED_CLASS(c) = klass;
@@ -1258,13 +1269,15 @@ add_activated_refinement(VALUE activated_refinements,
     rb_hash_aset(activated_refinements, klass, iclass);
 }
 
+VALUE rb_yield_refine_block(VALUE refinement, VALUE refinements);
+
 /*
  *  call-seq:
- *     refine(mod) { block }   -> module
+ *     refine(klass) { block }   -> module
  *
- *  Refine <i>mod</i> in the receiver.
+ *  Refine <i>klass</i> in the receiver.
  *
- *  Returns a module, where refined methods are defined.
+ *  Returns an overlaid module.
  */
 
 static VALUE
@@ -1275,16 +1288,16 @@ rb_mod_refine(VALUE module, VALUE klass)
        id_refined_class, id_defined_at;
     VALUE refinements, activated_refinements;
     rb_thread_t *th = GET_THREAD();
-    VALUE block_handler = rb_vm_frame_block_handler(th->cfp);
+    rb_block_t *block = rb_vm_control_frame_block_ptr(th->cfp);
 
-    if (block_handler == VM_BLOCK_HANDLER_NONE) {
-	rb_raise(rb_eArgError, "no block given");
+    if (!block) {
+        rb_raise(rb_eArgError, "no block given");
     }
-    if (vm_block_handler_type(block_handler) != block_handler_type_iseq) {
-	rb_raise(rb_eArgError, "can't pass a Proc as a block to Module#refine");
+    if (block->proc) {
+        rb_raise(rb_eArgError,
+		 "can't pass a Proc as a block to Module#refine");
     }
-
-    ensure_class_or_module(klass);
+    Check_Type(klass, T_CLASS);
     CONST_ID(id_refinements, "__refinements__");
     refinements = rb_attr_get(module, id_refinements);
     if (NIL_P(refinements)) {
@@ -1314,16 +1327,6 @@ rb_mod_refine(VALUE module, VALUE klass)
     return refinement;
 }
 
-static void
-ignored_block(VALUE module, const char *klass)
-{
-    const char *anon = "";
-    if (!RTEST(rb_search_class_path(module))) {
-	anon = ", maybe for Module.new";
-    }
-    rb_warn("%s""using doesn't call the given block""%s.", klass, anon);
-}
-
 /*
  *  call-seq:
  *     using(module)    -> self
@@ -1335,6 +1338,7 @@ ignored_block(VALUE module, const char *klass)
 static VALUE
 mod_using(VALUE self, VALUE module)
 {
+    NODE *cref = rb_vm_cref();
     rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
 
     if (prev_frame_func()) {
@@ -1344,71 +1348,15 @@ mod_using(VALUE self, VALUE module)
     if (prev_cfp && prev_cfp->self != self) {
 	rb_raise(rb_eRuntimeError, "Module#using is not called on self");
     }
-    if (rb_block_given_p()) {
-	ignored_block(module, "Module#");
-    }
-    rb_using_module(rb_vm_cref_replace_with_duplicated_cref(), module);
+    rb_using_module(cref, module);
     return self;
 }
 
-static int
-used_modules_i(VALUE _, VALUE mod, VALUE ary)
-{
-    ID id_defined_at;
-    CONST_ID(id_defined_at, "__defined_at__");
-    while (FL_TEST(rb_class_of(mod), RMODULE_IS_REFINEMENT)) {
-	rb_ary_push(ary, rb_attr_get(rb_class_of(mod), id_defined_at));
-	mod = RCLASS_SUPER(mod);
-    }
-    return ST_CONTINUE;
-}
-
-/*
- *  call-seq:
- *     used_modules -> array
- *
- *  Returns an array of all modules used in the current scope. The ordering
- *  of modules in the resulting array is not defined.
- *
- *     module A
- *       refine Object do
- *       end
- *     end
- *
- *     module B
- *       refine Object do
- *       end
- *     end
- *
- *     using A
- *     using B
- *     p Module.used_modules
- *
- *  <em>produces:</em>
- *
- *     [B, A]
- */
-static VALUE
-rb_mod_s_used_modules(void)
-{
-    const rb_cref_t *cref = rb_vm_cref();
-    VALUE ary = rb_ary_new();
-
-    while(cref) {
-	if(!NIL_P(CREF_REFINEMENTS(cref))) {
-	    rb_hash_foreach(CREF_REFINEMENTS(cref), used_modules_i, ary);
-	}
-	cref = CREF_NEXT(cref);
-    }
-
-    return rb_funcall(ary, rb_intern("uniq"), 0);
-}
-
 void
 rb_obj_call_init(VALUE obj, int argc, const VALUE *argv)
 {
-    PASS_PASSED_BLOCK_HANDLER();
-    rb_funcallv(obj, idInitialize, argc, argv);
+    PASS_PASSED_BLOCK();
+    rb_funcall2(obj, idInitialize, argc, argv);
 }
 
 void
@@ -1527,34 +1475,32 @@ top_include(int argc, VALUE *argv, VALUE self)
 static VALUE
 top_using(VALUE self, VALUE module)
 {
-    const rb_cref_t *cref = rb_vm_cref();
+    NODE *cref = rb_vm_cref();
     rb_control_frame_t *prev_cfp = previous_frame(GET_THREAD());
 
-    if (CREF_NEXT(cref) || (prev_cfp && rb_vm_frame_method_entry(prev_cfp))) {
-	rb_raise(rb_eRuntimeError, "main.using is permitted only at toplevel");
-    }
-    if (rb_block_given_p()) {
-	ignored_block(module, "main.");
+    if (cref->nd_next || (prev_cfp && prev_cfp->me)) {
+	rb_raise(rb_eRuntimeError,
+		 "main.using is permitted only at toplevel");
     }
-    rb_using_module(rb_vm_cref_replace_with_duplicated_cref(), module);
+    rb_using_module(cref, module);
     return self;
 }
 
-static const VALUE *
+static VALUE *
 errinfo_place(rb_thread_t *th)
 {
     rb_control_frame_t *cfp = th->cfp;
     rb_control_frame_t *end_cfp = RUBY_VM_END_CONTROL_FRAME(th);
 
     while (RUBY_VM_VALID_CONTROL_FRAME_P(cfp, end_cfp)) {
-	if (VM_FRAME_RUBYFRAME_P(cfp)) {
-	    if (cfp->iseq->body->type == ISEQ_TYPE_RESCUE) {
-		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
+	if (RUBY_VM_NORMAL_ISEQ_P(cfp->iseq)) {
+	    if (cfp->iseq->type == ISEQ_TYPE_RESCUE) {
+		return &cfp->ep[-2];
 	    }
-	    else if (cfp->iseq->body->type == ISEQ_TYPE_ENSURE &&
-		     !THROW_DATA_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR]) &&
-		     !FIXNUM_P(cfp->ep[VM_ENV_INDEX_LAST_LVAR])) {
-		return &cfp->ep[VM_ENV_INDEX_LAST_LVAR];
+	    else if (cfp->iseq->type == ISEQ_TYPE_ENSURE &&
+		     !RB_TYPE_P(cfp->ep[-2], T_NODE) &&
+		     !FIXNUM_P(cfp->ep[-2])) {
+		return &cfp->ep[-2];
 	    }
 	}
 	cfp = RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp);
@@ -1565,7 +1511,7 @@ errinfo_place(rb_thread_t *th)
 static VALUE
 get_thread_errinfo(rb_thread_t *th)
 {
-    const VALUE *ptr = errinfo_place(th);
+    VALUE *ptr = errinfo_place(th);
     if (ptr) {
 	return *ptr;
     }
@@ -1594,7 +1540,7 @@ errinfo_setter(VALUE val, ID id, VALUE *var)
 	rb_raise(rb_eTypeError, "assigning non-exception to $!");
     }
     else {
-	const VALUE *ptr = errinfo_place(GET_THREAD());
+	VALUE *ptr = errinfo_place(GET_THREAD());
 	if (ptr) {
 	    *ptr = val;
 	}
@@ -1632,7 +1578,7 @@ errat_getter(ID id)
 {
     VALUE err = get_errinfo();
     if (!NIL_P(err)) {
-	return rb_get_backtrace(err);
+	return get_backtrace(err);
     }
     else {
 	return Qnil;
@@ -1738,8 +1684,6 @@ Init_eval(void)
     rb_define_private_method(rb_cModule, "prepend_features", rb_mod_prepend_features, 1);
     rb_define_private_method(rb_cModule, "refine", rb_mod_refine, 1);
     rb_define_private_method(rb_cModule, "using", mod_using, 1);
-    rb_define_singleton_method(rb_cModule, "used_modules",
-			       rb_mod_s_used_modules, 0);
     rb_undef_method(rb_cClass, "refine");
 
     rb_undef_method(rb_cClass, "module_function");
@@ -1761,8 +1705,4 @@ Init_eval(void)
     rb_define_global_function("untrace_var", rb_f_untrace_var, -1);	/* in variable.c */
 
     rb_vm_register_special_exception(ruby_error_reenter, rb_eFatal, "exception reentered");
-
-    id_signo = rb_intern_const("signo");
-    id_status = rb_intern_const("status");
-    id_cause = rb_intern_const("cause");
 }
diff --git a/eval_error.c b/eval_error.c
index ff3db23a6b..0c323c21c7 100644
--- a/eval_error.c
+++ b/eval_error.c
@@ -3,52 +3,62 @@
  * included by eval.c
  */
 
-#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P
-#define warn_print(x) RB_GNUC_EXTENSION_BLOCK(	\
-    (__builtin_constant_p(x)) ? 		\
-	rb_write_error2((x), (long)strlen(x)) : \
-	rb_write_error(x)			\
-)
-#else
+static void
+warn_printf(const char *fmt, ...)
+{
+    VALUE str;
+    va_list args;
+
+    va_init_list(args, fmt);
+    str = rb_vsprintf(fmt, args);
+    va_end(args);
+    rb_write_error_str(str);
+}
+
 #define warn_print(x) rb_write_error(x)
-#endif
 #define warn_print2(x,l) rb_write_error2((x),(l))
 #define warn_print_str(x) rb_write_error_str(x)
 
-static VALUE error_pos_str(void);
-
 static void
 error_pos(void)
 {
-    VALUE str = error_pos_str();
-    if (!NIL_P(str)) {
-	warn_print_str(str);
-    }
-}
-
-static VALUE
-error_pos_str(void)
-{
-    int sourceline;
-    VALUE sourcefile = rb_source_location(&sourceline);
+    const char *sourcefile = rb_sourcefile();
+    int sourceline = rb_sourceline();
 
     if (sourcefile) {
 	ID caller_name;
 	if (sourceline == 0) {
-	    return rb_sprintf("%"PRIsVALUE": ", sourcefile);
+	    warn_printf("%s", sourcefile);
 	}
 	else if ((caller_name = rb_frame_callee()) != 0) {
-	    return rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ",
-			      sourcefile, sourceline,
-			      rb_id2str(caller_name));
+	    warn_printf("%s:%d:in `%s'", sourcefile, sourceline,
+			rb_id2name(caller_name));
 	}
 	else {
-	    return rb_sprintf("%"PRIsVALUE":%d: ", sourcefile, sourceline);
+	    warn_printf("%s:%d", sourcefile, sourceline);
 	}
     }
-    return Qnil;
 }
 
+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);
+}
+
+VALUE rb_exc_set_backtrace(VALUE exc, VALUE bt);
+
 static void
 set_backtrace(VALUE info, VALUE bt)
 {
@@ -63,24 +73,19 @@ set_backtrace(VALUE info, VALUE bt)
 	    bt = rb_backtrace_to_str_ary(bt);
 	}
     }
-    rb_check_funcall(info, set_backtrace, 1, &bt);
+    rb_funcall(info, rb_intern("set_backtrace"), 1, bt);
 }
 
 static void
-error_print(rb_thread_t *th)
-{
-    rb_threadptr_error_print(th, th->errinfo);
-}
-
-void
-rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
+error_print(void)
 {
     volatile VALUE errat = Qundef;
-    volatile int raised_flag = th->raised_flag;
+    rb_thread_t *th = GET_THREAD();
+    VALUE errinfo = th->errinfo;
+    int raised_flag = th->raised_flag;
     volatile VALUE eclass = Qundef, e = Qundef;
     const char *volatile einfo;
     volatile long elen;
-    VALUE mesg;
 
     if (NIL_P(errinfo))
 	return;
@@ -88,7 +93,7 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
 
     TH_PUSH_TAG(th);
     if (TH_EXEC_TAG() == 0) {
-	errat = rb_get_backtrace(errinfo);
+	errat = get_backtrace(errinfo);
     }
     else if (errat == Qundef) {
 	errat = Qnil;
@@ -99,13 +104,27 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
     else {
 	goto no_message;
     }
-    if (NIL_P(errat) || RARRAY_LEN(errat) == 0 ||
-	NIL_P(mesg = RARRAY_AREF(errat, 0))) {
+    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 {
-	warn_print_str(mesg);
-	warn_print(": ");
+	VALUE mesg = RARRAY_AREF(errat, 0);
+
+	if (NIL_P(mesg))
+	    error_pos();
+	else {
+	    warn_print_str(mesg);
+	}
     }
 
     eclass = CLASS_OF(errinfo);
@@ -121,18 +140,19 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
 	elen = 0;
     }
     if (eclass == rb_eRuntimeError && elen == 0) {
-	warn_print("unhandled exception\n");
+	warn_print(": unhandled exception\n");
     }
     else {
 	VALUE epath;
 
 	epath = rb_class_name(eclass);
 	if (elen == 0) {
+	    warn_print(": ");
 	    warn_print_str(epath);
 	    warn_print("\n");
 	}
 	else {
-	    const char *tail = 0;
+	    char *tail = 0;
 	    long len = elen;
 
 	    if (RSTRING_PTR(epath)[0] == '#')
@@ -141,14 +161,15 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
 		len = tail - einfo;
 		tail++;		/* skip newline */
 	    }
-	    warn_print_str(tail ? rb_str_subseq(e, 0, len) : e);
+	    warn_print(": ");
+	    warn_print2(einfo, len);
 	    if (epath) {
 		warn_print(" (");
 		warn_print_str(epath);
 		warn_print(")\n");
 	    }
 	    if (tail) {
-		warn_print_str(rb_str_subseq(e, tail - einfo, elen - len - 1));
+		warn_print2(tail, elen - len - 1);
 	    }
 	    if (tail ? einfo[elen-1] != '\n' : !epath) warn_print2("\n", 1);
 	}
@@ -166,11 +187,11 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
 	for (i = 1; i < len; i++) {
 	    VALUE line = RARRAY_AREF(errat, i);
 	    if (RB_TYPE_P(line, T_STRING)) {
-		warn_print_str(rb_sprintf("\tfrom %"PRIsVALUE"\n", line));
+		warn_printf("\tfrom %"PRIsVALUE"\n", line);
 	    }
 	    if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
-		warn_print_str(rb_sprintf("\t ... %ld levels...\n",
-					  len - TRACE_HEAD - TRACE_TAIL));
+		warn_printf("\t ... %ld levels...\n",
+			    len - TRACE_HEAD - TRACE_TAIL);
 		i = len - TRACE_TAIL;
 	    }
 	}
@@ -184,68 +205,60 @@ rb_threadptr_error_print(rb_thread_t *volatile th, volatile VALUE errinfo)
 void
 ruby_error_print(void)
 {
-    error_print(GET_THREAD());
+    error_print();
 }
 
-#define undef_mesg_for(v, k) rb_fstring_cstr("undefined"v" method `%1$s' for "k" `%2$s'")
-#define undef_mesg(v) ( \
-	is_mod ? \
-	undef_mesg_for(v, "module") : \
-	undef_mesg_for(v, "class"))
+static const char *
+method_scope_name(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;
+    }
+    return v;
+}
 
 void
-rb_print_undef(VALUE klass, ID id, rb_method_visibility_t visi)
+rb_print_undef(VALUE klass, ID id, int scope)
 {
-    const int is_mod = RB_TYPE_P(klass, T_MODULE);
-    VALUE mesg;
-    switch (visi & METHOD_VISI_MASK) {
-      case METHOD_VISI_UNDEF:
-      case METHOD_VISI_PUBLIC:    mesg = undef_mesg(""); break;
-      case METHOD_VISI_PRIVATE:   mesg = undef_mesg(" private"); break;
-      case METHOD_VISI_PROTECTED: mesg = undef_mesg(" protected"); break;
-      default: UNREACHABLE;
-    }
-    rb_name_err_raise_str(mesg, klass, ID2SYM(id));
+    const char *v = method_scope_name(scope);
+    rb_name_error(id, "undefined%s method `%"PRIsVALUE"' for %s `% "PRIsVALUE"'", v,
+		  QUOTE_ID(id),
+		  (RB_TYPE_P(klass, T_MODULE)) ? "module" : "class",
+		  rb_class_name(klass));
 }
 
 void
 rb_print_undef_str(VALUE klass, VALUE name)
 {
-    const int is_mod = RB_TYPE_P(klass, T_MODULE);
-    rb_name_err_raise_str(undef_mesg(""), klass, name);
+    rb_name_error_str(name, "undefined method `%"PRIsVALUE"' for %s `% "PRIsVALUE"'",
+		      QUOTE(name),
+		      (RB_TYPE_P(klass, T_MODULE)) ? "module" : "class",
+		      rb_class_name(klass));
 }
 
-#define inaccessible_mesg_for(v, k) rb_fstring_cstr("method `%1$s' for "k" `%2$s' is "v)
-#define inaccessible_mesg(v) ( \
-	is_mod ? \
-	inaccessible_mesg_for(v, "module") : \
-	inaccessible_mesg_for(v, "class"))
-
 void
-rb_print_inaccessible(VALUE klass, ID id, rb_method_visibility_t visi)
+rb_print_inaccessible(VALUE klass, ID id, int scope)
 {
-    const int is_mod = RB_TYPE_P(klass, T_MODULE);
-    VALUE mesg;
-    switch (visi & METHOD_VISI_MASK) {
-      case METHOD_VISI_UNDEF:
-      case METHOD_VISI_PUBLIC:    mesg = inaccessible_mesg(""); break;
-      case METHOD_VISI_PRIVATE:   mesg = inaccessible_mesg(" private"); break;
-      case METHOD_VISI_PROTECTED: mesg = inaccessible_mesg(" protected"); break;
-      default: UNREACHABLE;
-    }
-    rb_name_err_raise_str(mesg, klass, ID2SYM(id));
+    const char *v = method_scope_name(scope);
+    rb_name_error(id, "method `%"PRIsVALUE"' for %s `% "PRIsVALUE"' is %s",
+		  QUOTE_ID(id),
+		  (RB_TYPE_P(klass, T_MODULE)) ? "module" : "class",
+		  rb_class_name(klass),
+		  v);
 }
 
 static int
 sysexit_status(VALUE err)
 {
-    VALUE st = rb_ivar_get(err, id_status);
+    VALUE st = rb_iv_get(err, "status");
     return NUM2INT(st);
 }
 
-#define unknown_longjmp_status(status) \
-    rb_bug("Unknown longjmp status %d", status)
-
 static int
 error_handle(int ex)
 {
@@ -261,48 +274,48 @@ error_handle(int ex)
 
       case TAG_RETURN:
 	error_pos();
-	warn_print("unexpected return\n");
+	warn_print(": unexpected return\n");
 	break;
       case TAG_NEXT:
 	error_pos();
-	warn_print("unexpected next\n");
+	warn_print(": unexpected next\n");
 	break;
       case TAG_BREAK:
 	error_pos();
-	warn_print("unexpected break\n");
+	warn_print(": unexpected break\n");
 	break;
       case TAG_REDO:
 	error_pos();
-	warn_print("unexpected redo\n");
+	warn_print(": unexpected redo\n");
 	break;
       case TAG_RETRY:
 	error_pos();
-	warn_print("retry outside of rescue clause\n");
+	warn_print(": retry outside of rescue clause\n");
 	break;
       case TAG_THROW:
 	/* TODO: fix me */
 	error_pos();
-	warn_print("unexpected throw\n");
+	warn_printf(": unexpected throw\n");
 	break;
       case TAG_RAISE: {
-	VALUE errinfo = th->errinfo;
+	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) &&
-		 rb_ivar_get(errinfo, id_signo) != INT2FIX(SIGSEGV)) {
+		 rb_iv_get(errinfo, "signo") != INT2FIX(SIGSEGV)) {
 	    /* no message when exiting by signal */
 	}
 	else {
-	    error_print(th);
+	    error_print();
 	}
 	break;
       }
       case TAG_FATAL:
-	error_print(th);
+	error_print();
 	break;
       default:
-	unknown_longjmp_status(ex);
+	rb_bug("Unknown longjmp status %d", ex);
 	break;
     }
     rb_threadptr_reset_raised(th);
diff --git a/eval_intern.h b/eval_intern.h
index c5210b14de..c457deb8db 100644
--- a/eval_intern.h
+++ b/eval_intern.h
@@ -4,24 +4,15 @@
 #include "ruby/ruby.h"
 #include "vm_core.h"
 
-static inline void
-vm_passed_block_handler_set(rb_thread_t *th, VALUE block_handler)
-{
-    VM_ASSERT(vm_block_handler_verify(block_handler));
-    th->passed_block_handler = block_handler;
-}
-
-static inline void
-pass_passed_block_handler(rb_thread_t *th)
-{
-    VALUE block_handler = rb_vm_frame_block_handler(th->cfp);
-    VM_ASSERT(vm_block_handler_verify(block_handler));
-    vm_passed_block_handler_set(th, block_handler);
-    VM_ENV_FLAGS_SET(th->cfp->ep, VM_FRAME_FLAG_PASSED);
-}
+#define PASS_PASSED_BLOCK_TH(th) do { \
+    (th)->passed_block = rb_vm_control_frame_block_ptr(th->cfp); \
+    (th)->cfp->flag |= VM_FRAME_FLAG_PASSED; \
+} while (0)
 
-#define PASS_PASSED_BLOCK_HANDLER_TH(th) pass_passed_block_handler(th)
-#define PASS_PASSED_BLOCK_HANDLER() pass_passed_block_handler(GET_THREAD())
+#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>
@@ -131,7 +122,7 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
 #define TH_PUSH_TAG(th) do { \
   rb_thread_t * const _th = (th); \
   struct rb_vm_tag _tag; \
-  _tag.tag = Qundef; \
+  _tag.tag = 0; \
   _tag.prev = _th->tag;
 
 #define TH_POP_TAG() \
@@ -149,11 +140,9 @@ LONG WINAPI rb_w32_stack_overflow_handler(struct _EXCEPTION_POINTERS *);
 #if defined __GNUC__ && __GNUC__ == 4 && (__GNUC_MINOR__ >= 6 && __GNUC_MINOR__ <= 8)
 # define VAR_FROM_MEMORY(var) __extension__(*(__typeof__(var) volatile *)&(var))
 # define VAR_INITIALIZED(var) ((var) = VAR_FROM_MEMORY(var))
-# define VAR_NOCLOBBERED(var) volatile var
 #else
 # define VAR_FROM_MEMORY(var) (var)
 # define VAR_INITIALIZED(var) ((void)&(var))
-# define VAR_NOCLOBBERED(var) var
 #endif
 
 /* clear th->state, and return the value */
@@ -189,70 +178,41 @@ rb_threadptr_tag_jump(rb_thread_t *th, int st)
 
 #define INTERNAL_EXCEPTION_P(exc) FIXNUM_P(exc)
 
-/* CREF operators */
-
-#define CREF_FL_PUSHED_BY_EVAL IMEMO_FL_USER1
-#define CREF_FL_OMOD_SHARED    IMEMO_FL_USER2
-
-static inline VALUE
-CREF_CLASS(const rb_cref_t *cref)
-{
-    return cref->klass;
-}
-
-static inline rb_cref_t *
-CREF_NEXT(const rb_cref_t *cref)
-{
-    return cref->next;
-}
-
-static inline const rb_scope_visibility_t *
-CREF_SCOPE_VISI(const rb_cref_t *cref)
-{
-    return &cref->scope_visi;
-}
-
-static inline VALUE
-CREF_REFINEMENTS(const rb_cref_t *cref)
-{
-    return cref->refinements;
-}
-
-static inline void
-CREF_REFINEMENTS_SET(rb_cref_t *cref, VALUE refs)
-{
-    RB_OBJ_WRITE(cref, &cref->refinements, refs);
-}
-
-static inline int
-CREF_PUSHED_BY_EVAL(const rb_cref_t *cref)
-{
-    return cref->flags & CREF_FL_PUSHED_BY_EVAL;
-}
-
-static inline void
-CREF_PUSHED_BY_EVAL_SET(rb_cref_t *cref)
-{
-    cref->flags |= CREF_FL_PUSHED_BY_EVAL;
-}
-
-static inline int
-CREF_OMOD_SHARED(const rb_cref_t *cref)
-{
-    return cref->flags & CREF_FL_OMOD_SHARED;
-}
-
-static inline void
-CREF_OMOD_SHARED_SET(rb_cref_t *cref)
-{
-    cref->flags |= CREF_FL_OMOD_SHARED;
-}
-
-static inline void
-CREF_OMOD_SHARED_UNSET(rb_cref_t *cref)
-{
-    cref->flags &= ~CREF_FL_OMOD_SHARED;
-}
+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))
 
 void rb_thread_cleanup(void);
 void rb_thread_wait_other_threads(void);
@@ -276,20 +236,20 @@ NORETURN(void rb_method_name_error(VALUE, VALUE));
 
 NORETURN(void rb_fiber_start(void));
 
-NORETURN(void rb_print_undef(VALUE, ID, rb_method_visibility_t));
+NORETURN(void rb_print_undef(VALUE, ID, int));
 NORETURN(void rb_print_undef_str(VALUE, VALUE));
-NORETURN(void rb_print_inaccessible(VALUE, ID, rb_method_visibility_t));
+NORETURN(void rb_print_inaccessible(VALUE, ID, int));
 NORETURN(void rb_vm_localjump_error(const char *,VALUE, int));
 NORETURN(void rb_vm_jump_tag_but_local_jump(int));
 NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, const VALUE *argv,
 				      VALUE obj, int call_status));
 
 VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val);
-rb_cref_t *rb_vm_cref(void);
-rb_cref_t *rb_vm_cref_replace_with_duplicated_cref(void);
-VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, VALUE block_handler, VALUE filename);
+NODE *rb_vm_cref(void);
+VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename);
 void rb_vm_set_progname(VALUE filename);
 void rb_thread_terminate_all(void);
+VALUE rb_vm_top_self();
 VALUE rb_vm_cbase(void);
 
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
diff --git a/eval_jump.c b/eval_jump.c
index 59dae109ce..5443ed224e 100644
--- a/eval_jump.c
+++ b/eval_jump.c
@@ -94,11 +94,10 @@ rb_mark_end_proc(void)
 }
 
 static void
-exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
+exec_end_procs_chain(struct end_proc_data *volatile *procs)
 {
     struct end_proc_data volatile endproc;
     struct end_proc_data *link;
-    VALUE errinfo = *errp;
 
     while ((link = *procs) != 0) {
 	*procs = link->next;
@@ -106,7 +105,6 @@ exec_end_procs_chain(struct end_proc_data *volatile *procs, VALUE *errp)
 	xfree(link);
 	rb_set_safe_level_force(endproc.safe);
 	(*endproc.func) (endproc.data);
-	*errp = errinfo;
     }
 }
 
@@ -118,11 +116,11 @@ rb_exec_end_proc(void)
     rb_thread_t *th = GET_THREAD();
     volatile VALUE errinfo = th->errinfo;
 
-    TH_PUSH_TAG(th);
+    PUSH_TAG();
     if ((status = EXEC_TAG()) == 0) {
       again:
-	exec_end_procs_chain(&ephemeral_end_procs, &th->errinfo);
-	exec_end_procs_chain(&end_procs, &th->errinfo);
+	exec_end_procs_chain(&ephemeral_end_procs);
+	exec_end_procs_chain(&end_procs);
     }
     else {
 	VAR_INITIALIZED(th);
@@ -132,7 +130,7 @@ rb_exec_end_proc(void)
 	TH_REPUSH_TAG();
 	goto again;
     }
-    TH_POP_TAG();
+    POP_TAG();
 
     rb_set_safe_level_force(safe);
     th->errinfo = errinfo;
diff --git a/ext/-test-/array/resize/depend b/ext/-test-/array/resize/depend
deleted file mode 100644
index 177c527db2..0000000000
--- a/ext/-test-/array/resize/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-resize.o: $(RUBY_EXTCONF_H)
-resize.o: $(arch_hdrdir)/ruby/config.h
-resize.o: $(hdrdir)/ruby/backward.h
-resize.o: $(hdrdir)/ruby/defines.h
-resize.o: $(hdrdir)/ruby/intern.h
-resize.o: $(hdrdir)/ruby/missing.h
-resize.o: $(hdrdir)/ruby/ruby.h
-resize.o: $(hdrdir)/ruby/st.h
-resize.o: $(hdrdir)/ruby/subst.h
-resize.o: resize.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/array/resize/extconf.rb b/ext/-test-/array/resize/extconf.rb
index bc827e1170..6500a878fc 100644
--- a/ext/-test-/array/resize/extconf.rb
+++ b/ext/-test-/array/resize/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/array/resize")
diff --git a/ext/-test-/auto_ext.rb b/ext/-test-/auto_ext.rb
deleted file mode 100644
index 71606a9dd1..0000000000
--- a/ext/-test-/auto_ext.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: false
-def auto_ext(feat = $0[%r[/ext/(-test-/.*)/extconf.rb\z], 1], inc: false)
-  $INCFLAGS << " -I$(topdir) -I$(top_srcdir)" if inc
-  $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(feat)
-end
diff --git a/ext/-test-/bignum/big2str.c b/ext/-test-/bignum/big2str.c
index ec4bde2915..ce71fe37e2 100644
--- a/ext/-test-/bignum/big2str.c
+++ b/ext/-test-/bignum/big2str.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 static VALUE
diff --git a/ext/-test-/bignum/bigzero.c b/ext/-test-/bignum/bigzero.c
index 35117db7ae..a3bf8af459 100644
--- a/ext/-test-/bignum/bigzero.c
+++ b/ext/-test-/bignum/bigzero.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 static VALUE
diff --git a/ext/-test-/bignum/depend b/ext/-test-/bignum/depend
index 5310a3a4be..c65482236a 100644
--- a/ext/-test-/bignum/depend
+++ b/ext/-test-/bignum/depend
@@ -1,109 +1,7 @@
-big2str.o: big2str.c
-div.o: div.c
-intpack.o: intpack.c
-mul.o: mul.c
-str2big.o: str2big.c
+$(OBJS): $(HDRS) $(ruby_headers)
 
-# AUTOGENERATED DEPENDENCIES START
-big2str.o: $(RUBY_EXTCONF_H)
-big2str.o: $(arch_hdrdir)/ruby/config.h
-big2str.o: $(hdrdir)/ruby/backward.h
-big2str.o: $(hdrdir)/ruby/defines.h
-big2str.o: $(hdrdir)/ruby/encoding.h
-big2str.o: $(hdrdir)/ruby/intern.h
-big2str.o: $(hdrdir)/ruby/io.h
-big2str.o: $(hdrdir)/ruby/missing.h
-big2str.o: $(hdrdir)/ruby/oniguruma.h
-big2str.o: $(hdrdir)/ruby/ruby.h
-big2str.o: $(hdrdir)/ruby/st.h
-big2str.o: $(hdrdir)/ruby/subst.h
-big2str.o: $(top_srcdir)/include/ruby.h
-big2str.o: $(top_srcdir)/internal.h
-big2str.o: big2str.c
-bigzero.o: $(RUBY_EXTCONF_H)
-bigzero.o: $(arch_hdrdir)/ruby/config.h
-bigzero.o: $(hdrdir)/ruby/backward.h
-bigzero.o: $(hdrdir)/ruby/defines.h
-bigzero.o: $(hdrdir)/ruby/encoding.h
-bigzero.o: $(hdrdir)/ruby/intern.h
-bigzero.o: $(hdrdir)/ruby/io.h
-bigzero.o: $(hdrdir)/ruby/missing.h
-bigzero.o: $(hdrdir)/ruby/oniguruma.h
-bigzero.o: $(hdrdir)/ruby/ruby.h
-bigzero.o: $(hdrdir)/ruby/st.h
-bigzero.o: $(hdrdir)/ruby/subst.h
-bigzero.o: $(top_srcdir)/include/ruby.h
-bigzero.o: $(top_srcdir)/internal.h
-bigzero.o: bigzero.c
-div.o: $(RUBY_EXTCONF_H)
-div.o: $(arch_hdrdir)/ruby/config.h
-div.o: $(hdrdir)/ruby/backward.h
-div.o: $(hdrdir)/ruby/defines.h
-div.o: $(hdrdir)/ruby/encoding.h
-div.o: $(hdrdir)/ruby/intern.h
-div.o: $(hdrdir)/ruby/io.h
-div.o: $(hdrdir)/ruby/missing.h
-div.o: $(hdrdir)/ruby/oniguruma.h
-div.o: $(hdrdir)/ruby/ruby.h
-div.o: $(hdrdir)/ruby/st.h
-div.o: $(hdrdir)/ruby/subst.h
-div.o: $(top_srcdir)/include/ruby.h
-div.o: $(top_srcdir)/internal.h
-div.o: div.c
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-intpack.o: $(RUBY_EXTCONF_H)
-intpack.o: $(arch_hdrdir)/ruby/config.h
-intpack.o: $(hdrdir)/ruby/backward.h
-intpack.o: $(hdrdir)/ruby/defines.h
-intpack.o: $(hdrdir)/ruby/encoding.h
-intpack.o: $(hdrdir)/ruby/intern.h
-intpack.o: $(hdrdir)/ruby/io.h
-intpack.o: $(hdrdir)/ruby/missing.h
-intpack.o: $(hdrdir)/ruby/oniguruma.h
-intpack.o: $(hdrdir)/ruby/ruby.h
-intpack.o: $(hdrdir)/ruby/st.h
-intpack.o: $(hdrdir)/ruby/subst.h
-intpack.o: $(top_srcdir)/include/ruby.h
-intpack.o: $(top_srcdir)/internal.h
-intpack.o: intpack.c
-mul.o: $(RUBY_EXTCONF_H)
-mul.o: $(arch_hdrdir)/ruby/config.h
-mul.o: $(hdrdir)/ruby/backward.h
-mul.o: $(hdrdir)/ruby/defines.h
-mul.o: $(hdrdir)/ruby/encoding.h
-mul.o: $(hdrdir)/ruby/intern.h
-mul.o: $(hdrdir)/ruby/io.h
-mul.o: $(hdrdir)/ruby/missing.h
-mul.o: $(hdrdir)/ruby/oniguruma.h
-mul.o: $(hdrdir)/ruby/ruby.h
-mul.o: $(hdrdir)/ruby/st.h
-mul.o: $(hdrdir)/ruby/subst.h
-mul.o: $(top_srcdir)/include/ruby.h
-mul.o: $(top_srcdir)/internal.h
-mul.o: mul.c
-str2big.o: $(RUBY_EXTCONF_H)
-str2big.o: $(arch_hdrdir)/ruby/config.h
-str2big.o: $(hdrdir)/ruby/backward.h
-str2big.o: $(hdrdir)/ruby/defines.h
-str2big.o: $(hdrdir)/ruby/encoding.h
-str2big.o: $(hdrdir)/ruby/intern.h
-str2big.o: $(hdrdir)/ruby/io.h
-str2big.o: $(hdrdir)/ruby/missing.h
-str2big.o: $(hdrdir)/ruby/oniguruma.h
-str2big.o: $(hdrdir)/ruby/ruby.h
-str2big.o: $(hdrdir)/ruby/st.h
-str2big.o: $(hdrdir)/ruby/subst.h
-str2big.o: $(top_srcdir)/include/ruby.h
-str2big.o: $(top_srcdir)/internal.h
-str2big.o: str2big.c
-# AUTOGENERATED DEPENDENCIES END
+intpack.o: intpack.c $(top_srcdir)/internal.h
+mul.o: mul.c $(top_srcdir)/internal.h
+div.o: div.c $(top_srcdir)/internal.h
+big2str.o: big2str.c $(top_srcdir)/internal.h
+str2big.o: big2str.c $(top_srcdir)/internal.h
diff --git a/ext/-test-/bignum/div.c b/ext/-test-/bignum/div.c
index a1db21dc30..2853ebef1c 100644
--- a/ext/-test-/bignum/div.c
+++ b/ext/-test-/bignum/div.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 static VALUE
diff --git a/ext/-test-/bignum/extconf.rb b/ext/-test-/bignum/extconf.rb
index d786b15db9..e8c1febc82 100644
--- a/ext/-test-/bignum/extconf.rb
+++ b/ext/-test-/bignum/extconf.rb
@@ -1,3 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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-/bignum")
diff --git a/ext/-test-/bignum/intpack.c b/ext/-test-/bignum/intpack.c
index 2d19442cf2..b7435b2025 100644
--- a/ext/-test-/bignum/intpack.c
+++ b/ext/-test-/bignum/intpack.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 static VALUE
diff --git a/ext/-test-/bignum/mul.c b/ext/-test-/bignum/mul.c
index b922f34437..c0514a5a0d 100644
--- a/ext/-test-/bignum/mul.c
+++ b/ext/-test-/bignum/mul.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 static VALUE
@@ -54,8 +55,8 @@ mul_gmp(VALUE x, VALUE y)
 void
 Init_mul(VALUE klass)
 {
-    rb_define_const(rb_cInteger, "SIZEOF_BDIGIT", INT2NUM(SIZEOF_BDIGIT));
-    rb_define_const(rb_cInteger, "BITSPERDIG", INT2NUM(SIZEOF_BDIGIT * CHAR_BIT));
+    rb_define_const(rb_cBignum, "SIZEOF_BDIGIT", INT2NUM(SIZEOF_BDIGIT));
+    rb_define_const(rb_cBignum, "BITSPERDIG", INT2NUM(SIZEOF_BDIGIT * CHAR_BIT));
     rb_define_method(rb_cInteger, "big_mul_normal", mul_normal, 1);
     rb_define_method(rb_cInteger, "big_sq_fast", sq_fast, 0);
     rb_define_method(rb_cInteger, "big_mul_balance", mul_balance, 1);
diff --git a/ext/-test-/bignum/str2big.c b/ext/-test-/bignum/str2big.c
index bc79ef0329..0fdcb53290 100644
--- a/ext/-test-/bignum/str2big.c
+++ b/ext/-test-/bignum/str2big.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 static VALUE
diff --git a/ext/-test-/bug-3571/bug.c b/ext/-test-/bug-3571/bug.c
index a64f054740..87a5df0588 100644
--- a/ext/-test-/bug-3571/bug.c
+++ b/ext/-test-/bug-3571/bug.c
@@ -16,7 +16,7 @@ bug_start(VALUE self, VALUE hash)
 }
 
 void
-Init_bug_3571(void)
+Init_bug(void)
 {
     VALUE mBug = rb_define_module("Bug");
     rb_define_module_function(mBug, "start", bug_start, 0);
diff --git a/ext/-test-/bug-3571/extconf.rb b/ext/-test-/bug-3571/extconf.rb
index 7e76ebded6..6390fce219 100644
--- a/ext/-test-/bug-3571/extconf.rb
+++ b/ext/-test-/bug-3571/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/bug_3571")
+create_makefile("-test-/bug-3571/bug")
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-/bug-5832/bug.c b/ext/-test-/bug-5832/bug.c
index a2c3965640..67be5844b6 100644
--- a/ext/-test-/bug-5832/bug.c
+++ b/ext/-test-/bug-5832/bug.c
@@ -7,7 +7,7 @@ bug_funcall_callback(VALUE self, VALUE obj)
 }
 
 void
-Init_bug_5832(void)
+Init_bug(void)
 {
     VALUE mBug = rb_define_module("Bug");
     rb_define_module_function(mBug, "funcall_callback", bug_funcall_callback, 1);
diff --git a/ext/-test-/bug-5832/extconf.rb b/ext/-test-/bug-5832/extconf.rb
index b8452b4f8f..55a4b7d93f 100644
--- a/ext/-test-/bug-5832/extconf.rb
+++ b/ext/-test-/bug-5832/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/bug_5832")
+create_makefile("-test-/bug-5832/bug")
diff --git a/ext/-test-/bug_reporter/extconf.rb b/ext/-test-/bug_reporter/extconf.rb
index d9d49bb23e..0fccd81a41 100644
--- a/ext/-test-/bug_reporter/extconf.rb
+++ b/ext/-test-/bug_reporter/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/bug_reporter")
+create_makefile("-test-/bug_reporter/bug_reporter")
diff --git a/ext/-test-/class/depend b/ext/-test-/class/depend
deleted file mode 100644
index 40f3d7ab6d..0000000000
--- a/ext/-test-/class/depend
+++ /dev/null
@@ -1,23 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-class2name.o: $(RUBY_EXTCONF_H)
-class2name.o: $(arch_hdrdir)/ruby/config.h
-class2name.o: $(hdrdir)/ruby/backward.h
-class2name.o: $(hdrdir)/ruby/defines.h
-class2name.o: $(hdrdir)/ruby/intern.h
-class2name.o: $(hdrdir)/ruby/missing.h
-class2name.o: $(hdrdir)/ruby/ruby.h
-class2name.o: $(hdrdir)/ruby/st.h
-class2name.o: $(hdrdir)/ruby/subst.h
-class2name.o: class2name.c
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/class/extconf.rb b/ext/-test-/class/extconf.rb
index d786b15db9..a07d660b87 100644
--- a/ext/-test-/class/extconf.rb
+++ b/ext/-test-/class/extconf.rb
@@ -1,3 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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-/class")
diff --git a/ext/-test-/debug/depend b/ext/-test-/debug/depend
index 392677239a..d5a2ef9a52 100644
--- a/ext/-test-/debug/depend
+++ b/ext/-test-/debug/depend
@@ -1,35 +1,3 @@
-# AUTOGENERATED DEPENDENCIES START
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-inspector.o: $(RUBY_EXTCONF_H)
-inspector.o: $(arch_hdrdir)/ruby/config.h
-inspector.o: $(hdrdir)/ruby/backward.h
-inspector.o: $(hdrdir)/ruby/debug.h
-inspector.o: $(hdrdir)/ruby/defines.h
-inspector.o: $(hdrdir)/ruby/intern.h
-inspector.o: $(hdrdir)/ruby/missing.h
-inspector.o: $(hdrdir)/ruby/ruby.h
-inspector.o: $(hdrdir)/ruby/st.h
-inspector.o: $(hdrdir)/ruby/subst.h
-inspector.o: inspector.c
-profile_frames.o: $(RUBY_EXTCONF_H)
-profile_frames.o: $(arch_hdrdir)/ruby/config.h
-profile_frames.o: $(hdrdir)/ruby/backward.h
-profile_frames.o: $(hdrdir)/ruby/debug.h
-profile_frames.o: $(hdrdir)/ruby/defines.h
-profile_frames.o: $(hdrdir)/ruby/intern.h
-profile_frames.o: $(hdrdir)/ruby/missing.h
-profile_frames.o: $(hdrdir)/ruby/ruby.h
-profile_frames.o: $(hdrdir)/ruby/st.h
-profile_frames.o: $(hdrdir)/ruby/subst.h
-profile_frames.o: profile_frames.c
-# AUTOGENERATED DEPENDENCIES END
+init.o: $(HDRS) $(ruby_headers)
+inspector.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h
+profile_frames.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h
diff --git a/ext/-test-/debug/extconf.rb b/ext/-test-/debug/extconf.rb
index ca51178a18..8f7922e1a6 100644
--- a/ext/-test-/debug/extconf.rb
+++ b/ext/-test-/debug/extconf.rb
@@ -1,3 +1,6 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext
+$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-/debug")
diff --git a/ext/-test-/dln/empty/depend b/ext/-test-/dln/empty/depend
deleted file mode 100644
index 99151fa055..0000000000
--- a/ext/-test-/dln/empty/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-empty.o: empty.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/dln/empty/extconf.rb b/ext/-test-/dln/empty/extconf.rb
deleted file mode 100644
index 20310b6dde..0000000000
--- a/ext/-test-/dln/empty/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: false
-create_makefile("-test-/dln/empty")
diff --git a/ext/-test-/exception/depend b/ext/-test-/exception/depend
index 6d3f6e75f3..79b6c53f50 100644
--- a/ext/-test-/exception/depend
+++ b/ext/-test-/exception/depend
@@ -1,47 +1,3 @@
-# AUTOGENERATED DEPENDENCIES START
-dataerror.o: $(RUBY_EXTCONF_H)
-dataerror.o: $(arch_hdrdir)/ruby/config.h
-dataerror.o: $(hdrdir)/ruby/backward.h
-dataerror.o: $(hdrdir)/ruby/defines.h
-dataerror.o: $(hdrdir)/ruby/intern.h
-dataerror.o: $(hdrdir)/ruby/missing.h
-dataerror.o: $(hdrdir)/ruby/ruby.h
-dataerror.o: $(hdrdir)/ruby/st.h
-dataerror.o: $(hdrdir)/ruby/subst.h
-dataerror.o: dataerror.c
-enc_raise.o: $(RUBY_EXTCONF_H)
-enc_raise.o: $(arch_hdrdir)/ruby/config.h
-enc_raise.o: $(hdrdir)/ruby/backward.h
-enc_raise.o: $(hdrdir)/ruby/defines.h
-enc_raise.o: $(hdrdir)/ruby/encoding.h
-enc_raise.o: $(hdrdir)/ruby/intern.h
-enc_raise.o: $(hdrdir)/ruby/missing.h
-enc_raise.o: $(hdrdir)/ruby/oniguruma.h
-enc_raise.o: $(hdrdir)/ruby/ruby.h
-enc_raise.o: $(hdrdir)/ruby/st.h
-enc_raise.o: $(hdrdir)/ruby/subst.h
-enc_raise.o: $(top_srcdir)/include/ruby.h
-enc_raise.o: enc_raise.c
-ensured.o: $(RUBY_EXTCONF_H)
-ensured.o: $(arch_hdrdir)/ruby/config.h
-ensured.o: $(hdrdir)/ruby/backward.h
-ensured.o: $(hdrdir)/ruby/defines.h
-ensured.o: $(hdrdir)/ruby/intern.h
-ensured.o: $(hdrdir)/ruby/missing.h
-ensured.o: $(hdrdir)/ruby/ruby.h
-ensured.o: $(hdrdir)/ruby/st.h
-ensured.o: $(hdrdir)/ruby/subst.h
-ensured.o: $(top_srcdir)/include/ruby.h
-ensured.o: ensured.c
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/-test-/exception/extconf.rb b/ext/-test-/exception/extconf.rb
index ca51178a18..0faf6d53ed 100644
--- a/ext/-test-/exception/extconf.rb
+++ b/ext/-test-/exception/extconf.rb
@@ -1,3 +1,6 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext
+$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-/exception")
diff --git a/ext/-test-/fatal/extconf.rb b/ext/-test-/fatal/extconf.rb
index d5849c0733..e0cfeb2095 100644
--- a/ext/-test-/fatal/extconf.rb
+++ b/ext/-test-/fatal/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/fatal/rb_fatal")
diff --git a/ext/-test-/file/depend b/ext/-test-/file/depend
index fb22843b72..7555a235b5 100644
--- a/ext/-test-/file/depend
+++ b/ext/-test-/file/depend
@@ -1,39 +1,2 @@
-# AUTOGENERATED DEPENDENCIES START
-fs.o: $(RUBY_EXTCONF_H)
-fs.o: $(arch_hdrdir)/ruby/config.h
-fs.o: $(hdrdir)/ruby/backward.h
-fs.o: $(hdrdir)/ruby/defines.h
-fs.o: $(hdrdir)/ruby/encoding.h
-fs.o: $(hdrdir)/ruby/intern.h
-fs.o: $(hdrdir)/ruby/io.h
-fs.o: $(hdrdir)/ruby/missing.h
-fs.o: $(hdrdir)/ruby/oniguruma.h
-fs.o: $(hdrdir)/ruby/ruby.h
-fs.o: $(hdrdir)/ruby/st.h
-fs.o: $(hdrdir)/ruby/subst.h
-fs.o: fs.c
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-stat.o: $(RUBY_EXTCONF_H)
-stat.o: $(arch_hdrdir)/ruby/config.h
-stat.o: $(hdrdir)/ruby/backward.h
-stat.o: $(hdrdir)/ruby/defines.h
-stat.o: $(hdrdir)/ruby/encoding.h
-stat.o: $(hdrdir)/ruby/intern.h
-stat.o: $(hdrdir)/ruby/io.h
-stat.o: $(hdrdir)/ruby/missing.h
-stat.o: $(hdrdir)/ruby/oniguruma.h
-stat.o: $(hdrdir)/ruby/ruby.h
-stat.o: $(hdrdir)/ruby/st.h
-stat.o: $(hdrdir)/ruby/subst.h
-stat.o: stat.c
-# AUTOGENERATED DEPENDENCIES END
+init.o: $(HDRS) $(ruby_headers)
+stat.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/io.h $(hdrdir)/ruby/encoding.h $(hdrdir)/oniguruma.h
diff --git a/ext/-test-/file/extconf.rb b/ext/-test-/file/extconf.rb
index 9027ed1c3e..4e134dd1bf 100644
--- a/ext/-test-/file/extconf.rb
+++ b/ext/-test-/file/extconf.rb
@@ -1,18 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-
-headers = %w[sys/param.h sys/mount.h sys/vfs.h].select {|h| have_header(h)}
-if have_type("struct statfs", headers)
-  have_struct_member("struct statfs", "f_fstypename", headers)
-  have_struct_member("struct statfs", "f_type", headers)
-  have_struct_member("struct statfs", "f_flags", headers)
-end
-
-headers = %w[sys/statvfs.h].select {|h| have_header(h)}
-if have_type("struct statvfs", headers)
-  have_struct_member("struct statvfs", "f_fstypename", headers)
-  have_struct_member("struct statvfs", "f_basetype", headers)
-  have_struct_member("struct statvfs", "f_type", headers)
-end
-
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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-/file")
diff --git a/ext/-test-/file/fs.c b/ext/-test-/file/fs.c
index c9c3473257..4a41bf33b9 100644
--- a/ext/-test-/file/fs.c
+++ b/ext/-test-/file/fs.c
@@ -1,102 +1,55 @@
 #include "ruby/ruby.h"
 #include "ruby/io.h"
 
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#ifdef HAVE_SYS_VFS_H
-#include <sys/vfs.h>
-#endif
-#ifdef HAVE_SYS_STATVFS_H
-#include <sys/statvfs.h>
+#ifdef __linux__
+# define HAVE_GETMNTENT
 #endif
 
-#if defined HAVE_STRUCT_STATFS_F_FSTYPENAME
-typedef struct statfs statfs_t;
-# define STATFS(f, s) statfs((f), (s))
-# define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
-# if defined HAVE_STRUCT_STATFS_F_TYPE
-#   define HAVE_STRUCT_STATFS_T_F_TYPE 1
-# endif
-#elif defined(HAVE_STRUCT_STATVFS_F_FSTYPENAME) /* NetBSD */
-typedef struct statvfs statfs_t;
-# define STATFS(f, s) statvfs((f), (s))
-# define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
-# if defined HAVE_STRUCT_STATVFS_F_TYPE
-#   define HAVE_STRUCT_STATFS_T_F_TYPE 1
-# endif
-#elif defined(HAVE_STRUCT_STATVFS_F_BASETYPE) /* AIX, HP-UX, Solaris */
-typedef struct statvfs statfs_t;
-# define STATFS(f, s) statvfs((f), (s))
-# define HAVE_STRUCT_STATFS_T_F_FSTYPENAME 1
-# define f_fstypename f_basetype
-# if defined HAVE_STRUCT_STATVFS_F_TYPE
-#   define HAVE_STRUCT_STATFS_T_F_TYPE 1
-# endif
-#elif defined(HAVE_STRUCT_STATFS_F_TYPE) /* Linux */
-typedef struct statfs statfs_t;
-# define STATFS(f, s) statfs((f), (s))
-# if defined HAVE_STRUCT_STATFS_F_TYPE
-#   define HAVE_STRUCT_STATFS_T_F_TYPE 1
-# endif
+#ifdef HAVE_GETMNTENT
+# include <stdio.h>
+# include <mntent.h>
 #endif
 
 VALUE
 get_fsname(VALUE self, VALUE str)
 {
-#ifdef STATFS
-    statfs_t st;
-# define CSTR(s) rb_str_new_cstr(s)
+#ifdef HAVE_GETMNTENT
+    const char *path;
+    struct mntent mntbuf;
+    static const int buflen = 4096;
+    char *buf = alloca(buflen);
+    int len = 0;
+    FILE *fp;
+#define FSNAME_LEN 100
+    char name[FSNAME_LEN] = "";
 
     FilePathValue(str);
-    str = rb_str_encode_ospath(str);
-    if (STATFS(StringValueCStr(str), &st) == -1) {
-	rb_sys_fail_str(str);
-    }
-# ifdef HAVE_STRUCT_STATFS_T_F_FSTYPENAME
-    if (st.f_fstypename[0])
-	return CSTR(st.f_fstypename);
-# endif
-# ifdef HAVE_STRUCT_STATFS_T_F_TYPE
-    switch (st.f_type) {
-      case 0x9123683E: /* BTRFS_SUPER_MAGIC */
-	return CSTR("btrfs");
-      case 0x7461636f: /* OCFS2_SUPER_MAGIC */
-	return CSTR("ocfs");
-      case 0xEF53: /* EXT2_SUPER_MAGIC EXT3_SUPER_MAGIC EXT4_SUPER_MAGIC */
-	return CSTR("ext4");
-      case 0x58465342: /* XFS_SUPER_MAGIC */
-	return CSTR("xfs");
-      case 0x01021994: /* TMPFS_MAGIC */
-	return CSTR("tmpfs");
-    }
-# endif
-#endif
-    return Qnil;
-}
+    path = RSTRING_PTR(str);
+    fp = setmntent("/etc/mtab", "r");
+    if (!fp) rb_sys_fail("setmntent(/etb/mtab)");;
 
-VALUE
-get_noatime_p(VALUE self, VALUE str)
-{
-#ifdef STATFS
-    statfs_t st;
-    FilePathValue(str);
-    str = rb_str_encode_ospath(str);
-    if (STATFS(StringValueCStr(str), &st) == -1) {
-       rb_sys_fail_str(str);
+    while (getmntent_r(fp, &mntbuf, buf, buflen)) {
+	int i;
+	char *mnt_dir = mntbuf.mnt_dir;
+	for (i=0; mnt_dir[i]; i++) {
+	    if (mnt_dir[i] != path[i]) {
+		goto next_entry;
+	    }
+	}
+	if (i >= len) {
+	    len = i;
+	    strlcpy(name, mntbuf.mnt_type, FSNAME_LEN);
+	}
+next_entry:
+	;
     }
-# ifdef HAVE_STRUCT_STATFS_F_FLAGS
-#  ifdef MNT_NOATIME
-    return st.f_flags & MNT_NOATIME ? Qtrue : Qfalse;
-#  elif defined(ST_NOATIME)
-    return st.f_flags & ST_NOATIME ? Qtrue : Qfalse;
-#  endif
-# endif
-#endif
+    endmntent(fp);
+
+    if (!len) rb_sys_fail("no matching entry");;
+    return rb_str_new_cstr(name);
+#else
     return Qnil;
+#endif
 }
 
 void
@@ -104,5 +57,4 @@ Init_fs(VALUE module)
 {
     VALUE fs = rb_define_module_under(module, "Fs");
     rb_define_module_function(fs, "fsname", get_fsname, 1);
-    rb_define_module_function(fs, "noatime?", get_noatime_p, 1);
 }
diff --git a/ext/-test-/float/extconf.rb b/ext/-test-/float/extconf.rb
index d786b15db9..0a9a299aa5 100644
--- a/ext/-test-/float/extconf.rb
+++ b/ext/-test-/float/extconf.rb
@@ -1,3 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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-/float")
diff --git a/ext/-test-/funcall/extconf.rb b/ext/-test-/funcall/extconf.rb
index 39d6134cba..8a9179ab2f 100644
--- a/ext/-test-/funcall/extconf.rb
+++ b/ext/-test-/funcall/extconf.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: false
 require 'mkmf'
-create_makefile("-test-/funcall")
+create_makefile("-test-/funcall/funcall")
diff --git a/ext/-test-/funcall/passing_block.c b/ext/-test-/funcall/passing_block.c
index 70cb210831..0200f80369 100644
--- a/ext/-test-/funcall/passing_block.c
+++ b/ext/-test-/funcall/passing_block.c
@@ -5,7 +5,7 @@ VALUE rb_funcall_passing_block(VALUE, ID, int, const VALUE*);
 static VALUE
 with_funcall2(int argc, VALUE *argv, VALUE self)
 {
-    return rb_funcallv(self, rb_intern("target"), argc, argv);
+    return rb_funcall2(self, rb_intern("target"), argc, argv);
 }
 
 static VALUE
diff --git a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c b/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
deleted file mode 100644
index f3071d5768..0000000000
--- a/ext/-test-/gvl/call_without_gvl/call_without_gvl.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "ruby/ruby.h"
-#include "ruby/thread.h"
-
-static void*
-native_sleep_callback(void *data)
-{
-    struct timeval *timeval = data;
-    select(0, NULL, NULL, NULL, timeval);
-
-    return NULL;
-}
-
-
-static VALUE
-thread_runnable_sleep(VALUE thread, VALUE timeout)
-{
-    struct timeval timeval;
-
-    if (NIL_P(timeout)) {
-	rb_raise(rb_eArgError, "timeout must be non nil");
-    }
-
-    timeval = rb_time_interval(timeout);
-
-    rb_thread_call_without_gvl(native_sleep_callback, &timeval, RUBY_UBF_IO, NULL);
-
-    return thread;
-}
-
-void
-Init_call_without_gvl(void)
-{
-    rb_define_method(rb_cThread, "__runnable_sleep__", thread_runnable_sleep, 1);
-}
diff --git a/ext/-test-/gvl/call_without_gvl/depend b/ext/-test-/gvl/call_without_gvl/depend
deleted file mode 100644
index 1f7443898d..0000000000
--- a/ext/-test-/gvl/call_without_gvl/depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-call_without_gvl.o: $(RUBY_EXTCONF_H)
-call_without_gvl.o: $(arch_hdrdir)/ruby/config.h
-call_without_gvl.o: $(hdrdir)/ruby/backward.h
-call_without_gvl.o: $(hdrdir)/ruby/defines.h
-call_without_gvl.o: $(hdrdir)/ruby/intern.h
-call_without_gvl.o: $(hdrdir)/ruby/missing.h
-call_without_gvl.o: $(hdrdir)/ruby/ruby.h
-call_without_gvl.o: $(hdrdir)/ruby/st.h
-call_without_gvl.o: $(hdrdir)/ruby/subst.h
-call_without_gvl.o: $(hdrdir)/ruby/thread.h
-call_without_gvl.o: call_without_gvl.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/gvl/call_without_gvl/extconf.rb b/ext/-test-/gvl/call_without_gvl/extconf.rb
deleted file mode 100644
index 56181b6773..0000000000
--- a/ext/-test-/gvl/call_without_gvl/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: false
-create_makefile("-test-/gvl/call_without_gvl")
diff --git a/ext/-test-/hash/delete.c b/ext/-test-/hash/delete.c
deleted file mode 100644
index 10d4aec6e7..0000000000
--- a/ext/-test-/hash/delete.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "ruby.h"
-
-extern VALUE rb_hash_delete_entry(VALUE hash, VALUE key);
-
-static VALUE
-hash_delete(VALUE hash, VALUE key)
-{
-    VALUE ret = rb_hash_delete_entry(hash, key);
-    return ret == Qundef ? Qnil : rb_ary_new_from_values(1, &ret);
-}
-
-void
-Init_delete(VALUE klass)
-{
-    rb_define_method(klass, "delete!", hash_delete, 1);
-}
diff --git a/ext/-test-/hash/extconf.rb b/ext/-test-/hash/extconf.rb
deleted file mode 100644
index d786b15db9..0000000000
--- a/ext/-test-/hash/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
diff --git a/ext/-test-/hash/init.c b/ext/-test-/hash/init.c
deleted file mode 100644
index 9f6cbde652..0000000000
--- a/ext/-test-/hash/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_hash(void)
-{
-    VALUE mBug = rb_define_module("Bug");
-    VALUE klass = rb_define_class_under(mBug, "Hash", rb_cHash);
-    TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/integer/core_ext.c b/ext/-test-/integer/core_ext.c
deleted file mode 100644
index 6d64cdb0c2..0000000000
--- a/ext/-test-/integer/core_ext.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "internal.h"
-
-static VALUE
-int_bignum_p(VALUE self)
-{
-    return RB_TYPE_P(self, T_BIGNUM) ? Qtrue : Qfalse;
-}
-
-static VALUE
-int_fixnum_p(VALUE self)
-{
-    return FIXNUM_P(self) ? Qtrue : Qfalse;
-}
-
-static VALUE
-rb_int_to_bignum(VALUE x)
-{
-    if (FIXNUM_P(x))
-        x = rb_int2big(FIX2LONG(x));
-    return x;
-}
-
-void
-Init_core_ext(VALUE klass)
-{
-    rb_define_method(rb_cInteger, "bignum?", int_bignum_p, 0);
-    rb_define_method(rb_cInteger, "fixnum?", int_fixnum_p, 0);
-    rb_define_method(rb_cInteger, "to_bignum", rb_int_to_bignum, 0);
-}
diff --git a/ext/-test-/integer/depend b/ext/-test-/integer/depend
deleted file mode 100644
index 8ca1fe33c5..0000000000
--- a/ext/-test-/integer/depend
+++ /dev/null
@@ -1,39 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-core_ext.o: $(RUBY_EXTCONF_H)
-core_ext.o: $(arch_hdrdir)/ruby/config.h
-core_ext.o: $(hdrdir)/ruby/backward.h
-core_ext.o: $(hdrdir)/ruby/defines.h
-core_ext.o: $(hdrdir)/ruby/encoding.h
-core_ext.o: $(hdrdir)/ruby/intern.h
-core_ext.o: $(hdrdir)/ruby/io.h
-core_ext.o: $(hdrdir)/ruby/missing.h
-core_ext.o: $(hdrdir)/ruby/oniguruma.h
-core_ext.o: $(hdrdir)/ruby/ruby.h
-core_ext.o: $(hdrdir)/ruby/st.h
-core_ext.o: $(hdrdir)/ruby/subst.h
-core_ext.o: $(top_srcdir)/include/ruby.h
-core_ext.o: $(top_srcdir)/internal.h
-core_ext.o: core_ext.c
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-my_integer.o: $(RUBY_EXTCONF_H)
-my_integer.o: $(arch_hdrdir)/ruby/config.h
-my_integer.o: $(hdrdir)/ruby/backward.h
-my_integer.o: $(hdrdir)/ruby/defines.h
-my_integer.o: $(hdrdir)/ruby/intern.h
-my_integer.o: $(hdrdir)/ruby/missing.h
-my_integer.o: $(hdrdir)/ruby/ruby.h
-my_integer.o: $(hdrdir)/ruby/st.h
-my_integer.o: $(hdrdir)/ruby/subst.h
-my_integer.o: $(top_srcdir)/include/ruby.h
-my_integer.o: my_integer.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/integer/extconf.rb b/ext/-test-/integer/extconf.rb
deleted file mode 100644
index d786b15db9..0000000000
--- a/ext/-test-/integer/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
diff --git a/ext/-test-/integer/init.c b/ext/-test-/integer/init.c
deleted file mode 100644
index fc256ea16b..0000000000
--- a/ext/-test-/integer/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_integer(void)
-{
-    VALUE mBug = rb_define_module("Bug");
-    VALUE klass = rb_define_class_under(mBug, "Integer", rb_cObject);
-    TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/integer/my_integer.c b/ext/-test-/integer/my_integer.c
deleted file mode 100644
index d86474bd7d..0000000000
--- a/ext/-test-/integer/my_integer.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-my_integer_s_new(VALUE klass)
-{
-    return Data_Wrap_Struct(klass, 0, 0, 0);
-}
-
-void
-Init_my_integer(VALUE klass)
-{
-    VALUE cMyInteger;
-
-    cMyInteger = rb_define_class_under(klass, "MyInteger", rb_cInteger);
-    rb_define_singleton_method(cMyInteger, "new", my_integer_s_new, 0);
-}
diff --git a/ext/-test-/iseq_load/extconf.rb b/ext/-test-/iseq_load/extconf.rb
deleted file mode 100644
index 5858870138..0000000000
--- a/ext/-test-/iseq_load/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: false
-create_makefile("-test-/iseq_load")
diff --git a/ext/-test-/iseq_load/iseq_load.c b/ext/-test-/iseq_load/iseq_load.c
deleted file mode 100644
index b4b9a8aa3d..0000000000
--- a/ext/-test-/iseq_load/iseq_load.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <ruby.h>
-
-VALUE rb_iseq_load(VALUE data, VALUE parent, VALUE opt);
-
-static VALUE
-iseq_load(int argc, VALUE *argv, VALUE self)
-{
-    VALUE data, opt = Qnil;
-
-    rb_scan_args(argc, argv, "11", &data, &opt);
-
-    return rb_iseq_load(data, 0, opt);
-}
-
-void
-Init_iseq_load(void)
-{
-    VALUE rb_cISeq = rb_path2class("RubyVM::InstructionSequence");
-
-    rb_define_singleton_method(rb_cISeq, "iseq_load", iseq_load, -1);
-}
diff --git a/ext/-test-/iter/extconf.rb b/ext/-test-/iter/extconf.rb
index d786b15db9..0ba99691bd 100644
--- a/ext/-test-/iter/extconf.rb
+++ b/ext/-test-/iter/extconf.rb
@@ -1,3 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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-/iter")
diff --git a/ext/-test-/load/dot.dot/depend b/ext/-test-/load/dot.dot/depend
deleted file mode 100644
index a0445e288b..0000000000
--- a/ext/-test-/load/dot.dot/depend
+++ /dev/null
@@ -1,3 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-dot.dot.o: dot.dot.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/load/dot.dot/extconf.rb b/ext/-test-/load/dot.dot/extconf.rb
index 13ebb1ffb4..6287db6bd8 100644
--- a/ext/-test-/load/dot.dot/extconf.rb
+++ b/ext/-test-/load/dot.dot/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/load/dot.dot")
+create_makefile("-test-/load/dot.dot/dot.dot")
diff --git a/ext/-test-/marshal/compat/extconf.rb b/ext/-test-/marshal/compat/extconf.rb
index 9bf44b473a..bb11ebfb8c 100644
--- a/ext/-test-/marshal/compat/extconf.rb
+++ b/ext/-test-/marshal/compat/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/marshal/compat")
diff --git a/ext/-test-/marshal/internal_ivar/extconf.rb b/ext/-test-/marshal/internal_ivar/extconf.rb
deleted file mode 100644
index cb3f825dbd..0000000000
--- a/ext/-test-/marshal/internal_ivar/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: false
-create_makefile("-test-/marshal/internal_ivar")
diff --git a/ext/-test-/marshal/internal_ivar/internal_ivar.c b/ext/-test-/marshal/internal_ivar/internal_ivar.c
deleted file mode 100644
index 299da27f23..0000000000
--- a/ext/-test-/marshal/internal_ivar/internal_ivar.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <ruby.h>
-
-static ID id_normal_ivar, id_internal_ivar;
-
-static VALUE
-init(VALUE self, VALUE arg1, VALUE arg2)
-{
-    rb_ivar_set(self, id_normal_ivar, arg1);
-    rb_ivar_set(self, id_internal_ivar, arg2);
-    return self;
-}
-
-static VALUE
-get_normal(VALUE self)
-{
-    return rb_attr_get(self, id_normal_ivar);
-}
-
-static VALUE
-get_internal(VALUE self)
-{
-    return rb_attr_get(self, id_internal_ivar);
-}
-
-void
-Init_internal_ivar(void)
-{
-    VALUE mMarshal = rb_define_module_under(rb_define_module("Bug"), "Marshal");
-    VALUE newclass = rb_define_class_under(mMarshal, "InternalIVar", rb_cObject);
-
-    id_normal_ivar = rb_intern_const("normal");
-#if 0
-    /* leave id_internal_ivar being 0 */
-    id_internal_ivar = rb_make_internal_id();
-#endif
-    rb_define_method(newclass, "initialize", init, 2);
-    rb_define_method(newclass, "normal", get_normal, 0);
-    rb_define_method(newclass, "internal", get_internal, 0);
-}
diff --git a/ext/-test-/marshal/usr/extconf.rb b/ext/-test-/marshal/usr/extconf.rb
index b7886b9eea..c662b23dd5 100644
--- a/ext/-test-/marshal/usr/extconf.rb
+++ b/ext/-test-/marshal/usr/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/marshal/usr")
diff --git a/ext/-test-/marshal/usr/usrmarshal.c b/ext/-test-/marshal/usr/usrmarshal.c
index 0c9e079af2..b30bd52c13 100644
--- a/ext/-test-/marshal/usr/usrmarshal.c
+++ b/ext/-test-/marshal/usr/usrmarshal.c
@@ -1,38 +1,23 @@
 #include <ruby.h>
 
-static size_t
-usr_size(const void *ptr)
-{
-    return sizeof(int);
-}
-
-static const rb_data_type_t usrmarshal_type = {
-    "UsrMarshal",
-    {0, RUBY_DEFAULT_FREE, usr_size,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
-};
-
 static VALUE
 usr_alloc(VALUE klass)
 {
     int *p;
-    return TypedData_Make_Struct(klass, int, &usrmarshal_type, p);
+    return Data_Make_Struct(klass, int, 0, RUBY_DEFAULT_FREE, p);
 }
 
 static VALUE
 usr_init(VALUE self, VALUE val)
 {
-    int *ptr = Check_TypedStruct(self, &usrmarshal_type);
-    *ptr = NUM2INT(val);
+    *(int *)DATA_PTR(self) = NUM2INT(val);
     return self;
 }
 
 static VALUE
 usr_value(VALUE self)
 {
-    int *ptr = Check_TypedStruct(self, &usrmarshal_type);
-    int val = *ptr;
+    int val = *(int *)DATA_PTR(self);
     return INT2NUM(val);
 }
 
diff --git a/ext/-test-/memory_status/extconf.rb b/ext/-test-/memory_status/extconf.rb
deleted file mode 100644
index 1c1096d8f4..0000000000
--- a/ext/-test-/memory_status/extconf.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-case RUBY_PLATFORM
-when /darwin/
-  ok = true
-when /mswin/, /mingw/
-  func = "GetProcessMemoryInfo(0, 0, 0)"
-  hdr = "psapi.h"
-  ok = have_func(func, hdr) || have_library("psapi", func, hdr)
-end
-
-if ok
-  create_makefile("-test-/memory_status")
-end
diff --git a/ext/-test-/memory_status/memory_status.c b/ext/-test-/memory_status/memory_status.c
deleted file mode 100644
index 80e2648992..0000000000
--- a/ext/-test-/memory_status/memory_status.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "ruby.h"
-#ifdef __APPLE__
-# include <mach/mach.h>
-# include <mach/message.h>
-# include <mach/kern_return.h>
-# include <mach/task_info.h>
-#elif defined _WIN32
-# include <psapi.h>
-#endif
-
-static VALUE cMemoryStatus;
-
-static VALUE
-read_status(VALUE self)
-{
-    VALUE size = INT2FIX(0);
-#if defined __APPLE__
-    VALUE rss;
-    kern_return_t error;
-    mach_msg_type_number_t out_count;
-    mach_task_basic_info_data_t taskinfo;
-
-    taskinfo.virtual_size = 0;
-    out_count = MACH_TASK_BASIC_INFO_COUNT;
-    error = task_info(mach_task_self(), MACH_TASK_BASIC_INFO,
-		      (task_info_t)&taskinfo, &out_count);
-    if (error != KERN_SUCCESS) return Qnil;
-    size = ULL2NUM(taskinfo.virtual_size);
-    rss = ULL2NUM(taskinfo.resident_size);
-    rb_struct_aset(self, INT2FIX(1), rss);
-#elif defined _WIN32
-    VALUE peak;
-    PROCESS_MEMORY_COUNTERS c;
-    c.cb = sizeof(c);
-    if (!GetProcessMemoryInfo(GetCurrentProcess(), &c, c.cb))
-	return Qnil;
-    size = SIZET2NUM(c.PagefileUsage);
-    peak = SIZET2NUM(c.PeakWorkingSetSize);
-    rb_struct_aset(self, INT2FIX(1), peak);
-#endif
-    rb_struct_aset(self, INT2FIX(0), size);
-    return self;
-}
-
-void
-Init_memory_status(void)
-{
-    VALUE mMemory = rb_define_module("Memory");
-    cMemoryStatus =
-	rb_struct_define_under(mMemory, "Status", "size",
-#if defined __APPLE__
-			       "rss",
-#elif defined _WIN32
-			       "peak",
-#endif
-			       (char *)NULL);
-    rb_define_method(cMemoryStatus, "_update", read_status, 0);
-}
diff --git a/ext/-test-/method/extconf.rb b/ext/-test-/method/extconf.rb
index ca51178a18..658b7af1f1 100644
--- a/ext/-test-/method/extconf.rb
+++ b/ext/-test-/method/extconf.rb
@@ -1,3 +1,6 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext
+$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-/method")
diff --git a/ext/-test-/notimplement/bug.c b/ext/-test-/notimplement/bug.c
deleted file mode 100644
index 8e9cae707a..0000000000
--- a/ext/-test-/notimplement/bug.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#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_funcallv(self, rb_to_id(*argv), argc-1, argv+1);
-}
-
-void
-Init_notimplement(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-/notimplement/extconf.rb b/ext/-test-/notimplement/extconf.rb
deleted file mode 100644
index 54403cd7ce..0000000000
--- a/ext/-test-/notimplement/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: false
-create_makefile("-test-/notimplement")
diff --git a/ext/-test-/num2int/extconf.rb b/ext/-test-/num2int/extconf.rb
index 425f261f58..2bc820e480 100644
--- a/ext/-test-/num2int/extconf.rb
+++ b/ext/-test-/num2int/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/num2int")
+create_makefile("-test-/num2int/num2int")
diff --git a/ext/-test-/path_to_class/extconf.rb b/ext/-test-/path_to_class/extconf.rb
index d465b36d9c..e1072b1443 100644
--- a/ext/-test-/path_to_class/extconf.rb
+++ b/ext/-test-/path_to_class/extconf.rb
@@ -1,7 +1,6 @@
-# frozen_string_literal: false
 $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-/path_to_class")
+create_makefile("-test-/path_to_class/path_to_class")
diff --git a/ext/-test-/popen_deadlock/extconf.rb b/ext/-test-/popen_deadlock/extconf.rb
deleted file mode 100644
index 24a7d79931..0000000000
--- a/ext/-test-/popen_deadlock/extconf.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# frozen_string_literal: false
-case RUBY_PLATFORM
-when /solaris/i, /linux/i
-  create_makefile("-test-/popen_deadlock/infinite_loop_dlsym")
-end
diff --git a/ext/-test-/popen_deadlock/infinite_loop_dlsym.c b/ext/-test-/popen_deadlock/infinite_loop_dlsym.c
deleted file mode 100644
index 1d95a7cc9a..0000000000
--- a/ext/-test-/popen_deadlock/infinite_loop_dlsym.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "ruby/ruby.h"
-#include "ruby/thread.h"
-#include <dlfcn.h>
-
-struct data_for_loop_dlsym {
-    const char *name;
-    volatile int stop;
-};
-
-static void*
-native_loop_dlsym(void *data)
-{
-    struct data_for_loop_dlsym *s = data;
-
-    while (!(s->stop)) {
-        dlsym(RTLD_DEFAULT, s->name);
-    }
-
-    return NULL;
-}
-
-static void
-ubf_for_loop_dlsym(void *data)
-{
-    struct data_for_loop_dlsym *s = data;
-
-    s->stop = 1;
-
-    return;
-}
-
-static VALUE
-loop_dlsym(VALUE self, VALUE name)
-{
-    struct data_for_loop_dlsym d;
-
-    d.stop = 0;
-    d.name = StringValuePtr(name);
-
-    rb_thread_call_without_gvl(native_loop_dlsym, &d,
-                               ubf_for_loop_dlsym, &d);
-
-    return self;
-}
-
-void
-Init_infinite_loop_dlsym(void)
-{
-    rb_define_method(rb_cThread, "__infinite_loop_dlsym__", loop_dlsym, 1);
-}
diff --git a/ext/-test-/postponed_job/extconf.rb b/ext/-test-/postponed_job/extconf.rb
index 58fbd3b461..aa29b593f4 100644
--- a/ext/-test-/postponed_job/extconf.rb
+++ b/ext/-test-/postponed_job/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile('-test-/postponed_job')
diff --git a/ext/-test-/printf/extconf.rb b/ext/-test-/printf/extconf.rb
index fb8fa8de36..7b96da0c85 100644
--- a/ext/-test-/printf/extconf.rb
+++ b/ext/-test-/printf/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/printf")
diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c
index 666f5592e5..336f918986 100644
--- a/ext/-test-/printf/printf.c
+++ b/ext/-test-/printf/printf.c
@@ -2,6 +2,14 @@
 #include <ruby/encoding.h>
 
 static VALUE
+printf_test_i(VALUE self, VALUE obj)
+{
+    char buf[256];
+    snprintf(buf, sizeof(buf), "<%"PRIsVALUE">", obj);
+    return rb_usascii_str_new2(buf);
+}
+
+static VALUE
 printf_test_s(VALUE self, VALUE obj)
 {
     return rb_enc_sprintf(rb_usascii_encoding(), "<%"PRIsVALUE">", obj);
@@ -20,7 +28,7 @@ printf_test_q(VALUE self, VALUE obj)
 }
 
 static char *
-uint_to_str(char *p, char *e, unsigned int x)
+utoa(char *p, char *e, unsigned int x)
 {
     char *e0 = e;
     if (e <= p) return p;
@@ -71,12 +79,12 @@ printf_test_call(int argc, VALUE *argv, VALUE self)
 	    *p++ = '0';
 	}
 	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) {
-	    p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
+	    p = utoa(p, format + sizeof(format), NUM2UINT(v));
 	}
 	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) {
 	    *p++ = '.';
 	    if (FIXNUM_P(v))
-		p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
+		p = utoa(p, format + sizeof(format), NUM2UINT(v));
 	}
     }
     *p++ = cnv;
@@ -94,6 +102,7 @@ void
 Init_printf(void)
 {
     VALUE m = rb_define_module_under(rb_define_module("Bug"), "Printf");
+    rb_define_singleton_method(m, "i", printf_test_i, 1);
     rb_define_singleton_method(m, "s", printf_test_s, 1);
     rb_define_singleton_method(m, "v", printf_test_v, 1);
     rb_define_singleton_method(m, "q", printf_test_q, 1);
diff --git a/ext/-test-/proc/extconf.rb b/ext/-test-/proc/extconf.rb
deleted file mode 100644
index d786b15db9..0000000000
--- a/ext/-test-/proc/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
diff --git a/ext/-test-/proc/init.c b/ext/-test-/proc/init.c
deleted file mode 100644
index 814c55d98b..0000000000
--- a/ext/-test-/proc/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_proc(void)
-{
-    VALUE mBug = rb_define_module("Bug");
-    VALUE klass = rb_define_module_under(mBug, "Proc");
-    TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/proc/receiver.c b/ext/-test-/proc/receiver.c
deleted file mode 100644
index fe44a2246c..0000000000
--- a/ext/-test-/proc/receiver.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "ruby.h"
-
-VALUE rb_current_receiver(void);
-
-static VALUE
-bug_proc_call_receiver(RB_BLOCK_CALL_FUNC_ARGLIST(yieldarg, procarg))
-{
-    return rb_current_receiver();
-}
-
-static VALUE
-bug_proc_make_call_receiver(VALUE self, VALUE procarg)
-{
-    return rb_proc_new(bug_proc_call_receiver, procarg);
-}
-
-void
-Init_receiver(VALUE klass)
-{
-    rb_define_singleton_method(klass, "make_call_receiver", bug_proc_make_call_receiver, 1);
-}
diff --git a/ext/-test-/proc/super.c b/ext/-test-/proc/super.c
deleted file mode 100644
index dbe8af08f1..0000000000
--- a/ext/-test-/proc/super.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-bug_proc_call_super(RB_BLOCK_CALL_FUNC_ARGLIST(yieldarg, procarg))
-{
-    VALUE args[2];
-    VALUE ret;
-    args[0] = yieldarg;
-    args[1] = procarg;
-    ret = rb_call_super(2, args);
-    if (!NIL_P(blockarg)) {
-	ret = rb_proc_call(blockarg, ret);
-    }
-    return ret;
-}
-
-static VALUE
-bug_proc_make_call_super(VALUE self, VALUE procarg)
-{
-    return rb_proc_new(bug_proc_call_super, procarg);
-}
-
-void
-Init_super(VALUE klass)
-{
-    rb_define_singleton_method(klass, "make_call_super", bug_proc_make_call_super, 1);
-}
diff --git a/ext/-test-/rational/depend b/ext/-test-/rational/depend
index a0ee797b31..a43589042b 100644
--- a/ext/-test-/rational/depend
+++ b/ext/-test-/rational/depend
@@ -1,21 +1,3 @@
 $(OBJS): $(HDRS) $(ruby_headers)
 
 rat.o: rat.c $(top_srcdir)/internal.h
-
-# AUTOGENERATED DEPENDENCIES START
-rat.o: $(RUBY_EXTCONF_H)
-rat.o: $(arch_hdrdir)/ruby/config.h
-rat.o: $(hdrdir)/ruby/backward.h
-rat.o: $(hdrdir)/ruby/defines.h
-rat.o: $(hdrdir)/ruby/encoding.h
-rat.o: $(hdrdir)/ruby/intern.h
-rat.o: $(hdrdir)/ruby/io.h
-rat.o: $(hdrdir)/ruby/missing.h
-rat.o: $(hdrdir)/ruby/oniguruma.h
-rat.o: $(hdrdir)/ruby/ruby.h
-rat.o: $(hdrdir)/ruby/st.h
-rat.o: $(hdrdir)/ruby/subst.h
-rat.o: $(top_srcdir)/include/ruby.h
-rat.o: $(top_srcdir)/internal.h
-rat.o: rat.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/rational/extconf.rb b/ext/-test-/rational/extconf.rb
index 28c5d690c1..bd658def46 100644
--- a/ext/-test-/rational/extconf.rb
+++ b/ext/-test-/rational/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
 $srcs = Dir[File.join($srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
 inits = $srcs.map {|s| File.basename(s, ".*")}
diff --git a/ext/-test-/rational/rat.c b/ext/-test-/rational/rat.c
index 772546fca8..63ca849816 100644
--- a/ext/-test-/rational/rat.c
+++ b/ext/-test-/rational/rat.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 #if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
diff --git a/ext/-test-/recursion/extconf.rb b/ext/-test-/recursion/extconf.rb
index 13828113f0..92b28657f0 100644
--- a/ext/-test-/recursion/extconf.rb
+++ b/ext/-test-/recursion/extconf.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile("-test-/recursion")
diff --git a/ext/-test-/st/foreach/extconf.rb b/ext/-test-/st/foreach/extconf.rb
deleted file mode 100644
index a7346203c4..0000000000
--- a/ext/-test-/st/foreach/extconf.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# frozen_string_literal: false
-create_makefile("-test-/st/foreach")
diff --git a/ext/-test-/st/foreach/foreach.c b/ext/-test-/st/foreach/foreach.c
deleted file mode 100644
index 209b535503..0000000000
--- a/ext/-test-/st/foreach/foreach.c
+++ /dev/null
@@ -1,175 +0,0 @@
-#include <ruby.h>
-#include <ruby/st.h>
-
-static st_data_t expect_size = 32;
-struct checker {
-    st_table *tbl;
-    st_index_t nr;
-    VALUE test;
-};
-
-static void
-force_unpack_check(struct checker *c, st_data_t key, st_data_t val)
-{
-    if (c->nr == 0) {
-	st_data_t i;
-
-	if (c->tbl->bins != NULL) rb_bug("should be packed\n");
-
-	/* force unpacking during iteration: */
-	for (i = 1; i < expect_size; i++)
-	    st_add_direct(c->tbl, i, i);
-
-	if (c->tbl->bins == NULL) rb_bug("should be unpacked\n");
-    }
-
-    if (key != c->nr) {
-	rb_bug("unexpected key: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)key, (VALUE)c->nr);
-    }
-    if (val != c->nr) {
-	rb_bug("unexpected val: %"PRIuVALUE" (expected %"PRIuVALUE")\n", (VALUE)val, (VALUE)c->nr);
-    }
-
-    c->nr++;
-}
-
-static int
-unp_fec_i(st_data_t key, st_data_t val, st_data_t args, int error)
-{
-    struct checker *c = (struct checker *)args;
-
-    if (error) {
-	if (c->test == ID2SYM(rb_intern("delete2")))
-	    return ST_STOP;
-
-	rb_bug("unexpected error");
-    }
-
-    force_unpack_check(c, key, val);
-
-    if (c->test == ID2SYM(rb_intern("check"))) {
-	return ST_CHECK;
-    }
-    if (c->test == ID2SYM(rb_intern("delete1"))) {
-	if (c->nr == 1) return ST_DELETE;
-	return ST_CHECK;
-    }
-    if (c->test == ID2SYM(rb_intern("delete2"))) {
-	if (c->nr == 1) {
-	    st_data_t k = 0;
-	    st_data_t v;
-
-	    if (!st_delete(c->tbl, &k, &v)) {
-		rb_bug("failed to delete\n");
-	    }
-	    if (v != 0) {
-		rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
-	    }
-	}
-	return ST_CHECK;
-    }
-
-    rb_raise(rb_eArgError, "unexpected arg: %+"PRIsVALUE, c->test);
-}
-
-static VALUE
-unp_fec(VALUE self, VALUE test)
-{
-    st_table *tbl = st_init_numtable();
-    struct checker c;
-
-    c.tbl = tbl;
-    c.nr = 0;
-    c.test = test;
-
-    st_add_direct(tbl, 0, 0);
-
-    if (tbl->bins != NULL) rb_bug("should still be packed\n");
-
-    st_foreach_check(tbl, unp_fec_i, (st_data_t)&c, -1);
-
-    if (c.test == ID2SYM(rb_intern("delete2"))) {
-	if (c.nr != 1) {
-	    rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
-	}
-    }
-    else if (c.nr != expect_size) {
-	rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE")\n",
-		(VALUE)c.nr, (VALUE)expect_size);
-    }
-
-    if (tbl->bins == NULL) rb_bug("should be unpacked\n");
-
-    st_free_table(tbl);
-
-    return Qnil;
-}
-
-static int
-unp_fe_i(st_data_t key, st_data_t val, st_data_t args, int error)
-{
-    struct checker *c = (struct checker *)args;
-
-    force_unpack_check(c, key, val);
-    if (c->test == ID2SYM(rb_intern("unpacked"))) {
-	return ST_CONTINUE;
-    }
-    else if (c->test == ID2SYM(rb_intern("unpack_delete"))) {
-	if (c->nr == 1) {
-	    st_data_t k = 0;
-	    st_data_t v;
-
-	    if (!st_delete(c->tbl, &k, &v)) {
-		rb_bug("failed to delete\n");
-	    }
-	    if (v != 0) {
-		rb_bug("unexpected value deleted: %"PRIuVALUE" (expected 0)", (VALUE)v);
-	    }
-	    return ST_CONTINUE;
-	}
-	rb_bug("should never get here\n");
-    }
-
-    rb_raise(rb_eArgError, "unexpected arg: %+"PRIsVALUE, c->test);
-}
-
-static VALUE
-unp_fe(VALUE self, VALUE test)
-{
-    st_table *tbl = st_init_numtable();
-    struct checker c;
-
-    c.tbl = tbl;
-    c.nr = 0;
-    c.test = test;
-
-    st_add_direct(tbl, 0, 0);
-
-    if (tbl->bins != NULL) rb_bug("should still be packed\n");
-
-    st_foreach(tbl, unp_fe_i, (st_data_t)&c);
-
-    if (c.test == ID2SYM(rb_intern("unpack_delete"))) {
-	if (c.nr != 1) {
-	    rb_bug("mismatched iteration: %"PRIuVALUE" (expected 1)\n", (VALUE)c.nr);
-	}
-    }
-    else if (c.nr != expect_size) {
-	rb_bug("mismatched iteration: %"PRIuVALUE" (expected %"PRIuVALUE"o)\n",
-		(VALUE)c.nr, (VALUE)expect_size);
-    }
-
-    if (tbl->bins == NULL) rb_bug("should be unpacked\n");
-
-    st_free_table(tbl);
-
-    return Qnil;
-}
-
-void
-Init_foreach(void)
-{
-    VALUE bug = rb_define_module("Bug");
-    rb_define_singleton_method(bug, "unp_st_foreach_check", unp_fec, 1);
-    rb_define_singleton_method(bug, "unp_st_foreach", unp_fe, 1);
-}
diff --git a/ext/-test-/st/numhash/extconf.rb b/ext/-test-/st/numhash/extconf.rb
index 27d28a0a77..867fd75d2a 100644
--- a/ext/-test-/st/numhash/extconf.rb
+++ b/ext/-test-/st/numhash/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/st/numhash")
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
index fc35f476cd..d4dbd1a0ce 100644
--- a/ext/-test-/st/numhash/numhash.c
+++ b/ext/-test-/st/numhash/numhash.c
@@ -7,29 +7,16 @@ numhash_free(void *ptr)
     if (ptr) st_free_table(ptr);
 }
 
-static size_t
-numhash_memsize(const void *ptr)
-{
-    return st_memsize(ptr);
-}
-
-static const rb_data_type_t numhash_type = {
-    "numhash",
-    {0, numhash_free, numhash_memsize,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
-};
-
 static VALUE
 numhash_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &numhash_type, 0);
+    return Data_Wrap_Struct(klass, 0, numhash_free, 0);
 }
 
 static VALUE
 numhash_init(VALUE self)
 {
-    st_table *tbl = (st_table *)Check_TypedStruct(self, &numhash_type);
+    st_table *tbl = (st_table *)DATA_PTR(self);
     if (tbl) st_free_table(tbl);
     DATA_PTR(self) = st_init_numtable();
     return self;
@@ -39,9 +26,8 @@ static VALUE
 numhash_aref(VALUE self, VALUE key)
 {
     st_data_t data;
-    st_table *tbl = (st_table *)Check_TypedStruct(self, &numhash_type);
     if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const");
-    if (st_lookup(tbl, (st_data_t)key, &data))
+    if (st_lookup((st_table *)DATA_PTR(self), (st_data_t)key, &data))
 	return (VALUE)data;
     return Qnil;
 }
@@ -49,10 +35,9 @@ numhash_aref(VALUE self, VALUE key)
 static VALUE
 numhash_aset(VALUE self, VALUE key, VALUE data)
 {
-    st_table *tbl = (st_table *)Check_TypedStruct(self, &numhash_type);
     if (!SPECIAL_CONST_P(key)) rb_raise(rb_eArgError, "not a special const");
     if (!SPECIAL_CONST_P(data)) rb_raise(rb_eArgError, "not a special const");
-    st_insert(tbl, (st_data_t)key, (st_data_t)data);
+    st_insert((st_table *)DATA_PTR(self), (st_data_t)key, (st_data_t)data);
     return self;
 }
 
@@ -68,7 +53,7 @@ numhash_i(st_data_t key, st_data_t value, st_data_t arg)
 static VALUE
 numhash_each(VALUE self)
 {
-    st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
+    st_table *table = DATA_PTR(self);
     st_data_t data = (st_data_t)self;
     return st_foreach_check(table, numhash_i, data, data) ? Qtrue : Qfalse;
 }
@@ -91,8 +76,7 @@ update_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
 static VALUE
 numhash_update(VALUE self, VALUE key)
 {
-    st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
-    if (st_update(table, (st_data_t)key, update_func, 0))
+    if (st_update((st_table *)DATA_PTR(self), (st_data_t)key, update_func, 0))
 	return Qtrue;
     else
 	return Qfalse;
@@ -107,16 +91,14 @@ numhash_update(VALUE self, VALUE key)
 static VALUE
 numhash_size(VALUE self)
 {
-    st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
-    return ST2NUM(table->num_entries);
+    return ST2NUM(((st_table *)DATA_PTR(self))->num_entries);
 }
 
 static VALUE
 numhash_delete_safe(VALUE self, VALUE key)
 {
-    st_table *table = (st_table *)Check_TypedStruct(self, &numhash_type);
     st_data_t val, k = (st_data_t)key;
-    if (st_delete_safe(table, &k, &val, (st_data_t)self)) {
+    if (st_delete_safe((st_table *)DATA_PTR(self), &k, &val, (st_data_t)self)) {
 	return val;
     }
     return Qnil;
diff --git a/ext/-test-/st/update/extconf.rb b/ext/-test-/st/update/extconf.rb
index 5152b24229..96dbae43ab 100644
--- a/ext/-test-/st/update/extconf.rb
+++ b/ext/-test-/st/update/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/st/update")
diff --git a/ext/-test-/string/capacity.c b/ext/-test-/string/capacity.c
deleted file mode 100644
index ba7fb85e9e..0000000000
--- a/ext/-test-/string/capacity.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "ruby.h"
-#include "internal.h"
-
-static VALUE
-bug_str_capacity(VALUE klass, VALUE str)
-{
-    return
-	STR_EMBED_P(str) ? INT2FIX(RSTRING_EMBED_LEN_MAX) : \
-	STR_SHARED_P(str) ? INT2FIX(0) : \
-	LONG2FIX(RSTRING(str)->as.heap.aux.capa);
-}
-
-void
-Init_capacity(VALUE klass)
-{
-    rb_define_singleton_method(klass, "capacity", bug_str_capacity, 1);
-}
diff --git a/ext/-test-/string/cstr.c b/ext/-test-/string/cstr.c
index fc47d5206f..c2ed410b41 100644
--- a/ext/-test-/string/cstr.c
+++ b/ext/-test-/string/cstr.c
@@ -1,4 +1,5 @@
-#include "internal.h"
+#include "ruby.h"
+#include "ruby/encoding.h"
 
 static VALUE
 bug_str_cstr_term(VALUE str)
@@ -8,7 +9,9 @@ bug_str_cstr_term(VALUE str)
     int c;
     rb_encoding *enc;
 
+    rb_str_modify(str);
     len = RSTRING_LEN(str);
+    RSTRING_PTR(str)[len] = 'x';
     s = StringValueCStr(str);
     rb_gc();
     enc = rb_enc_get(str);
@@ -16,131 +19,8 @@ bug_str_cstr_term(VALUE str)
     return INT2NUM(c);
 }
 
-static VALUE
-bug_str_cstr_unterm(VALUE str, VALUE c)
-{
-    long len;
-
-    rb_str_modify(str);
-    len = RSTRING_LEN(str);
-    RSTRING_PTR(str)[len] = NUM2CHR(c);
-    return str;
-}
-
-static VALUE
-bug_str_cstr_term_char(VALUE str)
-{
-    long len;
-    char *s;
-    int c;
-    rb_encoding *enc = rb_enc_get(str);
-
-    RSTRING_GETMEM(str, s, len);
-    s += len;
-    len = rb_enc_mbminlen(enc);
-    c = rb_enc_precise_mbclen(s, s + len, enc);
-    if (!MBCLEN_CHARFOUND_P(c)) {
-	c = (unsigned char)*s;
-    }
-    else {
-	c = rb_enc_mbc_to_codepoint(s, s + len, enc);
-	if (!c) return Qnil;
-    }
-    return rb_enc_uint_chr((unsigned int)c, enc);
-}
-
-static VALUE
-bug_str_unterminated_substring(VALUE str, VALUE vbeg, VALUE vlen)
-{
-    long beg = NUM2LONG(vbeg);
-    long len = NUM2LONG(vlen);
-    rb_str_modify(str);
-    if (len < 0) rb_raise(rb_eArgError, "negative length: %ld", len);
-    if (RSTRING_LEN(str) < beg) rb_raise(rb_eIndexError, "beg: %ld", beg);
-    if (RSTRING_LEN(str) < beg + len) rb_raise(rb_eIndexError, "end: %ld", beg + len);
-    str = rb_str_new_shared(str);
-    if (STR_EMBED_P(str)) {
-	RSTRING(str)->basic.flags &= ~RSTRING_EMBED_LEN_MASK;
-	RSTRING(str)->basic.flags |= len << RSTRING_EMBED_LEN_SHIFT;
-	memmove(RSTRING(str)->as.ary, RSTRING(str)->as.ary + beg, len);
-    }
-    else {
-	RSTRING(str)->as.heap.ptr += beg;
-	RSTRING(str)->as.heap.len = len;
-    }
-    return str;
-}
-
-static VALUE
-bug_str_s_cstr_term(VALUE self, VALUE str)
-{
-    Check_Type(str, T_STRING);
-    return bug_str_cstr_term(str);
-}
-
-static VALUE
-bug_str_s_cstr_unterm(VALUE self, VALUE str, VALUE c)
-{
-    Check_Type(str, T_STRING);
-    return bug_str_cstr_unterm(str, c);
-}
-
-static VALUE
-bug_str_s_cstr_term_char(VALUE self, VALUE str)
-{
-    Check_Type(str, T_STRING);
-    return bug_str_cstr_term_char(str);
-}
-
-#define TERM_LEN(str) rb_enc_mbminlen(rb_enc_get(str))
-#define TERM_FILL(ptr, termlen) do {\
-    char *const term_fill_ptr = (ptr);\
-    const int term_fill_len = (termlen);\
-    *term_fill_ptr = '\0';\
-    if (UNLIKELY(term_fill_len > 1))\
-	memset(term_fill_ptr, 0, term_fill_len);\
-} while (0)
-
-static VALUE
-bug_str_s_cstr_noembed(VALUE self, VALUE str)
-{
-    VALUE str2 = rb_str_new(NULL, 0);
-    long capacity = RSTRING_LEN(str) + TERM_LEN(str);
-    char *buf = ALLOC_N(char, capacity);
-    Check_Type(str, T_STRING);
-    FL_SET((str2), STR_NOEMBED);
-    memcpy(buf, RSTRING_PTR(str), capacity);
-    RBASIC(str2)->flags &= ~RSTRING_EMBED_LEN_MASK;
-    RSTRING(str2)->as.heap.aux.capa = capacity;
-    RSTRING(str2)->as.heap.ptr = buf;
-    RSTRING(str2)->as.heap.len = RSTRING_LEN(str);
-    TERM_FILL(RSTRING_END(str2), TERM_LEN(str));
-    return str2;
-}
-
-static VALUE
-bug_str_s_cstr_embedded_p(VALUE self, VALUE str)
-{
-    return STR_EMBED_P(str) ? Qtrue : Qfalse;
-}
-
-static VALUE
-bug_str_s_rb_str_new_frozen(VALUE self, VALUE str)
-{
-    return rb_str_new_frozen(str);
-}
-
 void
 Init_cstr(VALUE klass)
 {
     rb_define_method(klass, "cstr_term", bug_str_cstr_term, 0);
-    rb_define_method(klass, "cstr_unterm", bug_str_cstr_unterm, 1);
-    rb_define_method(klass, "cstr_term_char", bug_str_cstr_term_char, 0);
-    rb_define_method(klass, "unterminated_substring", bug_str_unterminated_substring, 2);
-    rb_define_singleton_method(klass, "cstr_term", bug_str_s_cstr_term, 1);
-    rb_define_singleton_method(klass, "cstr_unterm", bug_str_s_cstr_unterm, 2);
-    rb_define_singleton_method(klass, "cstr_term_char", bug_str_s_cstr_term_char, 1);
-    rb_define_singleton_method(klass, "cstr_noembed", bug_str_s_cstr_noembed, 1);
-    rb_define_singleton_method(klass, "cstr_embedded?", bug_str_s_cstr_embedded_p, 1);
-    rb_define_singleton_method(klass, "rb_str_new_frozen", bug_str_s_rb_str_new_frozen, 1);
 }
diff --git a/ext/-test-/string/depend b/ext/-test-/string/depend
index e3ce4b6e9c..86617ff289 100644
--- a/ext/-test-/string/depend
+++ b/ext/-test-/string/depend
@@ -1,164 +1,5 @@
-# AUTOGENERATED DEPENDENCIES START
-capacity.o: $(RUBY_EXTCONF_H)
-capacity.o: $(arch_hdrdir)/ruby/config.h
-capacity.o: $(hdrdir)/ruby/backward.h
-capacity.o: $(hdrdir)/ruby/defines.h
-capacity.o: $(hdrdir)/ruby/encoding.h
-capacity.o: $(hdrdir)/ruby/intern.h
-capacity.o: $(hdrdir)/ruby/io.h
-capacity.o: $(hdrdir)/ruby/missing.h
-capacity.o: $(hdrdir)/ruby/oniguruma.h
-capacity.o: $(hdrdir)/ruby/ruby.h
-capacity.o: $(hdrdir)/ruby/st.h
-capacity.o: $(hdrdir)/ruby/subst.h
-capacity.o: $(top_srcdir)/include/ruby.h
-capacity.o: $(top_srcdir)/internal.h
-capacity.o: capacity.c
-coderange.o: $(RUBY_EXTCONF_H)
-coderange.o: $(arch_hdrdir)/ruby/config.h
-coderange.o: $(hdrdir)/ruby/backward.h
-coderange.o: $(hdrdir)/ruby/defines.h
-coderange.o: $(hdrdir)/ruby/encoding.h
-coderange.o: $(hdrdir)/ruby/intern.h
-coderange.o: $(hdrdir)/ruby/missing.h
-coderange.o: $(hdrdir)/ruby/oniguruma.h
-coderange.o: $(hdrdir)/ruby/ruby.h
-coderange.o: $(hdrdir)/ruby/st.h
-coderange.o: $(hdrdir)/ruby/subst.h
-coderange.o: coderange.c
-cstr.o: $(RUBY_EXTCONF_H)
-cstr.o: $(arch_hdrdir)/ruby/config.h
-cstr.o: $(hdrdir)/ruby/backward.h
-cstr.o: $(hdrdir)/ruby/defines.h
-cstr.o: $(hdrdir)/ruby/encoding.h
-cstr.o: $(hdrdir)/ruby/intern.h
-cstr.o: $(hdrdir)/ruby/io.h
-cstr.o: $(hdrdir)/ruby/missing.h
-cstr.o: $(hdrdir)/ruby/oniguruma.h
-cstr.o: $(hdrdir)/ruby/ruby.h
-cstr.o: $(hdrdir)/ruby/st.h
-cstr.o: $(hdrdir)/ruby/subst.h
-cstr.o: $(top_srcdir)/include/ruby.h
-cstr.o: $(top_srcdir)/internal.h
-cstr.o: cstr.c
-ellipsize.o: $(RUBY_EXTCONF_H)
-ellipsize.o: $(arch_hdrdir)/ruby/config.h
-ellipsize.o: $(hdrdir)/ruby/backward.h
-ellipsize.o: $(hdrdir)/ruby/defines.h
-ellipsize.o: $(hdrdir)/ruby/intern.h
-ellipsize.o: $(hdrdir)/ruby/missing.h
-ellipsize.o: $(hdrdir)/ruby/ruby.h
-ellipsize.o: $(hdrdir)/ruby/st.h
-ellipsize.o: $(hdrdir)/ruby/subst.h
-ellipsize.o: $(top_srcdir)/include/ruby.h
-ellipsize.o: ellipsize.c
-enc_associate.o: $(RUBY_EXTCONF_H)
-enc_associate.o: $(arch_hdrdir)/ruby/config.h
-enc_associate.o: $(hdrdir)/ruby/backward.h
-enc_associate.o: $(hdrdir)/ruby/defines.h
-enc_associate.o: $(hdrdir)/ruby/encoding.h
-enc_associate.o: $(hdrdir)/ruby/intern.h
-enc_associate.o: $(hdrdir)/ruby/missing.h
-enc_associate.o: $(hdrdir)/ruby/oniguruma.h
-enc_associate.o: $(hdrdir)/ruby/ruby.h
-enc_associate.o: $(hdrdir)/ruby/st.h
-enc_associate.o: $(hdrdir)/ruby/subst.h
-enc_associate.o: $(top_srcdir)/include/ruby.h
-enc_associate.o: enc_associate.c
-enc_str_buf_cat.o: $(RUBY_EXTCONF_H)
-enc_str_buf_cat.o: $(arch_hdrdir)/ruby/config.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/backward.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/defines.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/encoding.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/intern.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/missing.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/oniguruma.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/ruby.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/st.h
-enc_str_buf_cat.o: $(hdrdir)/ruby/subst.h
-enc_str_buf_cat.o: enc_str_buf_cat.c
-fstring.o: $(RUBY_EXTCONF_H)
-fstring.o: $(arch_hdrdir)/ruby/config.h
-fstring.o: $(hdrdir)/ruby/backward.h
-fstring.o: $(hdrdir)/ruby/defines.h
-fstring.o: $(hdrdir)/ruby/intern.h
-fstring.o: $(hdrdir)/ruby/missing.h
-fstring.o: $(hdrdir)/ruby/ruby.h
-fstring.o: $(hdrdir)/ruby/st.h
-fstring.o: $(hdrdir)/ruby/subst.h
-fstring.o: $(top_srcdir)/include/ruby.h
-fstring.o: fstring.c
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-modify.o: $(RUBY_EXTCONF_H)
-modify.o: $(arch_hdrdir)/ruby/config.h
-modify.o: $(hdrdir)/ruby/backward.h
-modify.o: $(hdrdir)/ruby/defines.h
-modify.o: $(hdrdir)/ruby/intern.h
-modify.o: $(hdrdir)/ruby/missing.h
-modify.o: $(hdrdir)/ruby/ruby.h
-modify.o: $(hdrdir)/ruby/st.h
-modify.o: $(hdrdir)/ruby/subst.h
-modify.o: $(top_srcdir)/include/ruby.h
-modify.o: modify.c
-nofree.o: $(RUBY_EXTCONF_H)
-nofree.o: $(arch_hdrdir)/ruby/config.h
-nofree.o: $(hdrdir)/ruby/backward.h
-nofree.o: $(hdrdir)/ruby/defines.h
-nofree.o: $(hdrdir)/ruby/intern.h
-nofree.o: $(hdrdir)/ruby/missing.h
-nofree.o: $(hdrdir)/ruby/ruby.h
-nofree.o: $(hdrdir)/ruby/st.h
-nofree.o: $(hdrdir)/ruby/subst.h
-nofree.o: $(top_srcdir)/include/ruby.h
-nofree.o: nofree.c
-normalize.o: $(RUBY_EXTCONF_H)
-normalize.o: $(arch_hdrdir)/ruby/config.h
-normalize.o: $(hdrdir)/ruby/backward.h
-normalize.o: $(hdrdir)/ruby/defines.h
-normalize.o: $(hdrdir)/ruby/encoding.h
-normalize.o: $(hdrdir)/ruby/intern.h
-normalize.o: $(hdrdir)/ruby/io.h
-normalize.o: $(hdrdir)/ruby/missing.h
-normalize.o: $(hdrdir)/ruby/oniguruma.h
-normalize.o: $(hdrdir)/ruby/ruby.h
-normalize.o: $(hdrdir)/ruby/st.h
-normalize.o: $(hdrdir)/ruby/subst.h
-normalize.o: $(top_srcdir)/include/ruby.h
-normalize.o: $(top_srcdir)/internal.h
-normalize.o: normalize.c
-qsort.o: $(RUBY_EXTCONF_H)
-qsort.o: $(arch_hdrdir)/ruby/config.h
-qsort.o: $(hdrdir)/ruby/backward.h
-qsort.o: $(hdrdir)/ruby/defines.h
-qsort.o: $(hdrdir)/ruby/encoding.h
-qsort.o: $(hdrdir)/ruby/intern.h
-qsort.o: $(hdrdir)/ruby/missing.h
-qsort.o: $(hdrdir)/ruby/oniguruma.h
-qsort.o: $(hdrdir)/ruby/ruby.h
-qsort.o: $(hdrdir)/ruby/st.h
-qsort.o: $(hdrdir)/ruby/subst.h
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
 qsort.o: $(hdrdir)/ruby/util.h
-qsort.o: $(top_srcdir)/include/ruby.h
-qsort.o: qsort.c
-set_len.o: $(RUBY_EXTCONF_H)
-set_len.o: $(arch_hdrdir)/ruby/config.h
-set_len.o: $(hdrdir)/ruby/backward.h
-set_len.o: $(hdrdir)/ruby/defines.h
-set_len.o: $(hdrdir)/ruby/intern.h
-set_len.o: $(hdrdir)/ruby/missing.h
-set_len.o: $(hdrdir)/ruby/ruby.h
-set_len.o: $(hdrdir)/ruby/st.h
-set_len.o: $(hdrdir)/ruby/subst.h
-set_len.o: $(top_srcdir)/include/ruby.h
-set_len.o: set_len.c
-# AUTOGENERATED DEPENDENCIES END
+normalize.o: $(top_srcdir)/internal.h
diff --git a/ext/-test-/string/enc_associate.c b/ext/-test-/string/enc_associate.c
index 53811620a0..d6614fb298 100644
--- a/ext/-test-/string/enc_associate.c
+++ b/ext/-test-/string/enc_associate.c
@@ -7,16 +7,8 @@ bug_str_enc_associate(VALUE str, VALUE enc)
     return rb_enc_associate(str, rb_to_encoding(enc));
 }
 
-VALUE
-bug_str_encoding_index(VALUE self, VALUE str)
-{
-    int idx = rb_enc_get_index(str);
-    return INT2NUM(idx);
-}
-
 void
 Init_enc_associate(VALUE klass)
 {
     rb_define_method(klass, "associate_encoding!", bug_str_enc_associate, 1);
-    rb_define_singleton_method(klass, "encoding_index", bug_str_encoding_index, 1);
 }
diff --git a/ext/-test-/string/extconf.rb b/ext/-test-/string/extconf.rb
index d786b15db9..10d33cbab9 100644
--- a/ext/-test-/string/extconf.rb
+++ b/ext/-test-/string/extconf.rb
@@ -1,3 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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/fstring.c b/ext/-test-/string/fstring.c
deleted file mode 100644
index b65c98ce6d..0000000000
--- a/ext/-test-/string/fstring.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "ruby.h"
-
-VALUE rb_fstring(VALUE str);
-
-VALUE
-bug_s_fstring(VALUE self, VALUE str)
-{
-    return rb_fstring(str);
-}
-
-void
-Init_fstring(VALUE klass)
-{
-    rb_define_singleton_method(klass, "fstring", bug_s_fstring, 1);
-}
diff --git a/ext/-test-/string/nofree.c b/ext/-test-/string/nofree.c
deleted file mode 100644
index d3d8071ff9..0000000000
--- a/ext/-test-/string/nofree.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ruby.h"
-
-VALUE
-bug_str_nofree(VALUE self)
-{
-    return rb_str_new_cstr("abcdef");
-}
-
-void
-Init_nofree(VALUE klass)
-{
-    rb_define_singleton_method(klass, "nofree", bug_str_nofree, 0);
-}
diff --git a/ext/-test-/string/normalize.c b/ext/-test-/string/normalize.c
index 2e16a4616f..22bb6d7887 100644
--- a/ext/-test-/string/normalize.c
+++ b/ext/-test-/string/normalize.c
@@ -1,3 +1,4 @@
+#include "ruby.h"
 #include "internal.h"
 
 #ifdef __APPLE__
diff --git a/ext/-test-/struct/duplicate.c b/ext/-test-/struct/duplicate.c
deleted file mode 100644
index 596d32aad8..0000000000
--- a/ext/-test-/struct/duplicate.c
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-bug_struct_new_duplicate(VALUE obj, VALUE name, VALUE mem)
-{
-    const char *n = NIL_P(name) ? 0 : StringValueCStr(name);
-    const char *m = StringValueCStr(mem);
-    return rb_struct_define(n, m, m, NULL);
-}
-
-static VALUE
-bug_struct_new_duplicate_under(VALUE obj, VALUE name, VALUE mem)
-{
-    const char *n = StringValueCStr(name);
-    const char *m = StringValueCStr(mem);
-    return rb_struct_define_under(obj, n, m, m, NULL);
-}
-
-void
-Init_duplicate(VALUE klass)
-{
-    rb_define_singleton_method(klass, "new_duplicate", bug_struct_new_duplicate, 2);
-    rb_define_singleton_method(klass, "new_duplicate_under", bug_struct_new_duplicate_under, 2);
-}
diff --git a/ext/-test-/struct/extconf.rb b/ext/-test-/struct/extconf.rb
index d786b15db9..0e4f9551f2 100644
--- a/ext/-test-/struct/extconf.rb
+++ b/ext/-test-/struct/extconf.rb
@@ -1,3 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
+$INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
+$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-/struct")
diff --git a/ext/-test-/symbol/extconf.rb b/ext/-test-/symbol/extconf.rb
index ecebdb7d6b..fc00ec9abf 100644
--- a/ext/-test-/symbol/extconf.rb
+++ b/ext/-test-/symbol/extconf.rb
@@ -1,4 +1,7 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
+$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(' ')}\""
 have_func("rb_pin_dynamic_symbol")
-auto_ext
+create_makefile("-test-/symbol")
diff --git a/ext/-test-/symbol/init.c b/ext/-test-/symbol/init.c
index 9e42e1a38b..3b7cf15899 100644
--- a/ext/-test-/symbol/init.c
+++ b/ext/-test-/symbol/init.c
@@ -8,18 +8,11 @@ sym_find(VALUE dummy, VALUE sym)
     return rb_check_symbol(&sym);
 }
 
-static VALUE
-sym_pinneddown_p(VALUE dummy, VALUE sym)
-{
-    return rb_check_id(&sym) ? Qtrue : Qfalse;
-}
-
 void
 Init_symbol(void)
 {
     VALUE mBug = rb_define_module("Bug");
     VALUE klass = rb_define_class_under(mBug, "Symbol", rb_cSymbol);
     rb_define_singleton_method(klass, "find", sym_find, 1);
-    rb_define_singleton_method(klass, "pinneddown?", sym_pinneddown_p, 1);
     TEST_INIT_FUNCS(init);
 }
diff --git a/ext/-test-/time/extconf.rb b/ext/-test-/time/extconf.rb
deleted file mode 100644
index d786b15db9..0000000000
--- a/ext/-test-/time/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-# frozen_string_literal: false
-require_relative "../auto_ext.rb"
-auto_ext(inc: true)
diff --git a/ext/-test-/time/init.c b/ext/-test-/time/init.c
deleted file mode 100644
index 01a20b8b3d..0000000000
--- a/ext/-test-/time/init.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ruby.h"
-
-#define init(n) {void Init_##n(VALUE klass); Init_##n(klass);}
-
-void
-Init_time(void)
-{
-    VALUE mBug = rb_define_module("Bug");
-    VALUE klass = rb_define_class_under(mBug, "Time", rb_cTime);
-    TEST_INIT_FUNCS(init);
-}
diff --git a/ext/-test-/time/new.c b/ext/-test-/time/new.c
deleted file mode 100644
index 0f71a5542b..0000000000
--- a/ext/-test-/time/new.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "ruby.h"
-
-static VALUE
-bug_time_s_nano_new(VALUE klass, VALUE sec, VALUE nsec)
-{
-    return rb_time_nano_new(NUM2TIMET(sec), NUM2LONG(nsec));
-}
-
-static VALUE
-bug_time_s_timespec_new(VALUE klass, VALUE sec, VALUE nsec, VALUE gmtoff)
-{
-    struct timespec ts;
-    ts.tv_sec = NUM2TIMET(sec);
-    ts.tv_nsec = NUM2LONG(nsec);
-    return rb_time_timespec_new(&ts, NUM2INT(gmtoff));
-}
-
-static VALUE
-bug_time_s_timespec_now(VALUE klass)
-{
-    struct timespec ts;
-    VALUE v;
-    rb_timespec_now(&ts);
-    v = rb_Rational(LONG2NUM(ts.tv_nsec), LONG2NUM(1000000000L));
-    return rb_num_coerce_bin(TIMET2NUM(ts.tv_sec), v, '+');
-}
-
-void
-Init_new(VALUE klass)
-{
-    rb_define_singleton_method(klass, "nano_new", bug_time_s_nano_new, 2);
-    rb_define_singleton_method(klass, "timespec_new", bug_time_s_timespec_new, 3);
-    rb_define_singleton_method(klass, "timespec_now", bug_time_s_timespec_now, 0);
-}
diff --git a/ext/-test-/tracepoint/depend b/ext/-test-/tracepoint/depend
index 5b2b2f7369..8d4e5ab343 100644
--- a/ext/-test-/tracepoint/depend
+++ b/ext/-test-/tracepoint/depend
@@ -1,24 +1 @@
-# AUTOGENERATED DEPENDENCIES START
-gc_hook.o: $(RUBY_EXTCONF_H)
-gc_hook.o: $(arch_hdrdir)/ruby/config.h
-gc_hook.o: $(hdrdir)/ruby/backward.h
-gc_hook.o: $(hdrdir)/ruby/debug.h
-gc_hook.o: $(hdrdir)/ruby/defines.h
-gc_hook.o: $(hdrdir)/ruby/intern.h
-gc_hook.o: $(hdrdir)/ruby/missing.h
-gc_hook.o: $(hdrdir)/ruby/ruby.h
-gc_hook.o: $(hdrdir)/ruby/st.h
-gc_hook.o: $(hdrdir)/ruby/subst.h
-gc_hook.o: gc_hook.c
-tracepoint.o: $(RUBY_EXTCONF_H)
-tracepoint.o: $(arch_hdrdir)/ruby/config.h
-tracepoint.o: $(hdrdir)/ruby/backward.h
-tracepoint.o: $(hdrdir)/ruby/debug.h
-tracepoint.o: $(hdrdir)/ruby/defines.h
-tracepoint.o: $(hdrdir)/ruby/intern.h
-tracepoint.o: $(hdrdir)/ruby/missing.h
-tracepoint.o: $(hdrdir)/ruby/ruby.h
-tracepoint.o: $(hdrdir)/ruby/st.h
-tracepoint.o: $(hdrdir)/ruby/subst.h
-tracepoint.o: tracepoint.c
-# AUTOGENERATED DEPENDENCIES END
+tracepoint.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h
diff --git a/ext/-test-/tracepoint/extconf.rb b/ext/-test-/tracepoint/extconf.rb
index 2b7258d072..c0c2399eb4 100644
--- a/ext/-test-/tracepoint/extconf.rb
+++ b/ext/-test-/tracepoint/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
 create_makefile("-test-/tracepoint")
diff --git a/ext/-test-/typeddata/extconf.rb b/ext/-test-/typeddata/extconf.rb
index 731701111b..02e3e41c8b 100644
--- a/ext/-test-/typeddata/extconf.rb
+++ b/ext/-test-/typeddata/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/typeddata")
+create_makefile("-test-/typeddata/typeddata")
diff --git a/ext/-test-/vm/at_exit.c b/ext/-test-/vm/at_exit.c
deleted file mode 100644
index 6cfbfafa9e..0000000000
--- a/ext/-test-/vm/at_exit.c
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <ruby/ruby.h>
-#include <ruby/vm.h>
-
-static void
-do_nothing(ruby_vm_t *vm)
-{
-}
-
-static void
-print_begin(ruby_vm_t *vm)
-{
-    printf("begin\n");
-}
-
-static void
-print_end(ruby_vm_t *vm)
-{
-    printf("end\n");
-}
-
-static VALUE
-register_at_exit(VALUE self, VALUE t)
-{
-    switch (t) {
-      case Qtrue:
-	ruby_vm_at_exit(print_begin);
-	break;
-      case Qfalse:
-	ruby_vm_at_exit(print_end);
-	break;
-      default:
-	ruby_vm_at_exit(do_nothing);
-	break;
-    }
-    return self;
-}
-
-void
-Init_at_exit(void)
-{
-    VALUE m = rb_define_module("Bug");
-    VALUE c = rb_define_class_under(m, "VM", rb_cObject);
-    rb_define_singleton_method(c, "register_at_exit", register_at_exit, 1);
-}
diff --git a/ext/-test-/vm/depend b/ext/-test-/vm/depend
deleted file mode 100644
index dd56dd0e0d..0000000000
--- a/ext/-test-/vm/depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-at_exit.o: $(RUBY_EXTCONF_H)
-at_exit.o: $(arch_hdrdir)/ruby/config.h
-at_exit.o: $(hdrdir)/ruby/backward.h
-at_exit.o: $(hdrdir)/ruby/defines.h
-at_exit.o: $(hdrdir)/ruby/intern.h
-at_exit.o: $(hdrdir)/ruby/missing.h
-at_exit.o: $(hdrdir)/ruby/ruby.h
-at_exit.o: $(hdrdir)/ruby/st.h
-at_exit.o: $(hdrdir)/ruby/subst.h
-at_exit.o: $(hdrdir)/ruby/vm.h
-at_exit.o: at_exit.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/-test-/vm/extconf.rb b/ext/-test-/vm/extconf.rb
deleted file mode 100644
index 614ec960d8..0000000000
--- a/ext/-test-/vm/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile('-test-/vm/at_exit')
diff --git a/ext/-test-/wait_for_single_fd/depend b/ext/-test-/wait_for_single_fd/depend
index 949c427685..b94e507631 100644
--- a/ext/-test-/wait_for_single_fd/depend
+++ b/ext/-test-/wait_for_single_fd/depend
@@ -1,15 +1,4 @@
-# AUTOGENERATED DEPENDENCIES START
-wait_for_single_fd.o: $(RUBY_EXTCONF_H)
-wait_for_single_fd.o: $(arch_hdrdir)/ruby/config.h
-wait_for_single_fd.o: $(hdrdir)/ruby/backward.h
-wait_for_single_fd.o: $(hdrdir)/ruby/defines.h
-wait_for_single_fd.o: $(hdrdir)/ruby/encoding.h
-wait_for_single_fd.o: $(hdrdir)/ruby/intern.h
-wait_for_single_fd.o: $(hdrdir)/ruby/io.h
-wait_for_single_fd.o: $(hdrdir)/ruby/missing.h
-wait_for_single_fd.o: $(hdrdir)/ruby/oniguruma.h
-wait_for_single_fd.o: $(hdrdir)/ruby/ruby.h
-wait_for_single_fd.o: $(hdrdir)/ruby/st.h
-wait_for_single_fd.o: $(hdrdir)/ruby/subst.h
-wait_for_single_fd.o: wait_for_single_fd.c
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \
+  $(hdrdir)/ruby/io.h
diff --git a/ext/-test-/wait_for_single_fd/extconf.rb b/ext/-test-/wait_for_single_fd/extconf.rb
index 931662c040..1a28b23da3 100644
--- a/ext/-test-/wait_for_single_fd/extconf.rb
+++ b/ext/-test-/wait_for_single_fd/extconf.rb
@@ -1,2 +1 @@
-# frozen_string_literal: false
-create_makefile("-test-/wait_for_single_fd")
+create_makefile("-test-/wait_for_single_fd/wait_for_single_fd")
diff --git a/ext/-test-/win32/console/attribute.c b/ext/-test-/win32/console/attribute.c
index 6d706fbfe7..8941272ea7 100644
--- a/ext/-test-/win32/console/attribute.c
+++ b/ext/-test-/win32/console/attribute.c
@@ -2,38 +2,30 @@
 
 static VALUE rb_cConsoleScreenBufferInfo;
 
-static HANDLE
-io_handle(VALUE io)
-{
-    int fd = NUM2INT(rb_funcallv(io, rb_intern("fileno"), 0, 0));
-    HANDLE h = (HANDLE)rb_w32_get_osfhandle(fd);
-
-    if (h == (HANDLE)-1) rb_raise(rb_eIOError, "invalid io");
-    return h;
-}
-
 static VALUE
 console_info(VALUE io)
 {
-    HANDLE h = io_handle(io);
+    int fd = NUM2INT(rb_funcallv(io, rb_intern("fileno"), 0, 0));
+    HANDLE h = (HANDLE)rb_w32_get_osfhandle(fd);
     CONSOLE_SCREEN_BUFFER_INFO csbi;
 
+    if (h == (HANDLE)-1) rb_raise(rb_eIOError, "invalid io");
     if (!GetConsoleScreenBufferInfo(h, &csbi))
 	rb_syserr_fail(rb_w32_map_errno(GetLastError()), "not console");
     return rb_struct_new(rb_cConsoleScreenBufferInfo,
-			 INT2FIX(csbi.dwSize.X),
-			 INT2FIX(csbi.dwSize.Y),
-			 INT2FIX(csbi.dwCursorPosition.X),
-			 INT2FIX(csbi.dwCursorPosition.Y),
+			 INT2FIX(csbi.dwSize.X), INT2FIX(csbi.dwSize.Y),
+			 INT2FIX(csbi.dwCursorPosition.X), INT2FIX(csbi.dwCursorPosition.Y),
 			 INT2FIX(csbi.wAttributes));
 }
 
 static VALUE
 console_set_attribute(VALUE io, VALUE attr)
 {
-    HANDLE h = io_handle(io);
+    int fd = NUM2INT(rb_funcallv(io, rb_intern("fileno"), 0, 0));
+    HANDLE h = (HANDLE)rb_w32_get_osfhandle(fd);
 
-    SetConsoleTextAttribute(h, (WORD)NUM2INT(attr));
+    if (h == (HANDLE)-1) rb_raise(rb_eIOError, "invalid io");
+    SetConsoleTextAttribute(h, NUM2INT(attr));
     return Qnil;
 }
 
diff --git a/ext/-test-/win32/console/extconf.rb b/ext/-test-/win32/console/extconf.rb
index 5162172890..4de9fa7e4f 100644
--- a/ext/-test-/win32/console/extconf.rb
+++ b/ext/-test-/win32/console/extconf.rb
@@ -1,5 +1,8 @@
-# frozen_string_literal: false
 if $mingw or $mswin
-  require_relative "../../auto_ext.rb"
-  auto_ext
+  $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-/win32/console")
 end
diff --git a/ext/-test-/win32/dln/depend b/ext/-test-/win32/dln/depend
deleted file mode 100644
index c3f14db4f7..0000000000
--- a/ext/-test-/win32/dln/depend
+++ /dev/null
@@ -1,9 +0,0 @@
-$(TARGET_SO): $(DLNTESTLIB)
-
-$(DLNTESTLIB): dlntest.dll
-
-dlntest.dll: libdlntest.o libdlntest.def
-	$(ECHO) linking shared-object $(@F)
-	-$(Q)$(RM) $@
-	-$(Q)$(MAKEDIRS) $(@D)
-	$(Q) $(DLNTEST_LDSHARED)
diff --git a/ext/-test-/dln/empty/empty.c b/ext/-test-/win32/dln/empty/empty.c
index c4f94f1644..c4f94f1644 100644
--- a/ext/-test-/dln/empty/empty.c
+++ b/ext/-test-/win32/dln/empty/empty.c
diff --git a/ext/-test-/win32/dln/empty/extconf.rb b/ext/-test-/win32/dln/empty/extconf.rb
new file mode 100644
index 0000000000..a4efed90c9
--- /dev/null
+++ b/ext/-test-/win32/dln/empty/extconf.rb
@@ -0,0 +1,3 @@
+if $mingw or $mswin
+  create_makefile("-test-/win32/dln/empty")
+end
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
index d72b6a868c..57cee23b40 100644
--- a/ext/-test-/win32/dln/extconf.rb
+++ b/ext/-test-/win32/dln/extconf.rb
@@ -1,33 +1,37 @@
-# frozen_string_literal: false
 if $mingw or $mswin
-  dlntestlib = "dlntest.#{$LIBEXT}"
-  $LOCAL_LIBS << " #{dlntestlib}"
-  $srcs = ["dlntest.c"]
   $objs = ["dlntest.o"]
-  testdll = "dlntest.dll"
+  testdll = "$(topdir)/dlntest.dll"
   $cleanfiles << testdll
   $cleanfiles << "dlntest.#{$LIBEXT}"
   config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)}
 
-  create_makefile("-test-/win32/dln") do |m|
-    m << "\n""DLNTESTLIB = #{dlntestlib}\n"
+  create_makefile("-test-/win32/dln")
+  m = File.read("Makefile")
+  dlntestlib = "dlntest.#{$LIBEXT}"
+  m.sub!(/^OBJS =.*/) {"#{$&} #{dlntestlib}"}
+  FileUtils.rm_f(RbConfig.expand(testdll.dup))
+  open("Makefile", "wb") do |mf|
+    mf.puts m, "\n"
+    sodir = $extout ? "$(RUBYARCHDIR)/" : ''
+    mf.print "#{sodir}$(DLLIB): #{dlntestlib}"
+    mf.puts
+    mf.puts "#{dlntestlib}: $(topdir)/dlntest.dll"
+    mf.puts
     if $mingw
-      m << "\n"
-      m << "dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def\n"
-      m << "dlntest.dll: DLDFLAGS += -Wl,--out-implib,$(DLNTESTLIB)\n"
+      mf.puts "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def"
+      mf.puts "$(topdir)/dlntest.dll: DLDFLAGS += -Wl,--out-implib,#{dlntestlib}"
     end
-    m
-  end
-  m = File.read("Makefile")
-  m.sub!(/(.*)\$\(DLNTEST_LDSHARED\)$/) do
-    pre = $1
-    link_so = LINK_SO.gsub(/^/) {pre}
+    mf.puts depend_rules("$(topdir)/dlntest.dll: libdlntest.o libdlntest.def")
+    mf.puts "\t$(ECHO) linking shared-object $(@F)\n"
+    mf.print "\t-$(Q)$(RM) $@\n"
+    mf.print "\t-$(Q)$(MAKEDIRS) $(@D)\n" if $extout
+    link_so = LINK_SO.gsub(/^/, "\t$(Q) ")
     link_so.sub!(/\$\(LOCAL_LIBS\)/, '')
     link_so.gsub!(/-\$\(arch\)/, '')
     link_so.gsub!(/:.so=/, ':.dll=')
     link_so.sub!(/\$\(OBJS\)/, "libdlntest.#{$OBJEXT}")
     link_so.sub!(/\$\(DEFFILE\)/, "$(srcdir)/libdlntest.def")
-    link_so
-  end and File.binwrite("Makefile", m)
-  FileUtils.rm_f(RbConfig.expand(testdll.dup))
+    mf.puts link_so
+    mf.puts
+  end
 end
diff --git a/ext/-test-/win32/fd_setsize/extconf.rb b/ext/-test-/win32/fd_setsize/extconf.rb
index caa4b85a1b..ed40f8b1d7 100644
--- a/ext/-test-/win32/fd_setsize/extconf.rb
+++ b/ext/-test-/win32/fd_setsize/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 if $mingw or $mswin
   create_makefile("-test-/win32/fd_setsize")
 end
diff --git a/ext/Setup b/ext/Setup
index 0929d647ae..5deb604151 100644
--- a/ext/Setup
+++ b/ext/Setup
@@ -1,38 +1,22 @@
 #option nodynamic
 
+#Win32API
 #bigdecimal
-#cgi/escape
-#continuation
-#coverage
-#date
 #dbm
-#digest/bubblebabble
 #digest
 #digest/md5
 #digest/rmd160
 #digest/sha1
 #digest/sha2
+#dl
 #etc
 #fcntl
-#fiber
-#fiddle
 #gdbm
-#io/console
-#io/nonblock
 #io/wait
-#json
-#json/generator
-#json/parser
-#mathn/complex
-#mathn/rational
 #nkf
-#objspace
 #openssl
-#pathname
-#psych
 #pty
 #racc/cparse
-#rbconfig/sizeof
 #readline
 #ripper
 #sdbm
@@ -40,6 +24,6 @@
 #stringio
 #strscan
 #syslog
-#win32
+#tk
 #win32ole
 #zlib
diff --git a/ext/Setup.atheos b/ext/Setup.atheos
index 90a7d01348..662ca57af1 100644
--- a/ext/Setup.atheos
+++ b/ext/Setup.atheos
@@ -2,13 +2,13 @@ option nodynamic
 
 #Win32API
 bigdecimal
-cgi/escape
 dbm
 digest
 digest/md5
 digest/rmd160
 digest/sha1
 digest/sha2
+dl
 enumerator
 etc
 fcntl
@@ -25,5 +25,6 @@ socket
 stringio
 strscan
 syslog
+#tk
 #win32ole
 zlib
diff --git a/ext/Setup.emx b/ext/Setup.emx
new file mode 100644
index 0000000000..6c80812ac0
--- /dev/null
+++ b/ext/Setup.emx
@@ -0,0 +1,32 @@
+# OS/2 environment w/ Autoconf 2.1x for EMX
+option platform os2-emx
+option nodynamic
+
+#Win32API
+bigdecimal
+#dbm
+digest
+digest/md5
+digest/rmd160
+digest/sha1
+digest/sha2
+#dl
+enumerator
+etc
+fcntl
+#gdbm
+#io/wait
+nkf
+#openssl
+#pty
+racc/cparse
+#readline
+#ripper
+#sdbm
+socket
+stringio
+strscan
+#syslog
+#tk
+#win32ole
+#zlib
diff --git a/ext/Setup.nacl b/ext/Setup.nacl
index eb8a1a70cd..28eafb5082 100644
--- a/ext/Setup.nacl
+++ b/ext/Setup.nacl
@@ -2,7 +2,6 @@
 #
 # #Win32API
 # bigdecimal
-# cgi/escape
 # continuation
 # coverage
 # date
@@ -13,6 +12,9 @@
 # digest/rmd160
 # digest/sha1
 # digest/sha2
+# dl
+# dl/callback
+# #dl/win32
 # etc
 # fcntl
 # fiber
@@ -41,4 +43,6 @@
 # stringio
 # strscan
 # #syslog
+# #tk
+# #tk/tkutil
 # #zlib
diff --git a/ext/Setup.nt b/ext/Setup.nt
index fb5989b87f..3936d2ed29 100644
--- a/ext/Setup.nt
+++ b/ext/Setup.nt
@@ -3,13 +3,13 @@
 
 Win32API
 bigdecimal
-cgi/escape
 #dbm
 digest
 digest/md5
 digest/rmd160
 digest/sha1
 digest/sha2
+dl
 enumerator
 etc
 fcntl
@@ -26,5 +26,6 @@ socket
 stringio
 strscan
 #syslog
+#tk
 win32ole
 #zlib
diff --git a/ext/bigdecimal/README b/ext/bigdecimal/README
new file mode 100644
index 0000000000..7a4362826c
--- /dev/null
+++ b/ext/bigdecimal/README
@@ -0,0 +1,60 @@
+
+  Ruby BIGDECIMAL(Variable Precision) extension library.
+  Copyright (C) 1999  by Shigeo Kobayashi(shigeo@tinyforest.gr.jp)
+
+BigDecimal is copyrighted free software by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
+You can redistribute it and/or modify it under either the terms of the GPL
+(see COPYING 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. 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.
+
+* The Author
+
+Feel free to send comments and bug reports to the ruby-core team.
+
+  http://bugs.ruby-lang.org
+
+-------------------------------------------------------
+created at: Thu Dec 22 1999
+updated at: Wed Sep 28 2011
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 0d9d0518a8..08febb5585 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -4,6 +4,13 @@
  *
  * 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.
+ *
+ *  NOTE: Change log in this source removed to reduce source code size.
+ *        See rev. 1.25 if needed.
+ *
  */
 
 /* #define BIGDECIMAL_DEBUG 1 */
@@ -62,7 +69,6 @@ static ID id_ceil;
 static ID id_floor;
 static ID id_to_r;
 static ID id_eq;
-static ID id_half;
 
 /* MACRO's to guard objects from GC by keeping them in stack */
 #define ENTER(n) volatile VALUE RB_UNUSED_VAR(vStack[n]);int iStack=0
@@ -103,33 +109,6 @@ static ID id_half;
 # define RB_OBJ_STRING(obj) StringValueCStr(obj)
 #endif
 
-#ifndef HAVE_RB_RATIONAL_NUM
-static inline VALUE
-rb_rational_num(VALUE rat)
-{
-#ifdef HAVE_TYPE_STRUCT_RRATIONAL
-    return RRATIONAL(rat)->num;
-#else
-    return rb_funcall(rat, rb_intern("numerator"));
-#endif
-}
-#endif
-
-#ifndef HAVE_RB_RATIONAL_DEN
-static inline VALUE
-rb_rational_den(VALUE rat)
-{
-#ifdef HAVE_TYPE_STRUCT_RRATIONAL
-    return RRATIONAL(rat)->den;
-#else
-    return rb_funcall(rat, rb_intern("denominator"));
-#endif
-}
-#endif
-
-#define BIGDECIMAL_POSITIVE_P(bd) ((bd)->sign > 0)
-#define BIGDECIMAL_NEGATIVE_P(bd) ((bd)->sign < 0)
-
 /*
  * ================== Ruby Interface part ==========================
  */
@@ -176,14 +155,14 @@ static size_t
 BigDecimal_memsize(const void *ptr)
 {
     const Real *pv = ptr;
-    return (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT));
+    return pv ? (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT)) : 0;
 }
 
 static const rb_data_type_t BigDecimal_data_type = {
     "BigDecimal",
     { 0, BigDecimal_delete, BigDecimal_memsize, },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 #endif
 };
 
@@ -243,11 +222,6 @@ again:
 	if (prec < 0) goto unable_to_coerce_without_prec;
 	if (prec > DBL_DIG+1) goto SomeOneMayDoIt;
 	d = RFLOAT_VALUE(v);
-	if (!isfinite(d)) {
-	    pv = VpCreateRbObject(1, NULL);
-	    VpDtoV(pv, d);
-	    return pv;
-	}
 	if (d != 0.0) {
 	    v = rb_funcall(v, id_to_r, 0);
 	    goto again;
@@ -335,18 +309,15 @@ BigDecimal_double_fig(VALUE self)
     return INT2FIX(VpDblFig());
 }
 
-/*  call-seq:
- *     big_decimal.precs  ->  array
- *
- *  Returns an Array of two Integer values.
+/* call-seq:
+ * precs
  *
- *  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.
+ * Returns an Array of two Integer values.
  *
- *     BigDecimal('5').precs #=> [9, 18]
+ * 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.
  */
-
 static VALUE
 BigDecimal_prec(VALUE self)
 {
@@ -391,9 +362,9 @@ BigDecimal_hash(VALUE self)
  * Method used to provide marshalling support.
  *
  *      inf = BigDecimal.new('Infinity')
- *        #=> Infinity
+ *      => #<BigDecimal:1e16fa8,'Infinity',9(9)>
  *      BigDecimal._load(inf._dump)
- *        #=> Infinity
+ *      => #<BigDecimal:1df8dc8,'Infinity',9(9)>
  *
  * See the Marshal module.
  */
@@ -447,55 +418,6 @@ BigDecimal_load(VALUE self, VALUE str)
 }
 
 static unsigned short
-check_rounding_mode_option(VALUE const opts)
-{
-    VALUE mode;
-    char const *s;
-    long l;
-
-    assert(RB_TYPE_P(opts, T_HASH));
-
-    if (NIL_P(opts))
-        goto noopt;
-
-    mode = rb_hash_lookup2(opts, ID2SYM(id_half), Qundef);
-    if (mode == Qundef || NIL_P(mode))
-        goto noopt;
-
-    if (SYMBOL_P(mode))
-        mode = rb_sym2str(mode);
-    else if (!RB_TYPE_P(mode, T_STRING)) {
-	VALUE str_mode = rb_check_string_type(mode);
-	if (NIL_P(str_mode)) goto invalid;
-	mode = str_mode;
-    }
-    s = RSTRING_PTR(mode);
-    l = RSTRING_LEN(mode);
-    switch (l) {
-      case 2:
-        if (strncasecmp(s, "up", 2) == 0)
-            return VP_ROUND_HALF_UP;
-        break;
-      case 4:
-        if (strncasecmp(s, "even", 4) == 0)
-            return VP_ROUND_HALF_EVEN;
-        else if (strncasecmp(s, "down", 4) == 0)
-            return VP_ROUND_HALF_DOWN;
-        break;
-      default:
-        break;
-    }
-  invalid:
-    if (NIL_P(mode))
-	rb_raise(rb_eArgError, "invalid rounding mode: nil");
-    else
-	rb_raise(rb_eArgError, "invalid rounding mode: %"PRIsVALUE, mode);
-
-  noopt:
-    return VpGetRoundMode();
-}
-
-static unsigned short
 check_rounding_mode(VALUE const v)
 {
     unsigned short sw;
@@ -523,7 +445,8 @@ check_rounding_mode(VALUE const v)
 	break;
     }
 
-    sw = NUM2USHORT(v);
+    Check_Type(v, T_FIXNUM);
+    sw = (unsigned short)FIX2UINT(v);
     if (!VpIsRoundMode(sw)) {
 	rb_raise(rb_eArgError, "invalid rounding mode");
     }
@@ -576,7 +499,8 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
     unsigned long f,fo;
 
     rb_scan_args(argc, argv, "11", &which, &val);
-    f = (unsigned long)NUM2INT(which);
+    Check_Type(which, T_FIXNUM);
+    f = (unsigned long)FIX2INT(which);
 
     if (f & VP_EXCEPTION_ALL) {
 	/* Exception mode setting */
@@ -617,7 +541,7 @@ BigDecimal_mode(int argc, VALUE *argv, VALUE self)
 	fo = VpSetRoundMode(sw);
 	return INT2FIX(fo);
     }
-    rb_raise(rb_eTypeError, "first argument for BigDecimal.mode invalid");
+    rb_raise(rb_eTypeError, "first argument for BigDecimal#mode invalid");
     return Qnil;
 }
 
@@ -646,7 +570,8 @@ static SIGNED_VALUE
 GetPositiveInt(VALUE v)
 {
     SIGNED_VALUE n;
-    n = NUM2INT(v);
+    Check_Type(v, T_FIXNUM);
+    n = FIX2INT(v);
     if (n < 0) {
 	rb_raise(rb_eArgError, "argument must be positive");
     }
@@ -656,17 +581,17 @@ GetPositiveInt(VALUE v)
 VP_EXPORT Real *
 VpNewRbClass(size_t mx, const char *str, VALUE klass)
 {
-    VALUE obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, 0);
     Real *pv = VpAlloc(mx,str);
-    RTYPEDDATA_DATA(obj) = pv;
-    pv->obj = obj;
+    pv->obj = TypedData_Wrap_Struct(klass, &BigDecimal_data_type, pv);
     return pv;
 }
 
 VP_EXPORT Real *
 VpCreateRbObject(size_t mx, const char *str)
 {
-    return VpNewRbClass(mx, str, rb_cBigDecimal);
+    Real *pv = VpAlloc(mx,str);
+    pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
+    return pv;
 }
 
 #define VpAllocReal(prec) (Real *)VpMemAlloc(offsetof(Real, frac) + (prec) * sizeof(BDIGIT))
@@ -688,7 +613,7 @@ VpCopy(Real *pv, Real const* const x)
     return pv;
 }
 
-/* Returns True if the value is Not a Number. */
+/* Returns True if the value is Not a Number */
 static VALUE
 BigDecimal_IsNaN(VALUE self)
 {
@@ -709,7 +634,7 @@ BigDecimal_IsInfinite(VALUE self)
     return Qnil;
 }
 
-/* Returns True if the value is finite (not NaN or infinite). */
+/* Returns True if the value is finite (not NaN or infinite) */
 static VALUE
 BigDecimal_IsFinite(VALUE self)
 {
@@ -735,9 +660,9 @@ BigDecimal_check_num(Real *p)
 
 static VALUE BigDecimal_split(VALUE self);
 
-/* Returns the value as an Integer.
+/* Returns the value as an integer (Fixnum or Bignum).
  *
- * If the BigDecimal is infinity or NaN, raises FloatDomainError.
+ * If the BigNumber is infinity or NaN, raises FloatDomainError.
  */
 static VALUE
 BigDecimal_to_i(VALUE self)
@@ -757,12 +682,12 @@ BigDecimal_to_i(VALUE self)
     }
     else {
 	VALUE a = BigDecimal_split(self);
-	VALUE digits = RARRAY_AREF(a, 1);
+	VALUE digits = RARRAY_PTR(a)[1];
 	VALUE numerator = rb_funcall(digits, rb_intern("to_i"), 0);
 	VALUE ret;
 	ssize_t dpower = e - (ssize_t)RSTRING_LEN(digits);
 
-	if (BIGDECIMAL_NEGATIVE_P(p)) {
+	if (VpGetSign(p) < 0) {
 	    numerator = rb_funcall(numerator, '*', 1, INT2FIX(-1));
 	}
 	if (dpower < 0) {
@@ -817,17 +742,17 @@ BigDecimal_to_f(VALUE self)
 
 overflow:
     VpException(VP_EXCEPTION_OVERFLOW, "BigDecimal to Float conversion", 0);
-    if (BIGDECIMAL_NEGATIVE_P(p))
-	return rb_float_new(VpGetDoubleNegInf());
-    else
+    if (p->sign >= 0)
 	return rb_float_new(VpGetDoublePosInf());
+    else
+	return rb_float_new(VpGetDoubleNegInf());
 
 underflow:
     VpException(VP_EXCEPTION_UNDERFLOW, "BigDecimal to Float conversion", 0);
-    if (BIGDECIMAL_NEGATIVE_P(p))
-	return rb_float_new(-0.0);
-    else
+    if (p->sign >= 0)
 	return rb_float_new(0.0);
+    else
+	return rb_float_new(-0.0);
 }
 
 
@@ -846,7 +771,7 @@ BigDecimal_to_r(VALUE self)
     sign = VpGetSign(p);
     power = VpExponent10(p);
     a = BigDecimal_split(self);
-    digits = RARRAY_AREF(a, 1);
+    digits = RARRAY_PTR(a)[1];
     denomi_power = power - RSTRING_LEN(digits);
     numerator = rb_funcall(digits, rb_intern("to_i"), 0);
 
@@ -873,8 +798,8 @@ BigDecimal_to_r(VALUE self)
  * be coerced into a BigDecimal value.
  *
  * e.g.
- *   a = BigDecimal.new("1.0")
- *   b = a / 2.0 #=> 0.5
+ * a = BigDecimal.new("1.0")
+ * b = a / 2.0  -> 0.5
  *
  * Note that coercing a String to a BigDecimal is not supported by default;
  * it requires a special compile-time option when building Ruby.
@@ -905,14 +830,13 @@ BigDecimal_coerce(VALUE self, VALUE other)
 }
 
 /*
- * call-seq:
- *    +big_decimal  ->  big_decimal
+ * call-seq: +@
  *
  * Return self.
  *
- *     +BigDecimal('5')  #=> 0.5e1
+ * e.g.
+ *   b = +a  # b == a
  */
-
 static VALUE
 BigDecimal_uplus(VALUE self)
 {
@@ -933,8 +857,8 @@ BigDecimal_uplus(VALUE self)
   *   c = a + b
   *
   * 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.
+  * result, the result is rounded to that number of digits, according to
+  * BigDecimal.mode.
   */
 static VALUE
 BigDecimal_add(VALUE self, VALUE r)
@@ -978,7 +902,7 @@ BigDecimal_add(VALUE self, VALUE r)
 }
 
  /* call-seq:
-  * a - b   -> bigdecimal
+  * value - digits   -> bigdecimal
   *
   * Subtract the specified value.
   *
@@ -1162,7 +1086,7 @@ BigDecimal_comp(VALUE self, VALUE r)
  *
  * Values may be coerced to perform the comparison:
  *
- *   BigDecimal.new('1.0') == 1.0  #=> true
+ * BigDecimal.new('1.0') == 1.0  -> true
  */
 static VALUE
 BigDecimal_eq(VALUE self, VALUE r)
@@ -1223,14 +1147,14 @@ BigDecimal_ge(VALUE self, VALUE r)
 }
 
 /*
- *  call-seq:
- *     -big_decimal  ->  big_decimal
+ * call-seq: -@
  *
- *  Return the negation of self.
+ * Return the negation of self.
  *
- *    -BigDecimal('5')  #=> -0.5e1
+ * e.g.
+ *   b = -a
+ *   b == a * -1
  */
-
 static VALUE
 BigDecimal_neg(VALUE self)
 {
@@ -1254,8 +1178,8 @@ BigDecimal_neg(VALUE self)
   *   c = a * b
   *
   * 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.
+  * result, the result is rounded to that number of digits, according to
+  * BigDecimal.mode.
   */
 static VALUE
 BigDecimal_mult(VALUE self, VALUE r)
@@ -1328,8 +1252,8 @@ BigDecimal_divide(Real **c, Real **res, Real **div, VALUE self, VALUE r)
   *   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.
+  * 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.
@@ -1508,10 +1432,7 @@ BigDecimal_divremain(VALUE self, VALUE r, Real **dv, Real **rv)
     return Qnil;
 }
 
-/* call-seq:
- * remainder(value)
- *
- * Returns the remainder from dividing by the value.
+/* Returns the remainder from dividing by the value.
  *
  * x.remainder(y) means x-y*(x/y).truncate
  */
@@ -1525,24 +1446,21 @@ BigDecimal_remainder(VALUE self, VALUE r) /* remainder */
     return ToValue(rv);
 }
 
-/* call-seq:
- * divmod(value)
- *
- * Divides by the specified value, and returns the quotient and modulus
+/* Divides by the specified value, and returns the quotient and modulus
  * as BigDecimal numbers. The quotient is rounded towards negative infinity.
  *
  * For example:
  *
- *   require 'bigdecimal'
+ * require 'bigdecimal'
  *
- *   a = BigDecimal.new("42")
- *   b = BigDecimal.new("9")
+ * a = BigDecimal.new("42")
+ * b = BigDecimal.new("9")
  *
- *   q, m = a.divmod(b)
+ * q,m = a.divmod(b)
  *
- *   c = q * b + m
+ * c = q * b + m
  *
- *   a == c  #=> true
+ * a == c  -> true
  *
  * The quotient q is (a/b).floor, and the modulus is the amount that must be
  * added to q * b to get a.
@@ -1589,7 +1507,7 @@ BigDecimal_div2(VALUE self, VALUE b, VALUE n)
         size_t mx = ix + VpBaseFig()*2;
         size_t pl = VpSetPrecLimit(0);
 
-        GUARD_OBJ(cv, VpCreateRbObject(mx + VpBaseFig(), "0"));
+        GUARD_OBJ(cv, VpCreateRbObject(mx, "0"));
         GUARD_OBJ(av, GetVpValue(self, 1));
         GUARD_OBJ(bv, GetVpValue(b, 1));
         mx = av->Prec + bv->Prec + 2;
@@ -1629,7 +1547,7 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
     }
 }
 
-/* call-seq:
+/*
  * sub(value, digits)  -> bigdecimal
  *
  * Subtract the specified value.
@@ -1638,8 +1556,8 @@ BigDecimal_add2(VALUE self, VALUE b, VALUE n)
  *   c = a.sub(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.
+ * result, the result is rounded to that number of digits, according to
+ * BigDecimal.mode.
  *
  */
 static VALUE
@@ -1677,16 +1595,12 @@ BigDecimal_mult2(VALUE self, VALUE b, VALUE n)
     }
 }
 
-/*
- *  call-seq:
- *     big_decimal.abs  ->  big_decimal
+/* Returns the absolute value.
  *
- *  Returns the absolute value, as a BigDecimal.
+ * BigDecimal('5').abs -> 5
  *
- *     BigDecimal('5').abs  #=> 0.5e1
- *     BigDecimal('-3').abs #=> 0.3e1
+ * BigDecimal('-3').abs -> 3
  */
-
 static VALUE
 BigDecimal_abs(VALUE self)
 {
@@ -1726,7 +1640,7 @@ BigDecimal_sqrt(VALUE self, VALUE nFig)
     return ToValue(c);
 }
 
-/* Return the integer part of the number, as a BigDecimal.
+/* Return the integer part of the number.
  */
 static VALUE
 BigDecimal_fix(VALUE self)
@@ -1745,12 +1659,10 @@ BigDecimal_fix(VALUE self)
 /* call-seq:
  * round(n, mode)
  *
- * Round to the nearest integer (by default), returning the result as a
- * BigDecimal.
+ * Round to the nearest 1 (by default), returning the result as a BigDecimal.
  *
  *	BigDecimal('3.14159').round #=> 3
  *	BigDecimal('8.7').round #=> 9
- *	BigDecimal('-9.9').round #=> -10
  *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
@@ -1781,21 +1693,13 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
 	iLoc = 0;
 	break;
       case 1:
-        if (RB_TYPE_P(vLoc, T_HASH)) {
-	    sw = check_rounding_mode_option(vLoc);
-	}
-	else {
-	    iLoc = NUM2INT(vLoc);
-	}
+	Check_Type(vLoc, T_FIXNUM);
+	iLoc = FIX2INT(vLoc);
 	break;
       case 2:
-	iLoc = NUM2INT(vLoc);
-	if (RB_TYPE_P(vRound, T_HASH)) {
-	    sw = check_rounding_mode_option(vRound);
-	}
-	else {
-	    sw = check_rounding_mode(vRound);
-	}
+	Check_Type(vLoc, T_FIXNUM);
+	iLoc = FIX2INT(vLoc);
+	sw = check_rounding_mode(vRound);
 	break;
       default:
 	break;
@@ -1816,12 +1720,10 @@ BigDecimal_round(int argc, VALUE *argv, VALUE self)
 /* call-seq:
  * truncate(n)
  *
- * Truncate to the nearest integer (by default), returning the result as a
- * BigDecimal.
+ * Truncate to the nearest 1, returning the result as a BigDecimal.
  *
  *	BigDecimal('3.14159').truncate #=> 3
  *	BigDecimal('8.7').truncate #=> 8
- *	BigDecimal('-9.9').truncate #=> -9
  *
  * If n is specified and positive, the fractional part of the result has no
  * more than that many digits.
@@ -1845,7 +1747,8 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
 	iLoc = 0;
     }
     else {
-	iLoc = NUM2INT(vLoc);
+	Check_Type(vLoc, T_FIXNUM);
+	iLoc = FIX2INT(vLoc);
     }
 
     GUARD_OBJ(a, GetVpValue(self, 1));
@@ -1859,7 +1762,7 @@ BigDecimal_truncate(int argc, VALUE *argv, VALUE self)
     return ToValue(c);
 }
 
-/* Return the fractional part of the number, as a BigDecimal.
+/* Return the fractional part of the number.
  */
 static VALUE
 BigDecimal_frac(VALUE self)
@@ -1905,7 +1808,8 @@ BigDecimal_floor(int argc, VALUE *argv, VALUE self)
 	iLoc = 0;
     }
     else {
-	iLoc = NUM2INT(vLoc);
+	Check_Type(vLoc, T_FIXNUM);
+	iLoc = FIX2INT(vLoc);
     }
 
     GUARD_OBJ(a, GetVpValue(self, 1));
@@ -1951,7 +1855,8 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
     if (rb_scan_args(argc, argv, "01", &vLoc) == 0) {
 	iLoc = 0;
     } else {
-	iLoc = NUM2INT(vLoc);
+	Check_Type(vLoc, T_FIXNUM);
+	iLoc = FIX2INT(vLoc);
     }
 
     GUARD_OBJ(a, GetVpValue(self, 1));
@@ -1989,14 +1894,14 @@ BigDecimal_ceil(int argc, VALUE *argv, VALUE self)
  *
  * Examples:
  *
- *   BigDecimal.new('-123.45678901234567890').to_s('5F')
- *     #=> '-123.45678 90123 45678 9'
+ *	BigDecimal.new('-123.45678901234567890').to_s('5F')
+ *	    #=> '-123.45678 90123 45678 9'
  *
- *   BigDecimal.new('123.45678901234567890').to_s('+8F')
- *     #=> '+123.45678901 23456789'
+ *	BigDecimal.new('123.45678901234567890').to_s('+8F')
+ *	    #=> '+123.45678901 23456789'
  *
- *   BigDecimal.new('123.45678901234567890').to_s(' F')
- *     #=> ' 123.4567890123456789'
+ *	BigDecimal.new('123.45678901234567890').to_s(' F')
+ *	    #=> ' 123.4567890123456789'
  */
 static VALUE
 BigDecimal_to_s(int argc, VALUE *argv, VALUE self)
@@ -2136,8 +2041,8 @@ BigDecimal_exponent(VALUE self)
 /* Returns debugging information about the value as a string of comma-separated
  * values in angle brackets with a leading #:
  *
- *   BigDecimal.new("1234.5678").inspect
- *     #=> "0.12345678e4"
+ * BigDecimal.new("1234.5678").inspect ->
+ * "#<BigDecimal:b7ea1130,'0.12345678E4',8(12)>"
  *
  * The first part is the address, the second is the value as a string, and
  * the final part ss(mm) is the current number of significant digits and the
@@ -2148,16 +2053,23 @@ BigDecimal_inspect(VALUE self)
 {
     ENTER(5);
     Real *vp;
-    volatile VALUE str;
+    volatile VALUE obj;
     size_t nc;
+    char *psz, *tmp;
 
     GUARD_OBJ(vp, GetVpValue(self, 1));
     nc = VpNumOfChars(vp, "E");
-
-    str = rb_str_new(0, nc);
-    VpToString(vp, RSTRING_PTR(str), 0, 0);
-    rb_str_resize(str, strlen(RSTRING_PTR(str)));
-    return str;
+    nc += (nc + 9) / 10;
+
+    obj = rb_str_new(0, nc+256);
+    psz = RSTRING_PTR(obj);
+    sprintf(psz, "#<BigDecimal:%"PRIxVALUE",'", self);
+    tmp = psz + strlen(psz);
+    VpToString(vp, tmp, 10, 0);
+    tmp += strlen(tmp);
+    sprintf(tmp, "',%"PRIuSIZE"(%"PRIuSIZE")>", VpPrec(vp)*VpBaseFig(), VpMaxPrec(vp)*VpBaseFig());
+    rb_str_resize(obj, strlen(psz));
+    return obj;
 }
 
 static VALUE BigMath_s_exp(VALUE, VALUE, VALUE);
@@ -2284,7 +2196,7 @@ rmpd_power_by_big_decimal(Real const* x, Real const* exp, ssize_t const n)
  *
  * Note that n must be an Integer.
  *
- * Also available as the operator **.
+ * Also available as the operator **
  */
 static VALUE
 BigDecimal_power(int argc, VALUE*argv, VALUE self)
@@ -2367,7 +2279,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	if (is_negative(vexp)) {
 	    y = VpCreateRbObject(n, "#0");
 	    RB_GC_GUARD(y->obj);
-	    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	    if (VpGetSign(x) < 0) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-0) ** (-even_integer)  -> Infinity */
@@ -2406,7 +2318,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 
     if (VpIsInf(x)) {
 	if (is_negative(vexp)) {
-	    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	    if (VpGetSign(x) < 0) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			/* (-Infinity) ** (-even_integer) -> +0 */
@@ -2428,7 +2340,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 	}
 	else {
 	    y = VpCreateRbObject(n, "0#");
-	    if (BIGDECIMAL_NEGATIVE_P(x)) {
+	    if (VpGetSign(x) < 0) {
 		if (is_integer(vexp)) {
 		    if (is_even(vexp)) {
 			VpSetPosInf(y);
@@ -2469,7 +2381,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		}
 		return ToValue(y);
 	    }
-	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
+	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2487,7 +2399,7 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 		}
 		return ToValue(y);
 	    }
-	    else if (BIGDECIMAL_NEGATIVE_P(x) && is_even(vexp)) {
+	    else if (VpGetSign(x) < 0 && is_even(vexp)) {
 		return ToValue(VpCreateRbObject(n, "-0"));
 	    }
 	    else {
@@ -2516,11 +2428,9 @@ BigDecimal_power(int argc, VALUE*argv, VALUE self)
 }
 
 /* call-seq:
- *   a ** n  -> bigdecimal
+ *   big_decimal ** exp  -> big_decimal
  *
- * Returns the value raised to the power of n.
- *
- * See BigDecimal#power.
+ * It is a synonym of BigDecimal#power(exp).
  */
 static VALUE
 BigDecimal_power_op(VALUE self, VALUE exp)
@@ -2547,7 +2457,7 @@ static Real *BigDecimal_new(int argc, VALUE *argv);
  *           If it is a String, spaces are ignored and unrecognized characters
  *           terminate the value.
  *
- * digits:: The number of significant digits, as an Integer. If omitted or 0,
+ * digits:: The number of significant digits, as a Fixnum. If omitted or 0,
  *          the number of significant digits is determined from the initial
  *          value.
  *
@@ -2556,10 +2466,10 @@ static Real *BigDecimal_new(int argc, VALUE *argv);
  *
  * ==== Exceptions
  *
- * TypeError:: If the +initial+ type is neither Integer, Float,
+ * TypeError:: If the +initial+ type is neither Fixnum, Bignum, Float,
  *             Rational, nor BigDecimal, this exception is raised.
  *
- * TypeError:: If the +digits+ is not an Integer, this exception is raised.
+ * TypeError:: If the +digits+ is not a Fixnum, this exception is raised.
  *
  * ArgumentError:: If +initial+ is a Float, and the +digits+ is larger than
  *                 Float::DIG + 1, this exception is raised.
@@ -2589,7 +2499,7 @@ BigDecimal_initialize(int argc, VALUE *argv, VALUE self)
 
 /* :nodoc:
  *
- * private method for dup and clone the provided BigDecimal +other+
+ * private method to dup and clone the provided BigDecimal +other+
  */
 static VALUE
 BigDecimal_initialize_copy(VALUE self, VALUE other)
@@ -2609,7 +2519,6 @@ BigDecimal_new(int argc, VALUE *argv)
     size_t mf;
     VALUE  nFig;
     VALUE  iniValue;
-    double d;
 
     if (rb_scan_args(argc, argv, "11", &iniValue, &nFig) == 1) {
         mf = 0;
@@ -2631,12 +2540,6 @@ BigDecimal_new(int argc, VALUE *argv)
 	return GetVpValue(iniValue, 1);
 
       case T_FLOAT:
-        d = RFLOAT_VALUE(iniValue);
-        if (!isfinite(d)) {
-            Real *pv = VpCreateRbObject(1, NULL);
-            VpDtoV(pv, d);
-            return pv;
-        }
 	if (mf > DBL_DIG+1) {
 	    rb_raise(rb_eArgError, "precision too large.");
 	}
@@ -2664,13 +2567,11 @@ BigDecimal_global_new(int argc, VALUE *argv, VALUE self)
 {
     ENTER(1);
     Real *pv;
-    VALUE obj;
 
-    obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, 0);
     GUARD_OBJ(pv, BigDecimal_new(argc, argv));
     if (ToValue(pv)) pv = VpCopy(NULL, pv);
-    RTYPEDDATA_DATA(obj) = pv;
-    return pv->obj = obj;
+    pv->obj = TypedData_Wrap_Struct(rb_cBigDecimal, &BigDecimal_data_type, pv);
+    return pv->obj;
 }
 
  /* call-seq:
@@ -2694,7 +2595,8 @@ BigDecimal_limit(int argc, VALUE *argv, VALUE self)
     if (rb_scan_args(argc, argv, "01", &nFig) == 1) {
 	int nf;
 	if (NIL_P(nFig)) return nCur;
-	nf = NUM2INT(nFig);
+	Check_Type(nFig, T_FIXNUM);
+	nf = FIX2INT(nFig);
 	if (nf < 0) {
 	    rb_raise(rb_eArgError, "argument must be positive");
 	}
@@ -2831,13 +2733,13 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
 	rb_raise(rb_eArgError, "Zero or negative precision for exp");
     }
 
-    /* TODO: the following switch statement is almost same as one in the
+    /* TODO: the following switch statement is almostly the same as one in the
      *       BigDecimalCmp function. */
     switch (TYPE(x)) {
       case T_DATA:
 	if (!is_kind_of_BigDecimal(x)) break;
 	vx = DATA_PTR(x);
-	negative = BIGDECIMAL_NEGATIVE_P(vx);
+	negative = VpGetSign(vx) < 0;
 	infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	nan = VpIsNaN(vx);
 	break;
@@ -2890,7 +2792,7 @@ BigMath_s_exp(VALUE klass, VALUE x, VALUE vprec)
     x = vx->obj;
 
     n = prec + rmpd_double_figures();
-    negative = BIGDECIMAL_NEGATIVE_P(vx);
+    negative = VpGetSign(vx) < 0;
     if (negative) {
 	VpSetSign(vx, 1);
     }
@@ -2969,14 +2871,14 @@ BigMath_s_log(VALUE klass, VALUE x, VALUE vprec)
 	rb_raise(rb_eArgError, "Zero or negative precision for exp");
     }
 
-    /* TODO: the following switch statement is almost same as one in the
+    /* TODO: the following switch statement is almostly the same as one in the
      *       BigDecimalCmp function. */
     switch (TYPE(x)) {
       case T_DATA:
 	  if (!is_kind_of_BigDecimal(x)) break;
 	  vx = DATA_PTR(x);
 	  zero = VpIsZero(vx);
-	  negative = BIGDECIMAL_NEGATIVE_P(vx);
+	  negative = VpGetSign(vx) < 0;
 	  infinite = VpIsPosInf(vx) || VpIsNegInf(vx);
 	  nan = VpIsNaN(vx);
 	  break;
@@ -3197,8 +3099,9 @@ get_vp_value:
  *
  * Copyright (C) 2002 by Shigeo Kobayashi <shigeo@tinyforest.gr.jp>.
  *
- * BigDecimal is released under the Ruby and 2-clause BSD licenses.
- * See LICENSE.txt for details.
+ * 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.
  *
  * Maintained by mrkn <mrkn@mrkn.jp> and ruby-core members.
  *
@@ -3279,7 +3182,7 @@ Init_bigdecimal(void)
     rb_define_const(rb_cBigDecimal, "EXCEPTION_OVERFLOW", INT2FIX(VP_EXCEPTION_OVERFLOW));
 
     /*
-     * 0x10: Determines what happens when a division by zero is performed.
+     * 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));
@@ -3421,7 +3324,6 @@ Init_bigdecimal(void)
     id_floor = rb_intern_const("floor");
     id_to_r = rb_intern_const("to_r");
     id_eq = rb_intern_const("==");
-    id_half = rb_intern_const("half");
 }
 
 /*
@@ -3449,14 +3351,7 @@ static Real *VpPt5;        /* constant 0.5 */
 #define MemCmp(x,y,z) memcmp(x,y,z)
 #define StrCmp(x,y)   strcmp(x,y)
 
-enum op_sw {
-    OP_SW_ADD = 1,  /* + */
-    OP_SW_SUB,      /* - */
-    OP_SW_MULT,     /* * */
-    OP_SW_DIV       /* / */
-};
-
-static int VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw);
+static int VpIsDefOP(Real *c,Real *a,Real *b,int sw);
 static int AddExponent(Real *a, SIGNED_VALUE n);
 static BDIGIT VpAddAbs(Real *a,Real *b,Real *c);
 static BDIGIT VpSubAbs(Real *a,Real *b,Real *c);
@@ -3483,7 +3378,7 @@ VpMemAlloc(size_t mb)
     return p;
 }
 
-VP_EXPORT void *
+    VP_EXPORT void *
 VpMemRealloc(void *ptr, size_t mb)
 {
     void *p = xrealloc(ptr, mb);
@@ -3501,12 +3396,12 @@ VpFree(Real *pv)
 #ifdef BIGDECIMAL_DEBUG
 	gnAlloc--; /* Decrement allocation count */
 	if (gnAlloc == 0) {
-	    printf(" *************** All memories allocated freed ****************\n");
-	    /*getchar();*/
+	    printf(" *************** All memories allocated freed ****************");
+	    getchar();
 	}
 	if (gnAlloc <  0) {
 	    printf(" ??????????? Too many memory free calls(%d) ?????????????\n", gnAlloc);
-	    /*getchar();*/
+	    getchar();
 	}
 #endif /* BIGDECIMAL_DEBUG */
     }
@@ -3536,7 +3431,7 @@ VpGetException (void)
 	return RMPD_EXCEPTION_MODE_DEFAULT;
     }
 
-    return NUM2USHORT(vmode);
+    return (unsigned short)FIX2UINT(vmode);
 }
 
 static void
@@ -3606,7 +3501,7 @@ VpGetRoundMode(void)
 	return RMPD_ROUNDING_MODE_DEFAULT;
     }
 
-    return NUM2USHORT(vmode);
+    return (unsigned short)FIX2INT(vmode);
 }
 
 VP_EXPORT int
@@ -3743,7 +3638,7 @@ VpException(unsigned short f, const char *str,int always)
 /* Throw exception or returns 0,when resulting c is Inf or NaN */
 /*  sw=1:+ 2:- 3:* 4:/ */
 static int
-VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
+VpIsDefOP(Real *c,Real *a,Real *b,int sw)
 {
     if (VpIsNaN(a) || VpIsNaN(b)) {
 	/* at least a or b is NaN */
@@ -3754,7 +3649,7 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
     if (VpIsInf(a)) {
 	if (VpIsInf(b)) {
 	    switch(sw) {
-	      case OP_SW_ADD: /* + */
+	      case 1: /* + */
 		if (VpGetSign(a) == VpGetSign(b)) {
 		    VpSetInf(c, VpGetSign(a));
 		    goto Inf;
@@ -3763,7 +3658,7 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 		    VpSetNaN(c);
 		    goto NaN;
 		}
-	      case OP_SW_SUB: /* - */
+	      case 2: /* - */
 		if (VpGetSign(a) != VpGetSign(b)) {
 		    VpSetInf(c, VpGetSign(a));
 		    goto Inf;
@@ -3772,10 +3667,12 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 		    VpSetNaN(c);
 		    goto NaN;
 		}
-	      case OP_SW_MULT: /* * */
+		break;
+	      case 3: /* * */
 		VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 		goto Inf;
-	      case OP_SW_DIV: /* / */
+		break;
+	      case 4: /* / */
 		VpSetNaN(c);
 		goto NaN;
 	    }
@@ -3784,18 +3681,18 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 	}
 	/* Inf op Finite */
 	switch(sw) {
-	  case OP_SW_ADD: /* + */
-	  case OP_SW_SUB: /* - */
+	  case 1: /* + */
+	  case 2: /* - */
 	    VpSetInf(c, VpGetSign(a));
 	    break;
-	  case OP_SW_MULT: /* * */
+	  case 3: /* * */
 	    if (VpIsZero(b)) {
 		VpSetNaN(c);
 		goto NaN;
 	    }
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	    break;
-	  case OP_SW_DIV: /* / */
+	  case 4: /* / */
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	}
 	goto Inf;
@@ -3803,20 +3700,20 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
 
     if (VpIsInf(b)) {
 	switch(sw) {
-	  case OP_SW_ADD: /* + */
+	  case 1: /* + */
 	    VpSetInf(c, VpGetSign(b));
 	    break;
-	  case OP_SW_SUB: /* - */
+	  case 2: /* - */
 	    VpSetInf(c, -VpGetSign(b));
 	    break;
-	  case OP_SW_MULT: /* * */
+	  case 3: /* * */
 	    if (VpIsZero(a)) {
 		VpSetNaN(c);
 		goto NaN;
 	    }
 	    VpSetInf(c, VpGetSign(a)*VpGetSign(b));
 	    break;
-	  case OP_SW_DIV: /* / */
+	  case 4: /* / */
 	    VpSetZero(c, VpGetSign(a)*VpGetSign(b));
 	}
 	goto Inf;
@@ -3824,13 +3721,7 @@ VpIsDefOP(Real *c, Real *a, Real *b, enum op_sw sw)
     return 1; /* Results OK */
 
 Inf:
-    if (VpIsPosInf(c)) {
-	return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
-    }
-    else {
-	return VpException(VP_EXCEPTION_INFINITY, "Computation results to '-Infinity'", 0);
-    }
-
+    return VpException(VP_EXCEPTION_INFINITY, "Computation results to 'Infinity'", 0);
 NaN:
     return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
 }
@@ -3905,12 +3796,12 @@ VpInit(BDIGIT BaseVal)
 
 #ifdef BIGDECIMAL_DEBUG
     if (gfDebug) {
-	printf("VpInit: BaseVal   = %"PRIuBDIGIT"\n", BaseVal);
-	printf("\tBASE      = %"PRIuBDIGIT"\n", BASE);
-	printf("\tHALF_BASE = %"PRIuBDIGIT"\n", HALF_BASE);
-	printf("\tBASE1     = %"PRIuBDIGIT"\n", BASE1);
-	printf("\tBASE_FIG  = %u\n", BASE_FIG);
-	printf("\tDBLE_FIG  = %d\n", DBLE_FIG);
+	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  = %u\n", BASE_FIG);
+	printf("  DBLE_FIG  = %d\n", DBLE_FIG);
     }
 #endif /* BIGDECIMAL_DEBUG */
 
@@ -3937,7 +3828,7 @@ AddExponent(Real *a, SIGNED_VALUE n)
                 goto overflow;
 	    mb = m*(SIGNED_VALUE)BASE_FIG;
 	    eb = e*(SIGNED_VALUE)BASE_FIG;
-	    if (eb - mb > 0) goto overflow;
+	    if (mb < eb) goto overflow;
 	}
     }
     else if (n < 0) {
@@ -3946,7 +3837,7 @@ AddExponent(Real *a, SIGNED_VALUE n)
             goto underflow;
 	mb = m*(SIGNED_VALUE)BASE_FIG;
 	eb = e*(SIGNED_VALUE)BASE_FIG;
-	if (mb - eb > 0) goto underflow;
+	if (mb > eb) goto underflow;
     }
     a->exponent = m;
     return 1;
@@ -3977,8 +3868,7 @@ overflow:
 VP_EXPORT Real *
 VpAlloc(size_t mx, const char *szVal)
 {
-    const char *orig_szVal = szVal;
-    size_t i, ni, ipn, ipf, nf, ipe, ne, dot_seen, exp_seen, nalloc;
+    size_t i, ni, ipn, ipf, nf, ipe, ne, nalloc;
     char v, *psz;
     int  sign=1;
     Real *vp = NULL;
@@ -3989,28 +3879,28 @@ VpAlloc(size_t mx, const char *szVal)
     if (mx == 0) ++mx;
 
     if (szVal) {
-        while (ISSPACE(*szVal)) szVal++;
-        if (*szVal != '#') {
-            if (mf) {
-                mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
-                if (mx > mf) {
-                    mx = mf;
-                }
-            }
-        }
-        else {
-            ++szVal;
-        }
+	while (ISSPACE(*szVal)) szVal++;
+	if (*szVal != '#') {
+	    if (mf) {
+		mf = (mf + BASE_FIG - 1) / BASE_FIG + 2; /* Needs 1 more for div */
+		if (mx > mf) {
+		    mx = mf;
+		}
+	    }
+	}
+	else {
+	    ++szVal;
+	}
     }
     else {
-        /* necessary to be able to store */
-        /* at least mx digits. */
-        /* szVal==NULL ==> allocate zero value. */
-        vp = VpAllocReal(mx);
-        /* xmalloc() alway returns(or throw interruption) */
-        vp->MaxPrec = mx;    /* set max precision */
-        VpSetZero(vp, 1);    /* initialize vp to zero. */
-        return vp;
+	/* necessary to be able to store */
+	/* at least mx digits. */
+	/* szVal==NULL ==> allocate zero value. */
+	vp = VpAllocReal(mx);
+	/* xmalloc() alway returns(or throw interruption) */
+	vp->MaxPrec = mx;    /* set max precision */
+	VpSetZero(vp, 1);    /* initialize vp to zero. */
+	return vp;
     }
 
     /* Skip all '_' after digit: 2006-6-30 */
@@ -4020,42 +3910,43 @@ VpAlloc(size_t mx, const char *szVal)
     i   = 0;
     ipn = 0;
     while ((psz[i] = szVal[ipn]) != 0) {
-        if (ISSPACE(psz[i])) {
-            psz[i] = 0;
-            break;
-        }
-        if (ISDIGIT(psz[i])) ++ni;
-        if (psz[i] == '_') {
-            if (ni > 0) {
-                ipn++;
-                continue;
-            }
-            psz[i] = 0;
-            break;
-        }
-        ++i;
-        ++ipn;
+	if (ISDIGIT(psz[i])) ++ni;
+	if (psz[i] == '_') {
+	    if (ni > 0) {
+		ipn++;
+		continue;
+	    }
+	    psz[i] = 0;
+	    break;
+	}
+	++i;
+	++ipn;
+    }
+    /* Skip trailing spaces */
+    while (--i > 0) {
+	if (ISSPACE(psz[i])) psz[i] = 0;
+	else break;
     }
     szVal = psz;
 
     /* Check on Inf & NaN */
     if (StrCmp(szVal, SZ_PINF) == 0 || StrCmp(szVal, SZ_INF) == 0 ) {
-        vp = VpAllocReal(1);
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetPosInf(vp);
-        return vp;
+	vp = VpAllocReal(1);
+	vp->MaxPrec = 1;    /* set max precision */
+	VpSetPosInf(vp);
+	return vp;
     }
     if (StrCmp(szVal, SZ_NINF) == 0) {
-        vp = VpAllocReal(1);
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetNegInf(vp);
-        return vp;
+	vp = VpAllocReal(1);
+	vp->MaxPrec = 1;    /* set max precision */
+	VpSetNegInf(vp);
+	return vp;
     }
     if (StrCmp(szVal, SZ_NaN) == 0) {
-        vp = VpAllocReal(1);
-        vp->MaxPrec = 1;    /* set max precision */
-        VpSetNaN(vp);
-        return vp;
+	vp = VpAllocReal(1);
+	vp->MaxPrec = 1;    /* set max precision */
+	VpSetNaN(vp);
+	return vp;
     }
 
     /* check on number szVal[] */
@@ -4065,55 +3956,46 @@ VpAlloc(size_t mx, const char *szVal)
     /* Skip digits */
     ni = 0;            /* digits in mantissa */
     while ((v = szVal[i]) != 0) {
-        if (!ISDIGIT(v)) break;
-        ++i;
-        ++ni;
+	if (!ISDIGIT(v)) break;
+	++i;
+	++ni;
     }
     nf  = 0;
     ipf = 0;
     ipe = 0;
     ne  = 0;
-    dot_seen = 0;
-    exp_seen = 0;
     if (v) {
-        /* other than digit nor \0 */
-        if (szVal[i] == '.') {    /* xxx. */
-            dot_seen = 1;
-            ++i;
-            ipf = i;
-            while ((v = szVal[i]) != 0) {    /* get fraction part. */
-                if (!ISDIGIT(v)) break;
-                ++i;
-                ++nf;
-            }
-        }
-        ipe = 0;        /* Exponent */
-
-        switch (szVal[i]) {
-            case '\0':
-                break;
-            case 'e': case 'E':
-            case 'd': case 'D':
-                exp_seen = 1;
-                ++i;
-                ipe = i;
-                v = szVal[i];
-                if ((v == '-') || (v == '+')) ++i;
-                while ((v=szVal[i]) != 0) {
-                    if (!ISDIGIT(v)) break;
-                    ++i;
-                    ++ne;
-                }
-                break;
-            default:
-                break;
-        }
-    }
-    if (((ni == 0 || dot_seen) && nf == 0) || (exp_seen && ne == 0)) {
-	VALUE str = rb_str_new2(orig_szVal);
-	rb_raise(rb_eArgError, "invalid value for BigDecimal(): \"%"PRIsVALUE"\"", str);
-    }
+	/* other than digit nor \0 */
+	if (szVal[i] == '.') {    /* xxx. */
+	    ++i;
+	    ipf = i;
+	    while ((v = szVal[i]) != 0) {    /* get fraction part. */
+		if (!ISDIGIT(v)) break;
+		++i;
+		++nf;
+	    }
+	}
+	ipe = 0;        /* Exponent */
 
+	switch (szVal[i]) {
+	  case '\0':
+	    break;
+	  case 'e': case 'E':
+	  case 'd': case 'D':
+	    ++i;
+	    ipe = i;
+	    v = szVal[i];
+	    if ((v == '-') || (v == '+')) ++i;
+	    while ((v=szVal[i]) != 0) {
+		if (!ISDIGIT(v)) break;
+		++i;
+		++ne;
+	    }
+	    break;
+	  default:
+	    break;
+	}
+    }
     nalloc = (ni + nf + BASE_FIG - 1) / BASE_FIG + 1;    /* set effective allocation  */
     /* units for szVal[]  */
     if (mx == 0) mx = 1;
@@ -4181,7 +4063,7 @@ VpAsgn(Real *c, Real *a, int isw)
 
 /*
  *   c = a + b  when operation =  1 or 2
- *   c = a - b  when operation = -1 or -2.
+ *  = a - b  when operation = -1 or -2.
  *   Returns number of significant digits of c
  */
 VP_EXPORT size_t
@@ -4200,7 +4082,7 @@ VpAddSub(Real *c, Real *a, Real *b, int operation)
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if (!VpIsDefOP(c, a, b, (operation > 0) ? OP_SW_ADD : OP_SW_SUB)) return 0; /* No significant digits */
+    if (!VpIsDefOP(c, a, b, (operation > 0) ? 1 : 2)) return 0; /* No significant digits */
 
     /* check if a or b is zero  */
     if (VpIsZero(a)) {
@@ -4314,7 +4196,7 @@ end_if:
 }
 
 /*
- * Addition of two values with variable precision
+ * Addition of two variable precisional variables
  * a and b assuming abs(a)>abs(b).
  *   c = abs(a) + abs(b) ; where |a|>=|b|
  */
@@ -4536,7 +4418,7 @@ VpSetPTR(Real *a, Real *b, Real *c, size_t *a_pos, size_t *b_pos, size_t *c_pos,
 
     size_t const round_limit = (VpGetPrecLimit() + BASE_FIG - 1) / BASE_FIG;
 
-    assert(a->exponent >= b->exponent);
+    assert(a->exponent >= b->expoennt);
 
     c->frac[0] = 0;
     *av = *bv = 0;
@@ -4656,7 +4538,7 @@ VpMult(Real *c, Real *a, Real *b)
     }
 #endif /* BIGDECIMAL_DEBUG */
 
-    if (!VpIsDefOP(c, a, b, OP_SW_MULT)) return 0; /* No significant digit */
+    if (!VpIsDefOP(c, a, b, 3)) return 0; /* No significant digit */
 
     if (VpIsZero(a) || VpIsZero(b)) {
 	/* at least a or b is zero */
@@ -4768,7 +4650,7 @@ Exit:
 /*
  *   c = a / b,  remainder = r
  */
-VP_EXPORT size_t
+    VP_EXPORT size_t
 VpDivd(Real *c, Real *r, Real *a, Real *b)
 {
     size_t word_a, word_b, word_c, word_r;
@@ -4786,14 +4668,14 @@ VpDivd(Real *c, Real *r, Real *a, Real *b)
 #endif /*BIGDECIMAL_DEBUG */
 
     VpSetNaN(r);
-    if (!VpIsDefOP(c, a, b, OP_SW_DIV)) goto Exit;
+    if (!VpIsDefOP(c, a, b, 4)) goto Exit;
     if (VpIsZero(a) && VpIsZero(b)) {
 	VpSetNaN(c);
-	return VpException(VP_EXCEPTION_NaN, "Computation results to 'NaN'", 0);
+	return VpException(VP_EXCEPTION_NaN, "(VpDivd) 0/0 not defined(NaN)", 0);
     }
     if (VpIsZero(b)) {
 	VpSetInf(c, VpGetSign(a) * VpGetSign(b));
-	return VpException(VP_EXCEPTION_ZERODIVIDE, "Divide by zero", 0);
+	return VpException(VP_EXCEPTION_ZERODIVIDE, "(VpDivd) Divide by zero", 0);
     }
     if (VpIsZero(a)) {
 	/* numerator a is zero  */
@@ -4960,11 +4842,11 @@ out_side:
 space_error:
 #ifdef BIGDECIMAL_DEBUG
     if (gfDebug) {
-	printf("   word_a=%"PRIuSIZE"\n", word_a);
-	printf("   word_b=%"PRIuSIZE"\n", word_b);
-	printf("   word_c=%"PRIuSIZE"\n", word_c);
-	printf("   word_r=%"PRIuSIZE"\n", word_r);
-	printf("   ind_r =%"PRIuSIZE"\n", ind_r);
+	printf("   word_a=%lu\n", word_a);
+	printf("   word_b=%lu\n", word_b);
+	printf("   word_c=%lu\n", word_c);
+	printf("   word_r=%lu\n", word_r);
+	printf("   ind_r =%lu\n", ind_r);
     }
 #endif /* BIGDECIMAL_DEBUG */
     rb_bug("ERROR(VpDivd): space for remainder too small.");
@@ -5073,7 +4955,7 @@ VpComp(Real *a, Real *b)
 	goto Exit;
     }
 
-    /* a and b have same exponent, then compare their significand. */
+    /* a and b have same exponent, then compare significand. */
     mx = (a->Prec < b->Prec) ? a->Prec : b->Prec;
     ind = 0;
     while (ind < mx) {
@@ -5114,8 +4996,8 @@ Exit:
  *      %  ... VP variable. To print '%', use '%%'.
  *      \n ... new line
  *      \b ... backspace
- *      \t ... tab
- *     Note: % must not appear more than once
+ *           ... tab
+ *     Note: % must must not appear more than once
  *    a  ... VP variable to be printed
  */
 #ifdef BIGDECIMAL_ENABLE_VPRINT
@@ -5125,6 +5007,24 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
     size_t i, j, nc, nd, ZeroSup, sep = 10;
     BDIGIT m, e, nn;
 
+    /* Check if NaN & Inf. */
+    if (VpIsNaN(a)) {
+	fprintf(fp, SZ_NaN);
+	return 8;
+    }
+    if (VpIsPosInf(a)) {
+	fprintf(fp, SZ_INF);
+	return 8;
+    }
+    if (VpIsNegInf(a)) {
+	fprintf(fp, SZ_NINF);
+	return 9;
+    }
+    if (VpIsZero(a)) {
+	fprintf(fp, "0.0");
+	return 3;
+    }
+
     j = 0;
     nd = nc = 0;        /*  nd : number of digits in fraction part(every 10 digits, */
     /*    nd<=10). */
@@ -5133,20 +5033,8 @@ VPrint(FILE *fp, const char *cntl_chr, Real *a)
     while (*(cntl_chr + j)) {
 	if (*(cntl_chr + j) == '%' && *(cntl_chr + j + 1) != '%') {
 	    nc = 0;
-	    if (VpIsNaN(a)) {
-		fprintf(fp, SZ_NaN);
-		nc += 8;
-	    }
-	    else if (VpIsPosInf(a)) {
-		fprintf(fp, SZ_INF);
-		nc += 8;
-	    }
-	    else if (VpIsNegInf(a)) {
-		fprintf(fp, SZ_NINF);
-		nc += 9;
-	    }
-	    else if (!VpIsZero(a)) {
-		if (BIGDECIMAL_NEGATIVE_P(a)) {
+	    if (!VpIsZero(a)) {
+		if (VpGetSign(a) < 0) {
 		    fprintf(fp, "-");
 		    ++nc;
 		}
@@ -5235,7 +5123,7 @@ VpFormatSt(char *psz, size_t fFmt)
 	if (!ch) break;
 	if (ISSPACE(ch) || ch=='-' || ch=='+') continue;
 	if (ch == '.') { nf = 0; continue; }
-	if (ch == 'E' || ch == 'e') break;
+	if (ch == 'E') break;
 
 	if (++nf > fFmt) {
 	    memmove(psz + i + 1, psz + i, ie - i + 1);
@@ -5284,7 +5172,7 @@ VpSzMantissa(Real *a,char *psz)
 
     ZeroSup = 1;        /* Flag not to print the leading zeros as 0.00xxxxEnn */
     if (!VpIsZero(a)) {
-	if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+	if (VpGetSign(a) < 0) *psz++ = '-';
 	n = a->Prec;
 	for (i = 0; i < n; ++i) {
 	    m = BASE1;
@@ -5358,7 +5246,7 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     ZeroSup = 1;    /* Flag not to print the leading zeros as 0.00xxxxEnn */
 
-    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+    if (VpGetSign(a) < 0) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
@@ -5389,7 +5277,7 @@ VpToString(Real *a, char *psz, size_t fFmt, int fPlus)
     while (psz[-1] == '0') {
 	*(--psz) = 0;
     }
-    sprintf(psz, "e%"PRIdSIZE, ex);
+    sprintf(psz, "E%"PRIdSIZE, ex);
     if (fFmt) VpFormatSt(pszSav, fFmt);
 }
 
@@ -5404,7 +5292,7 @@ VpToFString(Real *a, char *psz, size_t fFmt, int fPlus)
 
     if (VpToSpecialString(a, psz, fPlus)) return;
 
-    if (BIGDECIMAL_NEGATIVE_P(a)) *psz++ = '-';
+    if (VpGetSign(a) < 0) *psz++ = '-';
     else if (fPlus == 1)  *psz++ = ' ';
     else if (fPlus == 2)  *psz++ = '+';
 
@@ -5826,22 +5714,21 @@ VpSqrt(Real *y, Real *x)
     ssize_t nr;
     double val;
 
-    /* Zero or +Infinity ? */
-    if (VpIsZero(x) || VpIsPosInf(x)) {
-	VpAsgn(y,x,1);
+    /* Zero, NaN or Infinity ? */
+    if (!VpHasVal(x)) {
+	if (VpIsZero(x) || VpGetSign(x) > 0) {
+	    VpAsgn(y,x,1);
+	    goto Exit;
+	}
+	VpSetNaN(y);
+	return VpException(VP_EXCEPTION_OP, "(VpSqrt) SQRT(NaN or negative value)", 0);
 	goto Exit;
     }
 
     /* Negative ? */
-    if (BIGDECIMAL_NEGATIVE_P(x)) {
-	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "sqrt of negative value", 0);
-    }
-
-    /* NaN ? */
-    if (VpIsNaN(x)) {
+    if (VpGetSign(x) < 0) {
 	VpSetNaN(y);
-	return VpException(VP_EXCEPTION_OP, "sqrt of 'NaN'(Not a Number)", 0);
+	return VpException(VP_EXCEPTION_OP, "(VpSqrt) SQRT(negative value)", 0);
     }
 
     /* One ? */
@@ -6032,10 +5919,10 @@ VpMidRound(Real *y, unsigned short f, ssize_t nf)
 	if (v > 5 || (v == 5 && fracf_1further)) ++div;
 	break;
       case VP_ROUND_CEIL:
-	if (fracf && BIGDECIMAL_POSITIVE_P(y)) ++div;
+	if (fracf && (VpGetSign(y) > 0)) ++div;
 	break;
       case VP_ROUND_FLOOR:
-	if (fracf && BIGDECIMAL_NEGATIVE_P(y)) ++div;
+	if (fracf && (VpGetSign(y) < 0)) ++div;
 	break;
       case VP_ROUND_HALF_EVEN: /* Banker's rounding */
 	if (v > 5) ++div;
@@ -6154,10 +6041,10 @@ VpInternalRound(Real *c, size_t ixDigit, BDIGIT vPrev, BDIGIT v)
 	if (v >= 6) f = 1;
 	break;
       case VP_ROUND_CEIL:
-	if (v && BIGDECIMAL_POSITIVE_P(c)) f = 1;
+	if (v && (VpGetSign(c) > 0)) f = 1;
 	break;
       case VP_ROUND_FLOOR:
-	if (v && BIGDECIMAL_NEGATIVE_P(c)) f = 1;
+	if (v && (VpGetSign(c) < 0)) f = 1;
 	break;
       case VP_ROUND_HALF_EVEN:  /* Banker's rounding */
 	/* as per VP_ROUND_HALF_DOWN, because this is the last digit of precision,
@@ -6294,7 +6181,7 @@ VpPower(Real *y, Real *x, SIGNED_VALUE n)
     if (x->exponent == 1 && x->Prec == 1 && x->frac[0] == 1) {
 	/* abs(x) = 1 */
 	VpSetOne(y);
-	if (BIGDECIMAL_POSITIVE_P(x)) goto Exit;
+	if (VpGetSign(x) > 0) goto Exit;
 	if ((n % 2) == 0) goto Exit;
 	VpSetSign(y, -1);
 	goto Exit;
@@ -6339,7 +6226,7 @@ Exit:
     if (gfDebug) {
 	VPrint(stdout, "VpPower y=%\n", y);
 	VPrint(stdout, "VpPower x=%\n", x);
-	printf("  n=%"PRIdVALUE"\n", n);
+	printf("  n=%d\n", n);
     }
 #endif /* BIGDECIMAL_DEBUG */
     VpFree(w2);
@@ -6374,10 +6261,10 @@ VpVarCheck(Real * v)
     for (i = 0; i < v->Prec; ++i) {
 	if (v->frac[i] >= BASE) {
 	    printf("ERROR(VpVarCheck): Illegal fraction\n");
-	    printf("       Frac[%"PRIuSIZE"]=%"PRIuBDIGIT"\n", i, v->frac[i]);
+	    printf("       Frac[%"PRIuSIZE"]=%lu\n", i, v->frac[i]);
 	    printf("       Prec.   =%"PRIuSIZE"\n", v->Prec);
 	    printf("       Exp. =%"PRIdVALUE"\n", v->exponent);
-	    printf("       BASE =%"PRIuBDIGIT"\n", BASE);
+	    printf("       BASE =%lu\n", BASE);
 	    return 3;
 	}
     }
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
index 3767e9b65d..e4f58c1adf 100644
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ b/ext/bigdecimal/bigdecimal.gemspec
@@ -1,25 +1,23 @@
-# coding: utf-8
-_VERSION = '1.3.0'
+# -*- ruby -*-
+_VERSION = "1.2.5"
+date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
-  s.name          = "bigdecimal"
-  s.version       = _VERSION
-  s.authors       = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
-  s.email         = ["mrkn@mrkn.jp"]
-
-  s.summary       = "Arbitrary-precision decimal floating-point number library."
-  s.description   = "This library provides arbitrary-precision decimal floating-point number class."
-  s.homepage      = "https://github.com/ruby/bigdecimal"
-  s.license       = "ruby"
-
-  s.require_paths = %w[lib]
-  s.extensions    = %w[ext/bigdecimal/extconf.rb]
-  s.files         = %w[
+  s.name = "bigdecimal"
+  s.version = _VERSION
+  s.date = date
+  s.summary = "Arbitrary-precision decimal floating-point number library."
+  s.homepage = "http://www.ruby-lang.org"
+  s.email = "mrkn@mrkn.jp"
+  s.description = "This library provides arbitrary-precision decimal floating-point number class."
+  s.authors = ["Kenta Murata", "Zachary Scott", "Shigeo Kobayashi"]
+  s.require_path = %[.]
+  s.files = %w[
     bigdecimal.gemspec
-    ext/bigdecimal/bigdecimal.c
-    ext/bigdecimal/bigdecimal.h
-    ext/bigdecimal/depend
-    ext/bigdecimal/extconf.rb
+    bigdecimal.c
+    bigdecimal.h
+    README
+    depend extconf.rb
     lib/bigdecimal/jacobian.rb
     lib/bigdecimal/ludcmp.rb
     lib/bigdecimal/math.rb
@@ -29,8 +27,5 @@ Gem::Specification.new do |s|
     sample/nlsolve.rb
     sample/pi.rb
   ]
-
-  s.add_development_dependency "rake", "~> 10.0"
-  s.add_development_dependency "rake-compiler", "~> 0.9"
-  s.add_development_dependency "minitest", "~> 4.7.5"
+  s.extensions = %w[extconf.rb]
 end
diff --git a/ext/bigdecimal/bigdecimal.h b/ext/bigdecimal/bigdecimal.h
index fcfeb9c3c3..9d3e0fcd29 100644
--- a/ext/bigdecimal/bigdecimal.h
+++ b/ext/bigdecimal/bigdecimal.h
@@ -4,6 +4,13 @@
  *
  * 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.
+ *
+ * NOTES:
+ *   2003-03-28 V1.0 checked in.
+ *
  */
 
 #ifndef  RUBY_BIG_DECIMAL_H
@@ -36,35 +43,13 @@
 # define BDIGIT_DBL uint64_t
 # define BDIGIT_DBL_SIGNED int64_t
 # define SIZEOF_BDIGITS 4
-# define PRI_BDIGIT_PREFIX ""
-# ifdef PRI_LL_PREFIX
-# define PRI_BDIGIT_DBL_PREFIX PRI_LL_PREFIX
-# else
-# define PRI_BDIGIT_DBL_PREFIX "l"
-# endif
 #else
 # define BDIGIT uint16_t
 # define BDIGIT_DBL uint32_t
 # define BDIGIT_DBL_SIGNED int32_t
 # define SIZEOF_BDIGITS 2
-# define PRI_BDIGIT_PREFIX "h"
-# define PRI_BDIGIT_DBL_PREFIX ""
 #endif
 
-#define PRIdBDIGIT PRI_BDIGIT_PREFIX"d"
-#define PRIiBDIGIT PRI_BDIGIT_PREFIX"i"
-#define PRIoBDIGIT PRI_BDIGIT_PREFIX"o"
-#define PRIuBDIGIT PRI_BDIGIT_PREFIX"u"
-#define PRIxBDIGIT PRI_BDIGIT_PREFIX"x"
-#define PRIXBDIGIT PRI_BDIGIT_PREFIX"X"
-
-#define PRIdBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"d"
-#define PRIiBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"i"
-#define PRIoBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"o"
-#define PRIuBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"u"
-#define PRIxBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"x"
-#define PRIXBDIGIT_DBL PRI_BDIGIT_DBL_PREFIX"X"
-
 #if defined(__cplusplus)
 extern "C" {
 #if 0
@@ -90,56 +75,6 @@ llabs(LONG_LONG const x)
 }
 #endif
 
-#ifndef HAVE_FINITE
-static int
-finite(double)
-{
-    return !isnan(n) && !isinf(n);
-}
-#endif
-
-#ifndef isfinite
-# ifndef HAVE_ISFINITE
-#  define HAVE_ISFINITE 1
-#  define isfinite(x) finite(x)
-# endif
-#endif
-
-#ifndef FIX_CONST_VALUE_PTR
-# if defined(__fcc__) || defined(__fcc_version) || \
-    defined(__FCC__) || defined(__FCC_VERSION)
-/* workaround for old version of Fujitsu C Compiler (fcc) */
-#  define FIX_CONST_VALUE_PTR(x) ((const VALUE *)(x))
-# else
-#  define FIX_CONST_VALUE_PTR(x) (x)
-# endif
-#endif
-
-#ifndef HAVE_RB_ARRAY_CONST_PTR
-static inline const VALUE *
-rb_array_const_ptr(VALUE a)
-{
-    return FIX_CONST_VALUE_PTR((RBASIC(a)->flags & RARRAY_EMBED_FLAG) ?
-	RARRAY(a)->as.ary : RARRAY(a)->as.heap.ptr);
-}
-#endif
-
-#ifndef RARRAY_CONST_PTR
-# define RARRAY_CONST_PTR(a) rb_array_const_ptr(a)
-#endif
-
-#ifndef RARRAY_AREF
-# define RARRAY_AREF(a, i) (RARRAY_CONST_PTR(a)[i])
-#endif
-
-#ifndef HAVE_RB_SYM2STR
-static inline VALUE
-rb_sym2str(VALUE sym)
-{
-    return rb_id2str(SYM2ID(sym));
-}
-#endif
-
 #ifdef vabs
 # undef vabs
 #endif
@@ -232,11 +167,11 @@ extern VALUE rb_cBigDecimal;
 typedef struct {
     VALUE  obj;     /* Back pointer(VALUE) for Ruby object.     */
     size_t MaxPrec; /* Maximum precision size                   */
-                    /* This is the actual size of frac[]        */
+                    /* This is the actual size of pfrac[]       */
                     /*(frac[0] to frac[MaxPrec] are available). */
     size_t Prec;    /* Current precision size.                  */
-                    /* This indicates how much the              */
-                    /* array frac[] is actually used.           */
+                    /* This indicates how much the.             */
+                    /* the array frac[] is actually used.       */
     SIGNED_VALUE exponent; /* Exponent part.                    */
     short  sign;    /* Attributes of the value.                 */
                     /*
diff --git a/ext/bigdecimal/depend b/ext/bigdecimal/depend
index 6783192b30..0a83c1f17f 100644
--- a/ext/bigdecimal/depend
+++ b/ext/bigdecimal/depend
@@ -1,13 +1 @@
-# AUTOGENERATED DEPENDENCIES START
-bigdecimal.o: $(RUBY_EXTCONF_H)
-bigdecimal.o: $(arch_hdrdir)/ruby/config.h
-bigdecimal.o: $(hdrdir)/ruby/defines.h
-bigdecimal.o: $(hdrdir)/ruby/intern.h
-bigdecimal.o: $(hdrdir)/ruby/missing.h
-bigdecimal.o: $(hdrdir)/ruby/ruby.h
-bigdecimal.o: $(hdrdir)/ruby/st.h
-bigdecimal.o: $(hdrdir)/ruby/subst.h
-bigdecimal.o: $(hdrdir)/ruby/util.h
-bigdecimal.o: bigdecimal.c
-bigdecimal.o: bigdecimal.h
-# AUTOGENERATED DEPENDENCIES END
+bigdecimal.o: bigdecimal.c bigdecimal.h $(HDRS) $(ruby_headers) $(hdrdir)/ruby/util.h
diff --git a/ext/bigdecimal/extconf.rb b/ext/bigdecimal/extconf.rb
index b4f3a7a4f8..d6be3e584e 100644
--- a/ext/bigdecimal/extconf.rb
+++ b/ext/bigdecimal/extconf.rb
@@ -1,30 +1,6 @@
-# frozen_string_literal: false
 require 'mkmf'
 
-alias __have_macro__ have_macro
-
 have_func("labs", "stdlib.h")
 have_func("llabs", "stdlib.h")
-have_func("finite", "math.h")
-have_func("isfinite", "math.h")
-
-have_type("struct RRational", "ruby.h")
-have_func("rb_rational_num", "ruby.h")
-have_func("rb_rational_den", "ruby.h")
-have_func("rb_array_const_ptr", "ruby.h")
-have_func("rb_sym2str", "ruby.h")
-
-have_macro("FIX_CONST_VALUE_PTR", "ruby.h")
-have_macro("RARRAY_CONST_PTR", "ruby.h")
-have_macro("RARRAY_AREF", "ruby.h")
 
 create_makefile('bigdecimal')
-
-# Add additional dependencies
-open('Makefile', 'a') do |io|
-  if RUBY_VERSION >= '2.4'
-    io.puts <<-MAKEFILE
-bigdecimal.o: $(hdrdir)/ruby/backward.h
-    MAKEFILE
-  end
-end
diff --git a/ext/bigdecimal/lib/bigdecimal/jacobian.rb b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
index 9cad06c09b..d56caab0d3 100644
--- a/ext/bigdecimal/lib/bigdecimal/jacobian.rb
+++ b/ext/bigdecimal/lib/bigdecimal/jacobian.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #
 # require 'bigdecimal/jacobian'
 #
diff --git a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
index dd265e482a..6cbe29b6da 100644
--- a/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
+++ b/ext/bigdecimal/lib/bigdecimal/ludcmp.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'bigdecimal'
 
 #
diff --git a/ext/bigdecimal/lib/bigdecimal/math.rb b/ext/bigdecimal/lib/bigdecimal/math.rb
index ef1a02b38f..4a4fcc2b06 100644
--- a/ext/bigdecimal/lib/bigdecimal/math.rb
+++ b/ext/bigdecimal/lib/bigdecimal/math.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'bigdecimal'
 
 #
@@ -26,7 +25,7 @@ require 'bigdecimal'
 #   include BigMath
 #
 #   a = BigDecimal((PI(100)/2).to_s)
-#   puts sin(a,100) # => 0.99999999999999999999......e0
+#   puts sin(a,100) # => 0.10000000000000000000......E1
 #
 module BigMath
   module_function
@@ -38,7 +37,7 @@ module BigMath
   # precision, +numeric+.
   #
   #   BigMath.sqrt(BigDecimal.new('2'), 16).to_s
-  #   #=> "0.1414213562373095048801688724e1"
+  #   #=> "0.1414213562373095048801688724E1"
   #
   def sqrt(x, prec)
     x.sqrt(prec)
@@ -53,7 +52,7 @@ module BigMath
   # If +decimal+ is Infinity or NaN, returns NaN.
   #
   #   BigMath.sin(BigMath.PI(5)/4, 5).to_s
-  #   #=> "0.70710678118654752440082036563292800375e0"
+  #   #=> "0.70710678118654752440082036563292800375E0"
   #
   def sin(x, prec)
     raise ArgumentError, "Zero or negative precision for sin" if prec <= 0
@@ -97,7 +96,7 @@ module BigMath
   # If +decimal+ is Infinity or NaN, returns NaN.
   #
   #   BigMath.cos(BigMath.PI(4), 16).to_s
-  #   #=> "-0.999999999999999999999999999999856613163740061349e0"
+  #   #=> "-0.999999999999999999999999999999856613163740061349E0"
   #
   def cos(x, prec)
     raise ArgumentError, "Zero or negative precision for cos" if prec <= 0
@@ -141,7 +140,7 @@ module BigMath
   # If +decimal+ is NaN, returns NaN.
   #
   #   BigMath.atan(BigDecimal.new('-1'), 16).to_s
-  #   #=> "-0.785398163397448309615660845819878471907514682065e0"
+  #   #=> "-0.785398163397448309615660845819878471907514682065E0"
   #
   def atan(x, prec)
     raise ArgumentError, "Zero or negative precision for atan" if prec <= 0
@@ -178,7 +177,7 @@ module BigMath
   # +numeric+.
   #
   #   BigMath.PI(10).to_s
-  #   #=> "0.3141592653589793238462643388813853786957412e1"
+  #   #=> "0.3141592653589793238462643388813853786957412E1"
   #
   def PI(prec)
     raise ArgumentError, "Zero or negative precision for PI" if prec <= 0
@@ -223,7 +222,7 @@ module BigMath
   # digits of precision, +numeric+.
   #
   #   BigMath.E(10).to_s
-  #   #=> "0.271828182845904523536028752390026306410273e1"
+  #   #=> "0.271828182845904523536028752390026306410273E1"
   #
   def E(prec)
     raise ArgumentError, "Zero or negative precision for E" if prec <= 0
diff --git a/ext/bigdecimal/lib/bigdecimal/newton.rb b/ext/bigdecimal/lib/bigdecimal/newton.rb
index 85bacb7f2e..db1a5ad99e 100644
--- a/ext/bigdecimal/lib/bigdecimal/newton.rb
+++ b/ext/bigdecimal/lib/bigdecimal/newton.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require "bigdecimal/ludcmp"
 require "bigdecimal/jacobian"
 
diff --git a/ext/bigdecimal/lib/bigdecimal/util.rb b/ext/bigdecimal/lib/bigdecimal/util.rb
index 670a625563..82c82c8e1e 100644
--- a/ext/bigdecimal/lib/bigdecimal/util.rb
+++ b/ext/bigdecimal/lib/bigdecimal/util.rb
@@ -1,7 +1,6 @@
-# frozen_string_literal: false
 # BigDecimal extends the native Integer class to provide the #to_d method.
 #
-# When you require the BigDecimal library in your application, this method will
+# When you require the BigDecimal library in your application, this methodwill
 # be available on Integer objects.
 class Integer < Numeric
   # call-seq:
@@ -13,7 +12,7 @@ class Integer < Numeric
   #     require 'bigdecimal/util'
   #
   #     42.to_d
-  #     # => 0.42e2
+  #     # => #<BigDecimal:1008ef070,'0.42E2',9(36)>
   #
   def to_d
     BigDecimal(self)
@@ -34,7 +33,7 @@ class Float < Numeric
   #     require 'bigdecimal/util'
   #
   #     0.5.to_d
-  #     # => 0.5e0
+  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
   #
   def to_d(precision=nil)
     BigDecimal(self, precision || Float::DIG)
@@ -55,7 +54,7 @@ class String
   #     require 'bigdecimal/util'
   #
   #     "0.5".to_d
-  #     # => 0.5e0
+  #     # => #<BigDecimal:1dc69e0,'0.5E0',9(18)>
   #
   def to_d
     BigDecimal(self)
@@ -117,7 +116,7 @@ class Rational < Numeric
   #   r = (22/7.0).to_r
   #   # => (7077085128725065/2251799813685248)
   #   r.to_d(3)
-  #   # => 0.314e1
+  #   # => #<BigDecimal:1a44d08,'0.314E1',18(36)>
   def to_d(precision)
     if precision <= 0
       raise ArgumentError, "negative precision"
diff --git a/ext/bigdecimal/sample/linear.rb b/ext/bigdecimal/sample/linear.rb
index 3b23269f8a..a33255f591 100644
--- a/ext/bigdecimal/sample/linear.rb
+++ b/ext/bigdecimal/sample/linear.rb
@@ -1,5 +1,4 @@
 #!/usr/local/bin/ruby
-# frozen_string_literal: false
 
 #
 # linear.rb
diff --git a/ext/bigdecimal/sample/nlsolve.rb b/ext/bigdecimal/sample/nlsolve.rb
index b1dd08e0a3..7fa921c2c3 100644
--- a/ext/bigdecimal/sample/nlsolve.rb
+++ b/ext/bigdecimal/sample/nlsolve.rb
@@ -1,5 +1,4 @@
 #!/usr/local/bin/ruby
-# frozen_string_literal: false
 
 #
 # nlsolve.rb
diff --git a/ext/bigdecimal/sample/pi.rb b/ext/bigdecimal/sample/pi.rb
index ea9663896c..2f7dd27d60 100644
--- a/ext/bigdecimal/sample/pi.rb
+++ b/ext/bigdecimal/sample/pi.rb
@@ -1,5 +1,4 @@
 #!/usr/local/bin/ruby
-# frozen_string_literal: false
 
 #
 # pi.rb
diff --git a/ext/cgi/escape/depend b/ext/cgi/escape/depend
deleted file mode 100644
index c93a487a56..0000000000
--- a/ext/cgi/escape/depend
+++ /dev/null
@@ -1,15 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-escape.o: $(RUBY_EXTCONF_H)
-escape.o: $(arch_hdrdir)/ruby/config.h
-escape.o: $(hdrdir)/ruby/backward.h
-escape.o: $(hdrdir)/ruby/defines.h
-escape.o: $(hdrdir)/ruby/encoding.h
-escape.o: $(hdrdir)/ruby/intern.h
-escape.o: $(hdrdir)/ruby/missing.h
-escape.o: $(hdrdir)/ruby/oniguruma.h
-escape.o: $(hdrdir)/ruby/ruby.h
-escape.o: $(hdrdir)/ruby/st.h
-escape.o: $(hdrdir)/ruby/subst.h
-escape.o: $(top_srcdir)/include/ruby.h
-escape.o: escape.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/cgi/escape/escape.c b/ext/cgi/escape/escape.c
deleted file mode 100644
index 7289f43b8d..0000000000
--- a/ext/cgi/escape/escape.c
+++ /dev/null
@@ -1,421 +0,0 @@
-#include "ruby.h"
-#include "ruby/encoding.h"
-
-RUBY_EXTERN unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow);
-RUBY_EXTERN const char ruby_hexdigits[];
-RUBY_EXTERN const signed char ruby_digit36_to_number_table[];
-#define lower_hexdigits (ruby_hexdigits+0)
-#define upper_hexdigits (ruby_hexdigits+16)
-#define char_to_number(c) ruby_digit36_to_number_table[(unsigned char)(c)]
-
-static VALUE rb_cCGI, rb_mUtil, rb_mEscape;
-static ID id_accept_charset;
-
-static void
-html_escaped_cat(VALUE str, char c)
-{
-    switch (c) {
-      case '\'':
-	rb_str_cat_cstr(str, "&#39;");
-	break;
-      case '&':
-	rb_str_cat_cstr(str, "&amp;");
-	break;
-      case '"':
-	rb_str_cat_cstr(str, "&quot;");
-	break;
-      case '<':
-	rb_str_cat_cstr(str, "&lt;");
-	break;
-      case '>':
-	rb_str_cat_cstr(str, "&gt;");
-	break;
-    }
-}
-
-static inline void
-preserve_original_state(VALUE orig, VALUE dest)
-{
-    rb_enc_associate(dest, rb_enc_get(orig));
-
-    RB_OBJ_INFECT_RAW(dest, orig);
-}
-
-static VALUE
-optimized_escape_html(VALUE str)
-{
-    long i, len, beg = 0;
-    VALUE dest = 0;
-    const char *cstr;
-
-    len  = RSTRING_LEN(str);
-    cstr = RSTRING_PTR(str);
-
-    for (i = 0; i < len; i++) {
-	switch (cstr[i]) {
-	  case '\'':
-	  case '&':
-	  case '"':
-	  case '<':
-	  case '>':
-	    if (!dest) {
-		dest = rb_str_buf_new(len);
-	    }
-
-	    rb_str_cat(dest, cstr + beg, i - beg);
-	    beg = i + 1;
-
-	    html_escaped_cat(dest, cstr[i]);
-	    break;
-	}
-    }
-
-    if (dest) {
-	rb_str_cat(dest, cstr + beg, len - beg);
-	preserve_original_state(str, dest);
-	return dest;
-    }
-    else {
-	return rb_str_dup(str);
-    }
-}
-
-static VALUE
-optimized_unescape_html(VALUE str)
-{
-    enum {UNICODE_MAX = 0x10ffff};
-    rb_encoding *enc = rb_enc_get(str);
-    unsigned long charlimit = (strcasecmp(rb_enc_name(enc), "UTF-8") == 0 ? UNICODE_MAX :
-			       strcasecmp(rb_enc_name(enc), "ISO-8859-1") == 0 ? 256 :
-			       128);
-    long i, len, beg = 0;
-    size_t clen, plen;
-    int overflow;
-    const char *cstr;
-    char buf[6];
-    VALUE dest = 0;
-
-    len  = RSTRING_LEN(str);
-    cstr = RSTRING_PTR(str);
-
-    for (i = 0; i < len; i++) {
-	unsigned long cc;
-	char c = cstr[i];
-	if (c != '&') continue;
-	plen = i - beg;
-	if (++i >= len) break;
-	c = (unsigned char)cstr[i];
-#define MATCH(s) (len - i >= (int)rb_strlen_lit(s) && \
-		  memcmp(&cstr[i], s, rb_strlen_lit(s)) == 0 && \
-		  (i += rb_strlen_lit(s) - 1, 1))
-	switch (c) {
-	  case 'a':
-	    ++i;
-	    if (MATCH("pos;")) {
-		c = '\'';
-	    }
-	    else if (MATCH("mp;")) {
-		c = '&';
-	    }
-	    else continue;
-	    break;
-	  case 'q':
-	    ++i;
-	    if (MATCH("uot;")) {
-		c = '"';
-	    }
-	    else continue;
-	    break;
-	  case 'g':
-	    ++i;
-	    if (MATCH("t;")) {
-		c = '>';
-	    }
-	    else continue;
-	    break;
-	  case 'l':
-	    ++i;
-	    if (MATCH("t;")) {
-		c = '<';
-	    }
-	    else continue;
-	    break;
-	  case '#':
-	    if (len - ++i >= 2 && ISDIGIT(cstr[i])) {
-		cc = ruby_scan_digits(&cstr[i], len-i, 10, &clen, &overflow);
-	    }
-	    else if ((cstr[i] == 'x' || cstr[i] == 'X') && len - ++i >= 2 && ISXDIGIT(cstr[i])) {
-		cc = ruby_scan_digits(&cstr[i], len-i, 16, &clen, &overflow);
-	    }
-	    else continue;
-	    i += clen;
-	    if (overflow || cc >= charlimit || cstr[i] != ';') continue;
-	    if (!dest) {
-		dest = rb_str_buf_new(len);
-	    }
-	    rb_str_cat(dest, cstr + beg, plen);
-	    if (charlimit > 256) {
-		rb_str_cat(dest, buf, rb_enc_mbcput((OnigCodePoint)cc, buf, enc));
-	    }
-	    else {
-		c = (unsigned char)cc;
-		rb_str_cat(dest, &c, 1);
-	    }
-	    beg = i + 1;
-	    continue;
-	  default:
-	    --i;
-	    continue;
-	}
-	if (!dest) {
-	    dest = rb_str_buf_new(len);
-	}
-	rb_str_cat(dest, cstr + beg, plen);
-	rb_str_cat(dest, &c, 1);
-	beg = i + 1;
-    }
-
-    if (dest) {
-	rb_str_cat(dest, cstr + beg, len - beg);
-	preserve_original_state(str, dest);
-	return dest;
-    }
-    else {
-	return rb_str_dup(str);
-    }
-}
-
-static unsigned char
-url_unreserved_char(unsigned char c)
-{
-    switch (c) {
-      case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9':
-      case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g': case 'h': case 'i': case 'j':
-      case 'k': case 'l': case 'm': case 'n': case 'o': case 'p': case 'q': case 'r': case 's': case 't':
-      case 'u': case 'v': case 'w': case 'x': case 'y': case 'z':
-      case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G': case 'H': case 'I': case 'J':
-      case 'K': case 'L': case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T':
-      case 'U': case 'V': case 'W': case 'X': case 'Y': case 'Z':
-      case '-': case '.': case '_':
-        return 1;
-      default:
-        break;
-    }
-    return 0;
-}
-
-static VALUE
-optimized_escape(VALUE str)
-{
-    long i, len, beg = 0;
-    VALUE dest = 0;
-    const char *cstr;
-    char buf[4] = {'%'};
-
-    len  = RSTRING_LEN(str);
-    cstr = RSTRING_PTR(str);
-
-    for (i = 0; i < len; ++i) {
-	const unsigned char c = (unsigned char)cstr[i];
-	if (!url_unreserved_char(c)) {
-	    if (!dest) {
-		dest = rb_str_buf_new(len);
-	    }
-
-	    rb_str_cat(dest, cstr + beg, i - beg);
-	    beg = i + 1;
-
-	    if (c == ' ') {
-		rb_str_cat_cstr(dest, "+");
-	    }
-	    else {
-		buf[1] = upper_hexdigits[(c >> 4) & 0xf];
-		buf[2] = upper_hexdigits[c & 0xf];
-		rb_str_cat(dest, buf, 3);
-	    }
-	}
-    }
-
-    if (dest) {
-	rb_str_cat(dest, cstr + beg, len - beg);
-	preserve_original_state(str, dest);
-	return dest;
-    }
-    else {
-	return rb_str_dup(str);
-    }
-}
-
-static VALUE
-optimized_unescape(VALUE str, VALUE encoding)
-{
-    long i, len, beg = 0;
-    VALUE dest = 0;
-    const char *cstr;
-    int cr, origenc, encidx = rb_to_encoding_index(encoding);
-
-    len  = RSTRING_LEN(str);
-    cstr = RSTRING_PTR(str);
-
-    for (i = 0; i < len; ++i) {
-	char buf[1];
-	const char c = cstr[i];
-	int clen = 0;
-	if (c == '%') {
-	    if (i + 3 > len) break;
-	    if (!ISXDIGIT(cstr[i+1])) continue;
-	    if (!ISXDIGIT(cstr[i+2])) continue;
-	    buf[0] = ((char_to_number(cstr[i+1]) << 4)
-		      | char_to_number(cstr[i+2]));
-	    clen = 2;
-	}
-	else if (c == '+') {
-	    buf[0] = ' ';
-	}
-	else {
-	    continue;
-	}
-
-	if (!dest) {
-	    dest = rb_str_buf_new(len);
-	}
-
-	rb_str_cat(dest, cstr + beg, i - beg);
-	i += clen;
-	beg = i + 1;
-
-	rb_str_cat(dest, buf, 1);
-    }
-
-    if (dest) {
-	rb_str_cat(dest, cstr + beg, len - beg);
-	preserve_original_state(str, dest);
-	cr = ENC_CODERANGE_UNKNOWN;
-    }
-    else {
-	dest = rb_str_dup(str);
-	cr = ENC_CODERANGE(str);
-    }
-    origenc = rb_enc_get_index(str);
-    if (origenc != encidx) {
-	rb_enc_associate_index(dest, encidx);
-	if (!ENC_CODERANGE_CLEAN_P(rb_enc_str_coderange(dest))) {
-	    rb_enc_associate_index(dest, origenc);
-	    if (cr != ENC_CODERANGE_UNKNOWN)
-		ENC_CODERANGE_SET(dest, cr);
-	}
-    }
-    return dest;
-}
-
-/*
- *  call-seq:
- *     CGI.escapeHTML(string) -> string
- *
- *  Returns HTML-escaped string.
- *
- */
-static VALUE
-cgiesc_escape_html(VALUE self, VALUE str)
-{
-    StringValue(str);
-
-    if (rb_enc_str_asciicompat_p(str)) {
-	return optimized_escape_html(str);
-    }
-    else {
-	return rb_call_super(1, &str);
-    }
-}
-
-/*
- *  call-seq:
- *     CGI.unescapeHTML(string) -> string
- *
- *  Returns HTML-unescaped string.
- *
- */
-static VALUE
-cgiesc_unescape_html(VALUE self, VALUE str)
-{
-    StringValue(str);
-
-    if (rb_enc_str_asciicompat_p(str)) {
-	return optimized_unescape_html(str);
-    }
-    else {
-	return rb_call_super(1, &str);
-    }
-}
-
-/*
- *  call-seq:
- *     CGI.escape(string) -> string
- *
- *  Returns URL-escaped string.
- *
- */
-static VALUE
-cgiesc_escape(VALUE self, VALUE str)
-{
-    StringValue(str);
-
-    if (rb_enc_str_asciicompat_p(str)) {
-	return optimized_escape(str);
-    }
-    else {
-	return rb_call_super(1, &str);
-    }
-}
-
-static VALUE
-accept_charset(int argc, VALUE *argv, VALUE self)
-{
-    if (argc > 0)
-	return argv[0];
-    return rb_cvar_get(CLASS_OF(self), id_accept_charset);
-}
-
-/*
- *  call-seq:
- *     CGI.unescape(string, encoding=@@accept_charset) -> string
- *
- *  Returns URL-unescaped string.
- *
- */
-static VALUE
-cgiesc_unescape(int argc, VALUE *argv, VALUE self)
-{
-    VALUE str = (rb_check_arity(argc, 1, 2), argv[0]);
-
-    StringValue(str);
-
-    if (rb_enc_str_asciicompat_p(str)) {
-	VALUE enc = accept_charset(argc-1, argv+1, self);
-	return optimized_unescape(str, enc);
-    }
-    else {
-	return rb_call_super(argc, argv);
-    }
-}
-
-void
-Init_escape(void)
-{
-    id_accept_charset = rb_intern_const("@@accept_charset");
-    InitVM(escape);
-}
-
-void
-InitVM_escape(void)
-{
-    rb_cCGI    = rb_define_class("CGI", rb_cObject);
-    rb_mEscape = rb_define_module_under(rb_cCGI, "Escape");
-    rb_mUtil   = rb_define_module_under(rb_cCGI, "Util");
-    rb_define_method(rb_mEscape, "escapeHTML", cgiesc_escape_html, 1);
-    rb_define_method(rb_mEscape, "unescapeHTML", cgiesc_unescape_html, 1);
-    rb_define_method(rb_mEscape, "escape", cgiesc_escape, 1);
-    rb_define_method(rb_mEscape, "unescape", cgiesc_unescape, -1);
-    rb_prepend_module(rb_mUtil, rb_mEscape);
-    rb_extend_object(rb_cCGI, rb_mEscape);
-}
diff --git a/ext/cgi/escape/extconf.rb b/ext/cgi/escape/extconf.rb
deleted file mode 100644
index 16e8ff224d..0000000000
--- a/ext/cgi/escape/extconf.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'mkmf'
-
-create_makefile 'cgi/escape'
diff --git a/ext/continuation/continuation.c b/ext/continuation/continuation.c
index c678371cca..ae69b66cd8 100644
--- a/ext/continuation/continuation.c
+++ b/ext/continuation/continuation.c
@@ -1,13 +1,8 @@
 
-#include "ruby/ruby.h"
-
 void ruby_Init_Continuation_body(void);
 
 void
 Init_continuation(void)
 {
-#ifndef RUBY_EXPORT
-    rb_warn("callcc is obsolete; use Fiber instead");
-#endif
     ruby_Init_Continuation_body();
 }
diff --git a/ext/continuation/depend b/ext/continuation/depend
deleted file mode 100644
index 9e47f27f3a..0000000000
--- a/ext/continuation/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-continuation.o: $(RUBY_EXTCONF_H)
-continuation.o: $(arch_hdrdir)/ruby/config.h
-continuation.o: $(hdrdir)/ruby/backward.h
-continuation.o: $(hdrdir)/ruby/defines.h
-continuation.o: $(hdrdir)/ruby/intern.h
-continuation.o: $(hdrdir)/ruby/missing.h
-continuation.o: $(hdrdir)/ruby/ruby.h
-continuation.o: $(hdrdir)/ruby/st.h
-continuation.o: $(hdrdir)/ruby/subst.h
-continuation.o: continuation.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/continuation/extconf.rb b/ext/continuation/extconf.rb
index 6d54ec01a5..17e2d056db 100644
--- a/ext/continuation/extconf.rb
+++ b/ext/continuation/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile('continuation')
 
diff --git a/ext/coverage/coverage.c b/ext/coverage/coverage.c
index 9a9011a7da..93cb2a5c9e 100644
--- a/ext/coverage/coverage.c
+++ b/ext/coverage/coverage.c
@@ -11,6 +11,8 @@
 #include "ruby.h"
 #include "vm_core.h"
 
+static VALUE rb_coverages = Qundef;
+
 /*
  * call-seq:
  *    Coverage.start  => nil
@@ -20,22 +22,24 @@
 static VALUE
 rb_coverage_start(VALUE klass)
 {
-    VALUE coverages = rb_get_coverages();
-    if (!RTEST(coverages)) {
-	coverages = rb_hash_new();
-	rb_obj_hide(coverages);
-	rb_set_coverages(coverages);
+    if (!RTEST(rb_get_coverages())) {
+	if (rb_coverages == Qundef) {
+	    rb_coverages = rb_hash_new();
+	    rb_obj_hide(rb_coverages);
+	}
+	rb_set_coverages(rb_coverages);
     }
     return Qnil;
 }
 
 static int
-coverage_peek_result_i(st_data_t key, st_data_t val, st_data_t h)
+coverage_result_i(st_data_t key, st_data_t val, st_data_t h)
 {
     VALUE path = (VALUE)key;
     VALUE coverage = (VALUE)val;
     VALUE coverages = (VALUE)h;
     coverage = rb_ary_dup(coverage);
+    rb_ary_clear((VALUE)val);
     rb_ary_freeze(coverage);
     rb_hash_aset(coverages, path, coverage);
     return ST_CONTINUE;
@@ -43,34 +47,21 @@ coverage_peek_result_i(st_data_t key, st_data_t val, st_data_t h)
 
 /*
  *  call-seq:
- *     Coverage.peek_result  => hash
+ *     Coverage.result  => hash
  *
- * Returns a hash that contains filename as key and coverage array as value.
+ * Returns a hash that contains filename as key and coverage array as value
+ * and disables coverage measurement.
  */
 static VALUE
-rb_coverage_peek_result(VALUE klass)
+rb_coverage_result(VALUE klass)
 {
     VALUE coverages = rb_get_coverages();
     VALUE ncoverages = rb_hash_new();
     if (!RTEST(coverages)) {
 	rb_raise(rb_eRuntimeError, "coverage measurement is not enabled");
     }
-    st_foreach(RHASH_TBL(coverages), coverage_peek_result_i, ncoverages);
+    st_foreach(RHASH_TBL(coverages), coverage_result_i, ncoverages);
     rb_hash_freeze(ncoverages);
-    return ncoverages;
-}
-
-/*
- *  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 ncoverages = rb_coverage_peek_result(klass);
     rb_reset_coverages();
     return ncoverages;
 }
@@ -80,7 +71,7 @@ rb_coverage_result(VALUE klass)
  *
  * = Usage
  *
- * 1. require "coverage"
+ * 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
@@ -103,7 +94,7 @@ rb_coverage_result(VALUE klass)
  *   end
  *   [EOF]
  *
- *   require "coverage"
+ *   require "coverage.so"
  *   Coverage.start
  *   require "foo.rb"
  *   p Coverage.result  #=> {"foo.rb"=>[1, 1, 10, nil, nil, 1, 1, nil, 0, nil]}
@@ -114,5 +105,5 @@ 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);
-    rb_define_module_function(rb_mCoverage, "peek_result", rb_coverage_peek_result, 0);
+    rb_gc_register_address(&rb_coverages);
 }
diff --git a/ext/coverage/depend b/ext/coverage/depend
index 860893b06f..ad0ac1cdfa 100644
--- a/ext/coverage/depend
+++ b/ext/coverage/depend
@@ -9,35 +9,3 @@ $(OBJS): $(HDRS) $(ruby_headers) \
   $(top_srcdir)/thread_pthread.h \
   $(top_srcdir)/internal.h \
   $(top_srcdir)/include/ruby/thread_native.h
-
-# AUTOGENERATED DEPENDENCIES START
-coverage.o: $(RUBY_EXTCONF_H)
-coverage.o: $(arch_hdrdir)/ruby/config.h
-coverage.o: $(hdrdir)/ruby/backward.h
-coverage.o: $(hdrdir)/ruby/defines.h
-coverage.o: $(hdrdir)/ruby/encoding.h
-coverage.o: $(hdrdir)/ruby/intern.h
-coverage.o: $(hdrdir)/ruby/io.h
-coverage.o: $(hdrdir)/ruby/missing.h
-coverage.o: $(hdrdir)/ruby/oniguruma.h
-coverage.o: $(hdrdir)/ruby/ruby.h
-coverage.o: $(hdrdir)/ruby/st.h
-coverage.o: $(hdrdir)/ruby/subst.h
-coverage.o: $(hdrdir)/ruby/thread_native.h
-coverage.o: $(top_srcdir)/ccan/check_type/check_type.h
-coverage.o: $(top_srcdir)/ccan/container_of/container_of.h
-coverage.o: $(top_srcdir)/ccan/list/list.h
-coverage.o: $(top_srcdir)/ccan/str/str.h
-coverage.o: $(top_srcdir)/include/ruby.h
-coverage.o: $(top_srcdir)/internal.h
-coverage.o: $(top_srcdir)/method.h
-coverage.o: $(top_srcdir)/node.h
-coverage.o: $(top_srcdir)/ruby_assert.h
-coverage.o: $(top_srcdir)/ruby_atomic.h
-coverage.o: $(top_srcdir)/thread_pthread.h
-coverage.o: $(top_srcdir)/vm_core.h
-coverage.o: $(top_srcdir)/vm_debug.h
-coverage.o: $(top_srcdir)/vm_opts.h
-coverage.o: coverage.c
-coverage.o: {$(VPATH)}id.h
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/coverage/extconf.rb b/ext/coverage/extconf.rb
index 3a6f530a92..769f85b6ef 100644
--- a/ext/coverage/extconf.rb
+++ b/ext/coverage/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 $VPATH << '$(topdir)' << '$(top_srcdir)'
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 12240d7457..7ed21db5fc 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -4,7 +4,6 @@
 
 #include "ruby.h"
 #include "ruby/encoding.h"
-#include "ruby/util.h"
 #include <math.h>
 #include <time.h>
 #if defined(HAVE_SYS_TIME_H)
@@ -287,20 +286,20 @@ union DateData {
 
 #define get_d1(x)\
     union DateData *dat;\
-    TypedData_Get_Struct(x, union DateData, &d_lite_type, dat);
+    Data_Get_Struct(x, union DateData, dat);
 
 #define get_d1a(x)\
     union DateData *adat;\
-    TypedData_Get_Struct(x, union DateData, &d_lite_type, adat);
+    Data_Get_Struct(x, union DateData, adat);
 
 #define get_d1b(x)\
     union DateData *bdat;\
-    TypedData_Get_Struct(x, union DateData, &d_lite_type, bdat);
+    Data_Get_Struct(x, union DateData, bdat);
 
 #define get_d2(x,y)\
     union DateData *adat, *bdat;\
-    TypedData_Get_Struct(x, union DateData, &d_lite_type, adat);\
-    TypedData_Get_Struct(y, union DateData, &d_lite_type, bdat);
+    Data_Get_Struct(x, union DateData, adat);\
+    Data_Get_Struct(y, union DateData, bdat);
 
 inline static VALUE
 canon(VALUE x)
@@ -314,9 +313,9 @@ canon(VALUE x)
 }
 
 #ifndef USE_PACK
-#define set_to_simple(obj, x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
+#define set_to_simple(x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth)); \
+    (x)->nth = canon(_nth);\
     (x)->jd = _jd;\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
@@ -325,9 +324,9 @@ canon(VALUE x)
     (x)->flags = _flags;\
 }
 #else
-#define set_to_simple(obj, x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
+#define set_to_simple(x, _nth, _jd ,_sg, _year, _mon, _mday, _flags) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth)); \
+    (x)->nth = canon(_nth);\
     (x)->jd = _jd;\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
@@ -337,13 +336,13 @@ canon(VALUE x)
 #endif
 
 #ifndef USE_PACK
-#define set_to_complex(obj, x, _nth, _jd ,_df, _sf, _of, _sg,\
+#define set_to_complex(x, _nth, _jd ,_df, _sf, _of, _sg,\
 _year, _mon, _mday, _hour, _min, _sec, _flags) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth));\
+    (x)->nth = canon(_nth);\
     (x)->jd = _jd;\
     (x)->df = _df;\
-    RB_OBJ_WRITE((obj), &(x)->sf, canon(_sf));\
+    (x)->sf = canon(_sf);\
     (x)->of = _of;\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
@@ -355,13 +354,13 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->flags = _flags;\
 }
 #else
-#define set_to_complex(obj, x, _nth, _jd ,_df, _sf, _of, _sg,\
+#define set_to_complex(x, _nth, _jd ,_df, _sf, _of, _sg,\
 _year, _mon, _mday, _hour, _min, _sec, _flags) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, canon(_nth));\
+    (x)->nth = canon(_nth);\
     (x)->jd = _jd;\
     (x)->df = _df;\
-    RB_OBJ_WRITE((obj), &(x)->sf, canon(_sf));\
+    (x)->sf = canon(_sf);\
     (x)->of = _of;\
     (x)->sg = (date_sg_t)(_sg);\
     (x)->year = _year;\
@@ -371,9 +370,9 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
 #endif
 
 #ifndef USE_PACK
-#define copy_simple_to_complex(obj, x, y) \
+#define copy_simple_to_complex(x, y) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
+    (x)->nth = (y)->nth;\
     (x)->jd = (y)->jd;\
     (x)->df = 0;\
     (x)->sf = INT2FIX(0);\
@@ -388,12 +387,12 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->flags = (y)->flags;\
 }
 #else
-#define copy_simple_to_complex(obj, x, y) \
+#define copy_simple_to_complex(x, y) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
+    (x)->nth = (y)->nth;\
     (x)->jd = (y)->jd;\
     (x)->df = 0;\
-    RB_OBJ_WRITE((obj), &(x)->sf, INT2FIX(0));\
+    (x)->sf = INT2FIX(0);\
     (x)->of = 0;\
     (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
@@ -403,9 +402,9 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
 #endif
 
 #ifndef USE_PACK
-#define copy_complex_to_simple(obj, x, y) \
+#define copy_complex_to_simple(x, y) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
+    (x)->nth = (y)->nth;\
     (x)->jd = (y)->jd;\
     (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
@@ -414,9 +413,9 @@ _year, _mon, _mday, _hour, _min, _sec, _flags) \
     (x)->flags = (y)->flags;\
 }
 #else
-#define copy_complex_to_simple(obj, x, y) \
+#define copy_complex_to_simple(x, y) \
 {\
-    RB_OBJ_WRITE((obj), &(x)->nth, (y)->nth);\
+    (x)->nth = (y)->nth;\
     (x)->jd = (y)->jd;\
     (x)->sg = (date_sg_t)((y)->sg);\
     (x)->year = (y)->year;\
@@ -1121,13 +1120,11 @@ m_virtual_sg(union DateData *x)
 }
 
 inline static void
-canonicalize_s_jd(VALUE obj, union DateData *x)
+canonicalize_s_jd(union DateData *x)
 {
     int j = x->s.jd;
-    VALUE nth = x->s.nth;
     assert(have_jd_p(x));
-    canonicalize_jd(nth, x->s.jd);
-    RB_OBJ_WRITE(obj, &x->s.nth, nth);
+    canonicalize_jd(x->s.nth, x->s.jd);
     if (x->s.jd != j)
 	x->flags &= ~HAVE_CIVIL;
 }
@@ -1217,13 +1214,11 @@ get_c_time(union DateData *x)
 }
 
 inline static void
-canonicalize_c_jd(VALUE obj, union DateData *x)
+canonicalize_c_jd(union DateData *x)
 {
     int j = x->c.jd;
-    VALUE nth = x->c.nth;
     assert(have_jd_p(x));
-    canonicalize_jd(nth, x->c.jd);
-    RB_OBJ_WRITE(obj, &x->c.nth, nth);
+    canonicalize_jd(x->c.nth, x->c.jd);
     if (x->c.jd != j)
 	x->flags &= ~HAVE_CIVIL;
 }
@@ -1360,8 +1355,10 @@ encode_year(VALUE nth, int y, double style,
 static void
 decode_jd(VALUE jd, VALUE *nth, int *rjd)
 {
+    assert(FIXNUM_P(jd) || RB_TYPE_P(jd, T_BIGNUM));
     *nth = f_idiv(jd, INT2FIX(CM_PERIOD));
     if (f_zero_p(*nth)) {
+	assert(FIXNUM_P(jd));
 	*rjd = FIX2INT(jd);
 	return;
     }
@@ -1400,15 +1397,15 @@ guess_style(VALUE y, double sg) /* -/+oo or zero */
 }
 
 inline static void
-m_canonicalize_jd(VALUE obj, union DateData *x)
+m_canonicalize_jd(union DateData *x)
 {
     if (simple_dat_p(x)) {
 	get_s_jd(x);
-	canonicalize_s_jd(obj, x);
+	canonicalize_s_jd(x);
     }
     else {
 	get_c_jd(x);
-	canonicalize_c_jd(obj, x);
+	canonicalize_c_jd(x);
     }
 }
 
@@ -1977,13 +1974,6 @@ k_rational_p(VALUE x)
     return f_kind_of_p(x, rb_cRational);
 }
 
-static inline void
-expect_numeric(VALUE x)
-{
-    if (!k_numeric_p(x))
-	rb_raise(rb_eTypeError, "expected numeric");
-}
-
 #ifndef NDEBUG
 static void
 civil_to_jd(VALUE y, int m, int d, double sg,
@@ -2357,7 +2347,8 @@ offset_to_sec(VALUE vof, int *rof)
 	    return 1;
 	}
       default:
-	expect_numeric(vof);
+	if (!k_numeric_p(vof))
+	    rb_raise(rb_eTypeError, "expected numeric");
 	vof = f_to_r(vof);
 #ifdef CANONICALIZATION_FOR_MATHN
 	if (!k_rational_p(vof))
@@ -2931,31 +2922,17 @@ date_s_gregorian_leap_p(VALUE klass, VALUE y)
 }
 
 static void
-d_lite_gc_mark(void *ptr)
+d_lite_gc_mark(union DateData *dat)
 {
-    union DateData *dat = ptr;
     if (simple_dat_p(dat))
 	rb_gc_mark(dat->s.nth);
     else {
 	rb_gc_mark(dat->c.nth);
 	rb_gc_mark(dat->c.sf);
-    }
-}
 
-static size_t
-d_lite_memsize(const void *ptr)
-{
-    const union DateData *dat = ptr;
-    return complex_dat_p(dat) ? sizeof(struct ComplexDateData) : sizeof(struct SimpleDateData);
+    }
 }
 
-static const rb_data_type_t d_lite_type = {
-    "Date",
-    {d_lite_gc_mark, RUBY_TYPED_DEFAULT_FREE, d_lite_memsize,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
-};
-
 inline static VALUE
 d_simple_new_internal(VALUE klass,
 		      VALUE nth, int jd,
@@ -2966,9 +2943,9 @@ d_simple_new_internal(VALUE klass,
     struct SimpleDateData *dat;
     VALUE obj;
 
-    obj = TypedData_Make_Struct(klass, struct SimpleDateData,
-				&d_lite_type, dat);
-    set_to_simple(obj, dat, nth, jd, sg, y, m, d, flags & ~COMPLEX_DAT);
+    obj = Data_Make_Struct(klass, struct SimpleDateData,
+			   d_lite_gc_mark, -1, dat);
+    set_to_simple(dat, nth, jd, sg, y, m, d, flags & ~COMPLEX_DAT);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
 
@@ -2987,9 +2964,9 @@ d_complex_new_internal(VALUE klass,
     struct ComplexDateData *dat;
     VALUE obj;
 
-    obj = TypedData_Make_Struct(klass, struct ComplexDateData,
-				&d_lite_type, dat);
-    set_to_complex(obj, dat, nth, jd, df, sf, of, sg,
+    obj = Data_Make_Struct(klass, struct ComplexDateData,
+			   d_lite_gc_mark, -1, dat);
+    set_to_complex(dat, nth, jd, df, sf, of, sg,
 		   y, m, d, h, min, s, flags | COMPLEX_DAT);
 
     assert(have_jd_p(dat) || have_civil_p(dat));
@@ -3131,7 +3108,7 @@ wholenum_p(VALUE x)
 inline static VALUE
 to_integer(VALUE x)
 {
-    if (RB_INTEGER_TYPE_P(x))
+    if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM))
 	return x;
     return f_to_i(x);
 }
@@ -3728,8 +3705,7 @@ static VALUE
 rt_complete_frags(VALUE klass, VALUE hash)
 {
     static VALUE tab = Qnil;
-    int g;
-    long e;
+    int g, e;
     VALUE k, a, d;
 
     if (NIL_P(tab)) {
@@ -3826,19 +3802,19 @@ rt_complete_frags(VALUE klass, VALUE hash)
     }
 
     {
-	long i, eno = 0, idx = 0;
+	int i, eno = 0, idx = 0;
 
-	for (i = 0; i < RARRAY_LEN(tab); i++) {
+	for (i = 0; i < RARRAY_LENINT(tab); i++) {
 	    VALUE x, a;
 
-	    x = RARRAY_AREF(tab, i);
-	    a = RARRAY_AREF(x, 1);
+	    x = RARRAY_PTR(tab)[i];
+	    a = RARRAY_PTR(x)[1];
 
 	    {
-		long j, n = 0;
+		int j, n = 0;
 
-		for (j = 0; j < RARRAY_LEN(a); j++)
-		    if (!NIL_P(ref_hash0(RARRAY_AREF(a, j))))
+		for (j = 0; j < RARRAY_LENINT(a); j++)
+		    if (!NIL_P(ref_hash0(RARRAY_PTR(a)[j])))
 			n++;
 		if (n > eno) {
 		    eno = n;
@@ -3850,15 +3826,15 @@ rt_complete_frags(VALUE klass, VALUE hash)
 	    g = 0;
 	else {
 	    g = 1;
-	    k = RARRAY_AREF(RARRAY_AREF(tab, idx), 0);
-	    a = RARRAY_AREF(RARRAY_AREF(tab, idx), 1);
+	    k = RARRAY_PTR(RARRAY_PTR(tab)[idx])[0];
+	    a = RARRAY_PTR(RARRAY_PTR(tab)[idx])[1];
 	    e =	eno;
 	}
     }
 
     d = Qnil;
 
-    if (g && !NIL_P(k) && (RARRAY_LEN(a) - e)) {
+    if (g && !NIL_P(k) && (RARRAY_LENINT(a) - e)) {
 	if (k == sym("ordinal")) {
 	    if (NIL_P(ref_hash("year"))) {
 		if (NIL_P(d))
@@ -3869,10 +3845,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 		set_hash("yday", INT2FIX(1));
 	}
 	else if (k == sym("civil")) {
-	    long i;
+	    int i;
 
-	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_AREF(a, i);
+	    for (i = 0; i < RARRAY_LENINT(a); i++) {
+		VALUE e = RARRAY_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3886,10 +3862,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 		set_hash("mday", INT2FIX(1));
 	}
 	else if (k == sym("commercial")) {
-	    long i;
+	    int i;
 
-	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_AREF(a, i);
+	    for (i = 0; i < RARRAY_LENINT(a); i++) {
+		VALUE e = RARRAY_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3910,10 +3886,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 					   ref_hash("wday"))));
 	}
 	else if (k == sym("wnum0")) {
-	    long i;
+	    int i;
 
-	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_AREF(a, i);
+	    for (i = 0; i < RARRAY_LENINT(a); i++) {
+		VALUE e = RARRAY_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -3927,10 +3903,10 @@ rt_complete_frags(VALUE klass, VALUE hash)
 		set_hash("wday", INT2FIX(0));
 	}
 	else if (k == sym("wnum1")) {
-	    long i;
+	    int i;
 
-	    for (i = 0; i < RARRAY_LEN(a); i++) {
-		VALUE e = RARRAY_AREF(a, i);
+	    for (i = 0; i < RARRAY_LENINT(a); i++) {
+		VALUE e = RARRAY_PTR(a)[i];
 
 		if (!NIL_P(ref_hash0(e)))
 		    break;
@@ -4648,7 +4624,6 @@ dup_obj(VALUE self)
 	{
 	    get_d1b(new);
 	    bdat->s = adat->s;
-	    RB_OBJ_WRITTEN(new, Qundef, bdat->s.nth);
 	    return new;
 	}
     }
@@ -4657,8 +4632,6 @@ dup_obj(VALUE self)
 	{
 	    get_d1b(new);
 	    bdat->c = adat->c;
-	    RB_OBJ_WRITTEN(new, Qundef, bdat->c.nth);
-	    RB_OBJ_WRITTEN(new, Qundef, bdat->c.sf);
 	    return new;
 	}
     }
@@ -4673,7 +4646,7 @@ dup_obj_as_complex(VALUE self)
 	VALUE new = d_lite_s_alloc_complex(rb_obj_class(self));
 	{
 	    get_d1b(new);
-	    copy_simple_to_complex(new, &bdat->c, &adat->s);
+	    copy_simple_to_complex(&bdat->c, &adat->s);
 	    bdat->c.flags |= HAVE_DF | COMPLEX_DAT;
 	    return new;
 	}
@@ -4683,8 +4656,6 @@ dup_obj_as_complex(VALUE self)
 	{
 	    get_d1b(new);
 	    bdat->c = adat->c;
-	    RB_OBJ_WRITTEN(new, Qundef, bdat->c.nth);
-	    RB_OBJ_WRITTEN(new, Qundef, bdat->c.sf);
 	    return new;
 	}
     }
@@ -4743,14 +4714,14 @@ d_lite_initialize(int argc, VALUE *argv, VALUE self)
 
 	decode_jd(jd, &nth, &rjd);
 	if (!df && f_zero_p(sf) && !of) {
-	    set_to_simple(self, &dat->s, nth, rjd, sg, 0, 0, 0, HAVE_JD);
+	    set_to_simple(&dat->s, nth, rjd, sg, 0, 0, 0, HAVE_JD);
 	}
 	else {
 	    if (!complex_dat_p(dat))
 		rb_raise(rb_eArgError,
 			 "cannot load complex into simple");
 
-	    set_to_complex(self, &dat->c, nth, rjd, df, sf, of, sg,
+	    set_to_complex(&dat->c, nth, rjd, df, sf, of, sg,
 			   0, 0, 0, 0, 0, 0, HAVE_JD | HAVE_DF | COMPLEX_DAT);
 	}
     }
@@ -5254,7 +5225,7 @@ d_lite_zone(VALUE self)
  * call-seq:
  *    d.julian?  ->  bool
  *
- * Returns true if the date is before the day of calendar reform.
+ * Retruns true if the date is before the day of calendar reform.
  *
  *     Date.new(1582,10,15).julian?		#=> false
  *     (Date.new(1582,10,15) - 1).julian?	#=> true
@@ -5270,7 +5241,7 @@ d_lite_julian_p(VALUE self)
  * call-seq:
  *    d.gregorian?  ->  bool
  *
- * Returns true if the date is on or after the day of calendar reform.
+ * Retunrs true if the date is on or after the day of calendar reform.
  *
  *     Date.new(1582,10,15).gregorian?		#=> true
  *     (Date.new(1582,10,15) - 1).gregorian?	#=> false
@@ -5722,7 +5693,8 @@ d_lite_plus(VALUE self, VALUE other)
 	}
 	break;
       default:
-	expect_numeric(other);
+	if (!k_numeric_p(other))
+	    rb_raise(rb_eTypeError, "expected numeric");
 	other = f_to_r(other);
 #ifdef CANONICALIZATION_FOR_MATHN
 	if (!k_rational_p(other))
@@ -5906,7 +5878,8 @@ d_lite_minus(VALUE self, VALUE other)
       case T_FLOAT:
 	return d_lite_plus(self, DBL2NUM(-RFLOAT_VALUE(other)));
       default:
-	expect_numeric(other);
+	if (!k_numeric_p(other))
+	    rb_raise(rb_eTypeError, "expected numeric");
 	/* fall through */
       case T_BIGNUM:
       case T_RATIONAL:
@@ -6025,7 +5998,6 @@ d_lite_rshift(VALUE self, VALUE other)
 static VALUE
 d_lite_lshift(VALUE self, VALUE other)
 {
-    expect_numeric(other);
     return d_lite_rshift(self, f_negate(other));
 }
 
@@ -6218,8 +6190,8 @@ cmp_dd(VALUE self, VALUE other)
 	int a_jd, b_jd,
 	    a_df, b_df;
 
-	m_canonicalize_jd(self, adat);
-	m_canonicalize_jd(other, bdat);
+	m_canonicalize_jd(adat);
+	m_canonicalize_jd(bdat);
 	a_nth = m_nth(adat);
 	b_nth = m_nth(bdat);
 	if (f_eqeq_p(a_nth, b_nth)) {
@@ -6297,8 +6269,8 @@ d_lite_cmp(VALUE self, VALUE other)
 	    VALUE a_nth, b_nth;
 	    int a_jd, b_jd;
 
-	    m_canonicalize_jd(self, adat);
-	    m_canonicalize_jd(other, bdat);
+	    m_canonicalize_jd(adat);
+	    m_canonicalize_jd(bdat);
 	    a_nth = m_nth(adat);
 	    b_nth = m_nth(bdat);
 	    if (f_eqeq_p(a_nth, b_nth)) {
@@ -6369,8 +6341,8 @@ d_lite_equal(VALUE self, VALUE other)
 	    VALUE a_nth, b_nth;
 	    int a_jd, b_jd;
 
-	    m_canonicalize_jd(self, adat);
-	    m_canonicalize_jd(other, bdat);
+	    m_canonicalize_jd(adat);
+	    m_canonicalize_jd(bdat);
 	    a_nth = m_nth(adat);
 	    b_nth = m_nth(bdat);
 	    a_jd = m_local_jd(adat);
@@ -6429,40 +6401,54 @@ d_lite_to_s(VALUE self)
 
 #ifndef NDEBUG
 static VALUE
-mk_inspect_raw(union DateData *x, VALUE klass)
+mk_inspect_flags(union DateData *x)
 {
-    char flags[5];
-
-    flags[0] = (x->flags & COMPLEX_DAT) ? 'C' : 'S';
-    flags[1] = (x->flags & HAVE_JD)     ? 'j' : '-';
-    flags[2] = (x->flags & HAVE_DF)     ? 'd' : '-';
-    flags[3] = (x->flags & HAVE_CIVIL)  ? 'c' : '-';
-    flags[4] = (x->flags & HAVE_TIME)   ? 't' : '-';
-    flags[5] = '\0';
+    return rb_enc_sprintf(rb_usascii_encoding(),
+			  "%c%c%c%c%c",
+			  (x->flags & COMPLEX_DAT) ? 'C' : 'S',
+			  (x->flags & HAVE_JD)     ? 'j' : '-',
+			  (x->flags & HAVE_DF)     ? 'd' : '-',
+			  (x->flags & HAVE_CIVIL)  ? 'c' : '-',
+			  (x->flags & HAVE_TIME)   ? 't' : '-');
+}
 
+static VALUE
+mk_inspect_raw(union DateData *x, const char *klass)
+{
     if (simple_dat_p(x)) {
+	VALUE nth, flags;
+
+	RB_GC_GUARD(nth) = f_inspect(x->s.nth);
+	RB_GC_GUARD(flags) = mk_inspect_flags(x);
+
 	return rb_enc_sprintf(rb_usascii_encoding(),
-			      "#<%"PRIsVALUE": "
-			      "(%+"PRIsVALUE"th,%dj),+0s,%.0fj; "
+			      "#<%s: "
+			      "(%sth,%dj),+0s,%.0fj; "
 			      "%dy%dm%dd; %s>",
-			      klass,
-			      x->s.nth, x->s.jd, x->s.sg,
+			      klass ? klass : "?",
+			      RSTRING_PTR(nth), x->s.jd, x->s.sg,
 #ifndef USE_PACK
 			      x->s.year, x->s.mon, x->s.mday,
 #else
 			      x->s.year,
 			      EX_MON(x->s.pc), EX_MDAY(x->s.pc),
 #endif
-			      flags);
+			      RSTRING_PTR(flags));
     }
     else {
+	VALUE nth, sf, flags;
+
+	RB_GC_GUARD(nth) = f_inspect(x->c.nth);
+	RB_GC_GUARD(sf) = f_inspect(x->c.sf);
+	RB_GC_GUARD(flags) = mk_inspect_flags(x);
+
 	return rb_enc_sprintf(rb_usascii_encoding(),
-			      "#<%"PRIsVALUE": "
-			      "(%+"PRIsVALUE"th,%dj,%ds,%+"PRIsVALUE"n),"
-			      "%+ds,%.0fj; "
+			      "#<%s: "
+			      "(%sth,%dj,%ds,%sn),%+ds,%.0fj; "
 			      "%dy%dm%dd %dh%dm%ds; %s>",
-			      klass,
-			      x->c.nth, x->c.jd, x->c.df, x->c.sf,
+			      klass ? klass : "?",
+			      RSTRING_PTR(nth), x->c.jd, x->c.df,
+			      RSTRING_PTR(sf),
 			      x->c.of, x->c.sg,
 #ifndef USE_PACK
 			      x->c.year, x->c.mon, x->c.mday,
@@ -6473,7 +6459,7 @@ mk_inspect_raw(union DateData *x, VALUE klass)
 			      EX_HOUR(x->c.pc), EX_MIN(x->c.pc),
 			      EX_SEC(x->c.pc),
 #endif
-			      flags);
+			      RSTRING_PTR(flags));
     }
 }
 
@@ -6481,18 +6467,23 @@ static VALUE
 d_lite_inspect_raw(VALUE self)
 {
     get_d1(self);
-    return mk_inspect_raw(dat, rb_obj_class(self));
+    return mk_inspect_raw(dat, rb_obj_classname(self));
 }
 #endif
 
 static VALUE
-mk_inspect(union DateData *x, VALUE klass, VALUE to_s)
+mk_inspect(union DateData *x, const char *klass, const char *to_s)
 {
+    VALUE jd, sf;
+
+    RB_GC_GUARD(jd) = f_inspect(m_real_jd(x));
+    RB_GC_GUARD(sf) = f_inspect(m_sf(x));
+
     return rb_enc_sprintf(rb_usascii_encoding(),
-			  "#<%"PRIsVALUE": %"PRIsVALUE" "
-			  "((%+"PRIsVALUE"j,%ds,%+"PRIsVALUE"n),%+ds,%.0fj)>",
-			  klass, to_s,
-			  m_real_jd(x), m_df(x), m_sf(x),
+			  "#<%s: %s ((%sj,%ds,%sn),%+ds,%.0fj)>",
+			  klass ? klass : "?",
+			  to_s ? to_s : "?",
+			  RSTRING_PTR(jd), m_df(x), RSTRING_PTR(sf),
 			  m_of(x), m_sg(x));
 }
 
@@ -6511,7 +6502,12 @@ static VALUE
 d_lite_inspect(VALUE self)
 {
     get_d1(self);
-    return mk_inspect(dat, rb_obj_class(self), self);
+    {
+	VALUE to_s;
+
+	RB_GC_GUARD(to_s) = f_to_s(self);
+	return mk_inspect(dat, rb_obj_classname(self), RSTRING_PTR(to_s));
+    }
 }
 
 #include <errno.h>
@@ -6600,7 +6596,7 @@ tmx_m_zone(union DateData *x)
     return RSTRING_PTR(m_zone(x));
 }
 
-static const struct tmx_funcs tmx_funcs = {
+static struct tmx_funcs tmx_funcs = {
     (VALUE (*)(void *))m_real_year,
     (int (*)(void *))m_yday,
     (int (*)(void *))m_mon,
@@ -6689,32 +6685,32 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  * call-seq:
  *    d.strftime([format='%F'])  ->  string
  *
- * Formats date according to the directives in the given format
- * string.
- * The directives begins with a percent (%) character.
- * Any text not listed as a directive will be passed through to the
- * output string.
+ *  Formats date according to the directives in the given format
+ *  string.
+ *  The directives begins with a percent (%) character.
+ *  Any text not listed as a directive will be passed through to the
+ *  output string.
  *
- * The directive consists of a percent (%) character,
- * zero or more flags, optional minimum field width,
- * optional modifier and a conversion specifier
- * as follows.
+ *  The directive consists of a percent (%) character,
+ *  zero or more flags, optional minimum field width,
+ *  optional modifier and a conversion specifier
+ *  as follows.
  *
  *    %<flags><width><modifier><conversion>
  *
- * Flags:
+ *  Flags:
  *    -  don't pad a numerical output.
  *    _  use spaces for padding.
  *    0  use zeros for padding.
  *    ^  upcase the result string.
  *    #  change case.
  *
- * The minimum field width specifies the minimum width.
+ *  The minimum field width specifies the minimum width.
  *
- * The modifiers are "E", "O", ":", "::" and ":::".
- * "E" and "O" are ignored.  No effect to result currently.
+ *  The modifiers are "E", "O", ":", "::" and ":::".
+ *  "E" and "O" are ignored.  No effect to result currently.
  *
- * Format directives:
+ *  Format directives:
  *
  *    Date (Year, Month, Day):
  *      %Y - Year with century (can be negative, 4 digits at least)
@@ -6807,23 +6803,23 @@ date_strftime_internal(int argc, VALUE *argv, VALUE self,
  *      %T - 24-hour time (%H:%M:%S)
  *      %+ - date(1) (%a %b %e %H:%M:%S %Z %Y)
  *
- * This method is similar to strftime() function defined in ISO C and POSIX.
- * Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
- * are locale dependent in the function.
- * However this method is locale independent.
- * So, the result may differ even if a same format string is used in other
- * systems such as C.
- * It is good practice to avoid %x and %X because there are corresponding
- * locale independent representations, %D and %T.
+ *  This method is similar to strftime() function defined in ISO C and POSIX.
+ *  Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
+ *  are locale dependent in the function.
+ *  However this method is locale independent.
+ *  So, the result may differ even if a same format string is used in other
+ *  systems such as C.
+ *  It is good practice to avoid %x and %X because there are corresponding
+ *  locale independent representations, %D and %T.
  *
- * Examples:
+ *  Examples:
  *
  *    d = DateTime.new(2007,11,19,8,37,48,"-06:00")
  *				#=> #<DateTime: 2007-11-19T08:37:48-0600 ...>
  *    d.strftime("Printed on %m/%d/%Y")   #=> "Printed on 11/19/2007"
  *    d.strftime("at %I:%M%p")            #=> "at 08:37AM"
  *
- * Various ISO 8601 formats:
+ *  Various ISO 8601 formats:
  *    %Y%m%d           => 20071119                  Calendar date (basic)
  *    %F               => 2007-11-19                Calendar date (extended)
  *    %Y-%m            => 2007-11                   Calendar date, reduced accuracy, specific month
@@ -6879,7 +6875,6 @@ strftimev(const char *fmt, VALUE self,
 
     (*func)(self, &tmx);
     len = date_strftime_alloc(&buf, fmt, &tmx);
-    RB_GC_GUARD(self);
     str = rb_usascii_str_new(buf, len);
     if (buf != buffer) xfree(buf);
     return str;
@@ -6953,40 +6948,30 @@ d_lite_httpdate(VALUE self)
     return strftimev("%a, %d %b %Y %T GMT", dup, set_tmx);
 }
 
-enum {
-    DECIMAL_SIZE_OF_LONG = DECIMAL_SIZE_OF_BITS(CHAR_BIT*sizeof(long)),
-    JISX0301_DATE_SIZE = DECIMAL_SIZE_OF_LONG+8
-};
+static VALUE
+jisx0301_date(VALUE jd, VALUE y)
+{
+    VALUE a[2];
 
-static const char *
-jisx0301_date_format(char *fmt, size_t size, VALUE jd, VALUE y)
-{
-    if (FIXNUM_P(jd)) {
-	long d = FIX2INT(jd);
-	long s;
-	char c;
-	if (d < 2405160)
-	    return "%Y-%m-%d";
-	if (d < 2419614) {
-	    c = 'M';
-	    s = 1867;
-	}
-	else if (d < 2424875) {
-	    c = 'T';
-	    s = 1911;
-	}
-	else if (d < 2447535) {
-	    c = 'S';
-	    s = 1925;
-	}
-	else {
-	    c = 'H';
-	    s = 1988;
-	}
-	snprintf(fmt, size, "%c%02ld" ".%%m.%%d", c, FIX2INT(y) - s);
-	return fmt;
+    if (f_lt_p(jd, INT2FIX(2405160)))
+	return rb_usascii_str_new2("%Y-%m-%d");
+    if (f_lt_p(jd, INT2FIX(2419614))) {
+	a[0] = rb_usascii_str_new2("M%02d" ".%%m.%%d");
+	a[1] = f_sub(y, INT2FIX(1867));
+    }
+    else if (f_lt_p(jd, INT2FIX(2424875))) {
+	a[0] = rb_usascii_str_new2("T%02d" ".%%m.%%d");
+	a[1] = f_sub(y, INT2FIX(1911));
     }
-    return "%Y-%m-%d";
+    else if (f_lt_p(jd, INT2FIX(2447535))) {
+	a[0] = rb_usascii_str_new2("S%02d" ".%%m.%%d");
+	a[1] = f_sub(y, INT2FIX(1925));
+    }
+    else {
+	a[0] = rb_usascii_str_new2("H%02d" ".%%m.%%d");
+	a[1] = f_sub(y, INT2FIX(1988));
+    }
+    return rb_f_sprintf(2, a);
 }
 
 /*
@@ -7000,14 +6985,12 @@ jisx0301_date_format(char *fmt, size_t size, VALUE jd, VALUE y)
 static VALUE
 d_lite_jisx0301(VALUE self)
 {
-    char fmtbuf[JISX0301_DATE_SIZE];
-    const char *fmt;
+    VALUE s;
 
     get_d1(self);
-    fmt = jisx0301_date_format(fmtbuf, sizeof(fmtbuf),
-			       m_real_local_jd(dat),
-			       m_real_year(dat));
-    return strftimev(fmt, self, set_tmx);
+    s = jisx0301_date(m_real_local_jd(dat),
+		      m_real_year(dat));
+    return strftimev(RSTRING_PTR(s), self, set_tmx);
 }
 
 #ifndef NDEBUG
@@ -7078,29 +7061,29 @@ d_lite_marshal_load(VALUE self, VALUE a)
 
 
 	    if  (RARRAY_LEN(a) == 2) {
-		ajd = f_sub(RARRAY_AREF(a, 0), half_days_in_day);
+		ajd = f_sub(RARRAY_PTR(a)[0], half_days_in_day);
 		of = INT2FIX(0);
-		sg = RARRAY_AREF(a, 1);
+		sg = RARRAY_PTR(a)[1];
 		if (!k_numeric_p(sg))
 		    sg = DBL2NUM(RTEST(sg) ? GREGORIAN : JULIAN);
 	    }
 	    else {
-		ajd = RARRAY_AREF(a, 0);
-		of = RARRAY_AREF(a, 1);
-		sg = RARRAY_AREF(a, 2);
+		ajd = RARRAY_PTR(a)[0];
+		of = RARRAY_PTR(a)[1];
+		sg = RARRAY_PTR(a)[2];
 	    }
 
 	    old_to_new(ajd, of, sg,
 		       &nth, &jd, &df, &sf, &rof, &rsg);
 
 	    if (!df && f_zero_p(sf) && !rof) {
-		set_to_simple(self, &dat->s, nth, jd, rsg, 0, 0, 0, HAVE_JD);
+		set_to_simple(&dat->s, nth, jd, rsg, 0, 0, 0, HAVE_JD);
 	    } else {
 		if (!complex_dat_p(dat))
 		    rb_raise(rb_eArgError,
 			     "cannot load complex into simple");
 
-		set_to_complex(self, &dat->c, nth, jd, df, sf, rof, rsg,
+		set_to_complex(&dat->c, nth, jd, df, sf, rof, rsg,
 			       0, 0, 0, 0, 0, 0,
 			       HAVE_JD | HAVE_DF | COMPLEX_DAT);
 	    }
@@ -7112,20 +7095,20 @@ d_lite_marshal_load(VALUE self, VALUE a)
 	    int jd, df, of;
 	    double sg;
 
-	    nth = RARRAY_AREF(a, 0);
-	    jd = NUM2INT(RARRAY_AREF(a, 1));
-	    df = NUM2INT(RARRAY_AREF(a, 2));
-	    sf = RARRAY_AREF(a, 3);
-	    of = NUM2INT(RARRAY_AREF(a, 4));
-	    sg = NUM2DBL(RARRAY_AREF(a, 5));
+	    nth = RARRAY_PTR(a)[0];
+	    jd = NUM2INT(RARRAY_PTR(a)[1]);
+	    df = NUM2INT(RARRAY_PTR(a)[2]);
+	    sf = RARRAY_PTR(a)[3];
+	    of = NUM2INT(RARRAY_PTR(a)[4]);
+	    sg = NUM2DBL(RARRAY_PTR(a)[5]);
 	    if (!df && f_zero_p(sf) && !of) {
-		set_to_simple(self, &dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
+		set_to_simple(&dat->s, nth, jd, sg, 0, 0, 0, HAVE_JD);
 	    } else {
 		if (!complex_dat_p(dat))
 		    rb_raise(rb_eArgError,
 			     "cannot load complex into simple");
 
-		set_to_complex(self, &dat->c, nth, jd, df, sf, of, sg,
+		set_to_complex(&dat->c, nth, jd, df, sf, of, sg,
 			       0, 0, 0, 0, 0, 0,
 			       HAVE_JD | HAVE_DF | COMPLEX_DAT);
 	    }
@@ -8132,20 +8115,20 @@ dt_lite_to_s(VALUE self)
  * call-seq:
  *    dt.strftime([format='%FT%T%:z'])  ->  string
  *
- * Formats date according to the directives in the given format
- * string.
- * The directives begins with a percent (%) character.
- * Any text not listed as a directive will be passed through to the
- * output string.
+ *  Formats date according to the directives in the given format
+ *  string.
+ *  The directives begins with a percent (%) character.
+ *  Any text not listed as a directive will be passed through to the
+ *  output string.
  *
- * The directive consists of a percent (%) character,
- * zero or more flags, optional minimum field width,
- * optional modifier and a conversion specifier
- * as follows.
+ *  The directive consists of a percent (%) character,
+ *  zero or more flags, optional minimum field width,
+ *  optional modifier and a conversion specifier
+ *  as follows.
  *
  *    %<flags><width><modifier><conversion>
  *
- * Flags:
+ *  Flags:
  *    -  don't pad a numerical output.
  *    _  use spaces for padding.
  *    0  use zeros for padding.
@@ -8153,12 +8136,12 @@ dt_lite_to_s(VALUE self)
  *    #  change case.
  *    :  use colons for %z.
  *
- * The minimum field width specifies the minimum width.
+ *  The minimum field width specifies the minimum width.
  *
- * The modifier is "E" and "O".
- * They are ignored.
+ *  The modifier is "E" and "O".
+ *  They are ignored.
  *
- * Format directives:
+ *  Format directives:
  *
  *    Date (Year, Month, Day):
  *      %Y - Year with century (can be negative, 4 digits at least)
@@ -8251,23 +8234,23 @@ dt_lite_to_s(VALUE self)
  *      %T - 24-hour time (%H:%M:%S)
  *      %+ - date(1) (%a %b %e %H:%M:%S %Z %Y)
  *
- * This method is similar to strftime() function defined in ISO C and POSIX.
- * Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
- * are locale dependent in the function.
- * However this method is locale independent.
- * So, the result may differ even if a same format string is used in other
- * systems such as C.
- * It is good practice to avoid %x and %X because there are corresponding
- * locale independent representations, %D and %T.
+ *  This method is similar to strftime() function defined in ISO C and POSIX.
+ *  Several directives (%a, %A, %b, %B, %c, %p, %r, %x, %X, %E*, %O* and %Z)
+ *  are locale dependent in the function.
+ *  However this method is locale independent.
+ *  So, the result may differ even if a same format string is used in other
+ *  systems such as C.
+ *  It is good practice to avoid %x and %X because there are corresponding
+ *  locale independent representations, %D and %T.
  *
- * Examples:
+ *  Examples:
  *
  *    d = DateTime.new(2007,11,19,8,37,48,"-06:00")
  *				#=> #<DateTime: 2007-11-19T08:37:48-0600 ...>
  *    d.strftime("Printed on %m/%d/%Y")   #=> "Printed on 11/19/2007"
  *    d.strftime("at %I:%M%p")            #=> "at 08:37AM"
  *
- * Various ISO 8601 formats:
+ *  Various ISO 8601 formats:
  *    %Y%m%d           => 20071119                  Calendar date (basic)
  *    %F               => 2007-11-19                Calendar date (extended)
  *    %Y-%m            => 2007-11                   Calendar date, reduced accuracy, specific month
@@ -8313,19 +8296,26 @@ dt_lite_strftime(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-iso8601_timediv(VALUE self, long n)
+iso8601_timediv(VALUE self, VALUE n)
 {
-    static const char timefmt[] = "T%H:%M:%S";
-    static const char zone[] = "%:z";
-    char fmt[sizeof(timefmt) + sizeof(zone) + rb_strlen_lit(".%N") +
-	     DECIMAL_SIZE_OF_LONG];
-    char *p = fmt;
+    VALUE fmt;
+
+    n = to_integer(n);
+    fmt = rb_usascii_str_new2("T%H:%M:%S");
+    if (f_gt_p(n, INT2FIX(0))) {
+	VALUE argv[3];
 
-    memcpy(p, timefmt, sizeof(timefmt)-1);
-    p += sizeof(timefmt)-1;
-    if (n > 0) p += snprintf(p, fmt+sizeof(fmt)-p, ".%%%ldN", n);
-    memcpy(p, zone, sizeof(zone));
-    return strftimev(fmt, self, set_tmx);
+	get_d1(self);
+
+	argv[0] = rb_usascii_str_new2(".%0*d");
+	argv[1] = n;
+	argv[2] = f_round(f_quo(m_sf_in_sec(dat),
+				f_quo(INT2FIX(1),
+				      f_expt(INT2FIX(10), n))));
+	rb_str_append(fmt, rb_f_sprintf(3, argv));
+    }
+    rb_str_append(fmt, rb_usascii_str_new2("%:z"));
+    return strftimev(RSTRING_PTR(fmt), self, set_tmx);
 }
 
 /*
@@ -8342,14 +8332,15 @@ iso8601_timediv(VALUE self, long n)
 static VALUE
 dt_lite_iso8601(int argc, VALUE *argv, VALUE self)
 {
-    long n = 0;
+    VALUE n;
 
-    rb_check_arity(argc, 0, 1);
-    if (argc >= 1)
-	n = NUM2LONG(argv[0]);
+    rb_scan_args(argc, argv, "01", &n);
+
+    if (argc < 1)
+	n = INT2FIX(0);
 
-    return rb_str_append(strftimev("%Y-%m-%d", self, set_tmx),
-			 iso8601_timediv(self, n));
+    return f_add(strftimev("%Y-%m-%d", self, set_tmx),
+		 iso8601_timediv(self, n));
 }
 
 /*
@@ -8381,32 +8372,41 @@ dt_lite_rfc3339(int argc, VALUE *argv, VALUE self)
 static VALUE
 dt_lite_jisx0301(int argc, VALUE *argv, VALUE self)
 {
-    long n = 0;
+    VALUE n, s;
 
-    rb_check_arity(argc, 0, 1);
-    if (argc >= 1)
-	n = NUM2LONG(argv[0]);
+    rb_scan_args(argc, argv, "01", &n);
 
-    return rb_str_append(d_lite_jisx0301(self),
-			 iso8601_timediv(self, n));
+    if (argc < 1)
+	n = INT2FIX(0);
+
+    {
+	get_d1(self);
+	s = jisx0301_date(m_real_local_jd(dat),
+			  m_real_year(dat));
+	return rb_str_append(strftimev(RSTRING_PTR(s), self, set_tmx),
+			     iso8601_timediv(self, n));
+    }
 }
 
 /* conversions */
 
+#define f_getlocal(x) rb_funcall(x, rb_intern("getlocal"), 0)
 #define f_subsec(x) rb_funcall(x, rb_intern("subsec"), 0)
 #define f_utc_offset(x) rb_funcall(x, rb_intern("utc_offset"), 0)
 #define f_local3(x,y,m,d) rb_funcall(x, rb_intern("local"), 3, y, m, d)
+#define f_utc6(x,y,m,d,h,min,s) rb_funcall(x, rb_intern("utc"), 6,\
+					   y, m, d, h, min, s)
 
 /*
  * call-seq:
  *    t.to_time  ->  time
  *
- * Returns self.
+ * Returns a copy of self as local mode.
  */
 static VALUE
 time_to_time(VALUE self)
 {
-    return self;
+    return f_getlocal(self);
 }
 
 /*
@@ -8501,7 +8501,7 @@ date_to_time(VALUE self)
  * call-seq:
  *    d.to_date  ->  self
  *
- * Returns self.
+ * Returns self;
  */
 static VALUE
 date_to_date(VALUE self)
@@ -8534,7 +8534,7 @@ date_to_datetime(VALUE self)
 	    get_d1b(new);
 	    bdat->c = adat->c;
 	    bdat->c.df = 0;
-	    RB_OBJ_WRITE(new, &bdat->c.sf, INT2FIX(0));
+	    bdat->c.sf = INT2FIX(0);
 #ifndef USE_PACK
 	    bdat->c.hour = 0;
 	    bdat->c.min = 0;
@@ -8558,24 +8558,21 @@ date_to_datetime(VALUE self)
 static VALUE
 datetime_to_time(VALUE self)
 {
-    volatile VALUE dup = dup_obj(self);
+    volatile VALUE dup = dup_obj_with_new_offset(self, 0);
     {
 	VALUE t;
 
 	get_d1(dup);
 
-	t = rb_funcall(rb_cTime,
-		   rb_intern("new"),
-                   7,
+	t = f_utc6(rb_cTime,
 		   m_real_year(dat),
 		   INT2FIX(m_mon(dat)),
 		   INT2FIX(m_mday(dat)),
 		   INT2FIX(m_hour(dat)),
 		   INT2FIX(m_min(dat)),
 		   f_add(INT2FIX(m_sec(dat)),
-			 m_sf_in_sec(dat)),
-		   INT2FIX(m_of(dat)));
-	return t;
+			 m_sf_in_sec(dat)));
+	return f_getlocal(t);
     }
 }
 
@@ -8603,7 +8600,7 @@ datetime_to_date(VALUE self)
 	VALUE new = d_lite_s_alloc_simple(cDate);
 	{
 	    get_d1b(new);
-	    copy_complex_to_simple(new, &bdat->s, &adat->c)
+	    copy_complex_to_simple(&bdat->s, &adat->c)
 	    bdat->s.jd = m_local_jd(adat);
 	    bdat->s.flags &= ~(HAVE_DF | HAVE_TIME | COMPLEX_DAT);
 	    return new;
@@ -9031,7 +9028,7 @@ Init_date_core(void)
      * The calendar week is a seven day period within a calendar year,
      * starting on a Monday and identified by its ordinal number within
      * the year; the first calendar week of the year is the one that
-     * includes the first Thursday of that year. In the Gregorian
+     * includes the first Thursday of that year.  In the Gregorian
      * calendar, this is equivalent to the week which includes January 4.
      *
      * In those classes, this so-called "commercial".
@@ -9042,8 +9039,8 @@ Init_date_core(void)
      * time) on January 1, 4713 BCE (in the Julian calendar).
      *
      * In this document, the astronomical Julian day number is same as the
-     * original Julian day number. And the chronological Julian day
-     * number is a variation of the Julian day number. Its days begin at
+     * original Julian day number.  And the chronological Julian day
+     * number is a variation of the Julian day number.  Its days begin at
      * midnight on local time.
      *
      * In this document, when the term "Julian day number" simply appears,
@@ -9059,9 +9056,9 @@ Init_date_core(void)
      * Gregorian calendar).
      *
      * In this document, the astronomical modified Julian day number is
-     * same as the original modified Julian day number. And the
+     * same as the original modified Julian day number.  And the
      * chronological modified Julian day number is a variation of the
-     * modified Julian day number. Its days begin at midnight on local
+     * modified Julian day number.  Its days begin at midnight on local
      * time.
      *
      * In this document, when the term "modified Julian day number" simply
@@ -9070,9 +9067,10 @@ Init_date_core(void)
      *
      * In those classes, this is so-called "mjd".
      *
+     *
      * == Date
      *
-     * A subclass of Object that includes Comparable module and easily handles
+     * A subclass of Object includes Comparable module, easily handles
      * date.
      *
      * Date object is created with Date::new, Date::jd, Date::ordinal,
@@ -9081,20 +9079,14 @@ Init_date_core(void)
      *
      *     require 'date'
      *
-     *     Date.new(2001,2,3)
-     *	    #=> #<Date: 2001-02-03 ...>
-     *     Date.jd(2451944)
-     *	    #=> #<Date: 2001-02-03 ...>
-     *     Date.ordinal(2001,34)
-     *	    #=> #<Date: 2001-02-03 ...>
-     *     Date.commercial(2001,5,6)
-     *	    #=> #<Date: 2001-02-03 ...>
-     *     Date.parse('2001-02-03')
-     *	    #=> #<Date: 2001-02-03 ...>
+     *     Date.new(2001,2,3)		#=> #<Date: 2001-02-03 ...>
+     *     Date.jd(2451944)		#=> #<Date: 2001-02-03 ...>
+     *     Date.ordinal(2001,34)	#=> #<Date: 2001-02-03 ...>
+     *     Date.commercial(2001,5,6)	#=> #<Date: 2001-02-03 ...>
+     *     Date.parse('2001-02-03')	#=> #<Date: 2001-02-03 ...>
      *     Date.strptime('03-02-2001', '%d-%m-%Y')
-     *	    #=> #<Date: 2001-02-03 ...>
-     *     Time.new(2001,2,3).to_date
-     *	    #=> #<Date: 2001-02-03 ...>
+     *					#=> #<Date: 2001-02-03 ...>
+     *     Time.new(2001,2,3).to_date	#=> #<Date: 2001-02-03 ...>
      *
      * All date objects are immutable; hence cannot modify themselves.
      *
@@ -9102,11 +9094,11 @@ Init_date_core(void)
      * of the day count, the offset and the day of calendar reform.
      *
      * The day count denotes the absolute position of a temporal
-     * dimension. The offset is relative adjustment, which determines
-     * decoded local time with the day count. The day of calendar
-     * reform denotes the start day of the new style. The old style
+     * dimension.  The offset is relative adjustment, which determines
+     * decoded local time with the day count.  The day of calendar
+     * reform denotes the start day of the new style.  The old style
      * of the West is the Julian calendar which was adopted by
-     * Caesar. The new style is the Gregorian calendar, which is the
+     * Caersar.  The new style is the Gregorian calendar, which is the
      * current civil calendar of many countries.
      *
      * The day count is virtually the astronomical Julian day number.
@@ -9144,6 +9136,66 @@ Init_date_core(void)
      *     d += 1			#=> #<Date: 2001-02-04 ...>
      *     d.strftime('%a %d %b %Y')	#=> "Sun 04 Feb 2001"
      *
+     *
+     * == DateTime
+     *
+     * A subclass of Date easily handles date, hour, minute, second and
+     * offset.
+     *
+     * DateTime does not consider any leapseconds, does not track
+     * any summer time rules.
+     *
+     * DateTime object is created with DateTime::new, DateTime::jd,
+     * DateTime::ordinal, DateTime::commercial, DateTime::parse,
+     * DateTime::strptime, DateTime::now, Time#to_datetime or etc.
+     *
+     *     require 'date'
+     *
+     *     DateTime.new(2001,2,3,4,5,6)
+     *				#=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
+     *
+     * The last element of day, hour, minute or senond can be
+     * fractional number. The fractional number's precision is assumed
+     * at most nanosecond.
+     *
+     *     DateTime.new(2001,2,3.5)
+     *				#=> #<DateTime: 2001-02-03T12:00:00+00:00 ...>
+     *
+     * An optional argument the offset indicates the difference
+     * between the local time and UTC.  For example, Rational(3,24)
+     * represents ahead of 3 hours of UTC, Rational(-5,24) represents
+     * behind of 5 hours of UTC.  The offset should be -1 to +1, and
+     * its precision is assumed at most second.  The default value is
+     * zero (equals to UTC).
+     *
+     *     DateTime.new(2001,2,3,4,5,6,Rational(3,24))
+     *				#=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
+     * also accepts string form.
+     *
+     *     DateTime.new(2001,2,3,4,5,6,'+03:00')
+     *				#=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
+     *
+     * An optional argument the day of calendar reform (start) denotes
+     * a Julian day number, which should be 2298874 to 2426355 or
+     * -/+oo.  The default value is Date::ITALY (2299161=1582-10-15).
+     *
+     * DateTime object has various methods. See each reference.
+     *
+     *     d = DateTime.parse('3rd Feb 2001 04:05:06+03:30')
+     *				#=> #<DateTime: 2001-02-03T04:05:06+03:30 ...>
+     *     d.hour		#=> 4
+     *     d.min		#=> 5
+     *     d.sec		#=> 6
+     *     d.offset		#=> (7/48)
+     *     d.zone		#=> "+03:30"
+     *     d += Rational('1.5')
+     *				#=> #<DateTime: 2001-02-04%16:05:06+03:30 ...>
+     *     d = d.new_offset('+09:00')
+     *				#=> #<DateTime: 2001-02-04%21:35:06+09:00 ...>
+     *     d.strftime('%I:%M:%S %p')
+     *				#=> "09:35:06 PM"
+     *     d > DateTime.new(1999)
+     *				#=> true
      */
     cDate = rb_define_class("Date", rb_cObject);
 
@@ -9391,144 +9443,7 @@ Init_date_core(void)
     rb_define_method(cDate, "marshal_load", d_lite_marshal_load, 1);
     rb_define_singleton_method(cDate, "_load", date_s__load, 1);
 
-    /*
-     * == DateTime
-     *
-     * A subclass of Date that easily handles date, hour, minute, second and
-     * offset.
-     *
-     * DateTime does not consider any leap seconds, does not track
-     * any summer time rules.
-     *
-     * DateTime object is created with DateTime::new, DateTime::jd,
-     * DateTime::ordinal, DateTime::commercial, DateTime::parse,
-     * DateTime::strptime, DateTime::now, Time#to_datetime or etc.
-     *
-     *     require 'date'
-     *
-     *     DateTime.new(2001,2,3,4,5,6)
-     *                         #=> #<DateTime: 2001-02-03T04:05:06+00:00 ...>
-     *
-     * The last element of day, hour, minute or second can be
-     * fractional number. The fractional number's precision is assumed
-     * at most nanosecond.
-     *
-     *     DateTime.new(2001,2,3.5)
-     *                         #=> #<DateTime: 2001-02-03T12:00:00+00:00 ...>
-     *
-     * An optional argument the offset indicates the difference
-     * between the local time and UTC. For example, <tt>Rational(3,24)</tt>
-     * represents ahead of 3 hours of UTC, <tt>Rational(-5,24)</tt> represents
-     * behind of 5 hours of UTC. The offset should be -1 to +1, and
-     * its precision is assumed at most second. The default value is
-     * zero(equals to UTC).
-     *
-     *     DateTime.new(2001,2,3,4,5,6,Rational(3,24))
-     *                         #=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
-     *
-     * also accepts string form.
-     *
-     *     DateTime.new(2001,2,3,4,5,6,'+03:00')
-     *                         #=> #<DateTime: 2001-02-03T04:05:06+03:00 ...>
-     *
-     * An optional argument the day of calendar reform (start) denotes
-     * a Julian day number, which should be 2298874 to 2426355 or
-     * -/+oo.  The default value is +Date::ITALY+ (2299161=1582-10-15).
-     *
-     * DateTime object has various methods. See each reference.
-     *
-     *     d = DateTime.parse('3rd Feb 2001 04:05:06+03:30')
-     *                         #=> #<DateTime: 2001-02-03T04:05:06+03:30 ...>
-     *     d.hour              #=> 4
-     *     d.min               #=> 5
-     *     d.sec               #=> 6
-     *     d.offset            #=> (7/48)
-     *     d.zone              #=> "+03:30"
-     *     d += Rational('1.5')
-     *                         #=> #<DateTime: 2001-02-04%16:05:06+03:30 ...>
-     *     d = d.new_offset('+09:00')
-     *                         #=> #<DateTime: 2001-02-04%21:35:06+09:00 ...>
-     *     d.strftime('%I:%M:%S %p')
-     *                         #=> "09:35:06 PM"
-     *     d > DateTime.new(1999)
-     *                         #=> true
-     *
-     * === When should you use DateTime and when should you use Time?
-     *
-     * It's a common misconception that
-     * {William Shakespeare}[http://en.wikipedia.org/wiki/William_Shakespeare]
-     * and
-     * {Miguel de Cervantes}[http://en.wikipedia.org/wiki/Miguel_de_Cervantes]
-     * died on the same day in history -
-     * so much so that UNESCO named April 23 as
-     * {World Book Day because of this fact}[http://en.wikipedia.org/wiki/World_Book_Day].
-     * However because England hadn't yet adopted
-     * {Gregorian Calendar Reform}[http://en.wikipedia.org/wiki/Gregorian_calendar#Gregorian_reform]
-     * (and wouldn't until {1752}[http://en.wikipedia.org/wiki/Calendar_(New_Style)_Act_1750])
-     * their deaths are actually 10 days apart.
-     * Since Ruby's Time class implements a
-     * {proleptic Gregorian calendar}[http://en.wikipedia.org/wiki/Proleptic_Gregorian_calendar]
-     * and has no concept of calendar reform then there's no way
-     * to express this. This is where DateTime steps in:
-     *
-     *     shakespeare = DateTime.iso8601('1616-04-23', Date::ENGLAND)
-     *      #=> Tue, 23 Apr 1616 00:00:00 +0000
-     *     cervantes = DateTime.iso8601('1616-04-23', Date::ITALY)
-     *      #=> Sat, 23 Apr 1616 00:00:00 +0000
-     *
-     * Already you can see something's weird - the days of the week
-     * are different, taking this further:
-     *
-     *     cervantes == shakespeare
-     *      #=> false
-     *     (shakespeare - cervantes).to_i
-     *      #=> 10
-     *
-     * This shows that in fact they died 10 days apart (in reality
-     * 11 days since Cervantes died a day earlier but was buried on
-     * the 23rd). We can see the actual date of Shakespeare's death by
-     * using the #gregorian method to convert it:
-     *
-     *     shakespeare.gregorian
-     *      #=> Tue, 03 May 1616 00:00:00 +0000
-     *
-     * So there's an argument that all the celebrations that take
-     * place on the 23rd April in Stratford-upon-Avon are actually
-     * the wrong date since England is now using the Gregorian calendar.
-     * You can see why when we transition across the reform
-     * date boundary:
-     *
-     *     # start off with the anniversary of Shakespeare's birth in 1751
-     *     shakespeare = DateTime.iso8601('1751-04-23', Date::ENGLAND)
-     *      #=> Tue, 23 Apr 1751 00:00:00 +0000
-     *
-     *     # add 366 days since 1752 is a leap year and April 23 is after February 29
-     *     shakespeare + 366
-     *      #=> Thu, 23 Apr 1752 00:00:00 +0000
-     *
-     *     # add another 365 days to take us to the anniversary in 1753
-     *     shakespeare + 366 + 365
-     *      #=> Fri, 04 May 1753 00:00:00 +0000
-     *
-     * As you can see, if we're accurately tracking the number of
-     * {solar years}[http://en.wikipedia.org/wiki/Tropical_year]
-     * since Shakespeare's birthday then the correct anniversary date
-     * would be the 4th May and not the 23rd April.
-     *
-     * So when should you use DateTime in Ruby and when should
-     * you use Time? Almost certainly you'll want to use Time
-     * since your app is probably dealing with current dates and
-     * times. However, if you need to deal with dates and times in a
-     * historical context you'll want to use DateTime to avoid
-     * making the same mistakes as UNESCO. If you also have to deal
-     * with timezones then best of luck - just bear in mind that
-     * you'll probably be dealing with
-     * {local solar times}[http://en.wikipedia.org/wiki/Solar_time],
-     * since it wasn't until the 19th century that the introduction
-     * of the railways necessitated the need for
-     * {Standard Time}[http://en.wikipedia.org/wiki/Standard_time#Great_Britain]
-     * and eventually timezones.
-     */
+    /* datetime */
 
     cDateTime = rb_define_class("DateTime", cDate);
 
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
index b74230d291..239e2643b0 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -7,9 +7,6 @@
 #include "ruby/re.h"
 #include <ctype.h>
 
-RUBY_EXTERN VALUE rb_int_positive_pow(long x, unsigned long y);
-RUBY_EXTERN unsigned long ruby_scan_digits(const char *str, ssize_t len, int base, size_t *retlen, int *overflow);
-
 /* #define TIGHT_PARSER */
 
 #define sizeof_array(o) (sizeof o / sizeof o[0])
@@ -47,12 +44,12 @@ RUBY_EXTERN unsigned long ruby_scan_digits(const char *str, ssize_t len, int bas
 #define cstr2num(s) rb_cstr_to_inum(s, 10, 0)
 #define str2num(s) rb_str_to_inum(s, 10, 0)
 
-static const char abbr_days[][4] = {
+static const char *abbr_days[] = {
     "sun", "mon", "tue", "wed",
     "thu", "fri", "sat"
 };
 
-static const char abbr_months[][4] = {
+static const char *abbr_months[] = {
     "jan", "feb", "mar", "apr", "may", "jun",
     "jul", "aug", "sep", "oct", "nov", "dec"
 };
@@ -71,7 +68,6 @@ static const char abbr_months[][4] = {
 static void
 s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 {
-    VALUE vbuf = 0;
     VALUE c = Qnil;
 
     if (!RB_TYPE_P(m, T_STRING))
@@ -168,11 +164,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	{
 	    char *buf;
 
-	    buf = ALLOCV_N(char, vbuf, ep - bp + 1);
+	    buf = ALLOCA_N(char, ep - bp + 1);
 	    memcpy(buf, bp, ep - bp);
 	    buf[ep - bp] = '\0';
 	    iy = cstr2num(buf);
-	    ALLOCV_END(vbuf);
 	}
 	set_hash("year", iy);
     }
@@ -194,11 +189,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	{
 	    char *buf;
 
-	    buf = ALLOCV_N(char, vbuf, ep - bp + 1);
+	    buf = ALLOCA_N(char, ep - bp + 1);
 	    memcpy(buf, bp, ep - bp);
 	    buf[ep - bp] = '\0';
 	    im = cstr2num(buf);
-	    ALLOCV_END(vbuf);
 	}
 	set_hash("mon", im);
     }
@@ -217,11 +211,10 @@ s3e(VALUE hash, VALUE y, VALUE m, VALUE d, int bc)
 	{
 	    char *buf;
 
-	    buf = ALLOCV_N(char, vbuf, ep - bp + 1);
+	    buf = ALLOCA_N(char, ep - bp + 1);
 	    memcpy(buf, bp, ep - bp);
 	    buf[ep - bp] = '\0';
 	    id = cstr2num(buf);
-	    ALLOCV_END(vbuf);
 	}
 	set_hash("mday", id);
     }
@@ -340,20 +333,93 @@ subx(VALUE str, VALUE rep, VALUE pat, VALUE hash, int (*cb)(VALUE, VALUE))
 }
 #endif
 
-#include "zonetab.h"
+struct zone {
+    const char *name;
+    int offset;
+};
 
-static int
-str_end_with(const char *s, long l, const char *w)
-{
-    int n = (int)strlen(w);
-    return (l >= n && strncmp(s - n, w, n) == 0);
-}
+static struct zone zones_source[] = {
+    {"ut",   0*3600}, {"gmt",  0*3600}, {"est", -5*3600}, {"edt", -4*3600},
+    {"cst", -6*3600}, {"cdt", -5*3600}, {"mst", -7*3600}, {"mdt", -6*3600},
+    {"pst", -8*3600}, {"pdt", -7*3600},
+    {"a",    1*3600}, {"b",    2*3600}, {"c",    3*3600}, {"d",    4*3600},
+    {"e",    5*3600}, {"f",    6*3600}, {"g",    7*3600}, {"h",    8*3600},
+    {"i",    9*3600}, {"k",   10*3600}, {"l",   11*3600}, {"m",   12*3600},
+    {"n",   -1*3600}, {"o",   -2*3600}, {"p",   -3*3600}, {"q",   -4*3600},
+    {"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},
+    {"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},
+    {"arabic",                  10800}, {"atlantic",               -14400},
+    {"aus central",             34200}, {"aus eastern",             36000},
+    {"azores",                  -3600}, {"canada central",         -21600},
+    {"cape verde",              -3600}, {"caucasus",                14400},
+    {"cen. australia",          34200}, {"central america",        -21600},
+    {"central asia",            21600}, {"central europe",           3600},
+    {"central european",         3600}, {"central pacific",         39600},
+    {"central",                -21600}, {"china",                   28800},
+    {"dateline",               -43200}, {"e. africa",               10800},
+    {"e. australia",            36000}, {"e. europe",                7200},
+    {"e. south america",       -10800}, {"eastern",                -18000},
+    {"egypt",                    7200}, {"ekaterinburg",            18000},
+    {"fiji",                    43200}, {"fle",                      7200},
+    {"greenland",              -10800}, {"greenwich",                   0},
+    {"gtb",                      7200}, {"hawaiian",               -36000},
+    {"india",                   19800}, {"iran",                    12600},
+    {"jerusalem",                7200}, {"korea",                   32400},
+    {"mexico",                 -21600}, {"mid-atlantic",            -7200},
+    {"mountain",               -25200}, {"myanmar",                 23400},
+    {"n. central asia",         21600}, {"nepal",                   20700},
+    {"new zealand",             43200}, {"newfoundland",           -12600},
+    {"north asia east",         28800}, {"north asia",              25200},
+    {"pacific sa",             -14400}, {"pacific",                -28800},
+    {"romance",                  3600}, {"russian",                 10800},
+    {"sa eastern",             -10800}, {"sa pacific",             -18000},
+    {"sa western",             -14400}, {"samoa",                  -39600},
+    {"se asia",                 25200}, {"malay peninsula",         28800},
+    {"south africa",             7200}, {"sri lanka",               21600},
+    {"taipei",                  28800}, {"tasmania",                36000},
+    {"tokyo",                   32400}, {"tonga",                   46800},
+    {"us eastern",             -18000}, {"us mountain",            -25200},
+    {"vladivostok",             36000}, {"w. australia",            28800},
+    {"w. central africa",        3600}, {"w. europe",                3600},
+    {"west asia",               18000}, {"west pacific",            36000},
+    {"yakutsk",                 32400}
+};
 
 VALUE
 date_zone_to_diff(VALUE str)
 {
     VALUE offset = Qnil;
-    VALUE vbuf = 0;
 
     long l, i;
     char *s, *dest, *d;
@@ -362,7 +428,7 @@ date_zone_to_diff(VALUE str)
     l = RSTRING_LEN(str);
     s = RSTRING_PTR(str);
 
-    dest = d = ALLOCV_N(char, vbuf, l + 1);
+    dest = d = ALLOCA_N(char, l + 1);
 
     for (i = 0; i < l; i++) {
 	if (isspace((unsigned char)s[i]) || s[i] == '\0') {
@@ -383,96 +449,162 @@ date_zone_to_diff(VALUE str)
 	    --d;
 	*d = '\0';
     }
-    l = d - dest;
-    s = dest;
+    str = rb_str_new2(dest);
     {
-	static const char STD[] = " standard time";
-	static const char DST1[] = " daylight time";
-	static const char DST2[] = " dst";
+#define STD " standard time"
+#define DST " daylight time"
+	char *ss, *ds;
+	long sl, dl;
 	int dst = 0;
 
-	if (str_end_with(d, l, STD)) {
-	    l -= sizeof(STD) - 1;
+	sl = RSTRING_LEN(str) - (sizeof STD - 1);
+	ss = RSTRING_PTR(str) + sl;
+	dl = RSTRING_LEN(str) - (sizeof DST - 1);
+	ds = RSTRING_PTR(str) + dl;
+
+	if (sl >= 0 && strcmp(ss, STD) == 0) {
+	    str = rb_str_new(RSTRING_PTR(str), sl);
 	}
-	else if (str_end_with(d, l, DST1)) {
-	    l -= sizeof(DST1) - 1;
+	else if (dl >= 0 && strcmp(ds, DST) == 0) {
+	    str = rb_str_new(RSTRING_PTR(str), dl);
 	    dst = 1;
 	}
-	else if (str_end_with(d, l, DST2)) {
-	    l -= sizeof(DST2) - 1;
-	    dst = 1;
+#undef STD
+#undef DST
+	else {
+#define DST " dst"
+	    char *ds;
+	    long dl;
+
+	    dl = RSTRING_LEN(str) - (sizeof DST - 1);
+	    ds = RSTRING_PTR(str) + dl;
+
+	    if (dl >= 0 && strcmp(ds, DST) == 0) {
+		str = rb_str_new(RSTRING_PTR(str), dl);
+		dst = 1;
+	    }
+#undef DST
 	}
 	{
-	    const struct zone *z = zonetab(s, (unsigned int)l);
-	    if (z) {
-		int d = z->offset;
+	    static VALUE zones = Qnil;
+
+	    if (NIL_P(zones)) {
+		int i;
+
+		zones = rb_hash_new();
+		rb_gc_register_mark_object(zones);
+		for (i = 0; i < (int)sizeof_array(zones_source); i++) {
+		    VALUE name = rb_str_new2(zones_source[i].name);
+		    VALUE offset = INT2FIX(zones_source[i].offset);
+		    rb_hash_aset(zones, name, offset);
+		}
+	    }
+
+	    offset = f_aref(zones, str);
+	    if (!NIL_P(offset)) {
 		if (dst)
-		    d += 3600;
-		offset = INT2FIX(d);
+		    offset = f_add(offset, INT2FIX(3600));
 		goto ok;
 	    }
 	}
 	{
-	    char *p;
-	    int sign = 0;
-	    long hour = 0, min = 0, sec = 0;
+	    char *s, *p;
+	    VALUE sign;
+	    VALUE hour = Qnil, min = Qnil, sec = Qnil;
+	    VALUE str_orig;
+
+	    s = RSTRING_PTR(str);
+	    str_orig = str;
 
-	    if (l > 3 &&
-		(strncmp(s, "gmt", 3) == 0 ||
-		 strncmp(s, "utc", 3) == 0)) {
+	    if (strncmp(s, "gmt", 3) == 0 ||
+		strncmp(s, "utc", 3) == 0)
 		s += 3;
-		l -= 3;
-	    }
 	    if (issign(*s)) {
-		sign = *s == '-';
+		sign = rb_str_new(s, 1);
 		s++;
-		l--;
 
-		hour = STRTOUL(s, &p, 10);
-		if (*p == ':') {
+		str = rb_str_new2(s);
+
+		if (p = strchr(s, ':')) {
+		    hour = rb_str_new(s, p - s);
 		    s = ++p;
-		    min = STRTOUL(s, &p, 10);
-		    if (*p == ':') {
+		    if (p = strchr(s, ':')) {
+			min = rb_str_new(s, p - s);
 			s = ++p;
-			sec = STRTOUL(s, &p, 10);
+			if (p = strchr(s, ':')) {
+			    sec = rb_str_new(s, p - s);
+			}
+			else
+			    sec = rb_str_new2(s);
 		    }
+		    else
+			min = rb_str_new2(s);
+		    RB_GC_GUARD(str_orig);
 		    goto num;
 		}
-		if (*p == ',' || *p == '.') {
-		    char *e = 0;
-		    p++;
-		    min = STRTOUL(p, &e, 10) * 3600;
-		    if (sign) {
-			hour = -hour;
-			min = -min;
-		    }
-		    offset = rb_rational_new(INT2FIX(min),
-					     rb_int_positive_pow(10, (int)(e - p)));
-		    offset = f_add(INT2FIX(hour * 3600), offset);
-		    goto ok;
+		if (strpbrk(RSTRING_PTR(str), ",.")) {
+		    char *a, *b;
+
+		    a = ALLOCA_N(char, RSTRING_LEN(str) + 1);
+		    strcpy(a, RSTRING_PTR(str));
+		    b = strpbrk(a, ",.");
+		    *b = '\0';
+		    b++;
+
+		    hour = cstr2num(a);
+		    min = f_mul(rb_rational_new2
+				(cstr2num(b),
+				 f_expt(INT2FIX(10),
+					LONG2NUM((long)strlen(b)))),
+				INT2FIX(60));
+		    goto num;
 		}
-		else if (l > 2) {
-		    size_t n;
-		    int ov;
-
-		    if (l >= 1)
-			hour = ruby_scan_digits(&s[0], 2 - l % 2, 10, &n, &ov);
-		    if (l >= 3)
-			min  = ruby_scan_digits(&s[2 - l % 2], 2, 10, &n, &ov);
-		    if (l >= 5)
-			sec  = ruby_scan_digits(&s[4 - l % 2], 2, 10, &n, &ov);
+		{
+		    const char *cs = RSTRING_PTR(str);
+		    long cl = RSTRING_LEN(str);
+
+		    if (cl % 2) {
+			if (cl >= 1)
+			    hour = rb_str_new(&cs[0], 1);
+			if (cl >= 3)
+			    min  = rb_str_new(&cs[1], 2);
+			if (cl >= 5)
+			    sec  = rb_str_new(&cs[3], 2);
+		    }
+		    else {
+			if (cl >= 2)
+			    hour = rb_str_new(&cs[0], 2);
+			if (cl >= 4)
+			    min  = rb_str_new(&cs[2], 2);
+			if (cl >= 6)
+			    sec  = rb_str_new(&cs[4], 2);
+		    }
 		    goto num;
 		}
 	      num:
-		sec += min * 60 + hour * 3600;
-		if (sign) sec = -sec;
-		offset = INT2FIX(sec);
+		if (NIL_P(hour))
+		    offset = INT2FIX(0);
+		else {
+		    if (RB_TYPE_P(hour, T_STRING))
+			hour = str2num(hour);
+		    offset = f_mul(hour, INT2FIX(3600));
+		}
+		if (!NIL_P(min)) {
+		    if (RB_TYPE_P(min, T_STRING))
+			min = str2num(min);
+		    offset = f_add(offset, f_mul(min, INT2FIX(60)));
+		}
+		if (!NIL_P(sec))
+		    offset = f_add(offset, str2num(sec));
+		if (!NIL_P(sign) &&
+		    RSTRING_LEN(sign) == 1 &&
+		    *RSTRING_PTR(sign) == '-')
+		    offset = f_negate(offset);
 	    }
 	}
     }
     RB_GC_GUARD(str);
   ok:
-    ALLOCV_END(vbuf);
     return offset;
 }
 
@@ -1843,8 +1975,7 @@ parse_ddd_cb(VALUE m, VALUE hash)
 	set_hash("zone", s5);
 
 	if (*cs5 == '[') {
-	    VALUE vbuf = 0;
-	    char *buf = ALLOCV_N(char, vbuf, l5 + 1);
+	    char *buf = ALLOCA_N(char, l5 + 1);
 	    char *s1, *s2, *s3;
 	    VALUE zone;
 
@@ -1866,7 +1997,6 @@ parse_ddd_cb(VALUE m, VALUE hash)
 	    if (isdigit((unsigned char)*s1))
 		*--s1 = '+';
 	    set_hash("offset", date_zone_to_diff(rb_str_new2(s1)));
-	    ALLOCV_END(vbuf);
 	}
 	RB_GC_GUARD(s5);
     }
diff --git a/ext/date/date_strftime.c b/ext/date/date_strftime.c
index 9d8167b612..20931a3124 100644
--- a/ext/date/date_strftime.c
+++ b/ext/date/date_strftime.c
@@ -48,7 +48,7 @@ downcase(char *s, size_t i)
 /* strftime --- produce formatted time */
 
 static size_t
-date_strftime_with_tmx(char *s, const size_t maxsize, const char *format,
+date_strftime_with_tmx(char *s, size_t maxsize, const char *format,
 		       const struct tmx *tmx)
 {
     char *endp = s + maxsize;
@@ -575,12 +575,7 @@ date_strftime_with_tmx(char *s, const size_t maxsize, const char *format,
 	  case '5': case '6':  case '7': case '8': case '9':
 	    {
 		char *e;
-		unsigned long prec = strtoul(format, &e, 10);
-		if (prec > INT_MAX || prec > maxsize) {
-		    errno = ERANGE;
-		    return 0;
-		}
-		precision = (int)prec;
+		precision = (int)strtoul(format, &e, 10);
 		format = e - 1;
 		goto again;
 	    }
diff --git a/ext/date/date_strptime.c b/ext/date/date_strptime.c
index 4f93219317..e318af19f3 100644
--- a/ext/date/date_strptime.c
+++ b/ext/date/date_strptime.c
@@ -103,12 +103,10 @@ read_digits(const char *s, VALUE *n, size_t width)
 	return l;
     }
     else {
-	VALUE vbuf = 0;
-	char *s2 = ALLOCV_N(char, vbuf, l + 1);
+	char *s2 = ALLOCA_N(char, l + 1);
 	memcpy(s2, s, l);
 	s2[l] = '\0';
 	*n = rb_cstr_to_inum(s2, 10, 0);
-	ALLOCV_END(vbuf);
 	return l;
     }
 }
diff --git a/ext/date/date_tmx.h b/ext/date/date_tmx.h
index 993a15327d..ed06501228 100644
--- a/ext/date/date_tmx.h
+++ b/ext/date/date_tmx.h
@@ -23,7 +23,7 @@ struct tmx_funcs {
 };
 struct tmx {
     void *dat;
-    const struct tmx_funcs *funcs;
+    struct tmx_funcs *funcs;
 };
 
 #define tmx_attr(x) (tmx->funcs->x)(tmx->dat)
diff --git a/ext/date/depend b/ext/date/depend
index 2c24e91432..3a13fcc9a9 100644
--- a/ext/date/depend
+++ b/ext/date/depend
@@ -1,60 +1,7 @@
-# AUTOGENERATED DEPENDENCIES START
-date_core.o: $(RUBY_EXTCONF_H)
-date_core.o: $(arch_hdrdir)/ruby/config.h
-date_core.o: $(hdrdir)/ruby/backward.h
-date_core.o: $(hdrdir)/ruby/defines.h
-date_core.o: $(hdrdir)/ruby/encoding.h
-date_core.o: $(hdrdir)/ruby/intern.h
-date_core.o: $(hdrdir)/ruby/missing.h
-date_core.o: $(hdrdir)/ruby/oniguruma.h
-date_core.o: $(hdrdir)/ruby/ruby.h
-date_core.o: $(hdrdir)/ruby/st.h
-date_core.o: $(hdrdir)/ruby/subst.h
-date_core.o: $(hdrdir)/ruby/util.h
-date_core.o: $(top_srcdir)/include/ruby.h
-date_core.o: date_core.c
-date_core.o: date_tmx.h
-date_parse.o: $(RUBY_EXTCONF_H)
-date_parse.o: $(arch_hdrdir)/ruby/config.h
-date_parse.o: $(hdrdir)/ruby/backward.h
-date_parse.o: $(hdrdir)/ruby/defines.h
-date_parse.o: $(hdrdir)/ruby/encoding.h
-date_parse.o: $(hdrdir)/ruby/intern.h
-date_parse.o: $(hdrdir)/ruby/missing.h
-date_parse.o: $(hdrdir)/ruby/oniguruma.h
-date_parse.o: $(hdrdir)/ruby/re.h
-date_parse.o: $(hdrdir)/ruby/regex.h
-date_parse.o: $(hdrdir)/ruby/ruby.h
-date_parse.o: $(hdrdir)/ruby/st.h
-date_parse.o: $(hdrdir)/ruby/subst.h
-date_parse.o: $(top_srcdir)/include/ruby.h
-date_parse.o: date_parse.c
-date_parse.o: zonetab.h
-date_parse.o: zonetab.list
-date_strftime.o: $(RUBY_EXTCONF_H)
-date_strftime.o: $(arch_hdrdir)/ruby/config.h
-date_strftime.o: $(hdrdir)/ruby/backward.h
-date_strftime.o: $(hdrdir)/ruby/defines.h
-date_strftime.o: $(hdrdir)/ruby/intern.h
-date_strftime.o: $(hdrdir)/ruby/missing.h
-date_strftime.o: $(hdrdir)/ruby/ruby.h
-date_strftime.o: $(hdrdir)/ruby/st.h
-date_strftime.o: $(hdrdir)/ruby/subst.h
-date_strftime.o: date_strftime.c
+$(OBJS): $(ruby_headers)
+date_core.o: date_tmx.h $(hdrdir)/ruby/encoding.h $(hdrdir)/ruby/oniguruma.h
 date_strftime.o: date_tmx.h
-date_strptime.o: $(RUBY_EXTCONF_H)
-date_strptime.o: $(arch_hdrdir)/ruby/config.h
-date_strptime.o: $(hdrdir)/ruby/backward.h
-date_strptime.o: $(hdrdir)/ruby/defines.h
-date_strptime.o: $(hdrdir)/ruby/encoding.h
-date_strptime.o: $(hdrdir)/ruby/intern.h
-date_strptime.o: $(hdrdir)/ruby/missing.h
-date_strptime.o: $(hdrdir)/ruby/oniguruma.h
-date_strptime.o: $(hdrdir)/ruby/re.h
-date_strptime.o: $(hdrdir)/ruby/regex.h
-date_strptime.o: $(hdrdir)/ruby/ruby.h
-date_strptime.o: $(hdrdir)/ruby/st.h
-date_strptime.o: $(hdrdir)/ruby/subst.h
-date_strptime.o: $(top_srcdir)/include/ruby.h
-date_strptime.o: date_strptime.c
-# AUTOGENERATED DEPENDENCIES END
+date_parse.o: $(hdrdir)/ruby/encoding.h $(hdrdir)/ruby/oniguruma.h $(hdrdir)/ruby/re.h $(hdrdir)/ruby/regex.h
+date_strptime.o: $(hdrdir)/ruby/encoding.h $(hdrdir)/ruby/oniguruma.h $(hdrdir)/ruby/re.h $(hdrdir)/ruby/regex.h
+
+
diff --git a/ext/date/extconf.rb b/ext/date/extconf.rb
index e8596952de..9f7d3e8f0b 100644
--- a/ext/date/extconf.rb
+++ b/ext/date/extconf.rb
@@ -1,4 +1,2 @@
-# frozen_string_literal: false
 require 'mkmf'
-config_string("strict_warnflags") {|w| $warnflags += " #{w}"}
 create_makefile('date_core')
diff --git a/ext/date/lib/date.rb b/ext/date/lib/date.rb
index c10441e573..83234f458b 100644
--- a/ext/date/lib/date.rb
+++ b/ext/date/lib/date.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # date.rb: Written by Tadayoshi Funaba 1998-2011
 
 require 'date_core'
@@ -15,26 +14,26 @@ class Date
 
     protected :d
 
-    def zero?() false end
-    def finite?() false end
-    def infinite?() d.nonzero? end
-    def nan?() d.zero? end
+    def zero? () false end
+    def finite? () false end
+    def infinite? () d.nonzero? end
+    def nan? () d.zero? end
 
     def abs() self.class.new end
 
-    def -@() self.class.new(-d) end
-    def +@() self.class.new(+d) end
+    def -@ () self.class.new(-d) end
+    def +@ () self.class.new(+d) end
 
-    def <=>(other)
+    def <=> (other)
       case other
       when Infinity; return d <=> other.d
       when Numeric; return d
       else
-        begin
-          l, r = other.coerce(self)
-          return l <=> r
-        rescue NoMethodError
-        end
+	begin
+	  l, r = other.coerce(self)
+	  return l <=> r
+	rescue NoMethodError
+	end
       end
       nil
     end
@@ -43,16 +42,16 @@ class Date
       case other
       when Numeric; return -d, d
       else
-        super
+	super
       end
     end
 
     def to_f
       return 0 if @d == 0
       if @d > 0
-        Float::INFINITY
+	Float::INFINITY
       else
-        -Float::INFINITY
+	-Float::INFINITY
       end
     end
 
diff --git a/ext/date/prereq.mk b/ext/date/prereq.mk
deleted file mode 100644
index a0a5a2bff3..0000000000
--- a/ext/date/prereq.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-.SUFFIXES: .list
-
-.list.h:
-	gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
-	| sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
-	> $(@F)
-
-zonetab.h: zonetab.list
diff --git a/ext/date/zonetab.h b/ext/date/zonetab.h
deleted file mode 100644
index fa86e7991a..0000000000
--- a/ext/date/zonetab.h
+++ /dev/null
@@ -1,902 +0,0 @@
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list  */
-/* Computed positions: -k'1-4,$' */
-
-#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 "zonetab.list"
-
-struct zone {
-    int name;
-    int offset;
-};
-static const struct zone *zonetab();
-#line 9 "zonetab.list"
-struct zone;
-/* maximum key range = 434, duplicates = 0 */
-
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
-__inline
-#endif
-static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const unsigned short asso_values[] =
-    {
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439,  19, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439,   2,   4, 439, 439, 439,
-      439, 439,   8,   6,   3, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439,   7,  63,  53,
-        2,   4,  32, 110,  88,  78,  90,  68,  47, 108,
-       10,  73,  81, 124,   3,   1,   4,  77, 116,  88,
-       15,  96,  45,   5, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439, 439, 439, 439,
-      439, 439, 439, 439, 439, 439, 439
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[3]];
-      /*FALLTHROUGH*/
-      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]+1];
-        break;
-    }
-  return hval + asso_values[(unsigned char)str[len - 1]];
-}
-
-struct stringpool_t
-  {
-    char stringpool_str5[sizeof("r")];
-    char stringpool_str6[sizeof("s")];
-    char stringpool_str7[sizeof("d")];
-    char stringpool_str14[sizeof("cst")];
-    char stringpool_str15[sizeof("cdt")];
-    char stringpool_str16[sizeof("sst")];
-    char stringpool_str17[sizeof("cet")];
-    char stringpool_str18[sizeof("msd")];
-    char stringpool_str19[sizeof("cest")];
-    char stringpool_str20[sizeof("cat")];
-    char stringpool_str22[sizeof("mst")];
-    char stringpool_str23[sizeof("mdt")];
-    char stringpool_str24[sizeof("sast")];
-    char stringpool_str25[sizeof("met")];
-    char stringpool_str27[sizeof("mest")];
-    char stringpool_str30[sizeof("wet")];
-    char stringpool_str31[sizeof("dateline")];
-    char stringpool_str32[sizeof("west")];
-    char stringpool_str33[sizeof("wat")];
-    char stringpool_str35[sizeof("wast")];
-    char stringpool_str36[sizeof("wadt")];
-    char stringpool_str37[sizeof("e")];
-    char stringpool_str38[sizeof("central europe")];
-    char stringpool_str39[sizeof("central asia")];
-    char stringpool_str40[sizeof("west asia")];
-    char stringpool_str41[sizeof("cen. australia")];
-    char stringpool_str42[sizeof("central america")];
-    char stringpool_str44[sizeof("est")];
-    char stringpool_str45[sizeof("edt")];
-    char stringpool_str46[sizeof("central european")];
-    char stringpool_str47[sizeof("eet")];
-    char stringpool_str48[sizeof("se asia")];
-    char stringpool_str49[sizeof("eest")];
-    char stringpool_str50[sizeof("eat")];
-    char stringpool_str51[sizeof("z")];
-    char stringpool_str52[sizeof("east")];
-    char stringpool_str53[sizeof("eadt")];
-    char stringpool_str54[sizeof("sa eastern")];
-    char stringpool_str55[sizeof("w. europe")];
-    char stringpool_str56[sizeof("c")];
-    char stringpool_str57[sizeof("yst")];
-    char stringpool_str58[sizeof("ydt")];
-    char stringpool_str59[sizeof("kst")];
-    char stringpool_str60[sizeof("clt")];
-    char stringpool_str61[sizeof("eastern")];
-    char stringpool_str62[sizeof("clst")];
-    char stringpool_str63[sizeof("bt")];
-    char stringpool_str64[sizeof("w. australia")];
-    char stringpool_str65[sizeof("bst")];
-    char stringpool_str66[sizeof("cct")];
-    char stringpool_str67[sizeof("brt")];
-    char stringpool_str69[sizeof("brst")];
-    char stringpool_str71[sizeof("a")];
-    char stringpool_str72[sizeof("e. europe")];
-    char stringpool_str73[sizeof("at")];
-    char stringpool_str74[sizeof("central")];
-    char stringpool_str75[sizeof("ast")];
-    char stringpool_str76[sizeof("adt")];
-    char stringpool_str77[sizeof("art")];
-    char stringpool_str78[sizeof("e. africa")];
-    char stringpool_str79[sizeof("e. south america")];
-    char stringpool_str80[sizeof("jst")];
-    char stringpool_str81[sizeof("e. australia")];
-    char stringpool_str82[sizeof("t")];
-    char stringpool_str83[sizeof("nt")];
-    char stringpool_str84[sizeof("n")];
-    char stringpool_str85[sizeof("nst")];
-    char stringpool_str86[sizeof("ndt")];
-    char stringpool_str87[sizeof("canada central")];
-    char stringpool_str88[sizeof("central pacific")];
-    char stringpool_str89[sizeof("west pacific")];
-    char stringpool_str90[sizeof("hst")];
-    char stringpool_str91[sizeof("hdt")];
-    char stringpool_str93[sizeof("malay peninsula")];
-    char stringpool_str95[sizeof("zp6")];
-    char stringpool_str97[sizeof("russian")];
-    char stringpool_str98[sizeof("hast")];
-    char stringpool_str99[sizeof("hadt")];
-    char stringpool_str100[sizeof("gst")];
-    char stringpool_str101[sizeof("zp5")];
-    char stringpool_str102[sizeof("ist")];
-    char stringpool_str103[sizeof("swt")];
-    char stringpool_str104[sizeof("w")];
-    char stringpool_str105[sizeof("zp4")];
-    char stringpool_str107[sizeof("mez")];
-    char stringpool_str108[sizeof("cape verde")];
-    char stringpool_str109[sizeof("mesz")];
-    char stringpool_str110[sizeof("greenland")];
-    char stringpool_str112[sizeof("x")];
-    char stringpool_str114[sizeof("mewt")];
-    char stringpool_str115[sizeof("w. central africa")];
-    char stringpool_str116[sizeof("k")];
-    char stringpool_str117[sizeof("b")];
-    char stringpool_str119[sizeof("m")];
-    char stringpool_str120[sizeof("sri lanka")];
-    char stringpool_str122[sizeof("fst")];
-    char stringpool_str124[sizeof("iran")];
-    char stringpool_str125[sizeof("sgt")];
-    char stringpool_str126[sizeof("ut")];
-    char stringpool_str128[sizeof("q")];
-    char stringpool_str129[sizeof("nzt")];
-    char stringpool_str131[sizeof("nzst")];
-    char stringpool_str132[sizeof("nzdt")];
-    char stringpool_str133[sizeof("myanmar")];
-    char stringpool_str135[sizeof("alaskan")];
-    char stringpool_str136[sizeof("pst")];
-    char stringpool_str137[sizeof("pdt")];
-    char stringpool_str138[sizeof("sa western")];
-    char stringpool_str139[sizeof("korea")];
-    char stringpool_str142[sizeof("y")];
-    char stringpool_str143[sizeof("f")];
-    char stringpool_str144[sizeof("akst")];
-    char stringpool_str145[sizeof("akdt")];
-    char stringpool_str148[sizeof("caucasus")];
-    char stringpool_str150[sizeof("msk")];
-    char stringpool_str151[sizeof("idle")];
-    char stringpool_str153[sizeof("arabian")];
-    char stringpool_str155[sizeof("o")];
-    char stringpool_str156[sizeof("l")];
-    char stringpool_str157[sizeof("mid-atlantic")];
-    char stringpool_str160[sizeof("us eastern")];
-    char stringpool_str164[sizeof("ahst")];
-    char stringpool_str167[sizeof("h")];
-    char stringpool_str168[sizeof("fle")];
-    char stringpool_str169[sizeof("i")];
-    char stringpool_str170[sizeof("north asia")];
-    char stringpool_str171[sizeof("n. central asia")];
-    char stringpool_str172[sizeof("north asia east")];
-    char stringpool_str174[sizeof("sa pacific")];
-    char stringpool_str177[sizeof("south africa")];
-    char stringpool_str181[sizeof("aus eastern")];
-    char stringpool_str182[sizeof("atlantic")];
-    char stringpool_str186[sizeof("mexico")];
-    char stringpool_str188[sizeof("mountain")];
-    char stringpool_str190[sizeof("china")];
-    char stringpool_str191[sizeof("azores")];
-    char stringpool_str192[sizeof("india")];
-    char stringpool_str194[sizeof("u")];
-    char stringpool_str195[sizeof("arabic")];
-    char stringpool_str196[sizeof("greenwich")];
-    char stringpool_str197[sizeof("new zealand")];
-    char stringpool_str198[sizeof("hawaiian")];
-    char stringpool_str199[sizeof("g")];
-    char stringpool_str200[sizeof("romance")];
-    char stringpool_str203[sizeof("arab")];
-    char stringpool_str204[sizeof("samoa")];
-    char stringpool_str205[sizeof("v")];
-    char stringpool_str206[sizeof("p")];
-    char stringpool_str207[sizeof("gmt")];
-    char stringpool_str208[sizeof("tasmania")];
-    char stringpool_str209[sizeof("fwt")];
-    char stringpool_str211[sizeof("newfoundland")];
-    char stringpool_str217[sizeof("nepal")];
-    char stringpool_str218[sizeof("aus central")];
-    char stringpool_str221[sizeof("gtb")];
-    char stringpool_str223[sizeof("vladivostok")];
-    char stringpool_str229[sizeof("utc")];
-    char stringpool_str233[sizeof("ekaterinburg")];
-    char stringpool_str265[sizeof("us mountain")];
-    char stringpool_str269[sizeof("jerusalem")];
-    char stringpool_str272[sizeof("yakutsk")];
-    char stringpool_str279[sizeof("pacific sa")];
-    char stringpool_str282[sizeof("tonga")];
-    char stringpool_str314[sizeof("afghanistan")];
-    char stringpool_str319[sizeof("idlw")];
-    char stringpool_str322[sizeof("pacific")];
-    char stringpool_str327[sizeof("taipei")];
-    char stringpool_str328[sizeof("egypt")];
-    char stringpool_str392[sizeof("tokyo")];
-    char stringpool_str438[sizeof("fiji")];
-  };
-static const struct stringpool_t stringpool_contents =
-  {
-    "r",
-    "s",
-    "d",
-    "cst",
-    "cdt",
-    "sst",
-    "cet",
-    "msd",
-    "cest",
-    "cat",
-    "mst",
-    "mdt",
-    "sast",
-    "met",
-    "mest",
-    "wet",
-    "dateline",
-    "west",
-    "wat",
-    "wast",
-    "wadt",
-    "e",
-    "central europe",
-    "central asia",
-    "west asia",
-    "cen. australia",
-    "central america",
-    "est",
-    "edt",
-    "central european",
-    "eet",
-    "se asia",
-    "eest",
-    "eat",
-    "z",
-    "east",
-    "eadt",
-    "sa eastern",
-    "w. europe",
-    "c",
-    "yst",
-    "ydt",
-    "kst",
-    "clt",
-    "eastern",
-    "clst",
-    "bt",
-    "w. australia",
-    "bst",
-    "cct",
-    "brt",
-    "brst",
-    "a",
-    "e. europe",
-    "at",
-    "central",
-    "ast",
-    "adt",
-    "art",
-    "e. africa",
-    "e. south america",
-    "jst",
-    "e. australia",
-    "t",
-    "nt",
-    "n",
-    "nst",
-    "ndt",
-    "canada central",
-    "central pacific",
-    "west pacific",
-    "hst",
-    "hdt",
-    "malay peninsula",
-    "zp6",
-    "russian",
-    "hast",
-    "hadt",
-    "gst",
-    "zp5",
-    "ist",
-    "swt",
-    "w",
-    "zp4",
-    "mez",
-    "cape verde",
-    "mesz",
-    "greenland",
-    "x",
-    "mewt",
-    "w. central africa",
-    "k",
-    "b",
-    "m",
-    "sri lanka",
-    "fst",
-    "iran",
-    "sgt",
-    "ut",
-    "q",
-    "nzt",
-    "nzst",
-    "nzdt",
-    "myanmar",
-    "alaskan",
-    "pst",
-    "pdt",
-    "sa western",
-    "korea",
-    "y",
-    "f",
-    "akst",
-    "akdt",
-    "caucasus",
-    "msk",
-    "idle",
-    "arabian",
-    "o",
-    "l",
-    "mid-atlantic",
-    "us eastern",
-    "ahst",
-    "h",
-    "fle",
-    "i",
-    "north asia",
-    "n. central asia",
-    "north asia east",
-    "sa pacific",
-    "south africa",
-    "aus eastern",
-    "atlantic",
-    "mexico",
-    "mountain",
-    "china",
-    "azores",
-    "india",
-    "u",
-    "arabic",
-    "greenwich",
-    "new zealand",
-    "hawaiian",
-    "g",
-    "romance",
-    "arab",
-    "samoa",
-    "v",
-    "p",
-    "gmt",
-    "tasmania",
-    "fwt",
-    "newfoundland",
-    "nepal",
-    "aus central",
-    "gtb",
-    "vladivostok",
-    "utc",
-    "ekaterinburg",
-    "us mountain",
-    "jerusalem",
-    "yakutsk",
-    "pacific sa",
-    "tonga",
-    "afghanistan",
-    "idlw",
-    "pacific",
-    "taipei",
-    "egypt",
-    "tokyo",
-    "fiji"
-  };
-#define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct zone *
-zonetab (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 170,
-      MIN_WORD_LENGTH = 1,
-      MAX_WORD_LENGTH = 17,
-      MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 438
-    };
-
-  static const struct zone wordlist[] =
-    {
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 37 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str5),   -5*3600},
-#line 38 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str6),   -6*3600},
-#line 24 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str7),    4*3600},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 15 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str14), -6*3600},
-#line 16 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str15), -5*3600},
-#line 85 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str16),  2*3600},
-#line 71 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str17),  1*3600},
-#line 90 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str18),  4*3600},
-#line 79 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str19), 2*3600},
-#line 65 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str20),-10*3600},
-      {-1},
-#line 17 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str22), -7*3600},
-#line 18 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str23), -6*3600},
-#line 84 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str24), 2*3600},
-#line 73 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str25),  1*3600},
-      {-1},
-#line 82 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str27), 2*3600},
-      {-1}, {-1},
-#line 47 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str30),  0*3600},
-#line 128 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str31),               -43200},
-#line 78 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str32), 1*3600},
-#line 77 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str33),  1*3600},
-      {-1},
-#line 95 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str35), 7*3600},
-#line 98 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str36), 8*3600},
-#line 25 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str37),    5*3600},
-#line 123 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str38),           3600},
-#line 122 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str39),            21600},
-#line 178 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str40),               18000},
-#line 120 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str41),          34200},
-#line 121 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str42),        -21600},
-      {-1},
-#line 13 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str44), -5*3600},
-#line 14 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str45), -4*3600},
-#line 124 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str46),         3600},
-#line 80 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str47),  2*3600},
-#line 164 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str48),                 25200},
-#line 88 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str49), 3*3600},
-#line 87 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str50),  3*3600},
-#line 45 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str51),    0*3600},
-#line 101 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str52),10*3600},
-#line 103 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str53),11*3600},
-#line 160 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str54),             -10800},
-#line 177 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str55),                3600},
-#line 23 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str56),    3*3600},
-#line 63 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str57), -9*3600},
-#line 59 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str58), -8*3600},
-#line 100 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str59),  9*3600},
-#line 57 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str60), -4*3600},
-#line 133 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str61),                -18000},
-#line 54 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str62),-3*3600},
-#line 86 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str63),   3*3600},
-#line 175 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str64),            28800},
-#line 70 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str65),  1*3600},
-#line 96 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str66),  8*3600},
-#line 53 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str67), -3*3600},
-      {-1},
-#line 49 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str69),-2*3600},
-      {-1},
-#line 21 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str71),    1*3600},
-#line 131 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str72),                7200},
-#line 48 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str73),  -2*3600},
-#line 126 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str74),                -21600},
-#line 56 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str75), -4*3600},
-#line 52 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str76), -3*3600},
-#line 51 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str77), -3*3600},
-#line 129 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str78),               10800},
-#line 132 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str79),       -10800},
-#line 99 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str80),  9*3600},
-#line 130 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str81),            36000},
-#line 39 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str82),   -7*3600},
-#line 68 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str83),  -11*3600},
-#line 33 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str84),   -1*3600},
-#line 55 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str85), -(3*3600+1800)},
-#line 50 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str86), -(2*3600+1800)},
-#line 117 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str87),         -21600},
-#line 125 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str88),         39600},
-#line 179 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str89),            36000},
-#line 67 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str90),-10*3600},
-#line 62 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str91), -9*3600},
-      {-1},
-#line 165 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str93),         28800},
-      {-1},
-#line 94 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str95),  6*3600},
-      {-1},
-#line 159 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str97),                 10800},
-#line 66 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str98),-10*3600},
-#line 61 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str99),-9*3600},
-#line 102 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str100), 10*3600},
-#line 92 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str101),  5*3600},
-#line 93 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str102),  (5*3600+1800)},
-#line 76 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str103),  1*3600},
-#line 42 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str104),  -10*3600},
-#line 91 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str105),  4*3600},
-      {-1},
-#line 75 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str107),  1*3600},
-#line 118 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str108),              -3600},
-#line 83 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str109), 2*3600},
-#line 138 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str110),              -10800},
-      {-1},
-#line 43 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str112),  -11*3600},
-      {-1},
-#line 74 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str114), 1*3600},
-#line 176 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str115),        3600},
-#line 30 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str116),   10*3600},
-#line 22 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str117),    2*3600},
-      {-1},
-#line 32 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str119),   12*3600},
-#line 167 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str120),               21600},
-      {-1},
-#line 81 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str122),  2*3600},
-      {-1},
-#line 143 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str124),                    12600},
-#line 97 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str125),  8*3600},
-#line 11 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str126),   0*3600},
-      {-1},
-#line 36 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str128),   -4*3600},
-#line 106 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str129), 12*3600},
-      {-1},
-#line 105 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str131),12*3600},
-#line 107 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str132),13*3600},
-#line 149 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str133),                 23400},
-      {-1},
-#line 109 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str135),                -32400},
-#line 19 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str136), -8*3600},
-#line 20 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str137), -7*3600},
-#line 162 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str138),             -14400},
-#line 145 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str139),                   32400},
-      {-1}, {-1},
-#line 44 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str142),  -12*3600},
-#line 26 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str143),    6*3600},
-#line 60 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str144),-9*3600},
-#line 58 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str145),-8*3600},
-      {-1}, {-1},
-#line 119 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str148),                14400},
-      {-1},
-#line 89 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str150),  3*3600},
-#line 104 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str151),12*3600},
-      {-1},
-#line 111 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str153),                 14400},
-      {-1},
-#line 34 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str155),   -2*3600},
-#line 31 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str156),   11*3600},
-#line 147 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str157),            -7200},
-      {-1}, {-1},
-#line 172 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str160),             -18000},
-      {-1}, {-1}, {-1},
-#line 64 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str164),-10*3600},
-      {-1}, {-1},
-#line 28 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str167),    8*3600},
-#line 137 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str168),                      7200},
-#line 29 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str169),    9*3600},
-#line 155 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str170),              25200},
-#line 150 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str171),         21600},
-#line 154 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str172),         28800},
-      {-1},
-#line 161 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str174),             -18000},
-      {-1}, {-1},
-#line 166 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str177),             7200},
-      {-1}, {-1}, {-1},
-#line 115 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str181),             36000},
-#line 113 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str182),               -14400},
-      {-1}, {-1}, {-1},
-#line 146 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str186),                 -21600},
-      {-1},
-#line 148 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str188),               -25200},
-      {-1},
-#line 127 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str190),                   28800},
-#line 116 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str191),                  -3600},
-#line 142 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str192),                   19800},
-      {-1},
-#line 40 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str194),   -8*3600},
-#line 112 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str195),                  10800},
-#line 139 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str196),                   0},
-#line 152 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str197),             43200},
-#line 141 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str198),               -36000},
-#line 27 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str199),    7*3600},
-#line 158 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str200),                  3600},
-      {-1}, {-1},
-#line 110 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str203),                    10800},
-#line 163 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str204),                  -39600},
-#line 41 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str205),   -9*3600},
-#line 35 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str206),   -3*3600},
-#line 12 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str207),  0*3600},
-#line 169 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str208),                36000},
-#line 72 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str209),  1*3600},
-      {-1},
-#line 153 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str211),           -12600},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 151 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str217),                   20700},
-#line 114 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str218),             34200},
-      {-1}, {-1},
-#line 140 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str221),                      7200},
-      {-1},
-#line 174 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str223),             36000},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 46 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str229),  0*3600},
-      {-1}, {-1}, {-1},
-#line 135 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str233),            18000},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-#line 173 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str265),            -25200},
-      {-1}, {-1}, {-1},
-#line 144 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str269),                7200},
-      {-1}, {-1},
-#line 180 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str272),                 32400},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 156 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str279),             -14400},
-      {-1}, {-1},
-#line 171 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str282),                   46800},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-#line 108 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str314),             16200},
-      {-1}, {-1}, {-1}, {-1},
-#line 69 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str319),-12*3600},
-      {-1}, {-1},
-#line 157 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str322),                -28800},
-      {-1}, {-1}, {-1}, {-1},
-#line 168 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str327),                  28800},
-#line 134 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str328),                    7200},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 170 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str392),                   32400},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 136 "zonetab.list"
-      {offsetof(struct stringpool_t, stringpool_str438),                    43200}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].name;
-          if (o >= 0)
-            {
-              register const char *s = o + stringpool;
-
-              if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
-#line 181 "zonetab.list"
-
diff --git a/ext/date/zonetab.list b/ext/date/zonetab.list
deleted file mode 100644
index 3a4d121d2e..0000000000
--- a/ext/date/zonetab.list
+++ /dev/null
@@ -1,181 +0,0 @@
-%{
-struct zone {
-    int name;
-    int offset;
-};
-static const struct zone *zonetab();
-%}
-
-struct zone;
-%%
-ut,   0*3600
-gmt,  0*3600
-est, -5*3600
-edt, -4*3600
-cst, -6*3600
-cdt, -5*3600
-mst, -7*3600
-mdt, -6*3600
-pst, -8*3600
-pdt, -7*3600
-a,    1*3600
-b,    2*3600
-c,    3*3600
-d,    4*3600
-e,    5*3600
-f,    6*3600
-g,    7*3600
-h,    8*3600
-i,    9*3600
-k,   10*3600
-l,   11*3600
-m,   12*3600
-n,   -1*3600
-o,   -2*3600
-p,   -3*3600
-q,   -4*3600
-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
-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
-arabic,                  10800
-atlantic,               -14400
-aus central,             34200
-aus eastern,             36000
-azores,                  -3600
-canada central,         -21600
-cape verde,              -3600
-caucasus,                14400
-cen. australia,          34200
-central america,        -21600
-central asia,            21600
-central europe,           3600
-central european,         3600
-central pacific,         39600
-central,                -21600
-china,                   28800
-dateline,               -43200
-e. africa,               10800
-e. australia,            36000
-e. europe,                7200
-e. south america,       -10800
-eastern,                -18000
-egypt,                    7200
-ekaterinburg,            18000
-fiji,                    43200
-fle,                      7200
-greenland,              -10800
-greenwich,                   0
-gtb,                      7200
-hawaiian,               -36000
-india,                   19800
-iran,                    12600
-jerusalem,                7200
-korea,                   32400
-mexico,                 -21600
-mid-atlantic,            -7200
-mountain,               -25200
-myanmar,                 23400
-n. central asia,         21600
-nepal,                   20700
-new zealand,             43200
-newfoundland,           -12600
-north asia east,         28800
-north asia,              25200
-pacific sa,             -14400
-pacific,                -28800
-romance,                  3600
-russian,                 10800
-sa eastern,             -10800
-sa pacific,             -18000
-sa western,             -14400
-samoa,                  -39600
-se asia,                 25200
-malay peninsula,         28800
-south africa,             7200
-sri lanka,               21600
-taipei,                  28800
-tasmania,                36000
-tokyo,                   32400
-tonga,                   46800
-us eastern,             -18000
-us mountain,            -25200
-vladivostok,             36000
-w. australia,            28800
-w. central africa,        3600
-w. europe,                3600
-west asia,               18000
-west pacific,            36000
-yakutsk,                 32400
-%%
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 07044d6f9f..527d6518d0 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -46,7 +46,7 @@ closed_dbm(void)
 }
 
 #define GetDBM(obj, dbmp) do {\
-    TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
+    Data_Get_Struct((obj), struct dbmdata, (dbmp));\
     if ((dbmp) == 0) closed_dbm();\
     if ((dbmp)->di_dbm == 0) closed_dbm();\
 } while (0)
@@ -57,34 +57,14 @@ closed_dbm(void)
 } while (0)
 
 static void
-free_dbm(void *ptr)
+free_dbm(struct dbmdata *dbmp)
 {
-    struct dbmdata *dbmp = ptr;
     if (dbmp) {
 	if (dbmp->di_dbm) dbm_close(dbmp->di_dbm);
 	xfree(dbmp);
     }
 }
 
-static size_t
-memsize_dbm(const void *ptr)
-{
-    size_t size = 0;
-    const struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	size += sizeof(*dbmp);
-	if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
-    }
-    return size;
-}
-
-static const rb_data_type_t dbm_type = {
-    "dbm",
-    {0, free_dbm, memsize_dbm,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * call-seq:
  *   dbm.close
@@ -114,7 +94,7 @@ fdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
-    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp == 0)
 	return Qtrue;
     if (dbmp->di_dbm == 0)
@@ -126,7 +106,7 @@ fdbm_closed(VALUE obj)
 static VALUE
 fdbm_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &dbm_type, 0);
+    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
 }
 
 /*
@@ -145,7 +125,8 @@ fdbm_alloc(VALUE klass)
 static VALUE
 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;
@@ -247,7 +228,7 @@ fdbm_initialize(int argc, VALUE *argv, VALUE obj)
 static VALUE
 fdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = fdbm_alloc(klass);
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
 
     if (NIL_P(fdbm_initialize(argc, argv, obj))) {
 	return Qnil;
@@ -507,8 +488,8 @@ fdbm_delete_if(VALUE obj)
     DBM *dbm;
     VALUE keystr, valstr;
     VALUE ret, ary = rb_ary_tmp_new(0);
-    int status = 0;
-    long i, n;
+    int i, status = 0;
+    long n;
 
     fdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
@@ -527,7 +508,7 @@ fdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_AREF(ary, i);
+	keystr = RARRAY_PTR(ary)[i];
 	key.dptr = RSTRING_PTR(keystr);
 	key.dsize = (DSIZE_TYPE)RSTRING_LEN(keystr);
 	if (dbm_delete(dbm, key)) {
@@ -598,13 +579,11 @@ static VALUE fdbm_store(VALUE,VALUE,VALUE);
 static VALUE
 update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
 {
-    const VALUE *ptr;
     Check_Type(pair, T_ARRAY);
     if (RARRAY_LEN(pair) < 2) {
 	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    ptr = RARRAY_CONST_PTR(pair);
-    fdbm_store(dbm, ptr[0], ptr[1]);
+    fdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
     return Qnil;
 }
 
@@ -1035,7 +1014,7 @@ fdbm_reject(VALUE obj)
  * == Example
  *
  *  require 'dbm'
- *  db = DBM.open('rfcs', 0666, DBM::WRCREAT)
+ *  db = DBM.open('rfcs', 666, DBM::WRCREAT)
  *  db['822'] = 'Standard for the Format of ARPA Internet Text Messages'
  *  db['1123'] = 'Requirements for Internet Hosts - Application and Support'
  *  db['3068'] = 'An Anycast Prefix for 6to4 Relay Routers'
diff --git a/ext/dbm/depend b/ext/dbm/depend
deleted file mode 100644
index b0de2ae2ee..0000000000
--- a/ext/dbm/depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-dbm.o: $(RUBY_EXTCONF_H)
-dbm.o: $(arch_hdrdir)/ruby/config.h
-dbm.o: $(hdrdir)/ruby/backward.h
-dbm.o: $(hdrdir)/ruby/defines.h
-dbm.o: $(hdrdir)/ruby/intern.h
-dbm.o: $(hdrdir)/ruby/missing.h
-dbm.o: $(hdrdir)/ruby/ruby.h
-dbm.o: $(hdrdir)/ruby/st.h
-dbm.o: $(hdrdir)/ruby/subst.h
-dbm.o: $(top_srcdir)/include/ruby.h
-dbm.o: dbm.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/dbm/extconf.rb b/ext/dbm/extconf.rb
index 04f751d776..68070c9970 100644
--- a/ext/dbm/extconf.rb
+++ b/ext/dbm/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # configure option:
 #   --with-dbm-type=COMMA-SEPARATED-NDBM-TYPES
 #
@@ -268,23 +267,6 @@ if dblib.any? {|db| headers.fetch(db, ["ndbm.h"]).any? {|hdr| headers.db_check(d
   have_func("dbm_pagfno((DBM *)0)", headers.found, headers.defs)
   have_func("dbm_dirfno((DBM *)0)", headers.found, headers.defs)
   convertible_int("datum.dsize", headers.found, headers.defs)
-  checking_for("sizeof(DBM) is available") {
-    if try_compile(<<SRC)
-#ifdef HAVE_CDEFS_H
-# include <cdefs.h>
-#endif
-#ifdef HAVE_SYS_CDEFS_H
-# include <sys/cdefs.h>
-#endif
-#include DBM_HDR
-
-const int sizeof_DBM = (int)sizeof(DBM);
-SRC
-      $defs << '-DDBM_SIZEOF_DBM=sizeof(DBM)'
-    else
-      $defs << '-DDBM_SIZEOF_DBM=0'
-    end
-  }
   create_makefile("dbm")
 end
 # :startdoc:
diff --git a/ext/digest/bubblebabble/bubblebabble.c b/ext/digest/bubblebabble/bubblebabble.c
index 8f436908d3..4bccd221b8 100644
--- a/ext/digest/bubblebabble/bubblebabble.c
+++ b/ext/digest/bubblebabble/bubblebabble.c
@@ -11,8 +11,8 @@
 
 ************************************************/
 
-#include <ruby/ruby.h>
-#include "../digest.h"
+#include "ruby.h"
+#include "digest.h"
 
 static ID id_digest;
 
@@ -101,7 +101,7 @@ rb_digest_s_bubblebabble(VALUE klass, VALUE str)
 static VALUE
 rb_digest_class_s_bubblebabble(int argc, VALUE *argv, VALUE klass)
 {
-    return bubblebabble_str_new(rb_funcallv(klass, id_digest, argc, argv));
+    return bubblebabble_str_new(rb_funcall2(klass, id_digest, argc, argv));
 }
 
 /* Document-method: Digest::Instance#bubblebabble
diff --git a/ext/digest/bubblebabble/depend b/ext/digest/bubblebabble/depend
index c0550f3180..d13a156ce1 100644
--- a/ext/digest/bubblebabble/depend
+++ b/ext/digest/bubblebabble/depend
@@ -1,14 +1 @@
-# AUTOGENERATED DEPENDENCIES START
-bubblebabble.o: $(RUBY_EXTCONF_H)
-bubblebabble.o: $(arch_hdrdir)/ruby/config.h
-bubblebabble.o: $(hdrdir)/ruby/backward.h
-bubblebabble.o: $(hdrdir)/ruby/defines.h
-bubblebabble.o: $(hdrdir)/ruby/intern.h
-bubblebabble.o: $(hdrdir)/ruby/missing.h
-bubblebabble.o: $(hdrdir)/ruby/ruby.h
-bubblebabble.o: $(hdrdir)/ruby/st.h
-bubblebabble.o: $(hdrdir)/ruby/subst.h
-bubblebabble.o: $(top_srcdir)/ext/digest/digest.h
-bubblebabble.o: $(top_srcdir)/include/ruby.h
-bubblebabble.o: bubblebabble.c
-# AUTOGENERATED DEPENDENCIES END
+bubblebabble.o: bubblebabble.c $(srcdir)/../digest.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
diff --git a/ext/digest/bubblebabble/extconf.rb b/ext/digest/bubblebabble/extconf.rb
index 21feed57fb..53cb83934a 100644
--- a/ext/digest/bubblebabble/extconf.rb
+++ b/ext/digest/bubblebabble/extconf.rb
@@ -1,6 +1,6 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 $defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
 
 create_makefile('digest/bubblebabble')
diff --git a/ext/digest/depend b/ext/digest/depend
index 8e3b4691e8..2fbc6d9adf 100644
--- a/ext/digest/depend
+++ b/ext/digest/depend
@@ -1,14 +1 @@
-# AUTOGENERATED DEPENDENCIES START
-digest.o: $(RUBY_EXTCONF_H)
-digest.o: $(arch_hdrdir)/ruby/config.h
-digest.o: $(hdrdir)/ruby/backward.h
-digest.o: $(hdrdir)/ruby/defines.h
-digest.o: $(hdrdir)/ruby/intern.h
-digest.o: $(hdrdir)/ruby/missing.h
-digest.o: $(hdrdir)/ruby/ruby.h
-digest.o: $(hdrdir)/ruby/st.h
-digest.o: $(hdrdir)/ruby/subst.h
-digest.o: $(top_srcdir)/include/ruby.h
-digest.o: digest.c
-digest.o: digest.h
-# AUTOGENERATED DEPENDENCIES END
+digest.o: digest.c digest.h $(HDRS) $(ruby_headers)
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index 9838ed33de..2231452c42 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -77,8 +77,8 @@ RUBY_EXTERN void Init_digest_base(void);
  *
  * Different digest algorithms (or hash functions) are available:
  *
- * MD5::
- *  See RFC 1321 The MD5 Message-Digest Algorithm
+ * HMAC::
+ *   See FIPS PUB 198 The Keyed-Hash Message Authentication Code (HMAC).
  * RIPEMD-160::
  *   As Digest::RMD160.
  *   See http://homes.esat.kuleuven.be/~bosselae/ripemd160.html.
@@ -124,8 +124,6 @@ hexencode_str_new(VALUE str_digest)
         p[i + i + 1] = hex[byte & 0x0f];
     }
 
-    RB_GC_GUARD(str_digest);
-
     return str;
 }
 
@@ -486,7 +484,7 @@ rb_digest_class_s_digest(int argc, VALUE *argv, VALUE klass)
 static VALUE
 rb_digest_class_s_hexdigest(int argc, VALUE *argv, VALUE klass)
 {
-    return hexencode_str_new(rb_funcallv(klass, id_digest, argc, argv));
+    return hexencode_str_new(rb_funcall2(klass, id_digest, argc, argv));
 }
 
 /* :nodoc: */
@@ -501,40 +499,6 @@ rb_digest_class_init(VALUE self)
  *
  * This abstract class provides a common interface to message digest
  * implementation classes written in C.
- *
- * ==Write a Digest subclass in C
- * Digest::Base provides a common interface to message digest
- * classes written in C. These classes must provide a struct
- * of type rb_digest_metadata_t:
- *  typedef int (*rb_digest_hash_init_func_t)(void *);
- *  typedef void (*rb_digest_hash_update_func_t)(void *, unsigned char *, size_t);
- *  typedef int (*rb_digest_hash_finish_func_t)(void *, unsigned char *);
- *
- *  typedef struct {
- *    int api_version;
- *    size_t digest_len;
- *    size_t block_len;
- *    size_t ctx_size;
- *    rb_digest_hash_init_func_t init_func;
- *    rb_digest_hash_update_func_t update_func;
- *    rb_digest_hash_finish_func_t finish_func;
- *  } rb_digest_metadata_t;
- *
- * This structure must be set as an instance variable named +metadata+
- * (without the +@+ in front of the name). By example:
- *   static const rb_digest_metadata_t sha1 = {
- *      RUBY_DIGEST_API_VERSION,
- *      SHA1_DIGEST_LENGTH,
- *      SHA1_BLOCK_LENGTH,
- *      sizeof(SHA1_CTX),
- *      (rb_digest_hash_init_func_t)SHA1_Init,
- *      (rb_digest_hash_update_func_t)SHA1_Update,
- *      (rb_digest_hash_finish_func_t)SHA1_Finish,
- *  };
- *
- *
- *  rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
- *		Data_Wrap_Struct(0, 0, 0, (void *)&sha1));
  */
 
 static rb_digest_metadata_t *
@@ -554,8 +518,6 @@ get_digest_base_metadata(VALUE klass)
     if (NIL_P(p))
         rb_raise(rb_eRuntimeError, "Digest::Base cannot be directly inherited in Ruby");
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
     Data_Get_Struct(obj, rb_digest_metadata_t, algo);
 
     switch (algo->api_version) {
@@ -573,13 +535,6 @@ get_digest_base_metadata(VALUE klass)
     return algo;
 }
 
-static const rb_data_type_t digest_type = {
-    "digest",
-    {0, RUBY_TYPED_DEFAULT_FREE, 0,},
-    0, 0,
-    (RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED),
-};
-
 static inline void
 algo_init(const rb_digest_metadata_t *algo, void *pctx)
 {
@@ -601,10 +556,11 @@ rb_digest_base_alloc(VALUE klass)
 
     algo = get_digest_base_metadata(klass);
 
-    obj = rb_data_typed_object_zalloc(klass, algo->ctx_size, &digest_type);
-    pctx = RTYPEDDATA_DATA(obj);
+    pctx = xmalloc(algo->ctx_size);
     algo_init(algo, pctx);
 
+    obj = Data_Wrap_Struct(klass, 0, xfree, pctx);
+
     return obj;
 }
 
@@ -620,21 +576,15 @@ rb_digest_base_copy(VALUE copy, VALUE obj)
     rb_check_frozen(copy);
 
     algo = get_digest_base_metadata(rb_obj_class(copy));
-    if (algo != get_digest_base_metadata(rb_obj_class(obj)))
-	rb_raise(rb_eTypeError, "different algorithms");
 
-    TypedData_Get_Struct(obj, void, &digest_type, pctx1);
-    TypedData_Get_Struct(copy, void, &digest_type, pctx2);
+    Data_Get_Struct(obj, void, pctx1);
+    Data_Get_Struct(copy, void, pctx2);
     memcpy(pctx2, pctx1, algo->ctx_size);
 
     return copy;
 }
 
-/*
- * call-seq: digest_base.reset -> digest_base
- *
- * Reset the digest to its initial state and return +self+.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_reset(VALUE self)
 {
@@ -643,20 +593,14 @@ rb_digest_base_reset(VALUE self)
 
     algo = get_digest_base_metadata(rb_obj_class(self));
 
-    TypedData_Get_Struct(self, void, &digest_type, pctx);
+    Data_Get_Struct(self, void, pctx);
 
     algo_init(algo, pctx);
 
     return self;
 }
 
-/*
- * call-seq:
- *   digest_base.update(string) -> digest_base
- *   digest_base << string -> digest_base
- *
- * Update the digest using given _string_ and return +self+.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_update(VALUE self, VALUE str)
 {
@@ -665,11 +609,10 @@ rb_digest_base_update(VALUE self, VALUE str)
 
     algo = get_digest_base_metadata(rb_obj_class(self));
 
-    TypedData_Get_Struct(self, void, &digest_type, pctx);
+    Data_Get_Struct(self, void, pctx);
 
     StringValue(str);
     algo->update_func(pctx, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
-    RB_GC_GUARD(str);
 
     return self;
 }
@@ -684,7 +627,7 @@ rb_digest_base_finish(VALUE self)
 
     algo = get_digest_base_metadata(rb_obj_class(self));
 
-    TypedData_Get_Struct(self, void, &digest_type, pctx);
+    Data_Get_Struct(self, void, pctx);
 
     str = rb_str_new(0, algo->digest_len);
     algo->finish_func(pctx, (unsigned char *)RSTRING_PTR(str));
@@ -695,11 +638,7 @@ rb_digest_base_finish(VALUE self)
     return str;
 }
 
-/*
- * call-seq: digest_base.digest_length -> Integer
- *
- * Return the length of the hash value in bytes.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_digest_length(VALUE self)
 {
@@ -710,11 +649,7 @@ rb_digest_base_digest_length(VALUE self)
     return INT2NUM(algo->digest_len);
 }
 
-/*
- * call-seq: digest_base.block_length -> Integer
- *
- * Return the block length of the digest in bytes.
- */
+/* :nodoc: */
 static VALUE
 rb_digest_base_block_length(VALUE self)
 {
diff --git a/ext/digest/digest.h b/ext/digest/digest.h
index 30359ad348..85848d5682 100644
--- a/ext/digest/digest.h
+++ b/ext/digest/digest.h
@@ -30,22 +30,3 @@ typedef struct {
     rb_digest_hash_update_func_t update_func;
     rb_digest_hash_finish_func_t finish_func;
 } rb_digest_metadata_t;
-
-#define DEFINE_UPDATE_FUNC_FOR_UINT(name) \
-void \
-rb_digest_##name##_update(void *ctx, unsigned char *ptr, size_t size) \
-{ \
-    const unsigned int stride = 16384; \
- \
-    for (; size > stride; size -= stride, ptr += stride) { \
-	name##_Update(ctx, ptr, stride); \
-    } \
-    if (size > 0) name##_Update(ctx, ptr, size); \
-}
-
-#define DEFINE_FINISH_FUNC_FROM_FINAL(name) \
-int \
-rb_digest_##name##_finish(void *ctx, unsigned char *ptr) \
-{ \
-    return name##_Final(ptr, ctx); \
-}
diff --git a/ext/digest/digest_conf.rb b/ext/digest/digest_conf.rb
deleted file mode 100644
index 8e36ce5d41..0000000000
--- a/ext/digest/digest_conf.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# frozen_string_literal: false
-def digest_conf(name, hdr = name, funcs = nil, types = nil)
-  unless with_config("bundled-#{name}")
-    cc = with_config("common-digest")
-    if cc == true or /\b#{name}\b/ =~ cc
-      if File.exist?("#$srcdir/#{name}cc.h") and
-        have_header("CommonCrypto/CommonDigest.h")
-        $defs << "-D#{name.upcase}_USE_COMMONDIGEST"
-        $headers << "#{name}cc.h"
-        return :commondigest
-      end
-    end
-
-    dir_config("openssl")
-    pkg_config("openssl")
-    require File.expand_path('../../openssl/deprecation', __FILE__)
-    if have_library("crypto")
-      funcs ||= name.upcase
-      funcs = Array(funcs)
-      types ||= funcs
-      hdr = "openssl/#{hdr}.h"
-      if funcs.all? {|func| OpenSSL.check_func("#{func}_Transform", hdr)} &&
-         types.all? {|type| have_type("#{type}_CTX", hdr)}
-        $defs << "-D#{name.upcase}_USE_OPENSSL"
-        $headers << "#{name}ossl.h"
-        return :ossl
-      end
-    end
-  end
-  $objs << "#{name}.#{$OBJEXT}"
-  return
-end
diff --git a/ext/digest/extconf.rb b/ext/digest/extconf.rb
index a8c68850a2..a20ca8d68f 100644
--- a/ext/digest/extconf.rb
+++ b/ext/digest/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.6 2001/07/13 15:38:27 knu Exp $
 # $Id$
 
diff --git a/ext/digest/lib/digest.rb b/ext/digest/lib/digest.rb
index ba0637af32..5f7ebc2237 100644
--- a/ext/digest/lib/digest.rb
+++ b/ext/digest/lib/digest.rb
@@ -1,10 +1,6 @@
-# frozen_string_literal: false
 require 'digest.so'
 
 module Digest
-  # A mutex for Digest().
-  REQUIRE_MUTEX = Thread::Mutex.new
-
   def self.const_missing(name) # :nodoc:
     case name
     when :SHA256, :SHA384, :SHA512
@@ -80,30 +76,15 @@ end
 # call-seq:
 #   Digest(name) -> digest_subclass
 #
-# Returns a Digest subclass by +name+ in a thread-safe manner even
-# when on-demand loading is involved.
+# Returns a Digest subclass by +name+.
 #
 #   require 'digest'
 #
 #   Digest("MD5")
 #   # => Digest::MD5
 #
-#   Digest(:SHA256)
-#   # => Digest::SHA256
-#
-#   Digest(:Foo)
+#   Digest("Foo")
 #   # => LoadError: library not found for class Digest::Foo -- digest/foo
 def Digest(name)
-  const = name.to_sym
-  Digest::REQUIRE_MUTEX.synchronize {
-    # Ignore autoload's because it is void when we have #const_missing
-    Digest.const_missing(const)
-  }
-rescue LoadError
-  # Constants do not necessarily rely on digest/*.
-  if Digest.const_defined?(const)
-    Digest.const_get(const)
-  else
-    raise
-  end
+  Digest.const_get(name)
 end
diff --git a/ext/digest/md5/depend b/ext/digest/md5/depend
index 03c4cc8640..ca30d310e9 100644
--- a/ext/digest/md5/depend
+++ b/ext/digest/md5/depend
@@ -1,18 +1,3 @@
 md5.o: md5.c md5.h $(srcdir)/../defs.h
-md5init.o: $(LOCAL_HDRS)
-
-# AUTOGENERATED DEPENDENCIES START
-md5init.o: $(RUBY_EXTCONF_H)
-md5init.o: $(arch_hdrdir)/ruby/config.h
-md5init.o: $(hdrdir)/ruby/backward.h
-md5init.o: $(hdrdir)/ruby/defines.h
-md5init.o: $(hdrdir)/ruby/intern.h
-md5init.o: $(hdrdir)/ruby/missing.h
-md5init.o: $(hdrdir)/ruby/ruby.h
-md5init.o: $(hdrdir)/ruby/st.h
-md5init.o: $(hdrdir)/ruby/subst.h
-md5init.o: $(top_srcdir)/ext/digest/digest.h
-md5init.o: $(top_srcdir)/include/ruby.h
-md5init.o: md5init.c
-md5init.o: md5ossl.h
-# AUTOGENERATED DEPENDENCIES END
+md5init.o: md5init.c md5.h $(srcdir)/../digest.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+md5ossl.o: md5ossl.h
diff --git a/ext/digest/md5/extconf.rb b/ext/digest/md5/extconf.rb
index dead9a228b..5a57fd3eea 100644
--- a/ext/digest/md5/extconf.rb
+++ b/ext/digest/md5/extconf.rb
@@ -1,16 +1,25 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
 require "mkmf"
-require File.expand_path("../../digest_conf", __FILE__)
 
 $defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "md5init.#{$OBJEXT}" ]
 
-digest_conf("md5")
+dir_config("openssl")
+pkg_config("openssl")
+require File.expand_path('../../../openssl/deprecation', __FILE__)
+
+if !with_config("bundled-md5") &&
+    have_library("crypto") && OpenSSL.check_func("MD5_Transform", "openssl/md5.h")
+  $objs << "md5ossl.#{$OBJEXT}"
+
+else
+  $objs << "md5.#{$OBJEXT}"
+end
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/md5/md5.c b/ext/digest/md5/md5.c
index 19fe54a693..4ff280bb0a 100644
--- a/ext/digest/md5/md5.c
+++ b/ext/digest/md5/md5.c
@@ -61,7 +61,7 @@
  */
 #include <string.h>
 int
-main(void)
+main()
 {
     static const char *const test[7*2] = {
 	"", "d41d8cd98f00b204e9800998ecf8427e",
@@ -102,7 +102,7 @@ main(void)
 #ifdef COMPUTE_T_VALUES
 #include <math.h>
 int
-main(void)
+main()
 {
     int i;
     for (i = 1; i <= 64; ++i) {
diff --git a/ext/digest/md5/md5.h b/ext/digest/md5/md5.h
index 1b3383c5ee..a0faa25e48 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/md5cc.h b/ext/digest/md5/md5cc.h
deleted file mode 100644
index 35652eac6a..0000000000
--- a/ext/digest/md5/md5cc.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define COMMON_DIGEST_FOR_OPENSSL 1
-#include <CommonCrypto/CommonDigest.h>
-
-#define MD5_BLOCK_LENGTH	CC_MD5_BLOCK_BYTES
-
-static DEFINE_UPDATE_FUNC_FOR_UINT(MD5)
-static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
-
-#undef MD5_Update
-#undef MD5_Finish
-#define MD5_Update rb_digest_MD5_update
-#define MD5_Finish rb_digest_MD5_finish
diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c
index fdd8b36c5d..3591782f6e 100644
--- a/ext/digest/md5/md5init.c
+++ b/ext/digest/md5/md5init.c
@@ -1,12 +1,9 @@
 /* $RoughId: md5init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include <ruby/ruby.h>
-#include "../digest.h"
-#if defined(MD5_USE_OPENSSL)
+#include "digest.h"
+#if defined(HAVE_OPENSSL_MD5_H)
 #include "md5ossl.h"
-#elif defined(MD5_USE_COMMONDIGEST)
-#include "md5cc.h"
 #else
 #include "md5.h"
 #endif
@@ -22,32 +19,12 @@ static const rb_digest_metadata_t md5 = {
 };
 
 /*
- * Document-class: Digest::MD5 < Digest::Base
  * A class for calculating message digests using the MD5
  * Message-Digest Algorithm by RSA Data Security, Inc., described in
  * RFC1321.
- *
- * MD5 calculates a digest of 128 bits (16 bytes).
- *
- * == Examples
- *  require 'digest'
- *
- *  # Compute a complete digest
- *  Digest::MD5.hexdigest 'abc'      #=> "90015098..."
- *
- *  # Compute digest by chunks
- *  md5 = Digest::MD5.new               # =>#<Digest::MD5>
- *  md5.update "ab"
- *  md5 << "c"                           # alias for #update
- *  md5.hexdigest                        # => "90015098..."
- *
- *  # Use the same object to compute another digest
- *  md5.reset
- *  md5 << "message"
- *  md5.hexdigest                        # => "78e73102..."
  */
 void
-Init_md5(void)
+Init_md5()
 {
     VALUE mDigest, cDigest_Base, cDigest_MD5;
 
@@ -61,8 +38,6 @@ Init_md5(void)
 
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    rb_iv_set(cDigest_MD5, "metadata",
-	      Data_Wrap_Struct(0, 0, 0, (void *)&md5));
+    rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&md5));
 }
diff --git a/ext/digest/md5/md5ossl.c b/ext/digest/md5/md5ossl.c
new file mode 100644
index 0000000000..d94ae2cd2f
--- /dev/null
+++ b/ext/digest/md5/md5ossl.c
@@ -0,0 +1,9 @@
+/* $Id$ */
+
+#include "md5ossl.h"
+
+void
+MD5_Finish(MD5_CTX *pctx, unsigned char *digest)
+{
+    MD5_Final(digest, pctx);
+}
diff --git a/ext/digest/md5/md5ossl.h b/ext/digest/md5/md5ossl.h
index 94aa7ae77b..1680c4f5c9 100644
--- a/ext/digest/md5/md5ossl.h
+++ b/ext/digest/md5/md5ossl.h
@@ -8,8 +8,6 @@
 
 #define MD5_BLOCK_LENGTH	MD5_CBLOCK
 
-static DEFINE_FINISH_FUNC_FROM_FINAL(MD5)
-#undef MD5_Finish
-#define MD5_Finish rb_digest_MD5_finish
+void MD5_Finish(MD5_CTX *pctx, unsigned char *digest);
 
 #endif
diff --git a/ext/digest/rmd160/depend b/ext/digest/rmd160/depend
index 2dfeecf034..c5524be459 100644
--- a/ext/digest/rmd160/depend
+++ b/ext/digest/rmd160/depend
@@ -1,18 +1,3 @@
-rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h
-rmd160init.o: $(LOCAL_HDRS)
-
-# AUTOGENERATED DEPENDENCIES START
-rmd160init.o: $(RUBY_EXTCONF_H)
-rmd160init.o: $(arch_hdrdir)/ruby/config.h
-rmd160init.o: $(hdrdir)/ruby/backward.h
-rmd160init.o: $(hdrdir)/ruby/defines.h
-rmd160init.o: $(hdrdir)/ruby/intern.h
-rmd160init.o: $(hdrdir)/ruby/missing.h
-rmd160init.o: $(hdrdir)/ruby/ruby.h
-rmd160init.o: $(hdrdir)/ruby/st.h
-rmd160init.o: $(hdrdir)/ruby/subst.h
-rmd160init.o: $(top_srcdir)/ext/digest/digest.h
-rmd160init.o: $(top_srcdir)/include/ruby.h
-rmd160init.o: rmd160init.c
-rmd160init.o: rmd160ossl.h
-# AUTOGENERATED DEPENDENCIES END
+rmd160.o: rmd160.c rmd160.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+rmd160init.o: rmd160init.c rmd160.h $(srcdir)/../digest.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+rmd160ossl.o: rmd160ossl.h $(srcdir)/../defs.h
diff --git a/ext/digest/rmd160/extconf.rb b/ext/digest/rmd160/extconf.rb
index a02ba56169..d487d6da80 100644
--- a/ext/digest/rmd160/extconf.rb
+++ b/ext/digest/rmd160/extconf.rb
@@ -1,16 +1,24 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
 require "mkmf"
-require File.expand_path("../../digest_conf", __FILE__)
 
 $defs << "-DNDEBUG" << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "rmd160init.#{$OBJEXT}" ]
 
-digest_conf("rmd160", "ripemd", "RIPEMD160")
+dir_config("openssl")
+pkg_config("openssl")
+require File.expand_path('../../../openssl/deprecation', __FILE__)
+
+if !with_config("bundled-rmd160") &&
+    have_library("crypto") && OpenSSL.check_func("RMD160_Transform", "openssl/ripemd.h")
+  $objs << "rmd160ossl.#{$OBJEXT}"
+else
+  $objs << "rmd160.#{$OBJEXT}"
+end
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/rmd160/rmd160.h b/ext/digest/rmd160/rmd160.h
index 6324709d96..098fa05a88 100644
--- a/ext/digest/rmd160/rmd160.h
+++ b/ext/digest/rmd160/rmd160.h
@@ -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 10d9370163..c214ca9f33 100644
--- a/ext/digest/rmd160/rmd160init.c
+++ b/ext/digest/rmd160/rmd160init.c
@@ -1,9 +1,8 @@
 /* $RoughId: rmd160init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
 /* $Id$ */
 
-#include <ruby/ruby.h>
-#include "../digest.h"
-#if defined(RMD160_USE_OPENSSL)
+#include "digest.h"
+#if defined(HAVE_OPENSSL_RIPEMD_H)
 #include "rmd160ossl.h"
 #else
 #include "rmd160.h"
@@ -20,32 +19,12 @@ static const rb_digest_metadata_t rmd160 = {
 };
 
 /*
- * Document-class: Digest::RMD160 < Digest::Base
  * A class for calculating message digests using RIPEMD-160
  * cryptographic hash function, designed by Hans Dobbertin, Antoon
  * Bosselaers, and Bart Preneel.
- *
- * RMD160 calculates a digest of 160 bits (20 bytes).
- *
- * == Examples
- *  require 'digest'
- *
- *  # Compute a complete digest
- *  Digest::RMD160.hexdigest 'abc'      #=> "8eb208f7..."
- *
- *  # Compute digest by chunks
- *  rmd160 = Digest::RMD160.new               # =>#<Digest::RMD160>
- *  rmd160.update "ab"
- *  rmd160 << "c"                           # alias for #update
- *  rmd160.hexdigest                        # => "8eb208f7..."
- *
- *  # Use the same object to compute another digest
- *  rmd160.reset
- *  rmd160 << "message"
- *  rmd160.hexdigest                        # => "1dddbe1b..."
  */
 void
-Init_rmd160(void)
+Init_rmd160()
 {
     VALUE mDigest, cDigest_Base, cDigest_RMD160;
 
@@ -59,8 +38,6 @@ Init_rmd160(void)
 
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    rb_iv_set(cDigest_RMD160, "metadata",
-	      Data_Wrap_Struct(0, 0, 0, (void *)&rmd160));
+    rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&rmd160));
 }
diff --git a/ext/digest/rmd160/rmd160ossl.c b/ext/digest/rmd160/rmd160ossl.c
new file mode 100644
index 0000000000..f24e63e3d8
--- /dev/null
+++ b/ext/digest/rmd160/rmd160ossl.c
@@ -0,0 +1,8 @@
+/* $Id$ */
+
+#include "defs.h"
+#include "rmd160ossl.h"
+
+void RMD160_Finish(RMD160_CTX *ctx, char *buf) {
+	RIPEMD160_Final((unsigned char *)buf, ctx);
+}
diff --git a/ext/digest/rmd160/rmd160ossl.h b/ext/digest/rmd160/rmd160ossl.h
index e6bf5ea8d0..3df38a01c0 100644
--- a/ext/digest/rmd160/rmd160ossl.h
+++ b/ext/digest/rmd160/rmd160ossl.h
@@ -14,7 +14,6 @@
 #define RMD160_BLOCK_LENGTH		RIPEMD160_CBLOCK
 #define RMD160_DIGEST_LENGTH		RIPEMD160_DIGEST_LENGTH
 
-static DEFINE_FINISH_FUNC_FROM_FINAL(RIPEMD160)
-#define RMD160_Finish rb_digest_RIPEMD160_finish
+void RMD160_Finish(RMD160_CTX *ctx, char *buf);
 
 #endif
diff --git a/ext/digest/sha1/depend b/ext/digest/sha1/depend
index 5139f44ff4..6b6ee6a0bf 100644
--- a/ext/digest/sha1/depend
+++ b/ext/digest/sha1/depend
@@ -1,18 +1,3 @@
 sha1.o: sha1.c sha1.h $(srcdir)/../defs.h
-sha1init.o: $(LOCAL_HDRS)
-
-# AUTOGENERATED DEPENDENCIES START
-sha1init.o: $(RUBY_EXTCONF_H)
-sha1init.o: $(arch_hdrdir)/ruby/config.h
-sha1init.o: $(hdrdir)/ruby/backward.h
-sha1init.o: $(hdrdir)/ruby/defines.h
-sha1init.o: $(hdrdir)/ruby/intern.h
-sha1init.o: $(hdrdir)/ruby/missing.h
-sha1init.o: $(hdrdir)/ruby/ruby.h
-sha1init.o: $(hdrdir)/ruby/st.h
-sha1init.o: $(hdrdir)/ruby/subst.h
-sha1init.o: $(top_srcdir)/ext/digest/digest.h
-sha1init.o: $(top_srcdir)/include/ruby.h
-sha1init.o: sha1init.c
-sha1init.o: sha1ossl.h
-# AUTOGENERATED DEPENDENCIES END
+sha1init.o: sha1init.c sha1.h $(srcdir)/../digest.h sha1.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+sha1ossl.o: sha1ossl.h  $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
diff --git a/ext/digest/sha1/extconf.rb b/ext/digest/sha1/extconf.rb
index 0ff4158bef..d7e52fe731 100644
--- a/ext/digest/sha1/extconf.rb
+++ b/ext/digest/sha1/extconf.rb
@@ -1,16 +1,24 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.3 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
 require "mkmf"
-require File.expand_path("../../digest_conf", __FILE__)
 
 $defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "sha1init.#{$OBJEXT}" ]
 
-digest_conf("sha1", "sha", nil, %w[SHA])
+dir_config("openssl")
+pkg_config("openssl")
+require File.expand_path('../../../openssl/deprecation', __FILE__)
+
+if !with_config("bundled-sha1") &&
+    have_library("crypto") && OpenSSL.check_func("SHA1_Transform", "openssl/sha.h")
+  $objs << "sha1ossl.#{$OBJEXT}"
+else
+  $objs << "sha1.#{$OBJEXT}"
+end
 
 have_header("sys/cdefs.h")
 
diff --git a/ext/digest/sha1/sha1.h b/ext/digest/sha1/sha1.h
index 2accc46d46..6f1c388cf2 100644
--- a/ext/digest/sha1/sha1.h
+++ b/ext/digest/sha1/sha1.h
@@ -11,7 +11,7 @@
 #ifndef _SYS_SHA1_H_
 #define	_SYS_SHA1_H_
 
-#include "../defs.h"
+#include "defs.h"
 
 typedef struct {
 	uint32_t state[5];
diff --git a/ext/digest/sha1/sha1cc.h b/ext/digest/sha1/sha1cc.h
deleted file mode 100644
index 2ed8d646ab..0000000000
--- a/ext/digest/sha1/sha1cc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#define COMMON_DIGEST_FOR_OPENSSL 1
-#include <CommonCrypto/CommonDigest.h>
-
-#define SHA1_BLOCK_LENGTH	CC_SHA1_BLOCK_BYTES
-#define SHA1_DIGEST_LENGTH	CC_SHA1_DIGEST_LENGTH
-#define SHA1_CTX		CC_SHA1_CTX
-
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA1)
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
-
-#undef SHA1_Update
-#undef SHA1_Finish
-#define SHA1_Update rb_digest_SHA1_update
-#define SHA1_Finish rb_digest_SHA1_finish
diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c
index e12d297699..d52eef58b3 100644
--- a/ext/digest/sha1/sha1init.c
+++ b/ext/digest/sha1/sha1init.c
@@ -1,12 +1,9 @@
 /* $RoughId: sha1init.c,v 1.2 2001/07/13 19:49:10 knu Exp $ */
 /* $Id$ */
 
-#include <ruby/ruby.h>
-#include "../digest.h"
-#if defined(SHA1_USE_OPENSSL)
+#include "digest.h"
+#if defined(HAVE_OPENSSL_SHA_H)
 #include "sha1ossl.h"
-#elif defined(SHA1_USE_COMMONDIGEST)
-#include "sha1cc.h"
 #else
 #include "sha1.h"
 #endif
@@ -22,34 +19,12 @@ static const rb_digest_metadata_t sha1 = {
 };
 
 /*
- * Document-class: Digest::SHA1 < Digest::Base
  * A class for calculating message digests using the SHA-1 Secure Hash
  * Algorithm by NIST (the US' National Institute of Standards and
  * Technology), described in FIPS PUB 180-1.
- *
- * See Digest::Instance for digest API.
- *
- * SHA-1 calculates a digest of 160 bits (20 bytes).
- *
- * == Examples
- *  require 'digest'
- *
- *  # Compute a complete digest
- *  Digest::SHA1.hexdigest 'abc'      #=> "a9993e36..."
- *
- *  # Compute digest by chunks
- *  sha1 = Digest::SHA1.new               # =>#<Digest::SHA1>
- *  sha1.update "ab"
- *  sha1 << "c"                           # alias for #update
- *  sha1.hexdigest                        # => "a9993e36..."
- *
- *  # Use the same object to compute another digest
- *  sha1.reset
- *  sha1 << "message"
- *  sha1.hexdigest                        # => "6f9b9af3..."
  */
 void
-Init_sha1(void)
+Init_sha1()
 {
     VALUE mDigest, cDigest_Base, cDigest_SHA1;
 
@@ -63,8 +38,6 @@ Init_sha1(void)
 
     cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
-    rb_iv_set(cDigest_SHA1, "metadata",
-	      Data_Wrap_Struct(0, 0, 0, (void *)&sha1));
+    rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha1));
 }
diff --git a/ext/digest/sha1/sha1ossl.c b/ext/digest/sha1/sha1ossl.c
new file mode 100644
index 0000000000..452cf35084
--- /dev/null
+++ b/ext/digest/sha1/sha1ossl.c
@@ -0,0 +1,10 @@
+/* $Id$ */
+
+#include "defs.h"
+#include "sha1ossl.h"
+
+void
+SHA1_Finish(SHA1_CTX *ctx, char *buf)
+{
+	SHA1_Final((unsigned char *)buf, ctx);
+}
diff --git a/ext/digest/sha1/sha1ossl.h b/ext/digest/sha1/sha1ossl.h
index 599efe9a2f..8f9984cc64 100644
--- a/ext/digest/sha1/sha1ossl.h
+++ b/ext/digest/sha1/sha1ossl.h
@@ -15,8 +15,6 @@
 #endif
 #define SHA1_DIGEST_LENGTH	SHA_DIGEST_LENGTH
 
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA1)
-#undef SHA1_Finish
-#define SHA1_Finish rb_digest_SHA1_finish
+void SHA1_Finish(SHA1_CTX *ctx, char *buf);
 
 #endif
diff --git a/ext/digest/sha2/depend b/ext/digest/sha2/depend
index 1152fe4dac..7373f46fc2 100644
--- a/ext/digest/sha2/depend
+++ b/ext/digest/sha2/depend
@@ -1,18 +1,3 @@
-sha2.o: sha2.c sha2.h $(srcdir)/../defs.h
-sha2init.o: $(LOCAL_HDRS)
-
-# AUTOGENERATED DEPENDENCIES START
-sha2init.o: $(RUBY_EXTCONF_H)
-sha2init.o: $(arch_hdrdir)/ruby/config.h
-sha2init.o: $(hdrdir)/ruby/backward.h
-sha2init.o: $(hdrdir)/ruby/defines.h
-sha2init.o: $(hdrdir)/ruby/intern.h
-sha2init.o: $(hdrdir)/ruby/missing.h
-sha2init.o: $(hdrdir)/ruby/ruby.h
-sha2init.o: $(hdrdir)/ruby/st.h
-sha2init.o: $(hdrdir)/ruby/subst.h
-sha2init.o: $(top_srcdir)/ext/digest/digest.h
-sha2init.o: $(top_srcdir)/include/ruby.h
-sha2init.o: sha2init.c
-sha2init.o: sha2ossl.h
-# AUTOGENERATED DEPENDENCIES END
+sha2.o: sha2.c sha2.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+sha2init.o: sha2init.c sha2.h $(srcdir)/../digest.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
+sha2ossl.o: sha2ossl.h $(srcdir)/../defs.h $(HDRS) $(ruby_headers)
diff --git a/ext/digest/sha2/extconf.rb b/ext/digest/sha2/extconf.rb
index 5c7f76c7f3..5ab2d35af5 100644
--- a/ext/digest/sha2/extconf.rb
+++ b/ext/digest/sha2/extconf.rb
@@ -1,21 +1,33 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.4 2001/08/14 19:54:51 knu Exp $
 # $Id$
 
 require "mkmf"
-require File.expand_path("../../digest_conf", __FILE__)
 
 $defs << "-DHAVE_CONFIG_H"
+$INCFLAGS << " -I$(srcdir)/.."
 
 $objs = [ "sha2init.#{$OBJEXT}" ]
 
-unless digest_conf("sha2", "sha", %w[SHA256 SHA512])
+dir_config("openssl")
+pkg_config("openssl")
+require File.expand_path('../../../openssl/deprecation', __FILE__)
+
+if !with_config("bundled-sha2") &&
+    have_library("crypto") &&
+    %w[SHA256 SHA512].all? {|d| OpenSSL.check_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("sys/cdefs.h")
 
 $preload = %w[digest]
 
-create_makefile("digest/sha2")
+if have_type("uint64_t", "defs.h", $defs.join(' '))
+  create_makefile("digest/sha2")
+end
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index 61a0734850..58d12e9b09 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #--
 # sha2.rb - defines Digest::SHA2 class which wraps up the SHA256,
 #           SHA384, and SHA512 classes.
@@ -17,45 +16,11 @@ module Digest
   #
   # A meta digest provider class for SHA256, SHA384 and SHA512.
   #
-  # FIPS 180-2 describes SHA2 family of digest algorithms. It defines
-  # three algorithms:
-  # * one which works on chunks of 512 bits and returns a 256-bit
-  #   digest (SHA256),
-  # * one which works on chunks of 1024 bits and returns a 384-bit
-  #   digest (SHA384),
-  # * and one which works on chunks of 1024 bits and returns a 512-bit
-  #   digest (SHA512).
-  #
-  # ==Examples
-  #  require 'digest'
-  #
-  #  # Compute a complete digest
-  #  Digest::SHA2.hexdigest 'abc'          # => "ba7816bf8..."
-  #  Digest::SHA2.new(256).hexdigest 'abc' # => "ba7816bf8..."
-  #  Digest::SHA256.hexdigest 'abc'        # => "ba7816bf8..."
-  #
-  #  Digest::SHA2.new(384).hexdigest 'abc' # => "cb00753f4..."
-  #  Digest::SHA384.hexdigest 'abc'        # => "cb00753f4..."
-  #
-  #  Digest::SHA2.new(512).hexdigest 'abc' # => "ddaf35a19..."
-  #  Digest::SHA512.hexdigest 'abc'        # => "ddaf35a19..."
-  #
-  #  # Compute digest by chunks
-  #  sha2 = Digest::SHA2.new               # =>#<Digest::SHA2:256>
-  #  sha2.update "ab"
-  #  sha2 << "c"                           # alias for #update
-  #  sha2.hexdigest                        # => "ba7816bf8..."
-  #
-  #  # Use the same object to compute another digest
-  #  sha2.reset
-  #  sha2 << "message"
-  #  sha2.hexdigest                        # => "ab530a13e..."
-  #
   class SHA2 < Digest::Class
     # call-seq:
     #   Digest::SHA2.new(bitlen = 256) -> digest_obj
     #
-    # Create a new SHA2 hash object with a given bit length.
+    # Creates a new SHA2 hash object with a given bit length.
     #
     # Valid bit lengths are 256, 384 and 512.
     def initialize(bitlen = 256)
@@ -75,7 +40,7 @@ module Digest
     # call-seq:
     #   digest_obj.reset -> digest_obj
     #
-    # Reset the digest to the initial state and return self.
+    # Resets the digest to the initial state and returns self.
     def reset
       @sha2.reset
       self
@@ -85,7 +50,7 @@ module Digest
     #   digest_obj.update(string) -> digest_obj
     #   digest_obj << string -> digest_obj
     #
-    # Update the digest using a given _string_ and return self.
+    # Updates the digest using a given _string_ and returns self.
     def update(str)
       @sha2.update(str)
       self
@@ -101,7 +66,7 @@ module Digest
     # call-seq:
     #   digest_obj.block_length -> Integer
     #
-    # Return the block length of the digest in bytes.
+    # Returns the block length of the digest in bytes.
     #
     #   Digest::SHA256.new.block_length * 8
     #   # => 512
@@ -116,7 +81,7 @@ module Digest
     # call-seq:
     #   digest_obj.digest_length -> Integer
     #
-    # Return the length of the hash value (the digest) in bytes.
+    # Returns the length of the hash value of the digest in bytes.
     #
     #   Digest::SHA256.new.digest_length * 8
     #   # => 256
diff --git a/ext/digest/sha2/sha2.c b/ext/digest/sha2/sha2.c
index c86eab37a0..d0629a2b64 100644
--- a/ext/digest/sha2/sha2.c
+++ b/ext/digest/sha2/sha2.c
@@ -34,7 +34,7 @@
  * $Id$
  */
 
-#include "../defs.h"
+#include "defs.h"
 #include <string.h>	/* memcpy()/memset() or bcopy()/bzero() */
 #include <assert.h>	/* assert() */
 #include "sha2.h"
@@ -67,7 +67,7 @@
  * 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
- * equivalent.
+ * equivilent.
  *
  * If your system does not define the above, then you can do so by
  * hand like this:
diff --git a/ext/digest/sha2/sha2cc.h b/ext/digest/sha2/sha2cc.h
deleted file mode 100644
index 3f99604465..0000000000
--- a/ext/digest/sha2/sha2cc.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#define COMMON_DIGEST_FOR_OPENSSL 1
-#include <CommonCrypto/CommonDigest.h>
-
-#define SHA256_BLOCK_LENGTH	CC_SHA256_BLOCK_BYTES
-#define SHA384_BLOCK_LENGTH	CC_SHA384_BLOCK_BYTES
-#define SHA512_BLOCK_LENGTH	CC_SHA512_BLOCK_BYTES
-
-#define SHA384_CTX		CC_SHA512_CTX
-
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA256)
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA384)
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
-static DEFINE_UPDATE_FUNC_FOR_UINT(SHA512)
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
-
-
-#undef SHA256_Update
-#undef SHA256_Finish
-#define SHA256_Update rb_digest_SHA256_update
-#define SHA256_Finish rb_digest_SHA256_finish
-
-#undef SHA384_Update
-#undef SHA384_Finish
-#define SHA384_Update rb_digest_SHA384_update
-#define SHA384_Finish rb_digest_SHA384_finish
-
-#undef SHA512_Update
-#undef SHA512_Finish
-#define SHA512_Update rb_digest_SHA512_update
-#define SHA512_Finish rb_digest_SHA512_finish
diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c
index 9fd8ece7fe..13df4bcb78 100644
--- a/ext/digest/sha2/sha2init.c
+++ b/ext/digest/sha2/sha2init.c
@@ -1,12 +1,9 @@
 /* $RoughId: sha2init.c,v 1.3 2001/07/13 20:00:43 knu Exp $ */
 /* $Id$ */
 
-#include <ruby/ruby.h>
-#include "../digest.h"
+#include "digest.h"
 #if defined(SHA2_USE_OPENSSL)
 #include "sha2ossl.h"
-#elif defined(SHA2_USE_COMMONDIGEST)
-#include "sha2cc.h"
 #else
 #include "sha2.h"
 #endif
@@ -32,7 +29,7 @@ FOREACH_BITLEN(DEFINE_ALGO_METADATA)
  * Standards and Technology), described in FIPS PUB 180-2.
  */
 void
-Init_sha2(void)
+Init_sha2()
 {
     VALUE mDigest, cDigest_Base;
     ID id_metadata;
@@ -44,7 +41,7 @@ Init_sha2(void)
 
     rb_require("digest");
 
-    id_metadata = rb_intern_const("metadata");
+    id_metadata = rb_intern("metadata");
 
     mDigest = rb_path2class("Digest");
     cDigest_Base = rb_path2class("Digest::Base");
@@ -53,9 +50,7 @@ Init_sha2(void)
     cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
 \
     rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-		Data_Wrap_Struct(0, 0, 0, (void *)&sha##bitlen));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha##bitlen));
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 0
     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..34353be8b8
--- /dev/null
+++ b/ext/digest/sha2/sha2ossl.c
@@ -0,0 +1,13 @@
+#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);}
+#ifndef __DragonFly__
+#define SHA384_Final SHA512_Final
+#endif
+
+SHA_Finish(256)
+SHA_Finish(384)
+SHA_Finish(512)
diff --git a/ext/digest/sha2/sha2ossl.h b/ext/digest/sha2/sha2ossl.h
index 8dd0530107..4229d14cf9 100644
--- a/ext/digest/sha2/sha2ossl.h
+++ b/ext/digest/sha2/sha2ossl.h
@@ -8,20 +8,10 @@
 #define SHA384_BLOCK_LENGTH	SHA512_CBLOCK
 #define SHA512_BLOCK_LENGTH	SHA512_CBLOCK
 
-#ifndef __DragonFly__
-#define SHA384_Final SHA512_Final
-#endif
-
 typedef SHA512_CTX SHA384_CTX;
 
-#undef SHA256_Finish
-#undef SHA384_Finish
-#undef SHA512_Finish
-#define SHA256_Finish rb_digest_SHA256_finish
-#define SHA384_Finish rb_digest_SHA384_finish
-#define SHA512_Finish rb_digest_SHA512_finish
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA256)
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA384)
-static DEFINE_FINISH_FUNC_FROM_FINAL(SHA512)
+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/callback/depend b/ext/dl/callback/depend
new file mode 100644
index 0000000000..c3b4fef1db
--- /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): $(srcdir)/../dl.h $(HDRS) $(ruby_headers)
+
+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..f3b79b0a33
--- /dev/null
+++ b/ext/dl/callback/extconf.rb
@@ -0,0 +1,14 @@
+require 'mkmf'
+
+begin
+  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..e94a196247
--- /dev/null
+++ b/ext/dl/callback/mkcallback.rb
@@ -0,0 +1,242 @@
+#!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)
+  dltype = DLTYPE[ty]
+  ret = dltype[:conv]
+  src = <<-EOS
+#{calltype == STDCALL ? "\n#ifdef FUNC_STDCALL" : ""}
+static #{dltype[:type]}
+FUNC_#{calltype.upcase}(#{func_name(ty,argc,n,calltype)})(#{(0...argc).collect{|i| "DLSTACK_TYPE stack#{i}"}.join(", ")})
+{
+    VALUE #{ret ? "ret, " : ""}cb#{argc > 0 ? ", args[#{argc}]" : ""};
+#{
+      (0...argc).collect{|i|
+        "\n    args[#{i}] = PTR2NUM(stack#{i});"
+      }.join("")
+}
+    cb = rb_ary_entry(rb_ary_entry(#{proc_entry}, #{ty}), #{(n * DLSTACK_SIZE) + argc});
+    #{ret ? "ret = " : ""}rb_funcall2(cb, rb_dl_cb_call, #{argc}, #{argc > 0 ? 'args' : 'NULL'});
+  EOS
+  src << "    return #{ret % "ret"};\n" if ret
+  src << <<-EOS
+}
+#{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..1f4958bbdc
--- /dev/null
+++ b/ext/dl/cfunc.c
@@ -0,0 +1,677 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby/ruby.h>
+#include <ruby/util.h>
+#include <errno.h>
+#include "dl.h"
+
+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_mark(void *ptr)
+{
+    struct cfunc_data *data = ptr;
+    if (data->wrap) {
+	rb_gc_mark(data->wrap);
+    }
+}
+
+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",
+    {dlcfunc_mark, dlcfunc_free, dlcfunc_memsize,},
+};
+
+VALUE
+rb_dlcfunc_new(void (*func)(), int type, const char *name, ID calltype)
+{
+    VALUE val;
+    struct cfunc_data *data;
+
+    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, addrnum;
+    struct cfunc_data *data;
+    void *saddr;
+    const char *sname;
+
+    rb_scan_args(argc, argv, "13", &addr, &type, &name, &calltype);
+
+    addrnum = rb_Integer(addr);
+    saddr = (void*)(NUM2PTR(addrnum));
+    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);
+    data->wrap = (addrnum == addr) ? 0 : addr;
+
+    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
+ *    to_s
+ *
+ * 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 >= 1400 && _MSC_VER < 1600
+# 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;
+
+    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)) {
+            unsigned long ls[(sizeof(DLSTACK_TYPE) + sizeof(long) - 1)/sizeof(long)];
+            DLSTACK_TYPE d;
+            int j;
+            rb_big_pack(arg, ls, sizeof(ls)/sizeof(*ls));
+            d = 0;
+            for (j = 0; j < (int)(sizeof(ls)/sizeof(*ls)); j++)
+                d |= (DLSTACK_TYPE)ls[j] << (j * sizeof(long) * CHAR_BIT);
+	    stack[i] = d;
+	}
+	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{
+	const char *name = rb_id2name(cfunc->calltype);
+	if( name ){
+	    rb_raise(rb_eDLError, "unsupported call type: %s",
+		     name);
+	}
+	else{
+	    rb_raise(rb_eDLError, "unsupported call type: %"PRIxVALUE,
+		     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 >= 1400 && _MSC_VER < 1600
+# 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
+
+    /*
+     * Document-class: DL::CFunc
+     *
+     * A direct accessor to a function in a C library
+     *
+     * == Example
+     *
+     *   libc_so = "/lib64/libc.so.6"
+     *   => "/lib64/libc.so.6"
+     *   libc = DL::dlopen(libc_so)
+     *   => #<DL::Handle:0x00000000e05b00>
+     *   @cfunc = DL::CFunc.new(libc['strcpy'], DL::TYPE_VOIDP, 'strcpy')
+     *   => #<DL::CFunc:0x000000012daec0 ptr=0x007f62ca5a8300 type=1 name='strcpy'>
+     *
+     */
+    rb_cDLCFunc = rb_define_class_under(rb_mDL, "CFunc", rb_cObject);
+    rb_define_alloc_func(rb_cDLCFunc, rb_dlcfunc_s_allocate);
+
+    /*
+     * Document-method: last_error
+     *
+     * Returns the last error for the current executing thread
+     */
+    rb_define_module_function(rb_cDLCFunc, "last_error", rb_dl_get_last_error, 0);
+#if defined(_WIN32)
+
+    /*
+     * Document-method: win32_last_error
+     *
+     * Returns the last win32 error for the current executing thread
+     */
+    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..7a82c7c3e0
--- /dev/null
+++ b/ext/dl/cptr.c
@@ -0,0 +1,669 @@
+/* -*- 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, volatile VALUE *wrap)
+{
+    VALUE addrnum;
+    if (NIL_P(func)) {
+	*wrap = 0;
+	return NULL;
+    }
+    if (rb_dlcfunc_kind_p(func)) {
+	*wrap = func;
+	return (freefunc_t)(VALUE)RCFUNC_DATA(func)->ptr;
+    }
+    addrnum = rb_Integer(func);
+    *wrap = (addrnum != func) ? func : 0;
+    return (freefunc_t)(VALUE)NUM2PTR(addrnum);
+}
+
+static ID id_to_ptr;
+
+static void
+dlptr_mark(void *ptr)
+{
+    struct ptr_data *data = ptr;
+    if (data->wrap[0]) {
+	rb_gc_mark(data->wrap[0]);
+    }
+    if (data->wrap[1]) {
+	rb_gc_mark(data->wrap[1]);
+    }
+}
+
+static void
+dlptr_free(void *ptr)
+{
+    struct ptr_data *data = ptr;
+    if (data->ptr) {
+	if (data->free) {
+	    (*(data->free))(data->ptr);
+	}
+    }
+    xfree(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",
+    {dlptr_mark, dlptr_free, dlptr_memsize,},
+};
+
+VALUE
+rb_dlptr_new2(VALUE klass, void *ptr, long size, freefunc_t func)
+{
+    struct ptr_data *data;
+    VALUE val;
+
+    val = TypedData_Make_Struct(klass, struct ptr_data, &dlptr_data_type, data);
+    data->ptr = ptr;
+    data->free = func;
+    data->size = size;
+    OBJ_TAINT(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;
+
+    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;
+
+    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, wrap = 0, funcwrap = 0;
+    struct ptr_data *data;
+    void *p = NULL;
+    freefunc_t f = NULL;
+    long s = 0;
+
+    if (rb_scan_args(argc, argv, "12", &ptr, &size, &sym) >= 1) {
+	VALUE addrnum = rb_Integer(ptr);
+	if (addrnum != ptr) wrap = ptr;
+	p = NUM2PTR(addrnum);
+    }
+    if (argc >= 2) {
+	s = NUM2LONG(size);
+    }
+    if (argc >= 3) {
+	f = get_freefunc(sym, &funcwrap);
+    }
+
+    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->wrap[0] = wrap;
+	data->wrap[1] = funcwrap;
+	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, wrap = 0;
+    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, &wrap);
+	break;
+      default:
+	rb_bug("rb_dlptr_s_malloc");
+    }
+
+    obj = rb_dlptr_malloc(s,f);
+    if (wrap) RPTR_DATA(obj)->wrap[1] = wrap;
+
+    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, &data->wrap[1]);
+
+    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;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    return rb_sprintf("#<%"PRIsVALUE":%p ptr=%p size=%ld free=%p>",
+		      rb_obj_class(self), data, data->ptr, data->size, data->free);
+}
+
+/*
+ *  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;
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    if (!data->ptr) rb_raise(rb_eDLError, "NULL pointer dereference");
+    switch( rb_scan_args(argc, argv, "11", &arg0, &arg1) ){
+      case 1:
+	offset = NUM2ULONG(arg0);
+	retval = INT2NUM(*((char *)data->ptr + offset));
+	break;
+      case 2:
+	offset = NUM2ULONG(arg0);
+	len    = NUM2ULONG(arg1);
+	retval = rb_tainted_str_new((char *)data->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;
+    struct ptr_data *data;
+
+    TypedData_Get_Struct(self, struct ptr_data, &dlptr_data_type, data);
+    if (!data->ptr) rb_raise(rb_eDLError, "NULL pointer dereference");
+    switch( rb_scan_args(argc, argv, "21", &arg0, &arg1, &arg2) ){
+      case 2:
+	offset = NUM2ULONG(arg0);
+	((char*)data->ptr)[offset] = NUM2UINT(arg1);
+	retval = arg1;
+	break;
+      case 3:
+	offset = NUM2ULONG(arg0);
+	len    = NUM2ULONG(arg1);
+	if (RB_TYPE_P(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 *)data->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, wrap = val, vptr;
+
+    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 ((vptr = rb_check_funcall(val, id_to_ptr, 0, 0)) != Qundef){
+	if (rb_obj_is_kind_of(vptr, rb_cDLCPtr)){
+	    ptr = vptr;
+	    wrap = 0;
+	}
+	else{
+	    rb_raise(rb_eDLError, "to_ptr should return a CPtr object");
+	}
+    }
+    else{
+	VALUE num = rb_Integer(val);
+	if (num == val) wrap = 0;
+	ptr = rb_dlptr_new(NUM2PTR(num), 0, NULL);
+    }
+    OBJ_INFECT(ptr, val);
+    if (wrap) RPTR_DATA(ptr)->wrap[0] = wrap;
+    return ptr;
+}
+
+void
+Init_dlptr(void)
+{
+    id_to_ptr = rb_intern("to_ptr");
+
+    /* Document-class: DL::CPtr
+     *
+     * CPtr is a class to handle C pointers
+     *
+     */
+    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);
+
+    /*  Document-const: NULL
+     *
+     * A NULL pointer
+     */
+    rb_define_const(rb_mDL, "NULL", rb_dlptr_new(0, 0, 0));
+}
diff --git a/ext/dl/depend b/ext/dl/depend
new file mode 100644
index 0000000000..d0a3ab8ef0
--- /dev/null
+++ b/ext/dl/depend
@@ -0,0 +1,14 @@
+cfunc.o: cfunc.c dl.h $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/util.h
+
+cptr.o: cptr.c dl.h $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
+
+handle.o: handle.c dl.h $(HDRS) $(ruby_headers)
+
+dl.o: dl.c dl.h $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/dl/dl.c b/ext/dl/dl.c
new file mode 100644
index 0000000000..7ad77dd6b2
--- /dev/null
+++ b/ext/dl/dl.c
@@ -0,0 +1,569 @@
+/*
+ * ext/dl/dl.c
+ *
+ * documentation:
+ * - Vincent Batts (vbatts@hashbangbash.com)
+ *
+ */
+#include <ruby/ruby.h>
+#include <ruby/io.h>
+#include <ctype.h>
+#include "dl.h"
+
+VALUE rb_mDL;
+VALUE rb_eDLError;
+VALUE rb_eDLTypeError;
+
+ID rbdl_id_cdecl;
+ID rbdl_id_stdcall;
+
+#ifndef DLTYPE_SSIZE_T
+# if SIZEOF_SIZE_T == SIZEOF_INT
+#   define DLTYPE_SSIZE_T DLTYPE_INT
+# elif SIZEOF_SIZE_T == SIZEOF_LONG
+#   define DLTYPE_SSIZE_T DLTYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_SIZE_T == SIZEOF_LONG_LONG
+#   define DLTYPE_SSIZE_T DLTYPE_LONG_LONG
+# endif
+#endif
+#define DLTYPE_SIZE_T (-1*SIGNEDNESS_OF_SIZE_T*DLTYPE_SSIZE_T)
+
+#ifndef DLTYPE_PTRDIFF_T
+# if SIZEOF_PTRDIFF_T == SIZEOF_INT
+#   define DLTYPE_PTRDIFF_T DLTYPE_INT
+# elif SIZEOF_PTRDIFF_T == SIZEOF_LONG
+#   define DLTYPE_PTRDIFF_T DLTYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_PTRDIFF_T == SIZEOF_LONG_LONG
+#   define DLTYPE_PTRDIFF_T DLTYPE_LONG_LONG
+# endif
+#endif
+
+#ifndef DLTYPE_INTPTR_T
+# if SIZEOF_INTPTR_T == SIZEOF_INT
+#   define DLTYPE_INTPTR_T DLTYPE_INT
+# elif SIZEOF_INTPTR_T == SIZEOF_LONG
+#   define DLTYPE_INTPTR_T DLTYPE_LONG
+# elif defined HAVE_LONG_LONG && SIZEOF_INTPTR_T == SIZEOF_LONG_LONG
+#   define DLTYPE_INTPTR_T DLTYPE_LONG_LONG
+# endif
+#endif
+#define DLTYPE_UINTPTR_T (-DLTYPE_INTPTR_T)
+
+/*
+ * call-seq: DL.dlopen(so_lib)
+ *
+ * An interface to the dynamic linking loader
+ *
+ * This is a shortcut to DL::Handle.new and takes the same arguments.
+ *
+ * Example:
+ *
+ *   libc_so = "/lib64/libc.so.6"
+ *   => "/lib64/libc.so.6"
+ *
+ *   libc = DL.dlopen(libc_so)
+ *   => #<DL::Handle:0x00000000e05b00>
+ */
+VALUE
+rb_dl_dlopen(int argc, VALUE argv[], VALUE self)
+{
+    return rb_class_new_instance(argc, argv, rb_cDLHandle);
+}
+
+/*
+ * call-seq: DL.malloc(size)
+ *
+ * Allocate +size+ bytes of memory and return the integer memory address
+ * for the allocated memory.
+ */
+VALUE
+rb_dl_malloc(VALUE self, VALUE size)
+{
+    void *ptr;
+
+    ptr = (void*)ruby_xmalloc(NUM2SIZET(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_dl_realloc(VALUE self, VALUE addr, VALUE size)
+{
+    void *ptr = NUM2PTR(addr);
+
+    ptr = (void*)ruby_xrealloc(ptr, NUM2SIZET(size));
+    return PTR2NUM(ptr);
+}
+
+/*
+ * call-seq: DL.free(addr)
+ *
+ * Free the memory at address +addr+
+ */
+VALUE
+rb_dl_free(VALUE self, VALUE addr)
+{
+    void *ptr = NUM2PTR(addr);
+
+    ruby_xfree(ptr);
+    return Qnil;
+}
+
+/*
+ * call-seq: DL.dlunwrap(addr)
+ *
+ * Returns the hexadecimal representation of a memory pointer address +addr+
+ *
+ * Example:
+ *
+ *   lib = DL.dlopen('/lib64/libc-2.15.so')
+ *   => #<DL::Handle:0x00000001342460>
+ *
+ *   lib['strcpy'].to_s(16)
+ *   => "7f59de6dd240"
+ *
+ *   DL.dlunwrap(DL.dlwrap(lib['strcpy'].to_s(16)))
+ *   => "7f59de6dd240"
+ */
+VALUE
+rb_dl_ptr2value(VALUE self, VALUE addr)
+{
+    return (VALUE)NUM2PTR(addr);
+}
+
+/*
+ * call-seq: DL.dlwrap(val)
+ *
+ * Returns a memory pointer of a function's hexadecimal address location +val+
+ *
+ * Example:
+ *
+ *   lib = DL.dlopen('/lib64/libc-2.15.so')
+ *   => #<DL::Handle:0x00000001342460>
+ *
+ *   DL.dlwrap(lib['strcpy'].to_s(16))
+ *   => 25522520
+ */
+VALUE
+rb_dl_value2ptr(VALUE self, VALUE val)
+{
+    return PTR2NUM((void*)val);
+}
+
+static void
+rb_dl_init_callbacks(VALUE dl)
+{
+    static const char cb[] = "dl/callback.so";
+
+    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)
+{
+    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");
+
+    /* Document-module: DL
+     *
+     * A bridge to the dlopen() or dynamic library linker function.
+     *
+     * == Example
+     *
+     *   bash $> cat > sum.c <<EOF
+     *   double sum(double *arry, int len)
+     *   {
+     *           double ret = 0;
+     *           int i;
+     *           for(i = 0; i < len; i++){
+     *                   ret = ret + arry[i];
+     *           }
+     *           return ret;
+     *   }
+     *
+     *   double split(double num)
+     *   {
+     *           double ret = 0;
+     *           ret = num / 2;
+     *           return ret;
+     *   }
+     *   EOF
+     *   bash $> gcc -o libsum.so -shared sum.c
+     *   bash $> cat > sum.rb <<EOF
+     *   require 'dl'
+     *   require 'dl/import'
+     *
+     *   module LibSum
+     *           extend DL::Importer
+     *           dlload './libsum.so'
+     *           extern 'double sum(double*, int)'
+     *           extern 'double split(double)'
+     *   end
+     *
+     *   a = [2.0, 3.0, 4.0]
+     *
+     *   sum = LibSum.sum(a.pack("d*"), a.count)
+     *   p LibSum.split(sum)
+     *   EOF
+     *   bash $> ruby sum.rb
+     *   4.5
+     *
+     * WIN! :-)
+     */
+    rb_mDL = rb_define_module("DL");
+
+    /*
+     * Document-class: DL::DLError
+     *
+     * standard dynamic load exception
+     */
+    rb_eDLError = rb_define_class_under(rb_mDL, "DLError", rb_eStandardError);
+
+    /*
+     * Document-class: DL::DLTypeError
+     *
+     * dynamic load incorrect type exception
+     */
+    rb_eDLTypeError = rb_define_class_under(rb_mDL, "DLTypeError", rb_eDLError);
+
+    /* Document-const: MAX_CALLBACK
+     *
+     * Maximum number of callbacks
+     */
+    rb_define_const(rb_mDL, "MAX_CALLBACK", INT2NUM(MAX_CALLBACK));
+
+    /* Document-const: DLSTACK_SIZE
+     *
+     * Dynamic linker stack size
+     */
+    rb_define_const(rb_mDL, "DLSTACK_SIZE", INT2NUM(DLSTACK_SIZE));
+
+    rb_dl_init_callbacks(rb_mDL);
+
+    /* Document-const: RTLD_GLOBAL
+     *
+     * rtld DL::Handle flag.
+     *
+     * The symbols defined by this library will be made available for symbol
+     * resolution of subsequently loaded libraries.
+     */
+    rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL));
+
+    /* Document-const: RTLD_LAZY
+     *
+     * rtld DL::Handle flag.
+     *
+     * Perform lazy binding.  Only resolve symbols as the code that references
+     * them is executed.  If the  symbol is never referenced, then it is never
+     * resolved.  (Lazy binding is only performed for function references;
+     * references to variables are always immediately bound when the library
+     * is loaded.)
+     */
+    rb_define_const(rb_mDL, "RTLD_LAZY",   INT2NUM(RTLD_LAZY));
+
+    /* Document-const: RTLD_NOW
+     *
+     * rtld DL::Handle flag.
+     *
+     * If this value is specified or the environment variable LD_BIND_NOW is
+     * set to a nonempty string, all undefined symbols in the library are
+     * resolved before dlopen() returns.  If this cannot be done an error is
+     * returned.
+     */
+    rb_define_const(rb_mDL, "RTLD_NOW",    INT2NUM(RTLD_NOW));
+
+    /* Document-const: TYPE_VOID
+     *
+     * DL::CFunc type - void
+     */
+    rb_define_const(rb_mDL, "TYPE_VOID",  INT2NUM(DLTYPE_VOID));
+
+    /* Document-const: TYPE_VOIDP
+     *
+     * DL::CFunc type - void*
+     */
+    rb_define_const(rb_mDL, "TYPE_VOIDP",  INT2NUM(DLTYPE_VOIDP));
+
+    /* Document-const: TYPE_CHAR
+     *
+     * DL::CFunc type - char
+     */
+    rb_define_const(rb_mDL, "TYPE_CHAR",  INT2NUM(DLTYPE_CHAR));
+
+    /* Document-const: TYPE_SHORT
+     *
+     * DL::CFunc type - short
+     */
+    rb_define_const(rb_mDL, "TYPE_SHORT",  INT2NUM(DLTYPE_SHORT));
+
+    /* Document-const: TYPE_INT
+     *
+     * DL::CFunc type - int
+     */
+    rb_define_const(rb_mDL, "TYPE_INT",  INT2NUM(DLTYPE_INT));
+
+    /* Document-const: TYPE_LONG
+     *
+     * DL::CFunc type - long
+     */
+    rb_define_const(rb_mDL, "TYPE_LONG",  INT2NUM(DLTYPE_LONG));
+
+#if HAVE_LONG_LONG
+    /* Document-const: TYPE_LONG_LONG
+     *
+     * DL::CFunc type - long long
+     */
+    rb_define_const(rb_mDL, "TYPE_LONG_LONG",  INT2NUM(DLTYPE_LONG_LONG));
+#endif
+
+    /* Document-const: TYPE_FLOAT
+     *
+     * DL::CFunc type - float
+     */
+    rb_define_const(rb_mDL, "TYPE_FLOAT",  INT2NUM(DLTYPE_FLOAT));
+
+    /* Document-const: TYPE_DOUBLE
+     *
+     * DL::CFunc type - double
+     */
+    rb_define_const(rb_mDL, "TYPE_DOUBLE",  INT2NUM(DLTYPE_DOUBLE));
+
+    /* Document-const: TYPE_SIZE_T
+     *
+     * DL::CFunc type - size_t
+     */
+    rb_define_const(rb_mDL, "TYPE_SIZE_T",  INT2NUM(DLTYPE_SIZE_T));
+
+    /* Document-const: TYPE_SSIZE_T
+     *
+     * DL::CFunc type - ssize_t
+     */
+    rb_define_const(rb_mDL, "TYPE_SSIZE_T", INT2NUM(DLTYPE_SSIZE_T));
+
+    /* Document-const: TYPE_PTRDIFF_T
+     *
+     * DL::CFunc type - ptrdiff_t
+     */
+    rb_define_const(rb_mDL, "TYPE_PTRDIFF_T", INT2NUM(DLTYPE_PTRDIFF_T));
+
+    /* Document-const: TYPE_INTPTR_T
+     *
+     * DL::CFunc type - intptr_t
+     */
+    rb_define_const(rb_mDL, "TYPE_INTPTR_T", INT2NUM(DLTYPE_INTPTR_T));
+
+    /* Document-const: TYPE_UINTPTR_T
+     *
+     * DL::CFunc type - uintptr_t
+     */
+    rb_define_const(rb_mDL, "TYPE_UINTPTR_T", INT2NUM(DLTYPE_UINTPTR_T));
+
+    /* Document-const: ALIGN_VOIDP
+     *
+     * The alignment size of a void*
+     */
+    rb_define_const(rb_mDL, "ALIGN_VOIDP", INT2NUM(ALIGN_VOIDP));
+
+    /* Document-const: ALIGN_CHAR
+     *
+     * The alignment size of a char
+     */
+    rb_define_const(rb_mDL, "ALIGN_CHAR",  INT2NUM(ALIGN_CHAR));
+
+    /* Document-const: ALIGN_SHORT
+     *
+     * The alignment size of a short
+     */
+    rb_define_const(rb_mDL, "ALIGN_SHORT", INT2NUM(ALIGN_SHORT));
+
+    /* Document-const: ALIGN_INT
+     *
+     * The alignment size of an int
+     */
+    rb_define_const(rb_mDL, "ALIGN_INT",   INT2NUM(ALIGN_INT));
+
+    /* Document-const: ALIGN_LONG
+     *
+     * The alignment size of a long
+     */
+    rb_define_const(rb_mDL, "ALIGN_LONG",  INT2NUM(ALIGN_LONG));
+
+#if HAVE_LONG_LONG
+    /* Document-const: ALIGN_LONG_LONG
+     *
+     * The alignment size of a long long
+     */
+    rb_define_const(rb_mDL, "ALIGN_LONG_LONG",  INT2NUM(ALIGN_LONG_LONG));
+#endif
+
+    /* Document-const: ALIGN_FLOAT
+     *
+     * The alignment size of a float
+     */
+    rb_define_const(rb_mDL, "ALIGN_FLOAT", INT2NUM(ALIGN_FLOAT));
+
+    /* Document-const: ALIGN_DOUBLE
+     *
+     * The alignment size of a double
+     */
+    rb_define_const(rb_mDL, "ALIGN_DOUBLE",INT2NUM(ALIGN_DOUBLE));
+
+    /* Document-const: ALIGN_SIZE_T
+     *
+     * The alignment size of a size_t
+     */
+    rb_define_const(rb_mDL, "ALIGN_SIZE_T", INT2NUM(ALIGN_OF(size_t)));
+
+    /* Document-const: ALIGN_SSIZE_T
+     *
+     * The alignment size of a ssize_t
+     */
+    rb_define_const(rb_mDL, "ALIGN_SSIZE_T", INT2NUM(ALIGN_OF(size_t))); /* same as size_t */
+
+    /* Document-const: ALIGN_PTRDIFF_T
+     *
+     * The alignment size of a ptrdiff_t
+     */
+    rb_define_const(rb_mDL, "ALIGN_PTRDIFF_T", INT2NUM(ALIGN_OF(ptrdiff_t)));
+
+    /* Document-const: ALIGN_INTPTR_T
+     *
+     * The alignment size of a intptr_t
+     */
+    rb_define_const(rb_mDL, "ALIGN_INTPTR_T", INT2NUM(ALIGN_OF(intptr_t)));
+
+    /* Document-const: ALIGN_UINTPTR_T
+     *
+     * The alignment size of a uintptr_t
+     */
+    rb_define_const(rb_mDL, "ALIGN_UINTPTR_T", INT2NUM(ALIGN_OF(uintptr_t)));
+
+    /* Document-const: SIZEOF_VOIDP
+     *
+     * size of a void*
+     */
+    rb_define_const(rb_mDL, "SIZEOF_VOIDP", INT2NUM(sizeof(void*)));
+
+    /* Document-const: SIZEOF_CHAR
+     *
+     * size of a char
+     */
+    rb_define_const(rb_mDL, "SIZEOF_CHAR",  INT2NUM(sizeof(char)));
+
+    /* Document-const: SIZEOF_SHORT
+     *
+     * size of a short
+     */
+    rb_define_const(rb_mDL, "SIZEOF_SHORT", INT2NUM(sizeof(short)));
+
+    /* Document-const: SIZEOF_INT
+     *
+     * size of an int
+     */
+    rb_define_const(rb_mDL, "SIZEOF_INT",   INT2NUM(sizeof(int)));
+
+    /* Document-const: SIZEOF_LONG
+     *
+     * size of a long
+     */
+    rb_define_const(rb_mDL, "SIZEOF_LONG",  INT2NUM(sizeof(long)));
+
+#if HAVE_LONG_LONG
+    /* Document-const: SIZEOF_LONG_LONG
+     *
+     * size of a long long
+     */
+    rb_define_const(rb_mDL, "SIZEOF_LONG_LONG",  INT2NUM(sizeof(LONG_LONG)));
+#endif
+
+    /* Document-const: SIZEOF_FLOAT
+     *
+     * size of a float
+     */
+    rb_define_const(rb_mDL, "SIZEOF_FLOAT", INT2NUM(sizeof(float)));
+
+    /* Document-const: SIZEOF_DOUBLE
+     *
+     * size of a double
+     */
+    rb_define_const(rb_mDL, "SIZEOF_DOUBLE",INT2NUM(sizeof(double)));
+
+    /* Document-const: SIZEOF_SIZE_T
+     *
+     * size of a size_t
+     */
+    rb_define_const(rb_mDL, "SIZEOF_SIZE_T",  INT2NUM(sizeof(size_t)));
+
+    /* Document-const: SIZEOF_SSIZE_T
+     *
+     * size of a ssize_t
+     */
+    rb_define_const(rb_mDL, "SIZEOF_SSIZE_T",  INT2NUM(sizeof(size_t))); /* same as size_t */
+
+    /* Document-const: SIZEOF_PTRDIFF_T
+     *
+     * size of a ptrdiff_t
+     */
+    rb_define_const(rb_mDL, "SIZEOF_PTRDIFF_T",  INT2NUM(sizeof(ptrdiff_t)));
+
+    /* Document-const: SIZEOF_INTPTR_T
+     *
+     * size of a intptr_t
+     */
+    rb_define_const(rb_mDL, "SIZEOF_INTPTR_T",  INT2NUM(sizeof(intptr_t)));
+
+    /* Document-const: SIZEOF_UINTPTR_T
+     *
+     * size of a uintptr_t
+     */
+    rb_define_const(rb_mDL, "SIZEOF_UINTPTR_T",  INT2NUM(sizeof(uintptr_t)));
+
+    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);
+
+    /* Document-const: RUBY_FREE
+     *
+     * Address of the ruby_xfree() function
+     */
+    rb_define_const(rb_mDL, "RUBY_FREE", PTR2NUM(ruby_xfree));
+
+    /* Document-const: BUILD_RUBY_PLATFORM
+     *
+     * Platform built against (i.e. "x86_64-linux", etc.)
+     *
+     * See also RUBY_PLATFORM
+     */
+    rb_define_const(rb_mDL, "BUILD_RUBY_PLATFORM", rb_str_new2(RUBY_PLATFORM));
+
+    /* Document-const: BUILD_RUBY_VERSION
+     *
+     * Ruby Version built. (i.e. "1.9.3")
+     *
+     * See also RUBY_VERSION
+     */
+    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.h b/ext/dl/dl.h
new file mode 100644
index 0000000000..f8380a8471
--- /dev/null
+++ b/ext/dl/dl.h
@@ -0,0 +1,217 @@
+#ifndef RUBY_DL_H
+#define RUBY_DL_H
+
+#include <ruby.h>
+
+#if !defined(FUNC_CDECL)
+#  define FUNC_CDECL(x) x
+#endif
+
+#if defined(HAVE_DLFCN_H)
+# include <dlfcn.h>
+# /* some stranger systems may not define all of these */
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 0
+#endif
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 0
+#endif
+#ifndef RTLD_NOW
+#define RTLD_NOW 0
+#endif
+#else
+# if defined(_WIN32)
+#   include <windows.h>
+#   define dlopen(name,flag) ((void)(flag),(void*)LoadLibrary(name))
+#   define dlerror() strerror(rb_w32_map_errno(GetLastError()))
+#   define dlsym(handle,name) ((void*)GetProcAddress((handle),(name)))
+#   define RTLD_LAZY -1
+#   define RTLD_NOW  -1
+#   define RTLD_GLOBAL -1
+# endif
+#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
+
+/*
+ * 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_cDLHandle;
+extern VALUE rb_cDLSymbol;
+extern VALUE rb_eDLError;
+extern VALUE rb_eDLTypeError;
+
+#define ALIGN_OF(type) offsetof(struct {char align_c; type align_x;}, align_x)
+
+#define ALIGN_VOIDP  ALIGN_OF(void*)
+#define ALIGN_SHORT  ALIGN_OF(short)
+#define ALIGN_CHAR   ALIGN_OF(char)
+#define ALIGN_INT    ALIGN_OF(int)
+#define ALIGN_LONG   ALIGN_OF(long)
+#if HAVE_LONG_LONG
+#define ALIGN_LONG_LONG ALIGN_OF(LONG_LONG)
+#endif
+#define ALIGN_FLOAT  ALIGN_OF(float)
+#define ALIGN_DOUBLE ALIGN_OF(double)
+
+#define DLALIGN(ptr,offset,align) \
+    ((offset) += ((align) - ((uintptr_t)((char *)(ptr) + (offset))) % (align)) % (align))
+
+
+#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;
+};
+
+
+struct cfunc_data {
+    void *ptr;
+    char *name;
+    int  type;
+    ID   calltype;
+    VALUE wrap;
+};
+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;
+    long size;
+    freefunc_t free;
+    VALUE wrap[2];
+};
+
+#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);
+
+#endif
diff --git a/ext/dl/extconf.rb b/ext/dl/extconf.rb
new file mode 100644
index 0000000000..53e73c3a8b
--- /dev/null
+++ b/ext/dl/extconf.rb
@@ -0,0 +1,48 @@
+require 'mkmf'
+
+if RbConfig::CONFIG['GCC'] == 'yes'
+  flag = " -fno-defer-pop"
+  if have_macro("__clang__")
+    $LDFLAGS << flag if try_ldflags(flag)
+  else
+    $CFLAGS << flag
+  end
+  $CFLAGS << " -fno-omit-frame-pointer"
+end
+
+$INSTALLFILES = [
+  ["dl.h", "$(HDRDIR)"],
+]
+
+check = true
+if( have_header("dlfcn.h") )
+  have_library("dl")
+  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
+  check = false
+end
+
+if check
+  config = File.read(RbConfig.expand(File.join($arch_hdrdir, "ruby/config.h")))
+  types = {"SIZE_T"=>"SSIZE_T", "PTRDIFF_T"=>nil, "INTPTR_T"=>nil}
+  types.each do |type, signed|
+    if /^\#define\s+SIZEOF_#{type}\s+(SIZEOF_(.+)|\d+)/ =~ config
+      if size = $2 and size != 'VOIDP'
+        size = types.fetch(size) {size}
+        $defs << format("-DDLTYPE_%s=DLTYPE_%s", signed||type, size)
+      end
+      if signed
+        check_signedness(type.downcase, "stddef.h")
+      end
+    end
+  end
+  $defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
+  create_makefile("dl")
+end
diff --git a/ext/dl/handle.c b/ext/dl/handle.c
new file mode 100644
index 0000000000..6b90e089ee
--- /dev/null
+++ b/ext/dl/handle.c
@@ -0,0 +1,431 @@
+/* -*- C -*-
+ * $Id$
+ */
+
+#include <ruby.h>
+#include "dl.h"
+
+VALUE rb_cDLHandle;
+
+#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)
+{
+    struct dl_handle *dlhandle = ptr;
+    if( dlhandle->ptr && dlhandle->open && dlhandle->enable_close ){
+	dlclose(dlhandle->ptr);
+    }
+    xfree(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;
+
+    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");
+
+    UNREACHABLE;
+}
+
+VALUE
+rb_dlhandle_s_allocate(VALUE klass)
+{
+    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;
+
+    return obj;
+}
+
+static VALUE
+predefined_dlhandle(void *handle)
+{
+    VALUE obj = rb_dlhandle_s_allocate(rb_cDLHandle);
+    struct dl_handle *dlhandle = DATA_PTR(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, "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_eDLError, "%s", err);
+    }
+#else
+    if( !ptr ){
+	err = dlerror();
+	rb_raise(rb_eDLError, "%s", err);
+    }
+#endif
+    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);
+    }
+
+    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;
+
+    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;
+
+    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;
+
+    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;
+
+    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_sym(VALUE self, VALUE sym)
+{
+    struct dl_handle *dlhandle;
+
+    TypedData_Get_Struct(self, struct dl_handle, &dlhandle_data_type, dlhandle);
+    if( ! dlhandle->open ){
+	rb_raise(rb_eDLError, "closed handle");
+    }
+
+    return dlhandle_sym(dlhandle->ptr, StringValueCStr(sym));
+}
+
+#ifndef RTLD_NEXT
+#define RTLD_NEXT NULL
+#endif
+#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)
+    const char *err;
+# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
+#else
+# define CHECK_DLERROR
+#endif
+    void (*func)();
+
+    rb_secure(2);
+#ifdef HAVE_DLERROR
+    dlerror();
+#endif
+    func = (void (*)())(VALUE)dlsym(handle, name);
+    CHECK_DLERROR;
+#if defined(FUNC_STDCALL)
+    if( !func ){
+	int  i;
+	int  len = (int)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
+	name_n = (char*)xmalloc(len+6);
+#endif
+	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);
+    }
+#endif
+    if( !func ){
+	rb_raise(rb_eDLError, "unknown symbol \"%s\"", name);
+    }
+
+    return PTR2NUM(func);
+}
+
+void
+Init_dlhandle(void)
+{
+    /*
+     * Document-class: DL::Handle
+     *
+     * The DL::Handle is the manner to access the dynamic library
+     *
+     * == Example
+     *
+     * === Setup
+     *
+     *   libc_so = "/lib64/libc.so.6"
+     *   => "/lib64/libc.so.6"
+     *   @handle = DL::Handle.new(libc_so)
+     *   => #<DL::Handle:0x00000000d69ef8>
+     *
+     * === Setup, with flags
+     *
+     *   libc_so = "/lib64/libc.so.6"
+     *   => "/lib64/libc.so.6"
+     *   @handle = DL::Handle.new(libc_so, DL::RTLD_LAZY | DL::RTLD_GLOBAL)
+     *   => #<DL::Handle:0x00000000d69ef8>
+     *
+     * === Addresses to symbols
+     *
+     *   strcpy_addr = @handle['strcpy']
+     *   => 140062278451968
+     *
+     * or
+     *
+     *   strcpy_addr = @handle.sym('strcpy')
+     *   => 140062278451968
+     *
+     */
+    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);
+
+    /* Document-const: NEXT
+     *
+     * A predefined pseudo-handle of RTLD_NEXT
+     *
+     * Which will find the next occurrence of a function in the search order
+     * after the current library.
+     */
+    rb_define_const(rb_cDLHandle, "NEXT", predefined_dlhandle(RTLD_NEXT));
+
+    /* Document-const: DEFAULT
+     *
+     * A predefined pseudo-handle of RTLD_DEFAULT
+     *
+     * Which will find the first occurrence of the desired symbol using the
+     * default library search order
+     */
+    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/lib/dl.rb b/ext/dl/lib/dl.rb
new file mode 100644
index 0000000000..8e615ae718
--- /dev/null
+++ b/ext/dl/lib/dl.rb
@@ -0,0 +1,15 @@
+require 'dl.so'
+
+begin
+  require 'fiddle' unless Object.const_defined?(:Fiddle)
+rescue LoadError
+end
+
+warn "DL is deprecated, please use Fiddle"
+
+module DL
+  # Returns true if DL is using Fiddle, the libffi wrapper.
+  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..1722d3c6b9
--- /dev/null
+++ b/ext/dl/lib/dl/callback.rb
@@ -0,0 +1,112 @@
+require 'dl'
+require 'thread'
+
+module DL
+	# The mutual exclusion (Mutex) semaphore for the DL module
+  SEM = Mutex.new # :nodoc:
+
+  if DL.fiddle?
+    # A Hash of callback Procs
+    #
+    # Uses Fiddle
+    CdeclCallbackProcs = {} # :nodoc:
+
+    # A Hash of the addresses of callback Proc
+    #
+    # Uses Fiddle
+    CdeclCallbackAddrs = {} # :nodoc:
+
+    # A Hash of Stdcall callback Procs
+    #
+    # Uses Fiddle on win32
+    StdcallCallbackProcs = {} # :nodoc:
+
+    # A Hash of the addresses of Stdcall callback Procs
+    #
+    # Uses Fiddle on win32
+    StdcallCallbackAddrs = {} # :nodoc:
+  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..e70e0f1dc1
--- /dev/null
+++ b/ext/dl/lib/dl/cparser.rb
@@ -0,0 +1,156 @@
+module DL
+  # Methods for parsing C struct and C prototype signatures.
+  module CParser
+    # Parses a C struct's members
+    #
+    # Example:
+    #
+    #   parse_struct_signature(['int i', 'char c'])
+    #   => [[DL::TYPE_INT, DL::TYPE_CHAR], ["i", "c"]]
+    #
+    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
+
+    # Parses a C prototype signature
+    #
+    # Example:
+    #
+    #   include DL::CParser
+    #   => Object
+    #
+    #   parse_signature('double sum(double, double)')
+    #   => ["sum", DL::TYPE_DOUBLE, [DL::TYPE_DOUBLE, DL::TYPE_DOUBLE]]
+    #
+    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
+
+    # Given a String of C type +ty+, return the corresponding DL constant.
+    #
+    # +ty+ can also accept an Array of C type Strings, and will returned in a
+    # corresponding Array.
+    #
+    # If Hash +tymap+ is provided, +ty+ is expected to be the key, and the
+    # value will be the C type to be looked up.
+    #
+    # Example:
+    #
+    #   parse_ctype('int')
+    #   => DL::TYPE_INT
+    #
+    #   parse_ctype('double')
+    #   => DL::TYPE_DOUBLE
+    #
+    #   parse_ctype('unsigned char')
+    #   => -DL::TYPE_CHAR
+    #
+    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 "size_t"
+        return TYPE_SIZE_T
+      when "ssize_t"
+        return TYPE_SSIZE_T
+      when "ptrdiff_t"
+        return TYPE_PTRDIFF_T
+      when "intptr_t"
+        return TYPE_INTPTR_T
+      when "uintptr_t"
+        return TYPE_UINTPTR_T
+      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..543711f651
--- /dev/null
+++ b/ext/dl/lib/dl/func.rb
@@ -0,0 +1,251 @@
+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
+
+    if DL.fiddle?
+      # :stopdoc:
+      CALL_TYPE_TO_ABI = Hash.new { |h, k|
+        raise RuntimeError, "unsupported call type: #{k}"
+      }.merge({ :stdcall =>
+                (Fiddle::Function::STDCALL rescue Fiddle::Function::DEFAULT),
+                :cdecl   => Fiddle::Function::DEFAULT,
+                nil      => Fiddle::Function::DEFAULT
+              }).freeze
+      private_constant :CALL_TYPE_TO_ABI
+      # :startdoc:
+
+      def self.call_type_to_abi(call_type) # :nodoc:
+        CALL_TYPE_TO_ABI[call_type]
+      end
+      private_class_method :call_type_to_abi
+
+      class FiddleClosureCFunc < Fiddle::Closure # :nodoc: all
+        def initialize ctype, arg, abi, name
+          @name = name
+          super(ctype, arg, abi)
+        end
+        def name
+          @name
+        end
+        def ptr
+          to_i
+        end
+      end
+      private_constant :FiddleClosureCFunc
+
+      def self.class_fiddle_closure_cfunc # :nodoc:
+        FiddleClosureCFunc
+      end
+      private_class_method :class_fiddle_closure_cfunc
+    end
+
+    def initialize cfunc, argtypes, abi = nil, &block
+      if DL.fiddle?
+        abi ||= CALL_TYPE_TO_ABI[(cfunc.calltype rescue nil)]
+        if block_given?
+          @cfunc = Class.new(FiddleClosureCFunc) {
+            define_method(:call, block)
+          }.new(cfunc.ctype, argtypes, abi, cfunc.name)
+        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 = []
+        if $SAFE >= 1 && args.any? { |x| x.tainted? }
+          raise SecurityError, "tainted parameter not allowed"
+        end
+        _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(FiddleClosureCFunc) {
+          def initialize ctype, args, abi, name, block
+            super(ctype, args, abi, name)
+            @block = block
+          end
+
+          def call *args
+            @block.call(*args)
+          end
+        }.new(@cfunc.ctype, @args, abi, name, block)
+        @ptr = @cfunc
+        return nil
+      else
+        if( !block )
+          raise(RuntimeError, "block must be given.")
+        end
+        unless block.lambda?
+          block = Class.new(self.class){define_method(:call, block); def initialize(obj); obj.instance_variables.each{|s| instance_variable_set(s, obj.instance_variable_get(s))}; end}.new(self).method(:call)
+        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 DL.fiddle? then
+        if @cfunc.kind_of?(Fiddle::Closure) and @cfunc.ptr != 0 then
+          call_type = case abi
+                      when CALL_TYPE_TO_ABI[nil]
+                        nil
+                      when CALL_TYPE_TO_ABI[:stdcall]
+                        :stdcall
+                      else
+                        raise(RuntimeError, "unsupported abi: #{abi}")
+                      end
+          @cfunc = CFunc.new(0, @cfunc.ctype, name, call_type)
+          return 0
+        elsif @cfunc.ptr != 0 then
+          @cfunc.ptr = 0
+          return 0
+        else
+          return nil
+        end
+      end
+      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
new file mode 100644
index 0000000000..6f157ccf28
--- /dev/null
+++ b/ext/dl/lib/dl/import.rb
@@ -0,0 +1,268 @@
+require 'dl'
+require 'dl/func.rb'
+require 'dl/struct.rb'
+require 'dl/cparser.rb'
+
+module DL
+  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
+
+  # DL::Importer includes the means to dynamically load libraries and build
+  # modules around them including calling extern functions within the C
+  # library that has been loaded.
+  #
+  # == Example
+  #
+  #   require 'dl'
+  #   require 'dl/import'
+  #
+  #   module LibSum
+  #   	extend DL::Importer
+  #   	dlload './libsum.so'
+  #   	extern 'double sum(double*, int)'
+  #   	extern 'double split(double)'
+  #   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)
+      @type_alias ||= nil
+      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
+      return CPtr[ty].size()
+    end
+
+    def parse_bind_options(opts)
+      h = {}
+      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
+      h
+    end
+    private :parse_bind_options
+
+    def extern(signature, *opts)
+      @type_alias ||= nil
+      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
+      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)
+      @type_alias ||= nil
+      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
+      @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
+      module_eval(<<-EOS, file, line)
+        def #{name}(*args,&block)
+          @func_map['#{name}'].call(*args,&block)
+        end
+      EOS
+      module_function(name)
+      f
+    end
+
+    # Creates a class to wrap the C struct described by +signature+.
+    #
+    #   MyStruct = struct ['int i', 'char c']
+    def struct(signature)
+      @type_alias ||= nil
+      tys, mems = parse_struct_signature(signature, @type_alias)
+      DL::CStructBuilder.create(CStruct, tys, mems)
+    end
+
+    # Creates a class to wrap the C union described by +signature+.
+    #
+    #   MyUnion = union ['int i', 'char c']
+    def union(signature)
+      @type_alias ||= nil
+      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
+      return ptr
+    end
+    alias value create_value
+
+    def import_value(ty, addr)
+      s = struct([ty + " value"])
+      ptr = s.new(addr)
+      return ptr
+    end
+
+    def handler
+      defined?(@handler) or raise "call dlload before importing symbols and functions"
+      @handler
+    end
+
+    def import_symbol(name)
+      addr = handler.sym(name)
+      if( !addr )
+        raise(DLError, "cannot find the symbol: #{name}")
+      end
+      CPtr.new(addr)
+    end
+
+    def import_function(name, ctype, argtype, call_type = nil)
+      addr = handler.sym(name)
+      if( !addr )
+        raise(DLError, "cannot find the function: #{name}()")
+      end
+      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?
+        klass = Function.instance_eval { class_fiddle_closure_cfunc }
+        abi = Function.instance_eval { call_type_to_abi(call_type) }
+        closure = Class.new(klass) {
+          define_method(:call, block)
+        }.new(ctype, argtype, abi, name)
+
+        Function.new(closure, argtype, abi)
+      else
+        f = Function.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
+        f.bind(&block)
+        f
+      end
+    end
+
+    def create_temp_function(name, ctype, argtype, call_type = nil)
+      TempFunction.new(CFunc.new(0, ctype, name, call_type || :cdecl), argtype)
+    end
+
+    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
new file mode 100644
index 0000000000..e2d91a6d14
--- /dev/null
+++ b/ext/dl/lib/dl/struct.rb
@@ -0,0 +1,236 @@
+require 'dl'
+require 'dl/value'
+require 'dl/pack.rb'
+
+module DL
+  # C struct shell
+  class CStruct
+    # accessor to DL::CStructEntity
+    def CStruct.entity_class()
+      CStructEntity
+    end
+  end
+
+  # C union shell
+  class CUnion
+    # accessor to DL::CUnionEntity
+    def CUnion.entity_class()
+      CUnionEntity
+    end
+  end
+
+  # Used to construct C classes (CUnion, CStruct, etc)
+  #
+  # DL::Importer#struct and DL::Importer#union wrap this functionality in an
+  # easy-to-use manner.
+  module CStructBuilder
+    # Construct a new class given a C:
+    # * class +klass+ (CUnion, CStruct, or other that provide an
+    #   #entity_class)
+    # * +types+ (DL:TYPE_INT, DL::TYPE_SIZE_T, etc., see the C types
+    #   constants)
+    # * corresponding +members+
+    #
+    # DL::Importer#struct and DL::Importer#union wrap this functionality in an
+    # easy-to-use manner.
+    #
+    # Example:
+    #
+    #   require 'dl/struct'
+    #   require 'dl/cparser'
+    #
+    #   include DL::CParser
+    #
+    #   types, members = parse_struct_signature(['int i','char c'])
+    #
+    #   MyStruct = DL::CStructBuilder.create(CUnion, types, members)
+    #
+    #   obj = MyStruct.allocate
+    #
+    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
+
+  # A C struct wrapper
+  class CStructEntity < (DL.fiddle? ? Fiddle::Pointer : CPtr)
+    include PackInfo
+    include ValueUtil
+
+    # Allocates a C struct the +types+ provided.  The C function +func+ is
+    # called when the instance is garbage collected.
+    def CStructEntity.malloc(types, func = nil)
+      addr = DL.malloc(CStructEntity.size(types))
+      CStructEntity.new(addr, types, func)
+    end
+
+    # Given +types+, returns the offset for the packed sizes of those types
+    #
+    #   DL::CStructEntity.size([DL::TYPE_DOUBLE, DL::TYPE_INT, DL::TYPE_CHAR,
+    #                           DL::TYPE_VOIDP])
+    #   => 24
+    def CStructEntity.size(types)
+      offset = 0
+
+      max_align = types.map { |type, count = 1|
+        last_offset = offset
+
+        align = PackInfo::ALIGN_MAP[type]
+        offset = PackInfo.align(last_offset, align) +
+                 (PackInfo::SIZE_MAP[type] * count)
+
+        align
+      }.max
+
+      PackInfo.align(offset, max_align)
+    end
+
+    # Wraps the C pointer +addr+ as a C struct with the given +types+.  The C
+    # function +func+ is called when the instance is garbage collected.
+    #
+    # See also DL::CPtr.new
+    def initialize(addr, types, func = nil)
+      set_ctypes(types)
+      super(addr, @size, func)
+    end
+
+    # Set the names of the +members+ in this C struct
+    def assign_names(members)
+      @members = members
+    end
+
+    # Given +types+, calculate the offsets and sizes for the types in the
+    # struct.
+    def set_ctypes(types)
+      @ctypes = types
+      @offset = []
+      offset = 0
+
+      max_align = types.map { |type, count = 1|
+        orig_offset = offset
+        align = ALIGN_MAP[type]
+        offset = PackInfo.align(orig_offset, align)
+
+        @offset << offset
+
+        offset += (SIZE_MAP[type] * count)
+
+        align
+      }.max
+
+      @size = PackInfo.align(offset, max_align)
+    end
+
+    # Fetch struct member +name+
+    def [](name)
+      idx = @members.index(name)
+      if( idx.nil? )
+        raise(ArgumentError, "no such member: #{name}")
+      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
+
+    # Set struct member +name+, to value +val+
+    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
+
+    def to_s() # :nodoc:
+      super(@size)
+    end
+  end
+
+  # A C union wrapper
+  class CUnionEntity < CStructEntity
+    include PackInfo
+
+    # Allocates a C union the +types+ provided.  The C function +func+ is
+    # called when the instance is garbage collected.
+    def CUnionEntity.malloc(types, func=nil)
+      addr = DL.malloc(CUnionEntity.size(types))
+      CUnionEntity.new(addr, types, func)
+    end
+
+    # Given +types+, returns the size needed for the union.
+    #
+    #   DL::CUnionEntity.size([DL::TYPE_DOUBLE, DL::TYPE_INT, DL::TYPE_CHAR,
+    #                          DL::TYPE_VOIDP])
+    #   => 8
+    def CUnionEntity.size(types)
+      types.map { |type, count = 1|
+        PackInfo::SIZE_MAP[type] * count
+      }.max
+    end
+
+    # Given +types+, calculate the necessary offset and for each union member
+    def set_ctypes(types)
+      @ctypes = types
+      @offset = Array.new(types.length, 0)
+      @size   = self.class.size types
+    end
+  end
+end
+
diff --git a/ext/dl/lib/dl/types.rb b/ext/dl/lib/dl/types.rb
new file mode 100644
index 0000000000..d5724e407b
--- /dev/null
+++ b/ext/dl/lib/dl/types.rb
@@ -0,0 +1,71 @@
+module DL
+  # Adds Windows type aliases to the including class for use with
+  # DL::Importer.
+  #
+  # The aliases added are:
+  # * ATOM
+  # * BOOL
+  # * BYTE
+  # * DWORD
+  # * DWORD32
+  # * DWORD64
+  # * HANDLE
+  # * HDC
+  # * HINSTANCE
+  # * HWND
+  # * LPCSTR
+  # * LPSTR
+  # * PBYTE
+  # * PDWORD
+  # * PHANDLE
+  # * PVOID
+  # * PWORD
+  # * UCHAR
+  # * UINT
+  # * ULONG
+  # * WORD
+  module Win32Types
+    def included(m) # :nodoc:
+      m.module_eval{
+        typealias "DWORD", "unsigned long"
+        typealias "PDWORD", "unsigned long *"
+        typealias "DWORD32", "unsigned long"
+        typealias "DWORD64", "unsigned long 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", "uintptr_t"
+        typealias "PHANDLE", "void*"
+        typealias "PVOID", "void*"
+        typealias "LPCSTR", "char*"
+        typealias "LPSTR", "char*"
+        typealias "HINSTANCE", "unsigned int"
+        typealias "HDC", "unsigned int"
+        typealias "HWND", "unsigned int"
+      }
+    end
+    module_function :included
+  end
+
+  # Adds basic type aliases to the including class for use with DL::Importer.
+  #
+  # The aliases added are +uint+ and +u_int+ (<tt>unsigned int</tt>) and
+  # +ulong+ and +u_long+ (<tt>unsigned long</tt>)
+  module BasicTypes
+    def included(m) # :nodoc:
+      m.module_eval{
+        typealias "uint", "unsigned int"
+        typealias "u_int", "unsigned int"
+        typealias "ulong", "unsigned long"
+        typealias "u_long", "unsigned long"
+      }
+    end
+    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..147d9d120a
--- /dev/null
+++ b/ext/dl/lib/dl/value.rb
@@ -0,0 +1,114 @@
+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)
+        require 'dl/func'
+
+        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/etc/depend b/ext/etc/depend
index 137ec83849..a73a18465a 100644
--- a/ext/etc/depend
+++ b/ext/etc/depend
@@ -1,21 +1,9 @@
+etc.o : etc.c constdefs.h $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
+
 constdefs.h : $(srcdir)/mkconstants.rb
 	@echo "generating constant definitions"
 	@$(RUBY) $(srcdir)/mkconstants.rb -o constdefs.h
 
-# AUTOGENERATED DEPENDENCIES START
-etc.o: $(RUBY_EXTCONF_H)
-etc.o: $(arch_hdrdir)/ruby/config.h
-etc.o: $(hdrdir)/ruby/backward.h
-etc.o: $(hdrdir)/ruby/defines.h
-etc.o: $(hdrdir)/ruby/encoding.h
-etc.o: $(hdrdir)/ruby/intern.h
-etc.o: $(hdrdir)/ruby/io.h
-etc.o: $(hdrdir)/ruby/missing.h
-etc.o: $(hdrdir)/ruby/oniguruma.h
-etc.o: $(hdrdir)/ruby/ruby.h
-etc.o: $(hdrdir)/ruby/st.h
-etc.o: $(hdrdir)/ruby/subst.h
-etc.o: $(top_srcdir)/include/ruby.h
-etc.o: constdefs.h
-etc.o: etc.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 0d2d9af7cb..6168ed1510 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -30,10 +30,6 @@
 #include <sys/utsname.h>
 #endif
 
-#ifdef HAVE_SCHED_GETAFFINITY
-#include <sched.h>
-#endif
-
 static VALUE sPasswd;
 #ifdef HAVE_GETGRENT
 static VALUE sGroup;
@@ -81,15 +77,8 @@ etc_getlogin(VALUE obj)
     login = getenv("USER");
 #endif
 
-    if (login) {
-#ifdef _WIN32
-	rb_encoding *extenc = rb_utf8_encoding();
-#else
-	rb_encoding *extenc = rb_locale_encoding();
-#endif
-	return rb_external_str_new_with_enc(login, strlen(login), extenc);
-    }
-
+    if (login)
+	return rb_tainted_str_new2(login);
     return Qnil;
 }
 
@@ -241,7 +230,7 @@ passwd_iterate(void)
     struct passwd *pw;
 
     setpwent();
-    while ((pw = getpwent()) != 0) {
+    while (pw = getpwent()) {
 	rb_yield(setup_passwd(pw));
     }
     return Qnil;
@@ -287,7 +276,7 @@ etc_passwd(VALUE obj)
     if (rb_block_given_p()) {
 	each_passwd();
     }
-    else if ((pw = getpwent()) != 0) {
+    else if (pw = getpwent()) {
 	return setup_passwd(pw);
     }
 #endif
@@ -369,7 +358,7 @@ etc_getpwent(VALUE obj)
 #ifdef HAVE_GETPWENT
     struct passwd *pw;
 
-    if ((pw = getpwent()) != 0) {
+    if (pw = getpwent()) {
 	return setup_passwd(pw);
     }
 #endif
@@ -485,7 +474,7 @@ group_iterate(void)
     struct group *pw;
 
     setgrent();
-    while ((pw = getgrent()) != 0) {
+    while (pw = getgrent()) {
 	rb_yield(setup_group(pw));
     }
     return Qnil;
@@ -527,7 +516,7 @@ etc_group(VALUE obj)
     if (rb_block_given_p()) {
 	each_group();
     }
-    else if ((grp = getgrent()) != 0) {
+    else if (grp = getgrent()) {
 	return setup_group(grp);
     }
 #endif
@@ -606,7 +595,7 @@ etc_getgrent(VALUE obj)
 #ifdef HAVE_GETGRENT
     struct group *gr;
 
-    if ((gr = getgrent()) != 0) {
+    if (gr = getgrent()) {
 	return setup_group(gr);
     }
 #endif
@@ -651,28 +640,7 @@ etc_systmpdir(void)
     if (!len) return Qnil;
     tmpdir = rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
 #else
-    const char default_tmp[] = "/tmp";
-    const char *tmpstr = default_tmp;
-    size_t tmplen = strlen(default_tmp);
-# if defined _CS_DARWIN_USER_TEMP_DIR
-    #ifndef MAXPATHLEN
-    #define MAXPATHLEN 1024
-    #endif
-    char path[MAXPATHLEN];
-    size_t len;
-    len = confstr(_CS_DARWIN_USER_TEMP_DIR, path, sizeof(path));
-    if (len > 0) {
-	tmpstr = path;
-	tmplen = len - 1;
-	if (len > sizeof(path)) tmpstr = 0;
-    }
-# endif
-    tmpdir = rb_filesystem_str_new(tmpstr, tmplen);
-# if defined _CS_DARWIN_USER_TEMP_DIR
-    if (!tmpstr) {
-	confstr(_CS_DARWIN_USER_TEMP_DIR, RSTRING_PTR(tmpdir), len);
-    }
-# endif
+    tmpdir = rb_filesystem_str_new_cstr("/tmp");
 #endif
     FL_UNSET(tmpdir, FL_TAINT);
     return tmpdir;
@@ -810,7 +778,10 @@ etc_uname(VALUE obj)
  * nil means indefinite limit.  (sysconf() returns -1 but errno is not set.)
  *
  *   Etc.sysconf(Etc::SC_ARG_MAX) #=> 2097152
- *   Etc.sysconf(Etc::SC_LOGIN_NAME_MAX) #=> 256
+ *
+ *   # Number of processors.
+ *   # It is not standardized.
+ *   Etc.sysconf(Etc::SC_NPROCESSORS_ONLN) #=> 4
  *
  */
 static VALUE
@@ -920,119 +891,6 @@ io_pathconf(VALUE io, VALUE arg)
 #define io_pathconf rb_f_notimplement
 #endif
 
-#if (defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN)) || defined(_WIN32)
-
-#if defined(HAVE_SCHED_GETAFFINITY) && defined(CPU_ALLOC)
-static int
-etc_nprocessors_affin(void)
-{
-    cpu_set_t *cpuset;
-    size_t size;
-    int ret;
-    int n;
-
-    /*
-     * XXX:
-     * man page says CPU_ALLOC takes number of cpus. But it is not accurate
-     * explanation. sched_getaffinity() returns EINVAL if cpuset bitmap is
-     * smaller than kernel internal bitmap.
-     * That said, sched_getaffinity() can fail when a kernel have sparse bitmap
-     * even if cpuset bitmap is larger than number of cpus.
-     * The precious way is to use /sys/devices/system/cpu/online. But there are
-     * two problems,
-     * - Costly calculation
-     *    It is a minor issue, but possibly kill a benefit of a parallel processing.
-     * - No guarantee to exist /sys/devices/system/cpu/online
-     *    This is an issue especially when using Linux containers.
-     * So, we use hardcode number for a workaround. Current linux kernel
-     * (Linux 3.17) support 8192 cpus at maximum. Then 16384 must be enough.
-     */
-    for (n=64; n <= 16384; n *= 2) {
-	size = CPU_ALLOC_SIZE(n);
-	if (size >= 1024) {
-	    cpuset = xcalloc(1, size);
-	    if (!cpuset)
-		return -1;
-	} else {
-	    cpuset = alloca(size);
-	    CPU_ZERO_S(size, cpuset);
-	}
-
-	ret = sched_getaffinity(0, size, cpuset);
-	if (ret == 0) {
-	    /* On success, count number of cpus. */
-	    ret = CPU_COUNT_S(size, cpuset);
-	}
-
-	if (size >= 1024) {
-	    xfree(cpuset);
-	}
-	if (ret > 0) {
-	    return ret;
-	}
-    }
-
-    return ret;
-}
-#endif
-
-/*
- * Returns the number of online processors.
- *
- * The result is intended as the number of processes to
- * use all available processors.
- *
- * This method is implemented using:
- * - sched_getaffinity(): Linux
- * - sysconf(_SC_NPROCESSORS_ONLN): GNU/Linux, NetBSD, FreeBSD, OpenBSD, DragonFly BSD, OpenIndiana, Mac OS X, AIX
- *
- * Example:
- *
- *   require 'etc'
- *   p Etc.nprocessors #=> 4
- *
- * The result might be smaller number than physical cpus especially when ruby
- * process is bound to specific cpus. This is intended for getting better
- * parallel processing.
- *
- * Example: (Linux)
- *
- *   linux$ taskset 0x3 ./ruby -retc -e "p Etc.nprocessors"  #=> 2
- *
- */
-static VALUE
-etc_nprocessors(VALUE obj)
-{
-    long ret;
-
-#if !defined(_WIN32)
-
-#if defined(HAVE_SCHED_GETAFFINITY) && defined(CPU_ALLOC)
-    int ncpus;
-
-    ncpus = etc_nprocessors_affin();
-    if (ncpus != -1) {
-       return INT2NUM(ncpus);
-    }
-    /* fallback to _SC_NPROCESSORS_ONLN */
-#endif
-
-    errno = 0;
-    ret = sysconf(_SC_NPROCESSORS_ONLN);
-    if (ret == -1) {
-        rb_sys_fail("sysconf(_SC_NPROCESSORS_ONLN)");
-    }
-#else
-    SYSTEM_INFO si;
-    GetSystemInfo(&si);
-    ret = (long)si.dwNumberOfProcessors;
-#endif
-    return LONG2NUM(ret);
-}
-#else
-#define etc_nprocessors rb_f_notimplement
-#endif
-
 /*
  * The Etc module provides access to information typically stored in
  * files in the /etc directory on Unix systems.
@@ -1088,7 +946,6 @@ Init_etc(void)
     rb_define_module_function(mEtc, "sysconf", etc_sysconf, 1);
     rb_define_module_function(mEtc, "confstr", etc_confstr, 1);
     rb_define_method(rb_cIO, "pathconf", io_pathconf, 1);
-    rb_define_module_function(mEtc, "nprocessors", etc_nprocessors, 0);
 
     sPasswd =  rb_struct_define_under(mEtc, "Passwd",
 				      "name",
diff --git a/ext/etc/extconf.rb b/ext/etc/extconf.rb
index 11bc9458c0..c6b41a4c92 100644
--- a/ext/etc/extconf.rb
+++ b/ext/etc/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 headers = []
diff --git a/ext/etc/mkconstants.rb b/ext/etc/mkconstants.rb
index 0c4d17e6f9..c9fddfd132 100644
--- a/ext/etc/mkconstants.rb
+++ b/ext/etc/mkconstants.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'optparse'
 require 'erb'
 
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 04d374ece6..3a240aad0b 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -1,6 +1,5 @@
 #! /usr/local/bin/ruby
 # -*- mode: ruby; coding: us-ascii -*-
-# frozen_string_literal: false
 
 # :stopdoc:
 $extension = nil
@@ -26,6 +25,7 @@ alias $PROGRAM_NAME $0
 alias $0 $progname
 
 $extlist = []
+$compiled = {}
 
 DUMMY_SIGNATURE = "***DUMMY MAKEFILE***"
 
@@ -49,6 +49,11 @@ elsif !File.chardev?(@null = "/dev/null")
   @null = "nul"
 end
 
+def sysquote(x)
+  @quote ||= /os2/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
+  @quote ? x.quote : x
+end
+
 def verbose?
   $mflags.defined?("V") == "1"
 end
@@ -78,14 +83,11 @@ end
 
 def extract_makefile(makefile, keep = true)
   m = File.read(makefile)
-  s = m[/^CLEANFILES[ \t]*=[ \t](.*)/, 1] and $cleanfiles = s.split
-  s = m[/^DISTCLEANFILES[ \t]*=[ \t](.*)/, 1] and $distcleanfiles = s.split
-  s = m[/^EXTSO[ \t]*=[ \t](.*)/, 1] and $extso = s.split
   if !(target = m[/^TARGET[ \t]*=[ \t]*(\S*)/, 1])
     return keep
   end
   installrb = {}
-  m.scan(/^(?:do-)?install-rb-default:.*[ \t](\S+)(?:[ \t].*)?\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
+  m.scan(/^install-rb-default:.*[ \t](\S+)(?:[ \t].*)?\n\1:[ \t]*(\S+)/) {installrb[$2] = $1}
   oldrb = installrb.keys.sort
   newrb = install_rb(nil, "").collect {|d, *f| f}.flatten.sort
   if target_prefix = m[/^target_prefix[ \t]*=[ \t]*\/(.*)/, 1]
@@ -125,13 +127,13 @@ def extract_makefile(makefile, keep = true)
   end
   $objs = (m[/^OBJS[ \t]*=[ \t](.*)/, 1] || "").split
   $srcs = (m[/^SRCS[ \t]*=[ \t](.*)/, 1] || "").split
-  $headers = (m[/^LOCAL_HDRS[ \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
 end
 
-def extmake(target, basedir = (maybestatic = 'ext'))
+def extmake(target)
   unless $configure_only || verbose?
     print "#{$message} #{target}\n"
     $stdout.flush
@@ -143,7 +145,7 @@ def extmake(target, basedir = (maybestatic = 'ext'))
     parent = true
     d = target
     until (d = File.dirname(d)) == '.'
-      if File.exist?("#{$top_srcdir}/#{basedir}/#{d}/extconf.rb")
+      if File.exist?("#{$top_srcdir}/ext/#{d}/extconf.rb")
         parent = (/^all:\s*install/ =~ IO.read("#{d}/Makefile") rescue false)
         break
       end
@@ -161,11 +163,11 @@ def extmake(target, basedir = (maybestatic = 'ext'))
     $topdir = prefix + $topdir
     $target = target
     $mdir = target
-    $srcdir = File.join($top_srcdir, basedir, $mdir)
+    $srcdir = File.join($top_srcdir, "ext", $mdir)
     $preload = nil
     $objs = []
     $srcs = []
-    $extso = []
+    $compiled[target] = false
     makefile = "./Makefile"
     static = $static
     $static = nil if noinstall = File.fnmatch?("-*", target)
@@ -180,7 +182,7 @@ def extmake(target, basedir = (maybestatic = 'ext'))
       }
       mkconfig = {
 	"hdrdir" => ($hdrdir == top_srcdir) ? top_srcdir : "$(top_srcdir)/include",
-	"srcdir" => "$(top_srcdir)/#{basedir}/#{$mdir}",
+	"srcdir" => "$(top_srcdir)/ext/#{$mdir}",
 	"topdir" => $topdir,
       }
       rbconfig0.each_pair {|key, val| rbconfig[key] ||= val.dup}
@@ -199,7 +201,7 @@ def extmake(target, basedir = (maybestatic = 'ext'))
 	$extconf_h = nil
 	ok &&= extract_makefile(makefile)
 	old_objs = $objs
-	old_cleanfiles = $distcleanfiles | $cleanfiles
+	old_cleanfiles = $distcleanfiles
 	conf = ["#{$srcdir}/makefile.rb", "#{$srcdir}/extconf.rb"].find {|f| File.exist?(f)}
 	if (!ok || ($extconf_h && !File.exist?($extconf_h)) ||
 	    !(t = modified?(makefile, MTIMES)) ||
@@ -233,7 +235,6 @@ def extmake(target, basedir = (maybestatic = 'ext'))
       rescue SystemExit
 	# ignore
       rescue => error
-        lineno = error.backtrace_locations[0].lineno
         ok = false
       ensure
 	rm_f "conftest*"
@@ -241,40 +242,44 @@ def extmake(target, basedir = (maybestatic = 'ext'))
       end
     end
     ok &&= File.open(makefile){|f| s = f.gets and !s[DUMMY_SIGNATURE]}
-    unless ok
-      mf = ["# #{DUMMY_SIGNATURE}\n", *dummy_makefile(CONFIG["srcdir"])].join("")
+    ok = yield(ok) if block_given?
+    if ok
+      open(makefile, "r+b") do |f|
+        s = f.read.sub!(/^(static:)\s(?!all\b).*/, '\1 all') or break
+        f.rewind
+        f.print(s)
+        f.truncate(f.pos)
+      end unless $static
+    else
       atomic_write_open(makefile) do |f|
-        f.print(mf)
+        f.puts "# " + DUMMY_SIGNATURE
+	f.print(*dummy_makefile(CONFIG["srcdir"]))
       end
 
-      return true if !error and target.start_with?("-")
-
-      if parent
-        message = "Failed to configure #{target}. It will not be installed."
-      else
-        message = "Skipped to configure #{target}. Its parent is not configured."
-      end
-      if Logging.log_opened?
-        Logging::message(error.to_s) if error
-        Logging::message(message)
+      mess = "Failed to configure #{target}. It will not be installed.\n"
+      if error
+        mess = "#{error}\n#{mess}"
       end
-      message = error.message if error
 
-      return parent ? [conf, lineno||0, message] : true
+      Logging::message(mess) if Logging.log_opened?
+      print(mess)
+      $stdout.flush
+      return true
     end
-    args = $mflags
+    args = sysquote($mflags)
     unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR")
-      args += ["DESTDIR=" + relative_from($destdir, "../"+prefix)]
+      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
     end
     if $static and ok and !$objs.empty? and !noinstall
       args += ["static"] unless $clean
-      $extlist.push [(maybestatic ? $static : false), target, $target, $preload]
+      $extlist.push [$static, target, $target, $preload]
     end
-    FileUtils.rm_f(old_cleanfiles - $distcleanfiles - $cleanfiles)
+    FileUtils.rm_f(old_cleanfiles - $distcleanfiles)
     FileUtils.rm_f(old_objs - $objs)
     unless $configure_only or system($make, *args)
       $ignore or $continue or return false
     end
+    $compiled[target] = true
     if $clean
       FileUtils.rm_f("mkmf.log")
       if $clean != true
@@ -288,7 +293,7 @@ def extmake(target, basedir = (maybestatic = 'ext'))
       unless $mswin
         $extflags = split_libs($extflags, $DLDFLAGS, $LDFLAGS).uniq.join(" ")
       end
-      $extlibs = merge_libs($extlibs, split_libs($libs, $LOCAL_LIBS).map {|lib| lib.sub(/\A\.\//, "ext/#{target}/")})
+      $extlibs = merge_libs($extlibs, split_libs($libs), split_libs($LOCAL_LIBS))
       $extpath |= $LIBPATH
     end
   ensure
@@ -322,6 +327,10 @@ def extmake(target, basedir = (maybestatic = 'ext'))
   true
 end
 
+def compiled?(target)
+  $compiled[target]
+end
+
 def parse_args()
   $mflags = []
   $makeflags = [] # for make command to build ruby, so quoted
@@ -365,9 +374,6 @@ def parse_args()
     opts.on('--gnumake=yes|no', true) do |v|
       $gnumake = v
     end
-    opts.on('--extflags=FLAGS') do |v|
-      $extflags = v || ""
-    end
   end
   begin
     $optparser.parse!(ARGV)
@@ -488,29 +494,24 @@ end unless $extstatic
 
 ext_prefix = "#{$top_srcdir}/ext"
 exts = $static_ext.sort_by {|t, i| i}.collect {|t, i| t}
-default_exclude_exts =
-  case
-  when $cygwin
-    %w''
-  when $mswin, $mingw
-    %w'pty syslog'
-  else
-    %w'*win32*'
-  end
-withes, withouts = [["--with", nil], ["--without", default_exclude_exts]].collect {|w, d|
+withes, withouts = %w[--with --without].collect {|w|
   if !(w = %w[-extensions -ext].collect {|o|arg_config(w+o)}).any?
-    d ? proc {|c1| d.any?(&c1)} : proc {true}
+    nil
   elsif (w = w.grep(String)).empty?
     proc {true}
   else
-    w = w.collect {|o| o.split(/,/)}.flatten
-    w.collect! {|o| o == '+' ? d : o}.flatten! if d
-    proc {|c1| w.any?(&c1)}
+    proc {|c1| w.collect {|o| o.split(/,/)}.flatten.any?(&c1)}
   end
 }
+if withes
+  withouts ||= proc {true}
+else
+  withes = proc {false}
+  withouts ||= withes
+end
 cond = proc {|ext, *|
   cond1 = proc {|n| File.fnmatch(n, ext)}
-  withes.call(cond1) and !withouts.call(cond1)
+  withes.call(cond1) or !withouts.call(cond1)
 }
 ($extension || %w[*]).each do |e|
   e = e.sub(/\A(?:\.\/)+/, '')
@@ -529,91 +530,24 @@ end
 if $extout
   extout = RbConfig.expand("#{$extout}", RbConfig::CONFIG.merge("topdir"=>$topdir))
   unless $ignore
-    FileUtils.mkpath("#{extout}/gems")
+    FileUtils.mkpath(extout)
   end
 end
 
-FileUtils.makedirs('gems')
-ext_prefix = "#$top_srcdir/gems"
-gems = Dir.glob(File.join(ext_prefix, ($extension || ''), '**/extconf.rb')).collect {|d|
-  d = File.dirname(d)
-  d.slice!(0, ext_prefix.length + 1)
-  d
-}.find_all {|ext|
-  with_config(ext, &cond)
-}.sort
-
-extend Module.new {
-  def timestamp_file(name, target_prefix = nil)
-    super.sub(%r[/\.extout\.(?:-\.)?], '/.')
-  end
-
-  def configuration(srcdir)
-    super << "EXTSO #{['=', $extso].join(' ')}\n"
-  end
-}
-
 dir = Dir.pwd
 FileUtils::makedirs('ext')
 Dir::chdir('ext')
 
 hdrdir = $hdrdir
 $hdrdir = ($top_srcdir = relative_from(srcdir, $topdir = "..")) + "/include"
-extso = []
-fails = []
 exts.each do |d|
   $static = $force_static ? true : $static_ext[d]
 
   if $ignore or !$nodynamic or $static
-    result = extmake(d) or abort
-    extso |= $extso
-    fails << result unless result == true
+    extmake(d) or abort
   end
 end
 
-Dir.chdir('..')
-FileUtils::makedirs('gems')
-Dir.chdir('gems')
-extout = $extout
-unless gems.empty?
-  def self.timestamp_file(name, target_prefix = nil)
-    name = "$(arch)/gems/#{@gemname}#{target_prefix}" if name == '$(TARGET_SO_DIR)'
-    super
-  end
-
-  def self.create_makefile(*args, &block)
-    super(*args) do |conf|
-      conf.find do |s|
-        s.sub!(/^(TARGET_SO_DIR *= *)\$\(RUBYARCHDIR\)/) {
-          "TARGET_GEM_DIR = $(extout)/gems/$(arch)/#{@gemname}\n"\
-          "#{$1}$(TARGET_GEM_DIR)$(target_prefix)"
-        }
-      end
-      conf.any? {|s| /^TARGET *= *\S/ =~ s} and conf << %{
-
-# default target
-all:
-
-build_complete = $(TARGET_GEM_DIR)/gem.build_complete
-install-so: build_complete
-build_complete: $(build_complete)
-$(build_complete): $(TARGET_SO)
-	$(Q) $(TOUCH) $@
-
-}
-      conf
-    end
-  end
-end
-gems.each do |d|
-  $extout = extout.dup
-  @gemname = d[%r{\A[^/]+}]
-  extmake(d, 'gems')
-  extso |= $extso
-end
-$extout = extout
-Dir.chdir('../ext')
-
 $top_srcdir = srcdir
 $topdir = "."
 $hdrdir = hdrdir
@@ -652,8 +586,7 @@ unless $extlist.empty?
   list = $extlist.dup
   built = []
   while e = list.shift
-    static, target, feature, required = e
-    next unless static
+    _, target, feature, required = e
     if required and !(required -= built).empty?
       l = list.size
       if (while l > 0; break true if required.include?(list[l-=1][1]) end)
@@ -683,6 +616,9 @@ void Init_ext(void)\n{\n#$extinit}
     open(extinit.c, "w") {|fe| fe.print src}
   end
 
+  if RUBY_PLATFORM =~ /beos/
+    $extflags.delete("-L/usr/local/lib")
+  end
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
@@ -690,7 +626,7 @@ void Init_ext(void)\n{\n#$extinit}
     ['SETUP', $setup],
     ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
-    "#{n}=#{v}" if v &&= v[/\S(?:.*\S)?/]
+    "#{n}=#{v}" if v and !(v = v.strip).empty?
   }.compact
   puts(*conf)
   $stdout.flush
@@ -714,11 +650,22 @@ unless $destdir.to_s.empty?
 end
 $makeflags.uniq!
 
+if $nmake == ?b
+  unless (vars = $mflags.grep(/\A\w+=/n)).empty?
+    open(mkf = "libruby.mk", "wb") do |tmf|
+      tmf.puts("!include Makefile")
+      tmf.puts
+      tmf.puts(*vars.map {|v| v.sub(/\=/, " = ")})
+      tmf.puts("PRE_LIBRUBY_UPDATE = del #{mkf}")
+    end
+    $mflags.unshift("-f#{mkf}")
+    vars.each {|flag| flag.sub!(/\A/, "-D")}
+  end
+end
 $mflags.unshift("topdir=#$topdir")
 ENV.delete("RUBYOPT")
 if $configure_only and $command_output
   exts.map! {|d| "ext/#{d}/."}
-  gems.map! {|d| "gems/#{d}/."}
   atomic_write_open($command_output) do |mf|
     mf.puts "V = 0"
     mf.puts "Q1 = $(V:1=)"
@@ -744,48 +691,39 @@ if $configure_only and $command_output
     end
 
     mf.macro "extensions", exts
-    mf.macro "gems", gems
     mf.macro "EXTOBJS", $extlist.empty? ? ["dmyext.#{$OBJEXT}"] : ["ext/extinit.#{$OBJEXT}", *$extobjs]
     mf.macro "EXTLIBS", $extlibs
-    mf.macro "EXTSO", extso
     mf.macro "EXTLDFLAGS", $extflags.split
     submakeopts = []
     if enable_config("shared", $enable_shared)
-      submakeopts << 'DLDOBJS="$(EXTOBJS) $(EXTENCS)"'
-      submakeopts << 'EXTOBJS='
+      submakeopts << 'DLDOBJS="$(EXTOBJS) $(ENCOBJS)"'
       submakeopts << 'EXTSOLIBS="$(EXTLIBS)"'
       submakeopts << 'LIBRUBY_SO_UPDATE=$(LIBRUBY_EXTS)'
     else
-      submakeopts << 'EXTOBJS="$(EXTOBJS) $(EXTENCS)"'
+      submakeopts << 'EXTOBJS="$(EXTOBJS) $(ENCOBJS)"'
       submakeopts << 'EXTLIBS="$(EXTLIBS)"'
     end
     submakeopts << 'EXTLDFLAGS="$(EXTLDFLAGS)"'
-    submakeopts << 'UPDATE_LIBRARIES="$(UPDATE_LIBRARIES)"'
-    submakeopts << 'SHOWFLAGS='
     mf.macro "SUBMAKEOPTS", submakeopts
     mf.puts
     targets = %w[all install static install-so install-rb clean distclean realclean]
     targets.each do |tgt|
       mf.puts "#{tgt}: $(extensions:/.=/#{tgt})"
-      mf.puts "#{tgt}: $(gems:/.=/#{tgt})" unless tgt == 'static'
-      mf.puts "#{tgt}: note" unless /clean\z/ =~ tgt
     end
     mf.puts
     mf.puts "clean:\n\t-$(Q)$(RM) ext/extinit.#{$OBJEXT}"
     mf.puts "distclean:\n\t-$(Q)$(RM) ext/extinit.c"
     mf.puts
-    mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'}) $(gems:/.=/all)"
+    mf.puts "#{rubies.join(' ')}: $(extensions:/.=/#{$force_static ? 'static' : 'all'})"
     submake = "$(Q)$(MAKE) $(MFLAGS) $(SUBMAKEOPTS)"
-    mf.puts "all static: #{rubies.join(' ')}\n"
+    mf.puts "all static: $(EXTOBJS)\n\t#{submake} #{rubies.join(' ')}\n"
     $extobjs.each do |tgt|
       mf.puts "#{tgt}: #{File.dirname(tgt)}/static"
     end
-    mf.puts "#{rubies.join(' ')}: $(EXTOBJS)#{' libencs' if CONFIG['ENCSTATIC'] == 'static'}"
+    mf.puts "#{rubies.join(' ')}: $(EXTOBJS)"
     rubies.each do |tgt|
       mf.puts "#{tgt}:\n\t#{submake} $@"
     end
-    mf.puts "libencs:\n\t$(Q)$(MAKE) -f enc.mk V=$(V) $@"
-    mf.puts "ext/extinit.#{$OBJEXT}:\n\t$(Q)$(MAKE) $(MFLAGS) V=$(V) $@" if $static
     mf.puts
     if $gnumake == "yes"
       submake = "$(MAKE) -C $(@D)"
@@ -794,28 +732,11 @@ if $configure_only and $command_output
       config_string("exec") {|str| submake << str << " "}
       submake << "$(MAKE)"
     end
-    gems = exts + gems
     targets.each do |tgt|
-      (tgt == 'static' ? exts : gems).each do |d|
+      exts.each do |d|
         mf.puts "#{d[0..-2]}#{tgt}:\n\t$(Q)#{submake} $(MFLAGS) V=$(V) $(@F)"
       end
     end
-    mf.puts "\n""extso:\n"
-    mf.puts "\t@echo EXTSO=$(EXTSO)"
-
-    mf.puts "\n""note:\n"
-    unless fails.empty?
-      mf.puts %Q<\t@echo "*** Following extensions failed to configure:">
-      fails.each do |d, n, err|
-        d = "#{d}:#{n}:"
-        if err
-          d << " " << err
-        end
-        mf.puts %Q<\t@echo "#{d}">
-      end
-      mf.puts %Q<\t@echo "*** Fix the problems, then remove these directories and try again if you want.">
-    end
-
   end
 elsif $command_output
   message = "making #{rubies.join(', ')}"
@@ -841,7 +762,7 @@ elsif !$configure_only
   puts message
   $stdout.flush
   $mflags.concat(rubies)
-  system($make, *$mflags) or exit($?.exitstatus)
+  system($make, *sysquote($mflags)) or exit($?.exitstatus)
 end
 # :startdoc:
 
diff --git a/ext/fcntl/depend b/ext/fcntl/depend
deleted file mode 100644
index 61d7dc20ee..0000000000
--- a/ext/fcntl/depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-fcntl.o: $(RUBY_EXTCONF_H)
-fcntl.o: $(arch_hdrdir)/ruby/config.h
-fcntl.o: $(hdrdir)/ruby/backward.h
-fcntl.o: $(hdrdir)/ruby/defines.h
-fcntl.o: $(hdrdir)/ruby/intern.h
-fcntl.o: $(hdrdir)/ruby/missing.h
-fcntl.o: $(hdrdir)/ruby/ruby.h
-fcntl.o: $(hdrdir)/ruby/st.h
-fcntl.o: $(hdrdir)/ruby/subst.h
-fcntl.o: $(top_srcdir)/include/ruby.h
-fcntl.o: fcntl.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/fcntl/extconf.rb b/ext/fcntl/extconf.rb
index 35371ebe18..8b717d4a5b 100644
--- a/ext/fcntl/extconf.rb
+++ b/ext/fcntl/extconf.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile('fcntl')
diff --git a/ext/fcntl/fcntl.c b/ext/fcntl/fcntl.c
index 62780b78c0..3538d94948 100644
--- a/ext/fcntl/fcntl.c
+++ b/ext/fcntl/fcntl.c
@@ -62,7 +62,7 @@ pack up your own arguments to pass as args for locking functions, etc.
  *
  */
 void
-Init_fcntl(void)
+Init_fcntl()
 {
     VALUE mFcntl = rb_define_module("Fcntl");
 #ifdef F_DUPFD
diff --git a/ext/fiber/depend b/ext/fiber/depend
deleted file mode 100644
index 85cac2f03c..0000000000
--- a/ext/fiber/depend
+++ /dev/null
@@ -1 +0,0 @@
-fiber.o: fiber.c
diff --git a/ext/fiber/extconf.rb b/ext/fiber/extconf.rb
index 7f11e0dafa..904ab94a9c 100644
--- a/ext/fiber/extconf.rb
+++ b/ext/fiber/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile('fiber')
 
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index f19091b29b..e0f7e4b12d 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -1,6 +1,4 @@
 #include <fiddle.h>
-#include <ruby/thread.h>
-#include "internal.h" /* rb_thread_has_gvl_p */
 
 VALUE cFiddleClosure;
 
@@ -41,13 +39,14 @@ closure_memsize(const void * ptr)
     fiddle_closure * cls = (fiddle_closure *)ptr;
     size_t size = 0;
 
-    size += sizeof(*cls);
+    if (ptr) {
+	size += sizeof(*cls);
 #if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
-    size += ffi_raw_size(&cls->cif);
+	size += ffi_raw_size(&cls->cif);
 #endif
-    size += sizeof(*cls->argv);
-    size += sizeof(ffi_closure);
-
+	size += sizeof(*cls->argv);
+	size += sizeof(ffi_closure);
+    }
     return size;
 }
 
@@ -56,19 +55,10 @@ const rb_data_type_t closure_data_type = {
     {0, dealloc, closure_memsize,},
 };
 
-struct callback_args {
-    ffi_cif *cif;
-    void *resp;
-    void **args;
-    void *ctx;
-};
-
-static void *
-with_gvl_callback(void *ptr)
+void
+callback(ffi_cif *cif, void *resp, void **args, void *ctx)
 {
-    struct callback_args *x = ptr;
-
-    VALUE self      = (VALUE)x->ctx;
+    VALUE self      = (VALUE)ctx;
     VALUE rbargs    = rb_iv_get(self, "@args");
     VALUE ctype     = rb_iv_get(self, "@ctype");
     int argc        = RARRAY_LENINT(rbargs);
@@ -80,52 +70,52 @@ with_gvl_callback(void *ptr)
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
     for (i = 0; i < argc; i++) {
-        type = NUM2INT(RARRAY_AREF(rbargs, i));
+        type = NUM2INT(RARRAY_PTR(rbargs)[i]);
         switch (type) {
 	  case TYPE_VOID:
 	    argc = 0;
 	    break;
 	  case TYPE_INT:
-	    rb_ary_push(params, INT2NUM(*(int *)x->args[i]));
+	    rb_ary_push(params, INT2NUM(*(int *)args[i]));
 	    break;
 	  case -TYPE_INT:
-	    rb_ary_push(params, UINT2NUM(*(unsigned int *)x->args[i]));
+	    rb_ary_push(params, UINT2NUM(*(unsigned int *)args[i]));
 	    break;
 	  case TYPE_VOIDP:
 	    rb_ary_push(params,
 			rb_funcall(cPointer, rb_intern("[]"), 1,
-				   PTR2NUM(*(void **)x->args[i])));
+				   PTR2NUM(*(void **)args[i])));
 	    break;
 	  case TYPE_LONG:
-	    rb_ary_push(params, LONG2NUM(*(long *)x->args[i]));
+	    rb_ary_push(params, LONG2NUM(*(long *)args[i]));
 	    break;
 	  case -TYPE_LONG:
-	    rb_ary_push(params, ULONG2NUM(*(unsigned long *)x->args[i]));
+	    rb_ary_push(params, ULONG2NUM(*(unsigned long *)args[i]));
 	    break;
 	  case TYPE_CHAR:
-	    rb_ary_push(params, INT2NUM(*(signed char *)x->args[i]));
+	    rb_ary_push(params, INT2NUM(*(signed char *)args[i]));
 	    break;
 	  case -TYPE_CHAR:
-	    rb_ary_push(params, UINT2NUM(*(unsigned char *)x->args[i]));
+	    rb_ary_push(params, UINT2NUM(*(unsigned char *)args[i]));
 	    break;
 	  case TYPE_SHORT:
-	    rb_ary_push(params, INT2NUM(*(signed short *)x->args[i]));
+	    rb_ary_push(params, INT2NUM(*(signed short *)args[i]));
 	    break;
 	  case -TYPE_SHORT:
-	    rb_ary_push(params, UINT2NUM(*(unsigned short *)x->args[i]));
+	    rb_ary_push(params, UINT2NUM(*(unsigned short *)args[i]));
 	    break;
 	  case TYPE_DOUBLE:
-	    rb_ary_push(params, rb_float_new(*(double *)x->args[i]));
+	    rb_ary_push(params, rb_float_new(*(double *)args[i]));
 	    break;
 	  case TYPE_FLOAT:
-	    rb_ary_push(params, rb_float_new(*(float *)x->args[i]));
+	    rb_ary_push(params, rb_float_new(*(float *)args[i]));
 	    break;
 #if HAVE_LONG_LONG
 	  case TYPE_LONG_LONG:
-	    rb_ary_push(params, LL2NUM(*(LONG_LONG *)x->args[i]));
+	    rb_ary_push(params, LL2NUM(*(LONG_LONG *)args[i]));
 	    break;
 	  case -TYPE_LONG_LONG:
-	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)x->args[i]));
+	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)args[i]));
 	    break;
 #endif
 	  default:
@@ -133,7 +123,7 @@ with_gvl_callback(void *ptr)
         }
     }
 
-    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_CONST_PTR(params));
+    ret = rb_funcall2(self, rb_intern("call"), argc, RARRAY_PTR(params));
     RB_GC_GUARD(params);
 
     type = NUM2INT(ctype);
@@ -141,59 +131,41 @@ with_gvl_callback(void *ptr)
       case TYPE_VOID:
 	break;
       case TYPE_LONG:
-	*(long *)x->resp = NUM2LONG(ret);
+	*(long *)resp = NUM2LONG(ret);
 	break;
       case -TYPE_LONG:
-	*(unsigned long *)x->resp = NUM2ULONG(ret);
+	*(unsigned long *)resp = NUM2ULONG(ret);
 	break;
       case TYPE_CHAR:
       case TYPE_SHORT:
       case TYPE_INT:
-	*(ffi_sarg *)x->resp = NUM2INT(ret);
+	*(ffi_sarg *)resp = NUM2INT(ret);
 	break;
       case -TYPE_CHAR:
       case -TYPE_SHORT:
       case -TYPE_INT:
-	*(ffi_arg *)x->resp = NUM2UINT(ret);
+	*(ffi_arg *)resp = NUM2UINT(ret);
 	break;
       case TYPE_VOIDP:
-	*(void **)x->resp = NUM2PTR(ret);
+	*(void **)resp = NUM2PTR(ret);
 	break;
       case TYPE_DOUBLE:
-	*(double *)x->resp = NUM2DBL(ret);
+	*(double *)resp = NUM2DBL(ret);
 	break;
       case TYPE_FLOAT:
-	*(float *)x->resp = (float)NUM2DBL(ret);
+	*(float *)resp = (float)NUM2DBL(ret);
 	break;
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	*(LONG_LONG *)x->resp = NUM2LL(ret);
+	*(LONG_LONG *)resp = NUM2LL(ret);
 	break;
       case -TYPE_LONG_LONG:
-	*(unsigned LONG_LONG *)x->resp = NUM2ULL(ret);
+	*(unsigned LONG_LONG *)resp = NUM2ULL(ret);
 	break;
 #endif
       default:
 	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
     }
-    return 0;
-}
-
-static void
-callback(ffi_cif *cif, void *resp, void **args, void *ctx)
-{
-    struct callback_args x;
-
-    x.cif = cif;
-    x.resp = resp;
-    x.args = args;
-    x.ctx = ctx;
-
-    if (ruby_thread_has_gvl_p()) {
-	(void)with_gvl_callback(&x);
-    } else {
-	(void)rb_thread_call_with_gvl(with_gvl_callback, &x);
-    }
 }
 
 static VALUE
@@ -238,7 +210,7 @@ initialize(int rbargc, VALUE argv[], VALUE self)
     cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *));
 
     for (i = 0; i < argc; i++) {
-        int type = NUM2INT(RARRAY_AREF(args, i));
+        int type = NUM2INT(RARRAY_PTR(args)[i]);
         cl->argv[i] = INT2FFI_TYPE(type);
     }
     cl->argv[argc] = NULL;
@@ -288,7 +260,7 @@ to_i(VALUE self)
 }
 
 void
-Init_fiddle_closure(void)
+Init_fiddle_closure()
 {
 #if 0
     mFiddle = rb_define_module("Fiddle"); /* let rdoc know about mFiddle */
diff --git a/ext/fiddle/closure.h b/ext/fiddle/closure.h
index d0a8be6180..1e870e2285 100644
--- a/ext/fiddle/closure.h
+++ b/ext/fiddle/closure.h
@@ -3,6 +3,6 @@
 
 #include <fiddle.h>
 
-void Init_fiddle_closure(void);
+void Init_fiddle_closure();
 
 #endif
diff --git a/ext/fiddle/conversions.h b/ext/fiddle/conversions.h
index cbc610bad2..d0a08d6bc0 100644
--- a/ext/fiddle/conversions.h
+++ b/ext/fiddle/conversions.h
@@ -33,11 +33,11 @@ VALUE generic_to_value(VALUE rettype, fiddle_generic retval);
 #define GENERIC2VALUE(_type, _retval) generic_to_value((_type), (_retval))
 
 #if SIZEOF_VOIDP == SIZEOF_LONG
-# define PTR2NUM(x)   (LONG2NUM((long)(x)))
+# 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)   (LL2NUM((LONG_LONG)(x)))
+# define PTR2NUM(x)   (ULL2NUM((unsigned long long)(x)))
 # define NUM2PTR(x)   ((void*)(NUM2ULL(x)))
 #endif
 
diff --git a/ext/fiddle/depend b/ext/fiddle/depend
index 470e15efef..e786dc71d2 100644
--- a/ext/fiddle/depend
+++ b/ext/fiddle/depend
@@ -1,152 +1,4 @@
-PWD =
-
-CONFIGURE_LIBFFI = \
-	$(LIBFFI_CONFIGURE) --disable-shared \
-		--host=$(LIBFFI_ARCH) --enable-builddir=$(arch) \
-		CC="$(CC)" CFLAGS="$(LIBFFI_CFLAGS)" \
-		LD="$(LD)" LDFLAGS="$(LIBFFI_LDFLAGS)"
-
-$(STATIC_LIB) $(RUBYARCHDIR)/$(DLLIB) $(DLLIB): $(LIBFFI_A)
-
-$(OBJS): $(FFI_H)
-
-.PHONY: .FORCE hdr
-
-.FORCE:
-
-hdr: $(FFI_H)
-
-configure-libffi build-libffi: .FORCE
-configure-libffi \
-$(LIBFFI_DIR)/include/ffi.h \
-$(LIBFFI_DIR)/include/ffitarget.h \
-$(LIBFFI_DIR)/fficonfig.h \
-$(LIBFFI_DIR)/Makefile:
-	$(Q) $(MAKEDIRS) $(LIBFFI_DIR)
-	$(Q) $(CONFIGURE_LIBFFI)
-
-build-libffi: $(LIBFFI_A)
-build-libffi $(LIBFFI_A):
-	$(Q) $(SUBMAKE_LIBFFI)
-
-clean-libffi:
-	$(Q) $(SUBMAKE_LIBFFI) clean
-
-distclean-libffi:
-	$(Q) $(SUBMAKE_LIBFFI) distclean
-	$(Q) $(RM) $(LIBFFI_DIR)/local.exp
-	$(Q) $(RUBY) -rfileutils -e "FileUtils.rmdir(Dir.glob(ARGV[0]+'/**/{,.*/}'), :parents=>true)" $(LIBFFI_DIR)
-
-realclean-libffi:
-	$(Q) $(RMALL) $(LIBFFI_DIR)
-
-.PHONY: clean-libffi distclean-libffi realclean-libffi
-.PHONY: clean-none distclean-none realclean-none
-
-clean: clean-$(LIBFFI_CLEAN)
-distclean: distclean-$(LIBFFI_CLEAN)
-realclean: realclean-$(LIBFFI_CLEAN)
-
-.PHONY: configure configure-libffi
-
-# AUTOGENERATED DEPENDENCIES START
-closure.o: $(RUBY_EXTCONF_H)
-closure.o: $(arch_hdrdir)/ruby/config.h
-closure.o: $(hdrdir)/ruby/backward.h
-closure.o: $(hdrdir)/ruby/defines.h
-closure.o: $(hdrdir)/ruby/encoding.h
-closure.o: $(hdrdir)/ruby/intern.h
-closure.o: $(hdrdir)/ruby/io.h
-closure.o: $(hdrdir)/ruby/missing.h
-closure.o: $(hdrdir)/ruby/oniguruma.h
-closure.o: $(hdrdir)/ruby/ruby.h
-closure.o: $(hdrdir)/ruby/st.h
-closure.o: $(hdrdir)/ruby/subst.h
-closure.o: $(hdrdir)/ruby/thread.h
-closure.o: $(top_srcdir)/include/ruby.h
-closure.o: $(top_srcdir)/internal.h
-closure.o: closure.c
-closure.o: closure.h
-closure.o: conversions.h
-closure.o: fiddle.h
-closure.o: function.h
-conversions.o: $(RUBY_EXTCONF_H)
-conversions.o: $(arch_hdrdir)/ruby/config.h
-conversions.o: $(hdrdir)/ruby/backward.h
-conversions.o: $(hdrdir)/ruby/defines.h
-conversions.o: $(hdrdir)/ruby/intern.h
-conversions.o: $(hdrdir)/ruby/missing.h
-conversions.o: $(hdrdir)/ruby/ruby.h
-conversions.o: $(hdrdir)/ruby/st.h
-conversions.o: $(hdrdir)/ruby/subst.h
-conversions.o: $(top_srcdir)/include/ruby.h
-conversions.o: closure.h
-conversions.o: conversions.c
-conversions.o: conversions.h
-conversions.o: fiddle.h
-conversions.o: function.h
-fiddle.o: $(RUBY_EXTCONF_H)
-fiddle.o: $(arch_hdrdir)/ruby/config.h
-fiddle.o: $(hdrdir)/ruby/backward.h
-fiddle.o: $(hdrdir)/ruby/defines.h
-fiddle.o: $(hdrdir)/ruby/intern.h
-fiddle.o: $(hdrdir)/ruby/missing.h
-fiddle.o: $(hdrdir)/ruby/ruby.h
-fiddle.o: $(hdrdir)/ruby/st.h
-fiddle.o: $(hdrdir)/ruby/subst.h
-fiddle.o: $(top_srcdir)/include/ruby.h
-fiddle.o: closure.h
-fiddle.o: conversions.h
-fiddle.o: fiddle.c
-fiddle.o: fiddle.h
-fiddle.o: function.h
-function.o: $(RUBY_EXTCONF_H)
-function.o: $(arch_hdrdir)/ruby/config.h
-function.o: $(hdrdir)/ruby/backward.h
-function.o: $(hdrdir)/ruby/defines.h
-function.o: $(hdrdir)/ruby/intern.h
-function.o: $(hdrdir)/ruby/missing.h
-function.o: $(hdrdir)/ruby/ruby.h
-function.o: $(hdrdir)/ruby/st.h
-function.o: $(hdrdir)/ruby/subst.h
-function.o: $(hdrdir)/ruby/thread.h
-function.o: $(top_srcdir)/include/ruby.h
-function.o: closure.h
-function.o: conversions.h
-function.o: fiddle.h
-function.o: function.c
-function.o: function.h
-handle.o: $(RUBY_EXTCONF_H)
-handle.o: $(arch_hdrdir)/ruby/config.h
-handle.o: $(hdrdir)/ruby/backward.h
-handle.o: $(hdrdir)/ruby/defines.h
-handle.o: $(hdrdir)/ruby/intern.h
-handle.o: $(hdrdir)/ruby/missing.h
-handle.o: $(hdrdir)/ruby/ruby.h
-handle.o: $(hdrdir)/ruby/st.h
-handle.o: $(hdrdir)/ruby/subst.h
-handle.o: $(top_srcdir)/include/ruby.h
-handle.o: closure.h
-handle.o: conversions.h
-handle.o: fiddle.h
-handle.o: function.h
-handle.o: handle.c
-pointer.o: $(RUBY_EXTCONF_H)
-pointer.o: $(arch_hdrdir)/ruby/config.h
-pointer.o: $(hdrdir)/ruby/backward.h
-pointer.o: $(hdrdir)/ruby/defines.h
-pointer.o: $(hdrdir)/ruby/encoding.h
-pointer.o: $(hdrdir)/ruby/intern.h
-pointer.o: $(hdrdir)/ruby/io.h
-pointer.o: $(hdrdir)/ruby/missing.h
-pointer.o: $(hdrdir)/ruby/oniguruma.h
-pointer.o: $(hdrdir)/ruby/ruby.h
-pointer.o: $(hdrdir)/ruby/st.h
-pointer.o: $(hdrdir)/ruby/subst.h
-pointer.o: $(top_srcdir)/include/ruby.h
-pointer.o: closure.h
-pointer.o: conversions.h
-pointer.o: fiddle.h
-pointer.o: function.h
-pointer.o: pointer.c
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/fiddle/extconf.rb b/ext/fiddle/extconf.rb
index 0359355193..466d77e6dd 100644
--- a/ext/fiddle/extconf.rb
+++ b/ext/fiddle/extconf.rb
@@ -1,111 +1,26 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 # :stopdoc:
 
-bundle = enable_config('bundled-libffi')
-if ! bundle
-  dir_config 'libffi'
+dir_config 'libffi'
 
-  pkg_config("libffi") and
-    ver = pkg_config("libffi", "modversion")
+pkg_config("libffi")
+if ver = pkg_config("libffi", "modversion")
+  ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
+  ver = (ver.split('.') + [0,0])[0,3]
+  $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
+end
 
-  if have_header(ffi_header = 'ffi.h')
-    true
-  elsif have_header(ffi_header = 'ffi/ffi.h')
+unless have_header('ffi.h')
+  if have_header('ffi/ffi.h')
     $defs.push(format('-DUSE_HEADER_HACKS'))
-    true
-  end and (have_library('ffi') || have_library('libffi'))
-end or
-begin
-  ver = bundle != false &&
-        Dir.glob("#{$srcdir}/libffi-*/")
-        .map {|n| File.basename(n)}
-        .max_by {|n| n.scan(/\d+/).map(&:to_i)}
-  unless ver
-    raise "missing libffi. Please install libffi."
-  end
-
-  srcdir = "#{$srcdir}/#{ver}"
-  ffi_header = 'ffi.h'
-  libffi = Struct.new(*%I[dir srcdir builddir include lib a cflags ldflags opt arch]).new
-  libffi.dir = ver
-  if $srcdir == "."
-    libffi.builddir = "#{ver}/#{RUBY_PLATFORM}"
-    libffi.srcdir = "."
   else
-    libffi.builddir = libffi.dir
-    libffi.srcdir = relative_from(srcdir, "..")
-  end
-  libffi.include = "#{libffi.builddir}/include"
-  libffi.lib = "#{libffi.builddir}/.libs"
-  libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
-  nowarn = CONFIG.merge("warnflags"=>"")
-  libffi.cflags = RbConfig.expand("$(CFLAGS)", nowarn)
-  ver = ver[/libffi-(.*)/, 1]
-
-  FileUtils.mkdir_p(libffi.dir)
-  libffi.opt = CONFIG['configure_args'][/'(-C)'/, 1]
-  libffi.ldflags = RbConfig.expand("$(LDFLAGS) #{libpathflag([relative_from($topdir, "..")])} #{$LIBRUBYARG}")
-  libffi.arch = RbConfig::CONFIG['host']
-  if $mswin
-    unless find_executable(as = /x64/ =~ libffi.arch ? "ml64" : "ml")
-      raise "missing #{as} command."
-    end
-    $defs << "-DFFI_BUILDING"
-    libffi_config = "#{relative_from($srcdir, '..')}/win32/libffi-config.rb"
-    config = CONFIG.merge("top_srcdir" => $top_srcdir)
-    args = $ruby.gsub(/:\/=\\/, '')
-    args.gsub!(/\)\\/, ')/')
-    args = args.shellsplit
-    args.map! {|s| RbConfig.expand(s, config)}
-    args << '-C' << libffi.dir << libffi_config
-    opts = {}
-  else
-    args = %W[sh #{libffi.srcdir}/configure ]
-    opts = {chdir: libffi.dir}
-  end
-  cc = RbConfig::CONFIG['CC']
-  cxx = RbConfig::CONFIG['CXX']
-  ld = RbConfig::CONFIG['LD']
-  args.concat %W[
-    --srcdir=#{libffi.srcdir}
-    --host=#{libffi.arch}
-    --enable-builddir=#{RUBY_PLATFORM}
-  ]
-  args << ($enable_shared || !$static ? '--enable-shared' : '--enable-static')
-  args << libffi.opt if libffi.opt
-  args.concat %W[
-      CC=#{cc} CFLAGS=#{libffi.cflags}
-      CXX=#{cxx} CXXFLAGS=#{RbConfig.expand("$(CXXFLAGS)", nowarn)}
-      LD=#{ld} LDFLAGS=#{libffi.ldflags}
-  ]
-
-  FileUtils.rm_f("#{libffi.include}/ffitarget.h")
-  Logging::open do
-    Logging.message("%p in %p\n", args, opts)
-    unless system(*args, **opts)
-      begin
-        IO.copy_stream(libffi.dir + "/config.log", Logging.instance_variable_get(:@logfile))
-      rescue SystemCallError => e
-        Logfile.message("%s\n", e.message)
-      end
-      raise "failed to configure libffi. Please install libffi."
-    end
+    raise "ffi.h is missing. Please install libffi."
   end
-  if $mswin && File.file?("#{libffi.include}/ffitarget.h")
-    FileUtils.rm_f("#{libffi.include}/ffitarget.h")
-  end
-  unless File.file?("#{libffi.include}/ffitarget.h")
-    FileUtils.cp("#{srcdir}/src/x86/ffitarget.h", libffi.include, preserve: true)
-  end
-  $INCFLAGS << " -I" << libffi.include
 end
 
-if ver
-  ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
-  ver = (ver.split('.') + [0,0])[0,3]
-  $defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
+unless have_library('ffi') || have_library('libffi')
+  raise "libffi is missing. Please install libffi."
 end
 
 have_header 'sys/mman.h'
@@ -124,7 +39,7 @@ elsif have_header "windows.h"
   end
 end
 
-have_const('FFI_STDCALL', ffi_header)
+have_const('FFI_STDCALL', 'ffi.h') || have_const('FFI_STDCALL', 'ffi/ffi.h')
 
 config = File.read(RbConfig.expand(File.join($arch_hdrdir, "ruby/config.h")))
 types = {"SIZE_T"=>"SSIZE_T", "PTRDIFF_T"=>nil, "INTPTR_T"=>nil}
@@ -140,43 +55,6 @@ types.each do |type, signed|
   end
 end
 
-if libffi
-  $LOCAL_LIBS.prepend("./#{libffi.a} ").strip! # to exts.mk
-  $INCFLAGS.gsub!(/-I#{libffi.dir}/, '-I$(LIBFFI_DIR)')
-end
-$INCFLAGS << " -I$(top_srcdir)"
-create_makefile 'fiddle' do |conf|
-  if !libffi
-    next conf << "LIBFFI_CLEAN = none\n"
-  elsif $gnumake && !$nmake
-    submake = "$(MAKE) -C $(LIBFFI_DIR)\n"
-  else
-    submake = "cd $(LIBFFI_DIR) && \\\n\t\t" << "#{config_string("exec")} $(MAKE)".strip
-  end
-  if $nmake
-    cmd = "$(RUBY) -C $(LIBFFI_DIR) #{libffi_config} --srcdir=$(LIBFFI_SRCDIR)"
-  else
-    cmd = "cd $(LIBFFI_DIR) && #$exec $(LIBFFI_SRCDIR)/configure #{libffi.opt}"
-  end
-  sep = "/"
-  seprpl = config_string('BUILD_FILE_SEPARATOR') {|s| sep = s; ":/=#{s}" if s != "/"} || ""
-  conf << <<-MK.gsub(/^ +| +$/, '')
-   PWD =
-   LIBFFI_CONFIGURE = #{cmd}
-   LIBFFI_ARCH = #{libffi.arch}
-   LIBFFI_SRCDIR = #{libffi.srcdir.sub(libffi.dir, '$(LIBFFI_DIR)')}
-   LIBFFI_DIR = #{libffi.dir}
-   LIBFFI_A = #{libffi.a.sub(libffi.dir, '$(LIBFFI_DIR)')}
-   LIBFFI_CFLAGS = #{libffi.cflags}
-   LIBFFI_LDFLAGS = #{libffi.ldflags}
-   FFI_H = $(LIBFFI_DIR)/include/ffi.h
-   SUBMAKE_LIBFFI = #{submake}
-   LIBFFI_CLEAN = libffi
-  MK
-end
-
-if libffi
-  $LIBPATH.pop
-end
+create_makefile 'fiddle'
 
 # :startdoc:
diff --git a/ext/fiddle/extlibs b/ext/fiddle/extlibs
deleted file mode 100644
index 7d5fda5247..0000000000
--- a/ext/fiddle/extlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz md5:83b89587607e3eb65c70d361f13bab43
-	win32/libffi-3.2.1-mswin.patch -p0
diff --git a/ext/fiddle/fiddle.h b/ext/fiddle/fiddle.h
index d2583c1cbf..b37c37bc65 100644
--- a/ext/fiddle/fiddle.h
+++ b/ext/fiddle/fiddle.h
@@ -104,6 +104,11 @@
 #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
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 8e280567db..50366bb87f 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -1,5 +1,4 @@
 #include <fiddle.h>
-#include <ruby/thread.h>
 
 #ifdef PRIsVALUE
 # define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
@@ -15,16 +14,12 @@ VALUE cFiddleFunction;
 #define MAX_ARGS (SIZE_MAX / (sizeof(void *) + sizeof(fiddle_generic)) - 1)
 
 #define Check_Max_Args(name, len) \
-    Check_Max_Args_(name, len, "")
-#define Check_Max_Args_Long(name, len) \
-    Check_Max_Args_(name, len, "l")
-#define Check_Max_Args_(name, len, fmt) \
     if ((size_t)(len) < MAX_ARGS) { \
 	/* OK */ \
     } \
     else { \
 	rb_raise(rb_eTypeError, \
-		 name" is so large that it can cause integer overflow (%"fmt"d)", \
+		 name" is so large that it can cause integer overflow (%d)", \
 		 (len)); \
     }
 
@@ -42,11 +37,12 @@ function_memsize(const void *p)
     /* const */ffi_cif *ptr = (ffi_cif *)p;
     size_t size = 0;
 
-    size += sizeof(*ptr);
+    if (ptr) {
+	size += sizeof(*ptr);
 #if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
-    size += ffi_raw_size(ptr);
+	size += ffi_raw_size(ptr);
 #endif
-
+    }
     return size;
 }
 
@@ -91,34 +87,16 @@ static VALUE
 initialize(int argc, VALUE argv[], VALUE self)
 {
     ffi_cif * cif;
-    ffi_type **arg_types, *rtype;
+    ffi_type **arg_types;
     ffi_status result;
-    VALUE ptr, args, ret_type, abi, kwds, ary;
-    int i, len;
-    int nabi;
-    void *cfunc;
+    VALUE ptr, args, ret_type, abi, kwds;
+    int i;
 
     rb_scan_args(argc, argv, "31:", &ptr, &args, &ret_type, &abi, &kwds);
-    ptr = rb_Integer(ptr);
-    cfunc = NUM2PTR(ptr);
-    PTR2NUM(cfunc);
-    nabi = NIL_P(abi) ? FFI_DEFAULT_ABI : NUM2INT(abi);
-    abi = INT2FIX(nabi);
-    i = NUM2INT(ret_type);
-    rtype = INT2FFI_TYPE(i);
-    ret_type = INT2FIX(i);
+    if(NIL_P(abi)) abi = INT2NUM(FFI_DEFAULT_ABI);
 
     Check_Type(args, T_ARRAY);
-    len = RARRAY_LENINT(args);
-    Check_Max_Args("args", len);
-    ary = rb_ary_subseq(args, 0, len);
-    for (i = 0; i < RARRAY_LEN(args); i++) {
-	VALUE a = RARRAY_PTR(args)[i];
-	int type = NUM2INT(a);
-	(void)INT2FFI_TYPE(type); /* raise */
-	if (INT2FIX(type) != a) rb_ary_store(ary, i, INT2FIX(type));
-    }
-    OBJ_FREEZE(ary);
+    Check_Max_Args("args", RARRAY_LENINT(args));
 
     rb_iv_set(self, "@ptr", ptr);
     rb_iv_set(self, "@args", args);
@@ -129,15 +107,20 @@ initialize(int argc, VALUE argv[], VALUE self)
 
     TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
 
-    arg_types = xcalloc(len + 1, sizeof(ffi_type *));
+    arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *));
 
     for (i = 0; i < RARRAY_LEN(args); i++) {
-	int type = NUM2INT(RARRAY_AREF(args, i));
+	int type = NUM2INT(RARRAY_PTR(args)[i]);
 	arg_types[i] = INT2FFI_TYPE(type);
     }
-    arg_types[len] = NULL;
+    arg_types[RARRAY_LEN(args)] = NULL;
 
-    result = ffi_prep_cif(cif, nabi, len, rtype, arg_types);
+    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);
@@ -145,28 +128,13 @@ initialize(int argc, VALUE argv[], VALUE self)
     return self;
 }
 
-struct nogvl_ffi_call_args {
-    ffi_cif *cif;
-    void (*fn)(void);
-    void **values;
-    fiddle_generic retval;
-};
-
-static void *
-nogvl_ffi_call(void *ptr)
-{
-    struct nogvl_ffi_call_args *args = ptr;
-
-    ffi_call(args->cif, args->fn, &args->retval, args->values);
-
-    return NULL;
-}
-
 static VALUE
 function_call(int argc, VALUE argv[], VALUE self)
 {
-    struct nogvl_ffi_call_args args = { 0 };
+    ffi_cif * cif;
+    fiddle_generic retval;
     fiddle_generic *generic_args;
+    void **values;
     VALUE cfunc, types, cPointer;
     int i;
     VALUE alloc_buffer = 0;
@@ -176,11 +144,12 @@ function_call(int argc, VALUE argv[], VALUE self)
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
     Check_Max_Args("number of arguments", argc);
-    if (argc != (i = RARRAY_LENINT(types))) {
-	rb_error_arity(argc, i, i);
+    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, args.cif);
+    TypedData_Get_Struct(self, ffi_cif, &function_data_type, cif);
 
     if (rb_safe_level() >= 1) {
 	for (i = 0; i < argc; i++) {
@@ -193,15 +162,13 @@ function_call(int argc, VALUE argv[], VALUE self)
 
     generic_args = ALLOCV(alloc_buffer,
 	(size_t)(argc + 1) * sizeof(void *) + (size_t)argc * sizeof(fiddle_generic));
-    args.values = (void **)((char *)generic_args +
-			    (size_t)argc * sizeof(fiddle_generic));
+    values = (void **)((char *)generic_args + (size_t)argc * sizeof(fiddle_generic));
 
     for (i = 0; i < argc; i++) {
-	VALUE type = RARRAY_AREF(types, i);
+	VALUE type = RARRAY_PTR(types)[i];
 	VALUE src = argv[i];
-	int argtype = FIX2INT(type);
 
-	if (argtype == TYPE_VOIDP) {
+	if(NUM2INT(type) == TYPE_VOIDP) {
 	    if(NIL_P(src)) {
 		src = INT2FIX(0);
 	    } else if(cPointer != CLASS_OF(src)) {
@@ -210,13 +177,12 @@ function_call(int argc, VALUE argv[], VALUE self)
 	    src = rb_Integer(src);
 	}
 
-	VALUE2GENERIC(argtype, src, &generic_args[i]);
-	args.values[i] = (void *)&generic_args[i];
+	VALUE2GENERIC(NUM2INT(type), src, &generic_args[i]);
+	values[i] = (void *)&generic_args[i];
     }
-    args.values[argc] = NULL;
-    args.fn = NUM2PTR(cfunc);
+    values[argc] = NULL;
 
-    (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
+    ffi_call(cif, NUM2PTR(rb_Integer(cfunc)), &retval, values);
 
     rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno));
 #if defined(_WIN32)
@@ -225,7 +191,7 @@ function_call(int argc, VALUE argv[], VALUE self)
 
     ALLOCV_END(alloc_buffer);
 
-    return GENERIC2VALUE(rb_iv_get(self, "@return_type"), args.retval);
+    return GENERIC2VALUE(rb_iv_get(self, "@return_type"), retval);
 }
 
 void
@@ -258,7 +224,7 @@ Init_fiddle_function(void)
      *
      * === ABI check
      *
-     *   @libc = Fiddle.dlopen "/lib/libc.so.6"
+     *   @libc = DL.dlopen "/lib/libc.so.6"
      *	    #=> #<Fiddle::Handle:0x00000001d7a8d8>
      *   f = Fiddle::Function.new(@libc['strcpy'], [TYPE_VOIDP, TYPE_VOIDP], TYPE_VOIDP)
      *	    #=> #<Fiddle::Function:0x00000001d8ee00>
@@ -290,9 +256,7 @@ Init_fiddle_function(void)
     /*
      * Document-method: call
      *
-     * Calls the constructed Function, with +args+.
-     * Caller must ensure the underlying function is called in a
-     * thread-safe manner if running in a multi-threaded process.
+     * Calls the constructed Function, with +args+
      *
      * For an example see Fiddle::Function
      *
diff --git a/ext/fiddle/function.h b/ext/fiddle/function.h
index 829e592c8a..e5465ab64f 100644
--- a/ext/fiddle/function.h
+++ b/ext/fiddle/function.h
@@ -3,6 +3,6 @@
 
 #include <fiddle.h>
 
-void Init_fiddle_function(void);
+void Init_fiddle_function();
 
 #endif
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
index e727ccfd00..36970a2248 100644
--- a/ext/fiddle/handle.c
+++ b/ext/fiddle/handle.c
@@ -1,8 +1,6 @@
 #include <ruby.h>
 #include <fiddle.h>
 
-#define SafeStringValueCStr(v) (rb_check_safe_obj(rb_string_value(&v)), StringValueCStr(v))
-
 VALUE rb_cHandle;
 
 struct dl_handle {
@@ -48,7 +46,7 @@ fiddle_handle_free(void *ptr)
 static size_t
 fiddle_handle_memsize(const void *ptr)
 {
-    return sizeof(struct dl_handle);
+    return ptr ? sizeof(struct dl_handle) : 0;
 }
 
 static const rb_data_type_t fiddle_handle_data_type = {
@@ -145,17 +143,19 @@ rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
 	cflag = RTLD_LAZY | RTLD_GLOBAL;
 	break;
       case 1:
-	clib = NIL_P(lib) ? NULL : SafeStringValueCStr(lib);
+	clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
 	cflag = RTLD_LAZY | RTLD_GLOBAL;
 	break;
       case 2:
-	clib = NIL_P(lib) ? NULL : SafeStringValueCStr(lib);
+	clib = NIL_P(lib) ? NULL : StringValuePtr(lib);
 	cflag = NUM2INT(flag);
 	break;
       default:
 	rb_bug("rb_fiddle_handle_new");
     }
 
+    rb_secure(2);
+
 #if defined(_WIN32)
     if( !clib ){
 	HANDLE rb_libruby_handle(void);
@@ -170,7 +170,6 @@ rb_fiddle_handle_initialize(int argc, VALUE argv[], VALUE self)
 # ifdef _WIN32_WCE
 	ptr = dlopen("coredll.dll", cflag);
 # else
-	(void)cflag;
 	ptr = w32_coredll();
 # endif
     }
@@ -264,7 +263,7 @@ rb_fiddle_handle_to_i(VALUE self)
     return PTR2NUM(fiddle_handle);
 }
 
-static VALUE fiddle_handle_sym(void *handle, VALUE symbol);
+static VALUE fiddle_handle_sym(void *handle, const char *symbol);
 
 /*
  * Document-method: sym
@@ -283,7 +282,7 @@ rb_fiddle_handle_sym(VALUE self, VALUE sym)
 	rb_raise(rb_eFiddleError, "closed handle");
     }
 
-    return fiddle_handle_sym(fiddle_handle->ptr, sym);
+    return fiddle_handle_sym(fiddle_handle->ptr, StringValueCStr(sym));
 }
 
 #ifndef RTLD_NEXT
@@ -306,21 +305,21 @@ rb_fiddle_handle_sym(VALUE self, VALUE sym)
 static VALUE
 rb_fiddle_handle_s_sym(VALUE self, VALUE sym)
 {
-    return fiddle_handle_sym(RTLD_NEXT, sym);
+    return fiddle_handle_sym(RTLD_NEXT, StringValueCStr(sym));
 }
 
 static VALUE
-fiddle_handle_sym(void *handle, VALUE symbol)
+fiddle_handle_sym(void *handle, const char *name)
 {
 #if defined(HAVE_DLERROR)
     const char *err;
-# define CHECK_DLERROR if ((err = dlerror()) != 0) { func = 0; }
+# define CHECK_DLERROR if( err = dlerror() ){ func = 0; }
 #else
 # define CHECK_DLERROR
 #endif
     void (*func)();
-    const char *name = SafeStringValueCStr(symbol);
 
+    rb_secure(2);
 #ifdef HAVE_DLERROR
     dlerror();
 #endif
@@ -368,7 +367,7 @@ fiddle_handle_sym(void *handle, VALUE symbol)
     }
 #endif
     if( !func ){
-	rb_raise(rb_eFiddleError, "unknown symbol \"%"PRIsVALUE"\"", symbol);
+	rb_raise(rb_eFiddleError, "unknown symbol \"%s\"", name);
     }
 
     return PTR2NUM(func);
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb
index 5208eb9328..ae6e299637 100644
--- a/ext/fiddle/lib/fiddle.rb
+++ b/ext/fiddle/lib/fiddle.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'fiddle.so'
 require 'fiddle/function'
 require 'fiddle/closure'
diff --git a/ext/fiddle/lib/fiddle/closure.rb b/ext/fiddle/lib/fiddle/closure.rb
index 0b9adbb60a..beb90ecbe5 100644
--- a/ext/fiddle/lib/fiddle/closure.rb
+++ b/ext/fiddle/lib/fiddle/closure.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Fiddle
   class Closure
 
diff --git a/ext/fiddle/lib/fiddle/cparser.rb b/ext/fiddle/lib/fiddle/cparser.rb
index 6b9da9fa7c..43fb184a12 100644
--- a/ext/fiddle/lib/fiddle/cparser.rb
+++ b/ext/fiddle/lib/fiddle/cparser.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Fiddle
   # A mixin that provides methods for parsing C struct and prototype signatures.
   #
@@ -8,14 +7,8 @@ module Fiddle
   #   include Fiddle::CParser
   #     #=> Object
   #
-  #   parse_ctype('int')
-  #     #=> Fiddle::TYPE_INT
-  #
-  #   parse_struct_signature(['int i', 'char c'])
-  #     #=> [[Fiddle::TYPE_INT, Fiddle::TYPE_CHAR], ["i", "c"]]
-  #
-  #   parse_signature('double sum(double, double)')
-  #     #=> ["sum", Fiddle::TYPE_DOUBLE, [Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]]
+  #   parse_ctype('int increment(int)')
+  #     #=> ["increment", Fiddle::TYPE_INT, [Fiddle::TYPE_INT]]
   #
   module CParser
     # Parses a C struct's members
@@ -28,33 +21,37 @@ module Fiddle
     #   parse_struct_signature(['int i', 'char c'])
     #     #=> [[Fiddle::TYPE_INT, Fiddle::TYPE_CHAR], ["i", "c"]]
     #
-    #   parse_struct_signature(['char buffer[80]'])
-    #     #=> [[[Fiddle::TYPE_CHAR, 80]], ["buffer"]]
-    #
     def parse_struct_signature(signature, tymap=nil)
-      if signature.is_a?(String)
-        signature = split_arguments(signature, /[,;]/)
+      if( signature.is_a?(String) )
+        signature = signature.split(/\s*,\s*/)
       end
       mems = []
       tys  = []
       signature.each{|msig|
-        msig = compact(msig)
-        case msig
-        when /^[\w\*\s]+[\*\s](\w+)$/
-          mems.push($1)
-          tys.push(parse_ctype(msig, tymap))
-        when /^[\w\*\s]+\(\*(\w+)\)\(.*?\)$/
-          mems.push($1)
-          tys.push(parse_ctype(msig, tymap))
-        when /^([\w\*\s]+[\*\s])(\w+)\[(\d+)\]$/
-          mems.push($2)
-          tys.push([parse_ctype($1.strip, tymap), $3.to_i])
-        when /^([\w\*\s]+)\[(\d+)\](\w+)$/
-          mems.push($3)
-          tys.push([parse_ctype($1.strip, tymap), $2.to_i])
-        else
-          raise(RuntimeError,"can't parse the struct member: #{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
@@ -73,21 +70,22 @@ module Fiddle
     #   parse_signature('double sum(double, double)')
     #     #=> ["sum", Fiddle::TYPE_DOUBLE, [Fiddle::TYPE_DOUBLE, Fiddle::TYPE_DOUBLE]]
     #
-    #   parse_signature('void update(void (*cb)(int code))')
-    #     #=> ["update", Fiddle::TYPE_VOID, [Fiddle::TYPE_VOIDP]]
-    #
-    #   parse_signature('char (*getbuffer(void))[80]')
-    #     #=> ["getbuffer", Fiddle::TYPE_VOIDP, []]
-    #
     def parse_signature(signature, tymap=nil)
       tymap ||= {}
-      case compact(signature)
-      when /^(?:[\w\*\s]+)\(\*(\w+)\((.*?)\)\)(?:\[\w*\]|\(.*?\));?$/
-        func, args = $1, $2
-        return [func, TYPE_VOIDP, split_arguments(args).collect {|arg| parse_ctype(arg, tymap)}]
-      when /^([\w\*\s]+[\*\s])(\w+)\((.*?)\);?$/
-        ret, func, args = $1.strip, $2, $3
-        return [func, parse_ctype(ret, tymap), split_arguments(args).collect {|arg| parse_ctype(arg, 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
@@ -109,68 +107,64 @@ module Fiddle
     #   parse_ctype('int')
     #     #=> Fiddle::TYPE_INT
     #
-    #   parse_ctype('double diff')
+    #   parse_ctype('double')
     #     #=> Fiddle::TYPE_DOUBLE
     #
-    #   parse_ctype('unsigned char byte')
+    #   parse_ctype('unsigned char')
     #     #=> -Fiddle::TYPE_CHAR
     #
-    #   parse_ctype('const char* const argv[]')
-    #     #=> -Fiddle::TYPE_VOIDP
-    #
     def parse_ctype(ty, tymap=nil)
       tymap ||= {}
       case ty
       when Array
         return [parse_ctype(ty[0], tymap), ty[1]]
-      when 'void'
+      when "void"
         return TYPE_VOID
-      when /^(?:(?:signed\s+)?long\s+long(?:\s+int\s+)?|int64_t)(?:\s+\w+)?$/
+      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\s+long\s+long(?:\s+int\s+)?|uint64_t)(?:\s+\w+)?$/
+      when "unsigned long long"
         if( defined?(TYPE_LONG_LONG) )
           return -TYPE_LONG_LONG
         else
           raise(RuntimeError, "unsupported type: #{ty}")
         end
-      when /^(?:signed\s+)?long(?:\s+int\s+)?(?:\s+\w+)?$/
-        return TYPE_LONG
-      when /^unsigned\s+long(?:\s+int\s+)?(?:\s+\w+)?$/
-        return -TYPE_LONG
-      when /^(?:signed\s+)?int(?:\s+\w+)?$/
-        return TYPE_INT
-      when /^(?:unsigned\s+int|uint)(?:\s+\w+)?$/
-        return -TYPE_INT
-      when /^(?:signed\s+)?short(?:\s+int\s+)?(?:\s+\w+)?$/
-        return TYPE_SHORT
-      when /^unsigned\s+short(?:\s+int\s+)?(?:\s+\w+)?$/
-        return -TYPE_SHORT
-      when /^(?:signed\s+)?char(?:\s+\w+)?$/
-        return TYPE_CHAR
-      when /^unsigned\s+char(?:\s+\w+)?$/
-        return  -TYPE_CHAR
-      when /^float(?:\s+\w+)?$/
+      when "float"
         return TYPE_FLOAT
-      when /^double(?:\s+\w+)?$/
+      when "double"
         return TYPE_DOUBLE
-      when /^size_t(?:\s+\w+)?$/
+      when "size_t"
         return TYPE_SIZE_T
-      when /^ssize_t(?:\s+\w+)?$/
+      when "ssize_t"
         return TYPE_SSIZE_T
-      when /^ptrdiff_t(?:\s+\w+)?$/
+      when "ptrdiff_t"
         return TYPE_PTRDIFF_T
-      when /^intptr_t(?:\s+\w+)?$/
+      when "intptr_t"
         return TYPE_INTPTR_T
-      when /^uintptr_t(?:\s+\w+)?$/
+      when "uintptr_t"
         return TYPE_UINTPTR_T
-      when /\*/, /\[[\s\d]*\]/
+      when /\*/, /\[\s*\]/
         return TYPE_VOIDP
       else
-        ty = ty.split(' ', 2)[0]
         if( tymap[ty] )
           return parse_ctype(tymap[ty], tymap)
         else
@@ -178,17 +172,5 @@ module Fiddle
         end
       end
     end
-
-    private
-
-    def split_arguments(arguments, sep=',')
-      return [] if arguments.strip == 'void'
-      arguments.scan(/([\w\*\s]+\(\*\w*\)\(.*?\)|[\w\*\s\[\]]+)(?:#{sep}\s*|$)/).collect {|m| m[0]}
-    end
-
-    def compact(signature)
-      signature.gsub(/\s+/, ' ').gsub(/\s*([\(\)\[\]\*,;])\s*/, '\1').strip
-    end
-
   end
 end
diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
index fcd90dfd26..ab7496e944 100644
--- a/ext/fiddle/lib/fiddle/function.rb
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Fiddle
   class Function
     # The ABI of the Function.
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index 09429f6631..34f5d7f81c 100644
--- a/ext/fiddle/lib/fiddle/import.rb
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'fiddle'
 require 'fiddle/struct'
 require 'fiddle/cparser'
@@ -63,9 +62,6 @@ module Fiddle
     include CParser
     extend Importer
 
-    attr_reader :type_alias
-    private :type_alias
-
     # Creates an array of handlers for the given +libs+, can be an instance of
     # Fiddle::Handle, Fiddle::Importer, or will create a new instance of
     # Fiddle::Handle using Fiddle.dlopen
@@ -105,7 +101,7 @@ module Fiddle
     def sizeof(ty)
       case ty
       when String
-        ty = parse_ctype(ty, type_alias).abs()
+        ty = parse_ctype(ty, @type_alias).abs()
         case ty
         when TYPE_CHAR
           return SIZEOF_CHAR
@@ -163,7 +159,7 @@ module Fiddle
 
     # Creates a global method from the given C +signature+.
     def extern(signature, *opts)
-      symname, ctype, argtype = parse_signature(signature, type_alias)
+      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(/@.+/,'')
@@ -187,7 +183,7 @@ module Fiddle
     # Creates a global method from the given C +signature+ using the given
     # +opts+ as bind parameters with the given block.
     def bind(signature, *opts, &blk)
-      name, ctype, argtype = parse_signature(signature, type_alias)
+      name, ctype, argtype = parse_signature(signature, @type_alias)
       h = parse_bind_options(opts)
       case h[:callback_type]
       when :bind, nil
@@ -216,7 +212,7 @@ module Fiddle
     #
     #   MyStruct = struct ['int i', 'char c']
     def struct(signature)
-      tys, mems = parse_struct_signature(signature, type_alias)
+      tys, mems = parse_struct_signature(signature, @type_alias)
       Fiddle::CStructBuilder.create(CStruct, tys, mems)
     end
 
@@ -224,7 +220,7 @@ module Fiddle
     #
     #   MyUnion = union ['int i', 'char c']
     def union(signature)
-      tys, mems = parse_struct_signature(signature, type_alias)
+      tys, mems = parse_struct_signature(signature, @type_alias)
       Fiddle::CStructBuilder.create(CUnion, tys, mems)
     end
 
@@ -260,7 +256,7 @@ module Fiddle
     #
     # Will raise an error if no handlers are open.
     def handler
-      (@handler ||= nil) or raise "call dlload before importing symbols and functions"
+      @handler or raise "call dlload before importing symbols and functions"
     end
 
     # Returns a new Fiddle::Pointer instance at the memory address of the given
diff --git a/ext/fiddle/lib/fiddle/pack.rb b/ext/fiddle/lib/fiddle/pack.rb
index 6301068450..e4e9542cc0 100644
--- a/ext/fiddle/lib/fiddle/pack.rb
+++ b/ext/fiddle/lib/fiddle/pack.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'fiddle'
 
 module Fiddle
diff --git a/ext/fiddle/lib/fiddle/struct.rb b/ext/fiddle/lib/fiddle/struct.rb
index 233a987269..695a4d2247 100644
--- a/ext/fiddle/lib/fiddle/struct.rb
+++ b/ext/fiddle/lib/fiddle/struct.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'fiddle'
 require 'fiddle/value'
 require 'fiddle/pack'
diff --git a/ext/fiddle/lib/fiddle/types.rb b/ext/fiddle/lib/fiddle/types.rb
index 8a72635a69..02c1d25a37 100644
--- a/ext/fiddle/lib/fiddle/types.rb
+++ b/ext/fiddle/lib/fiddle/types.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Fiddle
   # Adds Windows type aliases to the including class for use with
   # Fiddle::Importer.
diff --git a/ext/fiddle/lib/fiddle/value.rb b/ext/fiddle/lib/fiddle/value.rb
index ac318cf2c4..8d71e47ce6 100644
--- a/ext/fiddle/lib/fiddle/value.rb
+++ b/ext/fiddle/lib/fiddle/value.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'fiddle'
 
 module Fiddle
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
index 932bc576c5..a09daf77ea 100644
--- a/ext/fiddle/pointer.c
+++ b/ext/fiddle/pointer.c
@@ -72,7 +72,7 @@ static size_t
 fiddle_ptr_memsize(const void *ptr)
 {
     const struct ptr_data *data = ptr;
-    return sizeof(*data) + data->size;
+    return data ? sizeof(*data) + data->size : 0;
 }
 
 static const rb_data_type_t fiddle_ptr_data_type = {
diff --git a/ext/fiddle/win32/fficonfig.h b/ext/fiddle/win32/fficonfig.h
deleted file mode 100755
index 776808159c..0000000000
--- a/ext/fiddle/win32/fficonfig.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#define HAVE_ALLOCA 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#if _MSC_VER >= 1600
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#endif
-
-#define SIZEOF_DOUBLE 8
-#if defined(X86_WIN64)
-#define SIZEOF_SIZE_T 8
-#else
-#define SIZEOF_SIZE_T 4
-#endif
-
-#define STACK_DIRECTION -1
-
-#define STDC_HEADERS 1
-
-#ifdef LIBFFI_ASM
-#define FFI_HIDDEN(name)
-#else
-#define FFI_HIDDEN
-#endif
-
diff --git a/ext/fiddle/win32/libffi-3.2.1-mswin.patch b/ext/fiddle/win32/libffi-3.2.1-mswin.patch
deleted file mode 100644
index f9100e703d..0000000000
--- a/ext/fiddle/win32/libffi-3.2.1-mswin.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-diff -ru libffi-3.2.1/src/x86/ffi.c libffi-3.2.1/src/x86/ffi.c
---- libffi-3.2.1/src/x86/ffi.c	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/src/x86/ffi.c	2014-12-25 18:46:14.806761900 +0900
-@@ -99,11 +99,13 @@
-        i != 0;
-        i--, p_arg += dir, p_argv += dir)
-     {
-+      size_t z;
-+
-       /* Align if necessary */
-       if ((sizeof(void*) - 1) & (size_t) argp)
-         argp = (char *) ALIGN(argp, sizeof(void*));
- 
--      size_t z = (*p_arg)->size;
-+      z = (*p_arg)->size;
- 
- #ifdef X86_WIN64
-       if (z > FFI_SIZEOF_ARG
-@@ -202,6 +204,7 @@
-      on top of stack, so that those can be moved to registers by call-handler.  */
-   if (stack_args_count > 0)
-     {
-+      int i;
-       if (dir < 0 && stack_args_count > 1)
-         {
-           /* Reverse order if iterating arguments backwards */
-@@ -210,7 +213,6 @@
-           *(ffi_arg*) p_stack_data[stack_args_count - 1] = tmp;
-         }
-       
--      int i;
-       for (i = 0; i < stack_args_count; i++)
-         {
-           if (p_stack_data[i] != argp2)
-@@ -569,11 +571,12 @@
-        i < cif->nargs && passed_regs < max_stack_count;
-        i++, p_arg++)
-     {
-+      size_t sz;
-       if ((*p_arg)->type == FFI_TYPE_FLOAT
-          || (*p_arg)->type == FFI_TYPE_STRUCT)
-         continue;
- 
--      size_t sz = (*p_arg)->size;
-+      sz = (*p_arg)->size;
-       if(sz == 0 || sz > FFI_SIZEOF_ARG)
-         continue;
- 
-@@ -599,11 +602,13 @@
-        i != 0;
-        i--, p_arg += dir, p_argv += dir)
-     {
-+      size_t z;
-+
-       /* Align if necessary */
-       if ((sizeof(void*) - 1) & (size_t) argp)
-         argp = (char *) ALIGN(argp, sizeof(void*));
- 
--      size_t z = (*p_arg)->size;
-+      z = (*p_arg)->size;
- 
- #ifdef X86_WIN64
-       if (z > FFI_SIZEOF_ARG
-@@ -642,7 +647,7 @@
- #endif
-     }
- 
--  return (size_t)argp - (size_t)stack;
-+  return (int)((size_t)argp - (size_t)stack);
- }
- 
- #define FFI_INIT_TRAMPOLINE_WIN64(TRAMP,FUN,CTX,MASK) \
-@@ -855,11 +860,12 @@
-   
-   for (i = 0; i < cif->nargs && passed_regs <= max_regs; i++)
-     {
-+      size_t sz;
-       if (cif->arg_types[i]->type == FFI_TYPE_FLOAT
-          || cif->arg_types[i]->type == FFI_TYPE_STRUCT)
-         continue;
- 
--      size_t sz = cif->arg_types[i]->size;
-+      sz = cif->arg_types[i]->size;
-       if (sz == 0 || sz > FFI_SIZEOF_ARG)
-         continue;
- 
-diff -ru libffi-3.2.1/src/x86/ffitarget.h libffi-3.2.1/src/x86/ffitarget.h
---- libffi-3.2.1/src/x86/ffitarget.h	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/src/x86/ffitarget.h	2014-12-22 15:45:54.000000000 +0900
-@@ -50,7 +50,9 @@
- #endif
- 
- #define FFI_TARGET_SPECIFIC_STACK_SPACE_ALLOCATION
-+#ifndef _MSC_VER
- #define FFI_TARGET_HAS_COMPLEX_TYPE
-+#endif
- 
- /* ---- Generic type definitions ----------------------------------------- */
- 
-diff -ru libffi-3.2.1/src/x86/win64.S libffi-3.2.1/src/x86/win64.S
---- libffi-3.2.1/src/x86/win64.S	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/src/x86/win64.S	2014-12-22 16:14:40.000000000 +0900
-@@ -127,7 +127,7 @@
- 
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov	DWORD PTR [rcx], eax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_struct2b$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SMALL_STRUCT_2B
-@@ -135,7 +135,7 @@
- 
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov	WORD PTR [rcx], ax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_struct1b$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SMALL_STRUCT_1B
-@@ -143,7 +143,7 @@
- 
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov	BYTE PTR [rcx], al
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_uint8$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_UINT8
-@@ -152,7 +152,7 @@
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	movzx   rax, al
- 	mov	QWORD PTR [rcx], rax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_sint8$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SINT8
-@@ -161,7 +161,7 @@
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	movsx   rax, al
- 	mov	QWORD PTR [rcx], rax
--	jmp	ret_void$
-+	jmp	SHORT ret_void$
- 
- ret_uint16$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_UINT16
-@@ -188,7 +188,13 @@
- 	mov	rcx, QWORD PTR RVALUE[rbp]
- 	mov     eax, eax
- 	mov	QWORD PTR [rcx], rax
--	jmp	SHORT ret_void$
-+
-+ret_void$:
-+	xor	rax, rax
-+
-+	lea	rsp, QWORD PTR [rbp+16]
-+	pop	rbp
-+	ret	0
- 
- ret_sint32$:
-  	cmp	DWORD PTR CIF_FLAGS[rbp], FFI_TYPE_SINT32
-@@ -247,13 +253,6 @@
- 	cdqe
- 	mov	QWORD PTR [rcx], rax
-  	jmp	SHORT ret_void$
--
--ret_void$:
--	xor	rax, rax
--
--	lea	rsp, QWORD PTR [rbp+16]
--	pop	rbp
--	ret	0
- ffi_call_win64 ENDP
- _TEXT	ENDS
- END
-diff -ru libffi-3.2.1/include/ffi.h.in libffi-3.2.1/include/ffi.h.in
---- libffi-3.2.1/include/ffi.h.in	2014-11-08 21:47:24.000000000 +0900
-+++ libffi-3.2.1/include/ffi.h.in	2015-01-11 12:35:30.000000000 +0900
-@@ -103,6 +103,11 @@
- #   undef  FFI_64_BIT_MAX
- #   define FFI_64_BIT_MAX 9223372036854775807LL
- #  endif
-+#  ifdef _MSC_VER
-+#   define FFI_LONG_LONG_MAX _I64_MAX
-+#   undef  FFI_64_BIT_MAX
-+#   define FFI_64_BIT_MAX 9223372036854775807I64
-+#  endif
- # endif
- #endif
- 
diff --git a/ext/fiddle/win32/libffi-config.rb b/ext/fiddle/win32/libffi-config.rb
deleted file mode 100755
index 7a32a91517..0000000000
--- a/ext/fiddle/win32/libffi-config.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/ruby
-# frozen_string_literal: false
-require 'fileutils'
-
-basedir = File.dirname(__FILE__)
-conf = {}
-enable = {}
-until ARGV.empty?
-  arg = ARGV.shift
-  case arg
-  when '-C'
-    # ignore
-  when /\A--srcdir=(.*)/
-    conf['SRCDIR'] = srcdir = $1
-  when /\A(CC|CFLAGS|CXX|CXXFLAGS|LD|LDFLAGS)=(.*)/
-    conf[$1] = $2
-  when /\A--host=(.*)/
-    host = $1
-  when /\A--enable-([^=]+)(?:=(.*))?/
-    enable[$1] = $2 || true
-  when /\A--disable-([^=]+)/
-    enable[$1] = false
-  end
-end
-
-IO.foreach("#{srcdir}/configure.ac") do |line|
-  if /^AC_INIT\((.*)\)/ =~ line
-    version = $1.split(/,\s*/)[1]
-    version.gsub!(/\A\[|\]\z/, '')
-    conf['VERSION'] = version
-    break
-  end
-end
-
-builddir = srcdir == "." ? enable['builddir'] : "."
-conf['TARGET'] = /^x64/ =~ host ? "X86_WIN64" : "X86_WIN32"
-
-FileUtils.mkdir_p([builddir, "#{builddir}/include", "#{builddir}/src/x86"])
-FileUtils.cp("#{basedir}/fficonfig.h", ".", preserve: true)
-
-hdr = IO.binread("#{srcdir}/include/ffi.h.in")
-hdr.gsub!(/@(\w+)@/) {conf[$1] || $&}
-hdr.gsub!(/^(#if\s+)@\w+@/, '\10')
-IO.binwrite("#{builddir}/include/ffi.h", hdr)
-
-mk = IO.binread("#{basedir}/libffi.mk.tmpl")
-mk.gsub!(/@(\w+)@/) {conf[$1] || $&}
-IO.binwrite("Makefile", mk)
diff --git a/ext/fiddle/win32/libffi.mk.tmpl b/ext/fiddle/win32/libffi.mk.tmpl
deleted file mode 100755
index 2a16e8efec..0000000000
--- a/ext/fiddle/win32/libffi.mk.tmpl
+++ /dev/null
@@ -1,96 +0,0 @@
-# -*- makefile -*-
-# ====================================================================
-#
-# libffi Windows Makefile
-#
-#
-# ====================================================================
-#
-NAME	= ffi
-TARGET	= @TARGET@
-CC	= cl
-!if "$(TARGET)" == "X86_WIN64"
-AS	= ml64
-!else
-AS	= ml
-!endif
-AR	= link
-DLEXT	= dll
-OBJEXT	= obj
-LIBEXT	= lib
-TOPDIR	= @SRCDIR@
-CPP	= $(CC) -EP
-CFLAGS	= @CFLAGS@
-ARFLAGS	= -lib
-ASFLAGS	= -coff -W3 -Cx
-INCLUDES= -I. -I./include -I./src/x86 \
-	  -I$(TOPDIR)/include -I$(TOPDIR)/include/src/x86
-
-SRCDIR	= $(TOPDIR)/src
-WORKDIR	= ./.libs
-BUILDDIR= ./src
-LIBNAME	= lib$(NAME)
-STATICLIB= $(WORKDIR)/$(LIBNAME)_convenience.$(LIBEXT)
-
-HEADERS = \
-	./fficonfig.h
-FFI_HEADERS = \
-	./include/ffi.h \
-	./include/ffitarget.h
-
-!if "$(TARGET)" == "X86_WIN32"
-OSSRC	= win32
-!else if "$(TARGET)" == "X86_WIN64"
-OSSRC	= win64
-!else
-! error unknown target: $(TARGET)
-!endif
-
-OBJECTS = \
-	$(BUILDDIR)/closures.$(OBJEXT) \
-	$(BUILDDIR)/debug.$(OBJEXT) \
-	$(BUILDDIR)/java_raw_api.$(OBJEXT) \
-	$(BUILDDIR)/prep_cif.$(OBJEXT) \
-	$(BUILDDIR)/raw_api.$(OBJEXT) \
-	$(BUILDDIR)/types.$(OBJEXT) \
-	$(BUILDDIR)/x86/ffi.$(OBJEXT) \
-	$(BUILDDIR)/x86/$(OSSRC).$(OBJEXT)
-ASMSRCS = \
-	$(BUILDDIR)/x86/$(OSSRC).asm
-
-.SUFFIXES : .S .asm
-
-all: $(WORKDIR) $(STATICLIB)
-
-{$(SRCDIR)}.c{$(BUILDDIR)}.$(OBJEXT):
-	$(CC) -c $(CFLAGS) $(INCLUDES) -Fo$(@:\=/) -Fd$(WORKDIR)/$(NAME)-src $(<:\=/)
-
-{$(SRCDIR)/x86}.c{$(BUILDDIR)/x86}.$(OBJEXT):
-	$(CC) -c $(CFLAGS) $(INCLUDES) -Fo$(@:\=/) -Fd$(WORKDIR)/$(NAME)-src $(<:\=/)
-
-{$(SRCDIR)/x86}.S{$(BUILDDIR)/x86}.asm:
-	$(CPP) $(CFLAGS) $(INCLUDES) $(<:\=/) >$(@:\=/)
-
-{$(BUILDDIR)/x86}.asm{$(BUILDDIR)/x86}.$(OBJEXT):
-	cd $(@D) && $(AS) -c $(ASFLAGS) -Fo $(@F) $(<F)
-
-$(BUILDDIR)/x86/$(OSSRC).asm: $(SRCDIR)/x86/$(OSSRC).S
-
-$(OBJECTS): $(FFI_HEADERS) $(HEADERS)
-
-$(WORKDIR):
-	-@if not exist "$(WORKDIR:/=\)\$(NULL)" mkdir $(WORKDIR:/=\)
-
-$(STATICLIB): $(WORKDIR) $(OBJECTS)
-	$(AR) $(ARFLAGS) -out:$(STATICLIB) @<<
-	$(OBJECTS)
-<<
-
-clean:
-	-@del /Q $(OBJECTS:/=\) 2>NUL
-	-@del /Q $(ASMSRCS:/=\) 2>NUL
-	-@del /Q /S $(WORKDIR:/=\) 2>NUL
-
-distclean: clean
-	-@del /Q $(HEADERS:/=\) $(FFI_HEADERS:/=\) 2>NUL
-	-@del /Q Makefile 2>NUL
diff --git a/ext/gdbm/depend b/ext/gdbm/depend
deleted file mode 100644
index 98def40879..0000000000
--- a/ext/gdbm/depend
+++ /dev/null
@@ -1,13 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-gdbm.o: $(RUBY_EXTCONF_H)
-gdbm.o: $(arch_hdrdir)/ruby/config.h
-gdbm.o: $(hdrdir)/ruby/backward.h
-gdbm.o: $(hdrdir)/ruby/defines.h
-gdbm.o: $(hdrdir)/ruby/intern.h
-gdbm.o: $(hdrdir)/ruby/missing.h
-gdbm.o: $(hdrdir)/ruby/ruby.h
-gdbm.o: $(hdrdir)/ruby/st.h
-gdbm.o: $(hdrdir)/ruby/subst.h
-gdbm.o: $(top_srcdir)/include/ruby.h
-gdbm.o: gdbm.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/gdbm/extconf.rb b/ext/gdbm/extconf.rb
index d1908ffa5c..5a09492e5e 100644
--- a/ext/gdbm/extconf.rb
+++ b/ext/gdbm/extconf.rb
@@ -1,19 +1,7 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 dir_config("gdbm")
 if have_library("gdbm", "gdbm_open") and
    have_header("gdbm.h")
-  checking_for("sizeof(DBM) is available") {
-    if try_compile(<<SRC)
-#include <gdbm.h>
-
-const int sizeof_DBM = (int)sizeof(DBM);
-SRC
-      $defs << '-DDBM_SIZEOF_DBM=sizeof(DBM)'
-    else
-      $defs << '-DDBM_SIZEOF_DBM=0'
-    end
-  }
   create_makefile("gdbm")
 end
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index 709f466cd8..851afea497 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -101,7 +101,7 @@ closed_dbm(void)
 }
 
 #define GetDBM(obj, dbmp) do {\
-    TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\
+    Data_Get_Struct((obj), struct dbmdata, (dbmp));\
     if ((dbmp) == 0) closed_dbm();\
     if ((dbmp)->di_dbm == 0) closed_dbm();\
 } while (0)
@@ -112,34 +112,14 @@ closed_dbm(void)
 } while (0)
 
 static void
-free_dbm(void *ptr)
+free_dbm(struct dbmdata *dbmp)
 {
-    struct dbmdata *dbmp = ptr;
     if (dbmp) {
         if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm);
         xfree(dbmp);
     }
 }
 
-static size_t
-memsize_dbm(const void *ptr)
-{
-    size_t size = 0;
-    const struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	size += sizeof(*dbmp);
-	if (dbmp->di_dbm) size += DBM_SIZEOF_DBM;
-    }
-    return size;
-}
-
-static const rb_data_type_t dbm_type = {
-    "gdbm",
-    {0, free_dbm, memsize_dbm,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * call-seq:
  *     gdbm.close -> nil
@@ -169,7 +149,7 @@ fgdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
-    TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp == 0)
         return Qtrue;
     if (dbmp->di_dbm == 0)
@@ -181,7 +161,7 @@ fgdbm_closed(VALUE obj)
 static VALUE
 fgdbm_s_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &dbm_type, 0);
+    return Data_Wrap_Struct(klass, 0, free_dbm, 0);
 }
 
 /*
@@ -299,7 +279,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj)
 static VALUE
 fgdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = fgdbm_s_alloc(klass);
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0);
 
     if (NIL_P(fgdbm_initialize(argc, argv, obj))) {
         return Qnil;
@@ -614,8 +594,7 @@ fgdbm_delete_if(VALUE obj)
     GDBM_FILE dbm;
     VALUE keystr, valstr;
     VALUE ret, ary = rb_ary_tmp_new(0);
-    long i;
-    int status = 0, n;
+    int i, status = 0, n;
 
     rb_gdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
@@ -634,7 +613,7 @@ fgdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++)
-        rb_gdbm_delete(obj, RARRAY_AREF(ary, i));
+        rb_gdbm_delete(obj, RARRAY_PTR(ary)[i]);
     if (status) rb_jump_tag(status);
     if (n > 0) dbmp->di_size = n - (int)RARRAY_LEN(ary);
     rb_ary_clear(ary);
@@ -747,13 +726,11 @@ fgdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 static VALUE
 update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
 {
-    const VALUE *ptr;
     Check_Type(pair, T_ARRAY);
     if (RARRAY_LEN(pair) < 2) {
         rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    ptr = RARRAY_CONST_PTR(pair);
-    fgdbm_store(dbm, ptr[0], ptr[1]);
+    fgdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
     return Qnil;
 }
 
diff --git a/ext/io/console/buildgem.sh b/ext/io/console/buildgem.sh
deleted file mode 100755
index 65fe545e1e..0000000000
--- a/ext/io/console/buildgem.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh -e
-cd ${0%/*}
-trap "mv depend.$$ depend" 0 2
-${RUBY-ruby} -i.$$ -pe 'exit if /^win32_vk/' depend
-${GEM-gem} build io-console.gemspec
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index dbbfbb7463..de5ca82558 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -3,7 +3,17 @@
  * console IO module
  */
 #include "ruby.h"
+#ifdef HAVE_RUBY_IO_H
 #include "ruby/io.h"
+#else
+#include "rubyio.h"
+/* assumes rb_io_t doesn't have pathv */
+#include "util.h"		/* for ruby_strdup() */
+#endif
+
+#ifndef HAVE_RB_IO_T
+typedef OpenFile rb_io_t;
+#endif
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -14,11 +24,9 @@
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
-#ifndef RARRAY_CONST_PTR
-# define RARRAY_CONST_PTR(ary) RARRAY_PTR(ary)
-#endif
-#ifndef HAVE_RB_FUNCALLV
-# define rb_funcallv rb_funcall2
+
+#ifndef RB_TYPE_P
+#define RB_TYPE_P(obj, type) (TYPE(obj) == type)
 #endif
 
 #if defined HAVE_TERMIOS_H
@@ -56,7 +64,11 @@ typedef struct sgttyb conmode;
 #include <winioctl.h>
 typedef DWORD conmode;
 
+#ifdef HAVE_RB_W32_MAP_ERRNO
 #define LAST_ERROR rb_w32_map_errno(GetLastError())
+#else
+#define LAST_ERROR EBADF
+#endif
 #define SET_LAST_ERROR (errno = LAST_ERROR, 0)
 
 static int
@@ -79,33 +91,11 @@ getattr(int fd, conmode *t)
 #define SET_LAST_ERROR (0)
 #endif
 
-static ID id_getc, id_console, id_close, id_min, id_time;
-#if ENABLE_IO_GETPASS
-static ID id_gets;
-#endif
-
-#ifndef HAVE_RB_F_SEND
-static ID id___send__;
-
-static VALUE
-rb_f_send(int argc, VALUE *argv, VALUE recv)
-{
-    VALUE sym = argv[0];
-    ID vid = rb_check_id(&sym);
-    if (vid) {
-	--argc;
-	++argv;
-    }
-    else {
-	vid = id___send__;
-    }
-    return rb_funcallv(recv, vid, argc, argv);
-}
+#ifndef InitVM
+#define InitVM(ext) {void InitVM_##ext(void);InitVM_##ext();}
 #endif
 
-#ifndef HAVE_RB_SYM2STR
-# define rb_sym2str(sym) rb_id2str(SYM2ID(sym))
-#endif
+static ID id_getc, id_console;
 
 typedef struct {
     int vmin;
@@ -117,10 +107,26 @@ rawmode_opt(int argc, VALUE *argv, rawmode_arg_t *opts)
 {
     rawmode_arg_t *optp = NULL;
     VALUE vopts;
+#ifdef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
     rb_scan_args(argc, argv, "0:", &vopts);
+#else
+    vopts = Qnil;
+    if (argc > 0) {
+	vopts = argv[--argc];
+	if (!NIL_P(vopts)) {
+# ifdef HAVE_RB_CHECK_HASH_TYPE
+	    vopts = rb_check_hash_type(vopts);
+	    if (NIL_P(vopts)) ++argc;
+# else
+	    Check_Type(vopts, T_HASH);
+# endif
+	}
+    }
+    rb_scan_args(argc, argv, "0");
+#endif
     if (!NIL_P(vopts)) {
-	VALUE vmin = rb_hash_aref(vopts, ID2SYM(id_min));
-	VALUE vtime = rb_hash_aref(vopts, ID2SYM(id_time));
+	VALUE vmin = rb_hash_aref(vopts, ID2SYM(rb_intern("min")));
+	VALUE vtime = rb_hash_aref(vopts, ID2SYM(rb_intern("time")));
 	/* default values by `stty raw` */
 	opts->vmin = 1;
 	opts->vtime = 0;
@@ -226,8 +232,15 @@ set_ttymode(int fd, conmode *t, void (*setter)(conmode *, void *), void *arg)
     return setattr(fd, &r);
 }
 
+#ifdef GetReadFile
+#define GetReadFD(fptr) fileno(GetReadFile(fptr))
+#else
 #define GetReadFD(fptr) ((fptr)->fd)
+#endif
 
+#ifdef GetWriteFile
+#define GetWriteFD(fptr) fileno(GetWriteFile(fptr))
+#else
 static inline int
 get_write_fd(const rb_io_t *fptr)
 {
@@ -238,6 +251,7 @@ get_write_fd(const rb_io_t *fptr)
     return ofptr->fd;
 }
 #define GetWriteFD(fptr) get_write_fd(fptr)
+#endif
 
 #define FD_PER_IO 2
 
@@ -290,7 +304,8 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void
     }
     if (status) {
 	if (status == -1) {
-	    rb_syserr_fail(error, 0);
+	    errno = error;
+	    rb_sys_fail(0);
 	}
 	rb_jump_tag(status);
     }
@@ -388,7 +403,7 @@ console_set_cooked(VALUE io)
 static VALUE
 getc_call(VALUE io)
 {
-    return rb_funcallv(io, id_getc, 0, 0);
+    return rb_funcall2(io, id_getc, 0, 0);
 }
 
 /*
@@ -533,16 +548,16 @@ console_set_winsize(VALUE io, VALUE size)
     int newrow, newcol;
 #endif
     VALUE row, col, xpixel, ypixel;
-    const VALUE *sz;
+#if defined TIOCSWINSZ
     int fd;
+#endif
 
     GetOpenFile(io, fptr);
     size = rb_Array(size);
-    rb_check_arity(RARRAY_LENINT(size), 2, 4);
-    sz = RARRAY_CONST_PTR(size);
-    row = sz[0], col = sz[1], xpixel = sz[2], ypixel = sz[3];
-    fd = GetWriteFD(fptr);
+    rb_scan_args((int)RARRAY_LEN(size), RARRAY_PTR(size), "22",
+                &row, &col, &xpixel, &ypixel);
 #if defined TIOCSWINSZ
+    fd = GetWriteFD(fptr);
     ws.ws_row = ws.ws_col = ws.ws_xpixel = ws.ws_ypixel = 0;
 #define SET(m) ws.ws_##m = NIL_P(m) ? 0 : (unsigned short)NUM2UINT(m)
     SET(row);
@@ -552,28 +567,24 @@ console_set_winsize(VALUE io, VALUE size)
 #undef SET
     if (!setwinsize(fd, &ws)) rb_sys_fail(0);
 #elif defined _WIN32
-    wh = (HANDLE)rb_w32_get_osfhandle(fd);
-#define SET(m) new##m = NIL_P(m) ? 0 : (unsigned short)NUM2UINT(m)
-    SET(row);
-    SET(col);
-#undef SET
-    if (!NIL_P(xpixel)) (void)NUM2UINT(xpixel);
-    if (!NIL_P(ypixel)) (void)NUM2UINT(ypixel);
-    if (!GetConsoleScreenBufferInfo(wh, &ws)) {
-	rb_syserr_fail(LAST_ERROR, "GetConsoleScreenBufferInfo");
+    wh = (HANDLE)rb_w32_get_osfhandle(GetReadFD(fptr));
+    newrow = (SHORT)NUM2UINT(row);
+    newcol = (SHORT)NUM2UINT(col);
+    if (!getwinsize(GetReadFD(fptr), &ws)) {
+	rb_sys_fail("GetConsoleScreenBufferInfo");
     }
     if ((ws.dwSize.X < newcol && (ws.dwSize.X = newcol, 1)) ||
 	(ws.dwSize.Y < newrow && (ws.dwSize.Y = newrow, 1))) {
-	if (!SetConsoleScreenBufferSize(wh, ws.dwSize)) {
-	    rb_syserr_fail(LAST_ERROR, "SetConsoleScreenBufferInfo");
+	if (!(SetConsoleScreenBufferSize(wh, ws.dwSize) || SET_LAST_ERROR)) {
+	    rb_sys_fail("SetConsoleScreenBufferInfo");
 	}
     }
     ws.srWindow.Left = 0;
     ws.srWindow.Top = 0;
     ws.srWindow.Right = newcol;
     ws.srWindow.Bottom = newrow;
-    if (!SetConsoleWindowInfo(wh, FALSE, &ws.srWindow)) {
-	rb_syserr_fail(LAST_ERROR, "SetConsoleWindowInfo");
+    if (!(SetConsoleWindowInfo(wh, FALSE, &ws.srWindow) || SET_LAST_ERROR)) {
+	rb_sys_fail("SetConsoleWindowInfo");
     }
 #endif
     return io;
@@ -657,143 +668,30 @@ console_ioflush(VALUE io)
     return io;
 }
 
-static VALUE
-console_beep(VALUE io)
-{
-    rb_io_t *fptr;
-    int fd;
-
-    GetOpenFile(io, fptr);
-    fd = GetWriteFD(fptr);
-#ifdef _WIN32
-    (void)fd;
-    MessageBeep(0);
-#else
-    if (write(fd, "\a", 1) < 0)
-	rb_sys_fail(0);
-#endif
-    return io;
-}
-
-#if defined _WIN32
-static VALUE
-console_goto(VALUE io, VALUE x, VALUE y)
-{
-    rb_io_t *fptr;
-    int fd;
-    COORD pos;
-
-    GetOpenFile(io, fptr);
-    fd = GetWriteFD(fptr);
-    pos.X = NUM2UINT(x);
-    pos.Y = NUM2UINT(y);
-    if (!SetConsoleCursorPosition((HANDLE)rb_w32_get_osfhandle(fd), pos)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    return io;
-}
-
-static VALUE
-console_cursor_pos(VALUE io)
-{
-    rb_io_t *fptr;
-    int fd;
-    rb_console_size_t ws;
-
-    GetOpenFile(io, fptr);
-    fd = GetWriteFD(fptr);
-    if (!GetConsoleScreenBufferInfo((HANDLE)rb_w32_get_osfhandle(fd), &ws)) {
-	rb_syserr_fail(LAST_ERROR, 0);
-    }
-    return rb_assoc_new(UINT2NUM(ws.dwCursorPosition.X), UINT2NUM(ws.dwCursorPosition.Y));
-}
-
-static VALUE
-console_cursor_set(VALUE io, VALUE cpos)
-{
-    cpos = rb_convert_type(cpos, T_ARRAY, "Array", "to_ary");
-    if (RARRAY_LEN(cpos) != 2) rb_raise(rb_eArgError, "expected 2D coordinate");
-    return console_goto(io, RARRAY_AREF(cpos, 0), RARRAY_AREF(cpos, 1));
-}
-
-#include "win32_vk.inc"
-
-static VALUE
-console_key_pressed_p(VALUE io, VALUE k)
-{
-    int vk = -1;
-
-    if (FIXNUM_P(k)) {
-	vk = NUM2UINT(k);
-    }
-    else {
-	const struct vktable *t;
-	const char *kn;
-	if (SYMBOL_P(k)) {
-	    k = rb_sym2str(k);
-	    kn = RSTRING_PTR(k);
-	}
-	else {
-	    kn = StringValuePtr(k);
-	}
-	t = console_win32_vk(kn, RSTRING_LEN(k));
-	if (!t || (vk = (short)t->vk) == -1) {
-	    rb_raise(rb_eArgError, "unknown virtual key code: % "PRIsVALUE, k);
-	}
-    }
-    return GetKeyState(vk) & 0x80 ? Qtrue : Qfalse;
-}
-#else
-# define console_goto rb_f_notimplement
-# define console_cursor_pos rb_f_notimplement
-# define console_cursor_set rb_f_notimplement
-# define console_key_pressed_p rb_f_notimplement
-#endif
-
 /*
  * call-seq:
  *   IO.console      -> #<File:/dev/tty>
- *   IO.console(sym, *args)
  *
  * Returns an File instance opened console.
  *
- * If +sym+ is given, it will be sent to the opened console with
- * +args+ and the result will be returned instead of the console IO
- * itself.
- *
  * You must require 'io/console' to use this method.
  */
 static VALUE
-console_dev(int argc, VALUE *argv, VALUE klass)
+console_dev(VALUE klass)
 {
     VALUE con = 0;
     rb_io_t *fptr;
-    VALUE sym = 0;
 
-    rb_check_arity(argc, 0, UNLIMITED_ARGUMENTS);
-    if (argc) {
-	Check_Type(sym = argv[0], T_SYMBOL);
-    }
     if (klass == rb_cIO) klass = rb_cFile;
     if (rb_const_defined(klass, id_console)) {
 	con = rb_const_get(klass, id_console);
-	if (!RB_TYPE_P(con, T_FILE) ||
-	    (!(fptr = RFILE(con)->fptr) || GetReadFD(fptr) == -1)) {
-	    rb_const_remove(klass, id_console);
-	    con = 0;
+	if (RB_TYPE_P(con, T_FILE)) {
+	    if ((fptr = RFILE(con)->fptr) && GetReadFD(fptr) != -1)
+		return con;
 	}
+	rb_mod_remove_const(klass, ID2SYM(id_console));
     }
-    if (sym) {
-	if (sym == ID2SYM(id_close) && argc == 1) {
-	    if (con) {
-		rb_io_close(con);
-		rb_const_remove(klass, id_console);
-		con = 0;
-	    }
-	    return Qnil;
-	}
-    }
-    if (!con) {
+    {
 	VALUE args[2];
 #if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H || defined HAVE_SGTTY_H
 # define CONSOLE_DEVICE "/dev/tty"
@@ -831,19 +729,25 @@ console_dev(int argc, VALUE *argv, VALUE klass)
 	args[0] = INT2NUM(fd);
 	con = rb_class_new_instance(2, args, klass);
 	GetOpenFile(con, fptr);
+#ifdef HAVE_RUBY_IO_H
 	fptr->pathv = rb_obj_freeze(rb_str_new2(CONSOLE_DEVICE));
+#else
+	fptr->path = ruby_strdup(CONSOLE_DEVICE);
+#endif
 #ifdef CONSOLE_DEVICE_FOR_WRITING
 	GetOpenFile(out, ofptr);
+# ifdef HAVE_RB_IO_GET_WRITE_IO
 	ofptr->pathv = fptr->pathv;
 	fptr->tied_io_for_writing = out;
+# else
+	fptr->f2 = ofptr->f;
+	ofptr->f = 0;
+# endif
 	ofptr->mode |= FMODE_SYNC;
 #endif
 	fptr->mode |= FMODE_SYNC;
 	rb_const_set(klass, id_console, con);
     }
-    if (sym) {
-	return rb_f_send(argc, argv, con);
-    }
     return con;
 }
 
@@ -856,101 +760,17 @@ console_dev(int argc, VALUE *argv, VALUE klass)
 static VALUE
 io_getch(int argc, VALUE *argv, VALUE io)
 {
-    return rb_funcallv(io, id_getc, argc, argv);
-}
-
-#if ENABLE_IO_GETPASS
-static VALUE
-puts_call(VALUE io)
-{
-    return rb_io_write(io, rb_default_rs);
-}
-
-static VALUE
-getpass_call(VALUE io)
-{
-    return ttymode(io, rb_io_gets, set_noecho, NULL);
-}
-
-static void
-prompt(int argc, VALUE *argv, VALUE io)
-{
-    if (argc > 0 && !NIL_P(argv[0])) {
-	VALUE str = argv[0];
-	StringValueCStr(str);
-	rb_check_safe_obj(str);
-	rb_io_write(io, str);
-    }
-}
-
-static VALUE
-str_chomp(VALUE str)
-{
-    if (!NIL_P(str)) {
-	str = rb_funcallv(str, rb_intern("chomp!"), 0, 0);
-    }
-    return str;
+    return rb_funcall2(io, rb_intern("getc"), argc, argv);
 }
 
 /*
- * call-seq:
- *   io.getpass(prompt=nil)       -> string
- *
- * Reads and returns a line without echo back.
- * Prints +prompt+ unless it is +nil+.
- *
- * You must require 'io/console' to use this method.
- */
-static VALUE
-console_getpass(int argc, VALUE *argv, VALUE io)
-{
-    VALUE str, wio;
-
-    rb_check_arity(argc, 0, 1);
-    wio = rb_io_get_write_io(io);
-    if (wio == io && io == rb_stdin) wio = rb_stderr;
-    prompt(argc, argv, wio);
-    str = rb_ensure(getpass_call, io, puts_call, wio);
-    return str_chomp(str);
-}
-
-/*
- * call-seq:
- *   io.getpass(prompt=nil)       -> string
- *
- * See IO#getpass.
- */
-static VALUE
-io_getpass(int argc, VALUE *argv, VALUE io)
-{
-    VALUE str;
-
-    rb_check_arity(argc, 0, 1);
-    prompt(argc, argv, io);
-    str = str_chomp(rb_funcallv(io, id_gets, 0, 0));
-    puts_call(io);
-    return str;
-}
-#endif
-
-/*
  * IO console methods
  */
 void
 Init_console(void)
 {
-#undef rb_intern
     id_getc = rb_intern("getc");
-#if ENABLE_IO_GETPASS
-    id_gets = rb_intern("gets");
-#endif
     id_console = rb_intern("console");
-    id_close = rb_intern("close");
-    id_min = rb_intern("min");
-    id_time = rb_intern("time");
-#ifndef HAVE_RB_F_SEND
-    id___send__ = rb_intern("__send__");
-#endif
     InitVM(console);
 }
 
@@ -970,20 +790,9 @@ InitVM_console(void)
     rb_define_method(rb_cIO, "iflush", console_iflush, 0);
     rb_define_method(rb_cIO, "oflush", console_oflush, 0);
     rb_define_method(rb_cIO, "ioflush", console_ioflush, 0);
-    rb_define_method(rb_cIO, "beep", console_beep, 0);
-    rb_define_method(rb_cIO, "goto", console_goto, 2);
-    rb_define_method(rb_cIO, "cursor", console_cursor_pos, 0);
-    rb_define_method(rb_cIO, "cursor=", console_cursor_set, 1);
-    rb_define_method(rb_cIO, "pressed?", console_key_pressed_p, 1);
-#if ENABLE_IO_GETPASS
-    rb_define_method(rb_cIO, "getpass", console_getpass, -1);
-#endif
-    rb_define_singleton_method(rb_cIO, "console", console_dev, -1);
+    rb_define_singleton_method(rb_cIO, "console", console_dev, 0);
     {
 	VALUE mReadable = rb_define_module_under(rb_cIO, "generic_readable");
 	rb_define_method(mReadable, "getch", io_getch, -1);
-#if ENABLE_IO_GETPASS
-	rb_define_method(mReadable, "getpass", io_getpass, -1);
-#endif
     }
 }
diff --git a/ext/io/console/depend b/ext/io/console/depend
index 400ae81a96..e786dc71d2 100644
--- a/ext/io/console/depend
+++ b/ext/io/console/depend
@@ -1,36 +1,4 @@
-# AUTOGENERATED DEPENDENCIES START
-console.o: $(RUBY_EXTCONF_H)
-console.o: $(arch_hdrdir)/ruby/config.h
-console.o: $(hdrdir)/ruby/backward.h
-console.o: $(hdrdir)/ruby/defines.h
-console.o: $(hdrdir)/ruby/encoding.h
-console.o: $(hdrdir)/ruby/intern.h
-console.o: $(hdrdir)/ruby/io.h
-console.o: $(hdrdir)/ruby/missing.h
-console.o: $(hdrdir)/ruby/oniguruma.h
-console.o: $(hdrdir)/ruby/ruby.h
-console.o: $(hdrdir)/ruby/st.h
-console.o: $(hdrdir)/ruby/subst.h
-console.o: $(top_srcdir)/include/ruby.h
-console.o: console.c
-# AUTOGENERATED DEPENDENCIES END
-
-win32_vk.inc: win32_vk.list
-
-.list.inc:
-	( \
-	$(RUBY) -anF, \
-	-e 'BEGIN {puts "#define UNDEFINED_VK (unsigned short)-1"}' \
-	-e 'n=$$F[1] and (n.strip!; /\AVK_/=~n) and' \
-	-e   'puts(%[#ifndef #{n}\n# define #{n} UNDEFINED_VK\n#endif])' \
-	$< && \
-	gperf --ignore-case -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k* $< \
-	| sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
-	) > $(@F)
-
-.SUFFIXES: .chksum .list .inc
-
-.list.chksum:
-	@$(RUBY) -I$(top_srcdir)/tool -rchecksum \
-	    -e "Checksum.update(ARGV) {|k|k.copy(k.target) rescue k.make(k.target)}" \
-	    -- --make=$(MAKE) -I$(srcdir) $(<F) $(@F:.chksum=.inc)
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/io/console/extconf.rb b/ext/io/console/extconf.rb
index be536dff9f..bbd1235986 100644
--- a/ext/io/console/extconf.rb
+++ b/ext/io/console/extconf.rb
@@ -1,13 +1,10 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 ok = true
 hdr = nil
 case
 when macro_defined?("_WIN32", "")
-  # rb_w32_map_errno: 1.8.7
-  vk_header = File.exist?("#$srcdir/win32_vk.list") ? "chksum" : "inc"
-  vk_header = "#{'{$(srcdir)}' if $nmake == ?m}win32_vk.#{vk_header}"
+  have_func("rb_w32_map_errno", "ruby.h")
 when hdr = %w"termios.h termio.h".find {|h| have_header(h)}
   have_func("cfmakeraw", hdr)
 when have_header(hdr = "sgtty.h")
@@ -15,15 +12,15 @@ when have_header(hdr = "sgtty.h")
 else
   ok = false
 end
+ok &&= enable_config("io-console-force-compatible-with-1.8") ||
+  macro_defined?("HAVE_RUBY_IO_H", cpp_include("ruby.h"))
 if ok
-  have_header("sys/ioctl.h") if hdr
-  have_func("rb_funcallv")
-  have_func("rb_sym2str")
-  # rb_check_hash_type: 1.9.3
-  # rb_io_get_write_io: 1.9.1
-  # rb_cloexec_open: 2.0.0
-  $defs << "-D""ENABLE_IO_GETPASS=1"
-  create_makefile("io/console") {|conf|
-    conf << "\n""VK_HEADER = #{vk_header}\n"
-  }
+  have_header("sys/ioctl.h")
+  have_func("rb_check_hash_type", "ruby.h")
+  have_func("rb_io_get_write_io", "ruby/io.h")
+  have_func("rb_cloexec_open", "ruby/io.h")
+  if enable_config("io-console-rb_scan_args-optional-hash", true)
+    $defs << "-DHAVE_RB_SCAN_ARGS_OPTIONAL_HASH=1"
+  end
+  create_makefile("io/console")
 end
diff --git a/ext/io/console/io-console.gemspec b/ext/io/console/io-console.gemspec
index 27e1a11e3a..f71e1b9b8f 100644
--- a/ext/io/console/io-console.gemspec
+++ b/ext/io/console/io-console.gemspec
@@ -1,5 +1,5 @@
 # -*- ruby -*-
-_VERSION = "0.4.6"
+_VERSION = "0.4.2"
 date = %w$Date::                           $[1]
 
 Gem::Specification.new do |s|
@@ -10,12 +10,12 @@ Gem::Specification.new do |s|
   s.email = "nobu@ruby-lang.org"
   s.description = "add console capabilities to IO instances."
   s.required_ruby_version = ">= 2.0.0"
-  s.homepage = "https://www.ruby-lang.org"
+  s.homepage = "http://www.ruby-lang.org"
   s.authors = ["Nobu Nakada"]
-  s.require_path = %[lib]
-  s.files = %w[console.c depend extconf.rb lib/console/size.rb win32_vk.inc]
+  s.require_path = %[.]
+  s.files = %w[console.c extconf.rb lib/console/size.rb]
   s.extensions = %w[extconf.rb]
-  s.license = "BSD-2-Clause"
+  s.licenses = "ruby"
   s.cert_chain  = %w[certs/nobu.pem]
   s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem") if $0 =~ /gem\z/
 end
diff --git a/ext/io/console/lib/console/size.rb b/ext/io/console/lib/console/size.rb
index f17206dfcf..519bc3be6d 100644
--- a/ext/io/console/lib/console/size.rb
+++ b/ext/io/console/lib/console/size.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # fallback to console window size
 def IO.default_console_size
   [
diff --git a/ext/io/console/win32_vk.chksum b/ext/io/console/win32_vk.chksum
deleted file mode 100644
index bc9fff7560..0000000000
--- a/ext/io/console/win32_vk.chksum
+++ /dev/null
@@ -1 +0,0 @@
-src="win32_vk.list", len=3269, checksum=34076
diff --git a/ext/io/console/win32_vk.inc b/ext/io/console/win32_vk.inc
deleted file mode 100644
index a098158e27..0000000000
--- a/ext/io/console/win32_vk.inc
+++ /dev/null
@@ -1,1400 +0,0 @@
-#define UNDEFINED_VK (unsigned short)-1
-#ifndef VK_LBUTTON
-# define VK_LBUTTON UNDEFINED_VK
-#endif
-#ifndef VK_RBUTTON
-# define VK_RBUTTON UNDEFINED_VK
-#endif
-#ifndef VK_CANCEL
-# define VK_CANCEL UNDEFINED_VK
-#endif
-#ifndef VK_MBUTTON
-# define VK_MBUTTON UNDEFINED_VK
-#endif
-#ifndef VK_XBUTTON1
-# define VK_XBUTTON1 UNDEFINED_VK
-#endif
-#ifndef VK_XBUTTON2
-# define VK_XBUTTON2 UNDEFINED_VK
-#endif
-#ifndef VK_BACK
-# define VK_BACK UNDEFINED_VK
-#endif
-#ifndef VK_TAB
-# define VK_TAB UNDEFINED_VK
-#endif
-#ifndef VK_CLEAR
-# define VK_CLEAR UNDEFINED_VK
-#endif
-#ifndef VK_RETURN
-# define VK_RETURN UNDEFINED_VK
-#endif
-#ifndef VK_SHIFT
-# define VK_SHIFT UNDEFINED_VK
-#endif
-#ifndef VK_CONTROL
-# define VK_CONTROL UNDEFINED_VK
-#endif
-#ifndef VK_MENU
-# define VK_MENU UNDEFINED_VK
-#endif
-#ifndef VK_PAUSE
-# define VK_PAUSE UNDEFINED_VK
-#endif
-#ifndef VK_CAPITAL
-# define VK_CAPITAL UNDEFINED_VK
-#endif
-#ifndef VK_KANA
-# define VK_KANA UNDEFINED_VK
-#endif
-#ifndef VK_HANGEUL
-# define VK_HANGEUL UNDEFINED_VK
-#endif
-#ifndef VK_HANGUL
-# define VK_HANGUL UNDEFINED_VK
-#endif
-#ifndef VK_JUNJA
-# define VK_JUNJA UNDEFINED_VK
-#endif
-#ifndef VK_FINAL
-# define VK_FINAL UNDEFINED_VK
-#endif
-#ifndef VK_HANJA
-# define VK_HANJA UNDEFINED_VK
-#endif
-#ifndef VK_KANJI
-# define VK_KANJI UNDEFINED_VK
-#endif
-#ifndef VK_ESCAPE
-# define VK_ESCAPE UNDEFINED_VK
-#endif
-#ifndef VK_CONVERT
-# define VK_CONVERT UNDEFINED_VK
-#endif
-#ifndef VK_NONCONVERT
-# define VK_NONCONVERT UNDEFINED_VK
-#endif
-#ifndef VK_ACCEPT
-# define VK_ACCEPT UNDEFINED_VK
-#endif
-#ifndef VK_MODECHANGE
-# define VK_MODECHANGE UNDEFINED_VK
-#endif
-#ifndef VK_SPACE
-# define VK_SPACE UNDEFINED_VK
-#endif
-#ifndef VK_PRIOR
-# define VK_PRIOR UNDEFINED_VK
-#endif
-#ifndef VK_NEXT
-# define VK_NEXT UNDEFINED_VK
-#endif
-#ifndef VK_END
-# define VK_END UNDEFINED_VK
-#endif
-#ifndef VK_HOME
-# define VK_HOME UNDEFINED_VK
-#endif
-#ifndef VK_LEFT
-# define VK_LEFT UNDEFINED_VK
-#endif
-#ifndef VK_UP
-# define VK_UP UNDEFINED_VK
-#endif
-#ifndef VK_RIGHT
-# define VK_RIGHT UNDEFINED_VK
-#endif
-#ifndef VK_DOWN
-# define VK_DOWN UNDEFINED_VK
-#endif
-#ifndef VK_SELECT
-# define VK_SELECT UNDEFINED_VK
-#endif
-#ifndef VK_PRINT
-# define VK_PRINT UNDEFINED_VK
-#endif
-#ifndef VK_EXECUTE
-# define VK_EXECUTE UNDEFINED_VK
-#endif
-#ifndef VK_SNAPSHOT
-# define VK_SNAPSHOT UNDEFINED_VK
-#endif
-#ifndef VK_INSERT
-# define VK_INSERT UNDEFINED_VK
-#endif
-#ifndef VK_DELETE
-# define VK_DELETE UNDEFINED_VK
-#endif
-#ifndef VK_HELP
-# define VK_HELP UNDEFINED_VK
-#endif
-#ifndef VK_LWIN
-# define VK_LWIN UNDEFINED_VK
-#endif
-#ifndef VK_RWIN
-# define VK_RWIN UNDEFINED_VK
-#endif
-#ifndef VK_APPS
-# define VK_APPS UNDEFINED_VK
-#endif
-#ifndef VK_SLEEP
-# define VK_SLEEP UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD0
-# define VK_NUMPAD0 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD1
-# define VK_NUMPAD1 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD2
-# define VK_NUMPAD2 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD3
-# define VK_NUMPAD3 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD4
-# define VK_NUMPAD4 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD5
-# define VK_NUMPAD5 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD6
-# define VK_NUMPAD6 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD7
-# define VK_NUMPAD7 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD8
-# define VK_NUMPAD8 UNDEFINED_VK
-#endif
-#ifndef VK_NUMPAD9
-# define VK_NUMPAD9 UNDEFINED_VK
-#endif
-#ifndef VK_MULTIPLY
-# define VK_MULTIPLY UNDEFINED_VK
-#endif
-#ifndef VK_ADD
-# define VK_ADD UNDEFINED_VK
-#endif
-#ifndef VK_SEPARATOR
-# define VK_SEPARATOR UNDEFINED_VK
-#endif
-#ifndef VK_SUBTRACT
-# define VK_SUBTRACT UNDEFINED_VK
-#endif
-#ifndef VK_DECIMAL
-# define VK_DECIMAL UNDEFINED_VK
-#endif
-#ifndef VK_DIVIDE
-# define VK_DIVIDE UNDEFINED_VK
-#endif
-#ifndef VK_F1
-# define VK_F1 UNDEFINED_VK
-#endif
-#ifndef VK_F2
-# define VK_F2 UNDEFINED_VK
-#endif
-#ifndef VK_F3
-# define VK_F3 UNDEFINED_VK
-#endif
-#ifndef VK_F4
-# define VK_F4 UNDEFINED_VK
-#endif
-#ifndef VK_F5
-# define VK_F5 UNDEFINED_VK
-#endif
-#ifndef VK_F6
-# define VK_F6 UNDEFINED_VK
-#endif
-#ifndef VK_F7
-# define VK_F7 UNDEFINED_VK
-#endif
-#ifndef VK_F8
-# define VK_F8 UNDEFINED_VK
-#endif
-#ifndef VK_F9
-# define VK_F9 UNDEFINED_VK
-#endif
-#ifndef VK_F10
-# define VK_F10 UNDEFINED_VK
-#endif
-#ifndef VK_F11
-# define VK_F11 UNDEFINED_VK
-#endif
-#ifndef VK_F12
-# define VK_F12 UNDEFINED_VK
-#endif
-#ifndef VK_F13
-# define VK_F13 UNDEFINED_VK
-#endif
-#ifndef VK_F14
-# define VK_F14 UNDEFINED_VK
-#endif
-#ifndef VK_F15
-# define VK_F15 UNDEFINED_VK
-#endif
-#ifndef VK_F16
-# define VK_F16 UNDEFINED_VK
-#endif
-#ifndef VK_F17
-# define VK_F17 UNDEFINED_VK
-#endif
-#ifndef VK_F18
-# define VK_F18 UNDEFINED_VK
-#endif
-#ifndef VK_F19
-# define VK_F19 UNDEFINED_VK
-#endif
-#ifndef VK_F20
-# define VK_F20 UNDEFINED_VK
-#endif
-#ifndef VK_F21
-# define VK_F21 UNDEFINED_VK
-#endif
-#ifndef VK_F22
-# define VK_F22 UNDEFINED_VK
-#endif
-#ifndef VK_F23
-# define VK_F23 UNDEFINED_VK
-#endif
-#ifndef VK_F24
-# define VK_F24 UNDEFINED_VK
-#endif
-#ifndef VK_NUMLOCK
-# define VK_NUMLOCK UNDEFINED_VK
-#endif
-#ifndef VK_SCROLL
-# define VK_SCROLL UNDEFINED_VK
-#endif
-#ifndef VK_OEM_NEC_EQUAL
-# define VK_OEM_NEC_EQUAL UNDEFINED_VK
-#endif
-#ifndef VK_OEM_FJ_JISHO
-# define VK_OEM_FJ_JISHO UNDEFINED_VK
-#endif
-#ifndef VK_OEM_FJ_MASSHOU
-# define VK_OEM_FJ_MASSHOU UNDEFINED_VK
-#endif
-#ifndef VK_OEM_FJ_TOUROKU
-# define VK_OEM_FJ_TOUROKU UNDEFINED_VK
-#endif
-#ifndef VK_OEM_FJ_LOYA
-# define VK_OEM_FJ_LOYA UNDEFINED_VK
-#endif
-#ifndef VK_OEM_FJ_ROYA
-# define VK_OEM_FJ_ROYA UNDEFINED_VK
-#endif
-#ifndef VK_LSHIFT
-# define VK_LSHIFT UNDEFINED_VK
-#endif
-#ifndef VK_RSHIFT
-# define VK_RSHIFT UNDEFINED_VK
-#endif
-#ifndef VK_LCONTROL
-# define VK_LCONTROL UNDEFINED_VK
-#endif
-#ifndef VK_RCONTROL
-# define VK_RCONTROL UNDEFINED_VK
-#endif
-#ifndef VK_LMENU
-# define VK_LMENU UNDEFINED_VK
-#endif
-#ifndef VK_RMENU
-# define VK_RMENU UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_BACK
-# define VK_BROWSER_BACK UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_FORWARD
-# define VK_BROWSER_FORWARD UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_REFRESH
-# define VK_BROWSER_REFRESH UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_STOP
-# define VK_BROWSER_STOP UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_SEARCH
-# define VK_BROWSER_SEARCH UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_FAVORITES
-# define VK_BROWSER_FAVORITES UNDEFINED_VK
-#endif
-#ifndef VK_BROWSER_HOME
-# define VK_BROWSER_HOME UNDEFINED_VK
-#endif
-#ifndef VK_VOLUME_MUTE
-# define VK_VOLUME_MUTE UNDEFINED_VK
-#endif
-#ifndef VK_VOLUME_DOWN
-# define VK_VOLUME_DOWN UNDEFINED_VK
-#endif
-#ifndef VK_VOLUME_UP
-# define VK_VOLUME_UP UNDEFINED_VK
-#endif
-#ifndef VK_MEDIA_NEXT_TRACK
-# define VK_MEDIA_NEXT_TRACK UNDEFINED_VK
-#endif
-#ifndef VK_MEDIA_PREV_TRACK
-# define VK_MEDIA_PREV_TRACK UNDEFINED_VK
-#endif
-#ifndef VK_MEDIA_STOP
-# define VK_MEDIA_STOP UNDEFINED_VK
-#endif
-#ifndef VK_MEDIA_PLAY_PAUSE
-# define VK_MEDIA_PLAY_PAUSE UNDEFINED_VK
-#endif
-#ifndef VK_LAUNCH_MAIL
-# define VK_LAUNCH_MAIL UNDEFINED_VK
-#endif
-#ifndef VK_LAUNCH_MEDIA_SELECT
-# define VK_LAUNCH_MEDIA_SELECT UNDEFINED_VK
-#endif
-#ifndef VK_LAUNCH_APP1
-# define VK_LAUNCH_APP1 UNDEFINED_VK
-#endif
-#ifndef VK_LAUNCH_APP2
-# define VK_LAUNCH_APP2 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_1
-# define VK_OEM_1 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_PLUS
-# define VK_OEM_PLUS UNDEFINED_VK
-#endif
-#ifndef VK_OEM_COMMA
-# define VK_OEM_COMMA UNDEFINED_VK
-#endif
-#ifndef VK_OEM_MINUS
-# define VK_OEM_MINUS UNDEFINED_VK
-#endif
-#ifndef VK_OEM_PERIOD
-# define VK_OEM_PERIOD UNDEFINED_VK
-#endif
-#ifndef VK_OEM_2
-# define VK_OEM_2 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_3
-# define VK_OEM_3 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_4
-# define VK_OEM_4 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_5
-# define VK_OEM_5 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_6
-# define VK_OEM_6 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_7
-# define VK_OEM_7 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_8
-# define VK_OEM_8 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_AX
-# define VK_OEM_AX UNDEFINED_VK
-#endif
-#ifndef VK_OEM_102
-# define VK_OEM_102 UNDEFINED_VK
-#endif
-#ifndef VK_ICO_HELP
-# define VK_ICO_HELP UNDEFINED_VK
-#endif
-#ifndef VK_ICO_00
-# define VK_ICO_00 UNDEFINED_VK
-#endif
-#ifndef VK_PROCESSKEY
-# define VK_PROCESSKEY UNDEFINED_VK
-#endif
-#ifndef VK_ICO_CLEAR
-# define VK_ICO_CLEAR UNDEFINED_VK
-#endif
-#ifndef VK_PACKET
-# define VK_PACKET UNDEFINED_VK
-#endif
-#ifndef VK_OEM_RESET
-# define VK_OEM_RESET UNDEFINED_VK
-#endif
-#ifndef VK_OEM_JUMP
-# define VK_OEM_JUMP UNDEFINED_VK
-#endif
-#ifndef VK_OEM_PA1
-# define VK_OEM_PA1 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_PA2
-# define VK_OEM_PA2 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_PA3
-# define VK_OEM_PA3 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_WSCTRL
-# define VK_OEM_WSCTRL UNDEFINED_VK
-#endif
-#ifndef VK_OEM_CUSEL
-# define VK_OEM_CUSEL UNDEFINED_VK
-#endif
-#ifndef VK_OEM_ATTN
-# define VK_OEM_ATTN UNDEFINED_VK
-#endif
-#ifndef VK_OEM_FINISH
-# define VK_OEM_FINISH UNDEFINED_VK
-#endif
-#ifndef VK_OEM_COPY
-# define VK_OEM_COPY UNDEFINED_VK
-#endif
-#ifndef VK_OEM_AUTO
-# define VK_OEM_AUTO UNDEFINED_VK
-#endif
-#ifndef VK_OEM_ENLW
-# define VK_OEM_ENLW UNDEFINED_VK
-#endif
-#ifndef VK_OEM_BACKTAB
-# define VK_OEM_BACKTAB UNDEFINED_VK
-#endif
-#ifndef VK_ATTN
-# define VK_ATTN UNDEFINED_VK
-#endif
-#ifndef VK_CRSEL
-# define VK_CRSEL UNDEFINED_VK
-#endif
-#ifndef VK_EXSEL
-# define VK_EXSEL UNDEFINED_VK
-#endif
-#ifndef VK_EREOF
-# define VK_EREOF UNDEFINED_VK
-#endif
-#ifndef VK_PLAY
-# define VK_PLAY UNDEFINED_VK
-#endif
-#ifndef VK_ZOOM
-# define VK_ZOOM UNDEFINED_VK
-#endif
-#ifndef VK_NONAME
-# define VK_NONAME UNDEFINED_VK
-#endif
-#ifndef VK_PA1
-# define VK_PA1 UNDEFINED_VK
-#endif
-#ifndef VK_OEM_CLEAR
-# define VK_OEM_CLEAR UNDEFINED_VK
-#endif
-/* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf --ignore-case -E -C -P -p -j1 -i 1 -g -o -t -K ofs -N console_win32_vk -k'*' win32_vk.list  */
-
-#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 "win32_vk.list"
-
-struct vktable {short ofs; unsigned short vk;};
-static const struct vktable *console_win32_vk(const char *, unsigned int);
-#line 5 "win32_vk.list"
-struct vktable;
-/* maximum key range = 245, duplicates = 0 */
-
-#ifndef GPERF_DOWNCASE
-#define GPERF_DOWNCASE 1
-static unsigned char gperf_downcase[256] =
-  {
-      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
-     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
-     30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
-     45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
-     60,  61,  62,  63,  64,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
-    107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
-    122,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104,
-    105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
-    120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
-    135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
-    150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
-    165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
-    180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
-    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
-    210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
-    225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
-    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
-    255
-  };
-#endif
-
-#ifndef GPERF_CASE_STRCMP
-#define GPERF_CASE_STRCMP 1
-static int
-gperf_case_strcmp (s1, s2)
-     register const char *s1;
-     register const char *s2;
-{
-  for (;;)
-    {
-      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
-      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
-      if (c1 != 0 && c1 == c2)
-        continue;
-      return (int)c1 - (int)c2;
-    }
-}
-#endif
-
-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
-inline
-#elif defined(__GNUC__)
-__inline
-#endif
-static unsigned int
-hash (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  static const unsigned short asso_values[] =
-    {
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257,  51,  74,
-       80, 116, 127, 124,  95, 140,  77,  53,   7,   3,
-      257, 257, 257, 257, 257,   1,  11,   1,  55,   1,
-       25,  84,  31,  33,  13,  16,   2,  28,   8,   1,
-        6,  10,   1,   1,   3,   4,  45,  18,  73,  79,
-       30, 257, 257, 257, 257,   5, 257,   1,  11,   1,
-       55,   1,  25,  84,  31,  33,  13,  16,   2,  28,
-        8,   1,   6,  10,   1,   1,   3,   4,  45,  18,
-       73,  79,  30, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257, 257, 257,
-      257, 257, 257, 257, 257, 257, 257, 257
-    };
-  register int hval = len;
-
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[18]];
-      /*FALLTHROUGH*/
-      case 18:
-        hval += asso_values[(unsigned char)str[17]];
-      /*FALLTHROUGH*/
-      case 17:
-        hval += asso_values[(unsigned char)str[16]];
-      /*FALLTHROUGH*/
-      case 16:
-        hval += asso_values[(unsigned char)str[15]];
-      /*FALLTHROUGH*/
-      case 15:
-        hval += asso_values[(unsigned char)str[14]];
-      /*FALLTHROUGH*/
-      case 14:
-        hval += asso_values[(unsigned char)str[13]];
-      /*FALLTHROUGH*/
-      case 13:
-        hval += asso_values[(unsigned char)str[12]];
-      /*FALLTHROUGH*/
-      case 12:
-        hval += asso_values[(unsigned char)str[11]];
-      /*FALLTHROUGH*/
-      case 11:
-        hval += asso_values[(unsigned char)str[10]];
-      /*FALLTHROUGH*/
-      case 10:
-        hval += asso_values[(unsigned char)str[9]];
-      /*FALLTHROUGH*/
-      case 9:
-        hval += asso_values[(unsigned char)str[8]];
-      /*FALLTHROUGH*/
-      case 8:
-        hval += asso_values[(unsigned char)str[7]];
-      /*FALLTHROUGH*/
-      case 7:
-        hval += asso_values[(unsigned char)str[6]];
-      /*FALLTHROUGH*/
-      case 6:
-        hval += asso_values[(unsigned char)str[5]];
-      /*FALLTHROUGH*/
-      case 5:
-        hval += asso_values[(unsigned char)str[4]];
-      /*FALLTHROUGH*/
-      case 4:
-        hval += asso_values[(unsigned char)str[3]];
-      /*FALLTHROUGH*/
-      case 3:
-        hval += asso_values[(unsigned char)str[2]+2];
-      /*FALLTHROUGH*/
-      case 2:
-        hval += asso_values[(unsigned char)str[1]];
-      /*FALLTHROUGH*/
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-
-struct stringpool_t
-  {
-    char stringpool_str12[sizeof("UP")];
-    char stringpool_str13[sizeof("APPS")];
-    char stringpool_str14[sizeof("CRSEL")];
-    char stringpool_str15[sizeof("SPACE")];
-    char stringpool_str16[sizeof("SCROLL")];
-    char stringpool_str17[sizeof("ESCAPE")];
-    char stringpool_str18[sizeof("CANCEL")];
-    char stringpool_str19[sizeof("ACCEPT")];
-    char stringpool_str20[sizeof("SEPARATOR")];
-    char stringpool_str21[sizeof("SELECT")];
-    char stringpool_str22[sizeof("CONTROL")];
-    char stringpool_str23[sizeof("OEM_CLEAR")];
-    char stringpool_str24[sizeof("OEM_RESET")];
-    char stringpool_str25[sizeof("OEM_AUTO")];
-    char stringpool_str26[sizeof("OEM_CUSEL")];
-    char stringpool_str28[sizeof("KANA")];
-    char stringpool_str29[sizeof("OEM_PLUS")];
-    char stringpool_str30[sizeof("PRIOR")];
-    char stringpool_str31[sizeof("OEM_ATTN")];
-    char stringpool_str32[sizeof("PAUSE")];
-    char stringpool_str33[sizeof("BACK")];
-    char stringpool_str34[sizeof("PACKET")];
-    char stringpool_str35[sizeof("RCONTROL")];
-    char stringpool_str36[sizeof("LCONTROL")];
-    char stringpool_str37[sizeof("END")];
-    char stringpool_str38[sizeof("HOME")];
-    char stringpool_str39[sizeof("PRINT")];
-    char stringpool_str40[sizeof("NUMLOCK")];
-    char stringpool_str41[sizeof("LEFT")];
-    char stringpool_str42[sizeof("JUNJA")];
-    char stringpool_str43[sizeof("MENU")];
-    char stringpool_str44[sizeof("OEM_WSCTRL")];
-    char stringpool_str45[sizeof("OEM_ENLW")];
-    char stringpool_str46[sizeof("NEXT")];
-    char stringpool_str47[sizeof("RWIN")];
-    char stringpool_str48[sizeof("LWIN")];
-    char stringpool_str49[sizeof("CAPITAL")];
-    char stringpool_str50[sizeof("HELP")];
-    char stringpool_str51[sizeof("NONAME")];
-    char stringpool_str52[sizeof("RBUTTON")];
-    char stringpool_str53[sizeof("LBUTTON")];
-    char stringpool_str54[sizeof("OEM_NEC_EQUAL")];
-    char stringpool_str56[sizeof("INSERT")];
-    char stringpool_str57[sizeof("HANJA")];
-    char stringpool_str60[sizeof("SNAPSHOT")];
-    char stringpool_str61[sizeof("ATTN")];
-    char stringpool_str62[sizeof("TAB")];
-    char stringpool_str63[sizeof("OEM_BACKTAB")];
-    char stringpool_str64[sizeof("ICO_CLEAR")];
-    char stringpool_str65[sizeof("CONVERT")];
-    char stringpool_str66[sizeof("RETURN")];
-    char stringpool_str67[sizeof("OEM_JUMP")];
-    char stringpool_str71[sizeof("BROWSER_STOP")];
-    char stringpool_str72[sizeof("FINAL")];
-    char stringpool_str73[sizeof("ZOOM")];
-    char stringpool_str74[sizeof("KANJI")];
-    char stringpool_str75[sizeof("DELETE")];
-    char stringpool_str76[sizeof("OEM_COMMA")];
-    char stringpool_str77[sizeof("SUBTRACT")];
-    char stringpool_str79[sizeof("MBUTTON")];
-    char stringpool_str80[sizeof("F9")];
-    char stringpool_str81[sizeof("SHIFT")];
-    char stringpool_str82[sizeof("RSHIFT")];
-    char stringpool_str83[sizeof("LSHIFT")];
-    char stringpool_str84[sizeof("ADD")];
-    char stringpool_str85[sizeof("NONCONVERT")];
-    char stringpool_str86[sizeof("EXSEL")];
-    char stringpool_str87[sizeof("OEM_1")];
-    char stringpool_str88[sizeof("OEM_AX")];
-    char stringpool_str89[sizeof("BROWSER_BACK")];
-    char stringpool_str90[sizeof("OEM_8")];
-    char stringpool_str91[sizeof("OEM_MINUS")];
-    char stringpool_str92[sizeof("PLAY")];
-    char stringpool_str93[sizeof("OEM_2")];
-    char stringpool_str94[sizeof("CLEAR")];
-    char stringpool_str95[sizeof("OEM_FJ_TOUROKU")];
-    char stringpool_str96[sizeof("OEM_PA1")];
-    char stringpool_str97[sizeof("ICO_HELP")];
-    char stringpool_str98[sizeof("BROWSER_SEARCH")];
-    char stringpool_str99[sizeof("SLEEP")];
-    char stringpool_str101[sizeof("F1")];
-    char stringpool_str102[sizeof("OEM_PA2")];
-    char stringpool_str103[sizeof("OEM_COPY")];
-    char stringpool_str104[sizeof("F8")];
-    char stringpool_str105[sizeof("F19")];
-    char stringpool_str106[sizeof("RIGHT")];
-    char stringpool_str107[sizeof("F2")];
-    char stringpool_str108[sizeof("OEM_6")];
-    char stringpool_str109[sizeof("F18")];
-    char stringpool_str111[sizeof("VOLUME_UP")];
-    char stringpool_str114[sizeof("MEDIA_STOP")];
-    char stringpool_str115[sizeof("OEM_PERIOD")];
-    char stringpool_str117[sizeof("EREOF")];
-    char stringpool_str121[sizeof("BROWSER_HOME")];
-    char stringpool_str122[sizeof("F6")];
-    char stringpool_str124[sizeof("BROWSER_REFRESH")];
-    char stringpool_str126[sizeof("PA1")];
-    char stringpool_str127[sizeof("PROCESSKEY")];
-    char stringpool_str128[sizeof("DECIMAL")];
-    char stringpool_str129[sizeof("OEM_3")];
-    char stringpool_str130[sizeof("RMENU")];
-    char stringpool_str131[sizeof("LMENU")];
-    char stringpool_str132[sizeof("OEM_FJ_MASSHOU")];
-    char stringpool_str133[sizeof("NUMPAD0")];
-    char stringpool_str134[sizeof("HANGUL")];
-    char stringpool_str135[sizeof("NUMPAD9")];
-    char stringpool_str136[sizeof("HANGEUL")];
-    char stringpool_str137[sizeof("OEM_5")];
-    char stringpool_str138[sizeof("OEM_PA3")];
-    char stringpool_str139[sizeof("VOLUME_MUTE")];
-    char stringpool_str140[sizeof("OEM_4")];
-    char stringpool_str141[sizeof("LAUNCH_MAIL")];
-    char stringpool_str142[sizeof("OEM_FJ_JISHO")];
-    char stringpool_str143[sizeof("F3")];
-    char stringpool_str144[sizeof("OEM_FJ_ROYA")];
-    char stringpool_str145[sizeof("OEM_FJ_LOYA")];
-    char stringpool_str147[sizeof("DOWN")];
-    char stringpool_str149[sizeof("OEM_FINISH")];
-    char stringpool_str151[sizeof("F5")];
-    char stringpool_str153[sizeof("OEM_7")];
-    char stringpool_str154[sizeof("F4")];
-    char stringpool_str155[sizeof("F17")];
-    char stringpool_str156[sizeof("NUMPAD1")];
-    char stringpool_str157[sizeof("ICO_00")];
-    char stringpool_str159[sizeof("NUMPAD8")];
-    char stringpool_str162[sizeof("NUMPAD2")];
-    char stringpool_str164[sizeof("LAUNCH_APP1")];
-    char stringpool_str165[sizeof("BROWSER_FORWARD")];
-    char stringpool_str167[sizeof("F7")];
-    char stringpool_str170[sizeof("LAUNCH_APP2")];
-    char stringpool_str171[sizeof("MULTIPLY")];
-    char stringpool_str174[sizeof("EXECUTE")];
-    char stringpool_str176[sizeof("BROWSER_FAVORITES")];
-    char stringpool_str177[sizeof("NUMPAD6")];
-    char stringpool_str179[sizeof("F16")];
-    char stringpool_str182[sizeof("F10")];
-    char stringpool_str185[sizeof("VOLUME_DOWN")];
-    char stringpool_str188[sizeof("F20")];
-    char stringpool_str189[sizeof("MEDIA_PREV_TRACK")];
-    char stringpool_str191[sizeof("MODECHANGE")];
-    char stringpool_str197[sizeof("F14")];
-    char stringpool_str198[sizeof("NUMPAD3")];
-    char stringpool_str199[sizeof("XBUTTON1")];
-    char stringpool_str203[sizeof("F24")];
-    char stringpool_str205[sizeof("XBUTTON2")];
-    char stringpool_str206[sizeof("NUMPAD5")];
-    char stringpool_str209[sizeof("NUMPAD4")];
-    char stringpool_str215[sizeof("MEDIA_PLAY_PAUSE")];
-    char stringpool_str217[sizeof("LAUNCH_MEDIA_SELECT")];
-    char stringpool_str218[sizeof("F11")];
-    char stringpool_str220[sizeof("OEM_102")];
-    char stringpool_str221[sizeof("MEDIA_NEXT_TRACK")];
-    char stringpool_str222[sizeof("NUMPAD7")];
-    char stringpool_str224[sizeof("F21")];
-    char stringpool_str226[sizeof("F13")];
-    char stringpool_str229[sizeof("F12")];
-    char stringpool_str232[sizeof("F23")];
-    char stringpool_str235[sizeof("F22")];
-    char stringpool_str242[sizeof("F15")];
-    char stringpool_str256[sizeof("DIVIDE")];
-  };
-static const struct stringpool_t stringpool_contents =
-  {
-    "UP",
-    "APPS",
-    "CRSEL",
-    "SPACE",
-    "SCROLL",
-    "ESCAPE",
-    "CANCEL",
-    "ACCEPT",
-    "SEPARATOR",
-    "SELECT",
-    "CONTROL",
-    "OEM_CLEAR",
-    "OEM_RESET",
-    "OEM_AUTO",
-    "OEM_CUSEL",
-    "KANA",
-    "OEM_PLUS",
-    "PRIOR",
-    "OEM_ATTN",
-    "PAUSE",
-    "BACK",
-    "PACKET",
-    "RCONTROL",
-    "LCONTROL",
-    "END",
-    "HOME",
-    "PRINT",
-    "NUMLOCK",
-    "LEFT",
-    "JUNJA",
-    "MENU",
-    "OEM_WSCTRL",
-    "OEM_ENLW",
-    "NEXT",
-    "RWIN",
-    "LWIN",
-    "CAPITAL",
-    "HELP",
-    "NONAME",
-    "RBUTTON",
-    "LBUTTON",
-    "OEM_NEC_EQUAL",
-    "INSERT",
-    "HANJA",
-    "SNAPSHOT",
-    "ATTN",
-    "TAB",
-    "OEM_BACKTAB",
-    "ICO_CLEAR",
-    "CONVERT",
-    "RETURN",
-    "OEM_JUMP",
-    "BROWSER_STOP",
-    "FINAL",
-    "ZOOM",
-    "KANJI",
-    "DELETE",
-    "OEM_COMMA",
-    "SUBTRACT",
-    "MBUTTON",
-    "F9",
-    "SHIFT",
-    "RSHIFT",
-    "LSHIFT",
-    "ADD",
-    "NONCONVERT",
-    "EXSEL",
-    "OEM_1",
-    "OEM_AX",
-    "BROWSER_BACK",
-    "OEM_8",
-    "OEM_MINUS",
-    "PLAY",
-    "OEM_2",
-    "CLEAR",
-    "OEM_FJ_TOUROKU",
-    "OEM_PA1",
-    "ICO_HELP",
-    "BROWSER_SEARCH",
-    "SLEEP",
-    "F1",
-    "OEM_PA2",
-    "OEM_COPY",
-    "F8",
-    "F19",
-    "RIGHT",
-    "F2",
-    "OEM_6",
-    "F18",
-    "VOLUME_UP",
-    "MEDIA_STOP",
-    "OEM_PERIOD",
-    "EREOF",
-    "BROWSER_HOME",
-    "F6",
-    "BROWSER_REFRESH",
-    "PA1",
-    "PROCESSKEY",
-    "DECIMAL",
-    "OEM_3",
-    "RMENU",
-    "LMENU",
-    "OEM_FJ_MASSHOU",
-    "NUMPAD0",
-    "HANGUL",
-    "NUMPAD9",
-    "HANGEUL",
-    "OEM_5",
-    "OEM_PA3",
-    "VOLUME_MUTE",
-    "OEM_4",
-    "LAUNCH_MAIL",
-    "OEM_FJ_JISHO",
-    "F3",
-    "OEM_FJ_ROYA",
-    "OEM_FJ_LOYA",
-    "DOWN",
-    "OEM_FINISH",
-    "F5",
-    "OEM_7",
-    "F4",
-    "F17",
-    "NUMPAD1",
-    "ICO_00",
-    "NUMPAD8",
-    "NUMPAD2",
-    "LAUNCH_APP1",
-    "BROWSER_FORWARD",
-    "F7",
-    "LAUNCH_APP2",
-    "MULTIPLY",
-    "EXECUTE",
-    "BROWSER_FAVORITES",
-    "NUMPAD6",
-    "F16",
-    "F10",
-    "VOLUME_DOWN",
-    "F20",
-    "MEDIA_PREV_TRACK",
-    "MODECHANGE",
-    "F14",
-    "NUMPAD3",
-    "XBUTTON1",
-    "F24",
-    "XBUTTON2",
-    "NUMPAD5",
-    "NUMPAD4",
-    "MEDIA_PLAY_PAUSE",
-    "LAUNCH_MEDIA_SELECT",
-    "F11",
-    "OEM_102",
-    "MEDIA_NEXT_TRACK",
-    "NUMPAD7",
-    "F21",
-    "F13",
-    "F12",
-    "F23",
-    "F22",
-    "F15",
-    "DIVIDE"
-  };
-#define stringpool ((const char *) &stringpool_contents)
-#ifdef __GNUC__
-__inline
-#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
-__attribute__ ((__gnu_inline__))
-#endif
-#endif
-const struct vktable *
-console_win32_vk (str, len)
-     register const char *str;
-     register unsigned int len;
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 160,
-      MIN_WORD_LENGTH = 2,
-      MAX_WORD_LENGTH = 19,
-      MIN_HASH_VALUE = 12,
-      MAX_HASH_VALUE = 256
-    };
-
-  static const struct vktable wordlist[] =
-    {
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1},
-#line 40 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str12), VK_UP},
-#line 52 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str13), VK_APPS},
-#line 159 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str14), VK_CRSEL},
-#line 34 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str15), VK_SPACE},
-#line 95 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str16), VK_SCROLL},
-#line 29 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str17), VK_ESCAPE},
-#line 9 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str18), VK_CANCEL},
-#line 32 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str19), VK_ACCEPT},
-#line 66 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str20), VK_SEPARATOR},
-#line 43 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str21), VK_SELECT},
-#line 18 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str22), VK_CONTROL},
-#line 166 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str23), VK_OEM_CLEAR},
-#line 145 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str24), VK_OEM_RESET},
-#line 155 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str25), VK_OEM_AUTO},
-#line 151 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str26), VK_OEM_CUSEL},
-      {-1},
-#line 22 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str28), VK_KANA},
-#line 127 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str29), VK_OEM_PLUS},
-#line 35 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str30), VK_PRIOR},
-#line 152 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str31), VK_OEM_ATTN},
-#line 20 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str32), VK_PAUSE},
-#line 13 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str33), VK_BACK},
-#line 144 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str34), VK_PACKET},
-#line 105 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str35), VK_RCONTROL},
-#line 104 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str36), VK_LCONTROL},
-#line 37 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str37), VK_END},
-#line 38 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str38), VK_HOME},
-#line 44 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str39), VK_PRINT},
-#line 94 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str40), VK_NUMLOCK},
-#line 39 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str41), VK_LEFT},
-#line 25 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str42), VK_JUNJA},
-#line 19 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str43), VK_MENU},
-#line 150 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str44), VK_OEM_WSCTRL},
-#line 156 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str45), VK_OEM_ENLW},
-#line 36 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str46), VK_NEXT},
-#line 51 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str47), VK_RWIN},
-#line 50 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str48), VK_LWIN},
-#line 21 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str49), VK_CAPITAL},
-#line 49 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str50), VK_HELP},
-#line 164 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str51), VK_NONAME},
-#line 8 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str52), VK_RBUTTON},
-#line 7 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str53), VK_LBUTTON},
-#line 96 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str54), VK_OEM_NEC_EQUAL},
-      {-1},
-#line 47 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str56), VK_INSERT},
-#line 27 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str57), VK_HANJA},
-      {-1}, {-1},
-#line 46 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str60), VK_SNAPSHOT},
-#line 158 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str61), VK_ATTN},
-#line 14 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str62), VK_TAB},
-#line 157 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str63), VK_OEM_BACKTAB},
-#line 143 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str64), VK_ICO_CLEAR},
-#line 30 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str65), VK_CONVERT},
-#line 16 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str66), VK_RETURN},
-#line 146 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str67), VK_OEM_JUMP},
-      {-1}, {-1}, {-1},
-#line 111 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str71), VK_BROWSER_STOP},
-#line 26 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str72), VK_FINAL},
-#line 163 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str73), VK_ZOOM},
-#line 28 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str74), VK_KANJI},
-#line 48 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str75), VK_DELETE},
-#line 128 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str76), VK_OEM_COMMA},
-#line 67 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str77), VK_SUBTRACT},
-      {-1},
-#line 10 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str79), VK_MBUTTON},
-#line 78 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str80), VK_F9},
-#line 17 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str81), VK_SHIFT},
-#line 103 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str82), VK_RSHIFT},
-#line 102 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str83), VK_LSHIFT},
-#line 65 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str84), VK_ADD},
-#line 31 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str85), VK_NONCONVERT},
-#line 160 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str86), VK_EXSEL},
-#line 126 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str87), VK_OEM_1},
-#line 138 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str88), VK_OEM_AX},
-#line 108 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str89), VK_BROWSER_BACK},
-#line 137 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str90), VK_OEM_8},
-#line 129 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str91), VK_OEM_MINUS},
-#line 162 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str92), VK_PLAY},
-#line 131 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str93), VK_OEM_2},
-#line 15 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str94), VK_CLEAR},
-#line 99 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str95), VK_OEM_FJ_TOUROKU},
-#line 147 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str96), VK_OEM_PA1},
-#line 140 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str97), VK_ICO_HELP},
-#line 112 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str98), VK_BROWSER_SEARCH},
-#line 53 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str99), VK_SLEEP},
-      {-1},
-#line 70 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str101), VK_F1},
-#line 148 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str102), VK_OEM_PA2},
-#line 154 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str103), VK_OEM_COPY},
-#line 77 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str104), VK_F8},
-#line 88 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str105), VK_F19},
-#line 41 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str106), VK_RIGHT},
-#line 71 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str107), VK_F2},
-#line 135 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str108), VK_OEM_6},
-#line 87 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str109), VK_F18},
-      {-1},
-#line 117 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str111), VK_VOLUME_UP},
-      {-1}, {-1},
-#line 120 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str114), VK_MEDIA_STOP},
-#line 130 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str115), VK_OEM_PERIOD},
-      {-1},
-#line 161 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str117), VK_EREOF},
-      {-1}, {-1}, {-1},
-#line 114 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str121), VK_BROWSER_HOME},
-#line 75 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str122), VK_F6},
-      {-1},
-#line 110 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str124), VK_BROWSER_REFRESH},
-      {-1},
-#line 165 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str126), VK_PA1},
-#line 142 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str127), VK_PROCESSKEY},
-#line 68 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str128), VK_DECIMAL},
-#line 132 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str129), VK_OEM_3},
-#line 107 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str130), VK_RMENU},
-#line 106 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str131), VK_LMENU},
-#line 98 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str132), VK_OEM_FJ_MASSHOU},
-#line 54 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str133), VK_NUMPAD0},
-#line 24 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str134), VK_HANGUL},
-#line 63 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str135), VK_NUMPAD9},
-#line 23 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str136), VK_HANGEUL},
-#line 134 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str137), VK_OEM_5},
-#line 149 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str138), VK_OEM_PA3},
-#line 115 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str139), VK_VOLUME_MUTE},
-#line 133 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str140), VK_OEM_4},
-#line 122 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str141), VK_LAUNCH_MAIL},
-#line 97 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str142), VK_OEM_FJ_JISHO},
-#line 72 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str143), VK_F3},
-#line 101 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str144), VK_OEM_FJ_ROYA},
-#line 100 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str145), VK_OEM_FJ_LOYA},
-      {-1},
-#line 42 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str147), VK_DOWN},
-      {-1},
-#line 153 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str149), VK_OEM_FINISH},
-      {-1},
-#line 74 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str151), VK_F5},
-      {-1},
-#line 136 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str153), VK_OEM_7},
-#line 73 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str154), VK_F4},
-#line 86 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str155), VK_F17},
-#line 55 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str156), VK_NUMPAD1},
-#line 141 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str157), VK_ICO_00},
-      {-1},
-#line 62 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str159), VK_NUMPAD8},
-      {-1}, {-1},
-#line 56 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str162), VK_NUMPAD2},
-      {-1},
-#line 124 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str164), VK_LAUNCH_APP1},
-#line 109 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str165), VK_BROWSER_FORWARD},
-      {-1},
-#line 76 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str167), VK_F7},
-      {-1}, {-1},
-#line 125 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str170), VK_LAUNCH_APP2},
-#line 64 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str171), VK_MULTIPLY},
-      {-1}, {-1},
-#line 45 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str174), VK_EXECUTE},
-      {-1},
-#line 113 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str176), VK_BROWSER_FAVORITES},
-#line 60 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str177), VK_NUMPAD6},
-      {-1},
-#line 85 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str179), VK_F16},
-      {-1}, {-1},
-#line 79 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str182), VK_F10},
-      {-1}, {-1},
-#line 116 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str185), VK_VOLUME_DOWN},
-      {-1}, {-1},
-#line 89 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str188), VK_F20},
-#line 119 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str189), VK_MEDIA_PREV_TRACK},
-      {-1},
-#line 33 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str191), VK_MODECHANGE},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 83 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str197), VK_F14},
-#line 57 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str198), VK_NUMPAD3},
-#line 11 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str199), VK_XBUTTON1},
-      {-1}, {-1}, {-1},
-#line 93 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str203), VK_F24},
-      {-1},
-#line 12 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str205), VK_XBUTTON2},
-#line 59 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str206), VK_NUMPAD5},
-      {-1}, {-1},
-#line 58 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str209), VK_NUMPAD4},
-      {-1}, {-1}, {-1}, {-1}, {-1},
-#line 121 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str215), VK_MEDIA_PLAY_PAUSE},
-      {-1},
-#line 123 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str217), VK_LAUNCH_MEDIA_SELECT},
-#line 80 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str218), VK_F11},
-      {-1},
-#line 139 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str220), VK_OEM_102},
-#line 118 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str221), VK_MEDIA_NEXT_TRACK},
-#line 61 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str222), VK_NUMPAD7},
-      {-1},
-#line 90 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str224), VK_F21},
-      {-1},
-#line 82 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str226), VK_F13},
-      {-1}, {-1},
-#line 81 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str229), VK_F12},
-      {-1}, {-1},
-#line 92 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str232), VK_F23},
-      {-1}, {-1},
-#line 91 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str235), VK_F22},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-#line 84 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str242), VK_F15},
-      {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1},
-      {-1}, {-1}, {-1}, {-1},
-#line 69 "win32_vk.list"
-      {offsetof(struct stringpool_t, stringpool_str256), VK_DIVIDE}
-    };
-
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register int o = wordlist[key].ofs;
-          if (o >= 0)
-            {
-              register const char *s = o + stringpool;
-
-              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strcmp (str, s))
-                return &wordlist[key];
-            }
-        }
-    }
-  return 0;
-}
diff --git a/ext/io/console/win32_vk.list b/ext/io/console/win32_vk.list
deleted file mode 100644
index 28bc9545ec..0000000000
--- a/ext/io/console/win32_vk.list
+++ /dev/null
@@ -1,166 +0,0 @@
-%{
-struct vktable {short ofs; unsigned short vk;};
-static const struct vktable *console_win32_vk(const char *, unsigned int);
-%}
-struct vktable
-%%
-LBUTTON, VK_LBUTTON
-RBUTTON, VK_RBUTTON
-CANCEL, VK_CANCEL
-MBUTTON, VK_MBUTTON
-XBUTTON1, VK_XBUTTON1
-XBUTTON2, VK_XBUTTON2
-BACK, VK_BACK
-TAB, VK_TAB
-CLEAR, VK_CLEAR
-RETURN, VK_RETURN
-SHIFT, VK_SHIFT
-CONTROL, VK_CONTROL
-MENU, VK_MENU
-PAUSE, VK_PAUSE
-CAPITAL, VK_CAPITAL
-KANA, VK_KANA
-HANGEUL, VK_HANGEUL
-HANGUL, VK_HANGUL
-JUNJA, VK_JUNJA
-FINAL, VK_FINAL
-HANJA, VK_HANJA
-KANJI, VK_KANJI
-ESCAPE, VK_ESCAPE
-CONVERT, VK_CONVERT
-NONCONVERT, VK_NONCONVERT
-ACCEPT, VK_ACCEPT
-MODECHANGE, VK_MODECHANGE
-SPACE, VK_SPACE
-PRIOR, VK_PRIOR
-NEXT, VK_NEXT
-END, VK_END
-HOME, VK_HOME
-LEFT, VK_LEFT
-UP, VK_UP
-RIGHT, VK_RIGHT
-DOWN, VK_DOWN
-SELECT, VK_SELECT
-PRINT, VK_PRINT
-EXECUTE, VK_EXECUTE
-SNAPSHOT, VK_SNAPSHOT
-INSERT, VK_INSERT
-DELETE, VK_DELETE
-HELP, VK_HELP
-LWIN, VK_LWIN
-RWIN, VK_RWIN
-APPS, VK_APPS
-SLEEP, VK_SLEEP
-NUMPAD0, VK_NUMPAD0
-NUMPAD1, VK_NUMPAD1
-NUMPAD2, VK_NUMPAD2
-NUMPAD3, VK_NUMPAD3
-NUMPAD4, VK_NUMPAD4
-NUMPAD5, VK_NUMPAD5
-NUMPAD6, VK_NUMPAD6
-NUMPAD7, VK_NUMPAD7
-NUMPAD8, VK_NUMPAD8
-NUMPAD9, VK_NUMPAD9
-MULTIPLY, VK_MULTIPLY
-ADD, VK_ADD
-SEPARATOR, VK_SEPARATOR
-SUBTRACT, VK_SUBTRACT
-DECIMAL, VK_DECIMAL
-DIVIDE, VK_DIVIDE
-F1, VK_F1
-F2, VK_F2
-F3, VK_F3
-F4, VK_F4
-F5, VK_F5
-F6, VK_F6
-F7, VK_F7
-F8, VK_F8
-F9, VK_F9
-F10, VK_F10
-F11, VK_F11
-F12, VK_F12
-F13, VK_F13
-F14, VK_F14
-F15, VK_F15
-F16, VK_F16
-F17, VK_F17
-F18, VK_F18
-F19, VK_F19
-F20, VK_F20
-F21, VK_F21
-F22, VK_F22
-F23, VK_F23
-F24, VK_F24
-NUMLOCK, VK_NUMLOCK
-SCROLL, VK_SCROLL
-OEM_NEC_EQUAL, VK_OEM_NEC_EQUAL
-OEM_FJ_JISHO, VK_OEM_FJ_JISHO
-OEM_FJ_MASSHOU, VK_OEM_FJ_MASSHOU
-OEM_FJ_TOUROKU, VK_OEM_FJ_TOUROKU
-OEM_FJ_LOYA, VK_OEM_FJ_LOYA
-OEM_FJ_ROYA, VK_OEM_FJ_ROYA
-LSHIFT, VK_LSHIFT
-RSHIFT, VK_RSHIFT
-LCONTROL, VK_LCONTROL
-RCONTROL, VK_RCONTROL
-LMENU, VK_LMENU
-RMENU, VK_RMENU
-BROWSER_BACK, VK_BROWSER_BACK
-BROWSER_FORWARD, VK_BROWSER_FORWARD
-BROWSER_REFRESH, VK_BROWSER_REFRESH
-BROWSER_STOP, VK_BROWSER_STOP
-BROWSER_SEARCH, VK_BROWSER_SEARCH
-BROWSER_FAVORITES, VK_BROWSER_FAVORITES
-BROWSER_HOME, VK_BROWSER_HOME
-VOLUME_MUTE, VK_VOLUME_MUTE
-VOLUME_DOWN, VK_VOLUME_DOWN
-VOLUME_UP, VK_VOLUME_UP
-MEDIA_NEXT_TRACK, VK_MEDIA_NEXT_TRACK
-MEDIA_PREV_TRACK, VK_MEDIA_PREV_TRACK
-MEDIA_STOP, VK_MEDIA_STOP
-MEDIA_PLAY_PAUSE, VK_MEDIA_PLAY_PAUSE
-LAUNCH_MAIL, VK_LAUNCH_MAIL
-LAUNCH_MEDIA_SELECT, VK_LAUNCH_MEDIA_SELECT
-LAUNCH_APP1, VK_LAUNCH_APP1
-LAUNCH_APP2, VK_LAUNCH_APP2
-OEM_1, VK_OEM_1
-OEM_PLUS, VK_OEM_PLUS
-OEM_COMMA, VK_OEM_COMMA
-OEM_MINUS, VK_OEM_MINUS
-OEM_PERIOD, VK_OEM_PERIOD
-OEM_2, VK_OEM_2
-OEM_3, VK_OEM_3
-OEM_4, VK_OEM_4
-OEM_5, VK_OEM_5
-OEM_6, VK_OEM_6
-OEM_7, VK_OEM_7
-OEM_8, VK_OEM_8
-OEM_AX, VK_OEM_AX
-OEM_102, VK_OEM_102
-ICO_HELP, VK_ICO_HELP
-ICO_00, VK_ICO_00
-PROCESSKEY, VK_PROCESSKEY
-ICO_CLEAR, VK_ICO_CLEAR
-PACKET, VK_PACKET
-OEM_RESET, VK_OEM_RESET
-OEM_JUMP, VK_OEM_JUMP
-OEM_PA1, VK_OEM_PA1
-OEM_PA2, VK_OEM_PA2
-OEM_PA3, VK_OEM_PA3
-OEM_WSCTRL, VK_OEM_WSCTRL
-OEM_CUSEL, VK_OEM_CUSEL
-OEM_ATTN, VK_OEM_ATTN
-OEM_FINISH, VK_OEM_FINISH
-OEM_COPY, VK_OEM_COPY
-OEM_AUTO, VK_OEM_AUTO
-OEM_ENLW, VK_OEM_ENLW
-OEM_BACKTAB, VK_OEM_BACKTAB
-ATTN, VK_ATTN
-CRSEL, VK_CRSEL
-EXSEL, VK_EXSEL
-EREOF, VK_EREOF
-PLAY, VK_PLAY
-ZOOM, VK_ZOOM
-NONAME, VK_NONAME
-PA1, VK_PA1
-OEM_CLEAR, VK_OEM_CLEAR
diff --git a/ext/io/nonblock/depend b/ext/io/nonblock/depend
index 13f445abf5..e786dc71d2 100644
--- a/ext/io/nonblock/depend
+++ b/ext/io/nonblock/depend
@@ -1,16 +1,4 @@
-# AUTOGENERATED DEPENDENCIES START
-nonblock.o: $(RUBY_EXTCONF_H)
-nonblock.o: $(arch_hdrdir)/ruby/config.h
-nonblock.o: $(hdrdir)/ruby/backward.h
-nonblock.o: $(hdrdir)/ruby/defines.h
-nonblock.o: $(hdrdir)/ruby/encoding.h
-nonblock.o: $(hdrdir)/ruby/intern.h
-nonblock.o: $(hdrdir)/ruby/io.h
-nonblock.o: $(hdrdir)/ruby/missing.h
-nonblock.o: $(hdrdir)/ruby/oniguruma.h
-nonblock.o: $(hdrdir)/ruby/ruby.h
-nonblock.o: $(hdrdir)/ruby/st.h
-nonblock.o: $(hdrdir)/ruby/subst.h
-nonblock.o: $(top_srcdir)/include/ruby.h
-nonblock.o: nonblock.c
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/io/nonblock/extconf.rb b/ext/io/nonblock/extconf.rb
index d813a01e7c..aecdc16cea 100644
--- a/ext/io/nonblock/extconf.rb
+++ b/ext/io/nonblock/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 target = "io/nonblock"
 
diff --git a/ext/io/nonblock/nonblock.c b/ext/io/nonblock/nonblock.c
index 2509329f6c..ccd8728a31 100644
--- a/ext/io/nonblock/nonblock.c
+++ b/ext/io/nonblock/nonblock.c
@@ -50,22 +50,21 @@ rb_io_nonblock_p(VALUE io)
 #endif
 
 #ifdef F_SETFL
-static int
+static void
 io_nonblock_set(int fd, int f, int nb)
 {
     if (nb) {
 	if ((f & O_NONBLOCK) != 0)
-	    return 0;
+	    return;
 	f |= O_NONBLOCK;
     }
     else {
 	if ((f & O_NONBLOCK) == 0)
-	    return 0;
+	    return;
 	f &= ~O_NONBLOCK;
     }
     if (fcntl(fd, F_SETFL, f) == -1)
 	rb_sys_fail(0);
-    return 1;
 }
 
 /*
@@ -80,10 +79,7 @@ rb_io_nonblock_set(VALUE io, VALUE nb)
 {
     rb_io_t *fptr;
     GetOpenFile(io, fptr);
-    if (RTEST(nb))
-	rb_io_set_nonblock(fptr);
-    else
-	io_nonblock_set(fptr->fd, io_nonblock_mode(fptr->fd), RTEST(nb));
+    io_nonblock_set(fptr->fd, io_nonblock_mode(fptr->fd), RTEST(nb));
     return io;
 }
 
@@ -122,8 +118,7 @@ rb_io_nonblock_block(int argc, VALUE *argv, VALUE io)
     f = io_nonblock_mode(fptr->fd);
     restore[0] = fptr->fd;
     restore[1] = f;
-    if (!io_nonblock_set(fptr->fd, f, nb))
-	return rb_yield(io);
+    io_nonblock_set(fptr->fd, f, nb);
     return rb_ensure(rb_yield, io, io_nonblock_restore, (VALUE)restore);
 }
 #else
diff --git a/ext/io/wait/depend b/ext/io/wait/depend
index 8440965df0..e786dc71d2 100644
--- a/ext/io/wait/depend
+++ b/ext/io/wait/depend
@@ -1,16 +1,4 @@
-# AUTOGENERATED DEPENDENCIES START
-wait.o: $(RUBY_EXTCONF_H)
-wait.o: $(arch_hdrdir)/ruby/config.h
-wait.o: $(hdrdir)/ruby/backward.h
-wait.o: $(hdrdir)/ruby/defines.h
-wait.o: $(hdrdir)/ruby/encoding.h
-wait.o: $(hdrdir)/ruby/intern.h
-wait.o: $(hdrdir)/ruby/io.h
-wait.o: $(hdrdir)/ruby/missing.h
-wait.o: $(hdrdir)/ruby/oniguruma.h
-wait.o: $(hdrdir)/ruby/ruby.h
-wait.o: $(hdrdir)/ruby/st.h
-wait.o: $(hdrdir)/ruby/subst.h
-wait.o: $(top_srcdir)/include/ruby.h
-wait.o: wait.c
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/io/wait/extconf.rb b/ext/io/wait/extconf.rb
index b5d36c3fe3..eed3543124 100644
--- a/ext/io/wait/extconf.rb
+++ b/ext/io/wait/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 target = "io/wait"
 
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index f7a7508eeb..d8bb55fc47 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -44,30 +44,6 @@ static VALUE io_wait_readable _((int argc, VALUE *argv, VALUE io));
 static VALUE io_wait_writable _((int argc, VALUE *argv, VALUE io));
 void Init_wait _((void));
 
-static struct timeval *
-get_timeout(int argc, VALUE *argv, struct timeval *timerec)
-{
-    VALUE timeout = Qnil;
-    rb_check_arity(argc, 0, 1);
-    if (!argc || NIL_P(timeout = argv[0])) {
-	return NULL;
-    }
-    else {
-	*timerec = rb_time_interval(timeout);
-	return timerec;
-    }
-}
-
-static int
-wait_for_single_fd(rb_io_t *fptr, int events, struct timeval *tv)
-{
-    int i = rb_wait_for_single_fd(fptr->fd, events, tv);
-    if (i < 0)
-	rb_sys_fail(0);
-    rb_io_check_closed(fptr);
-    return (i & events);
-}
-
 /*
  * call-seq:
  *   io.nread -> int
@@ -86,7 +62,7 @@ io_nread(VALUE io)
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     len = rb_io_read_pending(fptr);
-    if (len > 0) return INT2FIX(len);
+    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);
@@ -105,40 +81,57 @@ static VALUE
 io_ready_p(VALUE io)
 {
     rb_io_t *fptr;
-    struct timeval tv = {0, 0};
+    ioctl_arg n;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
     if (rb_io_read_pending(fptr)) return Qtrue;
-    if (wait_for_single_fd(fptr, RB_WAITFD_IN, &tv))
-	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;
 }
 
 /*
  * call-seq:
- *   io.wait_readable          -> IO, true or nil
- *   io.wait_readable(timeout) -> IO, true or nil
+ *   io.wait          -> IO, true, false or nil
+ *   io.wait(timeout) -> IO, true, false or nil
+ *   io.wait_readable          -> IO, true, false or nil
+ *   io.wait_readable(timeout) -> IO, true, false or nil
  *
- * Waits until IO is readable without blocking and returns +self+, or
- * +nil+ when times out.
- * Returns +true+ immediately when buffered data is available.
+ * Waits until input is available or times out and returns self or nil when
+ * EOF is reached.
  */
 
 static VALUE
 io_wait_readable(int argc, VALUE *argv, VALUE io)
 {
     rb_io_t *fptr;
+    int i;
+    ioctl_arg n;
+    VALUE timeout;
     struct timeval timerec;
     struct timeval *tv;
 
     GetOpenFile(io, fptr);
     rb_io_check_readable(fptr);
-    tv = get_timeout(argc, argv, &timerec);
-    if (rb_io_read_pending(fptr)) return Qtrue;
-    if (wait_for_single_fd(fptr, RB_WAITFD_IN, tv)) {
-	return io;
+    rb_scan_args(argc, argv, "01", &timeout);
+    if (NIL_P(timeout)) {
+	tv = NULL;
     }
+    else {
+	timerec = rb_time_interval(timeout);
+	tv = &timerec;
+    }
+
+    if (rb_io_read_pending(fptr)) return Qtrue;
+    if (!FIONREAD_POSSIBLE_P(fptr->fd)) return Qfalse;
+    i = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_IN, tv);
+    if (i < 0)
+	rb_sys_fail(0);
+    rb_io_check_closed(fptr);
+    if (ioctl(fptr->fd, FIONREAD, &n)) rb_sys_fail(0);
+    if (n > 0) return io;
     return Qnil;
 }
 
@@ -147,94 +140,34 @@ io_wait_readable(int argc, VALUE *argv, VALUE io)
  *   io.wait_writable          -> IO
  *   io.wait_writable(timeout) -> IO or nil
  *
- * Waits until IO is writable without blocking and returns +self+ or
- * +nil+ when times out.
+ * Waits until IO writable is available or times out and returns self or
+ * nil when EOF is reached.
  */
 static VALUE
 io_wait_writable(int argc, VALUE *argv, VALUE io)
 {
     rb_io_t *fptr;
+    int i;
+    VALUE timeout;
     struct timeval timerec;
     struct timeval *tv;
 
     GetOpenFile(io, fptr);
     rb_io_check_writable(fptr);
-    tv = get_timeout(argc, argv, &timerec);
-    if (wait_for_single_fd(fptr, RB_WAITFD_OUT, tv)) {
-	return io;
+    rb_scan_args(argc, argv, "01", &timeout);
+    if (NIL_P(timeout)) {
+	tv = NULL;
     }
-    return Qnil;
-}
-
-static int
-wait_mode_sym(VALUE mode)
-{
-    if (mode == ID2SYM(rb_intern("r"))) {
-	return RB_WAITFD_IN;
-    }
-    if (mode == ID2SYM(rb_intern("read"))) {
-	return RB_WAITFD_IN;
-    }
-    if (mode == ID2SYM(rb_intern("readable"))) {
-	return RB_WAITFD_IN;
-    }
-    if (mode == ID2SYM(rb_intern("w"))) {
-	return RB_WAITFD_OUT;
-    }
-    if (mode == ID2SYM(rb_intern("write"))) {
-	return RB_WAITFD_OUT;
-    }
-    if (mode == ID2SYM(rb_intern("writable"))) {
-	return RB_WAITFD_OUT;
-    }
-    if (mode == ID2SYM(rb_intern("rw"))) {
-	return RB_WAITFD_IN|RB_WAITFD_OUT;
-    }
-    if (mode == ID2SYM(rb_intern("read_write"))) {
-	return RB_WAITFD_IN|RB_WAITFD_OUT;
-    }
-    if (mode == ID2SYM(rb_intern("readable_writable"))) {
-	return RB_WAITFD_IN|RB_WAITFD_OUT;
+    else {
+	timerec = rb_time_interval(timeout);
+	tv = &timerec;
     }
-    rb_raise(rb_eArgError, "unsupported mode: %"PRIsVALUE, mode);
-    return 0;
-}
 
-/*
- * call-seq:
- *   io.wait(timeout = nil, mode = :read) -> IO, true or nil
- *
- * Waits until IO is readable or writable without blocking and returns
- * +self+, or +nil+ when times out.
- * Returns +true+ immediately when buffered data is available.
- * Optional parameter +mode+ is one of +:read+, +:write+, or
- * +:read_write+.
- */
-
-static VALUE
-io_wait_readwrite(int argc, VALUE *argv, VALUE io)
-{
-    rb_io_t *fptr;
-    struct timeval timerec;
-    struct timeval *tv = NULL;
-    int event = 0;
-    int i;
-
-    GetOpenFile(io, fptr);
-    for (i = 0; i < argc; ++i) {
-	if (SYMBOL_P(argv[i])) {
-	    event |= wait_mode_sym(argv[i]);
-	}
-	else {
-	    *(tv = &timerec) = rb_time_interval(argv[i]);
-	}
-    }
-    /* rb_time_interval() and might_mode() might convert the argument */
+    i = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_OUT, tv);
+    if (i < 0)
+	rb_sys_fail(0);
     rb_io_check_closed(fptr);
-    if (!event) event = RB_WAITFD_IN;
-    if ((event & RB_WAITFD_IN) && rb_io_read_pending(fptr))
-	return Qtrue;
-    if (wait_for_single_fd(fptr, event, tv))
+    if (i & RB_WAITFD_OUT)
 	return io;
     return Qnil;
 }
@@ -244,11 +177,11 @@ io_wait_readwrite(int argc, VALUE *argv, VALUE io)
  */
 
 void
-Init_wait(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_readwrite, -1);
+    rb_define_method(rb_cIO, "wait", io_wait_readable, -1);
     rb_define_method(rb_cIO, "wait_readable", io_wait_readable, -1);
     rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1);
 }
diff --git a/ext/json/extconf.rb b/ext/json/extconf.rb
index 7595d58a98..850798c643 100644
--- a/ext/json/extconf.rb
+++ b/ext/json/extconf.rb
@@ -1,2 +1,3 @@
 require 'mkmf'
 create_makefile('json')
+
diff --git a/ext/json/fbuffer/fbuffer.h b/ext/json/fbuffer/fbuffer.h
index 5a0a27cda5..1e860eb790 100644
--- a/ext/json/fbuffer/fbuffer.h
+++ b/ext/json/fbuffer/fbuffer.h
@@ -181,7 +181,7 @@ static FBuffer *fbuffer_dup(FBuffer *fb)
 
 static VALUE fbuffer_to_s(FBuffer *fb)
 {
-    VALUE result = rb_str_new(FBUFFER_PTR(fb), FBUFFER_LEN(fb));
+    VALUE result = rb_str_new(FBUFFER_PAIR(fb));
     fbuffer_free(fb);
     FORCE_UTF8(result);
     return result;
diff --git a/ext/json/generator/depend b/ext/json/generator/depend
index 556259c1c8..593a8fbb54 100644
--- a/ext/json/generator/depend
+++ b/ext/json/generator/depend
@@ -1,22 +1,2 @@
 $(OBJS): $(ruby_headers)
 generator.o: generator.c generator.h $(srcdir)/../fbuffer/fbuffer.h
-
-# AUTOGENERATED DEPENDENCIES START
-generator.o: $(RUBY_EXTCONF_H)
-generator.o: $(arch_hdrdir)/ruby/config.h
-generator.o: $(hdrdir)/ruby/backward.h
-generator.o: $(hdrdir)/ruby/defines.h
-generator.o: $(hdrdir)/ruby/encoding.h
-generator.o: $(hdrdir)/ruby/intern.h
-generator.o: $(hdrdir)/ruby/missing.h
-generator.o: $(hdrdir)/ruby/oniguruma.h
-generator.o: $(hdrdir)/ruby/re.h
-generator.o: $(hdrdir)/ruby/regex.h
-generator.o: $(hdrdir)/ruby/ruby.h
-generator.o: $(hdrdir)/ruby/st.h
-generator.o: $(hdrdir)/ruby/subst.h
-generator.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h
-generator.o: $(top_srcdir)/include/ruby.h
-generator.o: generator.c
-generator.o: generator.h
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index ef85bb7337..1b9652df24 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -7,20 +7,14 @@ static ID i_encoding, i_encode;
 #endif
 
 static VALUE mJSON, mExt, mGenerator, cState, mGeneratorMethods, mObject,
-             mHash, mArray,
-#ifdef RUBY_INTEGER_UNIFICATION
-             mInteger,
-#else
-             mFixnum, mBignum,
-#endif
-             mFloat, mString, mString_Extend,
+             mHash, mArray, mFixnum, mBignum, mFloat, mString, mString_Extend,
              mTrueClass, mFalseClass, mNilClass, eGeneratorError,
              eNestingError, CRegexp_MULTILINE, CJSON_SAFE_STATE_PROTOTYPE,
              i_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_quirks_mode, i_pack, i_unpack, i_create_id, i_extend, i_key_p,
           i_aref, i_send, i_respond_to_p, i_match, i_keys, i_depth,
           i_buffer_initial_length, i_dup;
 
@@ -222,7 +216,6 @@ static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
             unicode_escape_to_buffer(buffer, buf, (UTF16)((ch & halfMask) + UNI_SUR_LOW_START));
         }
     }
-    RB_GC_GUARD(string);
 }
 
 /* Converts string to a JSON string in FBuffer buffer, where only the
@@ -349,18 +342,6 @@ static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
     GENERATE_JSON(array);
 }
 
-#ifdef RUBY_INTEGER_UNIFICATION
-/*
- * call-seq: to_json(*)
- *
- * Returns a JSON string representation for this Integer number.
- */
-static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self)
-{
-    GENERATE_JSON(integer);
-}
-
-#else
 /*
  * call-seq: to_json(*)
  *
@@ -380,7 +361,6 @@ static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self)
 {
     GENERATE_JSON(bignum);
 }
-#endif
 
 /*
  * call-seq: to_json(*)
@@ -506,9 +486,8 @@ static VALUE mObject_to_json(int argc, VALUE *argv, VALUE self)
     return cState_partial_generate(state, string);
 }
 
-static void State_free(void *ptr)
+static void State_free(JSON_Generator_State *state)
 {
-    JSON_Generator_State *state = ptr;
     if (state->indent) ruby_xfree(state->indent);
     if (state->space) ruby_xfree(state->space);
     if (state->space_before) ruby_xfree(state->space_before);
@@ -520,37 +499,17 @@ static void State_free(void *ptr)
     ruby_xfree(state);
 }
 
-static size_t State_memsize(const void *ptr)
-{
-    const JSON_Generator_State *state = ptr;
-    size_t size = sizeof(*state);
-    if (state->indent) size += state->indent_len + 1;
-    if (state->space) size += state->space_len + 1;
-    if (state->space_before) size += state->space_before_len + 1;
-    if (state->object_nl) size += state->object_nl_len + 1;
-    if (state->array_nl) size += state->array_nl_len + 1;
-    if (state->array_delim) size += FBUFFER_CAPA(state->array_delim);
-    if (state->object_delim) size += FBUFFER_CAPA(state->object_delim);
-    if (state->object_delim2) size += FBUFFER_CAPA(state->object_delim2);
-    return size;
-}
-
-#ifdef NEW_TYPEDDATA_WRAPPER
-static const rb_data_type_t JSON_Generator_State_type = {
-    "JSON/Generator/State",
-    {NULL, State_free, State_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-#endif
+static JSON_Generator_State *State_allocate()
+{
+    JSON_Generator_State *state = ALLOC(JSON_Generator_State);
+    MEMZERO(state, JSON_Generator_State, 1);
+    return state;
+}
 
 static VALUE cState_s_allocate(VALUE klass)
 {
-    JSON_Generator_State *state;
-    return TypedData_Make_Struct(klass, JSON_Generator_State,
-				 &JSON_Generator_State_type, state);
+    JSON_Generator_State *state = State_allocate();
+    return Data_Wrap_Struct(klass, NULL, State_free, state);
 }
 
 /*
@@ -642,6 +601,8 @@ static VALUE cState_configure(VALUE self, VALUE opts)
     state->allow_nan = RTEST(tmp);
     tmp = rb_hash_aref(opts, ID2SYM(i_ascii_only));
     state->ascii_only = RTEST(tmp);
+    tmp = rb_hash_aref(opts, ID2SYM(i_quirks_mode));
+    state->quirks_mode = RTEST(tmp);
     return self;
 }
 
@@ -675,6 +636,7 @@ static VALUE cState_to_h(VALUE self)
     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_quirks_mode), state->quirks_mode ? Qtrue : Qfalse);
     rb_hash_aset(result, ID2SYM(i_max_nesting), LONG2FIX(state->max_nesting));
     rb_hash_aset(result, ID2SYM(i_depth), LONG2FIX(state->depth));
     rb_hash_aset(result, ID2SYM(i_buffer_initial_length), LONG2FIX(state->buffer_initial_length));
@@ -684,7 +646,7 @@ static VALUE cState_to_h(VALUE self)
 /*
 * call-seq: [](name)
 *
-* Returns the value returned by method +name+.
+* Return the value returned by method +name+.
 */
 static VALUE cState_aref(VALUE self, VALUE name)
 {
@@ -699,7 +661,7 @@ static VALUE cState_aref(VALUE self, VALUE name)
 /*
 * call-seq: []=(name, value)
 *
-* Sets the attribute name to value.
+* Set the attribute name to value.
 */
 static VALUE cState_aset(VALUE self, VALUE name, VALUE value)
 {
@@ -842,15 +804,6 @@ static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
     fbuffer_append_str(buffer, tmp);
 }
 
-#ifdef RUBY_INTEGER_UNIFICATION
-static void generate_json_integer(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
-{
-    if (FIXNUM_P(obj))
-        generate_json_fixnum(buffer, Vstate, state, obj);
-    else
-        generate_json_bignum(buffer, Vstate, state, obj);
-}
-#endif
 static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj)
 {
     double value = RFLOAT_VALUE(obj);
@@ -884,9 +837,9 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
         generate_json_false(buffer, Vstate, state, obj);
     } else if (obj == Qtrue) {
         generate_json_true(buffer, Vstate, state, obj);
-    } else if (FIXNUM_P(obj)) {
+    } else if (klass == rb_cFixnum) {
         generate_json_fixnum(buffer, Vstate, state, obj);
-    } else if (RB_TYPE_P(obj, T_BIGNUM)) {
+    } else if (klass == rb_cBignum) {
         generate_json_bignum(buffer, Vstate, state, obj);
     } else if (klass == rb_cFloat) {
         generate_json_float(buffer, Vstate, state, obj);
@@ -897,7 +850,7 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
     } else {
         tmp = rb_funcall(obj, i_to_s, 0);
         Check_Type(tmp, T_STRING);
-        generate_json_string(buffer, Vstate, state, tmp);
+        generate_json(buffer, Vstate, state, tmp);
     }
 }
 
@@ -918,7 +871,6 @@ static FBuffer *cState_prepare_buffer(VALUE self)
     } else {
         state->object_delim2 = fbuffer_alloc(16);
     }
-    if (state->space_before) fbuffer_append(state->object_delim2, state->space_before, state->space_before_len);
     fbuffer_append_char(state->object_delim2, ':');
     if (state->space) fbuffer_append(state->object_delim2, state->space, state->space_len);
 
@@ -941,6 +893,21 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
 }
 
 /*
+ * This function returns true if string is either a JSON array or JSON object.
+ * It might suffer from false positives, e. g. syntactically incorrect JSON in
+ * the string or certain UTF-8 characters on the right hand side.
+ */
+static int isArrayOrObject(VALUE string)
+{
+    long string_len = RSTRING_LEN(string);
+    char *p = RSTRING_PTR(string), *q = p + string_len - 1;
+    if (string_len < 2) return 0;
+    for (; p < q && isspace((unsigned char)*p); p++);
+    for (; q > p && isspace((unsigned char)*q); q--);
+    return (*p == '[' && *q == ']') || (*p == '{' && *q == '}');
+}
+
+/*
  * call-seq: generate(obj)
  *
  * Generates a valid JSON document from object +obj+ and returns the
@@ -951,7 +918,9 @@ static VALUE cState_generate(VALUE self, VALUE obj)
 {
     VALUE result = cState_partial_generate(self, obj);
     GET_STATE(self);
-    (void)state;
+    if (!state->quirks_mode && !isArrayOrObject(result)) {
+        rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
+    }
     return result;
 }
 
@@ -970,6 +939,8 @@ static VALUE cState_generate(VALUE self, VALUE obj)
  * * *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.
+ * * *quirks_mode*: Enables quirks_mode for parser, that is for example
+ *   generating single JSON values instead of documents is possible.
  * * *buffer_initial_length*: sets the initial length of the generator's
  *   internal buffer.
  */
@@ -987,7 +958,7 @@ static VALUE cState_initialize(int argc, VALUE *argv, VALUE self)
 /*
  * call-seq: initialize_copy(orig)
  *
- * Initializes this object from orig if it can be duplicated/cloned and returns
+ * Initializes this object from orig if it to be duplicated/cloned and returns
  * it.
 */
 static VALUE cState_init_copy(VALUE obj, VALUE orig)
@@ -995,8 +966,8 @@ static VALUE cState_init_copy(VALUE obj, VALUE orig)
     JSON_Generator_State *objState, *origState;
 
     if (obj == orig) return obj;
-    GET_STATE_TO(obj, objState);
-    GET_STATE_TO(orig, 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);
@@ -1035,7 +1006,7 @@ static VALUE cState_from_state_s(VALUE self, VALUE opts)
 /*
  * call-seq: indent()
  *
- * Returns the string that is used to indent levels in the JSON text.
+ * This string is used to indent levels in the JSON text.
  */
 static VALUE cState_indent(VALUE self)
 {
@@ -1046,7 +1017,7 @@ static VALUE cState_indent(VALUE self)
 /*
  * call-seq: indent=(indent)
  *
- * Sets the string that is used to indent levels in the JSON text.
+ * This string is used to indent levels in the JSON text.
  */
 static VALUE cState_indent_set(VALUE self, VALUE indent)
 {
@@ -1071,7 +1042,7 @@ static VALUE cState_indent_set(VALUE self, VALUE indent)
 /*
  * call-seq: space()
  *
- * Returns the string that is used to insert a space between the tokens in a JSON
+ * This string is used to insert a space between the tokens in a JSON
  * string.
  */
 static VALUE cState_space(VALUE self)
@@ -1083,7 +1054,7 @@ static VALUE cState_space(VALUE self)
 /*
  * call-seq: space=(space)
  *
- * Sets _space_ to the string that is used to insert a space between the tokens in a JSON
+ * This string is used to insert a space between the tokens in a JSON
  * string.
  */
 static VALUE cState_space_set(VALUE self, VALUE space)
@@ -1109,7 +1080,7 @@ static VALUE cState_space_set(VALUE self, VALUE space)
 /*
  * call-seq: space_before()
  *
- * Returns the string that is used to insert a space before the ':' in JSON objects.
+ * This string is used to insert a space before the ':' in JSON objects.
  */
 static VALUE cState_space_before(VALUE self)
 {
@@ -1120,7 +1091,7 @@ static VALUE cState_space_before(VALUE self)
 /*
  * call-seq: space_before=(space_before)
  *
- * Sets the string that is used to insert a space before the ':' in JSON objects.
+ * This string is used to insert a space before the ':' in JSON objects.
  */
 static VALUE cState_space_before_set(VALUE self, VALUE space_before)
 {
@@ -1277,6 +1248,29 @@ static VALUE cState_ascii_only_p(VALUE self)
 }
 
 /*
+ * call-seq: quirks_mode?
+ *
+ * Returns true, if quirks mode is enabled. Otherwise returns false.
+ */
+static VALUE cState_quirks_mode_p(VALUE self)
+{
+    GET_STATE(self);
+    return state->quirks_mode ? Qtrue : Qfalse;
+}
+
+/*
+ * call-seq: quirks_mode=(enable)
+ *
+ * If set to true, enables the quirks_mode mode.
+ */
+static VALUE cState_quirks_mode_set(VALUE self, VALUE enable)
+{
+    GET_STATE(self);
+    state->quirks_mode = RTEST(enable);
+    return Qnil;
+}
+
+/*
  * call-seq: depth
  *
  * This integer returns the current depth of data structure nesting.
@@ -1304,7 +1298,7 @@ static VALUE cState_depth_set(VALUE self, VALUE depth)
 /*
  * call-seq: buffer_initial_length
  *
- * This integer returns the current initial length of the buffer.
+ * This integer returns the current inital length of the buffer.
  */
 static VALUE cState_buffer_initial_length(VALUE self)
 {
@@ -1333,7 +1327,7 @@ static VALUE cState_buffer_initial_length_set(VALUE self, VALUE buffer_initial_l
 /*
  *
  */
-void Init_generator(void)
+void Init_generator()
 {
     rb_require("json/common");
 
@@ -1364,6 +1358,9 @@ void Init_generator(void)
     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, "quirks_mode?", cState_quirks_mode_p, 0);
+    rb_define_method(cState, "quirks_mode", cState_quirks_mode_p, 0);
+    rb_define_method(cState, "quirks_mode=", cState_quirks_mode_set, 1);
     rb_define_method(cState, "depth", cState_depth, 0);
     rb_define_method(cState, "depth=", cState_depth_set, 1);
     rb_define_method(cState, "buffer_initial_length", cState_buffer_initial_length, 0);
@@ -1383,15 +1380,10 @@ void Init_generator(void)
     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);
-#ifdef RUBY_INTEGER_UNIFICATION
-    mInteger = rb_define_module_under(mGeneratorMethods, "Integer");
-    rb_define_method(mInteger, "to_json", mInteger_to_json, -1);
-#else
     mFixnum = rb_define_module_under(mGeneratorMethods, "Fixnum");
     rb_define_method(mFixnum, "to_json", mFixnum_to_json, -1);
     mBignum = rb_define_module_under(mGeneratorMethods, "Bignum");
     rb_define_method(mBignum, "to_json", mBignum_to_json, -1);
-#endif
     mFloat = rb_define_module_under(mGeneratorMethods, "Float");
     rb_define_method(mFloat, "to_json", mFloat_to_json, -1);
     mString = rb_define_module_under(mGeneratorMethods, "String");
@@ -1420,6 +1412,7 @@ void Init_generator(void)
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_ascii_only = rb_intern("ascii_only");
+    i_quirks_mode = rb_intern("quirks_mode");
     i_depth = rb_intern("depth");
     i_buffer_initial_length = rb_intern("buffer_initial_length");
     i_pack = rb_intern("pack");
diff --git a/ext/json/generator/generator.h b/ext/json/generator/generator.h
index 900b4d58f3..b58cc4bc2f 100644
--- a/ext/json/generator/generator.h
+++ b/ext/json/generator/generator.h
@@ -23,7 +23,7 @@
 
 #define option_given_p(opts, key) RTEST(rb_funcall(opts, i_key_p, 1, key))
 
-/* unicode definitions */
+/* unicode defintions */
 
 #define UNI_STRICT_CONVERSION 1
 
@@ -73,16 +73,14 @@ typedef struct JSON_Generator_StateStruct {
     long max_nesting;
     char allow_nan;
     char ascii_only;
+    char quirks_mode;
     long depth;
     long buffer_initial_length;
 } JSON_Generator_State;
 
-#define GET_STATE_TO(self, state) \
-    TypedData_Get_Struct(self, JSON_Generator_State, &JSON_Generator_State_type, state)
-
 #define GET_STATE(self)                       \
     JSON_Generator_State *state;              \
-    GET_STATE_TO(self, state)
+    Data_Get_Struct(self, JSON_Generator_State, state)
 
 #define GENERATE_JSON(type)                                                                     \
     FBuffer *buffer;                                                                            \
@@ -91,19 +89,15 @@ typedef struct JSON_Generator_StateStruct {
                                                                                                 \
     rb_scan_args(argc, argv, "01", &Vstate);                                                    \
     Vstate = cState_from_state_s(cState, Vstate);                                               \
-    TypedData_Get_Struct(Vstate, JSON_Generator_State, &JSON_Generator_State_type, state);	\
+    Data_Get_Struct(Vstate, JSON_Generator_State, state);                                       \
     buffer = cState_prepare_buffer(Vstate);                                                     \
     generate_json_##type(buffer, Vstate, state, self);                                          \
     return fbuffer_to_s(buffer)
 
 static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self);
 static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self);
-#ifdef RUBY_INTEGER_UNIFICATION
-static VALUE mInteger_to_json(int argc, VALUE *argv, VALUE self);
-#else
 static VALUE mFixnum_to_json(int argc, VALUE *argv, VALUE self);
 static VALUE mBignum_to_json(int argc, VALUE *argv, VALUE self);
-#endif
 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);
@@ -114,7 +108,8 @@ 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(void *state);
+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);
@@ -125,9 +120,6 @@ static void generate_json_string(FBuffer *buffer, VALUE Vstate, JSON_Generator_S
 static void generate_json_null(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static void generate_json_false(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static void generate_json_true(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-#ifdef RUBY_INTEGER_UNIFICATION
-static void generate_json_integer(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
-#endif
 static void generate_json_fixnum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static void generate_json_bignum(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
 static void generate_json_float(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *state, VALUE obj);
@@ -152,21 +144,5 @@ static VALUE cState_ascii_only_p(VALUE self);
 static VALUE cState_depth(VALUE self);
 static VALUE cState_depth_set(VALUE self, VALUE depth);
 static FBuffer *cState_prepare_buffer(VALUE self);
-#ifndef ZALLOC
-#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
-static inline void *ruby_zalloc(size_t n)
-{
-    void *p = ruby_xmalloc(n);
-    memset(p, 0, n);
-    return p;
-}
-#endif
-#ifdef TypedData_Make_Struct
-static const rb_data_type_t JSON_Generator_State_type;
-#define NEW_TYPEDDATA_WRAPPER 1
-#else
-#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, State_free, json)
-#define TypedData_Get_Struct(self, JSON_Generator_State, ignore, json) Data_Get_Struct(self, JSON_Generator_State, json)
-#endif
 
 #endif
diff --git a/ext/json/json.gemspec b/ext/json/json.gemspec
deleted file mode 100644
index 2c304ef918..0000000000
--- a/ext/json/json.gemspec
+++ /dev/null
diff --git a/ext/json/lib/json.rb b/ext/json/lib/json.rb
index b5a6912415..24aa385c91 100644
--- a/ext/json/lib/json.rb
+++ b/ext/json/lib/json.rb
@@ -1,4 +1,3 @@
-#frozen_string_literal: false
 require 'json/common'
 
 ##
diff --git a/ext/json/lib/json/add/bigdecimal.rb b/ext/json/lib/json/add/bigdecimal.rb
index 539daeeaf5..0ef69f12e0 100644
--- a/ext/json/lib/json/add/bigdecimal.rb
+++ b/ext/json/lib/json/add/bigdecimal.rb
@@ -1,4 +1,3 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
diff --git a/ext/json/lib/json/add/complex.rb b/ext/json/lib/json/add/complex.rb
index 28ef734daf..d7ebebf5f7 100644
--- a/ext/json/lib/json/add/complex.rb
+++ b/ext/json/lib/json/add/complex.rb
@@ -1,19 +1,13 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 defined?(::Complex) or require 'complex'
 
 class Complex
-
-  # Deserializes JSON string by converting Real value <tt>r</tt>, imaginary
-  # value <tt>i</tt>, to a Complex object.
   def self.json_create(object)
     Complex(object['r'], object['i'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -22,7 +16,6 @@ class Complex
     }
   end
 
-  # Stores class name (Complex) along with real value <tt>r</tt> and imaginary value <tt>i</tt> as JSON string
   def to_json(*)
     as_json.to_json
   end
diff --git a/ext/json/lib/json/add/core.rb b/ext/json/lib/json/add/core.rb
index bfb017c460..77d9dc0b20 100644
--- a/ext/json/lib/json/add/core.rb
+++ b/ext/json/lib/json/add/core.rb
@@ -1,4 +1,3 @@
-#frozen_string_literal: false
 # This file requires the implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
diff --git a/ext/json/lib/json/add/date.rb b/ext/json/lib/json/add/date.rb
index 25523561a5..4288237db1 100644
--- a/ext/json/lib/json/add/date.rb
+++ b/ext/json/lib/json/add/date.rb
@@ -1,9 +1,9 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 require 'date'
 
+# Date serialization/deserialization
 class Date
 
   # Deserializes JSON string by converting Julian year <tt>y</tt>, month
diff --git a/ext/json/lib/json/add/date_time.rb b/ext/json/lib/json/add/date_time.rb
index 38b0e86ab8..5ea42ea656 100644
--- a/ext/json/lib/json/add/date_time.rb
+++ b/ext/json/lib/json/add/date_time.rb
@@ -1,9 +1,9 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 require 'date'
 
+# DateTime serialization/deserialization
 class DateTime
 
   # Deserializes JSON string by converting year <tt>y</tt>, month <tt>m</tt>,
diff --git a/ext/json/lib/json/add/exception.rb b/ext/json/lib/json/add/exception.rb
index a107e5b3c4..e6ad257abf 100644
--- a/ext/json/lib/json/add/exception.rb
+++ b/ext/json/lib/json/add/exception.rb
@@ -1,8 +1,8 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
+# Exception serialization/deserialization
 class Exception
 
   # Deserializes JSON string by constructing new Exception object with message
diff --git a/ext/json/lib/json/add/ostruct.rb b/ext/json/lib/json/add/ostruct.rb
index e064c85ff4..da81e107a7 100644
--- a/ext/json/lib/json/add/ostruct.rb
+++ b/ext/json/lib/json/add/ostruct.rb
@@ -1,13 +1,13 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 require 'ostruct'
 
+# OpenStruct serialization/deserialization
 class OpenStruct
 
   # Deserializes JSON string by constructing new Struct object with values
-  # <tt>t</tt> serialized by <tt>to_json</tt>.
+  # <tt>v</tt> serialized by <tt>to_json</tt>.
   def self.json_create(object)
     new(object['t'] || object[:t])
   end
diff --git a/ext/json/lib/json/add/range.rb b/ext/json/lib/json/add/range.rb
index 93529fb1c4..e61e553cdb 100644
--- a/ext/json/lib/json/add/range.rb
+++ b/ext/json/lib/json/add/range.rb
@@ -1,8 +1,8 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
+# Range serialization/deserialization
 class Range
 
   # Deserializes JSON string by constructing new Range object with arguments
diff --git a/ext/json/lib/json/add/rational.rb b/ext/json/lib/json/add/rational.rb
index 356940b225..867cd92f05 100644
--- a/ext/json/lib/json/add/rational.rb
+++ b/ext/json/lib/json/add/rational.rb
@@ -1,18 +1,13 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 defined?(::Rational) or require 'rational'
 
 class Rational
-  # Deserializes JSON string by converting numerator value <tt>n</tt>,
-  # denominator value <tt>d</tt>, to a Rational object.
   def self.json_create(object)
     Rational(object['n'], object['d'])
   end
 
-  # Returns a hash, that will be turned into a JSON object and represent this
-  # object.
   def as_json(*)
     {
       JSON.create_id => self.class.name,
@@ -21,7 +16,6 @@ class Rational
     }
   end
 
-  # Stores class name (Rational) along with numerator value <tt>n</tt> and denominator value <tt>d</tt> as JSON string
   def to_json(*)
     as_json.to_json
   end
diff --git a/ext/json/lib/json/add/regexp.rb b/ext/json/lib/json/add/regexp.rb
index a93866b05a..2fcbb6fb14 100644
--- a/ext/json/lib/json/add/regexp.rb
+++ b/ext/json/lib/json/add/regexp.rb
@@ -1,8 +1,8 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
+# Regexp serialization/deserialization
 class Regexp
 
   # Deserializes JSON string by constructing new Regexp object with source
diff --git a/ext/json/lib/json/add/struct.rb b/ext/json/lib/json/add/struct.rb
index e8395ed42f..6847cde99b 100644
--- a/ext/json/lib/json/add/struct.rb
+++ b/ext/json/lib/json/add/struct.rb
@@ -1,8 +1,8 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
+# Struct serialization/deserialization
 class Struct
 
   # Deserializes JSON string by constructing new Struct object with values
diff --git a/ext/json/lib/json/add/symbol.rb b/ext/json/lib/json/add/symbol.rb
index 74b13a423f..03dc9a56a5 100644
--- a/ext/json/lib/json/add/symbol.rb
+++ b/ext/json/lib/json/add/symbol.rb
@@ -1,8 +1,8 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
+# Symbol serialization/deserialization
 class Symbol
   # Returns a hash, that will be turned into a JSON object and represent this
   # object.
diff --git a/ext/json/lib/json/add/time.rb b/ext/json/lib/json/add/time.rb
index b73acc4086..338209d899 100644
--- a/ext/json/lib/json/add/time.rb
+++ b/ext/json/lib/json/add/time.rb
@@ -1,8 +1,8 @@
-#frozen_string_literal: false
 unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
+# Time serialization/deserialization
 class Time
 
   # Deserializes JSON string by converting time since epoch to Time
@@ -10,7 +10,7 @@ class Time
     if usec = object.delete('u') # used to be tv_usec -> tv_nsec
       object['n'] = usec * 1000
     end
-    if method_defined?(:tv_nsec)
+    if instance_methods.include?(:tv_nsec)
       at(object['s'], Rational(object['n'], 1000))
     else
       at(object['s'], object['n'] / 1000)
diff --git a/ext/json/lib/json/common.rb b/ext/json/lib/json/common.rb
index 7cc852916c..8fbaa2baad 100644
--- a/ext/json/lib/json/common.rb
+++ b/ext/json/lib/json/common.rb
@@ -1,15 +1,14 @@
-#frozen_string_literal: false
 require 'json/version'
 require 'json/generic_object'
 
 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.
+    # 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.
+    # 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)
@@ -25,7 +24,7 @@ module JSON
     # Set the JSON parser class _parser_ to be used by JSON.
     def parser=(parser) # :nodoc:
       @parser = parser
-      remove_const :Parser if const_defined?(:Parser, false)
+      remove_const :Parser if JSON.const_defined_in?(self, :Parser)
       const_set :Parser, parser
     end
 
@@ -36,8 +35,8 @@ module JSON
     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, true) then p.const_get(c)
+        when c.empty?                     then p
+        when JSON.const_defined_in?(p, c) then p.const_get(c)
         else
           begin
             p.const_missing(c)
@@ -139,17 +138,17 @@ module JSON
   # _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 100.
+  #   structures. Disable depth checking with :max_nesting => false. It defaults
+  #   to 100.
   # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
-  #   defiance of RFC 7159 to be parsed by the Parser. This option defaults
+  #   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. Strings are
   #   the default.
   # * *create_additions*: If set to false, the Parser doesn't create
   #   additions even if a matching class and create_id was found. This option
-  #   defaults to false.
+  #   defaults to true.
   # * *object_class*: Defaults to Hash
   # * *array_class*: Defaults to Array
   def parse(source, opts = {})
@@ -162,20 +161,20 @@ module JSON
   #
   # _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.
+  #   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 7159 to be parsed by the Parser. This option defaults
+  #   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 matching class and create_id was found. This option
-  #   defaults to false.
+  #   defaults to true.
   def parse!(source, opts = {})
     opts = {
       :max_nesting  => false,
       :allow_nan    => true
-    }.merge(opts)
+    }.update(opts)
     Parser.new(source, opts).parse
   end
 
@@ -296,13 +295,13 @@ module JSON
     # The global default options for the JSON.load method:
     #  :max_nesting: false
     #  :allow_nan:   true
-    #  :allow_blank:  true
+    #  :quirks_mode: true
     attr_accessor :load_default_options
   end
   self.load_default_options = {
     :max_nesting      => false,
     :allow_nan        => true,
-    :allow_blank       => true,
+    :quirks_mode      => true,
     :create_additions => true,
   }
 
@@ -329,7 +328,7 @@ module JSON
     elsif source.respond_to?(:read)
       source = source.read
     end
-    if opts[:allow_blank] && (source.nil? || source.empty?)
+    if opts[:quirks_mode] && (source.nil? || source.empty?)
       source = 'null'
     end
     result = parse(source, opts)
@@ -358,12 +357,13 @@ module JSON
     # The global default options for the JSON.dump method:
     #  :max_nesting: false
     #  :allow_nan:   true
-    #  :allow_blank: true
+    #  :quirks_mode: true
     attr_accessor :dump_default_options
   end
   self.dump_default_options = {
     :max_nesting => false,
     :allow_nan   => true,
+    :quirks_mode => true,
   }
 
   # Dumps _obj_ as a JSON string, i.e. calls generate on the object and returns
@@ -390,7 +390,7 @@ module JSON
       end
     end
     opts = JSON.dump_default_options
-    opts = opts.merge(:max_nesting => limit) if limit
+    limit and opts.update(:max_nesting => limit)
     result = generate(obj, opts)
     if anIO
       anIO.write result
@@ -402,9 +402,37 @@ module JSON
     raise ArgumentError, "exceed depth limit"
   end
 
-  # Encodes string using Ruby's _String.encode_
-  def self.iconv(to, from, string)
-    string.encode(to, from)
+  # Swap consecutive bytes of _string_ in place.
+  def self.swap!(string) # :nodoc:
+    0.upto(string.size / 2) do |i|
+      break unless string[2 * i + 1]
+      string[2 * i], string[2 * i + 1] = string[2 * i + 1], string[2 * i]
+    end
+    string
+  end
+
+  # Shortuct for iconv.
+  if ::String.method_defined?(:encode)
+    # Encodes string using Ruby's _String.encode_
+    def self.iconv(to, from, string)
+      string.encode(to, from)
+    end
+  else
+    require 'iconv'
+    # Encodes string using _iconv_ library
+    def self.iconv(to, from, string)
+      Iconv.conv(to, from, string)
+    end
+  end
+
+  if ::Object.method(:const_defined?).arity == 1
+    def self.const_defined_in?(modul, constant)
+      modul.const_defined?(constant)
+    end
+  else
+    def self.const_defined_in?(modul, constant)
+      modul.const_defined?(constant, false)
+    end
   end
 end
 
diff --git a/ext/json/lib/json/ext.rb b/ext/json/lib/json/ext.rb
index 7264a857fa..c5f813181d 100644
--- a/ext/json/lib/json/ext.rb
+++ b/ext/json/lib/json/ext.rb
@@ -1,3 +1,9 @@
+if ENV['SIMPLECOV_COVERAGE'].to_i == 1
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "/tests/"
+  end
+end
 require 'json/common'
 
 module JSON
diff --git a/ext/json/lib/json/generic_object.rb b/ext/json/lib/json/generic_object.rb
index 108309db26..8b8fd53bef 100644
--- a/ext/json/lib/json/generic_object.rb
+++ b/ext/json/lib/json/generic_object.rb
@@ -1,4 +1,3 @@
-#frozen_string_literal: false
 require 'ostruct'
 
 module JSON
@@ -49,12 +48,12 @@ module JSON
     end
 
     def [](name)
-      __send__(name)
-    end unless method_defined?(:[])
+      table[name.to_sym]
+    end
 
     def []=(name, value)
-      __send__("#{name}=", value)
-    end unless method_defined?(:[]=)
+      __send__ "#{name}=", value
+    end
 
     def |(other)
       self.class[other.to_hash.merge(to_hash)]
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index 8997def28b..47cdcd607c 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,7 +1,6 @@
-# frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '2.0.2'
+  VERSION         = '1.8.1'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
diff --git a/ext/json/parser/depend b/ext/json/parser/depend
index 927cd892bf..d188844670 100644
--- a/ext/json/parser/depend
+++ b/ext/json/parser/depend
@@ -1,21 +1,2 @@
 $(OBJS): $(ruby_headers)
 parser.o: parser.c parser.h $(srcdir)/../fbuffer/fbuffer.h
-
-# AUTOGENERATED DEPENDENCIES START
-parser.o: $(RUBY_EXTCONF_H)
-parser.o: $(arch_hdrdir)/ruby/config.h
-parser.o: $(hdrdir)/ruby/backward.h
-parser.o: $(hdrdir)/ruby/defines.h
-parser.o: $(hdrdir)/ruby/encoding.h
-parser.o: $(hdrdir)/ruby/intern.h
-parser.o: $(hdrdir)/ruby/missing.h
-parser.o: $(hdrdir)/ruby/oniguruma.h
-parser.o: $(hdrdir)/ruby/ruby.h
-parser.o: $(hdrdir)/ruby/st.h
-parser.o: $(hdrdir)/ruby/subst.h
-parser.o: $(top_srcdir)/ext/json/fbuffer/fbuffer.h
-parser.o: $(top_srcdir)/include/ruby.h
-parser.o: parser.c
-parser.o: parser.h
-parser.o: parser.rl
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/json/parser/extconf.rb b/ext/json/parser/extconf.rb
index f7360d46b2..ae4f861c79 100644
--- a/ext/json/parser/extconf.rb
+++ b/ext/json/parser/extconf.rb
@@ -1,6 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 
-have_func("rb_enc_raise", "ruby.h")
-
 create_makefile 'json/ext/parser'
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index 0dae674c88..29335541d4 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -3,28 +3,6 @@
 #include "../fbuffer/fbuffer.h"
 #include "parser.h"
 
-#if defined HAVE_RUBY_ENCODING_H
-# define EXC_ENCODING rb_utf8_encoding(),
-# ifndef HAVE_RB_ENC_RAISE
-static void
-enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
-{
-    va_list args;
-    VALUE mesg;
-
-    va_start(args, fmt);
-    mesg = rb_enc_vsprintf(enc, fmt, args);
-    va_end(args);
-
-    rb_exc_raise(rb_exc_new3(exc, mesg));
-}
-#   define rb_enc_raise enc_raise
-# endif
-#else
-# define EXC_ENCODING /* nothing */
-# define rb_enc_raise rb_raise
-#endif
-
 /* unicode */
 
 static const char digit_values[256] = {
@@ -50,16 +28,16 @@ static UTF32 unescape_unicode(const unsigned char *p)
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
+    result = (result << 4) | b;
     b = digit_values[p[1]];
+    result = (result << 4) | b;
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
     b = digit_values[p[2]];
+    result = (result << 4) | b;
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
     b = digit_values[p[3]];
+    result = (result << 4) | b;
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
     return result;
 }
 
@@ -89,20 +67,28 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
     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;
+#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_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_quirks_mode,
           i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
           i_match_string, i_aset, i_aref, i_leftshift;
 
 
-#line 124 "parser.rl"
+#line 110 "parser.rl"
 
 
 
-#line 106 "parser.c"
+#line 92 "parser.c"
 enum {JSON_object_start = 1};
 enum {JSON_object_first_final = 27};
 enum {JSON_object_error = 0};
@@ -110,30 +96,30 @@ enum {JSON_object_error = 0};
 enum {JSON_object_en_main = 1};
 
 
-#line 165 "parser.rl"
+#line 151 "parser.rl"
 
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+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 && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
+    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 130 "parser.c"
+#line 116 "parser.c"
 	{
 	cs = JSON_object_start;
 	}
 
-#line 180 "parser.rl"
+#line 166 "parser.rl"
 
-#line 137 "parser.c"
+#line 123 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -161,7 +147,7 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 147 "parser.rl"
+#line 133 "parser.rl"
 	{
         char *np;
         json->parsing_name = 1;
@@ -174,7 +160,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 178 "parser.c"
+#line 164 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -241,10 +227,10 @@ case 8:
 		goto st8;
 	goto st0;
 tr11:
-#line 132 "parser.rl"
+#line 118 "parser.rl"
 	{
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
+        char *np = JSON_parse_value(json, p, pe, &v);
         if (np == NULL) {
             p--; {p++; cs = 9; goto _out;}
         } else {
@@ -261,7 +247,7 @@ st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 265 "parser.c"
+#line 251 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st9;
 		case 32: goto st9;
@@ -350,14 +336,14 @@ case 18:
 		goto st9;
 	goto st18;
 tr4:
-#line 155 "parser.rl"
+#line 141 "parser.rl"
 	{ p--; {p++; cs = 27; goto _out;} }
 	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-#line 361 "parser.c"
+#line 347 "parser.c"
 	goto st0;
 st19:
 	if ( ++p == pe )
@@ -455,7 +441,7 @@ case 26:
 	_out: {}
 	}
 
-#line 181 "parser.rl"
+#line 167 "parser.rl"
 
     if (cs >= JSON_object_first_final) {
         if (json->create_additions) {
@@ -480,358 +466,281 @@ case 26:
 
 
 
-#line 484 "parser.c"
+#line 470 "parser.c"
 enum {JSON_value_start = 1};
-enum {JSON_value_first_final = 29};
+enum {JSON_value_first_final = 21};
 enum {JSON_value_error = 0};
 
 enum {JSON_value_en_main = 1};
 
 
-#line 281 "parser.rl"
+#line 271 "parser.rl"
 
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
 
-#line 500 "parser.c"
+#line 486 "parser.c"
 	{
 	cs = JSON_value_start;
 	}
 
-#line 288 "parser.rl"
+#line 278 "parser.rl"
 
-#line 507 "parser.c"
+#line 493 "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 34: goto tr2;
-		case 45: goto tr3;
-		case 47: goto st6;
-		case 73: goto st10;
-		case 78: goto st17;
-		case 91: goto tr7;
-		case 102: goto st19;
-		case 110: goto st23;
-		case 116: goto st26;
-		case 123: goto tr11;
+		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 ( (*p) > 10 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr3;
-	} else if ( (*p) >= 9 )
-		goto st1;
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto tr2;
 	goto st0;
 st0:
 cs = 0;
 	goto _out;
-tr2:
-#line 233 "parser.rl"
+tr0:
+#line 219 "parser.rl"
 	{
         char *np = JSON_parse_string(json, p, pe, result);
-        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
+        if (np == NULL) { p--; {p++; cs = 21; goto _out;} } else {p = (( np))-1;}
     }
-	goto st29;
-tr3:
-#line 238 "parser.rl"
+	goto st21;
+tr2:
+#line 224 "parser.rl"
 	{
         char *np;
-        if(pe > p + 8 && !strncmp(MinusInfinity, p, 9)) {
+        if(pe > p + 9 - json->quirks_mode && !strncmp(MinusInfinity, p, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 {p = (( p + 10))-1;}
-                p--; {p++; cs = 29; goto _out;}
+                p--; {p++; cs = 21; goto _out;}
             } else {
-                rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+                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 = 29; goto _out;}
+        p--; {p++; cs = 21; goto _out;}
     }
-	goto st29;
-tr7:
-#line 256 "parser.rl"
+	goto st21;
+tr5:
+#line 242 "parser.rl"
 	{
         char *np;
-        np = JSON_parse_array(json, p, pe, result, current_nesting + 1);
-        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
+        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 st29;
-tr11:
-#line 262 "parser.rl"
+	goto st21;
+tr9:
+#line 250 "parser.rl"
 	{
         char *np;
-        np =  JSON_parse_object(json, p, pe, result, current_nesting + 1);
-        if (np == NULL) { p--; {p++; cs = 29; goto _out;} } else {p = (( np))-1;}
+        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 st29;
-tr25:
-#line 226 "parser.rl"
+	goto st21;
+tr16:
+#line 212 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CInfinity;
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
         }
     }
-	goto st29;
-tr27:
-#line 219 "parser.rl"
+	goto st21;
+tr18:
+#line 205 "parser.rl"
 	{
         if (json->allow_nan) {
             *result = CNaN;
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
         }
     }
-	goto st29;
-tr31:
-#line 213 "parser.rl"
+	goto st21;
+tr22:
+#line 199 "parser.rl"
 	{
         *result = Qfalse;
     }
-	goto st29;
-tr34:
-#line 210 "parser.rl"
+	goto st21;
+tr25:
+#line 196 "parser.rl"
 	{
         *result = Qnil;
     }
-	goto st29;
-tr37:
-#line 216 "parser.rl"
+	goto st21;
+tr28:
+#line 202 "parser.rl"
 	{
         *result = Qtrue;
     }
-	goto st29;
-st29:
-	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
-#line 268 "parser.rl"
-	{ p--; {p++; cs = 29; goto _out;} }
-#line 627 "parser.c"
-	switch( (*p) ) {
-		case 13: goto st29;
-		case 32: goto st29;
-		case 47: goto st2;
-	}
-	if ( 9 <= (*p) && (*p) <= 10 )
-		goto st29;
+	goto st21;
+st21:
+	if ( ++p == pe )
+		goto _test_eof21;
+case 21:
+#line 258 "parser.rl"
+	{ p--; {p++; cs = 21; goto _out;} }
+#line 608 "parser.c"
 	goto st0;
 st2:
 	if ( ++p == pe )
 		goto _test_eof2;
 case 2:
-	switch( (*p) ) {
-		case 42: goto st3;
-		case 47: goto st5;
-	}
+	if ( (*p) == 110 )
+		goto st3;
 	goto st0;
 st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-	if ( (*p) == 42 )
+	if ( (*p) == 102 )
 		goto st4;
-	goto st3;
+	goto st0;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-	switch( (*p) ) {
-		case 42: goto st4;
-		case 47: goto st29;
-	}
-	goto st3;
+	if ( (*p) == 105 )
+		goto st5;
+	goto st0;
 st5:
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-	if ( (*p) == 10 )
-		goto st29;
-	goto st5;
+	if ( (*p) == 110 )
+		goto st6;
+	goto st0;
 st6:
 	if ( ++p == pe )
 		goto _test_eof6;
 case 6:
-	switch( (*p) ) {
-		case 42: goto st7;
-		case 47: goto st9;
-	}
+	if ( (*p) == 105 )
+		goto st7;
 	goto st0;
 st7:
 	if ( ++p == pe )
 		goto _test_eof7;
 case 7:
-	if ( (*p) == 42 )
+	if ( (*p) == 116 )
 		goto st8;
-	goto st7;
+	goto st0;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-	switch( (*p) ) {
-		case 42: goto st8;
-		case 47: goto st1;
-	}
-	goto st7;
+	if ( (*p) == 121 )
+		goto tr16;
+	goto st0;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-	if ( (*p) == 10 )
-		goto st1;
-	goto st9;
+	if ( (*p) == 97 )
+		goto st10;
+	goto st0;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-	if ( (*p) == 110 )
-		goto st11;
+	if ( (*p) == 78 )
+		goto tr18;
 	goto st0;
 st11:
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-	if ( (*p) == 102 )
+	if ( (*p) == 97 )
 		goto st12;
 	goto st0;
 st12:
 	if ( ++p == pe )
 		goto _test_eof12;
 case 12:
-	if ( (*p) == 105 )
+	if ( (*p) == 108 )
 		goto st13;
 	goto st0;
 st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
-	if ( (*p) == 110 )
+	if ( (*p) == 115 )
 		goto st14;
 	goto st0;
 st14:
 	if ( ++p == pe )
 		goto _test_eof14;
 case 14:
-	if ( (*p) == 105 )
-		goto st15;
+	if ( (*p) == 101 )
+		goto tr22;
 	goto st0;
 st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-	if ( (*p) == 116 )
+	if ( (*p) == 117 )
 		goto st16;
 	goto st0;
 st16:
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-	if ( (*p) == 121 )
-		goto tr25;
+	if ( (*p) == 108 )
+		goto st17;
 	goto st0;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-	if ( (*p) == 97 )
-		goto st18;
+	if ( (*p) == 108 )
+		goto tr25;
 	goto st0;
 st18:
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-	if ( (*p) == 78 )
-		goto tr27;
+	if ( (*p) == 114 )
+		goto st19;
 	goto st0;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
-	if ( (*p) == 97 )
+	if ( (*p) == 117 )
 		goto st20;
 	goto st0;
 st20:
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-	if ( (*p) == 108 )
-		goto st21;
-	goto st0;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-	if ( (*p) == 115 )
-		goto st22;
-	goto st0;
-st22:
-	if ( ++p == pe )
-		goto _test_eof22;
-case 22:
-	if ( (*p) == 101 )
-		goto tr31;
-	goto st0;
-st23:
-	if ( ++p == pe )
-		goto _test_eof23;
-case 23:
-	if ( (*p) == 117 )
-		goto st24;
-	goto st0;
-st24:
-	if ( ++p == pe )
-		goto _test_eof24;
-case 24:
-	if ( (*p) == 108 )
-		goto st25;
-	goto st0;
-st25:
-	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
-	if ( (*p) == 108 )
-		goto tr34;
-	goto st0;
-st26:
-	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
-	if ( (*p) == 114 )
-		goto st27;
-	goto st0;
-st27:
-	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
-	if ( (*p) == 117 )
-		goto st28;
-	goto st0;
-st28:
-	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
 	if ( (*p) == 101 )
-		goto tr37;
+		goto tr28;
 	goto st0;
 	}
-	_test_eof1: cs = 1; goto _test_eof;
-	_test_eof29: cs = 29; goto _test_eof;
+	_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;
@@ -851,20 +760,12 @@ case 28:
 	_test_eof18: cs = 18; 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_eof27: cs = 27; goto _test_eof;
-	_test_eof28: cs = 28; goto _test_eof;
 
 	_test_eof: {}
 	_out: {}
 	}
 
-#line 289 "parser.rl"
+#line 279 "parser.rl"
 
     if (cs >= JSON_value_first_final) {
         return p;
@@ -874,7 +775,7 @@ case 28:
 }
 
 
-#line 878 "parser.c"
+#line 779 "parser.c"
 enum {JSON_integer_start = 1};
 enum {JSON_integer_first_final = 3};
 enum {JSON_integer_error = 0};
@@ -882,7 +783,7 @@ enum {JSON_integer_error = 0};
 enum {JSON_integer_en_main = 1};
 
 
-#line 305 "parser.rl"
+#line 295 "parser.rl"
 
 
 static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -890,15 +791,15 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
     int cs = EVIL;
 
 
-#line 894 "parser.c"
+#line 795 "parser.c"
 	{
 	cs = JSON_integer_start;
 	}
 
-#line 312 "parser.rl"
+#line 302 "parser.rl"
     json->memo = p;
 
-#line 902 "parser.c"
+#line 803 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -932,14 +833,14 @@ case 3:
 		goto st0;
 	goto tr4;
 tr4:
-#line 302 "parser.rl"
+#line 292 "parser.rl"
 	{ p--; {p++; cs = 4; goto _out;} }
 	goto st4;
 st4:
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 943 "parser.c"
+#line 844 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -958,7 +859,7 @@ case 5:
 	_out: {}
 	}
 
-#line 314 "parser.rl"
+#line 304 "parser.rl"
 
     if (cs >= JSON_integer_first_final) {
         long len = p - json->memo;
@@ -973,7 +874,7 @@ case 5:
 }
 
 
-#line 977 "parser.c"
+#line 878 "parser.c"
 enum {JSON_float_start = 1};
 enum {JSON_float_first_final = 8};
 enum {JSON_float_error = 0};
@@ -981,7 +882,7 @@ enum {JSON_float_error = 0};
 enum {JSON_float_en_main = 1};
 
 
-#line 339 "parser.rl"
+#line 329 "parser.rl"
 
 
 static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *result)
@@ -989,15 +890,15 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
     int cs = EVIL;
 
 
-#line 993 "parser.c"
+#line 894 "parser.c"
 	{
 	cs = JSON_float_start;
 	}
 
-#line 346 "parser.rl"
+#line 336 "parser.rl"
     json->memo = p;
 
-#line 1001 "parser.c"
+#line 902 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1055,14 +956,14 @@ case 8:
 		goto st0;
 	goto tr9;
 tr9:
-#line 333 "parser.rl"
+#line 323 "parser.rl"
 	{ p--; {p++; cs = 9; goto _out;} }
 	goto st9;
 st9:
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 1066 "parser.c"
+#line 967 "parser.c"
 	goto st0;
 st5:
 	if ( ++p == pe )
@@ -1123,7 +1024,7 @@ case 7:
 	_out: {}
 	}
 
-#line 348 "parser.rl"
+#line 338 "parser.rl"
 
     if (cs >= JSON_float_first_final) {
         long len = p - json->memo;
@@ -1139,7 +1040,7 @@ case 7:
 
 
 
-#line 1143 "parser.c"
+#line 1044 "parser.c"
 enum {JSON_array_start = 1};
 enum {JSON_array_first_final = 17};
 enum {JSON_array_error = 0};
@@ -1147,28 +1048,28 @@ enum {JSON_array_error = 0};
 enum {JSON_array_en_main = 1};
 
 
-#line 391 "parser.rl"
+#line 381 "parser.rl"
 
 
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+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 && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
+    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 1165 "parser.c"
+#line 1066 "parser.c"
 	{
 	cs = JSON_array_start;
 	}
 
-#line 404 "parser.rl"
+#line 394 "parser.rl"
 
-#line 1172 "parser.c"
+#line 1073 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1207,10 +1108,10 @@ case 2:
 		goto st2;
 	goto st0;
 tr2:
-#line 368 "parser.rl"
+#line 358 "parser.rl"
 	{
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, p, pe, &v, current_nesting);
+        char *np = JSON_parse_value(json, p, pe, &v);
         if (np == NULL) {
             p--; {p++; cs = 3; goto _out;}
         } else {
@@ -1227,7 +1128,7 @@ st3:
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 1231 "parser.c"
+#line 1132 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st3;
 		case 32: goto st3;
@@ -1327,14 +1228,14 @@ case 12:
 		goto st3;
 	goto st12;
 tr4:
-#line 383 "parser.rl"
+#line 373 "parser.rl"
 	{ p--; {p++; cs = 17; goto _out;} }
 	goto st17;
 st17:
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 1338 "parser.c"
+#line 1239 "parser.c"
 	goto st0;
 st13:
 	if ( ++p == pe )
@@ -1390,12 +1291,12 @@ case 16:
 	_out: {}
 	}
 
-#line 405 "parser.rl"
+#line 395 "parser.rl"
 
     if(cs >= JSON_array_first_final) {
         return p + 1;
     } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
         return NULL;
     }
 }
@@ -1471,7 +1372,7 @@ static VALUE json_string_unescape(VALUE result, char *string, char *stringEnd)
 }
 
 
-#line 1475 "parser.c"
+#line 1376 "parser.c"
 enum {JSON_string_start = 1};
 enum {JSON_string_first_final = 8};
 enum {JSON_string_error = 0};
@@ -1479,7 +1380,7 @@ enum {JSON_string_error = 0};
 enum {JSON_string_en_main = 1};
 
 
-#line 504 "parser.rl"
+#line 494 "parser.rl"
 
 
 static int
@@ -1501,15 +1402,15 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     *result = rb_str_buf_new(0);
 
-#line 1505 "parser.c"
+#line 1406 "parser.c"
 	{
 	cs = JSON_string_start;
 	}
 
-#line 525 "parser.rl"
+#line 515 "parser.rl"
     json->memo = p;
 
-#line 1513 "parser.c"
+#line 1414 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1534,7 +1435,7 @@ case 2:
 		goto st0;
 	goto st2;
 tr2:
-#line 490 "parser.rl"
+#line 480 "parser.rl"
 	{
         *result = json_string_unescape(*result, json->memo + 1, p);
         if (NIL_P(*result)) {
@@ -1545,14 +1446,14 @@ tr2:
             {p = (( p + 1))-1;}
         }
     }
-#line 501 "parser.rl"
+#line 491 "parser.rl"
 	{ p--; {p++; cs = 8; goto _out;} }
 	goto st8;
 st8:
 	if ( ++p == pe )
 		goto _test_eof8;
 case 8:
-#line 1556 "parser.c"
+#line 1457 "parser.c"
 	goto st0;
 st3:
 	if ( ++p == pe )
@@ -1628,7 +1529,7 @@ case 7:
 	_out: {}
 	}
 
-#line 527 "parser.rl"
+#line 517 "parser.rl"
 
     if (json->create_additions && RTEST(match_string = json->match_string)) {
           VALUE klass;
@@ -1643,8 +1544,6 @@ case 7:
 
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
-    } else {
-      rb_str_resize(*result, RSTRING_LEN(*result));
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -1667,16 +1566,41 @@ case 7:
 
 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
-  rb_encoding *enc = rb_enc_get(source);
-  if (enc == rb_ascii8bit_encoding()) {
-    if (OBJ_FROZEN(source)) {
-      source = rb_str_dup(source);
+    {
+        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_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32BE);
+            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+                source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16BE);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+                source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32LE);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+                source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
+            } else {
+                source = rb_str_dup(source);
+                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);
     }
-    FORCE_UTF8(source);
-  } else {
-    source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
-  }
 #endif
     return source;
 }
@@ -1699,12 +1623,11 @@ static VALUE convert_encoding(VALUE source)
  *   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. It's not possible to use this option in
- *   conjunction with the *create_additions* option.
+ *   (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 matching class and create_id was found. This option
- *   defaults to false.
+ *   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
  */
@@ -1716,18 +1639,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     if (json->Vsource) {
         rb_raise(rb_eTypeError, "already initialized instance");
     }
-#ifdef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
-    rb_scan_args(argc, argv, "1:", &source, &opts);
-#else
     rb_scan_args(argc, argv, "11", &source, &opts);
-#endif
     if (!NIL_P(opts)) {
-#ifndef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
         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 {
-#endif
             VALUE tmp = ID2SYM(i_max_nesting);
             if (option_given_p(opts, tmp)) {
                 VALUE max_nesting = rb_hash_aref(opts, tmp);
@@ -1752,17 +1669,19 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->symbolize_names = 0;
             }
+            tmp = ID2SYM(i_quirks_mode);
+            if (option_given_p(opts, tmp)) {
+                VALUE quirks_mode = rb_hash_aref(opts, tmp);
+                json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
+            } else {
+                json->quirks_mode = 0;
+            }
             tmp = ID2SYM(i_create_additions);
             if (option_given_p(opts, tmp)) {
                 json->create_additions = RTEST(rb_hash_aref(opts, tmp));
             } else {
                 json->create_additions = 0;
             }
-            if (json->symbolize_names && json->create_additions) {
-              rb_raise(rb_eArgError,
-                "options :symbolize_names and :create_additions cannot be "
-                " used in conjunction");
-            }
             tmp = ID2SYM(i_create_id);
             if (option_given_p(opts, tmp)) {
                 json->create_id = rb_hash_aref(opts, tmp);
@@ -1788,9 +1707,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->match_string = Qnil;
             }
-#ifndef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
         }
-#endif
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
@@ -1799,7 +1716,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
         json->object_class = Qnil;
         json->array_class = Qnil;
     }
-    source = convert_encoding(StringValue(source));
+    source = rb_convert_type(source, T_STRING, "String", "to_str");
+    if (!json->quirks_mode) {
+      source = convert_encoding(StringValue(source));
+    }
+    json->current_nesting = 0;
     StringValue(source);
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
@@ -1808,7 +1729,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1812 "parser.c"
+#line 1733 "parser.c"
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -1816,33 +1737,201 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-#line 720 "parser.rl"
+#line 740 "parser.rl"
 
 
-/*
- * call-seq: parse()
- *
- *  Parses the current JSON text _source_ and returns the complete data
- *  structure as a result.
- */
-static VALUE cParser_parse(VALUE self)
+static VALUE cParser_parse_strict(VALUE self)
 {
-  char *p, *pe;
-  int cs = EVIL;
-  VALUE result = Qnil;
-  GET_PARSER;
+    char *p, *pe;
+    int cs = EVIL;
+    VALUE result = Qnil;
+    GET_PARSER;
 
 
-#line 1837 "parser.c"
+#line 1752 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 736 "parser.rl"
-  p = json->source;
-  pe = p + json->len;
+#line 750 "parser.rl"
+    p = json->source;
+    pe = p + json->len;
 
-#line 1846 "parser.c"
+#line 1761 "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 729 "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 722 "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 1838 "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 753 "parser.rl"
+
+    if (cs >= JSON_first_final && p == pe) {
+        return result;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
+    }
+}
+
+
+
+#line 1907 "parser.c"
+enum {JSON_quirks_mode_start = 1};
+enum {JSON_quirks_mode_first_final = 10};
+enum {JSON_quirks_mode_error = 0};
+
+enum {JSON_quirks_mode_en_main = 1};
+
+
+#line 778 "parser.rl"
+
+
+static VALUE cParser_parse_quirks_mode(VALUE self)
+{
+    char *p, *pe;
+    int cs = EVIL;
+    VALUE result = Qnil;
+    GET_PARSER;
+
+
+#line 1926 "parser.c"
+	{
+	cs = JSON_quirks_mode_start;
+	}
+
+#line 788 "parser.rl"
+    p = json->source;
+    pe = p + json->len;
+
+#line 1935 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1876,9 +1965,9 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 712 "parser.rl"
+#line 770 "parser.rl"
 	{
-        char *np = JSON_parse_value(json, p, pe, &result, 0);
+        char *np = JSON_parse_value(json, p, pe, &result);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
     }
 	goto st10;
@@ -1886,7 +1975,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1890 "parser.c"
+#line 1979 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -1975,19 +2064,44 @@ case 9:
 	_out: {}
 	}
 
-#line 739 "parser.rl"
+#line 791 "parser.rl"
 
-  if (cs >= JSON_first_final && p == pe) {
-    return result;
+    if (cs >= JSON_quirks_mode_first_final && p == pe) {
+        return result;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
+    }
+}
+
+/*
+ * call-seq: parse()
+ *
+ *  Parses the current JSON text _source_ and returns the complete data
+ *  structure as a result.
+ */
+static VALUE cParser_parse(VALUE self)
+{
+  GET_PARSER;
+
+  if (json->quirks_mode) {
+    return cParser_parse_quirks_mode(self);
   } else {
-    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
-    return Qnil;
+    return cParser_parse_strict(self);
   }
 }
 
-static void JSON_mark(void *ptr)
+
+static JSON_Parser *JSON_allocate()
+{
+    JSON_Parser *json = ALLOC(JSON_Parser);
+    MEMZERO(json, JSON_Parser, 1);
+    json->fbuffer = fbuffer_alloc(0);
+    return json;
+}
+
+static void JSON_mark(JSON_Parser *json)
 {
-    JSON_Parser *json = ptr;
     rb_gc_mark_maybe(json->Vsource);
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
@@ -1995,36 +2109,16 @@ static void JSON_mark(void *ptr)
     rb_gc_mark_maybe(json->match_string);
 }
 
-static void JSON_free(void *ptr)
+static void JSON_free(JSON_Parser *json)
 {
-    JSON_Parser *json = ptr;
     fbuffer_free(json->fbuffer);
     ruby_xfree(json);
 }
 
-static size_t JSON_memsize(const void *ptr)
-{
-    const JSON_Parser *json = ptr;
-    return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
-}
-
-#ifdef NEW_TYPEDDATA_WRAPPER
-static const rb_data_type_t JSON_Parser_type = {
-    "JSON/Parser",
-    {JSON_mark, JSON_free, JSON_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-#endif
-
 static VALUE cJSON_parser_s_allocate(VALUE klass)
 {
-    JSON_Parser *json;
-    VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
-    json->fbuffer = fbuffer_alloc(0);
-    return obj;
+    JSON_Parser *json = JSON_allocate();
+    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
 }
 
 /*
@@ -2039,7 +2133,19 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
-void Init_parser(void)
+/*
+ * call-seq: quirks_mode?()
+ *
+ * Returns a true, if this parser is in quirks_mode, false otherwise.
+ */
+static VALUE cParser_quirks_mode_p(VALUE self)
+{
+    GET_PARSER;
+    return json->quirks_mode ? Qtrue : Qfalse;
+}
+
+
+void Init_parser()
 {
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
@@ -2051,6 +2157,7 @@ void Init_parser(void)
     rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
+    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
@@ -2064,6 +2171,7 @@ void Init_parser(void)
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_symbolize_names = rb_intern("symbolize_names");
+    i_quirks_mode = rb_intern("quirks_mode");
     i_object_class = rb_intern("object_class");
     i_array_class = rb_intern("array_class");
     i_match = rb_intern("match");
@@ -2073,6 +2181,18 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
+#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");
+#else
+    i_iconv = rb_intern("iconv");
+#endif
 }
 
 /*
diff --git a/ext/json/parser/parser.h b/ext/json/parser/parser.h
index 1d46831965..b192064c09 100644
--- a/ext/json/parser/parser.h
+++ b/ext/json/parser/parser.h
@@ -34,9 +34,11 @@ typedef struct JSON_ParserStruct {
     char *memo;
     VALUE create_id;
     int max_nesting;
+    int current_nesting;
     int allow_nan;
     int parsing_name;
     int symbolize_names;
+    int quirks_mode;
     VALUE object_class;
     VALUE array_class;
     int create_additions;
@@ -49,42 +51,27 @@ typedef struct JSON_ParserStruct {
     if (!json->Vsource) rb_raise(rb_eTypeError, "uninitialized instance")
 #define GET_PARSER_INIT                     \
     JSON_Parser *json;                      \
-    TypedData_Get_Struct(self, JSON_Parser, &JSON_Parser_type, 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, int current_nesting);
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting);
+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, int current_nesting);
+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 void JSON_mark(void *json);
-static void JSON_free(void *json);
+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);
-#ifndef ZALLOC
-#define ZALLOC(type) ((type *)ruby_zalloc(sizeof(type)))
-static inline void *ruby_zalloc(size_t n)
-{
-    void *p = ruby_xmalloc(n);
-    memset(p, 0, n);
-    return p;
-}
-#endif
-#ifdef TypedData_Make_Struct
-static const rb_data_type_t JSON_Parser_type;
-#define NEW_TYPEDDATA_WRAPPER 1
-#else
-#define TypedData_Make_Struct(klass, type, ignore, json) Data_Make_Struct(klass, type, NULL, JSON_free, json)
-#define TypedData_Get_Struct(self, JSON_Parser, ignore, json) Data_Get_Struct(self, JSON_Parser, json)
-#endif
 
 #endif
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index dd24cf94cc..ab8d318173 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -1,28 +1,6 @@
 #include "../fbuffer/fbuffer.h"
 #include "parser.h"
 
-#if defined HAVE_RUBY_ENCODING_H
-# define EXC_ENCODING rb_utf8_encoding(),
-# ifndef HAVE_RB_ENC_RAISE
-static void
-enc_raise(rb_encoding *enc, VALUE exc, const char *fmt, ...)
-{
-    va_list args;
-    VALUE mesg;
-
-    va_start(args, fmt);
-    mesg = rb_enc_vsprintf(enc, fmt, args);
-    va_end(args);
-
-    rb_exc_raise(rb_exc_new3(exc, mesg));
-}
-#   define rb_enc_raise enc_raise
-# endif
-#else
-# define EXC_ENCODING /* nothing */
-# define rb_enc_raise rb_raise
-#endif
-
 /* unicode */
 
 static const char digit_values[256] = {
@@ -48,16 +26,16 @@ static UTF32 unescape_unicode(const unsigned char *p)
     UTF32 result = 0;
     b = digit_values[p[0]];
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
+    result = (result << 4) | b;
     b = digit_values[p[1]];
+    result = (result << 4) | b;
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
     b = digit_values[p[2]];
+    result = (result << 4) | b;
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
     b = digit_values[p[3]];
+    result = (result << 4) | b;
     if (b < 0) return UNI_REPLACEMENT_CHAR;
-    result = (result << 4) | (unsigned char)b;
     return result;
 }
 
@@ -87,11 +65,19 @@ static int convert_UTF32_to_UTF8(char *buf, UTF32 ch)
     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;
+#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_chr, i_max_nesting, i_allow_nan, i_symbolize_names, i_quirks_mode,
           i_object_class, i_array_class, i_key_p, i_deep_const_get, i_match,
           i_match_string, i_aset, i_aref, i_leftshift;
 
@@ -131,7 +117,7 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
 
     action parse_value {
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
+        char *np = JSON_parse_value(json, fpc, pe, &v);
         if (np == NULL) {
             fhold; fbreak;
         } else {
@@ -164,14 +150,14 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
     ) @exit;
 }%%
 
-static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+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 && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
+    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);
@@ -220,14 +206,14 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
         if (json->allow_nan) {
             *result = CNaN;
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
         }
     }
     action parse_infinity {
         if (json->allow_nan) {
             *result = CInfinity;
         } else {
-            rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
         }
     }
     action parse_string {
@@ -237,13 +223,13 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     action parse_number {
         char *np;
-        if(pe > fpc + 8 && !strncmp(MinusInfinity, fpc, 9)) {
+        if(pe > fpc + 9 - json->quirks_mode && !strncmp(MinusInfinity, fpc, 9)) {
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 fexec p + 10;
                 fhold; fbreak;
             } else {
-                rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
             }
         }
         np = JSON_parse_float(json, fpc, pe, result);
@@ -255,19 +241,23 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     action parse_array {
         char *np;
-        np = JSON_parse_array(json, fpc, pe, result, current_nesting + 1);
+        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;
-        np =  JSON_parse_object(json, fpc, pe, result, current_nesting + 1);
+        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 := ignore* (
+main := (
               Vnull @parse_null |
               Vfalse @parse_false |
               Vtrue @parse_true |
@@ -277,10 +267,10 @@ main := ignore* (
               begin_string >parse_string |
               begin_array >parse_array |
               begin_object >parse_object
-        ) ignore* %*exit;
+        ) %*exit;
 }%%
 
-static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
 
@@ -367,7 +357,7 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
     action parse_value {
         VALUE v = Qnil;
-        char *np = JSON_parse_value(json, fpc, pe, &v, current_nesting);
+        char *np = JSON_parse_value(json, fpc, pe, &v);
         if (np == NULL) {
             fhold; fbreak;
         } else {
@@ -390,13 +380,13 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
           end_array @exit;
 }%%
 
-static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result, int current_nesting)
+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 && current_nesting > json->max_nesting) {
-        rb_raise(eNestingError, "nesting of %d is too deep", current_nesting);
+    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);
 
@@ -406,7 +396,7 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     if(cs >= JSON_array_first_final) {
         return p + 1;
     } else {
-        rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
         return NULL;
     }
 }
@@ -538,8 +528,6 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
     if (json->symbolize_names && json->parsing_name) {
       *result = rb_str_intern(*result);
-    } else {
-      rb_str_resize(*result, RSTRING_LEN(*result));
     }
     if (cs >= JSON_string_first_final) {
         return p + 1;
@@ -562,16 +550,41 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
 
 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
-  rb_encoding *enc = rb_enc_get(source);
-  if (enc == rb_ascii8bit_encoding()) {
-    if (OBJ_FROZEN(source)) {
-      source = rb_str_dup(source);
+    {
+        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_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32BE);
+            } else if (len >= 4 && ptr[0] == 0 && ptr[2] == 0) {
+                source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16BE);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 0) {
+                source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_32LE);
+            } else if (len >= 4 && ptr[1] == 0 && ptr[3] == 0) {
+                source = rb_funcall(source, i_encode, 2, CEncoding_UTF_8, CEncoding_UTF_16LE);
+            } else {
+                source = rb_str_dup(source);
+                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);
     }
-    FORCE_UTF8(source);
-  } else {
-    source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
-  }
 #endif
     return source;
 }
@@ -594,12 +607,11 @@ static VALUE convert_encoding(VALUE source)
  *   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. It's not possible to use this option in
- *   conjunction with the *create_additions* option.
+ *   (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 matching class and create_id was found. This option
- *   defaults to false.
+ *   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
  */
@@ -611,18 +623,12 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
     if (json->Vsource) {
         rb_raise(rb_eTypeError, "already initialized instance");
     }
-#ifdef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
-    rb_scan_args(argc, argv, "1:", &source, &opts);
-#else
     rb_scan_args(argc, argv, "11", &source, &opts);
-#endif
     if (!NIL_P(opts)) {
-#ifndef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
         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 {
-#endif
             VALUE tmp = ID2SYM(i_max_nesting);
             if (option_given_p(opts, tmp)) {
                 VALUE max_nesting = rb_hash_aref(opts, tmp);
@@ -647,17 +653,19 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->symbolize_names = 0;
             }
+            tmp = ID2SYM(i_quirks_mode);
+            if (option_given_p(opts, tmp)) {
+                VALUE quirks_mode = rb_hash_aref(opts, tmp);
+                json->quirks_mode = RTEST(quirks_mode) ? 1 : 0;
+            } else {
+                json->quirks_mode = 0;
+            }
             tmp = ID2SYM(i_create_additions);
             if (option_given_p(opts, tmp)) {
                 json->create_additions = RTEST(rb_hash_aref(opts, tmp));
             } else {
                 json->create_additions = 0;
             }
-            if (json->symbolize_names && json->create_additions) {
-              rb_raise(rb_eArgError,
-                "options :symbolize_names and :create_additions cannot be "
-                " used in conjunction");
-            }
             tmp = ID2SYM(i_create_id);
             if (option_given_p(opts, tmp)) {
                 json->create_id = rb_hash_aref(opts, tmp);
@@ -683,9 +691,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->match_string = Qnil;
             }
-#ifndef HAVE_RB_SCAN_ARGS_OPTIONAL_HASH
         }
-#endif
     } else {
         json->max_nesting = 100;
         json->allow_nan = 0;
@@ -694,7 +700,11 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
         json->object_class = Qnil;
         json->array_class = Qnil;
     }
-    source = convert_encoding(StringValue(source));
+    source = rb_convert_type(source, T_STRING, "String", "to_str");
+    if (!json->quirks_mode) {
+      source = convert_encoding(StringValue(source));
+    }
+    json->current_nesting = 0;
     StringValue(source);
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
@@ -709,8 +719,56 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 
     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*;
+}%%
+
+static VALUE cParser_parse_strict(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;
+    }
+}
+
+
+%%{
+    machine JSON_quirks_mode;
+
+    write data;
+
+    include JSON_common;
+
     action parse_value {
-        char *np = JSON_parse_value(json, fpc, pe, &result, 0);
+        char *np = JSON_parse_value(json, fpc, pe, &result);
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
@@ -719,6 +777,26 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             ) ignore*;
 }%%
 
+static VALUE cParser_parse_quirks_mode(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_quirks_mode_first_final && p == pe) {
+        return result;
+    } else {
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
+        return Qnil;
+    }
+}
+
 /*
  * call-seq: parse()
  *
@@ -727,27 +805,26 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
  */
 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;
+  if (json->quirks_mode) {
+    return cParser_parse_quirks_mode(self);
   } else {
-    rb_enc_raise(EXC_ENCODING eParserError, "%u: unexpected token at '%s'", __LINE__, p);
-    return Qnil;
+    return cParser_parse_strict(self);
   }
 }
 
-static void JSON_mark(void *ptr)
+
+static JSON_Parser *JSON_allocate()
+{
+    JSON_Parser *json = ALLOC(JSON_Parser);
+    MEMZERO(json, JSON_Parser, 1);
+    json->fbuffer = fbuffer_alloc(0);
+    return json;
+}
+
+static void JSON_mark(JSON_Parser *json)
 {
-    JSON_Parser *json = ptr;
     rb_gc_mark_maybe(json->Vsource);
     rb_gc_mark_maybe(json->create_id);
     rb_gc_mark_maybe(json->object_class);
@@ -755,36 +832,16 @@ static void JSON_mark(void *ptr)
     rb_gc_mark_maybe(json->match_string);
 }
 
-static void JSON_free(void *ptr)
+static void JSON_free(JSON_Parser *json)
 {
-    JSON_Parser *json = ptr;
     fbuffer_free(json->fbuffer);
     ruby_xfree(json);
 }
 
-static size_t JSON_memsize(const void *ptr)
-{
-    const JSON_Parser *json = ptr;
-    return sizeof(*json) + FBUFFER_CAPA(json->fbuffer);
-}
-
-#ifdef NEW_TYPEDDATA_WRAPPER
-static const rb_data_type_t JSON_Parser_type = {
-    "JSON/Parser",
-    {JSON_mark, JSON_free, JSON_memsize,},
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-#endif
-
 static VALUE cJSON_parser_s_allocate(VALUE klass)
 {
-    JSON_Parser *json;
-    VALUE obj = TypedData_Make_Struct(klass, JSON_Parser, &JSON_Parser_type, json);
-    json->fbuffer = fbuffer_alloc(0);
-    return obj;
+    JSON_Parser *json = JSON_allocate();
+    return Data_Wrap_Struct(klass, JSON_mark, JSON_free, json);
 }
 
 /*
@@ -799,7 +856,19 @@ static VALUE cParser_source(VALUE self)
     return rb_str_dup(json->Vsource);
 }
 
-void Init_parser(void)
+/*
+ * call-seq: quirks_mode?()
+ *
+ * Returns a true, if this parser is in quirks_mode, false otherwise.
+ */
+static VALUE cParser_quirks_mode_p(VALUE self)
+{
+    GET_PARSER;
+    return json->quirks_mode ? Qtrue : Qfalse;
+}
+
+
+void Init_parser()
 {
     rb_require("json/common");
     mJSON = rb_define_module("JSON");
@@ -811,6 +880,7 @@ void Init_parser(void)
     rb_define_method(cParser, "initialize", cParser_initialize, -1);
     rb_define_method(cParser, "parse", cParser_parse, 0);
     rb_define_method(cParser, "source", cParser_source, 0);
+    rb_define_method(cParser, "quirks_mode?", cParser_quirks_mode_p, 0);
 
     CNaN = rb_const_get(mJSON, rb_intern("NaN"));
     CInfinity = rb_const_get(mJSON, rb_intern("Infinity"));
@@ -824,6 +894,7 @@ void Init_parser(void)
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
     i_symbolize_names = rb_intern("symbolize_names");
+    i_quirks_mode = rb_intern("quirks_mode");
     i_object_class = rb_intern("object_class");
     i_array_class = rb_intern("array_class");
     i_match = rb_intern("match");
@@ -833,6 +904,18 @@ void Init_parser(void)
     i_aset = rb_intern("[]=");
     i_aref = rb_intern("[]");
     i_leftshift = rb_intern("<<");
+#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");
+#else
+    i_iconv = rb_intern("iconv");
+#endif
 }
 
 /*
diff --git a/ext/mathn/complex/extconf.rb b/ext/mathn/complex/extconf.rb
index a3f45ac4fc..d4d14ffcb8 100644
--- a/ext/mathn/complex/extconf.rb
+++ b/ext/mathn/complex/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require "mkmf"
 
 create_makefile "mathn/complex"
diff --git a/ext/mathn/rational/extconf.rb b/ext/mathn/rational/extconf.rb
index 4e4cc5f621..ba76306b7b 100644
--- a/ext/mathn/rational/extconf.rb
+++ b/ext/mathn/rational/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require "mkmf"
 
 create_makefile "mathn/rational"
diff --git a/ext/nkf/depend b/ext/nkf/depend
index dfda9c0597..f368cd51d7 100644
--- a/ext/nkf/depend
+++ b/ext/nkf/depend
@@ -1,23 +1,6 @@
-# BSD make needs "nkf.o: nkf.c" dependency BEFORE "nkf.o: nkf-utf8/nkf.c".
-# It seems BSD make searches the target for implicit rule in dependencies at first.
-nkf.o: nkf.c
-
-# AUTOGENERATED DEPENDENCIES START
-nkf.o: $(RUBY_EXTCONF_H)
-nkf.o: $(arch_hdrdir)/ruby/config.h
-nkf.o: $(hdrdir)/ruby/backward.h
-nkf.o: $(hdrdir)/ruby/defines.h
-nkf.o: $(hdrdir)/ruby/encoding.h
-nkf.o: $(hdrdir)/ruby/intern.h
-nkf.o: $(hdrdir)/ruby/missing.h
-nkf.o: $(hdrdir)/ruby/oniguruma.h
-nkf.o: $(hdrdir)/ruby/ruby.h
-nkf.o: $(hdrdir)/ruby/st.h
-nkf.o: $(hdrdir)/ruby/subst.h
-nkf.o: nkf-utf8/config.h
-nkf.o: nkf-utf8/nkf.c
-nkf.o: nkf-utf8/nkf.h
-nkf.o: nkf-utf8/utf8tbl.c
-nkf.o: nkf-utf8/utf8tbl.h
-nkf.o: nkf.c
-# AUTOGENERATED DEPENDENCIES END
+nkf.o : nkf.c $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \
+  $(srcdir)/nkf-utf8/nkf.c $(srcdir)/nkf-utf8/nkf.h \
+  $(srcdir)/nkf-utf8/utf8tbl.c $(srcdir)/nkf-utf8/utf8tbl.h \
+  $(srcdir)/nkf-utf8/config.h
diff --git a/ext/nkf/extconf.rb b/ext/nkf/extconf.rb
index f41f6b11dc..710662f19c 100644
--- a/ext/nkf/extconf.rb
+++ b/ext/nkf/extconf.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile('nkf')
diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb
index f52b755288..f8c1ae8f59 100644
--- a/ext/nkf/lib/kconv.rb
+++ b/ext/nkf/lib/kconv.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #
 # kconv.rb - Kanji Converter.
 #
diff --git a/ext/nkf/nkf-utf8/nkf.c b/ext/nkf/nkf-utf8/nkf.c
index b58c437d3c..65d2c190ec 100644
--- a/ext/nkf/nkf-utf8/nkf.c
+++ b/ext/nkf/nkf-utf8/nkf.c
@@ -20,11 +20,11 @@
  *
  * 3. This notice may not be removed or altered from any source distribution.
  */
-#define NKF_VERSION "2.1.4"
-#define NKF_RELEASE_DATE "2015-12-12"
+#define NKF_VERSION "2.1.3"
+#define NKF_RELEASE_DATE "2013-11-22"
 #define COPY_RIGHT \
     "Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
-    "Copyright (C) 1996-2015, The nkf Project."
+    "Copyright (C) 1996-2013, The nkf Project."
 
 #include "config.h"
 #include "nkf.h"
@@ -774,7 +774,7 @@ nkf_enc_find(const char *name)
 
 #ifdef DEFAULT_CODE_LOCALE
 static const char*
-nkf_locale_charmap(void)
+nkf_locale_charmap()
 {
 #ifdef HAVE_LANGINFO_H
     return nl_langinfo(CODESET);
@@ -802,7 +802,7 @@ nkf_locale_charmap(void)
 }
 
 static nkf_encoding*
-nkf_locale_encoding(void)
+nkf_locale_encoding()
 {
     nkf_encoding *enc = 0;
     const char *encname = nkf_locale_charmap();
@@ -813,13 +813,13 @@ nkf_locale_encoding(void)
 #endif /* DEFAULT_CODE_LOCALE */
 
 static nkf_encoding*
-nkf_utf8_encoding(void)
+nkf_utf8_encoding()
 {
     return &nkf_encoding_table[UTF_8];
 }
 
 static nkf_encoding*
-nkf_default_encoding(void)
+nkf_default_encoding()
 {
     nkf_encoding *enc = 0;
 #ifdef DEFAULT_CODE_LOCALE
@@ -3575,7 +3575,6 @@ static void
 check_bom(FILE *f)
 {
     int c2;
-    input_bom_f = FALSE;
     switch(c2 = (*i_getc)(f)){
     case 0x00:
 	if((c2 = (*i_getc)(f)) == 0x00){
@@ -3834,8 +3833,8 @@ fold_conv(nkf_char c2, nkf_char c1)
 	    f_prev = c1;
 	    f_line = 0;
 	    fold_state =  CR;
-	} else if ((f_prev == c1)
-		   || (f_prev == LF)
+	} else if ((f_prev == c1 && !fold_preserve_f)
+		   || (f_prev == LF && fold_preserve_f)
 		  ) {        /* duplicate newline */
 	    if (f_line) {
 		f_line = 0;
@@ -5436,8 +5435,8 @@ mime_putc(nkf_char c)
 		mimeout_state.buf[mimeout_state.count++] = (char)c;
 		if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
 		    eof_mime();
-		    for (j=0;j<mimeout_state.count;j++) {
-			(*o_mputc)(mimeout_state.buf[j]);
+		    for (i=0;i<mimeout_state.count;i++) {
+			(*o_mputc)(mimeout_state.buf[i]);
 			base64_count++;
 		    }
 		    mimeout_state.count = 0;
@@ -5491,7 +5490,7 @@ typedef struct nkf_iconv_t {
     size_t input_buffer_size;
     char *output_buffer;
     size_t output_buffer_size;
-};
+}
 
 static nkf_iconv_t
 nkf_iconv_new(char *tocode, char *fromcode)
@@ -5710,9 +5709,9 @@ module_connection(void)
     if (nkf_enc_unicode_p(output_encoding))
 	output_mode = UTF_8;
 
-    if (x0201_f == NKF_UNSPECIFIED) {
-	x0201_f = X0201_DEFAULT;
-    }
+	if (x0201_f == NKF_UNSPECIFIED) {
+		x0201_f = X0201_DEFAULT;
+	}
 
     /* replace continuation module, from output side */
 
diff --git a/ext/nkf/nkf-utf8/utf8tbl.c b/ext/nkf/nkf-utf8/utf8tbl.c
index 3821c59468..e493c6beb5 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.c
+++ b/ext/nkf/nkf-utf8/utf8tbl.c
@@ -1,5 +1,5 @@
 /*
- * utf8tbl.c - Conversion Table for nkf
+ * utf8tbl.c - Convertion Table for nkf
  *
  */
 
diff --git a/ext/nkf/nkf-utf8/utf8tbl.h b/ext/nkf/nkf-utf8/utf8tbl.h
index 54a34271dd..96b61ed5a4 100644
--- a/ext/nkf/nkf-utf8/utf8tbl.h
+++ b/ext/nkf/nkf-utf8/utf8tbl.h
@@ -1,5 +1,5 @@
 /*
- * utf8tbl.h - Header file for Conversion Table
+ * utf8tbl.h - Header file for Convertion Table
  *
  */
 
diff --git a/ext/nkf/nkf.c b/ext/nkf/nkf.c
index 9613a925ce..2f36866ac4 100644
--- a/ext/nkf/nkf.c
+++ b/ext/nkf/nkf.c
@@ -478,7 +478,7 @@ rb_nkf_guess(VALUE obj, VALUE src)
  */
 
 void
-Init_nkf(void)
+Init_nkf()
 {
     VALUE mNKF = rb_define_module("NKF");
 
diff --git a/ext/objspace/depend b/ext/objspace/depend
index dc3009fc50..270bd911d3 100644
--- a/ext/objspace/depend
+++ b/ext/objspace/depend
@@ -1,72 +1,14 @@
-# AUTOGENERATED DEPENDENCIES START
-object_tracing.o: $(RUBY_EXTCONF_H)
-object_tracing.o: $(arch_hdrdir)/ruby/config.h
-object_tracing.o: $(hdrdir)/ruby/backward.h
-object_tracing.o: $(hdrdir)/ruby/debug.h
-object_tracing.o: $(hdrdir)/ruby/defines.h
-object_tracing.o: $(hdrdir)/ruby/encoding.h
-object_tracing.o: $(hdrdir)/ruby/intern.h
-object_tracing.o: $(hdrdir)/ruby/io.h
-object_tracing.o: $(hdrdir)/ruby/missing.h
-object_tracing.o: $(hdrdir)/ruby/oniguruma.h
-object_tracing.o: $(hdrdir)/ruby/ruby.h
-object_tracing.o: $(hdrdir)/ruby/st.h
-object_tracing.o: $(hdrdir)/ruby/subst.h
-object_tracing.o: $(top_srcdir)/include/ruby.h
-object_tracing.o: $(top_srcdir)/internal.h
-object_tracing.o: object_tracing.c
-object_tracing.o: objspace.h
-objspace.o: $(RUBY_EXTCONF_H)
-objspace.o: $(arch_hdrdir)/ruby/config.h
-objspace.o: $(hdrdir)/ruby/backward.h
-objspace.o: $(hdrdir)/ruby/defines.h
-objspace.o: $(hdrdir)/ruby/encoding.h
-objspace.o: $(hdrdir)/ruby/intern.h
-objspace.o: $(hdrdir)/ruby/io.h
-objspace.o: $(hdrdir)/ruby/missing.h
-objspace.o: $(hdrdir)/ruby/oniguruma.h
-objspace.o: $(hdrdir)/ruby/re.h
-objspace.o: $(hdrdir)/ruby/regex.h
-objspace.o: $(hdrdir)/ruby/ruby.h
-objspace.o: $(hdrdir)/ruby/st.h
-objspace.o: $(hdrdir)/ruby/subst.h
-objspace.o: $(top_srcdir)/gc.h
-objspace.o: $(top_srcdir)/include/ruby.h
-objspace.o: $(top_srcdir)/internal.h
-objspace.o: $(top_srcdir)/node.h
-objspace.o: $(top_srcdir)/symbol.h
-objspace.o: objspace.c
-objspace.o: {$(VPATH)}id.h
-objspace_dump.o: $(RUBY_EXTCONF_H)
-objspace_dump.o: $(arch_hdrdir)/ruby/config.h
-objspace_dump.o: $(hdrdir)/ruby/backward.h
-objspace_dump.o: $(hdrdir)/ruby/debug.h
-objspace_dump.o: $(hdrdir)/ruby/defines.h
-objspace_dump.o: $(hdrdir)/ruby/encoding.h
-objspace_dump.o: $(hdrdir)/ruby/intern.h
-objspace_dump.o: $(hdrdir)/ruby/io.h
-objspace_dump.o: $(hdrdir)/ruby/missing.h
-objspace_dump.o: $(hdrdir)/ruby/oniguruma.h
-objspace_dump.o: $(hdrdir)/ruby/ruby.h
-objspace_dump.o: $(hdrdir)/ruby/st.h
-objspace_dump.o: $(hdrdir)/ruby/subst.h
-objspace_dump.o: $(hdrdir)/ruby/thread_native.h
-objspace_dump.o: $(top_srcdir)/ccan/check_type/check_type.h
-objspace_dump.o: $(top_srcdir)/ccan/container_of/container_of.h
-objspace_dump.o: $(top_srcdir)/ccan/list/list.h
-objspace_dump.o: $(top_srcdir)/ccan/str/str.h
-objspace_dump.o: $(top_srcdir)/gc.h
-objspace_dump.o: $(top_srcdir)/include/ruby.h
-objspace_dump.o: $(top_srcdir)/internal.h
-objspace_dump.o: $(top_srcdir)/method.h
-objspace_dump.o: $(top_srcdir)/node.h
-objspace_dump.o: $(top_srcdir)/ruby_assert.h
-objspace_dump.o: $(top_srcdir)/ruby_atomic.h
-objspace_dump.o: $(top_srcdir)/thread_pthread.h
-objspace_dump.o: $(top_srcdir)/vm_core.h
-objspace_dump.o: $(top_srcdir)/vm_debug.h
-objspace_dump.o: $(top_srcdir)/vm_opts.h
-objspace_dump.o: objspace.h
-objspace_dump.o: objspace_dump.c
-objspace_dump.o: {$(VPATH)}id.h
-# AUTOGENERATED DEPENDENCIES END
+objspace.o: $(HDRS) $(ruby_headers) \
+            $(hdrdir)/ruby/io.h \
+	    $(hdrdir)/ruby/encoding.h \
+	    $(hdrdir)/ruby/oniguruma.h \
+	    $(hdrdir)/ruby/regex.h \
+            $(top_srcdir)/regenc.h \
+            $(top_srcdir)/node.h $(top_srcdir)/gc.h \
+	    $(hdrdir)/ruby/re.h $(top_srcdir)/node.h $(top_srcdir)/gc.h \
+	    $(top_srcdir)/regint.h $(top_srcdir)/internal.h
+gc_hook.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h
+object_tracing.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h
+objspace_dump.o: $(HDRS) $(ruby_headers) $(hdrdir)/ruby/debug.h \
+	    $(hdrdir)/ruby/encoding.h $(hdrdir)/ruby/io.h \
+	    $(top_srcdir)/node.h $(top_srcdir)/vm_core.h $(top_srcdir)/gc.h
diff --git a/ext/objspace/extconf.rb b/ext/objspace/extconf.rb
index adb8ef9169..23a42c4c20 100644
--- a/ext/objspace/extconf.rb
+++ b/ext/objspace/extconf.rb
@@ -1,4 +1,2 @@
-# frozen_string_literal: false
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
-$VPATH << '$(topdir)' << '$(top_srcdir)' # for id.h.
 create_makefile('objspace')
diff --git a/ext/objspace/object_tracing.c b/ext/objspace/object_tracing.c
index d3169c6c48..975518c654 100644
--- a/ext/objspace/object_tracing.c
+++ b/ext/objspace/object_tracing.c
@@ -13,9 +13,10 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/debug.h"
 #include "objspace.h"
+#include "internal.h"
 
 struct traceobj_arg {
     int running;
@@ -439,7 +440,7 @@ allocation_method_id(VALUE self, VALUE obj)
 }
 
 /*
- * call-seq: allocation_generation(object) -> integer or nil
+ * call-seq: allocation_generation(object) -> Fixnum
  *
  * Returns garbage collector generation for the given +object+.
  *
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index ba138e6244..88ebfca20e 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -12,13 +12,13 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include <ruby/ruby.h>
 #include <ruby/st.h>
 #include <ruby/io.h>
 #include <ruby/re.h>
 #include "node.h"
 #include "gc.h"
-#include "symbol.h"
+#include "internal.h"
 
 /*
  *  call-seq:
@@ -31,9 +31,6 @@
  *  correct.
  *
  *  This method is only expected to work with C Ruby.
- *
- *  From Ruby 2.2, memsize_of(obj) returns a memory size includes
- *  sizeof(RVALUE).
  */
 
 static VALUE
@@ -57,11 +54,13 @@ total_i(void *vstart, void *vend, size_t stride, void *ptr)
 	if (RBASIC(v)->flags) {
 	    switch (BUILTIN_TYPE(v)) {
 	      case T_NONE:
-	      case T_IMEMO:
 	      case T_ICLASS:
 	      case T_NODE:
 	      case T_ZOMBIE:
 		continue;
+	      case T_CLASS:
+		if (FL_TEST(v, FL_SINGLETON))
+		  continue;
 	      default:
 		if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
 		    data->total += rb_obj_memsize_of(v);
@@ -123,26 +122,6 @@ set_zero_i(st_data_t key, st_data_t val, st_data_t arg)
     return ST_CONTINUE;
 }
 
-static VALUE
-setup_hash(int argc, VALUE *argv)
-{
-    VALUE hash;
-
-    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
-        if (!RB_TYPE_P(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);
-    }
-
-    return hash;
-}
-
 static int
 cos_i(void *vstart, void *vend, size_t stride, void *data)
 {
@@ -185,7 +164,6 @@ type2sym(enum ruby_value_type i)
 	CASE_TYPE(T_SYMBOL);
 	CASE_TYPE(T_FIXNUM);
 	CASE_TYPE(T_UNDEF);
-	CASE_TYPE(T_IMEMO);
 	CASE_TYPE(T_NODE);
 	CASE_TYPE(T_ICLASS);
 	CASE_TYPE(T_ZOMBIE);
@@ -224,7 +202,12 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
     size_t counts[T_MASK+1];
     size_t total = 0;
     enum ruby_value_type i;
-    VALUE hash = setup_hash(argc, argv);
+    VALUE hash;
+
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (!RB_TYPE_P(hash, T_HASH))
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
 
     for (i = 0; i <= T_MASK; i++) {
 	counts[i] = 0;
@@ -250,84 +233,6 @@ count_objects_size(int argc, VALUE *argv, VALUE os)
     return hash;
 }
 
-struct dynamic_symbol_counts {
-    size_t mortal;
-    size_t immortal;
-};
-
-static int
-cs_i(void *vstart, void *vend, size_t stride, void *n)
-{
-    struct dynamic_symbol_counts *counts = (struct dynamic_symbol_counts *)n;
-    VALUE v = (VALUE)vstart;
-
-    for (; v != (VALUE)vend; v += stride) {
-	if (RBASIC(v)->flags && BUILTIN_TYPE(v) == T_SYMBOL) {
-	    ID id = RSYMBOL(v)->id;
-	    if ((id & ~ID_SCOPE_MASK) == 0) {
-		counts->mortal++;
-	    }
-	    else {
-		counts->immortal++;
-	    }
-	}
-    }
-
-    return 0;
-}
-
-size_t rb_sym_immortal_count(void);
-
-/*
- *  call-seq:
- *     ObjectSpace.count_symbols([result_hash]) -> hash
- *
- *  Counts symbols for each Symbol type.
- *
- *  This method is only for MRI developers interested in performance and memory
- *  usage of Ruby programs.
- *
- *  If the optional argument, result_hash, is given, it is overwritten and
- *  returned. This is intended to avoid probe effect.
- *
- *  Note:
- *  The contents of the returned hash is implementation defined.
- *  It may be changed in future.
- *
- *  This method is only expected to work with C Ruby.
- *
- *  On this version of MRI, they have 3 types of Symbols (and 1 total counts).
- *
- *   * mortal_dynamic_symbol: GC target symbols (collected by GC)
- *   * immortal_dynamic_symbol: Immortal symbols promoted from dynamic symbols (do not collected by GC)
- *   * immortal_static_symbol: Immortal symbols (do not collected by GC)
- *   * immortal_symbol: total immortal symbols (immortal_dynamic_symbol+immortal_static_symbol)
- */
-
-static VALUE
-count_symbols(int argc, VALUE *argv, VALUE os)
-{
-    struct dynamic_symbol_counts dynamic_counts = {0, 0};
-    VALUE hash = setup_hash(argc, argv);
-
-    size_t immortal_symbols = rb_sym_immortal_count();
-    rb_objspace_each_objects(cs_i, &dynamic_counts);
-
-    if (hash == Qnil) {
-        hash = rb_hash_new();
-    }
-    else if (!RHASH_EMPTY_P(hash)) {
-        st_foreach(RHASH_TBL(hash), set_zero_i, hash);
-    }
-
-    rb_hash_aset(hash, ID2SYM(rb_intern("mortal_dynamic_symbol")),   SIZET2NUM(dynamic_counts.mortal));
-    rb_hash_aset(hash, ID2SYM(rb_intern("immortal_dynamic_symbol")), SIZET2NUM(dynamic_counts.immortal));
-    rb_hash_aset(hash, ID2SYM(rb_intern("immortal_static_symbol")),  SIZET2NUM(immortal_symbols - dynamic_counts.immortal));
-    rb_hash_aset(hash, ID2SYM(rb_intern("immortal_symbol")),         SIZET2NUM(immortal_symbols));
-
-    return hash;
-}
-
 static int
 cn_i(void *vstart, void *vend, size_t stride, void *n)
 {
@@ -372,7 +277,12 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 {
     size_t nodes[NODE_LAST+1];
     size_t i;
-    VALUE hash = setup_hash(argc, argv);
+    VALUE hash;
+
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (!RB_TYPE_P(hash, T_HASH))
+            rb_raise(rb_eTypeError, "non-hash given");
+    }
 
     for (i = 0; i <= NODE_LAST; i++) {
 	nodes[i] = 0;
@@ -478,6 +388,7 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		COUNT_NODE(NODE_SCLASS);
 		COUNT_NODE(NODE_COLON2);
 		COUNT_NODE(NODE_COLON3);
+		COUNT_NODE(NODE_CREF);
 		COUNT_NODE(NODE_DOT2);
 		COUNT_NODE(NODE_DOT3);
 		COUNT_NODE(NODE_FLIP2);
@@ -491,6 +402,8 @@ count_nodes(int argc, VALUE *argv, VALUE os)
 		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);
@@ -571,85 +484,21 @@ cto_i(void *vstart, void *vend, size_t stride, void *data)
 static VALUE
 count_tdata_objects(int argc, VALUE *argv, VALUE self)
 {
-    VALUE hash = setup_hash(argc, argv);
-    rb_objspace_each_objects(cto_i, (void *)hash);
-    return hash;
-}
-
-static ID imemo_type_ids[imemo_mask+1];
-
-static int
-count_imemo_objects_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_IMEMO) {
-	    VALUE counter;
-	    VALUE key = ID2SYM(imemo_type_ids[imemo_type(v)]);
-
-	    counter = rb_hash_aref(hash, key);
-
-	    if (NIL_P(counter)) {
-		counter = INT2FIX(1);
-	    }
-	    else {
-		counter = INT2FIX(FIX2INT(counter) + 1);
-	    }
+    VALUE hash;
 
-	    rb_hash_aset(hash, key, counter);
-	}
+    if (rb_scan_args(argc, argv, "01", &hash) == 1) {
+        if (!RB_TYPE_P(hash, T_HASH))
+            rb_raise(rb_eTypeError, "non-hash given");
     }
 
-    return 0;
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.count_imemo_objects([result_hash]) -> hash
- *
- *  Counts objects for each +T_IMEMO+ type.
- *
- *  This method is only for MRI developers interested in performance and memory
- *  usage of Ruby programs.
- *
- *  It returns a hash as:
- *
- *       {:imemo_ifunc=>8,
- *        :imemo_svar=>7,
- *        :imemo_cref=>509,
- *        :imemo_memo=>1,
- *        :imemo_throw_data=>1}
- *
- *  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 specific and may change
- *  in the future.
- *
- *  In this version, keys are symbol objects.
- *
- *  This method is only expected to work with C Ruby.
- */
-
-static VALUE
-count_imemo_objects(int argc, VALUE *argv, VALUE self)
-{
-    VALUE hash = setup_hash(argc, argv);
-
-    if (imemo_type_ids[0] == 0) {
-	imemo_type_ids[0] = rb_intern("imemo_none");
-	imemo_type_ids[1] = rb_intern("imemo_cref");
-	imemo_type_ids[2] = rb_intern("imemo_svar");
-	imemo_type_ids[3] = rb_intern("imemo_throw_data");
-	imemo_type_ids[4] = rb_intern("imemo_ifunc");
-	imemo_type_ids[5] = rb_intern("imemo_memo");
-	imemo_type_ids[6] = rb_intern("imemo_ment");
-	imemo_type_ids[7] = rb_intern("imemo_iseq");
+    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(count_imemo_objects_i, (void *)hash);
+    rb_objspace_each_objects(cto_i, (void *)hash);
 
     return hash;
 }
@@ -670,7 +519,7 @@ iow_size(const void *ptr)
 static const rb_data_type_t iow_data_type = {
     "ObjectSpace::InternalObjectWrapper",
     {iow_mark, 0, iow_size,},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE rb_mInternalObjectWrapper;
@@ -678,7 +527,7 @@ static VALUE rb_mInternalObjectWrapper;
 static VALUE
 iow_newobj(VALUE obj)
 {
-    return TypedData_Wrap_Struct(rb_mInternalObjectWrapper, &iow_data_type, (void *)obj);
+    return rb_data_typed_object_alloc(rb_mInternalObjectWrapper, (void *)obj, &iow_data_type);
 }
 
 /* Returns the type of the internal object. */
@@ -823,7 +672,8 @@ reachable_object_from_root_i(const char *category, VALUE obj, void *ptr)
     else {
 	data->last_category = category;
 	category_str = data->last_category_str = rb_str_new2(category);
-	category_objects = data->last_category_objects = rb_ident_hash_new();
+	category_objects = data->last_category_objects = rb_hash_new();
+	rb_funcall(category_objects, rb_intern("compare_by_identity"), 0);
 	if (!NIL_P(rb_hash_lookup(data->categories, category_str))) {
 	    rb_bug("reachable_object_from_root_i: category should insert at once");
 	}
@@ -859,82 +709,16 @@ static VALUE
 reachable_objects_from_root(VALUE self)
 {
     struct rofr_data data;
-    VALUE hash = data.categories = rb_ident_hash_new();
+    VALUE hash = data.categories = rb_hash_new();
     data.last_category = 0;
 
+    rb_funcall(hash, rb_intern("compare_by_identity"), 0);
     rb_objspace_reachable_objects_from_root(reachable_object_from_root_i, &data);
     rb_hash_foreach(hash, collect_values_of_values, hash);
 
     return hash;
 }
 
-static VALUE
-wrap_klass_iow(VALUE klass)
-{
-    if (!RTEST(klass)) {
-	return Qnil;
-    }
-    else if (RB_TYPE_P(klass, T_ICLASS)) {
-	return iow_newobj(klass);
-    }
-    else {
-	return klass;
-    }
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.internal_class_of(obj) -> Class or Module
- *
- *  [MRI specific feature] Return internal class of obj.
- *  obj can be an instance of InternalObjectWrapper.
- *
- *  Note that you should not use this method in your application.
- */
-static VALUE
-objspace_internal_class_of(VALUE self, VALUE obj)
-{
-    VALUE klass;
-
-    if (rb_typeddata_is_kind_of(obj, &iow_data_type)) {
-	obj = (VALUE)DATA_PTR(obj);
-    }
-
-    klass = CLASS_OF(obj);
-    return wrap_klass_iow(klass);
-}
-
-/*
- *  call-seq:
- *     ObjectSpace.internal_super_of(cls) -> Class or Module
- *
- *  [MRI specific feature] Return internal super class of cls (Class or Module).
- *  obj can be an instance of InternalObjectWrapper.
- *
- *  Note that you should not use this method in your application.
- */
-static VALUE
-objspace_internal_super_of(VALUE self, VALUE obj)
-{
-    VALUE super;
-
-    if (rb_typeddata_is_kind_of(obj, &iow_data_type)) {
-	obj = (VALUE)DATA_PTR(obj);
-    }
-
-    switch (OBJ_BUILTIN_TYPE(obj)) {
-      case T_MODULE:
-      case T_CLASS:
-      case T_ICLASS:
-	super = RCLASS_SUPER(obj);
-	break;
-      default:
-	rb_raise(rb_eArgError, "class or module is expected");
-    }
-
-    return wrap_klass_iow(super);
-}
-
 void Init_object_tracing(VALUE rb_mObjSpace);
 void Init_objspace_dump(VALUE rb_mObjSpace);
 
@@ -966,17 +750,12 @@ Init_objspace(void)
     rb_define_module_function(rb_mObjSpace, "memsize_of_all", memsize_of_all_m, -1);
 
     rb_define_module_function(rb_mObjSpace, "count_objects_size", count_objects_size, -1);
-    rb_define_module_function(rb_mObjSpace, "count_symbols", count_symbols, -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);
-    rb_define_module_function(rb_mObjSpace, "count_imemo_objects", count_imemo_objects, -1);
 
     rb_define_module_function(rb_mObjSpace, "reachable_objects_from", reachable_objects_from, 1);
     rb_define_module_function(rb_mObjSpace, "reachable_objects_from_root", reachable_objects_from_root, 0);
 
-    rb_define_module_function(rb_mObjSpace, "internal_class_of", objspace_internal_class_of, 1);
-    rb_define_module_function(rb_mObjSpace, "internal_super_of", objspace_internal_super_of, 1);
-
     /*
      * This class is used as a return value from
      * ObjectSpace::reachable_objects_from.
diff --git a/ext/objspace/objspace_dump.c b/ext/objspace/objspace_dump.c
index 127d33283a..cb8f943d97 100644
--- a/ext/objspace/objspace_dump.c
+++ b/ext/objspace/objspace_dump.c
@@ -12,13 +12,15 @@
 
 **********************************************************************/
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/debug.h"
+#include "ruby/encoding.h"
 #include "ruby/io.h"
 #include "gc.h"
 #include "node.h"
 #include "vm_core.h"
 #include "objspace.h"
+#include "internal.h"
 
 static VALUE sym_output, sym_stdout, sym_string, sym_file;
 
@@ -33,7 +35,6 @@ struct dump_config {
     size_t cur_obj_references;
 };
 
-PRINTF_ARGS(static void dump_append(struct dump_config *, const char *, ...), 2, 3);
 static void
 dump_append(struct dump_config *dc, const char *format, ...)
 {
@@ -52,9 +53,8 @@ dump_append(struct dump_config *dc, const char *format, ...)
 static void
 dump_append_string_value(struct dump_config *dc, VALUE obj)
 {
-    long i;
-    char c;
-    const char *value;
+    int i;
+    char c, *value;
 
     dump_append(dc, "\"");
     for (i = 0, value = RSTRING_PTR(obj); i < RSTRING_LEN(obj); i++) {
@@ -91,14 +91,6 @@ dump_append_string_value(struct dump_config *dc, VALUE obj)
     dump_append(dc, "\"");
 }
 
-static void
-dump_append_symbol_value(struct dump_config *dc, VALUE obj)
-{
-    dump_append(dc, "{\"type\":\"SYMBOL\", \"value\":");
-    dump_append_string_value(dc, rb_sym2str(obj));
-    dump_append(dc, "}");
-}
-
 static inline const char *
 obj_type(VALUE obj)
 {
@@ -126,7 +118,6 @@ obj_type(VALUE obj)
 	CASE_TYPE(SYMBOL);
 	CASE_TYPE(RATIONAL);
 	CASE_TYPE(COMPLEX);
-	CASE_TYPE(IMEMO);
 	CASE_TYPE(UNDEF);
 	CASE_TYPE(NODE);
 	CASE_TYPE(ZOMBIE);
@@ -136,32 +127,6 @@ obj_type(VALUE obj)
 }
 
 static void
-dump_append_special_const(struct dump_config *dc, VALUE value)
-{
-    if (value == Qtrue) {
-	dump_append(dc, "true");
-    }
-    else if (value == Qfalse) {
-	dump_append(dc, "false");
-    }
-    else if (value == Qnil) {
-	dump_append(dc, "null");
-    }
-    else if (FIXNUM_P(value)) {
-	dump_append(dc, "%ld", FIX2LONG(value));
-    }
-    else if (FLONUM_P(value)) {
-	dump_append(dc, "%#g", RFLOAT_VALUE(value));
-    }
-    else if (SYMBOL_P(value)) {
-	dump_append_symbol_value(dc, value);
-    }
-    else {
-	dump_append(dc, "{}");
-    }
-}
-
-static void
 reachable_object_i(VALUE ref, void *data)
 {
     struct dump_config *dc = (struct dump_config *)data;
@@ -178,19 +143,6 @@ reachable_object_i(VALUE ref, void *data)
 }
 
 static void
-dump_append_string_content(struct dump_config *dc, VALUE obj)
-{
-    dump_append(dc, ", \"bytesize\":%ld", RSTRING_LEN(obj));
-    if (!STR_EMBED_P(obj) && !STR_SHARED_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj))
-	dump_append(dc, ", \"capacity\":%"PRIuSIZE, rb_str_capacity(obj));
-
-    if (is_ascii_string(obj)) {
-	dump_append(dc, ", \"value\":");
-	dump_append_string_value(dc, obj);
-    }
-}
-
-static void
 dump_object(VALUE obj, struct dump_config *dc)
 {
     size_t memsize;
@@ -199,11 +151,6 @@ dump_object(VALUE obj, struct dump_config *dc)
     ID flags[RB_OBJ_GC_FLAGS_MAX];
     size_t n, i;
 
-    if (SPECIAL_CONST_P(obj)) {
-	dump_append_special_const(dc, obj);
-	return;
-    }
-
     dc->cur_obj = obj;
     dc->cur_obj_references = 0;
     dc->cur_obj_klass = BUILTIN_TYPE(obj) == T_NODE ? 0 : RBASIC_CLASS(obj);
@@ -223,10 +170,6 @@ dump_object(VALUE obj, struct dump_config *dc)
 	dump_append(dc, ", \"node_type\":\"%s\"", ruby_node_name(nd_type(obj)));
 	break;
 
-      case T_SYMBOL:
-	dump_append_string_content(dc, rb_sym2str(obj));
-	break;
-
       case T_STRING:
 	if (STR_EMBED_P(obj))
 	    dump_append(dc, ", \"embedded\":true");
@@ -236,15 +179,23 @@ dump_object(VALUE obj, struct dump_config *dc)
 	    dump_append(dc, ", \"fstring\":true");
 	if (STR_SHARED_P(obj))
 	    dump_append(dc, ", \"shared\":true");
-	else
-	    dump_append_string_content(dc, obj);
+	else {
+	    dump_append(dc, ", \"bytesize\":%ld", RSTRING_LEN(obj));
+	    if (!STR_EMBED_P(obj) && !STR_SHARED_P(obj) && (long)rb_str_capacity(obj) != RSTRING_LEN(obj))
+		dump_append(dc, ", \"capacity\":%ld", rb_str_capacity(obj));
+
+	    if (is_ascii_string(obj)) {
+		dump_append(dc, ", \"value\":");
+		dump_append_string_value(dc, obj);
+	    }
+	}
 
 	if (!ENCODING_IS_ASCII8BIT(obj))
 	    dump_append(dc, ", \"encoding\":\"%s\"", rb_enc_name(rb_enc_from_index(ENCODING_GET(obj))));
 	break;
 
       case T_HASH:
-	dump_append(dc, ", \"size\":%"PRIuSIZE, (size_t)RHASH_SIZE(obj));
+	dump_append(dc, ", \"size\":%ld", RHASH_SIZE(obj));
 	if (FL_TEST(obj, HASH_PROC_DEFAULT))
 	    dump_append(dc, ", \"default\":\"%p\"", (void *)RHASH_IFNONE(obj));
 	break;
@@ -273,7 +224,7 @@ dump_object(VALUE obj, struct dump_config *dc)
 	break;
 
       case T_OBJECT:
-	dump_append(dc, ", \"ivars\":%u", ROBJECT_NUMIV(obj));
+	dump_append(dc, ", \"ivars\":%ld", ROBJECT_NUMIV(obj));
 	break;
 
       case T_FILE:
@@ -382,7 +333,7 @@ static VALUE
 dump_result(struct dump_config *dc, VALUE output)
 {
     if (output == sym_string) {
-	return rb_str_resurrect(dc->string);
+	return dc->string;
     }
     else if (output == sym_file) {
 	rb_io_flush(dc->string);
diff --git a/ext/openssl/History.md b/ext/openssl/History.md
deleted file mode 100644
index 029426fb8c..0000000000
--- a/ext/openssl/History.md
+++ /dev/null
@@ -1,137 +0,0 @@
-Version 2.0.0
-=============
-
-This is the first release of openssl gem, formerly a standard library of Ruby,
-ext/openssl. This is the successor of the version included in Ruby 2.3.
-
-Compatibility notes
--------------------
-
-* Support for OpenSSL version 0.9.6 and 0.9.7 is completely removed. openssl gem
-  still works with OpenSSL 0.9.8, but users are strongly encouraged to upgrade
-  to at least 1.0.1, as OpenSSL < 1.0.1 will not receive any security fixes from
-  the OpenSSL development team.
-
-Supported platforms
--------------------
-
-* OpenSSL 1.0.0, 1.0.1, 1.0.2, 1.1.0
-* OpenSSL < 0.9.8 is no longer supported.
-* LibreSSL 2.3, 2.4, 2.5
-* Ruby 2.3, 2.4
-
-Notable changes
----------------
-
-* Add support for OpenSSL 1.1.0. [[Feature #12324]](https://bugs.ruby-lang.org/issues/12324)
-* Add support for LibreSSL
-
-* OpenSSL::Cipher
-
-  - OpenSSL::Cipher#key= and #iv= reject too long inputs. They used to truncate
-    silently. [[Bug #12561]](https://bugs.ruby-lang.org/issues/12561)
-
-  - OpenSSL::Cipher#iv_len= is added. It allows changing IV (nonce) length if
-    using AEAD ciphers.
-    [[Bug #8667]](https://bugs.ruby-lang.org/issues/8667),
-    [[Bug #10420]](https://bugs.ruby-lang.org/issues/10420),
-    [[GH ruby/ruby#569]](https://github.com/ruby/ruby/pull/569),
-    [[GH ruby/openssl#58]](https://github.com/ruby/openssl/pull/58)
-
-  - OpenSSL::Cipher#auth_tag_len= is added. This sets the authentication tag
-    length to be generated by an AEAD cipher.
-
-* OpenSSL::OCSP
-
-  - Accessor methods are added to OpenSSL::OCSP::CertificateId.
-    [[Feature #7181]](https://bugs.ruby-lang.org/issues/7181)
-
-  - OpenSSL::OCSP::Request and BasicResponse can be signed with non-SHA-1 hash
-    algorithm. [[Feature #11552]](https://bugs.ruby-lang.org/issues/11552)
-
-  - OpenSSL::OCSP::CertificateId and BasicResponse can be encoded into DER.
-
-  - A new class OpenSSL::OCSP::SingleResponse is added for convenience.
-
-  - OpenSSL::OCSP::BasicResponse#add_status accepts absolute times. They used to
-    accept only relative seconds from the current time.
-
-* OpenSSL::PKey
-
-  - OpenSSL::PKey::EC follows the general PKey interface.
-    [[Bug #6567]](https://bugs.ruby-lang.org/issues/6567)
-
-  - OpenSSL::PKey.read raises OpenSSL::PKey::PKeyError instead of ArgumentError
-    for consistency with OpenSSL::PKey::{DH,DSA,RSA,EC}#new.
-    [[Bug #11774]](https://bugs.ruby-lang.org/issues/11774),
-    [[GH ruby/openssl#55]](https://github.com/ruby/openssl/pull/55)
-
-  - OpenSSL::PKey::EC::Group retrieved by OpenSSL::PKey::EC#group is no longer
-    linked with the EC key. Modifications to the EC::Group have no effect on the
-    key. [[GH ruby/openssl#71]](https://github.com/ruby/openssl/pull/71)
-
-  - OpenSSL::PKey::EC::Point#to_bn allows specifying the point conversion form
-    by the optional argument.
-
-* OpenSSL::SSL
-
-  - OpenSSL::SSL::SSLSocket#tmp_key is added. A client can call it after the
-    connection is established to retrieve the ephemeral key.
-    [[GH ruby/ruby#1318]](https://github.com/ruby/ruby/pull/1318)
-
-  - The automatic ephemeral ECDH curve selection is enabled by default when
-    built with OpenSSL >= 1.0.2 or LibreSSL.
-
-  - OpenSSL::SSL::SSLContext#security_level= is added. You can set the "security
-    level" of the SSL context. This is effective only when built with OpenSSL
-    1.1.0.
-
-  - A new option 'verify_hostname' is added to OpenSSL::SSL::SSLContext. When it
-    is enabled, and the SNI hostname is also set, the hostname verification on
-    the server certificate is automatically performed. It is now enabled by
-    OpenSSL::SSL::Context#set_params.
-    [[GH ruby/openssl#60]](https://github.com/ruby/openssl/pull/60)
-
-Removals
---------
-
-* OpenSSL::Engine
-
-  - OpenSSL::Engine.cleanup does nothing when built with OpenSSL 1.1.0.
-
-* OpenSSL::SSL
-
-  - OpenSSL::PKey::DH::DEFAULT_512 is removed. Hence servers no longer use
-    512-bit DH group by default. It is considered too weak nowadays.
-    [[Bug #11968]](https://bugs.ruby-lang.org/issues/11968),
-    [[GH ruby/ruby#1196]](https://github.com/ruby/ruby/pull/1196)
-
-  - RC4 cipher suites are removed from OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
-    RC4 is now considered to be weak.
-    [[GH ruby/openssl#50]](https://github.com/ruby/openssl/pull/50)
-
-Deprecations
-------------
-
-* OpenSSL::PKey
-
-  - OpenSSL::PKey::RSA#n=, #e=, #d=, #p=, #q=, #dmp1=, #dmq1=, #iqmp=,
-    OpenSSL::PKey::DSA#p=, #q=, #g=, #priv_key=, #pub_key=,
-    OpenSSL::PKey::DH#p=, #g=, #priv_key= and #pub_key= are deprecated. They are
-    disabled when built with OpenSSL 1.1.0, due to its API change. Instead,
-    OpenSSL::PKey::RSA#set_key, #set_factors, #set_crt_params,
-    OpenSSL::PKey::DSA#set_pqg, #set_key, OpenSSL::PKey::DH#set_pqg and #set_key
-    are added.
-
-* OpenSSL::Random
-
-  - OpenSSL::Random.pseudo_bytes is deprecated, and not defined when built with
-    OpenSSL 1.1.0. Use OpenSSL::Random.random_bytes instead.
-
-* OpenSSL::SSL
-
-  - OpenSSL::SSL::SSLContext#tmp_ecdh_callback is deprecated, as the underlying
-    API SSL_CTX_set_tmp_ecdh_callback() is removed in OpenSSL 1.1.0. It was
-    first added in Ruby 2.3.0. To specify the curve to be used in ephemeral
-    ECDH, use OpenSSL::SSL::SSLContext#ecdh_curves=. The automatic curve
-    selection is also now enabled by default when built with a capable OpenSSL.
diff --git a/ext/openssl/depend b/ext/openssl/depend
index 8426765281..23bebd8cc8 100644
--- a/ext/openssl/depend
+++ b/ext/openssl/depend
@@ -1,1123 +1,6 @@
-# AUTOGENERATED DEPENDENCIES START
-openssl_missing.o: $(RUBY_EXTCONF_H)
-openssl_missing.o: $(arch_hdrdir)/ruby/config.h
-openssl_missing.o: openssl_missing.c
-openssl_missing.o: openssl_missing.h
-ossl.o: $(RUBY_EXTCONF_H)
-ossl.o: $(arch_hdrdir)/ruby/config.h
-ossl.o: $(hdrdir)/ruby/backward.h
-ossl.o: $(hdrdir)/ruby/defines.h
-ossl.o: $(hdrdir)/ruby/encoding.h
-ossl.o: $(hdrdir)/ruby/intern.h
-ossl.o: $(hdrdir)/ruby/io.h
-ossl.o: $(hdrdir)/ruby/missing.h
-ossl.o: $(hdrdir)/ruby/oniguruma.h
-ossl.o: $(hdrdir)/ruby/ruby.h
-ossl.o: $(hdrdir)/ruby/st.h
-ossl.o: $(hdrdir)/ruby/subst.h
-ossl.o: $(hdrdir)/ruby/thread.h
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \
+  $(hdrdir)/ruby/thread.h
 ossl.o: $(hdrdir)/ruby/thread_native.h
-ossl.o: $(top_srcdir)/include/ruby.h
-ossl.o: openssl_missing.h
-ossl.o: ossl.c
-ossl.o: ossl.h
-ossl.o: ossl_asn1.h
-ossl.o: ossl_bio.h
-ossl.o: ossl_bn.h
-ossl.o: ossl_cipher.h
-ossl.o: ossl_config.h
-ossl.o: ossl_digest.h
-ossl.o: ossl_engine.h
-ossl.o: ossl_hmac.h
-ossl.o: ossl_ns_spki.h
-ossl.o: ossl_ocsp.h
-ossl.o: ossl_pkcs12.h
-ossl.o: ossl_pkcs5.h
-ossl.o: ossl_pkcs7.h
-ossl.o: ossl_pkey.h
-ossl.o: ossl_rand.h
-ossl.o: ossl_ssl.h
-ossl.o: ossl_version.h
-ossl.o: ossl_x509.h
-ossl.o: ruby_missing.h
-ossl_asn1.o: $(RUBY_EXTCONF_H)
-ossl_asn1.o: $(arch_hdrdir)/ruby/config.h
-ossl_asn1.o: $(hdrdir)/ruby/backward.h
-ossl_asn1.o: $(hdrdir)/ruby/defines.h
-ossl_asn1.o: $(hdrdir)/ruby/encoding.h
-ossl_asn1.o: $(hdrdir)/ruby/intern.h
-ossl_asn1.o: $(hdrdir)/ruby/io.h
-ossl_asn1.o: $(hdrdir)/ruby/missing.h
-ossl_asn1.o: $(hdrdir)/ruby/oniguruma.h
-ossl_asn1.o: $(hdrdir)/ruby/ruby.h
-ossl_asn1.o: $(hdrdir)/ruby/st.h
-ossl_asn1.o: $(hdrdir)/ruby/subst.h
-ossl_asn1.o: $(hdrdir)/ruby/thread.h
-ossl_asn1.o: $(top_srcdir)/include/ruby.h
-ossl_asn1.o: openssl_missing.h
-ossl_asn1.o: ossl.h
-ossl_asn1.o: ossl_asn1.c
-ossl_asn1.o: ossl_asn1.h
-ossl_asn1.o: ossl_bio.h
-ossl_asn1.o: ossl_bn.h
-ossl_asn1.o: ossl_cipher.h
-ossl_asn1.o: ossl_config.h
-ossl_asn1.o: ossl_digest.h
-ossl_asn1.o: ossl_engine.h
-ossl_asn1.o: ossl_hmac.h
-ossl_asn1.o: ossl_ns_spki.h
-ossl_asn1.o: ossl_ocsp.h
-ossl_asn1.o: ossl_pkcs12.h
-ossl_asn1.o: ossl_pkcs5.h
-ossl_asn1.o: ossl_pkcs7.h
-ossl_asn1.o: ossl_pkey.h
-ossl_asn1.o: ossl_rand.h
-ossl_asn1.o: ossl_ssl.h
-ossl_asn1.o: ossl_version.h
-ossl_asn1.o: ossl_x509.h
-ossl_asn1.o: ruby_missing.h
-ossl_bio.o: $(RUBY_EXTCONF_H)
-ossl_bio.o: $(arch_hdrdir)/ruby/config.h
-ossl_bio.o: $(hdrdir)/ruby/backward.h
-ossl_bio.o: $(hdrdir)/ruby/defines.h
-ossl_bio.o: $(hdrdir)/ruby/encoding.h
-ossl_bio.o: $(hdrdir)/ruby/intern.h
-ossl_bio.o: $(hdrdir)/ruby/io.h
-ossl_bio.o: $(hdrdir)/ruby/missing.h
-ossl_bio.o: $(hdrdir)/ruby/oniguruma.h
-ossl_bio.o: $(hdrdir)/ruby/ruby.h
-ossl_bio.o: $(hdrdir)/ruby/st.h
-ossl_bio.o: $(hdrdir)/ruby/subst.h
-ossl_bio.o: $(hdrdir)/ruby/thread.h
-ossl_bio.o: $(top_srcdir)/include/ruby.h
-ossl_bio.o: openssl_missing.h
-ossl_bio.o: ossl.h
-ossl_bio.o: ossl_asn1.h
-ossl_bio.o: ossl_bio.c
-ossl_bio.o: ossl_bio.h
-ossl_bio.o: ossl_bn.h
-ossl_bio.o: ossl_cipher.h
-ossl_bio.o: ossl_config.h
-ossl_bio.o: ossl_digest.h
-ossl_bio.o: ossl_engine.h
-ossl_bio.o: ossl_hmac.h
-ossl_bio.o: ossl_ns_spki.h
-ossl_bio.o: ossl_ocsp.h
-ossl_bio.o: ossl_pkcs12.h
-ossl_bio.o: ossl_pkcs5.h
-ossl_bio.o: ossl_pkcs7.h
-ossl_bio.o: ossl_pkey.h
-ossl_bio.o: ossl_rand.h
-ossl_bio.o: ossl_ssl.h
-ossl_bio.o: ossl_version.h
-ossl_bio.o: ossl_x509.h
-ossl_bio.o: ruby_missing.h
-ossl_bn.o: $(RUBY_EXTCONF_H)
-ossl_bn.o: $(arch_hdrdir)/ruby/config.h
-ossl_bn.o: $(hdrdir)/ruby/backward.h
-ossl_bn.o: $(hdrdir)/ruby/defines.h
-ossl_bn.o: $(hdrdir)/ruby/encoding.h
-ossl_bn.o: $(hdrdir)/ruby/intern.h
-ossl_bn.o: $(hdrdir)/ruby/io.h
-ossl_bn.o: $(hdrdir)/ruby/missing.h
-ossl_bn.o: $(hdrdir)/ruby/oniguruma.h
-ossl_bn.o: $(hdrdir)/ruby/ruby.h
-ossl_bn.o: $(hdrdir)/ruby/st.h
-ossl_bn.o: $(hdrdir)/ruby/subst.h
-ossl_bn.o: $(hdrdir)/ruby/thread.h
-ossl_bn.o: $(top_srcdir)/include/ruby.h
-ossl_bn.o: openssl_missing.h
-ossl_bn.o: ossl.h
-ossl_bn.o: ossl_asn1.h
-ossl_bn.o: ossl_bio.h
-ossl_bn.o: ossl_bn.c
-ossl_bn.o: ossl_bn.h
-ossl_bn.o: ossl_cipher.h
-ossl_bn.o: ossl_config.h
-ossl_bn.o: ossl_digest.h
-ossl_bn.o: ossl_engine.h
-ossl_bn.o: ossl_hmac.h
-ossl_bn.o: ossl_ns_spki.h
-ossl_bn.o: ossl_ocsp.h
-ossl_bn.o: ossl_pkcs12.h
-ossl_bn.o: ossl_pkcs5.h
-ossl_bn.o: ossl_pkcs7.h
-ossl_bn.o: ossl_pkey.h
-ossl_bn.o: ossl_rand.h
-ossl_bn.o: ossl_ssl.h
-ossl_bn.o: ossl_version.h
-ossl_bn.o: ossl_x509.h
-ossl_bn.o: ruby_missing.h
-ossl_cipher.o: $(RUBY_EXTCONF_H)
-ossl_cipher.o: $(arch_hdrdir)/ruby/config.h
-ossl_cipher.o: $(hdrdir)/ruby/backward.h
-ossl_cipher.o: $(hdrdir)/ruby/defines.h
-ossl_cipher.o: $(hdrdir)/ruby/encoding.h
-ossl_cipher.o: $(hdrdir)/ruby/intern.h
-ossl_cipher.o: $(hdrdir)/ruby/io.h
-ossl_cipher.o: $(hdrdir)/ruby/missing.h
-ossl_cipher.o: $(hdrdir)/ruby/oniguruma.h
-ossl_cipher.o: $(hdrdir)/ruby/ruby.h
-ossl_cipher.o: $(hdrdir)/ruby/st.h
-ossl_cipher.o: $(hdrdir)/ruby/subst.h
-ossl_cipher.o: $(hdrdir)/ruby/thread.h
-ossl_cipher.o: $(top_srcdir)/include/ruby.h
-ossl_cipher.o: openssl_missing.h
-ossl_cipher.o: ossl.h
-ossl_cipher.o: ossl_asn1.h
-ossl_cipher.o: ossl_bio.h
-ossl_cipher.o: ossl_bn.h
-ossl_cipher.o: ossl_cipher.c
-ossl_cipher.o: ossl_cipher.h
-ossl_cipher.o: ossl_config.h
-ossl_cipher.o: ossl_digest.h
-ossl_cipher.o: ossl_engine.h
-ossl_cipher.o: ossl_hmac.h
-ossl_cipher.o: ossl_ns_spki.h
-ossl_cipher.o: ossl_ocsp.h
-ossl_cipher.o: ossl_pkcs12.h
-ossl_cipher.o: ossl_pkcs5.h
-ossl_cipher.o: ossl_pkcs7.h
-ossl_cipher.o: ossl_pkey.h
-ossl_cipher.o: ossl_rand.h
-ossl_cipher.o: ossl_ssl.h
-ossl_cipher.o: ossl_version.h
-ossl_cipher.o: ossl_x509.h
-ossl_cipher.o: ruby_missing.h
-ossl_config.o: $(RUBY_EXTCONF_H)
-ossl_config.o: $(arch_hdrdir)/ruby/config.h
-ossl_config.o: $(hdrdir)/ruby/backward.h
-ossl_config.o: $(hdrdir)/ruby/defines.h
-ossl_config.o: $(hdrdir)/ruby/encoding.h
-ossl_config.o: $(hdrdir)/ruby/intern.h
-ossl_config.o: $(hdrdir)/ruby/io.h
-ossl_config.o: $(hdrdir)/ruby/missing.h
-ossl_config.o: $(hdrdir)/ruby/oniguruma.h
-ossl_config.o: $(hdrdir)/ruby/ruby.h
-ossl_config.o: $(hdrdir)/ruby/st.h
-ossl_config.o: $(hdrdir)/ruby/subst.h
-ossl_config.o: $(hdrdir)/ruby/thread.h
-ossl_config.o: $(top_srcdir)/include/ruby.h
-ossl_config.o: openssl_missing.h
-ossl_config.o: ossl.h
-ossl_config.o: ossl_asn1.h
-ossl_config.o: ossl_bio.h
-ossl_config.o: ossl_bn.h
-ossl_config.o: ossl_cipher.h
-ossl_config.o: ossl_config.c
-ossl_config.o: ossl_config.h
-ossl_config.o: ossl_digest.h
-ossl_config.o: ossl_engine.h
-ossl_config.o: ossl_hmac.h
-ossl_config.o: ossl_ns_spki.h
-ossl_config.o: ossl_ocsp.h
-ossl_config.o: ossl_pkcs12.h
-ossl_config.o: ossl_pkcs5.h
-ossl_config.o: ossl_pkcs7.h
-ossl_config.o: ossl_pkey.h
-ossl_config.o: ossl_rand.h
-ossl_config.o: ossl_ssl.h
-ossl_config.o: ossl_version.h
-ossl_config.o: ossl_x509.h
-ossl_config.o: ruby_missing.h
-ossl_digest.o: $(RUBY_EXTCONF_H)
-ossl_digest.o: $(arch_hdrdir)/ruby/config.h
-ossl_digest.o: $(hdrdir)/ruby/backward.h
-ossl_digest.o: $(hdrdir)/ruby/defines.h
-ossl_digest.o: $(hdrdir)/ruby/encoding.h
-ossl_digest.o: $(hdrdir)/ruby/intern.h
-ossl_digest.o: $(hdrdir)/ruby/io.h
-ossl_digest.o: $(hdrdir)/ruby/missing.h
-ossl_digest.o: $(hdrdir)/ruby/oniguruma.h
-ossl_digest.o: $(hdrdir)/ruby/ruby.h
-ossl_digest.o: $(hdrdir)/ruby/st.h
-ossl_digest.o: $(hdrdir)/ruby/subst.h
-ossl_digest.o: $(hdrdir)/ruby/thread.h
-ossl_digest.o: $(top_srcdir)/include/ruby.h
-ossl_digest.o: openssl_missing.h
-ossl_digest.o: ossl.h
-ossl_digest.o: ossl_asn1.h
-ossl_digest.o: ossl_bio.h
-ossl_digest.o: ossl_bn.h
-ossl_digest.o: ossl_cipher.h
-ossl_digest.o: ossl_config.h
-ossl_digest.o: ossl_digest.c
-ossl_digest.o: ossl_digest.h
-ossl_digest.o: ossl_engine.h
-ossl_digest.o: ossl_hmac.h
-ossl_digest.o: ossl_ns_spki.h
-ossl_digest.o: ossl_ocsp.h
-ossl_digest.o: ossl_pkcs12.h
-ossl_digest.o: ossl_pkcs5.h
-ossl_digest.o: ossl_pkcs7.h
-ossl_digest.o: ossl_pkey.h
-ossl_digest.o: ossl_rand.h
-ossl_digest.o: ossl_ssl.h
-ossl_digest.o: ossl_version.h
-ossl_digest.o: ossl_x509.h
-ossl_digest.o: ruby_missing.h
-ossl_engine.o: $(RUBY_EXTCONF_H)
-ossl_engine.o: $(arch_hdrdir)/ruby/config.h
-ossl_engine.o: $(hdrdir)/ruby/backward.h
-ossl_engine.o: $(hdrdir)/ruby/defines.h
-ossl_engine.o: $(hdrdir)/ruby/encoding.h
-ossl_engine.o: $(hdrdir)/ruby/intern.h
-ossl_engine.o: $(hdrdir)/ruby/io.h
-ossl_engine.o: $(hdrdir)/ruby/missing.h
-ossl_engine.o: $(hdrdir)/ruby/oniguruma.h
-ossl_engine.o: $(hdrdir)/ruby/ruby.h
-ossl_engine.o: $(hdrdir)/ruby/st.h
-ossl_engine.o: $(hdrdir)/ruby/subst.h
-ossl_engine.o: $(hdrdir)/ruby/thread.h
-ossl_engine.o: $(top_srcdir)/include/ruby.h
-ossl_engine.o: openssl_missing.h
-ossl_engine.o: ossl.h
-ossl_engine.o: ossl_asn1.h
-ossl_engine.o: ossl_bio.h
-ossl_engine.o: ossl_bn.h
-ossl_engine.o: ossl_cipher.h
-ossl_engine.o: ossl_config.h
-ossl_engine.o: ossl_digest.h
-ossl_engine.o: ossl_engine.c
-ossl_engine.o: ossl_engine.h
-ossl_engine.o: ossl_hmac.h
-ossl_engine.o: ossl_ns_spki.h
-ossl_engine.o: ossl_ocsp.h
-ossl_engine.o: ossl_pkcs12.h
-ossl_engine.o: ossl_pkcs5.h
-ossl_engine.o: ossl_pkcs7.h
-ossl_engine.o: ossl_pkey.h
-ossl_engine.o: ossl_rand.h
-ossl_engine.o: ossl_ssl.h
-ossl_engine.o: ossl_version.h
-ossl_engine.o: ossl_x509.h
-ossl_engine.o: ruby_missing.h
-ossl_hmac.o: $(RUBY_EXTCONF_H)
-ossl_hmac.o: $(arch_hdrdir)/ruby/config.h
-ossl_hmac.o: $(hdrdir)/ruby/backward.h
-ossl_hmac.o: $(hdrdir)/ruby/defines.h
-ossl_hmac.o: $(hdrdir)/ruby/encoding.h
-ossl_hmac.o: $(hdrdir)/ruby/intern.h
-ossl_hmac.o: $(hdrdir)/ruby/io.h
-ossl_hmac.o: $(hdrdir)/ruby/missing.h
-ossl_hmac.o: $(hdrdir)/ruby/oniguruma.h
-ossl_hmac.o: $(hdrdir)/ruby/ruby.h
-ossl_hmac.o: $(hdrdir)/ruby/st.h
-ossl_hmac.o: $(hdrdir)/ruby/subst.h
-ossl_hmac.o: $(hdrdir)/ruby/thread.h
-ossl_hmac.o: $(top_srcdir)/include/ruby.h
-ossl_hmac.o: openssl_missing.h
-ossl_hmac.o: ossl.h
-ossl_hmac.o: ossl_asn1.h
-ossl_hmac.o: ossl_bio.h
-ossl_hmac.o: ossl_bn.h
-ossl_hmac.o: ossl_cipher.h
-ossl_hmac.o: ossl_config.h
-ossl_hmac.o: ossl_digest.h
-ossl_hmac.o: ossl_engine.h
-ossl_hmac.o: ossl_hmac.c
-ossl_hmac.o: ossl_hmac.h
-ossl_hmac.o: ossl_ns_spki.h
-ossl_hmac.o: ossl_ocsp.h
-ossl_hmac.o: ossl_pkcs12.h
-ossl_hmac.o: ossl_pkcs5.h
-ossl_hmac.o: ossl_pkcs7.h
-ossl_hmac.o: ossl_pkey.h
-ossl_hmac.o: ossl_rand.h
-ossl_hmac.o: ossl_ssl.h
-ossl_hmac.o: ossl_version.h
-ossl_hmac.o: ossl_x509.h
-ossl_hmac.o: ruby_missing.h
-ossl_ns_spki.o: $(RUBY_EXTCONF_H)
-ossl_ns_spki.o: $(arch_hdrdir)/ruby/config.h
-ossl_ns_spki.o: $(hdrdir)/ruby/backward.h
-ossl_ns_spki.o: $(hdrdir)/ruby/defines.h
-ossl_ns_spki.o: $(hdrdir)/ruby/encoding.h
-ossl_ns_spki.o: $(hdrdir)/ruby/intern.h
-ossl_ns_spki.o: $(hdrdir)/ruby/io.h
-ossl_ns_spki.o: $(hdrdir)/ruby/missing.h
-ossl_ns_spki.o: $(hdrdir)/ruby/oniguruma.h
-ossl_ns_spki.o: $(hdrdir)/ruby/ruby.h
-ossl_ns_spki.o: $(hdrdir)/ruby/st.h
-ossl_ns_spki.o: $(hdrdir)/ruby/subst.h
-ossl_ns_spki.o: $(hdrdir)/ruby/thread.h
-ossl_ns_spki.o: $(top_srcdir)/include/ruby.h
-ossl_ns_spki.o: openssl_missing.h
-ossl_ns_spki.o: ossl.h
-ossl_ns_spki.o: ossl_asn1.h
-ossl_ns_spki.o: ossl_bio.h
-ossl_ns_spki.o: ossl_bn.h
-ossl_ns_spki.o: ossl_cipher.h
-ossl_ns_spki.o: ossl_config.h
-ossl_ns_spki.o: ossl_digest.h
-ossl_ns_spki.o: ossl_engine.h
-ossl_ns_spki.o: ossl_hmac.h
-ossl_ns_spki.o: ossl_ns_spki.c
-ossl_ns_spki.o: ossl_ns_spki.h
-ossl_ns_spki.o: ossl_ocsp.h
-ossl_ns_spki.o: ossl_pkcs12.h
-ossl_ns_spki.o: ossl_pkcs5.h
-ossl_ns_spki.o: ossl_pkcs7.h
-ossl_ns_spki.o: ossl_pkey.h
-ossl_ns_spki.o: ossl_rand.h
-ossl_ns_spki.o: ossl_ssl.h
-ossl_ns_spki.o: ossl_version.h
-ossl_ns_spki.o: ossl_x509.h
-ossl_ns_spki.o: ruby_missing.h
-ossl_ocsp.o: $(RUBY_EXTCONF_H)
-ossl_ocsp.o: $(arch_hdrdir)/ruby/config.h
-ossl_ocsp.o: $(hdrdir)/ruby/backward.h
-ossl_ocsp.o: $(hdrdir)/ruby/defines.h
-ossl_ocsp.o: $(hdrdir)/ruby/encoding.h
-ossl_ocsp.o: $(hdrdir)/ruby/intern.h
-ossl_ocsp.o: $(hdrdir)/ruby/io.h
-ossl_ocsp.o: $(hdrdir)/ruby/missing.h
-ossl_ocsp.o: $(hdrdir)/ruby/oniguruma.h
-ossl_ocsp.o: $(hdrdir)/ruby/ruby.h
-ossl_ocsp.o: $(hdrdir)/ruby/st.h
-ossl_ocsp.o: $(hdrdir)/ruby/subst.h
-ossl_ocsp.o: $(hdrdir)/ruby/thread.h
-ossl_ocsp.o: $(top_srcdir)/include/ruby.h
-ossl_ocsp.o: openssl_missing.h
-ossl_ocsp.o: ossl.h
-ossl_ocsp.o: ossl_asn1.h
-ossl_ocsp.o: ossl_bio.h
-ossl_ocsp.o: ossl_bn.h
-ossl_ocsp.o: ossl_cipher.h
-ossl_ocsp.o: ossl_config.h
-ossl_ocsp.o: ossl_digest.h
-ossl_ocsp.o: ossl_engine.h
-ossl_ocsp.o: ossl_hmac.h
-ossl_ocsp.o: ossl_ns_spki.h
-ossl_ocsp.o: ossl_ocsp.c
-ossl_ocsp.o: ossl_ocsp.h
-ossl_ocsp.o: ossl_pkcs12.h
-ossl_ocsp.o: ossl_pkcs5.h
-ossl_ocsp.o: ossl_pkcs7.h
-ossl_ocsp.o: ossl_pkey.h
-ossl_ocsp.o: ossl_rand.h
-ossl_ocsp.o: ossl_ssl.h
-ossl_ocsp.o: ossl_version.h
-ossl_ocsp.o: ossl_x509.h
-ossl_ocsp.o: ruby_missing.h
-ossl_pkcs12.o: $(RUBY_EXTCONF_H)
-ossl_pkcs12.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkcs12.o: $(hdrdir)/ruby/backward.h
-ossl_pkcs12.o: $(hdrdir)/ruby/defines.h
-ossl_pkcs12.o: $(hdrdir)/ruby/encoding.h
-ossl_pkcs12.o: $(hdrdir)/ruby/intern.h
-ossl_pkcs12.o: $(hdrdir)/ruby/io.h
-ossl_pkcs12.o: $(hdrdir)/ruby/missing.h
-ossl_pkcs12.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkcs12.o: $(hdrdir)/ruby/ruby.h
-ossl_pkcs12.o: $(hdrdir)/ruby/st.h
-ossl_pkcs12.o: $(hdrdir)/ruby/subst.h
-ossl_pkcs12.o: $(hdrdir)/ruby/thread.h
-ossl_pkcs12.o: $(top_srcdir)/include/ruby.h
-ossl_pkcs12.o: openssl_missing.h
-ossl_pkcs12.o: ossl.h
-ossl_pkcs12.o: ossl_asn1.h
-ossl_pkcs12.o: ossl_bio.h
-ossl_pkcs12.o: ossl_bn.h
-ossl_pkcs12.o: ossl_cipher.h
-ossl_pkcs12.o: ossl_config.h
-ossl_pkcs12.o: ossl_digest.h
-ossl_pkcs12.o: ossl_engine.h
-ossl_pkcs12.o: ossl_hmac.h
-ossl_pkcs12.o: ossl_ns_spki.h
-ossl_pkcs12.o: ossl_ocsp.h
-ossl_pkcs12.o: ossl_pkcs12.c
-ossl_pkcs12.o: ossl_pkcs12.h
-ossl_pkcs12.o: ossl_pkcs5.h
-ossl_pkcs12.o: ossl_pkcs7.h
-ossl_pkcs12.o: ossl_pkey.h
-ossl_pkcs12.o: ossl_rand.h
-ossl_pkcs12.o: ossl_ssl.h
-ossl_pkcs12.o: ossl_version.h
-ossl_pkcs12.o: ossl_x509.h
-ossl_pkcs12.o: ruby_missing.h
-ossl_pkcs5.o: $(RUBY_EXTCONF_H)
-ossl_pkcs5.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkcs5.o: $(hdrdir)/ruby/backward.h
-ossl_pkcs5.o: $(hdrdir)/ruby/defines.h
-ossl_pkcs5.o: $(hdrdir)/ruby/encoding.h
-ossl_pkcs5.o: $(hdrdir)/ruby/intern.h
-ossl_pkcs5.o: $(hdrdir)/ruby/io.h
-ossl_pkcs5.o: $(hdrdir)/ruby/missing.h
-ossl_pkcs5.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkcs5.o: $(hdrdir)/ruby/ruby.h
-ossl_pkcs5.o: $(hdrdir)/ruby/st.h
-ossl_pkcs5.o: $(hdrdir)/ruby/subst.h
-ossl_pkcs5.o: $(hdrdir)/ruby/thread.h
-ossl_pkcs5.o: $(top_srcdir)/include/ruby.h
-ossl_pkcs5.o: openssl_missing.h
-ossl_pkcs5.o: ossl.h
-ossl_pkcs5.o: ossl_asn1.h
-ossl_pkcs5.o: ossl_bio.h
-ossl_pkcs5.o: ossl_bn.h
-ossl_pkcs5.o: ossl_cipher.h
-ossl_pkcs5.o: ossl_config.h
-ossl_pkcs5.o: ossl_digest.h
-ossl_pkcs5.o: ossl_engine.h
-ossl_pkcs5.o: ossl_hmac.h
-ossl_pkcs5.o: ossl_ns_spki.h
-ossl_pkcs5.o: ossl_ocsp.h
-ossl_pkcs5.o: ossl_pkcs12.h
-ossl_pkcs5.o: ossl_pkcs5.c
-ossl_pkcs5.o: ossl_pkcs5.h
-ossl_pkcs5.o: ossl_pkcs7.h
-ossl_pkcs5.o: ossl_pkey.h
-ossl_pkcs5.o: ossl_rand.h
-ossl_pkcs5.o: ossl_ssl.h
-ossl_pkcs5.o: ossl_version.h
-ossl_pkcs5.o: ossl_x509.h
-ossl_pkcs5.o: ruby_missing.h
-ossl_pkcs7.o: $(RUBY_EXTCONF_H)
-ossl_pkcs7.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkcs7.o: $(hdrdir)/ruby/backward.h
-ossl_pkcs7.o: $(hdrdir)/ruby/defines.h
-ossl_pkcs7.o: $(hdrdir)/ruby/encoding.h
-ossl_pkcs7.o: $(hdrdir)/ruby/intern.h
-ossl_pkcs7.o: $(hdrdir)/ruby/io.h
-ossl_pkcs7.o: $(hdrdir)/ruby/missing.h
-ossl_pkcs7.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkcs7.o: $(hdrdir)/ruby/ruby.h
-ossl_pkcs7.o: $(hdrdir)/ruby/st.h
-ossl_pkcs7.o: $(hdrdir)/ruby/subst.h
-ossl_pkcs7.o: $(hdrdir)/ruby/thread.h
-ossl_pkcs7.o: $(top_srcdir)/include/ruby.h
-ossl_pkcs7.o: openssl_missing.h
-ossl_pkcs7.o: ossl.h
-ossl_pkcs7.o: ossl_asn1.h
-ossl_pkcs7.o: ossl_bio.h
-ossl_pkcs7.o: ossl_bn.h
-ossl_pkcs7.o: ossl_cipher.h
-ossl_pkcs7.o: ossl_config.h
-ossl_pkcs7.o: ossl_digest.h
-ossl_pkcs7.o: ossl_engine.h
-ossl_pkcs7.o: ossl_hmac.h
-ossl_pkcs7.o: ossl_ns_spki.h
-ossl_pkcs7.o: ossl_ocsp.h
-ossl_pkcs7.o: ossl_pkcs12.h
-ossl_pkcs7.o: ossl_pkcs5.h
-ossl_pkcs7.o: ossl_pkcs7.c
-ossl_pkcs7.o: ossl_pkcs7.h
-ossl_pkcs7.o: ossl_pkey.h
-ossl_pkcs7.o: ossl_rand.h
-ossl_pkcs7.o: ossl_ssl.h
-ossl_pkcs7.o: ossl_version.h
-ossl_pkcs7.o: ossl_x509.h
-ossl_pkcs7.o: ruby_missing.h
-ossl_pkey.o: $(RUBY_EXTCONF_H)
-ossl_pkey.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkey.o: $(hdrdir)/ruby/backward.h
-ossl_pkey.o: $(hdrdir)/ruby/defines.h
-ossl_pkey.o: $(hdrdir)/ruby/encoding.h
-ossl_pkey.o: $(hdrdir)/ruby/intern.h
-ossl_pkey.o: $(hdrdir)/ruby/io.h
-ossl_pkey.o: $(hdrdir)/ruby/missing.h
-ossl_pkey.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkey.o: $(hdrdir)/ruby/ruby.h
-ossl_pkey.o: $(hdrdir)/ruby/st.h
-ossl_pkey.o: $(hdrdir)/ruby/subst.h
-ossl_pkey.o: $(hdrdir)/ruby/thread.h
-ossl_pkey.o: $(top_srcdir)/include/ruby.h
-ossl_pkey.o: openssl_missing.h
-ossl_pkey.o: ossl.h
-ossl_pkey.o: ossl_asn1.h
-ossl_pkey.o: ossl_bio.h
-ossl_pkey.o: ossl_bn.h
-ossl_pkey.o: ossl_cipher.h
-ossl_pkey.o: ossl_config.h
-ossl_pkey.o: ossl_digest.h
-ossl_pkey.o: ossl_engine.h
-ossl_pkey.o: ossl_hmac.h
-ossl_pkey.o: ossl_ns_spki.h
-ossl_pkey.o: ossl_ocsp.h
-ossl_pkey.o: ossl_pkcs12.h
-ossl_pkey.o: ossl_pkcs5.h
-ossl_pkey.o: ossl_pkcs7.h
-ossl_pkey.o: ossl_pkey.c
-ossl_pkey.o: ossl_pkey.h
-ossl_pkey.o: ossl_rand.h
-ossl_pkey.o: ossl_ssl.h
-ossl_pkey.o: ossl_version.h
-ossl_pkey.o: ossl_x509.h
-ossl_pkey.o: ruby_missing.h
-ossl_pkey_dh.o: $(RUBY_EXTCONF_H)
-ossl_pkey_dh.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/backward.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/defines.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/encoding.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/intern.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/io.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/missing.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/ruby.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/st.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/subst.h
-ossl_pkey_dh.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_dh.o: $(top_srcdir)/include/ruby.h
-ossl_pkey_dh.o: openssl_missing.h
-ossl_pkey_dh.o: ossl.h
-ossl_pkey_dh.o: ossl_asn1.h
-ossl_pkey_dh.o: ossl_bio.h
-ossl_pkey_dh.o: ossl_bn.h
-ossl_pkey_dh.o: ossl_cipher.h
-ossl_pkey_dh.o: ossl_config.h
-ossl_pkey_dh.o: ossl_digest.h
-ossl_pkey_dh.o: ossl_engine.h
-ossl_pkey_dh.o: ossl_hmac.h
-ossl_pkey_dh.o: ossl_ns_spki.h
-ossl_pkey_dh.o: ossl_ocsp.h
-ossl_pkey_dh.o: ossl_pkcs12.h
-ossl_pkey_dh.o: ossl_pkcs5.h
-ossl_pkey_dh.o: ossl_pkcs7.h
-ossl_pkey_dh.o: ossl_pkey.h
-ossl_pkey_dh.o: ossl_pkey_dh.c
-ossl_pkey_dh.o: ossl_rand.h
-ossl_pkey_dh.o: ossl_ssl.h
-ossl_pkey_dh.o: ossl_version.h
-ossl_pkey_dh.o: ossl_x509.h
-ossl_pkey_dh.o: ruby_missing.h
-ossl_pkey_dsa.o: $(RUBY_EXTCONF_H)
-ossl_pkey_dsa.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/backward.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/defines.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/encoding.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/intern.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/io.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/missing.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/ruby.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/st.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/subst.h
-ossl_pkey_dsa.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_dsa.o: $(top_srcdir)/include/ruby.h
-ossl_pkey_dsa.o: openssl_missing.h
-ossl_pkey_dsa.o: ossl.h
-ossl_pkey_dsa.o: ossl_asn1.h
-ossl_pkey_dsa.o: ossl_bio.h
-ossl_pkey_dsa.o: ossl_bn.h
-ossl_pkey_dsa.o: ossl_cipher.h
-ossl_pkey_dsa.o: ossl_config.h
-ossl_pkey_dsa.o: ossl_digest.h
-ossl_pkey_dsa.o: ossl_engine.h
-ossl_pkey_dsa.o: ossl_hmac.h
-ossl_pkey_dsa.o: ossl_ns_spki.h
-ossl_pkey_dsa.o: ossl_ocsp.h
-ossl_pkey_dsa.o: ossl_pkcs12.h
-ossl_pkey_dsa.o: ossl_pkcs5.h
-ossl_pkey_dsa.o: ossl_pkcs7.h
-ossl_pkey_dsa.o: ossl_pkey.h
-ossl_pkey_dsa.o: ossl_pkey_dsa.c
-ossl_pkey_dsa.o: ossl_rand.h
-ossl_pkey_dsa.o: ossl_ssl.h
-ossl_pkey_dsa.o: ossl_version.h
-ossl_pkey_dsa.o: ossl_x509.h
-ossl_pkey_dsa.o: ruby_missing.h
-ossl_pkey_ec.o: $(RUBY_EXTCONF_H)
-ossl_pkey_ec.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/backward.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/defines.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/encoding.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/intern.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/io.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/missing.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/ruby.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/st.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/subst.h
-ossl_pkey_ec.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_ec.o: $(top_srcdir)/include/ruby.h
-ossl_pkey_ec.o: openssl_missing.h
-ossl_pkey_ec.o: ossl.h
-ossl_pkey_ec.o: ossl_asn1.h
-ossl_pkey_ec.o: ossl_bio.h
-ossl_pkey_ec.o: ossl_bn.h
-ossl_pkey_ec.o: ossl_cipher.h
-ossl_pkey_ec.o: ossl_config.h
-ossl_pkey_ec.o: ossl_digest.h
-ossl_pkey_ec.o: ossl_engine.h
-ossl_pkey_ec.o: ossl_hmac.h
-ossl_pkey_ec.o: ossl_ns_spki.h
-ossl_pkey_ec.o: ossl_ocsp.h
-ossl_pkey_ec.o: ossl_pkcs12.h
-ossl_pkey_ec.o: ossl_pkcs5.h
-ossl_pkey_ec.o: ossl_pkcs7.h
-ossl_pkey_ec.o: ossl_pkey.h
-ossl_pkey_ec.o: ossl_pkey_ec.c
-ossl_pkey_ec.o: ossl_rand.h
-ossl_pkey_ec.o: ossl_ssl.h
-ossl_pkey_ec.o: ossl_version.h
-ossl_pkey_ec.o: ossl_x509.h
-ossl_pkey_ec.o: ruby_missing.h
-ossl_pkey_rsa.o: $(RUBY_EXTCONF_H)
-ossl_pkey_rsa.o: $(arch_hdrdir)/ruby/config.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/backward.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/defines.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/encoding.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/intern.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/io.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/missing.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/oniguruma.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/ruby.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/st.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/subst.h
-ossl_pkey_rsa.o: $(hdrdir)/ruby/thread.h
-ossl_pkey_rsa.o: $(top_srcdir)/include/ruby.h
-ossl_pkey_rsa.o: openssl_missing.h
-ossl_pkey_rsa.o: ossl.h
-ossl_pkey_rsa.o: ossl_asn1.h
-ossl_pkey_rsa.o: ossl_bio.h
-ossl_pkey_rsa.o: ossl_bn.h
-ossl_pkey_rsa.o: ossl_cipher.h
-ossl_pkey_rsa.o: ossl_config.h
-ossl_pkey_rsa.o: ossl_digest.h
-ossl_pkey_rsa.o: ossl_engine.h
-ossl_pkey_rsa.o: ossl_hmac.h
-ossl_pkey_rsa.o: ossl_ns_spki.h
-ossl_pkey_rsa.o: ossl_ocsp.h
-ossl_pkey_rsa.o: ossl_pkcs12.h
-ossl_pkey_rsa.o: ossl_pkcs5.h
-ossl_pkey_rsa.o: ossl_pkcs7.h
-ossl_pkey_rsa.o: ossl_pkey.h
-ossl_pkey_rsa.o: ossl_pkey_rsa.c
-ossl_pkey_rsa.o: ossl_rand.h
-ossl_pkey_rsa.o: ossl_ssl.h
-ossl_pkey_rsa.o: ossl_version.h
-ossl_pkey_rsa.o: ossl_x509.h
-ossl_pkey_rsa.o: ruby_missing.h
-ossl_rand.o: $(RUBY_EXTCONF_H)
-ossl_rand.o: $(arch_hdrdir)/ruby/config.h
-ossl_rand.o: $(hdrdir)/ruby/backward.h
-ossl_rand.o: $(hdrdir)/ruby/defines.h
-ossl_rand.o: $(hdrdir)/ruby/encoding.h
-ossl_rand.o: $(hdrdir)/ruby/intern.h
-ossl_rand.o: $(hdrdir)/ruby/io.h
-ossl_rand.o: $(hdrdir)/ruby/missing.h
-ossl_rand.o: $(hdrdir)/ruby/oniguruma.h
-ossl_rand.o: $(hdrdir)/ruby/ruby.h
-ossl_rand.o: $(hdrdir)/ruby/st.h
-ossl_rand.o: $(hdrdir)/ruby/subst.h
-ossl_rand.o: $(hdrdir)/ruby/thread.h
-ossl_rand.o: $(top_srcdir)/include/ruby.h
-ossl_rand.o: openssl_missing.h
-ossl_rand.o: ossl.h
-ossl_rand.o: ossl_asn1.h
-ossl_rand.o: ossl_bio.h
-ossl_rand.o: ossl_bn.h
-ossl_rand.o: ossl_cipher.h
-ossl_rand.o: ossl_config.h
-ossl_rand.o: ossl_digest.h
-ossl_rand.o: ossl_engine.h
-ossl_rand.o: ossl_hmac.h
-ossl_rand.o: ossl_ns_spki.h
-ossl_rand.o: ossl_ocsp.h
-ossl_rand.o: ossl_pkcs12.h
-ossl_rand.o: ossl_pkcs5.h
-ossl_rand.o: ossl_pkcs7.h
-ossl_rand.o: ossl_pkey.h
-ossl_rand.o: ossl_rand.c
-ossl_rand.o: ossl_rand.h
-ossl_rand.o: ossl_ssl.h
-ossl_rand.o: ossl_version.h
-ossl_rand.o: ossl_x509.h
-ossl_rand.o: ruby_missing.h
-ossl_ssl.o: $(RUBY_EXTCONF_H)
-ossl_ssl.o: $(arch_hdrdir)/ruby/config.h
-ossl_ssl.o: $(hdrdir)/ruby/backward.h
-ossl_ssl.o: $(hdrdir)/ruby/defines.h
-ossl_ssl.o: $(hdrdir)/ruby/encoding.h
-ossl_ssl.o: $(hdrdir)/ruby/intern.h
-ossl_ssl.o: $(hdrdir)/ruby/io.h
-ossl_ssl.o: $(hdrdir)/ruby/missing.h
-ossl_ssl.o: $(hdrdir)/ruby/oniguruma.h
-ossl_ssl.o: $(hdrdir)/ruby/ruby.h
-ossl_ssl.o: $(hdrdir)/ruby/st.h
-ossl_ssl.o: $(hdrdir)/ruby/subst.h
-ossl_ssl.o: $(hdrdir)/ruby/thread.h
-ossl_ssl.o: $(top_srcdir)/include/ruby.h
-ossl_ssl.o: openssl_missing.h
-ossl_ssl.o: ossl.h
-ossl_ssl.o: ossl_asn1.h
-ossl_ssl.o: ossl_bio.h
-ossl_ssl.o: ossl_bn.h
-ossl_ssl.o: ossl_cipher.h
-ossl_ssl.o: ossl_config.h
-ossl_ssl.o: ossl_digest.h
-ossl_ssl.o: ossl_engine.h
-ossl_ssl.o: ossl_hmac.h
-ossl_ssl.o: ossl_ns_spki.h
-ossl_ssl.o: ossl_ocsp.h
-ossl_ssl.o: ossl_pkcs12.h
-ossl_ssl.o: ossl_pkcs5.h
-ossl_ssl.o: ossl_pkcs7.h
-ossl_ssl.o: ossl_pkey.h
-ossl_ssl.o: ossl_rand.h
-ossl_ssl.o: ossl_ssl.c
-ossl_ssl.o: ossl_ssl.h
-ossl_ssl.o: ossl_version.h
-ossl_ssl.o: ossl_x509.h
-ossl_ssl.o: ruby_missing.h
-ossl_ssl_session.o: $(RUBY_EXTCONF_H)
-ossl_ssl_session.o: $(arch_hdrdir)/ruby/config.h
-ossl_ssl_session.o: $(hdrdir)/ruby/backward.h
-ossl_ssl_session.o: $(hdrdir)/ruby/defines.h
-ossl_ssl_session.o: $(hdrdir)/ruby/encoding.h
-ossl_ssl_session.o: $(hdrdir)/ruby/intern.h
-ossl_ssl_session.o: $(hdrdir)/ruby/io.h
-ossl_ssl_session.o: $(hdrdir)/ruby/missing.h
-ossl_ssl_session.o: $(hdrdir)/ruby/oniguruma.h
-ossl_ssl_session.o: $(hdrdir)/ruby/ruby.h
-ossl_ssl_session.o: $(hdrdir)/ruby/st.h
-ossl_ssl_session.o: $(hdrdir)/ruby/subst.h
-ossl_ssl_session.o: $(hdrdir)/ruby/thread.h
-ossl_ssl_session.o: $(top_srcdir)/include/ruby.h
-ossl_ssl_session.o: openssl_missing.h
-ossl_ssl_session.o: ossl.h
-ossl_ssl_session.o: ossl_asn1.h
-ossl_ssl_session.o: ossl_bio.h
-ossl_ssl_session.o: ossl_bn.h
-ossl_ssl_session.o: ossl_cipher.h
-ossl_ssl_session.o: ossl_config.h
-ossl_ssl_session.o: ossl_digest.h
-ossl_ssl_session.o: ossl_engine.h
-ossl_ssl_session.o: ossl_hmac.h
-ossl_ssl_session.o: ossl_ns_spki.h
-ossl_ssl_session.o: ossl_ocsp.h
-ossl_ssl_session.o: ossl_pkcs12.h
-ossl_ssl_session.o: ossl_pkcs5.h
-ossl_ssl_session.o: ossl_pkcs7.h
-ossl_ssl_session.o: ossl_pkey.h
-ossl_ssl_session.o: ossl_rand.h
-ossl_ssl_session.o: ossl_ssl.h
-ossl_ssl_session.o: ossl_ssl_session.c
-ossl_ssl_session.o: ossl_version.h
-ossl_ssl_session.o: ossl_x509.h
-ossl_ssl_session.o: ruby_missing.h
-ossl_x509.o: $(RUBY_EXTCONF_H)
-ossl_x509.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509.o: $(hdrdir)/ruby/backward.h
-ossl_x509.o: $(hdrdir)/ruby/defines.h
-ossl_x509.o: $(hdrdir)/ruby/encoding.h
-ossl_x509.o: $(hdrdir)/ruby/intern.h
-ossl_x509.o: $(hdrdir)/ruby/io.h
-ossl_x509.o: $(hdrdir)/ruby/missing.h
-ossl_x509.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509.o: $(hdrdir)/ruby/ruby.h
-ossl_x509.o: $(hdrdir)/ruby/st.h
-ossl_x509.o: $(hdrdir)/ruby/subst.h
-ossl_x509.o: $(hdrdir)/ruby/thread.h
-ossl_x509.o: $(top_srcdir)/include/ruby.h
-ossl_x509.o: openssl_missing.h
-ossl_x509.o: ossl.h
-ossl_x509.o: ossl_asn1.h
-ossl_x509.o: ossl_bio.h
-ossl_x509.o: ossl_bn.h
-ossl_x509.o: ossl_cipher.h
-ossl_x509.o: ossl_config.h
-ossl_x509.o: ossl_digest.h
-ossl_x509.o: ossl_engine.h
-ossl_x509.o: ossl_hmac.h
-ossl_x509.o: ossl_ns_spki.h
-ossl_x509.o: ossl_ocsp.h
-ossl_x509.o: ossl_pkcs12.h
-ossl_x509.o: ossl_pkcs5.h
-ossl_x509.o: ossl_pkcs7.h
-ossl_x509.o: ossl_pkey.h
-ossl_x509.o: ossl_rand.h
-ossl_x509.o: ossl_ssl.h
-ossl_x509.o: ossl_version.h
-ossl_x509.o: ossl_x509.c
-ossl_x509.o: ossl_x509.h
-ossl_x509.o: ruby_missing.h
-ossl_x509attr.o: $(RUBY_EXTCONF_H)
-ossl_x509attr.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509attr.o: $(hdrdir)/ruby/backward.h
-ossl_x509attr.o: $(hdrdir)/ruby/defines.h
-ossl_x509attr.o: $(hdrdir)/ruby/encoding.h
-ossl_x509attr.o: $(hdrdir)/ruby/intern.h
-ossl_x509attr.o: $(hdrdir)/ruby/io.h
-ossl_x509attr.o: $(hdrdir)/ruby/missing.h
-ossl_x509attr.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509attr.o: $(hdrdir)/ruby/ruby.h
-ossl_x509attr.o: $(hdrdir)/ruby/st.h
-ossl_x509attr.o: $(hdrdir)/ruby/subst.h
-ossl_x509attr.o: $(hdrdir)/ruby/thread.h
-ossl_x509attr.o: $(top_srcdir)/include/ruby.h
-ossl_x509attr.o: openssl_missing.h
-ossl_x509attr.o: ossl.h
-ossl_x509attr.o: ossl_asn1.h
-ossl_x509attr.o: ossl_bio.h
-ossl_x509attr.o: ossl_bn.h
-ossl_x509attr.o: ossl_cipher.h
-ossl_x509attr.o: ossl_config.h
-ossl_x509attr.o: ossl_digest.h
-ossl_x509attr.o: ossl_engine.h
-ossl_x509attr.o: ossl_hmac.h
-ossl_x509attr.o: ossl_ns_spki.h
-ossl_x509attr.o: ossl_ocsp.h
-ossl_x509attr.o: ossl_pkcs12.h
-ossl_x509attr.o: ossl_pkcs5.h
-ossl_x509attr.o: ossl_pkcs7.h
-ossl_x509attr.o: ossl_pkey.h
-ossl_x509attr.o: ossl_rand.h
-ossl_x509attr.o: ossl_ssl.h
-ossl_x509attr.o: ossl_version.h
-ossl_x509attr.o: ossl_x509.h
-ossl_x509attr.o: ossl_x509attr.c
-ossl_x509attr.o: ruby_missing.h
-ossl_x509cert.o: $(RUBY_EXTCONF_H)
-ossl_x509cert.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509cert.o: $(hdrdir)/ruby/backward.h
-ossl_x509cert.o: $(hdrdir)/ruby/defines.h
-ossl_x509cert.o: $(hdrdir)/ruby/encoding.h
-ossl_x509cert.o: $(hdrdir)/ruby/intern.h
-ossl_x509cert.o: $(hdrdir)/ruby/io.h
-ossl_x509cert.o: $(hdrdir)/ruby/missing.h
-ossl_x509cert.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509cert.o: $(hdrdir)/ruby/ruby.h
-ossl_x509cert.o: $(hdrdir)/ruby/st.h
-ossl_x509cert.o: $(hdrdir)/ruby/subst.h
-ossl_x509cert.o: $(hdrdir)/ruby/thread.h
-ossl_x509cert.o: $(top_srcdir)/include/ruby.h
-ossl_x509cert.o: openssl_missing.h
-ossl_x509cert.o: ossl.h
-ossl_x509cert.o: ossl_asn1.h
-ossl_x509cert.o: ossl_bio.h
-ossl_x509cert.o: ossl_bn.h
-ossl_x509cert.o: ossl_cipher.h
-ossl_x509cert.o: ossl_config.h
-ossl_x509cert.o: ossl_digest.h
-ossl_x509cert.o: ossl_engine.h
-ossl_x509cert.o: ossl_hmac.h
-ossl_x509cert.o: ossl_ns_spki.h
-ossl_x509cert.o: ossl_ocsp.h
-ossl_x509cert.o: ossl_pkcs12.h
-ossl_x509cert.o: ossl_pkcs5.h
-ossl_x509cert.o: ossl_pkcs7.h
-ossl_x509cert.o: ossl_pkey.h
-ossl_x509cert.o: ossl_rand.h
-ossl_x509cert.o: ossl_ssl.h
-ossl_x509cert.o: ossl_version.h
-ossl_x509cert.o: ossl_x509.h
-ossl_x509cert.o: ossl_x509cert.c
-ossl_x509cert.o: ruby_missing.h
-ossl_x509crl.o: $(RUBY_EXTCONF_H)
-ossl_x509crl.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509crl.o: $(hdrdir)/ruby/backward.h
-ossl_x509crl.o: $(hdrdir)/ruby/defines.h
-ossl_x509crl.o: $(hdrdir)/ruby/encoding.h
-ossl_x509crl.o: $(hdrdir)/ruby/intern.h
-ossl_x509crl.o: $(hdrdir)/ruby/io.h
-ossl_x509crl.o: $(hdrdir)/ruby/missing.h
-ossl_x509crl.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509crl.o: $(hdrdir)/ruby/ruby.h
-ossl_x509crl.o: $(hdrdir)/ruby/st.h
-ossl_x509crl.o: $(hdrdir)/ruby/subst.h
-ossl_x509crl.o: $(hdrdir)/ruby/thread.h
-ossl_x509crl.o: $(top_srcdir)/include/ruby.h
-ossl_x509crl.o: openssl_missing.h
-ossl_x509crl.o: ossl.h
-ossl_x509crl.o: ossl_asn1.h
-ossl_x509crl.o: ossl_bio.h
-ossl_x509crl.o: ossl_bn.h
-ossl_x509crl.o: ossl_cipher.h
-ossl_x509crl.o: ossl_config.h
-ossl_x509crl.o: ossl_digest.h
-ossl_x509crl.o: ossl_engine.h
-ossl_x509crl.o: ossl_hmac.h
-ossl_x509crl.o: ossl_ns_spki.h
-ossl_x509crl.o: ossl_ocsp.h
-ossl_x509crl.o: ossl_pkcs12.h
-ossl_x509crl.o: ossl_pkcs5.h
-ossl_x509crl.o: ossl_pkcs7.h
-ossl_x509crl.o: ossl_pkey.h
-ossl_x509crl.o: ossl_rand.h
-ossl_x509crl.o: ossl_ssl.h
-ossl_x509crl.o: ossl_version.h
-ossl_x509crl.o: ossl_x509.h
-ossl_x509crl.o: ossl_x509crl.c
-ossl_x509crl.o: ruby_missing.h
-ossl_x509ext.o: $(RUBY_EXTCONF_H)
-ossl_x509ext.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509ext.o: $(hdrdir)/ruby/backward.h
-ossl_x509ext.o: $(hdrdir)/ruby/defines.h
-ossl_x509ext.o: $(hdrdir)/ruby/encoding.h
-ossl_x509ext.o: $(hdrdir)/ruby/intern.h
-ossl_x509ext.o: $(hdrdir)/ruby/io.h
-ossl_x509ext.o: $(hdrdir)/ruby/missing.h
-ossl_x509ext.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509ext.o: $(hdrdir)/ruby/ruby.h
-ossl_x509ext.o: $(hdrdir)/ruby/st.h
-ossl_x509ext.o: $(hdrdir)/ruby/subst.h
-ossl_x509ext.o: $(hdrdir)/ruby/thread.h
-ossl_x509ext.o: $(top_srcdir)/include/ruby.h
-ossl_x509ext.o: openssl_missing.h
-ossl_x509ext.o: ossl.h
-ossl_x509ext.o: ossl_asn1.h
-ossl_x509ext.o: ossl_bio.h
-ossl_x509ext.o: ossl_bn.h
-ossl_x509ext.o: ossl_cipher.h
-ossl_x509ext.o: ossl_config.h
-ossl_x509ext.o: ossl_digest.h
-ossl_x509ext.o: ossl_engine.h
-ossl_x509ext.o: ossl_hmac.h
-ossl_x509ext.o: ossl_ns_spki.h
-ossl_x509ext.o: ossl_ocsp.h
-ossl_x509ext.o: ossl_pkcs12.h
-ossl_x509ext.o: ossl_pkcs5.h
-ossl_x509ext.o: ossl_pkcs7.h
-ossl_x509ext.o: ossl_pkey.h
-ossl_x509ext.o: ossl_rand.h
-ossl_x509ext.o: ossl_ssl.h
-ossl_x509ext.o: ossl_version.h
-ossl_x509ext.o: ossl_x509.h
-ossl_x509ext.o: ossl_x509ext.c
-ossl_x509ext.o: ruby_missing.h
-ossl_x509name.o: $(RUBY_EXTCONF_H)
-ossl_x509name.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509name.o: $(hdrdir)/ruby/backward.h
-ossl_x509name.o: $(hdrdir)/ruby/defines.h
-ossl_x509name.o: $(hdrdir)/ruby/encoding.h
-ossl_x509name.o: $(hdrdir)/ruby/intern.h
-ossl_x509name.o: $(hdrdir)/ruby/io.h
-ossl_x509name.o: $(hdrdir)/ruby/missing.h
-ossl_x509name.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509name.o: $(hdrdir)/ruby/ruby.h
-ossl_x509name.o: $(hdrdir)/ruby/st.h
-ossl_x509name.o: $(hdrdir)/ruby/subst.h
-ossl_x509name.o: $(hdrdir)/ruby/thread.h
-ossl_x509name.o: $(top_srcdir)/include/ruby.h
-ossl_x509name.o: openssl_missing.h
-ossl_x509name.o: ossl.h
-ossl_x509name.o: ossl_asn1.h
-ossl_x509name.o: ossl_bio.h
-ossl_x509name.o: ossl_bn.h
-ossl_x509name.o: ossl_cipher.h
-ossl_x509name.o: ossl_config.h
-ossl_x509name.o: ossl_digest.h
-ossl_x509name.o: ossl_engine.h
-ossl_x509name.o: ossl_hmac.h
-ossl_x509name.o: ossl_ns_spki.h
-ossl_x509name.o: ossl_ocsp.h
-ossl_x509name.o: ossl_pkcs12.h
-ossl_x509name.o: ossl_pkcs5.h
-ossl_x509name.o: ossl_pkcs7.h
-ossl_x509name.o: ossl_pkey.h
-ossl_x509name.o: ossl_rand.h
-ossl_x509name.o: ossl_ssl.h
-ossl_x509name.o: ossl_version.h
-ossl_x509name.o: ossl_x509.h
-ossl_x509name.o: ossl_x509name.c
-ossl_x509name.o: ruby_missing.h
-ossl_x509req.o: $(RUBY_EXTCONF_H)
-ossl_x509req.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509req.o: $(hdrdir)/ruby/backward.h
-ossl_x509req.o: $(hdrdir)/ruby/defines.h
-ossl_x509req.o: $(hdrdir)/ruby/encoding.h
-ossl_x509req.o: $(hdrdir)/ruby/intern.h
-ossl_x509req.o: $(hdrdir)/ruby/io.h
-ossl_x509req.o: $(hdrdir)/ruby/missing.h
-ossl_x509req.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509req.o: $(hdrdir)/ruby/ruby.h
-ossl_x509req.o: $(hdrdir)/ruby/st.h
-ossl_x509req.o: $(hdrdir)/ruby/subst.h
-ossl_x509req.o: $(hdrdir)/ruby/thread.h
-ossl_x509req.o: $(top_srcdir)/include/ruby.h
-ossl_x509req.o: openssl_missing.h
-ossl_x509req.o: ossl.h
-ossl_x509req.o: ossl_asn1.h
-ossl_x509req.o: ossl_bio.h
-ossl_x509req.o: ossl_bn.h
-ossl_x509req.o: ossl_cipher.h
-ossl_x509req.o: ossl_config.h
-ossl_x509req.o: ossl_digest.h
-ossl_x509req.o: ossl_engine.h
-ossl_x509req.o: ossl_hmac.h
-ossl_x509req.o: ossl_ns_spki.h
-ossl_x509req.o: ossl_ocsp.h
-ossl_x509req.o: ossl_pkcs12.h
-ossl_x509req.o: ossl_pkcs5.h
-ossl_x509req.o: ossl_pkcs7.h
-ossl_x509req.o: ossl_pkey.h
-ossl_x509req.o: ossl_rand.h
-ossl_x509req.o: ossl_ssl.h
-ossl_x509req.o: ossl_version.h
-ossl_x509req.o: ossl_x509.h
-ossl_x509req.o: ossl_x509req.c
-ossl_x509req.o: ruby_missing.h
-ossl_x509revoked.o: $(RUBY_EXTCONF_H)
-ossl_x509revoked.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509revoked.o: $(hdrdir)/ruby/backward.h
-ossl_x509revoked.o: $(hdrdir)/ruby/defines.h
-ossl_x509revoked.o: $(hdrdir)/ruby/encoding.h
-ossl_x509revoked.o: $(hdrdir)/ruby/intern.h
-ossl_x509revoked.o: $(hdrdir)/ruby/io.h
-ossl_x509revoked.o: $(hdrdir)/ruby/missing.h
-ossl_x509revoked.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509revoked.o: $(hdrdir)/ruby/ruby.h
-ossl_x509revoked.o: $(hdrdir)/ruby/st.h
-ossl_x509revoked.o: $(hdrdir)/ruby/subst.h
-ossl_x509revoked.o: $(hdrdir)/ruby/thread.h
-ossl_x509revoked.o: $(top_srcdir)/include/ruby.h
-ossl_x509revoked.o: openssl_missing.h
-ossl_x509revoked.o: ossl.h
-ossl_x509revoked.o: ossl_asn1.h
-ossl_x509revoked.o: ossl_bio.h
-ossl_x509revoked.o: ossl_bn.h
-ossl_x509revoked.o: ossl_cipher.h
-ossl_x509revoked.o: ossl_config.h
-ossl_x509revoked.o: ossl_digest.h
-ossl_x509revoked.o: ossl_engine.h
-ossl_x509revoked.o: ossl_hmac.h
-ossl_x509revoked.o: ossl_ns_spki.h
-ossl_x509revoked.o: ossl_ocsp.h
-ossl_x509revoked.o: ossl_pkcs12.h
-ossl_x509revoked.o: ossl_pkcs5.h
-ossl_x509revoked.o: ossl_pkcs7.h
-ossl_x509revoked.o: ossl_pkey.h
-ossl_x509revoked.o: ossl_rand.h
-ossl_x509revoked.o: ossl_ssl.h
-ossl_x509revoked.o: ossl_version.h
-ossl_x509revoked.o: ossl_x509.h
-ossl_x509revoked.o: ossl_x509revoked.c
-ossl_x509revoked.o: ruby_missing.h
-ossl_x509store.o: $(RUBY_EXTCONF_H)
-ossl_x509store.o: $(arch_hdrdir)/ruby/config.h
-ossl_x509store.o: $(hdrdir)/ruby/backward.h
-ossl_x509store.o: $(hdrdir)/ruby/defines.h
-ossl_x509store.o: $(hdrdir)/ruby/encoding.h
-ossl_x509store.o: $(hdrdir)/ruby/intern.h
-ossl_x509store.o: $(hdrdir)/ruby/io.h
-ossl_x509store.o: $(hdrdir)/ruby/missing.h
-ossl_x509store.o: $(hdrdir)/ruby/oniguruma.h
-ossl_x509store.o: $(hdrdir)/ruby/ruby.h
-ossl_x509store.o: $(hdrdir)/ruby/st.h
-ossl_x509store.o: $(hdrdir)/ruby/subst.h
-ossl_x509store.o: $(hdrdir)/ruby/thread.h
-ossl_x509store.o: $(top_srcdir)/include/ruby.h
-ossl_x509store.o: openssl_missing.h
-ossl_x509store.o: ossl.h
-ossl_x509store.o: ossl_asn1.h
-ossl_x509store.o: ossl_bio.h
-ossl_x509store.o: ossl_bn.h
-ossl_x509store.o: ossl_cipher.h
-ossl_x509store.o: ossl_config.h
-ossl_x509store.o: ossl_digest.h
-ossl_x509store.o: ossl_engine.h
-ossl_x509store.o: ossl_hmac.h
-ossl_x509store.o: ossl_ns_spki.h
-ossl_x509store.o: ossl_ocsp.h
-ossl_x509store.o: ossl_pkcs12.h
-ossl_x509store.o: ossl_pkcs5.h
-ossl_x509store.o: ossl_pkcs7.h
-ossl_x509store.o: ossl_pkey.h
-ossl_x509store.o: ossl_rand.h
-ossl_x509store.o: ossl_ssl.h
-ossl_x509store.o: ossl_version.h
-ossl_x509store.o: ossl_x509.h
-ossl_x509store.o: ossl_x509store.c
-ossl_x509store.o: ruby_missing.h
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb
index 7dfc87c1c6..39ebfa0d37 100644
--- a/ext/openssl/deprecation.rb
+++ b/ext/openssl/deprecation.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module OpenSSL
   def self.deprecated_warning_flag
     unless flag = (@deprecated_warning_flag ||= nil)
@@ -16,11 +15,7 @@ module OpenSSL
   end
 
   def self.check_func(func, header)
-    have_func(func, header, deprecated_warning_flag)
-  end
-
-  def self.check_func_or_macro(func, header)
-    check_func(func, header) or
-      have_macro(func, header) && $defs.push("-DHAVE_#{func.upcase}")
+    have_func(func, header, deprecated_warning_flag) and
+      have_header(header, nil, deprecated_warning_flag)
   end
 end
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 7033b0e20d..e272cba092 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -1,14 +1,18 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
 =begin
+= $RCSfile$ -- Generator for Makefile
+
 = Info
   'OpenSSL for Ruby 2' project
   Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
   All rights reserved.
 
 = Licence
-  This program is licensed under the same licence as Ruby.
+  This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
+
+= Version
+  $Id$
 =end
 
 require "mkmf"
@@ -19,27 +23,31 @@ dir_config("kerberos")
 
 Logging::message "=== OpenSSL for Ruby configurator ===\n"
 
-# Add -Werror=deprecated-declarations to $warnflags if available
-OpenSSL.deprecated_warning_flag
-
 ##
 # Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used
 # To turn it on, use: --with-debug or --enable-debug
 #
 if with_config("debug") or enable_config("debug")
-  $defs.push("-DOSSL_DEBUG")
+  $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
 end
 
 Logging::message "=== Checking for system dependent stuff... ===\n"
 have_library("nsl", "t_open")
 have_library("socket", "socket")
+have_header("assert.h")
 
 Logging::message "=== Checking for required stuff... ===\n"
+if $mingw
+  have_library("wsock32")
+  have_library("gdi32")
+end
+
 result = pkg_config("openssl") && have_header("openssl/ssl.h")
+
 unless result
   result = have_header("openssl/ssl.h")
-  result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "CRYPTO_malloc")}
-  result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_new")}
+  result &&= %w[crypto libeay32].any? {|lib| have_library(lib, "OpenSSL_add_all_digests")}
+  result &&= %w[ssl ssleay32].any? {|lib| have_library(lib, "SSL_library_init")}
   unless result
     Logging::message "=== Checking for required stuff failed. ===\n"
     Logging::message "Makefile wasn't created. Fix the errors above.\n"
@@ -47,107 +55,106 @@ unless result
   end
 end
 
-result = checking_for("OpenSSL version is 0.9.8 or later") {
-  try_static_assert("OPENSSL_VERSION_NUMBER >= 0x00908000L", "openssl/opensslv.h")
-}
-unless result
-  raise "OpenSSL 0.9.8 or later required."
+unless have_header("openssl/conf_api.h")
+  raise "OpenSSL 0.9.6 or later required."
 end
-
 unless OpenSSL.check_func("SSL_library_init()", "openssl/ssl.h")
   raise "Ignore OpenSSL broken by Apple.\nPlease use another openssl. (e.g. using `configure --with-openssl-dir=/path/to/openssl')"
 end
 
 Logging::message "=== Checking for OpenSSL features... ===\n"
-# compile options
-
-# check OPENSSL_NO_{SSL2,SSL3_METHOD} macro: on some environment, these symbols
-# exist even if compiled with no-ssl2 or no-ssl3-method.
-unless have_macro("OPENSSL_NO_SSL2", "openssl/opensslconf.h")
-  have_func("SSLv2_method")
-end
-unless have_macro("OPENSSL_NO_SSL3_METHOD", "openssl/opensslconf.h")
-  have_func("SSLv3_method")
-end
-have_func("TLSv1_1_method")
-have_func("TLSv1_2_method")
-have_func("RAND_egd")
-engines = %w{builtin_engines openbsd_dev_crypto dynamic 4758cca aep atalla chil
-             cswift nuron sureware ubsec padlock capi gmp gost cryptodev aesni}
-engines.each { |name|
-  OpenSSL.check_func_or_macro("ENGINE_load_#{name}", "openssl/engine.h")
-}
-
-# added in 0.9.8X
-have_func("EVP_CIPHER_CTX_new")
-have_func("EVP_CIPHER_CTX_free")
-OpenSSL.check_func_or_macro("SSL_CTX_clear_options", "openssl/ssl.h")
-
-# added in 1.0.0
-have_func("ASN1_TIME_adj")
+have_func("ERR_peek_last_error")
+have_func("ASN1_put_eoc")
+have_func("BN_mod_add")
+have_func("BN_mod_sqr")
+have_func("BN_mod_sub")
+have_func("BN_pseudo_rand_range")
+have_func("BN_rand_range")
+have_func("CONF_get1_default_config_file")
 have_func("EVP_CIPHER_CTX_copy")
-have_func("EVP_PKEY_base_id")
+have_func("EVP_CIPHER_CTX_set_padding")
+have_func("EVP_CipherFinal_ex")
+have_func("EVP_CipherInit_ex")
+have_func("EVP_DigestFinal_ex")
+have_func("EVP_DigestInit_ex")
+have_func("EVP_MD_CTX_cleanup")
+have_func("EVP_MD_CTX_create")
+have_func("EVP_MD_CTX_destroy")
+have_func("EVP_MD_CTX_init")
+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")
+have_func("X509_CRL_set_issuer_name")
+have_func("X509_CRL_set_version")
+have_func("X509_CRL_sort")
 have_func("X509_NAME_hash_old")
-have_func("X509_STORE_CTX_get0_current_crl")
-have_func("X509_STORE_set_verify_cb")
-have_func("i2d_ASN1_SET_ANY")
-have_func("SSL_SESSION_cmp") # removed
-OpenSSL.check_func_or_macro("SSL_set_tlsext_host_name", "openssl/ssl.h")
-have_struct_member("CRYPTO_THREADID", "ptr", "openssl/crypto.h")
-have_func("EVP_PKEY_get0")
-
-# added in 1.0.1
-have_func("SSL_CTX_set_next_proto_select_cb")
-have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION")
-
-# added in 1.0.2
-have_func("EC_curve_nist2nid")
-have_func("X509_REVOKED_dup")
-have_func("X509_STORE_CTX_get0_store")
-have_func("SSL_CTX_set_alpn_select_cb")
-OpenSSL.check_func_or_macro("SSL_CTX_set1_curves_list", "openssl/ssl.h")
-OpenSSL.check_func_or_macro("SSL_CTX_set_ecdh_auto", "openssl/ssl.h")
-OpenSSL.check_func_or_macro("SSL_get_server_tmp_key", "openssl/ssl.h")
-have_func("SSL_is_server")
-
-# added in 1.1.0
-have_func("CRYPTO_lock") || $defs.push("-DHAVE_OPENSSL_110_THREADING_API")
-have_struct_member("SSL", "ctx", "openssl/ssl.h") || $defs.push("-DHAVE_OPAQUE_OPENSSL")
-have_func("BN_GENCB_new")
-have_func("BN_GENCB_free")
-have_func("BN_GENCB_get_arg")
-have_func("EVP_MD_CTX_new")
-have_func("EVP_MD_CTX_free")
-have_func("HMAC_CTX_new")
-have_func("HMAC_CTX_free")
-OpenSSL.check_func("RAND_pseudo_bytes", "openssl/rand.h") # deprecated
 have_func("X509_STORE_get_ex_data")
 have_func("X509_STORE_set_ex_data")
-have_func("X509_CRL_get0_signature")
-have_func("X509_REQ_get0_signature")
-have_func("X509_REVOKED_get0_serialNumber")
-have_func("X509_REVOKED_get0_revocationDate")
-have_func("X509_get0_tbs_sigalg")
-have_func("X509_STORE_CTX_get0_untrusted")
-have_func("X509_STORE_CTX_get0_cert")
-have_func("X509_STORE_CTX_get0_chain")
-have_func("OCSP_SINGLERESP_get0_id")
-have_func("SSL_CTX_get_ciphers")
-have_func("X509_up_ref")
-have_func("X509_CRL_up_ref")
-have_func("X509_STORE_up_ref")
-have_func("SSL_SESSION_up_ref")
-have_func("EVP_PKEY_up_ref")
-OpenSSL.check_func_or_macro("SSL_CTX_set_tmp_ecdh_callback", "openssl/ssl.h") # removed
-OpenSSL.check_func_or_macro("SSL_CTX_set_min_proto_version", "openssl/ssl.h")
-have_func("SSL_CTX_get_security_level")
-have_func("X509_get0_notBefore")
-have_func("SSL_SESSION_get_protocol_version")
+have_func("OBJ_NAME_do_all_sorted")
+have_func("SSL_SESSION_get_id")
+have_func("SSL_SESSION_cmp")
+have_func("OPENSSL_cleanse")
+have_func("SSLv2_method")
+have_func("SSLv2_server_method")
+have_func("SSLv2_client_method")
+have_func("TLSv1_1_method")
+have_func("TLSv1_1_server_method")
+have_func("TLSv1_1_client_method")
+have_func("TLSv1_2_method")
+have_func("TLSv1_2_server_method")
+have_func("TLSv1_2_client_method")
+have_macro("OPENSSL_NPN_NEGOTIATED", ['openssl/ssl.h']) && $defs.push("-DHAVE_OPENSSL_NPN_NEGOTIATED")
+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 have_header("openssl/engine.h")
+  have_func("ENGINE_add")
+  have_func("ENGINE_load_builtin_engines")
+  have_func("ENGINE_load_openbsd_dev_crypto")
+  have_func("ENGINE_get_digest")
+  have_func("ENGINE_get_cipher")
+  have_func("ENGINE_cleanup")
+  have_func("ENGINE_load_dynamic")
+  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")
+  have_func("ENGINE_load_padlock")
+  have_func("ENGINE_load_capi")
+  have_func("ENGINE_load_gmp")
+  have_func("ENGINE_load_gost")
+  have_func("ENGINE_load_cryptodev")
+  have_func("ENGINE_load_aesni")
+end
+have_func("DH_generate_parameters_ex")
+have_func("DSA_generate_parameters_ex")
+have_func("RSA_generate_key_ex")
+if checking_for('OpenSSL version is 0.9.7 or later') {
+    try_static_assert('OPENSSL_VERSION_NUMBER >= 0x00907000L', 'openssl/opensslv.h')
+  }
+  have_header("openssl/ocsp.h")
+end
+have_struct_member("CRYPTO_THREADID", "ptr", "openssl/crypto.h")
+have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h")
+have_struct_member("EVP_CIPHER_CTX", "engine", "openssl/evp.h")
+have_struct_member("X509_ATTRIBUTE", "single", "openssl/x509.h")
+have_macro("OPENSSL_FIPS", ['openssl/opensslconf.h']) && $defs.push("-DHAVE_OPENSSL_FIPS")
+have_macro("EVP_CTRL_GCM_GET_TAG", ['openssl/evp.h']) && $defs.push("-DHAVE_AUTHENTICATED_ENCRYPTION")
 
 Logging::message "=== Checking done. ===\n"
 
 create_header
-create_makefile("openssl")
+create_makefile("openssl") {|conf|
+  conf << "THREAD_MODEL = #{CONFIG["THREAD_MODEL"]}\n"
+}
 Logging::message "Done.\n"
diff --git a/ext/openssl/lib/openssl.rb b/ext/openssl/lib/openssl.rb
index 26d167a9b4..19a4382d0d 100644
--- a/ext/openssl/lib/openssl.rb
+++ b/ext/openssl/lib/openssl.rb
@@ -1,19 +1,22 @@
-# frozen_string_literal: false
 =begin
+= $RCSfile$ -- Loader for all OpenSSL C-space and Ruby-space definitions
+
 = Info
   'OpenSSL for Ruby 2' project
   Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
   All rights reserved.
 
 = Licence
-  This program is licensed under the same licence as Ruby.
+  This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
+
+= Version
+  $Id$
 =end
 
 require 'openssl.so'
 
 require 'openssl/bn'
-require 'openssl/pkey'
 require 'openssl/cipher'
 require 'openssl/config'
 require 'openssl/digest'
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index 6d6c96e42d..0e19c20d34 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -1,6 +1,7 @@
-# frozen_string_literal: false
 #--
 #
+# $RCSfile$
+#
 # = Ruby-space definitions that completes C-space funcs for BN
 #
 # = Info
@@ -9,20 +10,17 @@
 # All rights reserved.
 #
 # = Licence
-# This program is licensed under the same licence as Ruby.
+# This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
+#
+# = Version
+# $Id$
+#
 #++
 
 module OpenSSL
   class BN
     include Comparable
-
-    def pretty_print(q)
-      q.object_group(self) {
-        q.text ' '
-        q.text to_i.to_s
-      }
-    end
   end # BN
 end # OpenSSL
 
@@ -37,3 +35,4 @@ class Integer
     OpenSSL::BN::new(self)
   end
 end # Integer
+
diff --git a/ext/openssl/lib/openssl/buffering.rb b/ext/openssl/lib/openssl/buffering.rb
index 7fd647caad..1223c5de15 100644
--- a/ext/openssl/lib/openssl/buffering.rb
+++ b/ext/openssl/lib/openssl/buffering.rb
@@ -1,14 +1,18 @@
 # coding: binary
-# frozen_string_literal: false
 #--
+#= $RCSfile$ -- Buffering mix-in module.
+#
 #= Info
 #  'OpenSSL for Ruby 2' project
 #  Copyright (C) 2001 GOTOU YUUZOU <gotoyuzo@notwork.org>
 #  All rights reserved.
 #
 #= Licence
-#  This program is licensed under the same licence as Ruby.
+#  This program is licenced under the same licence as Ruby.
 #  (See the file 'LICENCE'.)
+#
+#= Version
+#  $Id$
 #++
 
 ##
@@ -132,6 +136,7 @@ module OpenSSL::Buffering
       buf.replace(ret)
       ret = buf
     end
+    raise EOFError if ret.empty?
     ret
   end
 
@@ -163,10 +168,6 @@ module OpenSSL::Buffering
   # Note that one reason that read_nonblock writes to the underlying IO is
   # when the peer requests a new TLS/SSL handshake.  See openssl the FAQ for
   # more details.  http://www.openssl.org/support/faq.html
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that read_nonblock should not raise an IO::Wait*able exception, but
-  # return the symbol :wait_writable or :wait_readable instead.
 
   def read_nonblock(maxlen, buf=nil, exception: true)
     if maxlen == 0
@@ -185,6 +186,7 @@ module OpenSSL::Buffering
       buf.replace(ret)
       ret = buf
     end
+    raise EOFError if ret.empty?
     ret
   end
 
@@ -211,7 +213,7 @@ module OpenSSL::Buffering
     else
       size = idx ? idx+eol.size : nil
     end
-    if size && limit && limit >= 0
+    if limit and limit >= 0
       size = [size, limit].min
     end
     consume_rbuff(size)
@@ -375,10 +377,6 @@ module OpenSSL::Buffering
   # Note that one reason that write_nonblock reads from the underlying IO
   # is when the peer requests a new TLS/SSL handshake.  See the openssl FAQ
   # for more details.  http://www.openssl.org/support/faq.html
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that write_nonblock should not raise an IO::Wait*able exception, but
-  # return the symbol :wait_writable or :wait_readable instead.
 
   def write_nonblock(s, exception: true)
     flush
@@ -389,7 +387,7 @@ module OpenSSL::Buffering
   # Writes +s+ to the stream.  +s+ will be converted to a String using
   # String#to_s.
 
-  def <<(s)
+  def << (s)
     do_write(s)
     self
   end
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index af721b3a80..b3340ff52a 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -1,5 +1,7 @@
-# frozen_string_literal: false
 #--
+#
+# $RCSfile$
+#
 # = Ruby-space predefined Cipher subclasses
 #
 # = Info
@@ -8,8 +10,12 @@
 # All rights reserved.
 #
 # = Licence
-# This program is licensed under the same licence as Ruby.
+# This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
+#
+# = Version
+# $Id$
+#
 #++
 
 module OpenSSL
@@ -18,7 +24,7 @@ module OpenSSL
       klass = Class.new(Cipher){
         define_method(:initialize){|*args|
           cipher_name = args.inject(name){|n, arg| "#{n}-#{arg}" }
-          super(cipher_name.downcase)
+          super(cipher_name)
         }
       }
       const_set(name, klass)
@@ -26,42 +32,34 @@ module OpenSSL
 
     %w(128 192 256).each{|keylen|
       klass = Class.new(Cipher){
-        define_method(:initialize){|mode = "CBC"|
-          super("aes-#{keylen}-#{mode}".downcase)
+        define_method(:initialize){|mode|
+          mode ||= "CBC"
+          cipher_name = "AES-#{keylen}-#{mode}"
+          super(cipher_name)
         }
       }
       const_set("AES#{keylen}", klass)
     }
 
-    # call-seq:
-    #   cipher.random_key -> key
-    #
-    # Generate a random key with OpenSSL::Random.random_bytes and sets it to
-    # the cipher, and returns it.
-    #
-    # You must call #encrypt or #decrypt before calling this method.
+    # 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
 
-    # call-seq:
-    #   cipher.random_iv -> iv
-    #
-    # Generate a random IV with OpenSSL::Random.random_bytes and sets it to the
-    # cipher, and returns it.
-    #
-    # You must call #encrypt or #decrypt before calling this method.
+    # 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
 
-    # Deprecated.
-    #
-    # This class is only provided for backwards compatibility.
-    # Use OpenSSL::Cipher.
-    class Cipher < Cipher; end
-    deprecate_constant :Cipher
+    # This class is only provided for backwards compatibility.  Use OpenSSL::Cipher in the future.
+    class Cipher < Cipher
+      # add warning
+    end
   end # Cipher
 end # OpenSSL
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 8822545192..5716d59fd6 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 =begin
 = Ruby-space definitions that completes C-space funcs for Config
 
@@ -6,7 +5,7 @@
   Copyright (C) 2010  Hiroshi Nakamura <nahi@ruby-lang.org>
 
 = Licence
-  This program is licensed under the same licence as Ruby.
+  This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
 
 =end
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 97ccbc9569..a7b641fd22 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -1,5 +1,7 @@
-# frozen_string_literal: false
 #--
+#
+# $RCSfile$
+#
 # = Ruby-space predefined Digest subclasses
 #
 # = Info
@@ -8,17 +10,18 @@
 # All rights reserved.
 #
 # = Licence
-# This program is licensed under the same licence as Ruby.
+# This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
+#
+# = Version
+# $Id$
+#
 #++
 
 module OpenSSL
   class Digest
 
-    alg = %w(MD2 MD4 MD5 MDC2 RIPEMD160 SHA1)
-    if OPENSSL_VERSION_NUMBER < 0x10100000
-      alg += %w(DSS DSS1 SHA)
-    end
+    alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
     if OPENSSL_VERSION_NUMBER > 0x00908000
       alg += %w(SHA224 SHA256 SHA384 SHA512)
     end
@@ -53,9 +56,15 @@ module OpenSSL
     # Deprecated.
     #
     # This class is only provided for backwards compatibility.
-    # Use OpenSSL::Digest instead.
-    class Digest < Digest; end # :nodoc:
-    deprecate_constant :Digest
+    class Digest < Digest # :nodoc:
+      # Deprecated.
+      #
+      # See OpenSSL::Digest.new
+      def initialize(*args)
+        warn('Digest::Digest is deprecated; use Digest')
+        super(*args)
+      end
+    end
 
   end # Digest
 
@@ -76,3 +85,4 @@ module OpenSSL
   module_function :Digest
 
 end # OpenSSL
+
diff --git a/ext/openssl/lib/openssl/pkey.rb b/ext/openssl/lib/openssl/pkey.rb
deleted file mode 100644
index 9af5f781f9..0000000000
--- a/ext/openssl/lib/openssl/pkey.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: false
-module OpenSSL
-  module PKey
-    if defined?(OpenSSL::PKey::DH)
-
-    class DH
-      # :nodoc:
-      DEFAULT_1024 = new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
-AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
-T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
------END DH PARAMETERS-----
-      _end_of_pem_
-
-      # :nodoc:
-      DEFAULT_2048 = new <<-_end_of_pem_
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEA7E6kBrYiyvmKAMzQ7i8WvwVk9Y/+f8S7sCTN712KkK3cqd1jhJDY
-JbrYeNV3kUIKhPxWHhObHKpD1R84UpL+s2b55+iMd6GmL7OYmNIT/FccKhTcveab
-VBmZT86BZKYyf45hUF9FOuUM9xPzuK3Vd8oJQvfYMCd7LPC0taAEljQLR4Edf8E6
-YoaOffgTf5qxiwkjnlVZQc3whgnEt9FpVMvQ9eknyeGB5KHfayAc3+hUAvI3/Cr3
-1bNveX5wInh5GDx1FGhKBZ+s1H+aedudCm7sCgRwv8lKWYGiHzObSma8A86KG+MD
-7Lo5JquQ3DlBodj3IDyPrxIv96lvRPFtAwIBAg==
------END DH PARAMETERS-----
-      _end_of_pem_
-    end
-
-    # :nodoc:
-    DEFAULT_TMP_DH_CALLBACK = lambda { |ctx, is_export, keylen|
-      warn "using default DH parameters." if $VERBOSE
-      case keylen
-      when 1024 then OpenSSL::PKey::DH::DEFAULT_1024
-      when 2048 then OpenSSL::PKey::DH::DEFAULT_2048
-      else
-        nil
-      end
-    }
-
-    else
-      DEFAULT_TMP_DH_CALLBACK = nil
-    end
-  end
-end
diff --git a/ext/openssl/lib/openssl/ssl.rb b/ext/openssl/lib/openssl/ssl.rb
index f40a451439..fb1045381f 100644
--- a/ext/openssl/lib/openssl/ssl.rb
+++ b/ext/openssl/lib/openssl/ssl.rb
@@ -1,117 +1,86 @@
-# frozen_string_literal: false
 =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 licensed under the same licence as Ruby.
+  This program is licenced under the same licence as Ruby.
   (See the file 'LICENCE'.)
+
+= Version
+  $Id$
 =end
 
 require "openssl/buffering"
-require "io/nonblock"
+require "fcntl"
 
 module OpenSSL
   module SSL
     class SSLContext
-      DEFAULT_PARAMS = { # :nodoc:
+      DEFAULT_PARAMS = {
         :ssl_version => "SSLv23",
         :verify_mode => OpenSSL::SSL::VERIFY_PEER,
-        :verify_hostname => true,
+        :ciphers => %w{
+          ECDHE-ECDSA-AES128-GCM-SHA256
+          ECDHE-RSA-AES128-GCM-SHA256
+          ECDHE-ECDSA-AES256-GCM-SHA384
+          ECDHE-RSA-AES256-GCM-SHA384
+          DHE-RSA-AES128-GCM-SHA256
+          DHE-DSS-AES128-GCM-SHA256
+          DHE-RSA-AES256-GCM-SHA384
+          DHE-DSS-AES256-GCM-SHA384
+          ECDHE-ECDSA-AES128-SHA256
+          ECDHE-RSA-AES128-SHA256
+          ECDHE-ECDSA-AES128-SHA
+          ECDHE-RSA-AES128-SHA
+          ECDHE-ECDSA-AES256-SHA384
+          ECDHE-RSA-AES256-SHA384
+          ECDHE-ECDSA-AES256-SHA
+          ECDHE-RSA-AES256-SHA
+          DHE-RSA-AES128-SHA256
+          DHE-RSA-AES256-SHA256
+          DHE-RSA-AES128-SHA
+          DHE-RSA-AES256-SHA
+          DHE-DSS-AES128-SHA256
+          DHE-DSS-AES256-SHA256
+          DHE-DSS-AES128-SHA
+          DHE-DSS-AES256-SHA
+          AES128-GCM-SHA256
+          AES256-GCM-SHA384
+          AES128-SHA256
+          AES256-SHA256
+          AES128-SHA
+          AES256-SHA
+          ECDHE-ECDSA-RC4-SHA
+          ECDHE-RSA-RC4-SHA
+          RC4-SHA
+        }.join(":"),
         :options => -> {
           opts = OpenSSL::SSL::OP_ALL
-          opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
+          opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
           opts |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
-          opts |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
-          opts
+          opts |= OpenSSL::SSL::OP_NO_SSLv2 if defined?(OpenSSL::SSL::OP_NO_SSLv2)
+          opts |= OpenSSL::SSL::OP_NO_SSLv3 if defined?(OpenSSL::SSL::OP_NO_SSLv3)
         }.call
       }
 
-      if !(OpenSSL::OPENSSL_VERSION.start_with?("OpenSSL") &&
-           OpenSSL::OPENSSL_VERSION_NUMBER >= 0x10100000)
-        DEFAULT_PARAMS.merge!(
-          ciphers: %w{
-            ECDHE-ECDSA-AES128-GCM-SHA256
-            ECDHE-RSA-AES128-GCM-SHA256
-            ECDHE-ECDSA-AES256-GCM-SHA384
-            ECDHE-RSA-AES256-GCM-SHA384
-            DHE-RSA-AES128-GCM-SHA256
-            DHE-DSS-AES128-GCM-SHA256
-            DHE-RSA-AES256-GCM-SHA384
-            DHE-DSS-AES256-GCM-SHA384
-            ECDHE-ECDSA-AES128-SHA256
-            ECDHE-RSA-AES128-SHA256
-            ECDHE-ECDSA-AES128-SHA
-            ECDHE-RSA-AES128-SHA
-            ECDHE-ECDSA-AES256-SHA384
-            ECDHE-RSA-AES256-SHA384
-            ECDHE-ECDSA-AES256-SHA
-            ECDHE-RSA-AES256-SHA
-            DHE-RSA-AES128-SHA256
-            DHE-RSA-AES256-SHA256
-            DHE-RSA-AES128-SHA
-            DHE-RSA-AES256-SHA
-            DHE-DSS-AES128-SHA256
-            DHE-DSS-AES256-SHA256
-            DHE-DSS-AES128-SHA
-            DHE-DSS-AES256-SHA
-            AES128-GCM-SHA256
-            AES256-GCM-SHA384
-            AES128-SHA256
-            AES256-SHA256
-            AES128-SHA
-            AES256-SHA
-          }.join(":"),
-        )
-      end
-
-      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new # :nodoc:
+      DEFAULT_CERT_STORE = OpenSSL::X509::Store.new
       DEFAULT_CERT_STORE.set_default_paths
-      DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
-
-      # A callback invoked when DH parameters are required.
-      #
-      # The callback is invoked with the Session for the key exchange, an
-      # flag indicating the use of an export cipher and the keylength
-      # required.
-      #
-      # The callback must return an OpenSSL::PKey::DH instance of the correct
-      # key length.
-
-      attr_accessor :tmp_dh_callback
-
-      # A callback invoked at connect time to distinguish between multiple
-      # server names.
-      #
-      # The callback is invoked with an SSLSocket and a server name.  The
-      # callback must return an SSLContext for the server name or nil.
-      attr_accessor :servername_cb if ExtConfig::HAVE_TLSEXT_HOST_NAME
-
-      # 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
-      def initialize(version = nil)
-        self.options |= OpenSSL::SSL::OP_ALL
-        self.ssl_version = version if version
+      if defined?(OpenSSL::X509::V_FLAG_CRL_CHECK_ALL)
+        DEFAULT_CERT_STORE.flags = OpenSSL::X509::V_FLAG_CRL_CHECK_ALL
       end
 
       ##
-      # call-seq:
-      #   ctx.set_params(params = {}) -> params
-      #
-      # Sets saner defaults optimized for the use with HTTP-like protocols.
-      #
-      # If a Hash +params+ is given, the parameters are overridden with it.
+      # Sets the parameters for this SSL context to the values in +params+.
       # The keys in +params+ must be assignment methods on SSLContext.
       #
       # If the verify_mode is not VERIFY_NONE and ca_file, ca_path and
       # cert_store are not set then the system default certificate store is
       # used.
+
       def set_params(params={})
         params = DEFAULT_PARAMS.merge(params)
         params.each{|name, value| self.__send__("#{name}=", value) }
@@ -154,6 +123,15 @@ module OpenSSL
       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|
@@ -164,7 +142,8 @@ module OpenSSL
           case san.tag
           when 2 # dNSName in GeneralName (RFC5280)
             should_verify_common_name = false
-            return true if verify_hostname(hostname, san.value)
+            reg = Regexp.escape(san.value).gsub(/\\\*/, "[^.]+")
+            return true if /\A#{reg}\z/i =~ hostname
           when 7 # iPAddress in GeneralName (RFC5280)
             should_verify_common_name = false
             # follows GENERAL_NAME_print() in x509v3/v3_alt.c
@@ -179,7 +158,8 @@ module OpenSSL
       if should_verify_common_name
         cert.subject.to_a.each{|oid, value|
           if oid == "CN"
-            return true if verify_hostname(hostname, value)
+            reg = Regexp.escape(value).gsub(/\\\*/, "[^.]+")
+            return true if /\A#{reg}\z/i =~ hostname
           end
         }
       end
@@ -187,150 +167,23 @@ module OpenSSL
     end
     module_function :verify_certificate_identity
 
-    def verify_hostname(hostname, san) # :nodoc:
-      # RFC 5280, IA5String is limited to the set of ASCII characters
-      return false unless san.ascii_only?
-      return false unless hostname.ascii_only?
-
-      # See RFC 6125, section 6.4.1
-      # Matching is case-insensitive.
-      san_parts = san.downcase.split(".")
-
-      # TODO: this behavior should probably be more strict
-      return san == hostname if san_parts.size < 2
-
-      # Matching is case-insensitive.
-      host_parts = hostname.downcase.split(".")
-
-      # RFC 6125, section 6.4.3, subitem 2.
-      # If the wildcard character is the only character of the left-most
-      # label in the presented identifier, the client SHOULD NOT compare
-      # against anything but the left-most label of the reference
-      # identifier (e.g., *.example.com would match foo.example.com but
-      # not bar.foo.example.com or example.com).
-      return false unless san_parts.size == host_parts.size
-
-      # RFC 6125, section 6.4.3, subitem 1.
-      # The client SHOULD NOT attempt to match a presented identifier in
-      # which the wildcard character comprises a label other than the
-      # left-most label (e.g., do not match bar.*.example.net).
-      return false unless verify_wildcard(host_parts.shift, san_parts.shift)
-
-      san_parts.join(".") == host_parts.join(".")
-    end
-    module_function :verify_hostname
-
-    def verify_wildcard(domain_component, san_component) # :nodoc:
-      parts = san_component.split("*", -1)
-
-      return false if parts.size > 2
-      return san_component == domain_component if parts.size == 1
-
-      # RFC 6125, section 6.4.3, subitem 3.
-      # The client SHOULD NOT attempt to match a presented identifier
-      # where the wildcard character is embedded within an A-label or
-      # U-label of an internationalized domain name.
-      return false if domain_component.start_with?("xn--") && san_component != "*"
-
-      parts[0].length + parts[1].length < domain_component.length &&
-      domain_component.start_with?(parts[0]) &&
-      domain_component.end_with?(parts[1])
-    end
-    module_function :verify_wildcard
-
     class SSLSocket
       include Buffering
       include SocketForwarder
+      include Nonblock
 
-      if ExtConfig::HAVE_TLSEXT_HOST_NAME
-        attr_reader :hostname
-      end
-
-      # The underlying IO object.
-      attr_reader :io
-      alias :to_io :io
-
-      # The SSLContext object used in this connection.
-      attr_reader :context
-
-      # Whether to close the underlying socket as well, when the SSL/TLS
-      # connection is shut down. This defaults to +false+.
-      attr_accessor :sync_close
-
-      # call-seq:
-      #    ssl.sysclose => nil
-      #
-      # Sends "close notify" to the peer and tries to shut down the SSL
-      # connection gracefully.
-      #
-      # If sync_close is set to +true+, the underlying IO is also closed.
-      def sysclose
-        return if closed?
-        stop
-        io.close if sync_close
-      end
-
-      # call-seq:
-      #   ssl.post_connection_check(hostname) -> true
-      #
-      # Perform hostname verification following RFC 6125.
-      #
-      # This method MUST be called after calling #connect to ensure that the
-      # hostname of a remote peer has been verified.
       def post_connection_check(hostname)
-        if peer_cert.nil?
-          msg = "Peer verification enabled, but no certificate received."
-          if using_anon_cipher?
-            msg += " Anonymous cipher suite #{cipher[0]} was negotiated. " \
-                   "Anonymous suites must be disabled to use peer verification."
-          end
-          raise SSLError, msg
-        end
-
         unless OpenSSL::SSL.verify_certificate_identity(peer_cert, hostname)
           raise SSLError, "hostname \"#{hostname}\" does not match the server certificate"
         end
         return true
       end
 
-      # call-seq:
-      #   ssl.session -> aSession
-      #
-      # Returns the SSLSession object currently used, or nil if the session is
-      # not established.
       def session
         SSL::Session.new(self)
       rescue SSL::Session::SessionError
         nil
       end
-
-      private
-
-      def using_anon_cipher?
-        ctx = OpenSSL::SSL::SSLContext.new
-        ctx.ciphers = "aNULL"
-        ctx.ciphers.include?(cipher)
-      end
-
-      def client_cert_cb
-        @context.client_cert_cb
-      end
-
-      def tmp_dh_callback
-        @context.tmp_dh_callback || OpenSSL::PKey::DEFAULT_TMP_DH_CALLBACK
-      end
-
-      def tmp_ecdh_callback
-        @context.tmp_ecdh_callback
-      end
-
-      def session_new_cb
-        @context.session_new_cb
-      end
-
-      def session_get_cb
-        @context.session_get_cb
-      end
     end
 
     ##
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index aef3456e0f..31a4381db4 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -1,5 +1,7 @@
-# frozen_string_literal: false
 #--
+#
+# $RCSfile$
+#
 # = Ruby-space definitions that completes C-space funcs for X509 and subclasses
 #
 # = Info
@@ -8,8 +10,12 @@
 # All rights reserved.
 #
 # = Licence
-# This program is licensed under the same licence as Ruby.
+# This program is licenced under the same licence as Ruby.
 # (See the file 'LICENCE'.)
+#
+# = Version
+# $Id$
+#
 #++
 
 module OpenSSL
@@ -64,7 +70,7 @@ module OpenSSL
         HexPair = /#{HexChar}#{HexChar}/
         HexString = /#{HexPair}+/
         Pair = /\\(?:[#{Special}]|\\|"|#{HexPair})/
-        StringChar = /[^\\"#{Special}]/
+        StringChar = /[^#{Special}\\"]/
         QuoteChar = /[^\\"]/
         AttributeType = /[a-zA-Z][0-9a-zA-Z]*|[0-9]+(?:\.[0-9]+)*/
         AttributeValue = /
@@ -145,13 +151,6 @@ module OpenSSL
 
         alias parse parse_openssl
       end
-
-      def pretty_print(q)
-        q.object_group(self) {
-          q.text ' '
-          q.text to_s(OpenSSL::X509::Name::RFC2253)
-        }
-      end
     end
 
     class StoreContext
@@ -159,18 +158,5 @@ module OpenSSL
         warn "(#{caller.first}) OpenSSL::X509::StoreContext#cleanup is deprecated with no replacement" if $VERBOSE
       end
     end
-
-    class Certificate
-      def pretty_print(q)
-        q.object_group(self) {
-          q.breakable
-          q.text 'subject='; q.pp self.subject; q.text ','; q.breakable
-          q.text 'issuer='; q.pp self.issuer; q.text ','; q.breakable
-          q.text 'serial='; q.pp self.serial; q.text ','; q.breakable
-          q.text 'not_before='; q.pp self.not_before; q.text ','; q.breakable
-          q.text 'not_after='; q.pp self.not_after
-        }
-      end
-    end
   end
 end
diff --git a/ext/openssl/openssl.gemspec b/ext/openssl/openssl.gemspec
deleted file mode 100644
index b5ad826e82..0000000000
--- a/ext/openssl/openssl.gemspec
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- encoding: utf-8 -*-
-# stub: openssl 2.0.2 ruby lib
-# stub: ext/openssl/extconf.rb
-
-Gem::Specification.new do |s|
-  s.name = "openssl".freeze
-  s.version = "2.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Martin Bosslet".freeze, "SHIBATA Hiroshi".freeze, "Zachary Scott".freeze, "Kazuki Yamaguchi".freeze]
-  s.date = "2016-12-22"
-  s.description = "It wraps the OpenSSL library.".freeze
-  s.email = ["ruby-core@ruby-lang.org".freeze]
-  s.extensions = ["ext/openssl/extconf.rb".freeze]
-  s.extra_rdoc_files = ["CONTRIBUTING.md".freeze, "README.md".freeze, "History.md".freeze]
-  s.files = ["BSDL".freeze, "CONTRIBUTING.md".freeze, "History.md".freeze, "LICENSE.txt".freeze, "README.md".freeze, "ext/openssl/deprecation.rb".freeze, "ext/openssl/extconf.rb".freeze, "ext/openssl/openssl_missing.c".freeze, "ext/openssl/openssl_missing.h".freeze, "ext/openssl/ossl.c".freeze, "ext/openssl/ossl.h".freeze, "ext/openssl/ossl_asn1.c".freeze, "ext/openssl/ossl_asn1.h".freeze, "ext/openssl/ossl_bio.c".freeze, "ext/openssl/ossl_bio.h".freeze, "ext/openssl/ossl_bn.c".freeze, "ext/openssl/ossl_bn.h".freeze, "ext/openssl/ossl_cipher.c".freeze, "ext/openssl/ossl_cipher.h".freeze, "ext/openssl/ossl_config.c".freeze, "ext/openssl/ossl_config.h".freeze, "ext/openssl/ossl_digest.c".freeze, "ext/openssl/ossl_digest.h".freeze, "ext/openssl/ossl_engine.c".freeze, "ext/openssl/ossl_engine.h".freeze, "ext/openssl/ossl_hmac.c".freeze, "ext/openssl/ossl_hmac.h".freeze, "ext/openssl/ossl_ns_spki.c".freeze, "ext/openssl/ossl_ns_spki.h".freeze, "ext/openssl/ossl_ocsp.c".freeze, "ext/openssl/ossl_ocsp.h".freeze, "ext/openssl/ossl_pkcs12.c".freeze, "ext/openssl/ossl_pkcs12.h".freeze, "ext/openssl/ossl_pkcs5.c".freeze, "ext/openssl/ossl_pkcs5.h".freeze, "ext/openssl/ossl_pkcs7.c".freeze, "ext/openssl/ossl_pkcs7.h".freeze, "ext/openssl/ossl_pkey.c".freeze, "ext/openssl/ossl_pkey.h".freeze, "ext/openssl/ossl_pkey_dh.c".freeze, "ext/openssl/ossl_pkey_dsa.c".freeze, "ext/openssl/ossl_pkey_ec.c".freeze, "ext/openssl/ossl_pkey_rsa.c".freeze, "ext/openssl/ossl_rand.c".freeze, "ext/openssl/ossl_rand.h".freeze, "ext/openssl/ossl_ssl.c".freeze, "ext/openssl/ossl_ssl.h".freeze, "ext/openssl/ossl_ssl_session.c".freeze, "ext/openssl/ossl_version.h".freeze, "ext/openssl/ossl_x509.c".freeze, "ext/openssl/ossl_x509.h".freeze, "ext/openssl/ossl_x509attr.c".freeze, "ext/openssl/ossl_x509cert.c".freeze, "ext/openssl/ossl_x509crl.c".freeze, "ext/openssl/ossl_x509ext.c".freeze, "ext/openssl/ossl_x509name.c".freeze, "ext/openssl/ossl_x509req.c".freeze, "ext/openssl/ossl_x509revoked.c".freeze, "ext/openssl/ossl_x509store.c".freeze, "ext/openssl/ruby_missing.h".freeze, "lib/openssl.rb".freeze, "lib/openssl/bn.rb".freeze, "lib/openssl/buffering.rb".freeze, "lib/openssl/cipher.rb".freeze, "lib/openssl/config.rb".freeze, "lib/openssl/digest.rb".freeze, "lib/openssl/pkey.rb".freeze, "lib/openssl/ssl.rb".freeze, "lib/openssl/x509.rb".freeze]
-  s.homepage = "https://www.ruby-lang.org/".freeze
-  s.licenses = ["Ruby".freeze]
-  s.rdoc_options = ["--main".freeze, "README.md".freeze]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.3.0".freeze)
-  s.rubygems_version = "2.6.8".freeze
-  s.summary = "OpenSSL provides SSL, TLS and general purpose cryptography.".freeze
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake-compiler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<test-unit>.freeze, ["~> 3.0"])
-      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<rake-compiler>.freeze, [">= 0"])
-      s.add_dependency(%q<test-unit>.freeze, ["~> 3.0"])
-      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<rake-compiler>.freeze, [">= 0"])
-    s.add_dependency(%q<test-unit>.freeze, ["~> 3.0"])
-    s.add_dependency(%q<rdoc>.freeze, [">= 0"])
-  end
-end
diff --git a/ext/openssl/openssl_missing.c b/ext/openssl/openssl_missing.c
index 94ce85aff4..b5efaaf15d 100644
--- a/ext/openssl/openssl_missing.c
+++ b/ext/openssl/openssl_missing.c
@@ -1,50 +1,116 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include RUBY_EXTCONF_H
 
-#include <string.h> /* memcpy() */
-#if !defined(OPENSSL_NO_ENGINE)
+#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_EVP_CIPHER_CTX_ENGINE)
 # include <openssl/engine.h>
 #endif
-#if !defined(OPENSSL_NO_HMAC)
-# include <openssl/hmac.h>
-#endif
 #include <openssl/x509_vfy.h>
 
+#if !defined(OPENSSL_NO_HMAC)
+#include <string.h> /* memcpy() */
+#include <openssl/hmac.h>
+
 #include "openssl_missing.h"
 
-/* added in 0.9.8X */
-#if !defined(HAVE_EVP_CIPHER_CTX_NEW)
-EVP_CIPHER_CTX *
-ossl_EVP_CIPHER_CTX_new(void)
+#if !defined(HAVE_HMAC_CTX_COPY)
+void
+HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
 {
-    EVP_CIPHER_CTX *ctx = OPENSSL_malloc(sizeof(EVP_CIPHER_CTX));
-    if (!ctx)
-	return NULL;
-    EVP_CIPHER_CTX_init(ctx);
+    if (!out || !in) return;
+    memcpy(out, in, sizeof(HMAC_CTX));
+
+    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);
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_CREATE)
+EVP_MD_CTX *
+EVP_MD_CTX_create(void)
+{
+    EVP_MD_CTX *ctx = OPENSSL_malloc(sizeof(EVP_MD_CTX));
+    if (!ctx) return NULL;
+
+    memset(ctx, 0, sizeof(EVP_MD_CTX));
+
     return ctx;
 }
 #endif
 
-#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
+int
+EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx)
+{
+    /* FIXME!!! */
+    memset(ctx, 0, sizeof(EVP_MD_CTX));
+
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
 void
-ossl_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
+EVP_MD_CTX_destroy(EVP_MD_CTX *ctx)
 {
-    if (ctx) {
-	EVP_CIPHER_CTX_cleanup(ctx);
-	OPENSSL_free(ctx);
-    }
+    EVP_MD_CTX_cleanup(ctx);
+    OPENSSL_free(ctx);
+}
+#endif
+
+#if !defined(HAVE_EVP_MD_CTX_INIT)
+void
+EVP_MD_CTX_init(EVP_MD_CTX *ctx)
+{
+    memset(ctx, 0, sizeof(EVP_MD_CTX));
+}
+#endif
+
+#if !defined(HAVE_HMAC_CTX_INIT)
+void
+HMAC_CTX_init(HMAC_CTX *ctx)
+{
+    EVP_MD_CTX_init(&ctx->i_ctx);
+    EVP_MD_CTX_init(&ctx->o_ctx);
+    EVP_MD_CTX_init(&ctx->md_ctx);
+}
+#endif
+
+#if !defined(HAVE_HMAC_CTX_CLEANUP)
+void
+HMAC_CTX_cleanup(HMAC_CTX *ctx)
+{
+    EVP_MD_CTX_cleanup(&ctx->i_ctx);
+    EVP_MD_CTX_cleanup(&ctx->o_ctx);
+    EVP_MD_CTX_cleanup(&ctx->md_ctx);
+    memset(ctx, 0, sizeof(HMAC_CTX));
 }
 #endif
 
-/* added in 1.0.0 */
 #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
 /*
  * this function does not exist in OpenSSL yet... or ever?.
@@ -52,11 +118,11 @@ ossl_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
  * tested on 0.9.7d.
  */
 int
-ossl_EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
+EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in)
 {
     memcpy(out, in, sizeof(EVP_CIPHER_CTX));
 
-#if !defined(OPENSSL_NO_ENGINE)
+#if defined(HAVE_ENGINE_ADD) && defined(HAVE_EVP_CIPHER_CTX_ENGINE)
     if (in->engine) ENGINE_add(out->engine);
     if (in->cipher_data) {
 	out->cipher_data = OPENSSL_malloc(in->cipher->ctx_size);
@@ -68,106 +134,223 @@ ossl_EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, const EVP_CIPHER_CTX *in)
 }
 #endif
 
-#if !defined(OPENSSL_NO_HMAC)
-#if !defined(HAVE_HMAC_CTX_COPY)
+#if !defined(HAVE_X509_CRL_SET_VERSION)
 int
-ossl_HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
+X509_CRL_set_version(X509_CRL *x, long version)
 {
-    if (!out || !in)
-	return 0;
+    if (x == NULL || x->crl == NULL) return 0;
+    if (x->crl->version == NULL) {
+	x->crl->version = M_ASN1_INTEGER_new();
+	if (x->crl->version == NULL) return 0;
+    }
+    return ASN1_INTEGER_set(x->crl->version, version);
+}
+#endif
 
-    memcpy(out, in, sizeof(HMAC_CTX));
+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
+int
+X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
+{
+    if (x == NULL || x->crl == NULL) return 0;
+    return X509_NAME_set(&x->crl->issuer, name);
+}
+#endif
 
-    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);
+#if !defined(HAVE_X509_CRL_SORT)
+int
+X509_CRL_sort(X509_CRL *c)
+{
+    int i;
+    X509_REVOKED *r;
+    /* sort the data so it will be written in serial
+     * number order */
+    sk_X509_REVOKED_sort(c->crl->revoked);
+    for (i=0; i<sk_X509_REVOKED_num(c->crl->revoked); i++) {
+	r=sk_X509_REVOKED_value(c->crl->revoked, i);
+	r->sequence=i;
+    }
+    return 1;
+}
+#endif
+
+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
+static int
+OSSL_X509_REVOKED_cmp(const X509_REVOKED * const *a, const X509_REVOKED * const *b)
+{
+    return(ASN1_STRING_cmp(
+		(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);
+    if (!inf->revoked || !sk_X509_REVOKED_push(inf->revoked, rev))
+	return 0;
     return 1;
 }
-#endif /* HAVE_HMAC_CTX_COPY */
-#endif /* NO_HMAC */
+#endif
+
+#if !defined(HAVE_BN_MOD_SQR)
+int
+BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx)
+{
+    if (!BN_sqr(r, (BIGNUM*)a, ctx)) return 0;
+    return BN_mod(r, r, m, ctx);
+}
+#endif
 
-/* added in 1.0.2 */
-#if !defined(OPENSSL_NO_EC)
-#if !defined(HAVE_EC_CURVE_NIST2NID)
-static struct {
-    const char *name;
-    int nid;
-} nist_curves[] = {
-    {"B-163", NID_sect163r2},
-    {"B-233", NID_sect233r1},
-    {"B-283", NID_sect283r1},
-    {"B-409", NID_sect409r1},
-    {"B-571", NID_sect571r1},
-    {"K-163", NID_sect163k1},
-    {"K-233", NID_sect233k1},
-    {"K-283", NID_sect283k1},
-    {"K-409", NID_sect409k1},
-    {"K-571", NID_sect571k1},
-    {"P-192", NID_X9_62_prime192v1},
-    {"P-224", NID_secp224r1},
-    {"P-256", NID_X9_62_prime256v1},
-    {"P-384", NID_secp384r1},
-    {"P-521", NID_secp521r1}
-};
+#if !defined(HAVE_BN_MOD_ADD) || !defined(HAVE_BN_MOD_SUB)
+int BN_nnmod(BIGNUM *r, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx)
+{
+    if (!BN_mod(r,m,d,ctx)) return 0;
+    if (!r->neg) return 1;
+    return (d->neg ? BN_sub : BN_add)(r, r, d);
+}
+#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)
+{
+    if (!BN_add(r, a, b)) return 0;
+    return BN_nnmod(r, r, m, ctx);
+}
+#endif
 
+#if !defined(HAVE_BN_MOD_SUB)
 int
-ossl_EC_curve_nist2nid(const char *name)
+BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx)
+{
+    if (!BN_sub(r, a, b)) return 0;
+    return BN_nnmod(r, r, m, ctx);
+}
+#endif
+
+#if !defined(HAVE_BN_RAND_RANGE) || !defined(HAVE_BN_PSEUDO_RAND_RANGE)
+static int
+bn_rand_range(int pseudo, BIGNUM *r, BIGNUM *range)
 {
-    size_t i;
-    for (i = 0; i < (sizeof(nist_curves) / sizeof(nist_curves[0])); i++) {
-	if (!strcmp(nist_curves[i].name, name))
-	    return nist_curves[i].nid;
+    int (*bn_rand)(BIGNUM *, int, int, int) = pseudo ? BN_pseudo_rand : BN_rand;
+    int n;
+
+    if (range->neg || BN_is_zero(range)) return 0;
+
+    n = BN_num_bits(range);
+
+    if (n == 1) {
+	if (!BN_zero(r)) return 0;
+    } else if (!BN_is_bit_set(range, n - 2) && !BN_is_bit_set(range, n - 3)) {
+	do {
+	    if (!bn_rand(r, n + 1, -1, 0)) return 0;
+	    if (BN_cmp(r ,range) >= 0) {
+		if (!BN_sub(r, r, range)) return 0;
+		if (BN_cmp(r, range) >= 0)
+		    if (!BN_sub(r, r, range)) return 0;
+	    }
+	} while (BN_cmp(r, range) >= 0);
+    } else {
+	do {
+	    if (!bn_rand(r, n, -1, 0)) return 0;
+	} while (BN_cmp(r, range) >= 0);
     }
-    return NID_undef;
+
+    return 1;
 }
 #endif
+
+#if !defined(HAVE_BN_RAND_RANGE)
+int
+BN_rand_range(BIGNUM *r, BIGNUM *range)
+{
+    return bn_rand_range(0, r, range);
+}
 #endif
 
-/*** added in 1.1.0 ***/
-#if !defined(HAVE_HMAC_CTX_NEW)
-HMAC_CTX *
-ossl_HMAC_CTX_new(void)
+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
+int
+BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range)
 {
-    HMAC_CTX *ctx = OPENSSL_malloc(sizeof(HMAC_CTX));
-    if (!ctx)
-	return NULL;
-    HMAC_CTX_init(ctx);
-    return ctx;
+    return bn_rand_range(1, r, range);
 }
 #endif
 
-#if !defined(HAVE_HMAC_CTX_FREE)
-void
-ossl_HMAC_CTX_free(HMAC_CTX *ctx)
+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
+#define OPENSSL_CONF "openssl.cnf"
+char *
+CONF_get1_default_config_file(void)
 {
-    if (ctx) {
-	HMAC_CTX_cleanup(ctx);
-	OPENSSL_free(ctx);
-    }
+    char *file;
+    int len;
+
+    file = getenv("OPENSSL_CONF");
+    if (file) return BUF_strdup(file);
+    len = strlen(X509_get_default_cert_area());
+#ifndef OPENSSL_SYS_VMS
+    len++;
+#endif
+    len += strlen(OPENSSL_CONF);
+    file = OPENSSL_malloc(len + 1);
+    if (!file) return NULL;
+    strcpy(file,X509_get_default_cert_area());
+#ifndef OPENSSL_SYS_VMS
+    strcat(file,"/");
+#endif
+    strcat(file,OPENSSL_CONF);
+
+    return file;
 }
 #endif
 
-#if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
-void
-ossl_X509_CRL_get0_signature(const X509_CRL *crl, const ASN1_BIT_STRING **psig,
-			     const X509_ALGOR **palg)
+#if !defined(HAVE_PEM_DEF_CALLBACK)
+#define OSSL_PASS_MIN_LENGTH 4
+int
+PEM_def_callback(char *buf, int num, int w, void *key)
 {
-    if (psig != NULL)
-	*psig = crl->signature;
-    if (palg != NULL)
-	*palg = crl->sig_alg;
+    int i,j;
+    const char *prompt;
+
+    if (key) {
+	i = strlen(key);
+	i = (i > num) ? num : i;
+	memcpy(buf, key, i);
+	return i;
+    }
+
+    prompt = EVP_get_pw_prompt();
+    if (prompt == NULL) prompt = "Enter PEM pass phrase:";
+    for (;;) {
+	i = EVP_read_pw_string(buf, num, prompt, w);
+	if (i != 0) {
+	    memset(buf, 0, (unsigned int)num);
+	    return(-1);
+	}
+	j = strlen(buf);
+	if (j < OSSL_PASS_MIN_LENGTH) {
+	    fprintf(stderr,
+		    "phrase is too short, needs to be at least %d chars\n",
+		    OSSL_PASS_MIN_LENGTH);
+	}
+	else break;
+    }
+    return j;
 }
 #endif
 
-#if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
-void
-ossl_X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-			     const X509_ALGOR **palg)
+#if !defined(HAVE_ASN1_PUT_EOC)
+int
+ASN1_put_eoc(unsigned char **pp)
 {
-    if (psig != NULL)
-	*psig = req->signature;
-    if (palg != NULL)
-	*palg = req->sig_alg;
+    unsigned char *p = *pp;
+    *p++ = 0;
+    *p++ = 0;
+    *pp = p;
+    return 2;
 }
 #endif
+
diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h
index 3d11aec2d2..3635f88b73 100644
--- a/ext/openssl/openssl_missing.h
+++ b/ext/openssl/openssl_missing.h
@@ -1,265 +1,198 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_OPENSSL_MISSING_H_)
 #define _OSSL_OPENSSL_MISSING_H_
 
-#include "ruby/config.h"
-
-/* added in 0.9.8X */
-#if !defined(HAVE_EVP_CIPHER_CTX_NEW)
-EVP_CIPHER_CTX *ossl_EVP_CIPHER_CTX_new(void);
-#  define EVP_CIPHER_CTX_new ossl_EVP_CIPHER_CTX_new
+#if defined(__cplusplus)
+extern "C" {
 #endif
 
-#if !defined(HAVE_EVP_CIPHER_CTX_FREE)
-void ossl_EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *);
-#  define EVP_CIPHER_CTX_free ossl_EVP_CIPHER_CTX_free
+#ifndef TYPEDEF_D2I_OF
+typedef char *d2i_of_void();
 #endif
-
-#if !defined(HAVE_SSL_CTX_CLEAR_OPTIONS)
-#  define SSL_CTX_clear_options(ctx, op) ((ctx)->options &= ~(op))
+#ifndef TYPEDEF_I2D_OF
+typedef int i2d_of_void();
 #endif
 
-/* added in 1.0.0 */
-#if !defined(HAVE_EVP_PKEY_BASE_ID)
-#  define EVP_PKEY_base_id(pkey) EVP_PKEY_type((pkey)->type)
-#endif
+/*
+ * These functions are not included in headers of OPENSSL <= 0.9.6b
+ */
 
-#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
-int ossl_EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *, const EVP_CIPHER_CTX *);
-#  define EVP_CIPHER_CTX_copy ossl_EVP_CIPHER_CTX_copy
+#if !defined(PEM_read_bio_DSAPublicKey)
+# define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
+        (d2i_of_void *)d2i_DSAPublicKey,PEM_STRING_DSA_PUBLIC,(bp),(void **)(x),(cb),(u))
 #endif
 
-#if !defined(HAVE_HMAC_CTX_COPY)
-int ossl_HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-#  define HMAC_CTX_copy ossl_HMAC_CTX_copy
+#if !defined(PEM_write_bio_DSAPublicKey)
+# define PEM_write_bio_DSAPublicKey(bp,x) \
+	PEM_ASN1_write_bio((i2d_of_void *)i2d_DSAPublicKey,\
+		PEM_STRING_DSA_PUBLIC,\
+		(bp),(char *)(x), NULL, NULL, 0, NULL, NULL)
 #endif
 
-#if !defined(HAVE_X509_STORE_CTX_GET0_CURRENT_CRL)
-#  define X509_STORE_CTX_get0_current_crl(x) ((x)->current_crl)
+#if !defined(DSAPrivateKey_dup)
+# define DSAPrivateKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, \
+	(d2i_of_void *)d2i_DSAPrivateKey,(char *)(dsa))
 #endif
 
-#if !defined(HAVE_X509_STORE_SET_VERIFY_CB)
-#  define X509_STORE_set_verify_cb X509_STORE_set_verify_cb_func
+#if !defined(DSAPublicKey_dup)
+# define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup((i2d_of_void *)i2d_DSAPublicKey, \
+	(d2i_of_void *)d2i_DSAPublicKey,(char *)(dsa))
 #endif
 
-#if !defined(HAVE_I2D_ASN1_SET_ANY)
-#  define i2d_ASN1_SET_ANY(sk, x) i2d_ASN1_SET_OF_ASN1_TYPE((sk), (x), \
-		i2d_ASN1_TYPE, V_ASN1_SET, V_ASN1_UNIVERSAL, 0)
+#if !defined(X509_REVOKED_dup)
+# 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(HAVE_EVP_PKEY_GET0)
-#  define EVP_PKEY_get0(pk) (pk->pkey.ptr)
+#if !defined(PKCS7_SIGNER_INFO_dup)
+#  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
 
-/* added in 1.0.2 */
-#if !defined(OPENSSL_NO_EC)
-#if !defined(HAVE_EC_CURVE_NIST2NID)
-int ossl_EC_curve_nist2nid(const char *);
-#  define EC_curve_nist2nid ossl_EC_curve_nist2nid
-#endif
+#if !defined(PKCS7_RECIP_INFO_dup)
+#  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_X509_REVOKED_DUP)
-# define X509_REVOKED_dup(rev) (X509_REVOKED *)ASN1_dup((i2d_of_void *)i2d_X509_REVOKED, \
-	(d2i_of_void *)d2i_X509_REVOKED, (char *)(rev))
+#if !defined(HAVE_HMAC_CTX_INIT)
+void HMAC_CTX_init(HMAC_CTX *ctx);
 #endif
 
-#if !defined(HAVE_X509_STORE_CTX_GET0_STORE)
-#  define X509_STORE_CTX_get0_store(x) ((x)->ctx)
+#if !defined(HAVE_HMAC_CTX_COPY)
+void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
 #endif
 
-#if !defined(HAVE_SSL_IS_SERVER)
-#  define SSL_is_server(s) ((s)->server)
+#if !defined(HAVE_HMAC_CTX_CLEANUP)
+void HMAC_CTX_cleanup(HMAC_CTX *ctx);
 #endif
 
-/* added in 1.1.0 */
-#if !defined(HAVE_BN_GENCB_NEW)
-#  define BN_GENCB_new() ((BN_GENCB *)OPENSSL_malloc(sizeof(BN_GENCB)))
+#if !defined(HAVE_EVP_MD_CTX_CREATE)
+EVP_MD_CTX *EVP_MD_CTX_create(void);
 #endif
 
-#if !defined(HAVE_BN_GENCB_FREE)
-#  define BN_GENCB_free(cb) OPENSSL_free(cb)
+#if !defined(HAVE_EVP_MD_CTX_INIT)
+void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
 #endif
 
-#if !defined(HAVE_BN_GENCB_GET_ARG)
-#  define BN_GENCB_get_arg(cb) (cb)->arg
+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
+int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_NEW)
-#  define EVP_MD_CTX_new EVP_MD_CTX_create
+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
+void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
 #endif
 
-#if !defined(HAVE_EVP_MD_CTX_FREE)
-#  define EVP_MD_CTX_free EVP_MD_CTX_destroy
+#if !defined(HAVE_EVP_CIPHER_CTX_COPY)
+int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
 #endif
 
-#if !defined(HAVE_HMAC_CTX_NEW)
-HMAC_CTX *ossl_HMAC_CTX_new(void);
-#  define HMAC_CTX_new ossl_HMAC_CTX_new
+#if !defined(HAVE_EVP_DIGESTINIT_EX)
+#  define EVP_DigestInit_ex(ctx, md, engine) EVP_DigestInit((ctx), (md))
 #endif
-
-#if !defined(HAVE_HMAC_CTX_FREE)
-void ossl_HMAC_CTX_free(HMAC_CTX *);
-#  define HMAC_CTX_free ossl_HMAC_CTX_free
+#if !defined(HAVE_EVP_DIGESTFINAL_EX)
+#  define EVP_DigestFinal_ex(ctx, buf, len) EVP_DigestFinal((ctx), (buf), (len))
 #endif
 
-#if !defined(HAVE_X509_STORE_GET_EX_DATA)
-#  define X509_STORE_get_ex_data(x, idx) \
-	CRYPTO_get_ex_data(&(x)->ex_data, (idx))
+#if !defined(HAVE_EVP_CIPHERINIT_EX)
+#  define EVP_CipherInit_ex(ctx, type, impl, key, iv, enc) EVP_CipherInit((ctx), (type), (key), (iv), (enc))
 #endif
-
-#if !defined(HAVE_X509_STORE_SET_EX_DATA)
-#  define X509_STORE_set_ex_data(x, idx, data) \
-	CRYPTO_set_ex_data(&(x)->ex_data, (idx), (data))
-#  define X509_STORE_get_ex_new_index(l, p, newf, dupf, freef) \
-	CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_X509_STORE, (l), (p), \
-				(newf), (dupf), (freef))
+#if !defined(HAVE_EVP_CIPHERFINAL_EX)
+#  define EVP_CipherFinal_ex(ctx, outm, outl) EVP_CipherFinal((ctx), (outm), (outl))
 #endif
 
-#if !defined(HAVE_X509_CRL_GET0_SIGNATURE)
-void ossl_X509_CRL_get0_signature(const X509_CRL *, const ASN1_BIT_STRING **, const X509_ALGOR **);
-#  define X509_CRL_get0_signature ossl_X509_CRL_get0_signature
+#if !defined(EVP_CIPHER_name)
+#  define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e))
 #endif
 
-#if !defined(HAVE_X509_REQ_GET0_SIGNATURE)
-void ossl_X509_REQ_get0_signature(const X509_REQ *, const ASN1_BIT_STRING **, const X509_ALGOR **);
-#  define X509_REQ_get0_signature ossl_X509_REQ_get0_signature
+#if !defined(EVP_MD_name)
+#  define EVP_MD_name(e) OBJ_nid2sn(EVP_MD_type(e))
 #endif
 
-#if !defined(HAVE_X509_REVOKED_GET0_SERIALNUMBER)
-#  define X509_REVOKED_get0_serialNumber(x) ((x)->serialNumber)
+#if !defined(HAVE_EVP_HMAC_INIT_EX)
+#  define HMAC_Init_ex(ctx, key, len, digest, engine) HMAC_Init((ctx), (key), (len), (digest))
 #endif
 
-#if !defined(HAVE_X509_REVOKED_GET0_REVOCATIONDATE)
-#  define X509_REVOKED_get0_revocationDate(x) ((x)->revocationDate)
+#if !defined(PKCS7_is_detached)
+#  define PKCS7_is_detached(p7) (PKCS7_type_is_signed(p7) && PKCS7_get_detached(p7))
 #endif
 
-#if !defined(HAVE_X509_GET0_TBS_SIGALG)
-#  define X509_get0_tbs_sigalg(x) ((x)->cert_info->signature)
+#if !defined(PKCS7_type_is_encrypted)
+#  define PKCS7_type_is_encrypted(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted)
 #endif
 
-#if !defined(HAVE_X509_STORE_CTX_GET0_UNTRUSTED)
-#  define X509_STORE_CTX_get0_untrusted(x) ((x)->untrusted)
+#if !defined(HAVE_OPENSSL_CLEANSE)
+#define OPENSSL_cleanse(p, l) memset((p), 0, (l))
 #endif
 
-#if !defined(HAVE_X509_STORE_CTX_GET0_CERT)
-#  define X509_STORE_CTX_get0_cert(x) ((x)->cert)
+#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_CTX_GET0_CHAIN)
-#  define X509_STORE_CTX_get0_chain(ctx) X509_STORE_CTX_get_chain(ctx)
+#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_OCSP_SINGLERESP_GET0_ID)
-#  define OCSP_SINGLERESP_get0_id(s) ((s)->certId)
+#if !defined(HAVE_X509_CRL_SET_VERSION)
+int X509_CRL_set_version(X509_CRL *x, long version);
 #endif
 
-#if !defined(HAVE_SSL_CTX_GET_CIPHERS)
-#  define SSL_CTX_get_ciphers(ctx) ((ctx)->cipher_list)
+#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_UP_REF)
-#  define X509_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509)
+#if !defined(HAVE_X509_CRL_SORT)
+int X509_CRL_sort(X509_CRL *c);
 #endif
 
-#if !defined(HAVE_X509_CRL_UP_REF)
-#  define X509_CRL_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_CRL);
+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
+int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
 #endif
 
-#if !defined(HAVE_X509_STORE_UP_REF)
-#  define X509_STORE_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_X509_STORE);
+#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_SSL_SESSION_UP_REF)
-#  define SSL_SESSION_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_SSL_SESSION);
+#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_EVP_PKEY_UP_REF)
-#  define EVP_PKEY_up_ref(x) \
-	CRYPTO_add(&(x)->references, 1, CRYPTO_LOCK_EVP_PKEY);
+#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_OPAQUE_OPENSSL)
-#define IMPL_PKEY_GETTER(_type, _name) \
-static inline _type *EVP_PKEY_get0_##_type(EVP_PKEY *pkey) { \
-	return pkey->pkey._name; }
-#define IMPL_KEY_ACCESSOR2(_type, _group, a1, a2, _fail_cond) \
-static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2) { \
-	if (a1) *a1 = obj->a1; \
-	if (a2) *a2 = obj->a2; } \
-static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2) { \
-	if (_fail_cond) return 0; \
-	BN_clear_free(obj->a1); obj->a1 = a1; \
-	BN_clear_free(obj->a2); obj->a2 = a2; \
-	return 1; }
-#define IMPL_KEY_ACCESSOR3(_type, _group, a1, a2, a3, _fail_cond) \
-static inline void _type##_get0_##_group(_type *obj, const BIGNUM **a1, const BIGNUM **a2, const BIGNUM **a3) { \
-	if (a1) *a1 = obj->a1; \
-	if (a2) *a2 = obj->a2; \
-	if (a3) *a3 = obj->a3; } \
-static inline int _type##_set0_##_group(_type *obj, BIGNUM *a1, BIGNUM *a2, BIGNUM *a3) { \
-	if (_fail_cond) return 0; \
-	BN_clear_free(obj->a1); obj->a1 = a1; \
-	BN_clear_free(obj->a2); obj->a2 = a2; \
-	BN_clear_free(obj->a3); obj->a3 = a3; \
-	return 1; }
-
-#if !defined(OPENSSL_NO_RSA)
-IMPL_PKEY_GETTER(RSA, rsa)
-IMPL_KEY_ACCESSOR3(RSA, key, n, e, d, (n == obj->n || e == obj->e || (obj->d && d == obj->d)))
-IMPL_KEY_ACCESSOR2(RSA, factors, p, q, (p == obj->p || q == obj->q))
-IMPL_KEY_ACCESSOR3(RSA, crt_params, dmp1, dmq1, iqmp, (dmp1 == obj->dmp1 || dmq1 == obj->dmq1 || iqmp == obj->iqmp))
+#if !defined(HAVE_BN_RAND_RANGE)
+int BN_rand_range(BIGNUM *r, BIGNUM *range);
 #endif
 
-#if !defined(OPENSSL_NO_DSA)
-IMPL_PKEY_GETTER(DSA, dsa)
-IMPL_KEY_ACCESSOR2(DSA, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
-IMPL_KEY_ACCESSOR3(DSA, pqg, p, q, g, (p == obj->p || q == obj->q || g == obj->g))
+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
+int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
 #endif
 
-#if !defined(OPENSSL_NO_DH)
-IMPL_PKEY_GETTER(DH, dh)
-IMPL_KEY_ACCESSOR2(DH, key, pub_key, priv_key, (pub_key == obj->pub_key || (obj->priv_key && priv_key == obj->priv_key)))
-IMPL_KEY_ACCESSOR3(DH, pqg, p, q, g, (p == obj->p || obj->q && q == obj->q || g == obj->g))
-static inline ENGINE *DH_get0_engine(DH *dh) { return dh->engine; }
+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
+char *CONF_get1_default_config_file(void);
 #endif
 
-#if !defined(OPENSSL_NO_EC)
-IMPL_PKEY_GETTER(EC_KEY, ec)
+#if !defined(HAVE_PEM_DEF_CALLBACK)
+int PEM_def_callback(char *buf, int num, int w, void *key);
 #endif
 
-#undef IMPL_PKEY_GETTER
-#undef IMPL_KEY_ACCESSOR2
-#undef IMPL_KEY_ACCESSOR3
-#endif /* HAVE_OPAQUE_OPENSSL */
-
-#if defined(HAVE_AUTHENTICATED_ENCRYPTION) && !defined(EVP_CTRL_AEAD_GET_TAG)
-#  define EVP_CTRL_AEAD_GET_TAG EVP_CTRL_GCM_GET_TAG
-#  define EVP_CTRL_AEAD_SET_TAG EVP_CTRL_GCM_SET_TAG
-#  define EVP_CTRL_AEAD_SET_IVLEN EVP_CTRL_GCM_SET_IVLEN
+#if !defined(HAVE_ASN1_PUT_EOC)
+int ASN1_put_eoc(unsigned char **pp);
 #endif
 
-#if !defined(HAVE_X509_GET0_NOTBEFORE)
-#  define X509_get0_notBefore(x) X509_get_notBefore(x)
-#  define X509_get0_notAfter(x) X509_get_notAfter(x)
-#  define X509_CRL_get0_lastUpdate(x) X509_CRL_get_lastUpdate(x)
-#  define X509_CRL_get0_nextUpdate(x) X509_CRL_get_nextUpdate(x)
+#if defined(__cplusplus)
+}
 #endif
 
-#if !defined(HAVE_SSL_SESSION_GET_PROTOCOL_VERSION)
-#  define SSL_SESSION_get_protocol_version(s) ((s)->ssl_version)
-#endif
 
 #endif /* _OSSL_OPENSSL_MISSING_H_ */
+
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index eb71b643bf..8b25c02990 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -1,15 +1,49 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 #include <stdarg.h> /* for ossl_raise */
-#include <ruby/thread_native.h> /* for OpenSSL < 1.1.0 locks */
+
+/*
+ * String to HEXString conversion
+ */
+int
+string2hex(const unsigned char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
+{
+    static const char hex[]="0123456789abcdef";
+    int i, len;
+
+    if (buf_len < 0 || buf_len > INT_MAX / 2) { /* PARANOIA? */
+	return -1;
+    }
+    len = 2 * buf_len;
+    if (!hexbuf) { /* if no buf, return calculated len */
+	if (hexbuf_len) {
+	    *hexbuf_len = len;
+	}
+	return len;
+    }
+    if (!(*hexbuf = OPENSSL_malloc(len + 1))) {
+	return -1;
+    }
+    for (i = 0; i < buf_len; i++) {
+	(*hexbuf)[2 * i] = hex[((unsigned char)buf[i]) >> 4];
+	(*hexbuf)[2 * i + 1] = hex[buf[i] & 0x0f];
+    }
+    (*hexbuf)[2 * i] = '\0';
+
+    if (hexbuf_len) {
+	*hexbuf_len = len;
+    }
+    return len;
+}
 
 /*
  * Data Conversion
@@ -44,7 +78,7 @@ STACK_OF(type) *						\
 ossl_protect_##name##_ary2sk(VALUE ary, int *status)		\
 {								\
     return (STACK_OF(type)*)rb_protect(				\
-	    (VALUE (*)(VALUE))ossl_##name##_ary2sk0,		\
+	    (VALUE(*)_((VALUE)))ossl_##name##_ary2sk0,		\
 	    ary,						\
 	    status);						\
 }								\
@@ -64,7 +98,7 @@ OSSL_IMPL_ARY2SK(x509, X509, cX509Cert, DupX509CertPtr)
 
 #define OSSL_IMPL_SK2ARY(name, type)	        \
 VALUE						\
-ossl_##name##_sk2ary(const STACK_OF(type) *sk)	\
+ossl_##name##_sk2ary(STACK_OF(type) *sk)	\
 {						\
     type *t;					\
     int i, num;					\
@@ -103,7 +137,7 @@ ossl_buf2str(char *buf, int len)
     VALUE str;
     int status = 0;
 
-    str = rb_protect((VALUE (*)(VALUE))ossl_str_new, len, &status);
+    str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
     if(!NIL_P(str)) memcpy(RSTRING_PTR(str), buf, len);
     OPENSSL_free(buf);
     if(status) rb_jump_tag(status);
@@ -111,49 +145,9 @@ ossl_buf2str(char *buf, int len)
     return str;
 }
 
-void
-ossl_bin2hex(unsigned char *in, char *out, size_t inlen)
-{
-    const char *hex = "0123456789abcdef";
-    size_t i;
-
-    assert(inlen <= LONG_MAX / 2);
-    for (i = 0; i < inlen; i++) {
-	unsigned char p = in[i];
-
-	out[i * 2 + 0] = hex[p >> 4];
-	out[i * 2 + 1] = hex[p & 0x0f];
-    }
-}
-
 /*
  * our default PEM callback
  */
-
-/*
- * OpenSSL requires passwords for PEM-encoded files to be at least four
- * characters long. See crypto/pem/pem_lib.c (as of 1.0.2h)
- */
-#define OSSL_MIN_PWD_LEN 4
-
-VALUE
-ossl_pem_passwd_value(VALUE pass)
-{
-    if (NIL_P(pass))
-	return Qnil;
-
-    StringValue(pass);
-
-    if (RSTRING_LEN(pass) < OSSL_MIN_PWD_LEN)
-	ossl_raise(eOSSLError, "password must be at least %d bytes", OSSL_MIN_PWD_LEN);
-    /* PEM_BUFSIZE is currently used as the second argument of pem_password_cb,
-     * that is +max_len+ of ossl_pem_passwd_cb() */
-    if (RSTRING_LEN(pass) > PEM_BUFSIZE)
-	ossl_raise(eOSSLError, "password must not be longer than %d bytes", PEM_BUFSIZE);
-
-    return pass;
-}
-
 static VALUE
 ossl_pem_passwd_cb0(VALUE flag)
 {
@@ -166,30 +160,13 @@ ossl_pem_passwd_cb0(VALUE flag)
 }
 
 int
-ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
+ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 {
-    long len;
-    int status;
-    VALUE rflag, pass = (VALUE)pwd_;
-
-    if (RTEST(pass)) {
-	/* PEM_def_callback(buf, max_len, flag, StringValueCStr(pass)) does not
-	 * work because it does not allow NUL characters and truncates to 1024
-	 * bytes silently if the input is over 1024 bytes */
-	if (RB_TYPE_P(pass, T_STRING)) {
-	    len = RSTRING_LEN(pass);
-	    if (len >= OSSL_MIN_PWD_LEN && len <= max_len) {
-		memcpy(buf, RSTRING_PTR(pass), len);
-		return (int)len;
-	    }
-	}
-	OSSL_Debug("passed data is not valid String???");
-	return -1;
-    }
+    int len, status = 0;
+    VALUE rflag, pass;
 
-    if (!rb_block_given_p()) {
-	return PEM_def_callback(buf, max_len, flag, NULL);
-    }
+    if (pwd || !rb_block_given_p())
+	return PEM_def_callback(buf, max_len, flag, pwd);
 
     while (1) {
 	/*
@@ -204,19 +181,77 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd_)
 	    rb_set_errinfo(Qnil);
 	    return -1;
 	}
-	len = RSTRING_LEN(pass);
-	if (len < OSSL_MIN_PWD_LEN) {
-	    rb_warning("password must be at least %d bytes", OSSL_MIN_PWD_LEN);
+	len = RSTRING_LENINT(pass);
+	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
+	    rb_warning("password must be longer than 4 bytes");
 	    continue;
 	}
 	if (len > max_len) {
-	    rb_warning("password must not be longer than %d bytes", max_len);
+	    rb_warning("password must be shorter then %d bytes", max_len-1);
 	    continue;
 	}
 	memcpy(buf, RSTRING_PTR(pass), len);
 	break;
     }
-    return (int)len;
+    return len;
+}
+
+/*
+ * Verify callback
+ */
+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
+ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
+{
+    VALUE proc, rctx, ret;
+    struct ossl_verify_cb_args args;
+    int state = 0;
+
+    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, ossl_verify_cb_idx);
+    if ((void*)proc == 0)
+	proc = (VALUE)X509_STORE_get_ex_data(ctx->ctx, ossl_verify_cb_idx);
+    if ((void*)proc == 0)
+	return ok;
+    if (!NIL_P(proc)) {
+	ret = Qfalse;
+	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
+			  (VALUE)ctx, &state);
+	if (state) {
+	    rb_set_errinfo(Qnil);
+	    rb_warn("StoreContext initialization failure");
+	}
+	else {
+	    args.proc = proc;
+	    args.preverify_ok = ok ? Qtrue : Qfalse;
+	    args.store_ctx = rctx;
+	    ret = rb_protect((VALUE(*)(VALUE))ossl_call_verify_cb_proc, (VALUE)&args, &state);
+	    if (state) {
+		rb_set_errinfo(Qnil);
+		rb_warn("exception in verify_callback is ignored");
+	    }
+	    ossl_x509stctx_clear_ptr(rctx);
+	}
+	if (ret == Qtrue) {
+	    X509_STORE_CTX_set_error(ctx, X509_V_OK);
+	    ok = 1;
+	}
+	else{
+	    if (X509_STORE_CTX_get_error(ctx) == X509_V_OK) {
+		X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
+	    }
+	    ok = 0;
+	}
+    }
+
+    return ok;
 }
 
 /*
@@ -263,7 +298,11 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
     const char *msg;
     long e;
 
+#ifdef HAVE_ERR_PEEK_LAST_ERROR
     e = ERR_peek_last_error();
+#else
+    e = ERR_peek_error();
+#endif
     if (fmt) {
 	str = rb_vsprintf(fmt, args);
     }
@@ -280,7 +319,12 @@ ossl_make_error(VALUE exc, const char *fmt, va_list args)
 	    rb_str_cat2(str, msg ? msg : "(null)");
 	}
     }
-    ossl_clear_error();
+    if (dOSSL == Qtrue){ /* show all errors on the stack */
+	while ((e = ERR_get_error()) != 0){
+	    rb_warn("error on stack: %s", ERR_error_string(e, NULL));
+	}
+    }
+    ERR_clear_error();
 
     if (NIL_P(str)) str = rb_str_new(0, 0);
     return rb_exc_new3(exc, str);
@@ -297,32 +341,15 @@ ossl_raise(VALUE exc, const char *fmt, ...)
     rb_exc_raise(err);
 }
 
-void
-ossl_clear_error(void)
+VALUE
+ossl_exc_new(VALUE exc, const char *fmt, ...)
 {
-    if (dOSSL == Qtrue) {
-	unsigned long e;
-	const char *file, *data, *errstr;
-	int line, flags;
-
-	while ((e = ERR_get_error_line_data(&file, &line, &data, &flags))) {
-	    errstr = ERR_error_string(e, NULL);
-	    if (!errstr)
-		errstr = "(null)";
-
-	    if (flags & ERR_TXT_STRING) {
-		if (!data)
-		    data = "(null)";
-		rb_warn("error on stack: %s (%s)", errstr, data);
-	    }
-	    else {
-		rb_warn("error on stack: %s", errstr);
-	    }
-	}
-    }
-    else {
-	ERR_clear_error();
-    }
+    va_list args;
+    VALUE err;
+    va_start(args, fmt);
+    err = ossl_make_error(exc, fmt, args);
+    va_end(args);
+    return err;
 }
 
 /*
@@ -334,7 +361,7 @@ ossl_clear_error(void)
  * Any errors you see here are probably due to a bug in ruby's OpenSSL implementation.
  */
 VALUE
-ossl_get_errors(void)
+ossl_get_errors()
 {
     VALUE ary;
     long e;
@@ -382,14 +409,24 @@ ossl_debug_get(VALUE self)
  * call-seq:
  *   OpenSSL.debug = boolean -> boolean
  *
- * Turns on or off debug mode. With debug mode, all erros added to the OpenSSL
- * error queue will be printed to stderr.
+ * Turns on or off CRYPTO_MEM_CHECK.
+ * Also shows some debugging message on stderr.
  */
 static VALUE
 ossl_debug_set(VALUE self, VALUE val)
 {
-    dOSSL = RTEST(val) ? Qtrue : Qfalse;
-
+    VALUE old = dOSSL;
+    dOSSL = val;
+
+    if (old != dOSSL) {
+	if (dOSSL == Qtrue) {
+	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+	    fprintf(stderr, "OSSL_DEBUG: IS NOW ON!\n");
+	} else if (old == Qtrue) {
+	    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_OFF);
+	    fprintf(stderr, "OSSL_DEBUG: IS NOW OFF!\n");
+	}
+    }
     return val;
 }
 
@@ -402,14 +439,15 @@ ossl_debug_set(VALUE self, VALUE val)
  * so otherwise will result in an error.
  *
  * === Examples
- *   OpenSSL.fips_mode = true   # turn FIPS mode on
- *   OpenSSL.fips_mode = false  # and off again
+ *
+ * OpenSSL.fips_mode = true   # turn FIPS mode on
+ * OpenSSL.fips_mode = false  # and off again
  */
 static VALUE
 ossl_fips_mode_set(VALUE self, VALUE enabled)
 {
 
-#ifdef OPENSSL_FIPS
+#ifdef HAVE_OPENSSL_FIPS
     if (RTEST(enabled)) {
 	int mode = FIPS_mode();
 	if(!mode && !FIPS_mode_set(1)) /* turning on twice leads to an error */
@@ -426,10 +464,10 @@ ossl_fips_mode_set(VALUE self, VALUE enabled)
 #endif
 }
 
-#if !defined(HAVE_OPENSSL_110_THREADING_API)
 /**
  * Stores locks needed for OpenSSL thread safety
  */
+#include "ruby/thread_native.h"
 static rb_nativethread_lock_t *ossl_locks;
 
 static void
@@ -513,7 +551,6 @@ static void Init_ossl_locks(void)
     CRYPTO_set_dynlock_lock_callback(ossl_dyn_lock_callback);
     CRYPTO_set_dynlock_destroy_callback(ossl_dyn_destroy_callback);
 }
-#endif /* !HAVE_OPENSSL_110_THREADING_API */
 
 /*
  * OpenSSL provides SSL, TLS and general purpose cryptography.  It wraps the
@@ -563,12 +600,10 @@ static void Init_ossl_locks(void)
  *
  *   key2 = OpenSSL::PKey::RSA.new File.read 'private_key.pem'
  *   key2.public? # => true
- *   key2.private? # => true
  *
  * or
  *
  *   key3 = OpenSSL::PKey::RSA.new File.read 'public_key.pem'
- *   key3.public? # => true
  *   key3.private? # => false
  *
  * === Loading an Encrypted Key
@@ -578,7 +613,6 @@ static void Init_ossl_locks(void)
  * loading the key:
  *
  *   key4_pem = File.read 'private.secure.pem'
- *   pass_phrase = 'my secure pass phrase goes here'
  *   key4 = OpenSSL::PKey::RSA.new key4_pem, pass_phrase
  *
  * == RSA Encryption
@@ -743,7 +777,6 @@ static void Init_ossl_locks(void)
  * This example creates a self-signed certificate using an RSA key and a SHA1
  * signature.
  *
- *   key = OpenSSL::PKey::RSA.new 2048
  *   name = OpenSSL::X509::Name.parse 'CN=nobody/DC=example'
  *
  *   cert = OpenSSL::X509::Certificate.new
@@ -813,9 +846,8 @@ static void Init_ossl_locks(void)
  * not readable by other users.
  *
  *   ca_key = OpenSSL::PKey::RSA.new 2048
- *   pass_phrase = 'my secure pass phrase goes here'
  *
- *   cipher = OpenSSL::Cipher.new 'AES-128-CBC'
+ *   cipher = OpenSSL::Cipher::Cipher.new 'AES-128-CBC'
  *
  *   open 'ca_key.pem', 'w', 0400 do |io|
  *     io.write ca_key.export(cipher, pass_phrase)
@@ -968,21 +1000,15 @@ static void Init_ossl_locks(void)
  * SSLSocket#connect must be called to initiate the SSL handshake and start
  * encryption.  A key and certificate are not required for the client socket.
  *
- * Note that SSLSocket#close doesn't close the underlying socket by default. Set
- * SSLSocket#sync_close to true if you want.
- *
  *   require 'socket'
  *
- *   tcp_socket = TCPSocket.new 'localhost', 5000
- *   ssl_client = OpenSSL::SSL::SSLSocket.new tcp_socket, context
- *   ssl_client.sync_close = true
+ *   tcp_client = TCPSocket.new 'localhost', 5000
+ *   ssl_client = OpenSSL::SSL::SSLSocket.new client_socket, context
  *   ssl_client.connect
  *
  *   ssl_client.puts "hello server!"
  *   puts ssl_client.gets
  *
- *   ssl_client.close # shutdown the TLS connection and close tcp_socket
- *
  * === Peer Verification
  *
  * An unverified SSL connection does not provide much security.  For enhanced
@@ -996,8 +1022,8 @@ static void Init_ossl_locks(void)
  *
  *   require 'socket'
  *
- *   tcp_socket = TCPSocket.new 'localhost', 5000
- *   ssl_client = OpenSSL::SSL::SSLSocket.new tcp_socket, context
+ *   tcp_client = TCPSocket.new 'localhost', 5000
+ *   ssl_client = OpenSSL::SSL::SSLSocket.new client_socket, context
  *   ssl_client.connect
  *
  *   ssl_client.puts "hello server!"
@@ -1008,7 +1034,7 @@ static void Init_ossl_locks(void)
  *
  */
 void
-Init_openssl(void)
+Init_openssl()
 {
     /*
      * Init timezone info
@@ -1071,14 +1097,11 @@ Init_openssl(void)
     /*
      * Boolean indicating whether OpenSSL is FIPS-enabled or not
      */
-    rb_define_const(mOSSL, "OPENSSL_FIPS",
-#ifdef OPENSSL_FIPS
-		    Qtrue
+#ifdef HAVE_OPENSSL_FIPS
+    rb_define_const(mOSSL, "OPENSSL_FIPS", Qtrue);
 #else
-		    Qfalse
+    rb_define_const(mOSSL, "OPENSSL_FIPS", Qfalse);
 #endif
-		   );
-
     rb_define_module_function(mOSSL, "fips_mode=", ossl_fips_mode_set, 1);
 
     /*
@@ -1089,6 +1112,12 @@ Init_openssl(void)
     rb_global_variable(&eOSSLError);
 
     /*
+     * Verify callback Proc index for ext-data
+     */
+    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
      */
     dOSSL = Qfalse;
@@ -1103,9 +1132,7 @@ Init_openssl(void)
      */
     ossl_s_to_der = rb_intern("to_der");
 
-#if !defined(HAVE_OPENSSL_110_THREADING_API)
     Init_ossl_locks();
-#endif
 
     /*
      * Init components
@@ -1138,3 +1165,4 @@ main(int argc, char *argv[])
     return 0;
 }
 #endif /* OSSL_DEBUG */
+
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 78eddd09b4..c843c06f5c 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_H_)
@@ -12,14 +13,49 @@
 
 #include RUBY_EXTCONF_H
 
-#include <assert.h>
-#include <errno.h>
+#if defined(__cplusplus)
+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!
+*/
+#if defined(RFILE) /*&& !defined(OSSL_DEBUG)*/
+#  undef RFILE
+#endif
 #include <ruby.h>
 #include <ruby/io.h>
 #include <ruby/thread.h>
+
+/*
+ * Check the OpenSSL version
+ * The only supported are:
+ * 	OpenSSL >= 0.9.7
+ */
 #include <openssl/opensslv.h>
+
+#ifdef HAVE_ASSERT_H
+#  include <assert.h>
+#else
+#  define assert(condition)
+#endif
+
+#if defined(_WIN32)
+#  include <openssl/e_os2.h>
+#  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>
-#include <openssl/asn1.h>
+#include <openssl/asn1_mac.h>
 #include <openssl/x509v3.h>
 #include <openssl/ssl.h>
 #include <openssl/pkcs12.h>
@@ -28,14 +64,22 @@
 #include <openssl/rand.h>
 #include <openssl/conf.h>
 #include <openssl/conf_api.h>
-#include <openssl/crypto.h>
-#if !defined(OPENSSL_NO_ENGINE)
+#undef X509_NAME
+#undef PKCS7_SIGNER_INFO
+#if defined(HAVE_OPENSSL_ENGINE_H) && defined(HAVE_EVP_CIPHER_CTX_ENGINE)
+#  define OSSL_ENGINE_ENABLED
 #  include <openssl/engine.h>
 #endif
-#if !defined(OPENSSL_NO_OCSP)
+#if defined(HAVE_OPENSSL_OCSP_H)
+#  define OSSL_OCSP_ENABLED
 #  include <openssl/ocsp.h>
 #endif
 
+/* OpenSSL requires passwords for PEM-encoded files to be at least four
+ * characters long
+ */
+#define OSSL_MIN_PWD_LEN 4
+
 /*
  * Common Module
  */
@@ -70,14 +114,26 @@ extern VALUE eOSSLError;
 } while (0)
 
 /*
+ * Compatibility
+ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define STACK _STACK
+#endif
+
+/*
+ * String to HEXString conversion
+ */
+int string2hex(const unsigned char *, int, char **, int *);
+
+/*
  * Data Conversion
  */
 STACK_OF(X509) *ossl_x509_ary2sk0(VALUE);
 STACK_OF(X509) *ossl_x509_ary2sk(VALUE);
 STACK_OF(X509) *ossl_protect_x509_ary2sk(VALUE,int*);
-VALUE ossl_x509_sk2ary(const STACK_OF(X509) *certs);
-VALUE ossl_x509crl_sk2ary(const STACK_OF(X509_CRL) *crl);
-VALUE ossl_x509name_sk2ary(const STACK_OF(X509_NAME) *names);
+VALUE ossl_x509_sk2ary(STACK_OF(X509) *certs);
+VALUE ossl_x509crl_sk2ary(STACK_OF(X509_CRL) *crl);
+VALUE ossl_x509name_sk2ary(STACK_OF(X509_NAME) *names);
 VALUE ossl_buf2str(char *buf, int len);
 #define ossl_str_adjust(str, p) \
 do{\
@@ -86,39 +142,39 @@ do{\
     assert(newlen <= len);\
     rb_str_set_len((str), newlen);\
 }while(0)
-/*
- * Convert binary string to hex string. The caller is responsible for
- * ensuring out has (2 * len) bytes of capacity.
- */
-void ossl_bin2hex(unsigned char *in, char *out, size_t len);
 
 /*
- * Our default PEM callback
+ * our default PEM callback
  */
-/* Convert the argument to String and validate the length. Note this may raise. */
-VALUE ossl_pem_passwd_value(VALUE);
-/* Can be casted to pem_password_cb. If a password (String) is passed as the
- * "arbitrary data" (typically the last parameter of PEM_{read,write}_
- * functions), uses the value. If not, but a block is given, yields to it.
- * If not either, fallbacks to PEM_def_callback() which reads from stdin. */
 int ossl_pem_passwd_cb(char *, int, int, void *);
 
 /*
  * Clear BIO* with this in PEM/DER fallback scenarios to avoid decoding
  * errors piling up in OpenSSL::Errors
  */
-#define OSSL_BIO_reset(bio) do { \
-    (void)BIO_reset((bio)); \
-    ossl_clear_error(); \
-} while (0)
+#define OSSL_BIO_reset(bio)	(void)BIO_reset((bio)); \
+				ERR_clear_error();
 
 /*
  * ERRor messages
  */
 #define OSSL_ErrMsg() ERR_reason_error_string(ERR_get_error())
 NORETURN(void ossl_raise(VALUE, const char *, ...));
-/* Clear OpenSSL error queue. If dOSSL is set, rb_warn() them. */
-void ossl_clear_error(void);
+VALUE ossl_exc_new(VALUE, const char *, ...);
+
+/*
+ * Verify callback
+ */
+extern int ossl_verify_cb_idx;
+
+struct ossl_verify_cb_args {
+    VALUE proc;
+    VALUE preverify_ok;
+    VALUE store_ctx;
+};
+
+VALUE ossl_call_verify_cb_proc(struct ossl_verify_cb_args *);
+int ossl_verify_cb(int, X509_STORE_CTX *);
 
 /*
  * String to DER String
@@ -183,4 +239,9 @@ void ossl_debug(const char *, ...);
 
 void Init_openssl(void);
 
+#if defined(__cplusplus)
+}
+#endif
+
 #endif /* _OSSL_H_ */
+
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 534796f52a..65ae71e861 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -1,14 +1,24 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
+#if defined(HAVE_SYS_TIME_H)
+#  include <sys/time.h>
+#elif !defined(NT) && !defined(_WIN32)
+struct timeval {
+    long tv_sec;	/* seconds */
+    long tv_usec;	/* and microseconds */
+};
+#endif
+
 static VALUE join_der(VALUE enumerable);
 static VALUE ossl_asn1_decode0(unsigned char **pp, long length, long *offset,
 			       int depth, int yield, long *num_read);
@@ -19,7 +29,7 @@ static VALUE ossl_asn1eoc_initialize(VALUE self);
  * DATE conversion
  */
 VALUE
-asn1time_to_time(const ASN1_TIME *time)
+asn1time_to_time(ASN1_TIME *time)
 {
     struct tm tm;
     VALUE argv[6];
@@ -47,15 +57,9 @@ asn1time_to_time(const ASN1_TIME *time)
 	}
 	break;
     case V_ASN1_GENERALIZEDTIME:
-	count = 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);
-	if (count == 5) {
-		tm.tm_sec = 0;
-	}
-	else if (count != 6) {
-		ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format: \"%s\"",
-			time->data);
+	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:
@@ -72,65 +76,83 @@ asn1time_to_time(const ASN1_TIME *time)
     return rb_funcall2(rb_cTime, rb_intern("utc"), 6, argv);
 }
 
-#if defined(HAVE_ASN1_TIME_ADJ)
-void
-ossl_time_split(VALUE time, time_t *sec, int *days)
-{
-    VALUE num = rb_Integer(time);
+/*
+ * This function is not exported in Ruby's *.h
+ */
+extern struct timeval rb_time_timeval(VALUE);
 
-    if (FIXNUM_P(num)) {
-	time_t t = FIX2LONG(num);
-	*sec = t % 86400;
-	*days = rb_long2int(t / 86400);
-    }
-    else {
-	*days = NUM2INT(rb_funcall(num, rb_intern("/"), 1, INT2FIX(86400)));
-	*sec = NUM2TIMET(rb_funcall(num, rb_intern("%"), 1, INT2FIX(86400)));
-    }
-}
-#else
 time_t
 time_to_time_t(VALUE time)
 {
-    return (time_t)NUM2TIMET(rb_Integer(time));
+    return (time_t)NUM2LONG(rb_Integer(time));
 }
-#endif
 
 /*
  * STRING conversion
  */
 VALUE
-asn1str_to_str(const ASN1_STRING *str)
+asn1str_to_str(ASN1_STRING *str)
 {
     return rb_str_new((const char *)str->data, str->length);
 }
 
 /*
  * ASN1_INTEGER conversions
+ * TODO: Make a decision what's the right way to do this.
  */
+#define DO_IT_VIA_RUBY 0
 VALUE
-asn1integer_to_num(const ASN1_INTEGER *ai)
+asn1integer_to_num(ASN1_INTEGER *ai)
 {
     BIGNUM *bn;
+#if DO_IT_VIA_RUBY
+    char *txt;
+#endif
     VALUE num;
 
     if (!ai) {
 	ossl_raise(rb_eTypeError, "ASN1_INTEGER is NULL!");
     }
-    if (ai->type == V_ASN1_ENUMERATED)
-	/* const_cast: workaround for old OpenSSL */
-	bn = ASN1_ENUMERATED_to_BN((ASN1_ENUMERATED *)ai, NULL);
-    else
-	bn = ASN1_INTEGER_to_BN(ai, NULL);
-
-    if (!bn)
+    if (!(bn = ASN1_INTEGER_to_BN(ai, NULL))) {
 	ossl_raise(eOSSLError, NULL);
+    }
+#if DO_IT_VIA_RUBY
+    if (!(txt = BN_bn2dec(bn))) {
+	BN_free(bn);
+	ossl_raise(eOSSLError, NULL);
+    }
+    num = rb_cstr_to_inum(txt, 10, Qtrue);
+    OPENSSL_free(txt);
+#else
     num = ossl_bn_new(bn);
+#endif
     BN_free(bn);
 
     return num;
 }
 
+#if DO_IT_VIA_RUBY
+ASN1_INTEGER *
+num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
+{
+    BIGNUM *bn = NULL;
+
+    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
+	bn = GetBNPtr(obj);
+    } else {
+	obj = rb_String(obj);
+	if (!BN_dec2bn(&bn, StringValuePtr(obj))) {
+	    ossl_raise(eOSSLError, NULL);
+	}
+    }
+    if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
+	BN_free(bn);
+	ossl_raise(eOSSLError, NULL);
+    }
+    BN_free(bn);
+    return ai;
+}
+#else
 ASN1_INTEGER *
 num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 {
@@ -146,6 +168,7 @@ num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
 
     return ai;
 }
+#endif
 
 /********/
 /*
@@ -185,10 +208,22 @@ VALUE cASN1ObjectId;                          /* OBJECT IDENTIFIER */
 VALUE cASN1UTCTime, cASN1GeneralizedTime;     /* TIME              */
 VALUE cASN1Sequence, cASN1Set;                /* CONSTRUCTIVE      */
 
-static VALUE sym_IMPLICIT, sym_EXPLICIT;
-static VALUE sym_UNIVERSAL, sym_APPLICATION, sym_CONTEXT_SPECIFIC, sym_PRIVATE;
+static ID sIMPLICIT, sEXPLICIT;
+static ID sUNIVERSAL, sAPPLICATION, sCONTEXT_SPECIFIC, sPRIVATE;
 static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNUSED_BITS;
-static ID id_each;
+
+/*
+ * We need to implement these for backward compatibility
+ * reasons, behavior of ASN1_put_object and ASN1_object_size
+ * for infinite length values is different in OpenSSL <= 0.9.7
+ */
+#if OPENSSL_VERSION_NUMBER < 0x00908000L
+#define ossl_asn1_object_size(cons, len, tag)		(cons) == 2 ? (len) + ASN1_object_size((cons), 0, (tag)) : ASN1_object_size((cons), (len), (tag))
+#define ossl_asn1_put_object(pp, cons, len, tag, xc)	(cons) == 2 ? ASN1_put_object((pp), (cons), 0, (tag), (xc)) : ASN1_put_object((pp), (cons), (len), (tag), (xc))
+#else
+#define ossl_asn1_object_size(cons, len, tag)		ASN1_object_size((cons), (len), (tag))
+#define ossl_asn1_put_object(pp, cons, len, tag, xc)	ASN1_put_object((pp), (cons), (len), (tag), (xc))
+#endif
 
 /*
  * Ruby to ASN1 converters
@@ -199,7 +234,11 @@ obj_to_asn1bool(VALUE obj)
     if (NIL_P(obj))
 	ossl_raise(rb_eTypeError, "Can't convert nil into Boolean");
 
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+     return RTEST(obj) ? 0xff : 0x100;
+#else
      return RTEST(obj) ? 0xff : 0x0;
+#endif
 }
 
 static ASN1_INTEGER*
@@ -255,50 +294,36 @@ obj_to_asn1obj(VALUE obj)
 {
     ASN1_OBJECT *a1obj;
 
-    StringValueCStr(obj);
+    StringValue(obj);
     a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 0);
     if(!a1obj) a1obj = OBJ_txt2obj(RSTRING_PTR(obj), 1);
-    if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID %"PRIsVALUE, obj);
+    if(!a1obj) ossl_raise(eASN1Error, "invalid OBJECT ID");
 
     return a1obj;
 }
 
-static ASN1_UTCTIME *
+static ASN1_UTCTIME*
 obj_to_asn1utime(VALUE time)
 {
     time_t sec;
     ASN1_UTCTIME *t;
 
-#if defined(HAVE_ASN1_TIME_ADJ)
-    int off_days;
-
-    ossl_time_split(time, &sec, &off_days);
-    if (!(t = ASN1_UTCTIME_adj(NULL, sec, off_days, 0)))
-#else
     sec = time_to_time_t(time);
-    if (!(t = ASN1_UTCTIME_set(NULL, sec)))
-#endif
-	ossl_raise(eASN1Error, NULL);
+    if(!(t = ASN1_UTCTIME_set(NULL, sec)))
+        ossl_raise(eASN1Error, NULL);
 
     return t;
 }
 
-static ASN1_GENERALIZEDTIME *
+static ASN1_GENERALIZEDTIME*
 obj_to_asn1gtime(VALUE time)
 {
     time_t sec;
     ASN1_GENERALIZEDTIME *t;
 
-#if defined(HAVE_ASN1_TIME_ADJ)
-    int off_days;
-
-    ossl_time_split(time, &sec, &off_days);
-    if (!(t = ASN1_GENERALIZEDTIME_adj(NULL, sec, off_days, 0)))
-#else
     sec = time_to_time_t(time);
-    if (!(t = ASN1_GENERALIZEDTIME_set(NULL, sec)))
-#endif
-	ossl_raise(eASN1Error, NULL);
+    if(!(t =ASN1_GENERALIZEDTIME_set(NULL, sec)))
+        ossl_raise(eASN1Error, NULL);
 
     return t;
 }
@@ -323,14 +348,14 @@ obj_to_asn1derstr(VALUE obj)
 static VALUE
 decode_bool(unsigned char* der, long length)
 {
-    const unsigned char *p = der;
+    int val;
+    const unsigned char *p;
 
-    if (length != 3)
-	ossl_raise(eASN1Error, "invalid length for BOOLEAN");
-    if (p[0] != 1 || p[1] != 1)
-	ossl_raise(eASN1Error, "invalid BOOLEAN");
+    p = der;
+    if((val = d2i_ASN1_BOOLEAN(NULL, &p, length)) < 0)
+	ossl_raise(eASN1Error, NULL);
 
-    return p[2] ? Qtrue : Qfalse;
+    return val ? Qtrue : Qfalse;
 }
 
 static VALUE
@@ -344,7 +369,7 @@ decode_int(unsigned char* der, long length)
     p = der;
     if(!(ai = d2i_ASN1_INTEGER(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE (*)(VALUE))asn1integer_to_num,
+    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
 		     (VALUE)ai, &status);
     ASN1_INTEGER_free(ai);
     if(status) rb_jump_tag(status);
@@ -384,7 +409,7 @@ decode_enum(unsigned char* der, long length)
     p = der;
     if(!(ai = d2i_ASN1_ENUMERATED(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE (*)(VALUE))asn1integer_to_num,
+    ret = rb_protect((VALUE(*)_((VALUE)))asn1integer_to_num,
 		     (VALUE)ai, &status);
     ASN1_ENUMERATED_free(ai);
     if(status) rb_jump_tag(status);
@@ -446,7 +471,7 @@ decode_time(unsigned char* der, long length)
     p = der;
     if(!(time = d2i_ASN1_TIME(NULL, &p, length)))
 	ossl_raise(eASN1Error, NULL);
-    ret = rb_protect((VALUE (*)(VALUE))asn1time_to_time,
+    ret = rb_protect((VALUE(*)_((VALUE)))asn1time_to_time,
 		     (VALUE)time, &status);
     ASN1_TIME_free(time);
     if(status) rb_jump_tag(status);
@@ -592,14 +617,17 @@ ossl_asn1_default_tag(VALUE obj)
     VALUE tmp_class, tag;
 
     tmp_class = CLASS_OF(obj);
-    while (!NIL_P(tmp_class)) {
+    while (tmp_class) {
 	tag = rb_hash_lookup(class_tag_map, tmp_class);
-	if (tag != Qnil)
-	    return NUM2INT(tag);
-	tmp_class = rb_class_superclass(tmp_class);
+	if (tag != Qnil) {
+       	    return NUM2INT(tag);
+      	}
+    	tmp_class = rb_class_superclass(tmp_class);
     }
     ossl_raise(eASN1Error, "universal tag for %"PRIsVALUE" not found",
 	       rb_obj_class(obj));
+
+    return -1; /* dummy */
 }
 
 static int
@@ -618,45 +646,59 @@ static int
 ossl_asn1_is_explicit(VALUE obj)
 {
     VALUE s;
+    int ret = -1;
 
     s = ossl_asn1_get_tagging(obj);
-    if (NIL_P(s) || s == sym_IMPLICIT)
-	return 0;
-    else if (s == sym_EXPLICIT)
-	return 1;
-    else
+    if(NIL_P(s)) return 0;
+    else if(SYMBOL_P(s)){
+	if (SYM2ID(s) == sIMPLICIT)
+	    ret = 0;
+	else if (SYM2ID(s) == sEXPLICIT)
+	    ret = 1;
+    }
+    if(ret < 0){
 	ossl_raise(eASN1Error, "invalid tag default");
+    }
+
+    return ret;
 }
 
 static int
 ossl_asn1_tag_class(VALUE obj)
 {
     VALUE s;
+    int ret = -1;
 
     s = ossl_asn1_get_tag_class(obj);
-    if (NIL_P(s) || s == sym_UNIVERSAL)
-	return V_ASN1_UNIVERSAL;
-    else if (s == sym_APPLICATION)
-	return V_ASN1_APPLICATION;
-    else if (s == sym_CONTEXT_SPECIFIC)
-	return V_ASN1_CONTEXT_SPECIFIC;
-    else if (s == sym_PRIVATE)
-	return V_ASN1_PRIVATE;
-    else
+    if(NIL_P(s)) ret = V_ASN1_UNIVERSAL;
+    else if(SYMBOL_P(s)){
+	if (SYM2ID(s) == sUNIVERSAL)
+	    ret = V_ASN1_UNIVERSAL;
+	else if (SYM2ID(s) == sAPPLICATION)
+	    ret = V_ASN1_APPLICATION;
+	else if (SYM2ID(s) == sCONTEXT_SPECIFIC)
+	    ret = V_ASN1_CONTEXT_SPECIFIC;
+	else if (SYM2ID(s) == sPRIVATE)
+	    ret = V_ASN1_PRIVATE;
+    }
+    if(ret < 0){
 	ossl_raise(eASN1Error, "invalid tag class");
+    }
+
+    return ret;
 }
 
 static VALUE
 ossl_asn1_class2sym(int tc)
 {
     if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	return sym_PRIVATE;
+	return ID2SYM(sPRIVATE);
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	return sym_CONTEXT_SPECIFIC;
+	return ID2SYM(sCONTEXT_SPECIFIC);
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	return sym_APPLICATION;
+	return ID2SYM(sAPPLICATION);
     else
-	return sym_UNIVERSAL;
+	return ID2SYM(sUNIVERSAL);
 }
 
 /*
@@ -680,7 +722,7 @@ ossl_asn1data_initialize(VALUE self, VALUE value, VALUE tag, VALUE tag_class)
 {
     if(!SYMBOL_P(tag_class))
 	ossl_raise(eASN1Error, "invalid tag class");
-    if (tag_class == sym_UNIVERSAL && NUM2INT(tag) > 31)
+    if((SYM2ID(tag_class) == sUNIVERSAL) && NUM2INT(tag) > 31)
 	ossl_raise(eASN1Error, "tag number for Universal too large");
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
@@ -703,7 +745,7 @@ static VALUE
 join_der(VALUE enumerable)
 {
     VALUE str = rb_str_new(0, 0);
-    rb_block_call(enumerable, id_each, 0, 0, join_der_i, str);
+    rb_block_call(enumerable, rb_intern("each"), 0, 0, join_der_i, str);
     return str;
 }
 
@@ -737,11 +779,11 @@ ossl_asn1data_to_der(VALUE self)
     if (inf_length == Qtrue) {
 	is_cons = 2;
     }
-    if((length = ASN1_object_size(is_cons, RSTRING_LENINT(value), tag)) <= 0)
+    if((length = ossl_asn1_object_size(is_cons, RSTRING_LENINT(value), tag)) <= 0)
 	ossl_raise(eASN1Error, NULL);
     der = rb_str_new(0, length);
     p = (unsigned char *)RSTRING_PTR(der);
-    ASN1_put_object(&p, is_cons, RSTRING_LENINT(value), tag, tag_class);
+    ossl_asn1_put_object(&p, is_cons, RSTRING_LENINT(value), tag, tag_class);
     memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
     p += RSTRING_LEN(value);
     ossl_str_adjust(der, p);
@@ -759,7 +801,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
 
     p = *pp;
 
-    if(tc == sym_UNIVERSAL && tag < ossl_asn1_info_size) {
+    if(tc == sUNIVERSAL && tag < ossl_asn1_info_size) {
 	switch(tag){
 	case V_ASN1_EOC:
 	    value = decode_eoc(p, hlen+length);
@@ -801,14 +843,13 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     *pp += hlen + length;
     *num_read = hlen + length;
 
-    if (tc == sym_UNIVERSAL &&
-	tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
+    if (tc == sUNIVERSAL && tag < ossl_asn1_info_size && ossl_asn1_info[tag].klass) {
 	VALUE klass = *ossl_asn1_info[tag].klass;
 	VALUE args[4];
 	args[0] = value;
 	args[1] = INT2NUM(tag);
 	args[2] = Qnil;
-	args[3] = tc;
+	args[3] = ID2SYM(tc);
 	asn1data = rb_obj_alloc(klass);
 	ossl_asn1_initialize(4, args, asn1data);
 	if(tag == V_ASN1_BIT_STRING){
@@ -817,7 +858,7 @@ int_ossl_asn1_decode0_prim(unsigned char **pp, long length, long hlen, int tag,
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), tc);
+	ossl_asn1data_initialize(asn1data, value, INT2NUM(tag), ID2SYM(tc));
     }
 
     return asn1data;
@@ -830,27 +871,28 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
 {
     VALUE value, asn1data, ary;
     int infinite;
-    long available_len, off = *offset;
+    long off = *offset;
 
     infinite = (j == 0x21);
     ary = rb_ary_new();
 
-    available_len = infinite ? max_len : length;
-    while (available_len > 0) {
+    while (length > 0 || infinite) {
 	long inner_read = 0;
-	value = ossl_asn1_decode0(pp, available_len, &off, depth + 1, yield, &inner_read);
+	value = ossl_asn1_decode0(pp, max_len, &off, depth + 1, yield, &inner_read);
 	*num_read += inner_read;
-	available_len -= inner_read;
+	max_len -= inner_read;
 	rb_ary_push(ary, value);
+	if (length > 0)
+	    length -= inner_read;
 
 	if (infinite &&
 	    NUM2INT(ossl_asn1_get_tag(value)) == V_ASN1_EOC &&
-	    ossl_asn1_get_tag_class(value) == sym_UNIVERSAL) {
+	    SYM2ID(ossl_asn1_get_tag_class(value)) == sUNIVERSAL) {
 	    break;
 	}
     }
 
-    if (tc == sym_UNIVERSAL) {
+    if (tc == sUNIVERSAL) {
 	VALUE args[4];
 	int not_sequence_or_set;
 
@@ -872,12 +914,12 @@ int_ossl_asn1_decode0_cons(unsigned char **pp, long max_len, long length,
 	args[0] = ary;
 	args[1] = INT2NUM(tag);
 	args[2] = Qnil;
-	args[3] = tc;
+	args[3] = ID2SYM(tc);
 	ossl_asn1_initialize(4, args, asn1data);
     }
     else {
 	asn1data = rb_obj_alloc(cASN1Data);
-	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), tc);
+	ossl_asn1data_initialize(asn1data, ary, INT2NUM(tag), ID2SYM(tc));
     }
 
     if (infinite)
@@ -907,13 +949,13 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, int depth,
     if(j & 0x80) ossl_raise(eASN1Error, NULL);
     if(len > length) ossl_raise(eASN1Error, "value is too short");
     if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
-	tag_class = sym_PRIVATE;
+	tag_class = sPRIVATE;
     else if((tc & V_ASN1_CONTEXT_SPECIFIC) == V_ASN1_CONTEXT_SPECIFIC)
-	tag_class = sym_CONTEXT_SPECIFIC;
+	tag_class = sCONTEXT_SPECIFIC;
     else if((tc & V_ASN1_APPLICATION) == V_ASN1_APPLICATION)
-	tag_class = sym_APPLICATION;
+	tag_class = sAPPLICATION;
     else
-	tag_class = sym_UNIVERSAL;
+	tag_class = sUNIVERSAL;
 
     hlen = p - start;
 
@@ -932,7 +974,7 @@ ossl_asn1_decode0(unsigned char **pp, long length, long *offset, int depth,
     if(j & V_ASN1_CONSTRUCTED) {
 	*pp += hlen;
 	off += hlen;
-	asn1data = int_ossl_asn1_decode0_cons(pp, length - hlen, len, &off, depth, yield, j, tag, tag_class, &inner_read);
+	asn1data = int_ossl_asn1_decode0_cons(pp, length, len, &off, depth, yield, j, tag, tag_class, &inner_read);
 	inner_read += hlen;
     }
     else {
@@ -987,7 +1029,7 @@ static VALUE
 ossl_asn1_traverse(VALUE self, VALUE obj)
 {
     unsigned char *p;
-    VALUE tmp;
+    volatile VALUE tmp;
     long len, read = 0, offset = 0;
 
     obj = ossl_to_der_if_possible(obj);
@@ -995,7 +1037,6 @@ ossl_asn1_traverse(VALUE self, VALUE obj)
     p = (unsigned char *)RSTRING_PTR(tmp);
     len = RSTRING_LEN(tmp);
     ossl_asn1_decode0(&p, len, &offset, 0, 1, &read);
-    RB_GC_GUARD(tmp);
     int_ossl_decode_sanity_check(len, read, offset);
     return Qnil;
 }
@@ -1017,7 +1058,7 @@ ossl_asn1_decode(VALUE self, VALUE obj)
 {
     VALUE ret;
     unsigned char *p;
-    VALUE tmp;
+    volatile VALUE tmp;
     long len, read = 0, offset = 0;
 
     obj = ossl_to_der_if_possible(obj);
@@ -1025,7 +1066,6 @@ ossl_asn1_decode(VALUE self, VALUE obj)
     p = (unsigned char *)RSTRING_PTR(tmp);
     len = RSTRING_LEN(tmp);
     ret = ossl_asn1_decode0(&p, len, &offset, 0, 0, &read);
-    RB_GC_GUARD(tmp);
     int_ossl_decode_sanity_check(len, read, offset);
     return ret;
 }
@@ -1049,7 +1089,7 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
     VALUE ary, val;
     unsigned char *p;
     long len, tmp_len = 0, read = 0, offset = 0;
-    VALUE tmp;
+    volatile VALUE tmp;
 
     obj = ossl_to_der_if_possible(obj);
     tmp = rb_str_new4(StringValue(obj));
@@ -1064,7 +1104,6 @@ ossl_asn1_decode_all(VALUE self, VALUE obj)
 	read += tmp_read;
 	tmp_len -= tmp_read;
     }
-    RB_GC_GUARD(tmp);
     int_ossl_decode_sanity_check(len, read, offset);
     return ary;
 }
@@ -1105,19 +1144,19 @@ ossl_asn1_initialize(int argc, VALUE *argv, VALUE self)
 	    ossl_raise(eASN1Error, "invalid tagging method");
 	if(NIL_P(tag_class)) {
 	    if (NIL_P(tagging))
-		tag_class = sym_UNIVERSAL;
+		tag_class = ID2SYM(sUNIVERSAL);
 	    else
-		tag_class = sym_CONTEXT_SPECIFIC;
+		tag_class = ID2SYM(sCONTEXT_SPECIFIC);
 	}
 	if(!SYMBOL_P(tag_class))
 	    ossl_raise(eASN1Error, "invalid tag class");
-	if (tagging == sym_IMPLICIT && NUM2INT(tag) > 31)
+	if(!NIL_P(tagging) && SYM2ID(tagging) == sIMPLICIT && NUM2INT(tag) > 31)
 	    ossl_raise(eASN1Error, "tag number for Universal too large");
     }
     else{
 	tag = INT2NUM(ossl_asn1_default_tag(self));
 	tagging = Qnil;
-	tag_class = sym_UNIVERSAL;
+	tag_class = ID2SYM(sUNIVERSAL);
     }
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
@@ -1133,7 +1172,7 @@ ossl_asn1eoc_initialize(VALUE self) {
     VALUE tag, tagging, tag_class, value;
     tag = INT2NUM(ossl_asn1_default_tag(self));
     tagging = Qnil;
-    tag_class = sym_UNIVERSAL;
+    tag_class = ID2SYM(sUNIVERSAL);
     value = rb_str_new("", 0);
     ossl_asn1_set_tag(self, tag);
     ossl_asn1_set_value(self, value);
@@ -1143,6 +1182,30 @@ ossl_asn1eoc_initialize(VALUE self) {
     return self;
 }
 
+static int
+ossl_i2d_ASN1_TYPE(ASN1_TYPE *a, unsigned char **pp)
+{
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    if(!a) return 0;
+    if(a->type == V_ASN1_BOOLEAN)
+        return i2d_ASN1_BOOLEAN(a->value.boolean, pp);
+#endif
+    return i2d_ASN1_TYPE(a, pp);
+}
+
+static void
+ossl_ASN1_TYPE_free(ASN1_TYPE *a)
+{
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    if(!a) return;
+    if(a->type == V_ASN1_BOOLEAN){
+        OPENSSL_free(a);
+        return;
+    }
+#endif
+    ASN1_TYPE_free(a);
+}
+
 /*
  * call-seq:
  *    asn1.to_der => DER-encoded String
@@ -1163,22 +1226,22 @@ ossl_asn1prim_to_der(VALUE self)
     explicit = ossl_asn1_is_explicit(self);
     asn1 = ossl_asn1_get_asn1type(self);
 
-    len = ASN1_object_size(1, i2d_ASN1_TYPE(asn1, NULL), tn);
+    len = ossl_asn1_object_size(1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn);
     if(!(buf = OPENSSL_malloc(len))){
-	ASN1_TYPE_free(asn1);
+	ossl_ASN1_TYPE_free(asn1);
 	ossl_raise(eASN1Error, "cannot alloc buffer");
     }
     p = buf;
     if (tc == V_ASN1_UNIVERSAL) {
-        i2d_ASN1_TYPE(asn1, &p);
+        ossl_i2d_ASN1_TYPE(asn1, &p);
     } else if (explicit) {
-        ASN1_put_object(&p, 1, i2d_ASN1_TYPE(asn1, NULL), tn, tc);
-        i2d_ASN1_TYPE(asn1, &p);
+        ossl_asn1_put_object(&p, 1, ossl_i2d_ASN1_TYPE(asn1, NULL), tn, tc);
+        ossl_i2d_ASN1_TYPE(asn1, &p);
     } else {
-        i2d_ASN1_TYPE(asn1, &p);
+        ossl_i2d_ASN1_TYPE(asn1, &p);
         *buf = tc | tn | (*buf & V_ASN1_CONSTRUCTED);
     }
-    ASN1_TYPE_free(asn1);
+    ossl_ASN1_TYPE_free(asn1);
     reallen = p - buf;
     assert(reallen <= len);
     str = ossl_buf2str((char *)buf, rb_long2int(reallen)); /* buf will be free in ossl_buf2str */
@@ -1207,8 +1270,8 @@ ossl_asn1cons_to_der(VALUE self)
     if (inf_length == Qtrue) {
 	VALUE ary, example;
 	constructed = 2;
-	if (rb_obj_class(self) == cASN1Sequence ||
-	    rb_obj_class(self) == cASN1Set) {
+	if (CLASS_OF(self) == cASN1Sequence ||
+	    CLASS_OF(self) == cASN1Set) {
 	    tag = ossl_asn1_default_tag(self);
 	}
 	else { /* must be a constructive encoding of a primitive value */
@@ -1237,26 +1300,26 @@ ossl_asn1cons_to_der(VALUE self)
 	}
     }
     else {
-	if (rb_obj_class(self) == cASN1Constructive)
+	if (CLASS_OF(self) == cASN1Constructive)
 	    ossl_raise(eASN1Error, "Constructive shall only be used with infinite length");
 	tag = ossl_asn1_default_tag(self);
     }
     explicit = ossl_asn1_is_explicit(self);
     value = join_der(ossl_asn1_get_value(self));
 
-    seq_len = ASN1_object_size(constructed, RSTRING_LENINT(value), tag);
-    length = ASN1_object_size(constructed, seq_len, tn);
+    seq_len = ossl_asn1_object_size(constructed, RSTRING_LENINT(value), tag);
+    length = ossl_asn1_object_size(constructed, seq_len, tn);
     str = rb_str_new(0, length);
     p = (unsigned char *)RSTRING_PTR(str);
     if(tc == V_ASN1_UNIVERSAL)
-	ASN1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
+	ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
     else{
 	if(explicit){
-	    ASN1_put_object(&p, constructed, seq_len, tn, tc);
-	    ASN1_put_object(&p, constructed, RSTRING_LENINT(value), tag, V_ASN1_UNIVERSAL);
+	    ossl_asn1_put_object(&p, constructed, seq_len, tn, tc);
+	    ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tag, V_ASN1_UNIVERSAL);
 	}
 	else{
-	    ASN1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
+	    ossl_asn1_put_object(&p, constructed, RSTRING_LENINT(value), tn, tc);
 	}
     }
     memcpy(p, RSTRING_PTR(value), RSTRING_LEN(value));
@@ -1291,28 +1354,27 @@ ossl_asn1cons_to_der(VALUE self)
 static VALUE
 ossl_asn1cons_each(VALUE self)
 {
-    rb_funcall(ossl_asn1_get_value(self), id_each, 0);
-
+    rb_ary_each(ossl_asn1_get_value(self));
     return self;
 }
 
 /*
  * call-seq:
- *    OpenSSL::ASN1::ObjectId.register(object_id, short_name, long_name)
+ *    ObjectId.register(object_id, short_name, long_name)
  *
  * This adds a new ObjectId to the internal tables. Where +object_id+ is the
  * numerical form, +short_name+ is the short name, and +long_name+ is the long
  * name.
  *
- * Returns +true+ if successful. Raises an OpenSSL::ASN1::ASN1Error if it fails.
+ * Returns +true+ if successful. Raises an ASN1Error otherwise.
  *
  */
 static VALUE
 ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
 {
-    StringValueCStr(oid);
-    StringValueCStr(sn);
-    StringValueCStr(ln);
+    StringValue(oid);
+    StringValue(sn);
+    StringValue(ln);
 
     if(!OBJ_create(RSTRING_PTR(oid), RSTRING_PTR(sn), RSTRING_PTR(ln)))
 	ossl_raise(eASN1Error, NULL);
@@ -1322,11 +1384,11 @@ ossl_asn1obj_s_register(VALUE self, VALUE oid, VALUE sn, VALUE ln)
 
 /* Document-method: OpenSSL::ASN1::ObjectId#sn
  *
- * The short name of the ObjectId, as defined in <openssl/objects.h>.
+ * The short name of the ObjectId, as defined in +openssl/objects.h+.
  */
 /* Document-method: OpenSSL::ASN1::ObjectId#short_name
  *
- * +short_name+ is an alias to +sn+
+ * #short_name is an alias to #sn
  */
 static VALUE
 ossl_asn1obj_get_sn(VALUE self)
@@ -1335,7 +1397,7 @@ ossl_asn1obj_get_sn(VALUE self)
     int nid;
 
     val = ossl_asn1_get_value(self);
-    if ((nid = OBJ_txt2nid(StringValueCStr(val))) != NID_undef)
+    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
 	ret = rb_str_new2(OBJ_nid2sn(nid));
 
     return ret;
@@ -1343,11 +1405,11 @@ ossl_asn1obj_get_sn(VALUE self)
 
 /* Document-method: OpenSSL::ASN1::ObjectId#ln
  *
- * The long name of the ObjectId, as defined in <openssl/objects.h>.
+ * The long name of the ObjectId, as defined in +openssl/objects.h+.
  */
-/* Document-method: OpenSSL::ASN1::ObjectId#long_name
+/* Document-method: OpenSSL::ASN1::ObjectId.long_name
  *
- * +long_name+ is an alias to +ln+
+ * #long_name is an alias to #ln
  */
 static VALUE
 ossl_asn1obj_get_ln(VALUE self)
@@ -1356,7 +1418,7 @@ ossl_asn1obj_get_ln(VALUE self)
     int nid;
 
     val = ossl_asn1_get_value(self);
-    if ((nid = OBJ_txt2nid(StringValueCStr(val))) != NID_undef)
+    if ((nid = OBJ_txt2nid(StringValuePtr(val))) != NID_undef)
 	ret = rb_str_new2(OBJ_nid2ln(nid));
 
     return ret;
@@ -1364,7 +1426,7 @@ ossl_asn1obj_get_ln(VALUE self)
 
 /* Document-method: OpenSSL::ASN1::ObjectId#oid
  *
- * The object identifier as a +String+, e.g. "1.2.3.4.5"
+ * The object identifier as a String.
  */
 static VALUE
 ossl_asn1obj_get_oid(VALUE self)
@@ -1410,22 +1472,21 @@ OSSL_ASN1_IMPL_FACTORY_METHOD(Set)
 OSSL_ASN1_IMPL_FACTORY_METHOD(EndOfContent)
 
 void
-Init_ossl_asn1(void)
+Init_ossl_asn1()
 {
     VALUE ary;
     int i;
 
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
-    sym_UNIVERSAL = ID2SYM(rb_intern_const("UNIVERSAL"));
-    sym_CONTEXT_SPECIFIC = ID2SYM(rb_intern_const("CONTEXT_SPECIFIC"));
-    sym_APPLICATION = ID2SYM(rb_intern_const("APPLICATION"));
-    sym_PRIVATE = ID2SYM(rb_intern_const("PRIVATE"));
-    sym_EXPLICIT = ID2SYM(rb_intern_const("EXPLICIT"));
-    sym_IMPLICIT = ID2SYM(rb_intern_const("IMPLICIT"));
+    sUNIVERSAL = rb_intern("UNIVERSAL");
+    sCONTEXT_SPECIFIC = rb_intern("CONTEXT_SPECIFIC");
+    sAPPLICATION = rb_intern("APPLICATION");
+    sPRIVATE = rb_intern("PRIVATE");
+    sEXPLICIT = rb_intern("EXPLICIT");
+    sIMPLICIT = rb_intern("IMPLICIT");
 
     sivVALUE = rb_intern("@value");
     sivTAG = rb_intern("@tag");
@@ -1748,8 +1809,8 @@ Init_ossl_asn1(void)
      *
      * == OpenSSL::ASN1::ObjectId
      *
-     * NOTE: While OpenSSL::ASN1::ObjectId.new will allocate a new ObjectId,
-     * it is not typically allocated this way, but rather that are received from
+     * While OpenSSL::ASN1::ObjectId.new will allocate a new ObjectId, it is
+     * not typically allocated this way, but rather that are received from
      * parsed ASN1 encodings.
      *
      * === Additional attributes
@@ -1933,6 +1994,4 @@ do{\
     rb_hash_aset(class_tag_map, cASN1UniversalString, INT2NUM(V_ASN1_UNIVERSALSTRING));
     rb_hash_aset(class_tag_map, cASN1BMPString, INT2NUM(V_ASN1_BMPSTRING));
     rb_global_variable(&class_tag_map);
-
-    id_each = rb_intern_const("each");
 }
diff --git a/ext/openssl/ossl_asn1.h b/ext/openssl/ossl_asn1.h
index d6a170c86c..718f43f068 100644
--- a/ext/openssl/ossl_asn1.h
+++ b/ext/openssl/ossl_asn1.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_ASN1_H_)
@@ -13,26 +14,18 @@
 /*
  * ASN1_DATE conversions
  */
-VALUE asn1time_to_time(const ASN1_TIME *);
-#if defined(HAVE_ASN1_TIME_ADJ)
-/* Splits VALUE to seconds and offset days. VALUE is typically a Time or an
- * Integer. This is used when updating ASN1_*TIME with ASN1_TIME_adj() or
- * X509_time_adj_ex(). We can't use ASN1_TIME_set() and X509_time_adj() because
- * they have the Year 2038 issue on sizeof(time_t) == 4 environment */
-void ossl_time_split(VALUE, time_t *, int *);
-#else
+VALUE asn1time_to_time(ASN1_TIME *);
 time_t time_to_time_t(VALUE);
-#endif
 
 /*
  * ASN1_STRING conversions
  */
-VALUE asn1str_to_str(const ASN1_STRING *);
+VALUE asn1str_to_str(ASN1_STRING *);
 
 /*
  * ASN1_INTEGER conversions
  */
-VALUE asn1integer_to_num(const ASN1_INTEGER *);
+VALUE asn1integer_to_num(ASN1_INTEGER *);
 ASN1_INTEGER *num_to_asn1integer(VALUE, ASN1_INTEGER *);
 
 /*
diff --git a/ext/openssl/ossl_bio.c b/ext/openssl/ossl_bio.c
index 1609b097c0..e150de0ad9 100644
--- a/ext/openssl/ossl_bio.c
+++ b/ext/openssl/ossl_bio.c
@@ -1,13 +1,17 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 
 BIO *
 ossl_obj2bio(VALUE obj)
@@ -26,9 +30,8 @@ ossl_obj2bio(VALUE obj)
 	}
         rb_update_max_fd(fd);
 	if (!(fp = fdopen(fd, "r"))){
-	    int e = errno;
 	    close(fd);
-	    rb_syserr_fail(e, 0);
+	    rb_sys_fail(0);
 	}
 	if (!(bio = BIO_new_fp(fp, BIO_CLOSE))){
 	    fclose(fp);
@@ -48,7 +51,7 @@ BIO *
 ossl_protect_obj2bio(VALUE obj, int *status)
 {
      BIO *ret = NULL;
-     ret = (BIO*)rb_protect((VALUE (*)(VALUE))ossl_obj2bio, obj, status);
+     ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
      return ret;
 }
 
@@ -67,7 +70,7 @@ ossl_membio2str0(BIO *bio)
 VALUE
 ossl_protect_membio2str(BIO *bio, int *status)
 {
-    return rb_protect((VALUE (*)(VALUE))ossl_membio2str0, (VALUE)bio, status);
+    return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
 }
 
 VALUE
diff --git a/ext/openssl/ossl_bio.h b/ext/openssl/ossl_bio.h
index 1705d0ac89..2d8f675c5b 100644
--- a/ext/openssl/ossl_bio.h
+++ b/ext/openssl/ossl_bio.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' team members
  * Copyright (C) 2003
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_BIO_H_)
@@ -17,3 +18,4 @@ VALUE ossl_membio2str(BIO*);
 VALUE ossl_protect_membio2str(BIO*,int*);
 
 #endif
+
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 4e371cb201..bdaf077b5f 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -1,26 +1,25 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Technorama team <oss-ruby@technorama.net>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 /* modified by Michal Rokos <m.rokos@sh.cvut.cz> */
 #include "ossl.h"
 
-#define NewBN(klass) \
-  TypedData_Wrap_Struct((klass), &ossl_bn_type, 0)
-#define SetBN(obj, bn) do { \
+#define WrapBN(klass, obj, bn) do { \
   if (!(bn)) { \
     ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
   } \
-  RTYPEDDATA_DATA(obj) = (bn); \
+  (obj) = Data_Wrap_Struct((klass), 0, BN_clear_free, (bn)); \
 } while (0)
 
 #define GetBN(obj, bn) do { \
-  TypedData_Get_Struct((obj), BIGNUM, &ossl_bn_type, (bn)); \
+  Data_Get_Struct((obj), BIGNUM, (bn)); \
   if (!(bn)) { \
     ossl_raise(rb_eRuntimeError, "BN wasn't initialized!"); \
   } \
@@ -31,29 +30,10 @@
   GetBN((obj), (bn)); \
 } while (0)
 
-static void
-ossl_bn_free(void *ptr)
-{
-    BN_clear_free(ptr);
-}
-
-static const rb_data_type_t ossl_bn_type = {
-    "OpenSSL/BN",
-    {
-	0, ossl_bn_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Classes
  */
 VALUE cBN;
-
-/* Document-class: OpenSSL::BNError
- *
- * Generic Error for all of OpenSSL::BN (big num)
- */
 VALUE eBNError;
 
 /*
@@ -65,90 +45,36 @@ ossl_bn_new(const BIGNUM *bn)
     BIGNUM *newbn;
     VALUE obj;
 
-    obj = NewBN(cBN);
     newbn = bn ? BN_dup(bn) : BN_new();
     if (!newbn) {
 	ossl_raise(eBNError, NULL);
     }
-    SetBN(obj, newbn);
+    WrapBN(cBN, obj, newbn);
 
     return obj;
 }
 
-static BIGNUM *
-integer_to_bnptr(VALUE obj, BIGNUM *orig)
-{
-    BIGNUM *bn;
-
-    if (FIXNUM_P(obj)) {
-	long i;
-	unsigned char bin[sizeof(long)];
-	long n = FIX2LONG(obj);
-	unsigned long un = labs(n);
-
-	for (i = sizeof(long) - 1; 0 <= i; i--) {
-	    bin[i] = un & 0xff;
-	    un >>= 8;
-	}
-
-	bn = BN_bin2bn(bin, sizeof(bin), orig);
-	if (!bn)
-	    ossl_raise(eBNError, "BN_bin2bn");
-	if (n < 0)
-	    BN_set_negative(bn, 1);
-    }
-    else { /* assuming Bignum */
-	size_t len = rb_absint_size(obj, NULL);
-	unsigned char *bin;
-	VALUE buf;
-	int sign;
-
-	if (INT_MAX < len) {
-	    rb_raise(eBNError, "bignum too long");
-	}
-	bin = (unsigned char*)ALLOCV_N(unsigned char, buf, len);
-	sign = rb_integer_pack(obj, bin, len, 1, 0, INTEGER_PACK_BIG_ENDIAN);
-
-	bn = BN_bin2bn(bin, (int)len, orig);
-	ALLOCV_END(buf);
-	if (!bn)
-	    ossl_raise(eBNError, "BN_bin2bn");
-	if (sign < 0)
-	    BN_set_negative(bn, 1);
-    }
-
-    return bn;
-}
-
-static VALUE
-try_convert_to_bn(VALUE obj)
-{
-    BIGNUM *bn;
-    VALUE newobj = Qnil;
-
-    if (rb_obj_is_kind_of(obj, cBN))
-	return obj;
-    if (RB_INTEGER_TYPE_P(obj)) {
-	newobj = NewBN(cBN); /* Handle potencial mem leaks */
-	bn = integer_to_bnptr(obj, NULL);
-	SetBN(newobj, bn);
-    }
-
-    return newobj;
-}
-
 BIGNUM *
-ossl_bn_value_ptr(volatile VALUE *ptr)
+GetBNPtr(VALUE obj)
 {
-    VALUE tmp;
-    BIGNUM *bn;
+    BIGNUM *bn = NULL;
 
-    tmp = try_convert_to_bn(*ptr);
-    if (NIL_P(tmp))
+    if (RTEST(rb_obj_is_kind_of(obj, cBN))) {
+	GetBN(obj, bn);
+    } else switch (TYPE(obj)) {
+    case T_FIXNUM:
+    case T_BIGNUM:
+	obj = rb_String(obj);
+	if (!BN_dec2bn(&bn, StringValuePtr(obj))) {
+	    ossl_raise(eBNError, NULL);
+	}
+	WrapBN(cBN, obj, bn); /* Handle potencial mem leaks */
+	break;
+    case T_NIL:
+	break;
+    default:
 	ossl_raise(rb_eTypeError, "Cannot convert into OpenSSL::BN");
-    GetBN(tmp, bn);
-    *ptr = tmp;
-
+    }
     return bn;
 }
 
@@ -166,26 +92,23 @@ static VALUE
 ossl_bn_alloc(VALUE klass)
 {
     BIGNUM *bn;
-    VALUE obj = NewBN(klass);
+    VALUE obj;
 
     if (!(bn = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
-    SetBN(obj, bn);
+    WrapBN(klass, obj, bn);
 
     return obj;
 }
 
-/* Document-method: OpenSSL::BN.new
- *
+/*
  * call-seq:
- *    OpenSSL::BN.new => aBN
- *    OpenSSL::BN.new(bn) => aBN
- *    OpenSSL::BN.new(integer) => aBN
- *    OpenSSL::BN.new(string) => aBN
- *    OpenSSL::BN.new(string, 0 | 2 | 10 | 16) => aBN
- *
- * Construct a new OpenSSL BigNum object.
+ *    BN.new => aBN
+ *    BN.new(bn) => aBN
+ *    BN.new(integer) => aBN
+ *    BN.new(string) => aBN
+ *    BN.new(string, 0 | 2 | 10 | 16) => aBN
  */
 static VALUE
 ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
@@ -198,13 +121,45 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 	base = NUM2INT(bs);
     }
 
-    if (RB_INTEGER_TYPE_P(str)) {
-	GetBN(self, bn);
-	integer_to_bnptr(str, bn);
+    if (RB_TYPE_P(str, T_FIXNUM)) {
+	long i;
+	unsigned char bin[sizeof(long)];
+	long n = FIX2LONG(str);
+	unsigned long un = labs(n);
 
+	for (i = sizeof(long) - 1; 0 <= i; i--) {
+	    bin[i] = un&0xff;
+	    un >>= 8;
+	}
+
+	GetBN(self, bn);
+	if (!BN_bin2bn(bin, sizeof(bin), bn)) {
+	    ossl_raise(eBNError, NULL);
+	}
+	if (n < 0) BN_set_negative(bn, 1);
 	return self;
     }
+    else if (RB_TYPE_P(str, T_BIGNUM)) {
+        size_t len = rb_absint_size(str, NULL);
+	unsigned char *bin;
+	VALUE buf;
+        int sign;
+
+        if (INT_MAX < len) {
+            rb_raise(eBNError, "bignum too long");
+        }
+        bin = (unsigned char*)ALLOCV_N(unsigned char, buf, len);
+        sign = rb_integer_pack(str, bin, len, 1, 0, INTEGER_PACK_BIG_ENDIAN);
 
+	GetBN(self, bn);
+	if (!BN_bin2bn(bin, (int)len, bn)) {
+	    ALLOCV_END(buf);
+	    ossl_raise(eBNError, NULL);
+	}
+	ALLOCV_END(buf);
+	if (sign < 0) BN_set_negative(bn, 1);
+	return self;
+    }
     if (RTEST(rb_obj_is_kind_of(str, cBN))) {
 	BIGNUM *other;
 
@@ -216,25 +171,26 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
 
+    StringValue(str);
     GetBN(self, bn);
     switch (base) {
     case 0:
-	if (!BN_mpi2bn((unsigned char *)StringValuePtr(str), RSTRING_LENINT(str), bn)) {
+	if (!BN_mpi2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 2:
-	if (!BN_bin2bn((unsigned char *)StringValuePtr(str), RSTRING_LENINT(str), bn)) {
+	if (!BN_bin2bn((unsigned char *)RSTRING_PTR(str), RSTRING_LENINT(str), bn)) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 10:
-	if (!BN_dec2bn(&bn, StringValueCStr(str))) {
+	if (!BN_dec2bn(&bn, RSTRING_PTR(str))) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
     case 16:
-	if (!BN_hex2bn(&bn, StringValueCStr(str))) {
+	if (!BN_hex2bn(&bn, RSTRING_PTR(str))) {
 	    ossl_raise(eBNError, NULL);
 	}
 	break;
@@ -251,11 +207,11 @@ ossl_bn_initialize(int argc, VALUE *argv, VALUE self)
  *
  * === Parameters
  * * +base+ - integer
- *   Valid values:
- *   * 0 - MPI
- *   * 2 - binary
- *   * 10 - the default
- *   * 16 - hex
+ * * * Valid values:
+ * * * * 0 - MPI
+ * * * * 2 - binary
+ * * * * 10 - the default
+ * * * * 16 - hex
  */
 static VALUE
 ossl_bn_to_s(int argc, VALUE *argv, VALUE self)
@@ -345,6 +301,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)				\
     {							\
@@ -355,36 +316,22 @@ ossl_bn_coerce(VALUE self, VALUE other)
 	}						\
 	return Qfalse;					\
     }
-
-/*
- * Document-method: OpenSSL::BN#zero?
- * call-seq:
- *   bn.zero? => true | false
- */
 BIGNUM_BOOL1(is_zero)
-
-/*
- * Document-method: OpenSSL::BN#one?
- * call-seq:
- *   bn.one? => true | false
- */
 BIGNUM_BOOL1(is_one)
-
-/*
- * Document-method: OpenSSL::BN#odd?
- * call-seq:
- *   bn.odd? => true | false
- */
 BIGNUM_BOOL1(is_odd)
 
 #define BIGNUM_1c(func)					\
+    /*							\
+     * call-seq:					\
+     *   bn.##func -> aBN				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self)				\
     {							\
 	BIGNUM *bn, *result;				\
 	VALUE obj;					\
 	GetBN(self, bn);				\
-	obj = NewBN(rb_obj_class(self));		\
 	if (!(result = BN_new())) {			\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
@@ -392,25 +339,23 @@ BIGNUM_BOOL1(is_odd)
 	    BN_free(result);				\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
-	SetBN(obj, result);				\
+	WrapBN(CLASS_OF(self), obj, result);		\
 	return obj;					\
     }
-
-/*
- * Document-method: OpenSSL::BN#sqr
- * call-seq:
- *   bn.sqr => aBN
- */
 BIGNUM_1c(sqr)
 
 #define BIGNUM_2(func)					\
+    /*							\
+     * call-seq:					\
+     *   bn.##func(bn2) -> aBN				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE other)		\
     {							\
 	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;	\
 	VALUE obj;					\
 	GetBN(self, bn1);				\
-	obj = NewBN(rb_obj_class(self));		\
 	if (!(result = BN_new())) {			\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
@@ -418,32 +363,24 @@ BIGNUM_1c(sqr)
 	    BN_free(result);				\
 	    ossl_raise(eBNError, NULL);			\
 	}						\
-	SetBN(obj, result);				\
+	WrapBN(CLASS_OF(self), obj, result);		\
 	return obj;					\
     }
-
-/*
- * Document-method: OpenSSL::BN#+
- * call-seq:
- *   bn + bn2 => aBN
- */
 BIGNUM_2(add)
-
-/*
- * Document-method: OpenSSL::BN#-
- * call-seq:
- *   bn - bn2 => aBN
- */
 BIGNUM_2(sub)
 
 #define BIGNUM_2c(func)						\
+    /*								\
+     * call-seq:						\
+     *   bn.##func(bn2) -> aBN					\
+     *								\
+     */								\
     static VALUE						\
     ossl_bn_##func(VALUE self, VALUE other)			\
     {								\
 	BIGNUM *bn1, *bn2 = GetBNPtr(other), *result;		\
 	VALUE obj;						\
 	GetBN(self, bn1);					\
-	obj = NewBN(rb_obj_class(self));			\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -451,70 +388,28 @@ BIGNUM_2(sub)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	SetBN(obj, result);					\
+	WrapBN(CLASS_OF(self), obj, result);			\
 	return obj;						\
     }
-
-/*
- * Document-method: OpenSSL::BN#*
- * call-seq:
- *   bn * bn2 => aBN
- */
 BIGNUM_2c(mul)
-
-/*
- * Document-method: OpenSSL::BN#%
- * call-seq:
- *   bn % bn2 => aBN
- */
 BIGNUM_2c(mod)
-
-/*
- * Document-method: OpenSSL::BN#**
- * call-seq:
- *   bn ** bn2 => aBN
- */
 BIGNUM_2c(exp)
-
-/*
- * Document-method: OpenSSL::BN#gcd
- * call-seq:
- *   bn.gcd(bn2) => aBN
- */
 BIGNUM_2c(gcd)
-
-/*
- * Document-method: OpenSSL::BN#mod_sqr
- * call-seq:
- *   bn.mod_sqr(bn2) => aBN
- */
 BIGNUM_2c(mod_sqr)
-
-/*
- * Document-method: OpenSSL::BN#mod_inverse
- * call-seq:
- *   bn.mod_inverse(bn2) => aBN
- */
 BIGNUM_2c(mod_inverse)
 
 /*
- * Document-method: OpenSSL::BN#/
  * call-seq:
  *    bn1 / bn2 => [result, remainder]
- *
- * Division of OpenSSL::BN instances
  */
 static VALUE
 ossl_bn_div(VALUE self, VALUE other)
 {
     BIGNUM *bn1, *bn2 = GetBNPtr(other), *r1, *r2;
-    VALUE klass, obj1, obj2;
+    VALUE obj1, obj2;
 
     GetBN(self, bn1);
 
-    klass = rb_obj_class(self);
-    obj1 = NewBN(klass);
-    obj2 = NewBN(klass);
     if (!(r1 = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
@@ -527,13 +422,18 @@ ossl_bn_div(VALUE self, VALUE other)
 	BN_free(r2);
 	ossl_raise(eBNError, NULL);
     }
-    SetBN(obj1, r1);
-    SetBN(obj2, r2);
+    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)	\
     {								\
@@ -541,7 +441,6 @@ ossl_bn_div(VALUE self, VALUE other)
 	BIGNUM *bn3 = GetBNPtr(other2), *result;		\
 	VALUE obj;						\
 	GetBN(self, bn1);					\
-	obj = NewBN(rb_obj_class(self));			\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -549,39 +448,20 @@ ossl_bn_div(VALUE self, VALUE other)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	SetBN(obj, result);					\
+	WrapBN(CLASS_OF(self), obj, result);			\
 	return obj;						\
     }
-
-/*
- * Document-method: OpenSSL::BN#mod_add
- * call-seq:
- *   bn.mod_add(bn1, bn2) -> aBN
- */
 BIGNUM_3c(mod_add)
-
-/*
- * Document-method: OpenSSL::BN#mod_sub
- * call-seq:
- *   bn.mod_sub(bn1, bn2) -> aBN
- */
 BIGNUM_3c(mod_sub)
-
-/*
- * Document-method: OpenSSL::BN#mod_mul
- * call-seq:
- *   bn.mod_mul(bn1, bn2) -> aBN
- */
 BIGNUM_3c(mod_mul)
-
-/*
- * Document-method: OpenSSL::BN#mod_exp
- * call-seq:
- *   bn.mod_exp(bn1, bn2) -> aBN
- */
 BIGNUM_3c(mod_exp)
 
 #define BIGNUM_BIT(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func(bit) -> self				\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_##func(VALUE self, VALUE bit)		\
     {							\
@@ -592,34 +472,13 @@ BIGNUM_3c(mod_exp)
 	}						\
 	return self;					\
     }
-
-/*
- * Document-method: OpenSSL::BN#set_bit!
- * call-seq:
- *   bn.set_bit!(bit) -> self
- */
 BIGNUM_BIT(set_bit)
-
-/*
- * Document-method: OpenSSL::BN#clear_bit!
- * call-seq:
- *   bn.clear_bit!(bit) -> self
- */
 BIGNUM_BIT(clear_bit)
+BIGNUM_BIT(mask_bits)
 
 /*
- * Document-method: OpenSSL::BN#mask_bit!
  * call-seq:
- *   bn.mask_bit!(bit) -> self
- */
-BIGNUM_BIT(mask_bits)
-
-/* Document-method: OpenSSL::BN#bit_set?
- * call-seq:
- *   bn.bit_set?(bit) => true | false
- *
- * Returns boolean of whether +bit+ is set.
- * Bitwise operations for openssl BIGNUMs.
+ *    bn.bit_set?(bit) => true | false
  */
 static VALUE
 ossl_bn_is_bit_set(VALUE self, VALUE bit)
@@ -636,6 +495,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)		\
     {							\
@@ -644,7 +508,6 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 	VALUE obj;					\
 	b = NUM2INT(bits);				\
 	GetBN(self, bn);				\
-	obj = NewBN(rb_obj_class(self));		\
 	if (!(result = BN_new())) {			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
@@ -652,25 +515,18 @@ ossl_bn_is_bit_set(VALUE self, VALUE bit)
 		BN_free(result);			\
 		ossl_raise(eBNError, NULL);		\
 	}						\
-	SetBN(obj, result);				\
+	WrapBN(CLASS_OF(self), obj, result);		\
 	return obj;					\
     }
-
-/*
- * Document-method: OpenSSL::BN#<<
- * call-seq:
- *   bn << bits -> aBN
- */
 BIGNUM_SHIFT(lshift)
-
-/*
- * Document-method: OpenSSL::BN#>>
- * call-seq:
- *   bn >> bits -> aBN
- */
 BIGNUM_SHIFT(rshift)
 
 #define BIGNUM_SELF_SHIFT(func)				\
+    /*							\
+     * call-seq:					\
+     *   bn.##func!(bits) -> self			\
+     *							\
+     */							\
     static VALUE					\
     ossl_bn_self_##func(VALUE self, VALUE bits)		\
     {							\
@@ -682,22 +538,15 @@ BIGNUM_SHIFT(rshift)
 		ossl_raise(eBNError, NULL);		\
 	return self;					\
     }
-
-/*
- * Document-method: OpenSSL::BN#lshift!
- * call-seq:
- *   bn.lshift!(bits) -> self
- */
 BIGNUM_SELF_SHIFT(lshift)
-
-/*
- * Document-method: OpenSSL::BN#rshift!
- * call-seq:
- *   bn.rshift!(bits) -> self
- */
 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)	\
     {								\
@@ -713,7 +562,6 @@ BIGNUM_SELF_SHIFT(rshift)
 	    top = NUM2INT(fill);				\
 	}							\
 	b = NUM2INT(bits);					\
-	obj = NewBN(klass);					\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -721,28 +569,23 @@ BIGNUM_SELF_SHIFT(rshift)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	SetBN(obj, result);					\
+	WrapBN(klass, obj, result);				\
 	return obj;						\
     }
-
-/*
- * Document-method: OpenSSL::BN.rand
- *   BN.rand(bits [, fill [, odd]]) -> aBN
- */
 BIGNUM_RAND(rand)
-
-/*
- * Document-method: OpenSSL::BN.pseudo_rand
- *   BN.pseudo_rand(bits [, fill [, odd]]) -> aBN
- */
 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)		\
     {								\
 	BIGNUM *bn = GetBNPtr(range), *result;			\
-	VALUE obj = NewBN(klass);				\
+	VALUE obj;						\
 	if (!(result = BN_new())) {				\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
@@ -750,34 +593,16 @@ BIGNUM_RAND(pseudo_rand)
 	    BN_free(result);					\
 	    ossl_raise(eBNError, NULL);				\
 	}							\
-	SetBN(obj, result);					\
+	WrapBN(klass, obj, result);				\
 	return obj;						\
     }
-
-/*
- * Document-method: OpenSSL::BN.rand_range
- * call-seq:
- *   BN.rand_range(range) -> aBN
- *
- */
 BIGNUM_RAND_RANGE(rand)
-
-/*
- * Document-method: OpenSSL::BN.pseudo_rand_range
- * call-seq:
- *   BN.pseudo_rand_range(range) -> aBN
- *
- */
 BIGNUM_RAND_RANGE(pseudo_rand)
 
 /*
  * call-seq:
  *    BN.generate_prime(bits, [, safe [, add [, rem]]]) => bn
  *
- * Generates a random prime number of bit length +bits+. If +safe+ is true,
- * generates a safe prime. If +add+ is specified, generates a prime that
- * fulfills condition <tt>p % add = rem</tt>.
- *
  * === Parameters
  * * +bits+ - integer
  * * +safe+ - boolean
@@ -802,40 +627,32 @@ ossl_bn_s_generate_prime(int argc, VALUE *argv, VALUE klass)
 	add = GetBNPtr(vadd);
 	rem = NIL_P(vrem) ? NULL : GetBNPtr(vrem);
     }
-    obj = NewBN(klass);
     if (!(result = BN_new())) {
 	ossl_raise(eBNError, NULL);
     }
-    if (!BN_generate_prime_ex(result, num, safe, add, rem, NULL)) {
+    if (!BN_generate_prime(result, num, safe, add, rem, NULL, NULL)) {
 	BN_free(result);
 	ossl_raise(eBNError, NULL);
     }
-    SetBN(obj, result);
+    WrapBN(klass, obj, result);
 
     return obj;
 }
 
 #define BIGNUM_NUM(func)			\
+    /*							\
+     * call-seq:					\
+     *   bn.##func -> integer				\
+     *							\
+     */							\
     static VALUE 				\
     ossl_bn_##func(VALUE self)			\
     {						\
 	BIGNUM *bn;				\
 	GetBN(self, bn);			\
-	return INT2NUM(BN_##func(bn));		\
+	return INT2FIX(BN_##func(bn));		\
     }
-
-/*
- * Document-method: OpenSSL::BN#num_bytes
- * call-seq:
- *   bn.num_bytes => integer
- */
 BIGNUM_NUM(num_bytes)
-
-/*
- * Document-method: OpenSSL::BN#num_bits
- * call-seq:
- *   bn.num_bits => integer
- */
 BIGNUM_NUM(num_bits)
 
 static VALUE
@@ -857,117 +674,35 @@ 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)		\
     {							\
 	BIGNUM *bn1, *bn2 = GetBNPtr(other);		\
 	GetBN(self, bn1);				\
-	return INT2NUM(BN_##func(bn1, bn2));		\
+	return INT2FIX(BN_##func(bn1, bn2));		\
     }
-
-/*
- * Document-method: OpenSSL::BN#cmp
- * call-seq:
- *   bn.cmp(bn2) => integer
- */
-/*
- * Document-method: OpenSSL::BN#<=>
- * call-seq:
- *   bn <=> bn2 => integer
- */
 BIGNUM_CMP(cmp)
-
-/*
- * Document-method: OpenSSL::BN#ucmp
- * call-seq:
- *   bn.ucmp(bn2) => integer
- */
 BIGNUM_CMP(ucmp)
 
-/*
- *  call-seq:
- *     bn == obj => true or false
- *
- *  Returns +true+ only if +obj+ has the same value as +bn+. Contrast this
- *  with OpenSSL::BN#eql?, which requires obj to be OpenSSL::BN.
- */
 static VALUE
-ossl_bn_eq(VALUE self, VALUE other)
+ossl_bn_eql(VALUE self, VALUE other)
 {
-    BIGNUM *bn1, *bn2;
-
-    GetBN(self, bn1);
-    other = try_convert_to_bn(other);
-    if (NIL_P(other))
-	return Qfalse;
-    GetBN(other, bn2);
-
-    if (!BN_cmp(bn1, bn2)) {
+    if (ossl_bn_cmp(self, other) == INT2FIX(0)) {
 	return Qtrue;
     }
     return Qfalse;
 }
 
 /*
- *  call-seq:
- *     bn.eql?(obj) => true or false
- *
- *  Returns <code>true</code> only if <i>obj</i> is a
- *  <code>OpenSSL::BN</code> with the same value as <i>big</i>. Contrast this
- *  with OpenSSL::BN#==, which performs type conversions.
- */
-static VALUE
-ossl_bn_eql(VALUE self, VALUE other)
-{
-    BIGNUM *bn1, *bn2;
-
-    if (!rb_obj_is_kind_of(other, cBN))
-	return Qfalse;
-    GetBN(self, bn1);
-    GetBN(other, bn2);
-
-    return BN_cmp(bn1, bn2) ? Qfalse : Qtrue;
-}
-
-/*
- *  call-seq:
- *     bn.hash => Integer
- *
- *  Returns a hash code for this object.
- *
- *  See also Object#hash.
- */
-static VALUE
-ossl_bn_hash(VALUE self)
-{
-    BIGNUM *bn;
-    VALUE hash;
-    unsigned char *buf;
-    int len;
-
-    GetBN(self, bn);
-    len = BN_num_bytes(bn);
-    buf = xmalloc(len);
-    if (BN_bn2bin(bn, buf) != len) {
-	xfree(buf);
-	ossl_raise(eBNError, NULL);
-    }
-
-    hash = INT2FIX(rb_memhash(buf, len));
-    xfree(buf);
-
-    return hash;
-}
-
-/*
  * call-seq:
  *    bn.prime? => true | false
  *    bn.prime?(checks) => true | false
  *
- * Performs a Miller-Rabin probabilistic primality test with +checks+
- * iterations. If +nchecks+ is not specified, a number of iterations is used
- * that yields a false positive rate of at most 2^-80 for random input.
- *
  * === Parameters
  * * +checks+ - integer
  */
@@ -982,7 +717,7 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
 	checks = NUM2INT(vchecks);
     }
     GetBN(self, bn);
-    switch (BN_is_prime_ex(bn, checks, ossl_bn_ctx, NULL)) {
+    switch (BN_is_prime(bn, checks, NULL, ossl_bn_ctx, NULL)) {
     case 1:
 	return Qtrue;
     case 0:
@@ -1000,9 +735,6 @@ ossl_bn_is_prime(int argc, VALUE *argv, VALUE self)
  *    bn.prime_fasttest?(checks) => true | false
  *    bn.prime_fasttest?(checks, trial_div) => true | false
  *
- * Performs a Miller-Rabin primality test. This is same as #prime? except this
- * first attempts trial divisions with some small primes.
- *
  * === Parameters
  * * +checks+ - integer
  * * +trial_div+ - boolean
@@ -1024,7 +756,7 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
     if (vtrivdiv == Qfalse) {
 	do_trial_division = 0;
     }
-    switch (BN_is_prime_fasttest_ex(bn, checks, ossl_bn_ctx, do_trial_division, NULL)) {
+    switch (BN_is_prime_fasttest(bn, checks, NULL, ossl_bn_ctx, NULL, do_trial_division)) {
     case 1:
 	return Qtrue;
     case 0:
@@ -1041,11 +773,10 @@ ossl_bn_is_prime_fasttest(int argc, VALUE *argv, VALUE self)
  * (NOTE: ordering of methods is the same as in 'man bn')
  */
 void
-Init_ossl_bn(void)
+Init_ossl_bn()
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
     if (!(ossl_bn_ctx = BN_CTX_new())) {
@@ -1094,9 +825,8 @@ Init_ossl_bn(void)
     rb_define_alias(cBN, "<=>", "cmp");
     rb_define_method(cBN, "ucmp", ossl_bn_ucmp, 1);
     rb_define_method(cBN, "eql?", ossl_bn_eql, 1);
-    rb_define_method(cBN, "hash", ossl_bn_hash, 0);
-    rb_define_method(cBN, "==", ossl_bn_eq, 1);
-    rb_define_alias(cBN, "===", "==");
+    rb_define_alias(cBN, "==", "eql?");
+    rb_define_alias(cBN, "===", "eql?");
     rb_define_method(cBN, "zero?", ossl_bn_is_zero, 0);
     rb_define_method(cBN, "one?", ossl_bn_is_one, 0);
     /* is_word */
@@ -1115,7 +845,6 @@ Init_ossl_bn(void)
 
     rb_define_singleton_method(cBN, "generate_prime", ossl_bn_s_generate_prime, -1);
     rb_define_method(cBN, "prime?", ossl_bn_is_prime, -1);
-    rb_define_method(cBN, "prime_fasttest?", ossl_bn_is_prime_fasttest, -1);
 
     rb_define_method(cBN, "set_bit!", ossl_bn_set_bit, 1);
     rb_define_method(cBN, "clear_bit!", ossl_bn_clear_bit, 1);
@@ -1157,4 +886,11 @@ Init_ossl_bn(void)
 
     /* RECiProcal
      * MONTgomery */
+
+    /*
+     * TODO:
+     * Where to belong these?
+     */
+    rb_define_method(cBN, "prime_fasttest?", ossl_bn_is_prime_fasttest, -1);
 }
+
diff --git a/ext/openssl/ossl_bn.h b/ext/openssl/ossl_bn.h
index a19ba19487..d6c396227b 100644
--- a/ext/openssl/ossl_bn.h
+++ b/ext/openssl/ossl_bn.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_BN_H_)
@@ -15,11 +16,10 @@ extern VALUE eBNError;
 
 extern BN_CTX *ossl_bn_ctx;
 
-#define GetBNPtr(obj) ossl_bn_value_ptr(&(obj))
-
 VALUE ossl_bn_new(const BIGNUM *);
-BIGNUM *ossl_bn_value_ptr(volatile VALUE *);
+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 73b667b2c3..1cd185e69c 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewCipher(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_cipher_type, 0)
-#define AllocCipher(obj, ctx) do { \
-    (ctx) = EVP_CIPHER_CTX_new(); \
-    if (!(ctx)) \
-	ossl_raise(rb_eRuntimeError, NULL); \
-    RTYPEDDATA_DATA(obj) = (ctx); \
-} while (0)
+#define WrapCipher(obj, klass, ctx) \
+    (obj) = Data_Wrap_Struct((klass), 0, ossl_cipher_free, (ctx))
+#define MakeCipher(obj, klass, ctx) \
+    (obj) = Data_Make_Struct((klass), EVP_CIPHER_CTX, 0, ossl_cipher_free, (ctx))
+#define AllocCipher(obj, ctx) \
+    memset(DATA_PTR(obj) = (ctx) = ALLOC(EVP_CIPHER_CTX), 0, sizeof(EVP_CIPHER_CTX))
 #define GetCipherInit(obj, ctx) do { \
-    TypedData_Get_Struct((obj), EVP_CIPHER_CTX, &ossl_cipher_type, (ctx)); \
+    Data_Get_Struct((obj), EVP_CIPHER_CTX, (ctx)); \
 } while (0)
 #define GetCipher(obj, ctx) do { \
     GetCipherInit((obj), (ctx)); \
@@ -36,18 +35,8 @@
  */
 VALUE cCipher;
 VALUE eCipherError;
-static ID id_auth_tag_len, id_key_set;
 
 static VALUE ossl_cipher_alloc(VALUE klass);
-static void ossl_cipher_free(void *ptr);
-
-static const rb_data_type_t ossl_cipher_type = {
-    "OpenSSL/Cipher",
-    {
-	0, ossl_cipher_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
 
 /*
  * PUBLIC
@@ -55,24 +44,11 @@ static const rb_data_type_t ossl_cipher_type = {
 const EVP_CIPHER *
 GetCipherPtr(VALUE obj)
 {
-    if (rb_obj_is_kind_of(obj, cCipher)) {
-	EVP_CIPHER_CTX *ctx;
-
-	GetCipher(obj, ctx);
-
-	return EVP_CIPHER_CTX_cipher(ctx);
-    }
-    else {
-	const EVP_CIPHER *cipher;
+    EVP_CIPHER_CTX *ctx;
 
-	StringValueCStr(obj);
-	cipher = EVP_get_cipherbyname(RSTRING_PTR(obj));
-	if (!cipher)
-	    ossl_raise(rb_eArgError,
-		       "unsupported cipher algorithm: %"PRIsVALUE, obj);
+    SafeGetCipher(obj, ctx);
 
-	return cipher;
-    }
+    return EVP_CIPHER_CTX_cipher(ctx);
 }
 
 VALUE
@@ -83,6 +59,7 @@ ossl_cipher_new(const EVP_CIPHER *cipher)
 
     ret = ossl_cipher_alloc(cCipher);
     AllocCipher(ret, ctx);
+    EVP_CIPHER_CTX_init(ctx);
     if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
@@ -93,15 +70,22 @@ ossl_cipher_new(const EVP_CIPHER *cipher)
  * PRIVATE
  */
 static void
-ossl_cipher_free(void *ptr)
+ossl_cipher_free(EVP_CIPHER_CTX *ctx)
 {
-    EVP_CIPHER_CTX_free(ptr);
+    if (ctx) {
+	EVP_CIPHER_CTX_cleanup(ctx);
+	ruby_xfree(ctx);
+    }
 }
 
 static VALUE
 ossl_cipher_alloc(VALUE klass)
 {
-    return NewCipher(klass);
+    VALUE obj;
+
+    WrapCipher(obj, klass, 0);
+
+    return obj;
 }
 
 /*
@@ -118,17 +102,26 @@ ossl_cipher_initialize(VALUE self, VALUE str)
     EVP_CIPHER_CTX *ctx;
     const EVP_CIPHER *cipher;
     char *name;
+    unsigned char key[EVP_MAX_KEY_LENGTH];
 
-    name = StringValueCStr(str);
+    name = StringValuePtr(str);
     GetCipherInit(self, ctx);
     if (ctx) {
 	ossl_raise(rb_eRuntimeError, "Cipher already inititalized!");
     }
     AllocCipher(self, ctx);
+    EVP_CIPHER_CTX_init(ctx);
     if (!(cipher = EVP_get_cipherbyname(name))) {
-	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%"PRIsVALUE")", str);
+	ossl_raise(rb_eRuntimeError, "unsupported cipher algorithm (%s)", name);
     }
-    if (EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, -1) != 1)
+    /*
+     * The EVP which has EVP_CIPH_RAND_KEY flag (such as DES3) allows
+     * uninitialized key, but other EVPs (such as AES) does not allow it.
+     * Calling EVP_CipherUpdate() without initializing key causes SEGV so we
+     * set the data filled with "\0" as the key by default.
+     */
+    memset(key, 0, EVP_MAX_KEY_LENGTH);
+    if (EVP_CipherInit_ex(ctx, cipher, NULL, key, NULL, -1) != 1)
 	ossl_raise(eCipherError, NULL);
 
     return self;
@@ -153,13 +146,16 @@ 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:
  *     OpenSSL::Cipher.ciphers -> array[string...]
@@ -178,6 +174,9 @@ ossl_s_ciphers(VALUE self)
 
     return ary;
 }
+#else
+#define ossl_s_ciphers rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
@@ -241,9 +240,6 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
 	ossl_raise(eCipherError, NULL);
     }
 
-    if (p_key)
-	rb_ivar_set(self, id_key_set, Qtrue);
-
     return self;
 }
 
@@ -255,7 +251,7 @@ ossl_cipher_init(int argc, VALUE *argv, VALUE self, int mode)
  *
  *  Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
  *  following methods:
- *  * [#key=, #iv=, #random_key, #random_iv, #pkcs5_keyivgen]
+ *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 1).
  */
@@ -273,7 +269,7 @@ ossl_cipher_encrypt(int argc, VALUE *argv, VALUE self)
  *
  *  Make sure to call Cipher#encrypt or Cipher#decrypt before using any of the
  *  following methods:
- *  * [#key=, #iv=, #random_key, #random_iv, #pkcs5_keyivgen]
+ *  * [key=, iv=, random_key, random_iv, pkcs5_keyivgen]
  *
  *  Internally calls EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, 0).
  */
@@ -285,20 +281,20 @@ ossl_cipher_decrypt(int argc, VALUE *argv, VALUE self)
 
 /*
  *  call-seq:
- *     cipher.pkcs5_keyivgen(pass, salt = nil, iterations = 2048, digest = "MD5") -> nil
+ *     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,
+ *  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. This method is deprecated and
  *  should no longer be used. Use a PKCS5 v2 key generation method from
  *  OpenSSL::PKCS5 instead.
  *
  *  === Parameters
- *  * +salt+ must be an 8 byte string if provided.
- *  * +iterations+ is an integer with a default of 2048.
- *  * +digest+ is a Digest object that defaults to 'MD5'
+ *  +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.
  *
@@ -330,36 +326,9 @@ ossl_cipher_pkcs5_keyivgen(int argc, VALUE *argv, VALUE self)
     OPENSSL_cleanse(key, sizeof key);
     OPENSSL_cleanse(iv, sizeof iv);
 
-    rb_ivar_set(self, id_key_set, Qtrue);
-
     return Qnil;
 }
 
-static int
-ossl_cipher_update_long(EVP_CIPHER_CTX *ctx, unsigned char *out, long *out_len_ptr,
-			const unsigned char *in, long in_len)
-{
-    int out_part_len;
-    int limit = INT_MAX / 2 + 1;
-    long out_len = 0;
-
-    do {
-	int in_part_len = in_len > limit ? limit : (int)in_len;
-
-	if (!EVP_CipherUpdate(ctx, out ? (out + out_len) : 0,
-			      &out_part_len, in, in_part_len))
-	    return 0;
-
-	out_len += out_part_len;
-	in += in_part_len;
-    } while ((in_len -= limit) > 0);
-
-    if (out_len_ptr)
-	*out_len_ptr = out_len;
-
-    return 1;
-}
-
 /*
  *  call-seq:
  *     cipher.update(data [, buffer]) -> string or buffer
@@ -369,32 +338,26 @@ ossl_cipher_update_long(EVP_CIPHER_CTX *ctx, unsigned char *out, long *out_len_p
  *  data chunk. When done, the output of Cipher#final should be additionally
  *  added to the result.
  *
- *  If +buffer+ is given, the encryption/decryption result will be written to
- *  it. +buffer+ will be resized automatically.
+ *  === 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;
     unsigned char *in;
-    long in_len, out_len;
+    int in_len, out_len;
     VALUE data, str;
 
     rb_scan_args(argc, argv, "11", &data, &str);
 
-    if (!RTEST(rb_attr_get(self, id_key_set)))
-	ossl_raise(eCipherError, "key not set");
-
     StringValue(data);
     in = (unsigned char *)RSTRING_PTR(data);
-    if ((in_len = RSTRING_LEN(data)) == 0)
+    if ((in_len = RSTRING_LENINT(data)) == 0)
         ossl_raise(rb_eArgError, "data must not be empty");
     GetCipher(self, ctx);
     out_len = in_len+EVP_CIPHER_CTX_block_size(ctx);
-    if (out_len <= 0) {
-	ossl_raise(rb_eRangeError,
-		   "data too big to make output buffer: %ld bytes", in_len);
-    }
 
     if (NIL_P(str)) {
         str = rb_str_new(0, out_len);
@@ -403,7 +366,7 @@ ossl_cipher_update(int argc, VALUE *argv, VALUE self)
         rb_str_resize(str, out_len);
     }
 
-    if (!ossl_cipher_update_long(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
+    if (!EVP_CipherUpdate(ctx, (unsigned char *)RSTRING_PTR(str), &out_len, in, in_len))
 	ossl_raise(eCipherError, NULL);
     assert(out_len < RSTRING_LEN(str));
     rb_str_set_len(str, out_len);
@@ -474,19 +437,15 @@ static VALUE
 ossl_cipher_set_key(VALUE self, VALUE key)
 {
     EVP_CIPHER_CTX *ctx;
-    int key_len;
 
     StringValue(key);
     GetCipher(self, ctx);
 
-    key_len = EVP_CIPHER_CTX_key_length(ctx);
-    if (RSTRING_LEN(key) != key_len)
-	ossl_raise(rb_eArgError, "key must be %d bytes", key_len);
+    if (RSTRING_LEN(key) < EVP_CIPHER_CTX_key_length(ctx))
+        ossl_raise(eCipherError, "key length too short");
 
     if (EVP_CipherInit_ex(ctx, NULL, NULL, (unsigned char *)RSTRING_PTR(key), NULL, -1) != 1)
-	ossl_raise(eCipherError, NULL);
-
-    rb_ivar_set(self, id_key_set, Qtrue);
+        ossl_raise(eCipherError, NULL);
 
     return key;
 }
@@ -502,24 +461,20 @@ ossl_cipher_set_key(VALUE self, VALUE key)
  *  Cipher#random_iv to create a secure random IV.
  *
  *  Only call this method after calling Cipher#encrypt or Cipher#decrypt.
+ *
+ *  If not explicitly set, the OpenSSL default of an all-zeroes ("\\0") IV is
+ *  used.
  */
 static VALUE
 ossl_cipher_set_iv(VALUE self, VALUE iv)
 {
     EVP_CIPHER_CTX *ctx;
-    int iv_len = 0;
 
     StringValue(iv);
     GetCipher(self, ctx);
 
-#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
-    if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
-	iv_len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
-#endif
-    if (!iv_len)
-	iv_len = EVP_CIPHER_CTX_iv_length(ctx);
-    if (RSTRING_LEN(iv) != iv_len)
-	ossl_raise(rb_eArgError, "iv must be %d bytes", iv_len);
+    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, (unsigned char *)RSTRING_PTR(iv), -1) != 1)
 	ossl_raise(eCipherError, NULL);
@@ -527,27 +482,6 @@ ossl_cipher_set_iv(VALUE self, VALUE iv)
     return iv;
 }
 
-/*
- *  call-seq:
- *     cipher.authenticated? -> true | false
- *
- *  Indicated whether this Cipher instance uses an Authenticated Encryption
- *  mode.
- */
-static VALUE
-ossl_cipher_is_authenticated(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-
-#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
-    return (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER) ? Qtrue : Qfalse;
-#else
-    return Qfalse;
-#endif
-}
-
 #ifdef HAVE_AUTHENTICATED_ENCRYPTION
 /*
  *  call-seq:
@@ -572,59 +506,85 @@ ossl_cipher_set_auth_data(VALUE self, VALUE data)
 {
     EVP_CIPHER_CTX *ctx;
     unsigned char *in;
-    long in_len, out_len;
+    int in_len;
+    int out_len;
 
     StringValue(data);
 
     in = (unsigned char *) RSTRING_PTR(data);
-    in_len = RSTRING_LEN(data);
+    in_len = RSTRING_LENINT(data);
 
     GetCipher(self, ctx);
 
-    if (!ossl_cipher_update_long(ctx, NULL, &out_len, in, in_len))
+    if (!EVP_CipherUpdate(ctx, NULL, &out_len, in, in_len))
         ossl_raise(eCipherError, "couldn't set additional authenticated data");
 
     return data;
 }
 
+#define ossl_is_gcm(nid)	(nid) == NID_aes_128_gcm || \
+				(nid) == NID_aes_192_gcm || \
+				(nid) == NID_aes_256_gcm
+
+static VALUE
+ossl_get_gcm_auth_tag(EVP_CIPHER_CTX *ctx, int len)
+{
+    unsigned char *tag;
+    VALUE ret;
+
+    tag = ALLOC_N(unsigned char, len);
+
+    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, len, tag))
+        ossl_raise(eCipherError, "retrieving the authentication tag failed");
+
+    ret = rb_str_new((const char *) tag, len);
+    xfree(tag);
+    return ret;
+}
+
 /*
  *  call-seq:
- *     cipher.auth_tag(tag_len = 16) -> String
+ *     cipher.auth_tag([ tag_len ] -> string
  *
  *  Gets the authentication tag generated by Authenticated Encryption Cipher
  *  modes (GCM for example). This tag may be stored along with the ciphertext,
  *  then set on the decryption cipher to authenticate the contents of the
  *  ciphertext against changes. If the optional integer parameter +tag_len+ is
  *  given, the returned tag will be +tag_len+ bytes long. If the parameter is
- *  omitted, the default length of 16 bytes or the length previously set by
- *  #auth_tag_len= will be used. For maximum security, the longest possible
- *  should be chosen.
+ *  omitted, the maximum length of 16 bytes will be returned. For maximum
+ *  security, the default of 16 bytes should be chosen.
  *
  *  The tag may only be retrieved after calling Cipher#final.
  */
 static VALUE
 ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
 {
-    VALUE vtag_len, ret;
+    VALUE vtag_len;
     EVP_CIPHER_CTX *ctx;
-    int tag_len = 16;
+    int nid, tag_len;
 
-    rb_scan_args(argc, argv, "01", &vtag_len);
-    if (NIL_P(vtag_len))
-	vtag_len = rb_attr_get(self, id_auth_tag_len);
-    if (!NIL_P(vtag_len))
+    if (rb_scan_args(argc, argv, "01", &vtag_len) == 0) {
+	tag_len = 16;
+    } else {
 	tag_len = NUM2INT(vtag_len);
+    }
 
     GetCipher(self, ctx);
+    nid = EVP_CIPHER_CTX_nid(ctx);
 
-    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
+    if (ossl_is_gcm(nid)) {
+	return ossl_get_gcm_auth_tag(ctx, tag_len);
+    } else {
 	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
+	return Qnil; /* dummy */
+    }
+}
 
-    ret = rb_str_new(NULL, tag_len);
-    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, tag_len, RSTRING_PTR(ret)))
-	ossl_raise(eCipherError, "retrieving the authentication tag failed");
-
-    return ret;
+static inline void
+ossl_set_gcm_auth_tag(EVP_CIPHER_CTX *ctx, unsigned char *tag, int tag_len)
+{
+    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, tag_len, tag))
+        ossl_raise(eCipherError, "unable to set GCM tag");
 }
 
 /*
@@ -638,14 +598,12 @@ ossl_cipher_get_auth_tag(int argc, VALUE *argv, VALUE self)
  *  decrypting any of the ciphertext. After all decryption is
  *  performed, the tag is verified automatically in the call to
  *  Cipher#final.
- *
- *  For OCB mode, the tag length must be supplied with #auth_tag_len=
- *  beforehand.
  */
 static VALUE
 ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
 {
     EVP_CIPHER_CTX *ctx;
+    int nid;
     unsigned char *tag;
     int tag_len;
 
@@ -654,80 +612,44 @@ ossl_cipher_set_auth_tag(VALUE self, VALUE vtag)
     tag_len = RSTRING_LENINT(vtag);
 
     GetCipher(self, ctx);
-    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
-	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
+    nid = EVP_CIPHER_CTX_nid(ctx);
 
-    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, tag))
-	ossl_raise(eCipherError, "unable to set AEAD tag");
+    if (ossl_is_gcm(nid)) {
+	ossl_set_gcm_auth_tag(ctx, tag, tag_len);
+    } else {
+	ossl_raise(eCipherError, "authentication tag not supported by this cipher");
+    }
 
     return vtag;
 }
 
 /*
  *  call-seq:
- *     cipher.auth_tag_len = Integer -> Integer
- *
- *  Sets the length of the authentication tag to be generated or to be given for
- *  AEAD ciphers that requires it as in input parameter. Note that not all AEAD
- *  ciphers support this method.
- *
- *  In OCB mode, the length must be supplied both when encrypting and when
- *  decrypting, and must be before specifying an IV.
- */
-static VALUE
-ossl_cipher_set_auth_tag_len(VALUE self, VALUE vlen)
-{
-    int tag_len = NUM2INT(vlen);
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
-	ossl_raise(eCipherError, "AEAD not supported by this cipher");
-
-    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, tag_len, NULL))
-	ossl_raise(eCipherError, "unable to set authentication tag length");
-
-    /* for #auth_tag */
-    rb_ivar_set(self, id_auth_tag_len, INT2NUM(tag_len));
-
-    return vlen;
-}
-
-/*
- * call-seq:
- *   cipher.iv_len = integer -> integer
+ *     cipher.authenticated? -> boolean
  *
- * Sets the IV/nonce length of the Cipher. Normally block ciphers don't allow
- * changing the IV length, but some make use of IV for 'nonce'. You may need
- * this for interoperability with other applications.
+ *  Indicated whether this Cipher instance uses an Authenticated Encryption
+ *  mode.
  */
 static VALUE
-ossl_cipher_set_iv_length(VALUE self, VALUE iv_length)
+ossl_cipher_is_authenticated(VALUE self)
 {
-    int len = NUM2INT(iv_length);
     EVP_CIPHER_CTX *ctx;
+    int nid;
 
     GetCipher(self, ctx);
-    if (!(EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER))
-	ossl_raise(eCipherError, "cipher does not support AEAD");
-
-    if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, len, NULL))
-	ossl_raise(eCipherError, "unable to set IV length");
-
-    /*
-     * EVP_CIPHER_CTX_iv_length() returns the default length. So we need to save
-     * the length somewhere. Luckily currently we aren't using app_data.
-     */
-    EVP_CIPHER_CTX_set_app_data(ctx, (void *)(VALUE)len);
+    nid = EVP_CIPHER_CTX_nid(ctx);
 
-    return iv_length;
+    if (ossl_is_gcm(nid)) {
+	return Qtrue;
+    } else {
+	return Qfalse;
+    }
 }
 #else
 #define ossl_cipher_set_auth_data rb_f_notimplement
 #define ossl_cipher_get_auth_tag rb_f_notimplement
 #define ossl_cipher_set_auth_tag rb_f_notimplement
-#define ossl_cipher_set_auth_tag_len rb_f_notimplement
-#define ossl_cipher_set_iv_length rb_f_notimplement
+#define ossl_cipher_is_authenticated rb_f_notimplement
 #endif
 
 /*
@@ -755,6 +677,7 @@ 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
@@ -776,6 +699,18 @@ ossl_cipher_set_padding(VALUE self, VALUE padding)
 	ossl_raise(eCipherError, NULL);
     return padding;
 }
+#else
+#define ossl_cipher_set_padding rb_f_notimplement
+#endif
+
+#define CIPHER_0ARG_INT(func)					\
+    static VALUE						\
+    ossl_cipher_##func(VALUE self)				\
+    {								\
+	EVP_CIPHER_CTX *ctx;					\
+	GetCipher(self, ctx);					\
+	return INT2NUM(EVP_CIPHER_##func(EVP_CIPHER_CTX_cipher(ctx)));	\
+    }
 
 /*
  *  call-seq:
@@ -783,54 +718,21 @@ ossl_cipher_set_padding(VALUE self, VALUE padding)
  *
  *  Returns the key length in bytes of the Cipher.
  */
-static VALUE
-ossl_cipher_key_length(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-
-    return INT2NUM(EVP_CIPHER_CTX_key_length(ctx));
-}
-
+CIPHER_0ARG_INT(key_length)
 /*
  *  call-seq:
  *     cipher.iv_len -> integer
  *
  *  Returns the expected length in bytes for an IV for this Cipher.
  */
-static VALUE
-ossl_cipher_iv_length(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-    int len = 0;
-
-    GetCipher(self, ctx);
-#if defined(HAVE_AUTHENTICATED_ENCRYPTION)
-    if (EVP_CIPHER_CTX_flags(ctx) & EVP_CIPH_FLAG_AEAD_CIPHER)
-	len = (int)(VALUE)EVP_CIPHER_CTX_get_app_data(ctx);
-#endif
-    if (!len)
-	len = EVP_CIPHER_CTX_iv_length(ctx);
-
-    return INT2NUM(len);
-}
-
+CIPHER_0ARG_INT(iv_length)
 /*
  *  call-seq:
  *     cipher.block_size -> integer
  *
  *  Returns the size in bytes of the blocks on which this Cipher operates on.
  */
-static VALUE
-ossl_cipher_block_size(VALUE self)
-{
-    EVP_CIPHER_CTX *ctx;
-
-    GetCipher(self, ctx);
-
-    return INT2NUM(EVP_CIPHER_CTX_block_size(ctx));
-}
+CIPHER_0ARG_INT(block_size)
 
 /*
  * INIT
@@ -839,8 +741,7 @@ void
 Init_ossl_cipher(void)
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
     /* Document-class: OpenSSL::Cipher
@@ -939,10 +840,12 @@ Init_ossl_cipher(void)
      * you absolutely need it</b>
      *
      * Because of this, you will end up with a mode that explicitly requires
-     * an IV in any case. Although the IV can be seen as public information,
-     * i.e. it may be transmitted in public once generated, it should still
-     * stay unpredictable to prevent certain kinds of attacks. Therefore,
-     * ideally
+     * an IV in any case. Note that for backwards compatibility reasons,
+     * setting an IV is not explicitly mandated by the Cipher API. If not
+     * set, OpenSSL itself defaults to an all-zeroes IV ("\\0", not the
+     * character). Although the IV can be seen as public information, i.e.
+     * it may be transmitted in public once generated, it should still stay
+     * unpredictable to prevent certain kinds of attacks. Therefore, ideally
      *
      * <b>Always create a secure random IV for every encryption of your
      * Cipher</b>
@@ -951,16 +854,16 @@ Init_ossl_cipher(void)
      * of the IV as a nonce (number used once) - it's public but random and
      * unpredictable. A secure random IV can be created as follows
      *
-     *   cipher = ...
-     *   cipher.encrypt
-     *   key = cipher.random_key
-     *   iv = cipher.random_iv # also sets the generated IV on the Cipher
+     *  cipher = ...
+     *  cipher.encrypt
+     *  key = cipher.random_key
+     *  iv = cipher.random_iv # also sets the generated IV on the Cipher
      *
-     * Although the key is generally a random value, too, it is a bad choice
-     * as an IV. There are elaborate ways how an attacker can take advantage
-     * of such an IV. As a general rule of thumb, exposing the key directly
-     * or indirectly should be avoided at all cost and exceptions only be
-     * made with good reason.
+     *  Although the key is generally a random value, too, it is a bad choice
+     *  as an IV. There are elaborate ways how an attacker can take advantage
+     *  of such an IV. As a general rule of thumb, exposing the key directly
+     *  or indirectly should be avoided at all cost and exceptions only be
+     *  made with good reason.
      *
      * === Calling Cipher#final
      *
@@ -1014,42 +917,29 @@ Init_ossl_cipher(void)
      * could otherwise be exploited to modify ciphertexts in ways beneficial to
      * potential attackers.
      *
-     * An associated data is used where there is additional information, such as
-     * headers or some metadata, that must be also authenticated but not
-     * necessarily need to be encrypted. If no associated data is needed for
-     * encryption and later decryption, the OpenSSL library still requires a
-     * value to be set - "" may be used in case none is available.
-     *
-     * An example using the GCM (Galois/Counter Mode). You have 16 bytes +key+,
-     * 12 bytes (96 bits) +nonce+ and the associated data +auth_data+. Be sure
-     * not to reuse the +key+ and +nonce+ pair. Reusing an nonce ruins the
-     * security gurantees of GCM mode.
+     * If no associated data is needed for encryption and later decryption,
+     * the OpenSSL library still requires a value to be set - "" may be used in
+     * case none is available. An example using the GCM (Galois Counter Mode):
      *
-     *   cipher = OpenSSL::Cipher::AES.new(128, :GCM).encrypt
-     *   cipher.key = key
-     *   cipher.iv = nonce
-     *   cipher.auth_data = auth_data
+     *   cipher = OpenSSL::Cipher::AES.new(128, :GCM)
+     *   cipher.encrypt
+     *   key = cipher.random_key
+     *   iv = cipher.random_iv
+     *   cipher.auth_data = ""
      *
      *   encrypted = cipher.update(data) + cipher.final
-     *   tag = cipher.auth_tag # produces 16 bytes tag by default
-     *
-     * Now you are the receiver. You know the +key+ and have received +nonce+,
-     * +auth_data+, +encrypted+ and +tag+ through an untrusted network. Note
-     * that GCM accepts an arbitrary length tag between 1 and 16 bytes. You may
-     * additionally need to check that the received tag has the correct length,
-     * or you allow attackers to forge a valid single byte tag for the tampered
-     * ciphertext with a probability of 1/256.
+     *   tag = cipher.auth_tag
      *
-     *   raise "tag is truncated!" unless tag.bytesize == 16
-     *   decipher = OpenSSL::Cipher::AES.new(128, :GCM).decrypt
+     *   decipher = OpenSSL::Cipher::AES.new(128, :GCM)
+     *   decipher.decrypt
      *   decipher.key = key
-     *   decipher.iv = nonce
+     *   decipher.iv = iv
      *   decipher.auth_tag = tag
-     *   decipher.auth_data = auth_data
+     *   decipher.auth_data = ""
      *
-     *   decrypted = decipher.update(encrypted) + decipher.final
+     *   plain = decipher.update(encrypted) + decipher.final
      *
-     *   puts data == decrypted #=> true
+     *   puts data == plain #=> true
      */
     cCipher = rb_define_class_under(mOSSL, "Cipher", rb_cObject);
     eCipherError = rb_define_class_under(cCipher, "CipherError", eOSSLError);
@@ -1069,16 +959,12 @@ Init_ossl_cipher(void)
     rb_define_method(cCipher, "auth_data=", ossl_cipher_set_auth_data, 1);
     rb_define_method(cCipher, "auth_tag=", ossl_cipher_set_auth_tag, 1);
     rb_define_method(cCipher, "auth_tag", ossl_cipher_get_auth_tag, -1);
-    rb_define_method(cCipher, "auth_tag_len=", ossl_cipher_set_auth_tag_len, 1);
     rb_define_method(cCipher, "authenticated?", ossl_cipher_is_authenticated, 0);
     rb_define_method(cCipher, "key_len=", ossl_cipher_set_key_length, 1);
     rb_define_method(cCipher, "key_len", ossl_cipher_key_length, 0);
     rb_define_method(cCipher, "iv=", ossl_cipher_set_iv, 1);
-    rb_define_method(cCipher, "iv_len=", ossl_cipher_set_iv_length, 1);
     rb_define_method(cCipher, "iv_len", ossl_cipher_iv_length, 0);
     rb_define_method(cCipher, "block_size", ossl_cipher_block_size, 0);
     rb_define_method(cCipher, "padding=", ossl_cipher_set_padding, 1);
-
-    id_auth_tag_len = rb_intern_const("auth_tag_len");
-    id_key_set = rb_intern_const("key_set");
 }
+
diff --git a/ext/openssl/ossl_cipher.h b/ext/openssl/ossl_cipher.h
index c444089fc2..bed4fa853b 100644
--- a/ext/openssl/ossl_cipher.h
+++ b/ext/openssl/ossl_cipher.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_CIPHER_H_)
@@ -18,3 +19,4 @@ VALUE ossl_cipher_new(const EVP_CIPHER *);
 void Init_ossl_cipher(void);
 
 #endif /* _OSSL_CIPHER_H_ */
+
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index ebf6ae2a3d..140f5c3ad0 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
@@ -26,13 +27,13 @@ VALUE eConfigError;
  */
 
 /*
- * DupConfigPtr is a public C-level function for getting OpenSSL CONF struct
+ * GetConfigPtr is a public C-level function for getting OpenSSL CONF struct
  * from an OpenSSL::Config(eConfig) instance.  We decided to implement
  * OpenSSL::Config in Ruby level but we need to pass native CONF struct for
  * some OpenSSL features such as X509V3_EXT_*.
  */
 CONF *
-DupConfigPtr(VALUE obj)
+GetConfigPtr(VALUE obj)
 {
     CONF *conf;
     VALUE str;
@@ -50,10 +51,9 @@ DupConfigPtr(VALUE obj)
     if(!NCONF_load_bio(conf, bio, &eline)){
 	BIO_free(bio);
 	NCONF_free(conf);
-	if (eline <= 0)
-	    ossl_raise(eConfigError, "wrong config format");
-	else
-	    ossl_raise(eConfigError, "error in line %d", eline);
+	if (eline <= 0) ossl_raise(eConfigError, "wrong config format");
+	else ossl_raise(eConfigError, "error in line %d", eline);
+	ossl_raise(eConfigError, NULL);
     }
     BIO_free(bio);
 
@@ -69,15 +69,9 @@ DupConfigPtr(VALUE obj)
  * INIT
  */
 void
-Init_ossl_config(void)
+Init_ossl_config()
 {
     char *default_config_file;
-
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-#endif
-
     eConfigError = rb_define_class_under(mOSSL, "ConfigError", eOSSLError);
     cConfig = rb_define_class_under(mOSSL, "Config", rb_cObject);
 
diff --git a/ext/openssl/ossl_config.h b/ext/openssl/ossl_config.h
index 627d297ba3..cb226b27e5 100644
--- a/ext/openssl/ossl_config.h
+++ b/ext/openssl/ossl_config.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_CONFIG_H_)
@@ -13,7 +14,9 @@
 extern VALUE cConfig;
 extern VALUE eConfigError;
 
+CONF* GetConfigPtr(VALUE obj);
 CONF* DupConfigPtr(VALUE obj);
 void Init_ossl_config(void);
 
 #endif /* _OSSL_CONFIG_H_ */
+
diff --git a/ext/openssl/ossl_digest.c b/ext/openssl/ossl_digest.c
index fdafda0074..7e5e7ff1ab 100644
--- a/ext/openssl/ossl_digest.c
+++ b/ext/openssl/ossl_digest.c
@@ -1,16 +1,17 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
 #define GetDigest(obj, ctx) do { \
-    TypedData_Get_Struct((obj), EVP_MD_CTX, &ossl_digest_type, (ctx)); \
+    Data_Get_Struct((obj), EVP_MD_CTX, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "Digest CTX wasn't initialized!"); \
     } \
@@ -28,20 +29,6 @@ VALUE eDigestError;
 
 static VALUE ossl_digest_alloc(VALUE klass);
 
-static void
-ossl_digest_free(void *ctx)
-{
-    EVP_MD_CTX_destroy(ctx);
-}
-
-static const rb_data_type_t ossl_digest_type = {
-    "OpenSSL/Digest",
-    {
-	0, ossl_digest_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  */
@@ -61,7 +48,7 @@ GetDigestPtr(VALUE obj)
 	    ASN1_OBJECT_free(oid);
 	}
 	if(!md)
-            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%"PRIsVALUE").", obj);
+            ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
     } else {
         EVP_MD_CTX *ctx;
 
@@ -80,13 +67,10 @@ ossl_digest_new(const EVP_MD *md)
     EVP_MD_CTX *ctx;
 
     ret = ossl_digest_alloc(cDigest);
-    ctx = EVP_MD_CTX_new();
-    if (!ctx)
-	ossl_raise(eDigestError, "EVP_MD_CTX_new");
-    RTYPEDDATA_DATA(ret) = ctx;
-
-    if (!EVP_DigestInit_ex(ctx, md, NULL))
-	ossl_raise(eDigestError, "Digest initialization failed");
+    GetDigest(ret, ctx);
+    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
+	ossl_raise(eDigestError, "Digest initialization failed.");
+    }
 
     return ret;
 }
@@ -97,7 +81,15 @@ ossl_digest_new(const EVP_MD *md)
 static VALUE
 ossl_digest_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &ossl_digest_type, 0);
+    EVP_MD_CTX *ctx;
+    VALUE obj;
+
+    ctx = EVP_MD_CTX_create();
+    if (ctx == NULL)
+	ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
+    obj = Data_Wrap_Struct(klass, 0, EVP_MD_CTX_destroy, ctx);
+
+    return obj;
 }
 
 VALUE ossl_digest_update(VALUE, VALUE);
@@ -108,16 +100,17 @@ VALUE ossl_digest_update(VALUE, VALUE);
  *
  * Creates a Digest instance based on +string+, which is either the ln
  * (long name) or sn (short name) of a supported digest algorithm.
- *
  * If +data+ (a +String+) is given, it is used as the initial input to the
  * Digest instance, i.e.
- *
  *   digest = OpenSSL::Digest.new('sha256', 'digestdata')
- *
  * is equal to
- *
  *   digest = OpenSSL::Digest.new('sha256')
  *   digest.update('digestdata')
+ *
+ * === Example
+ *   digest = OpenSSL::Digest.new('sha1')
+ *
+ *
  */
 static VALUE
 ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
@@ -130,16 +123,11 @@ ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
     md = GetDigestPtr(type);
     if (!NIL_P(data)) StringValue(data);
 
-    TypedData_Get_Struct(self, EVP_MD_CTX, &ossl_digest_type, ctx);
-    if (!ctx) {
-	RTYPEDDATA_DATA(self) = ctx = EVP_MD_CTX_new();
-	if (!ctx)
-	    ossl_raise(eDigestError, "EVP_MD_CTX_new");
+    GetDigest(self, ctx);
+    if (EVP_DigestInit_ex(ctx, md, NULL) != 1) {
+	ossl_raise(eDigestError, "Digest initialization failed.");
     }
 
-    if (!EVP_DigestInit_ex(ctx, md, NULL))
-	ossl_raise(eDigestError, "Digest initialization failed");
-
     if (!NIL_P(data)) return ossl_digest_update(self, data);
     return self;
 }
@@ -152,12 +140,7 @@ ossl_digest_copy(VALUE self, VALUE other)
     rb_check_frozen(self);
     if (self == other) return self;
 
-    TypedData_Get_Struct(self, EVP_MD_CTX, &ossl_digest_type, ctx1);
-    if (!ctx1) {
-	RTYPEDDATA_DATA(self) = ctx1 = EVP_MD_CTX_new();
-	if (!ctx1)
-	    ossl_raise(eDigestError, "EVP_MD_CTX_new");
-    }
+    GetDigest(self, ctx1);
     SafeGetDigest(other, ctx2);
 
     if (!EVP_MD_CTX_copy(ctx1, ctx2)) {
@@ -209,9 +192,7 @@ ossl_digest_update(VALUE self, VALUE data)
 
     StringValue(data);
     GetDigest(self, ctx);
-
-    if (!EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data)))
-	ossl_raise(eDigestError, "EVP_DigestUpdate");
+    EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
 
     return self;
 }
@@ -226,21 +207,19 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
 {
     EVP_MD_CTX *ctx;
     VALUE str;
-    int out_len;
 
-    GetDigest(self, ctx);
     rb_scan_args(argc, argv, "01", &str);
-    out_len = EVP_MD_CTX_size(ctx);
+
+    GetDigest(self, ctx);
 
     if (NIL_P(str)) {
-        str = rb_str_new(NULL, out_len);
+        str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
     } else {
         StringValue(str);
-        rb_str_resize(str, out_len);
+        rb_str_resize(str, EVP_MD_CTX_size(ctx));
     }
 
-    if (!EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL))
-	ossl_raise(eDigestError, "EVP_DigestFinal_ex");
+    EVP_DigestFinal_ex(ctx, (unsigned char *)RSTRING_PTR(str), NULL);
 
     return str;
 }
@@ -249,7 +228,7 @@ ossl_digest_finish(int argc, VALUE *argv, VALUE self)
  *  call-seq:
  *      digest.name -> string
  *
- * Returns the sn of this Digest algorithm.
+ * Returns the sn of this Digest instance.
  *
  * === Example
  *   digest = OpenSSL::Digest::SHA512.new
@@ -315,13 +294,12 @@ ossl_digest_block_length(VALUE self)
  * INIT
  */
 void
-Init_ossl_digest(void)
+Init_ossl_digest()
 {
     rb_require("digest");
 
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
     /* Document-class: OpenSSL::Digest
diff --git a/ext/openssl/ossl_digest.h b/ext/openssl/ossl_digest.h
index 512f7d3a39..8cc5b1bc56 100644
--- a/ext/openssl/ossl_digest.h
+++ b/ext/openssl/ossl_digest.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_DIGEST_H_)
@@ -18,3 +19,4 @@ VALUE ossl_digest_new(const EVP_MD *);
 void Init_ossl_digest(void);
 
 #endif /* _OSSL_DIGEST_H_ */
+
diff --git a/ext/openssl/ossl_engine.c b/ext/openssl/ossl_engine.c
index e840bfd92c..f99a30dfc3 100644
--- a/ext/openssl/ossl_engine.c
+++ b/ext/openssl/ossl_engine.c
@@ -1,26 +1,25 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#if !defined(OPENSSL_NO_ENGINE)
+#if defined(OSSL_ENGINE_ENABLED)
 
-#define NewEngine(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_engine_type, 0)
-#define SetEngine(obj, engine) do { \
+#define WrapEngine(klass, obj, engine) do { \
     if (!(engine)) { \
 	ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
     } \
-    RTYPEDDATA_DATA(obj) = (engine); \
+    (obj) = Data_Wrap_Struct((klass), 0, ENGINE_free, (engine)); \
 } while(0)
 #define GetEngine(obj, engine) do { \
-    TypedData_Get_Struct((obj), ENGINE, &ossl_engine_type, (engine)); \
+    Data_Get_Struct((obj), ENGINE, (engine)); \
     if (!(engine)) { \
         ossl_raise(rb_eRuntimeError, "ENGINE wasn't initialized."); \
     } \
@@ -58,20 +57,6 @@ do{\
   }\
 }while(0)
 
-static void
-ossl_engine_free(void *engine)
-{
-    ENGINE_free(engine);
-}
-
-static const rb_data_type_t ossl_engine_type = {
-    "OpenSSL/Engine",
-    {
-	0, ossl_engine_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /* Document-method: OpenSSL::Engine.load
  *
  * call-seq:
@@ -96,7 +81,7 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
         ENGINE_load_builtin_engines();
         return Qtrue;
     }
-    StringValueCStr(name);
+    StringValue(name);
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #if HAVE_ENGINE_LOAD_DYNAMIC
     OSSL_ENGINE_LOAD_IF_MATCH(dynamic);
@@ -148,7 +133,7 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
     OSSL_ENGINE_LOAD_IF_MATCH(openbsd_dev_crypto);
 #endif
     OSSL_ENGINE_LOAD_IF_MATCH(openssl);
-    rb_warning("no such builtin loader for `%"PRIsVALUE"'", name);
+    rb_warning("no such builtin loader for `%s'", RSTRING_PTR(name));
     return Qnil;
 #endif /* HAVE_ENGINE_LOAD_BUILTIN_ENGINES */
 }
@@ -160,12 +145,14 @@ ossl_engine_s_load(int argc, VALUE *argv, VALUE klass)
  * It is only necessary to run cleanup when engines are loaded via
  * OpenSSL::Engine.load. However, running cleanup before exit is recommended.
  *
- * Note that this is needed and works only in OpenSSL < 1.1.0.
+ * See also, https://www.openssl.org/docs/crypto/engine.html
  */
 static VALUE
 ossl_engine_s_cleanup(VALUE self)
 {
+#if defined(HAVE_ENGINE_CLEANUP)
     ENGINE_cleanup();
+#endif
     return Qnil;
 }
 
@@ -181,12 +168,11 @@ ossl_engine_s_engines(VALUE klass)
 
     ary = rb_ary_new();
     for(e = ENGINE_get_first(); e; e = ENGINE_get_next(e)){
-	obj = NewEngine(klass);
 	/* Need a ref count of two here because of ENGINE_free being
 	 * called internally by OpenSSL when moving to the next ENGINE
 	 * and by us when releasing the ENGINE reference */
 	ENGINE_up_ref(e);
-	SetEngine(obj, e);
+	WrapEngine(klass, obj, e);
         rb_ary_push(ary, obj);
     }
 
@@ -211,18 +197,31 @@ ossl_engine_s_by_id(VALUE klass, VALUE id)
     ENGINE *e;
     VALUE obj;
 
-    StringValueCStr(id);
+    StringValue(id);
     ossl_engine_s_load(1, &id, klass);
-    obj = NewEngine(klass);
     if(!(e = ENGINE_by_id(RSTRING_PTR(id))))
 	ossl_raise(eEngineError, NULL);
-    SetEngine(obj, e);
+    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(*)(void))ossl_pem_passwd_cb);
-    ossl_clear_error();
+    ERR_clear_error();
+
+    return obj;
+}
+
+static VALUE
+ossl_engine_s_alloc(VALUE klass)
+{
+    ENGINE *e;
+    VALUE obj;
+
+    if (!(e = ENGINE_new())) {
+       ossl_raise(eEngineError, NULL);
+    }
+    WrapEngine(klass, obj, e);
 
     return obj;
 }
@@ -279,6 +278,7 @@ ossl_engine_finish(VALUE self)
     return Qnil;
 }
 
+#if defined(HAVE_ENGINE_GET_CIPHER)
 /* Document-method: OpenSSL::Engine#cipher
  *
  * call-seq:
@@ -287,7 +287,7 @@ ossl_engine_finish(VALUE self)
  * This returns an OpenSSL::Cipher by +name+, if it is available in this
  * engine.
  *
- * An EngineError will be raised if the cipher is unavailable.
+ * A EngineError will be raised if the cipher is unavailable.
  *
  *    e = OpenSSL::Engine.by_id("openssl")
  *     => #<OpenSSL::Engine id="openssl" name="Software engine support">
@@ -300,10 +300,12 @@ ossl_engine_get_cipher(VALUE self, VALUE name)
 {
     ENGINE *e;
     const EVP_CIPHER *ciph, *tmp;
+    char *s;
     int nid;
 
-    tmp = EVP_get_cipherbyname(StringValueCStr(name));
-    if(!tmp) ossl_raise(eEngineError, "no such cipher `%"PRIsVALUE"'", name);
+    s = StringValuePtr(name);
+    tmp = EVP_get_cipherbyname(s);
+    if(!tmp) ossl_raise(eEngineError, "no such cipher `%s'", s);
     nid = EVP_CIPHER_nid(tmp);
     GetEngine(self, e);
     ciph = ENGINE_get_cipher(e, nid);
@@ -311,7 +313,11 @@ ossl_engine_get_cipher(VALUE self, VALUE name)
 
     return ossl_cipher_new(ciph);
 }
+#else
+#define ossl_engine_get_cipher rb_f_notimplement
+#endif
 
+#if defined(HAVE_ENGINE_GET_DIGEST)
 /* Document-method: OpenSSL::Engine#digest
  *
  * call-seq:
@@ -333,10 +339,12 @@ ossl_engine_get_digest(VALUE self, VALUE name)
 {
     ENGINE *e;
     const EVP_MD *md, *tmp;
+    char *s;
     int nid;
 
-    tmp = EVP_get_digestbyname(StringValueCStr(name));
-    if(!tmp) ossl_raise(eEngineError, "no such digest `%"PRIsVALUE"'", name);
+    s = StringValuePtr(name);
+    tmp = EVP_get_digestbyname(s);
+    if(!tmp) ossl_raise(eEngineError, "no such digest `%s'", s);
     nid = EVP_MD_nid(tmp);
     GetEngine(self, e);
     md = ENGINE_get_digest(e, nid);
@@ -344,6 +352,9 @@ ossl_engine_get_digest(VALUE self, VALUE name)
 
     return ossl_digest_new(md);
 }
+#else
+#define ossl_engine_get_digest rb_f_notimplement
+#endif
 
 /* Document-method: OpenSSL::Engine#load_private_key
  *
@@ -364,10 +375,14 @@ ossl_engine_load_privkey(int argc, VALUE *argv, VALUE self)
     char *sid, *sdata;
 
     rb_scan_args(argc, argv, "02", &id, &data);
-    sid = NIL_P(id) ? NULL : StringValueCStr(id);
-    sdata = NIL_P(data) ? NULL : StringValueCStr(data);
+    sid = NIL_P(id) ? NULL : StringValuePtr(id);
+    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
     GetEngine(self, e);
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    pkey = ENGINE_load_private_key(e, sid, sdata);
+#else
     pkey = ENGINE_load_private_key(e, sid, NULL, sdata);
+#endif
     if (!pkey) ossl_raise(eEngineError, NULL);
     obj = ossl_pkey_new(pkey);
     OSSL_PKEY_SET_PRIVATE(obj);
@@ -394,10 +409,14 @@ ossl_engine_load_pubkey(int argc, VALUE *argv, VALUE self)
     char *sid, *sdata;
 
     rb_scan_args(argc, argv, "02", &id, &data);
-    sid = NIL_P(id) ? NULL : StringValueCStr(id);
-    sdata = NIL_P(data) ? NULL : StringValueCStr(data);
+    sid = NIL_P(id) ? NULL : StringValuePtr(id);
+    sdata = NIL_P(data) ? NULL : StringValuePtr(data);
     GetEngine(self, e);
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
+    pkey = ENGINE_load_public_key(e, sid, sdata);
+#else
     pkey = ENGINE_load_public_key(e, sid, NULL, sdata);
+#endif
     if (!pkey) ossl_raise(eEngineError, NULL);
 
     return ossl_pkey_new(pkey);
@@ -450,8 +469,10 @@ ossl_engine_ctrl_cmd(int argc, VALUE *argv, VALUE self)
 
     GetEngine(self, e);
     rb_scan_args(argc, argv, "11", &cmd, &val);
-    ret = ENGINE_ctrl_cmd_string(e, StringValueCStr(cmd),
-				 NIL_P(val) ? NULL : StringValueCStr(val), 0);
+    StringValue(cmd);
+    if (!NIL_P(val)) StringValue(val);
+    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;
@@ -512,21 +533,17 @@ ossl_engine_inspect(VALUE self)
 #define DefEngineConst(x) rb_define_const(cEngine, #x, INT2NUM(ENGINE_##x))
 
 void
-Init_ossl_engine(void)
+Init_ossl_engine()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-#endif
-
     cEngine = rb_define_class_under(mOSSL, "Engine", rb_cObject);
     eEngineError = rb_define_class_under(cEngine, "EngineError", eOSSLError);
 
-    rb_undef_alloc_func(cEngine);
+    rb_define_alloc_func(cEngine, ossl_engine_s_alloc);
     rb_define_singleton_method(cEngine, "load", ossl_engine_s_load, -1);
     rb_define_singleton_method(cEngine, "cleanup", ossl_engine_s_cleanup, 0);
     rb_define_singleton_method(cEngine, "engines", ossl_engine_s_engines, 0);
     rb_define_singleton_method(cEngine, "by_id", ossl_engine_s_by_id, 1);
+    rb_undef_method(CLASS_OF(cEngine), "new");
 
     rb_define_method(cEngine, "id", ossl_engine_get_id, 0);
     rb_define_method(cEngine, "name", ossl_engine_get_name, 0);
@@ -550,14 +567,18 @@ Init_ossl_engine(void)
 #ifdef ENGINE_METHOD_BN_MOD_EXP_CRT
     DefEngineConst(METHOD_BN_MOD_EXP_CRT);
 #endif
+#ifdef ENGINE_METHOD_CIPHERS
     DefEngineConst(METHOD_CIPHERS);
+#endif
+#ifdef ENGINE_METHOD_DIGESTS
     DefEngineConst(METHOD_DIGESTS);
+#endif
     DefEngineConst(METHOD_ALL);
     DefEngineConst(METHOD_NONE);
 }
 #else
 void
-Init_ossl_engine(void)
+Init_ossl_engine()
 {
 }
 #endif
diff --git a/ext/openssl/ossl_engine.h b/ext/openssl/ossl_engine.h
index cd548beea3..ea2f256912 100644
--- a/ext/openssl/ossl_engine.h
+++ b/ext/openssl/ossl_engine.h
@@ -1,11 +1,12 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
  * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(OSSL_ENGINE_H)
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 270979ed92..b1e853dde3 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -1,20 +1,21 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(OPENSSL_NO_HMAC)
 
 #include "ossl.h"
 
-#define NewHMAC(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_hmac_type, 0)
+#define MakeHMAC(obj, klass, ctx) \
+    (obj) = Data_Make_Struct((klass), HMAC_CTX, 0, ossl_hmac_free, (ctx))
 #define GetHMAC(obj, ctx) do { \
-    TypedData_Get_Struct((obj), HMAC_CTX, &ossl_hmac_type, (ctx)); \
+    Data_Get_Struct((obj), HMAC_CTX, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
     } \
@@ -38,30 +39,20 @@ VALUE eHMACError;
  * Private
  */
 static void
-ossl_hmac_free(void *ctx)
+ossl_hmac_free(HMAC_CTX *ctx)
 {
-    HMAC_CTX_free(ctx);
+    HMAC_CTX_cleanup(ctx);
+    ruby_xfree(ctx);
 }
 
-static const rb_data_type_t ossl_hmac_type = {
-    "OpenSSL/HMAC",
-    {
-	0, ossl_hmac_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 static VALUE
 ossl_hmac_alloc(VALUE klass)
 {
-    VALUE obj;
     HMAC_CTX *ctx;
+    VALUE obj;
 
-    obj = NewHMAC(klass);
-    ctx = HMAC_CTX_new();
-    if (!ctx)
-	ossl_raise(eHMACError, NULL);
-    RTYPEDDATA_DATA(obj) = ctx;
+    MakeHMAC(obj, klass, ctx);
+    HMAC_CTX_init(ctx);
 
     return obj;
 }
@@ -109,8 +100,8 @@ ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
 
     StringValue(key);
     GetHMAC(self, ctx);
-    HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
-		 GetDigestPtr(digest), NULL);
+    HMAC_Init(ctx, RSTRING_PTR(key), RSTRING_LENINT(key),
+		 GetDigestPtr(digest));
 
     return self;
 }
@@ -126,8 +117,7 @@ ossl_hmac_copy(VALUE self, VALUE other)
     GetHMAC(self, ctx1);
     SafeGetHMAC(other, ctx2);
 
-    if (!HMAC_CTX_copy(ctx1, ctx2))
-	ossl_raise(eHMACError, "HMAC_CTX_copy");
+    HMAC_CTX_copy(ctx1, ctx2);
     return self;
 }
 
@@ -162,21 +152,18 @@ ossl_hmac_update(VALUE self, VALUE data)
 }
 
 static void
-hmac_final(HMAC_CTX *ctx, unsigned char *buf, unsigned int *buf_len)
+hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
 {
-    HMAC_CTX *final;
+    HMAC_CTX final;
 
-    final = HMAC_CTX_new();
-    if (!final)
-	ossl_raise(eHMACError, "HMAC_CTX_new");
-
-    if (!HMAC_CTX_copy(final, ctx)) {
-	HMAC_CTX_free(final);
-	ossl_raise(eHMACError, "HMAC_CTX_copy");
+    HMAC_CTX_copy(&final, ctx);
+    if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
+	HMAC_CTX_cleanup(&final);
+	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
+	ossl_raise(eHMACError, "Cannot allocate memory for hmac");
     }
-
-    HMAC_Final(final, buf, buf_len);
-    HMAC_CTX_free(final);
+    HMAC_Final(&final, *buf, buf_len);
+    HMAC_CTX_cleanup(&final);
 }
 
 /*
@@ -186,25 +173,26 @@ hmac_final(HMAC_CTX *ctx, unsigned char *buf, unsigned int *buf_len)
  * Returns the authentication code an instance represents as a binary string.
  *
  * === Example
- *  instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
- *  #=> f42bb0eeb018ebbd4597ae7213711ec60760843f
- *  instance.digest
- *  #=> "\xF4+\xB0\xEE\xB0\x18\xEB\xBDE\x97\xAEr\x13q\x1E\xC6\a`\x84?"
+ *
+ *	instance = OpenSSL::HMAC.new('key', OpenSSL::Digest.new('sha1'))
+ * 	#=> f42bb0eeb018ebbd4597ae7213711ec60760843f
+ * 	instance.digest
+ * 	#=> "\xF4+\xB0\xEE\xB0\x18\xEB\xBDE\x97\xAEr\x13q\x1E\xC6\a`\x84?"
+ *
  */
 static VALUE
 ossl_hmac_digest(VALUE self)
 {
     HMAC_CTX *ctx;
+    unsigned char *buf;
     unsigned int buf_len;
-    VALUE ret;
+    VALUE digest;
 
     GetHMAC(self, ctx);
-    ret = rb_str_new(NULL, EVP_MAX_MD_SIZE);
-    hmac_final(ctx, (unsigned char *)RSTRING_PTR(ret), &buf_len);
-    assert(buf_len <= EVP_MAX_MD_SIZE);
-    rb_str_set_len(ret, buf_len);
+    hmac_final(ctx, &buf, &buf_len);
+    digest = ossl_buf2str((char *)buf, buf_len);
 
-    return ret;
+    return digest;
 }
 
 /*
@@ -213,21 +201,27 @@ ossl_hmac_digest(VALUE self)
  *
  * Returns the authentication code an instance represents as a hex-encoded
  * string.
+ *
  */
 static VALUE
 ossl_hmac_hexdigest(VALUE self)
 {
     HMAC_CTX *ctx;
-    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned char *buf;
+    char *hexbuf;
     unsigned int buf_len;
-    VALUE ret;
+    VALUE hexdigest;
 
     GetHMAC(self, ctx);
-    hmac_final(ctx, buf, &buf_len);
-    ret = rb_str_new(NULL, buf_len * 2);
-    ossl_bin2hex(buf, RSTRING_PTR(ret), buf_len);
+    hmac_final(ctx, &buf, &buf_len);
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
+	OPENSSL_free(buf);
+	ossl_raise(eHMACError, "Memory alloc error");
+    }
+    OPENSSL_free(buf);
+    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
 
-    return ret;
+    return hexdigest;
 }
 
 /*
@@ -255,7 +249,7 @@ ossl_hmac_reset(VALUE self)
     HMAC_CTX *ctx;
 
     GetHMAC(self, ctx);
-    HMAC_Init_ex(ctx, NULL, 0, NULL, NULL);
+    HMAC_Init(ctx, NULL, 0, NULL);
 
     return self;
 }
@@ -311,63 +305,35 @@ ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 static VALUE
 ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
 {
-    unsigned char buf[EVP_MAX_MD_SIZE];
+    unsigned char *buf;
+    char *hexbuf;
     unsigned int buf_len;
-    VALUE ret;
+    VALUE hexdigest;
 
     StringValue(key);
     StringValue(data);
 
-    if (!HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
-	      (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data),
-	      buf, &buf_len))
-	ossl_raise(eHMACError, "HMAC");
-
-    ret = rb_str_new(NULL, buf_len * 2);
-    ossl_bin2hex(buf, RSTRING_PTR(ret), buf_len);
+    buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LENINT(key),
+	       (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
+    if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * (int)buf_len) {
+	ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
+    }
+    hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
 
-    return ret;
+    return hexdigest;
 }
 
 /*
  * INIT
  */
 void
-Init_ossl_hmac(void)
+Init_ossl_hmac()
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    /* :nodoc: */
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
-    /*
-     * Document-class: OpenSSL::HMAC
-     *
-     * OpenSSL::HMAC allows computing Hash-based Message Authentication Code
-     * (HMAC). It is a type of message authentication code (MAC) involving a
-     * hash function in combination with a key. HMAC can be used to verify the
-     * integrity of a message as well as the authenticity.
-     *
-     * OpenSSL::HMAC has a similar interface to OpenSSL::Digest.
-     *
-     * === HMAC-SHA256 using one-shot interface
-     *
-     *   key = "key"
-     *   data = "message-to-be-authenticated"
-     *   mac = OpenSSL::HMAC.hexdigest("SHA256", key, data)
-     *   #=> "cddb0db23f469c8bf072b21fd837149bd6ace9ab771cceef14c9e517cc93282e"
-     *
-     * === HMAC-SHA256 using incremental interface
-     *
-     *   data1 = File.read("file1")
-     *   data2 = File.read("file2")
-     *   key = "key"
-     *   digest = OpenSSL::Digest::SHA256.new
-     *   hmac = OpenSSL::HMAC.new(key, digest)
-     *   hmac << data1
-     *   hmac << data2
-     *   mac = hmac.digest
-     */
     eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
 
     cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
@@ -391,7 +357,7 @@ Init_ossl_hmac(void)
 #else /* NO_HMAC */
 #  warning >>> OpenSSL is compiled without HMAC support <<<
 void
-Init_ossl_hmac(void)
+Init_ossl_hmac()
 {
     rb_warning("HMAC is not available: OpenSSL is compiled without HMAC.");
 }
diff --git a/ext/openssl/ossl_hmac.h b/ext/openssl/ossl_hmac.h
index 7c51f4722d..1a2978b39a 100644
--- a/ext/openssl/ossl_hmac.h
+++ b/ext/openssl/ossl_hmac.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_HMAC_H_)
diff --git a/ext/openssl/ossl_ns_spki.c b/ext/openssl/ossl_ns_spki.c
index 98f6552ec7..b80984cfee 100644
--- a/ext/openssl/ossl_ns_spki.c
+++ b/ext/openssl/ossl_ns_spki.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewSPKI(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_netscape_spki_type, 0)
-#define SetSPKI(obj, spki) do { \
+#define WrapSPKI(klass, obj, spki) do { \
     if (!(spki)) { \
 	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (spki); \
+    (obj) = Data_Wrap_Struct((klass), 0, NETSCAPE_SPKI_free, (spki)); \
 } while (0)
 #define GetSPKI(obj, spki) do { \
-    TypedData_Get_Struct((obj), NETSCAPE_SPKI, &ossl_netscape_spki_type, (spki)); \
+    Data_Get_Struct((obj), NETSCAPE_SPKI, (spki)); \
     if (!(spki)) { \
 	ossl_raise(rb_eRuntimeError, "SPKI wasn't initialized!"); \
     } \
@@ -38,32 +37,16 @@ VALUE eSPKIError;
 /*
  * Private functions
  */
-
-static void
-ossl_netscape_spki_free(void *spki)
-{
-    NETSCAPE_SPKI_free(spki);
-}
-
-static const rb_data_type_t ossl_netscape_spki_type = {
-    "OpenSSL/NETSCAPE_SPKI",
-    {
-	0, ossl_netscape_spki_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 static VALUE
 ossl_spki_alloc(VALUE klass)
 {
     NETSCAPE_SPKI *spki;
     VALUE obj;
 
-    obj = NewSPKI(klass);
     if (!(spki = NETSCAPE_SPKI_new())) {
 	ossl_raise(eSPKIError, NULL);
     }
-    SetSPKI(obj, spki);
+    WrapSPKI(klass, obj, spki);
 
     return obj;
 }
@@ -86,15 +69,15 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
     }
     StringValue(buffer);
-    if (!(spki = NETSCAPE_SPKI_b64_decode(RSTRING_PTR(buffer), RSTRING_LENINT(buffer)))) {
-	ossl_clear_error();
+    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);
 	}
     }
     NETSCAPE_SPKI_free(DATA_PTR(self));
-    SetSPKI(self, spki);
+    DATA_PTR(self) = spki;
+    ERR_clear_error();
 
     return self;
 }
@@ -159,6 +142,8 @@ ossl_spki_print(VALUE self)
 {
     NETSCAPE_SPKI *spki;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetSPKI(self, spki);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -168,8 +153,11 @@ ossl_spki_print(VALUE self)
 	BIO_free(out);
 	ossl_raise(eSPKIError, NULL);
     }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
 
-    return ossl_membio2str(out);
+    return str;
 }
 
 /*
@@ -372,11 +360,10 @@ ossl_spki_verify(VALUE self, VALUE key)
  */
 
 void
-Init_ossl_ns_spki(void)
+Init_ossl_ns_spki()
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
     mNetscape = rb_define_module_under(mOSSL, "Netscape");
@@ -399,3 +386,4 @@ Init_ossl_ns_spki(void)
     rb_define_method(cSPKI, "challenge", ossl_spki_get_challenge, 0);
     rb_define_method(cSPKI, "challenge=", ossl_spki_set_challenge, 1);
 }
+
diff --git a/ext/openssl/ossl_ns_spki.h b/ext/openssl/ossl_ns_spki.h
index 62ba8cb163..9977035a9c 100644
--- a/ext/openssl/ossl_ns_spki.h
+++ b/ext/openssl/ossl_ns_spki.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_NS_SPKI_H_)
@@ -17,3 +18,4 @@ extern VALUE eSPKIError;
 void Init_ossl_ns_spki(void);
 
 #endif /* _OSSL_NS_SPKI_H_ */
+
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index a8b3503d2a..c959379324 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -1,25 +1,24 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
  * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#if !defined(OPENSSL_NO_OCSP)
+#if defined(OSSL_OCSP_ENABLED)
 
-#define NewOCSPReq(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_ocsp_request_type, 0)
-#define SetOCSPReq(obj, req) do { \
+#define WrapOCSPReq(klass, obj, req) do { \
     if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
-    RTYPEDDATA_DATA(obj) = (req); \
+    (obj) = Data_Wrap_Struct((klass), 0, OCSP_REQUEST_free, (req)); \
 } while (0)
 #define GetOCSPReq(obj, req) do { \
-    TypedData_Get_Struct((obj), OCSP_REQUEST, &ossl_ocsp_request_type, (req)); \
+    Data_Get_Struct((obj), OCSP_REQUEST, (req)); \
     if(!(req)) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
 } while (0)
 #define SafeGetOCSPReq(obj, req) do { \
@@ -27,14 +26,12 @@
     GetOCSPReq((obj), (req)); \
 } while (0)
 
-#define NewOCSPRes(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_ocsp_response_type, 0)
-#define SetOCSPRes(obj, res) do { \
+#define WrapOCSPRes(klass, obj, res) do { \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-    RTYPEDDATA_DATA(obj) = (res); \
+    (obj) = Data_Wrap_Struct((klass), 0, OCSP_RESPONSE_free, (res)); \
 } while (0)
 #define GetOCSPRes(obj, res) do { \
-    TypedData_Get_Struct((obj), OCSP_RESPONSE, &ossl_ocsp_response_type, (res)); \
+    Data_Get_Struct((obj), OCSP_RESPONSE, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
 } while (0)
 #define SafeGetOCSPRes(obj, res) do { \
@@ -42,14 +39,12 @@
     GetOCSPRes((obj), (res)); \
 } while (0)
 
-#define NewOCSPBasicRes(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_ocsp_basicresp_type, 0)
-#define SetOCSPBasicRes(obj, res) do { \
+#define WrapOCSPBasicRes(klass, obj, res) do { \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
-    RTYPEDDATA_DATA(obj) = (res); \
+    (obj) = Data_Wrap_Struct((klass), 0, OCSP_BASICRESP_free, (res)); \
 } while (0)
 #define GetOCSPBasicRes(obj, res) do { \
-    TypedData_Get_Struct((obj), OCSP_BASICRESP, &ossl_ocsp_basicresp_type, (res)); \
+    Data_Get_Struct((obj), OCSP_BASICRESP, (res)); \
     if(!(res)) ossl_raise(rb_eRuntimeError, "Response wasn't initialized!"); \
 } while (0)
 #define SafeGetOCSPBasicRes(obj, res) do { \
@@ -57,29 +52,12 @@
     GetOCSPBasicRes((obj), (res)); \
 } while (0)
 
-#define NewOCSPSingleRes(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_ocsp_singleresp_type, 0)
-#define SetOCSPSingleRes(obj, res) do { \
-    if(!(res)) ossl_raise(rb_eRuntimeError, "SingleResponse wasn't initialized!"); \
-    RTYPEDDATA_DATA(obj) = (res); \
-} while (0)
-#define GetOCSPSingleRes(obj, res) do { \
-    TypedData_Get_Struct((obj), OCSP_SINGLERESP, &ossl_ocsp_singleresp_type, (res)); \
-    if(!(res)) ossl_raise(rb_eRuntimeError, "SingleResponse wasn't initialized!"); \
-} while (0)
-#define SafeGetOCSPSingleRes(obj, res) do { \
-    OSSL_Check_Kind((obj), cOCSPSingleRes); \
-    GetOCSPSingleRes((obj), (res)); \
-} while (0)
-
-#define NewOCSPCertId(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_ocsp_certid_type, 0)
-#define SetOCSPCertId(obj, cid) do { \
+#define WrapOCSPCertId(klass, obj, cid) do { \
     if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
-    RTYPEDDATA_DATA(obj) = (cid); \
+    (obj) = Data_Wrap_Struct((klass), 0, OCSP_CERTID_free, (cid)); \
 } while (0)
 #define GetOCSPCertId(obj, cid) do { \
-    TypedData_Get_Struct((obj), OCSP_CERTID, &ossl_ocsp_certid_type, (cid)); \
+    Data_Get_Struct((obj), OCSP_CERTID, (cid)); \
     if(!(cid)) ossl_raise(rb_eRuntimeError, "Cert ID wasn't initialized!"); \
 } while (0)
 #define SafeGetOCSPCertId(obj, cid) do { \
@@ -92,87 +70,16 @@ VALUE eOCSPError;
 VALUE cOCSPReq;
 VALUE cOCSPRes;
 VALUE cOCSPBasicRes;
-VALUE cOCSPSingleRes;
 VALUE cOCSPCertId;
 
-static void
-ossl_ocsp_request_free(void *ptr)
-{
-    OCSP_REQUEST_free(ptr);
-}
-
-static const rb_data_type_t ossl_ocsp_request_type = {
-    "OpenSSL/OCSP/REQUEST",
-    {
-	0, ossl_ocsp_request_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void
-ossl_ocsp_response_free(void *ptr)
-{
-    OCSP_RESPONSE_free(ptr);
-}
-
-static const rb_data_type_t ossl_ocsp_response_type = {
-    "OpenSSL/OCSP/RESPONSE",
-    {
-	0, ossl_ocsp_response_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void
-ossl_ocsp_basicresp_free(void *ptr)
-{
-    OCSP_BASICRESP_free(ptr);
-}
-
-static const rb_data_type_t ossl_ocsp_basicresp_type = {
-    "OpenSSL/OCSP/BASICRESP",
-    {
-	0, ossl_ocsp_basicresp_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void
-ossl_ocsp_singleresp_free(void *ptr)
-{
-    OCSP_SINGLERESP_free(ptr);
-}
-
-static const rb_data_type_t ossl_ocsp_singleresp_type = {
-    "OpenSSL/OCSP/SINGLERESP",
-    {
-	0, ossl_ocsp_singleresp_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void
-ossl_ocsp_certid_free(void *ptr)
-{
-    OCSP_CERTID_free(ptr);
-}
-
-static const rb_data_type_t ossl_ocsp_certid_type = {
-    "OpenSSL/OCSP/CERTID",
-    {
-	0, ossl_ocsp_certid_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  */
 static VALUE
 ossl_ocspcertid_new(OCSP_CERTID *cid)
 {
-    VALUE obj = NewOCSPCertId(cOCSPCertId);
-    SetOCSPCertId(obj, cid);
+    VALUE obj;
+    WrapOCSPCertId(cOCSPCertId, obj, cid);
     return obj;
 }
 
@@ -185,33 +92,13 @@ ossl_ocspreq_alloc(VALUE klass)
     OCSP_REQUEST *req;
     VALUE obj;
 
-    obj = NewOCSPReq(klass);
     if (!(req = OCSP_REQUEST_new()))
 	ossl_raise(eOCSPError, NULL);
-    SetOCSPReq(obj, req);
+    WrapOCSPReq(klass, obj, req);
 
     return obj;
 }
 
-static VALUE
-ossl_ocspreq_initialize_copy(VALUE self, VALUE other)
-{
-    OCSP_REQUEST *req, *req_old, *req_new;
-
-    rb_check_frozen(self);
-    GetOCSPReq(self, req_old);
-    SafeGetOCSPReq(other, req);
-
-    req_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_REQUEST), req);
-    if (!req_new)
-	ossl_raise(eOCSPError, "ASN1_item_dup");
-
-    SetOCSPReq(self, req_new);
-    OCSP_REQUEST_free(req_old);
-
-    return self;
-}
-
 /*
  * call-seq:
  *   OpenSSL::OCSP::Request.new              -> request
@@ -225,20 +112,19 @@ static VALUE
 ossl_ocspreq_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
-    OCSP_REQUEST *req, *req_new;
     const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
-	GetOCSPReq(self, req);
+	OCSP_REQUEST *req = DATA_PTR(self), *x;
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
-	p = (unsigned char *)RSTRING_PTR(arg);
-	req_new = d2i_OCSP_REQUEST(NULL, &p, RSTRING_LEN(arg));
-	if (!req_new)
-	    ossl_raise(eOCSPError, "d2i_OCSP_REQUEST");
-	SetOCSPReq(self, req_new);
-	OCSP_REQUEST_free(req);
+	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");
+	}
     }
 
     return self;
@@ -321,17 +207,12 @@ static VALUE
 ossl_ocspreq_add_certid(VALUE self, VALUE certid)
 {
     OCSP_REQUEST *req;
-    OCSP_CERTID *id, *id_new;
+    OCSP_CERTID *id;
 
     GetOCSPReq(self, req);
     GetOCSPCertId(certid, id);
-
-    if (!(id_new = OCSP_CERTID_dup(id)))
-	ossl_raise(eOCSPError, "OCSP_CERTID_dup");
-    if (!OCSP_request_add0_id(req, id_new)) {
-	OCSP_CERTID_free(id_new);
-	ossl_raise(eOCSPError, "OCSP_request_add0_id");
-    }
+    if(!OCSP_request_add0_id(req, OCSP_CERTID_dup(id)))
+	ossl_raise(eOCSPError, NULL);
 
     return self;
 }
@@ -357,10 +238,9 @@ ossl_ocspreq_get_certid(VALUE self)
     ary = (count > 0) ? rb_ary_new() : Qnil;
     for(i = 0; i < count; i++){
 	one = OCSP_request_onereq_get0(req, i);
-	tmp = NewOCSPCertId(cOCSPCertId);
 	if(!(id = OCSP_CERTID_dup(OCSP_onereq_get0_id(one))))
 	    ossl_raise(eOCSPError, NULL);
-	SetOCSPCertId(tmp, id);
+	WrapOCSPCertId(cOCSPCertId, tmp, id);
 	rb_ary_push(ary, tmp);
     }
 
@@ -369,61 +249,49 @@ ossl_ocspreq_get_certid(VALUE self)
 
 /*
  * call-seq:
- *   request.sign(cert, key, certs = nil, flags = 0, digest = nil) -> self
+ *   request.sign(signer_cert, signer_key)                      -> self
+ *   request.sign(signer_cert, signer_key, certificates)        -> self
+ *   request.sign(signer_cert, signer_key, certificates, flags) -> self
  *
- * Signs this OCSP request using +cert+, +key+ and optional +digest+. If
- * +digest+ is not specified, SHA-1 is used. +certs+ is an optional Array of
- * additional certificates which are included in the request in addition to
- * the signer certificate. Note that if +certs+ is nil or not given, flag
- * OpenSSL::OCSP::NOCERTS is enabled. Pass an empty array to include only the
- * signer certificate.
- *
- * +flags+ can be a bitwise OR of the following constants:
- *
- * OpenSSL::OCSP::NOCERTS::
- *   Don't include any certificates in the request. +certs+ will be ignored.
+ * Signs this OCSP request using +signer_cert+ and +signer_key+.
+ * +certificates+ is an optional Array of certificates that may be included in
+ * the request.
  */
+
 static VALUE
 ossl_ocspreq_sign(int argc, VALUE *argv, VALUE self)
 {
-    VALUE signer_cert, signer_key, certs, flags, digest;
+    VALUE signer_cert, signer_key, certs, flags;
     OCSP_REQUEST *req;
     X509 *signer;
     EVP_PKEY *key;
-    STACK_OF(X509) *x509s = NULL;
-    unsigned long flg = 0;
-    const EVP_MD *md;
+    STACK_OF(X509) *x509s;
+    unsigned long flg;
     int ret;
 
-    rb_scan_args(argc, argv, "23", &signer_cert, &signer_key, &certs, &flags, &digest);
-    GetOCSPReq(self, req);
+    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
     signer = GetX509CertPtr(signer_cert);
     key = GetPrivPKeyPtr(signer_key);
-    if (!NIL_P(flags))
-	flg = NUM2INT(flags);
-    if (NIL_P(digest))
-	md = EVP_sha1();
-    else
-	md = GetDigestPtr(digest);
-    if (NIL_P(certs))
-	flg |= OCSP_NOCERTS;
-    else
-	x509s = ossl_x509_ary2sk(certs);
-
-    ret = OCSP_request_sign(req, signer, key, md, x509s, flg);
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    if(NIL_P(certs)){
+	x509s = sk_X509_new_null();
+	flags |= OCSP_NOCERTS;
+    }
+    else x509s = ossl_x509_ary2sk(certs);
+    GetOCSPReq(self, req);
+    ret = OCSP_request_sign(req, signer, key, EVP_sha1(), x509s, flg);
     sk_X509_pop_free(x509s, X509_free);
-    if (!ret) ossl_raise(eOCSPError, NULL);
+    if(!ret) ossl_raise(eOCSPError, NULL);
 
     return self;
 }
 
 /*
  * call-seq:
- *   request.verify(certificates, store, flags = 0) -> true or false
+ *   request.verify(certificates, store)        -> true or false
+ *   request.verify(certificates, store, flags) -> true or false
  *
- * Verifies this request using the given +certificates+ and +store+.
- * +certificates+ is an array of OpenSSL::X509::Certificate, +store+ is an
- * OpenSSL::X509::Store.
+ * Verifies this request using the given +certificates+ and X509 +store+.
  */
 
 static VALUE
@@ -436,16 +304,15 @@ ossl_ocspreq_verify(int argc, VALUE *argv, VALUE self)
     int flg, result;
 
     rb_scan_args(argc, argv, "21", &certs, &store, &flags);
-    GetOCSPReq(self, req);
     x509st = GetX509StorePtr(store);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
+    GetOCSPReq(self, req);
     result = OCSP_request_verify(req, x509s, x509st, flg);
     sk_X509_pop_free(x509s, X509_free);
-    if (result <= 0)
-	ossl_clear_error();
+    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
 
-    return result > 0 ? Qtrue : Qfalse;
+    return result ? Qtrue : Qfalse;
 }
 
 /*
@@ -492,10 +359,9 @@ ossl_ocspres_s_create(VALUE klass, VALUE status, VALUE basic_resp)
 
     if(NIL_P(basic_resp)) bs = NULL;
     else GetOCSPBasicRes(basic_resp, bs); /* NO NEED TO DUP */
-    obj = NewOCSPRes(klass);
     if(!(res = OCSP_response_create(st, bs)))
 	ossl_raise(eOCSPError, NULL);
-    SetOCSPRes(obj, res);
+    WrapOCSPRes(klass, obj, res);
 
     return obj;
 }
@@ -506,33 +372,13 @@ ossl_ocspres_alloc(VALUE klass)
     OCSP_RESPONSE *res;
     VALUE obj;
 
-    obj = NewOCSPRes(klass);
     if(!(res = OCSP_RESPONSE_new()))
 	ossl_raise(eOCSPError, NULL);
-    SetOCSPRes(obj, res);
+    WrapOCSPRes(klass, obj, res);
 
     return obj;
 }
 
-static VALUE
-ossl_ocspres_initialize_copy(VALUE self, VALUE other)
-{
-    OCSP_RESPONSE *res, *res_old, *res_new;
-
-    rb_check_frozen(self);
-    GetOCSPRes(self, res_old);
-    SafeGetOCSPRes(other, res);
-
-    res_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_RESPONSE), res);
-    if (!res_new)
-	ossl_raise(eOCSPError, "ASN1_item_dup");
-
-    SetOCSPRes(self, res_new);
-    OCSP_RESPONSE_free(res_old);
-
-    return self;
-}
-
 /*
  * call-seq:
  *   OpenSSL::OCSP::Response.new               -> response
@@ -546,20 +392,19 @@ static VALUE
 ossl_ocspres_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg;
-    OCSP_RESPONSE *res, *res_new;
     const unsigned char *p;
 
     rb_scan_args(argc, argv, "01", &arg);
     if(!NIL_P(arg)){
-	GetOCSPRes(self, res);
+	OCSP_RESPONSE *res = DATA_PTR(self), *x;
 	arg = ossl_to_der_if_possible(arg);
 	StringValue(arg);
 	p = (unsigned char *)RSTRING_PTR(arg);
-	res_new = d2i_OCSP_RESPONSE(NULL, &p, RSTRING_LEN(arg));
-	if (!res_new)
-	    ossl_raise(eOCSPError, "d2i_OCSP_RESPONSE");
-	SetOCSPRes(self, res_new);
-	OCSP_RESPONSE_free(res);
+	x = d2i_OCSP_RESPONSE(&res, &p, RSTRING_LEN(arg));
+	DATA_PTR(self) = res;
+	if(!x){
+	    ossl_raise(eOCSPError, "cannot load DER encoded response");
+	}
     }
 
     return self;
@@ -618,10 +463,9 @@ ossl_ocspres_get_basic(VALUE self)
     VALUE ret;
 
     GetOCSPRes(self, res);
-    ret = NewOCSPBasicRes(cOCSPBasicRes);
     if(!(bs = OCSP_response_get1_basic(res)))
 	return Qnil;
-    SetOCSPBasicRes(ret, bs);
+    WrapOCSPBasicRes(cOCSPBasicRes, ret, bs);
 
     return ret;
 }
@@ -662,61 +506,23 @@ ossl_ocspbres_alloc(VALUE klass)
     OCSP_BASICRESP *bs;
     VALUE obj;
 
-    obj = NewOCSPBasicRes(klass);
     if(!(bs = OCSP_BASICRESP_new()))
 	ossl_raise(eOCSPError, NULL);
-    SetOCSPBasicRes(obj, bs);
+    WrapOCSPBasicRes(klass, obj, bs);
 
     return obj;
 }
 
-static VALUE
-ossl_ocspbres_initialize_copy(VALUE self, VALUE other)
-{
-    OCSP_BASICRESP *bs, *bs_old, *bs_new;
-
-    rb_check_frozen(self);
-    GetOCSPBasicRes(self, bs_old);
-    SafeGetOCSPBasicRes(other, bs);
-
-    bs_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_BASICRESP), bs);
-    if (!bs_new)
-	ossl_raise(eOCSPError, "ASN1_item_dup");
-
-    SetOCSPBasicRes(self, bs_new);
-    OCSP_BASICRESP_free(bs_old);
-
-    return self;
-}
-
 /*
  * call-seq:
- *   OpenSSL::OCSP::BasicResponse.new(der_string = nil) -> basic_response
+ *   OpenSSL::OCSP::BasicResponse.new(*) -> basic_response
  *
- * Creates a new BasicResponse. If +der_string+ is given, decodes +der_string+
- * as DER.
+ * Creates a new BasicResponse and ignores all arguments.
  */
 
 static VALUE
 ossl_ocspbres_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE arg;
-    OCSP_BASICRESP *res, *res_new;
-    const unsigned char *p;
-
-    rb_scan_args(argc, argv, "01", &arg);
-    if (!NIL_P(arg)) {
-	GetOCSPBasicRes(self, res);
-	arg = ossl_to_der_if_possible(arg);
-	StringValue(arg);
-	p = (unsigned char *)RSTRING_PTR(arg);
-	res_new = d2i_OCSP_BASICRESP(NULL, &p, RSTRING_LEN(arg));
-	if (!res_new)
-	    ossl_raise(eOCSPError, "d2i_OCSP_BASICRESP");
-	SetOCSPBasicRes(self, res_new);
-	OCSP_BASICRESP_free(res);
-    }
-
     return self;
 }
 
@@ -772,49 +578,22 @@ ossl_ocspbres_add_nonce(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-add_status_convert_time(VALUE obj)
-{
-    ASN1_TIME *time;
-
-    if (RB_INTEGER_TYPE_P(obj))
-	time = X509_gmtime_adj(NULL, NUM2INT(obj));
-    else
-	time = ossl_x509_time_adjust(NULL, obj);
-
-    if (!time)
-	ossl_raise(eOCSPError, NULL);
-
-    return (VALUE)time;
-}
-
 /*
  * call-seq:
  *   basic_response.add_status(certificate_id, status, reason, revocation_time, this_update, next_update, extensions) -> basic_response
  *
- * Adds a certificate status for +certificate_id+. +status+ is the status, and
- * must be one of these:
- *
- * - OpenSSL::OCSP::V_CERTSTATUS_GOOD
- * - OpenSSL::OCSP::V_CERTSTATUS_REVOKED
- * - OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN
+ * Adds a validation +status+ (0 for revoked, 1 for success) to this
+ * response for +certificate_id+.  +reason+ describes the reason for the
+ * revocation, if any.
  *
- * +reason+ and +revocation_time+ can be given only when +status+ is
- * OpenSSL::OCSP::V_CERTSTATUS_REVOKED. +reason+ describes the reason for the
- * revocation, and must be one of OpenSSL::OCSP::REVOKED_STATUS_* constants.
- * +revocation_time+ is the time when the certificate is revoked.
+ * The +revocation_time+, +this_update+ and +next_update+ are times for the
+ * certificate's revocation time, the time of this status and the next update
+ * time for a new status, respectively.
  *
- * +this_update+ and +next_update+ indicate the time at which ths status is
- * verified to be correct and the time at or before which newer information
- * will be available, respectively. +next_update+ is optional.
- *
- * +extensions+ is an Array of OpenSSL::X509::Extension to be included in the
- * SingleResponse. This is also optional.
- *
- * Note that the times, +revocation_time+, +this_update+ and +next_update+
- * can be specified in either of Integer or Time object. If they are Integer, it
- * is treated as the relative seconds from the current time.
+ * +extensions+ may be an Array of OpenSSL::X509::Extension that will
+ * be added to this response or nil.
  */
+
 static VALUE
 ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 			 VALUE reason, VALUE revtime,
@@ -823,37 +602,36 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
     OCSP_BASICRESP *bs;
     OCSP_SINGLERESP *single;
     OCSP_CERTID *id;
-    ASN1_TIME *ths = NULL, *nxt = NULL, *rev = NULL;
-    int st, rsn = 0, error = 0, rstatus = 0;
-    long i;
+    int st, rsn;
+    ASN1_TIME *ths, *nxt, *rev;
+    int error, i, rstatus = 0;
     VALUE tmp;
 
-    GetOCSPBasicRes(self, bs);
-    SafeGetOCSPCertId(cid, id);
     st = NUM2INT(status);
-    if (!NIL_P(ext)) { /* All ext's members must be X509::Extension */
-	ext = rb_check_array_type(ext);
+    rsn = NIL_P(status) ? 0 : NUM2INT(reason);
+    if(!NIL_P(ext)){
+	/* All ary's members should be X509Extension */
+	Check_Type(ext, T_ARRAY);
 	for (i = 0; i < RARRAY_LEN(ext); i++)
-	    OSSL_Check_Kind(RARRAY_AREF(ext, i), cX509Ext);
+	    OSSL_Check_Kind(RARRAY_PTR(ext)[i], cX509Ext);
     }
 
-    if (st == V_OCSP_CERTSTATUS_REVOKED) {
-	rsn = NUM2INT(reason);
-	tmp = rb_protect(add_status_convert_time, revtime, &rstatus);
-	if (rstatus) goto err;
-	rev = (ASN1_TIME *)tmp;
-    }
-
-    tmp = rb_protect(add_status_convert_time, thisupd, &rstatus);
-    if (rstatus) goto err;
-    ths = (ASN1_TIME *)tmp;
-
-    if (!NIL_P(nextupd)) {
-	tmp = rb_protect(add_status_convert_time, nextupd, &rstatus);
-	if (rstatus) goto err;
-	nxt = (ASN1_TIME *)tmp;
+    error = 0;
+    ths = nxt = rev = NULL;
+    if(!NIL_P(revtime)){
+	tmp = rb_protect(rb_Integer, revtime, &rstatus);
+	if(rstatus) goto err;
+	rev = X509_gmtime_adj(NULL, NUM2INT(tmp));
     }
+    tmp = rb_protect(rb_Integer, thisupd, &rstatus);
+    if(rstatus) goto err;
+    ths = X509_gmtime_adj(NULL, NUM2INT(tmp));
+    tmp = rb_protect(rb_Integer, nextupd, &rstatus);
+    if(rstatus) goto err;
+    nxt = X509_gmtime_adj(NULL, NUM2INT(tmp));
 
+    GetOCSPBasicRes(self, bs);
+    SafeGetOCSPCertId(cid, id);
     if(!(single = OCSP_basic_add1_status(bs, id, st, rsn, rev, ths, nxt))){
 	error = 1;
 	goto err;
@@ -861,13 +639,16 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
 
     if(!NIL_P(ext)){
 	X509_EXTENSION *x509ext;
-
+	sk_X509_EXTENSION_pop_free(single->singleExtensions, X509_EXTENSION_free);
+	single->singleExtensions = NULL;
 	for(i = 0; i < RARRAY_LEN(ext); i++){
-	    x509ext = GetX509ExtPtr(RARRAY_AREF(ext, i));
+	    x509ext = DupX509ExtPtr(RARRAY_PTR(ext)[i]);
 	    if(!OCSP_SINGLERESP_add_ext(single, x509ext, -1)){
+		X509_EXTENSION_free(x509ext);
 		error = 1;
 		goto err;
 	    }
+	    X509_EXTENSION_free(x509ext);
 	}
     }
 
@@ -886,13 +667,11 @@ ossl_ocspbres_add_status(VALUE self, VALUE cid, VALUE status,
  *   basic_response.status -> statuses
  *
  * Returns an Array of statuses for this response.  Each status contains a
- * CertificateId, the status (0 for good, 1 for revoked, 2 for unknown), the
- * reason for the status, the revocation time, the time of this update, the time
- * for the next update and a list of OpenSSL::X509::Extensions.
- *
- * This should be superseded by BasicResponse#responses and #find_response that
- * return SingleResponse.
+ * CertificateId, the status (0 for success, 1 for revoked), the reason for
+ * the status, the revocation time, the time of this update, the time for the
+ * next update and a list of OpenSSL::X509::Extensions.
  */
+
 static VALUE
 ossl_ocspbres_get_status(VALUE self)
 {
@@ -916,7 +695,7 @@ ossl_ocspbres_get_status(VALUE self)
 	status = OCSP_single_get0_status(single, &reason, &revtime,
 					 &thisupd, &nextupd);
 	if(status < 0) continue;
-	if(!(cid = OCSP_CERTID_dup((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(single)))) /* FIXME */
+	if(!(cid = OCSP_CERTID_dup(single->certId)))
 	    ossl_raise(eOCSPError, NULL);
 	ary = rb_ary_new();
 	rb_ary_push(ary, ossl_ocspcertid_new(cid));
@@ -938,513 +717,76 @@ ossl_ocspbres_get_status(VALUE self)
     return ret;
 }
 
-static VALUE ossl_ocspsres_new(OCSP_SINGLERESP *);
-
-/*
- * call-seq:
- *   basic_response.responses -> Array of SingleResponse
- *
- * Returns an Array of SingleResponse for this BasicResponse.
- */
-
-static VALUE
-ossl_ocspbres_get_responses(VALUE self)
-{
-    OCSP_BASICRESP *bs;
-    VALUE ret;
-    int count, i;
-
-    GetOCSPBasicRes(self, bs);
-    count = OCSP_resp_count(bs);
-    ret = rb_ary_new2(count);
-
-    for (i = 0; i < count; i++) {
-	OCSP_SINGLERESP *sres, *sres_new;
-
-	sres = OCSP_resp_get0(bs, i);
-	sres_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_SINGLERESP), sres);
-	if (!sres_new)
-	    ossl_raise(eOCSPError, "ASN1_item_dup");
-
-	rb_ary_push(ret, ossl_ocspsres_new(sres_new));
-    }
-
-    return ret;
-}
-
-
-/*
- * call-seq:
- *   basic_response.find_response(certificate_id) -> SingleResponse | nil
- *
- * Returns a SingleResponse whose CertId matches with +certificate_id+, or nil
- * if this BasicResponse does not contain it.
- */
-static VALUE
-ossl_ocspbres_find_response(VALUE self, VALUE target)
-{
-    OCSP_BASICRESP *bs;
-    OCSP_SINGLERESP *sres, *sres_new;
-    OCSP_CERTID *id;
-    int n;
-
-    SafeGetOCSPCertId(target, id);
-    GetOCSPBasicRes(self, bs);
-
-    if ((n = OCSP_resp_find(bs, id, -1)) == -1)
-	return Qnil;
-
-    sres = OCSP_resp_get0(bs, n);
-    sres_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_SINGLERESP), sres);
-    if (!sres_new)
-	ossl_raise(eOCSPError, "ASN1_item_dup");
-
-    return ossl_ocspsres_new(sres_new);
-}
-
 /*
  * call-seq:
- *   basic_response.sign(cert, key, certs = nil, flags = 0, digest = nil) -> self
- *
- * Signs this OCSP response using the +cert+, +key+ and optional +digest+. This
- * behaves in the similar way as OpenSSL::OCSP::Request#sign.
+ *   basic_response.sign(signer_cert, signer_key) -> self
+ *   basic_response.sign(signer_cert, signer_key, certificates) -> self
+ *   basic_response.sign(signer_cert, signer_key, certificates, flags) -> self
  *
- * +flags+ can include:
- * OpenSSL::OCSP::NOCERTS::    don't include certificates
- * OpenSSL::OCSP::NOTIME::     don't set producedAt
- * OpenSSL::OCSP::RESPID_KEY:: use signer's public key hash as responderID
+ * Signs this response using the +signer_cert+ and +signer_key+.  Additional
+ * +certificates+ may be added to the signature along with a set of +flags+.
  */
 
 static VALUE
 ossl_ocspbres_sign(int argc, VALUE *argv, VALUE self)
 {
-    VALUE signer_cert, signer_key, certs, flags, digest;
+    VALUE signer_cert, signer_key, certs, flags;
     OCSP_BASICRESP *bs;
     X509 *signer;
     EVP_PKEY *key;
-    STACK_OF(X509) *x509s = NULL;
-    unsigned long flg = 0;
-    const EVP_MD *md;
+    STACK_OF(X509) *x509s;
+    unsigned long flg;
     int ret;
 
-    rb_scan_args(argc, argv, "23", &signer_cert, &signer_key, &certs, &flags, &digest);
-    GetOCSPBasicRes(self, bs);
+    rb_scan_args(argc, argv, "22", &signer_cert, &signer_key, &certs, &flags);
     signer = GetX509CertPtr(signer_cert);
     key = GetPrivPKeyPtr(signer_key);
-    if (!NIL_P(flags))
-	flg = NUM2INT(flags);
-    if (NIL_P(digest))
-	md = EVP_sha1();
-    else
-	md = GetDigestPtr(digest);
-    if (NIL_P(certs))
+    flg = NIL_P(flags) ? 0 : NUM2INT(flags);
+    if(NIL_P(certs)){
+	x509s = sk_X509_new_null();
 	flg |= OCSP_NOCERTS;
-    else
+    }
+    else{
 	x509s = ossl_x509_ary2sk(certs);
-
-    ret = OCSP_basic_sign(bs, signer, key, md, x509s, flg);
+    }
+    GetOCSPBasicRes(self, bs);
+    ret = OCSP_basic_sign(bs, signer, key, EVP_sha1(), x509s, flg);
     sk_X509_pop_free(x509s, X509_free);
-    if (!ret) ossl_raise(eOCSPError, NULL);
+    if(!ret) ossl_raise(eOCSPError, NULL);
 
     return self;
 }
 
 /*
  * call-seq:
- *   basic_response.verify(certificates, store, flags = 0) -> true or false
+ *   basic_response.verify(certificates, store) -> true or false
+ *   basic_response.verify(certificates, store, flags) -> true or false
  *
- * Verifies the signature of the response using the given +certificates+ and
- * +store+. This works in the similar way as OpenSSL::OCSP::Request#verify.
+ * Verifies the signature of the response using the given +certificates+,
+ * +store+ and +flags+.
  */
 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);
-    GetOCSPBasicRes(self, bs);
     x509st = GetX509StorePtr(store);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     x509s = ossl_x509_ary2sk(certs);
-#if (OPENSSL_VERSION_NUMBER < 0x1000202fL) || defined(LIBRESSL_VERSION_NUMBER)
-    /*
-     * OpenSSL had a bug that it doesn't use the certificates in x509s for
-     * verifying the chain. This can be a problem when the response is signed by
-     * a certificate issued by an intermediate CA.
-     *
-     *       root_ca
-     *         |
-     *   intermediate_ca
-     *         |-------------|
-     *     end_entity    ocsp_signer
-     *
-     * When the certificate hierarchy is like this, and the response contains
-     * only ocsp_signer certificate, the following code wrongly fails.
-     *
-     *   store = OpenSSL::X509::Store.new; store.add_cert(root_ca)
-     *   basic_response.verify([intermediate_ca], store)
-     *
-     * So add the certificates in x509s to the embedded certificates list first.
-     *
-     * This is fixed in OpenSSL 0.9.8zg, 1.0.0s, 1.0.1n, 1.0.2b. But it still
-     * exists in LibreSSL 2.1.10, 2.2.9, 2.3.6, 2.4.1.
-     */
-    if (!(flg & (OCSP_NOCHAIN | OCSP_NOVERIFY)) &&
-	sk_X509_num(x509s) && sk_X509_num(bs->certs)) {
-	int i;
-
-	bs = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_BASICRESP), bs);
-	if (!bs) {
-	    sk_X509_pop_free(x509s, X509_free);
-	    ossl_raise(eOCSPError, "ASN1_item_dup");
-	}
-
-	for (i = 0; i < sk_X509_num(x509s); i++) {
-	    if (!OCSP_basic_add1_cert(bs, sk_X509_value(x509s, i))) {
-		sk_X509_pop_free(x509s, X509_free);
-		OCSP_BASICRESP_free(bs);
-		ossl_raise(eOCSPError, "OCSP_basic_add1_cert");
-	    }
-	}
-	result = OCSP_basic_verify(bs, x509s, x509st, flg);
-	OCSP_BASICRESP_free(bs);
-    }
-    else {
-	result = OCSP_basic_verify(bs, x509s, x509st, flg);
-    }
-#else
-    result = OCSP_basic_verify(bs, x509s, x509st, flg);
-#endif
+    GetOCSPBasicRes(self, bs);
+    result = OCSP_basic_verify(bs, x509s, x509st, flg) > 0 ? Qtrue : Qfalse;
     sk_X509_pop_free(x509s, X509_free);
-    if (result <= 0)
-	ossl_clear_error();
-
-    return result > 0 ? Qtrue : Qfalse;
-}
-
-/*
- * call-seq:
- *   basic_response.to_der -> String
- *
- * Encodes this basic response into a DER-encoded string.
- */
-static VALUE
-ossl_ocspbres_to_der(VALUE self)
-{
-    OCSP_BASICRESP *res;
-    VALUE str;
-    long len;
-    unsigned char *p;
+    if(!result) rb_warn("%s", ERR_error_string(ERR_peek_error(), NULL));
 
-    GetOCSPBasicRes(self, res);
-    if ((len = i2d_OCSP_BASICRESP(res, NULL)) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
-    if (i2d_OCSP_BASICRESP(res, &p) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-/*
- * OCSP::SingleResponse
- */
-static VALUE
-ossl_ocspsres_new(OCSP_SINGLERESP *sres)
-{
-    VALUE obj;
-
-    obj = NewOCSPSingleRes(cOCSPSingleRes);
-    SetOCSPSingleRes(obj, sres);
-
-    return obj;
-}
-
-static VALUE
-ossl_ocspsres_alloc(VALUE klass)
-{
-    OCSP_SINGLERESP *sres;
-    VALUE obj;
-
-    obj = NewOCSPSingleRes(klass);
-    if (!(sres = OCSP_SINGLERESP_new()))
-	ossl_raise(eOCSPError, NULL);
-    SetOCSPSingleRes(obj, sres);
-
-    return obj;
+    return result;
 }
 
 /*
- * call-seq:
- *   OpenSSL::OCSP::SingleResponse.new(der_string) -> SingleResponse
- *
- * Creates a new SingleResponse from +der_string+.
- */
-static VALUE
-ossl_ocspsres_initialize(VALUE self, VALUE arg)
-{
-    OCSP_SINGLERESP *res, *res_new;
-    const unsigned char *p;
-
-    arg = ossl_to_der_if_possible(arg);
-    StringValue(arg);
-    GetOCSPSingleRes(self, res);
-
-    p = (unsigned char*)RSTRING_PTR(arg);
-    res_new = d2i_OCSP_SINGLERESP(NULL, &p, RSTRING_LEN(arg));
-    if (!res_new)
-	ossl_raise(eOCSPError, "d2i_OCSP_SINGLERESP");
-    SetOCSPSingleRes(self, res_new);
-    OCSP_SINGLERESP_free(res);
-
-    return self;
-}
-
-static VALUE
-ossl_ocspsres_initialize_copy(VALUE self, VALUE other)
-{
-    OCSP_SINGLERESP *sres, *sres_old, *sres_new;
-
-    rb_check_frozen(self);
-    GetOCSPSingleRes(self, sres_old);
-    SafeGetOCSPSingleRes(other, sres);
-
-    sres_new = ASN1_item_dup(ASN1_ITEM_rptr(OCSP_SINGLERESP), sres);
-    if (!sres_new)
-	ossl_raise(eOCSPError, "ASN1_item_dup");
-
-    SetOCSPSingleRes(self, sres_new);
-    OCSP_SINGLERESP_free(sres_old);
-
-    return self;
-}
-
-/*
- * call-seq:
- *   single_response.check_validity(nsec = 0, maxsec = -1) -> true | false
- *
- * Checks the validity of thisUpdate and nextUpdate fields of this
- * SingleResponse. This checks the current time is within the range thisUpdate
- * to nextUpdate.
- *
- * It is possible that the OCSP request takes a few seconds or the time is not
- * accurate. To avoid rejecting a valid response, this method allows the times
- * to be within +nsec+ of the current time.
- *
- * Some responders don't set the nextUpdate field. This may cause a very old
- * response to be considered valid. The +maxsec+ parameter can be used to limit
- * the age of responses.
- */
-static VALUE
-ossl_ocspsres_check_validity(int argc, VALUE *argv, VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    ASN1_GENERALIZEDTIME *this_update, *next_update;
-    VALUE nsec_v, maxsec_v;
-    int nsec, maxsec, status, ret;
-
-    rb_scan_args(argc, argv, "02", &nsec_v, &maxsec_v);
-    nsec = NIL_P(nsec_v) ? 0 : NUM2INT(nsec_v);
-    maxsec = NIL_P(maxsec_v) ? -1 : NUM2INT(maxsec_v);
-
-    GetOCSPSingleRes(self, sres);
-    status = OCSP_single_get0_status(sres, NULL, NULL, &this_update, &next_update);
-    if (status < 0)
-	ossl_raise(eOCSPError, "OCSP_single_get0_status");
-
-    ret = OCSP_check_validity(this_update, next_update, nsec, maxsec);
-
-    if (ret)
-	return Qtrue;
-    else {
-	ossl_clear_error();
-	return Qfalse;
-    }
-}
-
-/*
- * call-seq:
- *   single_response.certid -> CertificateId
- *
- * Returns the CertificateId for which this SingleResponse is.
- */
-static VALUE
-ossl_ocspsres_get_certid(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    OCSP_CERTID *id;
-
-    GetOCSPSingleRes(self, sres);
-    id = OCSP_CERTID_dup((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sres)); /* FIXME */
-
-    return ossl_ocspcertid_new(id);
-}
-
-/*
- * call-seq:
- *   single_response.cert_status -> Integer
- *
- * Returns the status of the certificate identified by the certid.
- * The return value may be one of these constant:
- *
- * - V_CERTSTATUS_GOOD
- * - V_CERTSTATUS_REVOKED
- * - V_CERTSTATUS_UNKNOWN
- *
- * When the status is V_CERTSTATUS_REVOKED, the time at which the certificate
- * was revoked can be retrieved by #revocation_time.
- */
-static VALUE
-ossl_ocspsres_get_cert_status(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    int status;
-
-    GetOCSPSingleRes(self, sres);
-    status = OCSP_single_get0_status(sres, NULL, NULL, NULL, NULL);
-    if (status < 0)
-	ossl_raise(eOCSPError, "OCSP_single_get0_status");
-
-    return INT2NUM(status);
-}
-
-/*
- * call-seq:
- *   single_response.this_update -> Time
- */
-static VALUE
-ossl_ocspsres_get_this_update(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    int status;
-    ASN1_GENERALIZEDTIME *time;
-
-    GetOCSPSingleRes(self, sres);
-    status = OCSP_single_get0_status(sres, NULL, NULL, &time, NULL);
-    if (status < 0)
-	ossl_raise(eOCSPError, "OCSP_single_get0_status");
-
-    return asn1time_to_time(time); /* will handle NULL */
-}
-
-/*
- * call-seq:
- *   single_response.next_update -> Time | nil
- */
-static VALUE
-ossl_ocspsres_get_next_update(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    int status;
-    ASN1_GENERALIZEDTIME *time;
-
-    GetOCSPSingleRes(self, sres);
-    status = OCSP_single_get0_status(sres, NULL, NULL, NULL, &time);
-    if (status < 0)
-	ossl_raise(eOCSPError, "OCSP_single_get0_status");
-
-    return asn1time_to_time(time);
-}
-
-/*
- * call-seq:
- *   single_response.revocation_time -> Time | nil
- */
-static VALUE
-ossl_ocspsres_get_revocation_time(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    int status;
-    ASN1_GENERALIZEDTIME *time;
-
-    GetOCSPSingleRes(self, sres);
-    status = OCSP_single_get0_status(sres, NULL, &time, NULL, NULL);
-    if (status < 0)
-	ossl_raise(eOCSPError, "OCSP_single_get0_status");
-    if (status != V_OCSP_CERTSTATUS_REVOKED)
-	ossl_raise(eOCSPError, "certificate is not revoked");
-
-    return asn1time_to_time(time);
-}
-
-/*
- * call-seq:
- *   single_response.revocation_reason -> Integer | nil
- */
-static VALUE
-ossl_ocspsres_get_revocation_reason(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    int status, reason;
-
-    GetOCSPSingleRes(self, sres);
-    status = OCSP_single_get0_status(sres, &reason, NULL, NULL, NULL);
-    if (status < 0)
-	ossl_raise(eOCSPError, "OCSP_single_get0_status");
-    if (status != V_OCSP_CERTSTATUS_REVOKED)
-	ossl_raise(eOCSPError, "certificate is not revoked");
-
-    return INT2NUM(reason);
-}
-
-/*
- * call-seq:
- *   single_response.extensions -> Array of X509::Extension
- */
-static VALUE
-ossl_ocspsres_get_extensions(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    X509_EXTENSION *ext;
-    int count, i;
-    VALUE ary;
-
-    GetOCSPSingleRes(self, sres);
-
-    count = OCSP_SINGLERESP_get_ext_count(sres);
-    ary = rb_ary_new2(count);
-    for (i = 0; i < count; i++) {
-	ext = OCSP_SINGLERESP_get_ext(sres, i);
-	rb_ary_push(ary, ossl_x509ext_new(ext)); /* will dup */
-    }
-
-    return ary;
-}
-
-/*
- * call-seq:
- *   single_response.to_der -> String
- *
- * Encodes this SingleResponse into a DER-encoded string.
- */
-static VALUE
-ossl_ocspsres_to_der(VALUE self)
-{
-    OCSP_SINGLERESP *sres;
-    VALUE str;
-    long len;
-    unsigned char *p;
-
-    GetOCSPSingleRes(self, sres);
-    if ((len = i2d_OCSP_SINGLERESP(sres, NULL)) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
-    if (i2d_OCSP_SINGLERESP(sres, &p) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    ossl_str_adjust(str, p);
-
-    return str;
-}
-
-
-/*
  * OCSP::CertificateId
  */
 static VALUE
@@ -1453,79 +795,48 @@ ossl_ocspcid_alloc(VALUE klass)
     OCSP_CERTID *id;
     VALUE obj;
 
-    obj = NewOCSPCertId(klass);
     if(!(id = OCSP_CERTID_new()))
 	ossl_raise(eOCSPError, NULL);
-    SetOCSPCertId(obj, id);
+    WrapOCSPCertId(klass, obj, id);
 
     return obj;
 }
 
-static VALUE
-ossl_ocspcid_initialize_copy(VALUE self, VALUE other)
-{
-    OCSP_CERTID *cid, *cid_old, *cid_new;
-
-    rb_check_frozen(self);
-    GetOCSPCertId(self, cid_old);
-    SafeGetOCSPCertId(other, cid);
-
-    cid_new = OCSP_CERTID_dup(cid);
-    if (!cid_new)
-	ossl_raise(eOCSPError, "OCSP_CERTID_dup");
-
-    SetOCSPCertId(self, cid_new);
-    OCSP_CERTID_free(cid_old);
-
-    return self;
-}
-
 /*
  * call-seq:
  *   OpenSSL::OCSP::CertificateId.new(subject, issuer, digest = nil) -> certificate_id
- *   OpenSSL::OCSP::CertificateId.new(der_string)                    -> certificate_id
  *
  * Creates a new OpenSSL::OCSP::CertificateId for the given +subject+ and
  * +issuer+ X509 certificates.  The +digest+ is used to compute the
  * certificate ID and must be an OpenSSL::Digest instance.
- *
- * If only one argument is given, decodes it as DER representation of a
- * certificate ID.
  */
 
 static VALUE
 ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
 {
     OCSP_CERTID *id, *newid;
+    X509 *x509s, *x509i;
     VALUE subject, issuer, digest;
+    const EVP_MD *md;
 
-    GetOCSPCertId(self, id);
-    if (rb_scan_args(argc, argv, "12", &subject, &issuer, &digest) == 1) {
-	VALUE arg;
-	const unsigned char *p;
-
-	arg = ossl_to_der_if_possible(subject);
-	StringValue(arg);
-	p = (unsigned char *)RSTRING_PTR(arg);
-	newid = d2i_OCSP_CERTID(NULL, &p, RSTRING_LEN(arg));
-	if (!newid)
-	    ossl_raise(eOCSPError, "d2i_OCSP_CERTID");
+    if (rb_scan_args(argc, argv, "21", &subject, &issuer, &digest) == 0) {
+	return self;
     }
-    else {
-	X509 *x509s, *x509i;
-	const EVP_MD *md;
 
-	x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
-	x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
-	md = !NIL_P(digest) ? GetDigestPtr(digest) : NULL;
+    x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
+    x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
 
+    if (!NIL_P(digest)) {
+	md = GetDigestPtr(digest);
 	newid = OCSP_cert_to_id(md, x509s, x509i);
-	if (!newid)
-	    ossl_raise(eOCSPError, "OCSP_cert_to_id");
+    } else {
+	newid = OCSP_cert_to_id(NULL, x509s, x509i);
     }
-
-    SetOCSPCertId(self, newid);
+    if(!newid)
+	ossl_raise(eOCSPError, NULL);
+    GetOCSPCertId(self, id);
     OCSP_CERTID_free(id);
+    RDATA(self)->data = newid;
 
     return self;
 }
@@ -1573,130 +884,24 @@ ossl_ocspcid_cmp_issuer(VALUE self, VALUE other)
 
 /*
  * call-seq:
- *   certificate_id.serial -> Integer
- *
- * Returns the serial number of the certificate for which status is being
- * requested.
- */
-static VALUE
-ossl_ocspcid_get_serial(VALUE self)
-{
-    OCSP_CERTID *id;
-    ASN1_INTEGER *serial;
-
-    GetOCSPCertId(self, id);
-    OCSP_id_get0_info(NULL, NULL, NULL, &serial, id);
-
-    return asn1integer_to_num(serial);
-}
-
-/*
- * call-seq:
- *   certificate_id.issuer_name_hash -> String
- *
- * Returns the issuerNameHash of this certificate ID, the hash of the
- * issuer's distinguished name calculated with the hashAlgorithm.
- */
-static VALUE
-ossl_ocspcid_get_issuer_name_hash(VALUE self)
-{
-    OCSP_CERTID *id;
-    ASN1_OCTET_STRING *name_hash;
-    VALUE ret;
-
-    GetOCSPCertId(self, id);
-    OCSP_id_get0_info(&name_hash, NULL, NULL, NULL, id);
-
-    ret = rb_str_new(NULL, name_hash->length * 2);
-    ossl_bin2hex(name_hash->data, RSTRING_PTR(ret), name_hash->length);
-
-    return ret;
-}
-
-/*
- * call-seq:
- *   certificate_id.issuer_key_hash -> String
+ *   certificate_id.get_serial -> Integer
  *
- * Returns the issuerKeyHash of this certificate ID, the hash of the issuer's
- * public key.
+ * Returns the serial number of the issuing certificate.
  */
-static VALUE
-ossl_ocspcid_get_issuer_key_hash(VALUE self)
-{
-    OCSP_CERTID *id;
-    ASN1_OCTET_STRING *key_hash;
-    VALUE ret;
-
-    GetOCSPCertId(self, id);
-    OCSP_id_get0_info(NULL, NULL, &key_hash, NULL, id);
 
-    ret = rb_str_new(NULL, key_hash->length * 2);
-    ossl_bin2hex(key_hash->data, RSTRING_PTR(ret), key_hash->length);
-
-    return ret;
-}
-
-/*
- * call-seq:
- *   certificate_id.hash_algorithm -> String
- *
- * Returns the ln (long name) of the hash algorithm used to generate
- * the issuerNameHash and the issuerKeyHash values.
- */
 static VALUE
-ossl_ocspcid_get_hash_algorithm(VALUE self)
-{
-    OCSP_CERTID *id;
-    ASN1_OBJECT *oid;
-    BIO *out;
-
-    GetOCSPCertId(self, id);
-    OCSP_id_get0_info(NULL, &oid, NULL, NULL, id);
-
-    if (!(out = BIO_new(BIO_s_mem())))
-	ossl_raise(eOCSPError, "BIO_new");
-
-    if (!i2a_ASN1_OBJECT(out, oid)) {
-	BIO_free(out);
-	ossl_raise(eOCSPError, "i2a_ASN1_OBJECT");
-    }
-    return ossl_membio2str(out);
-}
-
-/*
- * call-seq:
- *   certificate_id.to_der -> String
- *
- * Encodes this certificate identifier into a DER-encoded string.
- */
-static VALUE
-ossl_ocspcid_to_der(VALUE self)
+ossl_ocspcid_get_serial(VALUE self)
 {
     OCSP_CERTID *id;
-    VALUE str;
-    long len;
-    unsigned char *p;
 
     GetOCSPCertId(self, id);
-    if ((len = i2d_OCSP_CERTID(id, NULL)) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
-    if (i2d_OCSP_CERTID(id, &p) <= 0)
-	ossl_raise(eOCSPError, NULL);
-    ossl_str_adjust(str, p);
 
-    return str;
+    return asn1integer_to_num(id->serialNumber);
 }
 
 void
-Init_ossl_ocsp(void)
+Init_ossl_ocsp()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-#endif
-
     /*
      * OpenSSL::OCSP implements Online Certificate Status Protocol requests
      * and responses.
@@ -1766,7 +971,7 @@ Init_ossl_ocsp(void)
      *   store = OpenSSL::X509::Store.new
      *   store.set_default_paths
      *
-     *   unless response_basic.verify [], store then
+     *   unless response.verify [], store then
      *     raise 'response is not signed by a trusted certificate'
      *   end
      *
@@ -1782,28 +987,27 @@ Init_ossl_ocsp(void)
      *
      *   p request.check_nonce basic_response #=> value from -1 to 3
      *
-     * Then extract the status information for the certificate from the basic
-     * response.
+     * Then extract the status information from the basic response.  (You can
+     * check multiple certificates in a request, but for this example we only
+     * submitted one.)
+     *
+     *   response_certificate_id, status, reason, revocation_time,
+     *     this_update, next_update, extensions = basic_response.status
      *
-     *   single_response = basic_response.find_response(certificate_id)
+     * Then check the various fields.
      *
-     *   unless single_response
-     *     raise 'basic_response does not have the status for the certificiate'
+     *   unless response_certificate_id == certificate_id then
+     *     raise 'certificate id mismatch'
      *   end
      *
-     * Then check the validity. A status issued in the future must be rejected.
+     *   now = Time.now
      *
-     *   unless single_response.check_validity
-     *     raise 'this_update is in the future or next_update time has passed'
+     *   if this_update > now then
+     *     raise 'update date is in the future'
      *   end
      *
-     *   case single_response.cert_status
-     *   when OpenSSL::OCSP::V_CERTSTATUS_GOOD
-     *     puts 'certificate is still valid'
-     *   when OpenSSL::OCSP::V_CERTSTATUS_REVOKED
-     *     puts "certificate has been revoked at #{single_response.revocation_time}"
-     *   when OpenSSL::OCSP::V_CERTSTATUS_UNKNOWN
-     *     puts 'responder doesn't know about the certificate'
+     *   if now > next_update then
+     *     raise 'next update time has passed'
      *   end
      */
 
@@ -1824,7 +1028,6 @@ Init_ossl_ocsp(void)
 
     cOCSPReq = rb_define_class_under(mOCSP, "Request", rb_cObject);
     rb_define_alloc_func(cOCSPReq, ossl_ocspreq_alloc);
-    rb_define_copy_func(cOCSPReq, ossl_ocspreq_initialize_copy);
     rb_define_method(cOCSPReq, "initialize", ossl_ocspreq_initialize, -1);
     rb_define_method(cOCSPReq, "add_nonce", ossl_ocspreq_add_nonce, -1);
     rb_define_method(cOCSPReq, "check_nonce", ossl_ocspreq_check_nonce, 1);
@@ -1842,7 +1045,6 @@ Init_ossl_ocsp(void)
     cOCSPRes = rb_define_class_under(mOCSP, "Response", rb_cObject);
     rb_define_singleton_method(cOCSPRes, "create", ossl_ocspres_s_create, 2);
     rb_define_alloc_func(cOCSPRes, ossl_ocspres_alloc);
-    rb_define_copy_func(cOCSPRes, ossl_ocspres_initialize_copy);
     rb_define_method(cOCSPRes, "initialize", ossl_ocspres_initialize, -1);
     rb_define_method(cOCSPRes, "status", ossl_ocspres_status, 0);
     rb_define_method(cOCSPRes, "status_string", ossl_ocspres_status_string, 0);
@@ -1857,36 +1059,13 @@ Init_ossl_ocsp(void)
 
     cOCSPBasicRes = rb_define_class_under(mOCSP, "BasicResponse", rb_cObject);
     rb_define_alloc_func(cOCSPBasicRes, ossl_ocspbres_alloc);
-    rb_define_copy_func(cOCSPBasicRes, ossl_ocspbres_initialize_copy);
     rb_define_method(cOCSPBasicRes, "initialize", ossl_ocspbres_initialize, -1);
     rb_define_method(cOCSPBasicRes, "copy_nonce", ossl_ocspbres_copy_nonce, 1);
     rb_define_method(cOCSPBasicRes, "add_nonce", ossl_ocspbres_add_nonce, -1);
     rb_define_method(cOCSPBasicRes, "add_status", ossl_ocspbres_add_status, 7);
     rb_define_method(cOCSPBasicRes, "status", ossl_ocspbres_get_status, 0);
-    rb_define_method(cOCSPBasicRes, "responses", ossl_ocspbres_get_responses, 0);
-    rb_define_method(cOCSPBasicRes, "find_response", ossl_ocspbres_find_response, 1);
     rb_define_method(cOCSPBasicRes, "sign", ossl_ocspbres_sign, -1);
     rb_define_method(cOCSPBasicRes, "verify", ossl_ocspbres_verify, -1);
-    rb_define_method(cOCSPBasicRes, "to_der", ossl_ocspbres_to_der, 0);
-
-    /*
-     * An OpenSSL::OCSP::SingleResponse represents an OCSP SingleResponse
-     * structure, which contains the basic information of the status of the
-     * certificate.
-     */
-    cOCSPSingleRes = rb_define_class_under(mOCSP, "SingleResponse", rb_cObject);
-    rb_define_alloc_func(cOCSPSingleRes, ossl_ocspsres_alloc);
-    rb_define_copy_func(cOCSPSingleRes, ossl_ocspsres_initialize_copy);
-    rb_define_method(cOCSPSingleRes, "initialize", ossl_ocspsres_initialize, 1);
-    rb_define_method(cOCSPSingleRes, "check_validity", ossl_ocspsres_check_validity, -1);
-    rb_define_method(cOCSPSingleRes, "certid", ossl_ocspsres_get_certid, 0);
-    rb_define_method(cOCSPSingleRes, "cert_status", ossl_ocspsres_get_cert_status, 0);
-    rb_define_method(cOCSPSingleRes, "this_update", ossl_ocspsres_get_this_update, 0);
-    rb_define_method(cOCSPSingleRes, "next_update", ossl_ocspsres_get_next_update, 0);
-    rb_define_method(cOCSPSingleRes, "revocation_time", ossl_ocspsres_get_revocation_time, 0);
-    rb_define_method(cOCSPSingleRes, "revocation_reason", ossl_ocspsres_get_revocation_reason, 0);
-    rb_define_method(cOCSPSingleRes, "extensions", ossl_ocspsres_get_extensions, 0);
-    rb_define_method(cOCSPSingleRes, "to_der", ossl_ocspsres_to_der, 0);
 
     /*
      * An OpenSSL::OCSP::CertificateId identifies a certificate to the CA so
@@ -1895,15 +1074,10 @@ Init_ossl_ocsp(void)
 
     cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
     rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
-    rb_define_copy_func(cOCSPCertId, ossl_ocspcid_initialize_copy);
     rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, -1);
     rb_define_method(cOCSPCertId, "cmp", ossl_ocspcid_cmp, 1);
     rb_define_method(cOCSPCertId, "cmp_issuer", ossl_ocspcid_cmp_issuer, 1);
     rb_define_method(cOCSPCertId, "serial", ossl_ocspcid_get_serial, 0);
-    rb_define_method(cOCSPCertId, "issuer_name_hash", ossl_ocspcid_get_issuer_name_hash, 0);
-    rb_define_method(cOCSPCertId, "issuer_key_hash", ossl_ocspcid_get_issuer_key_hash, 0);
-    rb_define_method(cOCSPCertId, "hash_algorithm", ossl_ocspcid_get_hash_algorithm, 0);
-    rb_define_method(cOCSPCertId, "to_der", ossl_ocspcid_to_der, 0);
 
     /* Internal error in issuer */
     rb_define_const(mOCSP, "RESPONSE_STATUS_INTERNALERROR", INT2NUM(OCSP_RESPONSE_STATUS_INTERNALERROR));
@@ -2005,9 +1179,10 @@ Init_ossl_ocsp(void)
     /* The responder ID is based on the public key. */
     rb_define_const(mOCSP, "V_RESPID_KEY", INT2NUM(V_OCSP_RESPID_KEY));
 }
-#else
+
+#else /* ! OSSL_OCSP_ENABLED */
 void
-Init_ossl_ocsp(void)
+Init_ossl_ocsp()
 {
 }
 #endif
diff --git a/ext/openssl/ossl_ocsp.h b/ext/openssl/ossl_ocsp.h
index 21e2c99a2e..65b4f2e23f 100644
--- a/ext/openssl/ossl_ocsp.h
+++ b/ext/openssl/ossl_ocsp.h
@@ -1,17 +1,18 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2003  Michal Rokos <m.rokos@sh.cvut.cz>
  * Copyright (C) 2003  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_OCSP_H_)
 #define _OSSL_OCSP_H_
 
-#if !defined(OPENSSL_NO_OCSP)
+#if defined(OSSL_OCSP_ENABLED)
 extern VALUE mOCSP;
 extern VALUE cOPCSReq;
 extern VALUE cOPCSRes;
diff --git a/ext/openssl/ossl_pkcs12.c b/ext/openssl/ossl_pkcs12.c
index 0b9c7816b5..8a5f816082 100644
--- a/ext/openssl/ossl_pkcs12.c
+++ b/ext/openssl/ossl_pkcs12.c
@@ -1,19 +1,17 @@
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
+ * $Id$
  */
 #include "ossl.h"
 
-#define NewPKCS12(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_pkcs12_type, 0)
-
-#define SetPKCS12(obj, p12) do { \
+#define WrapPKCS12(klass, obj, p12) do { \
     if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
-    RTYPEDDATA_DATA(obj) = (p12); \
+    (obj) = Data_Wrap_Struct((klass), 0, PKCS12_free, (p12)); \
 } while (0)
 
 #define GetPKCS12(obj, p12) do { \
-    TypedData_Get_Struct((obj), PKCS12, &ossl_pkcs12_type, (p12)); \
+    Data_Get_Struct((obj), PKCS12, (p12)); \
     if(!(p12)) ossl_raise(rb_eRuntimeError, "PKCS12 wasn't initialized."); \
 } while (0)
 
@@ -38,52 +36,18 @@ VALUE ePKCS12Error;
 /*
  * Private
  */
-static void
-ossl_pkcs12_free(void *ptr)
-{
-    PKCS12_free(ptr);
-}
-
-static const rb_data_type_t ossl_pkcs12_type = {
-    "OpenSSL/PKCS12",
-    {
-	0, ossl_pkcs12_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 static VALUE
 ossl_pkcs12_s_allocate(VALUE klass)
 {
     PKCS12 *p12;
     VALUE obj;
 
-    obj = NewPKCS12(klass);
     if(!(p12 = PKCS12_new())) ossl_raise(ePKCS12Error, NULL);
-    SetPKCS12(obj, p12);
+    WrapPKCS12(klass, obj, p12);
 
     return obj;
 }
 
-static VALUE
-ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
-{
-    PKCS12 *p12, *p12_old, *p12_new;
-
-    rb_check_frozen(self);
-    GetPKCS12(self, p12_old);
-    SafeGetPKCS12(other, p12);
-
-    p12_new = ASN1_dup((i2d_of_void *)i2d_PKCS12, (d2i_of_void *)d2i_PKCS12, (char *)p12);
-    if (!p12_new)
-	ossl_raise(ePKCS12Error, "ASN1_dup");
-
-    SetPKCS12(self, p12_new);
-    PKCS12_free(p12_old);
-
-    return self;
-}
-
 /*
  * call-seq:
  *    PKCS12.create(pass, name, key, cert [, ca, [, key_pbe [, cert_pbe [, key_iter [, mac_iter [, keytype]]]]]])
@@ -93,8 +57,8 @@ ossl_pkcs12_initialize_copy(VALUE self, VALUE other)
  * * +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.
+ * * * 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
@@ -119,18 +83,19 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
     PKCS12 *p12;
 
     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 : StringValueCStr(pass);
-    friendlyname = NIL_P(name) ? NULL : StringValueCStr(name);
+    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(StringValueCStr(key_nid))) == NID_undef)
-	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, key_nid);
+        if ((nkey = OBJ_txt2nid(StringValuePtr(key_nid))) == NID_undef)
+            ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(key_nid));
     }
     if (!NIL_P(cert_nid)) {
-        if ((ncert = OBJ_txt2nid(StringValueCStr(cert_nid))) == NID_undef)
-	    ossl_raise(rb_eArgError, "Unknown PBE algorithm %"PRIsVALUE, cert_nid);
+        if ((ncert = OBJ_txt2nid(StringValuePtr(cert_nid))) == NID_undef)
+            ossl_raise(rb_eArgError, "Unknown PBE algorithm %s", StringValuePtr(cert_nid));
     }
     if (!NIL_P(key_iter))
         kiter = NUM2INT(key_iter);
@@ -139,13 +104,11 @@ ossl_pkcs12_s_create(int argc, VALUE *argv, VALUE self)
     if (!NIL_P(keytype))
         ktype = NUM2INT(keytype);
 
-    obj = NewPKCS12(cPKCS12);
-    x509s = NIL_P(ca) ? NULL : ossl_x509_ary2sk(ca);
     p12 = PKCS12_create(passphrase, friendlyname, key, x509, x509s,
                         nkey, ncert, kiter, miter, ktype);
     sk_X509_pop_free(x509s, X509_free);
     if(!p12) ossl_raise(ePKCS12Error, NULL);
-    SetPKCS12(obj, p12);
+    WrapPKCS12(cPKCS12, obj, p12);
 
     ossl_pkcs12_set_key(obj, pkey);
     ossl_pkcs12_set_cert(obj, cert);
@@ -177,30 +140,24 @@ ossl_pkcs12_initialize(int argc, VALUE *argv, VALUE self)
     PKCS12 *pkcs = DATA_PTR(self);
 
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) return self;
-    passphrase = NIL_P(pass) ? NULL : StringValueCStr(pass);
+    passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
     in = ossl_obj2bio(arg);
     d2i_PKCS12_bio(in, &pkcs);
     DATA_PTR(self) = pkcs;
     BIO_free(in);
 
     pkey = cert = ca = Qnil;
-    /* OpenSSL's bug; PKCS12_parse() puts errors even if it succeeds.
-     * Fixed in OpenSSL 1.0.0t, 1.0.1p, 1.0.2d */
-    ERR_set_mark();
     if(!PKCS12_parse(pkcs, passphrase, &key, &x509, &x509s))
 	ossl_raise(ePKCS12Error, "PKCS12_parse");
-    ERR_pop_to_mark();
-    if (key) {
-	pkey = rb_protect((VALUE (*)(VALUE))ossl_pkey_new, (VALUE)key, &st);
-	if (st) goto err;
-    }
-    if (x509) {
-	cert = rb_protect((VALUE (*)(VALUE))ossl_x509_new, (VALUE)x509, &st);
-	if (st) goto err;
-    }
-    if (x509s) {
-	ca = rb_protect((VALUE (*)(VALUE))ossl_x509_sk2ary, (VALUE)x509s, &st);
-	if (st) goto err;
+    pkey = rb_protect((VALUE(*)_((VALUE)))ossl_pkey_new, (VALUE)key,
+		      &st); /* NO DUP */
+    if(st) goto err;
+    cert = rb_protect((VALUE(*)_((VALUE)))ossl_x509_new, (VALUE)x509, &st);
+    if(st) goto err;
+    if(x509s){
+	ca =
+	    rb_protect((VALUE(*)_((VALUE)))ossl_x509_sk2ary, (VALUE)x509s, &st);
+	if(st) goto err;
     }
 
   err:
@@ -235,13 +192,8 @@ ossl_pkcs12_to_der(VALUE self)
 }
 
 void
-Init_ossl_pkcs12(void)
+Init_ossl_pkcs12()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-#endif
-
     /*
      * Defines a file format commonly used to store private keys with
      * accompanying public key certificates, protected with a password-based
@@ -252,7 +204,6 @@ Init_ossl_pkcs12(void)
     rb_define_singleton_method(cPKCS12, "create", ossl_pkcs12_s_create, -1);
 
     rb_define_alloc_func(cPKCS12, ossl_pkcs12_s_allocate);
-    rb_define_copy_func(cPKCS12, ossl_pkcs12_initialize_copy);
     rb_attr(cPKCS12, rb_intern("key"), 1, 0, Qfalse);
     rb_attr(cPKCS12, rb_intern("certificate"), 1, 0, Qfalse);
     rb_attr(cPKCS12, rb_intern("ca_certs"), 1, 0, Qfalse);
diff --git a/ext/openssl/ossl_pkcs12.h b/ext/openssl/ossl_pkcs12.h
index fe4f15ef60..24d25d00bb 100644
--- a/ext/openssl/ossl_pkcs12.h
+++ b/ext/openssl/ossl_pkcs12.h
@@ -1,6 +1,7 @@
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
+ * $Id$
  */
 #if !defined(_OSSL_PKCS12_H_)
 #define _OSSL_PKCS12_H_
@@ -11,3 +12,4 @@ extern VALUE ePKCS12Error;
 void Init_ossl_pkcs12(void);
 
 #endif /* _OSSL_PKCS12_H_ */
+
diff --git a/ext/openssl/ossl_pkcs5.c b/ext/openssl/ossl_pkcs5.c
index 47c5bfa3b8..3b615e4828 100644
--- a/ext/openssl/ossl_pkcs5.c
+++ b/ext/openssl/ossl_pkcs5.c
@@ -1,4 +1,5 @@
 /*
+ * $Id$
  * Copyright (C) 2007 Technorama Ltd. <oss-ruby@technorama.net>
  */
 #include "ossl.h"
@@ -18,7 +19,7 @@ VALUE ePKCS5;
  * * +keylen+ - integer
  * * +digest+ - a string or OpenSSL::Digest object.
  *
- * Available in OpenSSL >= 1.0.0.
+ * Available in OpenSSL 0.9.4.
  *
  * Digests other than SHA1 may not be supported by other cryptography libraries.
  */
@@ -48,6 +49,7 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key
 #endif
 
 
+#ifdef HAVE_PKCS5_PBKDF2_HMAC_SHA1
 /*
  * call-seq:
  *    PKCS5.pbkdf2_hmac_sha1(pass, salt, iter, keylen) => string
@@ -60,7 +62,7 @@ ossl_pkcs5_pbkdf2_hmac(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE key
  *
  * This method is available in almost any version of OpenSSL.
  *
- * Conforms to RFC 2898.
+ * Conforms to rfc2898.
  */
 static VALUE
 ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALUE keylen)
@@ -80,14 +82,21 @@ ossl_pkcs5_pbkdf2_hmac_sha1(VALUE self, VALUE pass, VALUE salt, VALUE iter, VALU
 
     return str;
 }
+#else
+#define ossl_pkcs5_pbkdf2_hmac_sha1 rb_f_notimplement
+#endif
 
 void
-Init_ossl_pkcs5(void)
+Init_ossl_pkcs5()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-#endif
+    /*
+     * Password-based Encryption
+     *
+     */
+
+    #if 0
+	mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+    #endif
 
     /* Document-class: OpenSSL::PKCS5
      *
@@ -100,7 +109,7 @@ Init_ossl_pkcs5(void)
      *
      * PKCS5 offers support for PBKDF2 with an OpenSSL::Digest::SHA1-based
      * HMAC, or an arbitrary Digest if the underlying version of OpenSSL
-     * already supports it (>= 1.0.0).
+     * already supports it (>= 0.9.4).
      *
      * === Parameters
      * ==== Password
diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c
index 4040355f99..bd5dc78947 100644
--- a/ext/openssl/ossl_pkcs7.c
+++ b/ext/openssl/ossl_pkcs7.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewPKCS7(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_pkcs7_type, 0)
-#define SetPKCS7(obj, pkcs7) do { \
+#define WrapPKCS7(klass, obj, pkcs7) do { \
     if (!(pkcs7)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
     } \
-    RTYPEDDATA_DATA(obj) = (pkcs7); \
+    (obj) = Data_Wrap_Struct((klass), 0, PKCS7_free, (pkcs7)); \
 } while (0)
 #define GetPKCS7(obj, pkcs7) do { \
-    TypedData_Get_Struct((obj), PKCS7, &ossl_pkcs7_type, (pkcs7)); \
+    Data_Get_Struct((obj), PKCS7, (pkcs7)); \
     if (!(pkcs7)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7 wasn't initialized."); \
     } \
@@ -28,16 +27,14 @@
     GetPKCS7((obj), (pkcs7)); \
 } while (0)
 
-#define NewPKCS7si(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_pkcs7_signer_info_type, 0)
-#define SetPKCS7si(obj, p7si) do { \
+#define WrapPKCS7si(klass, obj, p7si) do { \
     if (!(p7si)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
     } \
-    RTYPEDDATA_DATA(obj) = (p7si); \
+    (obj) = Data_Wrap_Struct((klass), 0, PKCS7_SIGNER_INFO_free, (p7si)); \
 } while (0)
 #define GetPKCS7si(obj, p7si) do { \
-    TypedData_Get_Struct((obj), PKCS7_SIGNER_INFO, &ossl_pkcs7_signer_info_type, (p7si)); \
+    Data_Get_Struct((obj), PKCS7_SIGNER_INFO, (p7si)); \
     if (!(p7si)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7si wasn't initialized."); \
     } \
@@ -47,16 +44,14 @@
     GetPKCS7si((obj), (p7si)); \
 } while (0)
 
-#define NewPKCS7ri(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_pkcs7_recip_info_type, 0)
-#define SetPKCS7ri(obj, p7ri) do { \
+#define WrapPKCS7ri(klass, obj, p7ri) do { \
     if (!(p7ri)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
     } \
-    RTYPEDDATA_DATA(obj) = (p7ri); \
+    (obj) = Data_Wrap_Struct((klass), 0, PKCS7_RECIP_INFO_free, (p7ri)); \
 } while (0)
 #define GetPKCS7ri(obj, p7ri) do { \
-    TypedData_Get_Struct((obj), PKCS7_RECIP_INFO, &ossl_pkcs7_recip_info_type, (p7ri)); \
+    Data_Get_Struct((obj), PKCS7_RECIP_INFO, (p7ri)); \
     if (!(p7ri)) { \
 	ossl_raise(rb_eRuntimeError, "PKCS7ri wasn't initialized."); \
     } \
@@ -81,78 +76,19 @@ VALUE cPKCS7Signer;
 VALUE cPKCS7Recipient;
 VALUE ePKCS7Error;
 
-static void
-ossl_pkcs7_free(void *ptr)
-{
-    PKCS7_free(ptr);
-}
-
-static const rb_data_type_t ossl_pkcs7_type = {
-    "OpenSSL/PKCS7",
-    {
-	0, ossl_pkcs7_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void
-ossl_pkcs7_signer_info_free(void *ptr)
-{
-    PKCS7_SIGNER_INFO_free(ptr);
-}
-
-static const rb_data_type_t ossl_pkcs7_signer_info_type = {
-    "OpenSSL/PKCS7/SIGNER_INFO",
-    {
-	0, ossl_pkcs7_signer_info_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static void
-ossl_pkcs7_recip_info_free(void *ptr)
-{
-    PKCS7_RECIP_INFO_free(ptr);
-}
-
-static const rb_data_type_t ossl_pkcs7_recip_info_type = {
-    "OpenSSL/PKCS7/RECIP_INFO",
-    {
-	0, ossl_pkcs7_recip_info_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  * (MADE PRIVATE UNTIL SOMEBODY WILL NEED THEM)
  */
-static PKCS7_SIGNER_INFO *
-ossl_PKCS7_SIGNER_INFO_dup(const PKCS7_SIGNER_INFO *si)
-{
-    return (PKCS7_SIGNER_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_SIGNER_INFO,
-					 (d2i_of_void *)d2i_PKCS7_SIGNER_INFO,
-					 (char *)si);
-}
-
-static PKCS7_RECIP_INFO *
-ossl_PKCS7_RECIP_INFO_dup(const PKCS7_RECIP_INFO *si)
-{
-    return (PKCS7_RECIP_INFO *)ASN1_dup((i2d_of_void *)i2d_PKCS7_RECIP_INFO,
-					(d2i_of_void *)d2i_PKCS7_RECIP_INFO,
-					(char *)si);
-}
-
 static VALUE
 ossl_pkcs7si_new(PKCS7_SIGNER_INFO *p7si)
 {
     PKCS7_SIGNER_INFO *pkcs7;
     VALUE obj;
 
-    obj = NewPKCS7si(cPKCS7Signer);
-    pkcs7 = p7si ? ossl_PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
+    pkcs7 = p7si ? PKCS7_SIGNER_INFO_dup(p7si) : PKCS7_SIGNER_INFO_new();
     if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    SetPKCS7si(obj, pkcs7);
+    WrapPKCS7si(cPKCS7Signer, obj, pkcs7);
 
     return obj;
 }
@@ -163,7 +99,7 @@ DupPKCS7SignerPtr(VALUE obj)
     PKCS7_SIGNER_INFO *p7si, *pkcs7;
 
     SafeGetPKCS7si(obj, p7si);
-    if (!(pkcs7 = ossl_PKCS7_SIGNER_INFO_dup(p7si))) {
+    if (!(pkcs7 = PKCS7_SIGNER_INFO_dup(p7si))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -176,10 +112,9 @@ ossl_pkcs7ri_new(PKCS7_RECIP_INFO *p7ri)
     PKCS7_RECIP_INFO *pkcs7;
     VALUE obj;
 
-    obj = NewPKCS7ri(cPKCS7Recipient);
-    pkcs7 = p7ri ? ossl_PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
+    pkcs7 = p7ri ? PKCS7_RECIP_INFO_dup(p7ri) : PKCS7_RECIP_INFO_new();
     if (!pkcs7) ossl_raise(ePKCS7Error, NULL);
-    SetPKCS7ri(obj, pkcs7);
+    WrapPKCS7ri(cPKCS7Recipient, obj, pkcs7);
 
     return obj;
 }
@@ -190,7 +125,7 @@ DupPKCS7RecipientPtr(VALUE obj)
     PKCS7_RECIP_INFO *p7ri, *pkcs7;
 
     SafeGetPKCS7ri(obj, p7ri);
-    if (!(pkcs7 = ossl_PKCS7_RECIP_INFO_dup(p7ri))) {
+    if (!(pkcs7 = PKCS7_RECIP_INFO_dup(p7ri))) {
 	ossl_raise(ePKCS7Error, NULL);
     }
 
@@ -208,14 +143,13 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
     PKCS7 *pkcs7;
     VALUE ret, data;
 
-    ret = NewPKCS7(cPKCS7);
     in = ossl_obj2bio(arg);
     out = NULL;
     pkcs7 = SMIME_read_PKCS7(in, &out);
     BIO_free(in);
     if(!pkcs7) ossl_raise(ePKCS7Error, NULL);
     data = out ? ossl_membio2str(out) : Qnil;
-    SetPKCS7(ret, pkcs7);
+    WrapPKCS7(cPKCS7, ret, pkcs7);
     ossl_pkcs7_set_data(ret, data);
     ossl_pkcs7_set_err_string(ret, Qnil);
 
@@ -277,7 +211,6 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
     x509 = GetX509CertPtr(cert); /* NO NEED TO DUP */
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    ret = NewPKCS7(cPKCS7);
     in = ossl_obj2bio(data);
     if(NIL_P(certs)) x509s = NULL;
     else{
@@ -292,7 +225,7 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
 	sk_X509_pop_free(x509s, X509_free);
 	ossl_raise(ePKCS7Error, NULL);
     }
-    SetPKCS7(ret, pkcs7);
+    WrapPKCS7(cPKCS7, ret, pkcs7);
     ossl_pkcs7_set_data(ret, data);
     ossl_pkcs7_set_err_string(ret, Qnil);
     BIO_free(in);
@@ -333,7 +266,6 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
     }
     else ciph = GetCipherPtr(cipher); /* NO NEED TO DUP */
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
-    ret = NewPKCS7(cPKCS7);
     in = ossl_obj2bio(data);
     x509s = ossl_protect_x509_ary2sk(certs, &status);
     if(status){
@@ -346,7 +278,7 @@ ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
 	ossl_raise(ePKCS7Error, NULL);
     }
     BIO_free(in);
-    SetPKCS7(ret, p7);
+    WrapPKCS7(cPKCS7, ret, p7);
     ossl_pkcs7_set_data(ret, data);
     sk_X509_pop_free(x509s, X509_free);
 
@@ -359,11 +291,10 @@ ossl_pkcs7_alloc(VALUE klass)
     PKCS7 *pkcs7;
     VALUE obj;
 
-    obj = NewPKCS7(klass);
     if (!(pkcs7 = PKCS7_new())) {
 	ossl_raise(ePKCS7Error, NULL);
     }
-    SetPKCS7(obj, pkcs7);
+    WrapPKCS7(klass, obj, pkcs7);
 
     return obj;
 }
@@ -445,13 +376,12 @@ ossl_pkcs7_sym2typeid(VALUE sym)
         { "digest",             NID_pkcs7_digest },
     };
 
-    if (SYMBOL_P(sym)) sym = rb_sym2str(sym);
+    if (RB_TYPE_P(sym, T_SYMBOL)) sym = rb_sym2str(sym);
     else StringValue(sym);
     RSTRING_GETMEM(sym, s, l);
-
     for(i = 0; ; i++){
 	if(i == numberof(p7_type_tab))
-	    ossl_raise(ePKCS7Error, "unknown type \"%"PRIsVALUE"\"", sym);
+	    ossl_raise(ePKCS7Error, "unknown type \"%s\"", s);
 	if(strlen(p7_type_tab[i].name) != l) continue;
 	if(strcmp(p7_type_tab[i].name, s) == 0){
 	    ret = p7_type_tab[i].nid;
@@ -772,9 +702,7 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     VALUE data;
     const char *msg;
 
-    GetPKCS7(self, p7);
     rb_scan_args(argc, argv, "22", &certs, &store, &indata, &flags);
-    x509st = GetX509StorePtr(store);
     flg = NIL_P(flags) ? 0 : NUM2INT(flags);
     if(NIL_P(indata)) indata = ossl_pkcs7_get_data(self);
     in = NIL_P(indata) ? NULL : ossl_obj2bio(indata);
@@ -786,6 +714,8 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
 	    rb_jump_tag(status);
 	}
     }
+    x509st = GetX509StorePtr(store);
+    GetPKCS7(self, p7);
     if(!(out = BIO_new(BIO_s_mem()))){
 	BIO_free(in);
 	sk_X509_pop_free(x509s, X509_free);
@@ -793,13 +723,13 @@ ossl_pkcs7_verify(int argc, VALUE *argv, VALUE self)
     }
     ok = PKCS7_verify(p7, x509s, x509st, in, out, flg);
     BIO_free(in);
-    sk_X509_pop_free(x509s, X509_free);
-    if (ok < 0) ossl_raise(ePKCS7Error, "PKCS7_verify");
-    msg = ERR_reason_error_string(ERR_peek_error());
+    if (ok < 0) ossl_raise(ePKCS7Error, NULL);
+    msg = ERR_reason_error_string(ERR_get_error());
     ossl_pkcs7_set_err_string(self, msg ? rb_str_new2(msg) : Qnil);
-    ossl_clear_error();
+    ERR_clear_error();
     data = ossl_membio2str(out);
     ossl_pkcs7_set_data(self, data);
+    sk_X509_pop_free(x509s, X509_free);
 
     return (ok == 1) ? Qtrue : Qfalse;
 }
@@ -839,12 +769,12 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     char buf[4096];
     int len;
 
+    in = ossl_obj2bio(data);
     GetPKCS7(self, pkcs7);
     if(PKCS7_type_is_signed(pkcs7)){
 	if(!PKCS7_content_new(pkcs7, NID_pkcs7_data))
 	    ossl_raise(ePKCS7Error, NULL);
     }
-    in = ossl_obj2bio(data);
     if(!(out = PKCS7_dataInit(pkcs7, NULL))) goto err;
     for(;;){
 	if((len = BIO_read(in, buf, sizeof(buf))) <= 0)
@@ -856,7 +786,7 @@ ossl_pkcs7_add_data(VALUE self, VALUE data)
     ossl_pkcs7_set_data(self, Qnil);
 
  err:
-    BIO_free_all(out);
+    BIO_free(out);
     BIO_free(in);
     if(ERR_peek_error()){
 	ossl_raise(ePKCS7Error, NULL);
@@ -914,11 +844,10 @@ ossl_pkcs7si_alloc(VALUE klass)
     PKCS7_SIGNER_INFO *p7si;
     VALUE obj;
 
-    obj = NewPKCS7si(klass);
     if (!(p7si = PKCS7_SIGNER_INFO_new())) {
 	ossl_raise(ePKCS7Error, NULL);
     }
-    SetPKCS7si(obj, p7si);
+    WrapPKCS7si(klass, obj, p7si);
 
     return obj;
 }
@@ -994,11 +923,10 @@ ossl_pkcs7ri_alloc(VALUE klass)
     PKCS7_RECIP_INFO *p7ri;
     VALUE obj;
 
-    obj = NewPKCS7ri(klass);
     if (!(p7ri = PKCS7_RECIP_INFO_new())) {
 	ossl_raise(ePKCS7Error, NULL);
     }
-    SetPKCS7ri(obj, p7ri);
+    WrapPKCS7ri(klass, obj, p7ri);
 
     return obj;
 }
@@ -1052,13 +980,8 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
  * INIT
  */
 void
-Init_ossl_pkcs7(void)
+Init_ossl_pkcs7()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-#endif
-
     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);
diff --git a/ext/openssl/ossl_pkcs7.h b/ext/openssl/ossl_pkcs7.h
index 139e00d640..371c421103 100644
--- a/ext/openssl/ossl_pkcs7.h
+++ b/ext/openssl/ossl_pkcs7.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_PKCS7_H_)
@@ -18,3 +19,4 @@ extern VALUE ePKCS7Error;
 void Init_ossl_pkcs7(void);
 
 #endif /* _OSSL_PKCS7_H_ */
+
diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c
index 6ab1b6184f..878b221270 100644
--- a/ext/openssl/ossl_pkey.c
+++ b/ext/openssl/ossl_pkey.c
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
@@ -15,11 +16,25 @@
 VALUE mPKey;
 VALUE cPKey;
 VALUE ePKeyError;
-static ID id_private_q;
+ID id_private_q;
 
 /*
  * callback for generating keys
  */
+void
+ossl_generate_cb(int p, int n, void *arg)
+{
+    VALUE ary;
+
+    ary = rb_ary_new2(2);
+    rb_ary_store(ary, 0, INT2NUM(p));
+    rb_ary_store(ary, 1, INT2NUM(n));
+
+    rb_yield(ary);
+}
+
+#if HAVE_BN_GENCB
+/* OpenSSL 2nd version of GN generation callback */
 int
 ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
 {
@@ -27,7 +42,7 @@ ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
     struct ossl_generate_cb_arg *arg;
     int state;
 
-    arg = (struct ossl_generate_cb_arg *)BN_GENCB_get_arg(cb);
+    arg = (struct ossl_generate_cb_arg *)cb->arg;
     if (arg->yield) {
 	ary = rb_ary_new2(2);
 	rb_ary_store(ary, 0, INT2NUM(p));
@@ -52,34 +67,18 @@ ossl_generate_cb_stop(void *ptr)
     struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
     arg->stop = 1;
 }
-
-static void
-ossl_evp_pkey_free(void *ptr)
-{
-    EVP_PKEY_free(ptr);
-}
+#endif
 
 /*
  * Public
  */
-const rb_data_type_t ossl_evp_pkey_type = {
-    "OpenSSL/EVP_PKEY",
-    {
-	0, ossl_evp_pkey_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static VALUE
-pkey_new0(EVP_PKEY *pkey)
+VALUE
+ossl_pkey_new(EVP_PKEY *pkey)
 {
-    VALUE obj;
-    int type;
-
-    if (!pkey || (type = EVP_PKEY_base_id(pkey)) == EVP_PKEY_NONE)
-	ossl_raise(rb_eRuntimeError, "pkey is empty");
-
-    switch (type) {
+    if (!pkey) {
+	ossl_raise(ePKeyError, "Cannot make new key from NULL.");
+    }
+    switch (EVP_PKEY_type(pkey->type)) {
 #if !defined(OPENSSL_NO_RSA)
     case EVP_PKEY_RSA:
 	return ossl_rsa_new(pkey);
@@ -97,111 +96,80 @@ pkey_new0(EVP_PKEY *pkey)
 	return ossl_ec_new(pkey);
 #endif
     default:
-	obj = NewPKey(cPKey);
-	SetPKey(obj, pkey);
-	return obj;
+	ossl_raise(ePKeyError, "unsupported key type");
     }
+
+    UNREACHABLE;
 }
 
 VALUE
-ossl_pkey_new(EVP_PKEY *pkey)
+ossl_pkey_new_from_file(VALUE filename)
 {
-    VALUE obj;
-    int status;
+    FILE *fp;
+    EVP_PKEY *pkey;
 
-    obj = rb_protect((VALUE (*)(VALUE))pkey_new0, (VALUE)pkey, &status);
-    if (status) {
-	EVP_PKEY_free(pkey);
-	rb_jump_tag(status);
+    SafeStringValue(filename);
+    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
+	ossl_raise(ePKeyError, "%s", strerror(errno));
     }
+    rb_fd_fix_cloexec(fileno(fp));
 
-    return obj;
+    pkey = PEM_read_PrivateKey(fp, NULL, ossl_pem_passwd_cb, NULL);
+    fclose(fp);
+    if (!pkey) {
+	ossl_raise(ePKeyError, NULL);
+    }
+
+    return ossl_pkey_new(pkey);
 }
 
 /*
  *  call-seq:
- *     OpenSSL::PKey.read(string [, pwd ]) -> PKey
- *     OpenSSL::PKey.read(io [, pwd ]) -> PKey
- *
- * Reads a DER or PEM encoded string from +string+ or +io+ and returns an
- * instance of the appropriate PKey class.
+ *     OpenSSL::PKey.read(string [, pwd ] ) -> PKey
+ *     OpenSSL::PKey.read(file [, pwd ]) -> PKey
  *
  * === Parameters
  * * +string+ is a DER- or PEM-encoded string containing an arbitrary private
- *   or public key.
- * * +io+ is an instance of +IO+ containing a DER- or PEM-encoded
- *   arbitrary private or public key.
+ * or public key.
+ * * +file+ is an instance of +File+ containing a DER- or PEM-encoded
+ * arbitrary private or public key.
  * * +pwd+ is an optional password in case +string+ or +file+ is an encrypted
- *   PEM resource.
+ * PEM resource.
  */
 static VALUE
 ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self)
 {
-    EVP_PKEY *pkey;
-    BIO *bio;
-    VALUE data, pass;
+     EVP_PKEY *pkey;
+     BIO *bio;
+     VALUE data, pass;
+     char *passwd = NULL;
 
-    rb_scan_args(argc, argv, "11", &data, &pass);
-    pass = ossl_pem_passwd_value(pass);
+     rb_scan_args(argc, argv, "11", &data, &pass);
 
-    bio = ossl_obj2bio(data);
-    if (!(pkey = d2i_PrivateKey_bio(bio, NULL))) {
+     bio = ossl_obj2bio(data);
+     if (!(pkey = d2i_PrivateKey_bio(bio, NULL))) {
 	OSSL_BIO_reset(bio);
-	if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, (void *)pass))) {
+	if (!NIL_P(pass)) {
+	    passwd = StringValuePtr(pass);
+	}
+	if (!(pkey = PEM_read_bio_PrivateKey(bio, NULL, ossl_pem_passwd_cb, passwd))) {
 	    OSSL_BIO_reset(bio);
 	    if (!(pkey = d2i_PUBKEY_bio(bio, NULL))) {
 		OSSL_BIO_reset(bio);
-		pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, (void *)pass);
+		if (!NIL_P(pass)) {
+		    passwd = StringValuePtr(pass);
+		}
+		pkey = PEM_read_bio_PUBKEY(bio, NULL, ossl_pem_passwd_cb, passwd);
 	    }
 	}
     }
 
     BIO_free(bio);
     if (!pkey)
-	ossl_raise(ePKeyError, "Could not parse PKey");
-
+	ossl_raise(rb_eArgError, "Could not parse PKey");
     return ossl_pkey_new(pkey);
 }
 
-static void
-pkey_check_public_key(EVP_PKEY *pkey)
-{
-    void *ptr;
-    const BIGNUM *n, *e, *pubkey;
-
-    if (EVP_PKEY_missing_parameters(pkey))
-	ossl_raise(ePKeyError, "parameters missing");
-
-    ptr = EVP_PKEY_get0(pkey);
-    switch (EVP_PKEY_base_id(pkey)) {
-      case EVP_PKEY_RSA:
-	RSA_get0_key(ptr, &n, &e, NULL);
-	if (n && e)
-	    return;
-	break;
-      case EVP_PKEY_DSA:
-	DSA_get0_key(ptr, &pubkey, NULL);
-	if (pubkey)
-	    return;
-	break;
-      case EVP_PKEY_DH:
-	DH_get0_key(ptr, &pubkey, NULL);
-	if (pubkey)
-	    return;
-	break;
-#if !defined(OPENSSL_NO_EC)
-      case EVP_PKEY_EC:
-	if (EC_KEY_get0_public_key(ptr))
-	    return;
-	break;
-#endif
-      default:
-	/* unsupported type; assuming ok */
-	return;
-    }
-    ossl_raise(ePKeyError, "public key missing");
-}
-
 EVP_PKEY *
 GetPKeyPtr(VALUE obj)
 {
@@ -217,7 +185,7 @@ GetPrivPKeyPtr(VALUE obj)
 {
     EVP_PKEY *pkey;
 
-    if (rb_funcallv(obj, id_private_q, 0, NULL) != Qtrue) {
+    if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
 	ossl_raise(rb_eArgError, "Private key is needed.");
     }
     SafeGetPKey(obj, pkey);
@@ -231,7 +199,21 @@ DupPKeyPtr(VALUE obj)
     EVP_PKEY *pkey;
 
     SafeGetPKey(obj, pkey);
-    EVP_PKEY_up_ref(pkey);
+    CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
+
+    return pkey;
+}
+
+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.");
+    }
+    SafeGetPKey(obj, pkey);
+    CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
 
     return pkey;
 }
@@ -245,11 +227,10 @@ ossl_pkey_alloc(VALUE klass)
     EVP_PKEY *pkey;
     VALUE obj;
 
-    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	ossl_raise(ePKeyError, NULL);
     }
-    SetPKey(obj, pkey);
+    WrapPKey(klass, obj, pkey);
 
     return obj;
 }
@@ -265,7 +246,7 @@ static VALUE
 ossl_pkey_initialize(VALUE self)
 {
     if (rb_obj_is_instance_of(self, cPKey)) {
-	ossl_raise(rb_eTypeError, "OpenSSL::PKey::PKey can't be instantiated directly");
+	ossl_raise(rb_eNotImpError, "OpenSSL::PKey::PKey is an abstract class.");
     }
     return self;
 }
@@ -291,32 +272,21 @@ static VALUE
 ossl_pkey_sign(VALUE self, VALUE digest, VALUE data)
 {
     EVP_PKEY *pkey;
-    const EVP_MD *md;
-    EVP_MD_CTX *ctx;
+    EVP_MD_CTX ctx;
     unsigned int buf_len;
     VALUE str;
-    int result;
 
-    pkey = GetPrivPKeyPtr(self);
-    md = GetDigestPtr(digest);
-    StringValue(data);
-    str = rb_str_new(0, EVP_PKEY_size(pkey));
-
-    ctx = EVP_MD_CTX_new();
-    if (!ctx)
-	ossl_raise(ePKeyError, "EVP_MD_CTX_new");
-    if (!EVP_SignInit_ex(ctx, md, NULL)) {
-	EVP_MD_CTX_free(ctx);
-	ossl_raise(ePKeyError, "EVP_SignInit_ex");
-    }
-    if (!EVP_SignUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data))) {
-	EVP_MD_CTX_free(ctx);
-	ossl_raise(ePKeyError, "EVP_SignUpdate");
+    if (rb_funcall(self, id_private_q, 0, NULL) != Qtrue) {
+	ossl_raise(rb_eArgError, "Private key is needed.");
     }
-    result = EVP_SignFinal(ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey);
-    EVP_MD_CTX_free(ctx);
-    if (!result)
-	ossl_raise(ePKeyError, "EVP_SignFinal");
+    GetPKey(self, pkey);
+    EVP_SignInit(&ctx, GetDigestPtr(digest));
+    StringValue(data);
+    EVP_SignUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+    str = rb_str_new(0, EVP_PKEY_size(pkey)+16);
+    if (!EVP_SignFinal(&ctx, (unsigned char *)RSTRING_PTR(str), &buf_len, pkey))
+	ossl_raise(ePKeyError, NULL);
+    assert((long)buf_len <= RSTRING_LEN(str));
     rb_str_set_len(str, buf_len);
 
     return str;
@@ -347,50 +317,35 @@ static VALUE
 ossl_pkey_verify(VALUE self, VALUE digest, VALUE sig, VALUE data)
 {
     EVP_PKEY *pkey;
-    const EVP_MD *md;
-    EVP_MD_CTX *ctx;
-    int siglen, result;
+    EVP_MD_CTX ctx;
+    int result;
 
     GetPKey(self, pkey);
-    pkey_check_public_key(pkey);
-    md = GetDigestPtr(digest);
     StringValue(sig);
-    siglen = RSTRING_LENINT(sig);
     StringValue(data);
-
-    ctx = EVP_MD_CTX_new();
-    if (!ctx)
-	ossl_raise(ePKeyError, "EVP_MD_CTX_new");
-    if (!EVP_VerifyInit_ex(ctx, md, NULL)) {
-	EVP_MD_CTX_free(ctx);
-	ossl_raise(ePKeyError, "EVP_VerifyInit_ex");
-    }
-    if (!EVP_VerifyUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data))) {
-	EVP_MD_CTX_free(ctx);
-	ossl_raise(ePKeyError, "EVP_VerifyUpdate");
-    }
-    result = EVP_VerifyFinal(ctx, (unsigned char *)RSTRING_PTR(sig), siglen, pkey);
-    EVP_MD_CTX_free(ctx);
+    EVP_VerifyInit(&ctx, GetDigestPtr(digest));
+    EVP_VerifyUpdate(&ctx, RSTRING_PTR(data), RSTRING_LEN(data));
+    result = EVP_VerifyFinal(&ctx, (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), pkey);
+    EVP_MD_CTX_cleanup(&ctx);
     switch (result) {
     case 0:
-	ossl_clear_error();
 	return Qfalse;
     case 1:
 	return Qtrue;
     default:
-	ossl_raise(ePKeyError, "EVP_VerifyFinal");
+	ossl_raise(ePKeyError, NULL);
     }
+    return Qnil; /* dummy */
 }
 
 /*
  * INIT
  */
 void
-Init_ossl_pkey(void)
+Init_ossl_pkey()
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
     /* Document-module: OpenSSL::PKey
@@ -402,7 +357,7 @@ Init_ossl_pkey(void)
      * algorithm consists of two parts: a public key that may be distributed
      * to others and a private key that needs to remain secret.
      *
-     * Messages encrypted with a public key can only be decrypted by
+     * Messages encrypted with a public key can only be encrypted by
      * recipients that are in possession of the associated private key.
      * Since public key algorithms are considerably slower than symmetric
      * key algorithms (cf. OpenSSL::Cipher) they are often used to establish
@@ -481,3 +436,4 @@ Init_ossl_pkey(void)
     Init_ossl_dh();
     Init_ossl_ec();
 }
+
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h
index e3b723cd68..686e956ee5 100644
--- a/ext/openssl/ossl_pkey.h
+++ b/ext/openssl/ossl_pkey.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_PKEY_H_)
@@ -13,23 +14,21 @@
 extern VALUE mPKey;
 extern VALUE cPKey;
 extern VALUE ePKeyError;
-extern const rb_data_type_t ossl_evp_pkey_type;
+extern ID id_private_q;
 
 #define OSSL_PKEY_SET_PRIVATE(obj) rb_iv_set((obj), "private", Qtrue)
 #define OSSL_PKEY_SET_PUBLIC(obj)  rb_iv_set((obj), "private", Qfalse)
 #define OSSL_PKEY_IS_PRIVATE(obj)  (rb_iv_get((obj), "private") == Qtrue)
 
-#define NewPKey(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_evp_pkey_type, 0)
-#define SetPKey(obj, pkey) do { \
+#define WrapPKey(klass, obj, pkey) do { \
     if (!(pkey)) { \
 	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (pkey); \
+    (obj) = Data_Wrap_Struct((klass), 0, EVP_PKEY_free, (pkey)); \
     OSSL_PKEY_SET_PUBLIC(obj); \
 } while (0)
 #define GetPKey(obj, pkey) do {\
-    TypedData_Get_Struct((obj), EVP_PKEY, &ossl_evp_pkey_type, (pkey)); \
+    Data_Get_Struct((obj), EVP_PKEY, (pkey));\
     if (!(pkey)) { \
 	rb_raise(rb_eRuntimeError, "PKEY wasn't initialized!");\
     } \
@@ -39,6 +38,9 @@ extern const rb_data_type_t ossl_evp_pkey_type;
     GetPKey((obj), (pkey)); \
 } while (0)
 
+void ossl_generate_cb(int, int, void *);
+#define HAVE_BN_GENCB defined(HAVE_RSA_GENERATE_KEY_EX) || defined(HAVE_DH_GENERATE_PARAMETERS_EX) || defined(HAVE_DSA_GENERATE_PARAMETERS_EX)
+#if HAVE_BN_GENCB
 struct ossl_generate_cb_arg {
     int yield;
     int stop;
@@ -46,11 +48,14 @@ struct ossl_generate_cb_arg {
 };
 int ossl_generate_cb_2(int p, int n, BN_GENCB *cb);
 void ossl_generate_cb_stop(void *ptr);
+#endif
 
 VALUE ossl_pkey_new(EVP_PKEY *);
+VALUE ossl_pkey_new_from_file(VALUE);
 EVP_PKEY *GetPKeyPtr(VALUE);
 EVP_PKEY *DupPKeyPtr(VALUE);
 EVP_PKEY *GetPrivPKeyPtr(VALUE);
+EVP_PKEY *DupPrivPKeyPtr(VALUE);
 void Init_ossl_pkey(void);
 
 /*
@@ -76,6 +81,8 @@ void Init_ossl_dsa(void);
  */
 extern VALUE cDH;
 extern VALUE eDHError;
+extern DH *OSSL_DEFAULT_DH_512;
+extern DH *OSSL_DEFAULT_DH_1024;
 
 VALUE ossl_dh_new(EVP_PKEY *);
 void Init_ossl_dh(void);
@@ -92,153 +99,53 @@ extern VALUE eEC_POINT;
 VALUE ossl_ec_new(EVP_PKEY *);
 void Init_ossl_ec(void);
 
-#define OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, _name, _get)		\
+
+#define OSSL_PKEY_BN(keytype, name)					\
 /*									\
  *  call-seq:								\
- *     _keytype##.##_name -> aBN					\
+ *     key.##name -> aBN						\
  */									\
-static VALUE ossl_##_keytype##_get_##_name(VALUE self)			\
+static VALUE ossl_##keytype##_get_##name(VALUE self)			\
 {									\
-	_type *obj;							\
-	const BIGNUM *bn;						\
+	EVP_PKEY *pkey;							\
+	BIGNUM *bn;							\
 									\
-	Get##_type(self, obj);						\
-	_get;								\
+	GetPKey(self, pkey);						\
+	bn = pkey->pkey.keytype->name;					\
 	if (bn == NULL)							\
 		return Qnil;						\
 	return ossl_bn_new(bn);						\
-}
-
-#define OSSL_PKEY_BN_DEF_GETTER3(_keytype, _type, _group, a1, a2, a3)	\
-	OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a1,			\
-		_type##_get0_##_group(obj, &bn, NULL, NULL))		\
-	OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a2,			\
-		_type##_get0_##_group(obj, NULL, &bn, NULL))		\
-	OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a3,			\
-		_type##_get0_##_group(obj, NULL, NULL, &bn))
-
-#define OSSL_PKEY_BN_DEF_GETTER2(_keytype, _type, _group, a1, a2)	\
-	OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a1,			\
-		_type##_get0_##_group(obj, &bn, NULL))			\
-	OSSL_PKEY_BN_DEF_GETTER0(_keytype, _type, a2,			\
-		_type##_get0_##_group(obj, NULL, &bn))
-
-#define OSSL_PKEY_BN_DEF_SETTER3(_keytype, _type, _group, a1, a2, a3)	\
-/*									\
- *  call-seq:								\
- *     _keytype##.set_##_group(a1, a2, a3) -> self			\
- */									\
-static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2, VALUE v3) \
-{									\
-	_type *obj;							\
-	BIGNUM *bn1 = NULL, *orig_bn1 = NIL_P(v1) ? NULL : GetBNPtr(v1);\
-	BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\
-	BIGNUM *bn3 = NULL, *orig_bn3 = NIL_P(v3) ? NULL : GetBNPtr(v3);\
-									\
-	Get##_type(self, obj);						\
-	if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) ||			\
-	    orig_bn2 && !(bn2 = BN_dup(orig_bn2)) ||			\
-	    orig_bn3 && !(bn3 = BN_dup(orig_bn3))) {			\
-		BN_clear_free(bn1);					\
-		BN_clear_free(bn2);					\
-		BN_clear_free(bn3);					\
-		ossl_raise(eBNError, NULL);				\
-	}								\
-									\
-	if (!_type##_set0_##_group(obj, bn1, bn2, bn3)) {		\
-		BN_clear_free(bn1);					\
-		BN_clear_free(bn2);					\
-		BN_clear_free(bn3);					\
-		ossl_raise(ePKeyError, #_type"_set0_"#_group);		\
-	}								\
-	return self;							\
-}
-
-#define OSSL_PKEY_BN_DEF_SETTER2(_keytype, _type, _group, a1, a2)	\
-/*									\
- *  call-seq:								\
- *     _keytype##.set_##_group(a1, a2) -> self				\
- */									\
-static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2) \
-{									\
-	_type *obj;							\
-	BIGNUM *bn1 = NULL, *orig_bn1 = NIL_P(v1) ? NULL : GetBNPtr(v1);\
-	BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\
-									\
-	Get##_type(self, obj);						\
-	if (orig_bn1 && !(bn1 = BN_dup(orig_bn1)) ||			\
-	    orig_bn2 && !(bn2 = BN_dup(orig_bn2))) {			\
-		BN_clear_free(bn1);					\
-		BN_clear_free(bn2);					\
-		ossl_raise(eBNError, NULL);				\
-	}								\
-									\
-	if (!_type##_set0_##_group(obj, bn1, bn2)) {			\
-		BN_clear_free(bn1);					\
-		BN_clear_free(bn2);					\
-		ossl_raise(ePKeyError, #_type"_set0_"#_group);		\
-	}								\
-	return self;							\
-}
-
-#define OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, _name)	\
+}									\
 /*									\
  *  call-seq:								\
- *     _keytype##.##_name = bn -> bn					\
+ *     key.##name = bn -> bn						\
  */									\
-static VALUE ossl_##_keytype##_set_##_name(VALUE self, VALUE bignum)	\
+static VALUE ossl_##keytype##_set_##name(VALUE self, VALUE bignum)	\
 {									\
-	_type *obj;							\
+	EVP_PKEY *pkey;							\
 	BIGNUM *bn;							\
 									\
-	rb_warning("#"#_name"= is deprecated; use #set_"#_group);	\
-	Get##_type(self, obj);						\
+	GetPKey(self, pkey);						\
 	if (NIL_P(bignum)) {						\
-		BN_clear_free(obj->_name);				\
-		obj->_name = NULL;					\
+		BN_clear_free(pkey->pkey.keytype->name);		\
+		pkey->pkey.keytype->name = NULL;			\
 		return Qnil;						\
 	}								\
 									\
 	bn = GetBNPtr(bignum);						\
-	if (obj->_name == NULL)						\
-		obj->_name = BN_new();					\
-	if (obj->_name == NULL)						\
+	if (pkey->pkey.keytype->name == NULL)				\
+		pkey->pkey.keytype->name = BN_new();			\
+	if (pkey->pkey.keytype->name == NULL)				\
 		ossl_raise(eBNError, NULL);				\
-	if (BN_copy(obj->_name, bn) == NULL)				\
+	if (BN_copy(pkey->pkey.keytype->name, bn) == NULL)		\
 		ossl_raise(eBNError, NULL);				\
 	return bignum;							\
 }
 
-#if defined(HAVE_OPAQUE_OPENSSL) /* OpenSSL 1.1.0 */
-#define OSSL_PKEY_BN_DEF3(_keytype, _type, _group, a1, a2, a3)		\
-	OSSL_PKEY_BN_DEF_GETTER3(_keytype, _type, _group, a1, a2, a3)	\
-	OSSL_PKEY_BN_DEF_SETTER3(_keytype, _type, _group, a1, a2, a3)
-
-#define OSSL_PKEY_BN_DEF2(_keytype, _type, _group, a1, a2)		\
-	OSSL_PKEY_BN_DEF_GETTER2(_keytype, _type, _group, a1, a2)	\
-	OSSL_PKEY_BN_DEF_SETTER2(_keytype, _type, _group, a1, a2)
-
 #define DEF_OSSL_PKEY_BN(class, keytype, name)				\
-	rb_define_method((class), #name, ossl_##keytype##_get_##name, 0)
-
-#else
-#define OSSL_PKEY_BN_DEF3(_keytype, _type, _group, a1, a2, a3)		\
-	OSSL_PKEY_BN_DEF_GETTER3(_keytype, _type, _group, a1, a2, a3)	\
-	OSSL_PKEY_BN_DEF_SETTER3(_keytype, _type, _group, a1, a2, a3)	\
-	OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a1)	\
-	OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a2)	\
-	OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a3)
-
-#define OSSL_PKEY_BN_DEF2(_keytype, _type, _group, a1, a2)		\
-	OSSL_PKEY_BN_DEF_GETTER2(_keytype, _type, _group, a1, a2)	\
-	OSSL_PKEY_BN_DEF_SETTER2(_keytype, _type, _group, a1, a2)	\
-	OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a1)	\
-	OSSL_PKEY_BN_DEF_SETTER_OLD(_keytype, _type, _group, a2)
-
-#define DEF_OSSL_PKEY_BN(class, keytype, name) do {			\
-	rb_define_method((class), #name, ossl_##keytype##_get_##name, 0);\
+do {									\
+	rb_define_method((class), #name, ossl_##keytype##_get_##name, 0);	\
 	rb_define_method((class), #name "=", ossl_##keytype##_set_##name, 1);\
 } while (0)
-#endif /* HAVE_OPAQUE_OPENSSL */
 
 #endif /* _OSSL_PKEY_H_ */
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index dd85b7b9b6..011b6f00b4 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -1,27 +1,32 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
-#include "ossl.h"
-
 #if !defined(OPENSSL_NO_DH)
 
+#include "ossl.h"
+
 #define GetPKeyDH(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) { /* PARANOIA? */ \
+    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_DH) { /* PARANOIA? */ \
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DH!") ; \
     } \
 } while (0)
-#define GetDH(obj, dh) do { \
-    EVP_PKEY *_pkey; \
-    GetPKeyDH((obj), _pkey); \
-    (dh) = EVP_PKEY_get0_DH(_pkey); \
-} while (0)
+
+#define DH_HAS_PRIVATE(dh) ((dh)->priv_key)
+
+#ifdef OSSL_ENGINE_ENABLED
+#  define DH_PRIVATE(dh) (DH_HAS_PRIVATE(dh) || (dh)->engine)
+#else
+#  define DH_PRIVATE(dh) DH_HAS_PRIVATE(dh)
+#endif
+
 
 /*
  * Classes
@@ -41,7 +46,6 @@ dh_instance(VALUE klass, DH *dh)
     if (!dh) {
 	return Qfalse;
     }
-    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -49,7 +53,7 @@ dh_instance(VALUE klass, DH *dh)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    SetPKey(obj, pkey);
+    WrapPKey(klass, obj, pkey);
 
     return obj;
 }
@@ -62,11 +66,10 @@ ossl_dh_new(EVP_PKEY *pkey)
     if (!pkey) {
 	obj = dh_instance(cDH, DH_new());
     } else {
-	obj = NewPKey(cDH);
-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DH) {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) {
 	    ossl_raise(rb_eTypeError, "Not a DH key!");
 	}
-	SetPKey(obj, pkey);
+	WrapPKey(cDH, obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eDHError, NULL);
@@ -78,6 +81,7 @@ ossl_dh_new(EVP_PKEY *pkey)
 /*
  * Private
  */
+#if defined(HAVE_DH_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
 struct dh_blocking_gen_arg {
     DH *dh;
     int size;
@@ -93,28 +97,27 @@ dh_blocking_gen(void *arg)
     gen->result = DH_generate_parameters_ex(gen->dh, gen->size, gen->gen, gen->cb);
     return 0;
 }
+#endif
 
 static DH *
 dh_generate(int size, int gen)
 {
-    struct ossl_generate_cb_arg cb_arg = { 0 };
+#if defined(HAVE_DH_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
+    BN_GENCB cb;
+    struct ossl_generate_cb_arg cb_arg;
     struct dh_blocking_gen_arg gen_arg;
     DH *dh = DH_new();
-    BN_GENCB *cb = BN_GENCB_new();
 
-    if (!dh || !cb) {
-	DH_free(dh);
-	BN_GENCB_free(cb);
-	return NULL;
-    }
+    if (!dh) return 0;
 
+    memset(&cb_arg, 0, sizeof(struct ossl_generate_cb_arg));
     if (rb_block_given_p())
 	cb_arg.yield = 1;
-    BN_GENCB_set(cb, ossl_generate_cb_2, &cb_arg);
+    BN_GENCB_set(&cb, ossl_generate_cb_2, &cb_arg);
     gen_arg.dh = dh;
     gen_arg.size = size;
     gen_arg.gen = gen;
-    gen_arg.cb = cb;
+    gen_arg.cb = &cb;
     if (cb_arg.yield == 1) {
 	/* we cannot release GVL when callback proc is supplied */
 	dh_blocking_gen(&gen_arg);
@@ -123,20 +126,21 @@ dh_generate(int size, int gen)
 	rb_thread_call_without_gvl(dh_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
     }
 
-    BN_GENCB_free(cb);
     if (!gen_arg.result) {
 	DH_free(dh);
-	if (cb_arg.state) {
-	    /* Clear OpenSSL error queue before re-raising. */
-	    ossl_clear_error();
-	    rb_jump_tag(cb_arg.state);
-	}
-	return NULL;
+	if (cb_arg.state) rb_jump_tag(cb_arg.state);
+	return 0;
     }
+#else
+    DH *dh;
+
+    dh = DH_generate_parameters(size, gen, rb_block_given_p() ? ossl_generate_cb : NULL, NULL);
+    if (!dh) return 0;
+#endif
 
     if (!DH_generate_key(dh)) {
         DH_free(dh);
-        return NULL;
+        return 0;
     }
 
     return dh;
@@ -175,10 +179,8 @@ ossl_dh_s_generate(int argc, VALUE *argv, VALUE klass)
 }
 
 /*
- * call-seq:
- *   DH.new -> dh
- *   DH.new(string) -> dh
- *   DH.new(size [, generator]) -> dh
+ *  call-seq:
+ *     DH.new([size [, generator] | string]) -> dh
  *
  * Either generates a DH instance from scratch or by reading already existing
  * DH parameters from +string+. Note that when reading a DH instance from
@@ -212,11 +214,11 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     if(rb_scan_args(argc, argv, "02", &arg, &gen) == 0) {
       dh = DH_new();
     }
-    else if (RB_INTEGER_TYPE_P(arg)) {
+    else if (FIXNUM_P(arg)) {
 	if (!NIL_P(gen)) {
 	    g = NUM2INT(gen);
 	}
-	if (!(dh = dh_generate(NUM2INT(arg), g))) {
+	if (!(dh = dh_generate(FIX2INT(arg), g))) {
 	    ossl_raise(eDHError, NULL);
 	}
     }
@@ -240,39 +242,6 @@ ossl_dh_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-ossl_dh_initialize_copy(VALUE self, VALUE other)
-{
-    EVP_PKEY *pkey;
-    DH *dh, *dh_other;
-    const BIGNUM *pub, *priv;
-
-    GetPKey(self, pkey);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
-	ossl_raise(eDHError, "DH already initialized");
-    GetDH(other, dh_other);
-
-    dh = DHparams_dup(dh_other);
-    if (!dh)
-	ossl_raise(eDHError, "DHparams_dup");
-    EVP_PKEY_assign_DH(pkey, dh);
-
-    DH_get0_key(dh_other, &pub, &priv);
-    if (pub) {
-	BIGNUM *pub2 = BN_dup(pub);
-	BIGNUM *priv2 = BN_dup(priv);
-
-	if (!pub2 || priv && !priv2) {
-	    BN_clear_free(pub2);
-	    BN_clear_free(priv2);
-	    ossl_raise(eDHError, "BN_dup");
-	}
-	DH_set0_key(dh, pub2, priv2);
-    }
-
-    return self;
-}
-
 /*
  *  call-seq:
  *     dh.public? -> true | false
@@ -283,13 +252,11 @@ ossl_dh_initialize_copy(VALUE self, VALUE other)
 static VALUE
 ossl_dh_is_public(VALUE self)
 {
-    DH *dh;
-    const BIGNUM *bn;
+    EVP_PKEY *pkey;
 
-    GetDH(self, dh);
-    DH_get0_key(dh, &bn, NULL);
+    GetPKeyDH(self, pkey);
 
-    return bn ? Qtrue : Qfalse;
+    return (pkey->pkey.dh->pub_key) ? Qtrue : Qfalse;
 }
 
 /*
@@ -302,17 +269,11 @@ ossl_dh_is_public(VALUE self)
 static VALUE
 ossl_dh_is_private(VALUE self)
 {
-    DH *dh;
-    const BIGNUM *bn;
+    EVP_PKEY *pkey;
 
-    GetDH(self, dh);
-    DH_get0_key(dh, NULL, &bn);
+    GetPKeyDH(self, pkey);
 
-#if !defined(OPENSSL_NO_ENGINE)
-    return (bn || DH_get0_engine(dh)) ? Qtrue : Qfalse;
-#else
-    return bn ? Qtrue : Qfalse;
-#endif
+    return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -328,15 +289,15 @@ ossl_dh_is_private(VALUE self)
 static VALUE
 ossl_dh_export(VALUE self)
 {
-    DH *dh;
+    EVP_PKEY *pkey;
     BIO *out;
     VALUE str;
 
-    GetDH(self, dh);
+    GetPKeyDH(self, pkey);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDHError, NULL);
     }
-    if (!PEM_write_bio_DHparams(out, dh)) {
+    if (!PEM_write_bio_DHparams(out, pkey->pkey.dh)) {
 	BIO_free(out);
 	ossl_raise(eDHError, NULL);
     }
@@ -357,17 +318,17 @@ ossl_dh_export(VALUE self)
 static VALUE
 ossl_dh_to_der(VALUE self)
 {
-    DH *dh;
+    EVP_PKEY *pkey;
     unsigned char *p;
     long len;
     VALUE str;
 
-    GetDH(self, dh);
-    if((len = i2d_DHparams(dh, NULL)) <= 0)
+    GetPKeyDH(self, pkey);
+    if((len = i2d_DHparams(pkey->pkey.dh, NULL)) <= 0)
 	ossl_raise(eDHError, NULL);
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_DHparams(dh, &p) < 0)
+    if(i2d_DHparams(pkey->pkey.dh, &p) < 0)
 	ossl_raise(eDHError, NULL);
     ossl_str_adjust(str, p);
 
@@ -385,20 +346,17 @@ ossl_dh_to_der(VALUE self)
 static VALUE
 ossl_dh_get_params(VALUE self)
 {
-    DH *dh;
+    EVP_PKEY *pkey;
     VALUE hash;
-    const BIGNUM *p, *q, *g, *pub_key, *priv_key;
 
-    GetDH(self, dh);
-    DH_get0_pqg(dh, &p, &q, &g);
-    DH_get0_key(dh, &pub_key, &priv_key);
+    GetPKeyDH(self, pkey);
 
     hash = rb_hash_new();
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
-    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(g));
-    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pub_key));
-    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(priv_key));
+
+    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.dh->p));
+    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;
 }
@@ -414,15 +372,15 @@ ossl_dh_get_params(VALUE self)
 static VALUE
 ossl_dh_to_text(VALUE self)
 {
-    DH *dh;
+    EVP_PKEY *pkey;
     BIO *out;
     VALUE str;
 
-    GetDH(self, dh);
+    GetPKeyDH(self, pkey);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDHError, NULL);
     }
-    if (!DHparams_print(out, dh)) {
+    if (!DHparams_print(out, pkey->pkey.dh)) {
 	BIO_free(out);
 	ossl_raise(eDHError, NULL);
     }
@@ -455,12 +413,13 @@ ossl_dh_to_text(VALUE self)
 static VALUE
 ossl_dh_to_public_key(VALUE self)
 {
-    DH *orig_dh, *dh;
+    EVP_PKEY *pkey;
+    DH *dh;
     VALUE obj;
 
-    GetDH(self, orig_dh);
-    dh = DHparams_dup(orig_dh); /* err check perfomed by dh_instance */
-    obj = dh_instance(rb_obj_class(self), dh);
+    GetPKeyDH(self, pkey);
+    dh = DHparams_dup(pkey->pkey.dh); /* err check perfomed by dh_instance */
+    obj = dh_instance(CLASS_OF(self), dh);
     if (obj == Qfalse) {
 	DH_free(dh);
 	ossl_raise(eDHError, NULL);
@@ -481,9 +440,12 @@ static VALUE
 ossl_dh_check_params(VALUE self)
 {
     DH *dh;
+    EVP_PKEY *pkey;
     int codes;
 
-    GetDH(self, dh);
+    GetPKeyDH(self, pkey);
+    dh = pkey->pkey.dh;
+
     if (!DH_check(dh, &codes)) {
 	return Qfalse;
     }
@@ -511,8 +473,11 @@ static VALUE
 ossl_dh_generate_key(VALUE self)
 {
     DH *dh;
+    EVP_PKEY *pkey;
+
+    GetPKeyDH(self, pkey);
+    dh = pkey->pkey.dh;
 
-    GetDH(self, dh);
     if (!DH_generate_key(dh))
 	ossl_raise(eDHError, "Failed to generate key");
     return self;
@@ -527,20 +492,19 @@ ossl_dh_generate_key(VALUE self)
  *
  * === Parameters
  * * +pub_bn+ is a OpenSSL::BN, *not* the DH instance returned by
- *   DH#public_key as that contains the DH parameters only.
+ * DH#public_key as that contains the DH parameters only.
  */
 static VALUE
 ossl_dh_compute_key(VALUE self, VALUE pub)
 {
     DH *dh;
-    const BIGNUM *pub_key, *dh_p;
+    EVP_PKEY *pkey;
+    BIGNUM *pub_key;
     VALUE str;
     int len;
 
-    GetDH(self, dh);
-    DH_get0_pqg(dh, &dh_p, NULL, NULL);
-    if (!dh_p)
-	ossl_raise(eDHError, "incomplete DH");
+    GetPKeyDH(self, pkey);
+    dh = pkey->pkey.dh;
     pub_key = GetBNPtr(pub);
     len = DH_size(dh);
     str = rb_str_new(0, len);
@@ -552,33 +516,83 @@ ossl_dh_compute_key(VALUE self, VALUE pub)
     return str;
 }
 
+OSSL_PKEY_BN(dh, p)
+OSSL_PKEY_BN(dh, g)
+OSSL_PKEY_BN(dh, pub_key)
+OSSL_PKEY_BN(dh, priv_key)
+
 /*
- * Document-method: OpenSSL::PKey::DH#set_pqg
- * call-seq:
- *   dh.set_pqg(p, q, g) -> self
- *
- * Sets +p+, +q+, +g+ for the DH instance.
+ * -----BEGIN DH PARAMETERS-----
+ * MEYCQQD0zXHljRg/mJ9PYLACLv58Cd8VxBxxY7oEuCeURMiTqEhMym16rhhKgZG2
+ * zk2O9uUIBIxSj+NKMURHGaFKyIvLAgEC
+ * -----END DH PARAMETERS-----
  */
-OSSL_PKEY_BN_DEF3(dh, DH, pqg, p, q, g)
+static unsigned char DEFAULT_DH_512_PRIM[] = {
+    0xf4, 0xcd, 0x71, 0xe5, 0x8d, 0x18, 0x3f, 0x98,
+    0x9f, 0x4f, 0x60, 0xb0, 0x02, 0x2e, 0xfe, 0x7c,
+    0x09, 0xdf, 0x15, 0xc4, 0x1c, 0x71, 0x63, 0xba,
+    0x04, 0xb8, 0x27, 0x94, 0x44, 0xc8, 0x93, 0xa8,
+    0x48, 0x4c, 0xca, 0x6d, 0x7a, 0xae, 0x18, 0x4a,
+    0x81, 0x91, 0xb6, 0xce, 0x4d, 0x8e, 0xf6, 0xe5,
+    0x08, 0x04, 0x8c, 0x52, 0x8f, 0xe3, 0x4a, 0x31,
+    0x44, 0x47, 0x19, 0xa1, 0x4a, 0xc8, 0x8b, 0xcb,
+};
+static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 };
+DH *OSSL_DEFAULT_DH_512 = NULL;
+
 /*
- * Document-method: OpenSSL::PKey::DH#set_key
- * call-seq:
- *   dh.set_key(pub_key, priv_key) -> self
- *
- * Sets +pub_key+ and +priv_key+ for the DH instance. +priv_key+ may be nil.
+ * -----BEGIN DH PARAMETERS-----
+ * MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
+ * AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
+ * T4h7KZ/2zmjvV+eF8kBUHBJAojUlzxKj4QeO2x20FP9X5xmNUXeDAgEC
+ * -----END DH PARAMETERS-----
  */
-OSSL_PKEY_BN_DEF2(dh, DH, key, pub_key, priv_key)
+static unsigned char DEFAULT_DH_1024_PRIM[] = {
+    0x9d, 0x25, 0x39, 0x5c, 0xb4, 0x54, 0x8a, 0xff,
+    0x25, 0xe6, 0xd6, 0x9f, 0x4c, 0xc3, 0xc1, 0x8d,
+    0xa1, 0xfa, 0xba, 0x88, 0x4c, 0x53, 0xa9, 0x74,
+    0xda, 0xfa, 0xba, 0x0b, 0x20, 0xbe, 0x40, 0xd7,
+    0xba, 0xe7, 0x1d, 0x70, 0x28, 0x61, 0x60, 0x4c,
+    0x49, 0x01, 0x5f, 0xd9, 0x0f, 0x60, 0x16, 0x3d,
+    0xba, 0xd3, 0xa9, 0x5e, 0xfa, 0x98, 0x64, 0x60,
+    0x26, 0x0e, 0x04, 0x75, 0xd8, 0x13, 0xd7, 0x31,
+    0xb4, 0x8e, 0xad, 0xeb, 0x9c, 0x57, 0x4c, 0x8f,
+    0x65, 0xf3, 0x90, 0x16, 0x31, 0xdc, 0x15, 0x6f,
+    0x7d, 0x1d, 0x00, 0xae, 0x76, 0xf2, 0xd1, 0x11,
+    0xd1, 0x4f, 0x88, 0x7b, 0x29, 0x9f, 0xf6, 0xce,
+    0x68, 0xef, 0x57, 0xe7, 0x85, 0xf2, 0x40, 0x54,
+    0x1c, 0x12, 0x40, 0xa2, 0x35, 0x25, 0xcf, 0x12,
+    0xa3, 0xe1, 0x07, 0x8e, 0xdb, 0x1d, 0xb4, 0x14,
+    0xff, 0x57, 0xe7, 0x19, 0x8d, 0x51, 0x77, 0x83
+};
+static unsigned char DEFAULT_DH_1024_GEN[] = { 0x02 };
+DH *OSSL_DEFAULT_DH_1024 = NULL;
+
+static DH*
+ossl_create_dh(unsigned char *p, size_t plen, unsigned char *g, size_t glen)
+{
+    DH *dh;
+
+    if ((dh = DH_new()) == NULL) ossl_raise(eDHError, NULL);
+    dh->p = BN_bin2bn(p, rb_long2int(plen), NULL);
+    dh->g = BN_bin2bn(g, rb_long2int(glen), NULL);
+    if (dh->p == NULL || dh->g == NULL){
+        DH_free(dh);
+	ossl_raise(eDHError, NULL);
+    }
+
+    return dh;
+}
 
 /*
  * INIT
  */
 void
-Init_ossl_dh(void)
+Init_ossl_dh()
 {
 #if 0
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
     mPKey = rb_define_module_under(mOSSL, "PKey");
-    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     /* Document-class: OpenSSL::PKey::DHError
@@ -595,15 +609,15 @@ Init_ossl_dh(void)
      * on.
      *
      * === Accessor methods for the Diffie-Hellman parameters
-     * DH#p::
-     *   The prime (an OpenSSL::BN) of the Diffie-Hellman parameters.
-     * DH#g::
-     *   The generator (an OpenSSL::BN) g of the Diffie-Hellman parameters.
-     * DH#pub_key::
-     *   The per-session public key (an OpenSSL::BN) matching the private key.
-     *   This needs to be passed to DH#compute_key.
-     * DH#priv_key::
-     *   The per-session private key, an OpenSSL::BN.
+     * * DH#p
+     * The prime (an OpenSSL::BN) of the Diffie-Hellman parameters.
+     * * DH#g
+     * The generator (an OpenSSL::BN) g of the Diffie-Hellman parameters.
+     * * DH#pub_key
+     * The per-session public key (an OpenSSL::BN) matching the private key.
+     * This needs to be passed to DH#compute_key.
+     * * DH#priv_key
+     * The per-session private key, an OpenSSL::BN.
      *
      * === Example of a key exchange
      *  dh1 = OpenSSL::PKey::DH.new(2048)
@@ -618,7 +632,6 @@ Init_ossl_dh(void)
     cDH = rb_define_class_under(mPKey, "DH", cPKey);
     rb_define_singleton_method(cDH, "generate", ossl_dh_s_generate, -1);
     rb_define_method(cDH, "initialize", ossl_dh_initialize, -1);
-    rb_define_copy_func(cDH, ossl_dh_initialize_copy);
     rb_define_method(cDH, "public?", ossl_dh_is_public, 0);
     rb_define_method(cDH, "private?", ossl_dh_is_private, 0);
     rb_define_method(cDH, "to_text", ossl_dh_to_text, 0);
@@ -632,19 +645,22 @@ Init_ossl_dh(void)
     rb_define_method(cDH, "compute_key", ossl_dh_compute_key, 1);
 
     DEF_OSSL_PKEY_BN(cDH, dh, p);
-    DEF_OSSL_PKEY_BN(cDH, dh, q);
     DEF_OSSL_PKEY_BN(cDH, dh, g);
     DEF_OSSL_PKEY_BN(cDH, dh, pub_key);
     DEF_OSSL_PKEY_BN(cDH, dh, priv_key);
-    rb_define_method(cDH, "set_pqg", ossl_dh_set_pqg, 3);
-    rb_define_method(cDH, "set_key", ossl_dh_set_key, 2);
-
     rb_define_method(cDH, "params", ossl_dh_get_params, 0);
+
+    OSSL_DEFAULT_DH_512 = ossl_create_dh(
+	DEFAULT_DH_512_PRIM, sizeof(DEFAULT_DH_512_PRIM),
+	DEFAULT_DH_512_GEN, sizeof(DEFAULT_DH_512_GEN));
+    OSSL_DEFAULT_DH_1024 = ossl_create_dh(
+	DEFAULT_DH_1024_PRIM, sizeof(DEFAULT_DH_1024_PRIM),
+	DEFAULT_DH_1024_GEN, sizeof(DEFAULT_DH_1024_GEN));
 }
 
 #else /* defined NO_DH */
 void
-Init_ossl_dh(void)
+Init_ossl_dh()
 {
 }
 #endif /* NO_DH */
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index 85085419c6..823b9b66e5 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -1,41 +1,26 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
-#include "ossl.h"
-
 #if !defined(OPENSSL_NO_DSA)
 
+#include "ossl.h"
+
 #define GetPKeyDSA(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DSA) { /* PARANOIA? */ \
+    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_DSA) { /* PARANOIA? */ \
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A DSA!"); \
     } \
 } while (0)
-#define GetDSA(obj, dsa) do { \
-    EVP_PKEY *_pkey; \
-    GetPKeyDSA((obj), _pkey); \
-    (dsa) = EVP_PKEY_get0_DSA(_pkey); \
-} while (0)
 
-static inline int
-DSA_HAS_PRIVATE(DSA *dsa)
-{
-    const BIGNUM *bn;
-    DSA_get0_key(dsa, NULL, &bn);
-    return !!bn;
-}
-
-static inline int
-DSA_PRIVATE(VALUE obj, DSA *dsa)
-{
-    return DSA_HAS_PRIVATE(dsa) || OSSL_PKEY_IS_PRIVATE(obj);
-}
+#define DSA_HAS_PRIVATE(dsa) ((dsa)->priv_key)
+#define DSA_PRIVATE(obj,dsa) (DSA_HAS_PRIVATE(dsa)||OSSL_PKEY_IS_PRIVATE(obj))
 
 /*
  * Classes
@@ -55,7 +40,6 @@ dsa_instance(VALUE klass, DSA *dsa)
     if (!dsa) {
 	return Qfalse;
     }
-    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -63,7 +47,7 @@ dsa_instance(VALUE klass, DSA *dsa)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    SetPKey(obj, pkey);
+    WrapPKey(klass, obj, pkey);
 
     return obj;
 }
@@ -76,11 +60,10 @@ ossl_dsa_new(EVP_PKEY *pkey)
     if (!pkey) {
 	obj = dsa_instance(cDSA, DSA_new());
     } else {
-	obj = NewPKey(cDSA);
-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_DSA) {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DSA) {
 	    ossl_raise(rb_eTypeError, "Not a DSA key!");
 	}
-	SetPKey(obj, pkey);
+	WrapPKey(cDSA, obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eDSAError, NULL);
@@ -92,9 +75,12 @@ ossl_dsa_new(EVP_PKEY *pkey)
 /*
  * Private
  */
+#if defined(HAVE_DSA_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
 struct dsa_blocking_gen_arg {
     DSA *dsa;
     int size;
+    unsigned char* seed;
+    int seed_len;
     int *counter;
     unsigned long *h;
     BN_GENCB *cb;
@@ -105,35 +91,40 @@ static void *
 dsa_blocking_gen(void *arg)
 {
     struct dsa_blocking_gen_arg *gen = (struct dsa_blocking_gen_arg *)arg;
-    gen->result = DSA_generate_parameters_ex(gen->dsa, gen->size, NULL, 0,
-					     gen->counter, gen->h, gen->cb);
+    gen->result = DSA_generate_parameters_ex(gen->dsa, gen->size, gen->seed, gen->seed_len, gen->counter, gen->h, gen->cb);
     return 0;
 }
+#endif
 
 static DSA *
 dsa_generate(int size)
 {
-    struct ossl_generate_cb_arg cb_arg = { 0 };
+#if defined(HAVE_DSA_GENERATE_PARAMETERS_EX) && HAVE_BN_GENCB
+    BN_GENCB cb;
+    struct ossl_generate_cb_arg cb_arg;
     struct dsa_blocking_gen_arg gen_arg;
     DSA *dsa = DSA_new();
-    BN_GENCB *cb = BN_GENCB_new();
-    int counter;
+    unsigned char seed[20];
+    int seed_len = 20, counter;
     unsigned long h;
 
-    if (!dsa || !cb) {
+    if (!dsa) return 0;
+    if (!RAND_bytes(seed, seed_len)) {
 	DSA_free(dsa);
-	BN_GENCB_free(cb);
-	return NULL;
+	return 0;
     }
 
+    memset(&cb_arg, 0, sizeof(struct ossl_generate_cb_arg));
     if (rb_block_given_p())
 	cb_arg.yield = 1;
-    BN_GENCB_set(cb, ossl_generate_cb_2, &cb_arg);
+    BN_GENCB_set(&cb, ossl_generate_cb_2, &cb_arg);
     gen_arg.dsa = dsa;
     gen_arg.size = size;
+    gen_arg.seed = seed;
+    gen_arg.seed_len = seed_len;
     gen_arg.counter = &counter;
     gen_arg.h = &h;
-    gen_arg.cb = cb;
+    gen_arg.cb = &cb;
     if (cb_arg.yield == 1) {
 	/* we cannot release GVL when callback proc is supplied */
 	dsa_blocking_gen(&gen_arg);
@@ -141,24 +132,28 @@ dsa_generate(int size)
 	/* there's a chance to unblock */
 	rb_thread_call_without_gvl(dsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
     }
-
-    BN_GENCB_free(cb);
     if (!gen_arg.result) {
 	DSA_free(dsa);
-	if (cb_arg.state) {
-	    /* Clear OpenSSL error queue before re-raising. By the way, the
-	     * documentation of DSA_generate_parameters_ex() says the error code
-	     * can be obtained by ERR_get_error(), but the default
-	     * implementation, dsa_builtin_paramgen() doesn't put any error... */
-	    ossl_clear_error();
-	    rb_jump_tag(cb_arg.state);
-	}
-	return NULL;
+	if (cb_arg.state) rb_jump_tag(cb_arg.state);
+	return 0;
     }
+#else
+    DSA *dsa;
+    unsigned char seed[20];
+    int seed_len = 20, counter;
+    unsigned long h;
+
+    if (!RAND_bytes(seed, seed_len)) {
+	return 0;
+    }
+    dsa = DSA_generate_parameters(size, seed, seed_len, &counter, &h,
+	    rb_block_given_p() ? ossl_generate_cb : NULL, NULL);
+    if(!dsa) return 0;
+#endif
 
     if (!DSA_generate_key(dsa)) {
 	DSA_free(dsa);
-	return NULL;
+	return 0;
     }
 
     return dsa;
@@ -191,9 +186,7 @@ ossl_dsa_s_generate(VALUE klass, VALUE size)
 
 /*
  *  call-seq:
- *    DSA.new -> dsa
- *    DSA.new(size) -> dsa
- *    DSA.new(string [, pass]) -> dsa
+ *    DSA.new([size | string [, pass]) -> dsa
  *
  * Creates a new DSA instance by reading an existing key from +string+.
  *
@@ -215,22 +208,23 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     EVP_PKEY *pkey;
     DSA *dsa;
     BIO *in;
+    char *passwd = NULL;
     VALUE arg, pass;
 
     GetPKey(self, pkey);
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
         dsa = DSA_new();
     }
-    else if (RB_INTEGER_TYPE_P(arg)) {
-	if (!(dsa = dsa_generate(NUM2INT(arg)))) {
+    else if (FIXNUM_P(arg)) {
+	if (!(dsa = dsa_generate(FIX2INT(arg)))) {
 	    ossl_raise(eDSAError, NULL);
 	}
     }
     else {
-	pass = ossl_pem_passwd_value(pass);
+	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
 	arg = ossl_to_der_if_possible(arg);
 	in = ossl_obj2bio(arg);
-	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
+	dsa = PEM_read_bio_DSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
 	if (!dsa) {
 	    OSSL_BIO_reset(in);
 	    dsa = PEM_read_bio_DSA_PUBKEY(in, NULL, NULL, NULL);
@@ -245,14 +239,11 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
 	}
 	if (!dsa) {
 	    OSSL_BIO_reset(in);
-#define PEM_read_bio_DSAPublicKey(bp,x,cb,u) (DSA *)PEM_ASN1_read_bio( \
-	(d2i_of_void *)d2i_DSAPublicKey, PEM_STRING_DSA_PUBLIC, (bp), (void **)(x), (cb), (u))
 	    dsa = PEM_read_bio_DSAPublicKey(in, NULL, NULL, NULL);
-#undef PEM_read_bio_DSAPublicKey
 	}
 	BIO_free(in);
 	if (!dsa) {
-	    ossl_clear_error();
+	    ERR_clear_error();
 	    ossl_raise(eDSAError, "Neither PUB key nor PRIV key");
 	}
     }
@@ -264,26 +255,6 @@ ossl_dsa_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-ossl_dsa_initialize_copy(VALUE self, VALUE other)
-{
-    EVP_PKEY *pkey;
-    DSA *dsa, *dsa_new;
-
-    GetPKey(self, pkey);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
-	ossl_raise(eDSAError, "DSA already initialized");
-    GetDSA(other, dsa);
-
-    dsa_new = ASN1_dup((i2d_of_void *)i2d_DSAPrivateKey, (d2i_of_void *)d2i_DSAPrivateKey, (char *)dsa);
-    if (!dsa_new)
-	ossl_raise(eDSAError, "ASN1_dup");
-
-    EVP_PKEY_assign_DSA(pkey, dsa_new);
-
-    return self;
-}
-
 /*
  *  call-seq:
  *    dsa.public? -> true | false
@@ -294,13 +265,11 @@ ossl_dsa_initialize_copy(VALUE self, VALUE other)
 static VALUE
 ossl_dsa_is_public(VALUE self)
 {
-    DSA *dsa;
-    const BIGNUM *bn;
+    EVP_PKEY *pkey;
 
-    GetDSA(self, dsa);
-    DSA_get0_key(dsa, &bn, NULL);
+    GetPKeyDSA(self, pkey);
 
-    return bn ? Qtrue : Qfalse;
+    return (pkey->pkey.dsa->pub_key) ? Qtrue : Qfalse;
 }
 
 /*
@@ -313,11 +282,11 @@ ossl_dsa_is_public(VALUE self)
 static VALUE
 ossl_dsa_is_private(VALUE self)
 {
-    DSA *dsa;
+    EVP_PKEY *pkey;
 
-    GetDSA(self, dsa);
+    GetPKeyDSA(self, pkey);
 
-    return DSA_PRIVATE(self, dsa) ? Qtrue : Qfalse;
+    return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -340,28 +309,34 @@ ossl_dsa_is_private(VALUE self)
 static VALUE
 ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 {
-    DSA *dsa;
+    EVP_PKEY *pkey;
     BIO *out;
     const EVP_CIPHER *ciph = NULL;
+    char *passwd = NULL;
     VALUE cipher, pass, str;
 
-    GetDSA(self, dsa);
+    GetPKeyDSA(self, pkey);
     rb_scan_args(argc, argv, "02", &cipher, &pass);
     if (!NIL_P(cipher)) {
 	ciph = GetCipherPtr(cipher);
-	pass = ossl_pem_passwd_value(pass);
+	if (!NIL_P(pass)) {
+	    StringValue(pass);
+	    if (RSTRING_LENINT(pass) < OSSL_MIN_PWD_LEN)
+		ossl_raise(eOSSLError, "OpenSSL requires passwords to be at least four characters long");
+	    passwd = RSTRING_PTR(pass);
+	}
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDSAError, NULL);
     }
-    if (DSA_HAS_PRIVATE(dsa)) {
-	if (!PEM_write_bio_DSAPrivateKey(out, dsa, ciph, NULL, 0,
-					 ossl_pem_passwd_cb, (void *)pass)){
+    if (DSA_HAS_PRIVATE(pkey->pkey.dsa)) {
+	if (!PEM_write_bio_DSAPrivateKey(out, pkey->pkey.dsa, ciph,
+					 NULL, 0, ossl_pem_passwd_cb, passwd)){
 	    BIO_free(out);
 	    ossl_raise(eDSAError, NULL);
 	}
     } else {
-	if (!PEM_write_bio_DSA_PUBKEY(out, dsa)) {
+	if (!PEM_write_bio_DSA_PUBKEY(out, pkey->pkey.dsa)) {
 	    BIO_free(out);
 	    ossl_raise(eDSAError, NULL);
 	}
@@ -381,29 +356,28 @@ ossl_dsa_export(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_dsa_to_der(VALUE self)
 {
-    DSA *dsa;
-    int (*i2d_func)(DSA *, unsigned char **);
+    EVP_PKEY *pkey;
+    int (*i2d_func)_((DSA*, unsigned char**));
     unsigned char *p;
     long len;
     VALUE str;
 
-    GetDSA(self, dsa);
-    if(DSA_HAS_PRIVATE(dsa))
-	i2d_func = (int (*)(DSA *,unsigned char **))i2d_DSAPrivateKey;
+    GetPKeyDSA(self, pkey);
+    if(DSA_HAS_PRIVATE(pkey->pkey.dsa))
+	i2d_func = (int(*)_((DSA*,unsigned char**)))i2d_DSAPrivateKey;
     else
 	i2d_func = i2d_DSA_PUBKEY;
-    if((len = i2d_func(dsa, NULL)) <= 0)
+    if((len = i2d_func(pkey->pkey.dsa, NULL)) <= 0)
 	ossl_raise(eDSAError, NULL);
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_func(dsa, &p) < 0)
+    if(i2d_func(pkey->pkey.dsa, &p) < 0)
 	ossl_raise(eDSAError, NULL);
     ossl_str_adjust(str, p);
 
     return str;
 }
 
-
 /*
  *  call-seq:
  *    dsa.params -> hash
@@ -415,20 +389,18 @@ ossl_dsa_to_der(VALUE self)
 static VALUE
 ossl_dsa_get_params(VALUE self)
 {
-    DSA *dsa;
+    EVP_PKEY *pkey;
     VALUE hash;
-    const BIGNUM *p, *q, *g, *pub_key, *priv_key;
 
-    GetDSA(self, dsa);
-    DSA_get0_pqg(dsa, &p, &q, &g);
-    DSA_get0_key(dsa, &pub_key, &priv_key);
+    GetPKeyDSA(self, pkey);
 
     hash = rb_hash_new();
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
-    rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(g));
-    rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pub_key));
-    rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(priv_key));
+
+    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.dsa->p));
+    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(pkey->pkey.dsa->q));
+    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;
 }
@@ -444,15 +416,15 @@ ossl_dsa_get_params(VALUE self)
 static VALUE
 ossl_dsa_to_text(VALUE self)
 {
-    DSA *dsa;
+    EVP_PKEY *pkey;
     BIO *out;
     VALUE str;
 
-    GetDSA(self, dsa);
+    GetPKeyDSA(self, pkey);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eDSAError, NULL);
     }
-    if (!DSA_print(out, dsa, 0)) { /* offset = 0 */
+    if (!DSA_print(out, pkey->pkey.dsa, 0)) { /* offset = 0 */
 	BIO_free(out);
 	ossl_raise(eDSAError, NULL);
     }
@@ -487,11 +459,8 @@ ossl_dsa_to_public_key(VALUE self)
 
     GetPKeyDSA(self, pkey);
     /* err check performed by dsa_instance */
-#define DSAPublicKey_dup(dsa) (DSA *)ASN1_dup( \
-	(i2d_of_void *)i2d_DSAPublicKey, (d2i_of_void *)d2i_DSAPublicKey, (char *)(dsa))
-    dsa = DSAPublicKey_dup(EVP_PKEY_get0_DSA(pkey));
-#undef DSAPublicKey_dup
-    obj = dsa_instance(rb_obj_class(self), dsa);
+    dsa = DSAPublicKey_dup(pkey->pkey.dsa);
+    obj = dsa_instance(CLASS_OF(self), dsa);
     if (obj == Qfalse) {
 	DSA_free(dsa);
 	ossl_raise(eDSAError, NULL);
@@ -499,6 +468,8 @@ ossl_dsa_to_public_key(VALUE self)
     return obj;
 }
 
+#define ossl_dsa_buf_size(pkey) (DSA_size((pkey)->pkey.dsa)+16)
+
 /*
  *  call-seq:
  *    dsa.syssign(string) -> aString
@@ -521,22 +492,19 @@ ossl_dsa_to_public_key(VALUE self)
 static VALUE
 ossl_dsa_sign(VALUE self, VALUE data)
 {
-    DSA *dsa;
-    const BIGNUM *dsa_q;
+    EVP_PKEY *pkey;
     unsigned int buf_len;
     VALUE str;
 
-    GetDSA(self, dsa);
-    DSA_get0_pqg(dsa, NULL, &dsa_q, NULL);
-    if (!dsa_q)
-	ossl_raise(eDSAError, "incomplete DSA");
-    if (!DSA_PRIVATE(self, dsa))
-	ossl_raise(eDSAError, "Private DSA key needed!");
+    GetPKeyDSA(self, pkey);
     StringValue(data);
-    str = rb_str_new(0, DSA_size(dsa));
+    if (!DSA_PRIVATE(self, pkey->pkey.dsa)) {
+	ossl_raise(eDSAError, "Private DSA key needed!");
+    }
+    str = rb_str_new(0, ossl_dsa_buf_size(pkey));
     if (!DSA_sign(0, (unsigned char *)RSTRING_PTR(data), RSTRING_LENINT(data),
 		  (unsigned char *)RSTRING_PTR(str),
-		  &buf_len, dsa)) { /* type is ignored (0) */
+		  &buf_len, pkey->pkey.dsa)) { /* type is ignored (0) */
 	ossl_raise(eDSAError, NULL);
     }
     rb_str_set_len(str, buf_len);
@@ -566,15 +534,15 @@ ossl_dsa_sign(VALUE self, VALUE data)
 static VALUE
 ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
 {
-    DSA *dsa;
+    EVP_PKEY *pkey;
     int ret;
 
-    GetDSA(self, dsa);
+    GetPKeyDSA(self, pkey);
     StringValue(digest);
     StringValue(sig);
     /* type is ignored (0) */
     ret = DSA_verify(0, (unsigned char *)RSTRING_PTR(digest), RSTRING_LENINT(digest),
-		     (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), dsa);
+		     (unsigned char *)RSTRING_PTR(sig), RSTRING_LENINT(sig), pkey->pkey.dsa);
     if (ret < 0) {
 	ossl_raise(eDSAError, NULL);
     }
@@ -585,33 +553,21 @@ ossl_dsa_verify(VALUE self, VALUE digest, VALUE sig)
     return Qfalse;
 }
 
-/*
- * Document-method: OpenSSL::PKey::DSA#set_pqg
- * call-seq:
- *   dsa.set_pqg(p, q, g) -> self
- *
- * Sets +p+, +q+, +g+ for the DSA instance.
- */
-OSSL_PKEY_BN_DEF3(dsa, DSA, pqg, p, q, g)
-/*
- * Document-method: OpenSSL::PKey::DSA#set_key
- * call-seq:
- *   dsa.set_key(pub_key, priv_key) -> self
- *
- * Sets +pub_key+ and +priv_key+ for the DSA instance. +priv_key+ may be nil.
- */
-OSSL_PKEY_BN_DEF2(dsa, DSA, key, pub_key, 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
  */
 void
-Init_ossl_dsa(void)
+Init_ossl_dsa()
 {
 #if 0
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
     mPKey = rb_define_module_under(mOSSL, "PKey");
-    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     /* Document-class: OpenSSL::PKey::DSAError
@@ -638,7 +594,6 @@ Init_ossl_dsa(void)
 
     rb_define_singleton_method(cDSA, "generate", ossl_dsa_s_generate, 1);
     rb_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
-    rb_define_copy_func(cDSA, ossl_dsa_initialize_copy);
 
     rb_define_method(cDSA, "public?", ossl_dsa_is_public, 0);
     rb_define_method(cDSA, "private?", ossl_dsa_is_private, 0);
@@ -656,15 +611,13 @@ Init_ossl_dsa(void)
     DEF_OSSL_PKEY_BN(cDSA, dsa, g);
     DEF_OSSL_PKEY_BN(cDSA, dsa, pub_key);
     DEF_OSSL_PKEY_BN(cDSA, dsa, priv_key);
-    rb_define_method(cDSA, "set_pqg", ossl_dsa_set_pqg, 3);
-    rb_define_method(cDSA, "set_key", ossl_dsa_set_key, 2);
 
     rb_define_method(cDSA, "params", ossl_dsa_get_params, 0);
 }
 
 #else /* defined NO_DSA */
 void
-Init_ossl_dsa(void)
+Init_ossl_dsa()
 {
 }
 #endif /* NO_DSA */
diff --git a/ext/openssl/ossl_pkey_ec.c b/ext/openssl/ossl_pkey_ec.c
index fc3f034a39..5e419bd167 100644
--- a/ext/openssl/ossl_pkey_ec.c
+++ b/ext/openssl/ossl_pkey_ec.c
@@ -6,51 +6,87 @@
 
 #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
 
-static const rb_data_type_t ossl_ec_group_type;
-static const rb_data_type_t ossl_ec_point_type;
 
 #define GetPKeyEC(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) { \
+    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_EC) { \
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A EC PKEY!"); \
     } \
 } while (0)
-#define GetEC(obj, key) do { \
-    EVP_PKEY *_pkey; \
-    GetPKeyEC(obj, _pkey); \
-    (key) = EVP_PKEY_get0_EC_KEY(_pkey); \
-} while (0)
-#define SafeGetEC(obj, key) do { \
-    OSSL_Check_Kind(obj, cEC); \
-    GetEC(obj, key); \
+
+#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) \
+        ossl_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 GetECGroup(obj, group) do { \
-    TypedData_Get_Struct(obj, EC_GROUP, &ossl_ec_group_type, group); \
+#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) \
+        ossl_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) \
-	ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
-} while (0)
-#define SafeGetECGroup(obj, group) do { \
+        ossl_raise(eEC_GROUP, "EC_GROUP is not initialized"); \
+} while(0)
+
+#define SafeRequire_EC_GROUP(obj, group) do { \
     OSSL_Check_Kind((obj), cEC_GROUP); \
-    GetECGroup(obj, group); \
-} while (0)
+    Require_EC_GROUP((obj), (group)); \
+} while(0)
 
-#define GetECPoint(obj, point) do { \
-    TypedData_Get_Struct(obj, EC_POINT, &ossl_ec_point_type, point); \
+#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) \
+        ossl_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) \
-	ossl_raise(eEC_POINT, "EC_POINT is not initialized"); \
-} while (0)
-#define SafeGetECPoint(obj, point) do { \
+        ossl_raise(eEC_POINT, "EC_POINT is not initialized"); \
+} while(0)
+
+#define SafeRequire_EC_POINT(obj, point) do { \
     OSSL_Check_Kind((obj), cEC_POINT); \
-    GetECPoint(obj, point); \
+    Require_EC_POINT((obj), (point)); \
 } while(0)
-#define GetECPointGroup(obj, group) do { \
-    VALUE _group = rb_attr_get(obj, id_i_group); \
-    SafeGetECGroup(_group, group); \
-} while (0)
 
 VALUE cEC;
 VALUE eECError;
@@ -70,11 +106,6 @@ static ID ID_uncompressed;
 static ID ID_compressed;
 static ID ID_hybrid;
 
-static ID id_i_group;
-
-static VALUE ec_group_new(const EC_GROUP *group);
-static VALUE ec_point_new(const EC_POINT *point, const EC_GROUP *group);
-
 static VALUE ec_instance(VALUE klass, EC_KEY *ec)
 {
     EVP_PKEY *pkey;
@@ -83,7 +114,6 @@ static VALUE ec_instance(VALUE klass, EC_KEY *ec)
     if (!ec) {
 	return Qfalse;
     }
-    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -91,7 +121,7 @@ static VALUE ec_instance(VALUE klass, EC_KEY *ec)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    SetPKey(obj, pkey);
+    WrapPKey(klass, obj, pkey);
 
     return obj;
 }
@@ -103,11 +133,10 @@ VALUE ossl_ec_new(EVP_PKEY *pkey)
     if (!pkey) {
 	obj = ec_instance(cEC, EC_KEY_new());
     } else {
-	obj = NewPKey(cEC);
-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_EC) {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_EC) {
 	    ossl_raise(rb_eTypeError, "Not a EC key!");
 	}
-	SetPKey(obj, pkey);
+	WrapPKey(cEC, obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eECError, NULL);
@@ -116,196 +145,168 @@ VALUE ossl_ec_new(EVP_PKEY *pkey)
     return obj;
 }
 
-/*
- * Creates a new EC_KEY on the EC group obj. arg can be an EC::Group or a String
- * representing an OID.
- */
-static EC_KEY *
-ec_key_new_from_group(VALUE arg)
-{
-    EC_KEY *ec;
-
-    if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
-	EC_GROUP *group;
-
-	SafeGetECGroup(arg, group);
-	if (!(ec = EC_KEY_new()))
-	    ossl_raise(eECError, NULL);
-
-	if (!EC_KEY_set_group(ec, group)) {
-	    EC_KEY_free(ec);
-	    ossl_raise(eECError, NULL);
-	}
-    } else {
-	int nid = OBJ_sn2nid(StringValueCStr(arg));
-
-	if (nid == NID_undef)
-	    ossl_raise(eECError, "invalid curve name");
-
-	if (!(ec = EC_KEY_new_by_curve_name(nid)))
-	    ossl_raise(eECError, NULL);
-
-	EC_KEY_set_asn1_flag(ec, OPENSSL_EC_NAMED_CURVE);
-	EC_KEY_set_conv_form(ec, POINT_CONVERSION_UNCOMPRESSED);
-    }
-
-    return ec;
-}
-
-/*
- *  call-seq:
- *     EC.generate(ec_group) -> ec
- *     EC.generate(string) -> ec
- *
- * Creates a new EC instance with a new random private and public key.
- */
-static VALUE
-ossl_ec_key_s_generate(VALUE klass, VALUE arg)
-{
-    EC_KEY *ec;
-    VALUE obj;
-
-    ec = ec_key_new_from_group(arg);
-
-    obj = ec_instance(klass, ec);
-    if (obj == Qfalse) {
-	EC_KEY_free(ec);
-	ossl_raise(eECError, NULL);
-    }
-
-    if (!EC_KEY_generate_key(ec))
-	ossl_raise(eECError, "EC_KEY_generate_key");
-
-    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 [, pwd])
- *   OpenSSL::PKey::EC.new(der_string)
+/*  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(pem_string [, pwd])
+ *     OpenSSL::PKey::EC.new(der_string)
  *
- * Creates a new EC object from given arguments.
+ *  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;
+    EC_KEY *ec = NULL;
     VALUE arg, pass;
+    VALUE group = Qnil;
+    char *passwd = NULL;
 
     GetPKey(self, pkey);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
+    if (pkey->pkey.ec)
         ossl_raise(eECError, "EC_KEY already initialized");
 
     rb_scan_args(argc, argv, "02", &arg, &pass);
 
     if (NIL_P(arg)) {
-        if (!(ec = EC_KEY_new()))
-	    ossl_raise(eECError, NULL);
-    } else if (rb_obj_is_kind_of(arg, cEC)) {
-	EC_KEY *other_ec = NULL;
-
-	SafeGetEC(arg, other_ec);
-	if (!(ec = EC_KEY_dup(other_ec)))
-	    ossl_raise(eECError, NULL);
-    } else if (rb_obj_is_kind_of(arg, cEC_GROUP)) {
-	ec = ec_key_new_from_group(arg);
+        ec = EC_KEY_new();
     } else {
-	BIO *in;
+        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);
 
-	pass = ossl_pem_passwd_value(pass);
-	in = ossl_obj2bio(arg);
+            if (!NIL_P(pass)) {
+		passwd = StringValuePtr(pass);
+	    }
+	    ec = PEM_read_bio_ECPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
+            if (!ec) {
+		OSSL_BIO_reset(in);
+		ec = PEM_read_bio_EC_PUBKEY(in, NULL, ossl_pem_passwd_cb, passwd);
+            }
+            if (!ec) {
+		OSSL_BIO_reset(in);
+                ec = d2i_ECPrivateKey_bio(in, NULL);
+            }
+            if (!ec) {
+		OSSL_BIO_reset(in);
+                ec = d2i_EC_PUBKEY_bio(in, NULL);
+            }
 
-	ec = PEM_read_bio_ECPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
-	if (!ec) {
-	    OSSL_BIO_reset(in);
-	    ec = PEM_read_bio_EC_PUBKEY(in, NULL, ossl_pem_passwd_cb, (void *)pass);
-	}
-	if (!ec) {
-	    OSSL_BIO_reset(in);
-	    ec = d2i_ECPrivateKey_bio(in, NULL);
-	}
-	if (!ec) {
-	    OSSL_BIO_reset(in);
-	    ec = d2i_EC_PUBKEY_bio(in, NULL);
-	}
-	BIO_free(in);
+            BIO_free(in);
 
-	if (!ec) {
-	    ossl_clear_error();
-	    ec = ec_key_new_from_group(arg);
-	}
+            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");
     }
 
-    return self;
-}
+    rb_iv_set(self, "@group", Qnil);
 
-static VALUE
-ossl_ec_key_initialize_copy(VALUE self, VALUE other)
-{
-    EVP_PKEY *pkey;
-    EC_KEY *ec, *ec_new;
-
-    GetPKey(self, pkey);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
-	ossl_raise(eECError, "EC already initialized");
-    SafeGetEC(other, ec);
-
-    ec_new = EC_KEY_dup(ec);
-    if (!ec_new)
-	ossl_raise(eECError, "EC_KEY_dup");
-    if (!EVP_PKEY_assign_EC_KEY(pkey, ec_new)) {
-	EC_KEY_free(ec_new);
-	ossl_raise(eECError, "EVP_PKEY_assign_EC_KEY");
-    }
+    if (!NIL_P(group))
+        rb_funcall(self, rb_intern("group="), 1, arg);
 
     return self;
 }
 
 /*
- * call-seq:
- *   key.group   => group
+ *  call-seq:
+ *     key.group   => group
  *
- * Returns the EC::Group that the key is associated with. Modifying the returned
- * group does not affect +key+.
+ *  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)
+static VALUE ossl_ec_key_get_group(VALUE self)
 {
+    VALUE group_v;
     EC_KEY *ec;
-    const EC_GROUP *group;
+    ossl_ec_group *ec_group;
+    EC_GROUP *group;
+
+    Require_EC_KEY(self, ec);
 
-    GetEC(self, ec);
-    group = EC_KEY_get0_group(ec);
-    if (!group)
-	return Qnil;
+    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 ec_group_new(group);
+    return Qnil;
 }
 
 /*
- * call-seq:
- *   key.group = group
+ *  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.
  *
- * Sets the EC::Group for the key. The group structure is internally copied so
- * modifition to +group+ after assigning to a key has no effect on the key.
+ *  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)
+static VALUE ossl_ec_key_set_group(VALUE self, VALUE group_v)
 {
+    VALUE old_group_v;
     EC_KEY *ec;
     EC_GROUP *group;
 
-    GetEC(self, ec);
-    SafeGetECGroup(group_v, 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");
@@ -324,7 +325,8 @@ static VALUE ossl_ec_key_get_private_key(VALUE self)
     EC_KEY *ec;
     const BIGNUM *bn;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
+
     if ((bn = EC_KEY_get0_private_key(ec)) == NULL)
         return Qnil;
 
@@ -342,7 +344,7 @@ static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE private_key)
     EC_KEY *ec;
     BIGNUM *bn = NULL;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
     if (!NIL_P(private_key))
         bn = GetBNPtr(private_key);
 
@@ -359,6 +361,26 @@ static VALUE ossl_ec_key_set_private_key(VALUE self, VALUE 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
@@ -369,12 +391,18 @@ static VALUE ossl_ec_key_get_public_key(VALUE self)
 {
     EC_KEY *ec;
     const EC_POINT *point;
+    VALUE group;
+
+    Require_EC_KEY(self, ec);
 
-    GetEC(self, ec);
     if ((point = EC_KEY_get0_public_key(ec)) == NULL)
         return Qnil;
 
-    return ec_point_new(point, EC_KEY_get0_group(ec));
+    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);
 }
 
 /*
@@ -388,9 +416,9 @@ static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
     EC_KEY *ec;
     EC_POINT *point = NULL;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
     if (!NIL_P(public_key))
-        SafeGetECPoint(public_key, point);
+        SafeRequire_EC_POINT(public_key, point);
 
     switch (EC_KEY_set_public_key(ec, point)) {
     case 1:
@@ -407,34 +435,32 @@ static VALUE ossl_ec_key_set_public_key(VALUE self, VALUE public_key)
 
 /*
  *  call-seq:
- *     key.public? => true or false
+ *     key.public_key? => true or false
  *
- *  Returns whether this EC instance has a public key. The public key
- *  (EC::Point) can be retrieved with EC#public_key.
+ *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
  */
-static VALUE ossl_ec_key_is_public(VALUE self)
+static VALUE ossl_ec_key_is_public_key(VALUE self)
 {
     EC_KEY *ec;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
 
-    return EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse;
+    return (EC_KEY_get0_public_key(ec) ? Qtrue : Qfalse);
 }
 
 /*
  *  call-seq:
- *     key.private? => true or false
+ *     key.private_key? => true or false
  *
- *  Returns whether this EC instance has a private key. The private key (BN) can
- *  be retrieved with EC#private_key.
+ *  Both public_key? and private_key? may return false at the same time unlike other PKey classes.
  */
-static VALUE ossl_ec_key_is_private(VALUE self)
+static VALUE ossl_ec_key_is_private_key(VALUE self)
 {
     EC_KEY *ec;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
 
-    return EC_KEY_get0_private_key(ec) ? Qtrue : Qfalse;
+    return (EC_KEY_get0_private_key(ec) ? Qtrue : Qfalse);
 }
 
 static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int format)
@@ -443,10 +469,10 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
     BIO *out;
     int i = -1;
     int private = 0;
+    char *password = NULL;
     VALUE str;
-    const EVP_CIPHER *cipher = NULL;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
 
     if (EC_KEY_get0_public_key(ec) == NULL)
         ossl_raise(eECError, "can't export - no public key set");
@@ -457,18 +483,26 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
     if (EC_KEY_get0_private_key(ec))
         private = 1;
 
-    if (!NIL_P(ciph)) {
-	cipher = GetCipherPtr(ciph);
-	pass = ossl_pem_passwd_value(pass);
-    }
-
     if (!(out = BIO_new(BIO_s_mem())))
         ossl_raise(eECError, "BIO_new(BIO_s_mem())");
 
     switch(format) {
     case EXPORT_PEM:
     	if (private) {
-            i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, ossl_pem_passwd_cb, (void *)pass);
+	    const EVP_CIPHER *cipher;
+	    if (!NIL_P(ciph)) {
+		cipher = GetCipherPtr(ciph);
+		if (!NIL_P(pass)) {
+		    StringValue(pass);
+		    if (RSTRING_LENINT(pass) < OSSL_MIN_PWD_LEN)
+			ossl_raise(eOSSLError, "OpenSSL requires passwords to be at least four characters long");
+		    password = RSTRING_PTR(pass);
+		}
+	    }
+	    else {
+		cipher = NULL;
+	    }
+            i = PEM_write_bio_ECPrivateKey(out, ec, cipher, NULL, 0, NULL, password);
     	} else {
             i = PEM_write_bio_EC_PUBKEY(out, ec);
         }
@@ -502,10 +536,12 @@ static VALUE ossl_ec_key_to_string(VALUE self, VALUE ciph, VALUE pass, int forma
  *     key.export([cipher, pass_phrase]) => String
  *     key.to_pem([cipher, pass_phrase]) => String
  *
- * Outputs the EC key in PEM encoding.  If +cipher+ and +pass_phrase+ are given
- * they will be used to encrypt the key.  +cipher+ must be an OpenSSL::Cipher
- * instance. Note that encryption will only be effective for a private key,
- * public keys will always be encoded in plain text.
+ * Outputs the EC key in PEM encoding.  If +cipher+ and +pass_phrase+ are
+ * given they will be used to encrypt the key.  +cipher+ must be an
+ * OpenSSL::Cipher::Cipher instance. Note that encryption will only be
+ * effective for a private key, public keys will always be encoded in plain
+ * text.
+ *
  */
 static VALUE ossl_ec_key_export(int argc, VALUE *argv, VALUE self)
 {
@@ -537,7 +573,7 @@ static VALUE ossl_ec_key_to_text(VALUE self)
     BIO *out;
     VALUE str;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eECError, "BIO_new(BIO_s_mem())");
     }
@@ -552,23 +588,16 @@ static VALUE ossl_ec_key_to_text(VALUE self)
 
 /*
  *  call-seq:
- *     key.generate_key!   => self
- *
- * Generates a new random private and public key.
+ *     key.generate_key   => self
  *
- * See also the OpenSSL documentation for EC_KEY_generate_key()
- *
- * === Example
- *   ec = OpenSSL::PKey::EC.new("prime256v1")
- *   p ec.private_key # => nil
- *   ec.generate_key!
- *   p ec.private_key # => #<OpenSSL::BN XXXXXX>
+ *  See the OpenSSL documentation for EC_KEY_generate_key()
  */
 static VALUE ossl_ec_key_generate_key(VALUE self)
 {
     EC_KEY *ec;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
+
     if (EC_KEY_generate_key(ec) != 1)
 	ossl_raise(eECError, "EC_KEY_generate_key");
 
@@ -587,7 +616,8 @@ static VALUE ossl_ec_key_check_key(VALUE self)
 {
     EC_KEY *ec;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
+
     if (EC_KEY_check_key(ec) != 1)
 	ossl_raise(eECError, "EC_KEY_check_key");
 
@@ -607,8 +637,8 @@ static VALUE ossl_ec_key_dh_compute_key(VALUE self, VALUE pubkey)
     int buf_len;
     VALUE str;
 
-    GetEC(self, ec);
-    SafeGetECPoint(pubkey, point);
+    Require_EC_KEY(self, ec);
+    SafeRequire_EC_POINT(pubkey, point);
 
 /* BUG: need a way to figure out the maximum string size */
     buf_len = 1024;
@@ -637,16 +667,17 @@ static VALUE ossl_ec_key_dsa_sign_asn1(VALUE self, VALUE data)
     unsigned int buf_len;
     VALUE str;
 
-    GetEC(self, ec);
+    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));
+    str = rb_str_new(0, ECDSA_size(ec) + 16);
     if (ECDSA_sign(0, (unsigned char *) RSTRING_PTR(data), RSTRING_LENINT(data), (unsigned char *) RSTRING_PTR(str), &buf_len, ec) != 1)
-	ossl_raise(eECError, "ECDSA_sign");
-    rb_str_set_len(str, buf_len);
+         ossl_raise(eECError, "ECDSA_sign");
+
+    rb_str_resize(str, buf_len);
 
     return str;
 }
@@ -661,7 +692,7 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
 {
     EC_KEY *ec;
 
-    GetEC(self, ec);
+    Require_EC_KEY(self, ec);
     StringValue(data);
     StringValue(sig);
 
@@ -676,72 +707,47 @@ static VALUE ossl_ec_key_dsa_verify_asn1(VALUE self, VALUE data, VALUE sig)
     UNREACHABLE;
 }
 
-/*
- * OpenSSL::PKey::EC::Group
- */
-static void
-ossl_ec_group_free(void *ptr)
-{
-    EC_GROUP_clear_free(ptr);
-}
-
-static const rb_data_type_t ossl_ec_group_type = {
-    "OpenSSL/ec_group",
-    {
-	0, ossl_ec_group_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static VALUE
-ossl_ec_group_alloc(VALUE klass)
+static void ossl_ec_group_free(ossl_ec_group *ec_group)
 {
-    return TypedData_Wrap_Struct(klass, &ossl_ec_group_type, NULL);
+    if (!ec_group->dont_free && ec_group->group)
+        EC_GROUP_clear_free(ec_group->group);
+    ruby_xfree(ec_group);
 }
 
-static VALUE
-ec_group_new(const EC_GROUP *group)
+static VALUE ossl_ec_group_alloc(VALUE klass)
 {
+    ossl_ec_group *ec_group;
     VALUE obj;
-    EC_GROUP *group_new;
 
-    obj = ossl_ec_group_alloc(cEC_GROUP);
-    group_new = EC_GROUP_dup(group);
-    if (!group_new)
-	ossl_raise(eEC_GROUP, "EC_GROUP_dup");
-    RTYPEDDATA_DATA(obj) = group_new;
+    obj = Data_Make_Struct(klass, ossl_ec_group, 0, ossl_ec_group_free, ec_group);
 
     return obj;
 }
 
-/*
- * call-seq:
- *   OpenSSL::PKey::EC::Group.new(ec_group)
- *   OpenSSL::PKey::EC::Group.new(pem_or_der_encoded)
- *   OpenSSL::PKey::EC::Group.new(ec_method)
- *   OpenSSL::PKey::EC::Group.new(:GFp, bignum_p, bignum_a, bignum_b)
- *   OpenSSL::PKey::EC::Group.new(:GF2m, bignum_p, bignum_a, bignum_b)
- *
- * Creates a new EC::Group object.
- *
- * +ec_method+ is a symbol that represents an EC_METHOD. Currently the following
- * are supported:
+/*  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)
  *
- * * :GFp_simple
- * * :GFp_mont
- * * :GFp_nist
- * * :GF2m_simple
- *
- * If the first argument is :GFp or :GF2m, creates a new curve with given
- * parameters.
+ *  See the OpenSSL documentation for EC_GROUP_*
  */
 static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 {
     VALUE arg1, arg2, arg3, arg4;
-    EC_GROUP *group;
+    ossl_ec_group *ec_group;
+    EC_GROUP *group = NULL;
 
-    TypedData_Get_Struct(self, EC_GROUP, &ossl_ec_group_type, group);
-    if (group)
+    Data_Get_Struct(self, ossl_ec_group, ec_group);
+    if (ec_group->group != NULL)
         ossl_raise(rb_eRuntimeError, "EC_GROUP is already initialized");
 
     switch (rb_scan_args(argc, argv, "13", &arg1, &arg2, &arg3, &arg4)) {
@@ -771,7 +777,7 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
         } else if (rb_obj_is_kind_of(arg1, cEC_GROUP)) {
             const EC_GROUP *arg1_group;
 
-            SafeGetECGroup(arg1, arg1_group);
+            SafeRequire_EC_GROUP(arg1, arg1_group);
             if ((group = EC_GROUP_dup(arg1_group)) == NULL)
                 ossl_raise(eEC_GROUP, "EC_GROUP_dup");
         } else {
@@ -789,13 +795,13 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
                 const char *name = StringValueCStr(arg1);
                 int nid = OBJ_sn2nid(name);
 
-		ossl_clear_error(); /* ignore errors in d2i_ECPKParameters_bio() */
+		(void)ERR_get_error();
                 if (nid == NID_undef)
-                    ossl_raise(eEC_GROUP, "unknown curve name (%"PRIsVALUE")", arg1);
+                    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 (%"PRIsVALUE")", arg1);
+                    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);
@@ -834,43 +840,23 @@ static VALUE ossl_ec_group_initialize(int argc, VALUE *argv, VALUE self)
 
     if (group == NULL)
         ossl_raise(eEC_GROUP, "");
-    RTYPEDDATA_DATA(self) = group;
-
-    return self;
-}
-
-static VALUE
-ossl_ec_group_initialize_copy(VALUE self, VALUE other)
-{
-    EC_GROUP *group, *group_new;
 
-    TypedData_Get_Struct(self, EC_GROUP, &ossl_ec_group_type, group_new);
-    if (group_new)
-	ossl_raise(eEC_GROUP, "EC::Group already initialized");
-    SafeGetECGroup(other, group);
-
-    group_new = EC_GROUP_dup(group);
-    if (!group_new)
-	ossl_raise(eEC_GROUP, "EC_GROUP_dup");
-    RTYPEDDATA_DATA(self) = group_new;
+    ec_group->group = group;
 
     return self;
 }
 
-/*
- * call-seq:
- *   group1.eql?(group2)   => true | false
- *   group1 == group2   => true | false
+/*  call-seq:
+ *     group1.eql?(group2)   => true | false
+ *     group1 == group2   => true | false
  *
- * Returns true if the two groups use the same curve and have the same
- * parameters, false otherwise.
  */
 static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
 {
     EC_GROUP *group1 = NULL, *group2 = NULL;
 
-    GetECGroup(a, group1);
-    SafeGetECGroup(b, group2);
+    Require_EC_GROUP(a, group1);
+    SafeRequire_EC_GROUP(b, group2);
 
     if (EC_GROUP_cmp(group1, group2, ossl_bn_ctx) == 1)
        return Qfalse;
@@ -878,35 +864,27 @@ static VALUE ossl_ec_group_eql(VALUE a, VALUE b)
     return Qtrue;
 }
 
-/*
- * call-seq:
- *   group.generator   => ec_point
- *
- * Returns the generator of the group.
+/*  call-seq:
+ *     group.generator   => ec_point
  *
- * See the OpenSSL documentation for EC_GROUP_get0_generator()
+ *  See the OpenSSL documentation for EC_GROUP_get0_generator()
  */
 static VALUE ossl_ec_group_get_generator(VALUE self)
 {
-    EC_GROUP *group;
-    const EC_POINT *generator;
+    VALUE point_obj;
+    EC_GROUP *group = NULL;
+
+    Require_EC_GROUP(self, group);
 
-    GetECGroup(self, group);
-    generator = EC_GROUP_get0_generator(group);
-    if (!generator)
-	return Qnil;
+    point_obj = ossl_ec_point_dup(EC_GROUP_get0_generator(group), self);
 
-    return ec_point_new(generator, group);
+    return point_obj;
 }
 
-/*
- * call-seq:
- *   group.set_generator(generator, order, cofactor)   => self
- *
- * Sets the curve parameters. +generator+ must be an instance of EC::Point that
- * is on the curve. +order+ and +cofactor+ are integers.
+/*  call-seq:
+ *     group.set_generator(generator, order, cofactor)   => self
  *
- * See the OpenSSL documentation for EC_GROUP_set_generator()
+ *  See the OpenSSL documentation for EC_GROUP_set_generator()
  */
 static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE order, VALUE cofactor)
 {
@@ -914,8 +892,8 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     const EC_POINT *point;
     const BIGNUM *o, *co;
 
-    GetECGroup(self, group);
-    SafeGetECPoint(generator, point);
+    Require_EC_GROUP(self, group);
+    SafeRequire_EC_POINT(generator, point);
     o = GetBNPtr(order);
     co = GetBNPtr(cofactor);
 
@@ -925,13 +903,10 @@ static VALUE ossl_ec_group_set_generator(VALUE self, VALUE generator, VALUE orde
     return self;
 }
 
-/*
- * call-seq:
- *   group.get_order   => order_bn
- *
- * Returns the order of the group.
+/*  call-seq:
+ *     group.get_order   => order_bn
  *
- * See the OpenSSL documentation for EC_GROUP_get_order()
+ *  See the OpenSSL documentation for EC_GROUP_get_order()
  */
 static VALUE ossl_ec_group_get_order(VALUE self)
 {
@@ -939,7 +914,7 @@ static VALUE ossl_ec_group_get_order(VALUE self)
     BIGNUM *bn;
     EC_GROUP *group = NULL;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
 
     bn_obj = ossl_bn_new(NULL);
     bn = GetBNPtr(bn_obj);
@@ -950,13 +925,10 @@ static VALUE ossl_ec_group_get_order(VALUE self)
     return bn_obj;
 }
 
-/*
- * call-seq:
- *   group.get_cofactor   => cofactor_bn
- *
- * Returns the cofactor of the group.
+/*  call-seq:
+ *     group.get_cofactor   => cofactor_bn
  *
- * See the OpenSSL documentation for EC_GROUP_get_cofactor()
+ *  See the OpenSSL documentation for EC_GROUP_get_cofactor()
  */
 static VALUE ossl_ec_group_get_cofactor(VALUE self)
 {
@@ -964,7 +936,7 @@ static VALUE ossl_ec_group_get_cofactor(VALUE self)
     BIGNUM *bn;
     EC_GROUP *group = NULL;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
 
     bn_obj = ossl_bn_new(NULL);
     bn = GetBNPtr(bn_obj);
@@ -975,20 +947,17 @@ static VALUE ossl_ec_group_get_cofactor(VALUE self)
     return bn_obj;
 }
 
-/*
- * call-seq:
- *   group.curve_name  => String
- *
- * Returns the curve name (sn).
+/*  call-seq:
+ *     group.curve_name  => String
  *
- * See the OpenSSL documentation for EC_GROUP_get_curve_name()
+ *  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;
 
-    GetECGroup(self, group);
+    Get_EC_GROUP(self, group);
     if (group == NULL)
         return Qnil;
 
@@ -998,14 +967,10 @@ static VALUE ossl_ec_group_get_curve_name(VALUE self)
     return rb_str_new2(OBJ_nid2sn(nid));
 }
 
-/*
- * call-seq:
- *   EC.builtin_curves => [[sn, comment], ...]
- *
- * Obtains a list of all predefined curves by the OpenSSL. Curve names are
- * returned as sn.
+/*  call-seq:
+ *     EC.builtin_curves => [[name, comment], ...]
  *
- * See the OpenSSL documentation for EC_get_builtin_curves().
+ *  See the OpenSSL documentation for EC_builtin_curves()
  */
 static VALUE ossl_s_builtin_curves(VALUE self)
 {
@@ -1035,56 +1000,43 @@ static VALUE ossl_s_builtin_curves(VALUE self)
     return ret;
 }
 
-/*
- * call-seq:
- *   group.asn1_flag -> Integer
- *
- * Returns the flags set on the group.
+/*  call-seq:
+ *     group.asn1_flag  => Fixnum
  *
- * See also #asn1_flag=.
+ *  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;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
+
     flag = EC_GROUP_get_asn1_flag(group);
 
-    return INT2NUM(flag);
+    return INT2FIX(flag);
 }
 
-/*
- * call-seq:
- *   group.asn1_flag = flags
- *
- * Sets flags on the group. The flag value is used to determine how to encode
- * the group: encode explicit parameters or named curve using an OID.
- *
- * The flag value can be either of:
+/*  call-seq:
+ *     group.asn1_flag = Fixnum   => Fixnum
  *
- * * EC::NAMED_CURVE
- * * EC::EXPLICIT_CURVE
- *
- * See the OpenSSL documentation for EC_GROUP_set_asn1_flag().
+ *  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;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
+
     EC_GROUP_set_asn1_flag(group, NUM2INT(flag_v));
 
     return flag_v;
 }
 
-/*
- * call-seq:
- *   group.point_conversion_form -> Symbol
- *
- * Returns the form how EC::Point data is encoded as ASN.1.
+/*  call-seq:
+ *     group.point_conversion_form  => :uncompressed | :compressed | :hybrid
  *
- * See also #point_conversion_form=.
+ *  See the OpenSSL documentation for EC_GROUP_get_point_conversion_form()
  */
 static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
 {
@@ -1092,7 +1044,8 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
     point_conversion_form_t form;
     VALUE ret;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
+
     form = EC_GROUP_get_point_conversion_form(group);
 
     switch (form) {
@@ -1105,67 +1058,46 @@ static VALUE ossl_ec_group_get_point_conversion_form(VALUE self)
    return ID2SYM(ret);
 }
 
-static point_conversion_form_t
-parse_point_conversion_form_symbol(VALUE sym)
-{
-    ID id = SYM2ID(sym);
-
-    if (id == ID_uncompressed)
-	return POINT_CONVERSION_UNCOMPRESSED;
-    else if (id == ID_compressed)
-	return POINT_CONVERSION_COMPRESSED;
-    else if (id == ID_hybrid)
-	return POINT_CONVERSION_HYBRID;
-    else
-	ossl_raise(rb_eArgError, "unsupported point conversion form %+"PRIsVALUE
-		   " (expected :compressed, :uncompressed, or :hybrid)", sym);
-}
-
-/*
- * call-seq:
- *   group.point_conversion_form = form
- *
- * Sets the form how EC::Point data is encoded as ASN.1 as defined in X9.62.
- *
- * +format+ can be one of these:
- *
- * :compressed::
- *   Encoded as z||x, where z is an octet indicating which solution of the
- *   equation y is. z will be 0x02 or 0x03.
- * :uncompressed::
- *   Encoded as z||x||y, where z is an octet 0x04.
- * :hybrid::
- *   Encodes as z||x||y, where z is an octet indicating which solution of the
- *   equation y is. z will be 0x06 or 0x07.
+/*  call-seq:
+ *     group.point_conversion_form = form => form
  *
- * See the OpenSSL documentation for EC_GROUP_set_point_conversion_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)
+static VALUE ossl_ec_group_set_point_conversion_form(VALUE self, VALUE form_v)
 {
-    EC_GROUP *group;
+    EC_GROUP *group = NULL;
     point_conversion_form_t form;
+    ID form_id = SYM2ID(form_v);
+
+    Require_EC_GROUP(self, group);
 
-    GetECGroup(self, group);
-    form = parse_point_conversion_form_symbol(form_v);
+    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 {
+        ossl_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
+/*  call-seq:
+ *     group.seed   => String or nil
  *
- * See the OpenSSL documentation for EC_GROUP_get0_seed()
+ *  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;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
+
     seed_len = EC_GROUP_get_seed_len(group);
 
     if (seed_len == 0)
@@ -1174,17 +1106,16 @@ static VALUE ossl_ec_group_get_seed(VALUE self)
     return rb_str_new((const char *)EC_GROUP_get0_seed(group), seed_len);
 }
 
-/*
- * call-seq:
- *   group.seed = seed  => seed
+/*  call-seq:
+ *     group.seed = seed  => seed
  *
- * See the OpenSSL documentation for EC_GROUP_set_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;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
     StringValue(seed);
 
     if (EC_GROUP_set_seed(group, (unsigned char *)RSTRING_PTR(seed), RSTRING_LEN(seed)) != (size_t)RSTRING_LEN(seed))
@@ -1195,17 +1126,16 @@ static VALUE ossl_ec_group_set_seed(VALUE self, VALUE seed)
 
 /* get/set curve GFp, GF2m */
 
-/*
- * call-seq:
- *   group.degree   => integer
+/*  call-seq:
+ *     group.degree   => Fixnum
  *
- * See the OpenSSL documentation for EC_GROUP_get_degree()
+ *  See the OpenSSL documentation for EC_GROUP_get_degree()
  */
 static VALUE ossl_ec_group_get_degree(VALUE self)
 {
     EC_GROUP *group = NULL;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
 
     return INT2NUM(EC_GROUP_get_degree(group));
 }
@@ -1217,7 +1147,7 @@ static VALUE ossl_ec_group_to_string(VALUE self, int format)
     int i = -1;
     VALUE str;
 
-    GetECGroup(self, group);
+    Get_EC_GROUP(self, group);
 
     if (!(out = BIO_new(BIO_s_mem())))
         ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
@@ -1244,9 +1174,8 @@ static VALUE ossl_ec_group_to_string(VALUE self, int format)
     return str;
 }
 
-/*
- * call-seq:
- *   group.to_pem   => String
+/*  call-seq:
+ *     group.to_pem   => String
  *
  *  See the OpenSSL documentation for PEM_write_bio_ECPKParameters()
  */
@@ -1255,22 +1184,20 @@ static VALUE ossl_ec_group_to_pem(VALUE self)
     return ossl_ec_group_to_string(self, EXPORT_PEM);
 }
 
-/*
- * call-seq:
- *   group.to_der   => String
+/*  call-seq:
+ *     group.to_der   => String
  *
- * See the OpenSSL documentation for i2d_ECPKParameters_bio()
+ *  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
+/*  call-seq:
+ *     group.to_text   => String
  *
- * See the OpenSSL documentation for ECPKParameters_print()
+ *  See the OpenSSL documentation for ECPKParameters_print()
  */
 static VALUE ossl_ec_group_to_text(VALUE self)
 {
@@ -1278,7 +1205,7 @@ static VALUE ossl_ec_group_to_text(VALUE self)
     BIO *out;
     VALUE str;
 
-    GetECGroup(self, group);
+    Require_EC_GROUP(self, group);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eEC_GROUP, "BIO_new(BIO_s_mem())");
     }
@@ -1292,62 +1219,41 @@ static VALUE ossl_ec_group_to_text(VALUE self)
 }
 
 
-/*
- * OpenSSL::PKey::EC::Point
- */
-static void
-ossl_ec_point_free(void *ptr)
-{
-    EC_POINT_clear_free(ptr);
-}
-
-static const rb_data_type_t ossl_ec_point_type = {
-    "OpenSSL/EC_POINT",
-    {
-	0, ossl_ec_point_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
-static VALUE
-ossl_ec_point_alloc(VALUE klass)
+static void ossl_ec_point_free(ossl_ec_point *ec_point)
 {
-    return TypedData_Wrap_Struct(klass, &ossl_ec_point_type, NULL);
+    if (!ec_point->dont_free && ec_point->point)
+        EC_POINT_clear_free(ec_point->point);
+    ruby_xfree(ec_point);
 }
 
-static VALUE
-ec_point_new(const EC_POINT *point, const EC_GROUP *group)
+static VALUE ossl_ec_point_alloc(VALUE klass)
 {
-    EC_POINT *point_new;
+    ossl_ec_point *ec_point;
     VALUE obj;
 
-    obj = ossl_ec_point_alloc(cEC_POINT);
-    point_new = EC_POINT_dup(point, group);
-    if (!point_new)
-	ossl_raise(eEC_POINT, "EC_POINT_dup");
-    RTYPEDDATA_DATA(obj) = point_new;
-    rb_ivar_set(obj, id_i_group, ec_group_new(group));
+    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)
+ *  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_*
+ *  See the OpenSSL documentation for EC_POINT_*
  */
 static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
 {
-    EC_POINT *point;
+    ossl_ec_point *ec_point;
+    EC_POINT *point = NULL;
     VALUE arg1, arg2;
     VALUE group_v = Qnil;
     const EC_GROUP *group = NULL;
 
-    TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point);
-    if (point)
+    Data_Get_Struct(self, ossl_ec_point, ec_point);
+    if (ec_point->point)
         ossl_raise(eEC_POINT, "EC_POINT already initialized");
 
     switch (rb_scan_args(argc, argv, "11", &arg1, &arg2)) {
@@ -1355,14 +1261,14 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
         if (rb_obj_is_kind_of(arg1, cEC_POINT)) {
             const EC_POINT *arg_point;
 
-	    group_v = rb_attr_get(arg1, id_i_group);
-	    SafeGetECGroup(group_v, group);
-	    SafeGetECPoint(arg1, 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;
-            SafeGetECGroup(group_v, group);
+            SafeRequire_EC_GROUP(group_v, group);
 
             point = EC_POINT_new(group);
         } else {
@@ -1374,7 +1280,7 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
         if (!rb_obj_is_kind_of(arg1, cEC_GROUP))
             ossl_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
         group_v = arg1;
-        SafeGetECGroup(group_v, group);
+        SafeRequire_EC_GROUP(group_v, group);
 
         if (rb_obj_is_kind_of(arg2, cBN)) {
             const BIGNUM *bn = GetBNPtr(arg2);
@@ -1402,54 +1308,32 @@ static VALUE ossl_ec_point_initialize(int argc, VALUE *argv, VALUE self)
     if (NIL_P(group_v))
         ossl_raise(rb_eRuntimeError, "missing group (internal error)");
 
-    RTYPEDDATA_DATA(self) = point;
-    rb_ivar_set(self, id_i_group, group_v);
-
-    return self;
-}
+    ec_point->point = point;
 
-static VALUE
-ossl_ec_point_initialize_copy(VALUE self, VALUE other)
-{
-    EC_POINT *point, *point_new;
-    EC_GROUP *group;
-    VALUE group_v;
-
-    TypedData_Get_Struct(self, EC_POINT, &ossl_ec_point_type, point_new);
-    if (point_new)
-	ossl_raise(eEC_POINT, "EC::Point already initialized");
-    SafeGetECPoint(other, point);
-
-    group_v = rb_obj_dup(rb_attr_get(other, id_i_group));
-    SafeGetECGroup(group_v, group);
-
-    point_new = EC_POINT_dup(point, group);
-    if (!point_new)
-	ossl_raise(eEC_POINT, "EC_POINT_dup");
-    RTYPEDDATA_DATA(self) = point_new;
-    rb_ivar_set(self, id_i_group, group_v);
+    rb_iv_set(self, "@group", group_v);
 
     return self;
 }
 
 /*
- * call-seq:
- *   point1.eql?(point2) => true | false
- *   point1 == point2 => true | false
+ *  call-seq:
+ *     point1.eql?(point2) => true | false
+ *     point1 == point2 => true | false
+ *
  */
 static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
 {
     EC_POINT *point1, *point2;
-    VALUE group_v1 = rb_attr_get(a, id_i_group);
-    VALUE group_v2 = rb_attr_get(b, id_i_group);
+    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;
 
-    GetECPoint(a, point1);
-    SafeGetECPoint(b, point2);
-    SafeGetECGroup(group_v1, group);
+    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;
@@ -1458,16 +1342,18 @@ static VALUE ossl_ec_point_eql(VALUE a, VALUE b)
 }
 
 /*
- * call-seq:
- *   point.infinity? => true | false
+ *  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;
 
-    GetECPoint(self, point);
-    GetECPointGroup(self, group);
+    Require_EC_POINT(self, point);
+    SafeRequire_EC_GROUP(group_v, group);
 
     switch (EC_POINT_is_at_infinity(group, point)) {
     case 1: return Qtrue;
@@ -1479,16 +1365,18 @@ static VALUE ossl_ec_point_is_at_infinity(VALUE self)
 }
 
 /*
- * call-seq:
- *   point.on_curve? => true | false
+ *  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;
 
-    GetECPoint(self, point);
-    GetECPointGroup(self, 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;
@@ -1500,16 +1388,18 @@ static VALUE ossl_ec_point_is_on_curve(VALUE self)
 }
 
 /*
- * call-seq:
- *   point.make_affine! => self
+ *  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;
 
-    GetECPoint(self, point);
-    GetECPointGroup(self, 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");
@@ -1518,16 +1408,18 @@ static VALUE ossl_ec_point_make_affine(VALUE self)
 }
 
 /*
- * call-seq:
- *   point.invert! => 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;
 
-    GetECPoint(self, point);
-    GetECPointGroup(self, 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");
@@ -1536,16 +1428,18 @@ static VALUE ossl_ec_point_invert(VALUE self)
 }
 
 /*
- * call-seq:
- *   point.set_to_infinity! => 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;
 
-    GetECPoint(self, point);
-    GetECPointGroup(self, 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");
@@ -1554,31 +1448,24 @@ static VALUE ossl_ec_point_set_to_infinity(VALUE self)
 }
 
 /*
- * call-seq:
- *   point.to_bn(conversion_form = nil) => OpenSSL::BN
- *
- * Convert the EC point into an octet string and store in an OpenSSL::BN. If
- * +conversion_form+ is given, the point data is converted using the specified
- * form. If not given, the default form set in the EC::Group object is used.
+ *  call-seq:
+ *     point.to_bn   => OpenSSL::BN
  *
- * See also EC::Point#point_conversion_form=.
+ *  See the OpenSSL documentation for EC_POINT_point2bn()
  */
-static VALUE
-ossl_ec_point_to_bn(int argc, VALUE *argv, VALUE self)
+static VALUE ossl_ec_point_to_bn(VALUE self)
 {
     EC_POINT *point;
-    VALUE form_obj, bn_obj;
+    VALUE bn_obj;
+    VALUE group_v = rb_iv_get(self, "@group");
     const EC_GROUP *group;
     point_conversion_form_t form;
     BIGNUM *bn;
 
-    GetECPoint(self, point);
-    GetECPointGroup(self, group);
-    rb_scan_args(argc, argv, "01", &form_obj);
-    if (NIL_P(form_obj))
-	form = EC_GROUP_get_point_conversion_form(group);
-    else
-	form = parse_point_conversion_form_symbol(form_obj);
+    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);
@@ -1590,116 +1477,94 @@ ossl_ec_point_to_bn(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * call-seq:
- *   point.mul(bn1 [, bn2]) => point
- *   point.mul(bns, points [, bn2]) => point
- *
- * Performs elliptic curve point multiplication.
- *
- * The first form calculates <tt>bn1 * point + bn2 * G</tt>, where +G+ is the
- * generator of the group of +point+. +bn2+ may be ommitted, and in that case,
- * the result is just <tt>bn1 * point</tt>.
- *
- * The second form calculates <tt>bns[0] * point + bns[1] * points[0] + ...
- * + bns[-1] * points[-1] + bn2 * G</tt>. +bn2+ may be ommitted. +bns+ must be
- * an array of OpenSSL::BN. +points+ must be an array of
- * OpenSSL::PKey::EC::Point. Please note that <tt>points[0]</tt> is not
- * multiplied by <tt>bns[0]</tt>, but <tt>bns[1]</tt>.
+ *  call-seq:
+ *     point.mul(bn)  => point
+ *     point.mul(bn, bn) => point
+ *     point.mul([bn], [point]) => point
+ *     point.mul([bn], [point], bn) => point
  */
 static VALUE ossl_ec_point_mul(int argc, VALUE *argv, VALUE self)
 {
-    EC_POINT *point_self, *point_result;
+    EC_POINT *point1, *point2;
     const EC_GROUP *group;
-    VALUE group_v = rb_attr_get(self, id_i_group);
-    VALUE arg1, arg2, arg3, result;
-    const BIGNUM *bn_g = NULL;
+    VALUE group_v = rb_iv_get(self, "@group");
+    VALUE bn_v1, bn_v2, r, points_v;
+    BIGNUM *bn1 = NULL, *bn2 = NULL;
 
-    GetECPoint(self, point_self);
-    SafeGetECGroup(group_v, group);
+    Require_EC_POINT(self, point1);
+    SafeRequire_EC_GROUP(group_v, group);
 
-    result = rb_obj_alloc(cEC_POINT);
-    ossl_ec_point_initialize(1, &group_v, result);
-    GetECPoint(result, point_result);
+    r = rb_obj_alloc(cEC_POINT);
+    ossl_ec_point_initialize(1, &group_v, r);
+    Require_EC_POINT(r, point2);
 
-    rb_scan_args(argc, argv, "12", &arg1, &arg2, &arg3);
-    if (!RB_TYPE_P(arg1, T_ARRAY)) {
-	BIGNUM *bn = GetBNPtr(arg1);
+    argc = rb_scan_args(argc, argv, "12", &bn_v1, &points_v, &bn_v2);
 
-	if (!NIL_P(arg2))
-	    bn_g = GetBNPtr(arg2);
-	if (EC_POINT_mul(group, point_result, bn_g, point_self, bn, ossl_bn_ctx) != 1)
-	    ossl_raise(eEC_POINT, NULL);
+    if (rb_obj_is_kind_of(bn_v1, cBN)) {
+        bn1 = GetBNPtr(bn_v1);
+        if (argc >= 2) {
+            bn2 = GetBNPtr(points_v);
+        }
+        if (EC_POINT_mul(group, point2, bn2, point1, bn1, ossl_bn_ctx) != 1)
+            ossl_raise(eEC_POINT, "Multiplication failed");
     } else {
-	/*
-	 * bignums | arg1[0] | arg1[1] | arg1[2] | ...
-	 * points  | self    | arg2[0] | arg2[1] | ...
-	 */
-	long i, num;
-	VALUE bns_tmp, tmp_p, tmp_b;
-	const EC_POINT **points;
-	const BIGNUM **bignums;
-
-	Check_Type(arg1, T_ARRAY);
-	Check_Type(arg2, T_ARRAY);
-	if (RARRAY_LEN(arg1) != RARRAY_LEN(arg2) + 1) /* arg2 must be 1 larger */
-	    ossl_raise(rb_eArgError, "bns must be 1 longer than points; see the documentation");
-
-	num = RARRAY_LEN(arg1);
-	bns_tmp = rb_ary_tmp_new(num);
-	bignums = ALLOCV_N(const BIGNUM *, tmp_b, num);
-	for (i = 0; i < num; i++) {
-	    VALUE item = RARRAY_AREF(arg1, i);
-	    bignums[i] = GetBNPtr(item);
-	    rb_ary_push(bns_tmp, item);
-	}
+        size_t i, points_len, bignums_len;
+        const EC_POINT **points;
+        const BIGNUM **bignums;
 
-	points = ALLOCV_N(const EC_POINT *, tmp_p, num);
-	points[0] = point_self; /* self */
-	for (i = 0; i < num - 1; i++)
-	    SafeGetECPoint(RARRAY_AREF(arg2, i), points[i + 1]);
+        Check_Type(bn_v1, T_ARRAY);
+        bignums_len = RARRAY_LEN(bn_v1);
+        bignums = (const BIGNUM **)OPENSSL_malloc(bignums_len * (int)sizeof(BIGNUM *));
 
-	if (!NIL_P(arg3))
-	    bn_g = GetBNPtr(arg3);
+        for (i = 0; i < bignums_len; ++i) {
+            bignums[i] = GetBNPtr(rb_ary_entry(bn_v1, i));
+        }
 
-	if (EC_POINTs_mul(group, point_result, bn_g, num, points, bignums, ossl_bn_ctx) != 1) {
-	    ALLOCV_END(tmp_b);
-	    ALLOCV_END(tmp_p);
-	    ossl_raise(eEC_POINT, NULL);
-	}
+        if (!rb_obj_is_kind_of(points_v, rb_cArray)) {
+            OPENSSL_free((void *)bignums);
+            rb_raise(rb_eTypeError, "Argument2 must be an array");
+        }
+
+        rb_ary_unshift(points_v, self);
+        points_len = RARRAY_LEN(points_v);
+        points = (const EC_POINT **)OPENSSL_malloc(points_len * (int)sizeof(EC_POINT *));
 
-	ALLOCV_END(tmp_b);
-	ALLOCV_END(tmp_p);
+        for (i = 0; i < points_len; ++i) {
+            Get_EC_POINT(rb_ary_entry(points_v, i), points[i]);
+        }
+
+        if (argc >= 3) {
+            bn2 = GetBNPtr(bn_v2);
+        }
+        if (EC_POINTs_mul(group, point2, bn2, points_len, points, bignums, ossl_bn_ctx) != 1) {
+            OPENSSL_free((void *)bignums);
+            OPENSSL_free((void *)points);
+            ossl_raise(eEC_POINT, "Multiplication failed");
+        }
+        OPENSSL_free((void *)bignums);
+        OPENSSL_free((void *)points);
     }
 
-    return result;
+    return r;
+}
+
+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(void)
+void Init_ossl_ec()
 {
-#if 0
+#ifdef DONT_NEED_RDOC_WORKAROUND
+    mOSSL = rb_define_module("OpenSSL");
     mPKey = rb_define_module_under(mOSSL, "PKey");
-    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     eECError = rb_define_class_under(mPKey, "ECError", ePKeyError);
 
-    /*
-     * Document-class: OpenSSL::PKey::EC
-     *
-     * OpenSSL::PKey::EC provides access to Elliptic Curve Digital Signature
-     * Algorithm (ECDSA) and Elliptic Curve Diffie-Hellman (ECDH).
-     *
-     * === Key exchange
-     *   ec1 = OpenSSL::PKey::EC.generate("prime256v1")
-     *   ec2 = OpenSSL::PKey::EC.generate("prime256v1")
-     *   # ec1 and ec2 have own private key respectively
-     *   shared_key1 = ec1.dh_compute_key(ec2.public_key)
-     *   shared_key2 = ec2.dh_compute_key(ec1.public_key)
-     *
-     *   p shared_key1 == shared_key2 #=> true
-     */
     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);
@@ -1717,16 +1582,13 @@ void Init_ossl_ec(void)
     ID_compressed = rb_intern("compressed");
     ID_hybrid = rb_intern("hybrid");
 
-    rb_define_const(cEC, "NAMED_CURVE", INT2NUM(OPENSSL_EC_NAMED_CURVE));
-#if defined(OPENSSL_EC_EXPLICIT_CURVE)
-    rb_define_const(cEC, "EXPLICIT_CURVE", INT2NUM(OPENSSL_EC_EXPLICIT_CURVE));
+#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_singleton_method(cEC, "generate", ossl_ec_key_s_generate, 1);
     rb_define_method(cEC, "initialize", ossl_ec_key_initialize, -1);
-    rb_define_copy_func(cEC, ossl_ec_key_initialize_copy);
 /* copy/dup/cmp */
 
     rb_define_method(cEC, "group", ossl_ec_key_get_group, 0);
@@ -1735,10 +1597,8 @@ void Init_ossl_ec(void)
     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?", ossl_ec_key_is_private, 0);
-    rb_define_method(cEC, "public?", ossl_ec_key_is_public, 0);
-    rb_define_alias(cEC, "private_key?", "private?");
-    rb_define_alias(cEC, "public_key?", "public?");
+    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
@@ -1746,8 +1606,7 @@ void Init_ossl_ec(void)
     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_alias(cEC, "generate_key", "generate_key!");
+    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);
@@ -1763,7 +1622,6 @@ void Init_ossl_ec(void)
 
     rb_define_alloc_func(cEC_GROUP, ossl_ec_group_alloc);
     rb_define_method(cEC_GROUP, "initialize", ossl_ec_group_initialize, -1);
-    rb_define_copy_func(cEC_GROUP, ossl_ec_group_initialize_copy);
     rb_define_method(cEC_GROUP, "eql?", ossl_ec_group_eql, 1);
     rb_define_alias(cEC_GROUP, "==", "eql?");
 /* copy/dup/cmp */
@@ -1799,7 +1657,6 @@ void Init_ossl_ec(void)
 
     rb_define_alloc_func(cEC_POINT, ossl_ec_point_alloc);
     rb_define_method(cEC_POINT, "initialize", ossl_ec_point_initialize, -1);
-    rb_define_copy_func(cEC_POINT, ossl_ec_point_initialize_copy);
     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?");
@@ -1811,14 +1668,16 @@ void Init_ossl_ec(void)
     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, -1);
+    rb_define_method(cEC_POINT, "to_bn", ossl_ec_point_to_bn, 0);
     rb_define_method(cEC_POINT, "mul", ossl_ec_point_mul, -1);
 
-    id_i_group = rb_intern("@group");
+    no_copy(cEC);
+    no_copy(cEC_GROUP);
+    no_copy(cEC_POINT);
 }
 
 #else /* defined NO_EC */
-void Init_ossl_ec(void)
+void Init_ossl_ec()
 {
 }
 #endif /* NO_EC */
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index cea228d6d8..4c346a042f 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -1,42 +1,26 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
-#include "ossl.h"
-
 #if !defined(OPENSSL_NO_RSA)
 
+#include "ossl.h"
+
 #define GetPKeyRSA(obj, pkey) do { \
     GetPKey((obj), (pkey)); \
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA) { /* PARANOIA? */ \
+    if (EVP_PKEY_type((pkey)->type) != EVP_PKEY_RSA) { /* PARANOIA? */ \
 	ossl_raise(rb_eRuntimeError, "THIS IS NOT A RSA!") ; \
     } \
 } while (0)
-#define GetRSA(obj, rsa) do { \
-    EVP_PKEY *_pkey; \
-    GetPKeyRSA((obj), _pkey); \
-    (rsa) = EVP_PKEY_get0_RSA(_pkey); \
-} while (0)
 
-static inline int
-RSA_HAS_PRIVATE(RSA *rsa)
-{
-    const BIGNUM *p, *q;
-
-    RSA_get0_factors(rsa, &p, &q);
-    return p && q; /* d? why? */
-}
-
-static inline int
-RSA_PRIVATE(VALUE obj, RSA *rsa)
-{
-    return RSA_HAS_PRIVATE(rsa) || OSSL_PKEY_IS_PRIVATE(obj);
-}
+#define RSA_HAS_PRIVATE(rsa) ((rsa)->p && (rsa)->q)
+#define RSA_PRIVATE(obj,rsa) (RSA_HAS_PRIVATE(rsa)||OSSL_PKEY_IS_PRIVATE(obj))
 
 /*
  * Classes
@@ -56,7 +40,6 @@ rsa_instance(VALUE klass, RSA *rsa)
     if (!rsa) {
 	return Qfalse;
     }
-    obj = NewPKey(klass);
     if (!(pkey = EVP_PKEY_new())) {
 	return Qfalse;
     }
@@ -64,7 +47,7 @@ rsa_instance(VALUE klass, RSA *rsa)
 	EVP_PKEY_free(pkey);
 	return Qfalse;
     }
-    SetPKey(obj, pkey);
+    WrapPKey(klass, obj, pkey);
 
     return obj;
 }
@@ -78,11 +61,10 @@ ossl_rsa_new(EVP_PKEY *pkey)
 	obj = rsa_instance(cRSA, RSA_new());
     }
     else {
-	obj = NewPKey(cRSA);
-	if (EVP_PKEY_base_id(pkey) != EVP_PKEY_RSA) {
+	if (EVP_PKEY_type(pkey->type) != EVP_PKEY_RSA) {
 	    ossl_raise(rb_eTypeError, "Not a RSA key!");
 	}
-	SetPKey(obj, pkey);
+	WrapPKey(cRSA, obj, pkey);
     }
     if (obj == Qfalse) {
 	ossl_raise(eRSAError, NULL);
@@ -94,6 +76,7 @@ ossl_rsa_new(EVP_PKEY *pkey)
 /*
  * Private
  */
+#if defined(HAVE_RSA_GENERATE_KEY_EX) && HAVE_BN_GENCB
 struct rsa_blocking_gen_arg {
     RSA *rsa;
     BIGNUM *e;
@@ -109,41 +92,42 @@ rsa_blocking_gen(void *arg)
     gen->result = RSA_generate_key_ex(gen->rsa, gen->size, gen->e, gen->cb);
     return 0;
 }
+#endif
 
 static RSA *
 rsa_generate(int size, unsigned long exp)
 {
+#if defined(HAVE_RSA_GENERATE_KEY_EX) && HAVE_BN_GENCB
     int i;
-    struct ossl_generate_cb_arg cb_arg = { 0 };
+    BN_GENCB cb;
+    struct ossl_generate_cb_arg cb_arg;
     struct rsa_blocking_gen_arg gen_arg;
     RSA *rsa = RSA_new();
     BIGNUM *e = BN_new();
-    BN_GENCB *cb = BN_GENCB_new();
 
-    if (!rsa || !e || !cb) {
-	RSA_free(rsa);
-	BN_free(e);
-	BN_GENCB_free(cb);
-	return NULL;
+    if (!rsa || !e) {
+	if (e) BN_free(e);
+	if (rsa) RSA_free(rsa);
+	return 0;
     }
     for (i = 0; i < (int)sizeof(exp) * 8; ++i) {
 	if (exp & (1UL << i)) {
 	    if (BN_set_bit(e, i) == 0) {
 		BN_free(e);
 		RSA_free(rsa);
-		BN_GENCB_free(cb);
-		return NULL;
+		return 0;
 	    }
 	}
     }
 
+    memset(&cb_arg, 0, sizeof(struct ossl_generate_cb_arg));
     if (rb_block_given_p())
 	cb_arg.yield = 1;
-    BN_GENCB_set(cb, ossl_generate_cb_2, &cb_arg);
+    BN_GENCB_set(&cb, ossl_generate_cb_2, &cb_arg);
     gen_arg.rsa = rsa;
     gen_arg.e = e;
     gen_arg.size = size;
-    gen_arg.cb = cb;
+    gen_arg.cb = &cb;
     if (cb_arg.yield == 1) {
 	/* we cannot release GVL when callback proc is supplied */
 	rsa_blocking_gen(&gen_arg);
@@ -151,20 +135,18 @@ rsa_generate(int size, unsigned long exp)
 	/* there's a chance to unblock */
 	rb_thread_call_without_gvl(rsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
     }
-
-    BN_GENCB_free(cb);
-    BN_free(e);
     if (!gen_arg.result) {
+	BN_free(e);
 	RSA_free(rsa);
-	if (cb_arg.state) {
-	    /* must clear OpenSSL error stack */
-	    ossl_clear_error();
-	    rb_jump_tag(cb_arg.state);
-	}
-	return NULL;
+	if (cb_arg.state) rb_jump_tag(cb_arg.state);
+	return 0;
     }
 
+    BN_free(e);
     return rsa;
+#else
+    return RSA_generate_key(size, exp, rb_block_given_p() ? ossl_generate_cb : NULL, NULL);
+#endif
 }
 
 /*
@@ -223,21 +205,22 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     EVP_PKEY *pkey;
     RSA *rsa;
     BIO *in;
+    char *passwd = NULL;
     VALUE arg, pass;
 
     GetPKey(self, pkey);
     if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
 	rsa = RSA_new();
     }
-    else if (RB_INTEGER_TYPE_P(arg)) {
-	rsa = rsa_generate(NUM2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
+    else if (FIXNUM_P(arg)) {
+	rsa = rsa_generate(FIX2INT(arg), NIL_P(pass) ? RSA_F4 : NUM2ULONG(pass));
 	if (!rsa) ossl_raise(eRSAError, NULL);
     }
     else {
-	pass = ossl_pem_passwd_value(pass);
+	if (!NIL_P(pass)) passwd = StringValuePtr(pass);
 	arg = ossl_to_der_if_possible(arg);
 	in = ossl_obj2bio(arg);
-	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, (void *)pass);
+	rsa = PEM_read_bio_RSAPrivateKey(in, NULL, ossl_pem_passwd_cb, passwd);
 	if (!rsa) {
 	    OSSL_BIO_reset(in);
 	    rsa = PEM_read_bio_RSA_PUBKEY(in, NULL, NULL, NULL);
@@ -271,26 +254,6 @@ ossl_rsa_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-ossl_rsa_initialize_copy(VALUE self, VALUE other)
-{
-    EVP_PKEY *pkey;
-    RSA *rsa, *rsa_new;
-
-    GetPKey(self, pkey);
-    if (EVP_PKEY_base_id(pkey) != EVP_PKEY_NONE)
-	ossl_raise(eRSAError, "RSA already initialized");
-    GetRSA(other, rsa);
-
-    rsa_new = ASN1_dup((i2d_of_void *)i2d_RSAPrivateKey, (d2i_of_void *)d2i_RSAPrivateKey, (char *)rsa);
-    if (!rsa_new)
-	ossl_raise(eRSAError, "ASN1_dup");
-
-    EVP_PKEY_assign_RSA(pkey, rsa_new);
-
-    return self;
-}
-
 /*
  * call-seq:
  *   rsa.public? => true
@@ -301,13 +264,12 @@ ossl_rsa_initialize_copy(VALUE self, VALUE other)
 static VALUE
 ossl_rsa_is_public(VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
 
-    GetRSA(self, rsa);
+    GetPKeyRSA(self, pkey);
     /*
      * This method should check for n and e.  BUG.
      */
-    (void)rsa;
     return Qtrue;
 }
 
@@ -320,11 +282,11 @@ ossl_rsa_is_public(VALUE self)
 static VALUE
 ossl_rsa_is_private(VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
 
-    GetRSA(self, rsa);
+    GetPKeyRSA(self, pkey);
 
-    return RSA_PRIVATE(self, rsa) ? Qtrue : Qfalse;
+    return (RSA_PRIVATE(self, pkey->pkey.rsa)) ? Qtrue : Qfalse;
 }
 
 /*
@@ -335,35 +297,41 @@ ossl_rsa_is_private(VALUE self)
  *
  * Outputs this keypair in PEM encoding.  If +cipher+ and +pass_phrase+ are
  * given they will be used to encrypt the key.  +cipher+ must be an
- * OpenSSL::Cipher instance.
+ * OpenSSL::Cipher::Cipher instance.
  */
 static VALUE
 ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
     BIO *out;
     const EVP_CIPHER *ciph = NULL;
+    char *passwd = NULL;
     VALUE cipher, pass, str;
 
-    GetRSA(self, rsa);
+    GetPKeyRSA(self, pkey);
 
     rb_scan_args(argc, argv, "02", &cipher, &pass);
 
     if (!NIL_P(cipher)) {
 	ciph = GetCipherPtr(cipher);
-	pass = ossl_pem_passwd_value(pass);
+	if (!NIL_P(pass)) {
+	    StringValue(pass);
+	    if (RSTRING_LENINT(pass) < OSSL_MIN_PWD_LEN)
+		ossl_raise(eOSSLError, "OpenSSL requires passwords to be at least four characters long");
+	    passwd = RSTRING_PTR(pass);
+	}
     }
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eRSAError, NULL);
     }
-    if (RSA_HAS_PRIVATE(rsa)) {
-	if (!PEM_write_bio_RSAPrivateKey(out, rsa, ciph, NULL, 0,
-					 ossl_pem_passwd_cb, (void *)pass)) {
+    if (RSA_HAS_PRIVATE(pkey->pkey.rsa)) {
+	if (!PEM_write_bio_RSAPrivateKey(out, pkey->pkey.rsa, ciph,
+					 NULL, 0, ossl_pem_passwd_cb, passwd)) {
 	    BIO_free(out);
 	    ossl_raise(eRSAError, NULL);
 	}
     } else {
-	if (!PEM_write_bio_RSA_PUBKEY(out, rsa)) {
+	if (!PEM_write_bio_RSA_PUBKEY(out, pkey->pkey.rsa)) {
 	    BIO_free(out);
 	    ossl_raise(eRSAError, NULL);
 	}
@@ -382,28 +350,30 @@ ossl_rsa_export(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_to_der(VALUE self)
 {
-    RSA *rsa;
-    int (*i2d_func)(const RSA *, unsigned char **);
+    EVP_PKEY *pkey;
+    int (*i2d_func)_((const RSA*, unsigned char**));
     unsigned char *p;
     long len;
     VALUE str;
 
-    GetRSA(self, rsa);
-    if (RSA_HAS_PRIVATE(rsa))
+    GetPKeyRSA(self, pkey);
+    if(RSA_HAS_PRIVATE(pkey->pkey.rsa))
 	i2d_func = i2d_RSAPrivateKey;
     else
-	i2d_func = (int (*)(const RSA *, unsigned char **))i2d_RSA_PUBKEY;
-    if((len = i2d_func(rsa, NULL)) <= 0)
+	i2d_func = (int (*)(const RSA*, unsigned char**))i2d_RSA_PUBKEY;
+    if((len = i2d_func(pkey->pkey.rsa, NULL)) <= 0)
 	ossl_raise(eRSAError, NULL);
     str = rb_str_new(0, len);
     p = (unsigned char *)RSTRING_PTR(str);
-    if(i2d_func(rsa, &p) < 0)
+    if(i2d_func(pkey->pkey.rsa, &p) < 0)
 	ossl_raise(eRSAError, NULL);
     ossl_str_adjust(str, p);
 
     return str;
 }
 
+#define ossl_rsa_buf_size(pkey) (RSA_size((pkey)->pkey.rsa)+16)
+
 /*
  * call-seq:
  *   rsa.public_encrypt(string)          => String
@@ -415,21 +385,18 @@ ossl_rsa_to_der(VALUE self)
 static VALUE
 ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
 {
-    RSA *rsa;
-    const BIGNUM *rsa_n;
+    EVP_PKEY *pkey;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetRSA(self, rsa);
-    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
-    if (!rsa_n)
-	ossl_raise(eRSAError, "incomplete RSA");
+    GetPKeyRSA(self, pkey);
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
     buf_len = RSA_public_encrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), rsa, pad);
+				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -447,21 +414,18 @@ ossl_rsa_public_encrypt(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
 {
-    RSA *rsa;
-    const BIGNUM *rsa_n;
+    EVP_PKEY *pkey;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetRSA(self, rsa);
-    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
-    if (!rsa_n)
-	ossl_raise(eRSAError, "incomplete RSA");
+    GetPKeyRSA(self, pkey);
     rb_scan_args(argc, argv, "11", &buffer, &padding);
     pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
     StringValue(buffer);
-    str = rb_str_new(0, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
     buf_len = RSA_public_decrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				 (unsigned char *)RSTRING_PTR(str), rsa, pad);
+				 (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				 pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -479,23 +443,21 @@ ossl_rsa_public_decrypt(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
 {
-    RSA *rsa;
-    const BIGNUM *rsa_n;
+    EVP_PKEY *pkey;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetRSA(self, rsa);
-    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
-    if (!rsa_n)
-	ossl_raise(eRSAError, "incomplete RSA");
-    if (!RSA_PRIVATE(self, rsa))
+    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, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
     buf_len = RSA_private_encrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), rsa, pad);
+				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -513,23 +475,21 @@ ossl_rsa_private_encrypt(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 {
-    RSA *rsa;
-    const BIGNUM *rsa_n;
+    EVP_PKEY *pkey;
     int buf_len, pad;
     VALUE str, buffer, padding;
 
-    GetRSA(self, rsa);
-    RSA_get0_key(rsa, &rsa_n, NULL, NULL);
-    if (!rsa_n)
-	ossl_raise(eRSAError, "incomplete RSA");
-    if (!RSA_PRIVATE(self, rsa))
+    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, RSA_size(rsa));
+    str = rb_str_new(0, ossl_rsa_buf_size(pkey));
     buf_len = RSA_private_decrypt(RSTRING_LENINT(buffer), (unsigned char *)RSTRING_PTR(buffer),
-				  (unsigned char *)RSTRING_PTR(str), rsa, pad);
+				  (unsigned char *)RSTRING_PTR(str), pkey->pkey.rsa,
+				  pad);
     if (buf_len < 0) ossl_raise(eRSAError, NULL);
     rb_str_set_len(str, buf_len);
 
@@ -550,24 +510,21 @@ ossl_rsa_private_decrypt(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_rsa_get_params(VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
     VALUE hash;
-    const BIGNUM *n, *e, *d, *p, *q, *dmp1, *dmq1, *iqmp;
 
-    GetRSA(self, rsa);
-    RSA_get0_key(rsa, &n, &e, &d);
-    RSA_get0_factors(rsa, &p, &q);
-    RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
+    GetPKeyRSA(self, pkey);
 
     hash = rb_hash_new();
-    rb_hash_aset(hash, rb_str_new2("n"), ossl_bn_new(n));
-    rb_hash_aset(hash, rb_str_new2("e"), ossl_bn_new(e));
-    rb_hash_aset(hash, rb_str_new2("d"), ossl_bn_new(d));
-    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(p));
-    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(q));
-    rb_hash_aset(hash, rb_str_new2("dmp1"), ossl_bn_new(dmp1));
-    rb_hash_aset(hash, rb_str_new2("dmq1"), ossl_bn_new(dmq1));
-    rb_hash_aset(hash, rb_str_new2("iqmp"), ossl_bn_new(iqmp));
+
+    rb_hash_aset(hash, rb_str_new2("n"), ossl_bn_new(pkey->pkey.rsa->n));
+    rb_hash_aset(hash, rb_str_new2("e"), ossl_bn_new(pkey->pkey.rsa->e));
+    rb_hash_aset(hash, rb_str_new2("d"), ossl_bn_new(pkey->pkey.rsa->d));
+    rb_hash_aset(hash, rb_str_new2("p"), ossl_bn_new(pkey->pkey.rsa->p));
+    rb_hash_aset(hash, rb_str_new2("q"), ossl_bn_new(pkey->pkey.rsa->q));
+    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;
 }
@@ -585,15 +542,15 @@ ossl_rsa_get_params(VALUE self)
 static VALUE
 ossl_rsa_to_text(VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
     BIO *out;
     VALUE str;
 
-    GetRSA(self, rsa);
+    GetPKeyRSA(self, pkey);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eRSAError, NULL);
     }
-    if (!RSA_print(out, rsa, 0)) { /* offset = 0 */
+    if (!RSA_print(out, pkey->pkey.rsa, 0)) { /* offset = 0 */
 	BIO_free(out);
 	ossl_raise(eRSAError, NULL);
     }
@@ -617,8 +574,8 @@ ossl_rsa_to_public_key(VALUE self)
 
     GetPKeyRSA(self, pkey);
     /* err check performed by rsa_instance */
-    rsa = RSAPublicKey_dup(EVP_PKEY_get0_RSA(pkey));
-    obj = rsa_instance(rb_obj_class(self), rsa);
+    rsa = RSAPublicKey_dup(pkey->pkey.rsa);
+    obj = rsa_instance(CLASS_OF(self), rsa);
     if (obj == Qfalse) {
 	RSA_free(rsa);
 	ossl_raise(eRSAError, NULL);
@@ -632,11 +589,11 @@ ossl_rsa_to_public_key(VALUE self)
 static VALUE
 ossl_rsa_blinding_on(VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
 
-    GetRSA(self, rsa);
+    GetPKeyRSA(self, pkey);
 
-    if (RSA_blinding_on(rsa, ossl_bn_ctx) != 1) {
+    if (RSA_blinding_on(pkey->pkey.rsa, ossl_bn_ctx) != 1) {
 	ossl_raise(eRSAError, NULL);
     }
     return self;
@@ -645,54 +602,35 @@ ossl_rsa_blinding_on(VALUE self)
 static VALUE
 ossl_rsa_blinding_off(VALUE self)
 {
-    RSA *rsa;
+    EVP_PKEY *pkey;
 
-    GetRSA(self, rsa);
-    RSA_blinding_off(rsa);
+    GetPKeyRSA(self, pkey);
+    RSA_blinding_off(pkey->pkey.rsa);
 
     return self;
 }
  */
 
-/*
- * Document-method: OpenSSL::PKey::RSA#set_key
- * call-seq:
- *   rsa.set_key(n, e, d) -> self
- *
- * Sets +n+, +e+, +d+ for the RSA instance.
- */
-OSSL_PKEY_BN_DEF3(rsa, RSA, key, n, e, d)
-/*
- * Document-method: OpenSSL::PKey::RSA#set_factors
- * call-seq:
- *   rsa.set_factors(p, q) -> self
- *
- * Sets +p+, +q+ for the RSA instance.
- */
-OSSL_PKEY_BN_DEF2(rsa, RSA, factors, p, q)
-/*
- * Document-method: OpenSSL::PKey::RSA#set_crt_params
- * call-seq:
- *   rsa.set_crt_params(dmp1, dmq1, iqmp) -> self
- *
- * Sets +dmp1+, +dmq1+, +iqmp+ for the RSA instance. They are calculated by
- * <tt>d mod (p - 1)</tt>, <tt>d mod (q - 1)</tt> and <tt>q^(-1) mod p</tt>
- * respectively.
- */
-OSSL_PKEY_BN_DEF3(rsa, RSA, crt_params, dmp1, dmq1, 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
  */
-#define DefRSAConst(x) rb_define_const(cRSA, #x, INT2NUM(RSA_##x))
+#define DefRSAConst(x) rb_define_const(cRSA, #x,INT2FIX(RSA_##x))
 
 void
-Init_ossl_rsa(void)
+Init_ossl_rsa()
 {
 #if 0
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL and mPKey */
     mPKey = rb_define_module_under(mOSSL, "PKey");
-    cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-    ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
 #endif
 
     /* Document-class: OpenSSL::PKey::RSAError
@@ -717,7 +655,6 @@ Init_ossl_rsa(void)
 
     rb_define_singleton_method(cRSA, "generate", ossl_rsa_s_generate, -1);
     rb_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
-    rb_define_copy_func(cRSA, ossl_rsa_initialize_copy);
 
     rb_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
     rb_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
@@ -740,9 +677,6 @@ Init_ossl_rsa(void)
     DEF_OSSL_PKEY_BN(cRSA, rsa, dmp1);
     DEF_OSSL_PKEY_BN(cRSA, rsa, dmq1);
     DEF_OSSL_PKEY_BN(cRSA, rsa, iqmp);
-    rb_define_method(cRSA, "set_key", ossl_rsa_set_key, 3);
-    rb_define_method(cRSA, "set_factors", ossl_rsa_set_factors, 2);
-    rb_define_method(cRSA, "set_crt_params", ossl_rsa_set_crt_params, 3);
 
     rb_define_method(cRSA, "params", ossl_rsa_get_params, 0);
 
@@ -760,7 +694,8 @@ Init_ossl_rsa(void)
 
 #else /* defined NO_RSA */
 void
-Init_ossl_rsa(void)
+Init_ossl_rsa()
 {
 }
 #endif /* NO_RSA */
+
diff --git a/ext/openssl/ossl_rand.c b/ext/openssl/ossl_rand.c
index 688c525afa..270a4b7437 100644
--- a/ext/openssl/ossl_rand.c
+++ b/ext/openssl/ossl_rand.c
@@ -1,22 +1,37 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
- *
  * All rights reserved.
- *
- * This program is licensed under the same licence as Ruby.
+ */
+/*
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
+/*
+ * Classes
+ */
 VALUE mRandom;
 VALUE eRandomError;
 
 /*
+ * Struct
+ */
+
+/*
+ * Public
+ */
+
+/*
+ * Private
+ */
+
+/*
  *  call-seq:
  *     seed(str) -> str
  *
- * ::seed is equivalent to ::add where +entropy+ is length of +str+.
  */
 static VALUE
 ossl_rand_seed(VALUE self, VALUE str)
@@ -31,23 +46,6 @@ ossl_rand_seed(VALUE self, VALUE str)
  *  call-seq:
  *     add(str, entropy) -> self
  *
- * Mixes the bytes from +str+ into the Pseudo Random Number Generator(PRNG)
- * state.
- *
- * Thus, if the data from +str+ are unpredictable to an adversary, this
- * increases the uncertainty about the state and makes the PRNG output less
- * predictable.
- *
- * The +entropy+ argument is (the lower bound of) an estimate of how much
- * randomness is contained in +str+, measured in bytes.
- *
- * === Example
- *
- *    pid = $$
- *    now = Time.now
- *    ary = [now.to_i, now.nsec, 1000, pid]
- *    OpenSSL::Random.add(ary.join, 0.0)
- *    OpenSSL::Random.seed(ary.join)
  */
 static VALUE
 ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
@@ -62,14 +60,13 @@ ossl_rand_add(VALUE self, VALUE str, VALUE entropy)
  *  call-seq:
  *     load_random_file(filename) -> true
  *
- * Reads bytes from +filename+ and adds them to the PRNG.
  */
 static VALUE
 ossl_rand_load_file(VALUE self, VALUE filename)
 {
-    rb_check_safe_obj(filename);
+    SafeStringValue(filename);
 
-    if(!RAND_load_file(StringValueCStr(filename), -1)) {
+    if(!RAND_load_file(RSTRING_PTR(filename), -1)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
@@ -79,16 +76,12 @@ ossl_rand_load_file(VALUE self, VALUE filename)
  *  call-seq:
  *     write_random_file(filename) -> true
  *
- * Writes a number of random generated bytes (currently 1024) to +filename+
- * which can be used to initialize the PRNG by calling ::load_random_file in a
- * later session.
  */
 static VALUE
 ossl_rand_write_file(VALUE self, VALUE filename)
 {
-    rb_check_safe_obj(filename);
-
-    if (RAND_write_file(StringValueCStr(filename)) == -1) {
+    SafeStringValue(filename);
+    if (RAND_write_file(RSTRING_PTR(filename)) == -1) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
@@ -96,48 +89,27 @@ ossl_rand_write_file(VALUE self, VALUE filename)
 
 /*
  *  call-seq:
- *	random_bytes(length) -> string
+ *     random_bytes(length) -> aString
  *
- * Generates +string+ with +length+ number of cryptographically strong
- * pseudo-random bytes.
- *
- * === Example
- *
- *    OpenSSL::Random.random_bytes(12)
- *    #=> "..."
  */
 static VALUE
 ossl_rand_bytes(VALUE self, VALUE len)
 {
     VALUE str;
     int n = NUM2INT(len);
-    int ret;
 
     str = rb_str_new(0, n);
-    ret = RAND_bytes((unsigned char *)RSTRING_PTR(str), n);
-    if (ret == 0) {
-	ossl_raise(eRandomError, "RAND_bytes");
-    } else if (ret == -1) {
-	ossl_raise(eRandomError, "RAND_bytes is not supported");
+    if (!RAND_bytes((unsigned char *)RSTRING_PTR(str), n)) {
+	ossl_raise(eRandomError, NULL);
     }
 
     return str;
 }
 
-#if defined(HAVE_RAND_PSEUDO_BYTES)
 /*
  *  call-seq:
- *	pseudo_bytes(length) -> string
- *
- * Generates +string+ with +length+ number of pseudo-random bytes.
+ *     pseudo_bytes(length) -> aString
  *
- * Pseudo-random byte sequences generated by ::pseudo_bytes will be unique if
- * they are of sufficient length, but are not necessarily unpredictable.
- *
- * === Example
- *
- *    OpenSSL::Random.pseudo_bytes(12)
- *    #=> "..."
  */
 static VALUE
 ossl_rand_pseudo_bytes(VALUE self, VALUE len)
@@ -146,27 +118,24 @@ ossl_rand_pseudo_bytes(VALUE self, VALUE len)
     int n = NUM2INT(len);
 
     str = rb_str_new(0, n);
-    if (RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n) < 1) {
+    if (!RAND_pseudo_bytes((unsigned char *)RSTRING_PTR(str), n)) {
 	ossl_raise(eRandomError, NULL);
     }
 
     return str;
 }
-#endif
 
-#ifdef HAVE_RAND_EGD
 /*
  *  call-seq:
  *     egd(filename) -> true
  *
- * Same as ::egd_bytes but queries 255 bytes by default.
  */
 static VALUE
 ossl_rand_egd(VALUE self, VALUE filename)
 {
-    rb_check_safe_obj(filename);
+    SafeStringValue(filename);
 
-    if (RAND_egd(StringValueCStr(filename)) == -1) {
+    if(!RAND_egd(RSTRING_PTR(filename))) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
@@ -176,24 +145,19 @@ ossl_rand_egd(VALUE self, VALUE filename)
  *  call-seq:
  *     egd_bytes(filename, length) -> true
  *
- * Queries the entropy gathering daemon EGD on socket path given by +filename+.
- *
- * Fetches +length+ number of bytes and uses ::add to seed the OpenSSL built-in
- * PRNG.
  */
 static VALUE
 ossl_rand_egd_bytes(VALUE self, VALUE filename, VALUE len)
 {
     int n = NUM2INT(len);
 
-    rb_check_safe_obj(filename);
+    SafeStringValue(filename);
 
-    if (RAND_egd_bytes(StringValueCStr(filename), n) == -1) {
+    if (!RAND_egd_bytes(RSTRING_PTR(filename), n)) {
 	ossl_raise(eRandomError, NULL);
     }
     return Qtrue;
 }
-#endif /* HAVE_RAND_EGD */
 
 /*
  *  call-seq:
@@ -207,32 +171,32 @@ 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));
+
 /*
  * INIT
  */
 void
-Init_ossl_rand(void)
+Init_ossl_rand()
 {
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
     mRandom = rb_define_module_under(mOSSL, "Random");
 
     eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
 
-    rb_define_module_function(mRandom, "seed", ossl_rand_seed, 1);
-    rb_define_module_function(mRandom, "random_add", ossl_rand_add, 2);
-    rb_define_module_function(mRandom, "load_random_file", ossl_rand_load_file, 1);
-    rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
-    rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
-#if defined(HAVE_RAND_PSEUDO_BYTES)
-    rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
-#endif
-#ifdef HAVE_RAND_EGD
-    rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
-    rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
-#endif /* HAVE_RAND_EGD */
-    rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
+    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, "status?", ossl_rand_status, 0)
 }
+
diff --git a/ext/openssl/ossl_rand.h b/ext/openssl/ossl_rand.h
index 8f77a3b239..ce2ae0d129 100644
--- a/ext/openssl/ossl_rand.h
+++ b/ext/openssl/ossl_rand.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_RAND_H_)
@@ -16,3 +17,4 @@ extern VALUE eRandomError;
 void Init_ossl_rand(void);
 
 #endif /* _OSSL_RAND_H_ */
+
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index eef7dbece6..d37e51c857 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -1,4 +1,5 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2000-2002  GOTOU Yuuzou <gotoyuzo@notwork.org>
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
@@ -6,11 +7,15 @@
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
+#if defined(HAVE_UNISTD_H)
+#  include <unistd.h> /* for read(), and write() */
+#endif
+
 #define numberof(ary) (int)(sizeof(ary)/sizeof((ary)[0]))
 
 #ifdef _WIN32
@@ -19,126 +24,155 @@
 #  define TO_SOCKET(s) (s)
 #endif
 
-#define GetSSLCTX(obj, ctx) do { \
-	TypedData_Get_Struct((obj), SSL_CTX, &ossl_sslctx_type, (ctx));	\
-} while (0)
-
 VALUE mSSL;
-static VALUE mSSLExtConfig;
-static VALUE eSSLError;
+VALUE eSSLError;
 VALUE cSSLContext;
 VALUE cSSLSocket;
 
 static VALUE eSSLErrorWaitReadable;
 static VALUE eSSLErrorWaitWritable;
 
-static ID ID_callback_state, id_tmp_dh_callback, id_tmp_ecdh_callback,
-	  id_npn_protocols_encoded;
-static VALUE sym_exception, sym_wait_readable, sym_wait_writable;
+#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))
+#define ossl_sslctx_set_ca_file(o,v)     	rb_iv_set((o),"@ca_file",(v))
+#define ossl_sslctx_set_ca_path(o,v)     	rb_iv_set((o),"@ca_path",(v))
+#define ossl_sslctx_set_timeout(o,v)     	rb_iv_set((o),"@timeout",(v))
+#define ossl_sslctx_set_verify_mode(o,v) 	rb_iv_set((o),"@verify_mode",(v))
+#define ossl_sslctx_set_verify_dep(o,v)  	rb_iv_set((o),"@verify_depth",(v))
+#define ossl_sslctx_set_verify_cb(o,v)   	rb_iv_set((o),"@verify_callback",(v))
+#define ossl_sslctx_set_options(o,v)     	rb_iv_set((o),"@options",(v))
+#define ossl_sslctx_set_cert_store(o,v)  	rb_iv_set((o),"@cert_store",(v))
+#define ossl_sslctx_set_extra_cert(o,v)  	rb_iv_set((o),"@extra_chain_cert",(v))
+#define ossl_sslctx_set_client_cert_cb(o,v) 	rb_iv_set((o),"@client_cert_cb",(v))
+#define ossl_sslctx_set_tmp_dh_cb(o,v)   	rb_iv_set((o),"@tmp_dh_callback",(v))
+#define ossl_sslctx_set_sess_id_ctx(o, v) 	rb_iv_set((o),"@session_id_context",(v))
+
+#define ossl_sslctx_get_cert(o)          	rb_iv_get((o),"@cert")
+#define ossl_sslctx_get_key(o)           	rb_iv_get((o),"@key")
+#define ossl_sslctx_get_client_ca(o)     	rb_iv_get((o),"@client_ca")
+#define ossl_sslctx_get_ca_file(o)       	rb_iv_get((o),"@ca_file")
+#define ossl_sslctx_get_ca_path(o)       	rb_iv_get((o),"@ca_path")
+#define ossl_sslctx_get_timeout(o)       	rb_iv_get((o),"@timeout")
+#define ossl_sslctx_get_verify_mode(o)   	rb_iv_get((o),"@verify_mode")
+#define ossl_sslctx_get_verify_dep(o)    	rb_iv_get((o),"@verify_depth")
+#define ossl_sslctx_get_verify_cb(o)     	rb_iv_get((o),"@verify_callback")
+#define ossl_sslctx_get_options(o)       	rb_iv_get((o),"@options")
+#define ossl_sslctx_get_cert_store(o)    	rb_iv_get((o),"@cert_store")
+#define ossl_sslctx_get_extra_cert(o)    	rb_iv_get((o),"@extra_chain_cert")
+#define ossl_sslctx_get_client_cert_cb(o) 	rb_iv_get((o),"@client_cert_cb")
+#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 const char *ossl_sslctx_attrs[] = {
+    "cert", "key", "client_ca", "ca_file", "ca_path",
+    "timeout", "verify_mode", "verify_depth", "renegotiation_cb",
+    "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
+#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
+    "npn_protocols",
+    "npn_select_cb",
+#endif
+};
+
+#define ossl_ssl_get_io(o)           rb_iv_get((o),"@io")
+#define ossl_ssl_get_ctx(o)          rb_iv_get((o),"@context")
+#define ossl_ssl_get_sync_close(o)   rb_iv_get((o),"@sync_close")
+#define ossl_ssl_get_x509(o)         rb_iv_get((o),"@x509")
+#define ossl_ssl_get_key(o)          rb_iv_get((o),"@key")
+#define ossl_ssl_get_tmp_dh(o)       rb_iv_get((o),"@tmp_dh")
+
+#define ossl_ssl_set_io(o,v)         rb_iv_set((o),"@io",(v))
+#define ossl_ssl_set_ctx(o,v)        rb_iv_set((o),"@context",(v))
+#define ossl_ssl_set_sync_close(o,v) rb_iv_set((o),"@sync_close",(v))
+#define ossl_ssl_set_x509(o,v)       rb_iv_set((o),"@x509",(v))
+#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 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;
 
-static ID id_i_cert_store, id_i_ca_file, id_i_ca_path, id_i_verify_mode,
-	  id_i_verify_depth, id_i_verify_callback, id_i_client_ca,
-	  id_i_renegotiation_cb, id_i_cert, id_i_key, id_i_extra_chain_cert,
-	  id_i_client_cert_cb, id_i_tmp_ecdh_callback, id_i_timeout,
-	  id_i_session_id_context, id_i_session_get_cb, id_i_session_new_cb,
-	  id_i_session_remove_cb, id_i_npn_select_cb, id_i_npn_protocols,
-	  id_i_alpn_select_cb, id_i_alpn_protocols, id_i_servername_cb,
-	  id_i_verify_hostname;
-static ID id_i_io, id_i_context, id_i_hostname;
+static VALUE sym_exception;
 
 /*
  * SSLContext class
  */
 static const struct {
     const char *name;
-    SSL_METHOD *(*func)(void); /* FIXME: constify when dropping 0.9.8 */
-    int version;
+    SSL_METHOD *(*func)(void);
 } ossl_ssl_method_tab[] = {
-#if defined(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION)
-#define OSSL_SSL_METHOD_ENTRY(name, version) \
-    { #name,          (SSL_METHOD *(*)(void))TLS_method, version }, \
-    { #name"_server", (SSL_METHOD *(*)(void))TLS_server_method, version }, \
-    { #name"_client", (SSL_METHOD *(*)(void))TLS_client_method, version }
-#else
-#define OSSL_SSL_METHOD_ENTRY(name, version) \
-    { #name,          (SSL_METHOD *(*)(void))name##_method, version }, \
-    { #name"_server", (SSL_METHOD *(*)(void))name##_server_method, version }, \
-    { #name"_client", (SSL_METHOD *(*)(void))name##_client_method, version }
-#endif
-#if defined(HAVE_SSLV2_METHOD)
-    OSSL_SSL_METHOD_ENTRY(SSLv2, SSL2_VERSION),
+#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_TLSV1_2_METHOD) && defined(HAVE_TLSV1_2_SERVER_METHOD) && \
+        defined(HAVE_TLSV1_2_CLIENT_METHOD)
+    OSSL_SSL_METHOD_ENTRY(TLSv1_2),
+    OSSL_SSL_METHOD_ENTRY(TLSv1_2_server),
+    OSSL_SSL_METHOD_ENTRY(TLSv1_2_client),
 #endif
-#if defined(HAVE_SSLV3_METHOD)
-    OSSL_SSL_METHOD_ENTRY(SSLv3, SSL3_VERSION),
+#if defined(HAVE_TLSV1_1_METHOD) && defined(HAVE_TLSV1_1_SERVER_METHOD) && \
+        defined(HAVE_TLSV1_1_CLIENT_METHOD)
+    OSSL_SSL_METHOD_ENTRY(TLSv1_1),
+    OSSL_SSL_METHOD_ENTRY(TLSv1_1_server),
+    OSSL_SSL_METHOD_ENTRY(TLSv1_1_client),
 #endif
-    OSSL_SSL_METHOD_ENTRY(TLSv1, TLS1_VERSION),
-#if defined(HAVE_TLSV1_1_METHOD)
-    OSSL_SSL_METHOD_ENTRY(TLSv1_1, TLS1_1_VERSION),
+#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
-#if defined(HAVE_TLSV1_2_METHOD)
-    OSSL_SSL_METHOD_ENTRY(TLSv1_2, TLS1_2_VERSION),
-#endif
-    OSSL_SSL_METHOD_ENTRY(SSLv23, 0),
+    OSSL_SSL_METHOD_ENTRY(SSLv3),
+    OSSL_SSL_METHOD_ENTRY(SSLv3_server),
+    OSSL_SSL_METHOD_ENTRY(SSLv3_client),
+    OSSL_SSL_METHOD_ENTRY(SSLv23),
+    OSSL_SSL_METHOD_ENTRY(SSLv23_server),
+    OSSL_SSL_METHOD_ENTRY(SSLv23_client),
 #undef OSSL_SSL_METHOD_ENTRY
 };
 
-static int ossl_ssl_ex_vcb_idx;
-static int ossl_ssl_ex_store_p;
-static int ossl_ssl_ex_ptr_idx;
+int ossl_ssl_ex_vcb_idx;
+int ossl_ssl_ex_store_p;
+int ossl_ssl_ex_ptr_idx;
+int ossl_ssl_ex_client_cert_cb_idx;
+int ossl_ssl_ex_tmp_dh_callback_idx;
 
 static void
-ossl_sslctx_free(void *ptr)
+ossl_sslctx_free(SSL_CTX *ctx)
 {
-    SSL_CTX *ctx = ptr;
-#if !defined(HAVE_X509_STORE_UP_REF)
     if(ctx && SSL_CTX_get_ex_data(ctx, ossl_ssl_ex_store_p)== (void*)1)
 	ctx->cert_store = NULL;
-#endif
     SSL_CTX_free(ctx);
 }
 
-static const rb_data_type_t ossl_sslctx_type = {
-    "OpenSSL/SSL/CTX",
-    {
-	0, ossl_sslctx_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 static VALUE
 ossl_sslctx_s_alloc(VALUE klass)
 {
     SSL_CTX *ctx;
-    long mode = SSL_MODE_ENABLE_PARTIAL_WRITE |
-	SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER;
-    VALUE obj;
+    long mode = SSL_MODE_ENABLE_PARTIAL_WRITE;
 
 #ifdef SSL_MODE_RELEASE_BUFFERS
     mode |= SSL_MODE_RELEASE_BUFFERS;
 #endif
 
-    obj = TypedData_Wrap_Struct(klass, &ossl_sslctx_type, 0);
     ctx = SSL_CTX_new(SSLv23_method());
     if (!ctx) {
         ossl_raise(eSSLError, "SSL_CTX_new");
     }
     SSL_CTX_set_mode(ctx, mode);
-    RTYPEDDATA_DATA(obj) = ctx;
-    SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_ptr_idx, (void*)obj);
-
-#if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_ECDH_AUTO)
-    /* We use SSL_CTX_set1_curves_list() to specify the curve used in ECDH. It
-     * allows to specify multiple curve names and OpenSSL will select
-     * automatically from them. In OpenSSL 1.0.2, the automatic selection has to
-     * be enabled explicitly. But OpenSSL 1.1.0 removed the knob and it is
-     * always enabled. To uniform the behavior, we enable the automatic
-     * selection also in 1.0.2. Users can still disable ECDH by removing ECDH
-     * cipher suites by SSLContext#ciphers=. */
-    if (!SSL_CTX_set_ecdh_auto(ctx, 1))
-	ossl_raise(eSSLError, "SSL_CTX_set_ecdh_auto");
-#endif
-
-    return obj;
+    return Data_Wrap_Struct(klass, 0, ossl_sslctx_free, ctx);
 }
 
 /*
@@ -146,223 +180,170 @@ ossl_sslctx_s_alloc(VALUE klass)
  *    ctx.ssl_version = :TLSv1
  *    ctx.ssl_version = "SSLv23_client"
  *
- * Sets the SSL/TLS protocol version for the context. This forces connections to
- * use only the specified protocol version.
- *
  * You can get a list of valid versions with OpenSSL::SSL::SSLContext::METHODS
  */
 static VALUE
 ossl_sslctx_set_ssl_version(VALUE self, VALUE ssl_method)
 {
-    SSL_CTX *ctx;
+    SSL_METHOD *method = NULL;
     const char *s;
-    VALUE m = ssl_method;
     int i;
 
-    GetSSLCTX(self, ctx);
+    SSL_CTX *ctx;
     if (RB_TYPE_P(ssl_method, T_SYMBOL))
-	m = rb_sym2str(ssl_method);
-    s = StringValueCStr(m);
+	s = rb_id2name(SYM2ID(ssl_method));
+    else
+	s =  StringValuePtr(ssl_method);
     for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
         if (strcmp(ossl_ssl_method_tab[i].name, s) == 0) {
-#if defined(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION)
-	    int version = ossl_ssl_method_tab[i].version;
-#endif
-	    SSL_METHOD *method = ossl_ssl_method_tab[i].func();
+            method = ossl_ssl_method_tab[i].func();
+            break;
+        }
+    }
+    if (!method) {
+        ossl_raise(rb_eArgError, "unknown SSL method `%s'.", s);
+    }
+    Data_Get_Struct(self, SSL_CTX, ctx);
+    if (SSL_CTX_set_ssl_version(ctx, method) != 1) {
+        ossl_raise(eSSLError, "SSL_CTX_set_ssl_version");
+    }
 
-	    if (SSL_CTX_set_ssl_version(ctx, method) != 1)
-		ossl_raise(eSSLError, "SSL_CTX_set_ssl_version");
+    return ssl_method;
+}
 
-#if defined(HAVE_SSL_CTX_SET_MIN_PROTO_VERSION)
-	    if (!SSL_CTX_set_min_proto_version(ctx, version))
-		ossl_raise(eSSLError, "SSL_CTX_set_min_proto_version");
-	    if (!SSL_CTX_set_max_proto_version(ctx, version))
-		ossl_raise(eSSLError, "SSL_CTX_set_max_proto_version");
-#endif
-	    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);
 
-    ossl_raise(rb_eArgError, "unknown SSL method `%"PRIsVALUE"'.", m);
+    return self;
 }
 
 static VALUE
 ossl_call_client_cert_cb(VALUE obj)
 {
-    VALUE ctx_obj, cb, ary, cert, key;
-
-    ctx_obj = rb_attr_get(obj, id_i_context);
-    cb = rb_attr_get(ctx_obj, id_i_client_cert_cb);
-    if (NIL_P(cb))
-	return Qnil;
+    VALUE cb, ary, cert, key;
+    SSL *ssl;
 
+    Data_Get_Struct(obj, SSL, ssl);
+    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx);
+    if (NIL_P(cb)) return Qfalse;
     ary = rb_funcall(cb, rb_intern("call"), 1, obj);
     Check_Type(ary, T_ARRAY);
     GetX509CertPtr(cert = rb_ary_entry(ary, 0));
-    GetPrivPKeyPtr(key = rb_ary_entry(ary, 1));
+    GetPKeyPtr(key = rb_ary_entry(ary, 1));
+    ossl_ssl_set_x509(obj, cert);
+    ossl_ssl_set_key(obj, key);
 
-    return rb_ary_new3(2, cert, key);
+    return Qtrue;
 }
 
 static int
 ossl_client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 {
-    VALUE obj, ret;
+    VALUE obj, success;
 
     obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    ret = rb_protect(ossl_call_client_cert_cb, obj, NULL);
-    if (NIL_P(ret))
-	return 0;
-
-    *x509 = DupX509CertPtr(RARRAY_AREF(ret, 0));
-    *pkey = DupPKeyPtr(RARRAY_AREF(ret, 1));
+    success = rb_protect((VALUE(*)_((VALUE)))ossl_call_client_cert_cb,
+                         obj, NULL);
+    if (!RTEST(success)) return 0;
+    *x509 = DupX509CertPtr(ossl_ssl_get_x509(obj));
+    *pkey = DupPKeyPtr(ossl_ssl_get_key(obj));
 
     return 1;
 }
 
-#if !defined(OPENSSL_NO_DH) || \
-    !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
-struct tmp_dh_callback_args {
-    VALUE ssl_obj;
-    ID id;
-    int type;
-    int is_export;
-    int keylength;
-};
-
-static EVP_PKEY *
-ossl_call_tmp_dh_callback(struct tmp_dh_callback_args *args)
+#if !defined(OPENSSL_NO_DH)
+static VALUE
+ossl_call_tmp_dh_callback(VALUE *args)
 {
+    SSL *ssl;
     VALUE cb, dh;
     EVP_PKEY *pkey;
 
-    cb = rb_funcall(args->ssl_obj, args->id, 0);
-    if (NIL_P(cb))
-	return NULL;
-    dh = rb_funcall(cb, rb_intern("call"), 3,
-		    args->ssl_obj, INT2NUM(args->is_export), INT2NUM(args->keylength));
+    Data_Get_Struct(args[0], SSL, ssl);
+    cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx);
+    if (NIL_P(cb)) return Qfalse;
+    dh = rb_funcall(cb, rb_intern("call"), 3, args[0], args[1], args[2]);
     pkey = GetPKeyPtr(dh);
-    if (EVP_PKEY_base_id(pkey) != args->type)
-	return NULL;
+    if (EVP_PKEY_type(pkey->type) != EVP_PKEY_DH) return Qfalse;
+    ossl_ssl_set_tmp_dh(args[0], dh);
 
-    return pkey;
+    return Qtrue;
 }
-#endif
 
-#if !defined(OPENSSL_NO_DH)
-static DH *
+static DH*
 ossl_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 {
-    VALUE rb_ssl;
-    EVP_PKEY *pkey;
-    struct tmp_dh_callback_args args;
-    int state;
-
-    rb_ssl = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    args.ssl_obj = rb_ssl;
-    args.id = id_tmp_dh_callback;
-    args.is_export = is_export;
-    args.keylength = keylength;
-    args.type = EVP_PKEY_DH;
-
-    pkey = (EVP_PKEY *)rb_protect((VALUE (*)(VALUE))ossl_call_tmp_dh_callback,
-				  (VALUE)&args, &state);
-    if (state) {
-	rb_ivar_set(rb_ssl, ID_callback_state, INT2NUM(state));
-	return NULL;
-    }
-    if (!pkey)
-	return NULL;
-
-    return EVP_PKEY_get0_DH(pkey);
-}
-#endif /* OPENSSL_NO_DH */
+    VALUE args[3], success;
 
-#if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
-static EC_KEY *
-ossl_tmp_ecdh_callback(SSL *ssl, int is_export, int keylength)
-{
-    VALUE rb_ssl;
-    EVP_PKEY *pkey;
-    struct tmp_dh_callback_args args;
-    int state;
-
-    rb_ssl = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    args.ssl_obj = rb_ssl;
-    args.id = id_tmp_ecdh_callback;
-    args.is_export = is_export;
-    args.keylength = keylength;
-    args.type = EVP_PKEY_EC;
-
-    pkey = (EVP_PKEY *)rb_protect((VALUE (*)(VALUE))ossl_call_tmp_dh_callback,
-				  (VALUE)&args, &state);
-    if (state) {
-	rb_ivar_set(rb_ssl, ID_callback_state, INT2NUM(state));
-	return NULL;
-    }
-    if (!pkey)
-	return NULL;
+    args[0] = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
+    args[1] = INT2FIX(is_export);
+    args[2] = INT2FIX(keylength);
+    success = rb_protect((VALUE(*)_((VALUE)))ossl_call_tmp_dh_callback,
+                         (VALUE)args, NULL);
+    if (!RTEST(success)) return NULL;
 
-    return EVP_PKEY_get0_EC_KEY(pkey);
+    return GetPKeyPtr(ossl_ssl_get_tmp_dh(args[0]))->pkey.dh;
 }
-#endif
 
-static VALUE
-call_verify_certificate_identity(VALUE ctx_v)
+static DH*
+ossl_default_tmp_dh_callback(SSL *ssl, int is_export, int keylength)
 {
-    X509_STORE_CTX *ctx = (X509_STORE_CTX *)ctx_v;
-    SSL *ssl;
-    VALUE ssl_obj, hostname, cert_obj;
-
-    ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    hostname = rb_attr_get(ssl_obj, id_i_hostname);
+    rb_warning("using default DH parameters.");
 
-    if (!RTEST(hostname)) {
-	rb_warning("verify_hostname requires hostname to be set");
-	return Qtrue;
+    switch(keylength){
+    case 512:
+	return OSSL_DEFAULT_DH_512;
+    case 1024:
+	return OSSL_DEFAULT_DH_1024;
     }
-
-    cert_obj = ossl_x509_new(X509_STORE_CTX_get_current_cert(ctx));
-    return rb_funcall(mSSL, rb_intern("verify_certificate_identity"), 2,
-		      cert_obj, hostname);
+    return NULL;
 }
+#endif /* OPENSSL_NO_DH */
 
 static int
 ossl_ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
 {
-    VALUE cb, ssl_obj, sslctx_obj, verify_hostname, ret;
+    VALUE cb;
     SSL *ssl;
-    int status;
 
     ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
     cb = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_vcb_idx);
-    ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
-    verify_hostname = rb_attr_get(sslctx_obj, id_i_verify_hostname);
-
-    if (preverify_ok && RTEST(verify_hostname) && !SSL_is_server(ssl) &&
-	!X509_STORE_CTX_get_error_depth(ctx)) {
-	ret = rb_protect(call_verify_certificate_identity, (VALUE)ctx, &status);
-	if (status) {
-	    rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(status));
-	    return 0;
-	}
-	preverify_ok = ret == Qtrue;
-    }
-
-    return ossl_verify_cb_call(cb, preverify_ok, ctx);
+    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx, (void*)cb);
+    return ossl_verify_cb(preverify_ok, ctx);
 }
 
 static VALUE
 ossl_call_session_get_cb(VALUE ary)
 {
-    VALUE ssl_obj, cb;
+    VALUE ssl_obj, sslctx_obj, cb;
 
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    cb = rb_funcall(ssl_obj, rb_intern("session_get_cb"), 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);
@@ -370,11 +351,7 @@ ossl_call_session_get_cb(VALUE ary)
 
 /* this method is currently only called for servers (in OpenSSL <= 0.9.8e) */
 static SSL_SESSION *
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-ossl_sslctx_session_get_cb(SSL *ssl, const unsigned char *buf, int len, int *copy)
-#else
 ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
-#endif
 {
     VALUE ary, ssl_obj, ret_obj;
     SSL_SESSION *sess;
@@ -389,7 +366,7 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new((const char *)buf, len));
 
-    ret_obj = rb_protect(ossl_call_session_get_cb, ary, &state);
+    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;
@@ -406,12 +383,14 @@ ossl_sslctx_session_get_cb(SSL *ssl, unsigned char *buf, int len, int *copy)
 static VALUE
 ossl_call_session_new_cb(VALUE ary)
 {
-    VALUE ssl_obj, cb;
+    VALUE ssl_obj, sslctx_obj, cb;
 
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    cb = rb_funcall(ssl_obj, rb_intern("session_new_cb"), 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);
@@ -431,14 +410,14 @@ ossl_sslctx_session_new_cb(SSL *ssl, SSL_SESSION *sess)
     	return 1;
     ssl_obj = (VALUE)ptr;
     sess_obj = rb_obj_alloc(cSSLSession);
-    SSL_SESSION_up_ref(sess);
+    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);
 
-    rb_protect(ossl_call_session_new_cb, ary, &state);
+    rb_protect((VALUE(*)_((VALUE)))ossl_call_session_new_cb, ary, &state);
     if (state) {
         rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(state));
     }
@@ -461,7 +440,7 @@ ossl_call_session_remove_cb(VALUE ary)
     Check_Type(ary, T_ARRAY);
     sslctx_obj = rb_ary_entry(ary, 0);
 
-    cb = rb_attr_get(sslctx_obj, id_i_session_remove_cb);
+    cb = rb_iv_get(sslctx_obj, "@session_remove_cb");
     if (NIL_P(cb)) return Qnil;
 
     return rb_funcall(cb, rb_intern("call"), 1, ary);
@@ -480,14 +459,14 @@ ossl_sslctx_session_remove_cb(SSL_CTX *ctx, SSL_SESSION *sess)
     	return;
     sslctx_obj = (VALUE)ptr;
     sess_obj = rb_obj_alloc(cSSLSession);
-    SSL_SESSION_up_ref(sess);
+    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);
 
-    rb_protect(ossl_call_session_remove_cb, ary, &state);
+    rb_protect((VALUE(*)_((VALUE)))ossl_call_session_remove_cb, ary, &state);
     if (state) {
 /*
   the SSL_CTX is frozen, nowhere to save state.
@@ -503,7 +482,7 @@ ossl_sslctx_add_extra_chain_cert_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, arg))
     X509 *x509;
     SSL_CTX *ctx;
 
-    GetSSLCTX(arg, ctx);
+    Data_Get_Struct(arg, SSL_CTX, ctx);
     x509 = DupX509CertPtr(i);
     if(!SSL_CTX_add_extra_chain_cert(ctx, x509)){
 	ossl_raise(eSSLError, NULL);
@@ -523,8 +502,9 @@ ossl_call_servername_cb(VALUE ary)
     Check_Type(ary, T_ARRAY);
     ssl_obj = rb_ary_entry(ary, 0);
 
-    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
-    cb = rb_attr_get(sslctx_obj, id_i_servername_cb);
+    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);
@@ -533,13 +513,11 @@ ossl_call_servername_cb(VALUE ary)
         SSL_CTX *ctx2;
 
         ossl_sslctx_setup(ret_obj);
-        GetSSL(ssl_obj, ssl);
-        GetSSLCTX(ret_obj, ctx2);
+        Data_Get_Struct(ssl_obj, SSL, ssl);
+        Data_Get_Struct(ret_obj, SSL_CTX, ctx2);
         SSL_set_SSL_CTX(ssl, ctx2);
-        rb_ivar_set(ssl_obj, id_i_context, ret_obj);
     } else if (!NIL_P(ret_obj)) {
-	ossl_raise(rb_eArgError, "servername_cb must return an "
-		   "OpenSSL::SSL::SSLContext object or nil");
+            ossl_raise(rb_eArgError, "servername_cb must return an OpenSSL::SSL::SSLContext object or nil");
     }
 
     return ret_obj;
@@ -563,7 +541,7 @@ ssl_servername_cb(SSL *ssl, int *ad, void *arg)
     rb_ary_push(ary, ssl_obj);
     rb_ary_push(ary, rb_str_new2(servername));
 
-    rb_protect(ossl_call_servername_cb, ary, &state);
+    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;
@@ -583,15 +561,15 @@ ssl_renegotiation_cb(const SSL *ssl)
 	ossl_raise(eSSLError, "SSL object could not be retrieved");
     ssl_obj = (VALUE)ptr;
 
-    sslctx_obj = rb_attr_get(ssl_obj, id_i_context);
-    cb = rb_attr_get(sslctx_obj, id_i_renegotiation_cb);
+    sslctx_obj = rb_iv_get(ssl_obj, "@context");
+    if (NIL_P(sslctx_obj)) return;
+    cb = rb_iv_get(sslctx_obj, "@renegotiation_cb");
     if (NIL_P(cb)) return;
 
     (void) rb_funcall(cb, rb_intern("call"), 1, ssl_obj);
 }
 
-#if defined(HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB) || \
-    defined(HAVE_SSL_CTX_SET_ALPN_SELECT_CB)
+#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
 static VALUE
 ssl_npn_encode_protocol_i(VALUE cur, VALUE encoded)
 {
@@ -606,81 +584,20 @@ ssl_npn_encode_protocol_i(VALUE cur, VALUE encoded)
     return Qnil;
 }
 
-static VALUE
-ssl_encode_npn_protocols(VALUE protocols)
+static void
+ssl_npn_encode_protocols(VALUE sslctx, VALUE protocols)
 {
-    VALUE encoded = rb_str_new(NULL, 0);
+    VALUE encoded = rb_str_new2("");
     rb_iterate(rb_each, protocols, ssl_npn_encode_protocol_i, encoded);
-    return encoded;
-}
-
-struct npn_select_cb_common_args {
-    VALUE cb;
-    const unsigned char *in;
-    unsigned inlen;
-};
-
-static VALUE
-npn_select_cb_common_i(VALUE tmp)
-{
-    struct npn_select_cb_common_args *args = (void *)tmp;
-    const unsigned char *in = args->in, *in_end = in + args->inlen;
-    unsigned char l;
-    long len;
-    VALUE selected, protocols = rb_ary_new();
-
-    /* assume OpenSSL verifies this format */
-    /* The format is len_1|proto_1|...|len_n|proto_n */
-    while (in < in_end) {
-	l = *in++;
-	rb_ary_push(protocols, rb_str_new((const char *)in, l));
-	in += l;
-    }
-
-    selected = rb_funcall(args->cb, rb_intern("call"), 1, protocols);
-    StringValue(selected);
-    len = RSTRING_LEN(selected);
-    if (len < 1 || len >= 256) {
-	ossl_raise(eSSLError, "Selected protocol name must have length 1..255");
-    }
-
-    return selected;
+    StringValueCStr(encoded);
+    rb_iv_set(sslctx, "@_protocols", encoded);
 }
 
 static int
-ssl_npn_select_cb_common(SSL *ssl, VALUE cb, const unsigned char **out,
-			 unsigned char *outlen, const unsigned char *in,
-			 unsigned int inlen)
+ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg)
 {
-    VALUE selected;
-    int status;
-    struct npn_select_cb_common_args args;
-
-    args.cb = cb;
-    args.in = in;
-    args.inlen = inlen;
-
-    selected = rb_protect(npn_select_cb_common_i, (VALUE)&args, &status);
-    if (status) {
-	VALUE ssl_obj = (VALUE)SSL_get_ex_data(ssl, ossl_ssl_ex_ptr_idx);
-
-	rb_ivar_set(ssl_obj, ID_callback_state, INT2NUM(status));
-	return SSL_TLSEXT_ERR_ALERT_FATAL;
-    }
-
-    *out = (unsigned char *)RSTRING_PTR(selected);
-    *outlen = (unsigned char)RSTRING_LEN(selected);
-
-    return SSL_TLSEXT_ERR_OK;
-}
-#endif
-
-#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
-static int
-ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
-		     void *arg)
-{
-    VALUE protocols = (VALUE)arg;
+    VALUE sslctx_obj = (VALUE) arg;
+    VALUE protocols = rb_iv_get(sslctx_obj, "@_protocols");
 
     *out = (const unsigned char *) RSTRING_PTR(protocols);
     *outlen = RSTRING_LENINT(protocols);
@@ -689,151 +606,100 @@ ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen,
 }
 
 static int
-ssl_npn_select_cb(SSL *ssl, unsigned char **out, unsigned char *outlen,
-		  const unsigned char *in, unsigned int inlen, void *arg)
+ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsigned char *in, unsigned int inlen, void *arg)
 {
-    VALUE sslctx_obj, cb;
+    int i = 0;
+    VALUE sslctx_obj, cb, protocols, selected;
 
     sslctx_obj = (VALUE) arg;
-    cb = rb_attr_get(sslctx_obj, id_i_npn_select_cb);
-
-    return ssl_npn_select_cb_common(ssl, cb, (const unsigned char **)out,
-				    outlen, in, inlen);
-}
-#endif
-
-#ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-static int
-ssl_alpn_select_cb(SSL *ssl, const unsigned char **out, unsigned char *outlen,
-		   const unsigned char *in, unsigned int inlen, void *arg)
-{
-    VALUE sslctx_obj, cb;
+    cb = rb_iv_get(sslctx_obj, "@npn_select_cb");
+    protocols = rb_ary_new();
+
+    /* The format is len_1|proto_1|...|len_n|proto_n\0 */
+    while (in[i]) {
+	VALUE protocol = rb_str_new((const char *) &in[i + 1], in[i]);
+	rb_ary_push(protocols, protocol);
+	i += in[i] + 1;
+    }
 
-    sslctx_obj = (VALUE) arg;
-    cb = rb_attr_get(sslctx_obj, id_i_alpn_select_cb);
+    selected = rb_funcall(cb, rb_intern("call"), 1, protocols);
+    StringValue(selected);
+    *out = (unsigned char *) StringValuePtr(selected);
+    *outlen = RSTRING_LENINT(selected);
 
-    return ssl_npn_select_cb_common(ssl, cb, out, outlen, in, inlen);
+    return SSL_TLSEXT_ERR_OK;
 }
 #endif
 
-/* This function may serve as the entry point to support further callbacks. */
+/* This function may serve as the entry point to support further
+ * callbacks. */
 static void
 ssl_info_cb(const SSL *ssl, int where, int val)
 {
-    int is_server = SSL_is_server((SSL *)ssl);
+    int state = SSL_state(ssl);
 
-    if (is_server && where & SSL_CB_HANDSHAKE_START) {
+    if ((where & SSL_CB_HANDSHAKE_START) &&
+	(state & SSL_ST_ACCEPT)) {
 	ssl_renegotiation_cb(ssl);
     }
 }
 
 /*
- * Gets various OpenSSL options.
- */
-static VALUE
-ossl_sslctx_get_options(VALUE self)
-{
-    SSL_CTX *ctx;
-    GetSSLCTX(self, ctx);
-    return LONG2NUM(SSL_CTX_get_options(ctx));
-}
-
-/*
- * Sets various OpenSSL options.
- */
-static VALUE
-ossl_sslctx_set_options(VALUE self, VALUE options)
-{
-    SSL_CTX *ctx;
-
-    rb_check_frozen(self);
-    GetSSLCTX(self, ctx);
-
-    SSL_CTX_clear_options(ctx, SSL_CTX_get_options(ctx));
-
-    if (NIL_P(options)) {
-	SSL_CTX_set_options(ctx, SSL_OP_ALL);
-    } else {
-	SSL_CTX_set_options(ctx, NUM2LONG(options));
-    }
-
-    return self;
-}
-
-/*
  * call-seq:
  *    ctx.setup => Qtrue # first time
  *    ctx.setup => nil # thereafter
  *
  * This method is called automatically when a new SSLSocket is created.
- * However, it is not thread-safe and must be called before creating
- * SSLSocket objects in a multi-threaded program.
+ * Normally you do not need to call this method (unless you are writing an
+ * extension in C).
  */
 static VALUE
 ossl_sslctx_setup(VALUE self)
 {
     SSL_CTX *ctx;
     X509 *cert = NULL, *client_ca = NULL;
+    X509_STORE *store;
     EVP_PKEY *key = NULL;
     char *ca_path = NULL, *ca_file = NULL;
-    int verify_mode;
-    long i;
+    int i, verify_mode;
     VALUE val;
 
     if(OBJ_FROZEN(self)) return Qnil;
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
 
 #if !defined(OPENSSL_NO_DH)
-    SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
-#endif
-
-#if !defined(OPENSSL_NO_EC)
-    /* We added SSLContext#tmp_ecdh_callback= in Ruby 2.3.0,
-     * but SSL_CTX_set_tmp_ecdh_callback() was removed in OpenSSL 1.1.0. */
-    if (RTEST(rb_attr_get(self, id_i_tmp_ecdh_callback))) {
-# if defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
-	rb_warn("#tmp_ecdh_callback= is deprecated; use #ecdh_curves= instead");
-	SSL_CTX_set_tmp_ecdh_callback(ctx, ossl_tmp_ecdh_callback);
-#  if defined(HAVE_SSL_CTX_SET_ECDH_AUTO)
-	/* tmp_ecdh_callback and ecdh_auto conflict; OpenSSL ignores
-	 * tmp_ecdh_callback. So disable ecdh_auto. */
-	if (!SSL_CTX_set_ecdh_auto(ctx, 0))
-	    ossl_raise(eSSLError, "SSL_CTX_set_ecdh_auto");
-#  endif
-# else
-	ossl_raise(eSSLError, "OpenSSL does not support tmp_ecdh_callback; "
-		   "use #ecdh_curves= instead");
-# endif
+    if (RTEST(ossl_sslctx_get_tmp_dh_cb(self))){
+	SSL_CTX_set_tmp_dh_callback(ctx, ossl_tmp_dh_callback);
+    }
+    else{
+	SSL_CTX_set_tmp_dh_callback(ctx, ossl_default_tmp_dh_callback);
     }
-#endif /* OPENSSL_NO_EC */
+#endif
+    SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_ptr_idx, (void*)self);
 
-    val = rb_attr_get(self, id_i_cert_store);
-    if (!NIL_P(val)) {
-	X509_STORE *store = GetX509StorePtr(val); /* NO NEED TO DUP */
-	SSL_CTX_set_cert_store(ctx, store);
-#if !defined(HAVE_X509_STORE_UP_REF)
+    val = ossl_sslctx_get_cert_store(self);
+    if(!NIL_P(val)){
 	/*
          * WORKAROUND:
 	 *   X509_STORE can count references, but
 	 *   X509_STORE_free() doesn't care it.
 	 *   So we won't increment it but mark it by ex_data.
 	 */
-        SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void *)1);
-#else /* Fixed in OpenSSL 1.0.2; bff9ce4db38b (master), 5b4b9ce976fc (1.0.2) */
-	X509_STORE_up_ref(store);
-#endif
+        store = GetX509StorePtr(val); /* NO NEED TO DUP */
+        SSL_CTX_set_cert_store(ctx, store);
+        SSL_CTX_set_ex_data(ctx, ossl_ssl_ex_store_p, (void*)1);
     }
 
-    val = rb_attr_get(self, id_i_extra_chain_cert);
+    val = ossl_sslctx_get_extra_cert(self);
     if(!NIL_P(val)){
 	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. */
-    val = rb_attr_get(self, id_i_cert);
+    val = ossl_sslctx_get_cert(self);
     cert = NIL_P(val) ? NULL : GetX509CertPtr(val); /* NO DUP NEEDED */
-    val = rb_attr_get(self, id_i_key);
-    key = NIL_P(val) ? NULL : GetPrivPKeyPtr(val); /* NO DUP NEEDED */
+    val = ossl_sslctx_get_key(self);
+    key = NIL_P(val) ? NULL : GetPKeyPtr(val); /* NO DUP NEEDED */
     if (cert && key) {
         if (!SSL_CTX_use_certificate(ctx, cert)) {
             /* Adds a ref => Safe to FREE */
@@ -848,11 +714,11 @@ ossl_sslctx_setup(VALUE self)
         }
     }
 
-    val = rb_attr_get(self, id_i_client_ca);
+    val = ossl_sslctx_get_client_ca(self);
     if(!NIL_P(val)){
 	if (RB_TYPE_P(val, T_ARRAY)) {
 	    for(i = 0; i < RARRAY_LEN(val); i++){
-		client_ca = GetX509CertPtr(RARRAY_AREF(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");
@@ -868,61 +734,50 @@ ossl_sslctx_setup(VALUE self)
 	}
     }
 
-    val = rb_attr_get(self, id_i_ca_file);
-    ca_file = NIL_P(val) ? NULL : StringValueCStr(val);
-    val = rb_attr_get(self, id_i_ca_path);
-    ca_path = NIL_P(val) ? NULL : StringValueCStr(val);
+    val = ossl_sslctx_get_ca_file(self);
+    ca_file = NIL_P(val) ? NULL : StringValuePtr(val);
+    val = ossl_sslctx_get_ca_path(self);
+    ca_path = NIL_P(val) ? NULL : StringValuePtr(val);
     if(ca_file || ca_path){
 	if (!SSL_CTX_load_verify_locations(ctx, ca_file, ca_path))
 	    rb_warning("can't set verify locations");
     }
 
-    val = rb_attr_get(self, id_i_verify_mode);
+    val = ossl_sslctx_get_verify_mode(self);
     verify_mode = NIL_P(val) ? SSL_VERIFY_NONE : NUM2INT(val);
     SSL_CTX_set_verify(ctx, verify_mode, ossl_ssl_verify_callback);
-    if (RTEST(rb_attr_get(self, id_i_client_cert_cb)))
+    if (RTEST(ossl_sslctx_get_client_cert_cb(self)))
 	SSL_CTX_set_client_cert_cb(ctx, ossl_client_cert_cb);
 
-    val = rb_attr_get(self, id_i_timeout);
+    val = ossl_sslctx_get_timeout(self);
     if(!NIL_P(val)) SSL_CTX_set_timeout(ctx, NUM2LONG(val));
 
-    val = rb_attr_get(self, id_i_verify_depth);
+    val = ossl_sslctx_get_verify_dep(self);
     if(!NIL_P(val)) SSL_CTX_set_verify_depth(ctx, NUM2INT(val));
 
-#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
-    val = rb_attr_get(self, id_i_npn_protocols);
+    val = ossl_sslctx_get_options(self);
+    if(!NIL_P(val)) {
+    	SSL_CTX_set_options(ctx, NUM2LONG(val));
+    } else {
+	SSL_CTX_set_options(ctx, SSL_OP_ALL);
+    }
+
+#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
+    val = rb_iv_get(self, "@npn_protocols");
     if (!NIL_P(val)) {
-	VALUE encoded = ssl_encode_npn_protocols(val);
-	rb_ivar_set(self, id_npn_protocols_encoded, encoded);
-	SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_npn_advertise_cb, (void *)encoded);
+	ssl_npn_encode_protocols(self, val);
+	SSL_CTX_set_next_protos_advertised_cb(ctx, ssl_npn_advertise_cb, (void *) self);
 	OSSL_Debug("SSL NPN advertise callback added");
     }
-    if (RTEST(rb_attr_get(self, id_i_npn_select_cb))) {
+    if (RTEST(rb_iv_get(self, "@npn_select_cb"))) {
 	SSL_CTX_set_next_proto_select_cb(ctx, ssl_npn_select_cb, (void *) self);
 	OSSL_Debug("SSL NPN select callback added");
     }
 #endif
 
-#ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-    val = rb_attr_get(self, id_i_alpn_protocols);
-    if (!NIL_P(val)) {
-	VALUE rprotos = ssl_encode_npn_protocols(val);
-
-	/* returns 0 on success */
-	if (SSL_CTX_set_alpn_protos(ctx, (unsigned char *)RSTRING_PTR(rprotos),
-				    RSTRING_LENINT(rprotos)))
-	    ossl_raise(eSSLError, "SSL_CTX_set_alpn_protos");
-	OSSL_Debug("SSL ALPN values added");
-    }
-    if (RTEST(rb_attr_get(self, id_i_alpn_select_cb))) {
-	SSL_CTX_set_alpn_select_cb(ctx, ssl_alpn_select_cb, (void *) self);
-	OSSL_Debug("SSL ALPN select callback added");
-    }
-#endif
-
     rb_obj_freeze(self);
 
-    val = rb_attr_get(self, id_i_session_id_context);
+    val = ossl_sslctx_get_sess_id_ctx(self);
     if (!NIL_P(val)){
 	StringValue(val);
 	if (!SSL_CTX_set_session_id_context(ctx, (unsigned char *)RSTRING_PTR(val),
@@ -931,21 +786,21 @@ ossl_sslctx_setup(VALUE self)
 	}
     }
 
-    if (RTEST(rb_attr_get(self, id_i_session_get_cb))) {
+    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_attr_get(self, id_i_session_new_cb))) {
+    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_attr_get(self, id_i_session_remove_cb))) {
+    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_attr_get(self, id_i_servername_cb);
+    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");
@@ -956,7 +811,7 @@ ossl_sslctx_setup(VALUE self)
 }
 
 static VALUE
-ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
+ossl_ssl_cipher_to_ary(SSL_CIPHER *cipher)
 {
     VALUE ary;
     int bits, alg_bits;
@@ -965,8 +820,8 @@ ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
     rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_name(cipher)));
     rb_ary_push(ary, rb_str_new2(SSL_CIPHER_get_version(cipher)));
     bits = SSL_CIPHER_get_bits(cipher, &alg_bits);
-    rb_ary_push(ary, INT2NUM(bits));
-    rb_ary_push(ary, INT2NUM(alg_bits));
+    rb_ary_push(ary, INT2FIX(bits));
+    rb_ary_push(ary, INT2FIX(alg_bits));
 
     return ary;
 }
@@ -975,23 +830,23 @@ ossl_ssl_cipher_to_ary(const SSL_CIPHER *cipher)
  * call-seq:
  *    ctx.ciphers => [[name, version, bits, alg_bits], ...]
  *
- * The list of cipher suites configured for this context.
+ * The list of ciphers configured for this context.
  */
 static VALUE
 ossl_sslctx_get_ciphers(VALUE self)
 {
     SSL_CTX *ctx;
     STACK_OF(SSL_CIPHER) *ciphers;
-    const SSL_CIPHER *cipher;
+    SSL_CIPHER *cipher;
     VALUE ary;
     int i, num;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
     if(!ctx){
         rb_warning("SSL_CTX is not initialized.");
         return Qnil;
     }
-    ciphers = SSL_CTX_get_ciphers(ctx);
+    ciphers = ctx->cipher_list;
 
     if (!ciphers)
         return rb_ary_new();
@@ -1011,9 +866,11 @@ ossl_sslctx_get_ciphers(VALUE self)
  *    ctx.ciphers = [name, ...]
  *    ctx.ciphers = [[name, version, bits, alg_bits], ...]
  *
- * Sets the list of available cipher suites for this context.  Note in a server
+ * Sets the list of available ciphers for this context.  Note in a server
  * context some ciphers require the appropriate certificates.  For example, an
- * RSA cipher suite can only be chosen when an RSA certificate is available.
+ * RSA cipher can only be chosen when an RSA certificate is available.
+ *
+ * See also OpenSSL::Cipher and OpenSSL::Cipher::ciphers
  */
 static VALUE
 ossl_sslctx_set_ciphers(VALUE self, VALUE v)
@@ -1039,170 +896,23 @@ ossl_sslctx_set_ciphers(VALUE self, VALUE v)
         StringValue(str);
     }
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
     if(!ctx){
         ossl_raise(eSSLError, "SSL_CTX is not initialized.");
         return Qnil;
     }
-    if (!SSL_CTX_set_cipher_list(ctx, StringValueCStr(str))) {
+    if (!SSL_CTX_set_cipher_list(ctx, RSTRING_PTR(str))) {
         ossl_raise(eSSLError, "SSL_CTX_set_cipher_list");
     }
 
     return v;
 }
 
-#if !defined(OPENSSL_NO_EC)
-/*
- * call-seq:
- *    ctx.ecdh_curves = curve_list -> curve_list
- *
- * Sets the list of "supported elliptic curves" for this context.
- *
- * For a TLS client, the list is directly used in the Supported Elliptic Curves
- * Extension. For a server, the list is used by OpenSSL to determine the set of
- * shared curves. OpenSSL will pick the most appropriate one from it.
- *
- * Note that this works differently with old OpenSSL (<= 1.0.1). Only one curve
- * can be set, and this has no effect for TLS clients.
- *
- * === Example
- *   ctx1 = OpenSSL::SSL::SSLContext.new
- *   ctx1.ecdh_curves = "X25519:P-256:P-224"
- *   svr = OpenSSL::SSL::SSLServer.new(tcp_svr, ctx1)
- *   Thread.new { svr.accept }
- *
- *   ctx2 = OpenSSL::SSL::SSLContext.new
- *   ctx2.ecdh_curves = "P-256"
- *   cli = OpenSSL::SSL::SSLSocket.new(tcp_sock, ctx2)
- *   cli.connect
- *
- *   p cli.tmp_key.group.curve_name
- *   # => "prime256v1" (is an alias for NIST P-256)
- */
-static VALUE
-ossl_sslctx_set_ecdh_curves(VALUE self, VALUE arg)
-{
-    SSL_CTX *ctx;
-
-    rb_check_frozen(self);
-    GetSSLCTX(self, ctx);
-    StringValueCStr(arg);
-
-#if defined(HAVE_SSL_CTX_SET1_CURVES_LIST)
-    if (!SSL_CTX_set1_curves_list(ctx, RSTRING_PTR(arg)))
-	ossl_raise(eSSLError, NULL);
-#else
-    /* OpenSSL does not have SSL_CTX_set1_curves_list()... Fallback to
-     * SSL_CTX_set_tmp_ecdh(). So only the first curve is used. */
-    {
-	VALUE curve, splitted;
-	EC_KEY *ec;
-	int nid;
-
-	splitted = rb_str_split(arg, ":");
-	if (!RARRAY_LEN(splitted))
-	    ossl_raise(eSSLError, "invalid input format");
-	curve = RARRAY_AREF(splitted, 0);
-	StringValueCStr(curve);
-
-	/* SSL_CTX_set1_curves_list() accepts NIST names */
-	nid = EC_curve_nist2nid(RSTRING_PTR(curve));
-	if (nid == NID_undef)
-	    nid = OBJ_txt2nid(RSTRING_PTR(curve));
-	if (nid == NID_undef)
-	    ossl_raise(eSSLError, "unknown curve name");
-
-	ec = EC_KEY_new_by_curve_name(nid);
-	if (!ec)
-	    ossl_raise(eSSLError, NULL);
-	EC_KEY_set_asn1_flag(ec, OPENSSL_EC_NAMED_CURVE);
-	if (!SSL_CTX_set_tmp_ecdh(ctx, ec)) {
-	    EC_KEY_free(ec);
-	    ossl_raise(eSSLError, "SSL_CTX_set_tmp_ecdh");
-	}
-	EC_KEY_free(ec);
-# if defined(HAVE_SSL_CTX_SET_ECDH_AUTO)
-	/* tmp_ecdh and ecdh_auto conflict. tmp_ecdh is ignored when ecdh_auto
-	 * is enabled. So disable ecdh_auto. */
-	if (!SSL_CTX_set_ecdh_auto(ctx, 0))
-	    ossl_raise(eSSLError, "SSL_CTX_set_ecdh_auto");
-# endif
-    }
-#endif
-
-    return arg;
-}
-#else
-#define ossl_sslctx_set_ecdh_curves rb_f_notimplement
-#endif
-
-/*
- * call-seq:
- *    ctx.security_level -> Integer
- *
- * Returns the security level for the context.
- *
- * See also OpenSSL::SSL::SSLContext#security_level=.
- */
-static VALUE
-ossl_sslctx_get_security_level(VALUE self)
-{
-    SSL_CTX *ctx;
-
-    GetSSLCTX(self, ctx);
-
-#if defined(HAVE_SSL_CTX_GET_SECURITY_LEVEL)
-    return INT2NUM(SSL_CTX_get_security_level(ctx));
-#else
-    (void)ctx;
-    return INT2FIX(0);
-#endif
-}
-
-/*
- * call-seq:
- *    ctx.security_level = integer
- *
- * Sets the security level for the context. OpenSSL limits parameters according
- * to the level. The "parameters" include: ciphersuites, curves, key sizes,
- * certificate signature algorithms, protocol version and so on. For example,
- * level 1 rejects parameters offering below 80 bits of security, such as
- * ciphersuites using MD5 for the MAC or RSA keys shorter than 1024 bits.
- *
- * Note that attempts to set such parameters with insufficient security are
- * also blocked. You need to lower the level first.
- *
- * This feature is not supported in OpenSSL < 1.1.0, and setting the level to
- * other than 0 will raise NotImplementedError. Level 0 means everything is
- * permitted, the same behavior as previous versions of OpenSSL.
- *
- * See the manpage of SSL_CTX_set_security_level(3) for details.
- */
-static VALUE
-ossl_sslctx_set_security_level(VALUE self, VALUE value)
-{
-    SSL_CTX *ctx;
-
-    rb_check_frozen(self);
-    GetSSLCTX(self, ctx);
-
-#if defined(HAVE_SSL_CTX_GET_SECURITY_LEVEL)
-    SSL_CTX_set_security_level(ctx, NUM2INT(value));
-#else
-    (void)ctx;
-    if (NUM2INT(value) != 0)
-	ossl_raise(rb_eNotImpError, "setting security level to other than 0 is "
-		   "not supported in this version of OpenSSL");
-#endif
-
-    return value;
-}
-
 /*
  *  call-seq:
  *     ctx.session_add(session) -> true | false
  *
- * Adds +session+ to the session cache.
+ * Adds +session+ to the session cache
  */
 static VALUE
 ossl_sslctx_session_add(VALUE self, VALUE arg)
@@ -1210,7 +920,7 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
     SSL_CTX *ctx;
     SSL_SESSION *sess;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
     SafeGetSSLSession(arg, sess);
 
     return SSL_CTX_add_session(ctx, sess) == 1 ? Qtrue : Qfalse;
@@ -1220,7 +930,7 @@ ossl_sslctx_session_add(VALUE self, VALUE arg)
  *  call-seq:
  *     ctx.session_remove(session) -> true | false
  *
- * Removes +session+ from the session cache.
+ * Removes +session+ from the session cache
  */
 static VALUE
 ossl_sslctx_session_remove(VALUE self, VALUE arg)
@@ -1228,7 +938,7 @@ ossl_sslctx_session_remove(VALUE self, VALUE arg)
     SSL_CTX *ctx;
     SSL_SESSION *sess;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
     SafeGetSSLSession(arg, sess);
 
     return SSL_CTX_remove_session(ctx, sess) == 1 ? Qtrue : Qfalse;
@@ -1245,7 +955,7 @@ ossl_sslctx_get_session_cache_mode(VALUE self)
 {
     SSL_CTX *ctx;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
 
     return LONG2NUM(SSL_CTX_get_session_cache_mode(ctx));
 }
@@ -1263,7 +973,7 @@ ossl_sslctx_set_session_cache_mode(VALUE self, VALUE arg)
 {
     SSL_CTX *ctx;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
 
     SSL_CTX_set_session_cache_mode(ctx, NUM2LONG(arg));
 
@@ -1282,7 +992,7 @@ ossl_sslctx_get_session_cache_size(VALUE self)
 {
     SSL_CTX *ctx;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
 
     return LONG2NUM(SSL_CTX_sess_get_cache_size(ctx));
 }
@@ -1299,7 +1009,7 @@ ossl_sslctx_set_session_cache_size(VALUE self, VALUE arg)
 {
     SSL_CTX *ctx;
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
 
     SSL_CTX_sess_set_cache_size(ctx, NUM2LONG(arg));
 
@@ -1334,7 +1044,7 @@ ossl_sslctx_get_session_cache_stats(VALUE self)
     SSL_CTX *ctx;
     VALUE hash;
 
-    GetSSLCTX(self, ctx);
+    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)));
@@ -1369,7 +1079,7 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
 
     rb_scan_args(argc, argv, "01", &arg1);
 
-    GetSSLCTX(self, ctx);
+    Data_Get_Struct(self, SSL_CTX, ctx);
 
     if (NIL_P(arg1)) {
         tm = time(0);
@@ -1388,31 +1098,37 @@ ossl_sslctx_flush_sessions(int argc, VALUE *argv, VALUE self)
  * SSLSocket class
  */
 #ifndef OPENSSL_NO_SOCK
-static inline int
-ssl_started(SSL *ssl)
-{
-    /* the FD is set in ossl_ssl_setup(), called by #connect or #accept */
-    return SSL_get_fd(ssl) >= 0;
+static void
+ossl_ssl_shutdown(SSL *ssl)
+{
+    int i, rc;
+
+    if (ssl) {
+	/* 4 is from SSL_smart_shutdown() of mod_ssl.c (v2.2.19) */
+	/* It says max 2x pending + 2x data = 4 */
+	for (i = 0; i < 4; ++i) {
+	    /*
+	     * Ignore the case SSL_shutdown returns -1. Empty handshake_func
+	     * must not happen.
+	     */
+	    if (rc = SSL_shutdown(ssl))
+		break;
+	}
+	SSL_clear(ssl);
+	ERR_clear_error();
+    }
 }
 
 static void
-ossl_ssl_free(void *ssl)
+ossl_ssl_free(SSL *ssl)
 {
     SSL_free(ssl);
 }
 
-const rb_data_type_t ossl_ssl_type = {
-    "OpenSSL/SSL",
-    {
-	0, ossl_ssl_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 static VALUE
 ossl_ssl_s_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &ossl_ssl_type, NULL);
+    return Data_Wrap_Struct(klass, 0, ossl_ssl_free, NULL);
 }
 
 /*
@@ -1420,7 +1136,7 @@ ossl_ssl_s_alloc(VALUE klass)
  *    SSLSocket.new(io) => aSSLSocket
  *    SSLSocket.new(io, ctx) => aSSLSocket
  *
- * Creates a new SSL socket from +io+ which must be a real IO object (not an
+ * Creates a new SSL socket from +io+ which must be a real ruby object (not an
  * IO-like object that responds to read/write).
  *
  * If +ctx+ is provided the SSL Sockets initial params will be taken from
@@ -1434,36 +1150,21 @@ ossl_ssl_s_alloc(VALUE klass)
 static VALUE
 ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 {
-    VALUE io, v_ctx, verify_cb;
-    SSL *ssl;
-    SSL_CTX *ctx;
-
-    TypedData_Get_Struct(self, SSL, &ossl_ssl_type, ssl);
-    if (ssl)
-	ossl_raise(eSSLError, "SSL already initialized");
-
-    if (rb_scan_args(argc, argv, "11", &io, &v_ctx) == 1)
-	v_ctx = rb_funcall(cSSLContext, rb_intern("new"), 0);
-
-    GetSSLCTX(v_ctx, ctx);
-    rb_ivar_set(self, id_i_context, v_ctx);
-    ossl_sslctx_setup(v_ctx);
+    VALUE io, ctx;
 
-    if (rb_respond_to(io, rb_intern("nonblock=")))
-	rb_funcall(io, rb_intern("nonblock="), 1, Qtrue);
-    rb_ivar_set(self, id_i_io, io);
-
-    ssl = SSL_new(ctx);
-    if (!ssl)
-	ossl_raise(eSSLError, NULL);
-    RTYPEDDATA_DATA(self) = ssl;
+    if (rb_scan_args(argc, argv, "11", &io, &ctx) == 1) {
+        ctx = rb_funcall(cSSLContext, rb_intern("new"), 0);
+    }
+    OSSL_Check_Kind(ctx, cSSLContext);
+    Check_Type(io, T_FILE);
+    ossl_ssl_set_io(self, io);
+    ossl_ssl_set_ctx(self, ctx);
+    ossl_ssl_set_sync_close(self, Qfalse);
+    ossl_sslctx_setup(ctx);
 
-    SSL_set_ex_data(ssl, ossl_ssl_ex_ptr_idx, (void *)self);
-    SSL_set_info_callback(ssl, ssl_info_cb);
-    verify_cb = rb_attr_get(v_ctx, id_i_verify_callback);
-    SSL_set_ex_data(ssl, ossl_ssl_ex_vcb_idx, (void *)verify_cb);
+    rb_iv_set(self, "@hostname", Qnil);
 
-    rb_call_super(0, NULL);
+    rb_call_super(0, 0);
 
     return self;
 }
@@ -1471,19 +1172,46 @@ ossl_ssl_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_ssl_setup(VALUE self)
 {
-    VALUE io;
+    VALUE io, v_ctx, cb;
+    SSL_CTX *ctx;
     SSL *ssl;
     rb_io_t *fptr;
 
-    GetSSL(self, ssl);
-    if (ssl_started(ssl))
-	return Qtrue;
+    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);
+
+        ssl = SSL_new(ctx);
+        if (!ssl) {
+            ossl_raise(eSSLError, "SSL_new");
+        }
+        DATA_PTR(self) = ssl;
 
-    io = rb_attr_get(self, id_i_io);
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    rb_io_check_writable(fptr);
-    SSL_set_fd(ssl, TO_SOCKET(FPTR_TO_FD(fptr)));
+#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(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);
+	cb = ossl_sslctx_get_client_cert_cb(v_ctx);
+	SSL_set_ex_data(ssl, ossl_ssl_ex_client_cert_cb_idx, (void*)cb);
+	cb = ossl_sslctx_get_tmp_dh_cb(v_ctx);
+	SSL_set_ex_data(ssl, ossl_ssl_ex_tmp_dh_callback_idx, (void*)cb);
+	SSL_set_info_callback(ssl, ssl_info_cb);
+    }
 
     return Qtrue;
 }
@@ -1494,64 +1222,62 @@ ossl_ssl_setup(VALUE self)
 #define ssl_get_error(ssl, ret) SSL_get_error((ssl), (ret))
 #endif
 
+#define ossl_ssl_data_get_struct(v, ssl)		\
+do {							\
+    Data_Get_Struct((v), SSL, (ssl));			\
+    if (!(ssl)) {					\
+        rb_warning("SSL session is not started yet.");  \
+        return Qnil;					\
+    }							\
+} while (0)
+
 static void
 write_would_block(int nonblock)
 {
-    if (nonblock)
-	ossl_raise(eSSLErrorWaitWritable, "write would block");
+    if (nonblock) {
+        VALUE exc = ossl_exc_new(eSSLErrorWaitWritable, "write would block");
+        rb_exc_raise(exc);
+    }
 }
 
 static void
 read_would_block(int nonblock)
 {
-    if (nonblock)
-	ossl_raise(eSSLErrorWaitReadable, "read would block");
-}
-
-static int
-no_exception_p(VALUE opts)
-{
-    if (RB_TYPE_P(opts, T_HASH) &&
-          rb_hash_lookup2(opts, sym_exception, Qundef) == Qfalse)
-	return 1;
-    return 0;
+    if (nonblock) {
+        VALUE exc = ossl_exc_new(eSSLErrorWaitReadable, "read would block");
+        rb_exc_raise(exc);
+    }
 }
 
 static VALUE
-ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, VALUE opts)
+ossl_start_ssl(VALUE self, int (*func)(), const char *funcname, int nonblock)
 {
     SSL *ssl;
     rb_io_t *fptr;
     int ret, ret2;
     VALUE cb_state;
-    int nonblock = opts != Qfalse;
 
     rb_ivar_set(self, ID_callback_state, Qnil);
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
-    GetOpenFile(rb_attr_get(self, id_i_io), fptr);
+    GetOpenFile(ossl_ssl_get_io(self), fptr);
     for(;;){
 	ret = func(ssl);
 
-	cb_state = rb_attr_get(self, ID_callback_state);
-        if (!NIL_P(cb_state)) {
-	    /* must cleanup OpenSSL error stack before re-raising */
-	    ossl_clear_error();
-	    rb_jump_tag(NUM2INT(cb_state));
-	}
+        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:
-            if (no_exception_p(opts)) { return sym_wait_writable; }
             write_would_block(nonblock);
             rb_io_wait_writable(FPTR_TO_FD(fptr));
             continue;
 	case SSL_ERROR_WANT_READ:
-            if (no_exception_p(opts)) { return sym_wait_readable; }
             read_would_block(nonblock);
             rb_io_wait_readable(FPTR_TO_FD(fptr));
             continue;
@@ -1577,13 +1303,12 @@ static VALUE
 ossl_ssl_connect(VALUE self)
 {
     ossl_ssl_setup(self);
-
-    return ossl_start_ssl(self, SSL_connect, "SSL_connect", Qfalse);
+    return ossl_start_ssl(self, SSL_connect, "SSL_connect", 0);
 }
 
 /*
  * call-seq:
- *    ssl.connect_nonblock([options]) => self
+ *    ssl.connect_nonblock => self
  *
  * Initiates the SSL/TLS handshake as a client in non-blocking manner.
  *
@@ -1598,20 +1323,12 @@ ossl_ssl_connect(VALUE self)
  *     retry
  *   end
  *
- * By specifying `exception: false`, the options hash allows you to indicate
- * that connect_nonblock should not raise an IO::WaitReadable or
- * IO::WaitWritable exception, but return the symbol :wait_readable or
- * :wait_writable instead.
  */
 static VALUE
-ossl_ssl_connect_nonblock(int argc, VALUE *argv, VALUE self)
+ossl_ssl_connect_nonblock(VALUE self)
 {
-    VALUE opts;
-    rb_scan_args(argc, argv, "0:", &opts);
-
     ossl_ssl_setup(self);
-
-    return ossl_start_ssl(self, SSL_connect, "SSL_connect", opts);
+    return ossl_start_ssl(self, SSL_connect, "SSL_connect", 1);
 }
 
 /*
@@ -1625,13 +1342,12 @@ static VALUE
 ossl_ssl_accept(VALUE self)
 {
     ossl_ssl_setup(self);
-
-    return ossl_start_ssl(self, SSL_accept, "SSL_accept", Qfalse);
+    return ossl_start_ssl(self, SSL_accept, "SSL_accept", 0);
 }
 
 /*
  * call-seq:
- *    ssl.accept_nonblock([options]) => self
+ *    ssl.accept_nonblock => self
  *
  * Initiates the SSL/TLS handshake as a server in non-blocking manner.
  *
@@ -1646,20 +1362,12 @@ ossl_ssl_accept(VALUE self)
  *     retry
  *   end
  *
- * By specifying `exception: false`, the options hash allows you to indicate
- * that accept_nonblock should not raise an IO::WaitReadable or
- * IO::WaitWritable exception, but return the symbol :wait_readable or
- * :wait_writable instead.
  */
 static VALUE
-ossl_ssl_accept_nonblock(int argc, VALUE *argv, VALUE self)
+ossl_ssl_accept_nonblock(VALUE self)
 {
-    VALUE opts;
-
-    rb_scan_args(argc, argv, "0:", &opts);
     ossl_ssl_setup(self);
-
-    return ossl_start_ssl(self, SSL_accept, "SSL_accept", opts);
+    return ossl_start_ssl(self, SSL_accept, "SSL_accept", 1);
 }
 
 static VALUE
@@ -1667,15 +1375,15 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 {
     SSL *ssl;
     int ilen, nread = 0;
+    int no_exception = 0;
     VALUE len, str;
     rb_io_t *fptr;
-    VALUE io, opts = Qnil;
+    VALUE opts = Qnil;
 
-    if (nonblock) {
-	rb_scan_args(argc, argv, "11:", &len, &str, &opts);
-    } else {
-	rb_scan_args(argc, argv, "11", &len, &str);
-    }
+    rb_scan_args(argc, argv, "11:", &len, &str, &opts);
+
+    if (!NIL_P(opts) && Qfalse == rb_hash_aref(opts, sym_exception))
+	no_exception = 1;
 
     ilen = NUM2INT(len);
     if(NIL_P(str)) str = rb_str_new(0, ilen);
@@ -1686,10 +1394,9 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
     }
     if(ilen == 0) return str;
 
-    GetSSL(self, ssl);
-    io = rb_attr_get(self, id_i_io);
-    GetOpenFile(io, fptr);
-    if (ssl_started(ssl)) {
+    Data_Get_Struct(self, SSL, ssl);
+    GetOpenFile(ossl_ssl_get_io(self), fptr);
+    if (ssl) {
 	if(!nonblock && SSL_pending(ssl) <= 0)
 	    rb_thread_wait_fd(FPTR_TO_FD(fptr));
 	for (;;){
@@ -1698,47 +1405,37 @@ ossl_ssl_read_internal(int argc, VALUE *argv, VALUE self, int nonblock)
 	    case SSL_ERROR_NONE:
 		goto end;
 	    case SSL_ERROR_ZERO_RETURN:
-		if (no_exception_p(opts)) { return Qnil; }
+		if (no_exception) { return Qnil; }
 		rb_eof_error();
 	    case SSL_ERROR_WANT_WRITE:
-		if (no_exception_p(opts)) { return sym_wait_writable; }
+		if (no_exception) { return ID2SYM(rb_intern("wait_writable")); }
                 write_would_block(nonblock);
                 rb_io_wait_writable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_WANT_READ:
-		if (no_exception_p(opts)) { return sym_wait_readable; }
+		if (no_exception) { return ID2SYM(rb_intern("wait_readable")); }
                 read_would_block(nonblock);
                 rb_io_wait_readable(FPTR_TO_FD(fptr));
 		continue;
 	    case SSL_ERROR_SYSCALL:
-		if (!ERR_peek_error()) {
-		    if (errno)
-			rb_sys_fail(0);
-		    else {
-			/*
-			 * The underlying BIO returned 0. This is actually a
-			 * protocol error. But unfortunately, not all
-			 * implementations cleanly shutdown the TLS connection
-			 * but just shutdown/close the TCP connection. So report
-			 * EOF for now...
-			 */
-			if (no_exception_p(opts)) { return Qnil; }
-			rb_eof_error();
-		    }
+		if(ERR_peek_error() == 0 && nread == 0) {
+		    if (no_exception) { return Qnil; }
+		    rb_eof_error();
 		}
+		rb_sys_fail(0);
 	    default:
 		ossl_raise(eSSLError, "SSL_read");
 	    }
         }
     }
     else {
-	ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
-
-	rb_warning("SSL session is not started yet.");
-	if (nonblock)
-	    return rb_funcall(io, meth, 3, len, str, opts);
-	else
-	    return rb_funcall(io, meth, 2, len, str);
+        ID meth = nonblock ? rb_intern("read_nonblock") : rb_intern("sysread");
+        rb_warning("SSL session is not started yet.");
+        if (nonblock) {
+          return rb_funcall(ossl_ssl_get_io(self), meth, 3, len, str, opts);
+        } else {
+          return rb_funcall(ossl_ssl_get_io(self), meth, 2, len, str);
+        }
     }
 
   end:
@@ -1782,37 +1479,29 @@ ossl_ssl_read_nonblock(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
+ossl_ssl_write_internal(VALUE self, VALUE str, int nonblock, int no_exception)
 {
     SSL *ssl;
     int nwrite = 0;
     rb_io_t *fptr;
-    int nonblock = opts != Qfalse;
-    VALUE io;
 
     StringValue(str);
-    GetSSL(self, ssl);
-    io = rb_attr_get(self, id_i_io);
-    GetOpenFile(io, fptr);
-    if (ssl_started(ssl)) {
-	for (;;){
-	    int num = RSTRING_LENINT(str);
-
-	    /* SSL_write(3ssl) manpage states num == 0 is undefined */
-	    if (num == 0)
-		goto end;
+    Data_Get_Struct(self, SSL, ssl);
+    GetOpenFile(ossl_ssl_get_io(self), fptr);
 
-	    nwrite = SSL_write(ssl, RSTRING_PTR(str), num);
+    if (ssl) {
+	for (;;){
+	    nwrite = SSL_write(ssl, RSTRING_PTR(str), RSTRING_LENINT(str));
 	    switch(ssl_get_error(ssl, nwrite)){
 	    case SSL_ERROR_NONE:
 		goto end;
 	    case SSL_ERROR_WANT_WRITE:
-		if (no_exception_p(opts)) { return sym_wait_writable; }
+		if (no_exception) { return ID2SYM(rb_intern("wait_writable")); }
                 write_would_block(nonblock);
                 rb_io_wait_writable(FPTR_TO_FD(fptr));
                 continue;
 	    case SSL_ERROR_WANT_READ:
-		if (no_exception_p(opts)) { return sym_wait_readable; }
+		if (no_exception) { return ID2SYM(rb_intern("wait_readable")); }
                 read_would_block(nonblock);
                 rb_io_wait_readable(FPTR_TO_FD(fptr));
                 continue;
@@ -1824,14 +1513,9 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
         }
     }
     else {
-	ID meth = nonblock ?
-	    rb_intern("write_nonblock") : rb_intern("syswrite");
-
-	rb_warning("SSL session is not started yet.");
-	if (nonblock)
-	    return rb_funcall(io, meth, 2, str, opts);
-	else
-	    return rb_funcall(io, meth, 1, str);
+        ID id_syswrite = rb_intern("syswrite");
+        rb_warning("SSL session is not started yet.");
+	return rb_funcall(ossl_ssl_get_io(self), id_syswrite, 1, str);
     }
 
   end:
@@ -1847,7 +1531,7 @@ ossl_ssl_write_internal(VALUE self, VALUE str, VALUE opts)
 static VALUE
 ossl_ssl_write(VALUE self, VALUE str)
 {
-    return ossl_ssl_write_internal(self, str, Qfalse);
+    return ossl_ssl_write_internal(self, str, 0, 0);
 }
 
 /*
@@ -1860,42 +1544,46 @@ ossl_ssl_write(VALUE self, VALUE str)
 static VALUE
 ossl_ssl_write_nonblock(int argc, VALUE *argv, VALUE self)
 {
-    VALUE str, opts;
+    VALUE str;
+    VALUE opts = Qnil;
+    int no_exception = 0;
 
     rb_scan_args(argc, argv, "1:", &str, &opts);
 
-    return ossl_ssl_write_internal(self, str, opts);
+    if (!NIL_P(opts) && Qfalse == rb_hash_aref(opts, sym_exception))
+	no_exception = 1;
+
+    return ossl_ssl_write_internal(self, str, 1, no_exception);
 }
 
 /*
  * call-seq:
- *    ssl.stop => nil
+ *    ssl.sysclose => nil
  *
- * Sends "close notify" to the peer and tries to shut down the SSL connection
- * gracefully.
+ * Shuts down the SSL connection and prepares it for another connection.
  */
 static VALUE
-ossl_ssl_stop(VALUE self)
+ossl_ssl_close(VALUE self)
 {
     SSL *ssl;
-    int ret;
+    VALUE io;
 
-    GetSSL(self, ssl);
-    if (!ssl_started(ssl))
-	return Qnil;
-    ret = SSL_shutdown(ssl);
-    if (ret == 1) /* Have already received close_notify */
-	return Qnil;
-    if (ret == 0) /* Sent close_notify, but we don't wait for reply */
-	return Qnil;
+    /* ossl_ssl_data_get_struct() is not usable here because it may return
+     * from this function; */
+
+    Data_Get_Struct(self, SSL, ssl);
+
+    io = ossl_ssl_get_io(self);
+    if (!RTEST(rb_funcall(io, rb_intern("closed?"), 0))) {
+        if (ssl) {
+            ossl_ssl_shutdown(ssl);
+            SSL_free(ssl);
+        }
+        DATA_PTR(self) = NULL;
+        if (RTEST(ossl_ssl_get_sync_close(self)))
+            rb_funcall(io, rb_intern("close"), 0);
+    }
 
-    /*
-     * XXX: Something happened. Possibly it failed because the underlying socket
-     * is not writable/readable, since it is in non-blocking mode. We should do
-     * some proper error handling using SSL_get_error() and maybe retry, but we
-     * can't block here. Give up for now.
-     */
-    ossl_clear_error();
     return Qnil;
 }
 
@@ -1911,7 +1599,7 @@ ossl_ssl_get_cert(VALUE self)
     SSL *ssl;
     X509 *cert = NULL;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     /*
      * Is this OpenSSL bug? Should add a ref?
@@ -1938,7 +1626,7 @@ ossl_ssl_get_peer_cert(VALUE self)
     X509 *cert = NULL;
     VALUE obj;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     cert = SSL_get_peer_certificate(ssl); /* Adds a ref => Safe to FREE. */
 
@@ -1966,7 +1654,7 @@ ossl_ssl_get_peer_cert_chain(VALUE self)
     VALUE ary;
     int i, num;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     chain = SSL_get_peer_cert_chain(ssl);
     if(!chain) return Qnil;
@@ -1992,7 +1680,7 @@ ossl_ssl_get_version(VALUE self)
 {
     SSL *ssl;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     return rb_str_new2(SSL_get_version(ssl));
 }
@@ -2009,7 +1697,7 @@ ossl_ssl_get_cipher(VALUE self)
     SSL *ssl;
     SSL_CIPHER *cipher;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     cipher = (SSL_CIPHER *)SSL_get_current_cipher(ssl);
 
@@ -2020,8 +1708,7 @@ ossl_ssl_get_cipher(VALUE self)
  * call-seq:
  *    ssl.state => string
  *
- * A description of the current connection state. This is for diagnostic
- * purposes only.
+ * A description of the current connection state.
  */
 static VALUE
 ossl_ssl_get_state(VALUE self)
@@ -2029,7 +1716,7 @@ ossl_ssl_get_state(VALUE self)
     SSL *ssl;
     VALUE ret;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     ret = rb_str_new2(SSL_state_string(ssl));
     if (ruby_verbose) {
@@ -2043,14 +1730,14 @@ ossl_ssl_get_state(VALUE self)
  * call-seq:
  *    ssl.pending => Integer
  *
- * The number of bytes that are immediately available for reading.
+ * The number of bytes that are immediately available for reading
  */
 static VALUE
 ossl_ssl_pending(VALUE self)
 {
     SSL *ssl;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     return INT2NUM(SSL_pending(ssl));
 }
@@ -2066,9 +1753,15 @@ ossl_ssl_session_reused(VALUE self)
 {
     SSL *ssl;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
-    return SSL_session_reused(ssl) ? Qtrue : Qfalse;
+    switch(SSL_session_reused(ssl)) {
+    case 1:	return Qtrue;
+    case 0:	return Qfalse;
+    default:	ossl_raise(eSSLError, "SSL_session_reused");
+    }
+
+    UNREACHABLE;
 }
 
 /*
@@ -2083,7 +1776,11 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
     SSL *ssl;
     SSL_SESSION *sess;
 
-    GetSSL(self, ssl);
+/* why is ossl_ssl_setup delayed? */
+    ossl_ssl_setup(self);
+
+    ossl_ssl_data_get_struct(self, ssl);
+
     SafeGetSSLSession(arg1, sess);
 
     if (SSL_set_session(ssl, sess) != 1)
@@ -2092,35 +1789,6 @@ ossl_ssl_set_session(VALUE self, VALUE arg1)
     return arg1;
 }
 
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-/*
- * call-seq:
- *    ssl.hostname = hostname -> hostname
- *
- * Sets the server hostname used for SNI. This needs to be set before
- * SSLSocket#connect.
- */
-static VALUE
-ossl_ssl_set_hostname(VALUE self, VALUE arg)
-{
-    SSL *ssl;
-    char *hostname = NULL;
-
-    GetSSL(self, ssl);
-
-    if (!NIL_P(arg))
-	hostname = StringValueCStr(arg);
-
-    if (!SSL_set_tlsext_host_name(ssl, hostname))
-	ossl_raise(eSSLError, NULL);
-
-    /* for SSLSocket#hostname */
-    rb_ivar_set(self, id_i_hostname, arg);
-
-    return arg;
-}
-#endif
-
 /*
  * call-seq:
  *    ssl.verify_result => Integer
@@ -2135,9 +1803,9 @@ ossl_ssl_get_verify_result(VALUE self)
 {
     SSL *ssl;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
-    return INT2NUM(SSL_get_verify_result(ssl));
+    return INT2FIX(SSL_get_verify_result(ssl));
 }
 
 /*
@@ -2157,16 +1825,16 @@ ossl_ssl_get_client_ca_list(VALUE self)
     SSL *ssl;
     STACK_OF(X509_NAME) *ca;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     ca = SSL_get_client_CA_list(ssl);
     return ossl_x509name_sk2ary(ca);
 }
 
-# ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+# ifdef HAVE_OPENSSL_NPN_NEGOTIATED
 /*
  * call-seq:
- *    ssl.npn_protocol => String | nil
+ *    ssl.npn_protocol => String
  *
  * Returns the protocol string that was finally selected by the client
  * during the handshake.
@@ -2178,7 +1846,7 @@ ossl_ssl_npn_protocol(VALUE self)
     const unsigned char *out;
     unsigned int outlen;
 
-    GetSSL(self, ssl);
+    ossl_ssl_data_get_struct(self, ssl);
 
     SSL_get0_next_proto_negotiated(ssl, &out, &outlen);
     if (!outlen)
@@ -2187,73 +1855,27 @@ ossl_ssl_npn_protocol(VALUE self)
 	return rb_str_new((const char *) out, outlen);
 }
 # endif
-
-# ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-/*
- * call-seq:
- *    ssl.alpn_protocol => String | nil
- *
- * Returns the ALPN protocol string that was finally selected by the server
- * during the handshake.
- */
-static VALUE
-ossl_ssl_alpn_protocol(VALUE self)
-{
-    SSL *ssl;
-    const unsigned char *out;
-    unsigned int outlen;
-
-    GetSSL(self, ssl);
-
-    SSL_get0_alpn_selected(ssl, &out, &outlen);
-    if (!outlen)
-	return Qnil;
-    else
-	return rb_str_new((const char *) out, outlen);
-}
-# endif
-
-# ifdef HAVE_SSL_GET_SERVER_TMP_KEY
-/*
- * call-seq:
- *    ssl.tmp_key => PKey or nil
- *
- * Returns the ephemeral key used in case of forward secrecy cipher.
- */
-static VALUE
-ossl_ssl_tmp_key(VALUE self)
-{
-    SSL *ssl;
-    EVP_PKEY *key;
-
-    GetSSL(self, ssl);
-    if (!SSL_get_server_tmp_key(ssl, &key))
-	return Qnil;
-    return ossl_pkey_new(key);
-}
-# endif /* defined(HAVE_SSL_GET_SERVER_TMP_KEY) */
 #endif /* !defined(OPENSSL_NO_SOCK) */
 
-#undef rb_intern
-#define rb_intern(s) rb_intern_const(s)
 void
-Init_ossl_ssl(void)
+Init_ossl_ssl()
 {
     int i;
     VALUE ary;
 
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    rb_mWaitReadable = rb_define_module_under(rb_cIO, "WaitReadable");
-    rb_mWaitWritable = rb_define_module_under(rb_cIO, "WaitWritable");
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
 #endif
 
-    ID_callback_state = rb_intern("callback_state");
+    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,(void *)"ossl_ssl_ex_client_cert_cb_idx",0,0,0);
+    ossl_ssl_ex_tmp_dh_callback_idx =
+	SSL_get_ex_new_index(0,(void *)"ossl_ssl_ex_tmp_dh_callback_idx",0,0,0);
 
     /* Document-module: OpenSSL::SSL
      *
@@ -2263,17 +1885,6 @@ Init_ossl_ssl(void)
      * of SSLContext to set up connections.
      */
     mSSL = rb_define_module_under(mOSSL, "SSL");
-
-    /* Document-module: OpenSSL::ExtConfig
-     *
-     * This module contains configuration information about the SSL extension,
-     * for example if socket support is enabled, or the host name TLS extension
-     * is enabled.  Constants in this module will always be defined, but contain
-     * `true` or `false` values depending on the configuration of your OpenSSL
-     * installation.
-     */
-    mSSLExtConfig = rb_define_module_under(mOSSL, "ExtConfig");
-
     /* Document-class: OpenSSL::SSL::SSLError
      *
      * Generic error class raised by SSLSocket and SSLContext.
@@ -2294,10 +1905,14 @@ Init_ossl_ssl(void)
      *
      * All attributes must be set before creating an SSLSocket as the
      * SSLContext will be frozen afterward.
+     *
+     * The following attributes are available but don't show up in rdoc:
+     * * 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);
-    rb_undef_method(cSSLContext, "initialize_copy");
 
     /*
      * Context certificate
@@ -2327,7 +1942,7 @@ Init_ossl_ssl(void)
     rb_attr(cSSLContext, rb_intern("ca_path"), 1, 1, Qfalse);
 
     /*
-     * Maximum session lifetime in seconds.
+     * Maximum session lifetime.
      */
     rb_attr(cSSLContext, rb_intern("timeout"), 1, 1, Qfalse);
 
@@ -2336,11 +1951,6 @@ Init_ossl_ssl(void)
      *
      * Valid modes are VERIFY_NONE, VERIFY_PEER, VERIFY_CLIENT_ONCE,
      * VERIFY_FAIL_IF_NO_PEER_CERT and defined on OpenSSL::SSL
-     *
-     * The default mode is VERIFY_NONE, which does not perform any verification
-     * at all.
-     *
-     * See SSL_CTX_set_verify(3) for details.
      */
     rb_attr(cSSLContext, rb_intern("verify_mode"), 1, 1, Qfalse);
 
@@ -2358,21 +1968,17 @@ Init_ossl_ssl(void)
      * +store_context+ is an OpenSSL::X509::StoreContext containing the
      * context used for certificate verification.
      *
-     * If the callback returns false, the chain verification is immediately
-     * stopped and a bad_certificate alert is then sent.
+     * If the callback returns false verification is stopped.
      */
     rb_attr(cSSLContext, rb_intern("verify_callback"), 1, 1, Qfalse);
 
     /*
-     * Whether to check the server certificate is valid for the hostname.
-     *
-     * In order to make this work, verify_mode must be set to VERIFY_PEER and
-     * the server hostname must be given by OpenSSL::SSL::SSLSocket#hostname=.
+     * Sets various OpenSSL options.
      */
-    rb_attr(cSSLContext, rb_intern("verify_hostname"), 1, 1, Qfalse);
+    rb_attr(cSSLContext, rb_intern("options"), 1, 1, Qfalse);
 
     /*
-     * An OpenSSL::X509::Store used for certificate verification.
+     * An OpenSSL::X509::Store used for certificate verification
      */
     rb_attr(cSSLContext, rb_intern("cert_store"), 1, 1, Qfalse);
 
@@ -2392,19 +1998,17 @@ Init_ossl_ssl(void)
      */
     rb_attr(cSSLContext, rb_intern("client_cert_cb"), 1, 1, Qfalse);
 
-#if !defined(OPENSSL_NO_EC) && defined(HAVE_SSL_CTX_SET_TMP_ECDH_CALLBACK)
     /*
-     * A callback invoked when ECDH parameters are required.
+     * A callback invoked when DH parameters are required.
      *
      * The callback is invoked with the Session for the key exchange, an
      * flag indicating the use of an export cipher and the keylength
      * required.
      *
-     * The callback is deprecated. This does not work with recent versions of
-     * OpenSSL. Use OpenSSL::SSL::SSLContext#ecdh_curves= instead.
+     * The callback must return an OpenSSL::PKey::DH instance of the correct
+     * key length.
      */
-    rb_attr(cSSLContext, rb_intern("tmp_ecdh_callback"), 1, 1, Qfalse);
-#endif
+    rb_attr(cSSLContext, rb_intern("tmp_dh_callback"), 1, 1, Qfalse);
 
     /*
      * Sets the context in which a session can be reused.  This allows
@@ -2438,17 +2042,15 @@ Init_ossl_ssl(void)
     rb_attr(cSSLContext, rb_intern("session_remove_cb"), 1, 1, Qfalse);
 
 #ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-    rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qtrue);
-#else
-    rb_define_const(mSSLExtConfig, "HAVE_TLSEXT_HOST_NAME", Qfalse);
-#endif
-
-#ifdef TLS_DH_anon_WITH_AES_256_GCM_SHA384
-    rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qtrue);
-#else
-    rb_define_const(mSSLExtConfig, "TLS_DH_anon_WITH_AES_256_GCM_SHA384", Qfalse);
+    /*
+     * A callback invoked at connect time to distinguish between multiple
+     * server names.
+     *
+     * The callback is invoked with an SSLSocket and a server name.  The
+     * callback must return an SSLContext for the server name or nil.
+     */
+    rb_attr(cSSLContext, rb_intern("servername_cb"), 1, 1, Qfalse);
 #endif
-
     /*
      * A callback invoked whenever a new handshake is initiated. May be used
      * to disable renegotiation entirely.
@@ -2471,7 +2073,7 @@ Init_ossl_ssl(void)
      *   end
      */
     rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse);
-#ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
     /*
      * An Enumerable of Strings. Each String represents a protocol to be
      * advertised as the list of supported protocols for Next Protocol
@@ -2496,76 +2098,41 @@ Init_ossl_ssl(void)
      * === Example
      *
      *   ctx.npn_select_cb = lambda do |protocols|
-     *     # inspect the protocols and select one
+     *     #inspect the protocols and select one
      *     protocols.first
      *   end
      */
     rb_attr(cSSLContext, rb_intern("npn_select_cb"), 1, 1, Qfalse);
 #endif
 
-#ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-    /*
-     * An Enumerable of Strings. Each String represents a protocol to be
-     * advertised as the list of supported protocols for Application-Layer
-     * Protocol Negotiation. Supported in OpenSSL 1.0.2 and higher. Has no
-     * effect on the server side. If not set explicitly, the ALPN extension will
-     * not be included in the handshake.
-     *
-     * === Example
-     *
-     *   ctx.alpn_protocols = ["http/1.1", "spdy/2", "h2"]
-     */
-    rb_attr(cSSLContext, rb_intern("alpn_protocols"), 1, 1, Qfalse);
-    /*
-     * A callback invoked on the server side when the server needs to select
-     * a protocol from the list sent by the client. Supported in OpenSSL 1.0.2
-     * and higher. The callback must return a protocol of those advertised by
-     * the client. If none is acceptable, raising an error in the callback
-     * will cause the handshake to fail. Not setting this callback explicitly
-     * means not supporting the ALPN extension on the server - any protocols
-     * advertised by the client will be ignored.
-     *
-     * === Example
-     *
-     *   ctx.alpn_select_cb = lambda do |protocols|
-     *     # inspect the protocols and select one
-     *     protocols.first
-     *   end
-     */
-    rb_attr(cSSLContext, rb_intern("alpn_select_cb"), 1, 1, Qfalse);
-#endif
-
     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);
-    rb_define_method(cSSLContext, "ecdh_curves=", ossl_sslctx_set_ecdh_curves, 1);
-    rb_define_method(cSSLContext, "security_level", ossl_sslctx_get_security_level, 0);
-    rb_define_method(cSSLContext, "security_level=", ossl_sslctx_set_security_level, 1);
 
     rb_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0);
-    rb_define_alias(cSSLContext, "freeze", "setup");
 
     /*
      * No session caching for client or server
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2NUM(SSL_SESS_CACHE_OFF));
+    rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
 
     /*
      * Client sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2NUM(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
 
     /*
      * Server sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2NUM(SSL_SESS_CACHE_SERVER));
+    rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2FIX(SSL_SESS_CACHE_SERVER));
 
     /*
      * Both client and server sessions are added to the session cache
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2NUM(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
+    rb_define_const(cSSLContext, "SESSION_CACHE_BOTH", LONG2FIX(SSL_SESS_CACHE_BOTH)); /* no different than CACHE_SERVER in 0.9.8e */
 
     /*
      * Normally the session cache is checked for expired sessions every 255
@@ -2573,7 +2140,7 @@ Init_ossl_ssl(void)
      * the automatic flushing may be disabled and #flush_sessions can be
      * called explicitly.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2NUM(SSL_SESS_CACHE_NO_AUTO_CLEAR));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_AUTO_CLEAR", LONG2FIX(SSL_SESS_CACHE_NO_AUTO_CLEAR));
 
     /*
      * Always perform external lookups of sessions even if they are in the
@@ -2581,18 +2148,18 @@ Init_ossl_ssl(void)
      *
      * This flag has no effect on clients
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_LOOKUP", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_LOOKUP));
 
     /*
      * Never automatically store sessions in the internal store.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL_STORE));
+    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL_STORE", LONG2FIX(SSL_SESS_CACHE_NO_INTERNAL_STORE));
 
     /*
      * Enables both SESSION_CACHE_NO_INTERNAL_LOOKUP and
      * SESSION_CACHE_NO_INTERNAL_STORE.
      */
-    rb_define_const(cSSLContext, "SESSION_CACHE_NO_INTERNAL", LONG2NUM(SSL_SESS_CACHE_NO_INTERNAL));
+    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);
@@ -2602,8 +2169,6 @@ Init_ossl_ssl(void)
     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);
-    rb_define_method(cSSLContext, "options",     ossl_sslctx_get_options, 0);
-    rb_define_method(cSSLContext, "options=",     ossl_sslctx_set_options, 1);
 
     ary = rb_ary_new2(numberof(ossl_ssl_method_tab));
     for (i = 0; i < numberof(ossl_ssl_method_tab); i++) {
@@ -2615,25 +2180,31 @@ Init_ossl_ssl(void)
 
     /*
      * Document-class: OpenSSL::SSL::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);
 #ifdef OPENSSL_NO_SOCK
-    rb_define_const(mSSLExtConfig, "OPENSSL_NO_SOCK", Qtrue);
-    rb_define_method(cSSLSocket, "initialize", rb_f_notimplement, -1);
+    rb_define_method(cSSLSocket, "initialize", rb_notimplement, -1);
 #else
-    rb_define_const(mSSLExtConfig, "OPENSSL_NO_SOCK", Qfalse);
     rb_define_alloc_func(cSSLSocket, ossl_ssl_s_alloc);
+    for(i = 0; i < numberof(ossl_ssl_attr_readers); i++)
+        rb_attr(cSSLSocket, rb_intern(ossl_ssl_attr_readers[i]), 1, 0, Qfalse);
+    for(i = 0; i < numberof(ossl_ssl_attrs); i++)
+        rb_attr(cSSLSocket, rb_intern(ossl_ssl_attrs[i]), 1, 1, Qfalse);
+    rb_define_alias(cSSLSocket, "to_io", "io");
     rb_define_method(cSSLSocket, "initialize", ossl_ssl_initialize, -1);
-    rb_undef_method(cSSLSocket, "initialize_copy");
     rb_define_method(cSSLSocket, "connect",    ossl_ssl_connect, 0);
-    rb_define_method(cSSLSocket, "connect_nonblock",    ossl_ssl_connect_nonblock, -1);
+    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, -1);
+    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_private_method(cSSLSocket, "stop",   ossl_ssl_stop, 0);
+    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);
     rb_define_method(cSSLSocket, "peer_cert_chain", ossl_ssl_get_peer_cert_chain, 0);
@@ -2646,22 +2217,12 @@ Init_ossl_ssl(void)
     rb_define_method(cSSLSocket, "session=",    ossl_ssl_set_session, 1);
     rb_define_method(cSSLSocket, "verify_result", ossl_ssl_get_verify_result, 0);
     rb_define_method(cSSLSocket, "client_ca", ossl_ssl_get_client_ca_list, 0);
-#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
-    /* #hostname is defined in lib/openssl/ssl.rb */
-    rb_define_method(cSSLSocket, "hostname=", ossl_ssl_set_hostname, 1);
-#endif
-# ifdef HAVE_SSL_GET_SERVER_TMP_KEY
-    rb_define_method(cSSLSocket, "tmp_key", ossl_ssl_tmp_key, 0);
-# endif
-# ifdef HAVE_SSL_CTX_SET_ALPN_SELECT_CB
-    rb_define_method(cSSLSocket, "alpn_protocol", ossl_ssl_alpn_protocol, 0);
-# endif
-# ifdef HAVE_SSL_CTX_SET_NEXT_PROTO_SELECT_CB
+# ifdef HAVE_OPENSSL_NPN_NEGOTIATED
     rb_define_method(cSSLSocket, "npn_protocol", ossl_ssl_npn_protocol, 0);
 # endif
 #endif
 
-#define ossl_ssl_def_const(x) rb_define_const(mSSL, #x, LONG2NUM(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);
@@ -2676,17 +2237,25 @@ Init_ossl_ssl(void)
     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);
+#if defined(SSL_OP_MSIE_SSLV2_RSA_PADDING)
     ossl_ssl_def_const(OP_MSIE_SSLV2_RSA_PADDING);
+#endif
     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);
+#endif
+#if defined(SSL_OP_SINGLE_ECDH_USE)
     ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
+#endif
     ossl_ssl_def_const(OP_SINGLE_DH_USE);
     ossl_ssl_def_const(OP_EPHEMERAL_RSA);
+#if defined(SSL_OP_CIPHER_SERVER_PREFERENCE)
     ossl_ssl_def_const(OP_CIPHER_SERVER_PREFERENCE);
+#endif
     ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
     ossl_ssl_def_const(OP_NO_SSLv2);
     ossl_ssl_def_const(OP_NO_SSLv3);
@@ -2709,42 +2278,4 @@ Init_ossl_ssl(void)
     ossl_ssl_def_const(OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
 
     sym_exception = ID2SYM(rb_intern("exception"));
-    sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
-    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
-
-    id_tmp_dh_callback = rb_intern("tmp_dh_callback");
-    id_tmp_ecdh_callback = rb_intern("tmp_ecdh_callback");
-    id_npn_protocols_encoded = rb_intern("npn_protocols_encoded");
-
-#define DefIVarID(name) do \
-    id_i_##name = rb_intern("@"#name); while (0)
-
-    DefIVarID(cert_store);
-    DefIVarID(ca_file);
-    DefIVarID(ca_path);
-    DefIVarID(verify_mode);
-    DefIVarID(verify_depth);
-    DefIVarID(verify_callback);
-    DefIVarID(client_ca);
-    DefIVarID(renegotiation_cb);
-    DefIVarID(cert);
-    DefIVarID(key);
-    DefIVarID(extra_chain_cert);
-    DefIVarID(client_cert_cb);
-    DefIVarID(tmp_ecdh_callback);
-    DefIVarID(timeout);
-    DefIVarID(session_id_context);
-    DefIVarID(session_get_cb);
-    DefIVarID(session_new_cb);
-    DefIVarID(session_remove_cb);
-    DefIVarID(npn_select_cb);
-    DefIVarID(npn_protocols);
-    DefIVarID(alpn_protocols);
-    DefIVarID(alpn_select_cb);
-    DefIVarID(servername_cb);
-    DefIVarID(verify_hostname);
-
-    DefIVarID(io);
-    DefIVarID(context);
-    DefIVarID(hostname);
 }
diff --git a/ext/openssl/ossl_ssl.h b/ext/openssl/ossl_ssl.h
index c1a3cd6c1d..034762fc46 100644
--- a/ext/openssl/ossl_ssl.h
+++ b/ext/openssl/ossl_ssl.h
@@ -1,24 +1,18 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_SSL_H_)
 #define _OSSL_SSL_H_
 
-#define GetSSL(obj, ssl) do { \
-	TypedData_Get_Struct((obj), SSL, &ossl_ssl_type, (ssl)); \
-	if (!(ssl)) { \
-		ossl_raise(rb_eRuntimeError, "SSL is not initialized"); \
-	} \
-} while (0)
-
 #define GetSSLSession(obj, sess) do { \
-	TypedData_Get_Struct((obj), SSL_SESSION, &ossl_ssl_session_type, (sess)); \
+	Data_Get_Struct((obj), SSL_SESSION, (sess)); \
 	if (!(sess)) { \
 		ossl_raise(rb_eRuntimeError, "SSL Session wasn't initialized."); \
 	} \
@@ -29,13 +23,14 @@
 	GetSSLSession((obj), (sess)); \
 } while (0)
 
-extern const rb_data_type_t ossl_ssl_type;
-extern const rb_data_type_t ossl_ssl_session_type;
 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
index 1b602a6cd7..a7437caf37 100644
--- a/ext/openssl/ossl_ssl_session.c
+++ b/ext/openssl/ossl_ssl_session.c
@@ -4,36 +4,35 @@
 
 #include "ossl.h"
 
-VALUE cSSLSession;
-static VALUE eSSLSession;
+#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)
 
-static void
-ossl_ssl_session_free(void *ptr)
-{
-    SSL_SESSION_free(ptr);
-}
+#define SafeGetSSLSession(obj, sess) do { \
+	OSSL_Check_Kind((obj), cSSLSession); \
+	GetSSLSession((obj), (sess)); \
+} while (0)
 
-const rb_data_type_t ossl_ssl_session_type = {
-    "OpenSSL/SSL/Session",
-    {
-	0, ossl_ssl_session_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
+
+VALUE cSSLSession;
+static VALUE eSSLSession;
 
 static VALUE ossl_ssl_session_alloc(VALUE klass)
 {
-	return TypedData_Wrap_Struct(klass, &ossl_ssl_session_type, NULL);
+	return Data_Wrap_Struct(klass, 0, SSL_SESSION_free, NULL);
 }
 
 /*
  * call-seq:
- *   Session.new(ssl_socket) -> Session
- *   Session.new(string) -> Session
+ *    Session.new(SSLSocket | string) => session
  *
- * Creates a new Session object from an instance of SSLSocket or DER/PEM encoded
- * String.
- */
+ * === 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;
@@ -44,9 +43,9 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 	if (rb_obj_is_instance_of(arg1, cSSLSocket)) {
 		SSL *ssl;
 
-		GetSSL(arg1, ssl);
+		Data_Get_Struct(arg1, SSL, ssl);
 
-		if ((ctx = SSL_get1_session(ssl)) == NULL)
+		if (!ssl || (ctx = SSL_get1_session(ssl)) == NULL)
 			ossl_raise(eSSLSession, "no session available");
 	} else {
 		BIO *in = ossl_obj2bio(arg1);
@@ -73,50 +72,21 @@ static VALUE ossl_ssl_session_initialize(VALUE self, VALUE arg1)
 	return self;
 }
 
-static VALUE
-ossl_ssl_session_initialize_copy(VALUE self, VALUE other)
-{
-    SSL_SESSION *sess, *sess_other, *sess_new;
-
-    rb_check_frozen(self);
-    sess = RTYPEDDATA_DATA(self); /* XXX */
-    SafeGetSSLSession(other, sess_other);
-
-    sess_new = ASN1_dup((i2d_of_void *)i2d_SSL_SESSION, (d2i_of_void *)d2i_SSL_SESSION,
-			(char *)sess_other);
-    if (!sess_new)
-	ossl_raise(eSSLSession, "ASN1_dup");
-
-    RTYPEDDATA_DATA(self) = sess_new;
-    SSL_SESSION_free(sess);
-
-    return self;
-}
-
-#if !defined(HAVE_SSL_SESSION_CMP)
-int ossl_SSL_SESSION_cmp(const SSL_SESSION *a, const SSL_SESSION *b)
+#if HAVE_SSL_SESSION_CMP == 0
+int SSL_SESSION_cmp(const SSL_SESSION *a,const SSL_SESSION *b)
 {
-    unsigned int a_len;
-    const unsigned char *a_sid = SSL_SESSION_get_id(a, &a_len);
-    unsigned int b_len;
-    const unsigned char *b_sid = SSL_SESSION_get_id(b, &b_len);
-
-    if (SSL_SESSION_get_protocol_version(a) != SSL_SESSION_get_protocol_version(b))
+    if (a->ssl_version != b->ssl_version ||
+	a->session_id_length != b->session_id_length)
 	return 1;
-    if (a_len != b_len)
-	return 1;
-
-    return CRYPTO_memcmp(a_sid, b_sid, a_len);
+    return memcmp(a->session_id,b-> session_id, a->session_id_length);
 }
-#define SSL_SESSION_cmp(a, b) ossl_SSL_SESSION_cmp(a, b)
 #endif
 
 /*
  * call-seq:
- *   session1 == session2 -> boolean
+ *    session1 == session2 -> boolean
  *
- * Returns true if the two Session is the same, false if not.
- */
+*/
 static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
 {
 	SSL_SESSION *ctx1, *ctx2;
@@ -134,50 +104,51 @@ static VALUE ossl_ssl_session_eq(VALUE val1, VALUE val2)
  * call-seq:
  *    session.time -> Time
  *
- * Returns the time at which the session was established.
- */
-static VALUE
-ossl_ssl_session_get_time(VALUE self)
+ * Gets start time of the session.
+ *
+*/
+static VALUE ossl_ssl_session_get_time(VALUE self)
 {
-    SSL_SESSION *ctx;
-    long t;
+	SSL_SESSION *ctx;
+	time_t t;
+
+	GetSSLSession(self, ctx);
+
+	t = SSL_SESSION_get_time(ctx);
 
-    GetSSLSession(self, ctx);
-    t = SSL_SESSION_get_time(ctx);
-    if (t == 0)
-	return Qnil;
+	if (t == 0)
+		return Qnil;
 
-    return rb_funcall(rb_cTime, rb_intern("at"), 1, LONG2NUM(t));
+	return rb_funcall(rb_cTime, rb_intern("at"), 1, TIMET2NUM(t));
 }
 
 /*
  * call-seq:
- *    session.timeout -> Integer
+ *    session.timeout -> integer
  *
- * Returns the timeout value set for the session, in seconds from the
- * established time.
+ * Gets how long until the session expires in seconds.
  *
- */
-static VALUE
-ossl_ssl_session_get_timeout(VALUE self)
+*/
+static VALUE ossl_ssl_session_get_timeout(VALUE self)
 {
-    SSL_SESSION *ctx;
-    long t;
+	SSL_SESSION *ctx;
+	time_t t;
+
+	GetSSLSession(self, ctx);
 
-    GetSSLSession(self, ctx);
-    t = SSL_SESSION_get_timeout(ctx);
+	t = SSL_SESSION_get_timeout(ctx);
 
-    return LONG2NUM(t);
+	return TIMET2NUM(t);
 }
 
 /*
  * call-seq:
- *    session.time = time
- *    session.time = integer
+ *    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;
@@ -194,10 +165,11 @@ static VALUE ossl_ssl_session_set_time(VALUE self, VALUE time_v)
 
 /*
  * call-seq:
- *    session.timeout = integer
+ *    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;
@@ -209,9 +181,10 @@ static VALUE ossl_ssl_session_set_timeout(VALUE self, VALUE time_v)
 	return ossl_ssl_session_get_timeout(self);
 }
 
+#ifdef HAVE_SSL_SESSION_GET_ID
 /*
  * call-seq:
- *    session.id -> String
+ *    session.id -> aString
  *
  * Returns the Session ID.
 */
@@ -227,13 +200,14 @@ static VALUE ossl_ssl_session_get_id(VALUE self)
 
 	return rb_str_new((const char *) p, i);
 }
+#endif
 
 /*
  * call-seq:
- *    session.to_der -> String
+ *    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;
@@ -259,11 +233,14 @@ static VALUE ossl_ssl_session_to_der(VALUE self)
  *    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);
 
@@ -271,13 +248,16 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
 		ossl_raise(eSSLSession, "BIO_s_mem()");
 	}
 
-	if (!PEM_write_bio_SSL_SESSION(out, ctx)) {
+	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 ossl_membio2str(out);
+	return str;
 }
 
 
@@ -285,12 +265,14 @@ static VALUE ossl_ssl_session_to_pem(VALUE self)
  * call-seq:
  *    session.to_text -> String
  *
- * Shows everything in the Session object. This is for diagnostic purposes.
- */
+ * 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);
 
@@ -303,23 +285,25 @@ static VALUE ossl_ssl_session_to_text(VALUE self)
 		ossl_raise(eSSLSession, "SSL_SESSION_print()");
 	}
 
-	return ossl_membio2str(out);
+	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
-    mOSSL = rb_define_module("OpenSSL");
-    mSSL = rb_define_module_under(mOSSL, "SSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+	mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
+	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_copy_func(cSSLSession, ossl_ssl_session_initialize_copy);
 
 	rb_define_method(cSSLSession, "==", ossl_ssl_session_eq, 1);
 
@@ -327,7 +311,12 @@ void Init_ossl_ssl_session(void)
 	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 d1bd7bc4bb..193ceab089 100644
--- a/ext/openssl/ossl_version.h
+++ b/ext/openssl/ossl_version.h
@@ -1,15 +1,16 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_VERSION_H_)
 #define _OSSL_VERSION_H_
 
-#define OSSL_VERSION "2.0.2"
+#define OSSL_VERSION "1.1.0"
 
 #endif /* _OSSL_VERSION_H_ */
diff --git a/ext/openssl/ossl_x509.c b/ext/openssl/ossl_x509.c
index 19ec274ae1..fd1d9b6c7e 100644
--- a/ext/openssl/ossl_x509.c
+++ b/ext/openssl/ossl_x509.c
@@ -1,43 +1,24 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
 VALUE mX509;
 
-#define DefX509Const(x) rb_define_const(mX509, #x, INT2NUM(X509_##x))
+#define DefX509Const(x) rb_define_const(mX509, #x,INT2FIX(X509_##x))
 #define DefX509Default(x,i) \
   rb_define_const(mX509, "DEFAULT_" #x, rb_str_new2(X509_get_default_##i()))
 
-ASN1_TIME *
-ossl_x509_time_adjust(ASN1_TIME *s, VALUE time)
-{
-    time_t sec;
-
-#if defined(HAVE_ASN1_TIME_ADJ)
-    int off_days;
-
-    ossl_time_split(time, &sec, &off_days);
-    return X509_time_adj_ex(s, off_days, 0, &sec);
-#else
-    sec = time_to_time_t(time);
-    return X509_time_adj(s, 0, &sec);
-#endif
-}
-
 void
-Init_ossl_x509(void)
+Init_ossl_x509()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-#endif
-
     mX509 = rb_define_module_under(mOSSL, "X509");
 
     Init_ossl_x509attr();
@@ -83,87 +64,22 @@ Init_ossl_x509(void)
     DefX509Const(V_ERR_KEYUSAGE_NO_CERTSIGN);
     DefX509Const(V_ERR_APPLICATION_VERIFICATION);
 
-    /* Set by Store#flags= and StoreContext#flags=. Enables CRL checking for the
-     * certificate chain leaf. */
+#if defined(X509_V_FLAG_CRL_CHECK)
     DefX509Const(V_FLAG_CRL_CHECK);
-    /* Set by Store#flags= and StoreContext#flags=. Enables CRL checking for all
-     * certificates in the certificate chain */
-    DefX509Const(V_FLAG_CRL_CHECK_ALL);
-    /* Set by Store#flags= and StoreContext#flags=. Disables critical extension
-     * checking. */
-    DefX509Const(V_FLAG_IGNORE_CRITICAL);
-    /* Set by Store#flags= and StoreContext#flags=. Disables workarounds for
-     * broken certificates. */
-    DefX509Const(V_FLAG_X509_STRICT);
-    /* Set by Store#flags= and StoreContext#flags=. Enables proxy certificate
-     * verification. */
-    DefX509Const(V_FLAG_ALLOW_PROXY_CERTS);
-    /* Set by Store#flags= and StoreContext#flags=. Enables certificate policy
-     * constraints checking. */
-    DefX509Const(V_FLAG_POLICY_CHECK);
-    /* Set by Store#flags= and StoreContext#flags=.
-     * Implies V_FLAG_POLICY_CHECK */
-    DefX509Const(V_FLAG_EXPLICIT_POLICY);
-    /* Set by Store#flags= and StoreContext#flags=.
-     * Implies V_FLAG_POLICY_CHECK */
-    DefX509Const(V_FLAG_INHIBIT_ANY);
-    /* Set by Store#flags= and StoreContext#flags=.
-     * Implies V_FLAG_POLICY_CHECK */
-    DefX509Const(V_FLAG_INHIBIT_MAP);
-    /* Set by Store#flags= and StoreContext#flags=. */
-    DefX509Const(V_FLAG_NOTIFY_POLICY);
-#if defined(X509_V_FLAG_EXTENDED_CRL_SUPPORT)
-    /* Set by Store#flags= and StoreContext#flags=. Enables some additional
-     * features including support for indirect signed CRLs. */
-    DefX509Const(V_FLAG_EXTENDED_CRL_SUPPORT);
-#endif
-#if defined(X509_V_FLAG_USE_DELTAS)
-    /* Set by Store#flags= and StoreContext#flags=. Uses delta CRLs. If not
-     * specified, deltas are ignored. */
-    DefX509Const(V_FLAG_USE_DELTAS);
-#endif
-#if defined(X509_V_FLAG_CHECK_SS_SIGNATURE)
-    /* Set by Store#flags= and StoreContext#flags=. Enables checking of the
-     * signature of the root self-signed CA. */
-    DefX509Const(V_FLAG_CHECK_SS_SIGNATURE);
-#endif
-#if defined(X509_V_FLAG_TRUSTED_FIRST)
-    /* Set by Store#flags= and StoreContext#flags=. When constructing a
-     * certificate chain, search the Store first for the issuer certificate.
-     * Enabled by default in OpenSSL >= 1.1.0. */
-    DefX509Const(V_FLAG_TRUSTED_FIRST);
 #endif
-#if defined(X509_V_FLAG_NO_ALT_CHAINS)
-    /* Set by Store#flags= and StoreContext#flags=. Suppresses searching for
-     * a alternative chain. No effect in OpenSSL >= 1.1.0. */
-    DefX509Const(V_FLAG_NO_ALT_CHAINS);
-#endif
-#if defined(X509_V_FLAG_NO_CHECK_TIME)
-    /* Set by Store#flags= and StoreContext#flags=. Suppresses checking the
-     * validity period of certificates and CRLs. No effect when the current
-     * time is explicitly set by Store#time= or StoreContext#time=. */
-    DefX509Const(V_FLAG_NO_CHECK_TIME);
+#if defined(X509_V_FLAG_CRL_CHECK_ALL)
+    DefX509Const(V_FLAG_CRL_CHECK_ALL);
 #endif
 
-    /* Set by Store#purpose=. SSL/TLS client. */
     DefX509Const(PURPOSE_SSL_CLIENT);
-    /* Set by Store#purpose=. SSL/TLS server. */
     DefX509Const(PURPOSE_SSL_SERVER);
-    /* Set by Store#purpose=. Netscape SSL server. */
     DefX509Const(PURPOSE_NS_SSL_SERVER);
-    /* Set by Store#purpose=. S/MIME signing. */
     DefX509Const(PURPOSE_SMIME_SIGN);
-    /* Set by Store#purpose=. S/MIME encryption. */
     DefX509Const(PURPOSE_SMIME_ENCRYPT);
-    /* Set by Store#purpose=. CRL signing */
     DefX509Const(PURPOSE_CRL_SIGN);
-    /* Set by Store#purpose=. No checks. */
     DefX509Const(PURPOSE_ANY);
-    /* Set by Store#purpose=. OCSP helper. */
+#if defined(X509_PURPOSE_OCSP_HELPER)
     DefX509Const(PURPOSE_OCSP_HELPER);
-#if defined(X509_PURPOSE_TIMESTAMP_SIGN)
-    /* Set by Store#purpose=. Time stamps signer. */
-    DefX509Const(PURPOSE_TIMESTAMP_SIGN);
 #endif
 
     DefX509Const(TRUST_COMPAT);
@@ -171,10 +87,11 @@ Init_ossl_x509(void)
     DefX509Const(TRUST_SSL_SERVER);
     DefX509Const(TRUST_EMAIL);
     DefX509Const(TRUST_OBJECT_SIGN);
+#if defined(X509_TRUST_OCSP_SIGN)
     DefX509Const(TRUST_OCSP_SIGN);
+#endif
+#if defined(X509_TRUST_OCSP_REQUEST)
     DefX509Const(TRUST_OCSP_REQUEST);
-#if defined(X509_TRUST_TSA)
-    DefX509Const(TRUST_TSA);
 #endif
 
     DefX509Default(CERT_AREA, cert_area);
@@ -184,3 +101,4 @@ Init_ossl_x509(void)
     DefX509Default(CERT_FILE_ENV, cert_file_env);
     DefX509Default(PRIVATE_DIR, private_dir);
 }
+
diff --git a/ext/openssl/ossl_x509.h b/ext/openssl/ossl_x509.h
index a60f7c3da3..1a43569073 100644
--- a/ext/openssl/ossl_x509.h
+++ b/ext/openssl/ossl_x509.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_X509_H_)
@@ -15,13 +16,6 @@
  */
 extern VALUE mX509;
 
-/*
- * Converts the VALUE into Integer and set it to the ASN1_TIME. This is a
- * wrapper for X509_time_adj_ex() so passing NULL creates a new ASN1_TIME.
- * Note that the caller must check the NULL return.
- */
-ASN1_TIME *ossl_x509_time_adjust(ASN1_TIME *, VALUE);
-
 void Init_ossl_x509(void);
 
 /*
@@ -31,7 +25,7 @@ extern VALUE cX509Attr;
 extern VALUE eX509AttrError;
 
 VALUE ossl_x509attr_new(X509_ATTRIBUTE *);
-X509_ATTRIBUTE *GetX509AttrPtr(VALUE);
+X509_ATTRIBUTE *DupX509AttrPtr(VALUE);
 void Init_ossl_x509attr(void);
 
 /*
@@ -66,6 +60,7 @@ extern VALUE eX509ExtError;
 
 VALUE ossl_x509ext_new(X509_EXTENSION *);
 X509_EXTENSION *GetX509ExtPtr(VALUE);
+X509_EXTENSION *DupX509ExtPtr(VALUE);
 void Init_ossl_x509ext(void);
 
 /*
@@ -110,13 +105,10 @@ VALUE ossl_x509store_new(X509_STORE *);
 X509_STORE *GetX509StorePtr(VALUE);
 X509_STORE *DupX509StorePtr(VALUE);
 
+VALUE ossl_x509stctx_new(X509_STORE_CTX *);
+VALUE ossl_x509stctx_clear_ptr(VALUE);
 X509_STORE_CTX *GetX509StCtxtPtr(VALUE);
-void Init_ossl_x509store(void);
 
-/*
- * Calls the verify callback Proc (the first parameter) with given pre-verify
- * result and the X509_STORE_CTX.
- */
-int ossl_verify_cb_call(VALUE, int, X509_STORE_CTX *);
+void Init_ossl_x509store(void);
 
 #endif /* _OSSL_X509_H_ */
diff --git a/ext/openssl/ossl_x509attr.c b/ext/openssl/ossl_x509attr.c
index ae0b347b5f..d50f88c969 100644
--- a/ext/openssl/ossl_x509attr.c
+++ b/ext/openssl/ossl_x509attr.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509Attr(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509attr_type, 0)
-#define SetX509Attr(obj, attr) do { \
+#define WrapX509Attr(klass, obj, attr) do { \
     if (!(attr)) { \
 	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (attr); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_ATTRIBUTE_free, (attr)); \
 } while (0)
 #define GetX509Attr(obj, attr) do { \
-    TypedData_Get_Struct((obj), X509_ATTRIBUTE, &ossl_x509attr_type, (attr)); \
+    Data_Get_Struct((obj), X509_ATTRIBUTE, (attr)); \
     if (!(attr)) { \
 	ossl_raise(rb_eRuntimeError, "ATTR wasn't initialized!"); \
     } \
@@ -34,20 +33,6 @@
 VALUE cX509Attr;
 VALUE eX509AttrError;
 
-static void
-ossl_x509attr_free(void *ptr)
-{
-    X509_ATTRIBUTE_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509attr_type = {
-    "OpenSSL/X509/ATTRIBUTE",
-    {
-	0, ossl_x509attr_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  */
@@ -57,7 +42,6 @@ ossl_x509attr_new(X509_ATTRIBUTE *attr)
     X509_ATTRIBUTE *new;
     VALUE obj;
 
-    obj = NewX509Attr(cX509Attr);
     if (!attr) {
 	new = X509_ATTRIBUTE_new();
     } else {
@@ -66,19 +50,22 @@ ossl_x509attr_new(X509_ATTRIBUTE *attr)
     if (!new) {
 	ossl_raise(eX509AttrError, NULL);
     }
-    SetX509Attr(obj, new);
+    WrapX509Attr(cX509Attr, obj, new);
 
     return obj;
 }
 
 X509_ATTRIBUTE *
-GetX509AttrPtr(VALUE obj)
+DupX509AttrPtr(VALUE obj)
 {
-    X509_ATTRIBUTE *attr;
+    X509_ATTRIBUTE *attr, *new;
 
     SafeGetX509Attr(obj, attr);
+    if (!(new = X509_ATTRIBUTE_dup(attr))) {
+	ossl_raise(eX509AttrError, NULL);
+    }
 
-    return attr;
+    return new;
 }
 
 /*
@@ -90,10 +77,9 @@ ossl_x509attr_alloc(VALUE klass)
     X509_ATTRIBUTE *attr;
     VALUE obj;
 
-    obj = NewX509Attr(klass);
     if (!(attr = X509_ATTRIBUTE_new()))
 	ossl_raise(eX509AttrError, NULL);
-    SetX509Attr(obj, attr);
+    WrapX509Attr(klass, obj, attr);
 
     return obj;
 }
@@ -127,25 +113,6 @@ ossl_x509attr_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-ossl_x509attr_initialize_copy(VALUE self, VALUE other)
-{
-    X509_ATTRIBUTE *attr, *attr_other, *attr_new;
-
-    rb_check_frozen(self);
-    GetX509Attr(self, attr);
-    SafeGetX509Attr(other, attr_other);
-
-    attr_new = X509_ATTRIBUTE_dup(attr_other);
-    if (!attr_new)
-	ossl_raise(eX509AttrError, "X509_ATTRIBUTE_dup");
-
-    SetX509Attr(self, attr_new);
-    X509_ATTRIBUTE_free(attr);
-
-    return self;
-}
-
 /*
  * call-seq:
  *    attr.oid = string => string
@@ -157,15 +124,12 @@ ossl_x509attr_set_oid(VALUE self, VALUE oid)
     ASN1_OBJECT *obj;
     char *s;
 
-    GetX509Attr(self, attr);
-    s = StringValueCStr(oid);
+    s = StringValuePtr(oid);
     obj = OBJ_txt2obj(s, 0);
+    if(!obj) obj = OBJ_txt2obj(s, 1);
     if(!obj) ossl_raise(eX509AttrError, NULL);
-    if (!X509_ATTRIBUTE_set1_object(attr, obj)) {
-	ASN1_OBJECT_free(obj);
-	ossl_raise(eX509AttrError, "X509_ATTRIBUTE_set1_object");
-    }
-    ASN1_OBJECT_free(obj);
+    GetX509Attr(self, attr);
+    X509_ATTRIBUTE_set1_object(attr, obj);
 
     return oid;
 }
@@ -197,6 +161,14 @@ ossl_x509attr_get_oid(VALUE self)
     return ret;
 }
 
+#if defined(HAVE_ST_X509_ATTRIBUTE_SINGLE) || defined(HAVE_ST_SINGLE)
+#  define OSSL_X509ATTR_IS_SINGLE(attr)  ((attr)->single)
+#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->single = 1)
+#else
+#  define OSSL_X509ATTR_IS_SINGLE(attr)  (!(attr)->value.set)
+#  define OSSL_X509ATTR_SET_SINGLE(attr) ((attr)->value.set = 0)
+#endif
+
 /*
  * call-seq:
  *    attr.value = asn1 => asn1
@@ -205,37 +177,21 @@ static VALUE
 ossl_x509attr_set_value(VALUE self, VALUE value)
 {
     X509_ATTRIBUTE *attr;
-    VALUE asn1_value;
-    int i, asn1_tag;
-
-    OSSL_Check_Kind(value, cASN1Data);
-    asn1_tag = NUM2INT(rb_attr_get(value, rb_intern("@tag")));
-    asn1_value = rb_attr_get(value, rb_intern("@value"));
-    if (asn1_tag != V_ASN1_SET)
-	ossl_raise(eASN1Error, "argument must be ASN1::Set");
-    if (!RB_TYPE_P(asn1_value, T_ARRAY))
-	ossl_raise(eASN1Error, "ASN1::Set has non-array value");
-
-    GetX509Attr(self, attr);
-    if (X509_ATTRIBUTE_count(attr)) { /* populated, reset first */
-	ASN1_OBJECT *obj = X509_ATTRIBUTE_get0_object(attr);
-	X509_ATTRIBUTE *new_attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, 0, NULL, -1);
-	if (!new_attr)
-	    ossl_raise(eX509AttrError, NULL);
-	SetX509Attr(self, new_attr);
-	X509_ATTRIBUTE_free(attr);
-	attr = new_attr;
-    }
+    ASN1_TYPE *a1type;
 
-    for (i = 0; i < RARRAY_LEN(asn1_value); i++) {
-	ASN1_TYPE *a1type = ossl_asn1_get_asn1type(RARRAY_AREF(asn1_value, i));
-	if (!X509_ATTRIBUTE_set1_data(attr, ASN1_TYPE_get(a1type),
-				      a1type->value.ptr, -1)) {
-	    ASN1_TYPE_free(a1type);
-	    ossl_raise(eX509AttrError, NULL);
-	}
+    if(!(a1type = ossl_asn1_get_asn1type(value)))
+	ossl_raise(eASN1Error, "could not get ASN1_TYPE");
+    if(ASN1_TYPE_get(a1type) == V_ASN1_SEQUENCE){
 	ASN1_TYPE_free(a1type);
+	ossl_raise(eASN1Error, "couldn't set SEQUENCE for attribute value.");
+    }
+    GetX509Attr(self, attr);
+    if(attr->value.set){
+	if(OSSL_X509ATTR_IS_SINGLE(attr)) ASN1_TYPE_free(attr->value.single);
+	else sk_ASN1_TYPE_free(attr->value.set);
     }
+    OSSL_X509ATTR_SET_SINGLE(attr);
+    attr->value.single = a1type;
 
     return value;
 }
@@ -248,34 +204,32 @@ static VALUE
 ossl_x509attr_get_value(VALUE self)
 {
     X509_ATTRIBUTE *attr;
-    STACK_OF(ASN1_TYPE) *sk;
-    VALUE str;
-    int i, count, len;
+    VALUE str, asn1;
+    long length;
     unsigned char *p;
 
     GetX509Attr(self, attr);
-    /* there is no X509_ATTRIBUTE_get0_set() :( */
-    if (!(sk = sk_ASN1_TYPE_new_null()))
-	ossl_raise(eX509AttrError, "sk_new");
-
-    count = X509_ATTRIBUTE_count(attr);
-    for (i = 0; i < count; i++)
-	sk_ASN1_TYPE_push(sk, X509_ATTRIBUTE_get0_type(attr, i));
-
-    if ((len = i2d_ASN1_SET_ANY(sk, NULL)) <= 0) {
-	sk_ASN1_TYPE_free(sk);
-	ossl_raise(eX509AttrError, NULL);
+    if(attr->value.ptr == NULL) return Qnil;
+    if(OSSL_X509ATTR_IS_SINGLE(attr)){
+	length = i2d_ASN1_TYPE(attr->value.single, NULL);
+	str = rb_str_new(0, length);
+	p = (unsigned char *)RSTRING_PTR(str);
+	i2d_ASN1_TYPE(attr->value.single, &p);
+	ossl_str_adjust(str, p);
     }
-    str = rb_str_new(0, len);
-    p = (unsigned char *)RSTRING_PTR(str);
-    if (i2d_ASN1_SET_ANY(sk, &p) <= 0) {
-	sk_ASN1_TYPE_free(sk);
-	ossl_raise(eX509AttrError, NULL);
+    else{
+	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 = (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);
     }
-    ossl_str_adjust(str, p);
-    sk_ASN1_TYPE_free(sk);
+    asn1 = rb_funcall(mASN1, rb_intern("decode"), 1, str);
 
-    return rb_funcall(mASN1, rb_intern("decode"), 1, str);
+    return asn1;
 }
 
 /*
@@ -297,7 +251,7 @@ ossl_x509attr_to_der(VALUE self)
     p = (unsigned char *)RSTRING_PTR(str);
     if(i2d_X509_ATTRIBUTE(attr, &p) <= 0)
 	ossl_raise(eX509AttrError, NULL);
-    ossl_str_adjust(str, p);
+    rb_str_set_len(str, p - (unsigned char*)RSTRING_PTR(str));
 
     return str;
 }
@@ -306,20 +260,13 @@ ossl_x509attr_to_der(VALUE self)
  * X509_ATTRIBUTE init
  */
 void
-Init_ossl_x509attr(void)
+Init_ossl_x509attr()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
     eX509AttrError = rb_define_class_under(mX509, "AttributeError", eOSSLError);
 
     cX509Attr = rb_define_class_under(mX509, "Attribute", rb_cObject);
     rb_define_alloc_func(cX509Attr, ossl_x509attr_alloc);
     rb_define_method(cX509Attr, "initialize", ossl_x509attr_initialize, -1);
-    rb_define_copy_func(cX509Attr, ossl_x509attr_initialize_copy);
     rb_define_method(cX509Attr, "oid=", ossl_x509attr_set_oid, 1);
     rb_define_method(cX509Attr, "oid", ossl_x509attr_get_oid, 0);
     rb_define_method(cX509Attr, "value=", ossl_x509attr_set_value, 1);
diff --git a/ext/openssl/ossl_x509cert.c b/ext/openssl/ossl_x509cert.c
index cecc3ca09a..85bbc0d081 100644
--- a/ext/openssl/ossl_x509cert.c
+++ b/ext/openssl/ossl_x509cert.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509_type, 0)
-#define SetX509(obj, x509) do { \
+#define WrapX509(klass, obj, x509) do { \
     if (!(x509)) { \
 	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (x509); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_free, (x509)); \
 } while (0)
 #define GetX509(obj, x509) do { \
-    TypedData_Get_Struct((obj), X509, &ossl_x509_type, (x509)); \
+    Data_Get_Struct((obj), X509, (x509)); \
     if (!(x509)) { \
 	ossl_raise(rb_eRuntimeError, "CERT wasn't initialized!"); \
     } \
@@ -34,20 +33,6 @@
 VALUE cX509Cert;
 VALUE eX509CertError;
 
-static void
-ossl_x509_free(void *ptr)
-{
-    X509_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509_type = {
-    "OpenSSL/X509",
-    {
-	0, ossl_x509_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  */
@@ -57,7 +42,6 @@ ossl_x509_new(X509 *x509)
     X509 *new;
     VALUE obj;
 
-    obj = NewX509(cX509Cert);
     if (!x509) {
 	new = X509_new();
     } else {
@@ -66,7 +50,7 @@ ossl_x509_new(X509 *x509)
     if (!new) {
 	ossl_raise(eX509CertError, NULL);
     }
-    SetX509(obj, new);
+    WrapX509(cX509Cert, obj, new);
 
     return obj;
 }
@@ -78,9 +62,8 @@ ossl_x509_new_from_file(VALUE filename)
     FILE *fp;
     VALUE obj;
 
-    rb_check_safe_obj(filename);
-    obj = NewX509(cX509Cert);
-    if (!(fp = fopen(StringValueCStr(filename), "r"))) {
+    SafeStringValue(filename);
+    if (!(fp = fopen(RSTRING_PTR(filename), "r"))) {
 	ossl_raise(eX509CertError, "%s", strerror(errno));
     }
     rb_fd_fix_cloexec(fileno(fp));
@@ -100,7 +83,7 @@ ossl_x509_new_from_file(VALUE filename)
     if (!x509) {
 	ossl_raise(eX509CertError, NULL);
     }
-    SetX509(obj, x509);
+    WrapX509(cX509Cert, obj, x509);
 
     return obj;
 }
@@ -122,7 +105,7 @@ DupX509CertPtr(VALUE obj)
 
     SafeGetX509(obj, x509);
 
-    X509_up_ref(x509);
+    CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509);
 
     return x509;
 }
@@ -136,10 +119,10 @@ ossl_x509_alloc(VALUE klass)
     X509 *x509;
     VALUE obj;
 
-    obj = NewX509(klass);
     x509 = X509_new();
     if (!x509) ossl_raise(eX509CertError, NULL);
-    SetX509(obj, x509);
+
+    WrapX509(klass, obj, x509);
 
     return obj;
 }
@@ -349,7 +332,9 @@ ossl_x509_set_serial(VALUE self, VALUE num)
     X509 *x509;
 
     GetX509(self, x509);
-    X509_set_serialNumber(x509, num_to_asn1integer(num, X509_get_serialNumber(x509)));
+
+    x509->cert_info->serialNumber =
+	num_to_asn1integer(num, X509_get_serialNumber(x509));
 
     return num;
 }
@@ -369,7 +354,7 @@ ossl_x509_get_signature_algorithm(VALUE self)
     out = BIO_new(BIO_s_mem());
     if (!out) ossl_raise(eX509CertError, NULL);
 
-    if (!i2a_ASN1_OBJECT(out, X509_get0_tbs_sigalg(x509)->algorithm)) {
+    if (!i2a_ASN1_OBJECT(out, x509->cert_info->signature->algorithm)) {
 	BIO_free(out);
 	ossl_raise(eX509CertError, NULL);
     }
@@ -456,10 +441,10 @@ static VALUE
 ossl_x509_get_not_before(VALUE self)
 {
     X509 *x509;
-    const ASN1_TIME *asn1time;
+    ASN1_UTCTIME *asn1time;
 
     GetX509(self, x509);
-    if (!(asn1time = X509_get0_notBefore(x509))) {
+    if (!(asn1time = X509_get_notBefore(x509))) { /* NO DUP - don't free! */
 	ossl_raise(eX509CertError, NULL);
     }
 
@@ -474,15 +459,13 @@ static VALUE
 ossl_x509_set_not_before(VALUE self, VALUE time)
 {
     X509 *x509;
-    ASN1_TIME *asn1time;
+    time_t sec;
 
+    sec = time_to_time_t(time);
     GetX509(self, x509);
-    asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_set_notBefore(x509, asn1time)) {
-	ASN1_TIME_free(asn1time);
-	ossl_raise(eX509CertError, "X509_set_notBefore");
+    if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
+	ossl_raise(eX509CertError, NULL);
     }
-    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -495,10 +478,10 @@ static VALUE
 ossl_x509_get_not_after(VALUE self)
 {
     X509 *x509;
-    const ASN1_TIME *asn1time;
+    ASN1_TIME *asn1time;
 
     GetX509(self, x509);
-    if (!(asn1time = X509_get0_notAfter(x509))) {
+    if (!(asn1time = X509_get_notAfter(x509))) { /* NO DUP - don't free! */
 	ossl_raise(eX509CertError, NULL);
     }
 
@@ -513,15 +496,13 @@ static VALUE
 ossl_x509_set_not_after(VALUE self, VALUE time)
 {
     X509 *x509;
-    ASN1_TIME *asn1time;
+    time_t sec;
 
+    sec = time_to_time_t(time);
     GetX509(self, x509);
-    asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_set_notAfter(x509, asn1time)) {
-	ASN1_TIME_free(asn1time);
-	ossl_raise(eX509CertError, "X509_set_notAfter");
+    if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
+	ossl_raise(eX509CertError, NULL);
     }
-    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -593,19 +574,18 @@ ossl_x509_verify(VALUE self, VALUE key)
 {
     X509 *x509;
     EVP_PKEY *pkey;
+    int i;
 
     pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
-
-    switch (X509_verify(x509, pkey)) {
-      case 1:
-	return Qtrue;
-      case 0:
-	ossl_clear_error();
-	return Qfalse;
-      default:
+    if ((i = X509_verify(x509, pkey)) < 0) {
 	ossl_raise(eX509CertError, NULL);
     }
+    if (i > 0) {
+	return Qtrue;
+    }
+
+    return Qfalse;
 }
 
 /*
@@ -624,7 +604,7 @@ ossl_x509_check_private_key(VALUE self, VALUE key)
     pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
     GetX509(self, x509);
     if (!X509_check_private_key(x509, pkey)) {
-	ossl_clear_error();
+	OSSL_Warning("Check private key:%s", OSSL_ErrMsg());
 	return Qfalse;
     }
 
@@ -666,21 +646,24 @@ ossl_x509_set_extensions(VALUE self, VALUE ary)
 {
     X509 *x509;
     X509_EXTENSION *ext;
-    long i;
+    int i;
 
     Check_Type(ary, T_ARRAY);
     /* All ary's members should be X509Extension */
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
     }
     GetX509(self, x509);
-    while ((ext = X509_delete_ext(x509, 0)))
-	X509_EXTENSION_free(ext);
+    sk_X509_EXTENSION_pop_free(x509->cert_info->extensions, X509_EXTENSION_free);
+    x509->cert_info->extensions = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = GetX509ExtPtr(RARRAY_AREF(ary, i));
-	if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext */
+	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);
 	}
+	X509_EXTENSION_free(ext);
     }
 
     return ary;
@@ -697,10 +680,12 @@ ossl_x509_add_extension(VALUE self, VALUE extension)
     X509_EXTENSION *ext;
 
     GetX509(self, x509);
-    ext = GetX509ExtPtr(extension);
+    ext = DupX509ExtPtr(extension);
     if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
+	X509_EXTENSION_free(ext);
 	ossl_raise(eX509CertError, NULL);
     }
+    X509_EXTENSION_free(ext);
 
     return extension;
 }
@@ -723,11 +708,11 @@ ossl_x509_inspect(VALUE self)
  * INIT
  */
 void
-Init_ossl_x509cert(void)
+Init_ossl_x509cert()
 {
+
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
     mX509 = rb_define_module_under(mOSSL, "X509");
 #endif
 
@@ -858,3 +843,4 @@ Init_ossl_x509cert(void)
     rb_define_method(cX509Cert, "add_extension", ossl_x509_add_extension, 1);
     rb_define_method(cX509Cert, "inspect", ossl_x509_inspect, 0);
 }
+
diff --git a/ext/openssl/ossl_x509crl.c b/ext/openssl/ossl_x509crl.c
index f9819f5824..dec13c8cae 100644
--- a/ext/openssl/ossl_x509crl.c
+++ b/ext/openssl/ossl_x509crl.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509CRL(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509crl_type, 0)
-#define SetX509CRL(obj, crl) do { \
+#define WrapX509CRL(klass, obj, crl) do { \
     if (!(crl)) { \
 	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (crl); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_CRL_free, (crl)); \
 } while (0)
 #define GetX509CRL(obj, crl) do { \
-    TypedData_Get_Struct((obj), X509_CRL, &ossl_x509crl_type, (crl)); \
+    Data_Get_Struct((obj), X509_CRL, (crl)); \
     if (!(crl)) { \
 	ossl_raise(rb_eRuntimeError, "CRL wasn't initialized!"); \
     } \
@@ -34,20 +33,6 @@
 VALUE cX509CRL;
 VALUE eX509CRLError;
 
-static void
-ossl_x509crl_free(void *ptr)
-{
-    X509_CRL_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509crl_type = {
-    "OpenSSL/X509/CRL",
-    {
-	0, ossl_x509crl_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * PUBLIC
  */
@@ -67,7 +52,7 @@ DupX509CRLPtr(VALUE obj)
     X509_CRL *crl;
 
     SafeGetX509CRL(obj, crl);
-    X509_CRL_up_ref(crl);
+    CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
 
     return crl;
 }
@@ -78,10 +63,9 @@ ossl_x509crl_new(X509_CRL *crl)
     X509_CRL *tmp;
     VALUE obj;
 
-    obj = NewX509CRL(cX509CRL);
     tmp = crl ? X509_CRL_dup(crl) : X509_CRL_new();
     if(!tmp) ossl_raise(eX509CRLError, NULL);
-    SetX509CRL(obj, tmp);
+    WrapX509CRL(cX509CRL, obj, tmp);
 
     return obj;
 }
@@ -95,11 +79,10 @@ ossl_x509crl_alloc(VALUE klass)
     X509_CRL *crl;
     VALUE obj;
 
-    obj = NewX509CRL(klass);
     if (!(crl = X509_CRL_new())) {
 	ossl_raise(eX509CRLError, NULL);
     }
-    SetX509CRL(obj, crl);
+    WrapX509CRL(klass, obj, crl);
 
     return obj;
 }
@@ -180,20 +163,22 @@ static VALUE
 ossl_x509crl_get_signature_algorithm(VALUE self)
 {
     X509_CRL *crl;
-    const X509_ALGOR *alg;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509CRLError, NULL);
     }
-    X509_CRL_get0_signature(crl, NULL, &alg);
-    if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
+    if (!i2a_ASN1_OBJECT(out, crl->sig_alg->algorithm)) {
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
-
-    return ossl_membio2str(out);
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+    return str;
 }
 
 static VALUE
@@ -226,22 +211,20 @@ ossl_x509crl_get_last_update(VALUE self)
 
     GetX509CRL(self, crl);
 
-    return asn1time_to_time(X509_CRL_get0_lastUpdate(crl));
+    return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
 }
 
 static VALUE
 ossl_x509crl_set_last_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
-    ASN1_TIME *asn1time;
+    time_t sec;
 
+    sec = time_to_time_t(time);
     GetX509CRL(self, crl);
-    asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_CRL_set_lastUpdate(crl, asn1time)) {
-	ASN1_TIME_free(asn1time);
-	ossl_raise(eX509CRLError, "X509_CRL_set_lastUpdate");
+    if (!X509_time_adj(crl->crl->lastUpdate, 0, &sec)) {
+	ossl_raise(eX509CRLError, NULL);
     }
-    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -253,22 +236,21 @@ ossl_x509crl_get_next_update(VALUE self)
 
     GetX509CRL(self, crl);
 
-    return asn1time_to_time(X509_CRL_get0_nextUpdate(crl));
+    return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
 }
 
 static VALUE
 ossl_x509crl_set_next_update(VALUE self, VALUE time)
 {
     X509_CRL *crl;
-    ASN1_TIME *asn1time;
+    time_t sec;
 
+    sec = time_to_time_t(time);
     GetX509CRL(self, crl);
-    asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_CRL_set_nextUpdate(crl, asn1time)) {
-	ASN1_TIME_free(asn1time);
-	ossl_raise(eX509CRLError, "X509_CRL_set_nextUpdate");
+    /* This must be some thinko in OpenSSL */
+    if (!(crl->crl->nextUpdate = X509_time_adj(crl->crl->nextUpdate, 0, &sec))){
+	ossl_raise(eX509CRLError, NULL);
     }
-    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -303,24 +285,20 @@ ossl_x509crl_set_revoked(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
     X509_REVOKED *rev;
-    STACK_OF(X509_REVOKED) *sk;
-    long i;
+    int i;
 
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Revoked */
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Rev);
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Rev);
     }
     GetX509CRL(self, crl);
-    if ((sk = X509_CRL_get_REVOKED(crl))) {
-	while ((rev = sk_X509_REVOKED_pop(sk)))
-	    X509_REVOKED_free(rev);
-    }
+    sk_X509_REVOKED_pop_free(crl->crl->revoked, X509_REVOKED_free);
+    crl->crl->revoked = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rev = DupX509RevokedPtr(RARRAY_AREF(ary, i));
+	rev = DupX509RevokedPtr(RARRAY_PTR(ary)[i]);
 	if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	    X509_REVOKED_free(rev);
-	    ossl_raise(eX509CRLError, "X509_CRL_add0_revoked");
+	    ossl_raise(eX509CRLError, NULL);
 	}
     }
     X509_CRL_sort(crl);
@@ -337,8 +315,7 @@ ossl_x509crl_add_revoked(VALUE self, VALUE revoked)
     GetX509CRL(self, crl);
     rev = DupX509RevokedPtr(revoked);
     if (!X509_CRL_add0_revoked(crl, rev)) { /* NO DUP - don't free! */
-	X509_REVOKED_free(rev);
-	ossl_raise(eX509CRLError, "X509_CRL_add0_revoked");
+	ossl_raise(eX509CRLError, NULL);
     }
     X509_CRL_sort(crl);
 
@@ -366,17 +343,17 @@ static VALUE
 ossl_x509crl_verify(VALUE self, VALUE key)
 {
     X509_CRL *crl;
+    int ret;
 
     GetX509CRL(self, crl);
-    switch (X509_CRL_verify(crl, GetPKeyPtr(key))) {
-      case 1:
-	return Qtrue;
-      case 0:
-	ossl_clear_error();
-	return Qfalse;
-      default:
+    if ((ret = X509_CRL_verify(crl, GetPKeyPtr(key))) < 0) {
 	ossl_raise(eX509CRLError, NULL);
     }
+    if (ret == 1) {
+	return Qtrue;
+    }
+
+    return Qfalse;
 }
 
 static VALUE
@@ -384,6 +361,8 @@ ossl_x509crl_to_der(VALUE self)
 {
     X509_CRL *crl;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -393,8 +372,11 @@ ossl_x509crl_to_der(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
 
-    return ossl_membio2str(out);
+    return str;
 }
 
 static VALUE
@@ -402,6 +384,8 @@ ossl_x509crl_to_pem(VALUE self)
 {
     X509_CRL *crl;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -411,8 +395,11 @@ ossl_x509crl_to_pem(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
 
-    return ossl_membio2str(out);
+    return str;
 }
 
 static VALUE
@@ -420,6 +407,8 @@ ossl_x509crl_to_text(VALUE self)
 {
     X509_CRL *crl;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509CRL(self, crl);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -429,8 +418,11 @@ ossl_x509crl_to_text(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509CRLError, NULL);
     }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
 
-    return ossl_membio2str(out);
+    return str;
 }
 
 /*
@@ -467,21 +459,23 @@ ossl_x509crl_set_extensions(VALUE self, VALUE ary)
 {
     X509_CRL *crl;
     X509_EXTENSION *ext;
-    long i;
+    int i;
 
     Check_Type(ary, T_ARRAY);
     /* All ary members should be X509 Extensions */
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
     }
     GetX509CRL(self, crl);
-    while ((ext = X509_CRL_delete_ext(crl, 0)))
-	X509_EXTENSION_free(ext);
+    sk_X509_EXTENSION_pop_free(crl->crl->extensions, X509_EXTENSION_free);
+    crl->crl->extensions = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	ext = GetX509ExtPtr(RARRAY_AREF(ary, i)); /* NO NEED TO DUP */
-	if (!X509_CRL_add_ext(crl, ext, -1)) {
+	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);
 	}
+	X509_EXTENSION_free(ext);
     }
 
     return ary;
@@ -494,10 +488,12 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
     X509_EXTENSION *ext;
 
     GetX509CRL(self, crl);
-    ext = GetX509ExtPtr(extension);
-    if (!X509_CRL_add_ext(crl, ext, -1)) {
+    ext = DupX509ExtPtr(extension);
+    if (!X509_CRL_add_ext(crl, ext, -1)) { /* DUPs ext - FREE it */
+	X509_EXTENSION_free(ext);
 	ossl_raise(eX509CRLError, NULL);
     }
+    X509_EXTENSION_free(ext);
 
     return extension;
 }
@@ -506,14 +502,8 @@ ossl_x509crl_add_extension(VALUE self, VALUE extension)
  * INIT
  */
 void
-Init_ossl_x509crl(void)
+Init_ossl_x509crl()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
     eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
 
     cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
@@ -544,3 +534,4 @@ Init_ossl_x509crl(void)
     rb_define_method(cX509CRL, "extensions=", ossl_x509crl_set_extensions, 1);
     rb_define_method(cX509CRL, "add_extension", ossl_x509crl_add_extension, 1);
 }
+
diff --git a/ext/openssl/ossl_x509ext.c b/ext/openssl/ossl_x509ext.c
index b92b0786b2..bd2e1dd2fa 100644
--- a/ext/openssl/ossl_x509ext.c
+++ b/ext/openssl/ossl_x509ext.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509Ext(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509ext_type, 0)
-#define SetX509Ext(obj, ext) do { \
+#define WrapX509Ext(klass, obj, ext) do { \
     if (!(ext)) { \
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (ext); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_EXTENSION_free, (ext)); \
 } while (0)
 #define GetX509Ext(obj, ext) do { \
-    TypedData_Get_Struct((obj), X509_EXTENSION, &ossl_x509ext_type, (ext)); \
+    Data_Get_Struct((obj), X509_EXTENSION, (ext)); \
     if (!(ext)) { \
 	ossl_raise(rb_eRuntimeError, "EXT wasn't initialized!"); \
     } \
@@ -28,14 +27,13 @@
     GetX509Ext((obj), (ext)); \
 } while (0)
 #define MakeX509ExtFactory(klass, obj, ctx) do { \
-    (obj) = TypedData_Wrap_Struct((klass), &ossl_x509extfactory_type, 0); \
     if (!((ctx) = OPENSSL_malloc(sizeof(X509V3_CTX)))) \
         ossl_raise(rb_eRuntimeError, "CTX wasn't allocated!"); \
     X509V3_set_ctx((ctx), NULL, NULL, NULL, NULL, 0); \
-    RTYPEDDATA_DATA(obj) = (ctx); \
+    (obj) = Data_Wrap_Struct((klass), 0, ossl_x509extfactory_free, (ctx)); \
 } while (0)
 #define GetX509ExtFactory(obj, ctx) do { \
-    TypedData_Get_Struct((obj), X509V3_CTX, &ossl_x509extfactory_type, (ctx)); \
+    Data_Get_Struct((obj), X509V3_CTX, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "CTX wasn't initialized!"); \
     } \
@@ -48,20 +46,6 @@ VALUE cX509Ext;
 VALUE cX509ExtFactory;
 VALUE eX509ExtError;
 
-static void
-ossl_x509ext_free(void *ptr)
-{
-    X509_EXTENSION_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509ext_type = {
-    "OpenSSL/X509/EXTENSION",
-    {
-	0, ossl_x509ext_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  */
@@ -71,7 +55,6 @@ ossl_x509ext_new(X509_EXTENSION *ext)
     X509_EXTENSION *new;
     VALUE obj;
 
-    obj = NewX509Ext(cX509Ext);
     if (!ext) {
 	new = X509_EXTENSION_new();
     } else {
@@ -80,7 +63,7 @@ ossl_x509ext_new(X509_EXTENSION *ext)
     if (!new) {
 	ossl_raise(eX509ExtError, NULL);
     }
-    SetX509Ext(obj, new);
+    WrapX509Ext(cX509Ext, obj, new);
 
     return obj;
 }
@@ -95,6 +78,19 @@ GetX509ExtPtr(VALUE obj)
     return ext;
 }
 
+X509_EXTENSION *
+DupX509ExtPtr(VALUE obj)
+{
+    X509_EXTENSION *ext, *new;
+
+    SafeGetX509Ext(obj, ext);
+    if (!(new = X509_EXTENSION_dup(ext))) {
+	ossl_raise(eX509ExtError, NULL);
+    }
+
+    return new;
+}
+
 /*
  * Private
  */
@@ -102,19 +98,11 @@ GetX509ExtPtr(VALUE obj)
  * Ext factory
  */
 static void
-ossl_x509extfactory_free(void *ctx)
+ossl_x509extfactory_free(X509V3_CTX *ctx)
 {
     OPENSSL_free(ctx);
 }
 
-static const rb_data_type_t ossl_x509extfactory_type = {
-    "OpenSSL/X509/EXTENSION/Factory",
-    {
-	0, ossl_x509extfactory_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 static VALUE
 ossl_x509extfactory_alloc(VALUE klass)
 {
@@ -175,6 +163,24 @@ 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)
+{
+    X509V3_CTX *ctx;
+    CONF *conf;
+
+    GetX509ExtFactory(self, ctx);
+    rb_iv_set(self, "@config", config);
+    conf = GetConfigPtr(config);  /* NO DUP NEEDED */
+    X509V3_set_nconf(ctx, conf);
+
+    return config;
+}
+#else
+#define ossl_x509extfactory_set_config rb_f_notimplement
+#endif
+
 static VALUE
 ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -198,11 +204,12 @@ ossl_x509extfactory_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 /*
- * call-seq:
- *   ef.create_ext(ln_or_sn, "value", critical = false) -> X509::Extension
- *   ef.create_ext(ln_or_sn, "critical,value")          -> X509::Extension
- *
- * Creates a new X509::Extension with passed values. See also x509v3_config(5).
+ * Array to X509_EXTENSION
+ * Structure:
+ * ["ln", "value", bool_critical] or
+ * ["sn", "value", bool_critical] or
+ * ["ln", "critical,value"] or the same for sn
+ * ["ln", "value"] => not critical
  */
 static VALUE
 ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
@@ -211,34 +218,37 @@ ossl_x509extfactory_create_ext(int argc, VALUE *argv, VALUE self)
     X509_EXTENSION *ext;
     VALUE oid, value, critical, valstr, obj;
     int nid;
+#ifdef HAVE_X509V3_EXT_NCONF_NID
     VALUE rconf;
     CONF *conf;
+#else
+    static LHASH *empty_lhash;
+#endif
 
     rb_scan_args(argc, argv, "21", &oid, &value, &critical);
-    StringValueCStr(oid);
+    StringValue(oid);
     StringValue(value);
     if(NIL_P(critical)) critical = Qfalse;
 
     nid = OBJ_ln2nid(RSTRING_PTR(oid));
     if(!nid) nid = OBJ_sn2nid(RSTRING_PTR(oid));
-    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%"PRIsVALUE"'", oid);
-
+    if(!nid) ossl_raise(eX509ExtError, "unknown OID `%s'", RSTRING_PTR(oid));
     valstr = rb_str_new2(RTEST(critical) ? "critical," : "");
     rb_str_append(valstr, value);
-    StringValueCStr(valstr);
-
     GetX509ExtFactory(self, ctx);
-    obj = NewX509Ext(cX509Ext);
+#ifdef HAVE_X509V3_EXT_NCONF_NID
     rconf = rb_iv_get(self, "@config");
-    conf = NIL_P(rconf) ? NULL : DupConfigPtr(rconf);
-    X509V3_set_nconf(ctx, conf);
+    conf = NIL_P(rconf) ? NULL : GetConfigPtr(rconf);
     ext = X509V3_EXT_nconf_nid(conf, ctx, nid, RSTRING_PTR(valstr));
-    X509V3_set_ctx_nodb(ctx);
-    NCONF_free(conf);
+#else
+    if (!empty_lhash) empty_lhash = lh_new(NULL, NULL);
+    ext = X509V3_EXT_conf_nid(empty_lhash, ctx, nid, RSTRING_PTR(valstr));
+#endif
     if (!ext){
-	ossl_raise(eX509ExtError, "%"PRIsVALUE" = %"PRIsVALUE, oid, valstr);
+	ossl_raise(eX509ExtError, "%s = %s",
+		   RSTRING_PTR(oid), RSTRING_PTR(value));
     }
-    SetX509Ext(obj, ext);
+    WrapX509Ext(cX509Ext, obj, ext);
 
     return obj;
 }
@@ -252,11 +262,10 @@ ossl_x509ext_alloc(VALUE klass)
     X509_EXTENSION *ext;
     VALUE obj;
 
-    obj = NewX509Ext(klass);
     if(!(ext = X509_EXTENSION_new())){
 	ossl_raise(eX509ExtError, NULL);
     }
-    SetX509Ext(obj, ext);
+    WrapX509Ext(klass, obj, ext);
 
     return obj;
 }
@@ -299,39 +308,18 @@ ossl_x509ext_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ossl_x509ext_initialize_copy(VALUE self, VALUE other)
-{
-    X509_EXTENSION *ext, *ext_other, *ext_new;
-
-    rb_check_frozen(self);
-    GetX509Ext(self, ext);
-    SafeGetX509Ext(other, ext_other);
-
-    ext_new = X509_EXTENSION_dup(ext_other);
-    if (!ext_new)
-	ossl_raise(eX509ExtError, "X509_EXTENSION_dup");
-
-    SetX509Ext(self, ext_new);
-    X509_EXTENSION_free(ext);
-
-    return self;
-}
-
-static VALUE
 ossl_x509ext_set_oid(VALUE self, VALUE oid)
 {
     X509_EXTENSION *ext;
     ASN1_OBJECT *obj;
+    char *s;
 
+    s = StringValuePtr(oid);
+    obj = OBJ_txt2obj(s, 0);
+    if(!obj) obj = OBJ_txt2obj(s, 1);
+    if(!obj) ossl_raise(eX509ExtError, NULL);
     GetX509Ext(self, ext);
-    obj = OBJ_txt2obj(StringValueCStr(oid), 0);
-    if (!obj)
-	ossl_raise(eX509ExtError, "OBJ_txt2obj");
-    if (!X509_EXTENSION_set_object(ext, obj)) {
-	ASN1_OBJECT_free(obj);
-	ossl_raise(eX509ExtError, "X509_EXTENSION_set_object");
-    }
-    ASN1_OBJECT_free(obj);
+    X509_EXTENSION_set_object(ext, obj);
 
     return oid;
 }
@@ -341,16 +329,25 @@ ossl_x509ext_set_value(VALUE self, VALUE data)
 {
     X509_EXTENSION *ext;
     ASN1_OCTET_STRING *asn1s;
+    char *s;
 
-    GetX509Ext(self, ext);
     data = ossl_to_der_if_possible(data);
     StringValue(data);
-    asn1s = X509_EXTENSION_get_data(ext);
-
-    if (!ASN1_OCTET_STRING_set(asn1s, (unsigned char *)RSTRING_PTR(data),
-			       RSTRING_LENINT(data))) {
-	ossl_raise(eX509ExtError, "ASN1_OCTET_STRING_set");
+    if(!(s = OPENSSL_malloc(RSTRING_LEN(data))))
+	ossl_raise(eX509ExtError, "malloc error");
+    memcpy(s, RSTRING_PTR(data), RSTRING_LEN(data));
+    if(!(asn1s = ASN1_OCTET_STRING_new())){
+	OPENSSL_free(s);
+	ossl_raise(eX509ExtError, NULL);
+    }
+    if(!M_ASN1_OCTET_STRING_set(asn1s, s, RSTRING_LENINT(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);
 
     return data;
 }
@@ -400,7 +397,7 @@ ossl_x509ext_get_value(VALUE obj)
     if (!(out = BIO_new(BIO_s_mem())))
 	ossl_raise(eX509ExtError, NULL);
     if (!X509V3_EXT_print(out, ext, 0, 0))
-	ASN1_STRING_print(out, (ASN1_STRING *)X509_EXTENSION_get_data(ext));
+	M_ASN1_OCTET_STRING_print(out, ext->value);
     ret = ossl_membio2str(out);
 
     return ret;
@@ -439,14 +436,8 @@ ossl_x509ext_to_der(VALUE obj)
  * INIT
  */
 void
-Init_ossl_x509ext(void)
+Init_ossl_x509ext()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
     eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
 
     cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
@@ -458,18 +449,18 @@ Init_ossl_x509ext(void)
     rb_attr(cX509ExtFactory, rb_intern("subject_certificate"), 1, 0, Qfalse);
     rb_attr(cX509ExtFactory, rb_intern("subject_request"), 1, 0, Qfalse);
     rb_attr(cX509ExtFactory, rb_intern("crl"), 1, 0, Qfalse);
-    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 1, Qfalse);
+    rb_attr(cX509ExtFactory, rb_intern("config"), 1, 0, Qfalse);
 
     rb_define_method(cX509ExtFactory, "issuer_certificate=", ossl_x509extfactory_set_issuer_cert, 1);
     rb_define_method(cX509ExtFactory, "subject_certificate=", ossl_x509extfactory_set_subject_cert, 1);
     rb_define_method(cX509ExtFactory, "subject_request=", ossl_x509extfactory_set_subject_req, 1);
     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);
-    rb_define_copy_func(cX509Ext, ossl_x509ext_initialize_copy);
     rb_define_method(cX509Ext, "oid=", ossl_x509ext_set_oid, 1);
     rb_define_method(cX509Ext, "value=", ossl_x509ext_set_value, 1);
     rb_define_method(cX509Ext, "critical=", ossl_x509ext_set_critical, 1);
diff --git a/ext/openssl/ossl_x509name.c b/ext/openssl/ossl_x509name.c
index 4523e0d71e..be70dc1b12 100644
--- a/ext/openssl/ossl_x509name.c
+++ b/ext/openssl/ossl_x509name.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509Name(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509name_type, 0)
-#define SetX509Name(obj, name) do { \
+#define WrapX509Name(klass, obj, name) do { \
     if (!(name)) { \
 	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
     } \
-    RTYPEDDATA_DATA(obj) = (name); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_NAME_free, (name)); \
 } while (0)
 #define GetX509Name(obj, name) do { \
-    TypedData_Get_Struct((obj), X509_NAME, &ossl_x509name_type, (name)); \
+    Data_Get_Struct((obj), X509_NAME, (name)); \
     if (!(name)) { \
 	ossl_raise(rb_eRuntimeError, "Name wasn't initialized."); \
     } \
@@ -39,20 +38,6 @@
 VALUE cX509Name;
 VALUE eX509NameError;
 
-static void
-ossl_x509name_free(void *ptr)
-{
-    X509_NAME_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509name_type = {
-    "OpenSSL/X509/NAME",
-    {
-	0, ossl_x509name_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public
  */
@@ -62,7 +47,6 @@ ossl_x509name_new(X509_NAME *name)
     X509_NAME *new;
     VALUE obj;
 
-    obj = NewX509Name(cX509Name);
     if (!name) {
 	new = X509_NAME_new();
     } else {
@@ -71,7 +55,7 @@ ossl_x509name_new(X509_NAME *name)
     if (!new) {
 	ossl_raise(eX509NameError, NULL);
     }
-    SetX509Name(obj, new);
+    WrapX509Name(cX509Name, obj, new);
 
     return obj;
 }
@@ -95,11 +79,10 @@ ossl_x509name_alloc(VALUE klass)
     X509_NAME *name;
     VALUE obj;
 
-    obj = NewX509Name(klass);
     if (!(name = X509_NAME_new())) {
 	ossl_raise(eX509NameError, NULL);
     }
-    SetX509Name(obj, name);
+    WrapX509Name(klass, obj, name);
 
     return obj;
 }
@@ -181,25 +164,6 @@ ossl_x509name_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-static VALUE
-ossl_x509name_initialize_copy(VALUE self, VALUE other)
-{
-    X509_NAME *name, *name_other, *name_new;
-
-    rb_check_frozen(self);
-    GetX509Name(self, name);
-    SafeGetX509Name(other, name_other);
-
-    name_new = X509_NAME_dup(name_other);
-    if (!name_new)
-	ossl_raise(eX509NameError, "X509_NAME_dup");
-
-    SetX509Name(self, name_new);
-    X509_NAME_free(name);
-
-    return self;
-}
-
 /*
  * call-seq:
  *    name.add_entry(oid, value [, type]) => self
@@ -301,7 +265,6 @@ ossl_x509name_to_a(VALUE self)
     char long_name[512];
     const char *short_name;
     VALUE ary, vname, ret;
-    ASN1_STRING *value;
 
     GetX509Name(self, name);
     entries = X509_NAME_entry_count(name);
@@ -314,8 +277,7 @@ ossl_x509name_to_a(VALUE self)
 	if (!(entry = X509_NAME_get_entry(name, i))) {
 	    ossl_raise(eX509NameError, NULL);
 	}
-	if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name),
-			     X509_NAME_ENTRY_get_object(entry))) {
+	if (!i2t_ASN1_OBJECT(long_name, sizeof(long_name), entry->object)) {
 	    ossl_raise(eX509NameError, NULL);
 	}
 	nid = OBJ_ln2nid(long_name);
@@ -325,8 +287,10 @@ ossl_x509name_to_a(VALUE self)
 	    short_name = OBJ_nid2sn(nid);
 	    vname = rb_str_new2(short_name); /*do not free*/
 	}
-	value = X509_NAME_ENTRY_get_data(entry);
-	ary = rb_ary_new3(3, vname, asn1str_to_str(value), INT2NUM(value->type));
+	ary = rb_ary_new3(3,
+			  vname,
+        		  rb_str_new((const char *)entry->value->data, entry->value->length),
+        		  INT2FIX(entry->value->type));
 	rb_ary_push(ret, ary);
     }
     return ret;
@@ -372,10 +336,12 @@ ossl_x509name_cmp(VALUE self, VALUE other)
 static VALUE
 ossl_x509name_eql(VALUE self, VALUE other)
 {
-    if (!rb_obj_is_kind_of(other, cX509Name))
-	return Qfalse;
+    int result;
+
+    if(CLASS_OF(other) != cX509Name) return Qfalse;
+    result = ossl_x509name_cmp0(self, other);
 
-    return ossl_x509name_cmp0(self, other) ? Qtrue : Qfalse;
+    return (result == 0) ? Qtrue : Qfalse;
 }
 
 /*
@@ -460,16 +426,10 @@ ossl_x509name_to_der(VALUE self)
  */
 
 void
-Init_ossl_x509name(void)
+Init_ossl_x509name()
 {
     VALUE utf8str, ptrstr, ia5str, hash;
 
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
     id_aref = rb_intern("[]");
     eX509NameError = rb_define_class_under(mX509, "NameError", eOSSLError);
     cX509Name = rb_define_class_under(mX509, "Name", rb_cObject);
@@ -478,7 +438,6 @@ Init_ossl_x509name(void)
 
     rb_define_alloc_func(cX509Name, ossl_x509name_alloc);
     rb_define_method(cX509Name, "initialize", ossl_x509name_initialize, -1);
-    rb_define_copy_func(cX509Name, ossl_x509name_initialize_copy);
     rb_define_method(cX509Name, "add_entry", ossl_x509name_add_entry, -1);
     rb_define_method(cX509Name, "to_s", ossl_x509name_to_s, -1);
     rb_define_method(cX509Name, "to_a", ossl_x509name_to_a, 0);
@@ -495,7 +454,8 @@ Init_ossl_x509name(void)
     ptrstr = INT2NUM(V_ASN1_PRINTABLESTRING);
     ia5str = INT2NUM(V_ASN1_IA5STRING);
 
-    /*
+    /* Document-const: DEFAULT_OBJECT_TYPE
+     *
      * The default object type for name entries.
      */
     rb_define_const(cX509Name, "DEFAULT_OBJECT_TYPE", utf8str);
@@ -509,12 +469,14 @@ Init_ossl_x509name(void)
     rb_hash_aset(hash, rb_str_new2("domainComponent"), ia5str);
     rb_hash_aset(hash, rb_str_new2("emailAddress"), ia5str);
 
-    /*
+    /* Document-const: OBJECT_TYPE_TEMPLATE
+     *
      * The default object type template for name entries.
      */
     rb_define_const(cX509Name, "OBJECT_TYPE_TEMPLATE", hash);
 
-    /*
+    /* Document-const: COMPAT
+     *
      * A flag for #to_s.
      *
      * Breaks the name returned into multiple lines if longer than 80
@@ -522,21 +484,24 @@ Init_ossl_x509name(void)
      */
     rb_define_const(cX509Name, "COMPAT", ULONG2NUM(XN_FLAG_COMPAT));
 
-    /*
+    /* Document-const: RFC2253
+     *
      * A flag for #to_s.
      *
      * Returns an RFC2253 format name.
      */
     rb_define_const(cX509Name, "RFC2253", ULONG2NUM(XN_FLAG_RFC2253));
 
-    /*
+    /* Document-const: ONELINE
+     *
      * A flag for #to_s.
      *
      * Returns a more readable format than RFC2253.
      */
     rb_define_const(cX509Name, "ONELINE", ULONG2NUM(XN_FLAG_ONELINE));
 
-    /*
+    /* Document-const: MULTILINE
+     *
      * A flag for #to_s.
      *
      * Returns a multiline format.
diff --git a/ext/openssl/ossl_x509req.c b/ext/openssl/ossl_x509req.c
index 220d2f40d5..5927f76d44 100644
--- a/ext/openssl/ossl_x509req.c
+++ b/ext/openssl/ossl_x509req.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509Req(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509req_type, 0)
-#define SetX509Req(obj, req) do { \
+#define WrapX509Req(klass, obj, req) do { \
     if (!(req)) { \
 	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (req); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_REQ_free, (req)); \
 } while (0)
 #define GetX509Req(obj, req) do { \
-    TypedData_Get_Struct((obj), X509_REQ, &ossl_x509req_type, (req)); \
+    Data_Get_Struct((obj), X509_REQ, (req)); \
     if (!(req)) { \
 	ossl_raise(rb_eRuntimeError, "Req wasn't initialized!"); \
     } \
@@ -34,20 +33,6 @@
 VALUE cX509Req;
 VALUE eX509ReqError;
 
-static void
-ossl_x509req_free(void *ptr)
-{
-    X509_REQ_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509req_type = {
-    "OpenSSL/X509/REQ",
-    {
-	0, ossl_x509req_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public functions
  */
@@ -57,7 +42,6 @@ ossl_x509req_new(X509_REQ *req)
     X509_REQ *new;
     VALUE obj;
 
-    obj = NewX509Req(cX509Req);
     if (!req) {
 	new = X509_REQ_new();
     } else {
@@ -66,7 +50,7 @@ ossl_x509req_new(X509_REQ *req)
     if (!new) {
 	ossl_raise(eX509ReqError, NULL);
     }
-    SetX509Req(obj, new);
+    WrapX509Req(cX509Req, obj, new);
 
     return obj;
 }
@@ -103,11 +87,10 @@ ossl_x509req_alloc(VALUE klass)
     X509_REQ *req;
     VALUE obj;
 
-    obj = NewX509Req(klass);
     if (!(req = X509_REQ_new())) {
 	ossl_raise(eX509ReqError, NULL);
     }
-    SetX509Req(obj, req);
+    WrapX509Req(klass, obj, req);
 
     return obj;
 }
@@ -160,6 +143,8 @@ 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()))) {
@@ -169,8 +154,11 @@ ossl_x509req_to_pem(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
 
-    return ossl_membio2str(out);
+    return str;
 }
 
 static VALUE
@@ -198,6 +186,8 @@ ossl_x509req_to_text(VALUE self)
 {
     X509_REQ *req;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509Req(self, req);
     if (!(out = BIO_new(BIO_s_mem()))) {
@@ -207,8 +197,11 @@ ossl_x509req_to_text(VALUE self)
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
 
-    return ossl_membio2str(out);
+    return str;
 }
 
 #if 0
@@ -240,7 +233,7 @@ ossl_x509req_get_version(VALUE self)
     GetX509Req(self, req);
     version = X509_REQ_get_version(req);
 
-    return LONG2NUM(version);
+    return LONG2FIX(version);
 }
 
 static VALUE
@@ -249,12 +242,12 @@ ossl_x509req_set_version(VALUE self, VALUE version)
     X509_REQ *req;
     long ver;
 
-    if ((ver = NUM2LONG(version)) < 0) {
+    if ((ver = FIX2LONG(version)) < 0) {
 	ossl_raise(eX509ReqError, "version must be >= 0!");
     }
     GetX509Req(self, req);
     if (!X509_REQ_set_version(req, ver)) {
-	ossl_raise(eX509ReqError, "X509_REQ_set_version");
+	ossl_raise(eX509ReqError, NULL);
     }
 
     return version;
@@ -292,21 +285,23 @@ static VALUE
 ossl_x509req_get_signature_algorithm(VALUE self)
 {
     X509_REQ *req;
-    const X509_ALGOR *alg;
     BIO *out;
+    BUF_MEM *buf;
+    VALUE str;
 
     GetX509Req(self, req);
 
     if (!(out = BIO_new(BIO_s_mem()))) {
 	ossl_raise(eX509ReqError, NULL);
     }
-    X509_REQ_get0_signature(req, NULL, &alg);
-    if (!i2a_ASN1_OBJECT(out, alg->algorithm)) {
+    if (!i2a_ASN1_OBJECT(out, req->sig_alg->algorithm)) {
 	BIO_free(out);
 	ossl_raise(eX509ReqError, NULL);
     }
-
-    return ossl_membio2str(out);
+    BIO_get_mem_ptr(out, &buf);
+    str = rb_str_new(buf->data, buf->length);
+    BIO_free(out);
+    return str;
 }
 
 static VALUE
@@ -363,18 +358,18 @@ ossl_x509req_verify(VALUE self, VALUE key)
 {
     X509_REQ *req;
     EVP_PKEY *pkey;
+    int i;
 
     GetX509Req(self, req);
     pkey = GetPKeyPtr(key); /* NO NEED TO DUP */
-    switch (X509_REQ_verify(req, pkey)) {
-      case 1:
-	return Qtrue;
-      case 0:
-	ossl_clear_error();
-	return Qfalse;
-      default:
+    if ((i = X509_REQ_verify(req, pkey)) < 0) {
 	ossl_raise(eX509ReqError, NULL);
     }
+    if (i > 0) {
+	return Qtrue;
+    }
+
+    return Qfalse;
 }
 
 static VALUE
@@ -406,19 +401,19 @@ ossl_x509req_set_attributes(VALUE self, VALUE ary)
 {
     X509_REQ *req;
     X509_ATTRIBUTE *attr;
-    long i;
+    int i;
     VALUE item;
 
     Check_Type(ary, T_ARRAY);
     for (i=0;i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Attr);
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Attr);
     }
     GetX509Req(self, req);
-    while ((attr = X509_REQ_delete_attr(req, 0)))
-	X509_ATTRIBUTE_free(attr);
+    sk_X509_ATTRIBUTE_pop_free(req->req_info->attributes, X509_ATTRIBUTE_free);
+    req->req_info->attributes = NULL;
     for (i=0;i<RARRAY_LEN(ary); i++) {
-	item = RARRAY_AREF(ary, i);
-	attr = GetX509AttrPtr(item);
+	item = RARRAY_PTR(ary)[i];
+	attr = DupX509AttrPtr(item);
 	if (!X509_REQ_add1_attr(req, attr)) {
 	    ossl_raise(eX509ReqError, NULL);
 	}
@@ -432,7 +427,7 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
     X509_REQ *req;
 
     GetX509Req(self, req);
-    if (!X509_REQ_add1_attr(req, GetX509AttrPtr(attr))) {
+    if (!X509_REQ_add1_attr(req, DupX509AttrPtr(attr))) {
 	ossl_raise(eX509ReqError, NULL);
     }
 
@@ -443,14 +438,8 @@ ossl_x509req_add_attribute(VALUE self, VALUE attr)
  * X509_REQUEST init
  */
 void
-Init_ossl_x509req(void)
+Init_ossl_x509req()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
     eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
 
     cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
@@ -476,3 +465,4 @@ Init_ossl_x509req(void)
     rb_define_method(cX509Req, "attributes=", ossl_x509req_set_attributes, 1);
     rb_define_method(cX509Req, "add_attribute", ossl_x509req_add_attribute, 1);
 }
+
diff --git a/ext/openssl/ossl_x509revoked.c b/ext/openssl/ossl_x509revoked.c
index 7960ea349e..320abaa7ae 100644
--- a/ext/openssl/ossl_x509revoked.c
+++ b/ext/openssl/ossl_x509revoked.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509Rev(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509rev_type, 0)
-#define SetX509Rev(obj, rev) do { \
+#define WrapX509Rev(klass, obj, rev) do { \
     if (!(rev)) { \
 	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (rev); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_REVOKED_free, (rev)); \
 } while (0)
 #define GetX509Rev(obj, rev) do { \
-    TypedData_Get_Struct((obj), X509_REVOKED, &ossl_x509rev_type, (rev)); \
+    Data_Get_Struct((obj), X509_REVOKED, (rev)); \
     if (!(rev)) { \
 	ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
     } \
@@ -34,20 +33,6 @@
 VALUE cX509Rev;
 VALUE eX509RevError;
 
-static void
-ossl_x509rev_free(void *ptr)
-{
-    X509_REVOKED_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509rev_type = {
-    "OpenSSL/X509/REV",
-    {
-	0, ossl_x509rev_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * PUBLIC
  */
@@ -57,7 +42,6 @@ ossl_x509revoked_new(X509_REVOKED *rev)
     X509_REVOKED *new;
     VALUE obj;
 
-    obj = NewX509Rev(cX509Rev);
     if (!rev) {
 	new = X509_REVOKED_new();
     } else {
@@ -66,7 +50,7 @@ ossl_x509revoked_new(X509_REVOKED *rev)
     if (!new) {
 	ossl_raise(eX509RevError, NULL);
     }
-    SetX509Rev(obj, new);
+    WrapX509Rev(cX509Rev, obj, new);
 
     return obj;
 }
@@ -93,11 +77,10 @@ ossl_x509revoked_alloc(VALUE klass)
     X509_REVOKED *rev;
     VALUE obj;
 
-    obj = NewX509Rev(klass);
     if (!(rev = X509_REVOKED_new())) {
 	ossl_raise(eX509RevError, NULL);
     }
-    SetX509Rev(obj, rev);
+    WrapX509Rev(klass, obj, rev);
 
     return obj;
 }
@@ -110,47 +93,22 @@ ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 static VALUE
-ossl_x509revoked_initialize_copy(VALUE self, VALUE other)
-{
-    X509_REVOKED *rev, *rev_other, *rev_new;
-
-    rb_check_frozen(self);
-    GetX509Rev(self, rev);
-    SafeGetX509Rev(other, rev_other);
-
-    rev_new = X509_REVOKED_dup(rev_other);
-    if (!rev_new)
-	ossl_raise(eX509RevError, "X509_REVOKED_dup");
-
-    SetX509Rev(self, rev_new);
-    X509_REVOKED_free(rev);
-
-    return self;
-}
-
-static VALUE
 ossl_x509revoked_get_serial(VALUE self)
 {
     X509_REVOKED *rev;
 
     GetX509Rev(self, rev);
 
-    return asn1integer_to_num(X509_REVOKED_get0_serialNumber(rev));
+    return asn1integer_to_num(rev->serialNumber);
 }
 
 static VALUE
 ossl_x509revoked_set_serial(VALUE self, VALUE num)
 {
     X509_REVOKED *rev;
-    ASN1_INTEGER *asn1int;
 
     GetX509Rev(self, rev);
-    asn1int = num_to_asn1integer(num, NULL);
-    if (!X509_REVOKED_set_serialNumber(rev, asn1int)) {
-	ASN1_INTEGER_free(asn1int);
-	ossl_raise(eX509RevError, "X509_REVOKED_set_serialNumber");
-    }
-    ASN1_INTEGER_free(asn1int);
+    rev->serialNumber = num_to_asn1integer(num, rev->serialNumber);
 
     return num;
 }
@@ -162,22 +120,20 @@ ossl_x509revoked_get_time(VALUE self)
 
     GetX509Rev(self, rev);
 
-    return asn1time_to_time(X509_REVOKED_get0_revocationDate(rev));
+    return asn1time_to_time(rev->revocationDate);
 }
 
 static VALUE
 ossl_x509revoked_set_time(VALUE self, VALUE time)
 {
     X509_REVOKED *rev;
-    ASN1_TIME *asn1time;
+    time_t sec;
 
+    sec = time_to_time_t(time);
     GetX509Rev(self, rev);
-    asn1time = ossl_x509_time_adjust(NULL, time);
-    if (!X509_REVOKED_set_revocationDate(rev, asn1time)) {
-	ASN1_TIME_free(asn1time);
-	ossl_raise(eX509RevError, "X509_REVOKED_set_revocationDate");
+    if (!X509_time_adj(rev->revocationDate, 0, &sec)) {
+	ossl_raise(eX509RevError, NULL);
     }
-    ASN1_TIME_free(asn1time);
 
     return time;
 }
@@ -215,19 +171,19 @@ ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
 {
     X509_REVOKED *rev;
     X509_EXTENSION *ext;
-    long i;
+    int i;
     VALUE item;
 
     Check_Type(ary, T_ARRAY);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
+	OSSL_Check_Kind(RARRAY_PTR(ary)[i], cX509Ext);
     }
     GetX509Rev(self, rev);
-    while ((ext = X509_REVOKED_delete_ext(rev, 0)))
-	X509_EXTENSION_free(ext);
+    sk_X509_EXTENSION_pop_free(rev->extensions, X509_EXTENSION_free);
+    rev->extensions = NULL;
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	item = RARRAY_AREF(ary, i);
-	ext = GetX509ExtPtr(item);
+	item = RARRAY_PTR(ary)[i];
+	ext = DupX509ExtPtr(item);
 	if(!X509_REVOKED_add_ext(rev, ext, -1)) {
 	    ossl_raise(eX509RevError, NULL);
 	}
@@ -242,7 +198,7 @@ ossl_x509revoked_add_extension(VALUE self, VALUE ext)
     X509_REVOKED *rev;
 
     GetX509Rev(self, rev);
-    if (!X509_REVOKED_add_ext(rev, GetX509ExtPtr(ext), -1)) {
+    if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
 	ossl_raise(eX509RevError, NULL);
     }
 
@@ -253,21 +209,14 @@ ossl_x509revoked_add_extension(VALUE self, VALUE ext)
  * INIT
  */
 void
-Init_ossl_x509revoked(void)
+Init_ossl_x509revoked()
 {
-#if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
-    mX509 = rb_define_module_under(mOSSL, "X509");
-#endif
-
     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_copy_func(cX509Rev, ossl_x509revoked_initialize_copy);
 
     rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
     rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
@@ -277,3 +226,4 @@ Init_ossl_x509revoked(void)
     rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
     rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
 }
+
diff --git a/ext/openssl/ossl_x509store.c b/ext/openssl/ossl_x509store.c
index eb81e0d473..f59c376574 100644
--- a/ext/openssl/ossl_x509store.c
+++ b/ext/openssl/ossl_x509store.c
@@ -1,24 +1,23 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2002  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #include "ossl.h"
 
-#define NewX509Store(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509store_type, 0)
-#define SetX509Store(obj, st) do { \
+#define WrapX509Store(klass, obj, st) do { \
     if (!(st)) { \
 	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (st); \
+    (obj) = Data_Wrap_Struct((klass), 0, X509_STORE_free, (st)); \
 } while (0)
 #define GetX509Store(obj, st) do { \
-    TypedData_Get_Struct((obj), X509_STORE, &ossl_x509store_type, (st)); \
+    Data_Get_Struct((obj), X509_STORE, (st)); \
     if (!(st)) { \
 	ossl_raise(rb_eRuntimeError, "STORE wasn't initialized!"); \
     } \
@@ -28,16 +27,14 @@
     GetX509Store((obj), (st)); \
 } while (0)
 
-#define NewX509StCtx(klass) \
-    TypedData_Wrap_Struct((klass), &ossl_x509stctx_type, 0)
-#define SetX509StCtx(obj, ctx) do { \
+#define WrapX509StCtx(klass, obj, ctx) do { \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "STORE_CTX wasn't initialized!"); \
     } \
-    RTYPEDDATA_DATA(obj) = (ctx); \
+    (obj) = Data_Wrap_Struct((klass), 0, ossl_x509stctx_free, (ctx)); \
 } while (0)
 #define GetX509StCtx(obj, ctx) do { \
-    TypedData_Get_Struct((obj), X509_STORE_CTX, &ossl_x509stctx_type, (ctx)); \
+    Data_Get_Struct((obj), X509_STORE_CTX, (ctx)); \
     if (!(ctx)) { \
 	ossl_raise(rb_eRuntimeError, "STORE_CTX is out of scope!"); \
     } \
@@ -48,85 +45,12 @@
 } while (0)
 
 /*
- * Verify callback stuff
- */
-static int stctx_ex_verify_cb_idx, store_ex_verify_cb_idx;
-static VALUE ossl_x509stctx_new(X509_STORE_CTX *);
-
-struct ossl_verify_cb_args {
-    VALUE proc;
-    VALUE preverify_ok;
-    VALUE store_ctx;
-};
-
-static VALUE
-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
-ossl_verify_cb_call(VALUE proc, int ok, X509_STORE_CTX *ctx)
-{
-    VALUE rctx, ret;
-    struct ossl_verify_cb_args args;
-    int state;
-
-    if (NIL_P(proc))
-	return ok;
-
-    ret = Qfalse;
-    rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new, (VALUE)ctx, &state);
-    if (state) {
-	rb_set_errinfo(Qnil);
-	rb_warn("StoreContext initialization failure");
-    }
-    else {
-	args.proc = proc;
-	args.preverify_ok = ok ? Qtrue : Qfalse;
-	args.store_ctx = rctx;
-	ret = rb_protect((VALUE(*)(VALUE))call_verify_cb_proc, (VALUE)&args, &state);
-	if (state) {
-	    rb_set_errinfo(Qnil);
-	    rb_warn("exception in verify_callback is ignored");
-	}
-	RTYPEDDATA_DATA(rctx) = NULL;
-    }
-    if (ret == Qtrue) {
-	X509_STORE_CTX_set_error(ctx, X509_V_OK);
-	ok = 1;
-    }
-    else {
-	if (X509_STORE_CTX_get_error(ctx) == X509_V_OK)
-	    X509_STORE_CTX_set_error(ctx, X509_V_ERR_CERT_REJECTED);
-	ok = 0;
-    }
-
-    return ok;
-}
-
-/*
  * Classes
  */
 VALUE cX509Store;
 VALUE cX509StoreContext;
 VALUE eX509StoreError;
 
-static void
-ossl_x509store_free(void *ptr)
-{
-    X509_STORE_free(ptr);
-}
-
-static const rb_data_type_t ossl_x509store_type = {
-    "OpenSSL/X509/STORE",
-    {
-	0, ossl_x509store_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * Public functions
  */
@@ -135,8 +59,7 @@ ossl_x509store_new(X509_STORE *store)
 {
     VALUE obj;
 
-    obj = NewX509Store(cX509Store);
-    SetX509Store(obj, store);
+    WrapX509Store(cX509Store, obj, store);
 
     return obj;
 }
@@ -157,7 +80,7 @@ DupX509StorePtr(VALUE obj)
     X509_STORE *store;
 
     SafeGetX509Store(obj, store);
-    X509_STORE_up_ref(store);
+    CRYPTO_add(&store->references, 1, CRYPTO_LOCK_X509_STORE);
 
     return store;
 }
@@ -165,32 +88,16 @@ DupX509StorePtr(VALUE obj)
 /*
  * Private functions
  */
-static int
-x509store_verify_cb(int ok, X509_STORE_CTX *ctx)
-{
-    VALUE proc;
-
-    proc = (VALUE)X509_STORE_CTX_get_ex_data(ctx, stctx_ex_verify_cb_idx);
-    if (!proc)
-	proc = (VALUE)X509_STORE_get_ex_data(X509_STORE_CTX_get0_store(ctx),
-					     store_ex_verify_cb_idx);
-    if (!proc)
-	return ok;
-
-    return ossl_verify_cb_call(proc, ok, ctx);
-}
-
 static VALUE
 ossl_x509store_alloc(VALUE klass)
 {
     X509_STORE *store;
     VALUE obj;
 
-    obj = NewX509Store(klass);
     if((store = X509_STORE_new()) == NULL){
         ossl_raise(eX509StoreError, NULL);
     }
-    SetX509Store(obj, store);
+    WrapX509Store(klass, obj, store);
 
     return obj;
 }
@@ -204,7 +111,7 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
     X509_STORE *store;
 
     GetX509Store(self, store);
-    X509_STORE_set_ex_data(store, store_ex_verify_cb_idx, (void *)cb);
+    X509_STORE_set_ex_data(store, ossl_verify_cb_idx, (void*)cb);
     rb_iv_set(self, "@verify_callback", cb);
 
     return cb;
@@ -215,7 +122,6 @@ ossl_x509store_set_vfy_cb(VALUE self, VALUE cb)
  * call-seq:
  *    X509::Store.new => store
  *
- * Creates a new X509::Store.
  */
 static VALUE
 ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
@@ -224,13 +130,16 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
 
 /* BUG: This method takes any number of arguments but appears to ignore them. */
     GetX509Store(self, store);
-#if !defined(HAVE_OPAQUE_OPENSSL)
-    /* [Bug #405] [Bug #1678] [Bug #3000]; already fixed? */
     store->ex_data.sk = NULL;
-#endif
-    X509_STORE_set_verify_cb(store, x509store_verify_cb);
+    X509_STORE_set_verify_cb_func(store, ossl_verify_cb);
     ossl_x509store_set_vfy_cb(self, Qnil);
 
+#if (OPENSSL_VERSION_NUMBER < 0x00907000L)
+    rb_iv_set(self, "@flags", INT2FIX(0));
+    rb_iv_set(self, "@purpose", INT2FIX(0));
+    rb_iv_set(self, "@trust", INT2FIX(0));
+#endif
+
     /* last verification status */
     rb_iv_set(self, "@error", Qnil);
     rb_iv_set(self, "@error_string", Qnil);
@@ -240,77 +149,54 @@ ossl_x509store_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *   store.flags = flag
- *
- * Sets +flag+ to the Store. +flag+ consists of zero or more of the constants
- * defined in with name V_FLAG_* or'ed together.
- */
 static VALUE
 ossl_x509store_set_flags(VALUE self, VALUE flags)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
     long f = NUM2LONG(flags);
 
     GetX509Store(self, store);
     X509_STORE_set_flags(store, f);
+#else
+    rb_iv_set(self, "@flags", flags);
+#endif
 
     return flags;
 }
 
-/*
- * call-seq:
- *   store.purpose = purpose
- *
- * Sets the store's purpose to +purpose+. If specified, the verifications on
- * the store will check every untrusted certificate's extensions are consistent
- * with the purpose. The purpose is specified by constants:
- *
- * * X509::PURPOSE_SSL_CLIENT
- * * X509::PURPOSE_SSL_SERVER
- * * X509::PURPOSE_NS_SSL_SERVER
- * * X509::PURPOSE_SMIME_SIGN
- * * X509::PURPOSE_SMIME_ENCRYPT
- * * X509::PURPOSE_CRL_SIGN
- * * X509::PURPOSE_ANY
- * * X509::PURPOSE_OCSP_HELPER
- * * X509::PURPOSE_TIMESTAMP_SIGN
- */
 static VALUE
 ossl_x509store_set_purpose(VALUE self, VALUE purpose)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
     int p = NUM2INT(purpose);
 
     GetX509Store(self, store);
     X509_STORE_set_purpose(store, p);
+#else
+    rb_iv_set(self, "@purpose", purpose);
+#endif
 
     return purpose;
 }
 
-/*
- * call-seq:
- *   store.trust = trust
- */
 static VALUE
 ossl_x509store_set_trust(VALUE self, VALUE trust)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE *store;
     int t = NUM2INT(trust);
 
     GetX509Store(self, store);
     X509_STORE_set_trust(store, t);
+#else
+    rb_iv_set(self, "@trust", trust);
+#endif
 
     return trust;
 }
 
-/*
- * call-seq:
- *   store.time = time
- *
- * Sets the time to be used in verifications.
- */
 static VALUE
 ossl_x509store_set_time(VALUE self, VALUE time)
 {
@@ -320,11 +206,13 @@ ossl_x509store_set_time(VALUE self, VALUE time)
 
 /*
  * call-seq:
- *   store.add_file(file) -> self
+ *   store.add_file(file) -> store
+ *
  *
  * Adds the certificates in +file+ to the certificate store.  The +file+ can
  * contain multiple PEM-encoded certificates.
  */
+
 static VALUE
 ossl_x509store_add_file(VALUE self, VALUE file)
 {
@@ -333,8 +221,8 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     char *path = NULL;
 
     if(file != Qnil){
-	rb_check_safe_obj(file);
-	path = StringValueCStr(file);
+        SafeStringValue(file);
+	path = RSTRING_PTR(file);
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
@@ -346,12 +234,6 @@ ossl_x509store_add_file(VALUE self, VALUE file)
     return self;
 }
 
-/*
- * call-seq:
- *   store.add_path(path) -> self
- *
- * Adds +path+ as the hash dir to be looked up by the store.
- */
 static VALUE
 ossl_x509store_add_path(VALUE self, VALUE dir)
 {
@@ -360,8 +242,8 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
     char *path = NULL;
 
     if(dir != Qnil){
-	rb_check_safe_obj(dir);
-	path = StringValueCStr(dir);
+        SafeStringValue(dir);
+	path = RSTRING_PTR(dir);
     }
     GetX509Store(self, store);
     lookup = X509_STORE_add_lookup(store, X509_LOOKUP_hash_dir());
@@ -377,12 +259,11 @@ ossl_x509store_add_path(VALUE self, VALUE dir)
  * call-seq:
  *   store.set_default_paths
  *
- * Configures +store+ to look up CA certificates from the system default
- * certificate store as needed basis. The location of the store can usually be
+ * Adds the default certificates to the certificate store.  These certificates
+ * are loaded from the default configuration directory which can usually be
  * determined by:
  *
- * * OpenSSL::X509::DEFAULT_CERT_FILE
- * * OpenSSL::X509::DEFAULT_CERT_DIR
+ *   File.dirname OpenSSL::Config::DEFAULT_CONFIG_FILE
  */
 static VALUE
 ossl_x509store_set_default_paths(VALUE self)
@@ -403,6 +284,7 @@ ossl_x509store_set_default_paths(VALUE self)
  *
  * Adds the OpenSSL::X509::Certificate +cert+ to the certificate store.
  */
+
 static VALUE
 ossl_x509store_add_cert(VALUE self, VALUE arg)
 {
@@ -418,12 +300,6 @@ ossl_x509store_add_cert(VALUE self, VALUE arg)
     return self;
 }
 
-/*
- * call-seq:
- *   store.add_crl(crl) -> self
- *
- * Adds the OpenSSL::X509::CRL +crl+ to the store.
- */
 static VALUE
 ossl_x509store_add_crl(VALUE self, VALUE arg)
 {
@@ -443,21 +319,6 @@ static VALUE ossl_x509stctx_get_err(VALUE);
 static VALUE ossl_x509stctx_get_err_string(VALUE);
 static VALUE ossl_x509stctx_get_chain(VALUE);
 
-/*
- * call-seq:
- *   store.verify(cert, chain = nil) -> true | false
- *
- * Performs a certificate verification on the OpenSSL::X509::Certificate +cert+.
- *
- * +chain+ can be an array of OpenSSL::X509::Certificate that is used to
- * construct the certificate chain.
- *
- * If a block is given, it overrides the callback set by #verify_callback=.
- *
- * After finishing the verification, the error information can be retrieved by
- * #error, #error_string, and the resuting complete certificate chain can be
- * retrieved by #chain.
- */
 static VALUE
 ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 {
@@ -481,28 +342,37 @@ ossl_x509store_verify(int argc, VALUE *argv, VALUE self)
 /*
  * Public Functions
  */
-static void ossl_x509stctx_free(void*);
+static void ossl_x509stctx_free(X509_STORE_CTX*);
+
+VALUE
+ossl_x509stctx_new(X509_STORE_CTX *ctx)
+{
+    VALUE obj;
 
+    WrapX509StCtx(cX509StoreContext, obj, ctx);
 
-static const rb_data_type_t ossl_x509stctx_type = {
-    "OpenSSL/X509/STORE_CTX",
-    {
-	0, ossl_x509stctx_free,
-    },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
-};
+    return obj;
+}
+
+VALUE
+ossl_x509stctx_clear_ptr(VALUE obj)
+{
+    OSSL_Check_Kind(obj, cX509StoreContext);
+    RDATA(obj)->data = NULL;
+
+    return obj;
+}
 
 /*
  * Private functions
  */
 static void
-ossl_x509stctx_free(void *ptr)
+ossl_x509stctx_free(X509_STORE_CTX *ctx)
 {
-    X509_STORE_CTX *ctx = ptr;
-    if (X509_STORE_CTX_get0_untrusted(ctx))
-	sk_X509_pop_free(X509_STORE_CTX_get0_untrusted(ctx), X509_free);
-    if (X509_STORE_CTX_get0_cert(ctx))
-	X509_free(X509_STORE_CTX_get0_cert(ctx));
+    if(ctx->untrusted)
+	sk_X509_pop_free(ctx->untrusted, X509_free);
+    if(ctx->cert)
+	X509_free(ctx->cert);
     X509_STORE_CTX_free(ctx);
 }
 
@@ -512,22 +382,10 @@ ossl_x509stctx_alloc(VALUE klass)
     X509_STORE_CTX *ctx;
     VALUE obj;
 
-    obj = NewX509StCtx(klass);
     if((ctx = X509_STORE_CTX_new()) == NULL){
         ossl_raise(eX509StoreError, NULL);
     }
-    SetX509StCtx(obj, ctx);
-
-    return obj;
-}
-
-static VALUE
-ossl_x509stctx_new(X509_STORE_CTX *ctx)
-{
-    VALUE obj;
-
-    obj = NewX509StCtx(cX509StoreContext);
-    SetX509StCtx(obj, ctx);
+    WrapX509StCtx(klass, obj, ctx);
 
     return obj;
 }
@@ -537,10 +395,6 @@ static VALUE ossl_x509stctx_set_purpose(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_trust(VALUE, VALUE);
 static VALUE ossl_x509stctx_set_time(VALUE, VALUE);
 
-/*
- * call-seq:
- *   StoreContext.new(store, cert = nil, chain = nil)
- */
 static VALUE
 ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -555,10 +409,17 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
     SafeGetX509Store(store, x509st);
     if(!NIL_P(cert)) x509 = DupX509CertPtr(cert); /* NEED TO DUP */
     if(!NIL_P(chain)) x509s = ossl_x509_ary2sk(chain);
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     if(X509_STORE_CTX_init(ctx, x509st, x509, x509s) != 1){
         sk_X509_pop_free(x509s, X509_free);
         ossl_raise(eX509StoreError, NULL);
     }
+#else
+    X509_STORE_CTX_init(ctx, x509st, x509, x509s);
+    ossl_x509stctx_set_flags(self, rb_iv_get(store, "@flags"));
+    ossl_x509stctx_set_purpose(self, rb_iv_get(store, "@purpose"));
+    ossl_x509stctx_set_trust(self, rb_iv_get(store, "@trust"));
+#endif
     if (!NIL_P(t = rb_iv_get(store, "@time")))
 	ossl_x509stctx_set_time(self, t);
     rb_iv_set(self, "@verify_callback", rb_iv_get(store, "@verify_callback"));
@@ -567,34 +428,20 @@ ossl_x509stctx_initialize(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-/*
- * call-seq:
- *   stctx.verify -> true | false
- */
 static VALUE
 ossl_x509stctx_verify(VALUE self)
 {
     X509_STORE_CTX *ctx;
+    int result;
 
     GetX509StCtx(self, ctx);
-    X509_STORE_CTX_set_ex_data(ctx, stctx_ex_verify_cb_idx,
-			       (void *)rb_iv_get(self, "@verify_callback"));
-
-    switch (X509_verify_cert(ctx)) {
-      case 1:
-	return Qtrue;
-      case 0:
-	ossl_clear_error();
-	return Qfalse;
-      default:
-	ossl_raise(eX509CertError, NULL);
-    }
+    X509_STORE_CTX_set_ex_data(ctx, ossl_verify_cb_idx,
+                               (void*)rb_iv_get(self, "@verify_callback"));
+    result = X509_verify_cert(ctx);
+
+    return result ? Qtrue : Qfalse;
 }
 
-/*
- * call-seq:
- *   stctx.chain -> Array of X509::Certificate
- */
 static VALUE
 ossl_x509stctx_get_chain(VALUE self)
 {
@@ -605,7 +452,7 @@ ossl_x509stctx_get_chain(VALUE self)
     VALUE ary;
 
     GetX509StCtx(self, ctx);
-    if((chain = X509_STORE_CTX_get0_chain(ctx)) == NULL){
+    if((chain = X509_STORE_CTX_get_chain(ctx)) == NULL){
         return Qnil;
     }
     if((num = sk_X509_num(chain)) < 0){
@@ -621,10 +468,6 @@ ossl_x509stctx_get_chain(VALUE self)
     return ary;
 }
 
-/*
- * call-seq:
- *   stctx.error -> Integer
- */
 static VALUE
 ossl_x509stctx_get_err(VALUE self)
 {
@@ -632,13 +475,9 @@ ossl_x509stctx_get_err(VALUE self)
 
     GetX509StCtx(self, ctx);
 
-    return INT2NUM(X509_STORE_CTX_get_error(ctx));
+    return INT2FIX(X509_STORE_CTX_get_error(ctx));
 }
 
-/*
- * call-seq:
- *   stctx.error = error_code
- */
 static VALUE
 ossl_x509stctx_set_error(VALUE self, VALUE err)
 {
@@ -650,12 +489,6 @@ ossl_x509stctx_set_error(VALUE self, VALUE err)
     return err;
 }
 
-/*
- * call-seq:
- *   stctx.error_string -> String
- *
- * Returns the error string corresponding to the error code retrieved by #error.
- */
 static VALUE
 ossl_x509stctx_get_err_string(VALUE self)
 {
@@ -668,10 +501,6 @@ ossl_x509stctx_get_err_string(VALUE self)
     return rb_str_new2(X509_verify_cert_error_string(err));
 }
 
-/*
- * call-seq:
- *   stctx.error_depth -> Integer
- */
 static VALUE
 ossl_x509stctx_get_err_depth(VALUE self)
 {
@@ -679,13 +508,9 @@ ossl_x509stctx_get_err_depth(VALUE self)
 
     GetX509StCtx(self, ctx);
 
-    return INT2NUM(X509_STORE_CTX_get_error_depth(ctx));
+    return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
 }
 
-/*
- * call-seq:
- *   stctx.current_cert -> X509::Certificate
- */
 static VALUE
 ossl_x509stctx_get_curr_cert(VALUE self)
 {
@@ -696,30 +521,21 @@ ossl_x509stctx_get_curr_cert(VALUE self)
     return ossl_x509_new(X509_STORE_CTX_get_current_cert(ctx));
 }
 
-/*
- * call-seq:
- *   stctx.current_crl -> X509::CRL
- */
 static VALUE
 ossl_x509stctx_get_curr_crl(VALUE self)
 {
+#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
     X509_STORE_CTX *ctx;
-    X509_CRL *crl;
 
     GetX509StCtx(self, ctx);
-    crl = X509_STORE_CTX_get0_current_crl(ctx);
-    if (!crl)
-	return Qnil;
+    if(!ctx->current_crl) return Qnil;
 
-    return ossl_x509crl_new(crl);
+    return ossl_x509crl_new(ctx->current_crl);
+#else
+    return Qnil;
+#endif
 }
 
-/*
- * call-seq:
- *   stctx.flags = flags
- *
- * Sets the verification flags to the context. See Store#flags=.
- */
 static VALUE
 ossl_x509stctx_set_flags(VALUE self, VALUE flags)
 {
@@ -732,12 +548,6 @@ ossl_x509stctx_set_flags(VALUE self, VALUE flags)
     return flags;
 }
 
-/*
- * call-seq:
- *   stctx.purpose = purpose
- *
- * Sets the purpose of the context. See Store#purpose=.
- */
 static VALUE
 ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
 {
@@ -750,10 +560,6 @@ ossl_x509stctx_set_purpose(VALUE self, VALUE purpose)
     return purpose;
 }
 
-/*
- * call-seq:
- *   stctx.trust = trust
- */
 static VALUE
 ossl_x509stctx_set_trust(VALUE self, VALUE trust)
 {
@@ -768,9 +574,7 @@ ossl_x509stctx_set_trust(VALUE self, VALUE trust)
 
 /*
  * call-seq:
- *   stctx.time = time
- *
- * Sets the time used in the verification. If not set, the current time is used.
+ *    storectx.time = time => time
  */
 static VALUE
 ossl_x509stctx_set_time(VALUE self, VALUE time)
@@ -789,22 +593,15 @@ ossl_x509stctx_set_time(VALUE self, VALUE time)
  * INIT
  */
 void
-Init_ossl_x509store(void)
+Init_ossl_x509store()
 {
+    VALUE x509stctx;
+
 #if 0
-    mOSSL = rb_define_module("OpenSSL");
-    eOSSLError = rb_define_class_under(mOSSL, "OpenSSLError", rb_eStandardError);
+    mOSSL = rb_define_module("OpenSSL"); /* let rdoc know about mOSSL */
     mX509 = rb_define_module_under(mOSSL, "X509");
 #endif
 
-    /* Register ext_data slot for verify callback Proc */
-    stctx_ex_verify_cb_idx = X509_STORE_CTX_get_ex_new_index(0, (void *)"stctx_ex_verify_cb_idx", 0, 0, 0);
-    if (stctx_ex_verify_cb_idx < 0)
-	ossl_raise(eOSSLError, "X509_STORE_CTX_get_ex_new_index");
-    store_ex_verify_cb_idx = X509_STORE_get_ex_new_index(0, (void *)"store_ex_verify_cb_idx", 0, 0, 0);
-    if (store_ex_verify_cb_idx < 0)
-	ossl_raise(eOSSLError, "X509_STORE_get_ex_new_index");
-
     eX509StoreError = rb_define_class_under(mX509, "StoreError", eOSSLError);
 
     /* Document-class: OpenSSL::X509::Store
@@ -819,11 +616,11 @@ Init_ossl_x509store(void)
      *
      * This will use your system's built-in certificates.
      *
-     * If your system does not have a default set of certificates you can obtain
-     * a set extracted from Mozilla CA certificate store by cURL maintainers
-     * here: https://curl.haxx.se/docs/caextract.html (You may wish to use the
-     * firefox-db2pem.sh script to extract the certificates from a local install
-     * to avoid man-in-the-middle attacks.)
+     * If your system does not have a default set of certificates you can
+     * obtain a set from Mozilla here: http://curl.haxx.se/docs/caextract.html
+     * (Note that this set does not have an HTTPS download option so you may
+     * wish to use the firefox-db2pem.sh script to extract the certificates
+     * from a local install to avoid man-in-the-middle attacks.)
      *
      * After downloading or generating a cacert.pem from the above link you
      * can create a certificate store from the pem file like this:
@@ -834,7 +631,6 @@ Init_ossl_x509store(void)
      * The certificate store can be used with an SSLSocket like this:
      *
      *   ssl_context = OpenSSL::SSL::SSLContext.new
-     *   ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER
      *   ssl_context.cert_store = cert_store
      *
      *   tcp_socket = TCPSocket.open 'example.com', 443
@@ -843,30 +639,12 @@ Init_ossl_x509store(void)
      */
 
     cX509Store = rb_define_class_under(mX509, "Store", rb_cObject);
-    /*
-     * The callback for additional certificate verification. It is invoked for
-     * each untrusted certificate in the chain.
-     *
-     * The callback is invoked with two values, a boolean that indicates if the
-     * pre-verification by OpenSSL has succeeded or not, and the StoreContext in
-     * use. The callback must return either true or false.
-     */
     rb_attr(cX509Store, rb_intern("verify_callback"), 1, 0, Qfalse);
-    /*
-     * The error code set by the last call of #verify.
-     */
     rb_attr(cX509Store, rb_intern("error"), 1, 0, Qfalse);
-    /*
-     * The description for the error code set by the last call of #verify.
-     */
     rb_attr(cX509Store, rb_intern("error_string"), 1, 0, Qfalse);
-    /*
-     * The certificate chain constructed by the last call of #verify.
-     */
     rb_attr(cX509Store, rb_intern("chain"), 1, 0, Qfalse);
     rb_define_alloc_func(cX509Store, ossl_x509store_alloc);
     rb_define_method(cX509Store, "initialize",   ossl_x509store_initialize, -1);
-    rb_undef_method(cX509Store, "initialize_copy");
     rb_define_method(cX509Store, "verify_callback=", ossl_x509store_set_vfy_cb, 1);
     rb_define_method(cX509Store, "flags=",       ossl_x509store_set_flags, 1);
     rb_define_method(cX509Store, "purpose=",     ossl_x509store_set_purpose, 1);
@@ -879,26 +657,21 @@ Init_ossl_x509store(void)
     rb_define_method(cX509Store, "add_crl",      ossl_x509store_add_crl, 1);
     rb_define_method(cX509Store, "verify",       ossl_x509store_verify, -1);
 
-    /*
-     * Document-class: OpenSSL::X509::StoreContext
-     *
-     * A StoreContext is used while validating a single certificate and holds
-     * the status involved.
-     */
-    cX509StoreContext = rb_define_class_under(mX509,"StoreContext", rb_cObject);
+    cX509StoreContext = rb_define_class_under(mX509,"StoreContext",rb_cObject);
+    x509stctx = cX509StoreContext;
     rb_define_alloc_func(cX509StoreContext, ossl_x509stctx_alloc);
-    rb_define_method(cX509StoreContext, "initialize", ossl_x509stctx_initialize, -1);
-    rb_undef_method(cX509StoreContext, "initialize_copy");
-    rb_define_method(cX509StoreContext, "verify", ossl_x509stctx_verify, 0);
-    rb_define_method(cX509StoreContext, "chain", ossl_x509stctx_get_chain,0);
-    rb_define_method(cX509StoreContext, "error", ossl_x509stctx_get_err, 0);
-    rb_define_method(cX509StoreContext, "error=", ossl_x509stctx_set_error, 1);
-    rb_define_method(cX509StoreContext, "error_string", ossl_x509stctx_get_err_string,0);
-    rb_define_method(cX509StoreContext, "error_depth", ossl_x509stctx_get_err_depth, 0);
-    rb_define_method(cX509StoreContext, "current_cert", ossl_x509stctx_get_curr_cert, 0);
-    rb_define_method(cX509StoreContext, "current_crl", ossl_x509stctx_get_curr_crl, 0);
-    rb_define_method(cX509StoreContext, "flags=", ossl_x509stctx_set_flags, 1);
-    rb_define_method(cX509StoreContext, "purpose=", ossl_x509stctx_set_purpose, 1);
-    rb_define_method(cX509StoreContext, "trust=", ossl_x509stctx_set_trust, 1);
-    rb_define_method(cX509StoreContext, "time=", ossl_x509stctx_set_time, 1);
+    rb_define_method(x509stctx,"initialize",  ossl_x509stctx_initialize, -1);
+    rb_define_method(x509stctx,"verify",      ossl_x509stctx_verify, 0);
+    rb_define_method(x509stctx,"chain",       ossl_x509stctx_get_chain,0);
+    rb_define_method(x509stctx,"error",       ossl_x509stctx_get_err, 0);
+    rb_define_method(x509stctx,"error=",      ossl_x509stctx_set_error, 1);
+    rb_define_method(x509stctx,"error_string",ossl_x509stctx_get_err_string,0);
+    rb_define_method(x509stctx,"error_depth", ossl_x509stctx_get_err_depth, 0);
+    rb_define_method(x509stctx,"current_cert",ossl_x509stctx_get_curr_cert, 0);
+    rb_define_method(x509stctx,"current_crl", ossl_x509stctx_get_curr_crl, 0);
+    rb_define_method(x509stctx,"flags=",      ossl_x509stctx_set_flags, 1);
+    rb_define_method(x509stctx,"purpose=",    ossl_x509stctx_set_purpose, 1);
+    rb_define_method(x509stctx,"trust=",      ossl_x509stctx_set_trust, 1);
+    rb_define_method(x509stctx,"time=",       ossl_x509stctx_set_time, 1);
+
 }
diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h
index 8dacc8266e..0f9de1c842 100644
--- a/ext/openssl/ruby_missing.h
+++ b/ext/openssl/ruby_missing.h
@@ -1,10 +1,11 @@
 /*
+ * $Id$
  * 'OpenSSL for Ruby' project
  * Copyright (C) 2001-2003  Michal Rokos <m.rokos@sh.cvut.cz>
  * All rights reserved.
  */
 /*
- * This program is licensed under the same licence as Ruby.
+ * This program is licenced under the same licence as Ruby.
  * (See the file 'LICENCE'.)
  */
 #if !defined(_OSSL_RUBY_MISSING_H_)
@@ -13,11 +14,15 @@
 #define rb_define_copy_func(klass, func) \
 	rb_define_method((klass), "initialize_copy", (func), 1)
 
+
+#ifndef GetReadFile
 #define FPTR_TO_FD(fptr) ((fptr)->fd)
+#else
+#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr)))
+#endif
 
-#ifndef RB_INTEGER_TYPE_P
-/* for Ruby 2.3 compatibility */
-#define RB_INTEGER_TYPE_P(obj) (RB_FIXNUM_P(obj) || RB_TYPE_P(obj, T_BIGNUM))
+#ifndef HAVE_RB_IO_T
+#define rb_io_t OpenFile
 #endif
 
 #endif /* _OSSL_RUBY_MISSING_H_ */
diff --git a/ext/pathname/depend b/ext/pathname/depend
index 5b6ea7484d..79b6c53f50 100644
--- a/ext/pathname/depend
+++ b/ext/pathname/depend
@@ -1,15 +1,3 @@
-# AUTOGENERATED DEPENDENCIES START
-pathname.o: $(RUBY_EXTCONF_H)
-pathname.o: $(arch_hdrdir)/ruby/config.h
-pathname.o: $(hdrdir)/ruby/backward.h
-pathname.o: $(hdrdir)/ruby/defines.h
-pathname.o: $(hdrdir)/ruby/encoding.h
-pathname.o: $(hdrdir)/ruby/intern.h
-pathname.o: $(hdrdir)/ruby/missing.h
-pathname.o: $(hdrdir)/ruby/oniguruma.h
-pathname.o: $(hdrdir)/ruby/ruby.h
-pathname.o: $(hdrdir)/ruby/st.h
-pathname.o: $(hdrdir)/ruby/subst.h
-pathname.o: $(top_srcdir)/include/ruby.h
-pathname.o: pathname.c
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/pathname/extconf.rb b/ext/pathname/extconf.rb
index c9133bc153..037f10065d 100644
--- a/ext/pathname/extconf.rb
+++ b/ext/pathname/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 have_struct_member("struct stat", "st_birthtimespec", "sys/stat.h")
 create_makefile('pathname')
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index a6621565d0..82541e9b15 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #
 # = pathname.rb
 #
@@ -14,8 +13,13 @@ require 'pathname.so'
 
 class Pathname
 
-  # to_path is implemented so Pathname objects are usable with File.open, etc.
-  TO_PATH = :to_path
+  # :stopdoc:
+  if RUBY_VERSION < "1.9"
+    TO_PATH = :to_str
+  else
+    # 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?
     # Avoid #zero? here because #casecmp can return nil.
@@ -279,17 +283,9 @@ class Pathname
   #     #<Pathname:path/to/some>
   #     #<Pathname:path/to/some/file.rb>
   #
-  # Returns an Enumerator if no block was given.
-  #
-  #   enum = Pathname.new("/usr/bin/ruby").descend
-  #     # ... do stuff ...
-  #   enum.each { |e| ... }
-  #     # yields Pathnames /, /usr, /usr/bin, and /usr/bin/ruby.
-  #
   # It doesn't access the filesystem.
   #
   def descend
-    return to_enum(__method__) unless block_given?
     vs = []
     ascend {|v| vs << v }
     vs.reverse_each {|v| yield v }
@@ -312,17 +308,9 @@ class Pathname
   #     #<Pathname:path/to>
   #     #<Pathname:path>
   #
-  # Returns an Enumerator if no block was given.
-  #
-  #   enum = Pathname.new("/usr/bin/ruby").ascend
-  #     # ... do stuff ...
-  #   enum.each { |e| ... }
-  #     # yields Pathnames /usr/bin/ruby, /usr/bin, /usr, and /.
-  #
   # It doesn't access the filesystem.
   #
   def ascend
-    return to_enum(__method__) unless block_given?
     path = @path
     yield self
     while r = chop_basename(path)
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index e617e82176..7c24598759 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -155,15 +155,11 @@ path_cmp(VALUE self, VALUE other)
     return INT2FIX(0);
 }
 
-#ifndef ST2FIX
-#define ST2FIX(h) LONG2FIX((long)(h))
-#endif
-
 /* :nodoc: */
 static VALUE
 path_hash(VALUE self)
 {
-    return ST2FIX(rb_str_hash(get_strpath(self)));
+    return INT2FIX(rb_str_hash(get_strpath(self)));
 }
 
 /*
@@ -206,7 +202,7 @@ path_sub(int argc, VALUE *argv, VALUE self)
         str = rb_block_call(str, rb_intern("sub"), argc, argv, 0, 0);
     }
     else {
-        str = rb_funcallv(str, rb_intern("sub"), argc, argv);
+        str = rb_funcall2(str, rb_intern("sub"), argc, argv);
     }
     return rb_class_new_instance(1, &str, rb_obj_class(self));
 }
@@ -303,7 +299,7 @@ path_each_line(int argc, VALUE *argv, VALUE self)
         return rb_block_call(rb_cIO, rb_intern("foreach"), 1+n, args, 0, 0);
     }
     else {
-        return rb_funcallv(rb_cIO, rb_intern("foreach"), 1+n, args);
+        return rb_funcall2(rb_cIO, rb_intern("foreach"), 1+n, args);
     }
 }
 
@@ -325,7 +321,7 @@ path_read(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcallv(rb_cIO, rb_intern("read"), 1+n, args);
+    return rb_funcall2(rb_cIO, rb_intern("read"), 1+n, args);
 }
 
 /*
@@ -345,7 +341,7 @@ path_binread(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "02", &args[1], &args[2]);
-    return rb_funcallv(rb_cIO, rb_intern("binread"), 1+n, args);
+    return rb_funcall2(rb_cIO, rb_intern("binread"), 1+n, args);
 }
 
 /*
@@ -366,7 +362,7 @@ path_write(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcallv(rb_cIO, rb_intern("write"), 1+n, args);
+    return rb_funcall2(rb_cIO, rb_intern("write"), 1+n, args);
 }
 
 /*
@@ -387,7 +383,7 @@ path_binwrite(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcallv(rb_cIO, rb_intern("binwrite"), 1+n, args);
+    return rb_funcall2(rb_cIO, rb_intern("binwrite"), 1+n, args);
 }
 
 /*
@@ -409,7 +405,7 @@ path_readlines(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "03", &args[1], &args[2], &args[3]);
-    return rb_funcallv(rb_cIO, rb_intern("readlines"), 1+n, args);
+    return rb_funcall2(rb_cIO, rb_intern("readlines"), 1+n, args);
 }
 
 /*
@@ -427,7 +423,7 @@ path_sysopen(int argc, VALUE *argv, VALUE self)
 
     args[0] = get_strpath(self);
     n = rb_scan_args(argc, argv, "02", &args[1], &args[2]);
-    return rb_funcallv(rb_cIO, rb_intern("sysopen"), 1+n, args);
+    return rb_funcall2(rb_cIO, rb_intern("sysopen"), 1+n, args);
 }
 
 /*
@@ -450,7 +446,7 @@ path_atime(VALUE self)
  *   pathname.birthtime	-> time
  *
  * Returns the birth time for the file.
- * If the platform doesn't have birthtime, raises NotImplementedError.
+ * If the platform doesn't have birthtime, returns <i>ctime</i>.
  *
  * See File.birthtime.
  */
@@ -612,7 +608,7 @@ path_open(int argc, VALUE *argv, VALUE self)
         return rb_block_call(rb_cFile, rb_intern("open"), 1+n, args, 0, 0);
     }
     else {
-        return rb_funcallv(rb_cFile, rb_intern("open"), 1+n, args);
+        return rb_funcall2(rb_cFile, rb_intern("open"), 1+n, args);
     }
 }
 
@@ -990,22 +986,6 @@ path_zero_p(VALUE self)
     return rb_funcall(rb_mFileTest, rb_intern("zero?"), 1, get_strpath(self));
 }
 
-/*
- * Tests the file is empty.
- *
- * See Dir#empty? and FileTest.empty?.
- */
-static VALUE
-path_empty_p(VALUE self)
-{
-
-    VALUE path = get_strpath(self);
-    if (RTEST(rb_funcall(rb_mFileTest, rb_intern("directory?"), 1, path)))
-        return rb_funcall(rb_cDir, rb_intern("empty?"), 1, path);
-    else
-        return rb_funcall(rb_mFileTest, rb_intern("empty?"), 1, path);
-}
-
 static VALUE
 glob_i(RB_BLOCK_CALL_FUNC_ARGLIST(elt, klass))
 {
@@ -1033,7 +1013,7 @@ path_s_glob(int argc, VALUE *argv, VALUE klass)
     else {
         VALUE ary;
         long i;
-        ary = rb_funcallv(rb_cDir, rb_intern("glob"), n, args);
+        ary = rb_funcall2(rb_cDir, rb_intern("glob"), n, args);
         ary = rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
         for (i = 0; i < RARRAY_LEN(ary); i++) {
             VALUE elt = RARRAY_AREF(ary, i);
@@ -1390,7 +1370,7 @@ path_f_pathname(VALUE self, VALUE str)
  * information.  In some cases, a brief description will follow.
  */
 void
-Init_pathname(void)
+Init_pathname()
 {
     id_at_path = rb_intern("@path");
     id_to_path = rb_intern("to_path");
@@ -1468,7 +1448,6 @@ Init_pathname(void)
     rb_define_method(rb_cPathname, "world_writable?", path_world_writable_p, 0);
     rb_define_method(rb_cPathname, "writable_real?", path_writable_real_p, 0);
     rb_define_method(rb_cPathname, "zero?", path_zero_p, 0);
-    rb_define_method(rb_cPathname, "empty?", path_empty_p, 0);
     rb_define_singleton_method(rb_cPathname, "glob", path_s_glob, -1);
     rb_define_singleton_method(rb_cPathname, "getwd", path_s_getwd, 0);
     rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0);
diff --git a/ext/psych/depend b/ext/psych/depend
index 7505e950bc..79b6c53f50 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -1,92 +1,3 @@
-# AUTOGENERATED DEPENDENCIES START
-psych.o: $(RUBY_EXTCONF_H)
-psych.o: $(arch_hdrdir)/ruby/config.h
-psych.o: $(hdrdir)/ruby/backward.h
-psych.o: $(hdrdir)/ruby/defines.h
-psych.o: $(hdrdir)/ruby/encoding.h
-psych.o: $(hdrdir)/ruby/intern.h
-psych.o: $(hdrdir)/ruby/missing.h
-psych.o: $(hdrdir)/ruby/oniguruma.h
-psych.o: $(hdrdir)/ruby/ruby.h
-psych.o: $(hdrdir)/ruby/st.h
-psych.o: $(hdrdir)/ruby/subst.h
-psych.o: $(top_srcdir)/include/ruby.h
-psych.o: psych.c
-psych.o: psych.h
-psych.o: psych_emitter.h
-psych.o: psych_parser.h
-psych.o: psych_to_ruby.h
-psych.o: psych_yaml_tree.h
-psych_emitter.o: $(RUBY_EXTCONF_H)
-psych_emitter.o: $(arch_hdrdir)/ruby/config.h
-psych_emitter.o: $(hdrdir)/ruby/backward.h
-psych_emitter.o: $(hdrdir)/ruby/defines.h
-psych_emitter.o: $(hdrdir)/ruby/encoding.h
-psych_emitter.o: $(hdrdir)/ruby/intern.h
-psych_emitter.o: $(hdrdir)/ruby/missing.h
-psych_emitter.o: $(hdrdir)/ruby/oniguruma.h
-psych_emitter.o: $(hdrdir)/ruby/ruby.h
-psych_emitter.o: $(hdrdir)/ruby/st.h
-psych_emitter.o: $(hdrdir)/ruby/subst.h
-psych_emitter.o: $(top_srcdir)/include/ruby.h
-psych_emitter.o: psych.h
-psych_emitter.o: psych_emitter.c
-psych_emitter.o: psych_emitter.h
-psych_emitter.o: psych_parser.h
-psych_emitter.o: psych_to_ruby.h
-psych_emitter.o: psych_yaml_tree.h
-psych_parser.o: $(RUBY_EXTCONF_H)
-psych_parser.o: $(arch_hdrdir)/ruby/config.h
-psych_parser.o: $(hdrdir)/ruby/backward.h
-psych_parser.o: $(hdrdir)/ruby/defines.h
-psych_parser.o: $(hdrdir)/ruby/encoding.h
-psych_parser.o: $(hdrdir)/ruby/intern.h
-psych_parser.o: $(hdrdir)/ruby/missing.h
-psych_parser.o: $(hdrdir)/ruby/oniguruma.h
-psych_parser.o: $(hdrdir)/ruby/ruby.h
-psych_parser.o: $(hdrdir)/ruby/st.h
-psych_parser.o: $(hdrdir)/ruby/subst.h
-psych_parser.o: $(top_srcdir)/include/ruby.h
-psych_parser.o: psych.h
-psych_parser.o: psych_emitter.h
-psych_parser.o: psych_parser.c
-psych_parser.o: psych_parser.h
-psych_parser.o: psych_to_ruby.h
-psych_parser.o: psych_yaml_tree.h
-psych_to_ruby.o: $(RUBY_EXTCONF_H)
-psych_to_ruby.o: $(arch_hdrdir)/ruby/config.h
-psych_to_ruby.o: $(hdrdir)/ruby/backward.h
-psych_to_ruby.o: $(hdrdir)/ruby/defines.h
-psych_to_ruby.o: $(hdrdir)/ruby/encoding.h
-psych_to_ruby.o: $(hdrdir)/ruby/intern.h
-psych_to_ruby.o: $(hdrdir)/ruby/missing.h
-psych_to_ruby.o: $(hdrdir)/ruby/oniguruma.h
-psych_to_ruby.o: $(hdrdir)/ruby/ruby.h
-psych_to_ruby.o: $(hdrdir)/ruby/st.h
-psych_to_ruby.o: $(hdrdir)/ruby/subst.h
-psych_to_ruby.o: $(top_srcdir)/include/ruby.h
-psych_to_ruby.o: psych.h
-psych_to_ruby.o: psych_emitter.h
-psych_to_ruby.o: psych_parser.h
-psych_to_ruby.o: psych_to_ruby.c
-psych_to_ruby.o: psych_to_ruby.h
-psych_to_ruby.o: psych_yaml_tree.h
-psych_yaml_tree.o: $(RUBY_EXTCONF_H)
-psych_yaml_tree.o: $(arch_hdrdir)/ruby/config.h
-psych_yaml_tree.o: $(hdrdir)/ruby/backward.h
-psych_yaml_tree.o: $(hdrdir)/ruby/defines.h
-psych_yaml_tree.o: $(hdrdir)/ruby/encoding.h
-psych_yaml_tree.o: $(hdrdir)/ruby/intern.h
-psych_yaml_tree.o: $(hdrdir)/ruby/missing.h
-psych_yaml_tree.o: $(hdrdir)/ruby/oniguruma.h
-psych_yaml_tree.o: $(hdrdir)/ruby/ruby.h
-psych_yaml_tree.o: $(hdrdir)/ruby/st.h
-psych_yaml_tree.o: $(hdrdir)/ruby/subst.h
-psych_yaml_tree.o: $(top_srcdir)/include/ruby.h
-psych_yaml_tree.o: psych.h
-psych_yaml_tree.o: psych_emitter.h
-psych_yaml_tree.o: psych_parser.h
-psych_yaml_tree.o: psych_to_ruby.h
-psych_yaml_tree.o: psych_yaml_tree.c
-psych_yaml_tree.o: psych_yaml_tree.h
-# AUTOGENERATED DEPENDENCIES END
+$(OBJS): $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index be33d35a5e..65e83a3554 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -1,5 +1,4 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
 require 'mkmf'
 require 'fileutils'
 
diff --git a/ext/psych/lib/psych.rb b/ext/psych/lib/psych.rb
index b117b25f45..40fcf610e2 100644
--- a/ext/psych/lib/psych.rb
+++ b/ext/psych/lib/psych.rb
@@ -1,12 +1,4 @@
-# frozen_string_literal: false
-require 'psych/versions'
-case RUBY_ENGINE
-when 'jruby'
-  require 'psych_jars'
-  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
-else
-  require 'psych.so'
-end
+require 'psych.so'
 require 'psych/nodes'
 require 'psych/streaming'
 require 'psych/visitors'
@@ -224,11 +216,12 @@ require 'psych/class_loader'
 #   # => "a"
 
 module Psych
+  # The version is Psych you're using
+  VERSION         = '2.0.6'
+
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
 
-  FALLBACK        = Struct.new :to_ruby # :nodoc:
-
   ###
   # Load +yaml+ in to a Ruby data structure.  If multiple documents are
   # provided, the object contained in the first document will be returned.
@@ -248,8 +241,8 @@ module Psych
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  def self.load yaml, filename = nil, fallback = false
-    result = parse(yaml, filename, fallback)
+  def self.load yaml, filename = nil
+    result = parse(yaml, filename)
     result ? result.to_ruby : result
   end
 
@@ -321,11 +314,11 @@ module Psych
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml, filename = nil, fallback = false
+  def self.parse yaml, filename = nil
     parse_stream(yaml, filename) do |node|
       return node
     end
-    fallback
+    false
   end
 
   ###
@@ -466,12 +459,9 @@ module Psych
 
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
-  # +filename+ as a Ruby object, or if the file is empty, it returns
-  # the specified default return value, which defaults to an empty Hash
-  def self.load_file filename, fallback = false
-    File.open(filename, 'r:bom|utf-8') { |f|
-      self.load f, filename, FALLBACK.new(fallback)
-    }
+  # +filename+ as a Ruby object
+  def self.load_file filename
+    File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
   end
 
   # :stopdoc:
diff --git a/ext/psych/lib/psych/class_loader.rb b/ext/psych/lib/psych/class_loader.rb
index ba756f7ea7..46c6b93627 100644
--- a/ext/psych/lib/psych/class_loader.rb
+++ b/ext/psych/lib/psych/class_loader.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/omap'
 require 'psych/set'
 
diff --git a/ext/psych/lib/psych/coder.rb b/ext/psych/lib/psych/coder.rb
index 26005f57b4..2b830d2b21 100644
--- a/ext/psych/lib/psych/coder.rb
+++ b/ext/psych/lib/psych/coder.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   ###
   # If an object defines +encode_with+, then an instance of Psych::Coder will
diff --git a/ext/psych/lib/psych/core_ext.rb b/ext/psych/lib/psych/core_ext.rb
index 1a98279afd..9c8134da7e 100644
--- a/ext/psych/lib/psych/core_ext.rb
+++ b/ext/psych/lib/psych/core_ext.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 class Object
   def self.yaml_tag url
     Psych.add_tag(url, self)
diff --git a/ext/psych/lib/psych/deprecated.rb b/ext/psych/lib/psych/deprecated.rb
index 165d2102b4..8c310b3207 100644
--- a/ext/psych/lib/psych/deprecated.rb
+++ b/ext/psych/lib/psych/deprecated.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'date'
 
 module Psych
diff --git a/ext/psych/lib/psych/exception.rb b/ext/psych/lib/psych/exception.rb
index 83c3d7fa82..ce9d2caf3f 100644
--- a/ext/psych/lib/psych/exception.rb
+++ b/ext/psych/lib/psych/exception.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   class Exception < RuntimeError
   end
diff --git a/ext/psych/lib/psych/handler.rb b/ext/psych/lib/psych/handler.rb
index 1ab5f73e95..c55afe745f 100644
--- a/ext/psych/lib/psych/handler.rb
+++ b/ext/psych/lib/psych/handler.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   ###
   # Psych::Handler is an abstract base class that defines the events used
diff --git a/ext/psych/lib/psych/handlers/document_stream.rb b/ext/psych/lib/psych/handlers/document_stream.rb
index c43b39ebc5..e429993c1c 100644
--- a/ext/psych/lib/psych/handlers/document_stream.rb
+++ b/ext/psych/lib/psych/handlers/document_stream.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/tree_builder'
 
 module Psych
diff --git a/ext/psych/lib/psych/handlers/recorder.rb b/ext/psych/lib/psych/handlers/recorder.rb
index 341b81dec4..4eae62e5f9 100644
--- a/ext/psych/lib/psych/handlers/recorder.rb
+++ b/ext/psych/lib/psych/handlers/recorder.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/handler'
 
 module Psych
diff --git a/ext/psych/lib/psych/json/ruby_events.rb b/ext/psych/lib/psych/json/ruby_events.rb
index 478eb667c7..6b73249c06 100644
--- a/ext/psych/lib/psych/json/ruby_events.rb
+++ b/ext/psych/lib/psych/json/ruby_events.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module JSON
     module RubyEvents # :nodoc:
diff --git a/ext/psych/lib/psych/json/stream.rb b/ext/psych/lib/psych/json/stream.rb
index 83b7e13655..fe2a6e9116 100644
--- a/ext/psych/lib/psych/json/stream.rb
+++ b/ext/psych/lib/psych/json/stream.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/json/ruby_events'
 require 'psych/json/yaml_events'
 
diff --git a/ext/psych/lib/psych/json/tree_builder.rb b/ext/psych/lib/psych/json/tree_builder.rb
index 2f94b8c252..b799c93f58 100644
--- a/ext/psych/lib/psych/json/tree_builder.rb
+++ b/ext/psych/lib/psych/json/tree_builder.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/json/yaml_events'
 
 module Psych
diff --git a/ext/psych/lib/psych/json/yaml_events.rb b/ext/psych/lib/psych/json/yaml_events.rb
index 07f64737c5..d054d9b458 100644
--- a/ext/psych/lib/psych/json/yaml_events.rb
+++ b/ext/psych/lib/psych/json/yaml_events.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module JSON
     module YAMLEvents # :nodoc:
diff --git a/ext/psych/lib/psych/nodes.rb b/ext/psych/lib/psych/nodes.rb
index 01573b509b..f3b33fe975 100644
--- a/ext/psych/lib/psych/nodes.rb
+++ b/ext/psych/lib/psych/nodes.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/nodes/node'
 require 'psych/nodes/stream'
 require 'psych/nodes/document'
diff --git a/ext/psych/lib/psych/nodes/alias.rb b/ext/psych/lib/psych/nodes/alias.rb
index 716a00d62f..5bd4df13d1 100644
--- a/ext/psych/lib/psych/nodes/alias.rb
+++ b/ext/psych/lib/psych/nodes/alias.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Nodes
     ###
diff --git a/ext/psych/lib/psych/nodes/document.rb b/ext/psych/lib/psych/nodes/document.rb
index 7234fef1d8..32014d60dc 100644
--- a/ext/psych/lib/psych/nodes/document.rb
+++ b/ext/psych/lib/psych/nodes/document.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Nodes
     ###
diff --git a/ext/psych/lib/psych/nodes/mapping.rb b/ext/psych/lib/psych/nodes/mapping.rb
index 4c11df8cd6..5ba95ce4b6 100644
--- a/ext/psych/lib/psych/nodes/mapping.rb
+++ b/ext/psych/lib/psych/nodes/mapping.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Nodes
     ###
diff --git a/ext/psych/lib/psych/nodes/node.rb b/ext/psych/lib/psych/nodes/node.rb
index e3621dc451..83233a61fd 100644
--- a/ext/psych/lib/psych/nodes/node.rb
+++ b/ext/psych/lib/psych/nodes/node.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'stringio'
 require 'psych/class_loader'
 require 'psych/scalar_scanner'
diff --git a/ext/psych/lib/psych/nodes/scalar.rb b/ext/psych/lib/psych/nodes/scalar.rb
index ee5570518e..1b1b25b98a 100644
--- a/ext/psych/lib/psych/nodes/scalar.rb
+++ b/ext/psych/lib/psych/nodes/scalar.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Nodes
     ###
diff --git a/ext/psych/lib/psych/nodes/sequence.rb b/ext/psych/lib/psych/nodes/sequence.rb
index 1096469567..7e907fe2c8 100644
--- a/ext/psych/lib/psych/nodes/sequence.rb
+++ b/ext/psych/lib/psych/nodes/sequence.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Nodes
     ###
diff --git a/ext/psych/lib/psych/nodes/stream.rb b/ext/psych/lib/psych/nodes/stream.rb
index 559b0846e7..7cf5e033ec 100644
--- a/ext/psych/lib/psych/nodes/stream.rb
+++ b/ext/psych/lib/psych/nodes/stream.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Nodes
     ###
diff --git a/ext/psych/lib/psych/omap.rb b/ext/psych/lib/psych/omap.rb
index 233b945c4a..6286270616 100644
--- a/ext/psych/lib/psych/omap.rb
+++ b/ext/psych/lib/psych/omap.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   class Omap < ::Hash
   end
diff --git a/ext/psych/lib/psych/parser.rb b/ext/psych/lib/psych/parser.rb
index 242512f89f..84085f1fb0 100644
--- a/ext/psych/lib/psych/parser.rb
+++ b/ext/psych/lib/psych/parser.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   ###
   # YAML event parser class.  This class parses a YAML document and calls
diff --git a/ext/psych/lib/psych/scalar_scanner.rb b/ext/psych/lib/psych/scalar_scanner.rb
index a849359d18..93007902a7 100644
--- a/ext/psych/lib/psych/scalar_scanner.rb
+++ b/ext/psych/lib/psych/scalar_scanner.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'strscan'
 
 module Psych
@@ -100,7 +99,7 @@ module Psych
           @string_cache[string] = true
           string
         else
-          Float(string.gsub(/[,_]|\.([Ee]|$)/, '\1'))
+          Float(string.gsub(/[,_]|\.$/, ''))
         end
       else
         int = parse_int string.gsub(/[,_]/, '')
diff --git a/ext/psych/lib/psych/set.rb b/ext/psych/lib/psych/set.rb
index f35be15e6f..6793a8ed1b 100644
--- a/ext/psych/lib/psych/set.rb
+++ b/ext/psych/lib/psych/set.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   class Set < ::Hash
   end
diff --git a/ext/psych/lib/psych/stream.rb b/ext/psych/lib/psych/stream.rb
index 2f63d7d552..88c4c4cb4e 100644
--- a/ext/psych/lib/psych/stream.rb
+++ b/ext/psych/lib/psych/stream.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   ###
   # Psych::Stream is a streaming YAML emitter.  It will not buffer your YAML,
diff --git a/ext/psych/lib/psych/streaming.rb b/ext/psych/lib/psych/streaming.rb
index 260f8a8008..9d94eb549f 100644
--- a/ext/psych/lib/psych/streaming.rb
+++ b/ext/psych/lib/psych/streaming.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Streaming
     module ClassMethods
diff --git a/ext/psych/lib/psych/syntax_error.rb b/ext/psych/lib/psych/syntax_error.rb
index db293b9fb2..e200ef0060 100644
--- a/ext/psych/lib/psych/syntax_error.rb
+++ b/ext/psych/lib/psych/syntax_error.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/exception'
 
 module Psych
diff --git a/ext/psych/lib/psych/tree_builder.rb b/ext/psych/lib/psych/tree_builder.rb
index d359c933af..c8f344787c 100644
--- a/ext/psych/lib/psych/tree_builder.rb
+++ b/ext/psych/lib/psych/tree_builder.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/handler'
 
 module Psych
diff --git a/ext/psych/lib/psych/versions.rb b/ext/psych/lib/psych/versions.rb
deleted file mode 100644
index 455a0142cf..0000000000
--- a/ext/psych/lib/psych/versions.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: false
-module Psych
-  # The version is Psych you're using
-  VERSION = '2.2.2'
-
-  if RUBY_ENGINE == 'jruby'
-    DEFAULT_SNAKEYAML_VERSION = '1.17'.freeze
-  end
-end
diff --git a/ext/psych/lib/psych/visitors.rb b/ext/psych/lib/psych/visitors.rb
index 5dee4ebd7a..cc98b103f1 100644
--- a/ext/psych/lib/psych/visitors.rb
+++ b/ext/psych/lib/psych/visitors.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/visitors/visitor'
 require 'psych/visitors/to_ruby'
 require 'psych/visitors/emitter'
diff --git a/ext/psych/lib/psych/visitors/depth_first.rb b/ext/psych/lib/psych/visitors/depth_first.rb
index 2d74a212d6..c6eb814ac0 100644
--- a/ext/psych/lib/psych/visitors/depth_first.rb
+++ b/ext/psych/lib/psych/visitors/depth_first.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Visitors
     class DepthFirst < Psych::Visitors::Visitor
diff --git a/ext/psych/lib/psych/visitors/emitter.rb b/ext/psych/lib/psych/visitors/emitter.rb
index f2ff9fdb28..c886e5092e 100644
--- a/ext/psych/lib/psych/visitors/emitter.rb
+++ b/ext/psych/lib/psych/visitors/emitter.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Visitors
     class Emitter < Psych::Visitors::Visitor
diff --git a/ext/psych/lib/psych/visitors/json_tree.rb b/ext/psych/lib/psych/visitors/json_tree.rb
index f2f0215cd2..0127ac8aa8 100644
--- a/ext/psych/lib/psych/visitors/json_tree.rb
+++ b/ext/psych/lib/psych/visitors/json_tree.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/json/ruby_events'
 
 module Psych
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index fd1c8e6caf..e74d5d4bc5 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
 require 'psych/exception'
@@ -33,7 +32,7 @@ module Psych
         return result if @domain_types.empty? || !target.tag
 
         key = target.tag.sub(/^[!\/]*/, '').sub(/(,\d+)\//, '\1:')
-        key = "tag:#{key}" unless key =~ /^(?:tag:|x-private)/
+        key = "tag:#{key}" unless key =~ /^(tag:|x-private)/
 
         if @domain_types.key? key
           value, block = @domain_types[key]
@@ -62,7 +61,7 @@ module Psych
         case o.tag
         when '!binary', 'tag:yaml.org,2002:binary'
           o.value.unpack('m').first
-        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
+        when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
           klass = resolve_class($1)
           if klass
             klass.allocate.replace o.value
@@ -70,11 +69,11 @@ module Psych
             o.value
           end
         when '!ruby/object:BigDecimal'
-          require 'bigdecimal' unless defined? BigDecimal
+          require 'bigdecimal'
           class_loader.big_decimal._load o.value
         when "!ruby/object:DateTime"
           class_loader.date_time
-          require 'date' unless defined? DateTime
+          require 'date'
           @ss.parse_time(o.value).to_datetime
         when '!ruby/encoding'
           ::Encoding.find o.value
@@ -90,7 +89,7 @@ module Psych
           Float(@ss.tokenize(o.value))
         when "!ruby/regexp"
           klass = class_loader.regexp
-          o.value =~ /^\/(.*)\/([mixn]*)$/m
+          o.value =~ /^\/(.*)\/([mixn]*)$/
           source  = $1
           options = 0
           lang    = nil
@@ -209,7 +208,7 @@ module Psych
             obj
           end
 
-        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
+        when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
           klass   = resolve_class($1)
           members = {}
           string  = nil
@@ -262,23 +261,8 @@ module Psych
           end
           set
 
-        when /^!ruby\/hash-with-ivars(?::(.*))?$/
-          hash = $1 ? resolve_class($1).allocate : {}
-          register o, hash
-          o.children.each_slice(2) do |key, value|
-            case key.value
-            when 'elements'
-              revive_hash hash, value
-            when 'ivars'
-              value.children.each_slice(2) do |k,v|
-                hash.instance_variable_set accept(k), accept(v)
-              end
-            end
-          end
-          hash
-
         when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
-          revive_hash register(o, resolve_class($1).allocate), o
+          revive_hash register(o, resolve_class($1).new), o
 
         when '!omap', 'tag:yaml.org,2002:omap'
           map = register(o, class_loader.psych_omap.new)
@@ -287,21 +271,6 @@ module Psych
           end
           map
 
-        when /^!ruby\/marshalable:(.*)$/
-          name = $1
-          klass = resolve_class(name)
-          obj = register(o, klass.allocate)
-
-          if obj.respond_to?(:init_with)
-            init_with(obj, revive_hash({}, o), o)
-          elsif obj.respond_to?(:marshal_load)
-            marshal_data = o.children.map(&method(:accept))
-            obj.marshal_load(marshal_data)
-            obj
-          else
-            raise ArgumentError, "Cannot deserialize #{name}"
-          end
-
         else
           revive_hash(register(o, {}), o)
         end
@@ -331,13 +300,12 @@ module Psych
         list
       end
 
-      SHOVEL = '<<'
       def revive_hash hash, o
         o.children.each_slice(2) { |k,v|
           key = accept(k)
           val = accept(v)
 
-          if key == SHOVEL && k.tag != "tag:yaml.org,2002:str"
+          if key == '<<' && k.tag != "tag:yaml.org,2002:str"
             case v
             when Nodes::Alias, Nodes::Mapping
               begin
diff --git a/ext/psych/lib/psych/visitors/visitor.rb b/ext/psych/lib/psych/visitors/visitor.rb
index d97bf550f6..4d7772f428 100644
--- a/ext/psych/lib/psych/visitors/visitor.rb
+++ b/ext/psych/lib/psych/visitors/visitor.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Psych
   module Visitors
     class Visitor
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 11214ecbf4..3f2427b8d0 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'psych/tree_builder'
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
@@ -22,15 +21,12 @@ module Psych
         end
 
         def register target, node
-          return unless target.respond_to? :object_id
           @targets << target
           @obj_to_node[target.object_id] = node
         end
 
         def key? target
           @obj_to_node.key? target.object_id
-        rescue NoMethodError
-          false
         end
 
         def id_for target
@@ -64,22 +60,13 @@ module Psych
 
       def initialize emitter, ss, options
         super()
-        @started    = false
-        @finished   = false
-        @emitter    = emitter
-        @st         = Registrar.new
-        @ss         = ss
-        @options    = options
-        @line_width = options[:line_width]
-        if @line_width && @line_width < 0
-          if @line_width == -1
-            # Treat -1 as unlimited line-width, same as libyaml does.
-            @line_width = nil
-          else
-            fail(ArgumentError, "Invalid line_width #{@line_width}, must be non-negative or -1 for unlimited.")
-          end
-        end
-        @coders     = []
+        @started  = false
+        @finished = false
+        @emitter  = emitter
+        @st       = Registrar.new
+        @ss       = ss
+        @options  = options
+        @coders   = []
 
         @dispatch_cache = Hash.new do |h,klass|
           method = "visit_#{(klass.name || '').split('::').join('_')}"
@@ -165,7 +152,7 @@ module Psych
       end
 
       def visit_Psych_Omap o
-        seq = @emitter.start_sequence(nil, 'tag:yaml.org,2002:omap', false, Nodes::Sequence::BLOCK)
+        seq = @emitter.start_sequence(nil, '!omap', false, Nodes::Sequence::BLOCK)
         register(o, seq)
 
         o.each { |k,v| visit_Hash k => v }
@@ -312,46 +299,46 @@ module Psych
         quote = true
         style = Nodes::Scalar::PLAIN
         tag   = nil
+        str   = o
 
         if binary?(o)
-          o     = [o].pack('m0')
+          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
           plain = false
           quote = false
-        elsif o =~ /\n(?!\Z)/  # match \n except blank line at the end of string
+        elsif o =~ /\n/
           style = Nodes::Scalar::LITERAL
         elsif o == '<<'
           style = Nodes::Scalar::SINGLE_QUOTED
           tag   = 'tag:yaml.org,2002:str'
           plain = false
           quote = false
-        elsif @line_width && o.length > @line_width
-          style = Nodes::Scalar::FOLDED
-        elsif o =~ /^[^[:word:]][^"]*$/
+        elsif o =~ /^\W[^"]*$/
           style = Nodes::Scalar::DOUBLE_QUOTED
-        elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o
-          style = Nodes::Scalar::SINGLE_QUOTED
+        else
+          unless String === @ss.tokenize(o)
+            style = Nodes::Scalar::SINGLE_QUOTED
+          end
         end
 
-        is_primitive = o.class == ::String
-        ivars = find_ivars o, is_primitive
+        ivars = find_ivars o
 
         if ivars.empty?
-          unless is_primitive
+          unless o.class == ::String
             tag = "!ruby/string:#{o.class}"
             plain = false
             quote = false
           end
-          @emitter.scalar o, nil, tag, plain, quote, style
+          @emitter.scalar str, nil, tag, plain, quote, style
         else
           maptag = '!ruby/string'
           maptag << ":#{o.class}" unless o.class == ::String
 
           register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
           @emitter.scalar 'str', nil, nil, true, false, Nodes::Scalar::ANY
-          @emitter.scalar o, nil, tag, plain, quote, style
+          @emitter.scalar str, nil, tag, plain, quote, style
 
           dump_ivars o
 
@@ -378,16 +365,17 @@ module Psych
       end
 
       def visit_Hash o
-        if o.class == ::Hash
-          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
-        else
-          visit_hash_subclass o
+        tag      = o.class == ::Hash ? nil : "!ruby/hash:#{o.class}"
+        implicit = !tag
+
+        register(o, @emitter.start_mapping(nil, tag, implicit, Psych::Nodes::Mapping::BLOCK))
+
+        o.each do |k,v|
+          accept k
+          accept v
         end
+
+        @emitter.end_mapping
       end
 
       def visit_Psych_Set o
@@ -423,18 +411,6 @@ module Psych
         end
       end
 
-      def visit_BasicObject o
-        tag = Psych.dump_tags[o.class]
-        tag ||= "!ruby/marshalable:#{o.class.name}"
-
-        map = @emitter.start_mapping(nil, tag, false, Nodes::Mapping::BLOCK)
-        register(o, map)
-
-        o.marshal_dump.each(&method(:accept))
-
-        @emitter.end_mapping
-      end
-
       private
       # FIXME: Remove the index and count checks in Psych 3.0
       NULL         = "\x00"
@@ -449,8 +425,7 @@ module Psych
 
       def visit_array_subclass o
         tag = "!ruby/array:#{o.class}"
-        ivars = o.instance_variables
-        if ivars.empty?
+        if o.instance_variables.empty?
           node = @emitter.start_sequence(nil, tag, false, Nodes::Sequence::BLOCK)
           register o, node
           o.each { |c| accept c }
@@ -468,7 +443,7 @@ module Psych
           # Dump the ivars
           accept 'ivars'
           @emitter.start_mapping(nil, nil, true, Nodes::Sequence::BLOCK)
-          ivars.each do |ivar|
+          o.instance_variables.each do |ivar|
             accept ivar
             accept o.instance_variable_get ivar
           end
@@ -478,57 +453,35 @@ module Psych
         end
       end
 
-      def visit_hash_subclass o
-        ivars = o.instance_variables
-        if ivars.any?
-          tag = "!ruby/hash-with-ivars:#{o.class}"
-          node = @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK)
-          register(o, node)
+      def dump_list o
+      end
 
-          # Dump the elements
-          accept 'elements'
-          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
-          o.each do |k,v|
-            accept k
-            accept v
-          end
-          @emitter.end_mapping
+      # '%:z' was no defined until 1.9.3
+      if RUBY_VERSION < '1.9.3'
+        def format_time time
+          formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
 
-          # Dump the ivars
-          accept 'ivars'
-          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
-          o.instance_variables.each do |ivar|
-            accept ivar
-            accept o.instance_variable_get ivar
+          if time.utc?
+            formatted += " Z"
+          else
+            zone = time.strftime('%z')
+            formatted += " #{zone[0,3]}:#{zone[3,5]}"
           end
-          @emitter.end_mapping
 
-          @emitter.end_mapping
-        else
-          tag = "!ruby/hash:#{o.class}"
-          node = @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK)
-          register(o, node)
-          o.each do |k,v|
-            accept k
-            accept v
-          end
-          @emitter.end_mapping
+          formatted
         end
-      end
-
-      def dump_list o
-      end
-
-      def format_time time
-        if time.utc?
-          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
-        else
-          time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+      else
+        def format_time time
+          if time.utc?
+            time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
+          else
+            time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+          end
         end
       end
 
       # FIXME: remove this method once "to_yaml_properties" is removed
-      def find_ivars target, is_primitive=false
+      def find_ivars target
         begin
           loc = target.method(:to_yaml_properties).source_location.first
           unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb')
@@ -542,7 +495,7 @@ module Psych
           # and it's OK to skip it since it's only to emit a warning.
         end
 
-        is_primitive ? [] : target.instance_variables
+        target.instance_variables
       end
 
       def register target, yaml_obj
@@ -560,10 +513,10 @@ module Psych
 
         c = Psych::Coder.new(tag)
         o.encode_with(c)
-        emit_coder c, o
+        emit_coder c
       end
 
-      def emit_coder c, o
+      def emit_coder c
         case c.type
         when :scalar
           @emitter.scalar c.scalar, nil, c.tag, c.tag.nil?, false, Nodes::Scalar::ANY
@@ -574,7 +527,7 @@ module Psych
           end
           @emitter.end_sequence
         when :map
-          register o, @emitter.start_mapping(nil, c.tag, c.implicit, c.style)
+          @emitter.start_mapping nil, c.tag, c.implicit, c.style
           c.map.each do |k,v|
             accept k
             accept v
diff --git a/ext/psych/lib/psych/y.rb b/ext/psych/lib/psych/y.rb
index 82e05a783c..d0e049d4e5 100644
--- a/ext/psych/lib/psych/y.rb
+++ b/ext/psych/lib/psych/y.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 module Kernel
   ###
   # An alias for Psych.dump_stream meant to be used with IRB.
diff --git a/ext/psych/psych.c b/ext/psych/psych.c
index 3bb59bfc11..69ff1d8dfc 100644
--- a/ext/psych/psych.c
+++ b/ext/psych/psych.c
@@ -20,7 +20,7 @@ static VALUE libyaml_version(VALUE module)
 
 VALUE mPsych;
 
-void Init_psych(void)
+void Init_psych()
 {
     mPsych = rb_define_module("Psych");
 
diff --git a/ext/psych/psych.gemspec b/ext/psych/psych.gemspec
index 9597e9866b..de83d6b3d2 100644
--- a/ext/psych/psych.gemspec
+++ b/ext/psych/psych.gemspec
@@ -1,43 +1,23 @@
 # -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require 'psych'
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = Psych::VERSION
-  s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
-  s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
-  s.date = "2016-11-14"
-  s.summary = "Psych is a YAML parser and emitter"
-  s.description = <<-DESCRIPTION
-Psych is a YAML parser and emitter. Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
-for its 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.
-DESCRIPTION
-  s.homepage = "https://github.com/ruby/psych"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-
-  # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.files = [".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/psych/.gitignore", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h", "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h", "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h", "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c", "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c", "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h", "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/deprecated.rb", "lib/psych/exception.rb", "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb", "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb", "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb", "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb", "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb", "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb", "lib/psych/tree_builder.rb", "lib/psych/versions.rb", "lib/psych/visitors.rb","lib/psych/visitors/depth_first.rb", "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb", "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "psych.gemspec"]
-
-  s.rdoc_options = ["--main", "README.md"]
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md"]
+  s.version = "2.0.6"
 
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Aaron Patterson"]
+  s.date = "2014-09-14"
+  s.description = "Psych is a YAML parser and emitter.  Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]\nfor its YAML parsing and emitting capabilities.  In addition to wrapping\nlibyaml, Psych also knows how to serialize and de-serialize most Ruby objects\nto and from the YAML format."
+  s.email = ["aaron@tenderlovemaking.com"]
+  s.extensions = ["ext/psych/extconf.rb"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
+  s.files = [".autotest", ".travis.yml", "CHANGELOG.rdoc", "Manifest.txt", "README.rdoc", "Rakefile", "ext/psych/depend", "ext/psych/extconf.rb", "ext/psych/psych.c", "ext/psych/psych.h", "ext/psych/psych_emitter.c", "ext/psych/psych_emitter.h", "ext/psych/psych_parser.c", "ext/psych/psych_parser.h", "ext/psych/psych_to_ruby.c", "ext/psych/psych_to_ruby.h", "ext/psych/psych_yaml_tree.c", "ext/psych/psych_yaml_tree.h", "ext/psych/yaml/LICENSE", "ext/psych/yaml/api.c", "ext/psych/yaml/config.h", "ext/psych/yaml/dumper.c", "ext/psych/yaml/emitter.c", "ext/psych/yaml/loader.c", "ext/psych/yaml/parser.c", "ext/psych/yaml/reader.c", "ext/psych/yaml/scanner.c", "ext/psych/yaml/writer.c", "ext/psych/yaml/yaml.h", "ext/psych/yaml/yaml_private.h", "lib/psych.rb", "lib/psych/class_loader.rb", "lib/psych/coder.rb", "lib/psych/core_ext.rb", "lib/psych/deprecated.rb", "lib/psych/exception.rb", "lib/psych/handler.rb", "lib/psych/handlers/document_stream.rb", "lib/psych/handlers/recorder.rb", "lib/psych/json/ruby_events.rb", "lib/psych/json/stream.rb", "lib/psych/json/tree_builder.rb", "lib/psych/json/yaml_events.rb", "lib/psych/nodes.rb", "lib/psych/nodes/alias.rb", "lib/psych/nodes/document.rb", "lib/psych/nodes/mapping.rb", "lib/psych/nodes/node.rb", "lib/psych/nodes/scalar.rb", "lib/psych/nodes/sequence.rb", "lib/psych/nodes/stream.rb", "lib/psych/omap.rb", "lib/psych/parser.rb", "lib/psych/scalar_scanner.rb", "lib/psych/set.rb", "lib/psych/stream.rb", "lib/psych/streaming.rb", "lib/psych/syntax_error.rb", "lib/psych/tree_builder.rb", "lib/psych/visitors.rb", "lib/psych/visitors/depth_first.rb", "lib/psych/visitors/emitter.rb", "lib/psych/visitors/json_tree.rb", "lib/psych/visitors/to_ruby.rb", "lib/psych/visitors/visitor.rb", "lib/psych/visitors/yaml_tree.rb", "lib/psych/y.rb", "test/psych/handlers/test_recorder.rb", "test/psych/helper.rb", "test/psych/json/test_stream.rb", "test/psych/nodes/test_enumerable.rb", "test/psych/test_alias_and_anchor.rb", "test/psych/test_array.rb", "test/psych/test_boolean.rb", "test/psych/test_class.rb", "test/psych/test_coder.rb", "test/psych/test_date_time.rb", "test/psych/test_deprecated.rb", "test/psych/test_document.rb", "test/psych/test_emitter.rb", "test/psych/test_encoding.rb", "test/psych/test_exception.rb", "test/psych/test_hash.rb", "test/psych/test_json_tree.rb", "test/psych/test_merge_keys.rb", "test/psych/test_nil.rb", "test/psych/test_null.rb", "test/psych/test_numeric.rb", "test/psych/test_object.rb", "test/psych/test_object_references.rb", "test/psych/test_omap.rb", "test/psych/test_parser.rb", "test/psych/test_psych.rb", "test/psych/test_safe_load.rb", "test/psych/test_scalar.rb", "test/psych/test_scalar_scanner.rb", "test/psych/test_serialize_subclasses.rb", "test/psych/test_set.rb", "test/psych/test_stream.rb", "test/psych/test_string.rb", "test/psych/test_struct.rb", "test/psych/test_symbol.rb", "test/psych/test_tainted.rb", "test/psych/test_to_yaml_properties.rb", "test/psych/test_tree_builder.rb", "test/psych/test_yaml.rb", "test/psych/test_yamldbm.rb", "test/psych/test_yamlstore.rb", "test/psych/visitors/test_depth_first.rb", "test/psych/visitors/test_emitter.rb", "test/psych/visitors/test_to_ruby.rb", "test/psych/visitors/test_yaml_tree.rb"]
+  s.homepage = "http://github.com/tenderlove/psych"
+  s.licenses = ["MIT"]
+  s.rdoc_options = ["--main", "README.rdoc"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
-  s.rubygems_version = "2.5.1"
-  s.required_rubygems_version = Gem::Requirement.new(">= 0")
-
-  s.add_development_dependency 'rake-compiler', ">= 0.4.1"
-  s.add_development_dependency 'minitest', "~> 5.0"
-
-  if RUBY_ENGINE == 'jruby'
-    s.platform = 'java'
-    s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"]
-    s.requirements = "jar org.yaml:snakeyaml, 1.17"
-    s.add_dependency 'jar-dependencies', '>= 0.1.7'
-    s.add_development_dependency 'ruby-maven'
-  else
-    s.extensions = ["ext/psych/extconf.rb"]
-  end
+  s.rubygems_version = "2.2.2"
+  s.summary = "Psych is a YAML parser and emitter"
+  s.test_files = ["test/psych/handlers/test_recorder.rb", "test/psych/json/test_stream.rb", "test/psych/nodes/test_enumerable.rb", "test/psych/test_alias_and_anchor.rb", "test/psych/test_array.rb", "test/psych/test_boolean.rb", "test/psych/test_class.rb", "test/psych/test_coder.rb", "test/psych/test_date_time.rb", "test/psych/test_deprecated.rb", "test/psych/test_document.rb", "test/psych/test_emitter.rb", "test/psych/test_encoding.rb", "test/psych/test_exception.rb", "test/psych/test_hash.rb", "test/psych/test_json_tree.rb", "test/psych/test_merge_keys.rb", "test/psych/test_nil.rb", "test/psych/test_null.rb", "test/psych/test_numeric.rb", "test/psych/test_object.rb", "test/psych/test_object_references.rb", "test/psych/test_omap.rb", "test/psych/test_parser.rb", "test/psych/test_psych.rb", "test/psych/test_safe_load.rb", "test/psych/test_scalar.rb", "test/psych/test_scalar_scanner.rb", "test/psych/test_serialize_subclasses.rb", "test/psych/test_set.rb", "test/psych/test_stream.rb", "test/psych/test_string.rb", "test/psych/test_struct.rb", "test/psych/test_symbol.rb", "test/psych/test_tainted.rb", "test/psych/test_to_yaml_properties.rb", "test/psych/test_tree_builder.rb", "test/psych/test_yaml.rb", "test/psych/test_yamldbm.rb", "test/psych/test_yamlstore.rb", "test/psych/visitors/test_depth_first.rb", "test/psych/visitors/test_emitter.rb", "test/psych/visitors/test_to_ruby.rb", "test/psych/visitors/test_yaml_tree.rb"]
 end
diff --git a/ext/psych/psych.h b/ext/psych/psych.h
index 6b3d63f246..1830ca4b19 100644
--- a/ext/psych/psych.h
+++ b/ext/psych/psych.h
@@ -2,7 +2,10 @@
 #define PSYCH_H
 
 #include <ruby.h>
+
+#ifdef HAVE_RUBY_ENCODING_H
 #include <ruby/encoding.h>
+#endif
 
 #include <yaml.h>
 
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
index 2154470781..f0d032649c 100644
--- a/ext/psych/psych_emitter.c
+++ b/ext/psych/psych_emitter.c
@@ -1,14 +1,6 @@
 #include <psych.h>
 
-#if !defined(RARRAY_CONST_PTR)
-#define RARRAY_CONST_PTR(s) (const VALUE *)RARRAY_PTR(s)
-#endif
-#if !defined(RARRAY_AREF)
-#define RARRAY_AREF(a, i) RARRAY_CONST_PTR(a)[i]
-#endif
-
 VALUE cPsychEmitter;
-static ID id_io;
 static ID id_write;
 static ID id_line_width;
 static ID id_indentation;
@@ -22,8 +14,8 @@ static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 
 static int writer(void *ctx, unsigned char *buffer, size_t size)
 {
-    VALUE self = (VALUE)ctx, io = rb_attr_get(self, id_io);
-    VALUE str = rb_enc_str_new((const char *)buffer, (long)size, rb_utf8_encoding());
+    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);
 }
@@ -37,34 +29,17 @@ static void dealloc(void * ptr)
     xfree(emitter);
 }
 
-#if 0
-static size_t memsize(const void *ptr)
-{
-    const yaml_emitter_t *emitter = ptr;
-    /* TODO: calculate emitter's size */
-    return 0;
-}
-#endif
-
-static const rb_data_type_t psych_emitter_type = {
-    "Psych/emitter",
-    {0, dealloc, 0,},
-    0, 0,
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-
 static VALUE allocate(VALUE klass)
 {
     yaml_emitter_t * emitter;
-    VALUE obj = TypedData_Make_Struct(klass, yaml_emitter_t, &psych_emitter_type, emitter);
+
+    emitter = xmalloc(sizeof(yaml_emitter_t));
 
     yaml_emitter_initialize(emitter);
     yaml_emitter_set_unicode(emitter, 1);
     yaml_emitter_set_indent(emitter, 2);
 
-    return obj;
+    return Data_Wrap_Struct(klass, 0, dealloc, emitter);
 }
 
 /* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
@@ -79,7 +54,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     VALUE indent;
     VALUE canonical;
 
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
 	line_width = rb_funcall(options, id_line_width, 0);
@@ -91,8 +66,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
 	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
     }
 
-    rb_ivar_set(self, id_io, io);
-    yaml_emitter_set_output(emitter, writer, (void *)self);
+    yaml_emitter_set_output(emitter, writer, (void *)io);
 
     return self;
 }
@@ -107,7 +81,7 @@ static VALUE start_stream(VALUE self, VALUE encoding)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
     Check_Type(encoding, T_FIXNUM);
 
     yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
@@ -127,7 +101,7 @@ static VALUE end_stream(VALUE self)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_stream_end_event_initialize(&event);
 
@@ -150,7 +124,7 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
     yaml_tag_directive_t * tail = NULL;
     yaml_event_t event;
     yaml_version_directive_t version_directive;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
 
     Check_Type(version, T_ARRAY);
@@ -164,18 +138,18 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
     }
 
     if(RTEST(tags)) {
-	long i = 0;
-	long len;
+	int i = 0;
+#ifdef HAVE_RUBY_ENCODING_H
 	rb_encoding * encoding = rb_utf8_encoding();
+#endif
 
 	Check_Type(tags, T_ARRAY);
 
-	len = RARRAY_LEN(tags);
-	head  = xcalloc((size_t)len, sizeof(yaml_tag_directive_t));
+	head  = xcalloc((size_t)RARRAY_LEN(tags), sizeof(yaml_tag_directive_t));
 	tail  = head;
 
-	for(i = 0; i < len && i < RARRAY_LEN(tags); i++) {
-	    VALUE tuple = RARRAY_AREF(tags, i);
+	for(i = 0; i < RARRAY_LEN(tags); i++) {
+	    VALUE tuple = RARRAY_PTR(tags)[i];
 	    VALUE name;
 	    VALUE value;
 
@@ -185,15 +159,15 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
 		xfree(head);
 		rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
 	    }
-	    name  = RARRAY_AREF(tuple, 0);
-	    value = RARRAY_AREF(tuple, 1);
-	    StringValue(name);
-	    StringValue(value);
+	    name  = RARRAY_PTR(tuple)[0];
+	    value = RARRAY_PTR(tuple)[1];
+#ifdef HAVE_RUBY_ENCODING_H
 	    name = rb_str_export_to_enc(name, encoding);
 	    value = rb_str_export_to_enc(value, encoding);
+#endif
 
-	    tail->handle = (yaml_char_t *)RSTRING_PTR(name);
-	    tail->prefix = (yaml_char_t *)RSTRING_PTR(value);
+	    tail->handle = (yaml_char_t *)StringValuePtr(name);
+	    tail->prefix = (yaml_char_t *)StringValuePtr(value);
 
 	    tail++;
 	}
@@ -224,7 +198,7 @@ static VALUE end_document(VALUE self, VALUE imp)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_document_end_event_initialize(&event, imp ? 1 : 0);
 
@@ -251,11 +225,14 @@ static VALUE scalar(
 	) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
+#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+#endif
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     Check_Type(value, T_STRING);
 
+#ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
 
     value = rb_str_export_to_enc(value, encoding);
@@ -269,6 +246,7 @@ static VALUE scalar(
 	Check_Type(tag, T_STRING);
 	tag = rb_str_export_to_enc(tag, encoding);
     }
+#endif
 
     yaml_scalar_event_initialize(
 	    &event,
@@ -303,6 +281,7 @@ static VALUE start_sequence(
     yaml_emitter_t * emitter;
     yaml_event_t event;
 
+#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding * encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
@@ -314,8 +293,9 @@ static VALUE start_sequence(
 	Check_Type(tag, T_STRING);
 	tag = rb_str_export_to_enc(tag, encoding);
     }
+#endif
 
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_sequence_start_event_initialize(
 	    &event,
@@ -340,7 +320,7 @@ static VALUE end_sequence(VALUE self)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_sequence_end_event_initialize(&event);
 
@@ -365,10 +345,12 @@ static VALUE start_mapping(
 	) {
     yaml_emitter_t * emitter;
     yaml_event_t event;
+#ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
+#endif
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
-
+#ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
 
     if(!NIL_P(anchor)) {
@@ -380,6 +362,7 @@ static VALUE start_mapping(
 	Check_Type(tag, T_STRING);
 	tag = rb_str_export_to_enc(tag, encoding);
     }
+#endif
 
     yaml_mapping_start_event_initialize(
 	    &event,
@@ -404,7 +387,7 @@ static VALUE end_mapping(VALUE self)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_mapping_end_event_initialize(&event);
 
@@ -423,12 +406,14 @@ static VALUE alias(VALUE self, VALUE anchor)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
+#ifdef HAVE_RUBY_ENCODING_H
     if(!NIL_P(anchor)) {
 	Check_Type(anchor, T_STRING);
 	anchor = rb_str_export_to_enc(anchor, rb_utf8_encoding());
     }
+#endif
 
     yaml_alias_event_initialize(
 	    &event,
@@ -447,7 +432,7 @@ static VALUE alias(VALUE self, VALUE anchor)
 static VALUE set_canonical(VALUE self, VALUE style)
 {
     yaml_emitter_t * emitter;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
 
@@ -461,7 +446,7 @@ static VALUE set_canonical(VALUE self, VALUE style)
 static VALUE canonical(VALUE self)
 {
     yaml_emitter_t * emitter;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     return (emitter->canonical == 0) ? Qfalse : Qtrue;
 }
@@ -474,7 +459,7 @@ static VALUE canonical(VALUE self)
 static VALUE set_indentation(VALUE self, VALUE level)
 {
     yaml_emitter_t * emitter;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_emitter_set_indent(emitter, NUM2INT(level));
 
@@ -488,7 +473,7 @@ static VALUE set_indentation(VALUE self, VALUE level)
 static VALUE indentation(VALUE self)
 {
     yaml_emitter_t * emitter;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     return INT2NUM(emitter->best_indent);
 }
@@ -500,7 +485,7 @@ static VALUE indentation(VALUE self)
 static VALUE line_width(VALUE self)
 {
     yaml_emitter_t * emitter;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     return INT2NUM(emitter->best_width);
 }
@@ -512,14 +497,14 @@ static VALUE line_width(VALUE self)
 static VALUE set_line_width(VALUE self, VALUE width)
 {
     yaml_emitter_t * emitter;
-    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
+    Data_Get_Struct(self, yaml_emitter_t, emitter);
 
     yaml_emitter_set_width(emitter, NUM2INT(width));
 
     return width;
 }
 
-void Init_psych_emitter(void)
+void Init_psych_emitter()
 {
     VALUE psych     = rb_define_module("Psych");
     VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);
@@ -545,7 +530,6 @@ void Init_psych_emitter(void)
     rb_define_method(cPsychEmitter, "line_width", line_width, 0);
     rb_define_method(cPsychEmitter, "line_width=", set_line_width, 1);
 
-    id_io          = rb_intern("io");
     id_write       = rb_intern("write");
     id_line_width  = rb_intern("line_width");
     id_indentation = rb_intern("indentation");
diff --git a/ext/psych/psych_emitter.h b/ext/psych/psych_emitter.h
index 4c1482a78b..560451ef31 100644
--- a/ext/psych/psych_emitter.h
+++ b/ext/psych/psych_emitter.h
@@ -3,6 +3,6 @@
 
 #include <psych.h>
 
-void Init_psych_emitter(void);
+void Init_psych_emitter();
 
 #endif
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
index 47ed8744b6..8c65ce1307 100644
--- a/ext/psych/psych_parser.c
+++ b/ext/psych/psych_parser.c
@@ -49,32 +49,14 @@ static void dealloc(void * ptr)
     xfree(parser);
 }
 
-#if 0
-static size_t memsize(const void *ptr)
-{
-    const yaml_parser_t *parser = ptr;
-    /* TODO: calculate parser's size */
-    return 0;
-}
-#endif
-
-static const rb_data_type_t psych_parser_type = {
-    "Psych/parser",
-    {0, dealloc, 0,},
-    0, 0,
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-
 static VALUE allocate(VALUE klass)
 {
     yaml_parser_t * parser;
-    VALUE obj = TypedData_Make_Struct(klass, yaml_parser_t, &psych_parser_type, parser);
 
+    parser = xmalloc(sizeof(yaml_parser_t));
     yaml_parser_initialize(parser);
 
-    return obj;
+    return Data_Wrap_Struct(klass, 0, dealloc, parser);
 }
 
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
@@ -93,6 +75,7 @@ static VALUE make_exception(yaml_parser_t * parser, VALUE path)
 	    parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
 }
 
+#ifdef HAVE_RUBY_ENCODING_H
 static VALUE transcode_string(VALUE src, int * parser_encoding)
 {
     int utf8    = rb_utf8_encindex();
@@ -170,6 +153,8 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
     return src;
 }
 
+#endif
+
 static VALUE protected_start_stream(VALUE pointer)
 {
     VALUE *args = (VALUE *)pointer;
@@ -250,8 +235,10 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     int tainted = 0;
     int state = 0;
     int parser_encoding = YAML_ANY_ENCODING;
+#ifdef HAVE_RUBY_ENCODING_H
     int encoding = rb_utf8_encindex();
     rb_encoding * internal_enc = rb_default_internal_encoding();
+#endif
     VALUE handler = rb_iv_get(self, "@handler");
 
     if (rb_scan_args(argc, argv, "11", &yaml, &path) == 1) {
@@ -261,7 +248,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 	    path = rb_str_new2("<unknown>");
     }
 
-    TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
+    Data_Get_Struct(self, yaml_parser_t, parser);
 
     yaml_parser_delete(parser);
     yaml_parser_initialize(parser);
@@ -269,14 +256,18 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     if (OBJ_TAINTED(yaml)) tainted = 1;
 
     if (rb_respond_to(yaml, id_read)) {
+#ifdef HAVE_RUBY_ENCODING_H
 	yaml = transcode_io(yaml, &parser_encoding);
 	yaml_parser_set_encoding(parser, parser_encoding);
+#endif
 	yaml_parser_set_input(parser, io_reader, (void *)yaml);
 	if (RTEST(rb_obj_is_kind_of(yaml, rb_cIO))) tainted = 1;
     } else {
 	StringValue(yaml);
+#ifdef HAVE_RUBY_ENCODING_H
 	yaml = transcode_string(yaml, &parser_encoding);
 	yaml_parser_set_encoding(parser, parser_encoding);
+#endif
 	yaml_parser_set_input_string(
 		parser,
 		(const unsigned char *)RSTRING_PTR(yaml),
@@ -329,13 +320,17 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 			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));
@@ -364,7 +359,9 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		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
 		}
 
 		args[0] = handler;
@@ -384,18 +381,24 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		    );
 		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 =
@@ -425,14 +428,18 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		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 =
@@ -461,13 +468,17 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 		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 =
@@ -515,7 +526,7 @@ static VALUE mark(VALUE self)
     VALUE args[3];
     yaml_parser_t * parser;
 
-    TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
+    Data_Get_Struct(self, yaml_parser_t, parser);
     mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark"));
     args[0] = INT2NUM(parser->mark.index);
     args[1] = INT2NUM(parser->mark.line);
@@ -524,7 +535,7 @@ static VALUE mark(VALUE self)
     return rb_class_new_instance(3, args, mark_klass);
 }
 
-void Init_psych_parser(void)
+void Init_psych_parser()
 {
 #if 0
     mPsych = rb_define_module("Psych");
diff --git a/ext/psych/psych_parser.h b/ext/psych/psych_parser.h
index beb3dd0709..25e896f01d 100644
--- a/ext/psych/psych_parser.h
+++ b/ext/psych/psych_parser.h
@@ -1,6 +1,6 @@
 #ifndef PSYCH_PARSER_H
 #define PSYCH_PARSER_H
 
-void Init_psych_parser(void);
+void Init_psych_parser();
 
 #endif
diff --git a/ext/psych/psych_to_ruby.c b/ext/psych/psych_to_ruby.c
index b388ff7754..3cc87a965e 100644
--- a/ext/psych/psych_to_ruby.c
+++ b/ext/psych/psych_to_ruby.c
@@ -21,7 +21,11 @@ static VALUE build_exception(VALUE self, VALUE klass, VALUE mesg)
  */
 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)
diff --git a/ext/psych/yaml/api.c b/ext/psych/yaml/api.c
index b1a8da0bda..e0b9d979cc 100644
--- a/ext/psych/yaml/api.c
+++ b/ext/psych/yaml/api.c
@@ -395,7 +395,7 @@ yaml_emitter_delete(yaml_emitter_t *emitter)
     }
     QUEUE_DEL(emitter, emitter->events);
     STACK_DEL(emitter, emitter->indents);
-    while (!STACK_EMPTY(empty, emitter->tag_directives)) {
+    while (!STACK_EMPTY(emitter, emitter->tag_directives)) {
         yaml_tag_directive_t tag_directive = POP(emitter, emitter->tag_directives);
         yaml_free(tag_directive.handle);
         yaml_free(tag_directive.prefix);
@@ -415,7 +415,7 @@ yaml_string_write_handler(void *data, unsigned char *buffer, size_t size)
 {
     yaml_emitter_t *emitter = data;
 
-    if (emitter->output.string.size - *emitter->output.string.size_written
+    if (emitter->output.string.size + *emitter->output.string.size_written
             < size) {
         memcpy(emitter->output.string.buffer
                 + *emitter->output.string.size_written,
@@ -822,6 +822,7 @@ yaml_scalar_event_initialize(yaml_event_t *event,
     yaml_char_t *anchor_copy = NULL;
     yaml_char_t *tag_copy = NULL;
     yaml_char_t *value_copy = NULL;
+    size_t value_length;
 
     assert(event);      /* Non-NULL event object is expected. */
     assert(value);      /* Non-NULL anchor is expected. */
@@ -839,16 +840,19 @@ yaml_scalar_event_initialize(yaml_event_t *event,
     }
 
     if (length < 0) {
-        length = strlen((char *)value);
+        value_length = strlen((char *)value);
+    }
+    else {
+        value_length = (size_t)length;
     }
 
-    if (!yaml_check_utf8(value, length)) goto error;
-    value_copy = yaml_malloc(length+1);
+    if (!yaml_check_utf8(value, value_length)) goto error;
+    value_copy = yaml_malloc(value_length+1);
     if (!value_copy) goto error;
-    memcpy(value_copy, value, length);
-    value_copy[length] = '\0';
+    memcpy(value_copy, value, value_length);
+    value_copy[value_length] = '\0';
 
-    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, length,
+    SCALAR_EVENT_INIT(*event, anchor_copy, tag_copy, value_copy, value_length,
             plain_implicit, quoted_implicit, style, mark, mark);
 
     return 1;
@@ -1202,6 +1206,8 @@ yaml_document_add_scalar(yaml_document_t *document,
     yaml_char_t *tag_copy = NULL;
     yaml_char_t *value_copy = NULL;
     yaml_node_t node;
+    size_t value_length;
+    ptrdiff_t ret;
 
     assert(document);   /* Non-NULL document object is expected. */
     assert(value);      /* Non-NULL value is expected. */
@@ -1215,19 +1221,26 @@ yaml_document_add_scalar(yaml_document_t *document,
     if (!tag_copy) goto error;
 
     if (length < 0) {
-        length = strlen((char *)value);
+        value_length = strlen((char *)value);
+    }
+    else {
+        value_length = (size_t)length;
     }
 
-    if (!yaml_check_utf8(value, length)) goto error;
-    value_copy = yaml_malloc(length+1);
+    if (!yaml_check_utf8(value, value_length)) goto error;
+    value_copy = yaml_malloc(value_length+1);
     if (!value_copy) goto error;
-    memcpy(value_copy, value, length);
-    value_copy[length] = '\0';
+    memcpy(value_copy, value, value_length);
+    value_copy[value_length] = '\0';
 
-    SCALAR_NODE_INIT(node, tag_copy, value_copy, length, style, mark, mark);
+    SCALAR_NODE_INIT(node, tag_copy, value_copy, value_length, style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    ret = document->nodes.top - document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (ret > INT_MAX) goto error;
+#endif
+    return (int)ret;
 
 error:
     yaml_free(tag_copy);
@@ -1255,6 +1268,7 @@ yaml_document_add_sequence(yaml_document_t *document,
         yaml_node_item_t *top;
     } items = { NULL, NULL, NULL };
     yaml_node_t node;
+    ptrdiff_t ret;
 
     assert(document);   /* Non-NULL document object is expected. */
 
@@ -1272,7 +1286,11 @@ yaml_document_add_sequence(yaml_document_t *document,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    ret = document->nodes.top - document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (ret > INT_MAX) goto error;
+#endif
+    return (int)ret;
 
 error:
     STACK_DEL(&context, items);
@@ -1300,6 +1318,7 @@ yaml_document_add_mapping(yaml_document_t *document,
         yaml_node_pair_t *top;
     } pairs = { NULL, NULL, NULL };
     yaml_node_t node;
+    ptrdiff_t ret;
 
     assert(document);   /* Non-NULL document object is expected. */
 
@@ -1317,7 +1336,11 @@ yaml_document_add_mapping(yaml_document_t *document,
             style, mark, mark);
     if (!PUSH(&context, document->nodes, node)) goto error;
 
-    return document->nodes.top - document->nodes.start;
+    ret = document->nodes.top - document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (ret > INT_MAX) goto error;
+#endif
+    return (int)ret;
 
 error:
     STACK_DEL(&context, pairs);
diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h
index 79e8501f4f..f54c27d339 100644
--- a/ext/psych/yaml/config.h
+++ b/ext/psych/yaml/config.h
@@ -1,10 +1,10 @@
 #define PACKAGE_NAME "yaml"
 #define PACKAGE_TARNAME "yaml"
-#define PACKAGE_VERSION "0.1.7"
-#define PACKAGE_STRING "yaml 0.1.7"
-#define PACKAGE_BUGREPORT "https://github.com/yaml/libyaml/issues"
-#define PACKAGE_URL "https://github.com/yaml/libyaml"
+#define PACKAGE_VERSION "0.1.6"
+#define PACKAGE_STRING "yaml 0.1.6"
+#define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component libyaml"
+#define PACKAGE_URL ""
 #define YAML_VERSION_MAJOR 0
 #define YAML_VERSION_MINOR 1
-#define YAML_VERSION_PATCH 7
-#define YAML_VERSION_STRING "0.1.7"
+#define YAML_VERSION_PATCH 6
+#define YAML_VERSION_STRING "0.1.6"
diff --git a/ext/psych/yaml/emitter.c b/ext/psych/yaml/emitter.c
index cb0b3a2ebc..bf84fafc51 100644
--- a/ext/psych/yaml/emitter.c
+++ b/ext/psych/yaml/emitter.c
@@ -53,7 +53,7 @@
 #define WRITE_BREAK(emitter,string)                                             \
     (FLUSH(emitter)                                                             \
      && (CHECK(string,'\n') ?                                                   \
-         (PUT_BREAK(emitter),                                                   \
+         ((void)PUT_BREAK(emitter),                                             \
           string.pointer ++,                                                    \
           1) :                                                                  \
          (COPY(emitter->buffer,string),                                         \
@@ -221,7 +221,7 @@ yaml_emitter_write_indent(yaml_emitter_t *emitter);
 
 static int
 yaml_emitter_write_indicator(yaml_emitter_t *emitter,
-        char *indicator, int need_whitespace,
+        const char *indicator, int need_whitespace,
         int is_whitespace, int is_indention);
 
 static int
@@ -1784,7 +1784,7 @@ yaml_emitter_write_indent(yaml_emitter_t *emitter)
 
 static int
 yaml_emitter_write_indicator(yaml_emitter_t *emitter,
-        char *indicator, int need_whitespace,
+        const char *indicator, int need_whitespace,
         int is_whitespace, int is_indention)
 {
     size_t indicator_length;
@@ -2178,7 +2178,7 @@ yaml_emitter_write_block_scalar_hints(yaml_emitter_t *emitter,
         yaml_string_t string)
 {
     char indent_hint[2];
-    char *chomp_hint = NULL;
+    const char *chomp_hint = NULL;
 
     if (IS_SPACE(string) || IS_BREAK(string))
     {
diff --git a/ext/psych/yaml/loader.c b/ext/psych/yaml/loader.c
index 3ba99f087e..cb3ea93089 100644
--- a/ext/psych/yaml/loader.c
+++ b/ext/psych/yaml/loader.c
@@ -239,8 +239,8 @@ yaml_parser_register_anchor(yaml_parser_t *parser,
         if (strcmp((char *)alias_data->anchor, (char *)anchor) == 0) {
             yaml_free(anchor);
             return yaml_parser_set_composer_error_context(parser,
-                    "found duplicate anchor; first occurrence",
-                    alias_data->mark, "second occurrence", data.mark);
+                    "found duplicate anchor; first occurence",
+                    alias_data->mark, "second occurence", data.mark);
         }
     }
 
@@ -283,6 +283,7 @@ static int
 yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
 {
     yaml_node_t node;
+    ptrdiff_t node_index;
     int index;
     yaml_char_t *tag = first_event->data.scalar.tag;
 
@@ -300,7 +301,11 @@ yaml_parser_load_scalar(yaml_parser_t *parser, yaml_event_t *first_event)
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    index = parser->document->nodes.top - parser->document->nodes.start;
+    node_index = parser->document->nodes.top - parser->document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (node_index > INT_MAX) goto error;
+#endif
+    index = (int)node_index;
 
     if (!yaml_parser_register_anchor(parser, index,
                 first_event->data.scalar.anchor)) return 0;
@@ -329,6 +334,7 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
         yaml_node_item_t *top;
     } items = { NULL, NULL, NULL };
     int index, item_index;
+    ptrdiff_t node_index;
     yaml_char_t *tag = first_event->data.sequence_start.tag;
 
     if (!STACK_LIMIT(parser, parser->document->nodes, INT_MAX-1)) goto error;
@@ -347,7 +353,11 @@ yaml_parser_load_sequence(yaml_parser_t *parser, yaml_event_t *first_event)
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    index = parser->document->nodes.top - parser->document->nodes.start;
+    node_index = parser->document->nodes.top - parser->document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (node_index > INT_MAX) goto error;
+#endif
+    index = (int)node_index;
 
     if (!yaml_parser_register_anchor(parser, index,
                 first_event->data.sequence_start.anchor)) return 0;
@@ -391,6 +401,7 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
         yaml_node_pair_t *top;
     } pairs = { NULL, NULL, NULL };
     int index;
+    ptrdiff_t node_index;
     yaml_node_pair_t pair;
     yaml_char_t *tag = first_event->data.mapping_start.tag;
 
@@ -410,7 +421,11 @@ yaml_parser_load_mapping(yaml_parser_t *parser, yaml_event_t *first_event)
 
     if (!PUSH(parser, parser->document->nodes, node)) goto error;
 
-    index = parser->document->nodes.top - parser->document->nodes.start;
+    node_index = parser->document->nodes.top - parser->document->nodes.start;
+#if PTRDIFF_MAX > INT_MAX
+    if (node_index > INT_MAX) goto error;
+#endif
+    index = (int)node_index;
 
     if (!yaml_parser_register_anchor(parser, index,
                 first_event->data.mapping_start.anchor)) return 0;
diff --git a/ext/psych/yaml/parser.c b/ext/psych/yaml/parser.c
index dc5430b09f..32671b252c 100644
--- a/ext/psych/yaml/parser.c
+++ b/ext/psych/yaml/parser.c
@@ -759,9 +759,8 @@ yaml_parser_parse_block_sequence_entry(yaml_parser_t *parser,
 
     else if (token->type == YAML_BLOCK_END_TOKEN)
     {
-        yaml_mark_t dummy_mark;     /* Used to eliminate a compiler warning. */
         parser->state = POP(parser, parser->states);
-        dummy_mark = POP(parser, parser->marks);
+        (void)POP(parser, parser->marks);
         SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
         SKIP_TOKEN(parser);
         return 1;
@@ -869,9 +868,8 @@ yaml_parser_parse_block_mapping_key(yaml_parser_t *parser,
 
     else if (token->type == YAML_BLOCK_END_TOKEN)
     {
-        yaml_mark_t dummy_mark;     /* Used to eliminate a compiler warning. */
         parser->state = POP(parser, parser->states);
-        dummy_mark = POP(parser, parser->marks);
+        (void)POP(parser, parser->marks);
         MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
         SKIP_TOKEN(parser);
         return 1;
@@ -952,7 +950,6 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
         yaml_event_t *event, int first)
 {
     yaml_token_t *token;
-    yaml_mark_t dummy_mark;     /* Used to eliminate a compiler warning. */
 
     if (first) {
         token = PEEK_TOKEN(parser);
@@ -997,7 +994,7 @@ yaml_parser_parse_flow_sequence_entry(yaml_parser_t *parser,
     }
 
     parser->state = POP(parser, parser->states);
-    dummy_mark = POP(parser, parser->marks);
+    (void)POP(parser, parser->marks);
     SEQUENCE_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
     SKIP_TOKEN(parser);
     return 1;
@@ -1104,7 +1101,6 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
         yaml_event_t *event, int first)
 {
     yaml_token_t *token;
-    yaml_mark_t dummy_mark;     /* Used to eliminate a compiler warning. */
 
     if (first) {
         token = PEEK_TOKEN(parser);
@@ -1158,7 +1154,7 @@ yaml_parser_parse_flow_mapping_key(yaml_parser_t *parser,
     }
 
     parser->state = POP(parser, parser->states);
-    dummy_mark = POP(parser, parser->marks);
+    (void)POP(parser, parser->marks);
     MAPPING_END_EVENT_INIT(*event, token->start_mark, token->end_mark);
     SKIP_TOKEN(parser);
     return 1;
diff --git a/ext/psych/yaml/scanner.c b/ext/psych/yaml/scanner.c
index bfdf3abda5..08ad8edb45 100644
--- a/ext/psych/yaml/scanner.c
+++ b/ext/psych/yaml/scanner.c
@@ -1106,6 +1106,13 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
             && parser->indent == (ptrdiff_t)parser->mark.column);
 
     /*
+     * A simple key is required only when it is the first token in the current
+     * line.  Therefore it is always allowed.  But we add a check anyway.
+     */
+
+    assert(parser->simple_key_allowed || !required);    /* Impossible. */
+
+    /*
      * If the current position may start a simple key, save it.
      */
 
@@ -1186,11 +1193,9 @@ yaml_parser_increase_flow_level(yaml_parser_t *parser)
 static int
 yaml_parser_decrease_flow_level(yaml_parser_t *parser)
 {
-    yaml_simple_key_t dummy_key;    /* Used to eliminate a compiler warning. */
-
     if (parser->flow_level) {
         parser->flow_level --;
-        dummy_key = POP(parser, parser->simple_keys);
+        (void)POP(parser, parser->simple_keys);
     }
 
     return 1;
@@ -1224,12 +1229,14 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
         if (!PUSH(parser, parser->indents, parser->indent))
             return 0;
 
+#if PTRDIFF_MAX > INT_MAX
         if (column > INT_MAX) {
             parser->error = YAML_MEMORY_ERROR;
             return 0;
         }
+#endif
 
-        parser->indent = column;
+        parser->indent = (int)column;
 
         /* Create a token and insert it into the queue. */
 
@@ -1251,7 +1258,7 @@ yaml_parser_roll_indent(yaml_parser_t *parser, ptrdiff_t column,
 
 /*
  * Pop indentation levels from the indents stack until the current level
- * becomes less or equal to the column.  For each indentation level, append
+ * becomes less or equal to the column.  For each intendation level, append
  * the BLOCK-END token.
  */
 
@@ -1266,7 +1273,7 @@ yaml_parser_unroll_indent(yaml_parser_t *parser, ptrdiff_t column)
     if (parser->flow_level)
         return 1;
 
-    /* Loop through the indentation levels in the stack. */
+    /* Loop through the intendation levels in the stack. */
 
     while (parser->indent > column)
     {
@@ -2053,7 +2060,7 @@ yaml_parser_scan_directive(yaml_parser_t *parser, yaml_token_t *token)
     else
     {
         yaml_parser_set_scanner_error(parser, "while scanning a directive",
-                start_mark, "found unknown directive name");
+                start_mark, "found uknown directive name");
         goto error;
     }
 
@@ -2775,15 +2782,15 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (IS_DIGIT(parser->buffer))
         {
-            /* Check that the indentation is greater than 0. */
+            /* Check that the intendation is greater than 0. */
 
             if (CHECK(parser->buffer, '0')) {
                 yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                        start_mark, "found an indentation indicator equal to 0");
+                        start_mark, "found an intendation indicator equal to 0");
                 goto error;
             }
 
-            /* Get the indentation level and eat the indicator. */
+            /* Get the intendation level and eat the indicator. */
 
             increment = AS_DIGIT(parser->buffer);
 
@@ -2797,7 +2804,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
     {
         if (CHECK(parser->buffer, '0')) {
             yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found an indentation indicator equal to 0");
+                    start_mark, "found an intendation indicator equal to 0");
             goto error;
         }
 
@@ -2847,7 +2854,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
     end_mark = parser->mark;
 
-    /* Set the indentation level if it was specified. */
+    /* Set the intendation level if it was specified. */
 
     if (increment) {
         indent = parser->indent >= 0 ? parser->indent+increment : increment;
@@ -2913,7 +2920,7 @@ yaml_parser_scan_block_scalar(yaml_parser_t *parser, yaml_token_t *token,
 
         if (!READ_LINE(parser, leading_break)) goto error;
 
-        /* Eat the following indentation spaces and line breaks. */
+        /* Eat the following intendation spaces and line breaks. */
 
         if (!yaml_parser_scan_block_scalar_breaks(parser,
                     &indent, &trailing_breaks, start_mark, &end_mark)) goto error;
@@ -2948,8 +2955,8 @@ error:
 }
 
 /*
- * Scan indentation spaces and line breaks for a block scalar.  Determine the
- * indentation level if needed.
+ * Scan intendation spaces and line breaks for a block scalar.  Determine the
+ * intendation level if needed.
  */
 
 static int
@@ -2961,11 +2968,11 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
 
     *end_mark = parser->mark;
 
-    /* Eat the indentation spaces and line breaks. */
+    /* Eat the intendation spaces and line breaks. */
 
     while (1)
     {
-        /* Eat the indentation spaces. */
+        /* Eat the intendation spaces. */
 
         if (!CACHE(parser, 1)) return 0;
 
@@ -2978,12 +2985,12 @@ yaml_parser_scan_block_scalar_breaks(yaml_parser_t *parser,
         if ((int)parser->mark.column > max_indent)
             max_indent = (int)parser->mark.column;
 
-        /* Check for a tab character messing the indentation. */
+        /* Check for a tab character messing the intendation. */
 
         if ((!*indent || (int)parser->mark.column < *indent)
                 && IS_TAB(parser->buffer)) {
             return yaml_parser_set_scanner_error(parser, "while scanning a block scalar",
-                    start_mark, "found a tab character where an indentation space is expected");
+                    start_mark, "found a tab character where an intendation space is expected");
         }
 
         /* Have we found a non-empty line? */
@@ -3504,12 +3511,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab character that abuse indentation. */
+                /* Check for tab character that abuse intendation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-                            start_mark, "found a tab character that violate indentation");
+                            start_mark, "found a tab character that violate intendation");
                     goto error;
                 }
 
@@ -3542,7 +3549,7 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
             if (!CACHE(parser, 1)) goto error;
         }
 
-        /* Check indentation level. */
+        /* Check intendation level. */
 
         if (!parser->flow_level && (int)parser->mark.column < indent)
             break;
diff --git a/ext/psych/yaml/yaml_private.h b/ext/psych/yaml/yaml_private.h
index ce262d3086..944499c94e 100644
--- a/ext/psych/yaml/yaml_private.h
+++ b/ext/psych/yaml/yaml_private.h
@@ -436,7 +436,8 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
      (stack).start = (stack).top = (stack).end = 0)
 
 #define STACK_EMPTY(context,stack)                                              \
-    ((stack).start == (stack).top)
+    ((void)(context),                                                           \
+     ((stack).start == (stack).top))
 
 #define STACK_LIMIT(context,stack,size)                                         \
     ((stack).top - (stack).start < (size) ?                                     \
@@ -660,3 +661,4 @@ yaml_queue_extend(void **start, void **head, void **tail, void **end);
      (node).data.mapping.pairs.end = (node_pairs_end),                          \
      (node).data.mapping.pairs.top = (node_pairs_start),                        \
      (node).data.mapping.style = (node_style))
+
diff --git a/ext/pty/depend b/ext/pty/depend
index 432ad0647c..cfcd3c910e 100644
--- a/ext/pty/depend
+++ b/ext/pty/depend
@@ -1,18 +1,6 @@
-# AUTOGENERATED DEPENDENCIES START
-pty.o: $(RUBY_EXTCONF_H)
-pty.o: $(arch_hdrdir)/ruby/config.h
-pty.o: $(hdrdir)/ruby/backward.h
-pty.o: $(hdrdir)/ruby/defines.h
-pty.o: $(hdrdir)/ruby/encoding.h
-pty.o: $(hdrdir)/ruby/intern.h
-pty.o: $(hdrdir)/ruby/io.h
-pty.o: $(hdrdir)/ruby/missing.h
-pty.o: $(hdrdir)/ruby/oniguruma.h
-pty.o: $(hdrdir)/ruby/ruby.h
-pty.o: $(hdrdir)/ruby/st.h
-pty.o: $(hdrdir)/ruby/subst.h
-pty.o: $(hdrdir)/ruby/util.h
-pty.o: $(top_srcdir)/include/ruby.h
-pty.o: $(top_srcdir)/internal.h
-pty.o: pty.c
-# AUTOGENERATED DEPENDENCIES END
+pty.o: pty.c $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \
+  $(hdrdir)/ruby/util.h \
+  $(top_srcdir)/internal.h
diff --git a/ext/pty/extconf.rb b/ext/pty/extconf.rb
index 844902b1f7..1db9f6e8aa 100644
--- a/ext/pty/extconf.rb
+++ b/ext/pty/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 $INCFLAGS << " -I$(topdir) -I$(top_srcdir)"
@@ -9,7 +8,6 @@ if /mswin|mingw|bccwin|nacl/ !~ RUBY_PLATFORM
   have_header("libutil.h")
   have_header("util.h") # OpenBSD openpty
   have_header("pty.h")
-  have_header("pwd.h")
   have_library("util", "openpty")
   if have_func("posix_openpt") or
       have_func("openpty") or
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index 122562127d..c3f3925be7 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 $expect_verbose = false
 
 # Expect library adds the IO instance method #expect, which does similar act to
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 2ac412cfbc..ec255cf202 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -9,9 +9,7 @@
 #include	<sys/file.h>
 #include	<fcntl.h>
 #include	<errno.h>
-#ifdef HAVE_PWD_H
 #include	<pwd.h>
-#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include	<sys/ioctl.h>
 #endif
@@ -35,9 +33,10 @@
 #endif
 #include <ctype.h>
 
-#include "internal.h"
+#include "ruby/ruby.h"
 #include "ruby/io.h"
 #include "ruby/util.h"
+#include "internal.h"
 
 #include <signal.h>
 #ifdef HAVE_SYS_STROPTS_H
@@ -159,23 +158,23 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     int 		master, slave, status = 0;
     rb_pid_t		pid;
     char		*p, *getenv();
+    struct passwd	*pwent;
     VALUE		v;
     struct child_info   carg;
     char		errbuf[32];
 
     if (argc == 0) {
-	const char *shellname = "/bin/sh";
+	const char *shellname;
 
 	if ((p = getenv("SHELL")) != NULL) {
 	    shellname = p;
 	}
 	else {
-#if defined HAVE_PWD_H
-	    const char *username = getenv("USER");
-	    struct passwd *pwent = getpwnam(username ? username : getlogin());
+	    pwent = getpwuid(getuid());
 	    if (pwent && pwent->pw_shell)
 		shellname = pwent->pw_shell;
-#endif
+	    else
+		shellname = "/bin/sh";
 	}
 	v = rb_str_new2(shellname);
 	argc = 1;
@@ -184,7 +183,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
 
     carg.execarg_obj = rb_execarg_new(argc, argv, 1);
     carg.eargp = rb_execarg_get(carg.execarg_obj);
-    rb_execarg_parent_start(carg.execarg_obj);
+    rb_execarg_fixup(carg.execarg_obj);
 
     getDevice(&master, &slave, SlaveName, 0);
 
@@ -198,14 +197,12 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
 	int e = errno;
 	close(master);
 	close(slave);
-        rb_execarg_parent_end(carg.execarg_obj);
 	errno = e;
 	if (status) rb_jump_tag(status);
 	rb_sys_fail(errbuf[0] ? errbuf : "fork failed");
     }
 
     close(slave);
-    rb_execarg_parent_end(carg.execarg_obj);
 
     info->child_pid = pid;
     info->fd = master;
@@ -213,7 +210,6 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
     RB_GC_GUARD(carg.execarg_obj);
 }
 
-#if defined(HAVE_POSIX_OPENPT) || defined(HAVE_OPENPTY) || defined(HAVE_PTSNAME)
 static int
 no_mesg(char *slavedevice, int nomesg)
 {
@@ -222,7 +218,6 @@ no_mesg(char *slavedevice, int nomesg)
     else
         return 0;
 }
-#endif
 
 static int
 get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, int fail)
@@ -267,7 +262,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     if ((slavefd = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
 
-#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
+#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;
@@ -351,7 +346,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     if (no_mesg(slavedevice, nomesg) == -1) goto error;
     if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error;
     rb_update_max_fd(slavefd);
-#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX)
+#if defined(I_PUSH) && !defined(__linux__)
     if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error;
     if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error;
     ioctl(slavefd, I_PUSH, "ttcompat");
@@ -369,13 +364,13 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
 #else
     /* BSD */
     int	 masterfd = -1, slavefd = -1;
-    int  i;
+    const char *const *p;
     char MasterName[DEVICELEN];
 
 #if defined(__hpux)
     static const char MasterDevice[] = "/dev/ptym/pty%s";
     static const char SlaveDevice[] =  "/dev/pty/tty%s";
-    static const char deviceNo[][3] = {
+    static const char *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",
@@ -392,11 +387,12 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     "v8","v9","va","vb","vc","vd","ve","vf",
     "w0","w1","w2","w3","w4","w5","w6","w7",
     "w8","w9","wa","wb","wc","wd","we","wf",
+    0
     };
 #elif defined(_IBMESA)  /* AIX/ESA */
     static const char MasterDevice[] = "/dev/ptyp%s";
     static const char SlaveDevice[] = "/dev/ttyp%s";
-    static const char deviceNo[][3] = {
+    static const char *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",
@@ -413,11 +409,12 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     "d0","d1","d2","d3","d4","d5","d6","d7","d8","d9","da","db","dc","dd","de","df",
     "e0","e1","e2","e3","e4","e5","e6","e7","e8","e9","ea","eb","ec","ed","ee","ef",
     "f0","f1","f2","f3","f4","f5","f6","f7","f8","f9","fa","fb","fc","fd","fe","ff",
+    0
     };
 #else /* 4.2BSD */
     static const char MasterDevice[] = "/dev/pty%s";
     static const char SlaveDevice[] = "/dev/tty%s";
-    static const char deviceNo[][3] = {
+    static const char *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",
@@ -426,15 +423,15 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg,
     "r8","r9","ra","rb","rc","rd","re","rf",
     "s0","s1","s2","s3","s4","s5","s6","s7",
     "s8","s9","sa","sb","sc","sd","se","sf",
+    0
     };
 #endif
-    for (i = 0; i < numberof(deviceNo); i++) {
-	const char *const devno = deviceNo[i];
-	snprintf(MasterName, sizeof MasterName, MasterDevice, devno);
+    for (p = deviceNo; *p != NULL; p++) {
+	snprintf(MasterName, sizeof MasterName, MasterDevice, *p);
 	if ((masterfd = rb_cloexec_open(MasterName,O_RDWR,0)) >= 0) {
             rb_update_max_fd(masterfd);
 	    *master = masterfd;
-	    snprintf(SlaveName, DEVICELEN, SlaveDevice, devno);
+	    snprintf(SlaveName, DEVICELEN, SlaveDevice, *p);
 	    if ((slavefd = rb_cloexec_open(SlaveName,O_RDWR,0)) >= 0) {
                 rb_update_max_fd(slavefd);
 		*slave = slavefd;
@@ -507,14 +504,6 @@ pty_close_pty(VALUE assoc)
  * +slave_file+::   the slave of the pty, as a File.  The path to the
  *		    terminal device is available via +slave_file.path+
  *
- * IO#raw! is usable to disable newline conversions:
- *
- *   require 'io/console'
- *   PTY.open {|m, s|
- *     s.raw!
- *     ...
- *   }
- *
  */
 static VALUE
 pty_open(VALUE klass)
@@ -581,7 +570,7 @@ pty_detach_process(struct pty_info *info)
  *
  * In the block form these same values will be yielded to the block:
  *
- * +r+:: A readable IO that contains the command's
+ * +r+:: A readable IO that that contains the command's
  *       standard output and standard error
  * +w+:: A writable IO that is the command's standard input
  * +pid+:: The process identifier for the command.
@@ -601,11 +590,11 @@ pty_getpty(int argc, VALUE *argv, VALUE self)
 
     establishShell(argc, argv, &info, SlaveName);
 
-    rfptr->mode = rb_io_modestr_fmode("r");
+    rfptr->mode = rb_io_mode_flags("r");
     rfptr->fd = info.fd;
     rfptr->pathv = rb_obj_freeze(rb_str_new_cstr(SlaveName));
 
-    wfptr->mode = rb_io_modestr_fmode("w") | FMODE_SYNC;
+    wfptr->mode = rb_io_mode_flags("w") | FMODE_SYNC;
     wfptr->fd = rb_cloexec_dup(info.fd);
     if (wfptr->fd == -1)
         rb_sys_fail("dup()");
@@ -676,17 +665,9 @@ pty_check(int argc, VALUE *argv, VALUE self)
     VALUE pid, exc;
     rb_pid_t cpid;
     int status;
-    const int flag =
-#ifdef WNOHANG
-	WNOHANG|
-#endif
-#ifdef WUNTRACED
-	WUNTRACED|
-#endif
-	0;
 
     rb_scan_args(argc, argv, "11", &pid, &exc);
-    cpid = rb_waitpid(NUM2PIDT(pid), &status, flag);
+    cpid = rb_waitpid(NUM2PIDT(pid), &status, WNOHANG|WUNTRACED);
     if (cpid == -1 || cpid == 0) return Qnil;
 
     if (!RTEST(exc)) return rb_last_status_get();
@@ -743,7 +724,7 @@ static VALUE cPTY;
  *   # The result of read operation when pty slave is closed is platform
  *   # dependent.
  *   ret = begin
- *           master.gets     # FreeBSD returns nil.
+ *           m.gets          # FreeBSD returns nil.
  *         rescue Errno::EIO # GNU/Linux raises EIO.
  *           nil
  *         end
@@ -764,10 +745,10 @@ static VALUE cPTY;
  */
 
 void
-Init_pty(void)
+Init_pty()
 {
     cPTY = rb_define_module("PTY");
-    /* :nodoc: */
+    /* :nodoc */
     rb_define_module_function(cPTY,"getpty",pty_getpty,-1);
     rb_define_module_function(cPTY,"spawn",pty_getpty,-1);
     rb_define_singleton_method(cPTY,"check",pty_check,-1);
diff --git a/ext/racc/cparse/cparse.c b/ext/racc/cparse/cparse.c
index b4429ed5f3..36ad959222 100644
--- a/ext/racc/cparse/cparse.c
+++ b/ext/racc/cparse/cparse.c
@@ -200,7 +200,6 @@ static VALUE assert_hash _((VALUE h));
 static VALUE initialize_params _((VALUE vparams, VALUE parser, VALUE arg,
                                  VALUE lexer, VALUE lexmid));
 static void cparse_params_mark _((void *ptr));
-static size_t cparse_params_memsize _((const void *ptr));
 
 static void parse_main _((struct cparse_params *v,
                          VALUE tok, VALUE val, int resume));
@@ -218,48 +217,31 @@ static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
 # define D_printf(fmt,arg)
 #endif
 
-#undef RUBY_UNTYPED_DATA_WARNING
-#define RUBY_UNTYPED_DATA_WARNING 1
-
-static const rb_data_type_t cparse_params_type = {
-    "racc/cparse",
-    {
-	cparse_params_mark,
-	RUBY_TYPED_DEFAULT_FREE,
-	cparse_params_memsize,
-    },
-#ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-#endif
-};
-
 static VALUE
 racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
 {
-    VALUE vparams;
+    volatile VALUE vparams;
     struct cparse_params *v;
 
-    vparams = TypedData_Make_Struct(CparseParams, struct cparse_params,
-				    &cparse_params_type, v);
+    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
+                               cparse_params_mark, -1, v);
     D_puts("starting cparse");
     v->sys_debug = RTEST(sysdebug);
     vparams = initialize_params(vparams, parser, arg, Qnil, Qnil);
     v->lex_is_iterator = FALSE;
     parse_main(v, Qnil, Qnil, 0);
 
-    RB_GC_GUARD(vparams);
     return v->retval;
 }
 
 static VALUE
 racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
 {
-    VALUE vparams;
+    volatile VALUE vparams;
     struct cparse_params *v;
 
-    vparams = TypedData_Make_Struct(CparseParams, struct cparse_params,
-				    &cparse_params_type, v);
+    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
+                               cparse_params_mark, -1, v);
     v->sys_debug = RTEST(sysdebug);
     D_puts("start C yyparse");
     vparams = initialize_params(vparams, parser, arg, lexer, lexmid);
@@ -272,7 +254,6 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
                  rb_id2name(v->lexmid));
     }
 
-    RB_GC_GUARD(vparams);
     return v->retval;
 }
 
@@ -286,8 +267,9 @@ call_lexer(struct cparse_params *v)
 static VALUE
 lexer_iter(VALUE data)
 {
-    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
+    struct cparse_params *v;
 
+    Data_Get_Struct(data, struct cparse_params, v);
     rb_funcall(v->lexer, v->lexmid, 0);
     return Qnil;
 }
@@ -302,9 +284,10 @@ call_lexer(struct cparse_params *v)
 static VALUE
 lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data))
 {
-    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
+    struct cparse_params *v;
     VALUE tok, val;
 
+    Data_Get_Struct(data, struct cparse_params, v);
     if (v->fin)
         rb_raise(rb_eArgError, "extra token after EndOfToken");
     extract_user_token(v, block_args, &tok, &val);
@@ -337,8 +320,9 @@ assert_integer(VALUE n)
 static VALUE
 initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lexmid)
 {
-    struct cparse_params *v = rb_check_typeddata(vparams, &cparse_params_type);
+    struct cparse_params *v;
 
+    Data_Get_Struct(vparams, struct cparse_params, v);
     v->value_v = vparams;
     v->parser = parser;
     v->lexer = lexer;
@@ -421,12 +405,6 @@ cparse_params_mark(void *ptr)
     rb_gc_mark(v->retval);
 }
 
-static size_t
-cparse_params_memsize(const void *ptr)
-{
-    return sizeof(struct cparse_params);
-}
-
 static void
 extract_user_token(struct cparse_params *v, VALUE block_args,
                    VALUE *tok, VALUE *val)
@@ -706,7 +684,7 @@ reduce(struct cparse_params *v, long act)
 static VALUE
 reduce0(VALUE val, VALUE data, VALUE self)
 {
-    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
+    struct cparse_params *v;
     VALUE reduce_to, reduce_len, method_id;
     long len;
     ID mid;
@@ -714,6 +692,7 @@ reduce0(VALUE val, VALUE data, VALUE self)
     long i, k1, k2;
     VALUE goto_state;
 
+    Data_Get_Struct(data, struct cparse_params, v);
     reduce_len = rb_ary_entry(v->reduce_table, v->ruleno);
     reduce_to  = rb_ary_entry(v->reduce_table, v->ruleno+1);
     method_id  = rb_ary_entry(v->reduce_table, v->ruleno+2);
@@ -815,8 +794,6 @@ reduce0(VALUE val, VALUE data, VALUE self)
 void
 Init_cparse(void)
 {
-#undef rb_intern
-#define rb_intern(str) rb_intern_const(str)
     VALUE Racc, Parser;
     ID id_racc = rb_intern("Racc");
 
@@ -836,9 +813,6 @@ Init_cparse(void)
         rb_str_new2("$originalId: cparse.c,v 1.8 2006/07/06 11:39:46 aamine Exp $"));
 
     CparseParams = rb_define_class_under(Racc, "CparseParams", rb_cObject);
-    rb_undef_alloc_func(CparseParams);
-    rb_undef_method(CparseParams, "initialize");
-    rb_undef_method(CparseParams, "initialize_copy");
 
     RaccBug = rb_eRuntimeError;
 
diff --git a/ext/racc/cparse/depend b/ext/racc/cparse/depend
deleted file mode 100644
index 441d4df0f7..0000000000
--- a/ext/racc/cparse/depend
+++ /dev/null
@@ -1,12 +0,0 @@
-# AUTOGENERATED DEPENDENCIES START
-cparse.o: $(RUBY_EXTCONF_H)
-cparse.o: $(arch_hdrdir)/ruby/config.h
-cparse.o: $(hdrdir)/ruby/backward.h
-cparse.o: $(hdrdir)/ruby/defines.h
-cparse.o: $(hdrdir)/ruby/intern.h
-cparse.o: $(hdrdir)/ruby/missing.h
-cparse.o: $(hdrdir)/ruby/ruby.h
-cparse.o: $(hdrdir)/ruby/st.h
-cparse.o: $(hdrdir)/ruby/subst.h
-cparse.o: cparse.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/racc/cparse/extconf.rb b/ext/racc/cparse/extconf.rb
index dfddf57111..3710f6f7e7 100644
--- a/ext/racc/cparse/extconf.rb
+++ b/ext/racc/cparse/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # $Id$
 
 require 'mkmf'
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
index 589837bee7..360b3386d3 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -1,21 +1,3 @@
-sizes.c: $(top_srcdir)/tool/generic_erb.rb \
-		   $(top_srcdir)/template/sizes.c.tmpl \
-		   $(top_srcdir)/configure.in \
-		   $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
+sizes.c: $(top_srcdir)/tool/generic_erb.rb $(top_srcdir)/template/sizes.c.tmpl $(top_srcdir)/configure.in
 	$(Q) $(RUBY) $(top_srcdir)/tool/generic_erb.rb --output=$@ \
-		$(top_srcdir)/template/sizes.c.tmpl \
-                $(top_srcdir)/configure.in \
-                $(top_srcdir)/ext/rbconfig/sizeof/extconf.rb
-
-# AUTOGENERATED DEPENDENCIES START
-sizes.o: $(RUBY_EXTCONF_H)
-sizes.o: $(arch_hdrdir)/ruby/config.h
-sizes.o: $(hdrdir)/ruby/backward.h
-sizes.o: $(hdrdir)/ruby/defines.h
-sizes.o: $(hdrdir)/ruby/intern.h
-sizes.o: $(hdrdir)/ruby/missing.h
-sizes.o: $(hdrdir)/ruby/ruby.h
-sizes.o: $(hdrdir)/ruby/st.h
-sizes.o: $(hdrdir)/ruby/subst.h
-sizes.o: {$(VPATH)}sizes.c
-# AUTOGENERATED DEPENDENCIES END
+		$(top_srcdir)/template/sizes.c.tmpl $(top_srcdir)/configure.in
diff --git a/ext/rbconfig/sizeof/extconf.rb b/ext/rbconfig/sizeof/extconf.rb
index 8cb16ca866..ac66b6ac26 100644
--- a/ext/rbconfig/sizeof/extconf.rb
+++ b/ext/rbconfig/sizeof/extconf.rb
@@ -1,36 +1,3 @@
-# frozen_string_literal: false
 $srcs = %w[sizes.c]
 $distcleanfiles.concat($srcs)
-
-have_type('int_least8_t')
-have_type('int_least16_t')
-have_type('int_least32_t')
-have_type('int_least64_t')
-have_type('int_fast8_t')
-have_type('int_fast16_t')
-have_type('int_fast32_t')
-have_type('int_fast64_t')
-have_type('intmax_t')
-have_type('sig_atomic_t', %w[signal.h])
-have_type('wchar_t')
-have_type('wint_t', %w[wctype.h])
-have_type('wctrans_t', %w[wctype.h])
-have_type('wctype_t', %w[wctype.h])
-have_type('_Bool')
-have_type('long double')
-have_type('float _Complex')
-have_type('double _Complex')
-have_type('long double _Complex')
-have_type('float _Imaginary')
-have_type('double _Imaginary')
-have_type('long double _Imaginary')
-have_type('__int128') # x86_64 ABI (optional)
-have_type('__float128') # x86_64 ABI (optional)
-have_type('_Decimal32') # x86_64 ABI
-have_type('_Decimal64') # x86_64 ABI
-have_type('_Decimal128') # x86_64 ABI
-have_type('__m64') # x86_64 ABI (optional)
-have_type('__m128') # x86_64 ABI (optional)
-have_type('__float80') # gcc x86
-
 create_makefile('rbconfig/sizeof')
diff --git a/ext/readline/depend b/ext/readline/depend
index 819328288e..5780d8d42a 100644
--- a/ext/readline/depend
+++ b/ext/readline/depend
@@ -1,17 +1,6 @@
-# AUTOGENERATED DEPENDENCIES START
-readline.o: $(RUBY_EXTCONF_H)
-readline.o: $(arch_hdrdir)/ruby/config.h
-readline.o: $(hdrdir)/ruby/backward.h
-readline.o: $(hdrdir)/ruby/defines.h
-readline.o: $(hdrdir)/ruby/encoding.h
-readline.o: $(hdrdir)/ruby/intern.h
-readline.o: $(hdrdir)/ruby/io.h
-readline.o: $(hdrdir)/ruby/missing.h
-readline.o: $(hdrdir)/ruby/oniguruma.h
-readline.o: $(hdrdir)/ruby/ruby.h
-readline.o: $(hdrdir)/ruby/st.h
-readline.o: $(hdrdir)/ruby/subst.h
-readline.o: $(hdrdir)/ruby/thread.h
-readline.o: $(top_srcdir)/include/ruby.h
-readline.o: readline.c
-# AUTOGENERATED DEPENDENCIES END
+readline.o: readline.c $(HDRS) $(ruby_headers) \
+  $(top_srcdir)/internal.h \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h \
+  $(hdrdir)/ruby/thread.h
diff --git a/ext/readline/extconf.rb b/ext/readline/extconf.rb
index 7bba386540..c79370bf4c 100644
--- a/ext/readline/extconf.rb
+++ b/ext/readline/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require "mkmf"
 
 readline = Struct.new(:headers, :extra_check).new(["stdio.h"])
@@ -38,7 +37,6 @@ have_library("ncurses", "tgetnum") ||
 case enable_libedit
 when true
   # --enable-libedit
-  dir_config("libedit")
   unless (readline.have_header("editline/readline.h") ||
           readline.have_header("readline/readline.h")) &&
           have_library("edit", "readline")
@@ -59,7 +57,7 @@ else
             have_library("edit", "readline"))) ||
             (readline.have_header("editline/readline.h") &&
              have_library("edit", "readline"))
-    raise "Neither readline nor libedit was found"
+    raise "readline nor libedit not found"
   end
 end
 
@@ -81,7 +79,6 @@ readline.have_var("rl_library_version")
 readline.have_var("rl_editing_mode")
 readline.have_var("rl_line_buffer")
 readline.have_var("rl_point")
-readline.have_var("rl_char_is_quoted_p")
 # workaround for native windows.
 /mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_event_hook")
 /mswin|bccwin|mingw/ !~ RUBY_PLATFORM && readline.have_var("rl_catch_sigwinch")
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 7356b7f299..5ceaaf780b 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -33,8 +33,10 @@
 #include <editline/readline.h>
 #endif
 
+#include "ruby/ruby.h"
 #include "ruby/io.h"
 #include "ruby/thread.h"
+#include "internal.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -57,11 +59,7 @@ static VALUE mReadline;
 
 #define COMPLETION_PROC "completion_proc"
 #define COMPLETION_CASE_FOLD "completion_case_fold"
-static ID id_call, completion_proc, completion_case_fold;
-#if defined HAVE_RL_CHAR_IS_QUOTED_P
-#define QUOTING_DETECTION_PROC "quoting_detection_proc"
-static ID quoting_detection_proc;
-#endif
+static ID completion_proc, completion_case_fold;
 #if USE_INSERT_IGNORE_ESCAPE
 static ID id_orig_prompt, id_last_prompt;
 #endif
@@ -135,13 +133,6 @@ static VALUE readline_outstream;
 static FILE *readline_rl_instream;
 static FILE *readline_rl_outstream;
 
-static void
-mustbe_callable(VALUE proc)
-{
-    if (!NIL_P(proc) && !rb_respond_to(proc, id_call))
-        rb_raise(rb_eArgError, "argument must respond to `call'");
-}
-
 #if defined HAVE_RL_GETC_FUNCTION
 
 #ifndef HAVE_RL_GETC
@@ -239,7 +230,8 @@ readline_getc(FILE *input)
                 goto again;
             rb_sys_fail("rb_wait_for_single_fd");
         }
-        rb_syserr_fail(data.err, "read");
+        errno = data.err;
+        rb_sys_fail("read");
     }
     return data.ret;
 }
@@ -368,34 +360,6 @@ clear_rl_outstream(void)
     readline_outstream = Qfalse;
 }
 
-static void
-prepare_readline(void)
-{
-    static int initialized = 0;
-    if (!initialized) {
-	rl_initialize();
-	initialized = 1;
-    }
-
-    if (readline_instream) {
-        rb_io_t *ifp;
-        rb_io_check_initialized(ifp = RFILE(rb_io_taint_check(readline_instream))->fptr);
-        if (ifp->fd < 0) {
-            clear_rl_instream();
-            rb_raise(rb_eIOError, "closed readline input");
-        }
-    }
-
-    if (readline_outstream) {
-        rb_io_t *ofp;
-        rb_io_check_initialized(ofp = RFILE(rb_io_taint_check(readline_outstream))->fptr);
-        if (ofp->fd < 0) {
-            clear_rl_outstream();
-            rb_raise(rb_eIOError, "closed readline output");
-        }
-    }
-}
-
 /*
  * call-seq:
  *   Readline.readline(prompt = "", add_hist = false) -> string or nil
@@ -497,7 +461,23 @@ readline_readline(int argc, VALUE *argv, VALUE self)
         prompt = RSTRING_PTR(tmp);
     }
 
-    prepare_readline();
+    if (readline_instream) {
+        rb_io_t *ifp;
+        rb_io_check_initialized(ifp = RFILE(rb_io_taint_check(readline_instream))->fptr);
+        if (ifp->fd < 0) {
+            clear_rl_instream();
+            rb_raise(rb_eIOError, "closed readline input");
+        }
+    }
+
+    if (readline_outstream) {
+        rb_io_t *ofp;
+        rb_io_check_initialized(ofp = RFILE(rb_io_taint_check(readline_outstream))->fptr);
+        if (ofp->fd < 0) {
+            clear_rl_outstream();
+            rb_raise(rb_eIOError, "closed readline output");
+        }
+    }
 
 #ifdef _WIN32
     rl_prep_terminal(1);
@@ -566,7 +546,8 @@ readline_s_set_input(VALUE self, VALUE input)
         if (f == NULL) {
             int save_errno = errno;
             close(fd);
-            rb_syserr_fail(save_errno, "fdopen");
+            errno = save_errno;
+            rb_sys_fail("fdopen");
         }
         rl_instream = readline_rl_instream = f;
         readline_instream = input;
@@ -602,7 +583,8 @@ readline_s_set_output(VALUE self, VALUE output)
         if (f == NULL) {
             int save_errno = errno;
             close(fd);
-            rb_syserr_fail(save_errno, "fdopen");
+            errno = save_errno;
+            rb_sys_fail("fdopen");
         }
         rl_outstream = readline_rl_outstream = f;
         readline_outstream = output;
@@ -628,7 +610,8 @@ readline_s_set_output(VALUE self, VALUE output)
 static VALUE
 readline_s_set_pre_input_hook(VALUE self, VALUE proc)
 {
-    mustbe_callable(proc);
+    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, id_pre_input_hook, proc);
 }
 
@@ -655,7 +638,7 @@ readline_pre_input_hook(void)
 
     proc = rb_attr_get(mReadline, id_pre_input_hook);
     if (!NIL_P(proc))
-        rb_funcall(proc, id_call, 0);
+        rb_funcall(proc, rb_intern("call"), 0);
     return 0;
 }
 #else
@@ -686,16 +669,6 @@ readline_s_insert_text(VALUE self, VALUE str)
 #endif
 
 #if defined(HAVE_RL_DELETE_TEXT)
-static const char *
-str_subpos(const char *ptr, const char *end, long beg, long *sublen, rb_encoding *enc)
-{
-    VALUE str = rb_enc_str_new_static(ptr, end-ptr, enc);
-    OBJ_FREEZE(str);
-    ptr = rb_str_subpos(str, beg, sublen);
-    rb_gc_force_recycle(str);
-    return ptr;
-}
-
 /*
  * call-seq:
  *   Readline.delete_text([start[, length]]) -> self
@@ -713,20 +686,21 @@ readline_s_delete_text(int argc, VALUE *argv, VALUE self)
 {
     rb_check_arity(argc, 0, 2);
     if (rl_line_buffer) {
-        const char *p, *ptr = rl_line_buffer;
-        long beg = 0, len = strlen(ptr);
-        const char *end = ptr + len;
-        rb_encoding *enc = rb_locale_encoding();
+        char *p, *ptr = rl_line_buffer;
+        long beg = 0, len = strlen(rl_line_buffer);
+        struct RString fakestr;
+        VALUE str = rb_setup_fake_str(&fakestr, ptr, len, rb_locale_encoding());
+        OBJ_FREEZE(str);
         if (argc == 2) {
             beg = NUM2LONG(argv[0]);
             len = NUM2LONG(argv[1]);
           num_pos:
-            p = str_subpos(ptr, end, beg, &len, enc);
+            p = rb_str_subpos(str, beg, &len);
             if (!p) rb_raise(rb_eArgError, "invalid index");
             beg = p - ptr;
         }
         else if (argc == 1) {
-            len = rb_enc_strlen(ptr, ptr + len, enc);
+            len = rb_str_strlen(str);
             if (!rb_range_beg_len(argv[0], &beg, &len, len, 1)) {
                 beg = NUM2LONG(argv[0]);
                 goto num_pos;
@@ -833,7 +807,8 @@ readline_s_redisplay(VALUE self)
 static VALUE
 readline_s_set_completion_proc(VALUE self, VALUE proc)
 {
-    mustbe_callable(proc);
+    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);
 }
 
@@ -849,51 +824,6 @@ readline_s_get_completion_proc(VALUE self)
     return rb_attr_get(mReadline, completion_proc);
 }
 
-#ifdef HAVE_RL_CHAR_IS_QUOTED_P
-/*
- * call-seq:
- *   Readline.quoting_detection_proc = proc
- *
- * Specifies a Proc object +proc+ to determine if a character in the user's
- * input is escaped. It should take the user's input and the index of the
- * character in question as input, and return a boolean (true if the specified
- * character is escaped).
- *
- * Readline will only call this proc with characters specified in
- * +completer_quote_characters+, to discover if they indicate the end of a
- * quoted argument, or characters specified in
- * +completer_word_break_characters+, to discover if they indicate a break
- * between arguments.
- *
- * If +completer_quote_characters+ is not set, or if the user input doesn't
- * contain one of the +completer_quote_characters+ or a +\+ character,
- * Readline will not attempt to use this proc at all.
- *
- * Raises ArgumentError if +proc+ does not respond to the call method.
- */
-static VALUE
-readline_s_set_quoting_detection_proc(VALUE self, VALUE proc)
-{
-    mustbe_callable(proc);
-    return rb_ivar_set(mReadline, quoting_detection_proc, proc);
-}
-
-/*
- * call-seq:
- *   Readline.quoting_detection_proc -> proc
- *
- * Returns the quoting detection Proc object.
- */
-static VALUE
-readline_s_get_quoting_detection_proc(VALUE self)
-{
-    return rb_attr_get(mReadline, quoting_detection_proc);
-}
-#else
-#define readline_s_set_quoting_detection_proc rb_f_notimplement
-#define readline_s_get_quoting_detection_proc rb_f_notimplement
-#endif
-
 /*
  * call-seq:
  *   Readline.completion_case_fold = bool
@@ -1015,7 +945,7 @@ readline_attempted_completion_function(const char *text, int start, int end)
     rl_attempted_completion_over = 1;
 #endif
     case_fold = RTEST(rb_attr_get(mReadline, completion_case_fold));
-    ary = rb_funcall(proc, id_call, 1, rb_locale_str_new_cstr(text));
+    ary = rb_funcall(proc, rb_intern("call"), 1, rb_locale_str_new_cstr(text));
     if (!RB_TYPE_P(ary, T_ARRAY))
         ary = rb_Array(ary);
     matches = RARRAY_LEN(ary);
@@ -1025,7 +955,7 @@ readline_attempted_completion_function(const char *text, int start, int end)
     enc = rb_locale_encoding();
     encobj = rb_enc_from_encoding(enc);
     for (i = 0; i < matches; i++) {
-        temp = rb_obj_as_string(RARRAY_AREF(ary, i));
+        temp = rb_obj_as_string(RARRAY_PTR(ary)[i]);
         StringValueCStr(temp);  /* must be NUL-terminated */
         rb_enc_check(encobj, temp);
         result[i + 1] = (char*)malloc(RSTRING_LEN(temp) + 1);
@@ -1069,32 +999,6 @@ readline_attempted_completion_function(const char *text, int start, int end)
     return result;
 }
 
-#ifdef HAVE_RL_CHAR_IS_QUOTED_P
-static int
-readline_char_is_quoted(char *text, int byte_index)
-{
-    VALUE proc, result, str;
-    long char_index;
-    size_t len;
-
-    proc = rb_attr_get(mReadline, quoting_detection_proc);
-    if (NIL_P(proc)) {
-        return 0;
-    }
-
-    len = strlen(text);
-    if (byte_index < 0 || len < (size_t)byte_index) {
-        rb_raise(rb_eIndexError, "invalid byte index (%d in %"PRIdSIZE")",
-                 byte_index, len);
-    }
-
-    str = rb_locale_str_new(text, len);
-    char_index = rb_str_sublen(str, byte_index);
-    result = rb_funcall(proc, id_call, 2, str, LONG2FIX(char_index));
-    return RTEST(result);
-}
-#endif
-
 #ifdef HAVE_RL_SET_SCREEN_SIZE
 /*
  * call-seq:
@@ -1646,7 +1550,6 @@ readline_s_get_filename_quote_characters(VALUE self, VALUE str)
 static VALUE
 readline_s_refresh_line(VALUE self)
 {
-    prepare_readline();
     rl_refresh_line(0, 0);
     return Qnil;
 }
@@ -1882,9 +1785,8 @@ username_completion_proc_call(VALUE self, VALUE str)
     return result;
 }
 
-#undef rb_intern
 void
-Init_readline(void)
+Init_readline()
 {
     VALUE history, fcomp, ucomp, version;
 
@@ -1902,7 +1804,6 @@ Init_readline(void)
 
     using_history();
 
-    id_call = rb_intern("call");
     completion_proc = rb_intern(COMPLETION_PROC);
     completion_case_fold = rb_intern(COMPLETION_CASE_FOLD);
 #if defined(HAVE_RL_PRE_INPUT_HOOK)
@@ -1911,9 +1812,6 @@ Init_readline(void)
 #if defined(HAVE_RL_SPECIAL_PREFIXES)
     id_special_prefixes = rb_intern("special_prefixes");
 #endif
-#if defined HAVE_RL_CHAR_IS_QUOTED_P
-    quoting_detection_proc = rb_intern(QUOTING_DETECTION_PROC);
-#endif
 
     mReadline = rb_define_module("Readline");
     rb_define_module_function(mReadline, "readline",
@@ -1926,10 +1824,6 @@ Init_readline(void)
                                readline_s_set_completion_proc, 1);
     rb_define_singleton_method(mReadline, "completion_proc",
                                readline_s_get_completion_proc, 0);
-    rb_define_singleton_method(mReadline, "quoting_detection_proc=",
-                               readline_s_set_quoting_detection_proc, 1);
-    rb_define_singleton_method(mReadline, "quoting_detection_proc",
-                               readline_s_get_quoting_detection_proc, 0);
     rb_define_singleton_method(mReadline, "completion_case_fold=",
                                readline_s_set_completion_case_fold, 1);
     rb_define_singleton_method(mReadline, "completion_case_fold",
@@ -2076,10 +1970,7 @@ Init_readline(void)
 
     rl_attempted_completion_function = readline_attempted_completion_function;
 #if defined(HAVE_RL_PRE_INPUT_HOOK)
-    rl_pre_input_hook = readline_pre_input_hook;
-#endif
-#if defined HAVE_RL_CHAR_IS_QUOTED_P
-    rl_char_is_quoted_p = &readline_char_is_quoted;
+    rl_pre_input_hook = (rl_hook_func_t *)readline_pre_input_hook;
 #endif
 #ifdef HAVE_RL_CATCH_SIGNALS
     rl_catch_signals = 0;
@@ -2091,9 +1982,3 @@ Init_readline(void)
     rb_gc_register_address(&readline_instream);
     rb_gc_register_address(&readline_outstream);
 }
-
-/*
- * Local variables:
- * indent-tabs-mode: nil
- * end:
- */
diff --git a/ext/ripper/depend b/ext/ripper/depend
index 7ea823c427..db7bea74ed 100644
--- a/ext/ripper/depend
+++ b/ext/ripper/depend
@@ -7,7 +7,19 @@ BISON = bison
 
 src: ripper.c eventids1.c eventids2table.c
 
-ripper.o: ripper.c
+ripper.o: ripper.c id.c lex.c eventids1.c eventids2.c eventids2table.c \
+	$(HDRS) $(ruby_headers) \
+	$(hdrdir)/ruby/encoding.h \
+	$(hdrdir)/ruby/oniguruma.h \
+	$(hdrdir)/ruby/regex.h \
+	$(hdrdir)/ruby/util.h \
+	$(top_srcdir)/node.h \
+	$(top_srcdir)/internal.h \
+	{$(VPATH)}parse.h \
+	{$(VPATH)}id.h \
+	$(top_srcdir)/regenc.h \
+	$(top_srcdir)/vm_opts.h \
+	$(topdir)/probes.h
 
 .y.c:
 	$(ECHO) compiling compiler $<
@@ -24,12 +36,9 @@ ripper.y: $(srcdir)/tools/preproc.rb $(top_srcdir)/parse.y
 	$(Q) $(RUBY) $(srcdir)/tools/preproc.rb ripper.tmp.y --output=$@
 	$(Q) $(RM) ripper.tmp.y
 
-check: .eventids2-check
-
-.eventids2-check: $(GEN) $(SRC1) $(SRC2)
+check: $(GEN) $(SRC1) $(SRC2)
 	$(ECHO) checking $(SRC1) and $(SRC2)
 	$(Q) $(RUBY) $(GEN) --mode=check --ids1src=$(SRC1) --ids2src=$(SRC2)
-	@exit > $@
 
 eventids1.c: $(srcdir)/tools/generate.rb $(SRC1)
 	$(ECHO) generating $@ from $(SRC1)
@@ -44,36 +53,4 @@ eventids2table.c: $(srcdir)/tools/generate.rb $(SRC2)
 preproc: ripper.E
 ripper.E: ripper.c
 	$(ECHO) preprocessing ripper.c
-	$(Q) $(CC) -E $(INCFLAGS) $(CPPFLAGS) $< | $(RUBY) $(srcdir)/tools/strip.rb > $@
-
-# AUTOGENERATED DEPENDENCIES START
-ripper.o: $(RUBY_EXTCONF_H)
-ripper.o: $(arch_hdrdir)/ruby/config.h
-ripper.o: $(hdrdir)/ruby/backward.h
-ripper.o: $(hdrdir)/ruby/defines.h
-ripper.o: $(hdrdir)/ruby/encoding.h
-ripper.o: $(hdrdir)/ruby/intern.h
-ripper.o: $(hdrdir)/ruby/io.h
-ripper.o: $(hdrdir)/ruby/missing.h
-ripper.o: $(hdrdir)/ruby/oniguruma.h
-ripper.o: $(hdrdir)/ruby/regex.h
-ripper.o: $(hdrdir)/ruby/ruby.h
-ripper.o: $(hdrdir)/ruby/st.h
-ripper.o: $(hdrdir)/ruby/subst.h
-ripper.o: $(hdrdir)/ruby/util.h
-ripper.o: $(top_srcdir)/include/ruby.h
-ripper.o: $(top_srcdir)/internal.h
-ripper.o: $(top_srcdir)/node.h
-ripper.o: $(top_srcdir)/regenc.h
-ripper.o: $(top_srcdir)/symbol.h
-ripper.o: ../../probes.h
-ripper.o: eventids2.c
-ripper.o: ripper.y
-ripper.o: {$(VPATH)}eventids1.c
-ripper.o: {$(VPATH)}eventids2table.c
-ripper.o: {$(VPATH)}id.h
-ripper.o: {$(VPATH)}lex.c
-ripper.o: {$(VPATH)}parse.h
-ripper.o: {$(VPATH)}probes.dmyh
-ripper.o: {$(VPATH)}ripper.c
-# AUTOGENERATED DEPENDENCIES END
+	$(Q) $(CC) -E $(CPPFLAGS) ripper.c | $(RUBY) $(srcdir)/tools/strip.rb > $@
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index 04a40e0da7..423f9d7e29 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -8,297 +8,284 @@
 #define tHEREDOC_END     (tLAST_TOKEN + 8)
 #define k__END__         (tLAST_TOKEN + 9)
 
-typedef struct {
-    ID ripper_id_backref;
-    ID ripper_id_backtick;
-    ID ripper_id_comma;
-    ID ripper_id_const;
-    ID ripper_id_cvar;
-    ID ripper_id_embexpr_beg;
-    ID ripper_id_embexpr_end;
-    ID ripper_id_embvar;
-    ID ripper_id_float;
-    ID ripper_id_gvar;
-    ID ripper_id_ident;
-    ID ripper_id_imaginary;
-    ID ripper_id_int;
-    ID ripper_id_ivar;
-    ID ripper_id_kw;
-    ID ripper_id_lbrace;
-    ID ripper_id_lbracket;
-    ID ripper_id_lparen;
-    ID ripper_id_nl;
-    ID ripper_id_op;
-    ID ripper_id_period;
-    ID ripper_id_rbrace;
-    ID ripper_id_rbracket;
-    ID ripper_id_rparen;
-    ID ripper_id_semicolon;
-    ID ripper_id_symbeg;
-    ID ripper_id_tstring_beg;
-    ID ripper_id_tstring_content;
-    ID ripper_id_tstring_end;
-    ID ripper_id_words_beg;
-    ID ripper_id_qwords_beg;
-    ID ripper_id_qsymbols_beg;
-    ID ripper_id_symbols_beg;
-    ID ripper_id_words_sep;
-    ID ripper_id_rational;
-    ID ripper_id_regexp_beg;
-    ID ripper_id_regexp_end;
-    ID ripper_id_label;
-    ID ripper_id_label_end;
-    ID ripper_id_tlambda;
-    ID ripper_id_tlambeg;
+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_imaginary;
+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_qsymbols_beg;
+static ID ripper_id_symbols_beg;
+static ID ripper_id_words_sep;
+static ID ripper_id_rational;
+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;
 
-    ID ripper_id_ignored_nl;
-    ID ripper_id_comment;
-    ID ripper_id_embdoc_beg;
-    ID ripper_id_embdoc;
-    ID ripper_id_embdoc_end;
-    ID ripper_id_sp;
-    ID ripper_id_heredoc_beg;
-    ID ripper_id_heredoc_end;
-    ID ripper_id___end__;
-    ID ripper_id_CHAR;
-} ripper_scanner_ids_t;
-
-static ripper_scanner_ids_t ripper_scanner_ids;
+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(void)
 {
-#define set_id2(name) ripper_scanner_ids.ripper_id_##name = rb_intern_const("on_"#name)
-    set_id2(backref);
-    set_id2(backtick);
-    set_id2(comma);
-    set_id2(const);
-    set_id2(cvar);
-    set_id2(embexpr_beg);
-    set_id2(embexpr_end);
-    set_id2(embvar);
-    set_id2(float);
-    set_id2(gvar);
-    set_id2(ident);
-    set_id2(imaginary);
-    set_id2(int);
-    set_id2(ivar);
-    set_id2(kw);
-    set_id2(lbrace);
-    set_id2(lbracket);
-    set_id2(lparen);
-    set_id2(nl);
-    set_id2(op);
-    set_id2(period);
-    set_id2(rbrace);
-    set_id2(rbracket);
-    set_id2(rparen);
-    set_id2(semicolon);
-    set_id2(symbeg);
-    set_id2(tstring_beg);
-    set_id2(tstring_content);
-    set_id2(tstring_end);
-    set_id2(words_beg);
-    set_id2(qwords_beg);
-    set_id2(qsymbols_beg);
-    set_id2(symbols_beg);
-    set_id2(words_sep);
-    set_id2(rational);
-    set_id2(regexp_beg);
-    set_id2(regexp_end);
-    set_id2(label);
-    set_id2(label_end);
-    set_id2(tlambda);
-    set_id2(tlambeg);
+    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_imaginary = rb_intern_const("on_imaginary");
+    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_qsymbols_beg = rb_intern_const("on_qsymbols_beg");
+    ripper_id_symbols_beg = rb_intern_const("on_symbols_beg");
+    ripper_id_words_sep = rb_intern_const("on_words_sep");
+    ripper_id_rational = rb_intern_const("on_rational");
+    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");
 
-    set_id2(ignored_nl);
-    set_id2(comment);
-    set_id2(embdoc_beg);
-    set_id2(embdoc);
-    set_id2(embdoc_end);
-    set_id2(sp);
-    set_id2(heredoc_beg);
-    set_id2(heredoc_end);
-    set_id2(__end__);
-    set_id2(CHAR);
+    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");
 }
 
-STATIC_ASSERT(k__END___range, k__END__ < SHRT_MAX);
-STATIC_ASSERT(ripper_scanner_ids_size, sizeof(ripper_scanner_ids) < SHRT_MAX);
-#define O(member) (int)offsetof(ripper_scanner_ids_t, ripper_id_##member)
-
 static const struct token_assoc {
-    unsigned short token;
-    unsigned short id_offset;
+    int token;
+    ID *id;
 } token_to_eventid[] = {
-    {' ',			O(words_sep)},
-    {'!',			O(op)},
-    {'%',			O(op)},
-    {'&',			O(op)},
-    {'*',			O(op)},
-    {'+',			O(op)},
-    {'-',			O(op)},
-    {'/',			O(op)},
-    {'<',			O(op)},
-    {'=',			O(op)},
-    {'>',			O(op)},
-    {'?',			O(op)},
-    {'^',			O(op)},
-    {'|',			O(op)},
-    {'~',			O(op)},
-    {':',			O(op)},
-    {',',			O(comma)},
-    {'.',			O(period)},
-    {';',			O(semicolon)},
-    {'`',			O(backtick)},
-    {'\n',			O(nl)},
-    {keyword_alias,		O(kw)},
-    {keyword_and,		O(kw)},
-    {keyword_begin,		O(kw)},
-    {keyword_break,		O(kw)},
-    {keyword_case,		O(kw)},
-    {keyword_class,		O(kw)},
-    {keyword_def,		O(kw)},
-    {keyword_defined,		O(kw)},
-    {keyword_do,		O(kw)},
-    {keyword_do_block,		O(kw)},
-    {keyword_do_cond,		O(kw)},
-    {keyword_else,		O(kw)},
-    {keyword_elsif,		O(kw)},
-    {keyword_end,		O(kw)},
-    {keyword_ensure,		O(kw)},
-    {keyword_false,		O(kw)},
-    {keyword_for,		O(kw)},
-    {keyword_if,		O(kw)},
-    {modifier_if,		O(kw)},
-    {keyword_in,		O(kw)},
-    {keyword_module,		O(kw)},
-    {keyword_next,		O(kw)},
-    {keyword_nil,		O(kw)},
-    {keyword_not,		O(kw)},
-    {keyword_or,		O(kw)},
-    {keyword_redo,		O(kw)},
-    {keyword_rescue,		O(kw)},
-    {modifier_rescue,		O(kw)},
-    {keyword_retry,		O(kw)},
-    {keyword_return,		O(kw)},
-    {keyword_self,		O(kw)},
-    {keyword_super,		O(kw)},
-    {keyword_then,		O(kw)},
-    {keyword_true,		O(kw)},
-    {keyword_undef,		O(kw)},
-    {keyword_unless,		O(kw)},
-    {modifier_unless,		O(kw)},
-    {keyword_until,		O(kw)},
-    {modifier_until,		O(kw)},
-    {keyword_when,		O(kw)},
-    {keyword_while,		O(kw)},
-    {modifier_while,		O(kw)},
-    {keyword_yield,		O(kw)},
-    {keyword__FILE__,		O(kw)},
-    {keyword__LINE__,		O(kw)},
-    {keyword__ENCODING__,	O(kw)},
-    {keyword_BEGIN,		O(kw)},
-    {keyword_END,		O(kw)},
-    {keyword_do_LAMBDA,		O(kw)},
-    {tAMPER,			O(op)},
-    {tANDOP,			O(op)},
-    {tAREF,			O(op)},
-    {tASET,			O(op)},
-    {tASSOC,			O(op)},
-    {tBACK_REF,			O(backref)},
-    {tCHAR,			O(CHAR)},
-    {tCMP,			O(op)},
-    {tCOLON2,			O(op)},
-    {tCOLON3,			O(op)},
-    {tCONSTANT,			O(const)},
-    {tCVAR,			O(cvar)},
-    {tDOT2,			O(op)},
-    {tDOT3,			O(op)},
-    {tEQ,			O(op)},
-    {tEQQ,			O(op)},
-    {tFID,			O(ident)},
-    {tFLOAT,			O(float)},
-    {tGEQ,			O(op)},
-    {tGVAR,			O(gvar)},
-    {tIDENTIFIER,		O(ident)},
-    {tIMAGINARY,		O(imaginary)},
-    {tINTEGER,			O(int)},
-    {tIVAR,			O(ivar)},
-    {tLBRACE,			O(lbrace)},
-    {tLBRACE_ARG,		O(lbrace)},
-    {'{',			O(lbrace)},
-    {'}',			O(rbrace)},
-    {tLBRACK,			O(lbracket)},
-    {'[',			O(lbracket)},
-    {']',			O(rbracket)},
-    {tLEQ,			O(op)},
-    {tLPAREN,			O(lparen)},
-    {tLPAREN_ARG,		O(lparen)},
-    {'(',			O(lparen)},
-    {')',			O(rparen)},
-    {tLSHFT,			O(op)},
-    {tMATCH,			O(op)},
-    {tNEQ,			O(op)},
-    {tNMATCH,			O(op)},
-    {tNTH_REF,			O(backref)},
-    {tOP_ASGN,			O(op)},
-    {tOROP,			O(op)},
-    {tPOW,			O(op)},
-    {tQWORDS_BEG,		O(qwords_beg)},
-    {tQSYMBOLS_BEG,		O(qsymbols_beg)},
-    {tSYMBOLS_BEG,		O(symbols_beg)},
-    {tRATIONAL,			O(rational)},
-    {tREGEXP_BEG,		O(regexp_beg)},
-    {tREGEXP_END,		O(regexp_end)},
-    {tRPAREN,			O(rparen)},
-    {tRSHFT,			O(op)},
-    {tSTAR,			O(op)},
-    {tDSTAR,			O(op)},
-    {tANDDOT,			O(op)},
-    {tSTRING_BEG,		O(tstring_beg)},
-    {tSTRING_CONTENT,		O(tstring_content)},
-    {tSTRING_DBEG,		O(embexpr_beg)},
-    {tSTRING_DEND,		O(embexpr_end)},
-    {tSTRING_DVAR,		O(embvar)},
-    {tSTRING_END,		O(tstring_end)},
-    {tSYMBEG,			O(symbeg)},
-    {tUMINUS,			O(op)},
-    {tUMINUS_NUM,		O(op)},
-    {tUPLUS,			O(op)},
-    {tWORDS_BEG,		O(words_beg)},
-    {tXSTRING_BEG,		O(backtick)},
-    {tLABEL,			O(label)},
-    {tLABEL_END,		O(label_end)},
-    {tLAMBDA,			O(tlambda)},
-    {tLAMBEG,			O(tlambeg)},
+    {' ',		&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},
+    {tIMAGINARY,	&ripper_id_imaginary},
+    {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},
+    {tQSYMBOLS_BEG,	&ripper_id_qsymbols_beg},
+    {tSYMBOLS_BEG,	&ripper_id_symbols_beg},
+    {tRATIONAL,		&ripper_id_rational},
+    {tREGEXP_BEG,	&ripper_id_regexp_beg},
+    {tREGEXP_END,	&ripper_id_regexp_end},
+    {tRPAREN,		&ripper_id_rparen},
+    {tRSHFT,		&ripper_id_op},
+    {tSTAR,		&ripper_id_op},
+    {tDSTAR,		&ripper_id_op},
+    {tSTRING_BEG,	&ripper_id_tstring_beg},
+    {tSTRING_CONTENT,	&ripper_id_tstring_content},
+    {tSTRING_DBEG,	&ripper_id_embexpr_beg},
+    {tSTRING_DEND,	&ripper_id_embexpr_end},
+    {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,		O(ignored_nl)},
-    {tCOMMENT,			O(comment)},
-    {tEMBDOC_BEG,		O(embdoc_beg)},
-    {tEMBDOC,			O(embdoc)},
-    {tEMBDOC_END,		O(embdoc_end)},
-    {tSP,			O(sp)},
-    {tHEREDOC_BEG,		O(heredoc_beg)},
-    {tHEREDOC_END,		O(heredoc_end)},
-    {k__END__,			O(__end__)},
+    {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)
 {
-    int i;
+    const struct token_assoc *a;
 
-    for (i = 0; i < numberof(token_to_eventid); i++) {
-	const struct token_assoc *const a = &token_to_eventid[i];
+    for (a = token_to_eventid; a->id != NULL; a++) {
         if (a->token == tok)
-            return *(const ID *)((const char *)&ripper_scanner_ids + a->id_offset);
+            return *a->id;
     }
     if (tok < 256) {
-        return ripper_scanner_ids.ripper_id_CHAR;
+        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
index 91d4b320e4..db54e5ca2a 100644
--- a/ext/ripper/extconf.rb
+++ b/ext/ripper/extconf.rb
@@ -1,5 +1,4 @@
 #!ruby -s
-# frozen_string_literal: false
 
 require 'mkmf'
 require 'rbconfig'
@@ -11,7 +10,7 @@ def main
     end
   end
   $objs = %w(ripper.o)
-  $cleanfiles.concat %w(ripper.y ripper.c ripper.E ripper.output y.output eventids1.c eventids2table.c .eventids2-check)
+  $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)'
diff --git a/ext/ripper/lib/ripper.rb b/ext/ripper/lib/ripper.rb
index c5c3a8091e..542bd405d2 100644
--- a/ext/ripper/lib/ripper.rb
+++ b/ext/ripper/lib/ripper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'ripper/core'
 require 'ripper/lexer'
 require 'ripper/filter'
diff --git a/ext/ripper/lib/ripper/core.rb b/ext/ripper/lib/ripper/core.rb
index 53ed14d5e1..637a72f4ad 100644
--- a/ext/ripper/lib/ripper/core.rb
+++ b/ext/ripper/lib/ripper/core.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #
 # $Id$
 #
@@ -30,21 +29,16 @@ class Ripper
 
   private
 
-  def _dispatch_0() nil end
-  def _dispatch_1(a) a end
-  def _dispatch_2(a, b) a end
-  def _dispatch_3(a, b, c) a end
-  def _dispatch_4(a, b, c, d) a end
-  def _dispatch_5(a, b, c, d, e) a end
-  def _dispatch_6(a, b, c, d, e, f) a end
-  def _dispatch_7(a, b, c, d, e, f, g) a end
-
   #
   # Parser Events
   #
 
   PARSER_EVENT_TABLE.each do |id, arity|
-    alias_method "on_#{id}", "_dispatch_#{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.
@@ -66,7 +60,11 @@ class Ripper
   #
 
   SCANNER_EVENTS.each do |id|
-    alias_method "on_#{id}", :_dispatch_1
+    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
index a50a2c6c4e..239f9f00e1 100644
--- a/ext/ripper/lib/ripper/filter.rb
+++ b/ext/ripper/lib/ripper/filter.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #
 # $Id$
 #
diff --git a/ext/ripper/lib/ripper/lexer.rb b/ext/ripper/lib/ripper/lexer.rb
index 69526340a7..c0a64d1ee5 100644
--- a/ext/ripper/lib/ripper/lexer.rb
+++ b/ext/ripper/lib/ripper/lexer.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #
 # $Id$
 #
@@ -45,56 +44,28 @@ class Ripper
   end
 
   class Lexer < ::Ripper   #:nodoc: internal use only
-    Elem = Struct.new(:pos, :event, :tok)
-
     def tokenize
-      parse().sort_by(&:pos).map(&:tok)
+      lex().map {|pos, event, tok| tok }
     end
 
     def lex
-      parse().sort_by(&:pos).map(&:to_a)
+      parse().sort_by {|pos, event, tok| pos }
     end
 
     def parse
       @buf = []
-      @stack = []
       super
-      @buf.flatten!
       @buf
     end
 
     private
 
-    def on_heredoc_dedent(v, w)
-      @buf.last.each do |e|
-        if e.event == :on_tstring_content
-          if (n = dedent_string(e.tok, w)) > 0
-            e.pos[1] += n
-          end
+    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
-      v
-    end
-
-    def on_heredoc_beg(tok)
-      @stack.push @buf
-      buf = []
-      @buf << buf
-      @buf = buf
-      @buf.push Elem.new([lineno(), column()], __callee__, tok)
-    end
-
-    def on_heredoc_end(tok)
-      @buf.push Elem.new([lineno(), column()], __callee__, tok)
-      @buf = @stack.pop
-    end
-
-    def _push_token(tok)
-      @buf.push Elem.new([lineno(), column()], __callee__, tok)
-    end
-
-    (SCANNER_EVENTS.map {|event|:"on_#{event}"} - private_instance_methods(false)).each do |event|
-      alias_method event, :_push_token
+      End
     end
   end
 
diff --git a/ext/ripper/lib/ripper/sexp.rb b/ext/ripper/lib/ripper/sexp.rb
index aa1f86e38c..66bd69134d 100644
--- a/ext/ripper/lib/ripper/sexp.rb
+++ b/ext/ripper/lib/ripper/sexp.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 #
 # $Id$
 #
@@ -29,9 +28,7 @@ class Ripper
   #           [:bodystmt, [[:var_ref, [:@kw, "nil", [1, 9]]]], nil, nil, nil]]]]
   #
   def Ripper.sexp(src, filename = '-', lineno = 1)
-    builder = SexpBuilderPP.new(src, filename, lineno)
-    sexp = builder.parse
-    sexp unless builder.error?
+    SexpBuilderPP.new(src, filename, lineno).parse
   end
 
   # [EXPERIMENTAL]
@@ -55,43 +52,48 @@ class Ripper
   #             nil]]]]
   #
   def Ripper.sexp_raw(src, filename = '-', lineno = 1)
-    builder = SexpBuilder.new(src, filename, lineno)
-    sexp = builder.parse
-    sexp unless builder.error?
+    SexpBuilder.new(src, filename, lineno).parse
   end
 
-  class SexpBuilder < ::Ripper   #:nodoc:
+  class SexpBuilderPP < ::Ripper   #:nodoc:
     private
 
-    def dedent_element(e, width)
-      if (n = dedent_string(e[1], width)) > 0
-        e[2][1] += n
+    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
-      e
     end
 
-    def on_heredoc_dedent(val, width)
-      sub = proc do |cont|
-        cont.map! do |e|
-          if Array === e
-            case e[0]
-            when :@tstring_content
-              e = dedent_element(e, width)
-            when /_add\z/
-              e[1] = sub[e[1]]
-            end
-          elsif String === e
-            dedent_string(e, width)
-          end
-          e
+    SCANNER_EVENTS.each do |event|
+      module_eval(<<-End, __FILE__, __LINE__ + 1)
+        def on_#{event}(tok)
+          [:@#{event}, tok, [lineno(), column()]]
         end
-      end
-      sub[val]
-      val
+      End
     end
+  end
+
+  class SexpBuilder < ::Ripper   #:nodoc:
+    private
 
-    events = private_instance_methods(false).grep(/\Aon_/) {$'.to_sym}
-    (PARSER_EVENTS - events).each do |event|
+    PARSER_EVENTS.each do |event|
       module_eval(<<-End, __FILE__, __LINE__ + 1)
         def on_#{event}(*args)
           args.unshift :#{event}
@@ -109,38 +111,4 @@ class Ripper
     end
   end
 
-  class SexpBuilderPP < SexpBuilder #:nodoc:
-    private
-
-    def on_heredoc_dedent(val, width)
-      val.map! do |e|
-        next e if Symbol === e and /_content\z/ =~ e
-        if Array === e and e[0] == :@tstring_content
-          e = dedent_element(e, width)
-        elsif String === e
-          dedent_string(e, width)
-        end
-        e
-      end
-      val
-    end
-
-    def _dispatch_event_new
-      []
-    end
-
-    def _dispatch_event_push(list, item)
-      list.push item
-      list
-    end
-
-    PARSER_EVENT_TABLE.each do |event, arity|
-      if /_new\z/ =~ event and arity == 0
-        alias_method "on_#{event}", :_dispatch_event_new
-      elsif /_add\z/ =~ event
-        alias_method "on_#{event}", :_dispatch_event_push
-      end
-    end
-  end
-
 end
diff --git a/ext/ripper/tools/generate-param-macros.rb b/ext/ripper/tools/generate-param-macros.rb
index c1f0c5bc31..b19f6e8d5c 100755
--- a/ext/ripper/tools/generate-param-macros.rb
+++ b/ext/ripper/tools/generate-param-macros.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 off = true
 ARGF.each do |line|
   case line
diff --git a/ext/ripper/tools/generate.rb b/ext/ripper/tools/generate.rb
index cb02de9b4b..48ad9e1d25 100755
--- a/ext/ripper/tools/generate.rb
+++ b/ext/ripper/tools/generate.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # $Id$
 
 require 'optparse'
@@ -69,22 +68,15 @@ end
 
 def generate_eventids1(ids)
   buf = ""
-  buf << %Q[static struct {\n]
   ids.each do |id, arity|
-    buf << %Q[    ID id_#{id};\n]
-  end
-  buf << %Q[} ripper_parser_ids;\n]
-  buf << %Q[\n]
-  ids.each do |id, arity|
-    buf << %Q[#define ripper_id_#{id} ripper_parser_ids.id_#{id}\n]
+    buf << %Q[static ID ripper_id_#{id};\n]
   end
   buf << %Q[\n]
   buf << %Q[static void\n]
   buf << %Q[ripper_init_eventids1(void)\n]
   buf << %Q[{\n]
-  buf << %Q[#define set_id1(name) ripper_id_##name = rb_intern_const("on_"#name)\n]
   ids.each do |id, arity|
-    buf << %Q[    set_id1(#{id});\n]
+    buf << %Q[    ripper_id_#{id} = rb_intern_const("on_#{id}");\n]
   end
   buf << %Q[}\n]
   buf << %Q[\n]
@@ -92,9 +84,11 @@ def generate_eventids1(ids)
   buf << %Q[ripper_init_eventids1_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, "PARSER_EVENT_TABLE", h);\n]
   ids.each do |id, arity|
-    buf << %Q[    rb_hash_aset(h, intern_sym("#{id}"), INT2FIX(#{arity}));\n]
+    buf << %Q[    id = rb_intern_const("#{id}");\n]
+    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(#{arity}));\n]
   end
   buf << %Q[}\n]
   buf
@@ -106,9 +100,11 @@ def generate_eventids2_table(ids)
   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[    rb_hash_aset(h, intern_sym("#{id}"), INT2FIX(1));\n]
+    buf << %Q[    id = rb_intern_const("#{id}");\n]
+    buf << %Q[    rb_hash_aset(h, ID2SYM(id), INT2NUM(1));\n]
   end
   buf << %Q[}\n]
   buf
@@ -139,9 +135,9 @@ def read_ids1_with_locations(path)
   h = {}
   File.open(path) {|f|
     f.each do |line|
-      next if /\A\#\s*define\s+dispatch/ =~ line
+      next if /\A\#\s*define\s+s?dispatch/ =~ line
       next if /ripper_dispatch/ =~ line
-      line.scan(/\bdispatch(\d)\((\w+)/) do |arity, event|
+      line.scan(/dispatch(\d)\((\w+)/) do |arity, event|
         (h[event] ||= []).push [f.lineno, arity.to_i]
       end
     end
@@ -150,13 +146,9 @@ def read_ids1_with_locations(path)
 end
 
 def read_ids2(path)
-  src = File.open(path) {|f| f.read}
-  ids2 = src.scan(/ID\s+ripper_id_(\w+)/).flatten.uniq.sort
-  diff = src.scan(/set_id2\((\w+)\);/).flatten - ids2
-  unless diff.empty?
-    abort "missing scanner IDs: #{diff}"
-  end
-  return ids2
+  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
index 2377506cd5..06397cea05 100755
--- a/ext/ripper/tools/preproc.rb
+++ b/ext/ripper/tools/preproc.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # $Id$
 
 require 'optparse'
diff --git a/ext/ripper/tools/strip.rb b/ext/ripper/tools/strip.rb
index 0e409eb63b..99413c361d 100755
--- a/ext/ripper/tools/strip.rb
+++ b/ext/ripper/tools/strip.rb
@@ -1,10 +1,10 @@
-# frozen_string_literal: false
 last_is_void = false
 ARGF.each do |line|
-  case line
-  when /\A\s*\z/, /\A\#/
-    puts unless last_is_void
+  if line.strip.empty?
+    #puts() unless last_is_void
     last_is_void = true
+  elsif /\A\#/ === line
+    ;
   else
     print line
     last_is_void = false
diff --git a/ext/rubyvm/extconf.rb b/ext/rubyvm/extconf.rb
deleted file mode 100644
index 8c40f58e2b..0000000000
--- a/ext/rubyvm/extconf.rb
+++ /dev/null
@@ -1 +0,0 @@
-create_makefile("rubyvm")
diff --git a/ext/rubyvm/lib/forwardable/impl.rb b/ext/rubyvm/lib/forwardable/impl.rb
deleted file mode 100644
index e9ada26e74..0000000000
--- a/ext/rubyvm/lib/forwardable/impl.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# :stopdoc:
-module Forwardable
-  FILTER_EXCEPTION = ""
-
-  def self._valid_method?(method)
-    iseq = RubyVM::InstructionSequence.compile("().#{method}", nil, nil, 0, false)
-  rescue SyntaxError
-    false
-  else
-    iseq.to_a.dig(-1, 1, 1, :mid) == method.to_sym
-  end
-
-  def self._compile_method(src, file, line)
-    RubyVM::InstructionSequence.compile(src, file, file, line,
-               trace_instruction: false,
-               tailcall_optimization: true)
-      .eval
-  end
-end
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 9ff0e7959a..847eb2aaf6 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -7,7 +7,8 @@
  * core routines
  */
 
-#include "ruby/ruby.h"
+#include "ruby/config.h"
+#include "ruby/defines.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
@@ -372,7 +373,7 @@ makroom(register DBM *db, long int hash, int need)
 {
 	long newp;
 	char twin[PBLKSIZ];
-#if defined _WIN32
+#if defined _WIN32 && !defined __CYGWIN__
 	char zer[PBLKSIZ];
 	long oldtail;
 #endif
@@ -399,7 +400,7 @@ makroom(register DBM *db, long int hash, int need)
  * here, as sdbm_store will do so, after it inserts the incoming pair.
  */
 
-#if defined _WIN32
+#if defined _WIN32 && !defined __CYGWIN__
 	/*
 	 * Fill hole with 0 if made it.
 	 * (hole is NOT read as 0)
@@ -506,7 +507,7 @@ getpage(register DBM *db, register long int hash)
 	while (dbit < db->maxbno && getdbit(db, dbit))
 		dbit = 2 * dbit + ((hash & ((long) 1 << hbit++)) ? 2 : 1);
 
-	debug(("dbit: %ld...", dbit));
+	debug(("dbit: %d...", dbit));
 
 	db->curbit = dbit;
 	db->hmask = masks[hbit];
@@ -531,7 +532,7 @@ getpage(register DBM *db, register long int hash)
 		}
 		db->pagbno = pagb;
 
-		debug(("pag read: %ld\n", pagb));
+		debug(("pag read: %d\n", pagb));
 	}
 	return 1;
 }
@@ -551,7 +552,7 @@ getdbit(register DBM *db, register long int dbit)
 			return 0;
 		db->dirbno = dirb;
 
-		debug(("dir read: %ld\n", dirb));
+		debug(("dir read: %d\n", dirb));
 	}
 
 	return db->dirbuf[c % DBLKSIZ] & (1 << (dbit % BYTESIZ));
@@ -572,7 +573,7 @@ setdbit(register DBM *db, register long int dbit)
 			return 0;
 		db->dirbno = dirb;
 
-		debug(("dir read: %ld\n", dirb));
+		debug(("dir read: %d\n", dirb));
 	}
 
 	db->dirbuf[c % DBLKSIZ] |= (1 << (dbit % BYTESIZ));
@@ -802,7 +803,7 @@ delpair(char *pag, datum key)
 		}
 #else
 #ifdef MEMMOVE
-		memmove(dst-m, src-m, m);
+		memmove(dst, src, m);
 #else
 		while (m--)
 			*--dst = *--src;
diff --git a/ext/sdbm/depend b/ext/sdbm/depend
index aeb2099e18..09f171a511 100644
--- a/ext/sdbm/depend
+++ b/ext/sdbm/depend
@@ -1,25 +1,2 @@
-# AUTOGENERATED DEPENDENCIES START
-_sdbm.o: $(RUBY_EXTCONF_H)
-_sdbm.o: $(arch_hdrdir)/ruby/config.h
-_sdbm.o: $(hdrdir)/ruby/backward.h
-_sdbm.o: $(hdrdir)/ruby/defines.h
-_sdbm.o: $(hdrdir)/ruby/intern.h
-_sdbm.o: $(hdrdir)/ruby/missing.h
-_sdbm.o: $(hdrdir)/ruby/ruby.h
-_sdbm.o: $(hdrdir)/ruby/st.h
-_sdbm.o: $(hdrdir)/ruby/subst.h
-_sdbm.o: _sdbm.c
-_sdbm.o: sdbm.h
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: init.c
-init.o: sdbm.h
-# AUTOGENERATED DEPENDENCIES END
+_sdbm.o: _sdbm.c sdbm.h $(HDRS) $(ruby_headers)
+init.o: init.c sdbm.h $(HDRS) $(ruby_headers)
diff --git a/ext/sdbm/extconf.rb b/ext/sdbm/extconf.rb
index bdf3e299e6..67796fbf8a 100644
--- a/ext/sdbm/extconf.rb
+++ b/ext/sdbm/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 $defs << "-D""BADMESS=0"
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 684f31b98f..92901181a5 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -72,13 +72,13 @@ struct dbmdata {
 };
 
 static void
-closed_sdbm(void)
+closed_sdbm()
 {
     rb_raise(rb_eDBMError, "closed SDBM file");
 }
 
 #define GetDBM(obj, dbmp) do {\
-    TypedData_Get_Struct((obj), struct dbmdata, &sdbm_type, (dbmp));\
+    Data_Get_Struct((obj), struct dbmdata, (dbmp));\
     if ((dbmp) == 0) closed_sdbm();\
     if ((dbmp)->di_dbm == 0) closed_sdbm();\
 } while (0)
@@ -89,33 +89,13 @@ closed_sdbm(void)
 } while (0)
 
 static void
-free_sdbm(void *ptr)
+free_sdbm(struct dbmdata *dbmp)
 {
-    struct dbmdata *dbmp = ptr;
 
     if (dbmp->di_dbm) sdbm_close(dbmp->di_dbm);
     ruby_xfree(dbmp);
 }
 
-static size_t
-memsize_dbm(const void *ptr)
-{
-    size_t size = 0;
-    const struct dbmdata *dbmp = ptr;
-    if (dbmp) {
-	size += sizeof(*dbmp);
-	if (dbmp->di_dbm) size += sizeof(DBM);
-    }
-    return size;
-}
-
-static const rb_data_type_t sdbm_type = {
-    "sdbm",
-    {0, free_sdbm, memsize_dbm,},
-    0, 0,
-    RUBY_TYPED_FREE_IMMEDIATELY,
-};
-
 /*
  * call-seq:
  *   sdbm.close -> nil
@@ -147,7 +127,7 @@ fsdbm_closed(VALUE obj)
 {
     struct dbmdata *dbmp;
 
-    TypedData_Get_Struct(obj, struct dbmdata, &sdbm_type, dbmp);
+    Data_Get_Struct(obj, struct dbmdata, dbmp);
     if (dbmp == 0)
 	return Qtrue;
     if (dbmp->di_dbm == 0)
@@ -159,7 +139,7 @@ fsdbm_closed(VALUE obj)
 static VALUE
 fsdbm_alloc(VALUE klass)
 {
-    return TypedData_Wrap_Struct(klass, &sdbm_type, 0);
+    return Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 }
 /*
  * call-seq:
@@ -179,7 +159,8 @@ fsdbm_alloc(VALUE klass)
 static VALUE
 fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE file, vmode;
+    volatile VALUE file;
+    VALUE vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode;
@@ -237,7 +218,7 @@ fsdbm_initialize(int argc, VALUE *argv, VALUE obj)
 static VALUE
 fsdbm_s_open(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE obj = fsdbm_alloc(klass);
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 
     if (NIL_P(fsdbm_initialize(argc, argv, obj))) {
 	return Qnil;
@@ -511,8 +492,7 @@ fsdbm_delete_if(VALUE obj)
     DBM *dbm;
     VALUE keystr, valstr;
     VALUE ret, ary = rb_ary_new();
-    long i;
-    int status = 0, n;
+    int i, status = 0, n;
 
     fdbm_modify(obj);
     GetDBM2(obj, dbmp, dbm);
@@ -529,7 +509,7 @@ fsdbm_delete_if(VALUE obj)
     }
 
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	keystr = RARRAY_AREF(ary, i);
+	keystr = RARRAY_PTR(ary)[i];
 	ExportStringValue(keystr);
 	key.dptr = RSTRING_PTR(keystr);
 	key.dsize = RSTRING_LENINT(keystr);
@@ -654,13 +634,11 @@ fsdbm_store(VALUE obj, VALUE keystr, VALUE valstr)
 static VALUE
 update_i(RB_BLOCK_CALL_FUNC_ARGLIST(pair, dbm))
 {
-    const VALUE *ptr;
     Check_Type(pair, T_ARRAY);
     if (RARRAY_LEN(pair) < 2) {
 	rb_raise(rb_eArgError, "pair must be [key, value]");
     }
-    ptr = RARRAY_CONST_PTR(pair);
-    fsdbm_store(dbm, ptr[0], ptr[1]);
+    fsdbm_store(dbm, RARRAY_PTR(pair)[0], RARRAY_PTR(pair)[1]);
     return Qnil;
 }
 
@@ -1013,7 +991,7 @@ fsdbm_reject(VALUE obj)
 }
 
 void
-Init_sdbm(void)
+Init_sdbm()
 {
     rb_cDBM = rb_define_class("SDBM", rb_cObject);
     rb_eDBMError = rb_define_class("SDBMError", rb_eStandardError);
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index f5451c9569..218085d5ce 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -3,7 +3,6 @@
 #include <time.h>
 
 int rsock_cmsg_cloexec_state = -1; /* <0: unknown, 0: ignored, >0: working */
-static VALUE sym_wait_readable, sym_wait_writable;
 
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
 static VALUE rb_cAncillaryData;
@@ -207,7 +206,7 @@ ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass)
     str = rb_str_buf_new(sizeof(int) * argc);
 
     for (i = 0 ; i < argc; i++) {
-        VALUE obj = RARRAY_AREF(ary, i);
+        VALUE obj = RARRAY_PTR(ary)[i];
         rb_io_t *fptr;
         int fd;
         GetOpenFile(obj, fptr);
@@ -360,8 +359,6 @@ ancillary_timestamp(VALUE self)
  *
  * The size and endian is dependent on the host.
  *
- *   require 'socket'
- *
  *   p Socket::AncillaryData.int(:UNIX, :SOCKET, :RIGHTS, STDERR.fileno)
  *   #=> #<Socket::AncillaryData: UNIX SOCKET RIGHTS 2>
  */
@@ -992,7 +989,7 @@ ancillary_inspect(VALUE self)
 
         vtype = ip_cmsg_type_to_sym(level, type);
         if (SYMBOL_P(vtype))
-            rb_str_catf(ret, " %"PRIsVALUE, rb_sym2str(vtype));
+            rb_str_catf(ret, " %s", rb_id2name(SYM2ID(vtype)));
         else
             rb_str_catf(ret, " cmsg_type:%d", type);
     }
@@ -1108,8 +1105,8 @@ ancillary_cmsg_is_p(VALUE self, VALUE vlevel, VALUE vtype)
 #if defined(HAVE_SENDMSG)
 struct sendmsg_args_struct {
     int fd;
-    int flags;
     const struct msghdr *msg;
+    int flags;
 };
 
 static void *
@@ -1130,16 +1127,16 @@ rb_sendmsg(int fd, const struct msghdr *msg, int flags)
 }
 
 static VALUE
-bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
-		       VALUE dest_sockaddr, VALUE controls, VALUE ex,
-		       int nonblock)
+bsock_sendmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
 {
     rb_io_t *fptr;
+    VALUE data, vflags, dest_sockaddr;
+    int controls_num;
     struct msghdr mh;
     struct iovec iov;
-    int controls_num;
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-    VALUE controls_str = 0;
+    volatile VALUE controls_str = 0;
+    VALUE *controls_ptr = NULL;
     int family;
 #endif
     int flags;
@@ -1147,21 +1144,27 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
 
     GetOpenFile(sock, fptr);
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-    family = rsock_getfamily(fptr);
+    family = rsock_getfamily(fptr->fd);
 #endif
 
-    StringValue(data);
+    data = vflags = dest_sockaddr = Qnil;
 
-    if (!RB_TYPE_P(controls, T_ARRAY)) {
-	controls = rb_ary_new();
-    }
-    controls_num = RARRAY_LENINT(controls);
+    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];
+    controls_num = 3 < argc ? argc - 3 : 0;
+#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
+    if (3 < argc) { controls_ptr = &argv[3]; }
+#endif
+
+    StringValue(data);
 
     if (controls_num) {
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
 	int i;
 	size_t last_pad = 0;
-	const VALUE *controls_ptr = RARRAY_CONST_PTR(controls);
 #if defined(__NetBSD__)
         int last_level = 0;
         int last_type = 0;
@@ -1236,7 +1239,6 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
                 rb_str_set_len(controls_str, RSTRING_LEN(controls_str)-last_pad);
 #endif
 	}
-	RB_GC_GUARD(controls);
 #else
 	rb_raise(rb_eNotImpError, "control message for sendmsg is unimplemented");
 #endif
@@ -1268,63 +1270,96 @@ bsock_sendmsg_internal(VALUE sock, VALUE data, VALUE vflags,
         mh.msg_control = RSTRING_PTR(controls_str);
         mh.msg_controllen = RSTRING_SOCKLEN(controls_str);
     }
+    else {
+        mh.msg_control = NULL;
+        mh.msg_controllen = 0;
+    }
 #endif
 
     rb_io_check_closed(fptr);
-    if (nonblock && !MSG_DONTWAIT_RELIABLE)
+    if (nonblock)
         rb_io_set_nonblock(fptr);
 
     ss = rb_sendmsg(fptr->fd, &mh, flags);
 
     if (ss == -1) {
-	int e;
         if (!nonblock && rb_io_wait_writable(fptr->fd)) {
             rb_io_check_closed(fptr);
             goto retry;
         }
-	e = errno;
-	if (nonblock && (e == EWOULDBLOCK || e == EAGAIN)) {
-	    if (ex == Qfalse) {
-		return sym_wait_writable;
-	    }
-	    rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e,
-				     "sendmsg(2) would block");
-	}
-	rb_syserr_fail(e, "sendmsg(2)");
+        if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
+            rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "sendmsg(2) would block");
+	rb_sys_fail("sendmsg(2)");
     }
-#if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-    RB_GC_GUARD(controls_str);
-#endif
 
     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(VALUE sock, VALUE data, VALUE flags, VALUE dest_sockaddr,
-		    VALUE controls)
+rsock_bsock_sendmsg(int argc, VALUE *argv, VALUE sock)
 {
-    return bsock_sendmsg_internal(sock, data, flags, dest_sockaddr, controls,
-				  Qtrue, 0);
+    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(VALUE sock, VALUE data, VALUE flags,
-			     VALUE dest_sockaddr, VALUE controls, VALUE ex)
+rsock_bsock_sendmsg_nonblock(int argc, VALUE *argv, VALUE sock)
 {
-    return bsock_sendmsg_internal(sock, data, flags, dest_sockaddr,
-				  controls, ex, 1);
+    return bsock_sendmsg_internal(argc, argv, sock, 1);
 }
 #endif
 
 #if defined(HAVE_RECVMSG)
 struct recvmsg_args_struct {
     int fd;
-    int flags;
     struct msghdr *msg;
+    int flags;
 };
 
 ssize_t
@@ -1444,18 +1479,18 @@ make_io_for_unix_rights(VALUE ctl, struct cmsghdr *cmh, char *msg_end)
 #endif
 
 static VALUE
-bsock_recvmsg_internal(VALUE sock,
-		VALUE vmaxdatlen, VALUE vflags, VALUE vmaxctllen,
-		VALUE scm_rights, VALUE ex, int nonblock)
+bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
 {
     rb_io_t *fptr;
+    VALUE vmaxdatlen, vmaxctllen, vflags;
+    VALUE vopts;
     int grow_buffer;
     size_t maxdatlen;
     int flags, orig_flags;
     struct msghdr mh;
     struct iovec iov;
     union_sockaddr namebuf;
-    char *datbuf;
+    char datbuf0[4096], *datbuf;
     VALUE dat_str = Qnil;
     VALUE ret;
     ssize_t ss;
@@ -1463,20 +1498,27 @@ bsock_recvmsg_internal(VALUE sock,
 #if defined(HAVE_STRUCT_MSGHDR_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
 
-    maxdatlen = NIL_P(vmaxdatlen) ? 4096 : NUM2SIZET(vmaxdatlen);
+
+    rb_scan_args(argc, argv, "03:", &vmaxdatlen, &vflags, &vmaxctllen, &vopts);
+
+    maxdatlen = NIL_P(vmaxdatlen) ? sizeof(datbuf0) : NUM2SIZET(vmaxdatlen);
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-    maxctllen = NIL_P(vmaxctllen) ? 4096 : NUM2SIZET(vmaxctllen);
+    maxctllen = NIL_P(vmaxctllen) ? sizeof(ctlbuf0) : NUM2SIZET(vmaxctllen);
 #else
     if (!NIL_P(vmaxctllen))
         rb_raise(rb_eArgError, "control message not supported");
 #endif
-    flags = NUM2INT(vflags);
+    flags = NIL_P(vflags) ? 0 : NUM2INT(vflags);
 #ifdef MSG_DONTWAIT
     if (nonblock)
         flags |= MSG_DONTWAIT;
@@ -1486,7 +1528,7 @@ bsock_recvmsg_internal(VALUE sock,
     grow_buffer = NIL_P(vmaxdatlen) || NIL_P(vmaxctllen);
 
     request_scm_rights = 0;
-    if (RTEST(scm_rights))
+    if (!NIL_P(vopts) && RTEST(rb_hash_aref(vopts, ID2SYM(rb_intern("scm_rights")))))
         request_scm_rights = 1;
 #if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
     if (request_scm_rights)
@@ -1511,18 +1553,26 @@ bsock_recvmsg_internal(VALUE sock,
 #endif
 
   retry:
-    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 (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_STRUCT_MSGHDR_MSG_CONTROL)
-    if (NIL_P(ctl_str))
-	ctl_str = rb_str_tmp_new(maxctllen);
-    else
-	rb_str_resize(ctl_str, maxctllen);
-    ctlbuf = RSTRING_PTR(ctl_str);
+    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));
@@ -1545,26 +1595,20 @@ bsock_recvmsg_internal(VALUE sock,
         flags |= MSG_PEEK;
 
     rb_io_check_closed(fptr);
-    if (nonblock && !MSG_DONTWAIT_RELIABLE)
+    if (nonblock)
         rb_io_set_nonblock(fptr);
 
     ss = rb_recvmsg(fptr->fd, &mh, flags);
 
     if (ss == -1) {
-	int e;
         if (!nonblock && rb_io_wait_readable(fptr->fd)) {
             rb_io_check_closed(fptr);
             goto retry;
         }
-	e = errno;
-	if (nonblock && (e == EWOULDBLOCK || e == EAGAIN)) {
-            if (ex == Qfalse) {
-                return sym_wait_readable;
-            }
-	    rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "recvmsg(2) would block");
-        }
+        if (nonblock && (errno == EWOULDBLOCK || errno == EAGAIN))
+            rb_readwrite_sys_fail(RB_IO_WAIT_READABLE, "recvmsg(2) would block");
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-	if (!gc_done && (e == EMFILE || e == EMSGSIZE)) {
+        if (!gc_done && (errno == EMFILE || errno == EMSGSIZE)) {
           /*
            * When SCM_RIGHTS hit the file descriptors limit:
            * - Linux 2.6.18 causes success with MSG_CTRUNC
@@ -1576,23 +1620,19 @@ bsock_recvmsg_internal(VALUE sock,
             gc_done = 1;
 	    goto retry;
         }
-#else
-	if (NIL_P(vmaxdatlen) && grow_buffer && e == EMSGSIZE)
-	    ss = (ssize_t)iov.iov_len;
-	else
 #endif
-	rb_syserr_fail(e, "recvmsg(2)");
+	rb_sys_fail("recvmsg(2)");
     }
 
     if (grow_buffer) {
 	int grown = 0;
-	if (NIL_P(vmaxdatlen) && ss != -1 && ss == (ssize_t)iov.iov_len) {
+#if defined(HAVE_STRUCT_MSGHDR_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 defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
         if (NIL_P(vmaxctllen) && (mh.msg_flags & MSG_CTRUNC)) {
 #define BIG_ENOUGH_SPACE 65536
             if (BIG_ENOUGH_SPACE < maxctllen &&
@@ -1612,6 +1652,13 @@ bsock_recvmsg_internal(VALUE sock,
             }
 #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, (flags & MSG_PEEK) != 0);
@@ -1645,7 +1692,7 @@ bsock_recvmsg_internal(VALUE sock,
 			 );
 
 #if defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL)
-    family = rsock_getfamily(fptr);
+    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)) {
@@ -1664,7 +1711,6 @@ bsock_recvmsg_internal(VALUE sock,
                 discard_cmsg(cmh, msg_end, (flags & MSG_PEEK) != 0);
             rb_ary_push(ret, ctl);
         }
-        RB_GC_GUARD(ctl_str);
     }
 #endif
 
@@ -1673,21 +1719,82 @@ bsock_recvmsg_internal(VALUE sock,
 #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(VALUE sock, VALUE dlen, VALUE flags, VALUE clen,
-		    VALUE scm_rights)
+rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock)
 {
-    VALUE ex = Qtrue;
-    return bsock_recvmsg_internal(sock, dlen, flags, clen, scm_rights, ex, 0);
+    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(VALUE sock, VALUE dlen, VALUE flags, VALUE clen,
-			     VALUE scm_rights, VALUE ex)
+rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock)
 {
-    return bsock_recvmsg_internal(sock, dlen, flags, clen, scm_rights, ex, 1);
+    return bsock_recvmsg_internal(argc, argv, sock, 1);
 }
 #endif
 
@@ -1728,7 +1835,4 @@ rsock_init_ancdata(void)
     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
-#undef rb_intern
-    sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
-    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
 }
diff --git a/ext/socket/basicsocket.c b/ext/socket/basicsocket.c
index 264b882500..088234aa85 100644
--- a/ext/socket/basicsocket.c
+++ b/ext/socket/basicsocket.c
@@ -66,6 +66,9 @@ bsock_shutdown(int argc, VALUE *argv, VALUE sock)
     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;
@@ -97,6 +100,9 @@ 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)) {
@@ -127,6 +133,9 @@ 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);
@@ -158,10 +167,10 @@ bsock_close_write(VALUE sock)
  * * +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:
- *   - Integer: value is assigned to an int, and a pointer to the int is
+ *   - 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 an Integer. Note that +false+ must be passed,
+ *     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
@@ -213,8 +222,9 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
         rb_scan_args(argc, argv, "30", &lev, &optname, &val);
     }
 
+    rb_secure(2);
     GetOpenFile(sock, fptr);
-    family = rsock_getfamily(fptr);
+    family = rsock_getfamily(fptr->fd);
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
 
@@ -244,6 +254,7 @@ bsock_setsockopt(int argc, VALUE *argv, VALUE sock)
     return INT2FIX(0);
 }
 
+#if !defined(__BEOS__)
 /*
  * Document-method: getsockopt
  * call-seq:
@@ -310,7 +321,7 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
     int family;
 
     GetOpenFile(sock, fptr);
-    family = rsock_getfamily(fptr);
+    family = rsock_getfamily(fptr->fd);
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
     len = 256;
@@ -323,6 +334,9 @@ bsock_getsockopt(VALUE sock, VALUE lev, VALUE optname)
 
     return rsock_sockopt_new(family, level, option, rb_str_new(buf, len));
 }
+#else
+#define bsock_getsockopt rb_f_notimplement
+#endif
 
 /*
  * call-seq:
@@ -565,15 +579,11 @@ rsock_bsock_send(int argc, VALUE *argv, VALUE sock)
  *
  * Gets the do_not_reverse_lookup flag of _basicsocket_.
  *
- *   require 'socket'
- *
- *   BasicSocket.do_not_reverse_lookup = false
  *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
  *     p sock.do_not_reverse_lookup      #=> false
- *   }
- *   BasicSocket.do_not_reverse_lookup = true
- *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
- *     p sock.do_not_reverse_lookup      #=> true
+ *     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
@@ -591,12 +601,10 @@ bsock_do_not_reverse_lookup(VALUE sock)
  *
  * Sets the do_not_reverse_lookup flag of _basicsocket_.
  *
- *   TCPSocket.open("www.ruby-lang.org", 80) {|sock|
- *     p sock.do_not_reverse_lookup       #=> true
- *     p sock.peeraddr                    #=> ["AF_INET", 80, "221.186.184.68", "221.186.184.68"]
- *     sock.do_not_reverse_lookup = false
- *     p sock.peeraddr                    #=> ["AF_INET", 80, "carbon.ruby-lang.org", "54.163.249.195"]
- *   }
+ *   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
@@ -616,7 +624,8 @@ bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
 
 /*
  * call-seq:
- *   basicsocket.recv(maxlen[, flags[, outbuf]]) => mesg
+ *   basicsocket.recv(maxlen) => mesg
+ *   basicsocket.recv(maxlen, flags) => mesg
  *
  * Receives a message.
  *
@@ -624,9 +633,6 @@ bsock_do_not_reverse_lookup_set(VALUE sock, VALUE state)
  *
  * _flags_ should be a bitwise OR of Socket::MSG_* constants.
  *
- * _outbuf_ will contain only the received data after the method call
- * even if it is not empty at the beginning.
- *
  *   UNIXSocket.pair {|s1, s2|
  *     s1.puts "Hello World"
  *     p s2.recv(4)                     #=> "Hell"
@@ -641,11 +647,55 @@ bsock_recv(int argc, VALUE *argv, VALUE sock)
     return rsock_s_recvfrom(sock, argc, argv, RECV_RECV);
 }
 
-/* :nodoc: */
+/*
+ * 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(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
+bsock_recv_nonblock(int argc, VALUE *argv, VALUE sock)
 {
-    return rsock_s_recvfrom_nonblock(sock, len, flg, str, ex, RECV_RECV);
+    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_RECV);
 }
 
 /*
@@ -714,22 +764,13 @@ rsock_init_basicsocket(void)
     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);
 
-    /* for ext/socket/lib/socket.rb use only: */
-    rb_define_private_method(rb_cBasicSocket,
-			     "__recv_nonblock", bsock_recv_nonblock, 4);
-
-    /* in ancdata.c */
-    rb_define_private_method(rb_cBasicSocket, "__sendmsg",
-			     rsock_bsock_sendmsg, 4);
-    rb_define_private_method(rb_cBasicSocket, "__sendmsg_nonblock",
-			     rsock_bsock_sendmsg_nonblock, 5);
-    rb_define_private_method(rb_cBasicSocket, "__recvmsg",
-			     rsock_bsock_recvmsg, 4);
-    rb_define_private_method(rb_cBasicSocket, "__recvmsg_nonblock",
-			    rsock_bsock_recvmsg_nonblock, 5);
+    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
index 6fc862777e..bab27b23bb 100644
--- a/ext/socket/constants.c
+++ b/ext/socket/constants.c
@@ -22,7 +22,7 @@ constant_arg(VALUE arg, int (*str_to_int)(const char*, long, int*), const char *
     int ret;
 
     if (SYMBOL_P(arg)) {
-        arg = rb_sym2str(arg);
+        arg = rb_sym_to_s(arg);
         goto str;
     }
     else if (!NIL_P(tmp = rb_check_string_type(arg))) {
diff --git a/ext/socket/depend b/ext/socket/depend
index 4b93dbeb1f..cd3fae98ea 100644
--- a/ext/socket/depend
+++ b/ext/socket/depend
@@ -1,312 +1,29 @@
-srcs: constdefs.h constdefs.c
+SOCK_HEADERS = $(srcdir)/rubysocket.h $(HDRS) $(ruby_headers) \
+	$(hdrdir)/ruby/encoding.h \
+        $(hdrdir)/ruby/oniguruma.h \
+        $(hdrdir)/ruby/util.h \
+	$(hdrdir)/ruby/io.h $(hdrdir)/ruby/thread.h \
+	$(srcdir)/addrinfo.h $(srcdir)/sockport.h constdefs.h $(top_srcdir)/internal.h
 
-getnameinfo.o: getnameinfo.c $(arch_hdrdir)/ruby/config.h addrinfo.h sockport.h rubysocket.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)
+ifaddr.o: ifaddr.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
-
-# AUTOGENERATED DEPENDENCIES START
-ancdata.o: $(RUBY_EXTCONF_H)
-ancdata.o: $(arch_hdrdir)/ruby/config.h
-ancdata.o: $(hdrdir)/ruby/backward.h
-ancdata.o: $(hdrdir)/ruby/defines.h
-ancdata.o: $(hdrdir)/ruby/encoding.h
-ancdata.o: $(hdrdir)/ruby/intern.h
-ancdata.o: $(hdrdir)/ruby/io.h
-ancdata.o: $(hdrdir)/ruby/missing.h
-ancdata.o: $(hdrdir)/ruby/oniguruma.h
-ancdata.o: $(hdrdir)/ruby/ruby.h
-ancdata.o: $(hdrdir)/ruby/st.h
-ancdata.o: $(hdrdir)/ruby/subst.h
-ancdata.o: $(hdrdir)/ruby/thread.h
-ancdata.o: $(hdrdir)/ruby/util.h
-ancdata.o: $(top_srcdir)/include/ruby.h
-ancdata.o: $(top_srcdir)/internal.h
-ancdata.o: ancdata.c
-ancdata.o: constdefs.h
-ancdata.o: rubysocket.h
-ancdata.o: sockport.h
-basicsocket.o: $(RUBY_EXTCONF_H)
-basicsocket.o: $(arch_hdrdir)/ruby/config.h
-basicsocket.o: $(hdrdir)/ruby/backward.h
-basicsocket.o: $(hdrdir)/ruby/defines.h
-basicsocket.o: $(hdrdir)/ruby/encoding.h
-basicsocket.o: $(hdrdir)/ruby/intern.h
-basicsocket.o: $(hdrdir)/ruby/io.h
-basicsocket.o: $(hdrdir)/ruby/missing.h
-basicsocket.o: $(hdrdir)/ruby/oniguruma.h
-basicsocket.o: $(hdrdir)/ruby/ruby.h
-basicsocket.o: $(hdrdir)/ruby/st.h
-basicsocket.o: $(hdrdir)/ruby/subst.h
-basicsocket.o: $(hdrdir)/ruby/thread.h
-basicsocket.o: $(hdrdir)/ruby/util.h
-basicsocket.o: $(top_srcdir)/include/ruby.h
-basicsocket.o: $(top_srcdir)/internal.h
-basicsocket.o: basicsocket.c
-basicsocket.o: constdefs.h
-basicsocket.o: rubysocket.h
-basicsocket.o: sockport.h
-constants.o: $(RUBY_EXTCONF_H)
-constants.o: $(arch_hdrdir)/ruby/config.h
-constants.o: $(hdrdir)/ruby/backward.h
-constants.o: $(hdrdir)/ruby/defines.h
-constants.o: $(hdrdir)/ruby/encoding.h
-constants.o: $(hdrdir)/ruby/intern.h
-constants.o: $(hdrdir)/ruby/io.h
-constants.o: $(hdrdir)/ruby/missing.h
-constants.o: $(hdrdir)/ruby/oniguruma.h
-constants.o: $(hdrdir)/ruby/ruby.h
-constants.o: $(hdrdir)/ruby/st.h
-constants.o: $(hdrdir)/ruby/subst.h
-constants.o: $(hdrdir)/ruby/thread.h
-constants.o: $(hdrdir)/ruby/util.h
-constants.o: $(top_srcdir)/include/ruby.h
-constants.o: $(top_srcdir)/internal.h
-constants.o: constants.c
-constants.o: constdefs.c
-constants.o: constdefs.h
-constants.o: rubysocket.h
-constants.o: sockport.h
-ifaddr.o: $(RUBY_EXTCONF_H)
-ifaddr.o: $(arch_hdrdir)/ruby/config.h
-ifaddr.o: $(hdrdir)/ruby/backward.h
-ifaddr.o: $(hdrdir)/ruby/defines.h
-ifaddr.o: $(hdrdir)/ruby/encoding.h
-ifaddr.o: $(hdrdir)/ruby/intern.h
-ifaddr.o: $(hdrdir)/ruby/io.h
-ifaddr.o: $(hdrdir)/ruby/missing.h
-ifaddr.o: $(hdrdir)/ruby/oniguruma.h
-ifaddr.o: $(hdrdir)/ruby/ruby.h
-ifaddr.o: $(hdrdir)/ruby/st.h
-ifaddr.o: $(hdrdir)/ruby/subst.h
-ifaddr.o: $(hdrdir)/ruby/thread.h
-ifaddr.o: $(hdrdir)/ruby/util.h
-ifaddr.o: $(top_srcdir)/include/ruby.h
-ifaddr.o: $(top_srcdir)/internal.h
-ifaddr.o: constdefs.h
-ifaddr.o: ifaddr.c
-ifaddr.o: rubysocket.h
-ifaddr.o: sockport.h
-init.o: $(RUBY_EXTCONF_H)
-init.o: $(arch_hdrdir)/ruby/config.h
-init.o: $(hdrdir)/ruby/backward.h
-init.o: $(hdrdir)/ruby/defines.h
-init.o: $(hdrdir)/ruby/encoding.h
-init.o: $(hdrdir)/ruby/intern.h
-init.o: $(hdrdir)/ruby/io.h
-init.o: $(hdrdir)/ruby/missing.h
-init.o: $(hdrdir)/ruby/oniguruma.h
-init.o: $(hdrdir)/ruby/ruby.h
-init.o: $(hdrdir)/ruby/st.h
-init.o: $(hdrdir)/ruby/subst.h
-init.o: $(hdrdir)/ruby/thread.h
-init.o: $(hdrdir)/ruby/util.h
-init.o: $(top_srcdir)/include/ruby.h
-init.o: $(top_srcdir)/internal.h
-init.o: constdefs.h
-init.o: init.c
-init.o: rubysocket.h
-init.o: sockport.h
-ipsocket.o: $(RUBY_EXTCONF_H)
-ipsocket.o: $(arch_hdrdir)/ruby/config.h
-ipsocket.o: $(hdrdir)/ruby/backward.h
-ipsocket.o: $(hdrdir)/ruby/defines.h
-ipsocket.o: $(hdrdir)/ruby/encoding.h
-ipsocket.o: $(hdrdir)/ruby/intern.h
-ipsocket.o: $(hdrdir)/ruby/io.h
-ipsocket.o: $(hdrdir)/ruby/missing.h
-ipsocket.o: $(hdrdir)/ruby/oniguruma.h
-ipsocket.o: $(hdrdir)/ruby/ruby.h
-ipsocket.o: $(hdrdir)/ruby/st.h
-ipsocket.o: $(hdrdir)/ruby/subst.h
-ipsocket.o: $(hdrdir)/ruby/thread.h
-ipsocket.o: $(hdrdir)/ruby/util.h
-ipsocket.o: $(top_srcdir)/include/ruby.h
-ipsocket.o: $(top_srcdir)/internal.h
-ipsocket.o: constdefs.h
-ipsocket.o: ipsocket.c
-ipsocket.o: rubysocket.h
-ipsocket.o: sockport.h
-option.o: $(RUBY_EXTCONF_H)
-option.o: $(arch_hdrdir)/ruby/config.h
-option.o: $(hdrdir)/ruby/backward.h
-option.o: $(hdrdir)/ruby/defines.h
-option.o: $(hdrdir)/ruby/encoding.h
-option.o: $(hdrdir)/ruby/intern.h
-option.o: $(hdrdir)/ruby/io.h
-option.o: $(hdrdir)/ruby/missing.h
-option.o: $(hdrdir)/ruby/oniguruma.h
-option.o: $(hdrdir)/ruby/ruby.h
-option.o: $(hdrdir)/ruby/st.h
-option.o: $(hdrdir)/ruby/subst.h
-option.o: $(hdrdir)/ruby/thread.h
-option.o: $(hdrdir)/ruby/util.h
-option.o: $(top_srcdir)/include/ruby.h
-option.o: $(top_srcdir)/internal.h
-option.o: constdefs.h
-option.o: option.c
-option.o: rubysocket.h
-option.o: sockport.h
-raddrinfo.o: $(RUBY_EXTCONF_H)
-raddrinfo.o: $(arch_hdrdir)/ruby/config.h
-raddrinfo.o: $(hdrdir)/ruby/backward.h
-raddrinfo.o: $(hdrdir)/ruby/defines.h
-raddrinfo.o: $(hdrdir)/ruby/encoding.h
-raddrinfo.o: $(hdrdir)/ruby/intern.h
-raddrinfo.o: $(hdrdir)/ruby/io.h
-raddrinfo.o: $(hdrdir)/ruby/missing.h
-raddrinfo.o: $(hdrdir)/ruby/oniguruma.h
-raddrinfo.o: $(hdrdir)/ruby/ruby.h
-raddrinfo.o: $(hdrdir)/ruby/st.h
-raddrinfo.o: $(hdrdir)/ruby/subst.h
-raddrinfo.o: $(hdrdir)/ruby/thread.h
-raddrinfo.o: $(hdrdir)/ruby/util.h
-raddrinfo.o: $(top_srcdir)/include/ruby.h
-raddrinfo.o: $(top_srcdir)/internal.h
-raddrinfo.o: constdefs.h
-raddrinfo.o: raddrinfo.c
-raddrinfo.o: rubysocket.h
-raddrinfo.o: sockport.h
-socket.o: $(RUBY_EXTCONF_H)
-socket.o: $(arch_hdrdir)/ruby/config.h
-socket.o: $(hdrdir)/ruby/backward.h
-socket.o: $(hdrdir)/ruby/defines.h
-socket.o: $(hdrdir)/ruby/encoding.h
-socket.o: $(hdrdir)/ruby/intern.h
-socket.o: $(hdrdir)/ruby/io.h
-socket.o: $(hdrdir)/ruby/missing.h
-socket.o: $(hdrdir)/ruby/oniguruma.h
-socket.o: $(hdrdir)/ruby/ruby.h
-socket.o: $(hdrdir)/ruby/st.h
-socket.o: $(hdrdir)/ruby/subst.h
-socket.o: $(hdrdir)/ruby/thread.h
-socket.o: $(hdrdir)/ruby/util.h
-socket.o: $(top_srcdir)/include/ruby.h
-socket.o: $(top_srcdir)/internal.h
-socket.o: constdefs.h
-socket.o: rubysocket.h
-socket.o: socket.c
-socket.o: sockport.h
-sockssocket.o: $(RUBY_EXTCONF_H)
-sockssocket.o: $(arch_hdrdir)/ruby/config.h
-sockssocket.o: $(hdrdir)/ruby/backward.h
-sockssocket.o: $(hdrdir)/ruby/defines.h
-sockssocket.o: $(hdrdir)/ruby/encoding.h
-sockssocket.o: $(hdrdir)/ruby/intern.h
-sockssocket.o: $(hdrdir)/ruby/io.h
-sockssocket.o: $(hdrdir)/ruby/missing.h
-sockssocket.o: $(hdrdir)/ruby/oniguruma.h
-sockssocket.o: $(hdrdir)/ruby/ruby.h
-sockssocket.o: $(hdrdir)/ruby/st.h
-sockssocket.o: $(hdrdir)/ruby/subst.h
-sockssocket.o: $(hdrdir)/ruby/thread.h
-sockssocket.o: $(hdrdir)/ruby/util.h
-sockssocket.o: $(top_srcdir)/include/ruby.h
-sockssocket.o: $(top_srcdir)/internal.h
-sockssocket.o: constdefs.h
-sockssocket.o: rubysocket.h
-sockssocket.o: sockport.h
-sockssocket.o: sockssocket.c
-tcpserver.o: $(RUBY_EXTCONF_H)
-tcpserver.o: $(arch_hdrdir)/ruby/config.h
-tcpserver.o: $(hdrdir)/ruby/backward.h
-tcpserver.o: $(hdrdir)/ruby/defines.h
-tcpserver.o: $(hdrdir)/ruby/encoding.h
-tcpserver.o: $(hdrdir)/ruby/intern.h
-tcpserver.o: $(hdrdir)/ruby/io.h
-tcpserver.o: $(hdrdir)/ruby/missing.h
-tcpserver.o: $(hdrdir)/ruby/oniguruma.h
-tcpserver.o: $(hdrdir)/ruby/ruby.h
-tcpserver.o: $(hdrdir)/ruby/st.h
-tcpserver.o: $(hdrdir)/ruby/subst.h
-tcpserver.o: $(hdrdir)/ruby/thread.h
-tcpserver.o: $(hdrdir)/ruby/util.h
-tcpserver.o: $(top_srcdir)/include/ruby.h
-tcpserver.o: $(top_srcdir)/internal.h
-tcpserver.o: constdefs.h
-tcpserver.o: rubysocket.h
-tcpserver.o: sockport.h
-tcpserver.o: tcpserver.c
-tcpsocket.o: $(RUBY_EXTCONF_H)
-tcpsocket.o: $(arch_hdrdir)/ruby/config.h
-tcpsocket.o: $(hdrdir)/ruby/backward.h
-tcpsocket.o: $(hdrdir)/ruby/defines.h
-tcpsocket.o: $(hdrdir)/ruby/encoding.h
-tcpsocket.o: $(hdrdir)/ruby/intern.h
-tcpsocket.o: $(hdrdir)/ruby/io.h
-tcpsocket.o: $(hdrdir)/ruby/missing.h
-tcpsocket.o: $(hdrdir)/ruby/oniguruma.h
-tcpsocket.o: $(hdrdir)/ruby/ruby.h
-tcpsocket.o: $(hdrdir)/ruby/st.h
-tcpsocket.o: $(hdrdir)/ruby/subst.h
-tcpsocket.o: $(hdrdir)/ruby/thread.h
-tcpsocket.o: $(hdrdir)/ruby/util.h
-tcpsocket.o: $(top_srcdir)/include/ruby.h
-tcpsocket.o: $(top_srcdir)/internal.h
-tcpsocket.o: constdefs.h
-tcpsocket.o: rubysocket.h
-tcpsocket.o: sockport.h
-tcpsocket.o: tcpsocket.c
-udpsocket.o: $(RUBY_EXTCONF_H)
-udpsocket.o: $(arch_hdrdir)/ruby/config.h
-udpsocket.o: $(hdrdir)/ruby/backward.h
-udpsocket.o: $(hdrdir)/ruby/defines.h
-udpsocket.o: $(hdrdir)/ruby/encoding.h
-udpsocket.o: $(hdrdir)/ruby/intern.h
-udpsocket.o: $(hdrdir)/ruby/io.h
-udpsocket.o: $(hdrdir)/ruby/missing.h
-udpsocket.o: $(hdrdir)/ruby/oniguruma.h
-udpsocket.o: $(hdrdir)/ruby/ruby.h
-udpsocket.o: $(hdrdir)/ruby/st.h
-udpsocket.o: $(hdrdir)/ruby/subst.h
-udpsocket.o: $(hdrdir)/ruby/thread.h
-udpsocket.o: $(hdrdir)/ruby/util.h
-udpsocket.o: $(top_srcdir)/include/ruby.h
-udpsocket.o: $(top_srcdir)/internal.h
-udpsocket.o: constdefs.h
-udpsocket.o: rubysocket.h
-udpsocket.o: sockport.h
-udpsocket.o: udpsocket.c
-unixserver.o: $(RUBY_EXTCONF_H)
-unixserver.o: $(arch_hdrdir)/ruby/config.h
-unixserver.o: $(hdrdir)/ruby/backward.h
-unixserver.o: $(hdrdir)/ruby/defines.h
-unixserver.o: $(hdrdir)/ruby/encoding.h
-unixserver.o: $(hdrdir)/ruby/intern.h
-unixserver.o: $(hdrdir)/ruby/io.h
-unixserver.o: $(hdrdir)/ruby/missing.h
-unixserver.o: $(hdrdir)/ruby/oniguruma.h
-unixserver.o: $(hdrdir)/ruby/ruby.h
-unixserver.o: $(hdrdir)/ruby/st.h
-unixserver.o: $(hdrdir)/ruby/subst.h
-unixserver.o: $(hdrdir)/ruby/thread.h
-unixserver.o: $(hdrdir)/ruby/util.h
-unixserver.o: $(top_srcdir)/include/ruby.h
-unixserver.o: $(top_srcdir)/internal.h
-unixserver.o: constdefs.h
-unixserver.o: rubysocket.h
-unixserver.o: sockport.h
-unixserver.o: unixserver.c
-unixsocket.o: $(RUBY_EXTCONF_H)
-unixsocket.o: $(arch_hdrdir)/ruby/config.h
-unixsocket.o: $(hdrdir)/ruby/backward.h
-unixsocket.o: $(hdrdir)/ruby/defines.h
-unixsocket.o: $(hdrdir)/ruby/encoding.h
-unixsocket.o: $(hdrdir)/ruby/intern.h
-unixsocket.o: $(hdrdir)/ruby/io.h
-unixsocket.o: $(hdrdir)/ruby/missing.h
-unixsocket.o: $(hdrdir)/ruby/oniguruma.h
-unixsocket.o: $(hdrdir)/ruby/ruby.h
-unixsocket.o: $(hdrdir)/ruby/st.h
-unixsocket.o: $(hdrdir)/ruby/subst.h
-unixsocket.o: $(hdrdir)/ruby/thread.h
-unixsocket.o: $(hdrdir)/ruby/util.h
-unixsocket.o: $(top_srcdir)/include/ruby.h
-unixsocket.o: $(top_srcdir)/internal.h
-unixsocket.o: constdefs.h
-unixsocket.o: rubysocket.h
-unixsocket.o: sockport.h
-unixsocket.o: unixsocket.c
-# AUTOGENERATED DEPENDENCIES END
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index fd70be45da..c4523da24d 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 
 AF_INET6_SOCKET_CREATION_TEST = <<EOF
@@ -385,9 +384,7 @@ if have_type("struct tcp_info", headers)
   have_const("TCP_LISTEN", headers)
   have_const("TCP_CLOSING", headers)
   have_struct_member('struct tcp_info', 'tcpi_state', headers)
-  if /solaris/ !~ RUBY_PLATFORM
-    have_struct_member('struct tcp_info', 'tcpi_ca_state', headers)
-  end
+  have_struct_member('struct tcp_info', 'tcpi_ca_state', headers)
   have_struct_member('struct tcp_info', 'tcpi_retransmits', headers)
   have_struct_member('struct tcp_info', 'tcpi_probes', headers)
   have_struct_member('struct tcp_info', 'tcpi_backoff', headers)
@@ -436,9 +433,15 @@ when /mswin(32|64)|mingw/
   have_library("ws2_32", "WSACleanup", headers)
 when /cygwin/
   test_func = "socket(0,0,0)"
+when /beos/
+  test_func = "socket(0,0,0)"
+  have_library("net", "socket(0,0,0)", headers)
 when /haiku/
   test_func = "socket(0,0,0)"
   have_library("network", "socket(0,0,0)", headers)
+when /i386-os2_emx/
+  test_func = "socket(0,0,0)"
+  have_library("socket", "socket(0,0,0)", headers)
 else
   test_func = "socket(0,0,0)"
   have_library("nsl", 't_open("", 0, (struct t_info *)NULL)', headers) # SunOS
@@ -505,7 +508,7 @@ EOF
   end
 
   ipv6 = false
-  default_ipv6 = /haiku/ !~ RUBY_PLATFORM
+  default_ipv6 = /beos|haiku/ !~ RUBY_PLATFORM
   if enable_config("ipv6", default_ipv6)
     if checking_for("ipv6") {try_link(AF_INET6_SOCKET_CREATION_TEST)}
       $defs << "-DENABLE_IPV6" << "-DINET6"
@@ -562,15 +565,29 @@ EOS
   case enable_config("wide-getaddrinfo")
   when true
     getaddr_info_ok = :wide
-  when nil, false
-    getaddr_info_ok = (:wide if getaddr_info_ok.nil?)
+  when nil
+    if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers)
+      getaddr_info_ok = :os
+      if !CROSS_COMPILING &&
+         !checking_for("system getaddrinfo working") {
+           try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)
+         }
+        getaddr_info_ok = :wide
+      end
+    else
+      getaddr_info_ok = :wide
+    end
+  when false
     if have_func("getnameinfo", headers) and have_func("getaddrinfo", headers)
-      if CROSS_COMPILING ||
-         checking_for("system getaddrinfo working") {
+      getaddr_info_ok = :os
+      if !CROSS_COMPILING &&
+         !checking_for("system getaddrinfo working") {
            try_run(cpp_include(headers) + GETADDRINFO_GETNAMEINFO_TEST)
          }
-        getaddr_info_ok = :os
+        getaddr_info_ok = nil
       end
+    else
+      getaddr_info_ok = nil
     end
   else
     raise "unexpected enable_config() value"
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c
index b01f1cb82e..a17d12b705 100644
--- a/ext/socket/getaddrinfo.c
+++ b/ext/socket/getaddrinfo.c
@@ -45,7 +45,11 @@
 #include <sys/types.h>
 #ifndef _WIN32
 #include <sys/param.h>
-#include <sys/socket.h>
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+#endif
 #include <netinet/in.h>
 #if defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
@@ -62,9 +66,6 @@
 #endif
 #include <unistd.h>
 #else
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-#include <windows.h>
-#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <io.h>
@@ -435,8 +436,11 @@ getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *h
 			s = socket(afd->a_af, SOCK_DGRAM, 0);
 			if (s < 0)
 				continue;
-
+#if defined(__BEOS__)
+			closesocket(s);
+#else
 			close(s);
+#endif
 
 			if (pai->ai_flags & AI_PASSIVE) {
 				GET_AI(cur->ai_next, afd, afd->a_addrany, port);
@@ -589,7 +593,6 @@ get_addr(const char *hostname, int af, struct addrinfo **res, struct addrinfo *p
 	} else
 		hp = getipnodebyname(hostname, af, AI_ADDRCONFIG, &h_error);
 #else
-	if (strlen(hostname) >= NI_MAXHOST) ERR(EAI_NODATA);
 	hp = gethostbyname((char*)hostname);
 	h_error = h_errno;
 #endif
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 94a5eb9439..4da9680ccb 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -41,7 +41,11 @@
 #include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32
-#include <sys/socket.h>
+#if defined(__BEOS__) && !defined(__HAIKU__) && !defined(BONE)
+# include <net/socket.h>
+#else
+# include <sys/socket.h>
+#endif
 #include <netinet/in.h>
 #if defined(HAVE_ARPA_INET_H)
 #include <arpa/inet.h>
@@ -55,9 +59,6 @@
 #endif
 #endif
 #ifdef _WIN32
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-#include <windows.h>
-#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define snprintf _snprintf
@@ -76,7 +77,6 @@ typedef int socklen_t;
 
 #include "addrinfo.h"
 #include "sockport.h"
-#include "rubysocket.h"
 
 #define SUCCESS 0
 #define ANY 0
@@ -118,6 +118,24 @@ static struct afd {
 #define ENI_FAMILY	5
 #define ENI_SALEN	6
 
+#ifndef HAVE_INET_NTOP
+static const char *
+inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
+{
+#ifdef HAVE_INET_NTOA
+	struct in_addr in;
+	memcpy(&in.s_addr, addr, sizeof(in.s_addr));
+	snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in));
+#else
+	unsigned long x = ntohl(*(unsigned long*)addr);
+	snprintf(numaddr, numaddr_len, "%d.%d.%d.%d",
+		 (int) (x>>24) & 0xff, (int) (x>>16) & 0xff,
+		 (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff);
+#endif
+	return numaddr;
+}
+#endif
+
 int
 getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags)
 {
diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c
index a954163369..15395d7088 100644
--- a/ext/socket/ifaddr.c
+++ b/ext/socket/ifaddr.c
@@ -41,6 +41,11 @@ get_root(const rb_ifaddr_t *ifaddr)
 }
 
 static void
+ifaddr_mark(void *ptr)
+{
+}
+
+static void
 ifaddr_free(void *ptr)
 {
     rb_ifaddr_t *ifaddr = ptr;
@@ -57,6 +62,8 @@ ifaddr_memsize(const void *ptr)
 {
     const rb_ifaddr_t *ifaddr;
     const rb_ifaddr_root_t *root;
+    if (ptr == NULL)
+        return 0;
     ifaddr = ptr;
     root = get_root(ifaddr);
     return sizeof(rb_ifaddr_root_t) + (root->numifaddrs - 1) * sizeof(rb_ifaddr_t);
@@ -64,7 +71,7 @@ ifaddr_memsize(const void *ptr)
 
 static const rb_data_type_t ifaddr_type = {
     "socket/ifaddr",
-    {0, ifaddr_free, ifaddr_memsize,},
+    {ifaddr_mark, ifaddr_free, ifaddr_memsize,},
 };
 
 static inline rb_ifaddr_t *
@@ -91,7 +98,7 @@ rsock_getifaddrs(void)
     int numifaddrs, i;
     struct ifaddrs *ifaddrs, *ifa;
     rb_ifaddr_root_t *root;
-    VALUE result, addr;
+    VALUE result;
 
     ret = getifaddrs(&ifaddrs);
     if (ret == -1)
@@ -105,10 +112,8 @@ rsock_getifaddrs(void)
     for (ifa = ifaddrs; ifa != NULL; ifa = ifa->ifa_next)
         numifaddrs++;
 
-    addr = TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, 0);
     root = xmalloc(sizeof(rb_ifaddr_root_t) + (numifaddrs-1) * sizeof(rb_ifaddr_t));
-    root->refcount = 0;
-    root->numifaddrs = numifaddrs;
+    root->refcount = root->numifaddrs = numifaddrs;
 
     ifa = ifaddrs;
     for (i = 0; i < numifaddrs; i++) {
@@ -117,15 +122,10 @@ rsock_getifaddrs(void)
         root->ary[i].root = root;
         ifa = ifa->ifa_next;
     }
-    RTYPEDDATA_DATA(addr) = &root->ary[0];
-    root->refcount++;
 
     result = rb_ary_new2(numifaddrs);
-    rb_ary_push(result, addr);
-    for (i = 1; i < numifaddrs; i++) {
-	addr = TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, &root->ary[i]);
-	root->refcount++;
-	rb_ary_push(result, addr);
+    for (i = 0; i < numifaddrs; i++) {
+        rb_ary_push(result, TypedData_Wrap_Struct(rb_cSockIfaddr, &ifaddr_type, &root->ary[i]));
     }
 
     return result;
diff --git a/ext/socket/init.c b/ext/socket/init.c
index 1ecd4fe352..f6cd2bce7b 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -29,43 +29,34 @@ VALUE rb_cSOCKSSocket;
 #endif
 
 int rsock_do_not_reverse_lookup = 1;
-static VALUE sym_wait_readable;
 
 void
 rsock_raise_socket_error(const char *reason, int error)
 {
 #ifdef EAI_SYSTEM
-    int e;
-    if (error == EAI_SYSTEM && (e = errno) != 0)
-	rb_syserr_fail(e, reason);
+    if (error == EAI_SYSTEM) rb_sys_fail(reason);
 #endif
     rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
 }
 
-#ifdef _WIN32
-#define is_socket(fd) rb_w32_is_socket(fd)
-#else
-static int
-is_socket(int fd)
+VALUE
+rsock_init_sock(VALUE sock, int fd)
 {
+    rb_io_t *fp;
+#ifndef _WIN32
     struct stat sbuf;
 
     if (fstat(fd, &sbuf) < 0)
         rb_sys_fail("fstat(2)");
-    return S_ISSOCK(sbuf.st_mode);
-}
+    rb_update_max_fd(fd);
+    if (!S_ISSOCK(sbuf.st_mode))
+        rb_raise(rb_eArgError, "not a socket file descriptor");
+#else
+    rb_update_max_fd(fd);
+    if (!rb_w32_is_socket(fd))
+        rb_raise(rb_eArgError, "not a socket file descriptor");
 #endif
 
-VALUE
-rsock_init_sock(VALUE sock, int fd)
-{
-    rb_io_t *fp;
-
-    if (!is_socket(fd) || rb_reserved_fd_p(fd)) {
-	rb_syserr_fail(EBADF, "not a socket file descriptor");
-    }
-
-    rb_update_max_fd(fd);
     MakeOpenFile(sock, fp);
     fp->fd = fd;
     fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
@@ -116,48 +107,21 @@ recvfrom_blocking(void *data)
     return (VALUE)ret;
 }
 
-static VALUE
-rsock_strbuf(VALUE str, long buflen)
-{
-    long len;
-
-    if (NIL_P(str)) return rb_tainted_str_new(0, buflen);
-
-    StringValue(str);
-    len = RSTRING_LEN(str);
-    if (len >= buflen) {
-	rb_str_modify(str);
-    } else {
-	rb_str_modify_expand(str, buflen - len);
-    }
-    rb_str_set_len(str, buflen);
-    return str;
-}
-
-static VALUE
-recvfrom_locktmp(VALUE v)
-{
-    struct recvfrom_arg *arg = (struct recvfrom_arg *)v;
-
-    return rb_thread_io_blocking_region(recvfrom_blocking, arg, arg->fd);
-}
-
 VALUE
 rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
 {
     rb_io_t *fptr;
-    VALUE str;
+    VALUE str, klass;
     struct recvfrom_arg arg;
     VALUE len, flg;
     long buflen;
     long slen;
 
-    rb_scan_args(argc, argv, "12", &len, &flg, &str);
+    rb_scan_args(argc, argv, "11", &len, &flg);
 
     if (flg == Qnil) arg.flags = 0;
     else             arg.flags = NUM2INT(flg);
     buflen = NUM2INT(len);
-    str = rsock_strbuf(str, buflen);
 
     GetOpenFile(sock, fptr);
     if (rb_io_read_pending(fptr)) {
@@ -165,18 +129,24 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
     }
     arg.fd = fptr->fd;
     arg.alen = (socklen_t)sizeof(arg.buf);
-    arg.str = str;
+
+    arg.str = str = rb_tainted_str_new(0, buflen);
+    klass = RBASIC(str)->klass;
+    rb_obj_hide(str);
 
     while (rb_io_check_closed(fptr),
 	   rsock_maybe_wait_fd(arg.fd),
-	   (slen = (long)rb_str_locktmp_ensure(str, recvfrom_locktmp,
-	                                       (VALUE)&arg)) < 0) {
+	   (slen = BLOCKING_REGION_FD(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");
+	}
     }
 
-    if (slen != RSTRING_LEN(str)) {
+    rb_obj_reveal(str, klass);
+    if (slen < RSTRING_LEN(str)) {
 	rb_str_set_len(str, slen);
     }
     rb_obj_taint(str);
@@ -206,21 +176,24 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
 }
 
 VALUE
-rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
-			  VALUE ex, enum sock_recv_type from)
+rsock_s_recvfrom_nonblock(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from)
 {
     rb_io_t *fptr;
+    VALUE str;
     union_sockaddr buf;
     socklen_t alen = (socklen_t)sizeof buf;
+    VALUE len, flg;
     long buflen;
     long slen;
     int fd, flags;
     VALUE addr = Qnil;
     socklen_t len0;
 
-    flags = NUM2INT(flg);
+    rb_scan_args(argc, argv, "11", &len, &flg);
+
+    if (flg == Qnil) flags = 0;
+    else             flags = NUM2INT(flg);
     buflen = NUM2INT(len);
-    str = rsock_strbuf(str, buflen);
 
 #ifdef MSG_DONTWAIT
     /* MSG_DONTWAIT avoids the race condition between fcntl and recvfrom.
@@ -234,30 +207,26 @@ rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
     }
     fd = fptr->fd;
 
-    rb_io_check_closed(fptr);
-
-    if (!MSG_DONTWAIT_RELIABLE)
-	rb_io_set_nonblock(fptr);
+    str = rb_tainted_str_new(0, buflen);
 
+    rb_io_check_closed(fptr);
+    rb_io_set_nonblock(fptr);
     len0 = alen;
     slen = recvfrom(fd, RSTRING_PTR(str), buflen, flags, &buf.addr, &alen);
     if (slen != -1 && len0 < alen)
         alen = len0;
 
     if (slen < 0) {
-	int e = errno;
-	switch (e) {
+	switch (errno) {
 	  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
 #endif
-            if (ex == Qfalse)
-		return sym_wait_readable;
-            rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "recvfrom(2) would block");
+            rb_readwrite_sys_fail(RB_IO_WAIT_READABLE, "recvfrom(2) would block");
 	}
-	rb_syserr_fail(e, "recvfrom(2)");
+	rb_sys_fail("recvfrom(2)");
     }
-    if (slen != RSTRING_LEN(str)) {
+    if (slen < RSTRING_LEN(str)) {
 	rb_str_set_len(str, slen);
     }
     rb_obj_taint(str);
@@ -360,7 +329,8 @@ rsock_socket(int domain, int type, int proto)
 
     fd = rsock_socket0(domain, type, proto);
     if (fd < 0) {
-       if (rb_gc_for_fd(errno)) {
+       if (errno == EMFILE || errno == ENFILE) {
+           rb_gc();
            fd = rsock_socket0(domain, type, proto);
        }
     }
@@ -369,69 +339,72 @@ rsock_socket(int domain, int type, int proto)
     return fd;
 }
 
-/* emulate blocking connect behavior on EINTR or non-blocking socket */
 static int
 wait_connectable(int fd)
 {
-    int sockerr, revents;
+    int sockerr;
     socklen_t sockerrlen;
+    int revents;
+    int ret;
 
-    /* only to clear pending error */
-    sockerrlen = (socklen_t)sizeof(sockerr);
-    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
-        return -1;
-
-    /*
-     * Stevens book says, successful finish turn on RB_WAITFD_OUT and
-     * failure finish turn on both RB_WAITFD_IN and RB_WAITFD_OUT.
-     * So it's enough to wait only RB_WAITFD_OUT and check the pending error
-     * by getsockopt().
-     *
-     * Note: rb_wait_for_single_fd already retries on EINTR/ERESTART
-     */
-    revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, NULL);
+    for (;;) {
+	/*
+	 * Stevens book says, successful finish turn on RB_WAITFD_OUT and
+	 * failure finish turn on both RB_WAITFD_IN and RB_WAITFD_OUT.
+	 */
+	revents = rb_wait_for_single_fd(fd, RB_WAITFD_IN|RB_WAITFD_OUT, NULL);
+
+	if (revents & (RB_WAITFD_IN|RB_WAITFD_OUT)) {
+	    sockerrlen = (socklen_t)sizeof(sockerr);
+	    ret = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
+
+	    /*
+	     * Solaris getsockopt(SO_ERROR) return -1 and set errno
+	     * in getsockopt(). Let's return immediately.
+	     */
+	    if (ret < 0)
+		break;
+	    if (sockerr == 0) {
+		if (revents & RB_WAITFD_OUT)
+		    break;
+		else
+		    continue;	/* workaround for winsock */
+	    }
+
+	    /* BSD and Linux use sockerr. */
+	    errno = sockerr;
+	    ret = -1;
+	    break;
+	}
 
-    if (revents < 0)
-        return -1;
+	if ((revents & (RB_WAITFD_IN|RB_WAITFD_OUT)) == RB_WAITFD_OUT) {
+	    ret = 0;
+	    break;
+	}
+    }
 
-    sockerrlen = (socklen_t)sizeof(sockerr);
-    if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen) < 0)
-        return -1;
+    return ret;
+}
 
-    switch (sockerr) {
-      case 0:
-      /*
-       * be defensive in case some platforms set SO_ERROR on the original,
-       * interrupted connect()
-       */
-      case EINTR:
-#ifdef ERESTART
-      case ERESTART:
+#ifdef __CYGWIN__
+#define WAIT_IN_PROGRESS 10
 #endif
-      case EAGAIN:
-#ifdef EINPROGRESS
-      case EINPROGRESS:
+#ifdef __APPLE__
+#define WAIT_IN_PROGRESS 10
 #endif
-#ifdef EALREADY
-      case EALREADY:
+#ifdef __linux__
+/* returns correct error */
+#define WAIT_IN_PROGRESS 0
 #endif
-#ifdef EISCONN
-      case EISCONN:
+#ifndef WAIT_IN_PROGRESS
+/* BSD origin code apparently has a problem */
+#define WAIT_IN_PROGRESS 1
 #endif
-	return 0; /* success */
-      default:
-        /* likely (but not limited to): ECONNREFUSED, ETIMEDOUT, EHOSTUNREACH */
-        errno = sockerr;
-        return -1;
-    }
-
-    return 0;
-}
 
 struct connect_arg {
     int fd;
-    socklen_t len;
     const struct sockaddr *sockaddr;
+    socklen_t len;
 };
 
 static VALUE
@@ -456,6 +429,11 @@ 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;
@@ -463,22 +441,76 @@ rsock_connect(int fd, const struct sockaddr *sockaddr, int len, int socks)
 #if defined(SOCKS) && !defined(SOCKS5)
     if (socks) func = socks_connect_blocking;
 #endif
-    status = (int)BLOCKING_REGION_FD(func, &arg);
-
-    if (status < 0) {
-        switch (errno) {
-          case EINTR:
-#ifdef ERESTART
-          case ERESTART:
+    for (;;) {
+	status = (int)BLOCKING_REGION_FD(func, &arg);
+	if (status < 0) {
+	    switch (errno) {
+	      case EINTR:
+#if defined(ERESTART)
+	      case ERESTART:
 #endif
-          case EAGAIN:
+		continue;
+
+	      case EAGAIN:
 #ifdef EINPROGRESS
-          case EINPROGRESS:
+	      case EINPROGRESS:
 #endif
-            return wait_connectable(fd);
-        }
+#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;
     }
-    return status;
 }
 
 static void
@@ -500,8 +532,7 @@ make_fd_nonblock(int fd)
 }
 
 static int
-cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
-	       int nonblock)
+cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len)
 {
     int ret;
     socklen_t len0 = 0;
@@ -515,21 +546,11 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
 #ifdef SOCK_CLOEXEC
         flags |= SOCK_CLOEXEC;
 #endif
-#ifdef SOCK_NONBLOCK
-        if (nonblock) {
-            flags |= SOCK_NONBLOCK;
-        }
-#endif
         ret = accept4(socket, address, address_len, flags);
         /* accept4 is available since Linux 2.6.28, glibc 2.10. */
         if (ret != -1) {
             if (ret <= 2)
                 rb_maygvl_fd_fix_cloexec(ret);
-#ifndef SOCK_NONBLOCK
-            if (nonblock) {
-                make_fd_nonblock(ret);
-            }
-#endif
             if (address_len && len0 < *address_len) *address_len = len0;
             return ret;
         }
@@ -543,23 +564,20 @@ cloexec_accept(int socket, struct sockaddr *address, socklen_t *address_len,
     if (ret == -1) return -1;
     if (address_len && len0 < *address_len) *address_len = len0;
     rb_maygvl_fd_fix_cloexec(ret);
-    if (nonblock) {
-        make_fd_nonblock(ret);
-    }
     return ret;
 }
 
+
 VALUE
-rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
-			struct sockaddr *sockaddr, socklen_t *len)
+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 = cloexec_accept(fptr->fd, (struct sockaddr*)sockaddr, len, 1);
+    fd2 = cloexec_accept(fptr->fd, (struct sockaddr*)sockaddr, len);
     if (fd2 < 0) {
-	int e = errno;
-	switch (e) {
+	switch (errno) {
 	  case EAGAIN:
 #if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
 	  case EWOULDBLOCK:
@@ -568,13 +586,12 @@ rsock_s_accept_nonblock(VALUE klass, VALUE ex, rb_io_t *fptr,
 #if defined EPROTO
 	  case EPROTO:
 #endif
-            if (ex == Qfalse)
-		return sym_wait_readable;
-            rb_readwrite_syserr_fail(RB_IO_WAIT_READABLE, e, "accept(2) would block");
+            rb_readwrite_sys_fail(RB_IO_WAIT_READABLE, "accept(2) would block");
 	}
-        rb_syserr_fail(e, "accept(2)");
+        rb_sys_fail("accept(2)");
     }
     rb_update_max_fd(fd2);
+    make_fd_nonblock(fd2);
     return rsock_init_sock(rb_obj_alloc(klass), fd2);
 }
 
@@ -588,7 +605,7 @@ static VALUE
 accept_blocking(void *data)
 {
     struct accept_arg *arg = data;
-    return (VALUE)cloexec_accept(arg->fd, arg->sockaddr, arg->len, 0);
+    return (VALUE)cloexec_accept(arg->fd, arg->sockaddr, arg->len);
 }
 
 VALUE
@@ -598,6 +615,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
     int retry = 0;
     struct accept_arg arg;
 
+    rb_secure(3);
     arg.fd = fd;
     arg.sockaddr = sockaddr;
     arg.len = len;
@@ -605,11 +623,9 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
     rsock_maybe_wait_fd(fd);
     fd2 = (int)BLOCKING_REGION_FD(accept_blocking, &arg);
     if (fd2 < 0) {
-	int e = errno;
-	switch (e) {
+	switch (errno) {
 	  case EMFILE:
 	  case ENFILE:
-	  case ENOMEM:
 	    if (retry) break;
 	    rb_gc();
 	    retry = 1;
@@ -619,7 +635,7 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 	    retry = 0;
 	    goto retry;
 	}
-	rb_syserr_fail(e, "accept(2)");
+	rb_sys_fail("accept(2)");
     }
     rb_update_max_fd(fd2);
     if (!klass) return INT2NUM(fd2);
@@ -627,39 +643,20 @@ rsock_s_accept(VALUE klass, int fd, struct sockaddr *sockaddr, socklen_t *len)
 }
 
 int
-rsock_getfamily(rb_io_t *fptr)
+rsock_getfamily(int sockfd)
 {
     union_sockaddr ss;
     socklen_t sslen = (socklen_t)sizeof(ss);
-    int cached = fptr->mode & FMODE_SOCK;
-
-    if (cached) {
-        switch (cached) {
-#ifdef AF_UNIX
-	    case FMODE_UNIX: return AF_UNIX;
-#endif
-	    case FMODE_INET: return AF_INET;
-	    case FMODE_INET6: return AF_INET6;
-	}
-    }
 
     ss.addr.sa_family = AF_UNSPEC;
-    if (getsockname(fptr->fd, &ss.addr, &sslen) < 0)
+    if (getsockname(sockfd, &ss.addr, &sslen) < 0)
         return AF_UNSPEC;
 
-    switch (ss.addr.sa_family) {
-#ifdef AF_UNIX
-      case AF_UNIX: fptr->mode |= FMODE_UNIX; break;
-#endif
-      case AF_INET: fptr->mode |= FMODE_INET; break;
-      case AF_INET6: fptr->mode |= FMODE_INET6; break;
-    }
-
     return ss.addr.sa_family;
 }
 
 void
-rsock_init_socket_init(void)
+rsock_init_socket_init()
 {
     /*
      * SocketError is the error class for socket.
@@ -677,7 +674,4 @@ rsock_init_socket_init(void)
     rsock_init_addrinfo();
     rsock_init_sockifaddr();
     rsock_init_socket_constants();
-
-#undef rb_intern
-    sym_wait_readable = ID2SYM(rb_intern("wait_readable"));
 }
diff --git a/ext/socket/ipsocket.c b/ext/socket/ipsocket.c
index dbf403b39a..ef5ce763ec 100644
--- a/ext/socket/ipsocket.c
+++ b/ext/socket/ipsocket.c
@@ -41,23 +41,19 @@ inetsock_cleanup(struct inetsock_arg *arg)
 static VALUE
 init_inetsock_internal(struct inetsock_arg *arg)
 {
-    int error = 0;
     int type = arg->type;
     struct addrinfo *res, *lres;
     int fd, status = 0, local = 0;
-    int family = AF_UNSPEC;
     const char *syscall = 0;
 
-    arg->remote.res = rsock_addrinfo(arg->remote.host, arg->remote.serv,
-				     family, SOCK_STREAM,
-				     (type == INET_SERVER) ? AI_PASSIVE : 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,
-					family, SOCK_STREAM, 0);
+	arg->local.res = rsock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
     }
 
     arg->fd = fd = -1;
@@ -84,7 +80,6 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	syscall = "socket(2)";
 	fd = status;
 	if (fd < 0) {
-	    error = errno;
 	    continue;
 	}
 	arg->fd = fd;
@@ -112,7 +107,6 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	}
 
 	if (status < 0) {
-	    error = errno;
 	    close(fd);
 	    arg->fd = fd = -1;
 	    continue;
@@ -130,7 +124,7 @@ init_inetsock_internal(struct inetsock_arg *arg)
 	    port = arg->remote.serv;
 	}
 
-	rsock_syserr_fail_host_port(error, syscall, host, port);
+	rsock_sys_fail_host_port(syscall, host, port);
     }
 
     arg->fd = -1;
@@ -138,9 +132,8 @@ init_inetsock_internal(struct inetsock_arg *arg)
     if (type == INET_SERVER) {
 	status = listen(fd, SOMAXCONN);
 	if (status < 0) {
-	    error = errno;
 	    close(fd);
-	    rb_syserr_fail(error, "listen(2)");
+            rb_sys_fail("listen(2)");
 	}
     }
 
@@ -200,7 +193,7 @@ rsock_revlookup_flag(VALUE revlookup, int *norevlookup)
  * 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 omitted, obeys to +ipsocket.do_not_reverse_lookup+.
+ * 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|
@@ -241,7 +234,7 @@ ip_addr(int argc, VALUE *argv, VALUE sock)
  * 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 omitted, obeys to +ipsocket.do_not_reverse_lookup+.
+ * 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|
@@ -303,8 +296,6 @@ ip_recvfrom(int argc, VALUE *argv, VALUE sock)
  *
  * Lookups the IP address of _host_.
  *
- *   require 'socket'
- *
  *   IPSocket.getaddress("localhost")     #=> "127.0.0.1"
  *   IPSocket.getaddress("ip6-localhost") #=> "::1"
  *
@@ -313,7 +304,7 @@ static VALUE
 ip_s_getaddress(VALUE obj, VALUE host)
 {
     union_sockaddr addr;
-    struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, 0);
+    struct rb_addrinfo *res = rsock_addrinfo(host, Qnil, SOCK_STREAM, 0);
     socklen_t len = res->ai->ai_addrlen;
 
     /* just take the first one */
diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb
index 42c7edddec..2cd7aeadf9 100644
--- a/ext/socket/lib/socket.rb
+++ b/ext/socket/lib/socket.rb
@@ -1,7 +1,4 @@
-# frozen_string_literal: true
-
 require 'socket.so'
-require 'io/wait'
 
 class Addrinfo
   # creates an Addrinfo object from the arguments.
@@ -53,13 +50,17 @@ class Addrinfo
       sock.ipv6only! if self.ipv6?
       sock.bind local_addrinfo if local_addrinfo
       if timeout
-        case sock.connect_nonblock(self, exception: false)
-        when 0 # success or EISCONN, other errors raise
-          break
-        when :wait_writable
-          sock.wait_writable(timeout) or
+        begin
+          sock.connect_nonblock(self)
+        rescue IO::WaitWritable
+          if !IO.select(nil, [sock], nil, timeout)
             raise Errno::ETIMEDOUT, 'user specified timeout'
-        end while true
+          end
+          begin
+            sock.connect_nonblock(self) # check connection failure
+          rescue Errno::EISCONN
+          end
+        end
       else
         sock.connect(self)
       end
@@ -71,7 +72,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -110,8 +111,10 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_from(*args, timeout: nil, &block)
-    connect_internal(family_addrinfo(*args), timeout, &block)
+  def connect_from(*args, &block)
+    opts = Hash === args.last ? args.pop : {}
+    local_addr_args = args
+    connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block)
   end
 
   # :call-seq:
@@ -133,8 +136,8 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect(timeout: nil, &block)
-    connect_internal(nil, timeout, &block)
+  def connect(opts={}, &block)
+    connect_internal(nil, opts[:timeout], &block)
   end
 
   # :call-seq:
@@ -156,9 +159,11 @@ class Addrinfo
   #     puts s.read
   #   }
   #
-  def connect_to(*args, timeout: nil, &block)
-    remote_addrinfo = family_addrinfo(*args)
-    remote_addrinfo.send(:connect_internal, self, timeout, &block)
+  def connect_to(*args, &block)
+    opts = Hash === args.last ? args.pop : {}
+    remote_addr_args = args
+    remote_addrinfo = family_addrinfo(*remote_addr_args)
+    remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block)
   end
 
   # creates a socket bound to self.
@@ -185,7 +190,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -208,7 +213,7 @@ class Addrinfo
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -270,178 +275,6 @@ class BasicSocket < IO
     end
     addr
   end
-
-  # 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)
-  def sendmsg(mesg, flags = 0, dest_sockaddr = nil, *controls)
-    __sendmsg(mesg, flags, dest_sockaddr, controls)
-  end
-
-  # call-seq:
-  #    basicsocket.sendmsg_nonblock(mesg, flags=0, dest_sockaddr=nil, *controls, opts={}) => 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.
-  #
-  # By specifying `exception: false`, the _opts_ hash allows you to indicate
-  # that sendmsg_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
-  def sendmsg_nonblock(mesg, flags = 0, dest_sockaddr = nil, *controls,
-                       exception: true)
-    __sendmsg_nonblock(mesg, flags, dest_sockaddr, controls, exception)
-  end
-
-  # call-seq:
-  # 	basicsocket.recv_nonblock(maxlen [, flags [, buf [, options ]]]) => 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
-  # * +options+ - keyword hash, supporting `exception: false`
-  #
-  # === 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::EAGAIN,
-  # it is extended by IO::WaitReadable.
-  # So IO::WaitReadable can be used to rescue the exceptions for retrying recv_nonblock.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that recv_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
-  #
-  # === See
-  # * Socket#recvfrom
-  def recv_nonblock(len, flag = 0, str = nil, exception: true)
-    __recv_nonblock(len, flag, str, exception)
-  end
-
-  # 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.
-  # Buffer full and MSG_CTRUNC are checked for truncation.
-  #
-  # 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
-  #   }
-  def recvmsg(dlen = nil, flags = 0, clen = nil, scm_rights: false)
-    __recvmsg(dlen, flags, clen, scm_rights)
-  end
-
-  # 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.
-  #
-  # By specifying `exception: false`, the _opts_ hash allows you to indicate
-  # that recvmsg_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
-  def recvmsg_nonblock(dlen = nil, flags = 0, clen = nil,
-                       scm_rights: false, exception: true)
-    __recvmsg_nonblock(dlen, flags, clen, scm_rights, exception)
-  end
 end
 
 class Socket < BasicSocket
@@ -452,133 +285,6 @@ class Socket < BasicSocket
     end
   end
 
-  # call-seq:
-  #   socket.recvfrom_nonblock(maxlen[, flags[, outbuf[, opts]]]) => [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_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 maximum number of bytes to receive from the socket
-  # * +flags+ - zero or more of the +MSG_+ options
-  # * +outbuf+ - destination String buffer
-  # * +opts+ - keyword hash, supporting `exception: false`
-  #
-  # === Example
-  #   # In one file, start this first
-  #   require 'socket'
-  #   include Socket::Constants
-  #   socket = Socket.new(AF_INET, SOCK_STREAM, 0)
-  #   sockaddr = Socket.sockaddr_in(2200, 'localhost')
-  #   socket.bind(sockaddr)
-  #   socket.listen(5)
-  #   client, client_addrinfo = socket.accept
-  #   begin # emulate blocking recvfrom
-  #     pair = client.recvfrom_nonblock(20)
-  #   rescue IO::WaitReadable
-  #     IO.select([client])
-  #     retry
-  #   end
-  #   data = pair[0].chomp
-  #   puts "I only received 20 bytes '#{data}'"
-  #   sleep 1
-  #   socket.close
-  #
-  #   # In another file, start this second
-  #   require 'socket'
-  #   include Socket::Constants
-  #   socket = Socket.new(AF_INET, SOCK_STREAM, 0)
-  #   sockaddr = Socket.sockaddr_in(2200, 'localhost')
-  #   socket.connect(sockaddr)
-  #   socket.puts "Watch this get cut short!"
-  #   socket.close
-  #
-  # Refer to Socket#recvfrom for the exceptions that may be thrown if the call
-  # to _recvfrom_nonblock_ fails.
-  #
-  # Socket#recvfrom_nonblock may raise any error corresponding to recvfrom(2) failure,
-  # including Errno::EWOULDBLOCK.
-  #
-  # If the exception is Errno::EWOULDBLOCK or Errno::EAGAIN,
-  # it is extended by IO::WaitReadable.
-  # So IO::WaitReadable can be used to rescue the exceptions for retrying
-  # recvfrom_nonblock.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
-  #
-  # === See
-  # * Socket#recvfrom
-  def recvfrom_nonblock(len, flag = 0, str = nil, exception: true)
-    __recvfrom_nonblock(len, flag, str, exception)
-  end
-
-  # call-seq:
-  #   socket.accept_nonblock([options]) => [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 containing the accepted socket
-  # for the incoming connection, _client_socket_,
-  # and an Addrinfo, _client_addrinfo_.
-  #
-  # === Example
-  #   # In one script, start this first
-  #   require 'socket'
-  #   include Socket::Constants
-  #   socket = Socket.new(AF_INET, SOCK_STREAM, 0)
-  #   sockaddr = Socket.sockaddr_in(2200, 'localhost')
-  #   socket.bind(sockaddr)
-  #   socket.listen(5)
-  #   begin # emulate blocking accept
-  #     client_socket, client_addrinfo = socket.accept_nonblock
-  #   rescue IO::WaitReadable, Errno::EINTR
-  #     IO.select([socket])
-  #     retry
-  #   end
-  #   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.sockaddr_in(2200, 'localhost')
-  #   socket.connect(sockaddr)
-  #   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.
-  #
-  # Socket#accept_nonblock may raise any error corresponding to accept(2) failure,
-  # including Errno::EWOULDBLOCK.
-  #
-  # If the exception is Errno::EWOULDBLOCK, Errno::EAGAIN, 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.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
-  #
-  # === See
-  # * Socket#accept
-  def accept_nonblock(exception: true)
-    __accept_nonblock(exception)
-  end
-
   # :call-seq:
   #   Socket.tcp(host, port, local_host=nil, local_port=nil, [opts]) {|socket| ... }
   #   Socket.tcp(host, port, local_host=nil, local_port=nil, [opts])
@@ -605,10 +311,15 @@ class Socket < BasicSocket
   #     puts sock.read
   #   }
   #
-  def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: nil) # :yield: socket
+  def self.tcp(host, port, *rest) # :yield: socket
+    opts = Hash === rest.last ? rest.pop : {}
+    raise ArgumentError, "wrong number of arguments (#{rest.length} for 2)" if 2 < rest.length
+    local_host, local_port = rest
     last_error = nil
     ret = nil
 
+    connect_timeout = opts[:connect_timeout]
+
     local_addr_list = nil
     if local_host != nil || local_port != nil
       local_addr_list = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, nil)
@@ -617,14 +328,14 @@ class Socket < BasicSocket
     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 unless local_addr
+        next if !local_addr
       else
         local_addr = nil
       end
       begin
         sock = local_addr ?
-          ai.connect_from(local_addr, timeout: connect_timeout) :
-          ai.connect(timeout: connect_timeout)
+          ai.connect_from(local_addr, :timeout => connect_timeout) :
+          ai.connect(:timeout => connect_timeout)
       rescue SystemCallError
         last_error = $!
         next
@@ -632,7 +343,7 @@ class Socket < BasicSocket
       ret = sock
       break
     }
-    unless ret
+    if !ret
       if last_error
         raise last_error
       else
@@ -643,7 +354,7 @@ class Socket < BasicSocket
       begin
         yield ret
       ensure
-        ret.close
+        ret.close if !ret.closed?
       end
     else
       ret
@@ -667,7 +378,7 @@ class Socket < BasicSocket
         if reuseaddr
           s.setsockopt(:SOCKET, :REUSEADDR, 1)
         end
-        unless port
+        if !port
           s.bind(ai)
           port = s.local_address.ip_port
         else
@@ -675,10 +386,10 @@ class Socket < BasicSocket
         end
       }
     rescue Errno::EADDRINUSE
-      sockets.each(&:close)
+      sockets.each {|s| s.close }
       retry
     rescue Exception
-      sockets.each(&:close)
+      sockets.each {|s| s.close }
       raise
     end
     sockets
@@ -695,7 +406,7 @@ class Socket < BasicSocket
         s.listen(Socket::SOMAXCONN)
       }
     rescue Exception
-      sockets.each(&:close)
+      sockets.each {|s| s.close }
       raise
     end
     sockets
@@ -758,7 +469,7 @@ class Socket < BasicSocket
           raise last_error
         end
       rescue Exception
-        sockets.each(&:close)
+        sockets.each {|s| s.close }
         raise
       end
     end
@@ -766,7 +477,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each(&:close)
+        sockets.each {|s| s.close if !s.closed? }
       end
     else
       sockets
@@ -790,8 +501,11 @@ class Socket < BasicSocket
     loop {
       readable, _, _ = IO.select(sockets)
       readable.each {|r|
-        sock, addr = r.accept_nonblock(exception: false)
-        next if sock == :wait_readable
+        begin
+          sock, addr = r.accept_nonblock
+        rescue IO::WaitReadable
+          next
+        end
         yield sock, addr
       }
     }
@@ -885,12 +599,12 @@ class Socket < BasicSocket
     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 unless a.ipv4?
+          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 unless a.ipv6?
+          next if !a.ipv6?
           ip_list << Addrinfo.new(a.to_sockaddr, :INET6, :DGRAM, 0);
         }
       else
@@ -927,7 +641,7 @@ class Socket < BasicSocket
       begin
         yield sockets
       ensure
-        sockets.each(&:close) if sockets
+        sockets.each {|s| s.close if !s.closed? } if sockets
       end
     else
       sockets
@@ -955,8 +669,11 @@ class Socket < BasicSocket
   #
   def self.udp_server_recv(sockets)
     sockets.each {|r|
-      msg, sender_addrinfo, _, *controls = r.recvmsg_nonblock(exception: false)
-      next if msg == :wait_readable
+      begin
+        msg, sender_addrinfo, _, *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)
@@ -1033,7 +750,7 @@ class Socket < BasicSocket
     attr_reader :local_address
 
     def inspect # :nodoc:
-      "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>".dup
+      "\#<#{self.class}: #{@remote_address.inspect_sockaddr} to #{@local_address.inspect_sockaddr}>"
     end
 
     # Sends the String +msg+ to the source
@@ -1064,7 +781,7 @@ class Socket < BasicSocket
       begin
         yield sock
       ensure
-        sock.close
+        sock.close if !sock.closed?
       end
     else
       sock
@@ -1088,12 +805,12 @@ class Socket < BasicSocket
   #   }
   #
   def self.unix_server_socket(path)
-    unless unix_socket_abstract_name?(path)
+    if !unix_socket_abstract_name?(path)
       begin
         st = File.lstat(path)
       rescue Errno::ENOENT
       end
-      if st&.socket? && st.owned?
+      if st && st.socket? && st.owned?
         File.unlink path
       end
     end
@@ -1102,8 +819,8 @@ class Socket < BasicSocket
       begin
         yield s
       ensure
-        s.close
-        unless unix_socket_abstract_name?(path)
+        s.close if !s.closed?
+        if !unix_socket_abstract_name?(path)
           File.unlink path
         end
       end
@@ -1150,192 +867,5 @@ class Socket < BasicSocket
     }
   end
 
-  # call-seq:
-  #   socket.connect_nonblock(remote_sockaddr, [options]) => 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
-  #  # +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 # emulate blocking connect
-  #     socket.connect_nonblock(sockaddr)
-  #   rescue IO::WaitWritable
-  #     IO.select(nil, [socket]) # wait 3-way handshake completion
-  #     begin
-  #       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
-  #
-  # Refer to Socket#connect for the exceptions that may be thrown if the call
-  # 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.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that connect_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
-  #
-  # === See
-  #  # Socket#connect
-  def connect_nonblock(addr, exception: true)
-    __connect_nonblock(addr, exception)
-  end
 end
 
-class UDPSocket < IPSocket
-
-  # call-seq:
-  #   udpsocket.recvfrom_nonblock(maxlen [, flags[, outbuf [, options]]]) => [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.
-  #
-  # 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
-  # * +outbuf+ - destination String buffer
-  # * +options+ - keyword hash, supporting `exception: false`
-  #
-  # === 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::EAGAIN,
-  # it is extended by IO::WaitReadable.
-  # So IO::WaitReadable can be used to rescue the exceptions for retrying recvfrom_nonblock.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that recvmsg_nonblock should not raise an IO::WaitWritable exception, but
-  # return the symbol :wait_writable instead.
-  #
-  # === See
-  # * Socket#recvfrom
-  def recvfrom_nonblock(len, flag = 0, outbuf = nil, exception: true)
-    __recvfrom_nonblock(len, flag, outbuf, exception)
-  end
-end
-
-class TCPServer < TCPSocket
-
-  # call-seq:
-  #   tcpserver.accept_nonblock([options]) => 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::EAGAIN, Errno::ECONNABORTED, Errno::EPROTO,
-  # it is extended by IO::WaitReadable.
-  # So IO::WaitReadable can be used to rescue the exceptions for retrying accept_nonblock.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
-  #
-  # === See
-  # * TCPServer#accept
-  # * Socket#accept
-  def accept_nonblock(exception: true)
-    __accept_nonblock(exception)
-  end
-end
-
-class UNIXServer < UNIXSocket
-  # call-seq:
-  #   unixserver.accept_nonblock([options]) => 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::EAGAIN, 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.
-  #
-  # By specifying `exception: false`, the options hash allows you to indicate
-  # that accept_nonblock should not raise an IO::WaitReadable exception, but
-  # return the symbol :wait_readable instead.
-  #
-  # === See
-  # * UNIXServer#accept
-  # * Socket#accept
-  def accept_nonblock(exception: true)
-    __accept_nonblock(exception)
-  end
-end if defined?(UNIXSocket)
diff --git a/ext/socket/mkconstants.rb b/ext/socket/mkconstants.rb
index 0ebf628b46..59fcb17682 100644
--- a/ext/socket/mkconstants.rb
+++ b/ext/socket/mkconstants.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'optparse'
 require 'erb'
 
diff --git a/ext/socket/option.c b/ext/socket/option.c
index bf3af171a2..a4a2a37c0f 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -27,12 +27,6 @@ VALUE rb_cSockOpt;
 # define USE_INSPECT_BYTE 1
 #endif
 
-#define check_size(len, size) \
-    ((len) == (size) ? \
-     (void)0 : \
-     rb_raise(rb_eTypeError, "size differ.  expected as "#size"=%d but %ld", \
-	      (int)size, (long)(len)))
-
 static VALUE
 sockopt_pack_byte(VALUE value)
 {
@@ -217,9 +211,12 @@ sockopt_s_byte(VALUE klass, VALUE vfamily, VALUE vlevel, VALUE voptname, VALUE v
 static VALUE
 sockopt_byte(VALUE self)
 {
+    unsigned char i;
     VALUE data = sockopt_data(self);
     StringValue(data);
-    check_size(RSTRING_LEN(data), sizeof(char));
+    if (RSTRING_LEN(data) != sizeof(i))
+        rb_raise(rb_eTypeError, "size differ.  expected as sizeof(int)=%d but %ld",
+                 (int)sizeof(i), (long)RSTRING_LEN(data));
     return CHR2FIX(*RSTRING_PTR(data));
 }
 
@@ -260,7 +257,9 @@ sockopt_int(VALUE self)
     int i;
     VALUE data = sockopt_data(self);
     StringValue(data);
-    check_size(RSTRING_LEN(data), sizeof(int));
+    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);
 }
@@ -272,8 +271,6 @@ sockopt_int(VALUE self)
  * Creates a new Socket::Option object which contains boolean as data.
  * Actually 0 or 1 as int is used.
  *
- *   require 'socket'
- *
  *   p Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, true)
  *   #=> #<Socket::Option: INET SOCKET KEEPALIVE 1>
  *
@@ -304,15 +301,12 @@ static VALUE
 sockopt_bool(VALUE self)
 {
     int i;
-    long len;
     VALUE data = sockopt_data(self);
     StringValue(data);
-    len = RSTRING_LEN(data);
-    if (len == 1) {
-	return *RSTRING_PTR(data) == 0 ? Qfalse : Qtrue;
-    }
-    check_size(len, sizeof(int));
-    memcpy((char*)&i, RSTRING_PTR(data), len);
+    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;
 }
 
@@ -364,7 +358,9 @@ sockopt_linger(VALUE self)
 
     if (level != SOL_SOCKET || optname != SO_LINGER)
         rb_raise(rb_eTypeError, "linger socket option expected");
-    check_size(RSTRING_LEN(data), sizeof(struct linger));
+    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;
@@ -406,7 +402,7 @@ sockopt_s_ipv4_multicast_loop(VALUE klass, VALUE value)
  * call-seq:
  *   sockopt.ipv4_multicast_loop => integer
  *
- * Returns the ipv4_multicast_loop data in _sockopt_ as an integer.
+ * Returns the ipv4_multicast_loop data in _sockopt_ as a integer.
  *
  *   sockopt = Socket::Option.ipv4_multicast_loop(10)
  *   p sockopt.ipv4_multicast_loop => 10
@@ -457,7 +453,7 @@ sockopt_s_ipv4_multicast_ttl(VALUE klass, VALUE value)
  * call-seq:
  *   sockopt.ipv4_multicast_ttl => integer
  *
- * Returns the ipv4_multicast_ttl data in _sockopt_ as an integer.
+ * Returns the ipv4_multicast_ttl data in _sockopt_ as a integer.
  *
  *   sockopt = Socket::Option.ipv4_multicast_ttl(10)
  *   p sockopt.ipv4_multicast_ttl => 10
@@ -646,8 +642,8 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret)
  * it is not distinguishable by the size.
  */
 
-#if !defined HAVE_INET_NTOP && ! defined _WIN32
-const char *
+#ifndef HAVE_INET_NTOP
+static const char *
 inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 {
 #ifdef HAVE_INET_NTOA
@@ -662,6 +658,8 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len)
 #endif
     return numaddr;
 }
+#elif defined __MINGW64__
+# define inet_ntop(f,a,n,l)      rb_w32_inet_ntop(f,a,n,l)
 #endif
 
 /* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295".  */
@@ -883,14 +881,14 @@ inspect_ipv6_mreq(int level, int optname, VALUE data, VALUE ret)
 #endif
 
 static void
-inspect_tcpi_options(VALUE ret, uint8_t options)
+inspect_tcpi_options(VALUE ret, u_int8_t options)
 {
     int sep = '=';
 
     rb_str_cat2(ret, " options");
 #define INSPECT_TCPI_OPTION(optval, name) \
     if (options & (optval)) { \
-        options &= ~(uint8_t)(optval); \
+        options &= ~(u_int8_t)(optval); \
         rb_str_catf(ret, "%c%s", sep, name); \
         sep = ','; \
     }
@@ -923,19 +921,14 @@ inspect_tcpi_options(VALUE ret, uint8_t options)
 }
 
 static void
-inspect_tcpi_usec(VALUE ret, const char *prefix, uint32_t t)
+inspect_tcpi_usec(VALUE ret, const char *prefix, u_int32_t t)
 {
     rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000);
 }
 
-#if !defined __FreeBSD__ && ( \
-    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \
-    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \
-    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT  || \
-    defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV  || \
-    0)
+#ifdef __linux__
 static void
-inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t)
+inspect_tcpi_msec(VALUE ret, const char *prefix, u_int32_t t)
 {
     rb_str_catf(ret, "%s%u.%03us", prefix, t / 1000, t % 1000);
 }
@@ -1249,7 +1242,7 @@ sockopt_inspect(VALUE self)
 
 	v = optname_to_sym(level, optname);
 	if (SYMBOL_P(v))
-	    rb_str_catf(ret, " %"PRIsVALUE, rb_sym2str(v));
+	    rb_str_catf(ret, " %s", rb_id2name(SYM2ID(v)));
 	else
 	    rb_str_catf(ret, " optname:%d", optname);
     }
@@ -1475,3 +1468,4 @@ rsock_init_sockopt(void)
 
     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
index 67bc9c2a97..ceed9c3ac1 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -154,34 +154,6 @@ struct getaddrinfo_arg
     struct addrinfo **res;
 };
 
-#ifdef HAVE_INET_PTON
-static int
-parse_numeric_port(const char *service, int *portp)
-{
-    unsigned long u;
-
-    if (!service) {
-        *portp = 0;
-        return 1;
-    }
-
-    if (strspn(service, "0123456789") != strlen(service))
-        return 0;
-
-    errno = 0;
-    u = STRTOUL(service, NULL, 10);
-    if (errno)
-        return 0;
-
-    if (0x10000 <= u)
-        return 0;
-
-    *portp = (int)u;
-
-    return 1;
-}
-#endif
-
 static void *
 nogvl_getaddrinfo(void *arg)
 {
@@ -209,9 +181,7 @@ numeric_getaddrinfo(const char *node, const char *service,
 #   define inet_pton(f,s,d)        rb_w32_inet_pton(f,s,d)
 # endif
 
-    int port;
-
-    if (node && parse_numeric_port(service, &port)) {
+    if (node && (!service || strspn(service, "0123456789") == strlen(service))) {
 	static const struct {
 	    int socktype;
 	    int protocol;
@@ -221,6 +191,7 @@ numeric_getaddrinfo(const char *node, const char *service,
 	    { SOCK_RAW, 0 }
 	};
 	struct addrinfo *ai = NULL;
+        int port = service ? (unsigned short)atoi(service): 0;
         int hint_family = hints ? hints->ai_family : PF_UNSPEC;
         int hint_socktype = hints ? hints->ai_socktype : 0;
         int hint_protocol = hints ? hints->ai_protocol : 0;
@@ -341,11 +312,11 @@ struct getnameinfo_arg
 {
     const struct sockaddr *sa;
     socklen_t salen;
-    int flags;
     char *host;
     size_t hostlen;
     char *serv;
     size_t servlen;
+    int flags;
 };
 
 static void *
@@ -426,14 +397,6 @@ str_is_number(const char *p)
        return 0;
 }
 
-#define str_equal(ptr, len, name) \
-    ((ptr)[0] == name[0] && \
-     rb_strlen_lit(name) == (len) && memcmp(ptr, name, len) == 0)
-#define SafeStringValueCStr(v) do {\
-    StringValueCStr(v);\
-    rb_check_safe_obj(v);\
-} while(0)
-
 static char*
 host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
 {
@@ -448,26 +411,24 @@ host_str(VALUE host, char *hbuf, size_t hbuflen, int *flags_ptr)
         return hbuf;
     }
     else {
-        const char *name;
-        size_t len;
+        char *name;
 
-        SafeStringValueCStr(host);
-        RSTRING_GETMEM(host, name, len);
-        if (!len || str_equal(name, len, "<any>")) {
+        SafeStringValue(host);
+        name = RSTRING_PTR(host);
+        if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
             make_inetaddr(INADDR_ANY, hbuf, hbuflen);
             if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
         }
-        else if (str_equal(name, len, "<broadcast>")) {
+        else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
             make_inetaddr(INADDR_BROADCAST, hbuf, hbuflen);
             if (flags_ptr) *flags_ptr |= AI_NUMERICHOST;
         }
-        else if (len >= hbuflen) {
+        else if (strlen(name) >= hbuflen) {
             rb_raise(rb_eArgError, "hostname too long (%"PRIuSIZE")",
-                     len);
+                strlen(name));
         }
         else {
-            memcpy(hbuf, name, len);
-            hbuf[len] = '\0';
+            strcpy(hbuf, name);
         }
         return hbuf;
     }
@@ -487,17 +448,15 @@ port_str(VALUE port, char *pbuf, size_t pbuflen, int *flags_ptr)
         return pbuf;
     }
     else {
-        const char *serv;
-        size_t len;
+        char *serv;
 
-        SafeStringValueCStr(port);
-        RSTRING_GETMEM(port, serv, len);
-        if (len >= pbuflen) {
+        SafeStringValue(port);
+        serv = RSTRING_PTR(port);
+        if (strlen(serv) >= pbuflen) {
             rb_raise(rb_eArgError, "service name too long (%"PRIuSIZE")",
-                     len);
+                strlen(serv));
         }
-        memcpy(pbuf, serv, len);
-        pbuf[len] = '\0';
+        strcpy(pbuf, serv);
         return pbuf;
     }
 }
@@ -530,26 +489,13 @@ rsock_getaddrinfo(VALUE host, VALUE port, struct addrinfo *hints, int socktype_h
     return res;
 }
 
-int
-rsock_fd_family(int fd)
-{
-    struct sockaddr sa = { 0 };
-    socklen_t sa_len = sizeof(sa);
-
-    if (fd < 0 || getsockname(fd, &sa, &sa_len) != 0 ||
-        (size_t)sa_len < offsetof(struct sockaddr, sa_family) + sizeof(sa.sa_family)) {
-	return AF_UNSPEC;
-    }
-    return sa.sa_family;
-}
-
 struct rb_addrinfo*
-rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags)
+rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags)
 {
     struct addrinfo hints;
 
     MEMZERO(&hints, struct addrinfo, 1);
-    hints.ai_family = family;
+    hints.ai_family = AF_UNSPEC;
     hints.ai_socktype = socktype;
     hints.ai_flags = flags;
     return rsock_getaddrinfo(host, port, &hints, 1);
@@ -671,8 +617,7 @@ make_hostent_internal(struct hostent_arg *arg)
     }
     rb_ary_push(ary, rb_str_new2(hostp));
 
-    if (addr->ai_canonname && strlen(addr->ai_canonname) < NI_MAXHOST &&
-	(h = gethostbyname(addr->ai_canonname))) {
+    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++) {
@@ -737,7 +682,7 @@ addrinfo_mark(void *ptr)
 static size_t
 addrinfo_memsize(const void *ptr)
 {
-    return sizeof(rb_addrinfo_t);
+    return ptr ? sizeof(rb_addrinfo_t) : 0;
 }
 
 static const rb_data_type_t addrinfo_type = {
@@ -771,7 +716,7 @@ get_addrinfo(VALUE self)
 
 
 static rb_addrinfo_t *
-alloc_addrinfo(void)
+alloc_addrinfo()
 {
     rb_addrinfo_t *rai = ZALLOC(rb_addrinfo_t);
     rai->inspectname = Qnil;
@@ -1264,7 +1209,7 @@ rsock_inspect_sockaddr(struct sockaddr *sockaddr_arg, socklen_t socklen, VALUE r
           }
 #endif
 
-#if defined(AF_PACKET) && defined(__linux__)
+#ifdef AF_PACKET
           /* GNU/Linux */
           case AF_PACKET:
           {
@@ -1697,7 +1642,6 @@ addrinfo_mload(VALUE self, VALUE ary)
 
         len = res->ai->ai_addrlen;
         memcpy(&ss, res->ai->ai_addr, res->ai->ai_addrlen);
-        rb_freeaddrinfo(res);
         break;
       }
     }
diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h
index 352da8c56e..8beffd2e76 100644
--- a/ext/socket/rubysocket.h
+++ b/ext/socket/rubysocket.h
@@ -27,7 +27,11 @@
 #    undef HAVE_TYPE_STRUCT_SOCKADDR_DL
 #  endif
 #else
-#  include <sys/socket.h>
+#  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>
@@ -76,9 +80,6 @@
 #endif
 
 #ifdef HAVE_IFADDRS_H
-#  ifdef __HAIKU__
-#    define _BSD_SOURCE
-#  endif
 #  include <ifaddrs.h>
 #endif
 #ifdef HAVE_SYS_IOCTL_H
@@ -218,6 +219,11 @@ typedef union {
 #  endif
 #endif
 
+#ifdef __BEOS__
+#  undef close
+#  define close closesocket
+#endif
+
 #define INET_CLIENT 0
 #define INET_SERVER 1
 #define INET_SOCKS  2
@@ -226,12 +232,6 @@ extern int rsock_do_not_reverse_lookup;
 extern int rsock_cmsg_cloexec_state;
 #define FMODE_NOREVLOOKUP 0x100
 
-/* common socket families only */
-#define FMODE_UNIX        0x00200000
-#define FMODE_INET        0x00400000
-#define FMODE_INET6       0x00800000
-#define FMODE_SOCK        (FMODE_UNIX|FMODE_INET|FMODE_INET6)
-
 extern VALUE rb_cBasicSocket;
 extern VALUE rb_cIPSocket;
 extern VALUE rb_cTCPSocket;
@@ -279,7 +279,7 @@ 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(rb_io_t *fptr);
+int rsock_getfamily(int sockfd);
 
 struct rb_addrinfo {
   struct addrinfo *ai;
@@ -289,8 +289,7 @@ int rb_getaddrinfo(const char *node, const char *service, const struct addrinfo
 void rb_freeaddrinfo(struct rb_addrinfo *ai);
 VALUE rsock_freeaddrinfo(VALUE arg);
 int rb_getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
-int rsock_fd_family(int fd);
-struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int family, int socktype, int flags);
+struct rb_addrinfo *rsock_addrinfo(VALUE host, VALUE port, int socktype, int flags);
 struct rb_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);
@@ -338,34 +337,28 @@ enum sock_recv_type {
     RECV_SOCKET                 /* Socket#recvfrom */
 };
 
-VALUE rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str,
-			        VALUE ex, enum sock_recv_type from);
+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, VALUE ex, rb_io_t *fptr,
-			      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(VALUE sock, VALUE data, VALUE flags,
-			  VALUE dest_sockaddr, VALUE controls);
-VALUE rsock_bsock_sendmsg_nonblock(VALUE sock, VALUE data, VALUE flags,
-			     VALUE dest_sockaddr, VALUE controls, VALUE ex);
+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(VALUE sock, VALUE dlen, VALUE clen, VALUE flags,
-			  VALUE scm_rights);
-VALUE rsock_bsock_recvmsg_nonblock(VALUE sock, VALUE dlen, VALUE clen,
-				   VALUE flags, VALUE scm_rights, VALUE ex);
+VALUE rsock_bsock_recvmsg(int argc, VALUE *argv, VALUE sock);
+VALUE rsock_bsock_recvmsg_nonblock(int argc, VALUE *argv, VALUE sock);
 ssize_t rsock_recvmsg(int socket, struct msghdr *message, int flags);
 #else
 #define rsock_bsock_recvmsg rb_f_notimplement
@@ -414,28 +407,9 @@ NORETURN(void rsock_sys_fail_raddrinfo_or_sockaddr(const char *, VALUE addr, VAL
 #if defined(__linux__)
 static inline int rsock_maybe_fd_writable(int fd) { return 1; }
 static inline void rsock_maybe_wait_fd(int fd) { }
-#  ifdef MSG_DONTWAIT
-#    define MSG_DONTWAIT_RELIABLE 1
-#  endif
 #else /* some systems (mswin/mingw) need these.  ref: r36946 */
 #  define rsock_maybe_fd_writable(fd) rb_thread_fd_writable((fd))
 #  define rsock_maybe_wait_fd(fd) rb_thread_wait_fd((fd))
 #endif
 
-/*
- * some OSes may support MSG_DONTWAIT inconsistently depending on socket
- * type, we only expect Linux to support it consistently for all socket types.
- */
-#ifndef MSG_DONTWAIT_RELIABLE
-#  define MSG_DONTWAIT_RELIABLE 0
-#endif
-
-#if !defined HAVE_INET_NTOP && ! defined _WIN32
-const char *inet_ntop(int, const void *, char *, size_t);
-#elif defined __MINGW32__
-# define inet_ntop(f,a,n,l)      rb_w32_inet_ntop(f,a,n,l)
-#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90
-const char *WSAAPI inet_ntop(int, const void *, char *, size_t);
-#endif
-
 #endif
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 14e069bb8d..f27383d61c 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -10,8 +10,6 @@
 
 #include "rubysocket.h"
 
-static VALUE sym_wait_writable;
-
 static VALUE sock_s_unpack_sockaddr_in(VALUE, VALUE);
 
 void
@@ -140,6 +138,7 @@ sock_initialize(int argc, VALUE *argv, VALUE sock)
     if (NIL_P(protocol))
         protocol = INT2FIX(0);
 
+    rb_secure(3);
     setup_domain_and_type(domain, &d, type, &t);
     fd = rsock_socket(d, t, NUM2INT(protocol));
     if (fd < 0) rb_sys_fail("socket(2)");
@@ -151,7 +150,7 @@ sock_initialize(int argc, VALUE *argv, VALUE sock)
 static VALUE
 io_call_close(VALUE io)
 {
-    return rb_funcallv(io, rb_intern("close"), 0, 0);
+    return rb_funcall(io, rb_intern("close"), 0, 0);
 }
 
 static VALUE
@@ -241,7 +240,8 @@ rsock_socketpair(int domain, int type, int protocol, int sv[2])
     int ret;
 
     ret = rsock_socketpair0(domain, type, protocol, sv);
-    if (ret < 0 && rb_gc_for_fd(errno)) {
+    if (ret < 0 && (errno == EMFILE || errno == ENFILE)) {
+        rb_gc();
         ret = rsock_socketpair0(domain, type, protocol, sv);
     }
 
@@ -319,14 +319,14 @@ rsock_sock_s_socketpair(int argc, VALUE *argv, VALUE klass)
  * * +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.pack_sockaddr_in( 80, 'www.google.com' )
- *   socket.connect( sockaddr )
- *   socket.write( "GET / HTTP/1.0\r\n\r\n" )
- *   results = socket.read
+ * 	# Pull down Google's web page
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	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
  *
  * === Unix-based Exceptions
  * On unix-based systems the following system exceptions may be raised if
@@ -438,9 +438,50 @@ sock_connect(VALUE sock, VALUE addr)
     return INT2FIX(n);
 }
 
-/* :nodoc: */
+/*
+ * call-seq:
+ *   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
+ * * +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 # emulate blocking connect
+ * 	  socket.connect_nonblock(sockaddr)
+ * 	rescue IO::WaitWritable
+ * 	  IO.select(nil, [socket]) # wait 3-way handshake completion
+ * 	  begin
+ * 	    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
+ *
+ * Refer to Socket#connect for the exceptions that may be thrown if the call
+ * 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(VALUE sock, VALUE addr, VALUE ex)
+sock_connect_nonblock(VALUE sock, VALUE addr)
 {
     VALUE rai;
     rb_io_t *fptr;
@@ -452,19 +493,9 @@ sock_connect_nonblock(VALUE sock, VALUE addr, VALUE ex)
     rb_io_set_nonblock(fptr);
     n = connect(fptr->fd, (struct sockaddr*)RSTRING_PTR(addr), RSTRING_SOCKLEN(addr));
     if (n < 0) {
-	int e = errno;
-	if (e == EINPROGRESS) {
-            if (ex == Qfalse) {
-                return sym_wait_writable;
-            }
-            rb_readwrite_syserr_fail(RB_IO_WAIT_WRITABLE, e, "connect(2) would block");
-	}
-	if (e == EISCONN) {
-            if (ex == Qfalse) {
-                return INT2FIX(0);
-            }
-	}
-	rsock_syserr_fail_raddrinfo_or_sockaddr(e, "connect(2)", addr, rai);
+        if (errno == EINPROGRESS)
+            rb_readwrite_sys_fail(RB_IO_WAIT_WRITABLE, "connect(2) would block");
+	rsock_sys_fail_raddrinfo_or_sockaddr("connect(2)", addr, rai);
     }
 
     return INT2FIX(n);
@@ -480,18 +511,18 @@ sock_connect_nonblock(VALUE sock, VALUE addr, VALUE ex)
  * * +local_sockaddr+ - the +struct+ sockaddr contained in a string or an Addrinfo object
  *
  * === Example
- *   require 'socket'
+ * 	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 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 )
+ * 	# 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
@@ -582,18 +613,18 @@ sock_bind(VALUE sock, VALUE addr)
  * * +backlog+ - the maximum length of the queue for pending connections.
  *
  * === Example 1
- *   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 )
+ * 	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 )
  *
  * === 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 )
+ * 	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
@@ -669,27 +700,27 @@ rsock_sock_listen(VALUE sock, VALUE log)
  * * +flags+ - zero or more of the +MSG_+ options
  *
  * === Example
- *   # In one file, 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_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
- *   socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
- *   sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
- *   socket.connect( sockaddr )
- *   socket.puts "Watch this get cut short!"
- *   socket.close
+ * 	# In one file, 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_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
+ * 	socket = Socket.new( AF_INET, SOCK_STREAM, 0 )
+ * 	sockaddr = Socket.pack_sockaddr_in( 2200, 'localhost' )
+ * 	socket.connect( sockaddr )
+ * 	socket.puts "Watch this get cut short!"
+ * 	socket.close
  *
  * === Unix-based Exceptions
  * On unix-based based systems the following system exceptions may be raised if the
@@ -765,11 +796,72 @@ sock_recvfrom(int argc, VALUE *argv, VALUE sock)
     return rsock_s_recvfrom(sock, argc, argv, RECV_SOCKET);
 }
 
-/* :nodoc: */
+/*
+ * call-seq:
+ *   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_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 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'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.bind(sockaddr)
+ * 	socket.listen(5)
+ * 	client, client_addrinfo = socket.accept
+ * 	begin # emulate blocking recvfrom
+ * 	  pair = client.recvfrom_nonblock(20)
+ * 	rescue IO::WaitReadable
+ * 	  IO.select([client])
+ * 	  retry
+ * 	end
+ * 	data = pair[0].chomp
+ * 	puts "I only received 20 bytes '#{data}'"
+ * 	sleep 1
+ * 	socket.close
+ *
+ * 	# In another file, start this second
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.connect(sockaddr)
+ * 	socket.puts "Watch this get cut short!"
+ * 	socket.close
+ *
+ * Refer to Socket#recvfrom for the exceptions that may be thrown if the call
+ * to _recvfrom_nonblock_ fails.
+ *
+ * Socket#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
-sock_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
+sock_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
 {
-    return rsock_s_recvfrom_nonblock(sock, len, flg, str, ex, RECV_SOCKET);
+    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_SOCKET);
 }
 
 /*
@@ -800,21 +892,67 @@ sock_accept(VALUE sock)
     return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len));
 }
 
-/* :nodoc: */
+/*
+ * call-seq:
+ *   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 containing the accepted socket
+ * for the incoming connection, _client_socket_,
+ * and an Addrinfo, _client_addrinfo_.
+ *
+ * === Example
+ * 	# In one script, start this first
+ * 	require 'socket'
+ * 	include Socket::Constants
+ * 	socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+ * 	sockaddr = Socket.sockaddr_in(2200, 'localhost')
+ * 	socket.bind(sockaddr)
+ * 	socket.listen(5)
+ * 	begin # emulate blocking accept
+ * 	  client_socket, client_addrinfo = socket.accept_nonblock
+ * 	rescue IO::WaitReadable, Errno::EINTR
+ * 	  IO.select([socket])
+ * 	  retry
+ * 	end
+ * 	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.sockaddr_in(2200, 'localhost')
+ * 	socket.connect(sockaddr)
+ * 	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.
+ *
+ * Socket#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
+ * * Socket#accept
+ */
 static VALUE
-sock_accept_nonblock(VALUE sock, VALUE ex)
+sock_accept_nonblock(VALUE sock)
 {
     rb_io_t *fptr;
     VALUE sock2;
     union_sockaddr buf;
-    struct sockaddr *addr = &buf.addr;
     socklen_t len = (socklen_t)sizeof buf;
 
     GetOpenFile(sock, fptr);
-    sock2 = rsock_s_accept_nonblock(rb_cSocket, ex, fptr, addr, &len);
-
-    if (SYMBOL_P(sock2)) /* :wait_readable */
-	return sock2;
+    sock2 = rsock_s_accept_nonblock(rb_cSocket, fptr, &buf.addr, &len);
     return rb_assoc_new(sock2, rsock_io_socket_addrinfo(sock2, &buf.addr, len));
 }
 
@@ -827,28 +965,28 @@ sock_accept_nonblock(VALUE sock, VALUE ex)
  * and an Addrinfo, _client_addrinfo_.
  *
  * === 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_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."
- *   puts "The server said, '#{socket.readline.chomp}'"
- *   socket.close
+ * 	# 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_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."
+ * 	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.
@@ -893,27 +1031,14 @@ sock_gethostname(VALUE obj)
 #  define RUBY_MAX_HOST_NAME_LEN 1024
 #endif
 
-    long len = RUBY_MAX_HOST_NAME_LEN;
-    VALUE name;
-
-    name = rb_str_new(0, len);
-    while (gethostname(RSTRING_PTR(name), len) < 0) {
-	int e = errno;
-	switch (e) {
-	  case ENAMETOOLONG:
-#ifdef __linux__
-	  case EINVAL:
-	    /* glibc before version 2.1 uses EINVAL instead of ENAMETOOLONG */
-#endif
-	    break;
-	  default:
-	    rb_syserr_fail(e, "gethostname(3)");
-	}
-	rb_str_modify_expand(name, len);
-	len += len;
-    }
-    rb_str_resize(name, strlen(RSTRING_PTR(name)));
-    return name;
+    char buf[RUBY_MAX_HOST_NAME_LEN+1];
+
+    rb_secure(3);
+    if (gethostname(buf, (int)sizeof buf - 1) < 0)
+	rb_sys_fail("gethostname(3)");
+
+    buf[sizeof buf - 1] = '\0';
+    return rb_str_new2(buf);
 }
 #else
 #ifdef HAVE_UNAME
@@ -925,6 +1050,7 @@ sock_gethostname(VALUE obj)
 {
     struct utsname un;
 
+    rb_secure(3);
     uname(&un);
     return rb_str_new2(un.nodename);
 }
@@ -946,7 +1072,7 @@ make_addrinfo(struct rb_addrinfo *res0, int norevlookup)
     for (res = res0->ai; res; res = res->ai_next) {
 	ary = rsock_ipaddr(res->ai_addr, res->ai_addrlen, norevlookup);
 	if (res->ai_canonname) {
-	    RARRAY_ASET(ary, 2, rb_str_new2(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));
@@ -991,9 +1117,8 @@ sock_sockaddr(struct sockaddr *addr, socklen_t len)
 static VALUE
 sock_s_gethostbyname(VALUE obj, VALUE host)
 {
-    struct rb_addrinfo *res =
-	rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
-    return rsock_make_hostent(host, res, sock_sockaddr);
+    rb_secure(3);
+    return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
 }
 
 /*
@@ -1137,7 +1262,7 @@ sock_s_getservbyport(int argc, VALUE *argv)
  *
  * Obtains address information for _nodename_:_servname_.
  *
- * _family_ should be an address family such as: :INET, :INET6, etc.
+ * _family_ should be an address family such as: :INET, :INET6, :UNIX, etc.
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
@@ -1257,16 +1382,16 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 	sa = tmp;
 	MEMZERO(&hints, struct addrinfo, 1);
 	if (RARRAY_LEN(sa) == 3) {
-	    af = RARRAY_AREF(sa, 0);
-	    port = RARRAY_AREF(sa, 1);
-	    host = RARRAY_AREF(sa, 2);
+	    af = RARRAY_PTR(sa)[0];
+	    port = RARRAY_PTR(sa)[1];
+	    host = RARRAY_PTR(sa)[2];
 	}
 	else if (RARRAY_LEN(sa) >= 4) {
-	    af = RARRAY_AREF(sa, 0);
-	    port = RARRAY_AREF(sa, 1);
-	    host = RARRAY_AREF(sa, 3);
+	    af = RARRAY_PTR(sa)[0];
+	    port = RARRAY_PTR(sa)[1];
+	    host = RARRAY_PTR(sa)[3];
 	    if (NIL_P(host)) {
-		host = RARRAY_AREF(sa, 2);
+		host = RARRAY_PTR(sa)[2];
 	    }
 	    else {
 		/*
@@ -1371,7 +1496,7 @@ sock_s_getnameinfo(int argc, VALUE *argv)
 static VALUE
 sock_s_pack_sockaddr_in(VALUE self, VALUE port, VALUE host)
 {
-    struct rb_addrinfo *res = rsock_addrinfo(host, port, AF_UNSPEC, 0, 0);
+    struct rb_addrinfo *res = rsock_addrinfo(host, port, 0, 0);
     VALUE addr = rb_str_new((char*)res->ai->ai_addr, res->ai->ai_addrlen);
 
     rb_freeaddrinfo(res);
@@ -1642,7 +1767,7 @@ socket_s_ip_address_list(VALUE self)
     int ret;
     struct lifnum ln;
     struct lifconf lc;
-    const char *reason = NULL;
+    char *reason = NULL;
     int save_errno;
     int i;
     VALUE list = Qnil;
@@ -1703,7 +1828,7 @@ socket_s_ip_address_list(VALUE self)
     errno = save_errno;
 
     if (reason)
-	rb_syserr_fail(save_errno, reason);
+	rb_sys_fail(reason);
     return list;
 
 #elif defined(SIOCGIFCONF)
@@ -1788,7 +1913,7 @@ socket_s_ip_address_list(VALUE self)
     errno = save_errno;
 
     if (reason)
-	rb_syserr_fail(save_errno, reason);
+	rb_sys_fail(reason);
     return list;
 
 #undef EXTRA_SPACE
@@ -1900,7 +2025,7 @@ socket_s_ip_address_list(VALUE self)
 #endif
 
 void
-Init_socket(void)
+Init_socket()
 {
     rsock_init_basicsocket();
 
@@ -1955,8 +2080,6 @@ Init_socket(void)
      *
      * Let's create an internet socket using the IPv4 protocol in a C-like manner:
      *
-     *   require 'socket'
-     *
      *   s = Socket.new Socket::AF_INET, Socket::SOCK_STREAM
      *   s.connect Socket.pack_sockaddr_in(80, 'example.com')
      *
@@ -2027,26 +2150,15 @@ Init_socket(void)
 
     rb_define_method(rb_cSocket, "initialize", sock_initialize, -1);
     rb_define_method(rb_cSocket, "connect", sock_connect, 1);
-
-    /* for ext/socket/lib/socket.rb use only: */
-    rb_define_private_method(rb_cSocket,
-			     "__connect_nonblock", sock_connect_nonblock, 2);
-
+    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", rsock_sock_listen, 1);
     rb_define_method(rb_cSocket, "accept", sock_accept, 0);
-
-    /* for ext/socket/lib/socket.rb use only: */
-    rb_define_private_method(rb_cSocket,
-			     "__accept_nonblock", sock_accept_nonblock, 1);
-
+    rb_define_method(rb_cSocket, "accept_nonblock", sock_accept_nonblock, 0);
     rb_define_method(rb_cSocket, "sysaccept", sock_sysaccept, 0);
 
     rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
-
-    /* for ext/socket/lib/socket.rb use only: */
-    rb_define_private_method(rb_cSocket,
-			     "__recvfrom_nonblock", sock_recvfrom_nonblock, 4);
+    rb_define_method(rb_cSocket, "recvfrom_nonblock", sock_recvfrom_nonblock, -1);
 
     rb_define_singleton_method(rb_cSocket, "socketpair", rsock_sock_s_socketpair, -1);
     rb_define_singleton_method(rb_cSocket, "pair", rsock_sock_s_socketpair, -1);
@@ -2067,7 +2179,4 @@ Init_socket(void)
 #endif
 
     rb_define_singleton_method(rb_cSocket, "ip_address_list", socket_s_ip_address_list, 0);
-
-#undef rb_intern
-    sym_wait_writable = ID2SYM(rb_intern("wait_writable"));
 }
diff --git a/ext/socket/sockssocket.c b/ext/socket/sockssocket.c
index 81f77a67c5..48be4fcf99 100644
--- a/ext/socket/sockssocket.c
+++ b/ext/socket/sockssocket.c
@@ -41,6 +41,9 @@ 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);
diff --git a/ext/socket/tcpserver.c b/ext/socket/tcpserver.c
index 1bbb31adcf..2245a0600d 100644
--- a/ext/socket/tcpserver.c
+++ b/ext/socket/tcpserver.c
@@ -64,16 +64,49 @@ tcp_accept(VALUE sock)
     return rsock_s_accept(rb_cTCPSocket, fptr->fd, &from.addr, &fromlen);
 }
 
-/* :nodoc: */
+/*
+ * 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, VALUE ex)
+tcp_accept_nonblock(VALUE sock)
 {
     rb_io_t *fptr;
     union_sockaddr from;
-    socklen_t len = (socklen_t)sizeof(from);
+    socklen_t fromlen;
 
     GetOpenFile(sock, fptr);
-    return rsock_s_accept_nonblock(rb_cTCPSocket, ex, fptr, &from.addr, &len);
+    fromlen = (socklen_t)sizeof(from);
+    return rsock_s_accept_nonblock(rb_cTCPSocket, fptr, &from.addr, &fromlen);
 }
 
 /*
@@ -138,8 +171,7 @@ rsock_init_tcpserver(void)
      */
     rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
     rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
-    rb_define_private_method(rb_cTCPServer,
-			     "__accept_nonblock", tcp_accept_nonblock, 1);
+    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
index a7a82fd880..6217e424d9 100644
--- a/ext/socket/tcpsocket.c
+++ b/ext/socket/tcpsocket.c
@@ -50,9 +50,9 @@ tcp_sockaddr(struct sockaddr *addr, socklen_t len)
 static VALUE
 tcp_s_gethostbyname(VALUE obj, VALUE host)
 {
-    struct rb_addrinfo *res =
-	rsock_addrinfo(host, Qnil, AF_UNSPEC, SOCK_STREAM, AI_CANONNAME);
-    return rsock_make_hostent(host, res, tcp_sockaddr);
+    rb_secure(3);
+    return rsock_make_hostent(host, rsock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME),
+			tcp_sockaddr);
 }
 
 void
diff --git a/ext/socket/udpsocket.c b/ext/socket/udpsocket.c
index c2e273c2a3..eb605cafc1 100644
--- a/ext/socket/udpsocket.c
+++ b/ext/socket/udpsocket.c
@@ -19,8 +19,6 @@
  * _address_family_ should be an integer, a string or a symbol:
  * Socket::AF_INET, "AF_INET", :INET, etc.
  *
- *   require 'socket'
- *
  *   UDPSocket.new                   #=> #<UDPSocket:fd 3>
  *   UDPSocket.new(Socket::AF_INET6) #=> #<UDPSocket:fd 4>
  *
@@ -32,6 +30,7 @@ udp_init(int argc, VALUE *argv, VALUE sock)
     int family = AF_INET;
     int fd;
 
+    rb_secure(3);
     if (rb_scan_args(argc, argv, "01", &arg) == 1) {
 	family = rsock_family_arg(arg);
     }
@@ -46,18 +45,15 @@ udp_init(int argc, VALUE *argv, VALUE sock)
 struct udp_arg
 {
     struct rb_addrinfo *res;
-    rb_io_t *fptr;
+    int fd;
 };
 
 static VALUE
 udp_connect_internal(struct udp_arg *arg)
 {
-    rb_io_t *fptr;
-    int fd;
+    int fd = arg->fd;
     struct addrinfo *res;
 
-    rb_io_check_closed(fptr = arg->fptr);
-    fd = fptr->fd;
     for (res = arg->res->ai; res; res = res->ai_next) {
 	if (rsock_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
 	    return Qtrue;
@@ -85,35 +81,20 @@ udp_connect_internal(struct udp_arg *arg)
 static VALUE
 udp_connect(VALUE sock, VALUE host, VALUE port)
 {
+    rb_io_t *fptr;
     struct udp_arg arg;
     VALUE ret;
 
-    GetOpenFile(sock, arg.fptr);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
+    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) rsock_sys_fail_host_port("connect(2)", host, port);
     return INT2FIX(0);
 }
 
-static VALUE
-udp_bind_internal(struct udp_arg *arg)
-{
-    rb_io_t *fptr;
-    int fd;
-    struct addrinfo *res;
-
-    rb_io_check_closed(fptr = arg->fptr);
-    fd = fptr->fd;
-    for (res = arg->res->ai; res; res = res->ai_next) {
-	if (bind(fd, res->ai_addr, res->ai_addrlen) < 0) {
-	    continue;
-	}
-	return Qtrue;
-    }
-    return Qfalse;
-}
-
 /*
  * call-seq:
  *   udpsocket.bind(host, port) #=> 0
@@ -129,46 +110,25 @@ udp_bind_internal(struct udp_arg *arg)
 static VALUE
 udp_bind(VALUE sock, VALUE host, VALUE port)
 {
-    struct udp_arg arg;
-    VALUE ret;
-
-    GetOpenFile(sock, arg.fptr);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
-    ret = rb_ensure(udp_bind_internal, (VALUE)&arg,
-		    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rsock_sys_fail_host_port("bind(2)", host, port);
-    return INT2FIX(0);
-}
-
-struct udp_send_arg {
-    struct rb_addrinfo *res;
-    rb_io_t *fptr;
-    struct rsock_send_arg sarg;
-};
-
-static VALUE
-udp_send_internal(struct udp_send_arg *arg)
-{
     rb_io_t *fptr;
-    int n;
+    struct rb_addrinfo *res0;
     struct addrinfo *res;
 
-    rb_io_check_closed(fptr = arg->fptr);
-    for (res = arg->res->ai; res; res = res->ai_next) {
-      retry:
-	arg->sarg.fd = fptr->fd;
-	arg->sarg.to = res->ai_addr;
-	arg->sarg.tolen = res->ai_addrlen;
-	rsock_maybe_fd_writable(arg->sarg.fd);
-	n = (int)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg->sarg);
-	if (n >= 0) {
-	    return INT2FIX(n);
-	}
-	if (rb_io_wait_writable(fptr->fd)) {
-	    goto retry;
+    rb_secure(3);
+    res0 = rsock_addrinfo(host, port, SOCK_DGRAM, 0);
+    GetOpenFile(sock, fptr);
+    for (res = res0->ai; res; res = res->ai_next) {
+	if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
+	    continue;
 	}
+	rb_freeaddrinfo(res0);
+	return INT2FIX(0);
     }
-    return Qfalse;
+    rb_freeaddrinfo(res0);
+
+    rsock_sys_fail_host_port("bind(2)", host, port);
+
+    return INT2FIX(0);
 }
 
 /*
@@ -197,30 +157,94 @@ static VALUE
 udp_send(int argc, VALUE *argv, VALUE sock)
 {
     VALUE flags, host, port;
-    struct udp_send_arg arg;
-    VALUE ret;
+    rb_io_t *fptr;
+    int n;
+    struct rb_addrinfo *res0;
+    struct addrinfo *res;
+    struct rsock_send_arg arg;
 
     if (argc == 2 || argc == 3) {
 	return rsock_bsock_send(argc, argv, sock);
     }
-    rb_scan_args(argc, argv, "4", &arg.sarg.mesg, &flags, &host, &port);
-
-    StringValue(arg.sarg.mesg);
-    GetOpenFile(sock, arg.fptr);
-    arg.sarg.fd = arg.fptr->fd;
-    arg.sarg.flags = NUM2INT(flags);
-    arg.res = rsock_addrinfo(host, port, rsock_fd_family(arg.fptr->fd), SOCK_DGRAM, 0);
-    ret = rb_ensure(udp_send_internal, (VALUE)&arg,
-		    rsock_freeaddrinfo, (VALUE)arg.res);
-    if (!ret) rsock_sys_fail_host_port("sendto(2)", host, port);
-    return ret;
+    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->ai; res; res = res->ai_next) {
+      retry:
+	arg.to = res->ai_addr;
+	arg.tolen = res->ai_addrlen;
+	rsock_maybe_fd_writable(arg.fd);
+	n = (int)BLOCKING_REGION_FD(rsock_sendto_blocking, &arg);
+	if (n >= 0) {
+	    rb_freeaddrinfo(res0);
+	    return INT2FIX(n);
+	}
+	if (rb_io_wait_writable(fptr->fd)) {
+	    goto retry;
+	}
+    }
+    rb_freeaddrinfo(res0);
+    rsock_sys_fail_host_port("sendto(2)", host, port);
+    return INT2FIX(n);
 }
 
-/* :nodoc: */
+/*
+ * 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(VALUE sock, VALUE len, VALUE flg, VALUE str, VALUE ex)
+udp_recvfrom_nonblock(int argc, VALUE *argv, VALUE sock)
 {
-    return rsock_s_recvfrom_nonblock(sock, len, flg, str, ex, RECV_IP);
+    return rsock_s_recvfrom_nonblock(sock, argc, argv, RECV_IP);
 }
 
 void
@@ -237,8 +261,6 @@ rsock_init_udpsocket(void)
     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);
-
-    /* for ext/socket/lib/socket.rb use only: */
-    rb_define_private_method(rb_cUDPSocket,
-			     "__recvfrom_nonblock", udp_recvfrom_nonblock, 4);
+    rb_define_method(rb_cUDPSocket, "recvfrom_nonblock", udp_recvfrom_nonblock, -1);
 }
+
diff --git a/ext/socket/unixserver.c b/ext/socket/unixserver.c
index b1f2a38547..df9849703b 100644
--- a/ext/socket/unixserver.c
+++ b/ext/socket/unixserver.c
@@ -17,8 +17,6 @@
  *
  * Creates a new UNIX server socket bound to _path_.
  *
- *   require 'socket'
- *
  *   serv = UNIXServer.new("/tmp/sock")
  *   s = serv.accept
  *   p s.read
@@ -59,9 +57,41 @@ unix_accept(VALUE sock)
 		          (struct sockaddr*)&from, &fromlen);
 }
 
-/* :nodoc: */
+/*
+ * 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, VALUE ex)
+unix_accept_nonblock(VALUE sock)
 {
     rb_io_t *fptr;
     struct sockaddr_un from;
@@ -69,7 +99,7 @@ unix_accept_nonblock(VALUE sock, VALUE ex)
 
     GetOpenFile(sock, fptr);
     fromlen = (socklen_t)sizeof(from);
-    return rsock_s_accept_nonblock(rb_cUNIXSocket, ex, fptr,
+    return rsock_s_accept_nonblock(rb_cUNIXSocket, fptr,
 			           (struct sockaddr *)&from, &fromlen);
 }
 
@@ -118,10 +148,7 @@ rsock_init_unixserver(void)
     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_private_method(rb_cUNIXServer,
-			     "__accept_nonblock", unix_accept_nonblock, 1);
-
+    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
index 5a44b552f8..0a1b65a5b9 100644
--- a/ext/socket/unixsocket.c
+++ b/ext/socket/unixsocket.c
@@ -65,16 +65,14 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
     }
 
     if (status < 0) {
-	int e = errno;
 	close(fd);
-	rsock_syserr_fail_path(e, "connect(2)", path);
+        rsock_sys_fail_path("connect(2)", path);
     }
 
     if (server) {
 	if (listen(fd, SOMAXCONN) < 0) {
-	    int e = errno;
 	    close(fd);
-	    rsock_syserr_fail_path(e, "listen(2)", path);
+            rsock_sys_fail_path("listen(2)", path);
 	}
     }
 
@@ -93,8 +91,6 @@ rsock_init_unixsock(VALUE sock, VALUE path, int server)
  *
  * Creates a new UNIX client socket connected to _path_.
  *
- *   require 'socket'
- *
  *   s = UNIXSocket.new("/tmp/sock")
  *   s.send "hello", 0
  *
@@ -135,7 +131,7 @@ unix_path(VALUE sock)
 
 /*
  * call-seq:
- *   unixsocket.recvfrom(maxlen [, flags[, outbuf]]) => [mesg, unixaddress]
+ *   unixsocket.recvfrom(maxlen [, flags]) => [mesg, unixaddress]
  *
  * Receives a message via _unixsocket_.
  *
@@ -143,9 +139,6 @@ unix_path(VALUE sock)
  *
  * _flags_ should be a bitwise OR of Socket::MSG_* constants.
  *
- * _outbuf_ will contain only the received data after the method call
- * even if it is not empty at the beginning.
- *
  *   s1 = Socket.new(:UNIX, :DGRAM, 0)
  *   s1_ai = Addrinfo.unix("/tmp/sock1")
  *   s1.bind(s1_ai)
@@ -205,8 +198,6 @@ sendmsg_blocking(void *data)
  *   p stdout.fileno #=> 6
  *
  *   stdout.puts "hello" # outputs "hello\n" to standard output.
- *
- * _io_ may be any kind of IO object or integer file descriptor.
  */
 static VALUE
 unix_send_io(VALUE sock, VALUE val)
@@ -287,8 +278,6 @@ recvmsg_blocking(void *data)
  * call-seq:
  *   unixsocket.recv_io([klass [, mode]]) => io
  *
- * Example
- *
  *   UNIXServer.open("/tmp/sock") {|serv|
  *     UNIXSocket.open("/tmp/sock") {|c|
  *       s = serv.accept
@@ -303,11 +292,6 @@ recvmsg_blocking(void *data)
  *     }
  *   }
  *
- * _klass_ will determine the class of _io_ returned (using the
- * IO.for_fd singleton method or similar).
- * If _klass_ is +nil+, an integer file descriptor is returned.
- *
- * _mode_ is the same as the argument passed to IO.for_fd
  */
 static VALUE
 unix_recv_io(int argc, VALUE *argv, VALUE sock)
@@ -424,7 +408,7 @@ unix_recv_io(int argc, VALUE *argv, VALUE sock)
 	ff_argc = mode == Qnil ? 1 : 2;
 	ff_argv[0] = INT2FIX(fd);
 	ff_argv[1] = mode;
-        return rb_funcallv(klass, for_fd, ff_argc, ff_argv);
+        return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
     }
 }
 #else
@@ -491,7 +475,7 @@ unix_peeraddr(VALUE sock)
  *   UNIXSocket.pair([type [, protocol]])       => [unixsocket1, unixsocket2]
  *   UNIXSocket.socketpair([type [, protocol]]) => [unixsocket1, unixsocket2]
  *
- * Creates a pair of sockets connected to each other.
+ * Creates a pair of sockets connected each other.
  *
  * _socktype_ should be a socket type such as: :STREAM, :DGRAM, :RAW, etc.
  *
diff --git a/ext/stringio/README b/ext/stringio/README
new file mode 100644
index 0000000000..d03f37dfd3
--- /dev/null
+++ b/ext/stringio/README
@@ -0,0 +1,18 @@
+-*- rd -*-
+$Author$
+
+=begin
+
+= StringIO
+Pseudo (({IO})) class from/to (({String})).
+
+This library is based on MoonWolf version written in Ruby.  Thanks a lot.
+
+= Differences to (({IO}))
+
+* not implemented: (({fcntl})), (({reopen})).
+* (({fileno})) returns nil.
+* (({pos=})) returns new position, not 0.
+* (({ungetc})) does nothing at start of the string.
+
+=end
diff --git a/ext/stringio/README.md b/ext/stringio/README.md
deleted file mode 100644
index 94532ed688..0000000000
--- a/ext/stringio/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# StringIO
-
-Pseudo `IO` class from/to `String`.
-
-This library is based on MoonWolf version written in Ruby.  Thanks a lot.
-
-## Differences to `IO`
-
-* `fileno` raises `NotImplementedError`.
-* encoding conversion is not implemented, and ignored silently.
diff --git a/ext/stringio/depend b/ext/stringio/depend
index cbd17f5df2..db356dd6e0 100644
--- a/ext/stringio/depend
+++ b/ext/stringio/depend
@@ -1,16 +1,4 @@
-# AUTOGENERATED DEPENDENCIES START
-stringio.o: $(RUBY_EXTCONF_H)
-stringio.o: $(arch_hdrdir)/ruby/config.h
-stringio.o: $(hdrdir)/ruby/backward.h
-stringio.o: $(hdrdir)/ruby/defines.h
-stringio.o: $(hdrdir)/ruby/encoding.h
-stringio.o: $(hdrdir)/ruby/intern.h
-stringio.o: $(hdrdir)/ruby/io.h
-stringio.o: $(hdrdir)/ruby/missing.h
-stringio.o: $(hdrdir)/ruby/oniguruma.h
-stringio.o: $(hdrdir)/ruby/ruby.h
-stringio.o: $(hdrdir)/ruby/st.h
-stringio.o: $(hdrdir)/ruby/subst.h
-stringio.o: $(top_srcdir)/include/ruby.h
-stringio.o: stringio.c
-# AUTOGENERATED DEPENDENCIES END
+stringio.o: stringio.c $(HDRS) $(ruby_headers) \
+  $(hdrdir)/ruby/io.h \
+  $(hdrdir)/ruby/encoding.h \
+  $(hdrdir)/ruby/oniguruma.h
diff --git a/ext/stringio/extconf.rb b/ext/stringio/extconf.rb
index ad8650dce2..8fc84b3735 100644
--- a/ext/stringio/extconf.rb
+++ b/ext/stringio/extconf.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: false
 require 'mkmf'
 create_makefile('stringio')
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index fb2eddaa7e..2964adab40 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -22,19 +22,16 @@
 
 struct StringIO {
     VALUE string;
-    rb_encoding *enc;
     long pos;
     long lineno;
     int flags;
     int count;
 };
 
-static VALUE strio_init(int, VALUE *, struct StringIO *, VALUE);
-static VALUE strio_unget_bytes(struct StringIO *, const char *, long);
+static void strio_init(int, VALUE *, struct StringIO *, VALUE);
 
 #define IS_STRIO(obj) (rb_typeddata_is_kind_of((obj), &strio_data_type))
-#define error_inval(msg) (rb_syserr_fail(EINVAL, msg))
-#define get_enc(ptr) ((ptr)->enc ? (ptr)->enc : rb_enc_get((ptr)->string))
+#define error_inval(msg) (errno = EINVAL, rb_sys_fail(msg))
 
 static struct StringIO *
 strio_alloc(void)
@@ -69,6 +66,8 @@ strio_free(void *p)
 static size_t
 strio_memsize(const void *p)
 {
+    const struct StringIO *ptr = p;
+    if (!ptr) return 0;
     return sizeof(struct StringIO);
 }
 
@@ -79,7 +78,7 @@ static const rb_data_type_t strio_data_type = {
 	strio_free,
 	strio_memsize,
     },
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define check_strio(self) ((struct StringIO*)rb_check_typeddata((self), &strio_data_type))
@@ -96,24 +95,16 @@ get_strio(VALUE self)
 }
 
 static VALUE
-enc_subseq(VALUE str, long pos, long len, rb_encoding *enc)
-{
-    str = rb_str_subseq(str, pos, len);
-    rb_enc_associate(str, enc);
-    return str;
-}
-
-static VALUE
 strio_substr(struct StringIO *ptr, long pos, long len)
 {
     VALUE str = ptr->string;
-    rb_encoding *enc = get_enc(ptr);
+    rb_encoding *enc = rb_enc_get(str);
     long rlen = RSTRING_LEN(str) - pos;
 
     if (len > rlen) len = rlen;
     if (len < 0) len = 0;
     if (len == 0) return rb_str_new(0,0);
-    return enc_subseq(str, pos, len, enc);
+    return rb_enc_str_new(RSTRING_PTR(str)+pos, len, enc);
 }
 
 #define StringIO(obj) get_strio(obj)
@@ -148,6 +139,8 @@ writable(VALUE strio)
     if (!WRITABLE(strio)) {
 	rb_raise(rb_eIOError, "not opened for writing");
     }
+    if (!OBJ_TAINTED(ptr->string)) {
+    }
     return ptr;
 }
 
@@ -179,10 +172,11 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
 	DATA_PTR(self) = ptr = strio_alloc();
     }
     rb_call_super(0, 0);
-    return strio_init(argc, argv, ptr, self);
+    strio_init(argc, argv, ptr, self);
+    return self;
 }
 
-static VALUE
+static void
 strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
 {
     VALUE string, mode;
@@ -192,17 +186,18 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
       case 2:
 	if (FIXNUM_P(mode)) {
 	    int flags = FIX2INT(mode);
-	    ptr->flags = rb_io_oflags_fmode(flags);
+	    ptr->flags = rb_io_modenum_flags(flags);
 	    trunc = flags & O_TRUNC;
 	}
 	else {
 	    const char *m = StringValueCStr(mode);
-	    ptr->flags = rb_io_modestr_fmode(m);
+	    ptr->flags = rb_io_mode_flags(m);
 	    trunc = *m == 'w';
 	}
 	StringValue(string);
 	if ((ptr->flags & FMODE_WRITABLE) && OBJ_FROZEN(string)) {
-	    rb_syserr_fail(EACCES, 0);
+	    errno = EACCES;
+	    rb_sys_fail(0);
 	}
 	if (trunc) {
 	    rb_str_resize(string, 0);
@@ -218,11 +213,9 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
 	break;
     }
     ptr->string = string;
-    ptr->enc = 0;
     ptr->pos = 0;
     ptr->lineno = 0;
     RBASIC(self)->flags |= (ptr->flags & FMODE_READWRITE) * (STRIO_READABLE / FMODE_READABLE);
-    return self;
 }
 
 static VALUE
@@ -249,19 +242,6 @@ strio_s_open(int argc, VALUE *argv, VALUE klass)
     return rb_ensure(rb_yield, obj, strio_finalize, obj);
 }
 
-/* :nodoc: */
-static VALUE
-strio_s_new(int argc, VALUE *argv, VALUE klass)
-{
-    if (rb_block_given_p()) {
-	VALUE cname = rb_obj_as_string(klass);
-
-	rb_warn("%"PRIsVALUE"::new() does not take block; use %"PRIsVALUE"::open() instead",
-		cname, cname);
-    }
-    return rb_class_new_instance(argc, argv, klass);
-}
-
 /*
  * Returns +false+.  Just for compatibility to IO.
  */
@@ -366,6 +346,9 @@ static VALUE
 strio_close(VALUE self)
 {
     StringIO(self);
+    if (CLOSED(self)) {
+	rb_raise(rb_eIOError, "closed stream");
+    }
     RBASIC(self)->flags &= ~STRIO_READWRITE;
     return Qnil;
 }
@@ -380,8 +363,8 @@ strio_close(VALUE self)
 static VALUE
 strio_close_read(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    if (!(ptr->flags & FMODE_READABLE)) {
+    StringIO(self);
+    if (!READABLE(self)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for reading");
     }
     RBASIC(self)->flags &= ~STRIO_READABLE;
@@ -398,8 +381,8 @@ strio_close_read(VALUE self)
 static VALUE
 strio_close_write(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    if (!(ptr->flags & FMODE_WRITABLE)) {
+    StringIO(self);
+    if (!WRITABLE(self)) {
 	rb_raise(rb_eIOError, "closing non-duplex IO for writing");
     }
     RBASIC(self)->flags &= ~STRIO_WRITABLE;
@@ -514,18 +497,7 @@ strio_set_lineno(VALUE self, VALUE lineno)
     return lineno;
 }
 
-static VALUE
-strio_binmode(VALUE self)
-{
-    struct StringIO *ptr = StringIO(self);
-    rb_encoding *enc = rb_ascii8bit_encoding();
-
-    ptr->enc = enc;
-    if (WRITABLE(self)) {
-	rb_enc_associate(ptr->string, enc);
-    }
-    return self;
-}
+#define strio_binmode strio_self
 
 #define strio_fcntl strio_unimpl
 
@@ -548,7 +520,8 @@ strio_reopen(int argc, VALUE *argv, VALUE self)
     if (argc == 1 && !RB_TYPE_P(*argv, T_STRING)) {
 	return strio_copy(self, *argv);
     }
-    return strio_init(argc, argv, StringIO(self), self);
+    strio_init(argc, argv, StringIO(self), self);
+    return self;
 }
 
 /*
@@ -610,30 +583,29 @@ strio_seek(int argc, VALUE *argv, VALUE self)
 {
     VALUE whence;
     struct StringIO *ptr = StringIO(self);
-    long amount, offset;
+    long offset;
 
     rb_scan_args(argc, argv, "11", NULL, &whence);
-    amount = NUM2LONG(argv[0]);
+    offset = NUM2LONG(argv[0]);
     if (CLOSED(self)) {
 	rb_raise(rb_eIOError, "closed stream");
     }
     switch (NIL_P(whence) ? 0 : NUM2LONG(whence)) {
       case 0:
-	offset = 0;
 	break;
       case 1:
-	offset = ptr->pos;
+	offset += ptr->pos;
 	break;
       case 2:
-	offset = RSTRING_LEN(ptr->string);
+	offset += RSTRING_LEN(ptr->string);
 	break;
       default:
 	error_inval("invalid whence");
     }
-    if (amount > LONG_MAX - offset || amount + offset < 0) {
+    if (offset < 0) {
 	error_inval(0);
     }
-    ptr->pos = amount + offset;
+    ptr->pos = offset;
     return INT2FIX(0);
 }
 
@@ -697,19 +669,17 @@ static VALUE
 strio_getc(VALUE self)
 {
     struct StringIO *ptr = readable(self);
-    rb_encoding *enc = get_enc(ptr);
-    VALUE str = ptr->string;
-    long pos = ptr->pos;
+    rb_encoding *enc = rb_enc_get(ptr->string);
     int len;
     char *p;
 
-    if (pos >= RSTRING_LEN(str)) {
+    if (ptr->pos >= RSTRING_LEN(ptr->string)) {
 	return Qnil;
     }
-    p = RSTRING_PTR(str)+pos;
-    len = rb_enc_mbclen(p, RSTRING_END(str), enc);
+    p = RSTRING_PTR(ptr->string)+ptr->pos;
+    len = rb_enc_mbclen(p, RSTRING_END(ptr->string), enc);
     ptr->pos += len;
-    return enc_subseq(str, pos, len, enc);
+    return rb_enc_str_new(p, len, rb_enc_get(ptr->string));
 }
 
 /*
@@ -735,9 +705,6 @@ strio_extend(struct StringIO *ptr, long pos, long len)
 {
     long olen;
 
-    if (len > LONG_MAX - pos)
-	rb_raise(rb_eArgError, "string size too big");
-
     check_modifiable(ptr);
     olen = RSTRING_LEN(ptr->string);
     if (pos + len > olen) {
@@ -763,17 +730,19 @@ static VALUE
 strio_ungetc(VALUE self, VALUE c)
 {
     struct StringIO *ptr = readable(self);
+    long lpos, clen;
+    char *p, *pend;
     rb_encoding *enc, *enc2;
 
-    check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
+    check_modifiable(ptr);
     if (FIXNUM_P(c)) {
 	int cc = FIX2INT(c);
 	char buf[16];
 
 	enc = rb_enc_get(ptr->string);
 	rb_enc_mbcput(cc, buf, enc);
-	return strio_unget_bytes(ptr, buf, rb_enc_codelen(cc, enc));
+	c = rb_enc_str_new(buf, rb_enc_codelen(cc, enc), enc);
     }
     else {
 	SafeStringValue(c);
@@ -782,10 +751,29 @@ strio_ungetc(VALUE self, VALUE c)
 	if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
 	    c = rb_str_conv_enc(c, enc2, enc);
 	}
-	strio_unget_bytes(ptr, RSTRING_PTR(c), RSTRING_LEN(c));
-	RB_GC_GUARD(c);
-	return Qnil;
     }
+    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++;
+	}
+	clen = p - RSTRING_PTR(ptr->string);
+	rb_str_update(ptr->string, lpos, ptr->pos ? 1 : 0, c);
+	ptr->pos = clen;
+    }
+
+    return Qnil;
 }
 
 /*
@@ -799,53 +787,35 @@ strio_ungetbyte(VALUE self, VALUE c)
 {
     struct StringIO *ptr = readable(self);
     char buf[1], *cp = buf;
-    long cl = 1;
+    long pos = ptr->pos, cl = 1;
+    VALUE str = ptr->string;
 
-    check_modifiable(ptr);
     if (NIL_P(c)) return Qnil;
     if (FIXNUM_P(c)) {
 	buf[0] = (char)FIX2INT(c);
-	return strio_unget_bytes(ptr, buf, 1);
     }
     else {
 	SafeStringValue(c);
 	cp = RSTRING_PTR(c);
 	cl = RSTRING_LEN(c);
 	if (cl == 0) return Qnil;
-	strio_unget_bytes(ptr, cp, cl);
-	RB_GC_GUARD(c);
-	return Qnil;
     }
-}
-
-static VALUE
-strio_unget_bytes(struct StringIO *ptr, const char *cp, long cl)
-{
-    long pos = ptr->pos, len, rest;
-    VALUE str = ptr->string;
-    char *s;
-
-    len = RSTRING_LEN(str);
-    rest = pos - len;
+    check_modifiable(ptr);
+    rb_str_modify(str);
     if (cl > pos) {
-	long ex = (rest < 0 ? cl-pos : cl+rest);
-	rb_str_modify_expand(str, ex);
-	rb_str_set_len(str, len + ex);
+	char *s;
+	long rest = RSTRING_LEN(str) - pos;
+	rb_str_resize(str, rest + cl);
 	s = RSTRING_PTR(str);
-	if (rest < 0) memmove(s + cl, s + pos, -rest);
+	memmove(s + cl, s + pos, rest);
 	pos = 0;
     }
     else {
-	if (rest > 0) {
-	    rb_str_modify_expand(str, rest);
-	    rb_str_set_len(str, len + rest);
-	}
-	s = RSTRING_PTR(str);
-	if (rest > cl) memset(s + len, 0, rest - cl);
 	pos -= cl;
     }
-    memcpy(s + pos, cp, cl);
+    memcpy(RSTRING_PTR(str) + pos, cp, cl);
     ptr->pos = pos;
+    RB_GC_GUARD(c);
     return Qnil;
 }
 
@@ -927,7 +897,7 @@ strio_each_codepoint(VALUE self)
     RETURN_ENUMERATOR(self, 0, 0);
 
     ptr = readable(self);
-    enc = get_enc(ptr);
+    enc = rb_enc_get(ptr->string);
     for (;;) {
 	if (ptr->pos >= RSTRING_LEN(ptr->string)) {
 	    return self;
@@ -986,19 +956,14 @@ bm_search(const char *little, long llen, const char *big, long blen, const long
     return -1;
 }
 
-struct getline_arg {
-    VALUE rs;
-    long limit;
-    unsigned int chomp: 1;
-};
-
-static struct getline_arg *
-prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
+static VALUE
+strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
 {
-    VALUE str, lim, opts;
-    long limit = -1;
+    const char *s, *e, *p;
+    long n, limit = 0;
+    VALUE str, lim;
 
-    argc = rb_scan_args(argc, argv, "02:", &str, &lim, &opts);
+    rb_scan_args(argc, argv, "02", &str, &lim);
     switch (argc) {
       case 0:
 	str = rb_rs;
@@ -1009,6 +974,7 @@ prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
 	    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 {
@@ -1022,38 +988,6 @@ prepare_getline_args(struct getline_arg *arg, int argc, VALUE *argv)
 	if (!NIL_P(lim)) limit = NUM2LONG(lim);
 	break;
     }
-    arg->rs = str;
-    arg->limit = limit;
-    arg->chomp = 0;
-    if (!NIL_P(opts)) {
-	static ID keywords[1];
-	VALUE vchomp;
-	if (!keywords[0]) {
-	    keywords[0] = rb_intern_const("chomp");
-	}
-	rb_get_kwargs(opts, keywords, 0, 1, &vchomp);
-	arg->chomp = (vchomp != Qundef) && RTEST(vchomp);
-    }
-    return arg;
-}
-
-static inline int
-chomp_newline_width(const char *s, const char *e)
-{
-    if (e > s && *--e == '\n') {
-	if (e > s && *--e == '\r') return 2;
-	return 1;
-    }
-    return 0;
-}
-
-static VALUE
-strio_getline(struct getline_arg *arg, struct StringIO *ptr)
-{
-    const char *s, *e, *p;
-    long n, limit = arg->limit;
-    VALUE str = arg->rs;
-    int w = 0;
 
     if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {
 	return Qnil;
@@ -1061,19 +995,15 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
     s = RSTRING_PTR(ptr->string);
     e = s + RSTRING_LEN(ptr->string);
     s += ptr->pos;
-    if (limit > 0 && (size_t)limit < (size_t)(e - s)) {
-	e = rb_enc_right_char_head(s, s + limit, e, get_enc(ptr));
+    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)) {
-	if (arg->chomp) {
-	    w = chomp_newline_width(s, e);
-	}
-	str = strio_substr(ptr, ptr->pos, e - s - w);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
     else if ((n = RSTRING_LEN(str)) == 0) {
 	p = s;
-	while (p[(p + 1 < e) && (*p == '\r') && 0] == '\n') {
-	    p += *p == '\r';
+	while (*p == '\n') {
 	    if (++p == e) {
 		return Qnil;
 	    }
@@ -1082,33 +1012,23 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
 	while ((p = memchr(p, '\n', e - p)) && (p != e)) {
 	    if (*++p == '\n') {
 		e = p + 1;
-		w = (arg->chomp ? 1 : 0);
-		break;
-	    }
-	    else if (*p == '\r' && p < e && p[1] == '\n') {
-		e = p + 2;
-		w = (arg->chomp ? 2 : 0);
 		break;
 	    }
 	}
-	if (!w && arg->chomp) {
-	    w = chomp_newline_width(s, e);
-	}
-	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s - w);
+	str = strio_substr(ptr, s - RSTRING_PTR(ptr->string), e - s);
     }
     else if (n == 1) {
 	if ((p = memchr(s, RSTRING_PTR(str)[0], e - s)) != 0) {
 	    e = p + 1;
-	    w = (arg->chomp ? (p > s && *(p-1) == '\r') + 1 : 0);
 	}
-	str = strio_substr(ptr, ptr->pos, e - s - w);
+	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_PTR(str), char, n) == 0) {
-			e = p + (arg->chomp ? 0 : n);
+			e = p + n;
 			break;
 		    }
 		}
@@ -1118,11 +1038,11 @@ strio_getline(struct getline_arg *arg, struct StringIO *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 + (arg->chomp ? 0 : n);
+		    e = s + pos + n;
 		}
 	    }
 	}
-	str = strio_substr(ptr, ptr->pos, e - s - w);
+	str = strio_substr(ptr, ptr->pos, e - s);
     }
     ptr->pos = e - RSTRING_PTR(ptr->string);
     ptr->lineno++;
@@ -1140,14 +1060,8 @@ strio_getline(struct getline_arg *arg, struct StringIO *ptr)
 static VALUE
 strio_gets(int argc, VALUE *argv, VALUE self)
 {
-    struct getline_arg arg;
-    VALUE str;
-
-    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
-	return rb_str_new(0, 0);
-    }
+    VALUE str = strio_getline(argc, argv, readable(self));
 
-    str = strio_getline(&arg, readable(self));
     rb_lastline_set(str);
     return str;
 }
@@ -1186,16 +1100,16 @@ static VALUE
 strio_each(int argc, VALUE *argv, VALUE self)
 {
     VALUE line;
-    struct getline_arg arg;
 
     StringIO(self);
     RETURN_ENUMERATOR(self, argc, argv);
 
-    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
+    if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
+	NUM2LONG(argv[argc-1]) == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for each_line");
     }
 
-    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
+    while (!NIL_P(line = strio_getline(argc, argv, readable(self)))) {
 	rb_yield(line);
     }
     return self;
@@ -1225,15 +1139,15 @@ static VALUE
 strio_readlines(int argc, VALUE *argv, VALUE self)
 {
     VALUE ary, line;
-    struct getline_arg arg;
 
     StringIO(self);
     ary = rb_ary_new();
-    if (prepare_getline_args(&arg, argc, argv)->limit == 0) {
+    if (argc > 0 && !NIL_P(argv[argc-1]) && NIL_P(rb_check_string_type(argv[argc-1])) &&
+	NUM2LONG(argv[argc-1]) == 0) {
 	rb_raise(rb_eArgError, "invalid limit: 0 for readlines");
     }
 
-    while (!NIL_P(line = strio_getline(&arg, readable(self)))) {
+    while (!NIL_P(line = strio_getline(argc, argv, readable(self)))) {
 	rb_ary_push(ary, line);
     }
     return ary;
@@ -1255,13 +1169,12 @@ strio_write(VALUE self, VALUE str)
     struct StringIO *ptr = writable(self);
     long len, olen;
     rb_encoding *enc, *enc2;
-    rb_encoding *const ascii8bit = rb_ascii8bit_encoding();
 
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
-    enc = get_enc(ptr);
+    enc = rb_enc_get(ptr->string);
     enc2 = rb_enc_get(str);
-    if (enc != enc2 && enc != ascii8bit) {
+    if (enc != enc2 && enc != rb_ascii8bit_encoding()) {
 	str = rb_str_conv_enc(str, enc2, enc);
     }
     len = RSTRING_LEN(str);
@@ -1272,7 +1185,7 @@ strio_write(VALUE self, VALUE str)
 	ptr->pos = olen;
     }
     if (ptr->pos == olen) {
-	if (enc == ascii8bit || enc2 == ascii8bit) {
+	if (enc2 == rb_ascii8bit_encoding()) {
 	    rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc);
 	    OBJ_INFECT(ptr->string, str);
 	}
@@ -1362,7 +1275,6 @@ strio_read(int argc, VALUE *argv, VALUE self)
     long len;
     int binary = 0;
 
-    rb_check_arity(argc, 0, 2);
     switch (argc) {
       case 2:
 	str = argv[1];
@@ -1399,6 +1311,8 @@ strio_read(int argc, VALUE *argv, VALUE self)
 	    len -= ptr->pos;
 	}
 	break;
+      default:
+	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
     }
     if (NIL_P(str)) {
 	str = strio_substr(ptr, ptr->pos, len);
@@ -1447,17 +1361,20 @@ static VALUE
 strio_read_nonblock(int argc, VALUE *argv, VALUE self)
 {
     VALUE opts = Qnil, val;
+    int no_exception = 0;
 
     rb_scan_args(argc, argv, "11:", NULL, NULL, &opts);
 
     if (!NIL_P(opts)) {
 	argc--;
+
+	if (Qfalse == rb_hash_aref(opts, sym_exception))
+	    no_exception = 1;
     }
 
     val = strio_read(argc, argv, self);
     if (NIL_P(val)) {
-	if (!NIL_P(opts) &&
-	      rb_hash_lookup2(opts, sym_exception, Qundef) == Qfalse)
+	if (no_exception)
 	    return Qnil;
 	else
 	    rb_eof_error();
@@ -1534,8 +1451,7 @@ strio_truncate(VALUE self, VALUE len)
 static VALUE
 strio_external_encoding(VALUE self)
 {
-    struct StringIO *ptr = StringIO(self);
-    return rb_enc_from_encoding(get_enc(ptr));
+    return rb_enc_from_encoding(rb_enc_get(StringIO(self)->string));
 }
 
 /*
@@ -1566,7 +1482,7 @@ static VALUE
 strio_set_encoding(int argc, VALUE *argv, VALUE self)
 {
     rb_encoding* enc;
-    struct StringIO *ptr = StringIO(self);
+    VALUE str = StringIO(self)->string;
     VALUE ext_enc, int_enc, opt;
 
     argc = rb_scan_args(argc, argv, "11:", &ext_enc, &int_enc, &opt);
@@ -1577,11 +1493,7 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
     else {
 	enc = rb_to_encoding(ext_enc);
     }
-    ptr->enc = enc;
-    if (WRITABLE(self)) {
-	rb_enc_associate(ptr->string, enc);
-    }
-
+    rb_enc_associate(str, enc);
     return self;
 }
 
@@ -1596,16 +1508,15 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
  *
  *   io = StringIO.new
  *   io.puts "Hello World"
- *   io.string #=> "Hello World\n"
+ *   io.string #=> "Hello World"
  */
 void
-Init_stringio(void)
+Init_stringio()
 {
     VALUE StringIO = rb_define_class("StringIO", rb_cData);
 
     rb_include_module(StringIO, rb_mEnumerable);
     rb_define_alloc_func(StringIO, strio_s_allocate);
-    rb_define_singleton_method(StringIO, "new", strio_s_new, -1);
     rb_define_singleton_method(StringIO, "open", strio_s_open, -1);
     rb_define_method(StringIO, "initialize", strio_initialize, -1);
     rb_define_method(StringIO, "initialize_copy", strio_copy, 1);
diff --git a/ext/strscan/depend b/ext/strscan/depend
index 318da4f7e7..689510ec66 100644
--- a/ext/strscan/depend
+++ b/ext/strscan/depend
@@ -1,18 +1,7 @@
-# AUTOGENERATED DEPENDENCIES START
-strscan.o: $(RUBY_EXTCONF_H)
-strscan.o: $(arch_hdrdir)/ruby/config.h
-strscan.o: $(hdrdir)/ruby/backward.h
-strscan.o: $(hdrdir)/ruby/defines.h
-strscan.o: $(hdrdir)/ruby/encoding.h
-strscan.o: $(hdrdir)/ruby/intern.h
-strscan.o: $(hdrdir)/ruby/missing.h
-strscan.o: $(hdrdir)/ruby/oniguruma.h
-strscan.o: $(hdrdir)/ruby/re.h
-strscan.o: $(hdrdir)/ruby/regex.h
-strscan.o: $(hdrdir)/ruby/ruby.h
-strscan.o: $(hdrdir)/ruby/st.h
-strscan.o: $(hdrdir)/ruby/subst.h
-strscan.o: $(top_srcdir)/regenc.h
-strscan.o: $(top_srcdir)/regint.h
-strscan.o: strscan.c
-# AUTOGENERATED DEPENDENCIES END
+strscan.o: strscan.c $(HDRS) $(ruby_headers) \
+           $(hdrdir)/re.h \
+           $(hdrdir)/regex.h \
+	   $(hdrdir)/encoding.h \
+	   $(hdrdir)/oniguruma.h \
+	   $(top_srcdir)/regint.h \
+	   $(top_srcdir)/regenc.h
diff --git a/ext/strscan/extconf.rb b/ext/strscan/extconf.rb
index c968f81c95..3e5a295e31 100644
--- a/ext/strscan/extconf.rb
+++ b/ext/strscan/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'mkmf'
 $INCFLAGS << " -I$(top_srcdir)"
 create_makefile 'strscan'
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 838f0e7f86..7f93324dee 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -64,7 +64,6 @@ struct strscanner
                             Function Prototypes
    ======================================================================= */
 
-static inline long minl _((const long n, const long x));
 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));
@@ -141,17 +140,12 @@ str_new(struct strscanner *p, const char *ptr, long len)
     return str;
 }
 
-static inline long
-minl(const long x, const long y)
-{
-    return (x < y) ? x : y;
-}
-
 static VALUE
 extract_range(struct strscanner *p, long beg_i, long end_i)
 {
     if (beg_i > S_LEN(p)) return Qnil;
-    end_i = minl(end_i, S_LEN(p));
+    if (end_i > S_LEN(p))
+        end_i = S_LEN(p);
     return infect(str_new(p, S_PBEG(p) + beg_i, end_i - beg_i), p);
 }
 
@@ -159,7 +153,8 @@ static VALUE
 extract_beg_len(struct strscanner *p, long beg_i, long len)
 {
     if (beg_i > S_LEN(p)) return Qnil;
-    len = minl(len, S_LEN(p) - beg_i);
+    if (beg_i + len > S_LEN(p))
+        len = S_LEN(p) - beg_i;
     return infect(str_new(p, S_PBEG(p) + beg_i, len), p);
 }
 
@@ -186,25 +181,29 @@ static size_t
 strscan_memsize(const void *ptr)
 {
     const struct strscanner *p = ptr;
-    return sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs);
+    size_t size = 0;
+    if (p) {
+	size = sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs);
+    }
+    return size;
 }
 
 static const rb_data_type_t strscanner_type = {
     "StringScanner",
     {strscan_mark, strscan_free, strscan_memsize},
-    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
 strscan_s_allocate(VALUE klass)
 {
     struct strscanner *p;
-    VALUE obj = TypedData_Make_Struct(klass, struct strscanner, &strscanner_type, p);
 
+    p = ZALLOC(struct strscanner);
     CLEAR_MATCH_STATUS(p);
     onig_region_init(&(p->regs));
     p->str = Qnil;
-    return obj;
+    return TypedData_Wrap_Struct(klass, &strscanner_type, p);
 }
 
 /*
@@ -252,9 +251,7 @@ strscan_init_copy(VALUE vself, VALUE vorig)
 	self->str = orig->str;
 	self->prev = orig->prev;
 	self->curr = orig->curr;
-	if (rb_reg_region_copy(&self->regs, &orig->regs))
-	    rb_memerror();
-	RB_GC_GUARD(vorig);
+	onig_region_copy(&self->regs, &orig->regs);
     }
 
     return vself;
@@ -465,7 +462,7 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
 
     p->regex = regex;
     re = rb_reg_prepare_re(regex, p->str);
-    tmpreg = re != RREGEXP_PTR(regex);
+    tmpreg = re != RREGEXP(regex)->ptr;
     if (!tmpreg) RREGEXP(regex)->usecnt++;
 
     if (headonly) {
@@ -485,8 +482,8 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
             onig_free(re);
         }
         else {
-            onig_free(RREGEXP_PTR(regex));
-            RREGEXP_PTR(regex) = re;
+            onig_free(RREGEXP(regex)->ptr);
+            RREGEXP(regex)->ptr = re;
         }
     }
 
@@ -733,7 +730,9 @@ strscan_getch(VALUE self)
         return Qnil;
 
     len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
-    len = minl(len, S_RESTLEN(p));
+    if (p->curr + len > S_LEN(p)) {
+        len = S_LEN(p) - p->curr;
+    }
     p->prev = p->curr;
     p->curr += len;
     MATCHED(p);
@@ -810,7 +809,8 @@ strscan_peek(VALUE self, VALUE vlen)
     if (EOS_P(p))
         return infect(str_new(p, "", 0), p);
 
-    len = minl(len, S_RESTLEN(p));
+    if (p->curr + len > S_LEN(p))
+        len = S_LEN(p) - p->curr;
     return extract_beg_len(p, p->curr, len);
 }
 
@@ -980,7 +980,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
 {
     int num;
 
-    num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
+    num = onig_name_to_backref_number(RREGEXP(regexp)->ptr,
 	(const unsigned char* )name, (const unsigned char* )name_end, regs);
     if (num >= 1) {
 	return num;
@@ -1118,7 +1118,7 @@ strscan_rest_size(VALUE self)
     if (EOS_P(p)) {
         return INT2FIX(0);
     }
-    i = S_RESTLEN(p);
+    i = S_LEN(p) - p->curr;
     return INT2FIX(i);
 }
 
@@ -1204,7 +1204,7 @@ inspect2(struct strscanner *p)
     long len;
 
     if (EOS_P(p)) return rb_str_new2("");
-    len = S_RESTLEN(p);
+    len = S_LEN(p) - p->curr;
     if (len > INSPECT_LENGTH) {
 	str = rb_str_new(CURPTR(p), INSPECT_LENGTH);
 	rb_str_cat2(str, "...");
@@ -1323,7 +1323,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;
diff --git a/ext/syslog/depend b/ext/syslog/depend
index ee2ad79052..0e2d76fbf6 100644
--- a/ext/syslog/depend
+++ b/ext/syslog/depend
@@ -1,13 +1,2 @@
-# AUTOGENERATED DEPENDENCIES START
-syslog.o: $(RUBY_EXTCONF_H)
-syslog.o: $(arch_hdrdir)/ruby/config.h
-syslog.o: $(hdrdir)/ruby/backward.h
-syslog.o: $(hdrdir)/ruby/defines.h
-syslog.o: $(hdrdir)/ruby/intern.h
-syslog.o: $(hdrdir)/ruby/missing.h
-syslog.o: $(hdrdir)/ruby/ruby.h
-syslog.o: $(hdrdir)/ruby/st.h
-syslog.o: $(hdrdir)/ruby/subst.h
-syslog.o: $(hdrdir)/ruby/util.h
-syslog.o: syslog.c
-# AUTOGENERATED DEPENDENCIES END
+syslog.o: syslog.c $(HDRS) $(ruby_headers) \
+  $(hdrdir)/util.h
diff --git a/ext/syslog/extconf.rb b/ext/syslog/extconf.rb
index 3bfea1fa73..0fa0bc339b 100644
--- a/ext/syslog/extconf.rb
+++ b/ext/syslog/extconf.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 # $RoughId: extconf.rb,v 1.3 2001/11/24 17:49:26 knu Exp $
 # $Id$
 
diff --git a/ext/syslog/lib/syslog/logger.rb b/ext/syslog/lib/syslog/logger.rb
index 06cbe5b19d..086f83c591 100644
--- a/ext/syslog/lib/syslog/logger.rb
+++ b/ext/syslog/lib/syslog/logger.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: false
 require 'syslog'
 require 'logger'
 
@@ -67,7 +66,7 @@ class Syslog::Logger
   ##
   # The version of Syslog::Logger you are using.
 
-  VERSION = '2.1.0'
+  VERSION = '2.0'
 
   ##
   # Maps Logger warning types to syslog(3) warning types.
diff --git a/ext/syslog/syslog.c b/ext/syslog/syslog.c
index 9c41795f5b..8ef722e1c0 100644
--- a/ext/syslog/syslog.c
+++ b/ext/syslog/syslog.c
@@ -304,7 +304,9 @@ static VALUE mSyslog_log(int argc, VALUE *argv, VALUE self)
 {
     VALUE pri;
 
-    rb_check_arity(argc, 2, UNLIMITED_ARGUMENTS);
+    if (argc < 2) {
+        rb_raise(rb_eArgError, "wrong number of arguments (%d for 2+)", argc);
+    }
 
     argc--;
     pri = *argv++;
@@ -416,7 +418,7 @@ static VALUE mSyslogMacros_included(VALUE mod, VALUE target)
  *
  * The syslog protocol is standardized in RFC 5424.
  */
-void Init_syslog(void)
+void Init_syslog()
 {
     mSyslog = rb_define_module("Syslog");
 
diff --git a/ext/thread/extconf.rb b/ext/thread/extconf.rb
new file mode 100644
index 0000000000..f2f0890580
--- /dev/null
+++ b/ext/thread/extconf.rb
@@ -0,0 +1,3 @@
+require 'mkmf'
+
+create_makefile('thread')
diff --git a/ext/thread/thread.c b/ext/thread/thread.c
new file mode 100644
index 0000000000..c14443b06c
--- /dev/null
+++ b/ext/thread/thread.c
@@ -0,0 +1,653 @@
+#include <ruby.h>
+
+enum {
+    CONDVAR_WAITERS = 0
+};
+
+enum {
+    QUEUE_QUE       = 0,
+    QUEUE_WAITERS   = 1,
+    SZQUEUE_WAITERS = 2,
+    SZQUEUE_MAX     = 3
+};
+
+#define GET_CONDVAR_WAITERS(cv) get_array((cv), CONDVAR_WAITERS)
+
+#define GET_QUEUE_QUE(q)        get_array((q), QUEUE_QUE)
+#define GET_QUEUE_WAITERS(q)    get_array((q), QUEUE_WAITERS)
+#define GET_SZQUEUE_WAITERS(q)  get_array((q), SZQUEUE_WAITERS)
+#define GET_SZQUEUE_MAX(q)      RSTRUCT_GET((q), SZQUEUE_MAX)
+#define GET_SZQUEUE_ULONGMAX(q) NUM2ULONG(GET_SZQUEUE_MAX(q))
+
+static VALUE
+get_array(VALUE obj, int idx)
+{
+    VALUE ary = RSTRUCT_GET(obj, idx);
+    if (!RB_TYPE_P(ary, T_ARRAY)) {
+	rb_raise(rb_eTypeError, "%+"PRIsVALUE" not initialized", obj);
+    }
+    return ary;
+}
+
+static VALUE
+ary_buf_new(void)
+{
+    return rb_ary_tmp_new(1);
+}
+
+static void
+wakeup_first_thread(VALUE list)
+{
+    VALUE thread;
+
+    while (!NIL_P(thread = rb_ary_shift(list))) {
+	if (RTEST(rb_thread_wakeup_alive(thread))) break;
+    }
+}
+
+static void
+wakeup_all_threads(VALUE list)
+{
+    VALUE thread;
+    long i;
+
+    for (i=0; i<RARRAY_LEN(list); i++) {
+	thread = RARRAY_AREF(list, i);
+	rb_thread_wakeup_alive(thread);
+    }
+    rb_ary_clear(list);
+}
+
+/*
+ *  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
+ *	 }
+ *    }
+ */
+
+/*
+ * Document-method: ConditionVariable::new
+ *
+ * Creates a new condition variable instance.
+ */
+
+static VALUE
+rb_condvar_initialize(VALUE self)
+{
+    RSTRUCT_SET(self, CONDVAR_WAITERS, ary_buf_new());
+    return self;
+}
+
+struct sleep_call {
+    VALUE mutex;
+    VALUE timeout;
+};
+
+static ID id_sleep;
+
+static VALUE
+do_sleep(VALUE args)
+{
+    struct sleep_call *p = (struct sleep_call *)args;
+    return rb_funcall2(p->mutex, id_sleep, 1, &p->timeout);
+}
+
+static VALUE
+delete_current_thread(VALUE ary)
+{
+    return rb_ary_delete(ary, rb_thread_current());
+}
+
+/*
+ * Document-method: ConditionVariable#wait
+ * call-seq: wait(mutex, timeout=nil)
+ *
+ * Releases the lock held in +mutex+ 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.
+ */
+
+static VALUE
+rb_condvar_wait(int argc, VALUE *argv, VALUE self)
+{
+    VALUE waiters = GET_CONDVAR_WAITERS(self);
+    VALUE mutex, timeout;
+    struct sleep_call args;
+
+    rb_scan_args(argc, argv, "11", &mutex, &timeout);
+
+    args.mutex   = mutex;
+    args.timeout = timeout;
+    rb_ary_push(waiters, rb_thread_current());
+    rb_ensure(do_sleep, (VALUE)&args, delete_current_thread, waiters);
+
+    return self;
+}
+
+/*
+ * Document-method: ConditionVariable#signal
+ *
+ * Wakes up the first thread in line waiting for this lock.
+ */
+
+static VALUE
+rb_condvar_signal(VALUE self)
+{
+    wakeup_first_thread(GET_CONDVAR_WAITERS(self));
+    return self;
+}
+
+/*
+ * Document-method: ConditionVariable#broadcast
+ *
+ * Wakes up all threads waiting for this lock.
+ */
+
+static VALUE
+rb_condvar_broadcast(VALUE self)
+{
+    wakeup_all_threads(GET_CONDVAR_WAITERS(self));
+    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
+ *
+ */
+
+/*
+ * Document-method: Queue::new
+ *
+ * Creates a new queue instance.
+ */
+
+static VALUE
+rb_queue_initialize(VALUE self)
+{
+    RSTRUCT_SET(self, QUEUE_QUE, ary_buf_new());
+    RSTRUCT_SET(self, QUEUE_WAITERS, ary_buf_new());
+    return self;
+}
+
+static VALUE
+queue_do_push(VALUE self, VALUE obj)
+{
+    rb_ary_push(GET_QUEUE_QUE(self), obj);
+    wakeup_first_thread(GET_QUEUE_WAITERS(self));
+    return self;
+}
+
+/*
+ * Document-method: Queue#push
+ * call-seq:
+ *   push(object)
+ *   enq(object)
+ *   <<(object)
+ *
+ * Pushes the given +object+ to the queue.
+ */
+
+static VALUE
+rb_queue_push(VALUE self, VALUE obj)
+{
+    return queue_do_push(self, obj);
+}
+
+static unsigned long
+queue_length(VALUE self)
+{
+    return RARRAY_LEN(GET_QUEUE_QUE(self));
+}
+
+static unsigned long
+queue_num_waiting(VALUE self)
+{
+    return RARRAY_LEN(GET_QUEUE_WAITERS(self));
+}
+
+struct waiting_delete {
+    VALUE waiting;
+    VALUE th;
+};
+
+static VALUE
+queue_delete_from_waiting(struct waiting_delete *p)
+{
+    rb_ary_delete(p->waiting, p->th);
+    return Qnil;
+}
+
+static VALUE
+queue_sleep(VALUE arg)
+{
+    rb_thread_sleep_deadly();
+    return Qnil;
+}
+
+static VALUE
+queue_do_pop(VALUE self, int should_block)
+{
+    struct waiting_delete args;
+    args.waiting = GET_QUEUE_WAITERS(self);
+    args.th	 = rb_thread_current();
+
+    while (queue_length(self) == 0) {
+	if (!should_block) {
+	    rb_raise(rb_eThreadError, "queue empty");
+	}
+	rb_ary_push(args.waiting, args.th);
+	rb_ensure(queue_sleep, (VALUE)0, queue_delete_from_waiting, (VALUE)&args);
+    }
+
+    return rb_ary_shift(GET_QUEUE_QUE(self));
+}
+
+static int
+queue_pop_should_block(int argc, const VALUE *argv)
+{
+    int should_block = 1;
+    rb_check_arity(argc, 0, 1);
+    if (argc > 0) {
+	should_block = !RTEST(argv[0]);
+    }
+    return should_block;
+}
+
+/*
+ * Document-method: Queue#pop
+ * call-seq:
+ *   pop(non_block=false)
+ *   deq(non_block=false)
+ *   shift(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)
+{
+    int should_block = queue_pop_should_block(argc, argv);
+    return queue_do_pop(self, should_block);
+}
+
+/*
+ * Document-method: Queue#empty?
+ * call-seq: empty?
+ *
+ * Returns +true+ if the queue is empty.
+ */
+
+static VALUE
+rb_queue_empty_p(VALUE self)
+{
+    return queue_length(self) == 0 ? Qtrue : Qfalse;
+}
+
+/*
+ * Document-method: Queue#clear
+ *
+ * Removes all objects from the queue.
+ */
+
+static VALUE
+rb_queue_clear(VALUE self)
+{
+    rb_ary_clear(GET_QUEUE_QUE(self));
+    return self;
+}
+
+/*
+ * Document-method: Queue#length
+ * call-seq:
+ *   length
+ *   size
+ *
+ * Returns the length of the queue.
+ */
+
+static VALUE
+rb_queue_length(VALUE self)
+{
+    unsigned long len = queue_length(self);
+    return ULONG2NUM(len);
+}
+
+/*
+ * Document-method: Queue#num_waiting
+ *
+ * Returns the number of threads waiting on the queue.
+ */
+
+static VALUE
+rb_queue_num_waiting(VALUE self)
+{
+    unsigned long len = queue_num_waiting(self);
+    return ULONG2NUM(len);
+}
+
+/*
+ *  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: SizedQueue::new
+ * call-seq: new(max)
+ *
+ * Creates a fixed-length queue with a maximum size of +max+.
+ */
+
+static VALUE
+rb_szqueue_initialize(VALUE self, VALUE vmax)
+{
+    long max;
+
+    max = NUM2LONG(vmax);
+    if (max <= 0) {
+	rb_raise(rb_eArgError, "queue size must be positive");
+    }
+
+    RSTRUCT_SET(self, QUEUE_QUE, ary_buf_new());
+    RSTRUCT_SET(self, QUEUE_WAITERS, ary_buf_new());
+    RSTRUCT_SET(self, SZQUEUE_WAITERS, ary_buf_new());
+    RSTRUCT_SET(self, SZQUEUE_MAX, vmax);
+
+    return self;
+}
+
+/*
+ * Document-method: SizedQueue#max
+ *
+ * Returns the maximum size of the queue.
+ */
+
+static VALUE
+rb_szqueue_max_get(VALUE self)
+{
+    return GET_SZQUEUE_MAX(self);
+}
+
+/*
+ * Document-method: SizedQueue#max=
+ * call-seq: max=(number)
+ *
+ * Sets the maximum size of the queue to the given +number+.
+ */
+
+static VALUE
+rb_szqueue_max_set(VALUE self, VALUE vmax)
+{
+    long max = NUM2LONG(vmax), diff = 0;
+    VALUE t;
+
+    if (max <= 0) {
+	rb_raise(rb_eArgError, "queue size must be positive");
+    }
+    if ((unsigned long)max > GET_SZQUEUE_ULONGMAX(self)) {
+	diff = max - GET_SZQUEUE_ULONGMAX(self);
+    }
+    RSTRUCT_SET(self, SZQUEUE_MAX, vmax);
+    while (diff-- > 0 && !NIL_P(t = rb_ary_shift(GET_SZQUEUE_WAITERS(self)))) {
+	rb_thread_wakeup_alive(t);
+    }
+    return vmax;
+}
+
+static int
+szqueue_push_should_block(int argc, const VALUE *argv)
+{
+    int should_block = 1;
+    rb_check_arity(argc, 1, 2);
+    if (argc > 1) {
+	should_block = !RTEST(argv[1]);
+    }
+    return should_block;
+}
+
+/*
+ * Document-method: SizedQueue#push
+ * call-seq:
+ *   push(object, non_block=false)
+ *   enq(object, non_block=false)
+ *   <<(object)
+ *
+ * Pushes +object+ to the queue.
+ *
+ * If there is no space left in the queue, waits until space becomes
+ * available, unless +non_block+ is true.  If +non_block+ is true, the
+ * thread isn't suspended, and an exception is raised.
+ */
+
+static VALUE
+rb_szqueue_push(int argc, VALUE *argv, VALUE self)
+{
+    struct waiting_delete args;
+    int should_block = szqueue_push_should_block(argc, argv);
+    args.waiting = GET_SZQUEUE_WAITERS(self);
+    args.th      = rb_thread_current();
+
+    while (queue_length(self) >= GET_SZQUEUE_ULONGMAX(self)) {
+	if (!should_block) {
+	    rb_raise(rb_eThreadError, "queue full");
+	}
+	rb_ary_push(args.waiting, args.th);
+	rb_ensure((VALUE (*)())rb_thread_sleep_deadly, (VALUE)0, queue_delete_from_waiting, (VALUE)&args);
+    }
+    return queue_do_push(self, argv[0]);
+}
+
+static VALUE
+szqueue_do_pop(VALUE self, int should_block)
+{
+    VALUE retval = queue_do_pop(self, should_block);
+
+    if (queue_length(self) < GET_SZQUEUE_ULONGMAX(self)) {
+	wakeup_first_thread(GET_SZQUEUE_WAITERS(self));
+    }
+
+    return retval;
+}
+
+/*
+ * Document-method: SizedQueue#pop
+ * call-seq:
+ *   pop(non_block=false)
+ *   deq(non_block=false)
+ *   shift(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_szqueue_pop(int argc, VALUE *argv, VALUE self)
+{
+    int should_block = queue_pop_should_block(argc, argv);
+    return szqueue_do_pop(self, should_block);
+}
+
+/*
+ * Document-method: Queue#clear
+ *
+ * Removes all objects from the queue.
+ */
+
+static VALUE
+rb_szqueue_clear(VALUE self)
+{
+    rb_ary_clear(GET_QUEUE_QUE(self));
+    wakeup_all_threads(GET_SZQUEUE_WAITERS(self));
+    return self;
+}
+
+/*
+ * Document-method: SizedQueue#num_waiting
+ *
+ * Returns the number of threads waiting on the queue.
+ */
+
+static VALUE
+rb_szqueue_num_waiting(VALUE self)
+{
+    long len = queue_num_waiting(self);
+    len += RARRAY_LEN(GET_SZQUEUE_WAITERS(self));
+    return ULONG2NUM(len);
+}
+
+#ifndef UNDER_THREAD
+#define UNDER_THREAD 1
+#endif
+
+/* :nodoc: */
+static VALUE
+undumpable(VALUE obj)
+{
+    rb_raise(rb_eTypeError, "can't dump %"PRIsVALUE, rb_obj_class(obj));
+    UNREACHABLE;
+}
+
+void
+Init_thread(void)
+{
+#if UNDER_THREAD
+#define ALIAS_GLOBAL_CONST(name) do {	              \
+	ID id = rb_intern_const(#name);	              \
+	if (!rb_const_defined_at(rb_cObject, id)) {   \
+	    rb_const_set(rb_cObject, id, rb_c##name); \
+	}                                             \
+    } while (0)
+#define OUTER rb_cThread
+#else
+#define ALIAS_GLOBAL_CONST(name) do { /* nothing */ } while (0)
+#define OUTER 0
+#endif
+
+    VALUE rb_cConditionVariable = rb_struct_define_without_accessor_under(
+	OUTER,
+	"ConditionVariable", rb_cObject, rb_struct_alloc_noinit,
+	"waiters", NULL);
+    VALUE rb_cQueue = rb_struct_define_without_accessor_under(
+	OUTER,
+	"Queue", rb_cObject, rb_struct_alloc_noinit,
+	"que", "waiters", NULL);
+    VALUE rb_cSizedQueue = rb_struct_define_without_accessor_under(
+	OUTER,
+	"SizedQueue", rb_cQueue, rb_struct_alloc_noinit,
+	"que", "waiters", "queue_waiters", "size", NULL);
+
+#if 0
+    rb_cConditionVariable = rb_define_class("ConditionVariable", rb_cObject); /* teach rdoc ConditionVariable */
+    rb_cQueue = rb_define_class("Queue", rb_cObject); /* teach rdoc Queue */
+    rb_cSizedQueue = rb_define_class("SizedQueue", rb_cObject); /* teach rdoc SizedQueue */
+#endif
+
+    id_sleep = rb_intern("sleep");
+
+    rb_define_method(rb_cConditionVariable, "initialize", rb_condvar_initialize, 0);
+    rb_undef_method(rb_cConditionVariable, "initialize_copy");
+    rb_define_method(rb_cConditionVariable, "marshal_dump", undumpable, 0);
+    rb_define_method(rb_cConditionVariable, "wait", rb_condvar_wait, -1);
+    rb_define_method(rb_cConditionVariable, "signal", rb_condvar_signal, 0);
+    rb_define_method(rb_cConditionVariable, "broadcast", rb_condvar_broadcast, 0);
+
+    rb_define_method(rb_cQueue, "initialize", rb_queue_initialize, 0);
+    rb_undef_method(rb_cQueue, "initialize_copy");
+    rb_define_method(rb_cQueue, "marshal_dump", undumpable, 0);
+    rb_define_method(rb_cQueue, "push", rb_queue_push, 1);
+    rb_define_method(rb_cQueue, "pop", rb_queue_pop, -1);
+    rb_define_method(rb_cQueue, "empty?", rb_queue_empty_p, 0);
+    rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
+    rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
+    rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
+
+    /* Alias for #push. */
+    rb_define_alias(rb_cQueue, "enq", "push");
+    /* Alias for #push. */
+    rb_define_alias(rb_cQueue, "<<", "push");
+    /* Alias for #pop. */
+    rb_define_alias(rb_cQueue, "deq", "pop");
+    /* Alias for #pop. */
+    rb_define_alias(rb_cQueue, "shift", "pop");
+    /* Alias for #length. */
+    rb_define_alias(rb_cQueue, "size", "length");
+
+    rb_define_method(rb_cSizedQueue, "initialize", rb_szqueue_initialize, 1);
+    rb_define_method(rb_cSizedQueue, "max", rb_szqueue_max_get, 0);
+    rb_define_method(rb_cSizedQueue, "max=", rb_szqueue_max_set, 1);
+    rb_define_method(rb_cSizedQueue, "push", rb_szqueue_push, -1);
+    rb_define_method(rb_cSizedQueue, "pop", rb_szqueue_pop, -1);
+    rb_define_method(rb_cSizedQueue, "clear", rb_szqueue_clear, 0);
+    rb_define_method(rb_cSizedQueue, "num_waiting", rb_szqueue_num_waiting, 0);
+
+    /* Alias for #push. */
+    rb_define_alias(rb_cSizedQueue, "enq", "push");
+    /* Alias for #push. */
+    rb_define_alias(rb_cSizedQueue, "<<", "push");
+    /* Alias for #pop. */
+    rb_define_alias(rb_cSizedQueue, "deq", "pop");
+    /* Alias for #pop. */
+    rb_define_alias(rb_cSizedQueue, "shift", "pop");
+
+    rb_provide("thread.rb");
+    ALIAS_GLOBAL_CONST(ConditionVariable);
+    ALIAS_GLOBAL_CONST(Queue);
+    ALIAS_GLOBAL_CONST(SizedQueue);
+}
diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
new file mode 100644
index 0000000000..52a0b7ea3a
--- /dev/null
+++ b/ext/tk/ChangeLog.tkextlib
@@ -0,0 +1,949 @@
+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.
+
+	* ext/tk/lib/tkextlib/tile/dialog.rb: forget to give an argument.
+
+	* ext/tk/lib/tkextlib/version.rb: update RELEASE_DATE.
+
+2007-01-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tk/lib/tkextlib/iwidgets/checkbox.rb: wrong number of arguments
+	  [ruby-Bugs-7776].
+
+	* ext/tk/lib/tkextlib/iwidgets/radiobox.rb: ditto.
+
+	* ext/tk/lib/tkextlib/blt/tile/checkbutton.rb: change primary name
+	  of class [ruby-dev:30080].
+
+	* ext/tk/lib/tkextlib/blt/tile/radiobutton.rb: ditto.
+
+2006-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/treeview.rb : minor bug fix.
+
+	* lib/tkextlib/blt/table.rb: fix bugs which forbade use of
+	  '::blt::table' command. Now, probably, it'll works properly.
+
+2006-11-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/version.rb: keep release date of tkextlib on
+	  "Tk::Tkextlib_RELEASE_DATE".
+
+	* lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
+	  Now, you can handle tree items as objects.
+
+2006-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb, lib/tkextlib/tile/* : support Tile 0.7.6.
+
+2006-10-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: [ruby-talk:211939] check links
+	  of extensions.
+
+	* lib/tkextlib/blt/container.rb: define instance methods properly.
+
+        * lib/tkextlib/tile/tcombobox.rb: bug fix [ruby-talk:213003].
+
+	* lib/tkextlib/tile/tnotebook.rb: ditto.
+
+	* lib/tkextlib/tile/treeview.rb: ditto.
+
+	* lib/tkextlib/tile/sizegrip.rb: [new] add 'ttk::sizegrip' widget.
+
+2006-08-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt.rb: double dashes (--) option doesn't work
+	  properly on some versions of BLT (wrong description on the
+	  manual of `blt::bgexec'?).
+
+2005-12-11  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: update to support libraries in
+          ActiveTcl8.4.12.0.
+
+	* lib/tkextlib/tile/tnotebook.rb: add Tk::Tile::TNotebook#insert.
+
+	* sample/tkextlib/tile/demo.rb: improve the look of a part of the demo.
+
+2005-11-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tile/demo.rb: bug fix
+
+	* sample/tkextlib/tile/themes/*: add some themes (blue,
+	  keramik, and plastik; require Tile-0.5 or later).
+
+2005-11-22  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
+	  is not defined).
+
+2005-11-19  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/treectrl/demo.rb: remove dependency on Ruby's
+	  version (1.8 or 1.9).
+
+2005-10-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/*: update to support ActiveTcl8.4.11.2
+
+	* lib/tkextlib/trofs/*: support Trofs 0.4.3
+
+	* lib/tkextlib/tile/*: support Tile 0.7.2
+
+	* lib/tkextlib/vu/*: support vu 2.3.0
+
+	* lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3 part only)
+
+	* lib/tkextlib/*: improve conversion of option values
+
+2005-10-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tktable/tktable.rb: border_* instance methods
+	  don't call 'border' subcommands.
+
+2005-08-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: didn't check
+	  __item_ruby2val_optkeys().
+
+2005-08-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/barchart.rb: support to treat tkvariable-type
+	  configure options.
+
+	* lib/tkextlib/blt/component.rb: ditto.
+
+	* lib/tkextlib/blt/dragdrop.rb: ditto.
+
+	* lib/tkextlib/blt/treeview.rb: ditto.
+
+	* lib/tkextlib/bwidget/button.rb: ditto.
+
+	* lib/tkextlib/bwidget/entry.rb: ditto.
+
+	* lib/tkextlib/bwidget/label.rb: ditto.
+
+	* lib/tkextlib/bwidget/labelentry.rb: ditto.
+
+	* lib/tkextlib/bwidget/labelframe.rb: ditto.
+
+	* lib/tkextlib/bwidget/mainframe.rb: ditto.
+
+	* lib/tkextlib/bwidget/passwddlg.rb: ditto.
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto.
+
+	* lib/tkextlib/bwidget/tree.rb: ditto.
+
+	* lib/tkextlib/iwidgets/calendar.rb: ditto.
+
+	* lib/tkextlib/iwidgets/entryfield.rb: ditto.
+
+	* lib/tkextlib/iwidgets/hierarchy.rb: ditto.
+
+	* lib/tkextlib/iwidgets/labeledframe.rb: ditto.
+
+	* lib/tkextlib/iwidgets/labeledwidget.rb: ditto.
+
+	* lib/tkextlib/iwidgets/menubar.rb: ditto.
+
+	* lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
+
+	* lib/tkextlib/iwidgets/spinner.rb: ditto.
+
+	* lib/tkextlib/iwidgets/toolbar.rb: ditto.
+
+	* lib/tkextlib/tkimg/pixmap.rb: ditto.
+
+	* lib/tkextlib/tktable/tktable.rb: ditto.
+
+2005-08-06  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Scale#variable.
+
+2005-08-04  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: followed previous changes.
+
+2005-08-04  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/t*.rb: aliased class names starting with 'T'
+	  to non 'T' ones. (ie. Tk::Tile::TButton -> Tk::Tile::Button)
+	  [ruby-dev:26724]
+
+	* lib/tkextlib/tile.rb: ditto. (autoload support)
+
+2005-08-04  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: fixed: Tk::Tile::TProgressbar is
+	  supported on tile 0.6 or later, not tile 0.5.
+
+	* sample/tkextlib/tile/demo.rb: updated scales demo to use
+	  Tk::Tile::TProgressbar for tile 0.6 or later.
+
+	* sample/tkextlib/tile/demo.rb: set some TkVariable default values.
+
+2005-08-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/treeview.rb: Tk::Tile::Treeview#headingconfigure
+	  is now working and more. [ruby-dev:26716]
+
+	* sample/tkextlib/tile/demo.rb: use Tk::Tile::Treeview#headingconfigure 	  instead of direct Tk.tk_call.
+
+2005-08-02  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/tile/tprogressbar.rb: Tk::Tile::TProgressbar#start
+	  takes optional argument `interval'.
+
+	* sample/tkextlib/tile/demo.rb: emulate Tk::Tile::TProgressbar
+	  with Tk::Tile::TProgress in tile 0.4. (repeating buttons demo)
+
+2005-08-02  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: added repeating buttons demo.
+
+	* sample/tkextlib/tile/repeater.tcl: ditto. (new file)
+
+2005-08-01  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/tile.rb: fixed autoload for Treeview.
+
+	* lib/tkextlib/tile/treeview.rb: replaced `ary2tk_list(items)' with
+	  `*items'.
+
+	* sample/tkextlib/tile/demo.rb: added treeview demo. (tile 0.5 or
+	  later is required) [ruby-dev:26668]
+
+2005-08-01  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: added combobox demo.
+
+2005-07-27  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/demo.rb: fixed typo.
+
+2005-06-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPOPRT_STATUS: add RELEASE_DATE information.
+
+	* lib/tkextlib/tile/style.rb: add "style element options <elem>"
+	  command support.
+
+2005-06-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/ICONS/icons.rb: fail to create instances of
+	  Tk::ICONS [ruby-dev:26305].
+
+2005-06-07  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: also support tile 0.4.
+
+2005-06-07  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: support tile 0.5 or later.
+	  ("pixmap" element constructor replaced by "image")
+
+2005-06-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tile/demo.rb: fix TypeError & create Console
+
+2005-05-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt.rb: add PACKAGE_NAME information of Tcl/Tk
+          Extension.
+
+	* lib/tkextlib/bwidget.rb: ditto.
+
+	* lib/tkextlib/iwidgets.rb: ditto.
+
+	* lib/tkextlib/tile.rb: ditto.
+
+	* lib/tkextlib/tkimg.rb: ditto.
+
+	* lib/tkextlib/vu.rb: ditto.
+
+	* lib/tkextlib/ICONS/icons.rb: ditto.
+
+	* lib/tkextlib/itcl/incr_tcl.rb: ditto.
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto.
+
+	* lib/tkextlib/tcllib/autoscroll.rb: ditto.
+
+	* lib/tkextlib/tcllib/ctext.rb: ditto.
+
+	* lib/tkextlib/tcllib/cursor.rb: ditto.
+
+	* lib/tkextlib/tcllib/datefield.rb: ditto.
+
+	* lib/tkextlib/tcllib/ico.rb: ditto.
+
+	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
+
+	* lib/tkextlib/tcllib/plotchart.rb: ditto.
+
+	* lib/tkextlib/tcllib/style.rb: ditto.
+
+	* lib/tkextlib/tcllib/tkpiechart.rb: ditto.
+
+	* lib/tkextlib/tclx/tclx.rb: ditto.
+
+	* lib/tkextlib/tkDND/shape.rb: ditto.
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto.
+
+	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
+
+	* lib/tkextlib/tkimg/bmp.rb: ditto.
+
+	* lib/tkextlib/tkimg/gif.rb: ditto.
+
+	* lib/tkextlib/tkimg/ico.rb: ditto.
+
+	* lib/tkextlib/tkimg/jpeg.rb: ditto.
+
+	* lib/tkextlib/tkimg/pcx.rb: ditto.
+
+	* lib/tkextlib/tkimg/pixmap.rb: ditto.
+
+	* lib/tkextlib/tkimg/png.rb: ditto.
+
+	* lib/tkextlib/tkimg/ppm.rb: ditto.
+
+	* lib/tkextlib/tkimg/ps.rb: ditto.
+
+	* lib/tkextlib/tkimg/sgi.rb: ditto.
+
+	* lib/tkextlib/tkimg/sun.rb: ditto.
+
+	* lib/tkextlib/tkimg/tga.rb: ditto.
+
+	* lib/tkextlib/tkimg/tiff.rb: ditto.
+
+	* lib/tkextlib/tkimg/window.rb: ditto.
+
+	* lib/tkextlib/tkimg/xbm.rb: ditto.
+
+	* lib/tkextlib/tkimg/xpm.rb: ditto.
+
+	* lib/tkextlib/tktable/tktable.rb: ditto.
+
+	* lib/tkextlib/tktrans/tktrans.rb: ditto.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
+
+	* lib/tkextlib/winico/winico.rb: ditto.
+
+2005-05-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/iwidgets/scrolledlistbox.rb: follow the change
+          of tk.rb. modify to attend encoding.
+
+	* lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bug fix on
+	  TkCanvas#delete when given non-TkcItem arguments.
+
+2005-05-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/winop.rb: fix typo
+
+2005-05-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/vu/pie.rb: fix typo
+
+2005-04-10  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/mailwasher.rb: fixed typo. [ruby-dev:26008]
+
+2005-04-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tile/demo.rb: new demo of Tile extension.
+
+	* sample/tkextlib/tile/iconlib.tcl: part of the demo.
+
+	* sample/tkextlib/tile/toolbutton.tcl: ditto.
+
+	* sample/tkextlib/tile/readme.txt: document of the demo.
+
+	* sample/tkextlib/tile/Orig_LICENSE.txt: ditto.
+
+	* sample/tkextlib/tile/themes/kroc.tcl: sample theme written with Tcl.
+
+	* sample/tkextlib/tile/themes/pkgIndex.tcl: pkgIndex of kroc.tcl.
+
+	* sample/tkextlib/tile/themes/kroc.rb: Kroc theme written with Ruby.
+
+	* sample/tkextlib/tile/themes/kroc/button-h.gif: images for Kroc theme.
+
+	* sample/tkextlib/tile/themes/kroc/button-n.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/button-p.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-hc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-hu.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-nc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/check-nu.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-hc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-hu.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-nc.gif: ditto.
+
+	* sample/tkextlib/tile/themes/kroc/radio-nu.gif: ditto.
+
+	* lib/tkextlib/tile.rb: bug fix (tested on the new demo).
+
+	* lib/tkextlib/tile/style.rb: ditto.
+
+	* lib/tkextlib/tile/tbutton.rb: ditto.
+
+	* lib/tkextlib/tile/tcheckbutton.rb: ditto.
+
+	* lib/tkextlib/tile/tcombobox.rb: ditto.
+
+	* lib/tkextlib/tile/tentry.rb: ditto.
+
+	* lib/tkextlib/tile/tframe.rb: ditto.
+
+	* lib/tkextlib/tile/tlabel.rb: ditto.
+
+	* lib/tkextlib/tile/tlabelframe.rb: ditto.
+
+	* lib/tkextlib/tile/tmenubutton.rb: ditto.
+
+	* lib/tkextlib/tile/tnotebook.rb: ditto.
+
+	* lib/tkextlib/tile/tprogressbar.rb: ditto.
+
+	* lib/tkextlib/tile/tradiobutton.rb: ditto.
+
+	* lib/tkextlib/tile/treeview.rb: ditto.
+
+	* lib/tkextlib/tile/tscrollbar.rb: ditto.
+
+	* lib/tkextlib/tile/tseparator.rb: ditto.
+
+	* lib/tkextlib/tile/tsquare.rb: ditto.
+
+	* lib/tkextlib/tile/tpaned.rb: new library
+
+	* lib/tkextlib/tile/tscale.rb: ditto.
+
+	* lib/tkextlib/SUPPORT_STATUS: update support status of Tile extension.
+
+	* lib/tkextlib/tcllib/ctext.rb: use TkCommandNames on create_self().
+
+	* lib/tkextlib/tcllib/datefield.rb: ditto.
+
+	* lib/tkextlib/tcllib/ip_entry.rb: ditto.
+
+	* lib/tkextlib/tkHTML/htmlwidget.rb: ditto.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto.
+
+2005-04-09  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/explorer.rb: File.executable? returns true
+	  even if it's plain text file. (this function only checks access right)
+
+2005-04-09  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/{help,www-options}.rb: fixed typo.
+	  (click or resize column header)
+
+2005-04-09  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/imovie.rb: fixed typo. (click on clip title)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/random.rb: fixed typo. (drop node outside of
+	  widget, or reenter widget while dragging)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/outlook-newgrounp.rb: image had disappered when
+	  node was selected.
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
+	  tk::treectrl uses 'afterId' not 'afterID'.
+
+	* sample/tkextlib/treectrl/{random,outlook-newgroup}.rb:
+	  item_firstchild can return empty string. (drop node to leaf node)
+
+	* sample/tkextlib/treectrl/random.rb: Enumerable#find didn't work properly
+	  because tried to compare String with Integer. (drag node and leave widget)
+
+	* sample/tkextlib/treectrl/random.rb: and some fixes.
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb (selection_clear): fixed typo.
+
+	* sample/tkextlib/treectrl/random.rb: node deselection now works.
+
+	* sample/tkextlib/treectrl/demo.rb: fixed typo. (popup menu on column header)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/help.rb: fixed typo. (wrong color)
+
+2005-04-08  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/random.rb: fixed typo. (wrong itemheight)
+
+	* sample/tkextlib/treectrl/outlook-newgroup.rb: ditto.
+
+	* sample/tkextlib/treectrl/explorer.rb: ditto.
+
+	* sample/tkextlib/treectrl/help.rb: ditto.
+
+2005-04-07  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/*.rb: some speed up... cache the result of
+	  version checking.
+
+2005-04-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: performance tuning by calling
+	  tk_send_without_enc. [ruby-dev:25997]
+
+2005-04-04  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/tktable/tktable.rb: added Tk::TkTable#selection_present.
+
+2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: support TreeCtrl's cvs head.
+
+2005-04-02  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: add TreeCtrl#legend_window_create().
+
+	* sample/tkextlib/blt/graph6.rb: use legend_window_create().
+
+	* lib/tkextlib/blt/tree.rb: forget to call tagid().
+
+	* lib/tkextlib/blt/treeview.rb: ditto.
+
+2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/treectrl/demo.rb: bridge the gap of
+	  Hash#index or Hash#key between ruby 1.8 and 1.9
+
+2005-04-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: bug fix on treatment of
+	  component objects.
+
+	* sample/tkextlib/blt/graph6.rb: a new sample script.
+
+2005-03-31  ocean  <ocean@ruby-lang.org>
+
+	* sample/tkextlib/treectrl/demo.rb: should use Hash#index.
+
+	* sample/tkextlib/treectrl/demo.rb: TkImage was not
+	  cached properly.
+
+	* sample/tkextlib/treectrl/random.rb: fixed typo.
+
+2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/iwidgets/sample/hierarchy.rb: show basename
+	  only [ruby-dev:25970]
+
+	* sample/tkextlib/treectrl/demo.rb: add check for existence of
+	  'backgroundimage' option.
+
+	* sample/tkextlib/treectrl/bitmaps.rb: ditto.
+
+	* sample/tkextlib/treectrl/outlook-newgroup.rb: lack of '%I'
+	  event callback argument.
+
+2005-03-31  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/iwidgets/sample/hierarchy.rb: fail to treat
+	  Japanese (i18n?) filenames.
+
+2005-03-30  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/bwidget/tree.rb: use 'return' in the Proc object.
+
+	* sample/tkextlib/tkHTML/hv.rb: ditto.
+
+	* sample/tkextlib/tkHTML/ss.rb: ditto.
+
+	* sample/tkextlib/tktable/basic.rb: ditto.
+
+	* sample/tkextlib/tktable/command.rb: ditto.
+
+	* sample/tkextlib/tktable/debug.rb: ditto.
+
+	* sample/tkextlib/tktable/maxsize.rb: ditto.
+
+	* sample/tkextlib/treectrl/demo.rb: ditto.
+
+2005-03-29  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: cannot create elements except
+	  default type of element.
+
+	* lib/tkextlib/blt/barchart.rb: ditto.
+
+	* lib/tkextlib/blt/graph.rb: ditto.
+
+	* lib/tkextlib/blt/stripchart.rb: ditto.
+
+	* lib/tkextlib/blt/component.rb: axis command option gets
+	  proper object type of arguments.
+
+	* sample/tkextlib/blt/calendar.rb: new sample.
+
+	* sample/tkextlib/blt/pareto.rb: ditto.
+
+2005-03-28  ocean  <ocean@ruby-lang.org>
+
+	* lib/tkextlib/iwidgets/notebook.rb: fixed typo.
+
+2005-03-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt.rb: add commands for zooming.
+
+	* lib/tkextlib/blt/bitmap.rb (new_with_name): add for using
+          given name.
+
+	* lib/tkextlib/blt/busy.rb: bug fix on Tk::BLT::Busy::Shild class.
+
+	* lib/tkextlib/blt/component.rb: typo fix.
+
+	* lib/tkextlib/blt/component.rb: fix lack of *_create methods
+
+	* lib/tkextlib/blt/component.rb: proper call on xaxis_* and so on.
+
+	* lib/tkextlib/blt/htext.rb: add TkVariable object to access
+          special Tcl variables.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: typo fix.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: proper treatment
+          of 'font' option of element_configure.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix on item_sort.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: add methods to
+          call TreeCtrl commands for bindings.
+
+	* sample/tkextlib/blt/*: add some sample scripts.
+
+	* sample/tkextlib/treectrl/*: add some sample scripts.
+
+2005-03-18  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
+	  classes for components of Tk::TreeCtrl
+
+2005-03-17  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: call wrong method in
+	  Tk::TreeCtrl#*_configinfo and current_*_configinfo method
+
+2005-03-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: change the status of TkImg
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: bug fix and support
+	  TkTreeCtrl-1.1
+
+	* lib/tkextlib/SUPPORT_STATUS: change the supported version of
+	  TkTreeCtrl
+
+2005-03-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* sample/tkextlib/tkimg: add sample
+
+2005-03-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: add version info of each extension
+
+2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb: lack of "autoload TProgressbar"
+
+2005-03-05  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile.rb: support tile-0.6
+
+	* lib/tkextlib/tile/tbutton.rb: ditto
+
+	* lib/tkextlib/tile/tcheckbutton.rb: ditto
+
+	* lib/tkextlib/tile/tlabel.rb: ditto
+
+	* lib/tkextlib/tile/tmenubutton.rb: ditto
+
+	* lib/tkextlib/tile/tnotebook.rb: ditto
+
+	* lib/tkextlib/tile/tradiobutton.rb: ditto
+
+	* lib/tkextlib/tile/tcombobox.rb: [new] ditto
+
+	* lib/tkextlib/tile/tentry.rb: [new] ditto
+
+	* lib/tkextlib/tile/tframe.rb: [new] ditto
+
+	* lib/tkextlib/tile/tlabelframe.rb: [new] ditto
+
+	* lib/tkextlib/tile/tprogressbar.rb: [new] ditto
+
+	* lib/tkextlib/tile/treeview.rb: [new] ditto
+
+	* lib/tkextlib/tile/tscrollbar.rb: [new] ditto
+
+	* lib/tkextlib/tile/tseparator.rb: [new] ditto
+
+	* lib/tkextlib/tile/tsquare.rb: [new] ditto
+
+2005-02-20  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tclx/tclx.rb: warning TclX's 'signal' command.
+
+2005-01-25  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt/component.rb: bug fix. cannot accept
+          a callback ID string for a command argument. [ruby-dev:25479]
+
+	* lib/tkextlib/blt/tabset.rb: ditto
+
+	* lib/tkextlib/blt/treeview.rb: ditto
+
+	* lib/tkextlib/bwidget/labelentry.rb: ditto
+
+	* lib/tkextlib/bwidget/listbox.rb: ditto
+
+	* lib/tkextlib/bwidget/notebook.rb: ditto
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto
+
+	* lib/tkextlib/bwidget/tree.rb: ditto
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+	* sample/tkextlib/tkHTML/ss.rb: local variable scope bug fix
+          [ruby-dev:25479]
+
+	* sample/tkextlib/vu/vu_demo.rb: rename from vu.rb; avoid the bug on
+	  Windows version of Tcl/Tk. The trouble based on the bug occurs when
+	  the script name (without extension) is a same name as a Tcl/Tk's
+	  library file name (without extension) required in the script.
+
+2004-12-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/blt: add BLT extension support
+
+2004-12-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/labelentry.rb: use TkCore.callback_obj?()
+
+	* lib/tkextlib/bwidget/listbox.rb: ditto
+
+	* lib/tkextlib/bwidget/notebook.rb: ditto
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+	* lib/tkextlib/winico/winico.rb: ditto
+
+2004-12-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/style.rb: 'theme_use' method bug fix
+
+2004-12-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/notebook.rb: raise method cannot return
+          the raised page.
+
+	* lib/tkextlib/bwidget/labelentry.rb: bind methods accept
+          subst_args + block
+
+	* lib/tkextlib/bwidget/listbox.rb: ditto
+
+	* lib/tkextlib/bwidget/notebook.rb: ditto
+
+	* lib/tkextlib/bwidget/spinbox.rb: ditto
+
+	* lib/tkextlib/bwidget/tree.rb: ditto
+
+	* lib/tkextlib/itk/incr_tk.rb: ditto
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto
+
+	* lib/tkextlib/tkDND/tkdnd.rb: ditto
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+2004-11-26  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/notebook.rb: uses epath
+
+	* lib/tkextlib/bwidget/widget.rb: ditto
+
+	* lib/tkextlib/tktable/tktable.rb: ditto
+
+	* lib/tkextlib/tcllib/cursor.rb: ditto, and bug fix
+
+2004-11-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tile/style.rb: bug fix
+
+2004-11-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/iwidgets/scrolledcanvas.rb: bind-event methods
+	  accept multi substitution arguments.
+
+	* lib/tkextlib/tktable/tktable.rb: ditto.
+
+	* lib/tkextlib/treectrl/tktreectrl.rb: ditto
+
+2004-11-03  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/SUPPORT_STATUS: BLT moves to 'plan to support'
+          from 'not determined'
+
+	* lib/tkextlib/itk/incr_tk.rb: __cget_cmd and __config_cmd are
+          private methods
+
+	* lib/tkextlib/tcllib/autoscroll.rb: extend TkCore
+
+	* lib/tkextlib/tcllib/cursor.rb: ditto.
+
+	* lib/tkextlib/tcllib/plotchart.rb: ditto.
+
+	* lib/tkextlib/tcllib/style.rb: ditto.
+
+	* lib/tkextlib/tile/style.rb: ditto.
+
+	* lib/tkextlib/tkDND/shape.rb: ditto.
+
+2004-10-24  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget/tree.rb: bug fix on Windows
+
+2004-10-16  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/tcllib/ico.rb: new library (Tk::Tcllib:ICO)
+
+	* lib/tkextlib/tcllib.rb: add Tk::Tcllib::ICO (based on tcllib 1.7)
+
+2004-10-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/bwidget.rb (BWidget.grab): bug fix
+
+	* lib/tkextlib/tcllib.rb: typo fix
+
+2004-07-28  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/add winico support
+
+2004-07-23  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/add TclX support (partially; infox command and
+          XPG/3 MsgCat only)
+
+2004-07-15  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* bug fix
+
+	* support TkTable extension
+
+2004-07-12  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* bug fix
+
+	* support Iwidgets extension
+
+2004-07-10  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* bug fix
+
+	* add more part of [incr Widget] support (about 65%? are complete)
+
+	* use Tk::ValidateConfigure.__def_validcmd() method
+          (new function to define validatecommand methods easier)
+
+	* tcllib.rb : avoid the loading trouble that almost all part of
+	  the extension is not available when some libraries are invalid.
+
+2004-07-09  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* add some part of [incr Widget] support (about 50%? are complete)
+
+2004-07-07  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* add [incr Tck], [incr Tk] support
+
+2004-07-06  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* support BWidget extension
+
+	* add BWidget extension demo
+
+	* add ICONS extension demo
+
+	* many bug fix
+
+2004-07-01  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* 1st release of tkextlib ( to support Tcl/Tk extensions )
diff --git a/ext/tk/MANUAL_tcltklib.eng b/ext/tk/MANUAL_tcltklib.eng
new file mode 100644
index 0000000000..957e8ec840
--- /dev/null
+++ b/ext/tk/MANUAL_tcltklib.eng
@@ -0,0 +1,473 @@
+(tof)
+                                    2005/07/05  Hidetoshi NAGAI
+
+This document discribes about the 'tcltklib' library. Although there
+is the 'tcltk' library (tcltk.rb) under this directory, no description
+in this document (because it is not maintained recently).
+
+==============================================================
+module TclTklib
+  : Defines methods to do operations which are independed on
+  : Tcl/Tk interpreters
+
+  module TclTkLib::EventFlag
+    : Defines flags to define target events on 'do_one_event' methods.
+    : When to give, please use bit-operator (e.g. WINDOW | DONT_WAIT).
+
+    [constants]
+       NONE
+         : Is 0. It means "there is no target". But on the real
+         : operation, it is same to ALL.
+
+       WINDOW
+         : 'window' event is processed.
+
+       FILE
+         : 'file' event is processed.
+
+       TIMER
+         : 'timer' event is processed.
+
+       IDLE
+         : 'idle' operation (e.g. 're-draw'; the operations when the
+         : other kinds of events doesn't occur) is processed.
+
+       ALL
+         : All kinds of events are processed.
+         : Same to 'WINDOW | FILE | TIMER | IDLE'.
+
+       DONT_WAIT
+         : Without this flag, 'do_one_event' waits the occurrence of
+         : a target event. With this flag, doesn't wait and returns
+         : false if there is no target event for processing.
+
+  module TclTkLib::VarAccessFlag
+    : Defines flags to give '_get_variable' and so on. When to give,
+    : please use bit-operator (e.g. GLOBAL_ONLY | LEAVE_ERR_MSG ).
+
+    [constants]
+       NONE
+         : Is 0. It means "set no flag".
+
+       GLOBAL_ONLY
+         : (site Tcl/Tk's man page)
+         : Under normal circumstances the procedures look up
+         : variables as follows: If a procedure call is active
+         : in interp, a variable is looked up at the current
+         : level of procedure call. Otherwise, a variable is
+         : looked up first in the current namespace,  then  in
+         : the global namespace. However, if this bit is set
+         : in flags then the variable is looked up only in the
+         : global namespace even if there is a procedure call
+         : active. If both GLOBAL_ONLY and NAMESPACE_ONLY are
+         : given, GLOBAL_ONLY is ignored.
+         :
+         :  *** ATTENTION ***
+         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
+         : is defined as 0, and then GLOBAL_ONLY is available
+         : even if flag is (GLOBAL_ONLY | NAMESPACE_ONLY).
+
+       NAMESPACE_ONLY
+         : (site Tcl/Tk's man page)
+         : Under normal circumstances the procedures look up
+         : variables as follows: If a procedure call is active
+         : in interp, a variable is looked up at the current
+         : level of procedure call. Otherwise, a variable is
+         : looked up first in the current namespace, then in
+         : the global namespace. However, if this bit is set
+         : in flags then the variable is looked up only in the
+         : current namespace even if there is a procedure call
+         : active.
+         :
+         :  *** ATTENTION ***
+         : Tcl7.6 doesn't have namespaces. So NAMESPACE_ONLY
+         : is defined as 0.
+
+       LEAVE_ERR_MSG
+         : (site Tcl/Tk's man page)
+         : If an error is returned and this bit is set in flags,
+         : then an error message will be left in the interpreter's
+         : result, where it can be retrieved with Tcl_GetObjResult
+         : or Tcl_GetStringResult. If this flag bit isn't set then
+         : no error message is left and the interpreter's result
+         : will not be modified.
+
+       APPEND_VALUE
+         : (site Tcl/Tk's man page)
+         : If this bit is set then newValue is appended to the
+         : current value, instead of replacing it. If the variable
+         : is currently undefined, then this bit is ignored.
+
+       LIST_ELEMENT
+         : (site Tcl/Tk's man page)
+         : If this bit is set, then newValue is converted to a
+         : valid Tcl list element before setting (or appending
+         : to) the variable. A separator space is appended before
+         : the new list element unless the list element is going
+         : to be the first element in a list or sublist (i.e. the
+         : variable's current value is empty, or contains the
+         : single character ``{'', or ends  in `` }'').
+
+       PARSE_VARNAME
+         : (site Tcl/Tk's man page)
+         : If this bit is set when calling _set_variable and so
+         : on, var_name argument may contain both an array and an
+         : element name: if the name contains an open parenthesis
+         : and ends with a close parenthesis, then the value
+         : between the parentheses is treated as an element name
+         : (which can have any string value) and the characters
+         : before  the first open parenthesis are treated as the
+         : name of an array variable. If the flag PARSE_VARNAME
+         : is given, index_name argument should be 'nil' since the
+         : array and element names are taken from var_name.
+         :
+         :  *** ATTENTION ***
+         : 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.
+       : If 'check_root' is false, doesn't return by the other
+       : reasons than exceptions.
+
+    mainloop_thread?
+       : Returns whether the current thread executes the eventloop.
+       : If true, the eventloop is working on the current thread.
+       : If no eventloop is working, this method returns nil.
+       : And if the other thread executes the eventloop, returns false.
+       :
+       :  *** ATTENTION ***
+       : When this methods returns false, it is dangerous to call a Tk
+       : interpreter directly.
+
+    mainloop_watchdog(check_root = true)
+       : On the normal eventloop, some kinds of callback operations
+       : cause deadlock. To avoid some of such deadlocks, this
+       : method starts an eventloop and a watchdog-thread.
+
+    do_one_event(flag = TclTkLib::EventFlag::ALL |
+                          TclTkLib::EventFlag::DONT_WAIT)
+       : Do one event for processing. When processed an event,
+       : returns true.
+       : If NOT set DONT_WAIT flag, this method waits occurrence of
+       : a target event.
+       : If set DONT_WAIT flag and no event for processing, returns
+       : false immediately.
+       : If $SAFE >= 4,  or $SAFE >= 1 and the flag is tainted,
+       : force to set DONT_WAIT flag.
+
+    set_eventloop_tick(timer_tick)
+       : Define the interval of thread-switching with an integer
+       : value of mili-seconds.
+       : Default timer_tick is 0. It means that thread-switching
+       : is based on the count of processed events.
+       : ( see 'set_eventloop_weight' method )
+       : However, if the eventloop thread is the only thread,
+       : timer_tick cannot be set to 0. If 0, then is set to 100 ms
+       : automatically (see NO_THREAD_INTERRUPT_TIME on tcltklib.c).
+       : On $SAFE >= 4, cannot call this method.
+
+    get_eventloop_tick
+       : Get current value of 'timer_tick'
+
+    set_no_event_wait(no_event_wait)
+       : Define sleeping time of the eventloop when two or more
+       : thread are running and there is no event for processing.
+       : Default value is 20 (ms).
+       : If the eventloop thread is the only thread, this value is
+       : invalid.
+       : On $SAFE >= 4, cannot call this method.
+
+    get_no_event_wait
+       : Get current value of 'no_event_wait'.
+
+    set_eventloop_weight(loop_max, no_event_tick)
+       : Define the weight parameters for the eventloop thread.
+       : That is invalid when the eventloop is the only thread.
+       : 'loop_max' is the max events for thread-switching.
+       : 'no_event_tick' is the increment value of the event count
+       : when no event for processing (And then, the eventloop thread
+       : sleeps 'no_event_wait' mili-seconds).
+       : 'loop_max == 800' and 'no_event_tick == 10' are default.
+       : On $SAFE >= 4, cannot call this method.
+
+    get_eventloop_weight
+       : Get current values of 'loop_max' and 'no_event_tick'.
+
+    mainloop_abort_on_exception=(bool)
+       : Define whether the eventloop stops on exception or not.
+       : If true (default value), stops on exception.
+       : If false, show a waring message but ignore the exception.
+       : If nil, no warning message and ignore the exception.
+       : This parameter is sometimes useful when multiple Tk
+       : interpreters are working. Because the only one eventloop
+       : admins all Tk interpreters, sometimes exception on a
+       : interpreter kills the eventloop thread. Even if such
+       : situation, when abort_on_exception == false or nil,
+       : the eventloop ignores the exception and continue to working.
+       : On $SAFE >= 4, cannot call this method.
+
+    mainloop_abort_on_exception
+       : Get current status of that.
+
+    num_of_mainwindows
+       : Returns the number of main-windows (root-widget).
+       : Because there is only one main-window for one Tk interpreter,
+       : the value is same to the number of interpreters which has
+       : available Tk functions.
+
+    _merge_tklist(str, str, ... )
+       : Get a Tcl's list string from arguments with a Tcl/Tk's
+       : library function. Each arguemnt is converted to a valid
+       : Tcl list element.
+
+    _conv_listelement(str)
+       : Convert the argument to a valid Tcl list element with
+       : Tcl/Tk's library function.
+
+    _toUTF8(str, encoding=nil)
+    _fromUTF8(str, encoding=nil)
+       : Call the function (which is internal function of Tcl/Tk) to
+       : convert to/from a UTF8 string.
+
+    _subst_UTF_backslash(str)
+    _subst_Tcl_backslash(str)
+       : Substitute backslash sequence with Tcl's rule (include \uhhhh;
+       : give a sixteen-bit hexadecimal value for Unicode character).
+       : _subst_Tcl_backslash method parses all backslash sequence.
+       : _subst_UTF_backslash method parses \uhhhh only.
+
+    encoding_system
+    encoding_system=(encoding)
+       : Get and set Tcl's system encoding.
+
+    encoding
+    encoding=(encoding)
+       : alias of encoding_system / encoding_system=
+       : ( probably, Ruby/Tk's tk.rb will override them )
+
+
+class TclTkIp
+  [class methods]
+    new(ip_name=nil, options='')
+       : Generate an instance of TclTkIp class.
+       : If 'ip_name' argument is given as a string, it is the name
+       : of the Tk interpreter which is shown by 'winfo interps'
+       : command.
+       : 'options' argument accepts a string which is the command
+       : line options of wish; such as '-geometry' or '-use'.
+       : The information is used to generate the root widget of the
+       : interpreter.
+       : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
+       : If is given nil or false for the 'option' argument, generates
+       : the Tcl interpreter without Tk library. Then the interpreter
+       : doesn't need GUI environment. Therefore, even if a window
+       : system doesn't exist or cannot be used, Ruby can control the
+       : Tcl interpreter and the extension libraries loaded on the
+       : interpreter.
+
+  [instance methods]
+    create_slave(name, safe=false)
+       : Create a slave interpreter.
+       : The parent of the interpreter is the receiver of this method.
+       : The name of the slave interpreter is given by 'name' argument.
+       : The 'safe' argument decides whether the slave interpreter is
+       : created as a safe interpreter or not. If true, create a safe
+       : interpreter. Default is false. However, if the parent
+       : interpreter is a safe interpreter, the created interpreter is
+       : a safe interpreter (ignore 'safe' argument value).
+       : If $SAFE >= 4, can create a safe interpreter only.
+
+    make_safe
+       : Make the interpreter to the safe interpreter, and returns
+       : self. If fail, raise RuntimeError.
+
+    safe?
+       : Check whether the interpreter is the safe interpreter.
+       : If is the safe interpreter, returns true.
+
+    allow_ruby_exit?
+       : Return the mode whether 'exit' function of ruby or 'exit'
+       : command of Tcl/Tk can quit the ruby process or not on the
+       : interpreter. If false, such a command quit the interpreter
+       : only.
+       : The default value for a master interpreter is true, and
+       : for a slave interpreter is false.
+
+    allow_ruby_exit=(mode)
+       : Change the mode of 'allow_ruby_exit?'.
+       : If $SAFE >= 4 or the interpreter is a "safe" interpreter,
+       : this is not permitted (raise an exception).
+
+    delete
+       : Delete the interpreter.
+       : The deleted interpreter doesn't accept command and then
+       : raise an exception.
+
+    deleted?
+       : Check whether the interpreter is already deleted.
+       : If deleted, returns true.
+
+    has_mainwindow?
+       : Check whether the interpreter has a MainWindow (root widget).
+       : If has, returns true. If doesn't, returns false.
+       : If IP is already deleted, returns nil.
+
+    restart
+       : Restart Tk part of the interpreter.
+       : Use this when you need Tk functions after destroying the
+       : root widget.
+       : On $SAFE >= 4, cannot call this method.
+
+    _eval(str)
+    _invoke(*args)
+       : Estimates the arguments as a command on the Tk interpreter.
+       : The argument of _eval is a script of Tcl/Tk.
+       : Each argument of _invoke is a token of one command line of
+       : Tcl/Tk.
+       : Because the operation of _invoke doesn't through the
+       : command line parser of Tk interpreter, the cost of
+       : estimation is smaller than _eval. However, auto_load
+       : mechanism of the Tk interpreter doesn't work on _invoke.
+       : So _invoke can call only the command which already
+       : registered on the interpreter by 'load' command and so on.
+       : On _eval command, auto_load mechanism words. So if succeed
+       : to _eval and register 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
+       : convert to/from a UTF8 string.
+
+    _thread_vwait(var_name)
+    _thread_tkwait(mode, target)
+       : 'vwait' or 'tkwait' with thread support.
+       : The difference from normal 'vwait' or 'tkwait' command is
+       : doing independent wait from the vwait stack when they are
+       : called on the other thread than the eventloop thread.
+       : In the case of Tcl/Tk's vwait / tkwait, if 2nd vwait /
+       : tkwait is called on waiting for 1st vwait / tkwait,
+       : returns the order of [2nd]->[1st] regardless of the order
+       : of when the wait condition was fulfilled.
+       : If _thread_vwait / _thread_tkwait is called on the
+       : eventloop thread, there is no difference from vwait /
+       : tkwait. But if called on the other thread than the
+       : eventloop, stops the thread.  And when the wait condition
+       : is fulfilled, the thread restarts. The meaning of
+       : "independent from the vwait stack" is that the timing of
+       : restarting is independent from the waiting status of the
+       : other threads. That is, even if the eventloop thread is
+       : waiting by vwait and is not fulfilled the condition,
+       : _thread_vwait completes the waiting when its waiting
+       : condition is fulfilled and the thread which stopped by
+       : _thread_vwait can continue the operation.
+
+    _return_value
+       : Get the last result value on the interpreter.
+
+    _get_variable(var_name, flag)
+    _get_variable2(var_name, index_name, flag)
+       : Get the current value of a variable. If specified a
+       : index_name (see also the PARSE_VARNAME flag), get the
+       : value of the index_name element.
+
+    _set_variable(var_name, value, flag)
+    _set_variable2(var_name, index_name, value, flag)
+       : Create or modify a variable. If specified a index_name
+       : (see also the PARSE_VARNAME flag), create or modify the
+       : index_name element.
+
+    _unset_variable(var_name)
+    _unset_variable2(var_name, index_name)
+       : Remove a variable. If specified a index_name (see also
+       : the PARSE_VARNAME flag), remove the index_name element.
+
+    _get_global_var(var_name)
+    _get_global_var2(var_name, index_name)
+    _set_global_var(var_name, value)
+    _set_global_var2(var_name, index_name, value)
+    _unset_global_var(var_name)
+    _unset_global_var2(var_name, index_name)
+       : Call the associated method with the flag argument
+       : (GLOBAL_ONLY | LEAVE_ERR_MSG).
+
+    _split_tklist(str)
+       : Split the argument with Tcl/Tk's library function and
+       : get an array as a list of Tcl list elements.
+
+    _merge_tklist(str, str, ... )
+       : Get a Tcl's list string from arguments with a Tcl/Tk's
+       : library function. Each arguemnt is converted to a valid
+       : Tcl list element.
+
+    _conv_listelement(str)
+       : Convert the argument to a valid Tcl list element with
+       : Tcl/Tk's library function.
+
+    mainloop
+    mainloop_watchdog
+       : If on the slave interpreter, never start an eventloop and
+       : returns nil.
+       : With the exception that, same to the TclTkLib module method
+       : with the same name.
+
+    do_one_event
+       : With the exception that the argument is forced to set
+       : DONT_WAIT flag on the slave interpreter, same to
+       : TclTkLib#do_one_event.
+
+    set_eventloop_tick
+    get_eventloop_tick
+    set_no_event_wait
+    get_no_event_wait
+    set_eventloop_weight
+    get_eventloop_weight
+    mainloop_abort_on_exception
+    mainloop_abort_on_exception=
+       : With the exception that it is ignored to set value on the
+       : 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
+  : operation.
+  : If raise TkCallbackBreak on the callback procedure, Ruby returns
+  : 'break' code to Tk interpreter (Then the Tk interpreter will
+  : break the operation for the current event).
+  : If raise TkCallbackContinue, returns 'continue' code (Then the Tk
+  : interpreter will break the operation for the current bindtag and
+  : starts the operation for the next bindtag 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.ja b/ext/tk/MANUAL_tcltklib.ja
new file mode 100644
index 0000000000..1de1736f9f
--- /dev/null
+++ b/ext/tk/MANUAL_tcltklib.ja
@@ -0,0 +1,584 @@
+(tof)
+                                    2005/07/05  Hidetoshi NAGAI
+
+本ドキュメントには古い tcltk ライブラリ，tcltklib ライブラリの説明
+が含まれていますが，その記述内容は古いものとなっています．
+
+tcltk ライブラリ（tcltk.rb）は現在ではメンテナンスが事実上行われて
+いないため，古いドキュメントの説明がそのまま有効です．それに対し，
+tcltklib ライブラリについては，現在の Ruby/Tk（tk.rb 以下のライブラ
+リ群）を稼働させるための中心としてメンテナンスされているため，少々
+違いが生じています．
+
+そこで，まず古い説明文書を示した後，現在の tcltklib ライブラリにつ
+いての説明を加えます．
+
+以下がライブラリの古い説明文書です．
+==============================================================
+	MANUAL.euc
+		Sep. 19, 1997	Y. Shigehiro
+
+以下, 「tcl/tk」という表記は, tclsh や wish を実現している, 一般でいう
+ところの tcl/tk を指します. 「tcltk ライブラリ」, 「tcltklib ライブラ
+リ」という表記は, 本パッケージに含まれる ruby 用のライブラリを指します.
+
+<< tcltk ライブラリ >>
+
+tcl/tk の C ライブラリを利用するための高(中?)水準インターフェースを提
+供します.
+
+このライブラリは ruby から tcl/tk ライブラリを利用するためのもので, 内
+部で tcltklib ライブラリを利用しています.
+
+[説明]
+
+tcl/tk インタプリタでは, ウィジェットに何か指示を送るには, ウィジェッ
+ト名に続いてパラメータを書きます. したがって, ウィジェットがオブジェク
+トであり, それに対してメソッドを送っている, とみなすことができます. さ
+て, tcl/tk インタプリタでは, 組み込みコマンドも, 前述のウィジェットと
+同じような書式の命令で実行されます. すなわち, コマンドもオブジェクトで
+あると考えることができます.
+
+このような考えに基づき, tcltk ライブラリでは, tcl/tk のコマンドやウィ
+ジェットに対応するオブジェクトを生成します. オブジェクトに対するメソッ
+ド呼び出しは, e() メソッドにより実行されます. 例えば, tcl/tk の info
+コマンドに対応する ruby のオブジェクトが info という名前であるとすると,
+tcl/tk の
+	info commands
+という命令は tcltk ライブラリでは
+	info.e("commands")
+と記述されます. また, 「.」というウィジェット (wish 実行時に自動的に生
+成されるルートウィジェット) に対応する ruby のオブジェクトが root とい
+う名前であるとすると,
+	. configure -height 300 -width 300
+という tcl/tk の命令は
+	root.e("configure -height 300 -width 300")
+と記述されます. このような記述は, 見ためには美しくありませんが, そして,
+スクリプトを読む人には見づらいかも知れませんが, 実際にスクリプトを書い
+てみると予想外に手軽です.
+
+[使用法]
+
+1. ライブラリを読み込む.
+     require "tcltk"
+
+2. tcl/tk インタプリタを生成する.
+     ip = TclTkInterpreter.new()
+
+3. tcl/tk のコマンドに対応するオブジェクトを変数に代入しておく.
+     # コマンドに対応するオブジェクトが入った Hash を取り出す.
+     c = ip.commands()
+     # 使いたいコマンドに対応するオブジェクトを個別の変数に代入する.
+     bind, button, info, wm = c.indexes("bind", "button", "info", "wm")
+
+4. 必要な処理を行う.
+     詳しくは, サンプルを参照のこと.
+
+5. 準備ができたら, イベントループに入る.
+     TclTk.mainloop()
+
+(( 以下, モジュール, クラス等の説明を書く予定.))
+
+
+
+<< tcltklib ライブラリ >>
+
+tcl/tk の C ライブラリを利用するための低水準インターフェースを提供しま
+す.
+
+コンパイル/実行には, tcl/tk の C ライブラリが必要です.
+
+[説明]
+
+このライブラリを用いると, ruby から tcl/tk の C ライブラリを利用できま
+す. 具体的には, ruby インタプリタから tcl/tk インタプリタを呼び出すこ
+とができます. さらに, その(ruby インタプリタから呼び出した) tcl/tk イ
+ンタプリタから, 逆に ruby インタプリタを呼び出すこともできます.
+
+[使用法]
+
+require "tcltklib" すると, 以下のモジュール, クラスが利用可能です.
+
+モジュール TclTkLib
+    tcl/tk ライブラリを呼び出すメソッドを集めたモジュールです. ただし,
+    tcl/tk インタプリタ関係のメソッドはクラス TclTkIp にあります.
+
+  モジュールメソッド mainloop()
+      Tk_MainLoop を実行します. 全ての tk のウインドウが無くなると終了
+      します(例えば, tcl/tk で書くところの "destroy ." をした場合等).
+    引数: 無し
+    戻り値: nil
+
+クラス TclTkIp
+    インスタンスが tcl/tk のインタプリタに対応します. tcl/tk のライブ
+    ラリの仕様通り, インスタンスを複数個生成しても正しく動作します(そ
+    んなことをする必要はあまり無いはずですが). インタプリタは wish の
+    tcl/tk コマンドを実行できます. さらに, 以下のコマンドを実行できま
+    す.
+      コマンド ruby
+	引数を ruby で実行します(ruby_eval_string を実行します). 引数
+	は 1 つでなければなりません. 戻り値は ruby の実行結果です.
+	ruby の実行結果は nil か String でなければなりません.
+
+  クラスメソッド new()
+      TclTkIp クラスのインスタンスを生成します
+    引数: 無し
+    戻り値 (TclTkIp): 生成されたインスタンス
+
+  メソッド _eval(script)
+      インタプリタで script を評価します(Tcl_Eval を実行します). 前述
+      のように, ruby コマンドにより script 内から ruby スクリプトを実
+      行できます.
+    引数: script (String) - インタプリタで評価するスクリプト文字列
+    戻り値 (String): 評価結果 ((Tcl_Interp *)->result)
+
+  メソッド _return_value()
+      直前の Tcl_Eval の戻り値を返します. 0(TCL_OK) で正常終了です.
+    引数: 無し
+    戻り値 (Fixnum): 直前の Tcl_Eval() が返した値.
+
+==============================================================
+
+以下が本ドキュメント作成時点での tcltklib ライブラリの説明です．
+==============================================================
+モジュール TclTkLib
+   : 個々の Tcl/Tk インタープリタに依存しない処理 ( == イベントルー
+   : プに関する処理 ) を呼び出すメソッドを定義したモジュール．
+
+   モジュール TclTkLib::EventFlag
+      : do_one_event を呼び出す際の処理対象イベントを指定するための
+      : フラグ ( WINDOW|DONT_WAIT というようにビット演算子で連結して
+      : 指定 ) を定数として定義したモジュール．以下の定数が含まれる．
+
+      定数  NONE
+         : 値は 0 で，値としてはいかなる種類のイベントも指定していない
+         : ことになるが，実際の処理上は ALL と同じとして扱われる．
+
+      定数  WINDOW
+         : window イベントを処理対象とする
+
+      定数  FILE
+         : file イベントを処理対象とする
+
+      定数  TIMER
+         : timer イベントを処理対象とする
+
+      定数  IDLE
+         : アイドルループ処理 ( 再描画など，他の種類のイベントが発生
+         : していないときに行われる処理 ) を処理対象とする
+
+      定数  ALL
+         : すべての種類のイベントを処理対象とする
+         : WINDOW|FILE|TIMER|IDLE と同じ
+
+      定数  DONT_WAIT
+         : 処理対象イベントが存在しない場合に，イベント発生を待たず
+         : に do_one_event を終了 ( false を返す ) する
+
+   モジュール TclTkLib::VarAccessFlag
+      : _get_variable などでのフラグを指定するためのもの．フラグに
+      : は以下の定数を OR で連結して与える．
+
+      定数  NONE
+         : 値は 0 で，何もフラグを指定していないのに等しい．
+
+      定数  GLOBAL_ONLY
+         : 通常，変数の検索はまず手続き呼び出しを行ったレベルで検
+         : 索し，次に現在の名前空間で検索，最後にグローバル空間で
+         : 検索を行う．しかし，このフラグが指定された場合には，グ
+         : ローバル空間でのみ検索する．
+         : もし GLOBAL_ONLY と NAMESPACE_ONLY とが両方指定された場
+         : 合には，GLOBAL_ONLY の指定は無視される．
+
+      定数  NAMESPACE_ONLY
+         : このフラグが指定された場合には，現在の名前空間でのみ変
+         : 数の検索を行う．GLOBAL_ONLY の説明も参照すること．
+
+      定数  LEAVE_ERR_MSG
+         : 変数アクセスにおいてエラーが発生した場合，このフラグが
+         : 指定されていれば，実行結果として Tcl インタープリタにエ
+         : ラーメッセージが残される．このフラグが指定されていなけ
+         : れば，エラーメッセージは一切残されない．
+
+      定数  APPEND_VALUE
+         : このフラグが指定されていた場合，変数の値を置き換えので
+         : はなく，現在の値に代入値が追加 (append; 文字列連結) さ
+         : れる．変数が未定義あった場合，このフラグは無視される．
+
+      定数  LIST_ELEMENT
+         : このフラグが指定されていた場合，代入値はまず Tcl のリス
+         : ト要素として適切となるように変換される．代入値がリスト
+         : (またはサブリスト) の最初の要素となるのでない限り，代入
+         : 値の直前には空白文字が追加される．
+
+      定数  PARSE_VARNAME
+         : _set_variable などの呼び出しにおいてこのフラグが指定さ
+         : れていた場合，var_name 引数が連想配列名と要素名とを両方
+         : 含む可能性がある (開き括弧を含み，閉じ括弧で終わる) こ
+         : とを示す．その場合，括弧の間が要素名指定，最初の開き括
+         : 弧までが連想配列名として扱われる．_set_variable2 などで
+         : このフラグを指定する場合，連想配列名と要素名は var_name
+         : から抽出されるはずであるから，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 が存在する限り，このメソッドは終了しない．
+         : check_root が false の場合は，root widget が消滅しても
+         : このメソッドは終了しない ( root widget が消滅しても，
+         : WINDOW 以外のイベントは発生しうるため )．終了には，外部
+         : からの働き掛け ( スレッドを活用するなど ) が必要．
+
+      mainloop_thread?
+         : カレントスレッドがイベントループを実行しているスレッド
+         : かどうかを返す．
+         : イベントループを実行しているスレッドであれば true を，
+         : どのスレッドでもイベントループが実行されていない場合は
+         : nil を，他のスレッドでイベントループが実行されている場
+         : 合は false を返す．
+         : false の際に Tk インタープリタを直接呼ぶのは危険である．
+
+      mainloop_watchdog(check_root = true)
+         : 通常のイベントループでは，イベント処理の内容によっては
+         : デッドロックを引き起こす可能性がある (例えばイベントに
+         : 対するコールバック処理中で widget 操作をし，その終了を
+         : 待つなど)．このメソッドは，そうしたデッドロックを回避す
+         : るための監視スレッド付きでイベントループを起動する
+         : ( 監視スレッドを生成した後にイベントループを実行する )．
+         : 引数の意味は mainloop と同じである．
+
+      do_one_event(flag = TclTkLib::EventFlag::ALL |
+                            TclTkLib::EventFlag::DONT_WAIT)
+         : 処理待ちのイベント 1 個を実行する．
+         : イベントを処理した場合は true を返す．
+         : フラグで DONT_WAIT を指定していない場合，フラグで処理対
+         : 象となっている種類のイベントが発生するまで待ち続ける．
+         : DONT_WAIT を指定していた場合，処理対象イベントがなくても
+         : すぐに終了し false を返す．
+         : $SAFE >= 4 か，$SAFE >= 1 かつ flag が汚染されているならば
+         : flag には DONT_WAIT が強制的に付けられる．
+
+      set_eventloop_tick(timer_tick)
+         : イベントループと同時に別スレッドが稼働している場合に，時
+         : 間に基づいた強制的なスレッドスイッチングをどの程度の頻度
+         : ( 時間間隔 ) で発生させるかをミリ秒単位の整数値で指定する．
+         : 0 を指定すると，この強制的なスイッチングは行われない．
+         : 標準では 0 に設定されており，イベント処理数に基づくスイッ
+         : チングだけが行われる ( see set_eventloop_weight )．
+         : ただし，稼働しているスレッドがイベントループだけの場合，
+         : timer_tick を 0 に設定することはできない．もし設定されて
+         : いたら，100 ms ( see NO_THREAD_INTERRUPT_TIME ) に自動設
+         : 定される．
+         : 詳細な説明は略すが，これは CPU パワーを節約しつつ安全で
+         : 安定した動作を実現するために実装した仕様である．
+         : $SAFE >= 4 では実行が禁止される．
+
+      get_eventloop_tick
+         : timer_tick の現在値を返す．
+
+      set_no_event_wait(no_event_wait)
+         : 複数のスレッドが稼働している場合で，処理待ちイベントが全
+         : く存在しなかった際に sleep 状態に入る時間長を指定する．
+         : 稼働スレッドがイベントループだけの場合には意味をなさない．
+         : デフォルトの値は 20 (ms)
+         : $SAFE >= 4 では実行が禁止される．
+
+      get_no_event_wait
+         : no_event_wait の現在値を返す．
+
+      set_eventloop_weight(loop_max, no_event_tick)
+         : 複数のスレッドが稼働している際に Ruby/Tk のイベントルー
+         : プに割り当てる比重を定めるためのパラメータを設定する．
+         : 稼働スレッドがイベントループだけの場合には意味をなさない．
+         : 一度のスレッド切り替えの間に処理するイベントの最大数と，
+         : 処理待ちのイベントが存在しない際の加算数とを設定する．
+         : 処理待ちイベントが存在しない場合は no_event_wait ( see
+         : set_no_event_wait ) だけの間 sleep 状態に入る．
+         : デフォルトではそれぞれ 800 回と 10 回，つまり，800 個のイ
+         : ベント (アイドルイベントを含む) を処理するとか，イベント
+         : が全く発生しないままに 80 回の処理待ちイベント検査が完了
+	 : するとかでカウントが 800 以上になるとスレッドスイッチング
+         : が発生することになる．
+         : $SAFE >= 4 では実行が禁止される．
+
+      get_eventloop_weight
+         : 現在の loop_max と no_event_tick との値を返す．
+         : ( see set_eventloop_wait )
+
+      mainloop_abort_on_exception=(bool)
+         : Tk インタープリタ上で例外を発生した際に，イベントループを
+         : エラー停止させるかどうかを指定する．true を指定した場合は
+         : エラー停止するが，false の場合は例外を無視してイベントルー
+         : プを継続する．さらに nil の場合は警告モードでない限りはエ
+         : ラーメッセージの出力すら省略して，例外を無視する．
+	 : デフォルトでは true に設定されている．
+         : １個のインタープリタだけを使っている場合にはエラー時にその
+         : まま停止しても通常は問題ないが，複数のインタープリタが同時
+         : に動作している場合には，それらを管理するイベントループは１
+         : 個だけであるため，いずれかのインタープリタのエラーが原因で，
+         : 他のインタープリタの処理継続が不可能になることがある．その
+         : ような場合でもエラーを無視してイベントループが稼働を続ける
+         : ことで，他のインタープリタが正常に動作し続けることができる．
+         : $SAFE >= 4 では実行が禁止される．
+
+      mainloop_abort_on_exception
+         : Tk インタープリタ上で例外を発生した際に，イベントループをエ
+         : ラー停止させるかどうかの設定状態を true/false で得る．
+
+      num_of_mainwindows
+         : 現在のメインウィンドウ (ルートウィジェット) の数を返す．
+         : メインウィンドウは一つのインタープリタに付き最大一つである
+         : ので，この値は現在 Tk の機能が有効であるインタープリタの総
+         : 数に等しい．
+
+      _merge_tklist(str, str, ... )
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列がそれぞれ
+         : 正しく一つのリスト要素となるように連結した文字列を返す．
+
+      _conv_listelement(str)
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列が Tcl の
+         : 一つのリスト要素として適切な表現になるように変換した文
+         : 字列を返す．
+
+      _toUTF8(str, encoding=nil)
+      _fromUTF8(str, encoding=nil)
+         : Tcl/Tk が内蔵している UTF8 変換処理を呼び出す．
+
+      _subst_UTF_backslash(str)
+      _subst_Tcl_backslash(str)
+         : Tcl のルールでバックスラッシュ記法 ( \uhhhh による
+         : Unicode 文字表現を含む ) を解析する．
+         : _subst_Tcl_backslash はすべてのバックスラッシュ記法を
+         : 置き換えるのに対し，_subst_UTF_backslash は \uhhhh
+         : による Unicode 文字表現だけを置き換える．
+
+      encoding_system
+      encoding_system=(encoding)
+         : Tcl の system encoding の獲得および設定
+
+      encoding
+      encoding=(encoding)
+         : encoding_system / encoding_system= の alias
+         : ( Ruby/Tk の tk.rb では置き換えられる予定のもの．)
+
+
+クラス TclTkIp
+   クラスメソッド
+      new(ip_name=nil, options='')
+         : TclTkIp クラスのインスタンスを生成する．
+         : ip_name に文字列を与えた場合は，それが winfo interps などで
+         : 表示される名前になる．
+         : options には，-geometry や -use など，wish のコマンドライン
+         : 引数として与えるオプションと同様の情報を文字列として与える．
+         : 与えられた情報は，root widget 生成の際に用いられる．
+         : ( e.g. TclTkIp.new('FOO', '-geometry 500x200 -use 0x2200009') )
+         : もし options に敢えて nil または false を与えた場合，Tk ライ
+         : ブラリが導入されていない (つまりは Tcl のみの) インタープリ
+         : タを生成する．この場合は GUI 環境は必要ないため，ウインドウ
+         : システムが存在しない，または使用できない環境でも Tcl インター
+         : プリタを生成し，Tcl やその拡張ライブラリを活用することができる．
+
+   インスタンスメソッド
+      create_slave(name, safe=false)
+         : レシーバを親とする name という名前のスレーブインタープリタを
+	 : 生成する．
+	 : safe には生成するインタープリタを safe インタープリタとする
+         : かを指定する．デフォルトは false ということになっているが，
+         : たとえ明確に false を指定していたとしても，親となるインター
+         : プリタが safe インタープリタであれば，その設定を引き継いで
+         : safe インタープリタとして生成される．
+         : $SAFE >= 4 では，safe インタープリタ以外の生成が禁止される．
+
+      make_safe
+         : Tcl/Tk インタープリタを safe インタープリタに変更する．
+         : 戻り値はレシーバであるインタープリタ自身である．
+         : 失敗した場合は RuntimeError の例外を発生する．
+
+      safe?
+         : Tcl/Tk インタープリタが safe インタープリタであるかを調べる．
+         : safe インタープリタであれば true を返す．
+
+      allow_ruby_exit?
+         : 対象となるインタープリタ上の評価で，ruby の exit 関数または
+         : Tcl/Tk 上の exit コマンドによって ruby 自体を終了させること
+         : を許すかどうかを返す．
+	 : 許さない場合は対象のインタープリタだけが終了する．
+         : マスターインタープリタのデフォルト値は true，スレーブインター
+         : プリタのデフォルト値は false である．
+
+      allow_ruby_exit=(mode)
+         : 対象となるインタープリタの allow_ruby_exit? の状態を変更する．
+	 : $SAFE >= 4 またはインタープリタが safe インタープリタの場合は
+	 : 変更が許されない (例外を発生)．
+
+      delete
+         : Tcl/Tk インタープリタを delete する．
+         : delete されたインタープリタは，以後一切の操作ができなくなり，
+         : コマンドを送っても例外を発生するようになる．
+
+      deleted?
+         : Tcl/Tk インタープリタがすでに delete されているかを調べる．
+         : delete 済みでコマンドを受け付けない状態になっているならば
+         : true を返す．
+
+      has_mainwindow?
+         : Tcl/Tk インタープリタにメインウィンドウ (root widget) が
+         : 存在すれば true を，存在しなければ false を返す．
+         : インタープリタが既に delete 済みであれば nil を返す．
+
+      restart
+         : Tcl/Tk インタープリタの Tk 部分の初期化，再起動を行う．
+         : 一旦 root widget を破壊した後に再度 Tk の機能が必要と
+         : なった場合に用いる．
+         : $SAFE >= 4 では実行が禁止される．
+
+      _eval(str)
+      _invoke(*args)
+         : Tcl/Tk インタープリタ上で評価を行う．
+         : _eval は評価スクリプトが一つの文字列であることに対し，
+         : _invoke は評価スクリプトの token ごとに一つの引数とな
+         : るように与える．
+         : _invoke の方は Tcl/Tk インタープリタの字句解析器を用い
+         : ないため，評価の負荷がより少なくてすむ．ただし，その代
+         : わりに auto_load のような機構は働かず，load 等によって
+         : Tcl/Tk インタープリタ上に既に登録済みのコマンドしか呼
+         : び出すことができない．
+         : _eval では auto_load 機構が働くため，一度 _eval を実行
+         : して登録に成功しさえすれば，以降は _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 変換処理を呼び出す．
+
+      _thread_vwait(var_name)
+      _thread_tkwait(mode, target)
+         : スレッド対応の vwait あるいは tkwait 相当のメソッド．
+         : 通常の vwait あるいは tkwait コマンドと異なるのは，イベン
+         : トループとは異なるスレッドから呼び出した場合に vwait 等の
+         : スタックとは独立に条件の成立待ちがなされることである．
+         : 通常の vwait / tkwait では，vwait / tkwait (1) の待ちの途
+         : 中でさらに vwait / tkwait (2) が呼ばれた場合，待ちの対象
+         : となっている条件の成立順序がどうあれ，(2)->(1) の順で待ち
+         : を終了して戻ってくる．
+         : _thread_vwait / _thread_tkwait は，イベントループのスレッ
+         : ドで呼ばれた場合は通常の vwait / tkwait と同様に動作する
+         : が，イベントループ以外のスレッドで呼ばれた場合にはそのス
+         : レッドを停止させて待ちに入り，条件が成立した時にスレッド
+         : の実行を再開する．「vwait 等の待ちスタックとは独立」とい
+         : う意味は，この再開のタイミングが他のスレッドでの待ち状況
+         : とは無関係ということである．つまり，イベントループ等の他
+         : のスレッドで vwait 等で待ちの状態にあったとしてもその完了
+         : を待つことなく，自らの待ち条件が成立次第，処理を継続する
+         : ことになる．
+
+      _return_value
+         : 直前の Tcl/Tk 上での評価の実行結果としての戻り値を返す．
+
+      _get_variable(var_name, flag)
+      _get_variable2(var_name, index_name, flag)
+         : Tcl/Tk 上の var という変数名の変数の値を返す．
+         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照)
+         : された場合は連想配列 var_name の index_name の要素を返す．
+         : flag には変数を検索する際の条件を指定する．flag に与える
+         : 値はモジュール TclTkLib::VarAccessFlag を参照すること．
+
+      _set_variable(var_name, value, flag)
+      _set_variable2(var_name, index_name, value, flag)
+         : Tcl/Tk 上の var という変数名の変数に値を設定する．
+         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照)
+         : された場合は連想配列 var_name の index_name の要素を設定
+         : する．
+         : flag には変数を検索する際の条件を指定する．flag に与える
+         : 値はモジュール TclTkLib::VarAccessFlag を参照すること．
+
+      _unset_variable(var_name)
+      _unset_variable2(var_name, index_name)
+         : Tcl/Tk 上の var_name という変数名の変数を消去する．
+         : もし index_name が指定 (PARSE_VARNAME フラグの説明も参照)
+         : された場合は連想配列 var_name から index_name の要素だけ
+         : を消去する．
+
+      _get_global_var(var_name)
+      _get_global_var2(var_name, index_name)
+      _set_global_var(var_name, value)
+      _set_global_var2(var_name, index_name, value)
+      _unset_global_var(var_name)
+      _unset_global_var2(var_name, index_name)
+         : それぞれ，対応する変数アクセスメソッドの flag に対して
+         : (GLOBAL_ONLY | LEAVE_ERR_MSG) を与えたもの．
+
+      _split_tklist(str)
+         : Tcl/Tk のライブラリ関数を使って，文字列 str をリストに
+         : 分割する (文字列の配列として返す)．
+
+      _merge_tklist(str, str, ... )
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列がそれぞれ
+         : 正しく一つのリスト要素となるように連結した文字列を返す．
+
+      _conv_listelement(str)
+         : Tcl/Tk のライブラリ関数を使って，引数の文字列が Tcl の
+         : 一つのリスト要素として適切な表現になるように変換した文
+         : 字列を返す．
+
+      mainloop
+      mainloop_watchdog
+         : スレーブ IP の場合にはイベントループを起動せずに nil を返す．
+         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
+
+      do_one_event
+         : スレーブ IP の場合には引数のイベントフラグに DONT_WAIT が
+         : 強制的に追加される (イベント待ちでスリープすることは禁止)．
+         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
+
+      set_eventloop_tick
+      get_eventloop_tick
+      set_no_event_wait
+      get_no_event_wait
+      set_eventloop_weight
+      get_eventloop_weight
+      mainloop_abort_on_exception
+      mainloop_abort_on_exception=
+         : スレーブ IP の場合には値の設定が許されない (無視される)．
+         : それ以外の点では引数を含めて TclTkLib の同名メソッドに同じ．
+
+      encoding_table
+         : Ruby m17n 用に Ruby と Tk との間の encoding 対応表を返す．
+
+クラス TkCallbackBreak < StandardError
+クラス TkCallbackContinue < StandardError
+   : これらはイベントコールバックにおいて，コールバック処理を適切に中
+   : 断したり，次のバインドタグのバインディング処理に進めたりすること
+   : を可能にするための例外クラスである．
+   : コールバックで break や continue を実現するためには，コールバック
+   : である Ruby 手続きが Tcl/Tk インタープリタ側に適切なリターンコー
+   : ドを返す必要がある．Ruby の手続きが普通に値を返すのでは，それが普
+   : 通の戻り値であるのか否かを区別ができないため，例外発生を利用した
+   : 実装を行っている．
+   : ただし現在では，コールバック手続きを Ruby の break, next で終了す
+   : ることで同等の結果を得ることができるようになっている．それゆえ，
+   : これらは必要ないものではあるが，互換性のために残してある．
+
+(eof)
diff --git a/ext/tk/README.1st b/ext/tk/README.1st
new file mode 100644
index 0000000000..4ffef34f1d
--- /dev/null
+++ b/ext/tk/README.1st
@@ -0,0 +1,19 @@
+If you want to use Ruby/Tk (tk.rb and so on), you must have tcltklib.so
+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 directory, 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.
+
+--------------------------------------------
+ ( the following is written in UTF-8 )
+
+Ruby/Tk (tk.rb など) を使いたい場合には，tcltklib.so が正しく動いていな
+ければなりません．コンパイル時に何か問題が生じた場合は，README.tcltklib
+や README.ActiveTcl を見てください．
+たとえ Ruby のライブラリディレクトリに tcltklib.so が存在していたとして
+も，実行環境に Tcl/Tk ライブラリ (libtcl8.4.so など) がなければ機能しま
+せん．Tcl/Tk が正しくインストールされているかもチェックしてください．
+
+==========================================================
+                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.ActiveTcl b/ext/tk/README.ActiveTcl
new file mode 100644
index 0000000000..990f612648
--- /dev/null
+++ b/ext/tk/README.ActiveTcl
@@ -0,0 +1,62 @@
+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>
+
+And use the followings if you need.
+
+   --with-tcllib=<libname>
+   --with-tklib=<libname>
+   --enable-tcltk-stubs
+
+For example, when you install ActiveTcl-8.4.x to '/usr/local/ActiveTcl',
+
+   configure --with-tcl-dir=/usr/local/ActiveTcl/  \
+             --with-tk-dir=/usr/local/ActiveTcl/   \
+             --with-tcllib=tclstub8.4              \
+             --with-tklib=tkstub8.4                \
+             --enable-tcltk-stubs
+
+It depends on your environment that you have to add the directory of
+ActiveTcl's libraries to your library path when execute Ruby/Tk.
+One of the way is to add entries to TCLLIBPATH environment variable,
+and one of the others add to LD_LIBRARY_PATH environment variable
+
+Probably, using TCLLIBPATH is better. The value is appended at the
+head of Tcl's 'auto_path' variable. You can see the value of the
+variable by using 'Tk::AUTO_PATH.value' or 'Tk::AUTO_PATH.list'.
+
+For example, on Linux, one of the ways is to use LD_LIBRARY_PATH
+environment variable.
+-------------------------------------------------------------------------
+ [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH \
+         ruby your-Ruby/Tk-script
+
+ [bash]$ LD_LIBRARY_PATH=/usr/local/ActiveTcl/lib:$LD_LIBRARY_PATH irb
+-------------------------------------------------------------------------
+Based on it, the Tcl interpreter changes auto_path variable's value.
+
+Then, you'll be able to use Tcl/Tk extension libraries included in the
+ActiveTcl package (e.g. call TkPackage.require('BWidget'), and then,
+use functions/widgets of BWidget extension).
+
+                                  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.fork b/ext/tk/README.fork
new file mode 100644
index 0000000000..c58d75883b
--- /dev/null
+++ b/ext/tk/README.fork
@@ -0,0 +1,34 @@
+Ruby/Tk does NOT support forking the process on which Tk interpreter
+is running (unless NEVER control Tk interpreter under the forked child
+process). In the library 'tk.rb', a Tk interpreter is initialized.
+Therefore, if you want running Tk under a child process, please call
+"require 'tk'" in the child process.
+
+# If do fork and exec(<new Ruby/Tk>) on the child process, you can
+# control Ruby/Tk interpreter on the child process by 'send' command
+# of Tcl/Tk. About this, please see Tk.appsend and Tk.rb_appsend, or
+# 'remote-tk.rb' and the sample 'sample/remote-ip_sample.rb'.
+
+For example, the following sample1 will NOT work, and sample2 will
+work properly.
+
+---<sample1: NOT work>---------------------------------------
+require 'tk'  ## init Tk interpreter under parent process
+
+exit! if fork ## exit parent process
+
+## child process
+TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
+Tk.mainloop
+-------------------------------------------------------------
+
+---<sample2: will work>--------------------------------------
+exit! if fork ## exit main process
+
+## child process
+require 'tk'  ## init Tk interpreter under child process
+TkButton.new(:text=>'QUIT', :command=>proc{exit}).pack
+Tk.mainloop
+-------------------------------------------------------------
+
+                                         2004/05/22  Hidetoshi NAGAI
diff --git a/ext/tk/README.macosx-aqua b/ext/tk/README.macosx-aqua
new file mode 100644
index 0000000000..15630727ec
--- /dev/null
+++ b/ext/tk/README.macosx-aqua
@@ -0,0 +1,67 @@
+
+  *** for MacOS X Aqua (Tcl/Tk Aqua) users ***
+
+First of all, please read README.tcltklib to use Tcl/Tk Aqua Framework.
+
+With Tcl/Tk Aqua libraries, current tcltklib somtimes freezes when
+using Aqua specific dialogs (e.g. Tk.messageBox).
+This is a known bug of Ruby-1.8.4 release.
+
+When you meet the trouble on your GUI, you'll be able to avoid the trouble
+by Tcl/Tk's traditional dialogs.
+If you want to do that, please call some of the following bits of script
+after "reqruie 'tk'".
+
+=================================================================
+# use a traditional dialog for Tk.chooseColor()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_chooseColor {args} {
+        return [eval tk::dialog::color:: $args]
+    }
+EOS
+
+# use a traditional dialog for Tk.getOpenFile() and Tk.getMultipleOpenFile()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_getOpenFile {args} {
+        if {$::tk_strictMotif} {
+            return [eval tk::MotifFDialog open $args]
+        } else {
+            return [eval ::tk::dialog::file:: open $args]
+        }
+    }
+EOS
+
+# use a traditional dialog for Tk.getSaveFile() and Tk.getMultipleSaveFile()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_getSaveFile {args} {
+        if {$::tk_strictMotif} {
+            return [eval tk::MotifFDialog save $args]
+        } else {
+            return [eval ::tk::dialog::file:: save $args]
+        }
+    }
+EOS
+
+# use a traditional dialog for Tk.messageBox()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_messageBox {args} {
+        return [eval tk::MessageBox $args]
+    }
+EOS
+
+# use a traditional dialog for Tk.chooseDirectory()
+Tk.ip_eval(<<'EOS')
+    proc ::tk_chooseDirectory {args} {
+        return [eval ::tk::dialog::file::chooseDir:: $args]
+    }
+EOS
+=================================================================
+
+Each of them replaces the platform specific dialog command to the
+traditional one.
+
+If you use some MultiTkIp objects, probably, you'll have to call the
+bits of script for each MultiTkIp object.
+
+--
+Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/README.tcltklib b/ext/tk/README.tcltklib
new file mode 100644
index 0000000000..da343a4f3e
--- /dev/null
+++ b/ext/tk/README.tcltklib
@@ -0,0 +1,152 @@
+To compile 'tcltklib', you must have Tcl/Tk libraries on your environment.
+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>
+ --with-tcltkversion=<tclversion>,<tkversion>
+      force version of Tcl/Tk library
+      (e.g. libtcl8.4g.so & libtk8.4g.so ==> --with-tcltkversion=8.4g
+            libtcl8.4.so  & libtk8.4g.so ==> --with-tcltkversion=8.4,8.4g)
+
+ --enable-tcl-h-ver-check/--disable-tcl-h-ver-check
+ --enable-tk-h-ver-check/--disable-tk-h-ver-check
+                               enable or disable for checking MAJOR_VERSION and
+                               MINOR_VERSION on tcl.h/tk.h whether match with
+                               Tcl/Tk libraries' version or not.
+
+ --with-tcl-build-dir=<dir>
+ --with-tk-build-dir=<dir>     If you want to compile with libraries on Tcl/Tk
+                               build dir (still NOT installed), you must use
+                               these options.
+                               (e.g. --with-tcl-build-dir=./build/tcl8.5.9/unix)
+                               When use these options, --with-tclConfig-dir and
+                               --with-tkConfig-dir options are ignored (however,
+                               --with-tclConfig-file and --with-tkConfig-file
+                               options are still available).
+
+ --with-tclConfig-file=<file>/--without-tclConfig-file
+ --with-tkConfig-file=<file>/--without-tkConfig-file
+                               file path of tclConfig.sh/tkConfig.sh, or don't
+                               refer those.
+                               If you want use non-standard filenames of config
+                               files (e.g. tclConfig-static.sh), you must use
+                               these options.
+
+ --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)
+                               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"
+
+ --with-tk-dir=<path>
+      equal to "--with-tk-include=<path>/include --with-tk-lib=<path>/lib"
+
+ --with-tcl-include=<dir>      the directory contains 'tcl.h'
+ --with-tk-include=<dir>       the directory contains 'tk.h'
+
+ --with-tcl-lib=<dir>          the directory contains 'libtcl<version>.so'
+ --with-tk-lib=<dir>           the directory 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 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")
+
+ --with-tk-framework-header=<dir>
+      Tk framework headers directory
+      (e.g. "/Library/Frameworks/Tk.framework/Headers")
+
+
+ --with-X11 / --without-X11    use / not use the X Window System
+
+ --with-X11-dir=<path>
+      equal to "--with-X11-include=<path>/include --with-X11-lib=<path>/lib"
+
+ --with-X11-include=<dir>      the directory contais X11 header files
+ --with-X11-lib=<dir>          the directory contais X11 libraries
+
+
+If you forgot to give the options when do 'configure' on toplevel
+directory of Ruby sources, please try something like as the followings.
+
+ $ cd ext/tcltklib
+ $ rm Makefile
+ $ CONFIGURE_ARGS='--with-tcl-include=/usr/local/include/tcl8.4/ --with-tcllib=tcl8.4 --with-tklib=tk8.4' ruby extconf.rb
+
+
+ *** ATTENTION ***
+When your Tcl/Tk libraries are compiled with "pthread support",
+Ruby/Tk may cause "Hang-up" or "Segmentation Fault" frequently.
+If you have such a trouble, please try to use the '--enable-pthread'
+option of the 'configure' command and re-compile Ruby sources.
+It may help you to avoid this trouble. The following configure
+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".
+When no "TCL_THREADS=?" line, if Tcl version is 7.x or 8.0 which is
+given by "TCL_MAJOR_VERSION=?" line and "TCL_MINOR_VERSION=?" line,
+then --disable-tcl-thread is expected. Else, ignore the 'tclConfig.sh'.
+If --enable-tcl-thread or --disable-tcl-thread option is given, then
+--with-tclConfig-file option is ignored.
+
+==========================================================
+                Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
diff --git a/ext/tk/config_list.in b/ext/tk/config_list.in
new file mode 100644
index 0000000000..143a7b5df6
--- /dev/null
+++ b/ext/tk/config_list.in
@@ -0,0 +1,41 @@
+##############################################
+# configure options for Ruby/Tk
+# release date:  2011-06-05
+##############################################
+with tk-old-extconf
+with ActiveTcl
+with tk-shlib-search-path
+enable tcltk-stubs
+with tcltkversion
+enable tcl-h-ver-check
+enable tk-h-ver-check
+with tcl-build-dir
+with tk-build-dir
+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
new file mode 100644
index 0000000000..f7ba3229c1
--- /dev/null
+++ b/ext/tk/depend
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..99a7367782
--- /dev/null
+++ b/ext/tk/extconf.rb
@@ -0,0 +1,2094 @@
+##############################################################
+# extconf.rb for tcltklib
+# release date: 2010-07-30
+##############################################################
+require 'mkmf'
+
+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
+  %w[8.5 8.4] # At present, Tcl/Tk8.6 is not supported.
+
+TkLib_Config['unsupported_versions'] =
+  %w[8.8 8.7 8.6] # At present, Tcl/Tk8.6 is not supported.
+
+TkLib_Config['major_nums'] = '87'
+
+
+##############################################################
+
+TkLib_Config['enable-shared'] = enable_config("shared")
+
+
+##############################################################
+# 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|s390x/ =~ 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']
+
+  else
+    [
+      '/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.exist?(File.join(dir, "Tcl.framework", "Headers"))
+    next unless File.directory?(tcldir = File.join(dir, "Tcl.framework"))
+    next unless File.exist?(File.join(dir, "Tk.framework", "Headers"))
+    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
+  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
+
+  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
+
+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
+
+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
+
+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
+
+def get_ext_list()
+  exts = [CONFIG['DLEXT']]
+  exts.concat %w(dll) if is_win32?
+  exts.concat %w(bundle dylib) if is_macosx?
+
+  if TkLib_Config["tcltk-stubs"] || TkLib_Config['enable-shared'] == false
+    exts.unshift "lib" if is_win32?
+    exts.unshift "a"
+    exts.unshift CONFIG['LIBEXT']
+  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 = "#{libpathflag([tcldir])} #{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 = "#{libpathflag([tkdir])} #{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
+  progress_flag = false
+
+  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_flag = true # 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
+      if tclconf
+        if tclver && ((tclver_major && tclver_major != tclconf['TCL_MAJOR_VERSION']) || (tclver_minor && tclver_minor != tclconf['TCL_MINOR_VERSION']))
+          print("\n") if progress_flag
+          puts "Ignore \"#{tclpath}\" (unmatch with configured version)."
+          progress_flag = false
+          next
+        end
+        if TkLib_Config['unsupported_versions'].find{|ver| ver == "#{tclconf['TCL_MAJOR_VERSION']}.#{tclconf['TCL_MINOR_VERSION']}"}
+          print("\n") if progress_flag
+          puts "Ignore \"#{tclpath}\" (unsupported version of Tcl/Tk)."
+          progress_flag = false
+          next
+        end
+      end
+
+      tkconf = (tkpath)? parse_tclConfig(tkpath): nil
+      if tkconf
+        if tkver && ((tkver_major && tkver_major != tkconf['TK_MAJOR_VERSION']) || (tkver_minor && tkver_minor != tkconf['TK_MINOR_VERSION']))
+          print("\n") if progress_flag
+          puts "Ignore \"#{tkpath}\" (unmatch with configured version)."
+          progress_flag = false
+          next
+        end
+        if TkLib_Config['unsupported_versions'].find{|ver| ver == "#{tkconf['TK_MAJOR_VERSION']}.#{tkconf['TK_MINOR_VERSION']}"}
+          print("\n") if progress_flag
+          puts "Ignore \"#{tkpath}\" (unsupported version of Tcl/Tk)."
+          progress_flag = false
+          next
+        end
+      end
+
+      # 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
+
+  print "Search Tcl library"
+
+  if stubs
+    func = "Tcl_InitStubs"
+    lib = "tclstub"
+  else
+    func = "Tcl_FindExecutable"
+    lib = "tcl"
+  end
+
+  if version && ! version.empty?
+    versions = [version]
+  else
+    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, tcllib, 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 = "#{libpathflag([path])} #{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, 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"
+  else
+    func = "Tk_Init"
+    lib = "tk"
+  end
+
+  if version && ! version.empty?
+    versions = [version]
+  else
+    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, tklib, 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 = "#{libpathflag([path])} #{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)
+  if !st && TkLib_Config['enable-shared'] == nil
+    TkLib_Config['enable-shared'] = false
+    st,path,lib,libs,*inc = find_tcl(tcllib, stubs, tclversion, *tcl_opt_paths)
+  end
+  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)
+  if !st && TkLib_Config['enable-shared'] == nil
+    TkLib_Config['enable-shared'] = false
+    st,path,lib,libs,*inc = find_tk(tklib, stubs, tkversion, *tk_opt_paths)
+  end
+  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
+      version_check = proc {|code|
+        code << ("#if TCL_MAJOR_VERSION != #{major} || TCL_MINOR_VERSION != #{minor}\n" \
+                 "#error VERSION does not match\n" \
+                 "#endif")
+      }
+    else
+      version_check = nil
+    end
+    have_tcl_h = have_header('tcl.h', &version_check)
+    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
+
+      if major || minor
+        version_check = proc {|code|
+          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
+          code
+        }
+      else
+        version_check = nil
+      end
+      have_tcl_h = paths.find{|path|
+        print(".") # progress
+        inc_opt = " -I#{path.quote}"
+        if try_header("tcl", inc_opt, &version_check)
+          ($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
+      version_check = proc {|code|
+        code << ("#if TK_MAJOR_VERSION != #{major} || TK_MINOR_VERSION != #{minor}\n" \
+                 "#error VERSION does not match\n" \
+                 "#endif")
+      }
+    else
+      version_check = nil
+    end
+    have_tk_h = have_header('tk.h')
+    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
+
+      if major || minor
+        version_check = proc {|code|
+          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
+          code
+        }
+      else
+        version_check = nil
+      end
+      have_tk_h = paths.find{|path|
+        print(".") # progress
+        inc_opt = " -I#{path.quote}"
+        if try_header(%w'tcl.h tk.h', inc_opt, &version_check)
+          ($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 $LIBS && $LIBS.include?('-framework')
+    ($LIBS ||= "") << ' -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()
+  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_Info['config_file_path']
+    if tcl_enable_thread == true
+      puts("Warning: definiton of tclConfig.sh is ignored, because --enable-tcl-thread option is given.")
+    elsif tcl_enable_thread == false
+      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
+      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
+        # 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
+        #tclConfig = false
+      end
+    end
+  end
+
+  if tcl_enable_thread == nil && !TclConfig_Info['config_file_path']
+    # tcl-thread is unknown and tclConfig is unavailable
+    begin
+      try_run("int main() { exit(0); }")
+    rescue Exception
+      # cannot try_run. Is CROSS-COMPILE environment?
+      puts(%Q'\
+*****************************************************************************
+**
+** NATIVETHREAD SUPPORT CHECK WARNING:
+**
+**   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.
+**
+*****************************************************************************
+')
+      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 (TkLib_Config["ruby_with_thread"])
+    $CPPFLAGS ||= ""
+
+    # ruby -> enable
+    unless tcl_enable_thread
+      # ruby -> enable && tcl -> disable
+      puts(%Q'\
+*****************************************************************************
+**
+** NATIVETHREAD SUPPORT MODE WARNING:
+**
+**   Ruby is compiled with --enable-pthread, but your Tcl/Tk library
+**   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 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).
+**
+*****************************************************************************
+')
+    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'\
+*****************************************************************************
+**
+** NATIVETHREAD SUPPORT MODE ERROR:
+**
+**   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 nativethread 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
+
+##############################################################
+# main
+##############################################################
+# check header file
+print("check functions.")
+
+%w"ruby_native_thread_p rb_errinfo rb_safe_level rb_hash_lookup
+ rb_proc_new rb_obj_untrust rb_obj_taint rb_set_safe_level_force
+ rb_sourcefile rb_thread_alive_p rb_thread_check_trap_pending".each do |func|
+  have_func(func, "ruby.h")
+  print(".") # progress
+end
+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
+
+# 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
+      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
+
+# 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
+      activeTcl = '/opt/ActiveTcl*'
+    end
+  end
+end
+TkLib_Config["ActiveTcl"] = activeTcl
+
+# 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
+
+# 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
+
+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
+
+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 ||= "") << " " << libpathflag([TkLib_Config["tcl-build-dir"]]) if TkLib_Config["tcl-build-dir"]
+
+  libs = ''
+  if tcl_cfg_dir
+    TclConfig_Info['TCL_LIBS'] ||= ""
+    ($INCFLAGS ||= "") << ' ' << TclConfig_Info['TCL_INCLUDE_SPEC']
+    libs << ' ' << 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?
+        libs << ' ' << TclConfig_Info['TCL_BUILD_STUB_LIB_SPEC']
+      else
+        libs << ' ' << 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?
+        libs << ' ' << TclConfig_Info['TCL_BUILD_LIB_SPEC']
+      else
+        libs << ' ' << TclConfig_Info['TCL_LIB_SPEC']
+      end
+    end
+  end
+
+  libs << " " << libpathflag([TkLib_Config["tk-build-dir"]]) if TkLib_Config["tk-build-dir"]
+
+  if tk_cfg_dir
+    TkConfig_Info['TK_LIBS'] ||= ""
+    ($INCFLAGS ||= "") << ' ' << TkConfig_Info['TK_INCLUDE_SPEC']
+    libs << ' ' << 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?
+        libs << ' ' << TkConfig_Info['TK_BUILD_STUB_LIB_SPEC']
+      else
+        libs << ' ' << 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?
+        libs << ' ' << TkConfig_Info['TK_BUILD_LIB_SPEC']
+      else
+        libs << ' ' << TkConfig_Info['TK_LIB_SPEC']
+      end
+    end
+  end
+  $LDFLAGS << ' ' << libs
+  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."
+  puts "If you have Tcl/Tk libraries on your environment, you may be able to use them with configure options (see ext/tk/README.tcltklib)."
+  puts "At present, Tcl/Tk8.6 is not supported. Although you can try to use Tcl/Tk8.6 with configure options, it will not work correctly. I recommend you to use Tcl/Tk8.5 or 8.4."
+end
diff --git a/ext/tk/lib/README b/ext/tk/lib/README
new file mode 100644
index 0000000000..c076755756
--- /dev/null
+++ b/ext/tk/lib/README
@@ -0,0 +1,30 @@
+README		this file
+multi-tk.rb	multiple Tk interpreter (included safe-Tk) support
+remotei-tk.rb	control remote Tk interpreter on the other process support
+tk.rb		Tk interface
+
+tk/             library files construct Ruby/Tk
+
+tkextlib/       non-standard Tcl/Tk extension support libraries
+
+*********************************************************************
+***  The followings exists for backward compatibility only.
+***  The only thing which they work is that requires current
+***  library files ( tk/*.rb ).
+*********************************************************************
+tkafter.rb	handles Tcl after
+tkbgerror.rb	Tk error module
+tkcanvas.rb	Tk canvas interface
+tkclass.rb	provides generic names for Tk classes
+tkconsole.rb	console command support
+tkdialog.rb	Tk dialog class
+tkentry.rb	Tk entry class
+tkfont.rb	Tk font support
+tkmacpkg.rb	Mac resource support
+tkmenubar.rb	TK menubar utility
+tkmngfocus.rb	focus manager
+tkpalette.rb	pallete support
+tkscrollbox.rb	scroll box, also example of compound widget
+tktext.rb	text classes
+tkvirtevent.rb	virtual event support
+tkwinpkg.rb	Win DDE and registry support
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb
new file mode 100644
index 0000000000..bb6e69aab6
--- /dev/null
+++ b/ext/tk/lib/multi-tk.rb
@@ -0,0 +1,3754 @@
+#
+#               multi-tk.rb - supports multi Tk interpreters
+#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+require 'tcltklib'
+require 'tkutil'
+require 'thread'
+
+if defined? Tk
+  fail RuntimeError,"'multi-tk' library must be required before requiring 'tk'"
+end
+
+################################################
+# ignore exception on the mainloop?
+
+TclTkLib.mainloop_abort_on_exception = true
+# TclTkLib.mainloop_abort_on_exception = false
+# TclTkLib.mainloop_abort_on_exception = nil
+
+
+################################################
+# add ThreadGroup check to TclTkIp.new
+class << TclTkIp
+  alias __new__ new
+  private :__new__
+
+  def new(*args)
+    if Thread.current.group != ThreadGroup::Default
+      raise SecurityError, 'only ThreadGroup::Default can call TclTkIp.new'
+    end
+    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
+
+
+################################################
+# exceptiopn to treat the return value from IP
+class MultiTkIp_OK < Exception
+  def self.send(thread, ret=nil)
+    thread.raise self.new(ret)
+  end
+
+  def initialize(ret=nil)
+    super('succeed')
+    @return_value = ret
+  end
+
+  attr_reader :return_value
+  alias value return_value
+end
+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__)
+
+  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
+
+  (@@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  = 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 = TkUtil.untrust([]) unless defined?(@@TK_TABLE_LIST)
+
+  unless defined?(@@TK_CMD_TBL)
+    @@TK_CMD_TBL = TkUtil.untrust(Object.new)
+
+    # @@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?', 'object_id',
+        '[]', '[]=', 'delete', 'each', 'has_key?'
+      ]
+      instance_methods.each{|m| undef_method(m) unless allow.index(m.to_s)}
+
+      def kind_of?(klass)
+        @tbl.kind_of?(klass)
+      end
+
+      def inspect
+        if Thread.current.group == ThreadGroup::Default
+          @tbl.inspect
+        else
+          ip = MultiTkIp.__getip
+          @tbl.reject{|idx, ent| ent.respond_to?(:ip) && ent.ip != ip}.inspect
+        end
+      end
+
+      def [](idx)
+        return unless (ent = @tbl[idx])
+        if Thread.current.group == ThreadGroup::Default
+          ent
+        elsif ent.respond_to?(:ip)
+          (ent.ip == MultiTkIp.__getip)? ent: nil
+        else
+          ent
+        end
+      end
+
+      def []=(idx,val)
+        if self.has_key?(idx) && Thread.current.group != ThreadGroup::Default
+          fail SecurityError,"cannot change the entried command"
+        end
+        @tbl[idx] = val
+      end
+
+      def delete(idx, &blk)
+        # if gets an entry, is permitted to delete
+        if self[idx]
+          @tbl.delete(idx)
+        elsif blk
+          blk.call(idx)
+        else
+          nil
+        end
+      end
+
+      def each(&blk)
+        if Thread.current.group == ThreadGroup::Default
+          @tbl.each(&blk)
+        else
+          ip = MultiTkIp.__getip
+          @tbl.each{|idx, ent|
+            blk.call(idx, ent) unless ent.respond_to?(:ip) && ent.ip != ip
+          }
+        end
+        self
+      end
+
+      def has_key?(k)
+        @tbl.has_key?(k)
+      end
+      alias include? has_key?
+      alias key? has_key?
+      alias member? has_key?
+    end
+
+    @@TK_CMD_TBL.freeze
+  end
+
+  ######################################
+
+  @@CB_ENTRY_CLASS = Class.new(TkCallbackEntry){
+    def initialize(ip, cmd)
+      @ip = ip
+      @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
+      cmd.inspect
+    end
+    def call(*args)
+      unless @ip.deleted?
+        current = Thread.current
+        backup_ip = current[:callback_ip]
+        current[:callback_ip] = @ip
+        begin
+          ret = @ip.cb_eval(@cmd, *args)
+          fail ret if ret.kind_of?(Exception)
+          ret
+        rescue TkCallbackBreak, TkCallbackContinue => e
+          fail e
+	rescue SecurityError => e
+          # in 'exit', 'exit!', and 'abort' : security error --> delete IP
+          if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
+	    @ip.delete
+          elsif @ip.safe?
+	    if @ip.respond_to?(:cb_error)
+              @ip.cb_error(e)
+            else
+              nil # ignore
+            end
+          else
+            fail e
+          end
+        rescue Exception => e
+          fail e if e.message =~ /^TkCallback/
+
+          if @ip.safe?
+	    if @ip.respond_to?(:cb_error)
+              @ip.cb_error(e)
+            else
+              nil # ignore
+            end
+          else
+            fail e
+          end
+        ensure
+          current[:callback_ip] = backup_ip
+        end
+      end
+    end
+  }.freeze
+
+  ######################################
+
+  def _keys2opts(src_keys)
+    return nil if src_keys == nil
+    keys = {}; src_keys.each{|k, v| keys[k.to_s] = v}
+    #keys.collect{|k,v| "-#{k} #{v}"}.join(' ')
+    keys.collect{|k,v| "-#{k} #{TclTkLib._conv_listelement(TkComm::_get_eval_string(v))}"}.join(' ')
+  end
+  private :_keys2opts
+
+  def _check_and_return(thread, exception, wait=0)
+    unless thread
+      unless exception.kind_of?(MultiTkIp_OK)
+        msg = "#{exception.class}: #{exception.message}"
+
+        if @interp.deleted?
+          warn("Warning (#{self}): " + msg)
+          return nil
+        end
+
+        if safe?
+          warn("Warning (#{self}): " + msg) if $DEBUG
+          return nil
+        end
+
+        begin
+          @interp._eval_without_enc(@interp._merge_tklist('bgerror', msg))
+        rescue Exception => e
+          warn("Warning (#{self}): " + msg)
+        end
+      end
+      return nil
+    end
+
+    if wait == 0
+      # no wait
+      Thread.pass
+      if thread.stop?
+        thread.raise exception
+      end
+      return thread
+    end
+
+    # wait to stop the caller thread
+    wait.times{
+      if thread.stop?
+        # ready to send exception
+        thread.raise exception
+        return thread
+      end
+
+      # wait
+      Thread.pass
+    }
+
+    # unexpected error
+    thread.raise RuntimeError, "the thread may not wait for the return value"
+    return thread
+  end
+
+  ######################################
+
+  def set_cb_error(cmd = Proc.new)
+    @cb_error_proc[0] = cmd
+  end
+
+  def cb_error(e)
+    if @cb_error_proc[0].respond_to?(:call)
+      @cb_error_proc[0].call(e)
+    end
+  end
+
+  ######################################
+
+  def set_safe_level(safe)
+    if safe > @safe_level[0]
+      @safe_level[0] = safe
+      @cmd_queue.enq([@system, 'set_safe_level', safe])
+    end
+    @safe_level[0]
+  end
+  def safe_level=(safe)
+    set_safe_level(safe)
+  end
+  def self.set_safe_level(safe)
+    __getip.set_safe_level(safe)
+  end
+  def self.safe_level=(safe)
+    self.set_safe_level(safe)
+  end
+  def safe_level
+    @safe_level[0]
+  end
+  def self.safe_level
+    __getip.safe_level
+  end
+
+  def wait_on_mainloop?
+    @wait_on_mainloop[0]
+  end
+  def wait_on_mainloop=(bool)
+    @wait_on_mainloop[0] = bool
+  end
+
+  def running_mainloop?
+    @wait_on_mainloop[1] > 0
+  end
+
+  def _destroy_slaves_of_slaveIP(ip)
+    unless ip.deleted?
+      # ip._split_tklist(ip._invoke('interp', 'slaves')).each{|name|
+      ip._split_tklist(ip._invoke_without_enc('interp', 'slaves')).each{|name|
+        name = _fromUTF8(name)
+        begin
+          # ip._eval_without_enc("#{name} eval {foreach i [after info] {after cancel $i}}")
+          after_ids = ip._eval_without_enc("#{name} eval {after info}")
+          ip._eval_without_enc("#{name} eval {foreach i {#{after_ids}} {after cancel $i}}")
+        rescue Exception
+        end
+        begin
+          # ip._invoke('interp', 'eval', name, 'destroy', '.')
+          ip._invoke(name, 'eval', 'destroy', '.')
+        rescue Exception
+        end
+
+        # safe_base?
+        if ip._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+          begin
+            ip._eval_without_enc("::safe::interpDelete #{name}")
+          rescue Exception
+          end
+        end
+=begin
+        if ip._invoke('interp', 'exists', name) == '1'
+          begin
+            ip._invoke(name, 'eval', 'exit')
+          rescue Exception
+          end
+        end
+=end
+        unless ip.deleted?
+          if ip._invoke('interp', 'exists', name) == '1'
+            begin
+              ip._invoke('interp', 'delete', name)
+            rescue Exception
+            end
+          end
+        end
+      }
+    end
+  end
+
+  def _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+    begin
+      #ret = proc{$SAFE = safe_level; cmd.call(*args)}.call
+      #ret = cmd.call(safe_level, *args)
+      normal_ret = false
+      ret = catch(:IRB_EXIT) do  # IRB hack
+        retval = cmd.call(safe_level, *args)
+        normal_ret = true
+        retval
+      end
+      unless normal_ret
+        # catch IRB_EXIT
+        exit(ret)
+      end
+      ret
+    rescue SystemExit => e
+      # delete IP
+      unless @interp.deleted?
+        @slave_ip_tbl.each{|name, subip|
+          _destroy_slaves_of_slaveIP(subip)
+          begin
+            # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
+            after_ids = subip._eval_without_enc("after info")
+            subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+          rescue Exception
+          end
+=begin
+          begin
+            subip._invoke('destroy', '.') unless subip.deleted?
+          rescue Exception
+          end
+=end
+          # safe_base?
+          if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+            begin
+              @interp._eval_without_enc("::safe::interpDelete #{name}")
+            rescue Exception
+            else
+              next if subip.deleted?
+            end
+          end
+          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')
+            rescue Exception
+            end
+          else
+            begin
+              subip.delete unless subip.deleted?
+            rescue Exception
+            end
+          end
+        }
+
+        begin
+          # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
+          after_ids = @interp._eval_without_enc("after info")
+          @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+        rescue Exception
+        end
+        begin
+          @interp._invoke('destroy', '.') unless @interp.deleted?
+        rescue Exception
+        end
+        if @safe_base && !@interp.deleted?
+          # do 'exit' to call the delete_hook procedure
+          @interp._eval_without_enc('exit')
+        else
+          @interp.delete unless @interp.deleted?
+        end
+      end
+
+      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
+        _check_and_return(thread, MultiTkIp_OK.new($3 == 'exit'))
+      else
+        _check_and_return(thread, MultiTkIp_OK.new(nil))
+      end
+
+      # if master? && !safe? && allow_ruby_exit?
+      if !@interp.deleted? && master? && !safe? && allow_ruby_exit?
+=begin
+        ObjectSpace.each_object(TclTkIp){|obj|
+          obj.delete unless obj.deleted?
+        }
+=end
+        #exit(e.status)
+        fail e
+      end
+      # break
+
+    rescue SecurityError => e
+      # in 'exit', 'exit!', and 'abort' : security error --> delete IP
+      if e.backtrace[0] =~ /^(.+?):(\d+):in `(exit|exit!|abort)'/
+        ret = ($3 == 'exit')
+        unless @interp.deleted?
+          @slave_ip_tbl.each{|name, subip|
+            _destroy_slaves_of_slaveIP(subip)
+            begin
+              # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
+              after_ids = subip._eval_without_enc("after info")
+              subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+            rescue Exception
+            end
+=begin
+            begin
+              subip._invoke('destroy', '.') unless subip.deleted?
+            rescue Exception
+            end
+=end
+            # safe_base?
+            if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+              begin
+                @interp._eval_without_enc("::safe::interpDelete #{name}")
+              rescue Exception
+              else
+                next if subip.deleted?
+              end
+            end
+            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')
+              rescue Exception
+              end
+            else
+              begin
+                subip.delete unless subip.deleted?
+              rescue Exception
+              end
+            end
+          }
+
+          begin
+            # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
+            after_ids = @interp._eval_without_enc("after info")
+            @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+          rescue Exception
+          end
+=begin
+          begin
+            @interp._invoke('destroy', '.') unless @interp.deleted?
+          rescue Exception
+          end
+=end
+          if @safe_base && !@interp.deleted?
+            # do 'exit' to call the delete_hook procedure
+            @interp._eval_without_enc('exit')
+          else
+            @interp.delete unless @interp.deleted?
+          end
+        end
+        _check_and_return(thread, MultiTkIp_OK.new(ret))
+        # break
+
+      else
+        # raise security error
+        _check_and_return(thread, e)
+      end
+
+    rescue Exception => e
+      # raise exception
+      begin
+        bt = _toUTF8(e.backtrace.join("\n"))
+        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
+      begin
+        @interp._set_global_var('errorInfo', bt)
+      rescue Exception
+      end
+      _check_and_return(thread, e)
+
+    else
+      # no exception
+      _check_and_return(thread, MultiTkIp_OK.new(ret))
+    end
+  end
+
+  def _receiver_eval_proc(last_thread, safe_level, thread, cmd, *args)
+    if thread
+      Thread.new{
+        last_thread.join if last_thread
+        unless @interp.deleted?
+          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+        end
+      }
+    else
+      Thread.new{
+        unless  @interp.deleted?
+          _receiver_eval_proc_core(safe_level, thread, cmd, *args)
+        end
+      }
+      last_thread
+    end
+  end
+
+  private :_receiver_eval_proc, :_receiver_eval_proc_core
+
+  def _receiver_mainloop(check_root)
+    if @evloop_thread[0] && @evloop_thread[0].alive?
+      @evloop_thread[0]
+    else
+      @evloop_thread[0] = Thread.new{
+	while !@interp.deleted?
+	  #if check_root
+	  #  inf = @interp._invoke_without_enc('info', 'command', '.')
+	  #  break if !inf.kind_of?(String) || inf != '.'
+	  #end
+          break if check_root && !@interp.has_mainwindow?
+	  sleep 0.5
+	end
+      }
+      @evloop_thread[0]
+    end
+  end
+
+  def _create_receiver_and_watchdog(lvl = $SAFE)
+    lvl = $SAFE if lvl < $SAFE
+
+    # command-procedures receiver
+    receiver = Thread.new(lvl){|safe_level|
+      last_thread = {}
+
+      loop do
+        break if @interp.deleted?
+        thread, cmd, *args = @cmd_queue.deq
+        if thread == @system
+          # control command
+          case cmd
+          when 'set_safe_level'
+            begin
+              safe_level = args[0] if safe_level < args[0]
+            rescue Exception
+            end
+          when 'call_mainloop'
+            thread = args.shift
+            _check_and_return(thread,
+                              MultiTkIp_OK.new(_receiver_mainloop(*args)))
+          else
+            # ignore
+          end
+
+        else
+          # procedure
+          last_thread[thread] = _receiver_eval_proc(last_thread[thread],
+						    safe_level, thread,
+						    cmd, *args)
+        end
+      end
+    }
+
+    # watchdog of receiver
+    watchdog = Thread.new{
+      begin
+        loop do
+          sleep 1
+          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.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,
+              'the interpreter no longer receives command procedures'
+          end
+        end
+      end
+    }
+
+    # return threads
+    [receiver, watchdog]
+  end
+  private :_check_and_return, :_create_receiver_and_watchdog
+
+  ######################################
+
+  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
+    name = nil
+  end
+  if self.const_defined?(:DEFAULT_MASTER_OPTS) &&
+      DEFAULT_MASTER_OPTS.kind_of?(Hash)
+    keys = DEFAULT_MASTER_OPTS
+  else
+    keys = {}
+  end
+
+  @@DEFAULT_MASTER = self.allocate
+  @@DEFAULT_MASTER.instance_eval{
+    @tk_windows = TkUtil.untrust({})
+
+    @tk_table_list = TkUtil.untrust([])
+
+    @slave_ip_tbl = TkUtil.untrust({})
+
+    @slave_ip_top = TkUtil.untrust({})
+
+    @evloop_thread = TkUtil.untrust([])
+
+    unless keys.kind_of? Hash
+      fail ArgumentError, "expecting a Hash object for the 2nd argument"
+    end
+
+    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 = TkUtil.untrust([])
+
+    @system = Object.new
+
+    @wait_on_mainloop = TkUtil.untrust([true, 0])
+
+    @threadgroup  = Thread.current.group
+
+    @safe_base = false
+
+    @safe_level = [$SAFE]
+
+    @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
+
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
+
+    @threadgroup.add @cmd_receiver
+    @threadgroup.add @receiver_watchdog
+
+    # NOT enclose @threadgroup for @@DEFAULT_MASTER
+
+    @@IP_TABLE[ThreadGroup::Default] = self
+    @@IP_TABLE[@threadgroup] = self
+
+    #################################
+
+    @pseudo_toplevel = [false, nil]
+
+    def self.__pseudo_toplevel
+      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 &&
+                MultiTkIp.__getip == @@DEFAULT_MASTER)
+        fail SecurityError, "no permission to manipulate"
+      end
+
+      # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+      if m.respond_to?(:pseudo_toplevel_evaluable?)
+        @pseudo_toplevel[0] = true
+        @pseudo_toplevel[1] = m
+      else
+        fail ArgumentError, 'fail to set pseudo-toplevel'
+      end
+      self
+    end
+
+    def self.__pseudo_toplevel_evaluable?
+      begin
+        @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
+      rescue Exception
+        false
+      end
+    end
+
+    def self.__pseudo_toplevel_evaluable=(mode)
+      unless (Thread.current.group == ThreadGroup::Default &&
+                MultiTkIp.__getip == @@DEFAULT_MASTER)
+        fail SecurityError, "no permission to manipulate"
+      end
+
+      @pseudo_toplevel[0] = (mode)? true: false
+    end
+
+    #################################
+
+    @assign_request = Class.new(Exception){
+      def self.new(target, ret)
+        obj = super()
+        obj.target = target
+        obj.ret = ret
+        obj
+      end
+      attr_accessor :target, :ret
+    }
+
+    @assign_thread = Thread.new{
+      loop do
+        begin
+          Thread.stop
+        rescue @assign_request=>req
+          begin
+            req.ret[0] = req.target.instance_eval{
+              @cmd_receiver, @receiver_watchdog =
+                _create_receiver_and_watchdog(@safe_level[0])
+              @threadgroup.add @cmd_receiver
+              @threadgroup.add @receiver_watchdog
+              @threadgroup.enclose
+              true
+            }
+          rescue Exception=>e
+            begin
+              req.ret[0] = e
+            rescue Exception
+              # ignore
+            end
+          end
+        rescue Exception
+          # ignore
+        end
+      end
+    }
+
+    def self.assign_receiver_and_watchdog(target)
+      ret = [nil]
+      @assign_thread.raise(@assign_request.new(target, ret))
+      while ret[0] == nil
+        unless @assign_thread.alive?
+          raise RuntimeError, 'lost the thread to assign a receiver and a watchdog thread'
+        end
+      end
+      if ret[0].kind_of?(Exception)
+        raise ret[0]
+      else
+        ret[0]
+      end
+    end
+
+    #################################
+
+    @init_ip_env_queue = Queue.new
+    Thread.new{
+      current = Thread.current
+      loop {
+        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.synchronize{ cond.signal }
+        end
+        mtx = cond = ret = table = script = nil  # clear variables for GC
+      }
+    }
+
+    def self.__init_ip_env__(table, script)
+      ret = []
+      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
+        ret[0]
+      end
+    end
+
+    #################################
+
+    class << self
+      undef :instance_eval
+    end
+  }
+
+  @@DEFAULT_MASTER.freeze # defend against modification
+
+  ######################################
+
+  def self.inherited(subclass)
+    # trust if on ThreadGroup::Default or @@DEFAULT_MASTER's ThreadGroup
+    if @@IP_TABLE[Thread.current.group] == @@DEFAULT_MASTER
+      begin
+        class << subclass
+          self.methods.each{|m|
+            name = m.to_s
+            begin
+              unless name == '__id__' || name == '__send__' || name == 'freeze'
+                undef_method(m)
+              end
+            rescue Exception
+              # ignore all exceptions
+            end
+          }
+        end
+      ensure
+        subclass.freeze
+        fail SecurityError,
+          "cannot create subclass of MultiTkIp on a untrusted ThreadGroup"
+      end
+    end
+  end
+
+  ######################################
+
+  @@SAFE_OPT_LIST = [
+    'accessPath'.freeze,
+    'statics'.freeze,
+    'nested'.freeze,
+    'deleteHook'.freeze
+  ].freeze
+
+  def _parse_slaveopts(keys)
+    name = nil
+    safe = false
+    safe_opts = {}
+    tk_opts   = {}
+
+    keys.each{|k,v|
+      k_str = k.to_s
+      if k_str == 'name'
+        name = v
+      elsif k_str == 'safe'
+        safe = v
+      elsif @@SAFE_OPT_LIST.member?(k_str)
+        safe_opts[k_str] = v
+      else
+        tk_opts[k_str] = v
+      end
+    }
+
+    if keys['without_tk'] || keys[:without_tk]
+      [name, safe, safe_opts, nil]
+    else
+      [name, safe, safe_opts, tk_opts]
+    end
+  end
+  private :_parse_slaveopts
+
+  def _create_slave_ip_name
+    @@SLAVE_IP_ID.mutex.synchronize{
+      name = @@SLAVE_IP_ID.join('')
+      @@SLAVE_IP_ID[1].succ!
+      name.freeze
+    }
+  end
+  private :_create_slave_ip_name
+
+  ######################################
+
+  def __check_safetk_optkeys(optkeys)
+    # based on 'safetk.tcl'
+    new_keys = {}
+    optkeys.each{|k,v| new_keys[k.to_s] = v}
+
+    # check 'display'
+    if !new_keys.key?('display')
+      begin
+        #new_keys['display'] = @interp._invoke('winfo screen .')
+        new_keys['display'] = @interp._invoke('winfo', 'screen', '.')
+      rescue
+        if ENV[DISPLAY]
+          new_keys['display'] = ENV[DISPLAY]
+        elsif !new_keys.key?('use')
+          warn "Warning: no screen info or ENV[DISPLAY], so use ':0.0'"
+          new_keys['display'] = ':0.0'
+        end
+      end
+    end
+
+    # check 'use'
+    if new_keys.key?('use')
+      # given 'use'
+      case new_keys['use']
+      when TkWindow
+        new_keys['use'] = TkWinfo.id(new_keys['use'])
+        #assoc_display = @interp._eval('winfo screen .')
+        assoc_display = @interp._invoke('winfo', 'screen', '.')
+      when /^\..*/
+        new_keys['use'] = @interp._invoke('winfo', 'id', new_keys['use'])
+        assoc_display = @interp._invoke('winfo', 'screen', new_keys['use'])
+      else
+        begin
+          pathname = @interp._invoke('winfo', 'pathname', new_keys['use'])
+          assoc_display = @interp._invoke('winfo', 'screen', pathname)
+        rescue
+          assoc_display = new_keys['display']
+        end
+      end
+
+      # match display?
+      if assoc_display != new_keys['display']
+        if optkeys.key?(:display) || optkeys.key?('display')
+          fail RuntimeError,
+            "conflicting 'display'=>#{new_keys['display']} " +
+            "and display '#{assoc_display}' on 'use'=>#{new_keys['use']}"
+        else
+          new_keys['display'] = assoc_display
+        end
+      end
+    end
+
+    # return
+    new_keys
+  end
+  private :__check_safetk_optkeys
+
+  def __create_safetk_frame(slave_ip, slave_name, app_name, keys)
+    # display option is used by ::safe::loadTk
+    loadTk_keys = {}
+    loadTk_keys['display'] = keys['display']
+    dup_keys = keys.dup
+
+    # keys for toplevel : allow followings
+    toplevel_keys = {}
+    ['height', 'width', 'background', 'menu'].each{|k|
+      toplevel_keys[k] = dup_keys.delete(k) if dup_keys.key?(k)
+    }
+    toplevel_keys['classname'] = 'SafeTk'
+    toplevel_keys['screen'] = dup_keys.delete('display')
+
+    # other keys used by pack option of container frame
+
+    # create toplevel widget
+    begin
+      top = TkToplevel.new(toplevel_keys)
+    rescue NameError => e
+      fail e unless @interp.safe?
+      fail SecurityError, "unable create toplevel on the safe interpreter"
+    end
+    msg = "Untrusted Ruby/Tk applet (#{slave_name})"
+    if app_name.kind_of?(String)
+      top.title "#{app_name} (#{slave_name})"
+    else
+      top.title msg
+    end
+
+    # procedure to delete slave interpreter
+    slave_delete_proc = proc{
+      unless slave_ip.deleted?
+        #if slave_ip._invoke('info', 'command', '.') != ""
+        #  slave_ip._invoke('destroy', '.')
+        #end
+        #slave_ip.delete
+        slave_ip._eval_without_enc('exit')
+      end
+      begin
+        top.destroy if top.winfo_exist?
+      rescue
+        # ignore
+      end
+    }
+    tag = TkBindTag.new.bind('Destroy', slave_delete_proc)
+
+    top.bindtags = top.bindtags.unshift(tag)
+
+    # create control frame
+    TkFrame.new(top, :bg=>'red', :borderwidth=>3, :relief=>'ridge') {|fc|
+      fc.bindtags = fc.bindtags.unshift(tag)
+
+      TkFrame.new(fc, :bd=>0){|f|
+        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,
+                  :anchor=>:w).pack(:side=>:left, :fill=>:both, :expand=>true)
+
+      fc.pack(:side=>:bottom, :fill=>:x)
+    }
+
+    # container frame for slave interpreter
+    dup_keys['fill'] = :both  unless dup_keys.key?('fill')
+    dup_keys['expand'] = true unless dup_keys.key?('expand')
+    c = TkFrame.new(top, :container=>true).pack(dup_keys)
+    c.bind('Destroy', proc{top.destroy})
+
+    # return keys
+    loadTk_keys['use'] = TkWinfo.id(c)
+    [loadTk_keys, top.path]
+  end
+  private :__create_safetk_frame
+
+  def __create_safe_slave_obj(safe_opts, app_name, tk_opts)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    # 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
+    end
+
+    @interp._eval("::safe::interpInit #{ip_name}")
+
+    slave_ip._invoke('set', 'argv0', app_name) if app_name.kind_of?(String)
+
+    if tk_opts
+      tk_opts = __check_safetk_optkeys(tk_opts)
+      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)
+        @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} " +
+                    _keys2opts(safe_opts))
+    else
+      @interp._eval("::safe::interpConfigure #{ip_name} " +
+                    _keys2opts(safe_opts) + '-deleteHook {' +
+                    TkComm._get_eval_string(proc{|slave|
+                                              self._default_delete_hook(slave)
+                                            }) + '}')
+    end
+
+    [slave_ip, ip_name]
+  end
+
+  def __create_trusted_slave_obj(name, keys)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    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
+
+  ######################################
+
+  def _create_slave_object(keys={})
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    ip = MultiTkIp.new_slave(self, keys={})
+    @slave_ip_tbl[ip.name] = ip
+  end
+
+  ######################################
+
+  def initialize(master, safeip=true, keys={})
+    if $SAFE >= 4
+      fail SecurityError, "cannot create a new interpreter at level #{$SAFE}"
+    end
+
+    if safeip == nil && $SAFE >= 2
+      fail SecurityError, "cannot create a master-ip at level #{$SAFE}"
+    end
+
+    if master.deleted? && safeip == nil
+      fail RuntimeError, "cannot create a slave of a deleted interpreter"
+    end
+
+    if !master.deleted? && !master.master? && master.safe?
+      fail SecurityError, "safe-slave-ip cannot create a new interpreter"
+    end
+
+    if safeip == nil && !master.master?
+      fail SecurityError, "slave-ip cannot create a master-ip"
+    end
+
+    unless keys.kind_of? Hash
+      fail ArgumentError, "expecting a Hash object for the 2nd argument"
+    end
+
+    @tk_windows = {}
+    @tk_table_list = []
+    @slave_ip_tbl = {}
+    @slave_ip_top = {}
+    @cb_error_proc = []
+    @evloop_thread = []
+
+    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 = []
+
+    name, safe, safe_opts, tk_opts = _parse_slaveopts(keys)
+
+    safe = 4 if safe && !safe.kind_of?(Fixnum)
+
+    @safe_base = false
+
+    if safeip == nil
+      # create master-ip
+      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,
+                                                           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]
+        else
+          @safe_level = [4]
+        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]
+        else
+          @safe_level = [master.safe_level]
+        end
+      end
+      @set_alias_proc = proc{|name|
+        master._invoke('interp', 'alias', @ip_name, name, '', name)
+      }.freeze
+    end
+
+    @system = Object.new
+
+    @wait_on_mainloop = TkUtil.untrust([true, 0])
+    # @wait_on_mainloop = TkUtil.untrust([false, 0])
+
+    @threadgroup  = ThreadGroup.new
+
+    @pseudo_toplevel = [false, nil]
+
+    @cmd_queue = MultiTkIp::Command_Queue.new(@interp)
+
+=begin
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog(@safe_level[0])
+
+    @threadgroup.add @cmd_receiver
+    @threadgroup.add @receiver_watchdog
+
+    @threadgroup.enclose
+=end
+    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
+
+    @@IP_TABLE[@threadgroup] = self
+    @@TK_TABLE_LIST.size.times{
+      @tk_table_list << TkUtil.untrust({})
+    }
+    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
+
+    class << self
+      undef :instance_eval
+    end
+
+    # dummy call for initialization
+    self.eval_proc{ Tk.tk_call('set', 'tcl_patchLevel') }
+
+    self.freeze  # defend against modification
+  end
+
+  ######################################
+
+  def _default_delete_hook(slave)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @slave_ip_tbl.delete(slave)
+    top = @slave_ip_top.delete(slave)
+    if top.kind_of?(String)
+      # call default hook of safetk.tcl (ignore exceptions)
+      if top == ''
+        begin
+          @interp._eval("::safe::disallowTk #{slave}")
+        rescue
+          warn("Waring: fail to call '::safe::disallowTk'") if $DEBUG
+        end
+      else # toplevel path
+        begin
+          @interp._eval("::safe::tkDelete {} #{top} #{slave}")
+        rescue
+          warn("Waring: fail to call '::safe::tkDelete'") if $DEBUG
+          begin
+            @interp._eval("destroy #{top}")
+          rescue
+            warn("Waring: fail to destroy toplevel") if $DEBUG
+          end
+        end
+      end
+    end
+  end
+
+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
+  def _ip_id_
+    # for RemoteTkIp
+    ''
+  end
+
+  def self.__getip
+    current = Thread.current
+    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,
+          "cannot call Tk methods on #{Thread.current.inspect}"
+      end
+      ip
+    end
+  end
+end
+
+
+# aliases of constructor
+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
+
+    if safe.kind_of?(Hash)
+      keys = safe
+    elsif safe.kind_of?(Integer)
+      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
+      if !keys.key?(:safe) && !keys.key?('safe')
+        keys[:safe] = safe
+      end
+    elsif safe == nil
+      # do nothing
+    else
+      raise ArgumentError, "unexpected argument(s)"
+    end
+
+    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)}
+      #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={}, &blk)
+    if safe.kind_of?(Hash)
+      keys = safe
+    elsif safe.kind_of?(Integer)
+      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
+      if !keys.key?(:safe) && !keys.key?('safe')
+        keys[:safe] = safe
+      end
+    elsif safe == nil
+      # do nothing
+    else
+      raise ArgumentError, "unexpected argument(s)"
+    end
+
+    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; 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={}, &blk)
+    if safe.kind_of?(Hash)
+      keys = safe
+    elsif safe.kind_of?(Integer)
+      raise ArgumentError, "unexpected argument(s)" unless keys.kind_of?(Hash)
+      if !keys.key?(:safe) && !keys.key?('safe')
+        keys[:safe] = safe
+      end
+    else
+      raise ArgumentError, "unexpected argument(s)"
+    end
+
+    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; yield}.call)}
+      ip._proc_on_safelevel(&blk).call(ip.safe_level)
+    end
+    ip
+  end
+  alias new_safeTk new_safe_slave
+end
+
+
+# get info
+class MultiTkIp
+  def inspect
+    s = self.to_s.chop!
+    if self.manipulable?
+      if master?
+        if @interp.deleted?
+          s << ':deleted-master'
+        else
+          s << ':master'
+        end
+      else
+        if @interp.deleted?
+          s << ':deleted-slave'
+        elsif @interp.safe?
+          s << ':safe-slave'
+        else
+          s << ':trusted-slave'
+        end
+      end
+    end
+    s << '>'
+  end
+
+  def master?
+    if @ip_name
+      false
+    else
+      true
+    end
+  end
+  def self.master?
+    __getip.master?
+  end
+
+  def slave?
+    not master?
+  end
+  def self.slave?
+    not self.master?
+  end
+
+  def alive?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    begin
+      return false unless @cmd_receiver.alive?
+      return false if @interp.deleted?
+      return false if @interp._invoke('interp', 'exists', '') == '0'
+    rescue Exception
+      return false
+    end
+    true
+  end
+  def self.alive?
+    __getip.alive?
+  end
+
+  def path
+    @ip_name || ''
+  end
+  def self.path
+    __getip.path
+  end
+  def ip_name
+    @ip_name || ''
+  end
+  def self.ip_name
+    __getip.ip_name
+  end
+  def to_eval
+    @ip_name || ''
+  end
+  def self.to_eval
+    __getip.to_eval
+  end
+
+  def slaves(all = false)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp','slaves').split.map!{|name|
+      if @slave_ip_tbl.key?(name)
+        @slave_ip_tbl[name]
+      elsif all
+        name
+      else
+        nil
+      end
+    }.compact!
+  end
+  def self.slaves(all = false)
+    __getip.slaves(all)
+  end
+
+  def manipulable?
+    return true if (Thread.current.group == ThreadGroup::Default)
+    ip = MultiTkIp.__getip
+    (ip == self) || ip._is_master_of?(@interp)
+  end
+  def self.manipulable?
+    true
+  end
+
+  def _is_master_of?(tcltkip_obj)
+    tcltkip_obj.slave_of?(@interp)
+  end
+  protected :_is_master_of?
+end
+
+
+# instance methods to treat tables
+class MultiTkIp
+  def _tk_cmd_tbl
+    tbl = {}
+    MultiTkIp.tk_cmd_tbl.each{|id, ent| tbl[id] = ent if ent.ip == self }
+    tbl
+  end
+
+  def _tk_windows
+    @tk_windows
+  end
+
+  def _tk_table_list
+    @tk_table_list
+  end
+
+  def _add_new_tables
+    (@@TK_TABLE_LIST.size - @tk_table_list.size).times{
+      @tk_table_list << TkUtil.untrust({})
+    }
+  end
+
+  def _init_ip_env(script)
+    self.eval_proc{script.call(self)}
+  end
+
+  def _add_tk_procs(name, args, body)
+    return if slave?
+    @interp._invoke('proc', name, args, body) if args && body
+    @interp._invoke('interp', 'slaves').split.each{|slave|
+      @interp._invoke('interp', 'alias', slave, name, '', name)
+    }
+  end
+
+  def _remove_tk_procs(*names)
+    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
+      }
+    }
+  end
+
+  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|
+      if master?
+        @interp._invoke('proc', name, args, body) if args && body
+      else
+        @set_alias_proc.call(name)
+      end
+    }
+  end
+end
+
+
+# class methods to treat tables
+class MultiTkIp
+  def self.tk_cmd_tbl
+    @@TK_CMD_TBL
+  end
+  def self.tk_windows
+    __getip._tk_windows
+  end
+  def self.tk_object_table(id)
+    __getip._tk_table_list[id]
+  end
+  def self.create_table
+    if __getip.slave?
+      begin
+        raise SecurityError, "slave-IP has no permission creating a new table"
+      rescue SecurityError => e
+        #p e.backtrace
+        # Is called on a Ruby/Tk library?
+        caller_info = e.backtrace[1]
+        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
+          # Probably, caller is a Ruby/Tk library  -->  allow creating
+        else
+          raise e
+        end
+      end
+    end
+
+    id = @@TK_TABLE_LIST.size
+    obj = Object.new
+    @@TK_TABLE_LIST << obj
+    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)
+      end
+    }
+    obj.freeze
+    @@IP_TABLE.each{|tg, ip| ip._add_new_tables }
+    return obj
+  end
+
+  def self.init_ip_env(script = Proc.new)
+    @@INIT_IP_ENV << script
+    if __getip.slave?
+      begin
+        raise SecurityError, "slave-IP has no permission initializing IP env"
+      rescue SecurityError => e
+        #p e.backtrace
+        # Is called on a Ruby/Tk library?
+        caller_info = e.backtrace[1]
+        if caller_info =~ %r{^#{MultiTkIp::BASE_DIR}/(tk|tkextlib)/[^:]+\.rb:}
+          # Probably, caller is a Ruby/Tk library  -->  allow creating
+        else
+          raise e
+        end
+      end
+    end
+
+    # @@IP_TABLE.each{|tg, ip|
+    #   ip._init_ip_env(script)
+    # }
+    @@DEFAULT_MASTER.__init_ip_env__(@@IP_TABLE, script)
+  end
+
+  def self.add_tk_procs(name, args=nil, body=nil)
+    if name.kind_of?(Array) # => an array of [name, args, body]
+      name.each{|param| self.add_tk_procs(*param)}
+    else
+      name = name.to_s
+      @@ADD_TK_PROCS << [name, args, body]
+      @@IP_TABLE.each{|tg, ip|
+        ip._add_tk_procs(name, args, body)
+      }
+    end
+  end
+
+  def self.remove_tk_procs(*names)
+    names.each{|name|
+      name = name.to_s
+      @@ADD_TK_PROCS.delete_if{|elem|
+        elem.kind_of?(Array) && elem[0].to_s == name
+      }
+    }
+    @@IP_TABLE.each{|tg, ip|
+      ip._remove_tk_procs(*names)
+    }
+  end
+
+  def self.init_ip_internal
+    __getip._init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
+  end
+end
+
+# for callback operation
+class MultiTkIp
+  def self.cb_entry_class
+    @@CB_ENTRY_CLASS
+  end
+  def self.get_cb_entry(cmd)
+    @@CB_ENTRY_CLASS.new(__getip, cmd).freeze
+  end
+
+=begin
+  def cb_eval(cmd, *args)
+    #self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
+    #ret = self.eval_callback{ TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *args)) }
+    ret = self.eval_callback(*args){|safe, *params|
+      $SAFE=safe if $SAFE < safe
+      TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
+    }
+    if ret.kind_of?(Exception)
+      raise ret
+    end
+    ret
+  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
+    @callback_status[1] ||= TkVariable.new
+    st, val = @callback_status
+    th = Thread.new{
+      self.eval_callback(*args){|safe, *params|
+        #p [status, val, safe, *params]
+        $SAFE=safe if $SAFE < safe
+        begin
+          TkComm._get_eval_string(TkUtil.eval_cmd(cmd, *params))
+        rescue TkCallbackContinue
+          st.value = 4
+        rescue TkCallbackBreak
+          st.value = 3
+        rescue TkCallbackReturn
+          st.value = 2
+        rescue Exception => e
+          val.value = e.message
+          st.value = 1
+        else
+          st.value = 0
+        end
+      }
+    }
+    begin
+      st.wait
+      status = st.numeric
+      retval = val.value
+    rescue => e
+      fail e
+    end
+
+    if status == 1
+      fail RuntimeError, retval
+    elsif status == 2
+      fail TkCallbackReturn, "Tk callback returns 'return' status"
+    elsif status == 3
+      fail TkCallbackBreak, "Tk callback returns 'break' status"
+    elsif status == 4
+      fail TkCallbackContinue, "Tk callback returns 'continue' status"
+    else
+      ''
+    end
+  end
+=end
+
+end
+
+# pseudo-toplevel operation support
+class MultiTkIp
+  # instance method
+  def __pseudo_toplevel
+    ip = MultiTkIp.__getip
+    (ip == @@DEFAULT_MASTER || ip == self) &&
+      self.__pseudo_toplevel_evaluable? && @pseudo_toplevel[1]
+  end
+
+  def __pseudo_toplevel=(m)
+    unless (Thread.current.group == ThreadGroup::Default &&
+              MultiTkIp.__getip == @@DEFAULT_MASTER)
+      fail SecurityError, "no permission to manipulate"
+    end
+
+    # if m.kind_of?(Module) && m.respond_to?(:pseudo_toplevel_evaluable?)
+    if m.respond_to?(:pseudo_toplevel_evaluable?)
+      @pseudo_toplevel[0] = true
+      @pseudo_toplevel[1] = m
+    else
+      fail ArgumentError, 'fail to set pseudo-toplevel'
+    end
+    self
+  end
+
+  def __pseudo_toplevel_evaluable?
+    begin
+      @pseudo_toplevel[0] && @pseudo_toplevel[1].pseudo_toplevel_evaluable?
+    rescue Exception
+      false
+    end
+  end
+
+  def __pseudo_toplevel_evaluable=(mode)
+    unless (Thread.current.group == ThreadGroup::Default &&
+              MultiTkIp.__getip == @@DEFAULT_MASTER)
+      fail SecurityError, "no permission to manipulate"
+    end
+
+    @pseudo_toplevel[0] = (mode)? true: false
+  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) # 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
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    unless cmd.kind_of?(Proc) || cmd.kind_of?(Method)
+      raise RuntimeError, "A Proc/Method object is expected for the 'cmd' argument"
+    end
+
+    # on IP thread
+    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: "+ e.inspect + " on " + self.inspect) if $DEBUG
+        begin
+          self._eval_without_enc('exit')
+        rescue Exception => e
+        end
+        self.delete
+        ret = nil
+      rescue Exception => e
+        if $DEBUG
+          warn("Warning: " + e.class.inspect +
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +
+               " on " + self.inspect)
+        end
+=begin
+        begin
+          bt = _toUTF8(e.backtrace.join("\n"))
+          bt.instance_variable_set(:@encoding, 'utf-8')
+        rescue Exception
+          bt = e.backtrace.join("\n")
+        end
+        begin
+          @interp._set_global_var('errorInfo', bt)
+        rescue Exception
+        end
+=end
+        ret = e
+      end
+      return ret
+    end
+
+    # send cmd to the proc-queue
+    unless req_val
+      begin
+        @cmd_queue.enq([nil, cmd, *args])
+      rescue Exception => e
+        # ignore
+        if $DEBUG
+          warn("Warning: " + e.class.inspect +
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +
+               " on " + self.inspect)
+        end
+        return e
+      end
+      return nil
+    end
+
+    # send and get return value by exception
+    begin
+      @cmd_queue.enq([Thread.current, cmd, *args])
+      Thread.stop
+    rescue MultiTkIp_OK => ret
+      # return value
+      return ret.value
+    rescue SystemExit => e
+      # exit IP
+      warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
+      begin
+        self._eval_without_enc('exit')
+      rescue Exception
+      end
+      if !self.deleted? && !safe? && allow_ruby_exit?
+        self.delete
+        fail e
+      else
+        self.delete
+      end
+    rescue Exception => e
+      if $DEBUG
+        warn("Warning: " + e.class.inspect +
+             ((e.message.length > 0)? ' "' + e.message + '"': '') +
+             " on " + self.inspect)
+      end
+      return e
+    end
+    return nil
+  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
+    begin
+      eval_proc_core(false, cmd, *args)
+    rescue Exception=>e
+      e
+    ensure
+    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,
+    # use arguments of eval_proc method. They are passed to block-arguments.
+    if block_given?
+      cmd = Proc.new
+    else
+      unless (cmd = args.shift)
+        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
+      end
+    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,
+	               proc{|safe, *params|
+		         $SAFE=safe if $SAFE < safe
+                         cmd.call(*params)
+                       }, *args)
+      ensure
+        current[:callback_ip] = backup_ip
+      end
+    else
+      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)
+    if block_given?
+      cmd = Proc.new
+    else
+      unless (cmd = args.shift)
+        fail ArgumentError, "A Proc or Method object is expected for 1st argument"
+      end
+    end
+    Thread.new{
+      eval_proc(cmd, *args)
+=begin
+      eval_proc_core(false,
+                     proc{|safe, *params|
+                       $SAFE=safe if $SAFE < safe
+                       Thread.new(*params, &cmd).value
+                     },
+                     safe_level, *args)
+=end
+    }
+  end
+  alias background_eval_proc bg_eval_proc
+  alias thread_eval_proc bg_eval_proc
+  alias bg_call bg_eval_proc
+  alias background_call bg_eval_proc
+
+  def eval_string(cmd, *eval_args)
+    # cmd string ==> proc
+    unless cmd.kind_of?(String)
+      raise RuntimeError, "A String object is expected for the 'cmd' argument"
+    end
+
+    eval_proc_core(true,
+                   proc{|safe|
+                     Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                 *eval_args)
+                   })
+  end
+  alias eval_str eval_string
+
+  def bg_eval_string(cmd, *eval_args)
+    # cmd string ==> proc
+    unless cmd.kind_of?(String)
+      raise RuntimeError, "A String object is expected for the 'cmd' argument"
+    end
+    Thread.new{
+      eval_proc_core(true,
+                     proc{|safe|
+                       Kernel.eval("$SAFE=#{safe} if $SAFE < #{safe};" << cmd,
+                                   *eval_args)
+                     })
+    }
+  end
+  alias background_eval_string bg_eval_string
+  alias bg_eval_str bg_eval_string
+  alias background_eval_str bg_eval_string
+
+  def eval(*args, &blk)
+    if block_given?
+      eval_proc(*args, &blk)
+    elsif args[0]
+      if args[0].respond_to?(:call)
+        eval_proc(*args)
+      else
+        eval_string(*args)
+      end
+    else
+      fail ArgumentError, "no argument to eval"
+    end
+  end
+
+  def bg_eval(*args, &blk)
+    if block_given?
+      bg_eval_proc(*args, &blk)
+    elsif args[0]
+      if args[0].respond_to?(:call)
+        bg_eval_proc(*args)
+      else
+        bg_eval_string(*args)
+      end
+    else
+      fail ArgumentError, "no argument to eval"
+    end
+  end
+  alias background_eval bg_eval
+end
+
+class << MultiTkIp
+  # class method
+  def eval_proc(*args, &blk)
+    # class ==> interp object
+    __getip.eval_proc(*args, &blk)
+  end
+  alias call eval_proc
+
+  def bg_eval_proc(*args, &blk)
+    # class ==> interp object
+    __getip.bg_eval_proc(*args, &blk)
+  end
+  alias background_eval_proc bg_eval_proc
+  alias thread_eval_proc bg_eval_proc
+  alias bg_call bg_eval_proc
+  alias background_call bg_eval_proc
+
+  def eval_string(cmd, *eval_args)
+    # class ==> interp object
+    __getip.eval_string(cmd, *eval_args)
+  end
+  alias eval_str eval_string
+
+  def bg_eval_string(cmd, *eval_args)
+    # class ==> interp object
+    __getip.bg_eval_string(cmd, *eval_args)
+  end
+  alias background_eval_string bg_eval_string
+  alias bg_eval_str bg_eval_string
+  alias background_eval_str bg_eval_string
+
+  def eval(*args, &blk)
+    # class ==> interp object
+    __getip.eval(*args, &blk)
+  end
+  def bg_eval(*args, &blk)
+    # class ==> interp object
+    __getip.bg_eval(*args, &blk)
+  end
+  alias background_eval bg_eval
+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)
+  end
+  def mainloop_watchdog(check_root = true)
+    __getip.mainloop_watchdog(check_root)
+  end
+  def do_one_event(flag = TclTkLib::EventFlag::ALL)
+    __getip.do_one_event(flag)
+  end
+  def mainloop_abort_on_exception
+    # __getip.mainloop_abort_on_exception
+    TclTkLib.mainloop_abort_on_exception
+  end
+  def mainloop_abort_on_exception=(mode)
+    # __getip.mainloop_abort_on_exception=(mode)
+    TclTkLib.mainloop_abort_on_exception=(mode)
+  end
+  def set_eventloop_tick(tick)
+    __getip.set_eventloop_tick(tick)
+  end
+  def get_eventloop_tick
+    __getip.get_eventloop_tick
+  end
+  def set_no_event_wait(tick)
+    __getip.set_no_event_wait(tick)
+  end
+  def get_no_event_wait
+    __getip.get_no_event_wait
+  end
+  def set_eventloop_weight(loop_max, no_event_tick)
+    __getip.set_eventloop_weight(loop_max, no_event_tick)
+  end
+  def get_eventloop_weight
+    __getip.get_eventloop_weight
+  end
+end
+
+# class methods to delegate to TclTkIp
+class << MultiTkIp
+  def method_missing(id, *args)
+    __getip.__send__(id, *args)
+  end
+
+  def make_safe
+    __getip.make_safe
+  end
+
+  def safe?
+    __getip.safe?
+  end
+
+  def safe_base?
+    begin
+      __getip.safe_base?
+    rescue
+      false
+    end
+  end
+
+  def allow_ruby_exit?
+    __getip.allow_ruby_exit?
+  end
+
+  def allow_ruby_exit= (mode)
+    __getip.allow_ruby_exit = mode
+  end
+
+  def delete
+    __getip.delete
+  end
+
+  def deleted?
+    __getip.deleted?
+  end
+
+  def has_mainwindow?
+    __getip.has_mainwindow?
+  end
+
+  def invalid_namespace?
+    __getip.invalid_namespace?
+  end
+
+  def abort(msg = nil)
+    __getip.abort(msg)
+  end
+
+  def exit(st = true)
+    __getip.exit(st)
+  end
+
+  def exit!(st = false)
+    __getip.exit!(st)
+  end
+
+  def restart(app_name = nil, keys = {})
+    init_ip_internal
+
+    __getip._invoke('set', 'argv0', app_name) if app_name
+    if keys.kind_of?(Hash)
+      __getip._invoke('set', 'argv', _keys2opts(keys))
+    end
+
+    __getip.restart
+  end
+
+  def _eval(str)
+    __getip._eval(str)
+  end
+
+  def _invoke(*args)
+    __getip._invoke(*args)
+  end
+
+  def _eval_without_enc(str)
+    __getip._eval_without_enc(str)
+  end
+
+  def _invoke_without_enc(*args)
+    __getip._invoke_without_enc(*args)
+  end
+
+  def _eval_with_enc(str)
+    __getip._eval_with_enc(str)
+  end
+
+  def _invoke_with_enc(*args)
+    __getip._invoke_with_enc(*args)
+  end
+
+  def _toUTF8(str, encoding=nil)
+    __getip._toUTF8(str, encoding)
+  end
+
+  def _fromUTF8(str, encoding=nil)
+    __getip._fromUTF8(str, encoding)
+  end
+
+  def _thread_vwait(var)
+    __getip._thread_vwait(var)
+  end
+
+  def _thread_tkwait(mode, target)
+    __getip._thread_tkwait(mode, target)
+  end
+
+  def _return_value
+    __getip._return_value
+  end
+
+  def _get_variable(var, flag)
+    __getip._get_variable(var, flag)
+  end
+  def _get_variable2(var, idx, flag)
+    __getip._get_variable2(var, idx, flag)
+  end
+  def _set_variable(var, value, flag)
+    __getip._set_variable(var, value, flag)
+  end
+  def _set_variable2(var, idx, value, flag)
+    __getip._set_variable2(var, idx, value, flag)
+  end
+  def _unset_variable(var, flag)
+    __getip._unset_variable(var, flag)
+  end
+  def _unset_variable2(var, idx, flag)
+    __getip._unset_variable2(var, idx, flag)
+  end
+
+  def _get_global_var(var)
+    __getip._get_global_var(var)
+  end
+  def _get_global_var2(var, idx)
+    __getip._get_global_var2(var, idx)
+  end
+  def _set_global_var(var, value)
+    __getip._set_global_var(var, value)
+  end
+  def _set_global_var2(var, idx, value)
+    __getip._set_global_var2(var, idx, value)
+  end
+  def _unset_global_var(var)
+    __getip._unset_global_var(var)
+  end
+  def _unset_global_var2(var, idx)
+    __getip._unset_global_var2(var, idx)
+  end
+
+  def _make_menu_embeddable(menu_path)
+    __getip._make_menu_embeddable(menu_path)
+  end
+
+  def _split_tklist(str)
+    __getip._split_tklist(str)
+  end
+  def _merge_tklist(*args)
+    __getip._merge_tklist(*args)
+  end
+  def _conv_listelement(arg)
+    __getip._conv_listelement(arg)
+  end
+
+  def _create_console
+    __getip._create_console
+  end
+end
+
+
+# wrap methods on TclTkLib : not permit calling TclTkLib module methods
+class << TclTkLib
+  def mainloop(check_root = true)
+    MultiTkIp.mainloop(check_root)
+  end
+  def mainloop_watchdog(check_root = true)
+    MultiTkIp.mainloop_watchdog(check_root)
+  end
+  def do_one_event(flag = TclTkLib::EventFlag::ALL)
+    MultiTkIp.do_one_event(flag)
+  end
+  #def mainloop_abort_on_exception
+  #  MultiTkIp.mainloop_abort_on_exception
+  #end
+  #def mainloop_abort_on_exception=(mode)
+  #  MultiTkIp.mainloop_abort_on_exception=(mode)
+  #end
+  def set_eventloop_tick(tick)
+    MultiTkIp.set_eventloop_tick(tick)
+  end
+  def get_eventloop_tick
+    MultiTkIp.get_eventloop_tick
+  end
+  def set_no_event_wait(tick)
+    MultiTkIp.set_no_event_wait(tick)
+  end
+  def get_no_event_wait
+    MultiTkIp.get_no_event_wait
+  end
+  def set_eventloop_weight(loop_max, no_event_tick)
+    MultiTkIp.set_eventloop_weight(loop_max, no_event_tick)
+  end
+  def get_eventloop_weight
+    MultiTkIp.get_eventloop_weight
+  end
+  def restart(*args)
+    MultiTkIp.restart(*args)
+  end
+
+  def _merge_tklist(*args)
+    MultiTkIp._merge_tklist(*args)
+  end
+  def _conv_listelement(arg)
+    MultiTkIp._conv_listelement(arg)
+  end
+end
+
+
+# depend on TclTkIp
+class MultiTkIp
+#  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
+      if @wait_on_mainloop[0]
+        begin
+          @wait_on_mainloop[1] += 1
+          if $SAFE >= 4
+	    _receiver_mainloop(check_root).join
+          else
+            @cmd_queue.enq([@system, 'call_mainloop',
+                            Thread.current, check_root])
+            Thread.stop
+          end
+        rescue MultiTkIp_OK => ret
+          # return value
+          if ret.value.kind_of?(Thread)
+            return ret.value.value
+          else
+            return ret.value
+          end
+        rescue SystemExit => e
+          # exit IP
+          warn("Warning: " + e.inspect + " on " + self.inspect) if $DEBUG
+          begin
+            self._eval_without_enc('exit')
+          rescue Exception
+          end
+          self.delete
+        rescue StandardError => e
+          if $DEBUG
+            warn("Warning: " + e.class.inspect +
+                 ((e.message.length > 0)? ' "' + e.message + '"': '') +
+                 " on " + self.inspect)
+          end
+          return e
+        rescue Exception => e
+	  return e
+        ensure
+          @wait_on_mainloop[1] -= 1
+        end
+      end
+      return
+    end
+
+    unless restart_on_dead
+      @wait_on_mainloop[1] += 1
+=begin
+      begin
+        @interp.mainloop(check_root)
+      rescue StandardError => e
+        if $DEBUG
+          warn("Warning: " + e.class.inspect +
+               ((e.message.length > 0)? ' "' + e.message + '"': '') +
+               " on " + self.inspect)
+        end
+      end
+=end
+      begin
+	@interp.mainloop(check_root)
+      ensure
+	@wait_on_mainloop[1] -= 1
+      end
+    else
+      loop do
+        break unless self.alive?
+        if check_root
+          begin
+            break if TclTkLib.num_of_mainwindows == 0
+          rescue StandardError
+            break
+          end
+        end
+        break if @interp.deleted?
+        begin
+	  @wait_on_mainloop[1] += 1
+          @interp.mainloop(check_root)
+        rescue StandardError => e
+          if TclTkLib.mainloop_abort_on_exception != nil
+            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
+            #             " exception (ignore) : ", $!.message, "\n");
+            if $DEBUG
+              warn("Warning: Tk mainloop receives " << e.class.inspect <<
+                   " exception (ignore) : " << e.message);
+            end
+          end
+          #raise e
+        rescue Exception => e
+=begin
+          if TclTkLib.mainloop_abort_on_exception != nil
+            #STDERR.print("Warning: Tk mainloop receives ", $!.class.inspect,
+            #             " exception (ignore) : ", $!.message, "\n");
+            if $DEBUG
+              warn("Warning: Tk mainloop receives " << e.class.inspect <<
+                   " exception (ignore) : " << e.message);
+            end
+          end
+=end
+          raise e
+        ensure
+          @wait_on_mainloop[1] -= 1
+          Thread.pass  # avoid eventloop conflict
+        end
+      end
+    end
+    self
+  end
+
+  def make_safe
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.make_safe
+  end
+
+  def safe?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.safe?
+  end
+
+  def safe_base?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @safe_base
+  end
+
+  def allow_ruby_exit?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.allow_ruby_exit?
+  end
+
+  def allow_ruby_exit= (mode)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.allow_ruby_exit = mode
+  end
+
+  def delete
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @slave_ip_tbl.each{|name, subip|
+      _destroy_slaves_of_slaveIP(subip)
+=begin
+      begin
+        subip._invoke('destroy', '.') unless subip.deleted?
+      rescue Exception
+      end
+=end
+      begin
+        # subip._eval_without_enc("foreach i [after info] {after cancel $i}")
+	unless subip.deleted?
+	  after_ids = subip._eval_without_enc("after info")
+	  subip._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+	end
+      rescue Exception
+      end
+
+      # safe_base?
+      if @interp._eval_without_enc("catch {::safe::interpConfigure #{name}}") == '0'
+        begin
+          @interp._eval_without_enc("::safe::interpDelete #{name}")
+        rescue Exception
+        else
+          next if subip.deleted?
+        end
+      end
+      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')
+        rescue Exception
+        end
+      else
+        begin
+          subip.delete unless subip.deleted?
+        rescue Exception
+        end
+      end
+    }
+
+    begin
+      # @interp._eval_without_enc("foreach i [after info] {after cancel $i}")
+      after_ids = @interp._eval_without_enc("after info")
+      @interp._eval_without_enc("foreach i {#{after_ids}} {after cancel $i}")
+    rescue Exception
+    end
+
+    begin
+      @interp._invoke('destroy', '.') unless @interp.deleted?
+    rescue Exception
+    end
+
+    if @safe_base && !@interp.deleted?
+      # do 'exit' to call the delete_hook procedure
+      @interp._eval_without_enc('exit')
+    end
+    @interp.delete
+    self
+  end
+
+  def deleted?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.deleted?
+  end
+
+  def has_mainwindow?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.has_mainwindow?
+  end
+
+  def invalid_namespace?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.invalid_namespace?
+  end
+
+  def abort(msg = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if master? && !safe? && allow_ruby_exit?
+      if msg
+        Kernel.abort(msg)
+      else
+        Kernel.abort
+      end
+    else
+      # ignore msg
+      delete
+      1
+    end
+  end
+
+  def exit(st = true)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if master? && !safe? && allow_ruby_exit?
+      Kernel.exit(st)
+    else
+      delete
+      st
+    end
+  end
+
+  def exit!(st = false)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if master? && !safe? && allow_ruby_exit?
+      Kernel.exit!(st)
+    else
+      delete
+      st
+    end
+  end
+
+  def restart(app_name = nil, keys = {})
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    _init_ip_internal(@@INIT_IP_ENV, @@ADD_TK_PROCS)
+
+    @interp._invoke('set', 'argv0', app_name) if app_name
+    if keys.kind_of?(Hash)
+      @interp._invoke('set', 'argv', _keys2opts(keys))
+    end
+
+    @interp.restart
+  end
+
+  def __eval(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.__eval(str)
+  end
+
+  def __invoke(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.__invoke(*args)
+  end
+
+  def _eval(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._eval(str)
+  end
+
+  def _invoke(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke(*args)
+  end
+
+  def _eval_without_enc(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._eval_without_enc(str)
+  end
+
+  def _invoke_without_enc(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke_without_enc(*args)
+  end
+
+  def _eval_with_enc(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._eval_with_enc(str)
+  end
+
+  def _invoke_with_enc(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke_with_enc(*args)
+  end
+
+  def _toUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._toUTF8(str, encoding)
+  end
+
+  def _fromUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._fromUTF8(str, encoding)
+  end
+
+  def _thread_vwait(var)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._thread_vwait(var)
+  end
+
+  def _thread_tkwait(mode, target)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._thread_tkwait(mode, target)
+  end
+
+  def _return_value
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._return_value
+  end
+
+  def _get_variable(var, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_variable(var, flag)
+  end
+  def _get_variable2(var, idx, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_variable2(var, idx, flag)
+  end
+  def _set_variable(var, value, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_variable(var, value, flag)
+  end
+  def _set_variable2(var, idx, value, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_variable2(var, idx, value, flag)
+  end
+  def _unset_variable(var, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_variable(var, flag)
+  end
+  def _unset_variable2(var, idx, flag)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_variable2(var, idx, flag)
+  end
+
+  def _get_global_var(var)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_global_var(var)
+  end
+  def _get_global_var2(var, idx)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._get_global_var2(var, idx)
+  end
+  def _set_global_var(var, value)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_global_var(var, value)
+  end
+  def _set_global_var2(var, idx, value)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._set_global_var2(var, idx, value)
+  end
+  def _unset_global_var(var)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_global_var(var)
+  end
+  def _unset_global_var2(var, idx)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._unset_global_var2(var, idx)
+  end
+
+  def _make_menu_embeddable(menu_path)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._make_menu_embeddable(menu_path)
+  end
+
+  def _split_tklist(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._split_tklist(str)
+  end
+  def _merge_tklist(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._merge_tklist(*args)
+  end
+  def _conv_listelement(arg)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._conv_listelement(arg)
+  end
+end
+
+
+# interp command support
+class MultiTkIp
+  def _lst2ary(str)
+    return [] if str == ""
+    idx = str.index('{')
+    while idx and idx > 0 and str[idx-1] == ?\\
+      idx = str.index('{', idx+1)
+    end
+    return str.split unless idx
+
+    list = str[0,idx].split
+    str = str[idx+1..-1]
+    i = -1
+    brace = 1
+    str.each_byte {|c|
+      c = c.chr
+      i += 1
+      brace += 1 if c == '{'
+      brace -= 1 if c == '}'
+      break if brace == 0
+    }
+    if i == 0
+      list.push ''
+    elsif str[0, i] == ' '
+      list.push ' '
+    else
+      list.push str[0..i-1]
+    end
+    #list += _lst2ary(str[i+1..-1])
+    list.concat(_lst2ary(str[i+1..-1]))
+    list
+  end
+  private :_lst2ary
+
+  def _slavearg(slave)
+    if slave.kind_of?(MultiTkIp)
+      slave.path
+    elsif slave.kind_of?(String)
+      slave
+    else
+      slave.to_s
+    end
+  end
+  private :_slavearg
+
+  def alias_info(slave, cmd_name)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    _lst2ary(@interp._invoke('interp', 'alias', _slavearg(slave), cmd_name))
+  end
+  def self.alias_info(slave, cmd_name)
+    __getip.alias_info(slave, cmd_name)
+  end
+
+  def alias_delete(slave, cmd_name)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'alias', _slavearg(slave), cmd_name, '')
+    self
+  end
+  def self.alias_delete(slave, cmd_name)
+    __getip.alias_delete(slave, cmd_name)
+    self
+  end
+
+  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,
+                          '', org_cmd, *args)
+    (ret == new_cmd)? self: nil
+  end
+  def self.def_alias(slave, new_cmd, org_cmd, *args)
+    ret = __getip.def_alias(slave, new_cmd, org_cmd, *args)
+    (ret == new_cmd)? self: nil
+  end
+
+  def aliases(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    _lst2ary(@interp._invoke('interp', 'aliases', _slavearg(slave)))
+  end
+  def self.aliases(slave = '')
+    __getip.aliases(slave)
+  end
+
+  def delete_slaves(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    slaves = args.collect{|s| _slavearg(s)}
+    @interp._invoke('interp', 'delete', *slaves) if slaves.size > 0
+    self
+  end
+  def self.delete_slaves(*args)
+    __getip.delete_slaves(*args)
+    self
+  end
+
+  def exist?(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    ret = @interp._invoke('interp', 'exists', _slavearg(slave))
+    (ret == '1')? true: false
+  end
+  def self.exist?(slave = '')
+    __getip.exist?(slave)
+  end
+
+  def delete_cmd(slave, cmd)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    slave_invoke = @interp._invoke('list', 'rename', cmd, '')
+    @interp._invoke('interp', 'eval', _slavearg(slave), slave_invoke)
+    self
+  end
+  def self.delete_cmd(slave, cmd)
+    __getip.delete_cmd(slave, cmd)
+    self
+  end
+
+  def expose_cmd(slave, cmd, aliasname = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if aliasname
+      @interp._invoke('interp', 'expose', _slavearg(slave), cmd, aliasname)
+    else
+      @interp._invoke('interp', 'expose', _slavearg(slave), cmd)
+    end
+    self
+  end
+  def self.expose_cmd(slave, cmd, aliasname = nil)
+    __getip.expose_cmd(slave, cmd, aliasname)
+    self
+  end
+
+  def hide_cmd(slave, cmd, aliasname = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if aliasname
+      @interp._invoke('interp', 'hide', _slavearg(slave), cmd, aliasname)
+    else
+      @interp._invoke('interp', 'hide', _slavearg(slave), cmd)
+    end
+    self
+  end
+  def self.hide_cmd(slave, cmd, aliasname = nil)
+    __getip.hide_cmd(slave, cmd, aliasname)
+    self
+  end
+
+  def hidden_cmds(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    _lst2ary(@interp._invoke('interp', 'hidden', _slavearg(slave)))
+  end
+  def self.hidden_cmds(slave = '')
+    __getip.hidden_cmds(slave)
+  end
+
+  def invoke_hidden(slave, cmd, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = []
+    end
+    keys << _slavearg(slave)
+    if Tk::TCL_MAJOR_VERSION > 8 ||
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+      keys << '--'
+    end
+    keys << cmd
+    keys.concat(args)
+    @interp._invoke('interp', 'invokehidden', *keys)
+  end
+  def self.invoke_hidden(slave, cmd, *args)
+    __getip.invoke_hidden(slave, cmd, *args)
+  end
+
+  def invoke_hidden_on_global(slave, cmd, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = []
+    end
+    keys << _slavearg(slave)
+    keys << '-global'
+    if Tk::TCL_MAJOR_VERSION > 8 ||
+        (Tk::TCL_MAJOR_VERSION == 8 && Tk::TCL_MINOR_VERSION >= 5)
+      keys << '--'
+    end
+    keys << cmd
+    keys.concat(args)
+    @interp._invoke('interp', 'invokehidden', *keys)
+  end
+  def self.invoke_hidden_on_global(slave, cmd, *args)
+    __getip.invoke_hidden_on_global(slave, cmd, *args)
+  end
+
+  def invoke_hidden_on_namespace(slave, ns, cmd, *args)
+    # for Tcl8.5 or later
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = []
+    end
+    keys << _slavearg(slave)
+    keys << '-namespace' << TkComm._get_eval_string(ns)
+    keys << '--' << cmd
+    keys.concat(args)
+    @interp._invoke('interp', 'invokehidden', *keys)
+  end
+  def self.invoke_hidden_on_namespace(slave, ns, cmd, *args)
+    __getip.invoke_hidden_on_namespace(slave, ns, cmd, *args)
+  end
+
+  def mark_trusted(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'marktrusted', _slavearg(slave))
+    self
+  end
+  def self.mark_trusted(slave = '')
+    __getip.mark_trusted(slave)
+    self
+  end
+
+  def set_bgerror_handler(cmd = Proc.new, slave = nil, &b)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    unless TkComm._callback_entry?(cmd)
+      if !slave && b
+        slave = cmd
+        cmd = Proc.new(&b)
+      end
+    end
+    slave = '' unless slave
+
+    @interp._invoke('interp', 'bgerror', _slavearg(slave), cmd)
+  end
+  def self.bgerror(cmd = Proc.new, slave = nil, &b)
+    __getip.bgerror(cmd, slave, &b)
+  end
+
+  def get_bgerror_handler(slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    procedure(@interp._invoke('interp', 'bgerror', _slavearg(slave)))
+  end
+  def self.bgerror(slave = '')
+    __getip.bgerror(slave)
+  end
+
+  def set_limit(limit_type, slave = '', opts = {})
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'limit', _slavearg(slave), limit_type, opts)
+  end
+  def self.set_limit(limit_type, slave = '', opts = {})
+    __getip.set_limit(limit_type, slave, opts)
+  end
+
+  def get_limit(limit_type, slave = '', slot = nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if slot
+      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),
+                                                            limit_type))
+      l.map!{|s| _fromUTF8(s)}
+      r = {}
+      until l.empty?
+        key = l.shift[1..-1]
+        val = l.shift
+        val = num_or_str(val) if val
+        r[key] = val
+      end
+      r
+    end
+  end
+  def self.get_limit(limit_type, slave = '', slot = nil)
+    __getip.get_limit(limit_type, slave, slot)
+  end
+
+  def recursion_limit(slave = '', limit = None)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    number(@interp._invoke('interp', 'recursionlimit',
+                           _slavearg(slave), limit))
+  end
+  def self.recursion_limit(slave = '', limit = None)
+    __getip.recursion_limit(slave)
+  end
+
+  def alias_target(aliascmd, slave = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'target', _slavearg(slave), aliascmd)
+  end
+  def self.alias_target(aliascmd, slave = '')
+    __getip.alias_target(aliascmd, slave)
+  end
+
+  def share_stdin(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stdin', dist)
+    self
+  end
+  def self.share_stdin(dist, src = '')
+    __getip.share_stdin(dist, src)
+    self
+  end
+
+  def share_stdout(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stdout', dist)
+    self
+  end
+  def self.share_stdout(dist, src = '')
+    __getip.share_stdout(dist, src)
+    self
+  end
+
+  def share_stderr(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stderr', dist)
+    self
+  end
+  def self.share_stderr(dist, src = '')
+    __getip.share_stderr(dist, src)
+    self
+  end
+
+  def transfer_stdin(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stdin', dist)
+    self
+  end
+  def self.transfer_stdin(dist, src = '')
+    __getip.transfer_stdin(dist, src)
+    self
+  end
+
+  def transfer_stdout(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
+    self
+  end
+  def self.transfer_stdout(dist, src = '')
+    __getip.transfer_stdout(dist, src)
+    self
+  end
+
+  def transfer_stderr(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
+    self
+  end
+  def self.transfer_stderr(dist, src = '')
+    __getip.transfer_stderr(dist, src)
+    self
+  end
+
+  def share_stdio(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'share', src, 'stdin',  dist)
+    @interp._invoke('interp', 'share', src, 'stdout', dist)
+    @interp._invoke('interp', 'share', src, 'stderr', dist)
+    self
+  end
+  def self.share_stdio(dist, src = '')
+    __getip.share_stdio(dist, src)
+    self
+  end
+
+  def transfer_stdio(dist, src = '')
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._invoke('interp', 'transfer', src, 'stdin',  dist)
+    @interp._invoke('interp', 'transfer', src, 'stdout', dist)
+    @interp._invoke('interp', 'transfer', src, 'stderr', dist)
+    self
+  end
+  def self.transfer_stdio(dist, src = '')
+    __getip.transfer_stdio(dist, src)
+    self
+  end
+end
+
+
+# Safe Base :: manipulating safe interpreter
+class MultiTkIp
+  def safeip_configure(slot, value=None)
+    # use for '-noStatics' option ==> {statics=>false}
+    #     for '-nestedLoadOk' option ==> {nested=>true}
+    if slot.kind_of?(Hash)
+      ip = MultiTkIp.__getip
+      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' + _keys2opts(slot))
+    else
+      ip._eval('::safe::interpConfigure ' + @ip_name + ' ' +
+               "-#{slot} #{_get_eval_string(value)}")
+    end
+    self
+  end
+
+  def safeip_configinfo(slot = nil)
+    ip = MultiTkIp.__getip
+    ret = {}
+    if slot
+      conf = _lst2ary(ip._eval("::safe::interpConfigure " +
+                               @ip_name + " -#{slot}"))
+      if conf[0] == '-deleteHook'
+=begin
+        if conf[1] =~ /^rb_out\S* (c(_\d+_)?\d+)/
+          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
+=end
+        if conf[1] =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+          ret[conf[0][1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
+        else
+          ret[conf[0][1..-1]] = conf[1]
+        end
+      else
+        ret[conf[0][1..-1]] = conf[1]
+      end
+    else
+      Hash[*_lst2ary(ip._eval("::safe::interpConfigure " +
+                              @ip_name))].each{|k, v|
+        if k == '-deleteHook'
+=begin
+          if v =~ /^rb_out\S* (c(_\d+_)?\d+)/
+            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$1]
+=end
+          if v =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+            ret[k[1..-1]] = MultiTkIp._tk_cmd_tbl[$4]
+          else
+            ret[k[1..-1]] = v
+          end
+        else
+          ret[k[1..-1]] = v
+        end
+      }
+    end
+    ret
+  end
+
+  def safeip_delete
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::interpDelete " + @ip_name)
+  end
+
+  def safeip_add_to_access_path(dir)
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::interpAddToAccessPath #{@ip_name} #{dir}")
+  end
+
+  def safeip_find_in_access_path(dir)
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::interpFindInAccessPath #{@ip_name} #{dir}")
+  end
+
+  def safeip_set_log_cmd(cmd = Proc.new)
+    ip = MultiTkIp.__getip
+    ip._eval("::safe::setLogCmd #{@ip_name} #{_get_eval_string(cmd)}")
+  end
+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_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.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?
+    @interp.encoding_convertfrom(str, enc)
+  end
+  alias encoding_convert_from encoding_convertfrom
+
+  def encoding_convertto(str, enc=None)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp.encoding_convertto(str, enc)
+  end
+  alias encoding_convert_to encoding_convertto
+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
+#MultiTkIp.freeze
+#TclTkLib.freeze
+
+########################################
+#  start Tk which depends on MultiTkIp
+module TkCore
+  INTERP = MultiTkIp
+end
+require 'tk'
diff --git a/ext/tk/lib/remote-tk.rb b/ext/tk/lib/remote-tk.rb
new file mode 100644
index 0000000000..443d66010c
--- /dev/null
+++ b/ext/tk/lib/remote-tk.rb
@@ -0,0 +1,530 @@
+#
+#               remote-tk.rb - supports to control remote Tk interpreters
+#                       by Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
+
+if defined? MultiTkIp
+  fail RuntimeError, "'remote-tk' library must be required before requiring 'multi-tk'"
+end
+
+class MultiTkIp; end
+class RemoteTkIp < MultiTkIp; end
+
+class MultiTkIp
+  @@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
+
+  @flag = true
+  def self._DEFAULT_MASTER
+    # work only once
+    if @flag
+      @flag = nil
+      @@DEFAULT_MASTER
+    else
+      nil
+    end
+  end
+end
+class RemoteTkIp
+  @@IP_TABLE = MultiTkIp._IP_TABLE unless defined?(@@IP_TABLE)
+  @@TK_TABLE_LIST = MultiTkIp._TK_TABLE_LIST unless defined?(@@TK_TABLE_LIST)
+end
+class << MultiTkIp
+  undef _IP_TABLE
+  undef _TK_TABLE_LIST
+end
+
+require 'multi-tk'
+
+class RemoteTkIp
+  if defined?(@@DEFAULT_MASTER)
+    MultiTkIp._DEFAULT_MASTER
+  else
+    @@DEFAULT_MASTER = MultiTkIp._DEFAULT_MASTER
+  end
+end
+
+
+###############################
+
+class << RemoteTkIp
+  undef new_master, new_slave, new_safe_slave
+  undef new_trusted_slave, new_safeTk
+
+  def new(*args, &b)
+    ip = __new(*args)
+    ip.eval_proc(&b) if b
+    ip
+  end
+end
+
+class RemoteTkIp
+  def initialize(remote_ip, displayof=nil, timeout=5)
+    if $SAFE >= 4
+      fail SecurityError, "cannot access another interpreter at level #{$SAFE}"
+    end
+
+    @interp = MultiTkIp.__getip
+    if @interp.safe?
+      fail SecurityError, "safe-IP cannot create RemoteTkIp"
+    end
+
+
+    @interp.allow_ruby_exit = false
+    @appname = @interp._invoke('tk', 'appname')
+    @remote = remote_ip.to_s.dup.freeze
+    if displayof.kind_of?(TkWindow)
+      @displayof = displayof.path.dup.freeze
+    else
+      @displayof = nil
+    end
+    if self.deleted?
+      fail RuntimeError, "no Tk application named \"#{@remote}\""
+    end
+
+    @tk_windows = {}
+    @tk_table_list = []
+    @slave_ip_tbl = {}
+    @slave_ip_top = {}
+
+    @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
+
+    @threadgroup  = ThreadGroup.new
+
+    @safe_level = [$SAFE]
+
+    @wait_on_mainloop = [true, 0]
+
+    @cmd_queue = Queue.new
+
+=begin
+    @cmd_receiver, @receiver_watchdog = _create_receiver_and_watchdog()
+
+    @threadgroup.add @cmd_receiver
+    @threadgroup.add @receiver_watchdog
+
+    @threadgroup.enclose
+=end
+    @@DEFAULT_MASTER.assign_receiver_and_watchdog(self)
+
+    @@IP_TABLE[@threadgroup] = self
+    @@TK_TABLE_LIST.size.times{
+      (tbl = {}).tainted? || TkUtil.untrust(tbl)
+      @tk_table_list << tbl
+    }
+
+    @ret_val = TkVariable.new
+    if timeout > 0 && ! _available_check(timeout)
+      fail RuntimeError, "cannot create connection"
+    end
+    @ip_id = _create_connection
+
+    class << self
+      undef :instance_eval
+    end
+
+    self.freeze  # defend against modification
+  end
+
+  def manipulable?
+    return true if (Thread.current.group == ThreadGroup::Default)
+    MultiTkIp.__getip == @interp && ! @interp.safe?
+  end
+  def self.manipulable?
+    true
+  end
+
+  def _is_master_of?(tcltkip_obj)
+    tcltkip_obj == @interp
+  end
+  protected :_is_master_of?
+
+  def _ip_id_
+    @ip_id
+  end
+
+  def _available_check(timeout = 5)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    return nil if timeout < 1
+    @ret_val.value = ''
+    @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
+        Tk.update
+        break if @ret_val == 'ready'
+      }
+    end
+    @ret_val.value == 'ready'
+  end
+  private :_available_check
+
+  def _create_connection
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    ip_id = '_' + @interp._invoke('send', @remote, <<-'EOS') + '_'
+      if {[catch {set _rubytk_control_ip_id_} ret] != 0} {
+        set _rubytk_control_ip_id_ 0
+      } else {
+        set _rubytk_control_ip_id_ [expr $ret + 1]
+      }
+      return $_rubytk_control_ip_id_
+    EOS
+
+    @interp._invoke('send', @remote, <<-EOS)
+      proc rb_out#{ip_id} args {
+        send #{@appname} rb_out \$args
+      }
+    EOS
+
+    ip_id
+  end
+  private :_create_connection
+
+  def _appsend(enc_mode, async, *cmds)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    p ['_appsend', [@remote, @displayof], enc_mode, async, cmds] if $DEBUG
+    if $SAFE >= 4
+      fail SecurityError, "cannot send commands at level 4"
+    elsif $SAFE >= 1 && cmds.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted commands at level #{$SAFE}"
+    end
+
+    cmds = @interp._merge_tklist(*TkUtil::_conv_args([], enc_mode, *cmds))
+    if @displayof
+      if async
+        @interp.__invoke('send', '-async', '-displayof', @displayof,
+                         '--', @remote, *cmds)
+      else
+        @interp.__invoke('send', '-displayof', @displayof,
+                         '--', @remote, *cmds)
+      end
+    else
+      if async
+        @interp.__invoke('send', '-async', '--', @remote, *cmds)
+      else
+        @interp.__invoke('send', '--', @remote, *cmds)
+      end
+    end
+  end
+  private :_appsend
+
+  def ready?(timeout=5)
+    if timeout < 0
+      fail ArgumentError, "timeout must be positive number"
+    end
+    _available_check(timeout)
+  end
+
+  def is_rubytk?
+    return false if _appsend(false, false, 'info', 'command', 'ruby') == ""
+    [ _appsend(false, false, 'ruby', 'RUBY_VERSION'),
+      _appsend(false, false, 'set', 'tk_patchLevel') ]
+  end
+
+  def appsend(async, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if @displayof
+      Tk.appsend_displayof(@remote, @displayof, async, *args)
+    else
+      Tk.appsend(@remote, async, *args)
+    end
+  end
+
+  def rb_appsend(async, *args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if @displayof
+      Tk.rb_appsend_displayof(@remote, @displayof, async, *args)
+    else
+      Tk.rb_appsend(@remote, async, *args)
+    end
+  end
+
+  def create_slave(name, safe=false)
+    if safe
+      safe_opt = ''
+    else
+      safe_opt = '-safe'
+    end
+    _appsend(false, false, "interp create #{safe_opt} -- #{name}")
+  end
+
+  def make_safe
+    fail RuntimeError, 'cannot change safe mode of the remote interpreter'
+  end
+
+  def safe?
+    _appsend(false, false, 'interp issafe')
+  end
+
+  def safe_base?
+    false
+  end
+
+  def allow_ruby_exit?
+    false
+  end
+
+  def allow_ruby_exit= (mode)
+    fail RuntimeError, 'cannot change mode of the remote interpreter'
+  end
+
+  def delete
+    _appsend(false, true, 'exit')
+  end
+
+  def deleted?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    if @displayof
+      lst = @interp._invoke_without_enc('winfo', 'interps',
+                                        '-displayof', @displayof)
+    else
+      lst = @interp._invoke_without_enc('winfo', 'interps')
+    end
+    # unless @interp._split_tklist(lst).index(@remote)
+    unless @interp._split_tklist(lst).index(_toUTF8(@remote))
+      true
+    else
+      false
+    end
+  end
+
+  def has_mainwindow?
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+
+    begin
+      inf = @interp._invoke_without_enc('info', 'command', '.')
+    rescue Exception
+      return nil
+    end
+    if !inf.kind_of?(String) || inf != '.'
+      false
+    else
+      true
+    end
+  end
+
+  def invalid_namespace?
+    false
+  end
+
+  def restart
+    fail RuntimeError, 'cannot restart the remote interpreter'
+  end
+
+  def __eval(str)
+    _appsend(false, false, str)
+  end
+  def _eval(str)
+    _appsend(nil, false, str)
+  end
+  def _eval_without_enc(str)
+    _appsend(false, false, str)
+  end
+  def _eval_with_enc(str)
+    _appsend(true, false, str)
+  end
+
+  def _invoke(*args)
+    _appsend(nil, false, *args)
+  end
+
+  def __invoke(*args)
+    _appsend(false, false, *args)
+  end
+  def _invoke(*args)
+    _appsend(nil, false, *args)
+  end
+  def _invoke_without_enc(*args)
+    _appsend(false, false, *args)
+  end
+  def _invoke_with_enc(*args)
+    _appsend(true, false, *args)
+  end
+
+  def _toUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._toUTF8(str, encoding)
+  end
+
+  def _fromUTF8(str, encoding=nil)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._fromUTF8(str, encoding)
+  end
+
+  def _thread_vwait(var_name)
+    _appsend(false, 'thread_vwait', varname)
+  end
+
+  def _thread_tkwait(mode, target)
+    _appsend(false, 'thread_tkwait', mode, target)
+  end
+
+  def _return_value
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._return_value
+  end
+
+  def _get_variable(var_name, flag)
+    # ignore flag
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
+  end
+  def _get_variable2(var_name, index_name, flag)
+    # ignore flag
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
+  end
+
+  def _set_variable(var_name, value, flag)
+    # ignore flag
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
+  end
+  def _set_variable2(var_name, index_name, value, flag)
+    # ignore flag
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
+  end
+
+  def _unset_variable(var_name, flag)
+    # ignore flag
+    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
+  end
+  def _unset_variable2(var_name, index_name, flag)
+    # ignore flag
+    _appsend(false, 'unset', "#{var_name}(#{index_name})")
+  end
+
+  def _get_global_var(var_name)
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name))
+  end
+  def _get_global_var2(var_name, index_name)
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})")
+  end
+
+  def _set_global_var(var_name, value)
+    _appsend(false, 'set', TkComm::_get_eval_string(var_name), TkComm::_get_eval_string(value))
+  end
+  def _set_global_var2(var_name, index_name, value)
+    _appsend(false, 'set', "#{TkComm::_get_eval_string(var_name)}(#{TkComm::_get_eval_string(index_name)})", TkComm::_get_eval_string(value))
+  end
+
+  def _unset_global_var(var_name)
+    _appsend(false, 'unset', TkComm::_get_eval_string(var_name))
+  end
+  def _unset_global_var2(var_name, index_name)
+    _appsend(false, 'unset', "#{var_name}(#{index_name})")
+  end
+
+  def _split_tklist(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._split_tklist(str)
+  end
+
+  def _merge_tklist(*args)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._merge_tklist(*args)
+  end
+
+  def _conv_listelement(str)
+    raise SecurityError, "no permission to manipulate" unless self.manipulable?
+    @interp._conv_listelement(str)
+  end
+
+  def _create_console
+    fail RuntimeError, 'not support "_create_console" on the remote interpreter'
+  end
+
+  def mainloop
+    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
+  end
+  def mainloop_watchdog
+    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
+  end
+  def do_one_event(flag = nil)
+    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception
+    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception=(mode)
+    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
+  end
+  def set_eventloop_tick(*args)
+    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
+  end
+  def get_eventloop_tick
+    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
+  end
+  def set_no_event_wait(*args)
+    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
+  end
+  def get_no_event_wait
+    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
+  end
+  def set_eventloop_weight(*args)
+    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
+  end
+  def get_eventloop_weight
+    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
+  end
+end
+
+class << RemoteTkIp
+  def mainloop(*args)
+    fail RuntimeError, 'not support "mainloop" on the remote interpreter'
+  end
+  def mainloop_watchdog(*args)
+    fail RuntimeError, 'not support "mainloop_watchdog" on the remote interpreter'
+  end
+  def do_one_event(flag = nil)
+    fail RuntimeError, 'not support "do_one_event" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception
+    fail RuntimeError, 'not support "mainloop_abort_on_exception" on the remote interpreter'
+  end
+  def mainloop_abort_on_exception=(mode)
+    fail RuntimeError, 'not support "mainloop_abort_on_exception=" on the remote interpreter'
+  end
+  def set_eventloop_tick(*args)
+    fail RuntimeError, 'not support "set_eventloop_tick" on the remote interpreter'
+  end
+  def get_eventloop_tick
+    fail RuntimeError, 'not support "get_eventloop_tick" on the remote interpreter'
+  end
+  def set_no_event_wait(*args)
+    fail RuntimeError, 'not support "set_no_event_wait" on the remote interpreter'
+  end
+  def get_no_event_wait
+    fail RuntimeError, 'not support "get_no_event_wait" on the remote interpreter'
+  end
+  def set_eventloop_weight(*args)
+    fail RuntimeError, 'not support "set_eventloop_weight" on the remote interpreter'
+  end
+  def get_eventloop_weight
+    fail RuntimeError, 'not support "get_eventloop_weight" on the remote interpreter'
+  end
+end
diff --git a/ext/tk/lib/tcltk.rb b/ext/tk/lib/tcltk.rb
new file mode 100644
index 0000000000..f8fbdfbe6d
--- /dev/null
+++ b/ext/tk/lib/tcltk.rb
@@ -0,0 +1,367 @@
+# tof
+
+#### tcltk library, more direct manipulation of tcl/tk
+####    Sep. 5, 1997    Y. Shigehiro
+
+require "tcltklib"
+
+################
+
+# module TclTk: collection of tcl/tk utilities (supplies namespace.)
+module TclTk
+
+  # initialize Hash to hold unique symbols and such
+  @namecnt = {}
+
+  # initialize Hash to hold callbacks
+  @callback = {}
+end
+
+# TclTk.mainloop(): call TclTkLib.mainloop()
+def TclTk.mainloop()
+  print("mainloop: start\n") if $DEBUG
+  TclTkLib.mainloop()
+  print("mainloop: end\n") if $DEBUG
+end
+
+# TclTk.deletecallbackkey(ca): remove callback from TclTk module
+#     this does not remove callbacks from tcl/tk interpreter
+#     without calling this method, TclTkInterpreter will not be GCed
+#   ca: callback(TclTkCallback)
+def TclTk.deletecallbackkey(ca)
+  print("deletecallbackkey: ", ca.to_s(), "\n") if $DEBUG
+  @callback.delete(ca.to_s)
+end
+
+# TclTk.dcb(ca, wid, W): call TclTk.deletecallbackkey() for each callbacks
+#     in an array.
+#     this is for callback for top-level <Destroy>
+#   ca: array of callbacks(TclTkCallback)
+#   wid: top-level widget(TclTkWidget)
+#   w: information about window given by %W(String)
+def TclTk.dcb(ca, wid, w)
+  if wid.to_s() == w
+    ca.each{|i|
+      TclTk.deletecallbackkey(i)
+    }
+  end
+end
+
+# TclTk._addcallback(ca): register callback
+#   ca: callback(TclTkCallback)
+def TclTk._addcallback(ca)
+  print("_addcallback: ", ca.to_s(), "\n") if $DEBUG
+  @callback[ca.to_s()] = ca
+end
+
+# TclTk._callcallback(key, arg): invoke registered callback
+#   key: key to select callback (to_s value of the TclTkCallback)
+#   arg: parameter from tcl/tk interpreter
+def TclTk._callcallback(key, arg)
+  print("_callcallback: ", @callback[key].inspect, "\n") if $DEBUG
+  @callback[key]._call(arg)
+  # throw out callback value
+  # should return String to satisfy rb_eval_string()
+  return ""
+end
+
+# TclTk._newname(prefix): generate unique name(String)
+#   prefix: prefix of the unique name
+def TclTk._newname(prefix)
+  # generated name counter is stored in @namecnt
+  if !@namecnt.key?(prefix)
+    # first appearing prefix, initialize
+    @namecnt[prefix] = 1
+  else
+    # already appeared prefix, generate next name
+    @namecnt[prefix] += 1
+  end
+  return "#{prefix}#{@namecnt[prefix]}"
+end
+
+################
+
+# class TclTkInterpreter: tcl/tk interpreter
+class TclTkInterpreter
+
+  # initialize():
+  def initialize()
+    # generate interpreter object
+    @ip = TclTkIp.new()
+
+    # add ruby_fmt command to tcl interpreter
+    # ruby_fmt command format arguments by `format' and call `ruby' command
+    # (notice ruby command receives only one argument)
+    if $DEBUG
+      @ip._eval("proc ruby_fmt {fmt args} { puts \"ruby_fmt: $fmt $args\" ; set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
+    else
+      @ip._eval("proc ruby_fmt {fmt args} { set cmd [list ruby [format $fmt $args]] ; uplevel $cmd }")
+    end
+
+    # @ip._get_eval_string(*args): generate string to evaluate in tcl interpreter
+    #   *args: script which is going to be evaluated under tcl/tk
+    def @ip._get_eval_string(*args)
+      argstr = ""
+      args.each{|arg|
+        argstr += " " if argstr != ""
+        # call to_eval if it is defined
+        if (arg.respond_to?(:to_eval))
+          argstr += arg.to_eval()
+        else
+          # call to_s unless defined
+          argstr += arg.to_s()
+        end
+      }
+      return argstr
+    end
+
+    # @ip._eval_args(*args): evaluate string under tcl/tk interpreter
+    #     returns result string.
+    #   *args: script which is going to be evaluated under tcl/tk
+    def @ip._eval_args(*args)
+      # calculate the string to eval in the interpreter
+      argstr = _get_eval_string(*args)
+
+      # evaluate under the interpreter
+      print("_eval: \"", argstr, "\"") if $DEBUG
+      res = _eval(argstr)
+      if $DEBUG
+        print(" -> \"", res, "\"\n")
+      elsif  _return_value() != 0
+        print(res, "\n")
+      end
+      fail(%Q/can't eval "#{argstr}"/) if _return_value() != 0 #'
+      return res
+    end
+
+    # generate tcl/tk command object and register in the hash
+    @commands = {}
+    # for all commands registered in tcl/tk interpreter:
+    @ip._eval("info command").split(/ /).each{|comname|
+      if comname =~ /^[.]/
+        # if command is a widget (path), generate TclTkWidget,
+        # and register it in the hash
+        @commands[comname] = TclTkWidget.new(@ip, comname)
+      else
+        # otherwise, generate TclTkCommand
+        @commands[comname] = TclTkCommand.new(@ip, comname)
+      end
+    }
+  end
+
+  # commands(): returns hash of the tcl/tk commands
+  def commands()
+    return @commands
+  end
+
+  # rootwidget(): returns root widget(TclTkWidget)
+  def rootwidget()
+    return @commands["."]
+  end
+
+  # _tcltkip(): returns @ip(TclTkIp)
+  def _tcltkip()
+    return @ip
+  end
+
+  # method_missing(id, *args): execute undefined method as tcl/tk command
+  #   id: method symbol
+  #   *args: method arguments
+  def method_missing(id, *args)
+    # if command named by id registered, then execute it
+    if @commands.key?(id.id2name)
+      return @commands[id.id2name].e(*args)
+    else
+      # otherwise, exception
+      super
+    end
+  end
+end
+
+# class TclTkObject: base class of the tcl/tk objects
+class TclTkObject
+
+  # initialize(ip, exp):
+  #   ip: interpreter(TclTkIp)
+  #   exp: tcl/tk representation
+  def initialize(ip, exp)
+    fail("type is not TclTkIp") if !ip.kind_of?(TclTkIp)
+    @ip = ip
+    @exp = exp
+  end
+
+  # to_s(): returns tcl/tk representation
+  def to_s()
+    return @exp
+  end
+end
+
+# class TclTkCommand: tcl/tk commands
+# you should not call TclTkCommand.new()
+# commands are created by TclTkInterpreter:initialize()
+class TclTkCommand < TclTkObject
+
+  # e(*args): execute command.  returns String (e is for exec or eval)
+  #   *args: command arguments
+  def e(*args)
+    return @ip._eval_args(to_s(), *args)
+  end
+end
+
+# class TclTkLibCommand: tcl/tk commands in the library
+class TclTkLibCommand < TclTkCommand
+
+  # initialize(ip, name):
+  #   ip: interpreter(TclTkInterpreter)
+  #   name: command name (String)
+  def initialize(ip, name)
+    super(ip._tcltkip, name)
+  end
+end
+
+# class TclTkVariable: tcl/tk variable
+class TclTkVariable < TclTkObject
+
+  # initialize(interp, dat):
+  #   interp: interpreter(TclTkInterpreter)
+  #   dat: the value to set(String)
+  #       if nil, not initialize variable
+  def initialize(interp, dat)
+    # auto-generate tcl/tk representation (variable name)
+    exp = TclTk._newname("v_")
+    # initialize TclTkObject
+    super(interp._tcltkip(), exp)
+    # safe this for `set' command
+    @set = interp.commands()["set"]
+    # set value
+    set(dat) if dat
+  end
+
+  # 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'
+  #   data: new value
+  def set(data)
+    @set.e(to_s(), data.to_s())
+  end
+
+  # get(): read tcl/tk variable(String) using `set'
+  def get()
+    return @set.e(to_s())
+  end
+end
+
+# class TclTkWidget: tcl/tk widget
+class TclTkWidget < TclTkCommand
+
+  # initialize(*args):
+  #   *args: parameters
+  def initialize(*args)
+    if args[0].kind_of?(TclTkIp)
+      # in case the 1st argument is TclTkIp:
+
+      # Wrap tcl/tk widget by TclTkWidget
+      # (used in TclTkInterpreter#initialize())
+
+      # need two arguments
+      fail("invalid # of parameter") if args.size != 2
+
+      # ip: interpreter(TclTkIp)
+      # exp: tcl/tk representation
+      ip, exp = args
+
+      # initialize TclTkObject
+      super(ip, exp)
+    elsif args[0].kind_of?(TclTkInterpreter)
+      # in case 1st parameter is TclTkInterpreter:
+
+      # generate new widget from parent widget
+
+      # interp: interpreter(TclTkInterpreter)
+      # parent: parent widget
+      # command: widget generating tk command(label 等)
+      # *args: argument to the command
+      interp, parent, command, *args = args
+
+      # generate widget name
+      exp = parent.to_s()
+      exp += "." if exp !~ /[.]$/
+      exp += TclTk._newname("w_")
+      # initialize TclTkObject
+      super(interp._tcltkip(), exp)
+      # generate widget
+      res = @ip._eval_args(command, exp, *args)
+#      fail("can't create Widget") if res != exp
+      # for tk_optionMenu, it is legal res != exp
+    else
+      fail("first parameter is not TclTkInterpreter")
+    end
+  end
+end
+
+# class TclTkCallback: tcl/tk callbacks
+class TclTkCallback < TclTkObject
+
+  # 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
+  #       scrollbar with -command option, which receives parameters
+  #       without specifying any replacement
+  def initialize(interp, pr, arg = nil)
+    # auto-generate tcl/tk representation (variable name)
+    exp = TclTk._newname("c_")
+    # initialize TclTkObject
+    super(interp._tcltkip(), exp)
+    # save parameters
+    @pr = pr
+    @arg = arg
+    # register in the module
+    TclTk._addcallback(self)
+  end
+
+  # to_eval(): returns string representation for @ip._eval_args
+  def to_eval()
+    if @arg
+      # bind replaces %s before calling ruby_fmt, so %%s is used
+      s = %Q/{ruby_fmt {TclTk._callcallback("#{to_s()}", "%%s")} #{@arg}}/
+    else
+      s = %Q/{ruby_fmt {TclTk._callcallback("#{to_s()}", "%s")}}/
+    end
+
+    return s
+  end
+
+  # _call(arg): invoke callback
+  #   arg: callback parameter
+  def _call(arg)
+    @pr.call(arg)
+  end
+end
+
+# class TclTkImage: tcl/tk images
+class TclTkImage < TclTkCommand
+
+  # initialize(interp, t, *args):
+  #     generating image is done by TclTkImage.new()
+  #     destroying is done by image delete (inconsistent, sigh)
+  #   interp: interpreter(TclTkInterpreter)
+  #   t: image type (photo, bitmap, etc.)
+  #   *args: command argument
+  def initialize(interp, t, *args)
+    # auto-generate tcl/tk representation
+    exp = TclTk._newname("i_")
+    # initialize TclTkObject
+    super(interp._tcltkip(), exp)
+    # generate image
+    res = @ip._eval_args("image create", t, exp, *args)
+    fail("can't create Image") if res != exp
+  end
+end
+
+# eof
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
new file mode 100644
index 0000000000..5bac92e47c
--- /dev/null
+++ b/ext/tk/lib/tk.rb
@@ -0,0 +1,5761 @@
+#
+#               tk.rb - Tk interface module using tcltklib
+#                       by Yukihiro Matsumoto <matz@netlab.jp>
+
+# use Shigehiro's tcltklib
+require 'tcltklib'
+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)
+module TkComm
+  include TkUtil
+  extend TkUtil
+
+  WidgetClassNames = TkUtil.untrust({})
+  TkExtlibAutoloadModule = TkUtil.untrust([])
+
+  # None = Object.new  ### --> definition is moved to TkUtil module
+  # def None.to_s
+  #   'None'
+  # end
+  # None.freeze
+
+  #Tk_CMDTBL = {}
+  #Tk_WINDOWS = {}
+  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
+  def Tk_CMDTBL.method_missing(id, *args)
+    TkCore::INTERP.tk_cmd_tbl.__send__(id, *args)
+  end
+  Tk_CMDTBL.freeze
+  Tk_WINDOWS = Object.new
+  def Tk_WINDOWS.method_missing(id, *args)
+    TkCore::INTERP.tk_windows.__send__(id, *args)
+  end
+  Tk_WINDOWS.freeze
+
+  self.instance_eval{
+    @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.
+    GET_CONFIGINFO_AS_ARRAY = true
+  end
+  unless const_defined?(:GET_CONFIGINFOwoRES_AS_ARRAY)
+    # for configinfo without resource info; list of [opt, value] pair
+    #           false => returns a Hash { opt=>val, ... }
+    #           true  => returns an Array [[opt,val], ... ]
+    GET_CONFIGINFOwoRES_AS_ARRAY = true
+  end
+  #  *** ATTENTION ***
+  # 'current_configinfo' method always returns a Hash under all cases of above.
+
+  def error_at
+    frames = caller()
+    frames.delete_if do |c|
+      c =~ %r!/tk(|core|thcore|canvas|text|entry|scrollbox)\.rb:\d+!
+    end
+    frames
+  end
+  private :error_at
+
+  def _genobj_for_tkwidget(path)
+    return TkRoot.new if path == '.'
+
+    begin
+      #tk_class = TkCore::INTERP._invoke('winfo', 'class', path)
+      tk_class = Tk.ip_invoke_without_enc('winfo', 'class', path)
+    rescue
+      return path
+    end
+
+    if ruby_class = WidgetClassNames[tk_class]
+      ruby_class_name = ruby_class.name
+      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
+      gen_class_name = ruby_class_name
+      classname_def = ''
+    else # ruby_class == nil
+      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
+        if Object.const_defined?(std_class)
+          Object.const_get(std_class)  # auto_load
+          ruby_class = WidgetClassNames[tk_class]
+        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
+        gen_class_name = ruby_class_name
+        classname_def = ''
+      else
+        # unknown
+        ruby_class_name = 'TkWindow'
+        gen_class_name = 'TkWidget_' + tk_class
+        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
+      end
+    end
+
+###################################
+=begin
+    if ruby_class = WidgetClassNames[tk_class]
+      ruby_class_name = ruby_class.name
+      # gen_class_name = ruby_class_name + 'GeneratedOnTk'
+      gen_class_name = ruby_class_name
+      classname_def = ''
+    else
+      mod = TkExtlibAutoloadModule.find{|m| m.const_defined?(tk_class)}
+      if mod
+        ruby_class_name = mod.name + '::' + tk_class
+        gen_class_name = ruby_class_name
+        classname_def = ''
+      elsif Object.const_defined?('Tk' + tk_class)
+        ruby_class_name = 'Tk' + tk_class
+        # gen_class_name = ruby_class_name + 'GeneratedOnTk'
+        gen_class_name = ruby_class_name
+        classname_def = ''
+      else
+        ruby_class_name = 'TkWindow'
+        # gen_class_name = ruby_class_name + tk_class + 'GeneratedOnTk'
+        gen_class_name = 'TkWidget_' + tk_class
+        classname_def = "WidgetClassName = '#{tk_class}'.freeze"
+      end
+    end
+=end
+
+=begin
+    unless Object.const_defined? gen_class_name
+      Object.class_eval "class #{gen_class_name}<#{ruby_class_name}
+                           #{classname_def}
+                         end"
+    end
+    Object.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
+                                             'without_creating'=>true)"
+=end
+    base = Object
+    gen_class_name.split('::').each{|klass|
+      next if klass == ''
+      if base.const_defined?(klass)
+        base = base.class_eval klass
+      else
+        base = base.class_eval "class #{klass}<#{ruby_class_name}
+                                  #{classname_def}
+                                end
+                                #{klass}"
+      end
+    }
+    base.class_eval "#{gen_class_name}.new('widgetname'=>'#{path}',
+                                           'without_creating'=>true)"
+  end
+  private :_genobj_for_tkwidget
+  module_function :_genobj_for_tkwidget
+
+  def _at(x,y=nil)
+    if y
+      "@#{Integer(x)},#{Integer(y)}"
+    else
+      "@#{Integer(x)}"
+    end
+  end
+  module_function :_at
+
+  def tk_tcl2ruby(val, enc_mode = false, listobj = true)
+=begin
+    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
+      #return Tk_CMDTBL[$1]
+      return TkCore::INTERP.tk_cmd_tbl[$1]
+      #cmd_obj = TkCore::INTERP.tk_cmd_tbl[$1]
+      #if cmd_obj.kind_of?(Proc) || cmd_obj.kind_of?(Method)
+      #  cmd_obj
+      #else
+      #  cmd_obj.cmd
+      #end
+    end
+=end
+    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+      return TkCore::INTERP.tk_cmd_tbl[$4]
+    end
+    #if val.include? ?\s
+    #  return val.split.collect{|v| tk_tcl2ruby(v)}
+    #end
+    case val
+    when /\A@font\S+\z/
+      TkFont.get_obj(val)
+    when /\A-?\d+\z/
+      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] : _genobj_for_tkwidget(val)
+    when /\Ai(_\d+_)?\d+\z/
+      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 /\\ /
+      val.gsub(/\\ /, ' ')
+    when /[^\\] /
+      if listobj
+        #tk_split_escstr(val).collect{|elt|
+        #  tk_tcl2ruby(elt, enc_mode, listobj)
+        #}
+        val = _toUTF8(val) unless enc_mode
+        tk_split_escstr(val, false, false).collect{|elt|
+          tk_tcl2ruby(elt, true, listobj)
+        }
+      elsif enc_mode
+        _fromUTF8(val)
+      else
+        val
+      end
+    else
+      if enc_mode
+        _fromUTF8(val)
+      else
+        val
+      end
+    end
+  end
+
+  private :tk_tcl2ruby
+  module_function :tk_tcl2ruby
+  #private_class_method :tk_tcl2ruby
+
+unless const_defined?(:USE_TCLs_LIST_FUNCTIONS)
+  USE_TCLs_LIST_FUNCTIONS = true
+end
+
+if USE_TCLs_LIST_FUNCTIONS
+  ###########################################################################
+  # use Tcl function version of split_list
+  ###########################################################################
+
+  def tk_split_escstr(str, src_enc=true, dst_enc=true)
+    str = _toUTF8(str) if src_enc
+    if dst_enc
+      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
+    else
+      TkCore::INTERP._split_tklist(str)
+    end
+  end
+
+  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
+    # return [] if str == ""
+    # list = TkCore::INTERP._split_tklist(str)
+    str = _toUTF8(str) if src_enc
+
+    if depth == 0
+      return "" if str == ""
+      list = [str]
+    else
+      return [] if str == ""
+      list = TkCore::INTERP._split_tklist(str)
+    end
+    if list.size == 1
+      # tk_tcl2ruby(list[0], nil, false)
+      tk_tcl2ruby(list[0], dst_enc, false)
+    else
+      list.collect{|token| tk_split_sublist(token, depth - 1, false, dst_enc)}
+    end
+  end
+
+  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    str = _toUTF8(str) if src_enc
+    TkCore::INTERP._split_tklist(str).map!{|token|
+      tk_split_sublist(token, depth - 1, false, dst_enc)
+    }
+  end
+
+  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
+    #lst = TkCore::INTERP._split_tklist(str)
+    #if (lst.size == 1 && lst =~ /^\{.*\}$/)
+    #  TkCore::INTERP._split_tklist(str[1..-2])
+    #else
+    #  lst
+    #end
+
+    str = _toUTF8(str) if src_enc
+    if dst_enc
+      TkCore::INTERP._split_tklist(str).map!{|s| _fromUTF8(s)}
+    else
+      TkCore::INTERP._split_tklist(str)
+    end
+  end
+
+  def array2tk_list(ary, enc=nil)
+    return "" if ary.size == 0
+
+    sys_enc = TkCore::INTERP.encoding
+    sys_enc = TclTkLib.encoding_system unless sys_enc
+
+    dst_enc = (enc == nil)? sys_enc: enc
+
+    dst = ary.collect{|e|
+      if e.kind_of? Array
+        s = array2tk_list(e, enc)
+      elsif e.kind_of? Hash
+        tmp_ary = []
+        #e.each{|k,v| tmp_ary << k << v }
+        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
+        s = array2tk_list(tmp_ary, enc)
+      else
+        s = _get_eval_string(e, enc)
+      end
+
+      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
+        dst_enc = true if s_enc != dst_enc
+      end
+
+      s
+    }
+
+    if sys_enc && dst_enc
+      dst.map!{|s| _toUTF8(s)}
+      ret = TkCore::INTERP._merge_tklist(*dst)
+      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
+      TkCore::INTERP._merge_tklist(*dst)
+    end
+  end
+
+else
+  ###########################################################################
+  # use Ruby script version of split_list (traditional methods)
+  ###########################################################################
+
+  def tk_split_escstr(str, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    list = []
+    token = nil
+    escape = false
+    brace = 0
+    str.split('').each {|c|
+      brace += 1 if c == '{' && !escape
+      brace -= 1 if c == '}' && !escape
+      if brace == 0 && c == ' ' && !escape
+        list << token.gsub(/^\{(.*)\}$/, '\1') if token
+        token = nil
+      else
+        token = (token || "") << c
+      end
+      escape = (c == '\\' && !escape)
+    }
+    list << token.gsub(/^\{(.*)\}$/, '\1') if token
+    list
+  end
+
+  def tk_split_sublist(str, depth=-1, src_enc=true, dst_enc=true)
+    #return [] if str == ""
+    #return [tk_split_sublist(str[1..-2])] if str =~ /^\{.*\}$/
+    #list = tk_split_escstr(str)
+    if depth == 0
+      return "" if str == ""
+      str = str[1..-2] if str =~ /^\{.*\}$/
+      list = [str]
+    else
+      return [] if str == []
+      return [tk_split_sublist(str[1..-2], depth - 1)] if str =~ /^\{.*\}$/
+      list = tk_split_escstr(str)
+    end
+    if list.size == 1
+      tk_tcl2ruby(list[0], nil, false)
+    else
+      list.collect{|token| tk_split_sublist(token, depth - 1)}
+    end
+  end
+
+  def tk_split_list(str, depth=0, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    tk_split_escstr(str).collect{|token|
+      tk_split_sublist(token, depth - 1)
+    }
+  end
+
+  def tk_split_simplelist(str, src_enc=true, dst_enc=true)
+    return [] if str == ""
+    list = []
+    token = nil
+    escape = false
+    brace = 0
+    str.split('').each {|c|
+      if c == '\\' && !escape
+        escape = true
+        token = (token || "") << c if brace > 0
+        next
+      end
+      brace += 1 if c == '{' && !escape
+      brace -= 1 if c == '}' && !escape
+      if brace == 0 && c == ' ' && !escape
+        list << token.gsub(/^\{(.*)\}$/, '\1') if token
+        token = nil
+      else
+        token = (token || "") << c
+      end
+      escape = false
+    }
+    list << token.gsub(/^\{(.*)\}$/, '\1') if token
+    list
+  end
+
+  def array2tk_list(ary, enc=nil)
+    ary.collect{|e|
+      if e.kind_of? Array
+        "{#{array2tk_list(e, enc)}}"
+      elsif e.kind_of? Hash
+        # "{#{e.to_a.collect{|ee| array2tk_list(ee)}.join(' ')}}"
+        e.each{|k,v| tmp_ary << "-#{_get_eval_string(k)}" << v }
+        array2tk_list(tmp_ary, enc)
+      else
+        s = _get_eval_string(e, enc)
+        (s.index(/\s/) || s.size == 0)? "{#{s}}": s
+      end
+    }.join(" ")
+  end
+end
+
+  private :tk_split_escstr, :tk_split_sublist
+  private :tk_split_list, :tk_split_simplelist
+  private :array2tk_list
+
+  module_function :tk_split_escstr, :tk_split_sublist
+  module_function :tk_split_list, :tk_split_simplelist
+  module_function :array2tk_list
+
+  private_class_method :tk_split_escstr, :tk_split_sublist
+  private_class_method :tk_split_list, :tk_split_simplelist
+#  private_class_method :array2tk_list
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _symbolkey2str(keys)
+    h = {}
+    keys.each{|key,value| h[key.to_s] = value}
+    h
+  end
+  private :_symbolkey2str
+  module_function :_symbolkey2str
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  # def hash_kv(keys, enc_mode = nil, conf = [], flat = false)
+  def hash_kv(keys, enc_mode = nil, conf = nil)
+    # Hash {key=>val, key=>val, ... } or Array [ [key, val], [key, val], ... ]
+    #     ==> Array ['-key', val, '-key', val, ... ]
+    dst = []
+    if keys and keys != None
+      keys.each{|k, v|
+        #dst.push("-#{k}")
+        dst.push('-' + k.to_s)
+        if v != None
+          # v = _get_eval_string(v, enc_mode) if (enc_mode || flat)
+          v = _get_eval_string(v, enc_mode) if enc_mode
+          dst.push(v)
+        end
+      }
+    end
+    if conf
+      conf + dst
+    else
+      dst
+    end
+  end
+  private :hash_kv
+  module_function :hash_kv
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def bool(val)
+    case val
+    when "1", 1, 'yes', 'true'
+      true
+    else
+      false
+    end
+  end
+
+  def number(val)
+    case val
+    when /^-?\d+$/
+      val.to_i
+    when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+      val.to_f
+    else
+      fail(ArgumentError, "invalid value for Number:'#{val}'")
+    end
+  end
+  def string(val)
+    if val == "{}"
+      ''
+    elsif val[0] == ?{ && val[-1] == ?}
+      val[1..-2]
+    else
+      val
+    end
+  end
+  def num_or_str(val)
+    begin
+      number(val)
+    rescue ArgumentError
+      string(val)
+    end
+  end
+=end
+
+  def list(val, depth=0, enc=true)
+    tk_split_list(val, depth, enc, enc)
+  end
+  def simplelist(val, src_enc=true, dst_enc=true)
+    tk_split_simplelist(val, src_enc, dst_enc)
+  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] : _genobj_for_tkwidget(val)
+    else
+      nil
+    end
+  end
+  def image_obj(val)
+    if val =~ /^i(_\d+_)?\d+$/
+      TkImage::Tk_IMGTBL.mutex.synchronize{
+        TkImage::Tk_IMGTBL[val]? TkImage::Tk_IMGTBL[val] : val
+      }
+    else
+      val
+    end
+  end
+  def procedure(val)
+=begin
+    if val =~ /^rb_out\S* (c(_\d+_)?\d+)/
+      #Tk_CMDTBL[$1]
+      #TkCore::INTERP.tk_cmd_tbl[$1]
+      TkCore::INTERP.tk_cmd_tbl[$1].cmd
+=end
+    if val =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+      return TkCore::INTERP.tk_cmd_tbl[$4].cmd
+    else
+      #nil
+      val
+    end
+  end
+  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',
+            *(opts.collect{|opt|
+                opt = opt.to_s
+                (opt[0] == ?-)? opt: '-' << opt
+              } << str))
+  end
+
+  def _toUTF8(str, encoding = nil)
+    TkCore::INTERP._toUTF8(str, encoding)
+  end
+  def _fromUTF8(str, encoding = nil)
+    TkCore::INTERP._fromUTF8(str, encoding)
+  end
+  private :_toUTF8, :_fromUTF8
+  module_function :_toUTF8, :_fromUTF8
+
+  def _callback_entry_class?(cls)
+    cls <= Proc || cls <= Method || cls <= TkCallbackEntry
+  end
+  private :_callback_entry_class?
+  module_function :_callback_entry_class?
+
+  def _callback_entry?(obj)
+    obj.kind_of?(Proc) || obj.kind_of?(Method) || obj.kind_of?(TkCallbackEntry)
+  end
+  private :_callback_entry?
+  module_function :_callback_entry?
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _get_eval_string(str, enc_mode = nil)
+    return nil if str == None
+    if str.kind_of?(TkObject)
+      str = str.path
+    elsif str.kind_of?(String)
+      str = _toUTF8(str) if enc_mode
+    elsif str.kind_of?(Symbol)
+      str = str.id2name
+      str = _toUTF8(str) if enc_mode
+    elsif str.kind_of?(Hash)
+      str = hash_kv(str, enc_mode).join(" ")
+    elsif str.kind_of?(Array)
+      str = array2tk_list(str)
+      str = _toUTF8(str) if enc_mode
+    elsif str.kind_of?(Proc)
+      str = install_cmd(str)
+    elsif str == nil
+      str = ""
+    elsif str == false
+      str = "0"
+    elsif str == true
+      str = "1"
+    elsif (str.respond_to?(:to_eval))
+      str = str.to_eval()
+      str = _toUTF8(str) if enc_mode
+    else
+      str = str.to_s() || ''
+      unless str.kind_of? String
+        fail RuntimeError, "fail to convert the object to a string"
+      end
+      str = _toUTF8(str) if enc_mode
+    end
+    return str
+  end
+=end
+=begin
+  def _get_eval_string(obj, enc_mode = nil)
+    case obj
+    when Numeric
+      obj.to_s
+    when String
+      (enc_mode)? _toUTF8(obj): obj
+    when Symbol
+      (enc_mode)? _toUTF8(obj.id2name): obj.id2name
+    when TkObject
+      obj.path
+    when Hash
+      hash_kv(obj, enc_mode).join(' ')
+    when Array
+      (enc_mode)? _toUTF8(array2tk_list(obj)): array2tk_list(obj)
+    when Proc, Method, TkCallbackEntry
+      install_cmd(obj)
+    when false
+      '0'
+    when true
+      '1'
+    when nil
+      ''
+    when None
+      nil
+    else
+      if (obj.respond_to?(:to_eval))
+        (enc_mode)? _toUTF8(obj.to_eval): obj.to_eval
+      else
+        begin
+          obj = obj.to_s || ''
+        rescue
+          fail RuntimeError, "fail to convert object '#{obj}' to string"
+        end
+        (enc_mode)? _toUTF8(obj): obj
+      end
+    end
+  end
+  private :_get_eval_string
+  module_function :_get_eval_string
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _get_eval_enc_str(obj)
+    return obj if obj == None
+    _get_eval_string(obj, true)
+  end
+  private :_get_eval_enc_str
+  module_function :_get_eval_enc_str
+=end
+
+=begin
+  ### --> obsolete
+  def ruby2tcl(v, enc_mode = nil)
+    if v.kind_of?(Hash)
+      v = hash_kv(v)
+      v.flatten!
+      v.collect{|e|ruby2tcl(e, enc_mode)}
+    else
+      _get_eval_string(v, enc_mode)
+    end
+  end
+  private :ruby2tcl
+=end
+
+=begin
+  ### --> definition is moved to TkUtil module
+  def _conv_args(args, enc_mode, *src_args)
+    conv_args = []
+    src_args.each{|arg|
+      conv_args << _get_eval_string(arg, enc_mode) unless arg == None
+      # if arg.kind_of?(Hash)
+      # arg.each{|k, v|
+      #   args << '-' + k.to_s
+      #   args << _get_eval_string(v, enc_mode)
+      # }
+      # elsif arg != None
+      #   args << _get_eval_string(arg, enc_mode)
+      # end
+    }
+    args + conv_args
+  end
+  private :_conv_args
+=end
+
+  def _curr_cmd_id
+    #id = format("c%.4d", Tk_IDs[0])
+    id = "c" + TkCore::INTERP._ip_id_ + TkComm::Tk_IDs[0]
+  end
+  def _next_cmd_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 TkComm.install_cmd(cmd, local_cmdtbl=nil)
+    return '' if cmd == ''
+    begin
+      ns = TkCore::INTERP._invoke_without_enc('namespace', 'current')
+      ns = nil if ns == '::' # for backward compatibility
+    rescue
+      # probably, Tcl7.6
+      ns = nil
+    end
+    id = _next_cmd_id
+    #Tk_CMDTBL[id] = cmd
+    if cmd.kind_of?(TkCallbackEntry)
+      TkCore::INTERP.tk_cmd_tbl[id] = cmd
+    else
+      TkCore::INTERP.tk_cmd_tbl[id] = TkCore::INTERP.get_cb_entry(cmd)
+    end
+    @cmdtbl = [] unless defined? @cmdtbl
+    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
+    else
+      'rb_out' << TkCore::INTERP._ip_id_ << ' ' << id
+    end
+  end
+  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
+  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)
+    if !name or name == ''
+      #name = format("w%.4d", Tk_IDs[1])
+      #Tk_IDs[1] += 1
+      name = "w" + Tk_IDs[1]
+      Tk_IDs[1].succ!
+    end
+    if name[0] == ?.
+      @path = name.dup
+    elsif !ppath or ppath == "."
+      @path = Kernel.format(".%s", name);
+    else
+      @path = Kernel.format("%s.%s", ppath, name)
+    end
+    #Tk_WINDOWS[@path] = self
+    TkCore::INTERP.tk_windows[@path] = self
+  end
+=end
+  def install_win(ppath,name=nil)
+    if name
+      if name == ''
+        raise ArgumentError, "invalid wiget-name '#{name}'"
+      end
+      if name[0] == ?.
+        @path = '' + name
+        @path.freeze
+        return TkCore::INTERP.tk_windows[@path] = self
+      end
+    else
+      Tk_IDs.mutex.synchronize{
+        name = "w" + TkCore::INTERP._ip_id_ + Tk_IDs[1]
+        Tk_IDs[1].succ!
+      }
+    end
+    if !ppath or ppath == '.'
+      @path = '.' + name
+    else
+      @path = ppath + '.' + name
+    end
+    @path.freeze
+    TkCore::INTERP.tk_windows[@path] = self
+  end
+
+  def uninstall_win()
+    #Tk_WINDOWS.delete(@path)
+    TkCore::INTERP.tk_windows.delete(@path)
+  end
+  private :install_win, :uninstall_win
+
+  def _epath(win)
+    if win.kind_of?(TkObject)
+      win.epath
+    elsif win.respond_to?(:epath)
+      win.epath
+    else
+      win
+    end
+  end
+  private :_epath
+end
+
+# define TkComm module (step 2: event binding)
+module TkComm
+  include TkEvent
+  extend TkEvent
+
+  def tk_event_sequence(context)
+    if context.kind_of? TkVirtualEvent
+      context = context.path
+    end
+    if context.kind_of? Array
+      context = context.collect{|ev|
+        if ev.kind_of? TkVirtualEvent
+          ev.path
+        else
+          ev
+        end
+      }.join("><")
+    end
+    if /,/ =~ context
+      context = context.split(/\s*,\s*/).join("><")
+    else
+      context
+    end
+  end
+
+  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)}>",
+                              mode + id]))
+    rescue
+      uninstall_cmd(id) if cmd
+      fail
+    end
+  end
+
+  def _bind(what, context, cmd, *args)
+    _bind_core('', what, context, cmd, *args)
+  end
+
+  def _bind_append(what, context, cmd, *args)
+    _bind_core('+', what, context, cmd, *args)
+  end
+
+  def _bind_remove(what, context)
+    tk_call_without_enc(*(what + ["<#{tk_event_sequence(context)}>", '']))
+  end
+
+  def _bindinfo(what, context=nil)
+    if context
+      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]
+          [TkCore::INTERP.tk_cmd_tbl[$1], $2]
+=end
+        if cmdline =~ /rb_out\S*(?:\s+(::\S*|[{](::.*)[}]|["](::.*)["]))? (c(_\d+_)?(\d+))/
+          [TkCore::INTERP.tk_cmd_tbl[$4], $5]
+        else
+          cmdline
+        end
+      }
+    else
+      tk_split_simplelist(tk_call_without_enc(*what)).collect!{|seq|
+        l = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
+          case (subseq)
+          when /^<<[^<>]+>>$/
+            TkVirtualEvent.getobj(subseq[1..-2])
+          when /^<[^<>]+>$/
+            subseq[1..-2]
+          else
+            subseq.split('')
+          end
+        }.flatten
+        (l.size == 1) ? l[0] : l
+      }
+    end
+  end
+
+  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)}>",
+                              mode + id]))
+    rescue
+      uninstall_cmd(id) if cmd
+      fail
+    end
+  end
+
+  def _bind_for_event_class(klass, what, context, cmd, *args)
+    _bind_core_for_event_class(klass, '', what, context, cmd, *args)
+  end
+
+  def _bind_append_for_event_class(klass, what, context, cmd, *args)
+    _bind_core_for_event_class(klass, '+', what, context, cmd, *args)
+  end
+
+  def _bind_remove_for_event_class(klass, what, context)
+    _bind_remove(what, context)
+  end
+
+  def _bindinfo_for_event_class(klass, what, context=nil)
+    _bindinfo(what, context)
+  end
+
+  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,
+          :_bindinfo_for_event_class
+
+  #def bind(tagOrClass, context, cmd=Proc.new, *args)
+  #  _bind(["bind", tagOrClass], context, cmd, *args)
+  #  tagOrClass
+  #end
+  def bind(tagOrClass, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind(["bind", tagOrClass], context, cmd, *args)
+    tagOrClass
+  end
+
+  #def bind_append(tagOrClass, context, cmd=Proc.new, *args)
+  #  _bind_append(["bind", tagOrClass], context, cmd, *args)
+  #  tagOrClass
+  #end
+  def bind_append(tagOrClass, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append(["bind", tagOrClass], context, cmd, *args)
+    tagOrClass
+  end
+
+  def bind_remove(tagOrClass, context)
+    _bind_remove(['bind', tagOrClass], context)
+    tagOrClass
+  end
+
+  def bindinfo(tagOrClass, context=nil)
+    _bindinfo(['bind', tagOrClass], context)
+  end
+
+  #def bind_all(context, cmd=Proc.new, *args)
+  #  _bind(['bind', 'all'], context, cmd, *args)
+  #  TkBindTag::ALL
+  #end
+  def bind_all(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind(['bind', 'all'], context, cmd, *args)
+    TkBindTag::ALL
+  end
+
+  #def bind_append_all(context, cmd=Proc.new, *args)
+  #  _bind_append(['bind', 'all'], context, cmd, *args)
+  #  TkBindTag::ALL
+  #end
+  def bind_append_all(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append(['bind', 'all'], context, cmd, *args)
+    TkBindTag::ALL
+  end
+
+  def bind_remove_all(context)
+    _bind_remove(['bind', 'all'], context)
+    TkBindTag::ALL
+  end
+
+  def bindinfo_all(context=nil)
+    _bindinfo(['bind', 'all'], context)
+  end
+end
+
+
+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
+    else
+      #name = nil
+      name = $0
+    end
+    if self.const_defined? :IP_OPTS
+      if IP_OPTS.kind_of?(Hash)
+        opts = hash_kv(IP_OPTS).join(' ')
+      else
+        opts = IP_OPTS.to_s
+      end
+    else
+      opts = ''
+    end
+
+    # 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
+            #  ----------------------------------------------------------
+            #
+            # *** ADD (2010/07/05) ***
+            #  The value of TclTkLib::WINDOWING_SYSTEM is defined at compiling.
+            #  If it is inconsistent with linked DLL, please call the following
+            #  before "require 'tk'".
+            #  ----------------------------------------------------------
+            #  require 'tcltklib'
+            #  module TclTkLib
+            #    remove_const :WINDOWING_SYSTEM
+            #    WINDOWING_SYSTEM = 'x11' # or 'aqua'
+            #  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 = 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"
+        end
+        super(idx,val)
+      end
+
+      @tk_windows = TkUtil.untrust({})
+
+      @tk_table_list = TkUtil.untrust([])
+
+      @init_ip_env  = TkUtil.untrust([])  # table of Procs
+      @add_tk_procs = TkUtil.untrust([])  # 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
+          def inspect
+            sprintf("#<Class(TkCallbackEntry):%0x>", self.__id__)
+          end
+          alias to_s inspect
+        end
+
+        def initialize(ip, cmd)
+          @ip = ip
+          @cmd = cmd
+        end
+        attr_reader :ip, :cmd
+        def call(*args)
+          @ip.cb_eval(@cmd, *args)
+        end
+        def inspect
+          sprintf("#<cb_entry:%0x>", self.__id__)
+        end
+        alias to_s inspect
+      }.freeze
+    }
+
+    def INTERP.cb_entry_class
+      @cb_entry_class
+    end
+    def INTERP.tk_cmd_tbl
+      @tk_cmd_tbl
+    end
+    def INTERP.tk_windows
+      @tk_windows
+    end
+
+    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)
+      end
+    end
+
+    def INTERP.tk_object_table(id)
+      @tk_table_list[id]
+    end
+    def INTERP.create_table
+      id = @tk_table_list.size
+      (tbl = {}).tainted? || TkUtil.untrust(tbl)
+      @tk_table_list << tbl
+#      obj = Object.new
+#      obj.instance_eval <<-EOD
+#        def self.method_missing(m, *args)
+#         TkCore::INTERP.tk_object_table(#{id}).send(m, *args)
+#        end
+#      EOD
+#      return obj
+      Tk_OBJECT_TABLE.new(id)
+    end
+
+    def INTERP.get_cb_entry(cmd)
+      @cb_entry_class.new(__getip, cmd).freeze
+    end
+    def INTERP.cb_eval(cmd, *args)
+      TkUtil._get_eval_string(TkUtil.eval_cmd(cmd, *args))
+    end
+
+    def INTERP.init_ip_env(script = Proc.new)
+      @init_ip_env << script
+      script.call(self)
+    end
+    def INTERP.add_tk_procs(name, args = nil, body = nil)
+      if name.kind_of?(Array)
+        name.each{|param| self.add_tk_procs(*param)}
+      else
+        name = name.to_s
+        @add_tk_procs << [name, args, body]
+        self._invoke('proc', name, args, body) if args && body
+      end
+    end
+    def INTERP.remove_tk_procs(*names)
+      names.each{|name|
+        name = name.to_s
+        @add_tk_procs.delete_if{|elem|
+          elem.kind_of?(Array) && elem[0].to_s == name
+        }
+        #self._invoke('rename', name, '')
+        self.__invoke__('rename', name, '')
+      }
+    end
+    def INTERP.init_ip_internal
+      ip = self
+      @init_ip_env.each{|script| script.call(ip)}
+      @add_tk_procs.each{|name,args,body| ip._invoke('proc',name,args,body)}
+    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',
+                             "<#{WIDGET_DESTROY_HOOK}>", '<Destroy>')
+  INTERP._invoke_without_enc('bind', 'all', "<#{WIDGET_DESTROY_HOOK}>",
+                             install_cmd(proc{|path|
+                                unless TkCore::INTERP.deleted?
+                                  begin
+                                    if (widget=TkCore::INTERP.tk_windows[path])
+                                      if widget.respond_to?(:__destroy_hook__)
+                                        widget.__destroy_hook__
+                                      end
+                                    end
+                                  rescue Exception=>e
+                                      p e if $DEBUG
+                                  end
+                                end
+                             }) << ' %W')
+
+  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] {
+      set cmd {namespace eval $ns {ruby_cmd TkCore callback} $args}
+    } else {
+      set cmd {eval {ruby_cmd TkCore callback} $ns $args}
+    }
+    if {[set st [catch $cmd ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+=begin
+  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
+    if {[set st [catch {eval {ruby_cmd TkCore callback} $args} ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+=end
+=begin
+  INTERP.add_tk_procs('rb_out', 'args', <<-'EOL')
+    #regsub -all {\\} $args {\\\\} args
+    #regsub -all {!} $args {\\!} args
+    #regsub -all "{" $args "\\{" args
+    regsub -all {(\\|!|\{|\})} $args {\\\1} args
+    if {[set st [catch {ruby [format "TkCore.callback %%Q!%s!" $args]} ret]] != 0} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+=end
+
+  at_exit{ INTERP.remove_tk_procs(TclTkLib::FINALIZE_PROC_NAME) }
+
+  EventFlag = TclTkLib::EventFlag
+
+  def callback_break
+    fail TkCallbackBreak, "Tk callback returns 'break' status"
+  end
+
+  def callback_continue
+    fail TkCallbackContinue, "Tk callback returns 'continue' status"
+  end
+
+  def callback_return
+    fail TkCallbackReturn, "Tk callback returns 'return' status"
+  end
+
+  def TkCore.callback(*arg)
+    begin
+      if TkCore::INTERP.tk_cmd_tbl.kind_of?(Hash)
+        #TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
+        normal_ret = false
+        ret = catch(:IRB_EXIT) do  # IRB hack
+          retval = TkCore::INTERP.tk_cmd_tbl[arg.shift].call(*arg)
+          normal_ret = true
+          retval
+        end
+        unless normal_ret
+          # catch IRB_EXIT
+          exit(ret)
+        end
+        ret
+      end
+    rescue SystemExit=>e
+      exit(e.status)
+    rescue Interrupt=>e
+      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")) +
+              "\n---< backtrace of Tk side >-------"
+        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") +
+              "\n---< backtrace of Tk side >-------"
+      end
+      # TkCore::INTERP._set_global_var('errorInfo', msg)
+      # fail(e)
+      fail(e, msg)
+    end
+  end
+=begin
+  def TkCore.callback(arg_str)
+    # 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],
+    #                        *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") +
+               "\n---< backtrace of Tk side >-------")
+    end
+#=begin
+#    cb_obj = TkCore::INTERP.tk_cmd_tbl[arg.shift]
+#    unless $DEBUG
+#      cb_obj.call(*arg)
+#    else
+#      begin
+#       raise 'check backtrace'
+#      rescue
+#       # ignore backtrace before 'callback'
+#       pos = -($!.backtrace.size)
+#      end
+#      begin
+#       cb_obj.call(*arg)
+#      rescue
+#       trace = $!.backtrace
+#       raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
+#                 "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
+#      end
+#    end
+#=end
+  end
+=end
+
+  def load_cmd_on_ip(tk_cmd)
+    bool(tk_call('auto_load', tk_cmd))
+  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
+
+    myid = _curr_cmd_id
+    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
+
+    Thread.critical = crit_bup
+
+    tk_call_without_enc("after",ms,cmdid)  # return id
+#    return
+#    if false #defined? Thread
+#      Thread.start do
+#       ms = Float(ms)/1000
+#       ms = 10 if ms == 0
+#       sleep ms/1000
+#       cmd.call
+#      end
+#    else
+#      cmdid = install_cmd(cmd)
+#      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
+
+    myid = _curr_cmd_id
+    cmdid = install_cmd(proc{ret = cmd.call;uninstall_cmd(myid); ret})
+
+    Thread.critical = crit_bup
+
+    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
+    tk_call_without_enc('tk', 'windowingsystem')
+  end
+
+  def scaling(scale=nil)
+    if scale
+      tk_call_without_enc('tk', 'scaling', scale)
+    else
+      Float(number(tk_call_without_enc('tk', 'scaling')))
+    end
+  end
+  def scaling_displayof(win, scale=nil)
+    if scale
+      tk_call_without_enc('tk', 'scaling', '-displayof', win, scale)
+    else
+      Float(number(tk_call_without_enc('tk', '-displayof', win, 'scaling')))
+    end
+  end
+
+  def inactive
+    Integer(tk_call_without_enc('tk', 'inactive'))
+  end
+  def inactive_displayof(win)
+    Integer(tk_call_without_enc('tk', 'inactive', '-displayof', win))
+  end
+  def reset_inactive
+    tk_call_without_enc('tk', 'inactive', 'reset')
+  end
+  def reset_inactive_displayof(win)
+    tk_call_without_enc('tk', 'inactive', '-displayof', win, 'reset')
+  end
+
+  def appname(name=None)
+    tk_call('tk', 'appname', name)
+  end
+
+  def appsend_deny
+    tk_call('rename', 'send', '')
+  end
+
+  def appsend(interp, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Tk commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
+    end
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if async
+      tk_call('send', '-async', '--', interp, *args)
+    else
+      tk_call('send', '--', interp, *args)
+    end
+  end
+
+  def rb_appsend(interp, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Ruby commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
+    end
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
+    # args.push(').to_s"')
+    # appsend(interp, async, 'ruby "(', *args)
+    args.push('}.call)"')
+    appsend(interp, async, 'ruby "TkComm._get_eval_string(proc{', *args)
+  end
+
+  def appsend_displayof(interp, win, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Tk commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Tk commands at level #{$SAFE}"
+    end
+    win = '.' if win == nil
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    if async
+      tk_call('send', '-async', '-displayof', win, '--', interp, *args)
+    else
+      tk_call('send', '-displayor', win, '--', interp, *args)
+    end
+  end
+
+  def rb_appsend_displayof(interp, win, async, *args)
+    if $SAFE >= 4
+      fail SecurityError, "cannot send Ruby commands at level 4"
+    elsif $SAFE >= 1 && args.find{|obj| obj.tainted?}
+      fail SecurityError, "cannot send tainted Ruby commands at level #{$SAFE}"
+    end
+    win = '.' if win == nil
+    if async != true && async != false && async != nil
+      args.unshift(async)
+      async = false
+    end
+    #args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"]/, '\\\\\&')}
+    args = args.collect!{|c| _get_eval_string(c).gsub(/[\[\]$"\\]/, '\\\\\&')}
+    # args.push(').to_s"')
+    # appsend_displayof(interp, win, async, 'ruby "(', *args)
+    args.push('}.call)"')
+    appsend(interp, win, async, 'ruby "TkComm._get_eval_string(proc{', *args)
+  end
+
+  def info(*args)
+    tk_call('info', *args)
+  end
+
+  def mainloop(check_root = true)
+    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?
+    # true  : current thread is mainloop
+    # nil   : there is no mainloop
+    # false : mainloop is running on the other thread
+    #         ( At then, it is dangerous to call Tk interpreter directly. )
+    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?
+    TclTkLib.mainloop_thread? != nil
+  end
+
+  def is_mainloop?
+    TclTkLib.mainloop_thread? == true
+  end
+
+  def mainloop_watchdog(check_root = true)
+    # watchdog restarts mainloop when mainloop is dead
+    TclTkLib.mainloop_watchdog(check_root)
+  end
+
+  def do_one_event(flag = TclTkLib::EventFlag::ALL)
+    TclTkLib.do_one_event(flag)
+  end
+
+  def set_eventloop_tick(timer_tick)
+    TclTkLib.set_eventloop_tick(timer_tick)
+  end
+
+  def get_eventloop_tick()
+    TclTkLib.get_eventloop_tick
+  end
+
+  def set_no_event_wait(wait)
+    TclTkLib.set_no_even_wait(wait)
+  end
+
+  def get_no_event_wait()
+    TclTkLib.get_no_eventloop_wait
+  end
+
+  def set_eventloop_weight(loop_max, no_event_tick)
+    TclTkLib.set_eventloop_weight(loop_max, no_event_tick)
+  end
+
+  def get_eventloop_weight()
+    TclTkLib.get_eventloop_weight
+  end
+
+  def restart(app_name = nil, keys = {})
+    TkCore::INTERP.init_ip_internal
+
+    tk_call('set', 'argv0', app_name) if app_name
+    if keys.kind_of?(Hash)
+      # tk_call('set', 'argc', keys.size * 2)
+      tk_call('set', 'argv', hash_kv(keys).join(' '))
+    end
+
+    INTERP.restart
+    nil
+  end
+
+  def event_generate(win, context, keys=nil)
+    #win = win.path if win.kind_of?(TkObject)
+    if context.kind_of?(TkEvent::Event)
+      context.generate(win, ((keys)? keys: {}))
+    elsif keys
+      tk_call_without_enc('event', 'generate', win,
+                          "<#{tk_event_sequence(context)}>",
+                          *hash_kv(keys, true))
+    else
+      tk_call_without_enc('event', 'generate', win,
+                          "<#{tk_event_sequence(context)}>")
+    end
+    nil
+  end
+
+  def messageBox(keys)
+    tk_call('tk_messageBox', *hash_kv(keys))
+  end
+
+  def getOpenFile(keys = nil)
+    tk_call('tk_getOpenFile', *hash_kv(keys))
+  end
+  def getMultipleOpenFile(keys = nil)
+    simplelist(tk_call('tk_getOpenFile', '-multiple', '1', *hash_kv(keys)))
+  end
+
+  def getSaveFile(keys = nil)
+    tk_call('tk_getSaveFile', *hash_kv(keys))
+  end
+  def getMultipleSaveFile(keys = nil)
+    simplelist(tk_call('tk_getSaveFile', '-multiple', '1', *hash_kv(keys)))
+  end
+
+  def chooseColor(keys = nil)
+    tk_call('tk_chooseColor', *hash_kv(keys))
+  end
+
+  def chooseDirectory(keys = nil)
+    tk_call('tk_chooseDirectory', *hash_kv(keys))
+  end
+
+  def _ip_eval_core(enc_mode, cmd_string)
+    case enc_mode
+    when nil
+      res = INTERP._eval(cmd_string)
+    when false
+      res = INTERP._eval_without_enc(cmd_string)
+    when true
+      res = INTERP._eval_with_enc(cmd_string)
+    end
+    if  INTERP._return_value() != 0
+      fail RuntimeError, res, error_at
+    end
+    return res
+  end
+  private :_ip_eval_core
+
+  def ip_eval(cmd_string)
+    _ip_eval_core(nil, cmd_string)
+  end
+
+  def ip_eval_without_enc(cmd_string)
+    _ip_eval_core(false, cmd_string)
+  end
+
+  def ip_eval_with_enc(cmd_string)
+    _ip_eval_core(true, cmd_string)
+  end
+
+  def _ip_invoke_core(enc_mode, *args)
+    case enc_mode
+    when false
+      res = INTERP._invoke_without_enc(*args)
+    when nil
+      res = INTERP._invoke(*args)
+    when true
+      res = INTERP._invoke_with_enc(*args)
+    end
+    if  INTERP._return_value() != 0
+      fail RuntimeError, res, error_at
+    end
+    return res
+  end
+  private :_ip_invoke_core
+
+  def ip_invoke(*args)
+    _ip_invoke_core(nil, *args)
+  end
+
+  def ip_invoke_without_enc(*args)
+    _ip_invoke_core(false, *args)
+  end
+
+  def ip_invoke_with_enc(*args)
+    _ip_invoke_core(true, *args)
+  end
+
+  def _tk_call_core(enc_mode, *args)
+    ### puts args.inspect if $DEBUG
+    #args.collect! {|x|ruby2tcl(x, enc_mode)}
+    #args.compact!
+    #args.flatten!
+    args = _conv_args([], enc_mode, *args)
+    puts 'invoke args => ' + args.inspect if $DEBUG
+    ### print "=> ", args.join(" ").inspect, "\n" if $DEBUG
+    begin
+      # 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 NameError => err
+      # err = $!
+      begin
+        args.unshift "unknown"
+        #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
+        fail err
+      end
+    end
+    if  INTERP._return_value() != 0
+      fail RuntimeError, res, error_at
+    end
+    ### print "==> ", res.inspect, "\n" if $DEBUG
+    return res
+  end
+  private :_tk_call_core
+
+  def tk_call(*args)
+    _tk_call_core(nil, *args)
+  end
+
+  def tk_call_without_enc(*args)
+    _tk_call_core(false, *args)
+  end
+
+  def tk_call_with_enc(*args)
+    _tk_call_core(true, *args)
+  end
+
+  def _tk_call_to_list_core(depth, arg_enc, val_enc, *args)
+    args = _conv_args([], arg_enc, *args)
+    val = _tk_call_core(false, *args)
+    if !depth.kind_of?(Integer) || depth == 0
+      tk_split_simplelist(val, false, val_enc)
+    else
+      tk_split_list(val, depth, false, val_enc)
+    end
+  end
+  #private :_tk_call_to_list_core
+
+  def tk_call_to_list(*args)
+    _tk_call_to_list_core(-1, nil, true, *args)
+  end
+
+  def tk_call_to_list_without_enc(*args)
+    _tk_call_to_list_core(-1, false, false, *args)
+  end
+
+  def tk_call_to_list_with_enc(*args)
+    _tk_call_to_list_core(-1, true, true, *args)
+  end
+
+  def tk_call_to_simplelist(*args)
+    _tk_call_to_list_core(0, nil, true, *args)
+  end
+
+  def tk_call_to_simplelist_without_enc(*args)
+    _tk_call_to_list_core(0, false, false, *args)
+  end
+
+  def tk_call_to_simplelist_with_enc(*args)
+    _tk_call_to_list_core(0, true, true, *args)
+  end
+end
+
+
+module Tk
+  include TkCore
+  extend Tk
+
+  TCL_VERSION = INTERP._invoke_without_enc("info", "tclversion").freeze
+  TCL_PATCHLEVEL = INTERP._invoke_without_enc("info", "patchlevel").freeze
+
+  major, minor = TCL_VERSION.split('.')
+  TCL_MAJOR_VERSION = major.to_i
+  TCL_MINOR_VERSION = minor.to_i
+
+  TK_VERSION  = INTERP._invoke_without_enc("set", "tk_version").freeze
+  TK_PATCHLEVEL  = INTERP._invoke_without_enc("set", "tk_patchLevel").freeze
+
+  major, minor = TK_VERSION.split('.')
+  TK_MAJOR_VERSION = major.to_i
+  TK_MINOR_VERSION = minor.to_i
+
+  JAPANIZED_TK = (INTERP._invoke_without_enc("info", "commands",
+                                             "kanji") != "").freeze
+
+  def Tk.const_missing(sym)
+    case(sym)
+    when :TCL_LIBRARY
+      INTERP._invoke_without_enc('global', 'tcl_library')
+      INTERP._invoke("set", "tcl_library").freeze
+
+    when :TK_LIBRARY
+      INTERP._invoke_without_enc('global', 'tk_library')
+      INTERP._invoke("set", "tk_library").freeze
+
+    when :LIBRARY
+      INTERP._invoke("info", "library").freeze
+
+    #when :PKG_PATH, :PACKAGE_PATH, :TCL_PACKAGE_PATH
+    #  INTERP._invoke_without_enc('global', 'tcl_pkgPath')
+    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_pkgPath'))
+
+    #when :LIB_PATH, :LIBRARY_PATH, :TCL_LIBRARY_PATH
+    #  INTERP._invoke_without_enc('global', 'tcl_libPath')
+    #  tk_split_simplelist(INTERP._invoke('set', 'tcl_libPath'))
+
+    when :PLATFORM, :TCL_PLATFORM
+      if $SAFE >= 4
+        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',
+                                                           'tcl_platform'))]
+
+    when :ENV
+      INTERP._invoke_without_enc('global', 'env')
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'env'))]
+
+    #when :AUTO_PATH   #<===
+    #  tk_split_simplelist(INTERP._invoke('set', 'auto_path'))
+
+    #when :AUTO_OLDPATH
+    #  tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
+
+    when :AUTO_INDEX
+      INTERP._invoke_without_enc('global', 'auto_index')
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', 'auto_index'))]
+
+    when :PRIV, :PRIVATE, :TK_PRIV
+      priv = {}
+      if INTERP._invoke_without_enc('info', 'vars', 'tk::Priv') != ""
+        var_nam = 'tk::Priv'
+      else
+        var_nam = 'tkPriv'
+      end
+      INTERP._invoke_without_enc('global', var_nam)
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get',
+                                               var_nam))].each{|k,v|
+        k.freeze
+        case v
+        when /^-?\d+$/
+          priv[k] = v.to_i
+        when /^-?\d+\.?\d*(e[-+]?\d+)?$/
+          priv[k] = v.to_f
+        else
+          priv[k] = v.freeze
+        end
+      }
+      priv
+
+    else
+      raise NameError, 'uninitialized constant Tk::' + sym.id2name
+    end
+  end
+
+  def Tk.errorInfo
+    INTERP._invoke_without_enc('global', 'errorInfo')
+    INTERP._invoke_without_enc('set', 'errorInfo')
+  end
+
+  def Tk.errorCode
+    INTERP._invoke_without_enc('global', 'errorCode')
+    code = tk_split_simplelist(INTERP._invoke_without_enc('set', 'errorCode'))
+    case code[0]
+    when 'CHILDKILLED', 'CHILDSTATUS', 'CHILDSUSP'
+      begin
+        pid = Integer(code[1])
+        code[1] = pid
+      rescue
+      end
+    end
+    code
+  end
+
+  def Tk.has_mainwindow?
+    INTERP.has_mainwindow?
+  end
+
+  def root
+    Tk::Root.new
+  end
+
+  def Tk.load_tclscript(file, enc=nil)
+    if enc
+      # TCL_VERSION >= 8.5
+      tk_call('source', '-encoding', enc, file)
+    else
+      tk_call('source', file)
+    end
+  end
+
+  def Tk.load_tcllibrary(file, pkg_name=None, interp=None)
+    tk_call('load', file, pkg_name, interp)
+  end
+
+  def Tk.unload_tcllibrary(*args)
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      nocomp = (keys['nocomplain'])? '-nocomplain': None
+      keeplib = (keys['keeplibrary'])? '-keeplibrary': None
+      tk_call('unload', nocomp, keeplib, '--', *args)
+    else
+      tk_call('unload', *args)
+    end
+  end
+
+  def Tk.pkgconfig_list(mod)
+    # Tk8.5 feature
+    if mod.kind_of?(Module)
+      if mod.respond_to?(:package_name)
+        pkgname = mod.package_name
+      elsif mod.const_defined?(:PACKAGE_NAME)
+        pkgname = mod::PACKAGE_NAME
+      else
+        fail NotImplementedError, 'may not be a module for a Tcl extension'
+      end
+    else
+      pkgname = mod.to_s
+    end
+
+    pkgname = '::' << pkgname unless pkgname =~ /^::/
+
+    tk_split_list(tk_call(pkgname + '::pkgconfig', 'list'))
+  end
+
+  def Tk.pkgconfig_get(mod, key)
+    # Tk8.5 feature
+    if mod.kind_of?(Module)
+      if mod.respond_to?(:package_name)
+        pkgname = mod.package_name
+      else
+        fail NotImplementedError, 'may not be a module for a Tcl extension'
+      end
+    else
+      pkgname = mod.to_s
+    end
+
+    pkgname = '::' << pkgname unless pkgname =~ /^::/
+
+    tk_call(pkgname + '::pkgconfig', 'get', key)
+  end
+
+  def Tk.tcl_pkgconfig_list
+    # Tk8.5 feature
+    Tk.pkgconfig_list('::tcl')
+  end
+
+  def Tk.tcl_pkgconfig_get(key)
+    # Tk8.5 feature
+    Tk.pkgconfig_get('::tcl', key)
+  end
+
+  def Tk.tk_pkgconfig_list
+    # Tk8.5 feature
+    Tk.pkgconfig_list('::tk')
+  end
+
+  def Tk.tk_pkgconfig_get(key)
+    # Tk8.5 feature
+    Tk.pkgconfig_get('::tk', key)
+  end
+
+  def Tk.bell(nice = false)
+    if nice
+      tk_call_without_enc('bell', '-nice')
+    else
+      tk_call_without_enc('bell')
+    end
+    nil
+  end
+
+  def Tk.bell_on_display(win, nice = false)
+    if nice
+      tk_call_without_enc('bell', '-displayof', win, '-nice')
+    else
+      tk_call_without_enc('bell', '-displayof', win)
+    end
+    nil
+  end
+
+  def Tk.destroy(*wins)
+    #tk_call_without_enc('destroy', *wins)
+    tk_call_without_enc('destroy', *(wins.collect{|win|
+                                       if win.kind_of?(TkWindow)
+                                         win.epath
+                                       else
+                                         win
+                                       end
+                                     }))
+  end
+
+  def Tk.exit
+    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
+  def Tk.pack_forget(*args)
+    TkPack.forget(*args)
+  end
+  def Tk.unpack(*args)
+    TkPack.forget(*args)
+  end
+
+  def Tk.grid(*args)
+    TkGrid.configure(*args)
+  end
+  def Tk.grid_forget(*args)
+    TkGrid.forget(*args)
+  end
+  def Tk.ungrid(*args)
+    TkGrid.forget(*args)
+  end
+
+  def Tk.place(*args)
+    TkPlace.configure(*args)
+  end
+  def Tk.place_forget(*args)
+    TkPlace.forget(*args)
+  end
+  def Tk.unplace(*args)
+    TkPlace.forget(*args)
+  end
+
+  def Tk.update(idle=nil)
+    if idle
+      tk_call_without_enc('update', 'idletasks')
+    else
+      tk_call_without_enc('update')
+    end
+  end
+  def Tk.update_idletasks
+    update(true)
+  end
+  def update(idle=nil)
+    # only for backward compatibility (This never be recommended to use)
+    Tk.update(idle)
+    self
+  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.
+  def Tk.thread_update(idle=nil)
+    if idle
+      tk_call_without_enc('thread_update', 'idletasks')
+    else
+      tk_call_without_enc('thread_update')
+    end
+  end
+  def Tk.thread_update_idletasks
+    thread_update(true)
+  end
+
+  def Tk.lower_window(win, below=None)
+    tk_call('lower', _epath(win), _epath(below))
+    nil
+  end
+  def Tk.raise_window(win, above=None)
+    tk_call('raise', _epath(win), _epath(above))
+    nil
+  end
+
+  def Tk.current_grabs(win = nil)
+    if win
+      window(tk_call_without_enc('grab', 'current', win))
+    else
+      tk_split_list(tk_call_without_enc('grab', 'current'))
+    end
+  end
+
+  def Tk.focus(display=nil)
+    if display == nil
+      window(tk_call_without_enc('focus'))
+    else
+      window(tk_call_without_enc('focus', '-displayof', display))
+    end
+  end
+
+  def Tk.focus_to(win, force=false)
+    if force
+      tk_call_without_enc('focus', '-force', win)
+    else
+      tk_call_without_enc('focus', win)
+    end
+  end
+
+  def Tk.focus_lastfor(win)
+    window(tk_call_without_enc('focus', '-lastfor', win))
+  end
+
+  def Tk.focus_next(win)
+    TkManageFocus.next(win)
+  end
+
+  def Tk.focus_prev(win)
+    TkManageFocus.prev(win)
+  end
+
+  def Tk.strictMotif(mode=None)
+    bool(tk_call_without_enc('set', 'tk_strictMotif', mode))
+  end
+
+  def Tk.show_kinsoku(mode='both')
+    begin
+      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
+        tk_split_simplelist(tk_call('kinsoku', 'show', mode))
+      end
+    rescue
+    end
+  end
+  def Tk.add_kinsoku(chars, mode='both')
+    begin
+      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
+        tk_split_simplelist(tk_call('kinsoku', 'add', mode,
+                                    *(chars.split(''))))
+      else
+        []
+      end
+    rescue
+      []
+    end
+  end
+  def Tk.delete_kinsoku(chars, mode='both')
+    begin
+      if /^8\.*/ === TK_VERSION  && JAPANIZED_TK
+        tk_split_simplelist(tk_call('kinsoku', 'delete', mode,
+                            *(chars.split(''))))
+      end
+    rescue
+    end
+  end
+
+  def Tk.toUTF8(str, encoding = nil)
+    _toUTF8(str, encoding)
+  end
+
+  def Tk.fromUTF8(str, encoding = nil)
+    _fromUTF8(str, encoding)
+  end
+end
+
+###########################################
+#  string with Tcl's encoding
+###########################################
+module Tk
+  def Tk.subst_utf_backslash(str)
+    Tk::EncodedString.subst_utf_backslash(str)
+  end
+  def Tk.subst_tk_backslash(str)
+    Tk::EncodedString.subst_tk_backslash(str)
+  end
+  def Tk.utf_to_backslash_sequence(str)
+    Tk::EncodedString.utf_to_backslash_sequence(str)
+  end
+  def Tk.utf_to_backslash(str)
+    Tk::EncodedString.utf_to_backslash_sequence(str)
+  end
+  def Tk.to_backslash_sequence(str)
+    Tk::EncodedString.to_backslash_sequence(str)
+  end
+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
+    def encoding=(name)
+      self.force_default_encoding = true  # for comaptibility
+      self.default_encoding = name
+    end
+
+    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
+
+    def _toUTF8(str, encoding = nil)
+      # decide encoding
+      if encoding
+        encoding = encoding.to_s
+      elsif str.kind_of?(Tk::EncodedString) && str.encoding != nil
+        encoding = str.encoding.to_s
+      elsif str.instance_variable_get(:@encoding)
+        encoding = str.instance_variable_get(:@encoding).to_s
+      elsif defined?(@encoding) && @encoding != nil
+        encoding = @encoding.to_s
+      else
+        encoding = __invoke('encoding', 'system')
+      end
+
+      # convert
+      case encoding
+      when 'utf-8', 'binary'
+        str
+      else
+        __toUTF8(str, encoding)
+      end
+    end
+
+    def _fromUTF8(str, encoding = nil)
+      unless encoding
+        if defined?(@encoding) && @encoding != nil
+          encoding = @encoding.to_s
+        else
+          encoding = __invoke('encoding', 'system')
+        end
+      end
+
+      if str.kind_of?(Tk::EncodedString)
+        if str.encoding == 'binary'
+          str
+        else
+          __fromUTF8(str, encoding)
+        end
+      elsif str.instance_variable_get(:@encoding).to_s == 'binary'
+        str
+      else
+        __fromUTF8(str, encoding)
+      end
+    end
+=end
+
+=begin
+    def _eval(cmd)
+      if defined?(@encoding) && @encoding != 'utf-8'
+        ret = if cmd.kind_of?(Tk::EncodedString)
+                case cmd.encoding
+                when 'utf-8', 'binary'
+                  __eval(cmd)
+                else
+                  __eval(_toUTF8(cmd, cmd.encoding))
+                end
+              elsif cmd.instance_variable_get(:@encoding) == 'binary'
+                __eval(cmd)
+              else
+                __eval(_toUTF8(cmd, @encoding))
+              end
+        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
+          ret
+        else
+          _fromUTF8(ret, @encoding)
+        end
+      else
+        __eval(cmd)
+      end
+    end
+
+    def _invoke(*cmds)
+      if defined?(@encoding) && @encoding != 'utf-8'
+        cmds = cmds.collect{|cmd|
+          if cmd.kind_of?(Tk::EncodedString)
+            case cmd.encoding
+            when 'utf-8', 'binary'
+              cmd
+            else
+              _toUTF8(cmd, cmd.encoding)
+            end
+          elsif cmd.instance_variable_get(:@encoding) == 'binary'
+            cmd
+          else
+            _toUTF8(cmd, @encoding)
+          end
+        }
+        ret = __invoke(*cmds)
+        if ret.kind_of?(String) && ret.instance_variable_get(:@encoding) == 'binary'
+          ret
+        else
+          _fromUTF8(ret, @encoding)
+        end
+      else
+        __invoke(*cmds)
+        end
+    end
+=end
+  end
+
+  module TclTkLib
+    class << self
+      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=(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_name
+        TkCore::INTERP.encoding
+      end
+      alias encoding encoding_name
+      alias default_encoding encoding_name
+
+      def encoding_obj
+        if Tk::WITH_ENCODING
+          Tk::Encoding.tcl2rb_encoding(TkCore::INTERP.encoding)
+        else
+          TkCore::INTERP.encoding
+        end
+      end
+    end
+  end
+
+  # 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
+    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
+      begin
+        Tk.encoding = Tk.encoding_system
+      rescue StandardError, NameError
+        Tk.encoding = 'utf-8'
+        Tk.encoding_system = 'utf-8'
+      end
+    end
+
+  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]
+
+=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
+
+    # 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
+
+    # setup Tk.encoding
+    enc_name = nil
+
+    begin
+      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 NameError
+      # ignore
+      enc_name = nil
+    rescue ArgumentError
+      enc_name = nil
+      fail ArgumentError,
+           "DEFAULT_TK_ENCODING has an unknown encoding #{default_def}"
+    end
+
+    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
+  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
+      def encoding
+        nil
+      end
+      def encoding_names
+        nil
+      end
+      def encoding_system
+        nil
+      end
+      def encoding_system=(enc)
+        nil
+      end
+
+      def encoding_convertfrom(str, enc=None)
+        str
+      end
+      alias encoding_convert_from encoding_convertfrom
+
+      def encoding_convertto(str, enc=None)
+        str
+      end
+      alias encoding_convert_to encoding_convertto
+      def encoding_dirs
+        nil
+      end
+      def encoding_dirs=(dir_array)
+        nil
+      end
+    end
+
+    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
+
+
+module TkBindCore
+  #def bind(context, cmd=Proc.new, *args)
+  #  Tk.bind(self, context, cmd, *args)
+  #end
+  def bind(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    Tk.bind(self, context, cmd, *args)
+  end
+
+  #def bind_append(context, cmd=Proc.new, *args)
+  #  Tk.bind_append(self, context, cmd, *args)
+  #end
+  def bind_append(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    Tk.bind_append(self, context, cmd, *args)
+  end
+
+  def bind_remove(context)
+    Tk.bind_remove(self, context)
+  end
+
+  def bindinfo(context=nil)
+    Tk.bindinfo(self, context)
+  end
+end
+
+
+module TkTreatFont
+  def __font_optkeys
+    ['font']
+  end
+  private :__font_optkeys
+
+  def __pathname
+    self.path
+  end
+  private :__pathname
+
+  ################################
+
+  def font_configinfo(key = nil)
+    optkeys = __font_optkeys
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __pathname.split(':')
+
+    if key
+      pathname = [win, tag, key].join(';')
+      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.init_widget_font(pathname, *__confinfo_cmd)
+    else
+      fonts = {}
+      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
+    end
+  end
+  alias fontobj font_configinfo
+
+  def font_configure(slot)
+    pathname = __pathname
+
+    slot = _symbolkey2str(slot)
+
+    __font_optkeys.each{|optkey|
+      optkey = optkey.to_s
+      l_optkey = 'latin' << optkey
+      a_optkey = 'ascii' << optkey
+      k_optkey = 'kanji' << optkey
+
+      if slot.key?(optkey)
+        fnt = slot.delete(optkey)
+        if fnt.kind_of?(TkFont)
+          slot.delete(l_optkey)
+          slot.delete(a_optkey)
+          slot.delete(k_optkey)
+
+          fnt.call_font_configure([pathname, optkey], *(__config_cmd << {}))
+          next
+        else
+          if fnt
+            if (slot.key?(l_optkey) ||
+                slot.key?(a_optkey) ||
+                slot.key?(k_optkey))
+              fnt = TkFont.new(fnt)
+
+              lfnt = slot.delete(l_optkey)
+              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+              kfnt = slot.delete(k_optkey)
+
+              fnt.latin_replace(lfnt) if lfnt
+              fnt.kanji_replace(kfnt) if kfnt
+
+              fnt.call_font_configure([pathname, optkey],
+                                      *(__config_cmd << {}))
+              next
+            else
+              fnt = hash_kv(fnt) if fnt.kind_of?(Hash)
+              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
+        end
+      end
+
+      lfnt = slot.delete(l_optkey)
+      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+      kfnt = slot.delete(k_optkey)
+
+      if lfnt && kfnt
+        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
+                                                   *(__config_cmd << {}))
+      elsif lfnt
+        latinfont_configure([lfnt, optkey])
+      elsif kfnt
+        kanjifont_configure([kfnt, optkey])
+      end
+    }
+
+    # configure other (without font) options
+    tk_call(*(__config_cmd.concat(hash_kv(slot)))) if slot != {}
+    self
+  end
+
+  def latinfont_configure(ltn, keys=nil)
+    if ltn.kind_of?(Array)
+      key = ltn[1]
+      ltn = ltn[0]
+    else
+      key = nil
+    end
+
+    optkeys = __font_optkeys
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __pathname.split(':')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        ltn = hash_kv(ltn) if ltn.kind_of?(Hash)
+        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{|k,val| conf[k] = val}
+          if keys
+            fobj.latin_configure(conf.update(keys))
+          else
+            fobj.latin_configure(conf)
+          end
+        else
+          fobj.latin_replace(ltn)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
+    }
+    self
+  end
+  alias asciifont_configure latinfont_configure
+
+  def kanjifont_configure(knj, keys=nil)
+    if knj.kind_of?(Array)
+      key = knj[1]
+      knj = knj[0]
+    else
+      key = nil
+    end
+
+    optkeys = __font_optkeys
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __pathname.split(':')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        knj = hash_kv(knj) if knj.kind_of?(Hash)
+        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{|k,val| conf[k] = val}
+          if keys
+            fobj.kanji_configure(conf.update(keys))
+          else
+            fobj.kanji_configure(conf)
+          end
+        else
+          fobj.kanji_replace(knj)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__config_cmd << {}))
+    }
+    self
+  end
+
+  def font_copy(win, wintag=nil, winkey=nil, targetkey=nil)
+    if wintag
+      if winkey
+        fnt = win.tagfontobj(wintag, winkey).dup
+      else
+        fnt = win.tagfontobj(wintag).dup
+      end
+    else
+      if winkey
+        fnt = win.fontobj(winkey).dup
+      else
+        fnt = win.fontobj.dup
+      end
+    end
+
+    if targetkey
+      fnt.call_font_configure([__pathname, targetkey], *(__config_cmd << {}))
+    else
+      fnt.call_font_configure(__pathname, *(__config_cmd << {}))
+    end
+    self
+  end
+
+  def latinfont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
+    if targetkey
+      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
+                                                 *(__config_cmd << {}))
+    else
+      fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
+      end
+    else
+      if winkey
+        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.fontobj.latin_font_id)
+      end
+    end
+    self
+  end
+  alias asciifont_copy latinfont_copy
+
+  def kanjifont_copy(win, wintag=nil, winkey=nil, targetkey=nil)
+    if targetkey
+      fontobj(targetkey).dup.call_font_configure([__pathname, targetkey],
+                                                 *(__config_cmd << {}))
+    else
+        fontobj.dup.call_font_configure(__pathname, *(__config_cmd << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
+      end
+    else
+      if winkey
+        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.fontobj.kanji_font_id)
+      end
+    end
+    self
+  end
+end
+
+
+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
+  private :__cget_cmd
+
+  def __config_cmd
+    [self.path, 'configure']
+  end
+  private :__config_cmd
+
+  def __confinfo_cmd
+    __config_cmd
+  end
+  private :__confinfo_cmd
+
+  def __configinfo_struct
+    {: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
+  private :__numval_optkeys
+
+  def __numstrval_optkeys
+    []
+  end
+  private :__numstrval_optkeys
+
+  def __boolval_optkeys
+    ['exportselection', 'jump', 'setgrid', 'takefocus']
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    [
+      'text', 'label', 'show', 'data', 'file',
+      'activebackground', 'activeforeground', 'background',
+      'disabledforeground', 'disabledbackground', 'foreground',
+      'highlightbackground', 'highlightcolor', 'insertbackground',
+      'selectbackground', 'selectforeground', 'troughcolor'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    []
+  end
+  private :__listval_optkeys
+
+  def __numlistval_optkeys
+    []
+  end
+  private :__numlistval_optkeys
+
+  def __tkvariable_optkeys
+    ['variable', 'textvariable']
+  end
+  private :__tkvariable_optkeys
+
+  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.
+    {}
+  end
+  private :__val2ruby_optkeys
+
+  def __ruby2val_optkeys  # { key=>proc, ... }
+    # 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)}".
+    {}
+  end
+  private :__ruby2val_optkeys
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    # The method is used to both of get and set.
+    # Usually, the 'key' will not be a widget option.
+    {}
+  end
+  private :__methodcall_optkeys
+
+  def __keyonly_optkeys  # { def_key=>undef_key or nil, ... }
+    {}
+  end
+  private :__keyonly_optkeys
+
+  def __conv_keyonly_opts(keys)
+    return keys unless keys.kind_of?(Hash)
+    keyonly = __keyonly_optkeys
+    keys2 = {}
+    keys.each{|k, v|
+      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
+      if optkey
+        defkey, undefkey = optkey
+        if v
+          keys2[defkey.to_s] = None
+        elsif undefkey
+          keys2[undefkey.to_s] = None
+        else
+          # remove key
+        end
+      else
+        keys2[k.to_s] = v
+      end
+    }
+    keys2
+  end
+  private :__conv_keyonly_opts
+
+  def config_hash_kv(keys, enc_mode = nil, conf = nil)
+    hash_kv(__conv_keyonly_opts(keys), enc_mode, conf)
+  end
+
+  ################################
+
+  def [](id)
+    cget(id)
+  end
+
+  def []=(id, val)
+    configure(id, val)
+    val
+  end
+
+  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
+      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
+        return method.call(optval)
+      rescue => e
+        warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+        return optval
+      end
+    end
+
+    if ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
+      return self.__send__(method)
+    end
+
+    case slot
+    when /^(#{__numval_optkeys.join('|')})$/
+      begin
+        number(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__numstrval_optkeys.join('|')})$/
+      num_or_str(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+
+    when /^(#{__boolval_optkeys.join('|')})$/
+      begin
+        bool(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__listval_optkeys.join('|')})$/
+      simplelist(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+
+    when /^(#{__numlistval_optkeys.join('|')})$/
+      conf = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
+      if conf =~ /^[0-9+-]/
+        list(conf)
+      else
+        conf
+      end
+
+    when /^(#{__strval_optkeys.join('|')})$/
+      _fromUTF8(tk_call_without_enc(*(__cget_cmd << "-#{slot}")))
+
+    when /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/
+      fontcode = $1
+      fontkey  = $2
+      fnt = tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{fontkey}")), true)
+      unless fnt.kind_of?(TkFont)
+        fnt = fontobj(fontkey)
+      end
+      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+
+    when /^(#{__tkvariable_optkeys.join('|')})$/
+      v = tk_call_without_enc(*(__cget_cmd << "-#{slot}"))
+      (v.empty?)? nil: TkVarAccess.new(v)
+
+    else
+      tk_tcl2ruby(tk_call_without_enc(*(__cget_cmd << "-#{slot}")), true)
+    end
+  end
+  private :__cget_core
+
+  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
+      }
+
+      __ruby2val_optkeys.each{|key, method|
+        key = key.to_s
+        slot[key] = method.call(slot[key]) if slot.has_key?(key)
+      }
+
+      __keyonly_optkeys.each{|defkey, undefkey|
+        conf = slot.find{|kk, vv| kk == defkey.to_s}
+        if conf
+          k, v = conf
+          if v
+            slot[k] = None
+          else
+            slot[undefkey.to_s] = None if undefkey
+            slot.delete(k)
+          end
+        end
+      }
+
+      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/})
+        font_configure(slot)
+      elsif slot.size > 0
+        tk_call(*(__config_cmd.concat(hash_kv(slot))))
+      end
+
+    else
+      orig_slot = slot
+      slot = slot.to_s
+      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 ( conf = __keyonly_optkeys.find{|k, v| k.to_s == slot} )
+        defkey, undefkey = conf
+        if value
+          tk_call(*(__config_cmd << "-#{defkey}"))
+        elsif undefkey
+          tk_call(*(__config_cmd << "-#{undefkey}"))
+        end
+      elsif ( method = _symbolkey2str(__ruby2val_optkeys)[slot] )
+        tk_call(*(__config_cmd << "-#{slot}" << method.call(value)))
+      elsif ( method = _symbolkey2str(__methodcall_optkeys)[slot] )
+        self.__send__(method, value)
+      elsif (slot =~ /^(|latin|ascii|kanji)(#{__font_optkeys.join('|')})$/)
+        if value == None
+          fontobj($2)
+        else
+          font_configure({slot=>value})
+        end
+      else
+        tk_call(*(__config_cmd << "-#{slot}" << value))
+      end
+    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_core(slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      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]][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]][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]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd() << "-#{slot}")), false, true)
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              optval = conf[__configinfo_struct[:default_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:default_value]] = val
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              optval = conf[__configinfo_struct[:current_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:current_value]] = val
+            end
+
+          when /^(#{__methodcall_optkeys.keys.join('|')})$/
+            method = _symbolkey2str(__methodcall_optkeys)[slot]
+            return [slot, '', '', '', self.__send__(method)]
+
+          when /^(#{__numval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              begin
+                conf[__configinfo_struct[:default_value]] =
+                  number(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] =
+                  number(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__numstrval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                num_or_str(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__boolval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              begin
+                conf[__configinfo_struct[:default_value]] =
+                  bool(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] =
+                  bool(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__listval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                simplelist(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__numlistval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] \
+                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+              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]] =
+                list(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__strval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+          when /^(#{__tkvariable_optkeys.join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]])
+              v = conf[__configinfo_struct[:default_value]]
+              if v.empty?
+                conf[__configinfo_struct[:default_value]] = nil
+              else
+                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              v = conf[__configinfo_struct[:current_value]]
+              if v.empty?
+                conf[__configinfo_struct[:current_value]] = nil
+              else
+                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          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}")), 1, false, true)
+          end
+          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]][1..-1]
+          end
+
+          conf
+
+        else
+          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).collect{|conflist|
+          #  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]][1..-1]
+
+            optkey = conf[__configinfo_struct[:key]]
+            case optkey
+            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
+              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                optval = conf[__configinfo_struct[:default_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:default_value]] = val
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                optval = conf[__configinfo_struct[:current_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:current_value]] = val
+              end
+
+            when /^(#{__strval_optkeys.join('|')})$/
+              # do nothing
+
+            when /^(#{__numval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] =
+                    number(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] =
+                    number(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__numstrval_optkeys.join('|')})$/
+              if ( __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]] =
+                  num_or_str(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__boolval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] =
+                    bool(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] =
+                    bool(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__listval_optkeys.join('|')})$/
+              if ( __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]] =
+                  simplelist(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__numlistval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] \
+                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+                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]] =
+                  list(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__tkvariable_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                v = conf[__configinfo_struct[:default_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:default_value]] = nil
+                else
+                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                v = conf[__configinfo_struct[:current_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:current_value]] = nil
+                else
+                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
+                end
+              end
+
+            else
+              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]])
+                else
+                  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]])
+                else
+                  conf[__configinfo_struct[:current_value]] =
+                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
+                end
+              end
+            end
+
+            if ( __configinfo_struct[:alias] \
+                && conf.size == __configinfo_struct[:alias] + 1 \
+                && conf[__configinfo_struct[:alias]][0] == ?- )
+              conf[__configinfo_struct[:alias]] =
+                conf[__configinfo_struct[:alias]][1..-1]
+            end
+
+            conf
+          }
+
+          __font_optkeys.each{|optkey|
+            optkey = optkey.to_s
+            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, m|
+            ret << [optkey.to_s, '', '', '', self.__send__(m)]
+          }
+
+          ret
+        end
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      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]][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]][1..-1]
+          end
+          { conf[0] => conf[1] }
+        else
+          { conf.shift => conf }
+        end
+      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]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              optval = conf[__configinfo_struct[:default_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:default_value]] = val
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              optval = conf[__configinfo_struct[:current_value]]
+              begin
+                val = method.call(optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__configinfo_struct[:current_value]] = val
+            end
+
+          when /^(#{__methodcall_optkeys.keys.join('|')})$/
+            method = _symbolkey2str(__methodcall_optkeys)[slot]
+            return {slot => ['', '', '', self.__send__(method)]}
+
+          when /^(#{__numval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              begin
+                conf[__configinfo_struct[:default_value]] =
+                  number(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] =
+                  number(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__numstrval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                num_or_str(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__boolval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              begin
+                conf[__configinfo_struct[:default_value]] =
+                  bool(conf[__configinfo_struct[:default_value]])
+              rescue
+                conf[__configinfo_struct[:default_value]] = nil
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              begin
+                conf[__configinfo_struct[:current_value]] =
+                  bool(conf[__configinfo_struct[:current_value]])
+              rescue
+                conf[__configinfo_struct[:current_value]] = nil
+              end
+            end
+
+          when /^(#{__listval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                simplelist(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__numlistval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] \
+                && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+              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]] =
+                list(conf[__configinfo_struct[:current_value]])
+            end
+
+          when /^(#{__tkvariable_optkeys.join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+
+            if ( __configinfo_struct[:default_value] \
+                && conf[__configinfo_struct[:default_value]] )
+              v = conf[__configinfo_struct[:default_value]]
+              if v.empty?
+                conf[__configinfo_struct[:default_value]] = nil
+              else
+                conf[__configinfo_struct[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__configinfo_struct[:current_value]] )
+              v = conf[__configinfo_struct[:current_value]]
+              if v.empty?
+                conf[__configinfo_struct[:current_value]] = nil
+              else
+                conf[__configinfo_struct[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          when /^(#{__strval_optkeys.join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__confinfo_cmd << "-#{slot}")), false, true)
+          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)
+          end
+          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]][1..-1]
+            end
+            { conf[0] => conf[1] }
+          else
+            { conf.shift => conf }
+          end
+
+        else
+          ret = {}
+          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*__confinfo_cmd))).each{|conflist|
+          #  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]][1..-1]
+
+            optkey = conf[__configinfo_struct[:key]]
+            case optkey
+            when /^(#{__val2ruby_optkeys().keys.join('|')})$/
+              method = _symbolkey2str(__val2ruby_optkeys())[optkey]
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                optval = conf[__configinfo_struct[:default_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:default_value]] = val
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                optval = conf[__configinfo_struct[:current_value]]
+                begin
+                  val = method.call(optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__configinfo_struct[:current_value]] = val
+              end
+
+            when /^(#{__strval_optkeys.join('|')})$/
+              # do nothing
+
+            when /^(#{__numval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] =
+                    number(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] =
+                    number(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__numstrval_optkeys.join('|')})$/
+              if ( __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]] =
+                  num_or_str(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__boolval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                begin
+                  conf[__configinfo_struct[:default_value]] =
+                    bool(conf[__configinfo_struct[:default_value]])
+                rescue
+                  conf[__configinfo_struct[:default_value]] = nil
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                begin
+                  conf[__configinfo_struct[:current_value]] =
+                    bool(conf[__configinfo_struct[:current_value]])
+                rescue
+                  conf[__configinfo_struct[:current_value]] = nil
+                end
+              end
+
+            when /^(#{__listval_optkeys.join('|')})$/
+              if ( __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]] =
+                  simplelist(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__numlistval_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] \
+                  && conf[__configinfo_struct[:default_value]] =~ /^[0-9]/ )
+                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]] =
+                  list(conf[__configinfo_struct[:current_value]])
+              end
+
+            when /^(#{__tkvariable_optkeys.join('|')})$/
+              if ( __configinfo_struct[:default_value] \
+                  && conf[__configinfo_struct[:default_value]] )
+                v = conf[__configinfo_struct[:default_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:default_value]] = nil
+                else
+                  conf[__configinfo_struct[:default_value]] = TkVarAccess.new
+                end
+              end
+              if ( conf[__configinfo_struct[:current_value]] )
+                v = conf[__configinfo_struct[:current_value]]
+                if v.empty?
+                  conf[__configinfo_struct[:current_value]] = nil
+                else
+                  conf[__configinfo_struct[:current_value]] = TkVarAccess.new
+                end
+              end
+
+            else
+              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]])
+                else
+                  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]])
+                else
+                  conf[__configinfo_struct[:current_value]] =
+                    tk_tcl2ruby(conf[__configinfo_struct[:current_value]])
+                end
+              end
+            end
+
+            if ( __configinfo_struct[:alias] \
+                && conf.size == __configinfo_struct[:alias] + 1 )
+              if conf[__configinfo_struct[:alias]][0] == ?-
+                conf[__configinfo_struct[:alias]] =
+                  conf[__configinfo_struct[:alias]][1..-1]
+              end
+              ret[conf[0]] = conf[1]
+            else
+              ret[conf.shift] = conf
+            end
+          }
+
+          __font_optkeys.each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret[optkey]
+            if fontconf.kind_of?(Array)
+              ret.delete(optkey)
+              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, m|
+            ret[optkey.to_s] = ['', '', '', self.__send__(m)]
+          }
+
+          ret
+        end
+      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
+      if slot
+        org_slot = slot
+        begin
+          conf = configinfo(slot)
+          if ( ! __configinfo_struct[:alias] \
+              || conf.size > __configinfo_struct[:alias] + 1 )
+            return {conf[0] => conf[-1]}
+          end
+          slot = conf[__configinfo_struct[:alias]]
+        end while(org_slot != slot)
+        fail RuntimeError,
+          "there is a configure alias loop about '#{org_slot}'"
+      else
+        ret = {}
+        configinfo().each{|cnf|
+          if ( ! __configinfo_struct[:alias] \
+              || 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, cnf|
+        ret[key] = cnf[-1] if cnf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+end
+
+class TkObject<TkKernel
+  extend  TkCore
+  include Tk
+  include TkConfigMethod
+  include TkBindCore
+
+### --> definition is moved to TkUtil module
+#  def path
+#    @path
+#  end
+
+  def epath
+    @path
+  end
+
+  def to_eval
+    @path
+  end
+
+  def tk_send(cmd, *rest)
+    tk_call(path, cmd, *rest)
+  end
+  def tk_send_without_enc(cmd, *rest)
+    tk_call_without_enc(path, cmd, *rest)
+  end
+  def tk_send_with_enc(cmd, *rest)
+    tk_call_with_enc(path, cmd, *rest)
+  end
+  # private :tk_send, :tk_send_without_enc, :tk_send_with_enc
+
+  def tk_send_to_list(cmd, *rest)
+    tk_call_to_list(path, cmd, *rest)
+  end
+  def tk_send_to_list_without_enc(cmd, *rest)
+    tk_call_to_list_without_enc(path, cmd, *rest)
+  end
+  def tk_send_to_list_with_enc(cmd, *rest)
+    tk_call_to_list_with_enc(path, cmd, *rest)
+  end
+  def tk_send_to_simplelist(cmd, *rest)
+    tk_call_to_simplelist(path, cmd, *rest)
+  end
+  def tk_send_to_simplelist_without_enc(cmd, *rest)
+    tk_call_to_simplelist_without_enc(path, cmd, *rest)
+  end
+  def tk_send_to_simplelist_with_enc(cmd, *rest)
+    tk_call_to_simplelist_with_enc(path, cmd, *rest)
+  end
+
+  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
+        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
+      super(id, *args)
+#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+    end
+  end
+
+=begin
+  def [](id)
+    cget(id)
+  end
+
+  def []=(id, val)
+    configure(id, val)
+    val
+  end
+=end
+
+  def event_generate(context, keys=nil)
+    if context.kind_of?(TkEvent::Event)
+      context.generate(self, ((keys)? keys: {}))
+    elsif keys
+      #tk_call('event', 'generate', path,
+      #       "<#{tk_event_sequence(context)}>", *hash_kv(keys))
+      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_event_sequence(context)}>")
+    end
+  end
+
+  def tk_trace_variable(v)
+    #unless v.kind_of?(TkVariable)
+    #  fail(ArgumentError, "type error (#{v.class}); must be TkVariable object")
+    #end
+    v
+  end
+  private :tk_trace_variable
+
+  def destroy
+    #tk_call 'trace', 'vdelete', @tk_vn, 'w', @var_id if @var_id
+  end
+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.
+  WidgetClassName = ''.freeze
+  # WidgetClassNames[WidgetClassName] = self
+  ## ==> If self is a widget class, entry to the WidgetClassNames table.
+  def self.to_eval
+    self::WidgetClassName
+  end
+
+  def initialize(parent=nil, keys=nil)
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      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 set 'without_creating' to true, need to define 'widgetname'"
+      # end
+    elsif keys
+      keys = _symbolkey2str(keys)
+      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 set 'without_creating' to true, need to define 'widgetname'"
+      # end
+    else
+      install_win(if parent then parent.path end)
+    end
+    if self.method(:create_self).arity == 0
+      p 'create_self has no arg' if $DEBUG
+      create_self unless without_creating
+      if keys
+        # tk_call @path, 'configure', *hash_kv(keys)
+        configure(keys)
+      end
+    else
+      p 'create_self has args' if $DEBUG
+      fontkeys = {}
+      methodkeys = {}
+      if keys
+        #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+        #  fontkeys[key] = keys.delete(key) if keys.key?(key)
+        #}
+        __font_optkeys.each{|key|
+          fkey = key.to_s
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+          fkey = "kanji#{key}"
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+          fkey = "latin#{key}"
+          fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+          fkey = "ascii#{key}"
+          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)
+        }
+
+        __ruby2val_optkeys.each{|key, method|
+          key = key.to_s
+          keys[key] = method.call(keys[key]) if keys.has_key?(key)
+        }
+      end
+      if without_creating && keys
+        #configure(keys)
+        configure(__conv_keyonly_opts(keys))
+      else
+        #create_self(keys)
+        create_self(__conv_keyonly_opts(keys))
+      end
+      font_configure(fontkeys) unless fontkeys.empty?
+      configure(methodkeys) unless methodkeys.empty?
+    end
+  end
+
+  def create_self(keys)
+    # may need to override
+    begin
+      cmd = self.class::TkCommandNames[0]
+      fail unless (cmd.kind_of?(String) && cmd.length > 0)
+    rescue
+      fail RuntimeError, "class #{self.class} may be an abstract class"
+    end
+
+    if keys and keys != None
+      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
+
+  def bind_class
+    @db_class || self.class()
+  end
+
+  def database_classname
+    TkWinfo.classname(self)
+  end
+  def database_class
+    name = database_classname()
+    if WidgetClassNames[name]
+      WidgetClassNames[name]
+    else
+      TkDatabaseClass.new(name)
+    end
+  end
+  def self.database_classname
+    self::WidgetClassName
+  end
+  def self.database_class
+    WidgetClassNames[self::WidgetClassName]
+  end
+
+  def pack(keys = nil)
+    #tk_call_without_enc('pack', epath, *hash_kv(keys, true))
+    if keys
+      TkPack.configure(self, keys)
+    else
+      TkPack.configure(self)
+    end
+    self
+  end
+
+  def pack_in(target, keys = nil)
+    if keys
+      keys = keys.dup
+      keys['in'] = target
+    else
+      keys = {'in'=>target}
+    end
+    #tk_call 'pack', epath, *hash_kv(keys)
+    TkPack.configure(self, keys)
+    self
+  end
+
+  def pack_forget
+    #tk_call_without_enc('pack', 'forget', epath)
+    TkPack.forget(self)
+    self
+  end
+  alias unpack pack_forget
+
+  def pack_config(slot, value=None)
+    #if slot.kind_of? Hash
+    #  tk_call 'pack', 'configure', epath, *hash_kv(slot)
+    #else
+    #  tk_call 'pack', 'configure', epath, "-#{slot}", value
+    #end
+    if slot.kind_of? Hash
+      TkPack.configure(self, slot)
+    else
+      TkPack.configure(self, slot=>value)
+    end
+  end
+  alias pack_configure pack_config
+
+  def pack_info()
+    #ilist = list(tk_call('pack', 'info', epath))
+    #info = {}
+    #while key = ilist.shift
+    #  info[key[1..-1]] = ilist.shift
+    #end
+    #return info
+    TkPack.info(self)
+  end
+
+  def pack_propagate(mode=None)
+    #if mode == None
+    #  bool(tk_call('pack', 'propagate', epath))
+    #else
+    #  tk_call('pack', 'propagate', epath, mode)
+    #  self
+    #end
+    if mode == None
+      TkPack.propagate(self)
+    else
+      TkPack.propagate(self, mode)
+      self
+    end
+  end
+
+  def pack_slaves()
+    #list(tk_call('pack', 'slaves', epath))
+    TkPack.slaves(self)
+  end
+
+  def grid(keys = nil)
+    #tk_call 'grid', epath, *hash_kv(keys)
+    if keys
+      TkGrid.configure(self, keys)
+    else
+      TkGrid.configure(self)
+    end
+    self
+  end
+
+  def grid_in(target, keys = nil)
+    if keys
+      keys = keys.dup
+      keys['in'] = target
+    else
+      keys = {'in'=>target}
+    end
+    #tk_call 'grid', epath, *hash_kv(keys)
+    TkGrid.configure(self, keys)
+    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)
+    self
+  end
+  alias ungrid grid_forget
+
+  def grid_bbox(*args)
+    #list(tk_call('grid', 'bbox', epath, *args))
+    TkGrid.bbox(self, *args)
+  end
+
+  def grid_config(slot, value=None)
+    #if slot.kind_of? Hash
+    #  tk_call 'grid', 'configure', epath, *hash_kv(slot)
+    #else
+    #  tk_call 'grid', 'configure', epath, "-#{slot}", value
+    #end
+    if slot.kind_of? Hash
+      TkGrid.configure(self, slot)
+    else
+      TkGrid.configure(self, slot=>value)
+    end
+  end
+  alias grid_configure grid_config
+
+  def grid_columnconfig(index, keys)
+    #tk_call('grid', 'columnconfigure', epath, index, *hash_kv(keys))
+    TkGrid.columnconfigure(self, index, keys)
+  end
+  alias grid_columnconfigure grid_columnconfig
+
+  def grid_rowconfig(index, keys)
+    #tk_call('grid', 'rowconfigure', epath, index, *hash_kv(keys))
+    TkGrid.rowconfigure(self, index, keys)
+  end
+  alias grid_rowconfigure grid_rowconfig
+
+  def grid_columnconfiginfo(index, slot=nil)
+    #if slot
+    #  tk_call('grid', 'columnconfigure', epath, index, "-#{slot}").to_i
+    #else
+    #  ilist = list(tk_call('grid', 'columnconfigure', epath, index))
+    #  info = {}
+    #  while key = ilist.shift
+    #   info[key[1..-1]] = ilist.shift
+    #  end
+    #  info
+    #end
+    TkGrid.columnconfiginfo(self, index, slot)
+  end
+
+  def grid_rowconfiginfo(index, slot=nil)
+    #if slot
+    #  tk_call('grid', 'rowconfigure', epath, index, "-#{slot}").to_i
+    #else
+    #  ilist = list(tk_call('grid', 'rowconfigure', epath, index))
+    #  info = {}
+    #  while key = ilist.shift
+    #   info[key[1..-1]] = ilist.shift
+    #  end
+    #  info
+    #end
+    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)
+  end
+
+  def grid_location(x, y)
+    #list(tk_call('grid', 'location', epath, x, y))
+    TkGrid.location(self, x, y)
+  end
+
+  def grid_propagate(mode=None)
+    #if mode == None
+    #  bool(tk_call('grid', 'propagate', epath))
+    #else
+    #  tk_call('grid', 'propagate', epath, mode)
+    #  self
+    #end
+    if mode == None
+      TkGrid.propagate(self)
+    else
+      TkGrid.propagate(self, mode)
+      self
+    end
+  end
+
+  def grid_remove()
+    #tk_call 'grid', 'remove', epath
+    TkGrid.remove(self)
+    self
+  end
+
+  def grid_size()
+    #list(tk_call('grid', 'size', epath))
+    TkGrid.size(self)
+  end
+
+  def grid_slaves(keys = nil)
+    #list(tk_call('grid', 'slaves', epath, *hash_kv(args)))
+    TkGrid.slaves(self, keys)
+  end
+
+  def place(keys)
+    #tk_call 'place', epath, *hash_kv(keys)
+    TkPlace.configure(self, keys)
+    self
+  end
+
+  def place_in(target, keys = nil)
+    if keys
+      keys = keys.dup
+      keys['in'] = target
+    else
+      keys = {'in'=>target}
+    end
+    #tk_call 'place', epath, *hash_kv(keys)
+    TkPlace.configure(self, keys)
+    self
+  end
+
+  def  place_forget
+    #tk_call 'place', 'forget', epath
+    TkPlace.forget(self)
+    self
+  end
+  alias unplace place_forget
+
+  def place_config(slot, value=None)
+    #if slot.kind_of? Hash
+    #  tk_call 'place', 'configure', epath, *hash_kv(slot)
+    #else
+    #  tk_call 'place', 'configure', epath, "-#{slot}", value
+    #end
+    TkPlace.configure(self, slot, value)
+  end
+  alias place_configure place_config
+
+  def place_configinfo(slot = nil)
+    # for >= Tk8.4a2 ?
+    #if slot
+    #  conf = tk_split_list(tk_call('place', 'configure', epath, "-#{slot}") )
+    #  conf[0] = conf[0][1..-1]
+    #  conf
+    #else
+    #  tk_split_simplelist(tk_call('place',
+    #                             'configure', epath)).collect{|conflist|
+    #   conf = tk_split_simplelist(conflist)
+    #   conf[0] = conf[0][1..-1]
+    #   conf
+    #  }
+    #end
+    TkPlace.configinfo(self, slot)
+  end
+
+  def place_info()
+    #ilist = list(tk_call('place', 'info', epath))
+    #info = {}
+    #while key = ilist.shift
+    #  info[key[1..-1]] = ilist.shift
+    #end
+    #return info
+    TkPlace.info(self)
+  end
+
+  def place_slaves()
+    #list(tk_call('place', 'slaves', epath))
+    TkPlace.slaves(self)
+  end
+
+  def set_focus(force=false)
+    if force
+      tk_call_without_enc('focus', '-force', path)
+    else
+      tk_call_without_enc('focus', path)
+    end
+    self
+  end
+  alias focus set_focus
+
+  def grab(opt = nil)
+    unless opt
+      tk_call_without_enc('grab', 'set', path)
+      return self
+    end
+
+    case opt
+    when 'set', :set
+      tk_call_without_enc('grab', 'set', path)
+      return self
+    when 'global', :global
+      #return(tk_call('grab', 'set', '-global', path))
+      tk_call_without_enc('grab', 'set', '-global', path)
+      return self
+    when 'release', :release
+      #return tk_call('grab', 'release', path)
+      tk_call_without_enc('grab', 'release', path)
+      return self
+    when 'current', :current
+      return window(tk_call_without_enc('grab', 'current', path))
+    when 'status', :status
+      return tk_call_without_enc('grab', 'status', path)
+    else
+      return tk_call_without_enc('grab', opt, path)
+    end
+  end
+
+  def grab_current
+    grab('current')
+  end
+  alias current_grab grab_current
+  def grab_release
+    grab('release')
+  end
+  alias release_grab grab_release
+  def grab_set
+    grab('set')
+  end
+  alias set_grab grab_set
+  def grab_set_global
+    grab('global')
+  end
+  alias set_global_grab grab_set_global
+  def grab_status
+    grab('status')
+  end
+
+  def lower(below=None)
+    # below = below.epath if below.kind_of?(TkObject)
+    below = _epath(below)
+    tk_call 'lower', epath, below
+    self
+  end
+  alias lower_window lower
+  def raise(above=None)
+    #above = above.epath if above.kind_of?(TkObject)
+    above = _epath(above)
+    tk_call 'raise', epath, above
+    self
+  end
+  alias raise_window raise
+
+  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 colormodel(model=None)
+    tk_call('tk', 'colormodel', path, model)
+    self
+  end
+
+  def caret(keys=nil)
+    TkXIM.caret(path, keys)
+  end
+
+  def destroy
+    super
+    children = []
+    rexp = /^#{self.path}\.[^.]+$/
+    TkCore::INTERP.tk_windows.each{|path, obj|
+      children << [path, obj] if path =~ rexp
+    }
+    if defined?(@cmdtbl)
+      for id in @cmdtbl
+        uninstall_cmd id
+      end
+    end
+
+    children.each{|path, obj|
+      obj.instance_eval{
+        if defined?(@cmdtbl)
+          for id in @cmdtbl
+            uninstall_cmd id
+          end
+        end
+      }
+      TkCore::INTERP.tk_windows.delete(path)
+    }
+
+    begin
+      tk_call_without_enc('destroy', epath)
+    rescue
+    end
+    uninstall_win
+  end
+
+  def wait_visibility(on_thread = true)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait visibility at $SAFE >= 4"
+    end
+    on_thread &= (Thread.list.size != 1)
+    if on_thread
+      INTERP._thread_tkwait('visibility', path)
+    else
+      INTERP._invoke('tkwait', 'visibility', path)
+    end
+  end
+  def eventloop_wait_visibility
+    wait_visibility(false)
+  end
+  def thread_wait_visibility
+    wait_visibility(true)
+  end
+  alias wait wait_visibility
+  alias tkwait wait_visibility
+  alias eventloop_wait eventloop_wait_visibility
+  alias eventloop_tkwait eventloop_wait_visibility
+  alias eventloop_tkwait_visibility eventloop_wait_visibility
+  alias thread_wait thread_wait_visibility
+  alias thread_tkwait thread_wait_visibility
+  alias thread_tkwait_visibility thread_wait_visibility
+
+  def wait_destroy(on_thread = true)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait destroy at $SAFE >= 4"
+    end
+    on_thread &= (Thread.list.size != 1)
+    if on_thread
+      INTERP._thread_tkwait('window', epath)
+    else
+      INTERP._invoke('tkwait', 'window', epath)
+    end
+  end
+  alias wait_window wait_destroy
+  def eventloop_wait_destroy
+    wait_destroy(false)
+  end
+  alias eventloop_wait_window eventloop_wait_destroy
+  def thread_wait_destroy
+    wait_destroy(true)
+  end
+  alias thread_wait_window thread_wait_destroy
+
+  alias tkwait_destroy wait_destroy
+  alias tkwait_window wait_destroy
+
+  alias eventloop_tkwait_destroy eventloop_wait_destroy
+  alias eventloop_tkwait_window eventloop_wait_destroy
+
+  alias thread_tkwait_destroy thread_wait_destroy
+  alias thread_tkwait_window thread_wait_destroy
+
+  def bindtags(taglist=nil)
+    if taglist
+      fail ArgumentError, "taglist must be Array" unless taglist.kind_of? Array
+      tk_call('bindtags', path, taglist)
+      taglist
+    else
+      list(tk_call('bindtags', path)).collect{|tag|
+        if tag.kind_of?(String)
+          if cls = WidgetClassNames[tag]
+            cls
+          elsif btag = TkBindTag.id2obj(tag)
+            btag
+          else
+            tag
+          end
+        else
+          tag
+        end
+      }
+    end
+  end
+
+  def bindtags=(taglist)
+    bindtags(taglist)
+    taglist
+  end
+
+  def bindtags_shift
+    taglist = bindtags
+    tag = taglist.shift
+    bindtags(taglist)
+    tag
+  end
+
+  def bindtags_unshift(tag)
+    bindtags(bindtags().unshift(tag))
+  end
+end
+TkWidget = TkWindow
+
+# freeze core modules
+#TclTkLib.freeze
+#TclTkIp.freeze
+#TkUtil.freeze
+#TkKernel.freeze
+#TkComm.freeze
+#TkComm::Event.freeze
+#TkCore.freeze
+#Tk.freeze
+
+module Tk
+  RELEASE_DATE = '2010-06-03'.freeze
+
+  autoload :AUTO_PATH,        'tk/variable'
+  autoload :TCL_PACKAGE_PATH, 'tk/variable'
+  autoload :PACKAGE_PATH,     'tk/variable'
+  autoload :TCL_LIBRARY_PATH, 'tk/variable'
+  autoload :LIBRARY_PATH,     'tk/variable'
+  autoload :TCL_PRECISION,    'tk/variable'
+end
+
+# call setup script for Tk extension libraries (base configuration)
+begin
+  require 'tkextlib/version.rb'
+  require 'tkextlib/setup.rb'
+rescue LoadError
+  # ignore
+end
diff --git a/ext/tk/lib/tk/after.rb b/ext/tk/lib/tk/after.rb
new file mode 100644
index 0000000000..8c58210331
--- /dev/null
+++ b/ext/tk/lib/tk/after.rb
@@ -0,0 +1,6 @@
+#
+#   tk/after.rb : methods for Tcl/Tk after command
+#
+#   $Id$
+#
+require 'tk/timer'
diff --git a/ext/tk/lib/tk/autoload.rb b/ext/tk/lib/tk/autoload.rb
new file mode 100644
index 0000000000..f6ca261da9
--- /dev/null
+++ b/ext/tk/lib/tk/autoload.rb
@@ -0,0 +1,760 @@
+#
+#  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
+
+autoload :TkPack,             'tk/pack'
+def TkPack(*args); TkPack.configure(*args); end
+
+autoload :TkPlace,            'tk/place'
+def TkPlace(*args); TkPlace.configure(*args); end
+
+
+############################################
+# 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 :TkConsole,          'tk/console'
+
+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'
+autoload :TkcTagString,       'tk/canvastag'
+autoload :TkcNamedTag,        'tk/canvastag'
+autoload :TkcTagAll,          'tk/canvastag'
+autoload :TkcTagCurrent,      'tk/canvastag'
+autoload :TkcTagGroup,        'tk/canvastag'
+
+autoload :TkClipboard,        'tk/clipboard'
+
+autoload :TkComposite,        'tk/composite'
+
+autoload :TkConsole,          'tk/console'
+
+autoload :TkDialog,           'tk/dialog'
+autoload :TkDialog2,          'tk/dialog'
+autoload :TkDialogObj,        'tk/dialog'
+autoload :TkWarning,          'tk/dialog'
+autoload :TkWarning2,         'tk/dialog'
+autoload :TkWarningObj,       'tk/dialog'
+
+autoload :TkEvent,            'tk/event'
+
+autoload :TkFont,             'tk/font'
+autoload :TkNamedFont,        'tk/font'
+
+autoload :TkImage,            'tk/image'
+autoload :TkBitmapImage,      'tk/image'
+autoload :TkPhotoImage,       'tk/image'
+
+autoload :TkItemConfigMethod, 'tk/itemconfig'
+
+autoload :TkTreatItemFont,    'tk/itemfont'
+
+autoload :TkKinput,           'tk/kinput'
+
+autoload :TkSystemMenu,       'tk/menu'
+
+autoload :TkMenubar,          'tk/menubar'
+
+autoload :TkMenuSpec,         'tk/menuspec'
+
+autoload :TkManageFocus,      'tk/mngfocus'
+
+autoload :TkMsgCatalog,       'tk/msgcat'
+autoload :TkMsgCat,           'tk/msgcat'
+
+autoload :TkNamespace,        'tk/namespace'
+
+autoload :TkOptionDB,         'tk/optiondb'
+autoload :TkOption,           'tk/optiondb'
+autoload :TkResourceDB,       'tk/optiondb'
+
+autoload :TkPackage,          'tk/package'
+
+autoload :TkPalette,          'tk/palette'
+
+autoload :TkRoot,             'tk/root'
+
+autoload :TkScrollbox,        'tk/scrollbox'
+
+autoload :TkSelection,        'tk/selection'
+
+autoload :TkTreatTagFont,     'tk/tagfont'
+
+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 :TkTextWin,          'tk/txtwin_abst'
+
+autoload :TkValidation,       'tk/validation'
+autoload :TkValidateCommand,  'tk/validation'
+
+autoload :TkVariable,         'tk/variable'
+autoload :TkVarAccess,        'tk/variable'
+
+autoload :TkVirtualEvent,     'tk/virtevent'
+autoload :TkNamedVirtualEvent,'tk/virtevent'
+
+autoload :TkWinfo,            'tk/winfo'
+
+autoload :TkXIM,              'tk/xim'
+
+
+############################################
+#  toplevel classes/modules (switchable)
+module Tk
+  @TOPLEVEL_ALIAS_TABLE = {}
+  @TOPLEVEL_ALIAS_TABLE[:Tk] = {
+    :TkButton             => 'tk/button',
+
+    :TkCanvas             => 'tk/canvas',
+
+    :TkCheckButton        => 'tk/checkbutton',
+    :TkCheckbutton        => 'tk/checkbutton',
+
+    # :TkDialog             => 'tk/dialog',
+    # :TkDialog2            => 'tk/dialog',
+    # :TkDialogObj          => 'tk/dialog',
+    # :TkWarning            => 'tk/dialog',
+    # :TkWarning2           => 'tk/dialog',
+    # :TkWarningObj         => 'tk/dialog',
+
+    :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/bgerror.rb b/ext/tk/lib/tk/bgerror.rb
new file mode 100644
index 0000000000..c82a8e046b
--- /dev/null
+++ b/ext/tk/lib/tk/bgerror.rb
@@ -0,0 +1,29 @@
+#
+#  tkbgerror -- bgerror ( tkerror ) module
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+module TkBgError
+  extend Tk
+
+  TkCommandNames = ['bgerror'.freeze].freeze
+
+  def bgerror(message)
+    tk_call('bgerror', message)
+  end
+  alias tkerror bgerror
+  alias show bgerror
+  module_function :bgerror, :tkerror, :show
+
+  def set_handler(hdlr = Proc.new) #==> handler :: proc{|msg| ...body... }
+    tk_call('proc', 'bgerror', 'msg', install_cmd(hdlr) + ' $msg')
+  end
+  def set_default
+    begin
+      tk_call('rename', 'bgerror', '')
+    rescue RuntimeError
+    end
+  end
+  module_function :set_handler, :set_default
+end
diff --git a/ext/tk/lib/tk/bindtag.rb b/ext/tk/lib/tk/bindtag.rb
new file mode 100644
index 0000000000..23b4e0b7c3
--- /dev/null
+++ b/ext/tk/lib/tk/bindtag.rb
@@ -0,0 +1,138 @@
+#
+# tk/bind.rb : control event binding
+#
+require 'tk'
+
+class TkBindTag
+  include TkBindCore
+
+  #BTagID_TBL = {}
+  BTagID_TBL = TkCore::INTERP.create_table
+
+  (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.mutex.synchronize{
+      (BTagID_TBL[id])? BTagID_TBL[id]: id
+    }
+  end
+
+=begin
+  def TkBindTag.new_by_name(name, *args, &b)
+    BTagID_TBL.mutex.synchronize{
+      return BTagID_TBL[name] if BTagID_TBL[name]
+    }
+
+    self.new.instance_eval{
+      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)
+    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
+
+  ALL = self.new_by_name('all')
+
+  def name
+    @id
+  end
+
+  def to_eval
+    @id
+  end
+
+  def inspect
+    #Kernel.format "#<TkBindTag: %s>", @id
+    '#<TkBindTag: ' + @id + '>'
+  end
+end
+
+
+class TkBindTagAll<TkBindTag
+  def TkBindTagAll.new(*args, &b)
+    $stderr.puts "Warning: TkBindTagALL is obsolete. Use TkBindTag::ALL\n"
+
+    TkBindTag::ALL.bind(*args, &b) if args != []
+    TkBindTag::ALL
+  end
+end
+
+
+class TkDatabaseClass<TkBindTag
+=begin
+  def self.new(name, *args, &b)
+    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.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
+
+  def inspect
+    #Kernel.format "#<TkDatabaseClass: %s>", @id
+    '#<TkDatabaseClass: ' + @id + '>'
+  end
+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
new file mode 100644
index 0000000000..65233c91b6
--- /dev/null
+++ b/ext/tk/lib/tk/button.rb
@@ -0,0 +1,31 @@
+#
+# tk/button.rb : treat button widget
+#
+require 'tk'
+require 'tk/label'
+
+class Tk::Button<Tk::Label
+  TkCommandNames = ['button'.freeze].freeze
+  WidgetClassName = 'Button'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('button', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('button', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def invoke
+    _fromUTF8(tk_send_without_enc('invoke'))
+  end
+  def flash
+    tk_send_without_enc('flash')
+    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
new file mode 100644
index 0000000000..f3e9a7c229
--- /dev/null
+++ b/ext/tk/lib/tk/canvas.rb
@@ -0,0 +1,846 @@
+#
+#               tk/canvas.rb - Tk canvas classes
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#
+require 'tk'
+require 'tk/canvastag'
+require 'tk/itemconfig'
+require 'tk/scrollable'
+
+module TkCanvasItemConfig
+  include TkItemConfigMethod
+
+  def __item_strval_optkeys(id)
+    # maybe need to override
+    super(id) + [
+      'fill', 'activefill', 'disabledfill',
+      'outline', 'activeoutline', 'disabledoutline'
+    ]
+  end
+  private :__item_strval_optkeys
+
+  def __item_methodcall_optkeys(id)
+    {'coords'=>'coords'}
+  end
+  private :__item_methodcall_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
+    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
+
+  def __item_pathname(tagOrId)
+    if tagOrId.kind_of?(TkcItem) || tagOrId.kind_of?(TkcTag)
+      self.path + ';' + tagOrId.id.to_s
+    else
+      self.path + ';' + tagOrId.to_s
+    end
+  end
+  private :__item_pathname
+end
+
+class Tk::Canvas<TkWindow
+  include TkCanvasItemConfig
+  include Tk::Scrollable
+
+  TkCommandNames = ['canvas'.freeze].freeze
+  WidgetClassName = 'Canvas'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __destroy_hook__
+    TkcItem::CItemID_TBL.delete(@path)
+  end
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('canvas', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('canvas', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __numval_optkeys
+    super() + ['closeenough']
+  end
+  private :__numval_optkeys
+
+  def __boolval_optkeys
+    super() + ['confine']
+  end
+  private :__boolval_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
+      tag.id
+    else
+      tag  # maybe an Array of configure parameters
+    end
+  end
+  private :tagid
+
+
+  # create a canvas item without creating a TkcItem object
+  def create(type, *args)
+    if type.kind_of?(Class) && type < TkcItem
+      # do nothing
+    elsif TkcItem.type2class(type.to_s)
+      type = TkcItem.type2class(type.to_s)
+    else
+      fail ArgumentError, "type must a subclass of TkcItem class, or a string in CItemTypeToClass"
+    end
+    type.create(self, *args)
+  end
+
+  def addtag(tag, mode, *args)
+    mode = mode.to_s
+    if args[0] && mode =~ /^(above|below|with(tag)?)$/
+      args[0] = tagid(args[0])
+    end
+    tk_send_without_enc('addtag', tagid(tag), mode, *args)
+    self
+  end
+  def addtag_above(tagOrId, target)
+    addtag(tagOrId, 'above', tagid(target))
+  end
+  def addtag_all(tagOrId)
+    addtag(tagOrId, 'all')
+  end
+  def addtag_below(tagOrId, target)
+    addtag(tagOrId, 'below', tagid(target))
+  end
+  def addtag_closest(tagOrId, x, y, halo=None, start=None)
+    addtag(tagOrId, 'closest', x, y, halo, start)
+  end
+  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
+  end
+  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
+  end
+  def addtag_withtag(tagOrId, tag)
+    addtag(tagOrId, 'withtag', tagid(tag))
+  end
+
+  def bbox(tagOrId, *tags)
+    list(tk_send_without_enc('bbox', tagid(tagOrId),
+                             *tags.collect{|t| tagid(t)}))
+  end
+
+  #def itembind(tag, context, cmd=Proc.new, *args)
+  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  #def itembind_append(tag, context, cmd=Proc.new, *args)
+  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind_append(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  def itembind_remove(tag, context)
+    _bind_remove([path, "bind", tagid(tag)], context)
+    self
+  end
+
+  def itembindinfo(tag, context=nil)
+    _bindinfo([path, "bind", tagid(tag)], context)
+  end
+
+  def canvasx(screen_x, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
+    number(tk_send_without_enc('canvasx', screen_x, *args))
+  end
+  def canvasy(screen_y, *args)
+    #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.empty?
+      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
+    else
+      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
+      self
+    end
+  end
+
+  def dchars(tag, first, last=None)
+    tk_send_without_enc('dchars', tagid(tag),
+                        _get_eval_enc_str(first), _get_eval_enc_str(last))
+    self
+  end
+
+  def delete(*args)
+    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.mutex.synchronize{
+              tbl.delete(item.id)
+            }
+          end
+        }
+      }
+    end
+    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
+    self
+  end
+  alias remove delete
+
+  def dtag(tag, tag_to_del=None)
+    tk_send_without_enc('dtag', tagid(tag), tagid(tag_to_del))
+    self
+  end
+  alias deltag dtag
+
+  def find(mode, *args)
+    list(tk_send_without_enc('find', mode, *args)).collect!{|id|
+      TkcItem.id2obj(self, id)
+    }
+  end
+  def find_above(target)
+    find('above', tagid(target))
+  end
+  def find_all
+    find('all')
+  end
+  def find_below(target)
+    find('below', tagid(target))
+  end
+  def find_closest(x, y, halo=None, start=None)
+    find('closest', x, y, halo, start)
+  end
+  def find_enclosed(x1, y1, x2, y2)
+    find('enclosed', x1, y1, x2, y2)
+  end
+  def find_overlapping(x1, y1, x2, y2)
+    find('overlapping', x1, y1, x2, y2)
+  end
+  def find_withtag(tag)
+    find('withtag', tag)
+  end
+
+  def itemfocus(tagOrId=nil)
+    if tagOrId
+      tk_send_without_enc('focus', tagid(tagOrId))
+      self
+    else
+      ret = tk_send_without_enc('focus')
+      if ret == ""
+        nil
+      else
+        TkcItem.id2obj(self, ret)
+      end
+    end
+  end
+
+  def gettags(tagOrId)
+    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
+      TkcTag.id2obj(self, tag)
+    }
+  end
+
+  def icursor(tagOrId, index)
+    tk_send_without_enc('icursor', tagid(tagOrId), index)
+    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,
+                        _get_eval_enc_str(string))
+    self
+  end
+
+=begin
+  def itemcget(tagOrId, option)
+    case option.to_s
+    when 'dash', 'activedash', 'disableddash'
+      conf = tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}")
+      if conf =~ /^[0-9]/
+        list(conf)
+      else
+        conf
+      end
+    when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+      _fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId), "-#{option}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('itemcget', tagid(tagOrId), "-#{option}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_with_enc('itemcget', tagid(tagOrId), '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(tagid(tagOrId), fnt)
+      end
+      if option.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', tagid(tagOrId),
+                                                "-#{option}")))
+    end
+  end
+
+  def itemconfigure(tagOrId, key, value=None)
+    if key.kind_of? Hash
+      key = _symbolkey2str(key)
+      coords = key.delete('coords')
+      self.coords(tagOrId, coords) if coords
+
+      if ( key['font'] || key['kanjifont'] \
+          || key['latinfont'] || key['asciifont'] )
+        tagfont_configure(tagid(tagOrId), key.dup)
+      else
+        _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 ||
+              key == 'asciifont' || key == :asciifont )
+        if value == None
+          tagfontobj(tagid(tagOrId))
+        else
+          tagfont_configure(tagid(tagOrId), {key=>value})
+        end
+      else
+        _fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),
+                                      "-#{key}", _get_eval_enc_str(value)))
+      end
+    end
+    self
+  end
+#  def itemconfigure(tagOrId, key, value=None)
+#    if key.kind_of? Hash
+#      tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(key)
+#    else
+#      tk_send 'itemconfigure', tagid(tagOrId), "-#{key}", value
+#    end
+#  end
+#  def itemconfigure(tagOrId, keys)
+#    tk_send 'itemconfigure', tagid(tagOrId), *hash_kv(keys)
+#  end
+
+  def itemconfiginfo(tagOrId, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'coords'
+          return ['coords', '', '', '', self.coords(tagOrId)]
+        when 'dash', 'activedash', 'disableddash'
+          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}"))
+          if conf[3] && conf[3] =~ /^[0-9]/
+            conf[3] = list(conf[3])
+          end
+          if conf[4] && conf[4] =~ /^[0-9]/
+            conf[4] = list(conf[4])
+          end
+        when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
+          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          when 'dash', 'activedash', 'disableddash'
+            if conf[3] && conf[3] =~ /^[0-9]/
+              conf[3] = list(conf[3])
+            end
+            if conf[4] && conf[4] =~ /^[0-9]/
+              conf[4] = list(conf[4])
+            end
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+
+        fontconf = ret.assoc('font')
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(tagid(tagOrId), fontconf[4])
+          ret.push(fontconf)
+        end
+
+        ret << ['coords', '', '', '', self.coords(tagOrId)]
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'coords'
+          {'coords' => ['', '', '', self.coords(tagOrId)]}
+        when 'dash', 'activedash', 'disableddash'
+          conf = tk_split_simplelist(tk_send_without_enc('itemconfigure',
+                                                         tagid(tagOrId),
+                                                         "-#{key}"))
+          if conf[3] && conf[3] =~ /^[0-9]/
+            conf[3] = list(conf[3])
+          end
+          if conf[4] && conf[4] =~ /^[0-9]/
+            conf[4] = list(conf[4])
+          end
+        when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId),"-#{key}")))
+          conf[4] = tagfont_configinfo(tagid(tagOrId), conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId), "-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', tagid(tagOrId)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file', 'maskdata', 'maskfile'
+          when 'dash', 'activedash', 'disableddash'
+            if conf[2] && conf[2] =~ /^[0-9]/
+              conf[2] = list(conf[2])
+            end
+            if conf[3] && conf[3] =~ /^[0-9]/
+              conf[3] = list(conf[3])
+            end
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(tagid(tagOrId), fontconf[3])
+          ret['font'] = fontconf
+        end
+
+        ret['coords'] = ['', '', '', self.coords(tagOrId)]
+
+        ret
+      end
+    end
+  end
+
+  def current_itemconfiginfo(tagOrId, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = itemconfiginfo(tagOrId, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        itemconfiginfo(tagOrId).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      itemconfiginfo(tagOrId, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+
+  def lower(tag, below=nil)
+    if below
+      tk_send_without_enc('lower', tagid(tag), tagid(below))
+    else
+      tk_send_without_enc('lower', tagid(tag))
+    end
+    self
+  end
+
+  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
+
+  def raise(tag, above=nil)
+    if above
+      tk_send_without_enc('raise', tagid(tag), tagid(above))
+    else
+      tk_send_without_enc('raise', tagid(tag))
+    end
+    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
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y, gain=None)
+    tk_send_without_enc('scan', 'dragto', x, y, gain)
+    self
+  end
+
+  def select(mode, *args)
+    r = tk_send_without_enc('select', mode, *args)
+    (mode == 'item')? TkcItem.id2obj(self, r): self
+  end
+  def select_adjust(tagOrId, index)
+    select('adjust', tagid(tagOrId), index)
+  end
+  def select_clear
+    select('clear')
+  end
+  def select_from(tagOrId, index)
+    select('from', tagid(tagOrId), index)
+  end
+  def select_item
+    select('item')
+  end
+  def select_to(tagOrId, index)
+    select('to', tagid(tagOrId), index)
+  end
+
+  def itemtype(tag)
+    TkcItem.type2class(tk_send('type', tagid(tag)))
+  end
+
+  def create_itemobj_from_id(idnum)
+    id = TkcItem.id2obj(self, idnum.to_i)
+    return id if id.kind_of?(TkcItem)
+
+    typename = tk_send('type', id)
+    unless type = TkcItem.type2class(typename)
+      (itemclass = typename.dup)[0,1] = typename[0,1].upcase
+      type = TkcItem.const_set(itemclass, Class.new(TkcItem))
+      type.const_set("CItemTypeName", typename.freeze)
+      TkcItem::CItemTypeToClass[typename] = type
+    end
+
+    canvas = self
+    (obj = type.allocate).instance_eval{
+      @parent = @c = canvas
+      @path = canvas.path
+      @id = id
+      TkcItem::CItemID_TBL.mutex.synchronize{
+        TkcItem::CItemID_TBL[@path] = {} unless TkcItem::CItemID_TBL[@path]
+        TkcItem::CItemID_TBL[@path][@id] = self
+      }
+    }
+  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
+  extend TkItemFontOptkeys
+  extend TkItemConfigOptkeys
+
+  CItemTypeName = nil
+  CItemTypeToClass = {}
+
+  CItemID_TBL = TkCore::INTERP.create_table
+
+  TkCore::INTERP.init_ip_env{
+    CItemID_TBL.mutex.synchronize{ CItemID_TBL.clear }
+  }
+
+  def TkcItem.type2class(type)
+    CItemTypeToClass[type]
+  end
+
+  def TkcItem.id2obj(canvas, id)
+    cpath = canvas.path
+    CItemID_TBL.mutex.synchronize{
+      if CItemID_TBL[cpath]
+        CItemID_TBL[cpath][id]? CItemID_TBL[cpath][id]: id
+      else
+        id
+      end
+    }
+  end
+
+  ########################################
+  def self._parse_create_args(args)
+    fontkeys = {}
+    methodkeys = {}
+    if args[-1].kind_of? Hash
+      keys = _symbolkey2str(args.pop)
+      if args.size == 0
+        args = keys.delete('coords')
+        unless args.kind_of?(Array)
+          fail "coords parameter must be given by an Array"
+        end
+      end
+
+      #['font', 'kanjifont', 'latinfont', 'asciifont'].each{|key|
+      #  fontkeys[key] = keys.delete(key) if keys.key?(key)
+      #}
+      __item_font_optkeys(nil).each{|key|
+        fkey = key.to_s
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+        fkey = "kanji#{key}"
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+        fkey = "latin#{key}"
+        fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+        fkey = "ascii#{key}"
+        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)
+      }
+
+      __item_ruby2val_optkeys(nil).each{|key, method|
+        key = key.to_s
+        keys[key] = method.call(keys[key]) if keys.has_key?(key)
+      }
+
+      #args = args.flatten.concat(hash_kv(keys))
+      args = args.flatten.concat(itemconfig_hash_kv(nil, keys))
+    else
+      args = args.flatten
+    end
+
+    [args, fontkeys, methodkeys]
+  end
+  private_class_method :_parse_create_args
+
+  def self.create(canvas, *args)
+    unless self::CItemTypeName
+      fail RuntimeError, "#{self} is an abstract class"
+    end
+    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?(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.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'
+  end
+  private :create_self
+
+  def id
+    @id
+  end
+
+  def exist?
+    if @c.find_withtag(@id)
+      true
+    else
+      false
+    end
+  end
+
+  def delete
+    @c.delete @id
+    CItemID_TBL.mutex.synchronize{
+      CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+    }
+    self
+  end
+  alias remove  delete
+  alias destroy delete
+end
+
+class TkcArc<TkcItem
+  CItemTypeName = 'arc'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcBitmap<TkcItem
+  CItemTypeName = 'bitmap'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcImage<TkcItem
+  CItemTypeName = 'image'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcLine<TkcItem
+  CItemTypeName = 'line'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcOval<TkcItem
+  CItemTypeName = 'oval'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcPolygon<TkcItem
+  CItemTypeName = 'polygon'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcRectangle<TkcItem
+  CItemTypeName = 'rectangle'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+end
+
+class TkcText<TkcItem
+  CItemTypeName = 'text'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+  def self.create(canvas, *args)
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      txt = keys['text']
+      keys['text'] = _get_eval_enc_str(txt) if txt
+      args.push(keys)
+    end
+    super(canvas, *args)
+  end
+end
+
+class TkcWindow<TkcItem
+  CItemTypeName = 'window'.freeze
+  CItemTypeToClass[CItemTypeName] = self
+  def self.create(canvas, *args)
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+      win = keys['window']
+      # keys['window'] = win.epath if win.kind_of?(TkWindow)
+      keys['window'] = _epath(win) if win
+      args.push(keys)
+    end
+    super(canvas, *args)
+  end
+end
diff --git a/ext/tk/lib/tk/canvastag.rb b/ext/tk/lib/tk/canvastag.rb
new file mode 100644
index 0000000000..495d92a9a8
--- /dev/null
+++ b/ext/tk/lib/tk/canvastag.rb
@@ -0,0 +1,459 @@
+#
+# tk/canvastag.rb - methods for treating canvas tags
+#
+require 'tk'
+require 'tk/tagfont'
+
+module TkcTagAccess
+  include TkComm
+  include TkTreatTagFont
+end
+
+require 'tk/canvas'
+
+module TkcTagAccess
+  def addtag(tag)
+    @c.addtag(tag, 'withtag', @id)
+    self
+  end
+
+  def bbox
+    @c.bbox(@id)
+  end
+
+  #def bind(seq, cmd=Proc.new, *args)
+  #  @c.itembind(@id, seq, cmd, *args)
+  #  self
+  #end
+  def bind(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @c.itembind(@id, seq, cmd, *args)
+    self
+  end
+
+  #def bind_append(seq, cmd=Proc.new, *args)
+  #  @c.itembind_append(@id, seq, cmd, *args)
+  #  self
+  #end
+  def bind_append(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @c.itembind_append(@id, seq, cmd, *args)
+    self
+  end
+
+  def bind_remove(seq)
+    @c.itembind_remove(@id, seq)
+    self
+  end
+
+  def bindinfo(seq=nil)
+    @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)
+    self
+  end
+#  def configure(keys)
+#    @c.itemconfigure @id, keys
+#  end
+
+  def configinfo(key=nil)
+    @c.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @c.current_itemconfiginfo(@id, key)
+  end
+
+  def coords(*args)
+    @c.coords(@id, *args)
+  end
+
+  def dchars(first, last=None)
+    @c.dchars(@id, first, last)
+    self
+  end
+
+  def dtag(tag_to_del=None)
+    @c.dtag(@id, tag_to_del)
+    self
+  end
+  alias deltag dtag
+
+  def find
+    @c.find('withtag', @id)
+  end
+  alias list find
+
+  def focus
+    @c.itemfocus(@id)
+  end
+
+  def gettags
+    @c.gettags(@id)
+  end
+
+  def icursor(index)
+    @c.icursor(@id, index)
+    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
+
+  def insert(beforethis, string)
+    @c.insert(@id, beforethis, string)
+    self
+  end
+
+  def lower(belowthis=None)
+    @c.lower(@id, belowthis)
+    self
+  end
+
+  def move(xamount, yamount)
+    @c.move(@id, xamount, yamount)
+    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
+  end
+
+  def scale(xorigin, yorigin, xscale, yscale)
+    @c.scale(@id, xorigin, yorigin, xscale, yscale)
+    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
+  end
+  def select_from(index)
+    @c.select('from', @id, index)
+    self
+  end
+  def select_to(index)
+    @c.select('to', @id, index)
+    self
+  end
+
+  def itemtype
+    @c.itemtype(@id)
+  end
+
+  # Following operators support logical expressions of canvas tags
+  # (for Tk8.3+).
+  # If tag1.path is 't1' and tag2.path is 't2', then
+  #      ltag = tag1 & tag2; ltag.path => "(t1)&&(t2)"
+  #      ltag = tag1 | tag2; ltag.path => "(t1)||(t2)"
+  #      ltag = tag1 ^ tag2; ltag.path => "(t1)^(t2)"
+  #      ltag = - tag1;      ltag.path => "!(t1)"
+  def & (tag)
+    if tag.kind_of? TkObject
+      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.path + ')')
+    else
+      TkcTagString.new(@c, '(' + @id + ')&&(' + tag.to_s + ')')
+    end
+  end
+
+  def | (tag)
+    if tag.kind_of? TkObject
+      TkcTagString.new(@c, '(' + @id + ')||(' + tag.path + ')')
+    else
+      TkcTagString.new(@c, '(' + @id + ')||(' + tag.to_s + ')')
+    end
+  end
+
+  def ^ (tag)
+    if tag.kind_of? TkObject
+      TkcTagString.new(@c, '(' + @id + ')^(' + tag.path + ')')
+    else
+      TkcTagString.new(@c, '(' + @id + ')^(' + tag.to_s + ')')
+    end
+  end
+
+  def -@
+    TkcTagString.new(@c, '!(' + @id + ')')
+  end
+end
+
+class TkcTag<TkObject
+  include TkcTagAccess
+
+  CTagID_TBL = TkCore::INTERP.create_table
+
+  (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
+    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)
+    #unless parent.kind_of?(TkCanvas)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    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
+  end
+  def id
+    @id
+  end
+
+  def exist?
+    if @c.find_withtag(@id)
+      true
+    else
+      false
+    end
+  end
+
+  def delete
+    @c.delete @id
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath].delete(@id) if CTagID_TBL[@cpath]
+    }
+    self
+  end
+  alias remove  delete
+  alias destroy delete
+
+  def set_to_above(target)
+    @c.addtag_above(@id, target)
+    self
+  end
+  alias above set_to_above
+
+  def set_to_all
+    @c.addtag_all(@id)
+    self
+  end
+  alias all set_to_all
+
+  def set_to_below(target)
+    @c.addtag_below(@id, target)
+    self
+  end
+  alias below set_to_below
+
+  def set_to_closest(x, y, halo=None, start=None)
+    @c.addtag_closest(@id, x, y, halo, start)
+    self
+  end
+  alias closest set_to_closest
+
+  def set_to_enclosed(x1, y1, x2, y2)
+    @c.addtag_enclosed(@id, x1, y1, x2, y2)
+    self
+  end
+  alias enclosed set_to_enclosed
+
+  def set_to_overlapping(x1, y1, x2, y2)
+    @c.addtag_overlapping(@id, x1, y1, x2, y2)
+    self
+  end
+  alias overlapping set_to_overlapping
+
+  def set_to_withtag(target)
+    @c.addtag_withtag(@id, target)
+    self
+  end
+  alias withtag set_to_withtag
+end
+
+class TkcTagString<TkcTag
+  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
+
+    if mode
+      tk_call_without_enc(@c.path, "addtag", @id, mode, *args)
+    end
+  end
+end
+TkcNamedTag = TkcTagString
+
+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"
+    #end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = 'all'
+    CTagID_TBL.mutex.synchronize{
+      CTagID_TBL[@cpath] = {} unless CTagID_TBL[@cpath]
+      CTagID_TBL[@cpath][@id] = self
+    }
+  end
+=end
+end
+
+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"
+    #end
+    @c = parent
+    @cpath = parent.path
+    @path = @id = 'current'
+    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, 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)
+    #  fail ArgumentError, "expect TkCanvas for 1st argument"
+    #end
+    @c = parent
+    @cpath = parent.path
+    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)
+      @c.addtag_withtag(@id, i)
+    end
+    self
+  end
+  alias add include
+
+  def exclude(*tags)
+    for i in tags
+      #i.dtag(@id)
+      @c.dtag(i, @id)
+    end
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/checkbutton.rb b/ext/tk/lib/tk/checkbutton.rb
new file mode 100644
index 0000000000..b7449541c5
--- /dev/null
+++ b/ext/tk/lib/tk/checkbutton.rb
@@ -0,0 +1,32 @@
+#
+# tk/checkbutton.rb : treat checkbutton widget
+#
+require 'tk'
+require 'tk/radiobutton'
+
+class Tk::CheckButton<Tk::RadioButton
+  TkCommandNames = ['checkbutton'.freeze].freeze
+  WidgetClassName = 'Checkbutton'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('checkbutton', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('checkbutton', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def toggle
+    tk_send_without_enc('toggle')
+    self
+  end
+end
+
+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/clipboard.rb b/ext/tk/lib/tk/clipboard.rb
new file mode 100644
index 0000000000..d4205a5c28
--- /dev/null
+++ b/ext/tk/lib/tk/clipboard.rb
@@ -0,0 +1,75 @@
+#
+# tk/clipboard.rb : methods to treat clipboard
+#
+require 'tk'
+
+module TkClipboard
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['clipboard'.freeze].freeze
+
+  def self.clear(win=nil)
+    if win
+      tk_call_without_enc('clipboard', 'clear', '-displayof', win)
+    else
+      tk_call_without_enc('clipboard', 'clear')
+    end
+  end
+  def self.clear_on_display(win)
+    tk_call_without_enc('clipboard', 'clear', '-displayof', win)
+  end
+
+  def self.get(type=nil)
+    if type
+      tk_call_without_enc('clipboard', 'get', '-type', type)
+    else
+      tk_call_without_enc('clipboard', 'get')
+    end
+  end
+  def self.get_on_display(win, type=nil)
+    if type
+      tk_call_without_enc('clipboard', 'get', '-displayof', win, '-type', type)
+    else
+      tk_call_without_enc('clipboard', 'get', '-displayof', win)
+    end
+  end
+
+  def self.set(data, keys=nil)
+    clear
+    append(data, keys)
+  end
+  def self.set_on_display(win, data, keys=nil)
+    clear(win)
+    append_on_display(win, data, keys)
+  end
+
+  def self.append(data, keys=nil)
+    args = ['clipboard', 'append']
+    args.concat(hash_kv(keys))
+    args.concat(['--', data])
+    tk_call(*args)
+  end
+  def self.append_on_display(win, data, keys=nil)
+    args = ['clipboard', 'append', '-displayof', win]
+    args.concat(hash_kv(keys))
+    args.concat(['--', data])
+    tk_call(*args)
+  end
+
+  def clear
+    TkClipboard.clear_on_display(self)
+    self
+  end
+  def get(type=nil)
+    TkClipboard.get_on_display(self, type)
+  end
+  def set(data, keys=nil)
+    TkClipboard.set_on_display(self, data, keys)
+    self
+  end
+  def append(data, keys=nil)
+    TkClipboard.append_on_display(self, data, keys)
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/clock.rb b/ext/tk/lib/tk/clock.rb
new file mode 100644
index 0000000000..4e9438f5ab
--- /dev/null
+++ b/ext/tk/lib/tk/clock.rb
@@ -0,0 +1,71 @@
+#
+# tk/clock.rb : methods for clock command
+#
+require 'tk'
+
+module Tk
+  module Clock
+    include Tk
+    extend TkCore
+
+    def self.add(clk, *args)
+      tk_call_without_enc('clock','add', clk, *args).to_i
+    end
+
+    def self.clicks(ms=nil)
+      ms = ms.to_s if ms.kind_of?(Symbol)
+      case ms
+      when nil, ''
+        tk_call_without_enc('clock','clicks').to_i
+      when /^mic/
+        tk_call_without_enc('clock','clicks','-microseconds').to_i
+      when /^mil/
+        tk_call_without_enc('clock','clicks','-milliseconds').to_i
+      else
+        tk_call_without_enc('clock','clicks','-milliseconds').to_i
+      end
+    end
+
+    def self.format(clk, form=nil)
+      if form
+        tk_call('clock','format',clk,'-format',form)
+      else
+        tk_call('clock','format',clk)
+      end
+    end
+
+    def self.formatGMT(clk, form=nil)
+      if form
+        tk_call('clock','format',clk,'-format',form,'-gmt','1')
+      else
+        tk_call('clock','format',clk,'-gmt','1')
+      end
+    end
+
+    def self.scan(str, base=nil)
+      if base
+        tk_call('clock','scan',str,'-base',base).to_i
+      else
+        tk_call('clock','scan',str).to_i
+      end
+    end
+
+    def self.scanGMT(str, base=nil)
+      if base
+        tk_call('clock','scan',str,'-base',base,'-gmt','1').to_i
+      else
+        tk_call('clock','scan',str,'-gmt','1').to_i
+      end
+    end
+
+    def self.seconds
+      tk_call_without_enc('clock','seconds').to_i
+    end
+    def self.milliseconds
+      tk_call_without_enc('clock','milliseconds').to_i
+    end
+    def self.microseconds
+      tk_call_without_enc('clock','microseconds').to_i
+    end
+  end
+end
diff --git a/ext/tk/lib/tk/composite.rb b/ext/tk/lib/tk/composite.rb
new file mode 100644
index 0000000000..e267c7a22b
--- /dev/null
+++ b/ext/tk/lib/tk/composite.rb
@@ -0,0 +1,484 @@
+#
+# tk/composite.rb :
+#
+require 'tk'
+
+module TkComposite
+  include Tk
+  extend Tk
+
+=begin
+  def initialize(parent=nil, *args)
+    @delegates = {}
+    @option_methods = {}
+    @option_setting = {}
+
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      @frame = TkFrame.new(parent)
+      @path = @epath = @frame.path
+      initialize_composite(keys)
+    else
+      @frame = TkFrame.new(parent)
+      @path = @epath = @frame.path
+      initialize_composite(*args)
+    end
+  end
+=end
+
+  def _choice_classname_of_baseframe
+    base_class_name = nil
+
+    klass = WidgetClassNames[self.class::WidgetClassName]
+
+    if klass
+      # WidgetClassName is a known class
+      #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
+          base_class_name = self.class.name
+          if base_class_name == ''
+            # anonymous class -> use ancestor's name
+            base_class_name = klass.name
+          end
+        else
+          # not subclass -> use WidgetClassName
+          base_class_name = klass.name
+        end
+
+      else
+        # klass is invalid for the base frame
+        #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 == ''
+            # anonymous class -> use TkFrame
+            base_class_name = nil
+          end
+        else
+          # no idea for the base frame -> use TkFrame
+          base_class_name = nil
+        end
+      end
+
+    elsif self.class::WidgetClassName && ! self.class::WidgetClassName.empty?
+      # unknown WidgetClassName is defined -> use it for the base frame
+      base_class_name = self.class::WidgetClassName
+
+    else
+      # no valid WidgetClassName
+      #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 == ''
+          # anonymous class -> use TkFrame
+          base_class_name = nil
+        end
+      else
+        # no idea for the base frame -> use TkFrame
+        base_class_name = nil
+      end
+    end
+
+    base_class_name
+  end
+  private :_choice_classname_of_baseframe
+
+  # def initialize(parent=nil, *args)
+  def initialize(*args)
+    @delegates = {}
+    @option_methods = {}
+    @option_setting = {}
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = {}
+    end
+    parent = args.shift
+    parent = keys.delete('parent') if keys.has_key?('parent')
+
+    if keys.key?('classname')
+      keys['class'] = keys.delete('classname')
+    end
+    if (base_class_name = (keys.delete('class')).to_s).empty?
+      base_class_name = _choice_classname_of_baseframe
+    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
+
+    args.push(keys) unless keys.empty?
+    initialize_composite(*args)
+  end
+
+  def database_classname
+    @frame.database_classname
+  end
+
+  def database_class
+    @frame.database_class
+  end
+
+  def epath
+    @epath
+  end
+
+  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)
+    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)
+    if wins.length == 0
+      fail ArgumentError, "target widgets are not given"
+    end
+    if alias_opt != option && (alias_opt == 'DEFAULT' || option == 'DEFAULT')
+      fail ArgumentError, "cannot alias 'DEFAULT' option"
+    end
+    alias_opt = alias_opt.to_s
+    option = option.to_s
+    if @delegates[alias_opt].kind_of?(Array)
+      if (elem = @delegates[alias_opt].assoc(option))
+        wins.each{|w| elem[1].push(w)}
+      else
+        @delegates[alias_opt] << [option, wins]
+      end
+    else
+      @delegates[alias_opt] = [ [option, wins] ]
+    end
+  end
+
+  def delegate(option, *wins)
+    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
+
+    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)
+        end
+      end
+    rescue
+    end
+
+    super(slot)
+  end
+=end
+
+  def configure(slot, value=None)
+    if slot.kind_of? Hash
+      slot.each{|slot,value| configure slot, value}
+      return self
+    end
+
+    slot = slot.to_s
+
+    if @option_methods.include?(slot)
+      unless @option_methods[slot][:cget]
+        if value.kind_of?(Symbol)
+          @option_setting[slot] = value.to_s
+        else
+          @option_setting[slot] = value
+        end
+      end
+      return self.__send__(@option_methods[slot][:set], value)
+    end
+
+    tbl = @delegates[slot]
+    tbl = @delegates['DEFAULT'] unless tbl
+
+    begin
+      if tbl
+        last = nil
+        tbl.each{|opt, wins|
+          opt = slot if opt == 'DEFAULT'
+          wins.each{|w| last = w.configure(opt, value)}
+        }
+        return last
+      end
+    rescue
+    end
+
+    super(slot, value)
+  end
+
+  def configinfo(slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        slot = slot.to_s
+        if @option_methods.include?(slot)
+          if @option_methods[slot][:info]
+            return self.__send__(@option_methods[slot][:info])
+          else
+            return [slot, '', '', '', self.cget(slot)]
+          end
+        end
+
+        tbl = @delegates[slot]
+        tbl = @delegates['DEFAULT'] unless tbl
+
+        begin
+          if tbl
+            if tbl.length == 1
+              opt, wins = tbl[0]
+              if slot == opt || opt == 'DEFAULT'
+                return wins[-1].configinfo(slot)
+              else
+                info = wins[-1].configinfo(opt)
+                info[0] = slot
+                return info
+              end
+            else
+              opt, wins = tbl[-1]
+              return [slot, '', '', '', wins[-1].cget(opt)]
+            end
+          end
+        rescue
+        end
+
+        super(slot)
+
+      else # slot == nil
+        info_list = super(slot)
+
+        tbl = @delegates['DEFAULT']
+        if tbl
+          wins = tbl[0][1]
+          if wins && wins[-1]
+            wins[-1].configinfo.each{|info|
+              slot = info[0]
+              info_list.delete_if{|i| i[0] == slot} << info
+            }
+          end
+        end
+
+        @delegates.each{|slot, tbl|
+          next if slot == 'DEFAULT'
+          if tbl.length == 1
+            opt, wins = tbl[0]
+            next unless wins && wins[-1]
+            if slot == opt
+              info_list.delete_if{|i| i[0] == slot} <<
+                wins[-1].configinfo(slot)
+            else
+              info = wins[-1].configinfo(opt)
+              info[0] = slot
+              info_list.delete_if{|i| i[0] == slot} << info
+            end
+          else
+            opt, wins = tbl[-1]
+            info_list.delete_if{|i| i[0] == slot} <<
+              [slot, '', '', '', wins[-1].cget(opt)]
+          end
+        }
+
+        @option_methods.each{|slot, m|
+          if m[:info]
+            info = self.__send__(m[:info])
+          else
+            info = [slot, '', '', '', self.cget(slot)]
+          end
+          info_list.delete_if{|i| i[0] == slot} << info
+        }
+
+        info_list
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        slot = slot.to_s
+        if @option_methods.include?(slot)
+          if @option_methods[slot][:info]
+            return self.__send__(@option_methods[slot][:info])
+          else
+            return {slot => ['', '', '', self.cget(slot)]}
+          end
+        end
+
+        tbl = @delegates[slot]
+        tbl = @delegates['DEFAULT'] unless tbl
+
+        begin
+          if tbl
+            if tbl.length == 1
+              opt, wins = tbl[0]
+              if slot == opt || opt == 'DEFAULT'
+                return wins[-1].configinfo(slot)
+              else
+                return {slot => wins[-1].configinfo(opt)[opt]}
+              end
+            else
+              opt, wins = tbl[-1]
+              return {slot => ['', '', '', wins[-1].cget(opt)]}
+            end
+          end
+        rescue
+        end
+
+        super(slot)
+
+      else # slot == nil
+        info_list = super(slot)
+
+        tbl = @delegates['DEFAULT']
+        if tbl
+          wins = tbl[0][1]
+          info_list.update(wins[-1].configinfo) if wins && wins[-1]
+        end
+
+        @delegates.each{|slot, tbl|
+          next if slot == 'DEFAULT'
+          if tbl.length == 1
+            opt, wins = tbl[0]
+            next unless wins && wins[-1]
+            if slot == opt
+              info_list.update(wins[-1].configinfo(slot))
+            else
+              info_list.update({slot => wins[-1].configinfo(opt)[opt]})
+            end
+          else
+            opt, wins = tbl[-1]
+            info_list.update({slot => ['', '', '', wins[-1].cget(opt)]})
+          end
+        }
+
+        @option_methods.each{|slot, m|
+          if m[:info]
+            info = self.__send__(m[:info])
+          else
+            info = {slot => ['', '', '', self.cget(slot)]}
+          end
+          info_list.update(info)
+        }
+
+        info_list
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tk/console.rb b/ext/tk/lib/tk/console.rb
new file mode 100644
index 0000000000..64e257594c
--- /dev/null
+++ b/ext/tk/lib/tk/console.rb
@@ -0,0 +1,52 @@
+#
+#   tk/console.rb : control the console on system without a real console
+#
+require 'tk'
+
+module TkConsole
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['console'.freeze, 'consoleinterp'.freeze].freeze
+
+  def self.create
+    TkCore::INTERP._create_console
+  end
+  self.create  # initialize console
+
+  def self.title(str=None)
+    tk_call 'console', str
+  end
+  def self.hide
+    tk_call_without_enc('console', 'hide')
+  end
+  def self.show
+    tk_call_without_enc('console', 'show')
+  end
+  def self.eval(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    _fromUTF8(tk_call_without_enc('console', 'eval',
+                                  _get_eval_enc_str(tcl_script)))
+  end
+  def self.maininterp_eval(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    _fromUTF8(tk_call_without_enc('consoleinterp', 'eval',
+                                  _get_eval_enc_str(tcl_script)))
+
+  end
+  def self.maininterp_record(tcl_script)
+    #
+    # supports a Tcl script only
+    # I have no idea to support a Ruby script seamlessly.
+    #
+    _fromUTF8(tk_call_without_enc('consoleinterp', 'record',
+                                  _get_eval_enc_str(tcl_script)))
+
+  end
+end
diff --git a/ext/tk/lib/tk/dialog.rb b/ext/tk/lib/tk/dialog.rb
new file mode 100644
index 0000000000..7ef7820699
--- /dev/null
+++ b/ext/tk/lib/tk/dialog.rb
@@ -0,0 +1,326 @@
+#
+#   tk/dialog.rb : create dialog boxes
+#
+require 'tk'
+require 'tk/variable.rb'
+
+class TkDialogObj < TkWindow
+  extend Tk
+
+  TkCommandNames = ['tk_dialog'.freeze].freeze
+
+  def self.show(*args)
+    dlog = self.new(*args)
+    dlog.show
+    dlog
+  end
+
+  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 " +
+                     "to the dialog button#{i}. It was removed.\n")
+      end
+      c.delete('command'); c.delete(:command)
+      # @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 '+
+                   array2tk_list(hash_kv(c))+'; '
+    }
+    case configs
+    when Proc
+      @buttons.each_index{|i|
+        if (c = configs.call(i)).kind_of?(Hash)
+          set_config.call(c,i)
+        end
+      }
+
+    when Array
+      @buttons.each_index{|i|
+        if (c = configs[i]).kind_of?(Hash)
+          set_config.call(c,i)
+        end
+      }
+
+    when Hash
+      @buttons.each_with_index{|s,i|
+        if (c = configs[s]).kind_of?(Hash)
+          set_config.call(c,i)
+        end
+      }
+    end
+    # @config = 'after idle {' + @config + '};' if @config != ""
+    @config = array2tk_list(['after', 'idle', @config]) << ';' if @config != ""
+  end
+  private :_set_button_config
+
+  # initialize tk_dialog
+  def create_self(keys)
+    # @var = TkVariable.new
+    @val = nil
+
+    @title   = title
+
+    @message = message
+    @message_config = message_config
+    @msgframe_config = msgframe_config
+
+    @bitmap  = bitmap
+    @bitmap_config = message_config
+
+    @default_button = default_button
+
+    @buttons = buttons
+    @button_configs = proc{|num| button_configs(num)}
+    @btnframe_config = btnframe_config
+
+    #@config = "puts [winfo children .w0000];"
+    @config = ""
+
+    @command = prev_command
+
+    if keys.kind_of?(Hash)
+      @title   = keys['title'] if keys.key? 'title'
+      @message = keys['message'] if keys.key? 'message'
+      @bitmap  = keys['bitmap'] if keys.key? 'bitmap'
+      # @bitmap  = '{}' if @bitmap == nil || @bitmap == ""
+      @bitmap  = '' unless @bitmap
+      @default_button = keys['default'] if keys.key? 'default'
+      @buttons = keys['buttons'] if keys.key? 'buttons'
+
+      @command = keys['prev_command'] if keys.key? 'prev_command'
+
+      @message_config = keys['message_config'] if keys.key? 'message_config'
+      @msgframe_config = keys['msgframe_config'] if keys.key? 'msgframe_config'
+      @bitmap_config  = keys['bitmap_config']  if keys.key? 'bitmap_config'
+      @button_configs = keys['button_configs'] if keys.key? 'button_configs'
+      @btnframe_config = keys['btnframe_config'] if keys.key? 'btnframe_config'
+    end
+
+    #if @title.include? ?\s
+    #  @title = '{' + @title + '}'
+    #end
+
+    if @buttons.kind_of?(Array)
+      _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
+    if @buttons.kind_of?(Hash)
+      _set_button_config(@buttons)
+      @buttons = @buttons.keys
+    end
+    @buttons = tk_split_simplelist(@buttons) if @buttons.kind_of?(String)
+    @buttons = [] unless @buttons
+=begin
+    @buttons = @buttons.collect{|s|
+      if s.kind_of?(Array)
+        s = s.join(' ')
+      end
+      if s.include? ?\s
+        '{' + s + '}'
+      else
+        s
+      end
+    }
+=end
+
+    if @message_config.kind_of?(Hash)
+      # @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 '+
+                   array2tk_list(hash_kv(@message_config))+';'
+    end
+
+    if @msgframe_config.kind_of?(Hash)
+      # @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 '+
+                   array2tk_list(hash_kv(@msgframe_config))+';'
+    end
+
+    if @btnframe_config.kind_of?(Hash)
+      # @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 '+
+                   array2tk_list(hash_kv(@btnframe_config))+';'
+    end
+
+    if @bitmap_config.kind_of?(Hash)
+      # @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 '+
+                    array2tk_list(hash_kv(@bitmap_config))+';'
+    end
+
+    _set_button_config(@button_configs) if @button_configs
+  end
+  private :create_self
+
+  def show
+    # if @command.kind_of?(Proc)
+    if TkComm._callback_entry?(@command)
+      @command.call(self)
+    end
+
+    if @default_button.kind_of?(String)
+      default_button = @buttons.index(@default_button)
+    else
+      default_button = @default_button
+    end
+    # 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 '+
+    #          @path+" "+@title+" {#{@message}} "+@bitmap+" "+
+    #          String(default_button)+" "+@buttons.join(' ')+']}')
+    Tk.ip_eval(@config)
+    # @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 + ' ' +
+    #                   String(default_button) + ' ' + @buttons.join(' ')).to_i
+    @val = Tk.ip_eval(array2tk_list([
+                                      self.class::TkCommandNames[0],
+                                      @path, @title, @message, @bitmap,
+                                      String(default_button)
+                                    ].concat(@buttons))).to_i
+  end
+
+  def value
+    # @var.value.to_i
+    @val
+  end
+
+  def name
+    (@val)? @buttons[@val]: nil
+  end
+
+  ############################################################
+  #                                                          #
+  #  following methods should be overridden for each dialog  #
+  #                                                          #
+  ############################################################
+  private
+
+  def title
+    # returns a title string of the dialog window
+    return "DIALOG"
+  end
+  def message
+    # returns a message text to display on the dialog
+    return "MESSAGE"
+  end
+  def message_config
+    # returns a Hash {option=>value, ...} for the message text
+    return nil
+  end
+  def msgframe_config
+    # returns a Hash {option=>value, ...} for the message text frame
+    return nil
+  end
+  def bitmap
+    # returns a bitmap name or a bitmap file path
+    # (@ + path ; e.g. '@/usr/share/bitmap/sample.xbm')
+    return "info"
+  end
+  def bitmap_config
+    # returns nil or a Hash {option=>value, ...} for the bitmap
+    return nil
+  end
+  def default_button
+    # returns a default button's number or name
+    # if nil or null string, set no-default
+    return 0
+  end
+  def buttons
+    #return "BUTTON1 BUTTON2"
+    return ["BUTTON1", "BUTTON2"]
+  end
+  def button_configs(num)
+    # returns nil / Proc / Array or Hash (see _set_button_config)
+    return nil
+  end
+  def btnframe_config
+    # returns nil or a Hash {option=>value, ...} for the button frame
+    return nil
+  end
+  def prev_command
+    # returns nil or a Proc
+    return nil
+  end
+end
+TkDialog2 = TkDialogObj
+
+#
+# TkDialog : with showing at initialize
+#
+class TkDialog < TkDialogObj
+  def self.show(*args)
+    self.new(*args)
+  end
+
+  def initialize(*args)
+    super(*args)
+    show
+  end
+end
+
+
+#
+# dialog for warning
+#
+class TkWarningObj < TkDialogObj
+  def initialize(parent = nil, mes = nil)
+    if !mes
+      if parent.kind_of?(TkWindow)
+        mes = ""
+      else
+        mes = parent.to_s
+        parent = nil
+      end
+    end
+    super(parent, :message=>mes)
+  end
+
+  def show(mes = nil)
+    mes_bup = @message
+    @message = mes if mes
+    ret = super()
+    @message = mes_bup
+    ret
+  end
+
+  #######
+  private
+
+  def title
+    return "WARNING";
+  end
+  def bitmap
+    return "warning";
+  end
+  def default_button
+    return 0;
+  end
+  def buttons
+    return "OK";
+  end
+end
+TkWarning2 = TkWarningObj
+
+class TkWarning < TkWarningObj
+  def self.show(*args)
+    self.new(*args)
+  end
+  def initialize(*args)
+    super(*args)
+    show
+  end
+end
diff --git a/ext/tk/lib/tk/encodedstr.rb b/ext/tk/lib/tk/encodedstr.rb
new file mode 100644
index 0000000000..59fbb1911d
--- /dev/null
+++ b/ext/tk/lib/tk/encodedstr.rb
@@ -0,0 +1,187 @@
+#
+# tk/encodedstr.rb : Tk::EncodedString class
+#
+require 'tk'
+
+###########################################
+#  string with Tcl's encoding
+###########################################
+module Tk
+  class EncodedString < String
+    Encoding = nil
+
+    def self.subst_utf_backslash(str)
+      # str.gsub(/\\u([0-9A-Fa-f]{1,4})/){[$1.hex].pack('U')}
+      TclTkLib._subst_UTF_backslash(str)
+    end
+    def self.utf_backslash(str)
+      self.subst_utf_backslash(str)
+    end
+
+    def self.subst_tk_backslash(str)
+      TclTkLib._subst_Tcl_backslash(str)
+    end
+
+    def self.utf_to_backslash_sequence(str)
+      str.unpack('U*').collect{|c|
+        if c <= 0xFF  # ascii character
+          c.chr
+        else
+          format('\u%X', c)
+        end
+      }.join('')
+    end
+    def self.utf_to_backslash(str)
+      self.utf_to_backslash_sequence(str)
+    end
+
+    def self.to_backslash_sequence(str)
+      str.unpack('U*').collect{|c|
+        if c <= 0x1F  # control character
+          case c
+          when 0x07; '\a'
+          when 0x08; '\b'
+          when 0x09; '\t'
+          when 0x0a; '\n'
+          when 0x0b; '\v'
+          when 0x0c; '\f'
+          when 0x0d; '\r'
+          else
+            format('\x%02X', c)
+          end
+        elsif c <= 0xFF  # ascii character
+          c.chr
+        else
+          format('\u%X', c)
+        end
+      }.join('')
+    end
+
+    def self.new_with_utf_backslash(str, enc = nil)
+      self.new('', enc).replace(self.subst_utf_backslash(str))
+    end
+
+    def self.new_without_utf_backslash(str, enc = nil)
+      self.new('', enc).replace(str)
+    end
+
+    def initialize(str, enc = nil)
+      super(str)
+      # @encoding = ( enc ||
+      #              ((self.class::Encoding)?
+      #                  self.class::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
+
+    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)
+  # end
+
+  ##################################
+
+  class BinaryString < EncodedString
+    Encoding = 'binary'.freeze
+  end
+  # def Tk.BinaryString(str)
+  #   Tk::BinaryString.new(str)
+  # end
+
+  ##################################
+
+  class UTF8_String < EncodedString
+    Encoding = 'utf-8'.freeze
+    def self.new(str)
+      super(self.subst_utf_backslash(str))
+    end
+
+    def to_backslash_sequence
+      Tk::EncodedString.utf_to_backslash_sequence(self)
+    end
+    alias to_backslash to_backslash_sequence
+  end
+  # def Tk.UTF8_String(str)
+  #   Tk::UTF8_String.new(str)
+  # end
+
+end
diff --git a/ext/tk/lib/tk/entry.rb b/ext/tk/lib/tk/entry.rb
new file mode 100644
index 0000000000..d4aa03f2b6
--- /dev/null
+++ b/ext/tk/lib/tk/entry.rb
@@ -0,0 +1,120 @@
+#
+#               tk/entry.rb - Tk entry classes
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+
+require 'tk'
+require 'tk/label'
+require 'tk/scrollable'
+require 'tk/validation'
+
+class Tk::Entry<Tk::Label
+  include X_Scrollable
+  include TkValidation
+
+  TkCommandNames = ['entry'.freeze].freeze
+  WidgetClassName = 'Entry'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  #def create_self(keys)
+  #  super(__conv_vcmd_on_hash_kv(keys))
+  #end
+  #private :create_self
+
+  def __strval_optkeys
+    super() + ['show', 'disabledbackground', 'readonlybackground']
+  end
+  private :__strval_optkeys
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', index))
+  end
+  def cursor
+    number(tk_send_without_enc('index', 'insert'))
+  end
+  alias icursor cursor
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor= cursor=
+  def index(idx)
+    number(tk_send_without_enc('index', idx))
+  end
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  def invoke_validate
+    bool(tk_send_without_enc('validate'))
+  end
+  def validate(mode = nil)
+    if mode
+      configure 'validate', mode
+    else
+      invoke_validate
+    end
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def [](*args)
+    self.value[*args]
+  end
+  def []=(*args)
+    val = args.pop
+    str = self.value
+    str[*args] = val
+    self.value = str
+    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
new file mode 100644
index 0000000000..bf4e122322
--- /dev/null
+++ b/ext/tk/lib/tk/event.rb
@@ -0,0 +1,562 @@
+#
+#  tk/event.rb - module for event
+#
+
+module TkEvent
+end
+
+########################
+
+require 'tkutil'
+require 'tk' unless Object.const_defined? :TkComm
+
+########################
+
+module TkEvent
+  class Event < TkUtil::CallbackSubst
+    module Grp
+      KEY         =           0x1
+      BUTTON      =           0x2
+      MOTION      =           0x4
+      CROSSING    =           0x8
+      FOCUS       =           0x10
+      EXPOSE      =           0x20
+      VISIBILITY  =           0x40
+      CREATE      =           0x80
+      DESTROY     =           0x100
+      UNMAP       =           0x200
+      MAP         =           0x400
+      REPARENT    =           0x800
+      CONFIG      =           0x1000
+      GRAVITY     =           0x2000
+      CIRC        =           0x4000
+      PROP        =           0x8000
+      COLORMAP    =           0x10000
+      VIRTUAL     =           0x20000
+      ACTIVATE    =           0x40000
+      MAPREQ      =           0x80000
+      CONFIGREQ   =           0x100000
+      RESIZEREQ   =           0x200000
+      CIRCREQ     =           0x400000
+
+      MWHEEL      =           KEY
+
+      STRING_DATA =           0x80000000  # special flag for 'data' field
+
+      ALL         =           0xFFFFFFFF
+
+      KEY_BUTTON_MOTION_VIRTUAL  = (KEY|MWHEEL|BUTTON|MOTION|VIRTUAL)
+      KEY_BUTTON_MOTION_CROSSING = (KEY|MWHEEL|BUTTON|MOTION|CROSSING|VIRTUAL)
+    end
+
+    type_data = [
+      #-----+-------------------+------------------+-----------------------#
+      #  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,                                        ],
+      [ 35,  :VirtualEvent,      Grp::VIRTUAL,                             ],
+      [ 36,  :ActivateNotify,    Grp::ACTIVATE,    'Activate'              ],
+      [ 37,  :DeactivateNotify,  Grp::ACTIVATE,    'Deactivate'            ],
+      [ 38,  :MouseWheelEvent,   Grp::MWHEEL,      'MouseWheel'            ],
+      [ 39,  :TK_LASTEVENT,      0,                                        ]
+    ]
+
+    module TypeNum
+    end
+
+    TYPE_NAME_TBL  = Hash.new
+    TYPE_ID_TBL    = Hash.new
+    TYPE_GROUP_TBL = Hash.new
+
+    type_data.each{|id, c_name, g_flag, *t_names|
+      TypeNum.const_set(c_name, id)
+      t_names.each{|t_name| t_name.freeze; TYPE_NAME_TBL[t_name] = id }
+      TYPE_ID_TBL[id]    = t_names
+      TYPE_GROUP_TBL[id] = g_flag
+    }
+
+    TYPE_NAME_TBL.freeze
+    TYPE_ID_TBL.freeze
+
+    def self.type_id(name)
+      TYPE_NAME_TBL[name.to_s]
+    end
+
+    def self.type_name(id)
+      TYPE_ID_TBL[id] && TYPE_ID_TBL[id][0]
+    end
+
+    def self.group_flag(id)
+      TYPE_GROUP_TBL[id] || 0
+    end
+
+    #############################################
+
+    module StateMask
+      ShiftMask      =        (1<<0)
+      LockMask       =        (1<<1)
+      ControlMask    =        (1<<2)
+      Mod1Mask       =        (1<<3)
+      Mod2Mask       =        (1<<4)
+      Mod3Mask       =        (1<<5)
+      Mod4Mask       =        (1<<6)
+      Mod5Mask       =        (1<<7)
+      Button1Mask    =        (1<<8)
+      Button2Mask    =        (1<<9)
+      Button3Mask    =        (1<<10)
+      Button4Mask    =        (1<<11)
+      Button5Mask    =        (1<<12)
+
+      AnyModifier    =        (1<<15)
+
+      META_MASK      =  (AnyModifier<<1)
+      ALT_MASK       =  (AnyModifier<<2)
+      EXTENDED_MASK  =  (AnyModifier<<3)
+
+      CommandMask    =  Mod1Mask
+      OptionMask     =  Mod2Mask
+    end
+
+    #############################################
+
+    FIELD_FLAG = {
+      # key  =>  flag
+      'above'       => Grp::CONFIG,
+      'borderwidth' => (Grp::CREATE|Grp::CONFIG),
+      '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),
+      'keycode'     => Grp::KEY,
+      'keysym'      => Grp::KEY,
+      'mode'        => (Grp::CROSSING|Grp::FOCUS),
+      'override'    => (Grp::CREATE|Grp::MAP|Grp::REPARENT|Grp::CONFIG),
+      'place'       => Grp::CIRC,
+      'root'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'rootx'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'rooty'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'sendevent'   => Grp::ALL,
+      'serial'      => Grp::ALL,
+      'state'       => (Grp::KEY_BUTTON_MOTION_VIRTUAL|
+                        Grp::CROSSING|Grp::VISIBILITY),
+      'subwindow'   => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING),
+      'time'        => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
+                        Grp::PROP),
+      'warp'        => Grp::KEY_BUTTON_MOTION_VIRTUAL,
+      'width'       => (Grp::EXPOSE|Grp::CREATE|Grp::CONFIG),
+      'window'      => (Grp::CREATE|Grp::UNMAP|Grp::MAP|Grp::REPARENT|
+                        Grp::CONFIG|Grp::GRAVITY|Grp::CIRC),
+      'when'        => Grp::ALL,
+      'x'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
+                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
+                        Grp::REPARENT),
+      'y'           => (Grp::KEY_BUTTON_MOTION_VIRTUAL|Grp::CROSSING|
+                        Grp::EXPOSE|Grp::CREATE|Grp::CONFIG|Grp::GRAVITY|
+                        Grp::REPARENT),
+    }
+
+    FIELD_OPERATION = {
+      'root' => proc{|val|
+        begin
+          Tk.tk_call_without_enc('winfo', 'pathname', val)
+          val
+        rescue
+          nil
+        end
+      },
+
+      'subwindow' => proc{|val|
+        begin
+          Tk.tk_call_without_enc('winfo', 'pathname', val)
+          val
+        rescue
+          nil
+        end
+      },
+
+      'window' => proc{|val| nil}
+    }
+
+    #-------------------------------------------
+
+    def valid_fields(group_flag=nil)
+      group_flag = self.class.group_flag(self.type) unless group_flag
+
+      fields = {}
+      FIELD_FLAG.each{|key, flag|
+        next if (flag & group_flag) == 0
+        begin
+          val = self.__send__(key)
+        rescue
+          next
+        end
+        # next if !val || val == '??'
+        next if !val || (val == '??' && (flag & Grp::STRING_DATA))
+        fields[key] = val
+      }
+
+      fields
+    end
+
+    def valid_for_generate(group_flag=nil)
+      fields = valid_fields(group_flag)
+
+      FIELD_OPERATION.each{|key, cmd|
+        next unless fields.has_key?(key)
+        val = FIELD_OPERATION[key].call(fields[key])
+        if val
+          fields[key] = val
+        else
+          fields.delete(key)
+        end
+      }
+
+      fields
+    end
+
+    def generate(win, modkeys={})
+      klass = self.class
+
+      if modkeys.has_key?(:type) || modkeys.has_key?('type')
+        modkeys = TkComm._symbolkey2str(modkeys)
+        type_id = modkeys.delete('type')
+      else
+        type_id = self.type
+      end
+
+      type_name  = klass.type_name(type_id)
+      unless type_name
+        fail RuntimeError, "type_id #{type_id} is invalid"
+      end
+
+      group_flag = klass.group_flag(type_id)
+
+      opts = valid_for_generate(group_flag)
+
+      modkeys.each{|key, val|
+        if val
+          opts[key.to_s] = val
+        else
+          opts.delete(key.to_s)
+        end
+      }
+
+      if group_flag != Grp::KEY
+        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.
+        # That will make infinite loop.
+        w = Tk.tk_call_without_enc('focus')
+        begin
+          Tk.tk_call_without_enc('focus', win)
+          Tk.event_generate(win, type_name, opts)
+        ensure
+          Tk.tk_call_without_enc('focus', w)
+        end
+      end
+    end
+
+    #############################################
+
+    # [ <'%' 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 ],
+      # ?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) ],
+
+      [ ?x, proc{|val|
+          begin
+            TkComm::number(val)
+          rescue ArgumentError
+            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.
+    #
+    #     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, LONGKEY_TBL, PROC_TBL) # if use longname-keys
+
+    #
+    # 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,
+    # please override _get_extra_args_tbl
+    #
+    #def self._get_extra_args_tbl
+    #  # return an array of convert procs
+    #  []
+    #end
+
+=begin
+    alias button num
+    alias delta  wheel_delta
+    alias root   rootwin_id
+    alias rootx  x_root
+    alias root_x x_root
+    alias rooty  y_root
+    alias root_y y_root
+    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,
+      :window    => :widget
+    }
+
+    _define_attribute_aliases(ALIAS_TBL)
+
+  end
+
+  ###############################################
+
+  def install_bind_for_event_class(klass, cmd, *args)
+    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)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        id = install_cmd(cmd)
+      else
+        id = install_cmd(proc{|*arg|
+          ex_args = []
+          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+          begin
+            TkUtil.eval_cmd(cmd, *(ex_args.concat(klass.scan_args(keys, arg))))
+          rescue Exception=>e
+            if TkCore::INTERP.kind_of?(TclTkIp)
+              fail e
+            else
+              # MultiTkIp
+              fail Exception, "#{e.class}: #{e.message.dup}"
+            end
+          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
+
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        id = install_cmd(cmd)
+      else
+        id = install_cmd(proc{|*arg|
+          ex_args = []
+          extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+          begin
+            TkUtil.eval_cmd(cmd, *(ex_args << klass.new(*klass.scan_args(keys, arg))))
+          rescue Exception=>e
+            if TkCore::INTERP.kind_of?(TclTkIp)
+              fail e
+            else
+              # MultiTkIp
+              fail Exception, "#{e.class}: #{e.message.dup}"
+            end
+          end
+        })
+      end
+    end
+
+    if TkCore::INTERP.kind_of?(TclTkIp)
+      id + ' ' + args
+    else
+      # MultiTkIp
+      "if {[set st [catch {#{id} #{args}} ret]] != 0} {
+         if {$st == 4} {
+           return -code continue $ret
+         } elseif {$st == 3} {
+           return -code break $ret
+         } elseif {$st == 2} {
+           return -code return $ret
+         } elseif {[regexp {^Exception: (TkCallbackContinue: .*)$} \
+                                                               $ret m msg]} {
+           return -code continue $msg
+         } elseif {[regexp {^Exception: (TkCallbackBreak: .*)$} $ret m msg]} {
+           return -code break $msg
+         } elseif {[regexp {^Exception: (TkCallbackReturn: .*)$} $ret m msg]} {
+           return -code return $msg
+         } elseif {[regexp {^Exception: (\\S+: .*)$} $ret m msg]} {
+           return -code return $msg
+         } else {
+           return -code error $ret
+         }
+       } else {
+          set ret
+       }"
+    end
+  end
+
+  def install_bind(cmd, *args)
+    install_bind_for_event_class(TkEvent::Event, cmd, *args)
+  end
+end
diff --git a/ext/tk/lib/tk/font.rb b/ext/tk/lib/tk/font.rb
new file mode 100644
index 0000000000..03db850f96
--- /dev/null
+++ b/ext/tk/lib/tk/font.rb
@@ -0,0 +1,2351 @@
+#
+#  tk/font.rb - the class to treat fonts on Ruby/Tk
+#
+#                               by  Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+class TkFont
+  include Tk
+  extend TkCore
+
+  TkCommandNames = ['font'.freeze].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.mutex.synchronize{ Tk_FontNameTBL.clear }
+    Tk_FontUseTBL.mutex.synchronize{ Tk_FontUseTBL.clear }
+  }
+
+  # option_type : default => string
+  OptionType = Hash.new(?s)
+  OptionType['size'] = ?n
+  OptionType['pointadjust'] = ?n
+  OptionType['underline'] = ?b
+  OptionType['overstrike'] = ?b
+
+  # metric_type : default => num_or_str
+  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\..*/
+    DEFAULT_LATIN_FONT_NAME = 'a14'.freeze
+    DEFAULT_KANJI_FONT_NAME = 'k14'.freeze
+
+  when /^8\.[0-4]/
+    if JAPANIZED_TK
+      begin
+        fontnames = tk_call('font', 'names')
+        case fontnames
+        when /defaultgui/
+          # Tcl/Tk-JP for Windows
+          ltn = 'defaultgui'
+          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',
+                                                 '-compound'))
+        else
+          # unknown Tcl/Tk-JP
+          #platform = tk_call('set', 'tcl_platform(platform)')
+          platform = Tk::PLATFORM['platform']
+          case platform
+          when 'unix'
+            ltn = {'family'=>'Helvetica'.freeze,
+                   'size'=>-12, 'weight'=>'bold'.freeze}
+            #knj = 'k14'
+            #knj = '-misc-fixed-medium-r-normal--14-*-*-*-c-*-jisx0208.1983-0'
+            knj = '-*-fixed-bold-r-normal--12-*-*-*-c-*-jisx0208.1983-0'
+          when 'windows'
+            ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
+            knj = 'mincho'
+          when 'macintosh'
+            ltn = 'system'
+            knj = 'mincho'
+          else # unknown
+            ltn = 'Helvetica'
+            knj = 'mincho'
+          end
+        end
+      rescue
+        ltn = 'Helvetica'
+        knj = 'mincho'
+      end
+
+    else # not JAPANIZED_TK
+      begin
+        #platform = tk_call('set', 'tcl_platform(platform)')
+        platform = Tk::PLATFORM['platform']
+        case platform
+        when 'unix'
+          ltn = {'family'=>'Helvetica'.freeze,
+                 'size'=>-12, 'weight'=>'bold'.freeze}
+        when 'windows'
+          ltn = {'family'=>'MS Sans Serif'.freeze, 'size'=>8}
+        when 'macintosh'
+          ltn = 'system'
+        else # unknown
+          ltn = 'Helvetica'
+        end
+      rescue
+        ltn = 'Helvetica'
+      end
+
+      knj = ltn.dup
+    end
+
+    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
+
+  end
+
+  if $DEBUG
+    print "default latin font = "; p DEFAULT_LATIN_FONT_NAME
+    print "default kanji font = "; p DEFAULT_KANJI_FONT_NAME
+  end
+
+
+  ###################################
+  class DescendantFont
+    def initialize(compound, type)
+      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'
+        @type = type
+      when :kanji, :latin, :ascii
+        @type = type.to_s
+      else
+        fail ArgumentError, "unknown type '#{type}'"
+      end
+    end
+
+    def dup
+      fail RuntimeError, "cannot dupulicate a descendant font"
+    end
+    def clone
+      fail RuntimeError, "cannot clone a descendant font"
+    end
+
+    def to_eval
+      @compound.__send__(@type + '_font_id')
+    end
+    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)
+    end
+    def []=(slot, value)
+      @compound.__send__(@type + '_configure', slot, value)
+      value
+    end
+
+    def method_missing(id, *args)
+      @compound.__send__(@type + '_' + id.id2name, *args)
+    end
+  end
+
+
+  ###################################
+  # 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)
+     fnt.actual(option)
+    else
+      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 == ''
+    if fnt.kind_of?(TkFont)
+     fnt.actual_displayof(win, option)
+    else
+      win = '.' unless win
+      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)
+      fnt.configure(fnt, slot, value)
+    else
+      configure_core(fnt, slot, value)
+    end
+    fnt
+  end
+
+  def TkFont.configinfo(fnt, slot=nil)
+    if fnt.kind_of?(TkFont)
+      fnt.configinfo(fnt, slot)
+    else
+      configinfo_core(fnt, slot)
+    end
+  end
+
+  def TkFont.current_configinfo(fnt, slot=nil)
+    if fnt.kind_of?(TkFont)
+      fnt.current_configinfo(fnt, slot)
+    else
+      current_configinfo_core(fnt, slot)
+    end
+  end
+
+  def TkFont.measure(fnt, text)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      fnt.measure(text)
+    else
+      measure_core(fnt, nil, text)
+    end
+  end
+
+  def TkFont.measure_displayof(fnt, win, text)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      fnt.measure_displayof(win, text)
+    else
+      win = '.' unless win
+      measure_core(fnt, win, text)
+    end
+  end
+
+  def TkFont.metrics(fnt, option=nil)
+    fnt = '{}' if fnt == ''
+    if fnt.kind_of?(TkFont)
+      fnt.metrics(option)
+    else
+      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 == ''
+    if fnt.kind_of?(TkFont)
+      font.metrics_displayof(win, option=nil)
+    else
+      win = '.' unless win
+      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\..*/
+      ['fixed']
+
+    when /^8\..*/
+      if win
+        tk_split_simplelist(tk_call('font', 'families', '-displayof', win))
+      else
+        tk_split_simplelist(tk_call('font', 'families'))
+      end
+    end
+  end
+
+  def TkFont.names
+    case (Tk::TK_VERSION)
+    when /^4\..*/
+      r = ['fixed']
+      r += ['a14', 'k14'] if JAPANIZED_TK
+      Tk_FontNameTBL.mutex.synchronize{
+        Tk_FontNameTBL.each_value{|obj| r.push(obj)}
+      }
+      #r | []
+      r.uniq
+
+    when /^8\..*/
+      tk_split_simplelist(tk_call('font', 'names'))
+
+    end
+  end
+
+  def TkFont.create_copy(font)
+    fail 'source-font must be a TkFont object' unless font.kind_of? TkFont
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      keys = {}
+      font.configinfo.each{|key,value| keys[key] = value }
+      TkFont.new(font.latin_font_id, font.kanji_font_id, keys)
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      TkFont.new(font.latin_font_id, font.kanji_font_id, font.configinfo)
+    end
+  end
+
+  def TkFont.get_obj(name)
+    name = name.to_s
+    if name =~ /^(@font[0-9]+)(|c|l|k)$/
+      Tk_FontNameTBL.mutex.synchronize{
+        Tk_FontNameTBL[$1]
+      }
+    else
+      Tk_FontNameTBL.mutex.synchronize{
+        Tk_FontNameTBL[name]
+      }
+    end
+  end
+
+  def TkFont.init_widget_font(pathname, *args)
+    win, tag, key = pathname.split(';')
+    key = 'font' if key == nil || key == ''
+    path = [win, tag, key].join(';')
+
+    case (Tk::TK_VERSION)
+    when /^4\..*/
+      regexp = /^-(|kanji)#{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 << {}
+
+      ltn_key = "-#{key}"
+      knj_key = "-kanji#{key}"
+
+      ltn_info = conf_list.find{|conf| conf[0] == ltn_key}
+      ltn = ltn_info[-1]
+      ltn = nil if ltn == [] || ltn == ""
+
+      knj_info = conf_list.find{|conf| conf[0] == knj_key}
+      knj = knj_info[-1]
+      knj = nil if knj == [] || knj == ""
+
+      TkFont.new(ltn, knj).call_font_configure([path, key], *args)
+
+    when /^8\.[0-4]/
+      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
+        begin
+          compound = tk_split_simplelist(
+              Hash[*tk_split_simplelist(tk_call('font', 'configure',
+                                                fnt))].collect{|k,v|
+                [k[1..-1], v]
+              }.assoc('compound')[1])
+        rescue
+          compound = []
+        end
+        if compound == []
+          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],
+                     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)
+    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
+        tk_call('font', 'failsafe', font)
+      end
+    rescue
+    end
+  end
+
+  ###################################
+  # instance methods
+  ###################################
+  private
+  ###################################
+  def init_dummy_fontobj
+    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
+    @descendant = [nil, nil] # [latin, kanji]
+
+    case (Tk::TK_VERSION)
+    when /^4\..*/
+      @latinfont = ""
+      @kanjifont = ""
+      if JAPANIZED_TK
+        @compoundfont = [[@latinfont], [@kanjifont]]
+        @fontslot = {'font'=>@latinfont, 'kanjifont'=>@kanjifont}
+      else
+        @compoundfont = @latinfont
+        @fontslot = {'font'=>@latinfont}
+      end
+    else
+      @latinfont = @id + 'l'
+      @kanjifont = @id + 'k'
+      @compoundfont = @id + 'c'
+
+      if JAPANIZED_TK
+        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
+        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
+        tk_call('font', 'create', @compoundfont,
+                '-compound', [@latinfont, @kanjifont])
+      else
+        tk_call('font', 'create', @latinfont)
+        tk_call('font', 'create', @kanjifont)
+        tk_call('font', 'create', @compoundfont)
+      end
+
+      @fontslot = {'font'=>@compoundfont}
+    end
+
+    self
+  end
+
+  def initialize(ltn=nil, knj=nil, keys=nil)
+    ltn = '{}' if ltn == ''
+    knj = '{}' if knj == ''
+
+    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]
+
+    # @latinfont = @id + 'l'
+    # @kanjifont = @id + 'k'
+    # @compoundfont = @id + 'c'
+    # @fontslot = {}
+
+    if knj.kind_of?(Hash) && !keys
+      keys = knj
+      knj = nil
+    end
+
+    # compound font check
+    if Tk::TK_VERSION == '8.0' && JAPANIZED_TK
+      begin
+        compound = tk_split_simplelist(tk_call('font', 'configure',
+                                               ltn, '-compound'))
+        if knj == nil
+          if compound != []
+            ltn, knj = compound
+          end
+        else
+          if compound != []
+            ltn = compound[0]
+          end
+          compound = tk_split_simplelist(tk_call('font', 'configure',
+                                                 knj, '-compound'))
+          if compound != []
+            knj = compound[1]
+          end
+        end
+      rescue
+      end
+    end
+
+    if ltn
+      if JAPANIZED_TK && !knj
+        if Tk::TK_VERSION =~ /^4..*/
+          knj = DEFAULT_KANJI_FONT_NAME
+        else
+          knj = ltn
+        end
+      end
+    else
+      ltn = DEFAULT_LATIN_FONT_NAME
+      knj = DEFAULT_KANJI_FONT_NAME if JAPANIZED_TK && !knj
+    end
+
+    create_compoundfont(ltn, knj, keys)
+  end
+
+  def initialize_copy(font)
+    unless font.kind_of?(TkFont)
+      fail TypeError, '"initialize_copy should take same class object'
+    end
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      keys = {}
+      font.configinfo.each{|key,value| keys[key] = value }
+      initialize(font.latin_font_id, font.kanji_font_id, keys)
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      initialize(font.latin_font_id, font.kanji_font_id, font.configinfo)
+    end
+  end
+
+  def _get_font_info_from_hash(font)
+    font = _symbolkey2str(font)
+    foundry  = (info = font['foundry'] .to_s)?  info: '*'
+    family   = (info = font['family']  .to_s)?  info: '*'
+    weight   = (info = font['weight']  .to_s)?  info: '*'
+    slant    = (info = font['slant']   .to_s)?  info: '*'
+    swidth   = (info = font['swidth']  .to_s)?  info: '*'
+    adstyle  = (info = font['adstyle'] .to_s)?  info: '*'
+    pixels   = (info = font['pixels']  .to_s)?  info: '*'
+    points   = (info = font['points']  .to_s)?  info: '*'
+    resx     = (info = font['resx']    .to_s)?  info: '*'
+    resy     = (info = font['resy']    .to_s)?  info: '*'
+    space    = (info = font['space']   .to_s)?  info: '*'
+    avgWidth = (info = font['avgWidth'].to_s)?  info: '*'
+    charset  = (info = font['charset'] .to_s)?  info: '*'
+    encoding = (info = font['encoding'].to_s)?  info: '*'
+
+    [foundry, family, weight, slant, swidth, adstyle,
+      pixels, points, resx, resy, space, avgWidth, charset, encoding]
+  end
+
+  def create_latinfont_tk4x(font)
+    if font.kind_of? Hash
+      @latinfont = '-' + _get_font_info_from_hash(font).join('-') + '-'
+
+    elsif font.kind_of? Array
+      finfo = {}
+      finfo['family'] = font[0].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'] = '13'
+        end
+      end
+      font[2..-1].each{|style|
+        case (style)
+        when 'normal'
+          finfo['weight'] = style
+        when 'bold'
+          finfo['weight'] = style
+        when 'roman'
+          finfo['slant'] = 'r'
+        when 'italic'
+          finfo['slant'] = 'i'
+        end
+      }
+
+      @latinfont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
+
+    elsif font.kind_of? TkFont
+      @latinfont = font.latin_font
+
+    else
+      if font
+        @latinfont = font
+      else
+        @latinfont = DEFAULT_LATIN_FONT_NAME
+      end
+
+    end
+  end
+
+  def create_kanjifont_tk4x(font)
+    unless JAPANIZED_TK
+      @kanjifont = ""
+      return
+    end
+
+    if font.kind_of? Hash
+      @kanjifont = '-' + _get_font_info_from_hash(font).join('-') + '-'
+
+    elsif font.kind_of? Array
+      finfo = {}
+      finfo['family'] = font[0].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'] = '13'
+        end
+      end
+      font[2..-1].each{|style|
+        case (style)
+        when 'normal'
+          finfo['weight'] = style
+        when 'bold'
+          finfo['weight'] = style
+        when 'roman'
+          finfo['slant'] = 'r'
+        when 'italic'
+          finfo['slant'] = 'i'
+        end
+      }
+
+      @kanjifont = '-' + _get_font_info_from_hash(finfo).join('-') + '-'
+    elsif font.kind_of? TkFont
+      @kanjifont = font.kanji_font_id
+    else
+      if font
+        @kanjifont = font
+      else
+        @kanjifont = DEFAULT_KANJI_FONT_NAME
+      end
+    end
+  end
+
+  def create_compoundfont_tk4x(ltn, knj, keys)
+    create_latinfont(ltn)
+    create_kanjifont(knj)
+
+    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
+
+  def create_latinfont_tk8x(font)
+    @latinfont = @id + 'l'
+
+    if JAPANIZED_TK
+      if font.kind_of? Hash
+        if font[:charset] || font['charset']
+          tk_call('font', 'create', @latinfont, *hash_kv(font))
+        else
+          tk_call('font', 'create', @latinfont,
+                  '-charset', 'iso8859', *hash_kv(font))
+        end
+      elsif font.kind_of? Array
+        tk_call('font', 'create', @latinfont, '-copy', array2tk_list(font))
+        tk_call('font', 'configure', @latinfont, '-charset', 'iso8859')
+      elsif font.kind_of? TkFont
+        tk_call('font', 'create', @latinfont, '-copy', font.latin_font)
+      elsif font
+        tk_call('font', 'create', @latinfont, '-copy', font,
+                '-charset', 'iso8859')
+      else
+        tk_call('font', 'create', @latinfont, '-charset', 'iso8859')
+      end
+    else
+      if font.kind_of? Hash
+        tk_call('font', 'create', @latinfont, *hash_kv(font))
+      else
+        keys = {}
+        if font.kind_of? Array
+          actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
+        elsif font.kind_of? TkFont
+          actual_core(font.latin_font).each{|key,val| keys[key] = val}
+        elsif font
+          actual_core(font).each{|key,val| keys[key] = val}
+        end
+        tk_call('font', 'create', @latinfont, *hash_kv(keys))
+      end
+
+      if font && @compoundfont
+        keys = {}
+        actual_core(@latinfont).each{|key,val| keys[key] = val}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+      end
+    end
+  end
+
+  def create_kanjifont_tk8x(font)
+    @kanjifont = @id + 'k'
+
+    if JAPANIZED_TK
+      if font.kind_of? Hash
+        if font[:charset] || font['charset']
+          tk_call('font', 'create', @kanjifont, *hash_kv(font))
+        else
+          tk_call('font', 'create', @kanjifont,
+                  '-charset', 'jisx0208.1983', *hash_kv(font))
+        end
+      elsif font.kind_of? Array
+        tk_call('font', 'create', @kanjifont, '-copy', array2tk_list(font))
+        tk_call('font', 'configure', @kanjifont, '-charset', 'jisx0208.1983')
+      elsif font.kind_of? TkFont
+        tk_call('font', 'create', @kanjifont, '-copy', font.kanji_font_id)
+      elsif font
+        tk_call('font', 'create', @kanjifont, '-copy', font,
+                '-charset', 'jisx0208.1983')
+      else
+        tk_call('font', 'create', @kanjifont, '-charset', 'jisx0208.1983')
+      end
+      # end of JAPANIZED_TK
+
+    else
+      if font.kind_of? Hash
+        tk_call('font', 'create', @kanjifont, *hash_kv(font))
+      else
+        keys = {}
+        if font.kind_of? Array
+          actual_core(array2tk_list(font)).each{|key,val| keys[key] = val}
+        elsif font.kind_of? TkFont
+          actual_core(font.kanji_font_id).each{|key,val| keys[key] = val}
+        elsif font
+          actual_core(font).each{|key,val| keys[key] = val}
+        end
+        tk_call('font', 'create', @kanjifont, *hash_kv(keys))
+      end
+
+      if font && @compoundfont
+        keys = {}
+        actual_core(@kanjifont).each{|key,val| keys[key] = val}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+      end
+    end
+  end
+
+  def create_compoundfont_tk8x(ltn, knj, keys)
+    if knj
+      create_latinfont(ltn)
+      create_kanjifont(knj)
+    else
+      cfnt = ltn
+      create_kanjifont(cfnt)
+      create_latinfont(cfnt)
+    end
+
+    @compoundfont = @id + 'c'
+
+    if JAPANIZED_TK
+      unless keys
+        keys = {}
+      else
+        keys = keys.dup
+      end
+      if (tk_call('font', 'configure', @latinfont, '-underline') == '1' &&
+          tk_call('font', 'configure', @kanjifont, '-underline') == '1' &&
+          !keys.key?('underline'))
+        keys['underline'] = true
+      end
+      if (tk_call('font', 'configure', @latinfont, '-overstrike') == '1' &&
+          tk_call('font', 'configure', @kanjifont, '-overstrike') == '1' &&
+          !keys.key?('overstrike'))
+        keys['overstrike'] = true
+      end
+
+      @fontslot = {'font'=>@compoundfont}
+      # @fontslot['font'] = @compoundfont
+      begin
+        tk_call('font', 'create', @compoundfont,
+                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+      rescue RuntimeError => e
+        if ltn == knj
+          if e.message =~ /kanji font .* specified/
+            tk_call('font', 'delete', @latinfont)
+            create_latinfont(DEFAULT_LATIN_FONT_NAME)
+            opts = []
+            Hash[*(tk_split_simplelist(tk_call('font', 'configure',
+                                               @kanjifont)))].each{|k,v|
+              case k
+              when '-size', '-weight', '-slant', '-underline', '-overstrike'
+                opts << k << v
+              end
+            }
+            tk_call('font', 'configure', @latinfont, *opts)
+            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',
+                                               @latinfont)))].each{|k,v|
+              case k
+              when '-size', '-weight', '-slant', '-underline', '-overstrike'
+                opts << k << v
+              end
+            }
+            tk_call('font', 'configure', @kanjifont, *opts)
+            tk_call('font', 'create', @compoundfont,
+                    '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+
+          else
+            raise e
+          end
+        else
+          raise e
+        end
+      end
+    else
+      tk_call('font', 'create', @compoundfont)
+
+      latinkeys = {}
+      begin
+        actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
+      rescue
+        latinkeys = {}
+      end
+      if latinkeys != {}
+        tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+      end
+
+      if knj
+        compoundkeys = nil
+        kanjikeys = {}
+        begin
+          actual_core(@kanjifont).each{|key,val| kanjikeys[key] = val}
+        rescue
+          kanjikeys = {}
+        end
+        if kanjikeys != {}
+          tk_call('font', 'configure', @compoundfont, *hash_kv(kanjikeys))
+        end
+      end
+
+      if cfnt
+        if cfnt.kind_of?(Hash)
+          compoundkeys = cfnt.dup
+        else
+          compoundkeys = {}
+          actual_core(cfnt).each{|key,val| compoundkeys[key] = val}
+        end
+        compoundkeys.update(_symbolkey2str(keys))
+        keys = compoundkeys
+      end
+
+      @fontslot = {'font'=>@compoundfont}
+      # @fontslot['font'] = @compoundfont
+      tk_call('font', 'configure', @compoundfont, *hash_kv(keys))
+    end
+  end
+
+  ###################################
+  public
+  ###################################
+  def inspect
+    sprintf("#<%s:%0x:%s>", self.class.inspect, self.__id__, @compoundfont)
+  end
+
+  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
+        configinfo name
+      rescue
+        super(id, *args)
+#        fail NameError, "undefined local variable or method `#{name}' for #{self.to_s}", error_at
+      end
+    else
+      super(id, *args)
+#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+    end
+  end
+
+  def call_font_configure(path, *args)
+    if path.kind_of?(Array)
+      # [path, optkey]
+      win, tag = path[0].split(';')
+      optkey = path[1].to_s
+    else
+      win, tag, optkey = path.split(';')
+    end
+
+    fontslot = _symbolkey2str(@fontslot)
+    if optkey && optkey != ""
+      ltn = fontslot.delete('font')
+      knj = fontslot.delete('kanjifont')
+      fontslot[optkey] = ltn if ltn
+      fontslot["kanji#{optkey}"] = knj if knj
+    end
+
+    keys = _symbolkey2str(args.pop).update(fontslot)
+    args.concat(hash_kv(keys))
+    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 = []
+    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) || 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) || winobj.kind_of?(Tk::Canvas)
+          if (tagobj = TkcTag.id2obj(winobj, tag)).kind_of? TkcTag
+            if optkey
+              ret.push([winobj, tagobj, optkey])
+            else
+              ret.push([winobj, tagobj])
+            end
+          elsif (tagobj = TkcItem.id2obj(winobj, tag)).kind_of? TkcItem
+            if optkey
+              ret.push([winobj, tagobj, optkey])
+            else
+              ret.push([winobj, tagobj])
+            end
+          else
+            if optkey
+              ret.push([winobj, tag, optkey])
+            else
+              ret.push([winobj, tag])
+            end
+          end
+        #elsif winobj.kind_of? TkMenu
+        elsif winobj.kind_of?(TkMenu) || winobj.kind_of?(Tk::Menu)
+          if optkey
+            ret.push([winobj, tag, optkey])
+          else
+            ret.push([winobj, tag])
+          end
+        else
+          if optkey
+            ret.push([win, tag, optkey])
+          else
+            ret.push([win, tag])
+          end
+        end
+      else
+        ret.push(tk_tcl2ruby(key))
+      end
+    }
+    ret
+  end
+
+  def id
+    @id
+  end
+
+  def to_eval
+    font
+  end
+
+  def font
+    @compoundfont
+  end
+  alias font_id font
+  alias name font
+  alias to_s font
+
+  def latin_font_id
+    @latinfont
+  end
+
+  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
+
+  def kanji_font_id
+    @kanjifont
+  end
+
+  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)
+    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
+    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 == 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 == 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
+  end
+
+  def []=(slot, val)
+    configure slot, val
+    val
+  end
+
+  def configure(slot, value=None)
+    configure_core(@compoundfont, slot, value)
+    self
+  end
+
+  def configinfo(slot=nil)
+    configinfo_core(@compoundfont, slot)
+  end
+
+  def current_configinfo(slot=nil)
+    current_configinfo_core(@compoundfont, slot)
+  end
+
+  def delete
+    delete_core
+  end
+
+  def latin_configure(slot, value=None)
+    if JAPANIZED_TK
+      configure_core(@latinfont, slot, value)
+    else
+      configure(slot, value)
+    end
+    self
+  end
+
+  def latin_configinfo(slot=nil)
+    if JAPANIZED_TK
+      configinfo_core(@latinfont, slot)
+    else
+      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 == nil
+      configure_core(@compoundfont, slot, value) # use @compoundfont
+    elsif @kanjifont != ""
+      configure_core(@kanjifont, slot, value)
+      configure('size'=>configinfo('size')) # to reflect new configuration
+    else
+      #""
+      configure(slot, value)
+    end
+    self
+  end
+
+  def kanji_configinfo(slot=nil)
+    #if JAPANIZED_TK
+    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
+    latin_replace(ltn)
+    kanji_replace(knj)
+    self
+  end
+
+  def latin_replace(ltn)
+    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
+  end
+
+  def measure(text)
+    measure_core(@compoundfont, nil, text)
+  end
+
+  def measure_displayof(win, text)
+    win = '.' unless win
+    measure_core(@compoundfont, win, text)
+  end
+
+  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)
+    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
+    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 @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)
+    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 /
+                                      kanji_actual.assoc('size')[1].to_f )
+      end
+    rescue
+    end
+    self
+  end
+
+  ###################################
+  # private alias
+  ###################################
+  case (Tk::TK_VERSION)
+  when /^4\..*/
+    alias create_latinfont        create_latinfont_tk4x
+    alias create_kanjifont        create_kanjifont_tk4x
+    alias create_compoundfont     create_compoundfont_tk4x
+
+  when /^8\.[0-5]/
+    alias create_latinfont        create_latinfont_tk8x
+    alias create_kanjifont        create_kanjifont_tk8x
+    alias create_compoundfont     create_compoundfont_tk8x
+
+  else
+    alias create_latinfont        create_latinfont_tk8x
+    alias create_kanjifont        create_kanjifont_tk8x
+    alias create_compoundfont     create_compoundfont_tk8x
+
+  end
+
+  ###################################
+  # public alias
+  ###################################
+  alias ascii_font             latin_font
+  alias asciifont              latinfont
+  alias create_asciifont       create_latinfont
+  alias ascii_actual           latin_actual
+  alias ascii_actual_displayof latin_actual_displayof
+  alias ascii_configure        latin_configure
+  alias ascii_configinfo       latin_configinfo
+  alias ascii_replace          latin_replace
+  alias ascii_metrics          latin_metrics
+
+  ###################################
+=begin
+  def dup
+    TkFont.new(self)
+  end
+  def clone
+    TkFont.new(self)
+  end
+=end
+end
+
+module TkFont::CoreMethods
+  include Tk
+  extend TkCore
+
+  private
+
+  def actual_core_tk4x(font, win=nil, option=nil)
+    # dummy
+    if option == 'pointadjust' || option == :pointadjust
+        1.0
+    elsif option
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        0
+      when ?b
+        false
+      else
+        ''
+      end
+    else
+      [['family',''], ['size',0], ['weight',''], ['slant',''],
+        ['underline',false], ['overstrike',false], ['charset',''],
+        ['pointadjust',0]]
+    end
+  end
+
+  def actual_core_tk8x(font, win=nil, option=nil)
+    font = '{}' if font == ''
+
+    if option == 'compound' || option == :compound
+      ""
+    elsif option
+      if win
+        val = tk_call('font', 'actual', font,
+                      "-displayof", win, "-#{option}")
+      else
+        val = tk_call('font', 'actual', font, "-#{option}")
+      end
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        num_or_str(val)
+      when ?b
+        bool(val)
+      else
+        val
+      end
+    else
+      l = tk_split_simplelist(if win
+                                 tk_call('font', 'actual', font,
+                                                     "-displayof", win)
+                              else
+                                 tk_call('font', 'actual', font)
+                              end)
+      r = []
+      while key=l.shift
+        if key == '-compound'
+          l.shift
+        else
+          key = key[1..-1]
+          val = l.shift
+          case TkFont::OptionType[key]
+          when ?n
+            r.push [key, num_or_str(val)]
+          when ?b
+            r.push [key, bool(val)]
+          else
+            r.push [key, val]
+          end
+        end
+      end
+      r
+    end
+  end
+
+  def configure_core_tk4x(font, slot, value=None)
+    #""
+    self
+  end
+
+  def configinfo_core_tk4x(font, option=nil)
+    # dummy
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      if option == 'pointadjust' || option == :pointadjust
+        1.0
+      elsif option
+        case TkFont::OptionType[option.to_s]
+        when ?n
+          0
+        when ?b
+          false
+        else
+          ''
+        end
+      else
+        [['family',''], ['size',0], ['weight',''], ['slant',''],
+          ['underline',false], ['overstrike',false], ['charset',''],
+          ['pointadjust',1.0]]
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      current_configinfo_core_tk4x(font, option)
+    end
+  end
+
+  def current_configinfo_core_tk4x(font, option=nil)
+    if option
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        0
+      when ?b
+        false
+      else
+        ''
+      end
+    else
+      {'family'=>'', 'size'=>0, 'weight'=>'', 'slant'=>'',
+        'underline'=>false, 'overstrike'=>false,
+        'charset'=>false, 'pointadjust'=>1.0}
+    end
+  end
+
+  def configure_core_tk8x(font, slot, value=None)
+    if JAPANIZED_TK
+      begin
+        padjust = tk_call('font', 'configure', font, '-pointadjust')
+      rescue
+        padjust = nil
+      end
+    else
+      padjust = nil
+    end
+    if slot.kind_of? Hash
+      if JAPANIZED_TK && (slot.key?('family') || slot.key?(:family))
+        slot = _symbolkey2str(slot)
+        configure_core_tk8x(font, 'family', slot.delete('family'))
+      end
+
+      if ((slot.key?('size') || slot.key?(:size)) &&
+          padjust && !slot.key?('pointadjust') && !slot.key?(:pointadjust))
+        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,
+              "-#{slot}", value, '-pointadjust', padjust)
+    elsif JAPANIZED_TK && (slot == 'family' || slot == :family)
+      # coumpund font?
+      begin
+        compound = tk_split_simplelist(tk_call('font', 'configure',
+                                               font, '-compound'))
+      rescue
+        tk_call('font', 'configure', font, '-family', value)
+        return self
+      end
+      if compound == []
+        tk_call('font', 'configure', font, '-family', value)
+        return self
+      end
+      ltn, knj = compound
+
+      lfnt = tk_call('font', 'create', '-copy', ltn)
+      begin
+        tk_call('font', 'configure', lfnt, '-family', value)
+        latin_replace_core_tk8x(lfnt)
+      rescue RuntimeError => e
+        fail e if $DEBUG
+      ensure
+        tk_call('font', 'delete', lfnt) if lfnt != ''
+      end
+
+      kfnt = tk_call('font', 'create', '-copy', knj)
+      begin
+        tk_call('font', 'configure', kfnt, '-family', value)
+        kanji_replace_core_tk8x(lfnt)
+      rescue RuntimeError => e
+        fail e if $DEBUG
+      ensure
+        tk_call('font', 'delete', kfnt) if kfnt != ''
+      end
+
+    else
+      tk_call('font', 'configure', font, "-#{slot}", value)
+    end
+    self
+  end
+
+  def configinfo_core_tk8x(font, option=nil)
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      if option == 'compound' || option == :compound
+        ""
+      elsif option
+        val = tk_call('font', 'configure', font, "-#{option}")
+        case TkFont::OptionType[option.to_s]
+        when ?n
+          num_or_str(val)
+        when ?b
+          bool(val)
+        else
+          val
+        end
+      else
+        l = tk_split_simplelist(tk_call('font', 'configure', font))
+        r = []
+        while key=l.shift
+          if key == '-compound'
+            l.shift
+          else
+            key = key[1..-1]
+            val = l.shift
+            case TkFont::OptionType[key]
+            when ?n
+              r.push [key, num_or_str(val)]
+            when ?b
+              r.push [key, bool(val)]
+            else
+              r.push [key, val]
+            end
+          end
+        end
+        r
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      current_configinfo_core_tk8x(font, option)
+    end
+  end
+
+  def current_configinfo_core_tk8x(font, option=nil)
+    if option == 'compound'
+      ""
+    elsif option
+      val = tk_call('font', 'configure', font, "-#{option}")
+      case TkFont::OptionType[option.to_s]
+      when ?n
+        num_or_str(val)
+      when ?b
+        bool(val)
+      else
+        val
+      end
+    else
+      l = tk_split_simplelist(tk_call('font', 'configure', font))
+      h = {}
+      while key=l.shift
+        if key == '-compound'
+          l.shift
+        else
+          key = key[1..-1]
+          val = l.shift
+          case TkFont::OptionType[key]
+          when ?n
+            h[key] = num_or_str(val)
+          when ?b
+            h[key] = bool(val)
+          else
+            h[key] = val
+          end
+        end
+      end
+      h
+    end
+  end
+
+  def delete_core_tk4x
+    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) if @latinfont
+    rescue
+    end
+    begin
+      tk_call('font', 'delete', @kanjifont) if @kanjifont
+    rescue
+    end
+    begin
+      tk_call('font', 'delete', @compoundfont) if @compoundfont
+    rescue
+    end
+    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
+    table = nil
+    TkFont::Tk_FontUseTBL.mutex.synchronize{
+      table = TkFont::Tk_FontUseTBL.clone
+    }
+    table.each{|w, fobj|
+      if self == fobj
+        begin
+          if w.include?(';')
+            win, tag, optkey = w.split(';')
+            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) || winobj.kind_of?(Tk::Text)
+              tk_call(win, 'tag', 'configure', tag, "-#{optkey}", @latinfont)
+            #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) || winobj.kind_of?(Tk::Menu)
+              tk_call(win, 'entryconfigure', tag, "-#{optkey}", @latinfont)
+            else
+              raise RuntimeError, "unknown widget type"
+            end
+          else
+#           tk_tcl2ruby(w).font_configure('font'=>@latinfont)
+            tk_call(w, 'configure', '-font', @latinfont)
+          end
+        rescue
+          TkFont::Tk_FontUseTBL.mutex.synchronize{
+            TkFont::Tk_FontUseTBL.delete(w)
+          }
+        end
+      end
+    }
+    self
+  end
+
+  def kanji_replace_core_tk4x(knj)
+    return self unless JAPANIZED_TK
+
+    create_kanjifont_tk4x(knj)
+    @compoundfont[1] = [@kanjifont]
+    @fontslot['kanjifont'] = @kanjifont
+    table = nil
+    TkFont::Tk_FontUseTBL.mutex.synchronize{
+      table = TkFont::Tk_FontUseTBL.clone
+    }
+    table.dup.each{|w, fobj|
+      if self == fobj
+        begin
+          if w.include?(';')
+            win, tag, optkey = w.split(';')
+            optkey = 'kanjifont' unless optkey
+            winobj = tk_tcl2ruby(win)
+#           winobj.tagfont_configure(tag, {'kanjifont'=>@kanjifont})
+            #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) || winobj.kind_of?(Tk::Canvas)
+              tk_call(win, 'itemconfigure', tag, "-#{optkey}", @kanjifont)
+            #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"
+            end
+          else
+#           tk_tcl2ruby(w).font_configure('kanjifont'=>@kanjifont)
+            tk_call(w, 'configure', '-kanjifont', @kanjifont)
+          end
+        rescue
+          Tk_FontUseTBL.mutex.synchronize{
+            TkFont::Tk_FontUseTBL.delete(w)
+          }
+        end
+      end
+    }
+    self
+  end
+
+  def latin_replace_core_tk8x(ltn)
+    ltn = '{}' if ltn == ''
+
+    if JAPANIZED_TK
+      begin
+        tk_call('font', 'delete', '@font_tmp')
+      rescue
+      end
+      begin
+        fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @latinfont)
+      rescue
+        #fnt_bup = ''
+        fnt_bup = TkFont::DEFAULT_LATIN_FONT_NAME
+      end
+    end
+
+    begin
+      tk_call('font', 'delete', @latinfont)
+    rescue
+    end
+    create_latinfont(ltn)
+
+    if JAPANIZED_TK
+      keys = self.configinfo
+      tk_call('font', 'delete', @compoundfont)
+      begin
+        tk_call('font', 'create', @compoundfont,
+                '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+=begin
+        latinkeys = {}
+        begin
+          actual_core(@latinfont).each{|key,val| latinkeys[key] = val}
+        rescue
+          latinkeys = {}
+        end
+        if latinkeys != {}
+          tk_call('font', 'configure', @compoundfont, *hash_kv(latinkeys))
+        end
+=end
+      rescue RuntimeError => e
+        tk_call('font', 'delete', @latinfont)
+        if fnt_bup && fnt_bup != ''
+          tk_call('font', 'create', @latinfont, '-copy', fnt_bup)
+          tk_call('font', 'create', @compoundfont,
+                  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+          tk_call('font', 'delete', fnt_bup)
+        else
+          fail e
+        end
+      end
+
+    else
+      latinkeys = {}
+      begin
+        actual_core(@latinfont).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_core_tk8x(knj)
+    knj = '{}' if knj == ''
+
+    if JAPANIZED_TK
+      begin
+        tk_call('font', 'delete', '@font_tmp')
+      rescue
+      end
+      begin
+        fnt_bup = tk_call('font', 'create', '@font_tmp', '-copy', @kanjifont)
+      rescue
+        #fnt_bup = ''
+        fnt_bup = TkFont::DEFAULT_KANJI_FONT_NAME
+      end
+    end
+
+    begin
+      tk_call('font', 'delete', @kanjifont)
+    rescue
+    end
+    create_kanjifont(knj)
+
+    if JAPANIZED_TK
+      keys = self.configinfo
+      tk_call('font', 'delete', @compoundfont)
+      begin
+        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,
+                  '-compound', [@latinfont, @kanjifont], *hash_kv(keys))
+          tk_call('font', 'delete', fnt_bup)
+        else
+          fail e
+        end
+      end
+    end
+    self
+  end
+
+  def measure_core_tk4x(font, win, text)
+    0
+  end
+
+  def measure_core_tk8x(font, win, text)
+    font = '{}' if font == ''
+
+    if win
+      number(tk_call('font', 'measure', font,
+                     '-displayof', win, text))
+    else
+      number(tk_call('font', 'measure', font, text))
+    end
+  end
+
+  def metrics_core_tk4x(font, win, option=nil)
+    # dummy
+    if option
+      ""
+    else
+      [['ascent',[]], ['descent',[]], ['linespace',[]], ['fixed',[]]]
+    end
+  end
+
+  def metrics_core_tk8x(font, win, option=nil)
+    font = '{}' if font == ''
+
+    if option
+      if win
+        number(tk_call('font', 'metrics', font,
+                       "-displayof", win, "-#{option}"))
+      else
+        number(tk_call('font', 'metrics', font, "-#{option}"))
+      end
+    else
+      l = tk_split_list(if win
+                          tk_call('font','metrics',font,"-displayof",win)
+                        else
+                          tk_call('font','metrics',font)
+                        end)
+      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
+  end
+
+  ###################################
+  # private alias
+  ###################################
+  case (Tk::TK_VERSION)
+  when /^4\..*/
+    alias actual_core             actual_core_tk4x
+    alias configure_core          configure_core_tk4x
+    alias configinfo_core         configinfo_core_tk4x
+    alias current_configinfo_core current_configinfo_core_tk4x
+    alias delete_core             delete_core_tk4x
+    alias latin_replace_core      latin_replace_core_tk4x
+    alias kanji_replace_core      kanji_replace_core_tk4x
+    alias measure_core            measure_core_tk4x
+    alias metrics_core            metrics_core_tk4x
+
+  when /^8\.[0-9]/
+    alias actual_core             actual_core_tk8x
+    alias configure_core          configure_core_tk8x
+    alias configinfo_core         configinfo_core_tk8x
+    alias current_configinfo_core current_configinfo_core_tk8x
+    alias delete_core             delete_core_tk8x
+    alias latin_replace_core      latin_replace_core_tk8x
+    alias kanji_replace_core      kanji_replace_core_tk8x
+    alias measure_core            measure_core_tk8x
+    alias metrics_core            metrics_core_tk8x
+
+  else
+    alias actual_core             actual_core_tk8x
+    alias configure_core          configure_core_tk8x
+    alias configinfo_core         configinfo_core_tk8x
+    alias current_configinfo_core current_configinfo_core_tk8x
+    alias delete_core             delete_core_tk8x
+    alias latin_replace_core      latin_replace_core_tk8x
+    alias kanji_replace_core      kanji_replace_core_tk8x
+    alias measure_core            measure_core_tk8x
+    alias metrics_core            metrics_core_tk8x
+
+  end
+end
+
+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..694c58a607
--- /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
new file mode 100644
index 0000000000..5118939732
--- /dev/null
+++ b/ext/tk/lib/tk/frame.rb
@@ -0,0 +1,132 @@
+#
+# tk/frame.rb : treat frame widget
+#
+require 'tk'
+
+class Tk::Frame<TkWindow
+  TkCommandNames = ['frame'.freeze].freeze
+  WidgetClassName = 'Frame'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+################# old version
+#  def initialize(parent=nil, keys=nil)
+#    if keys.kind_of? Hash
+#      keys = keys.dup
+#      @classname = keys.delete('classname') if keys.key?('classname')
+#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
+#      @container = keys.delete('container') if keys.key?('container')
+#      @visual    = keys.delete('visual')    if keys.key?('visual')
+#    end
+#    super(parent, keys)
+#  end
+#
+#  def create_self
+#    s = []
+#    s << "-class"     << @classname if @classname
+#    s << "-colormap"  << @colormap  if @colormap
+#    s << "-container" << @container if @container
+#    s << "-visual"    << @visual    if @visual
+#    tk_call 'frame', @path, *s
+#  end
+#################
+
+  def __boolval_optkeys
+    super() << 'container'
+  end
+  private :__boolval_optkeys
+
+  def initialize(parent=nil, keys=nil)
+    my_class_name = nil
+    if self.class < WidgetClassNames[self.class::WidgetClassName]
+      my_class_name = self.class.name
+      my_class_name = nil if my_class_name == ''
+    end
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+    else
+      if keys
+        keys = _symbolkey2str(keys)
+        keys['parent'] = parent
+      else
+        keys = {'parent'=>parent}
+      end
+    end
+    if keys.key?('classname')
+       keys['class'] = keys.delete('classname')
+    end
+    @classname = keys['class']
+    @colormap  = keys['colormap']
+    @container = keys['container']
+    @visual    = keys['visual']
+    if !@classname && my_class_name
+      keys['class'] = @classname = my_class_name
+    end
+    if @classname.kind_of? TkBindTag
+      @db_class = @classname
+      @classname = @classname.id
+    elsif @classname
+      @db_class = TkDatabaseClass.new(@classname)
+    else
+      @db_class = self.class
+      @classname = @db_class::WidgetClassName
+    end
+    super(keys)
+  end
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('frame', @path, *hash_kv(keys))
+  #  else
+  #    tk_call_without_enc( 'frame', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def database_classname
+    @classname
+  end
+
+  def self.database_class
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      self
+    else
+      TkDatabaseClass.new(self.name)
+    end
+  end
+  def self.database_classname
+    self.database_class.name
+  end
+
+  def self.bind(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind(*args, &b)
+    end
+  end
+  def self.bind_append(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind_append(*args, &b)
+    end
+  end
+  def self.bind_remove(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind_remove(*args)
+    end
+  end
+  def self.bindinfo(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bindinfo(*args)
+    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
new file mode 100644
index 0000000000..e1e07c44fa
--- /dev/null
+++ b/ext/tk/lib/tk/grid.rb
@@ -0,0 +1,279 @@
+#
+# tk/grid.rb : control grid geometry manager
+#
+require 'tk'
+
+module TkGrid
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['grid'.freeze].freeze
+
+  def anchor(master, anchor=None)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    tk_call_without_enc('grid', 'anchor', master, anchor)
+  end
+
+  def bbox(master, *args)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    args.unshift(master)
+    list(tk_call_without_enc('grid', 'bbox', *args))
+  end
+
+=begin
+  def configure(win, *args)
+    if args[-1].kind_of?(Hash)
+      opts = args.pop
+    else
+      opts = {}
+    end
+    params = []
+    params.push(_epath(win))
+    args.each{|win|
+      case win
+      when '-', 'x', '^'  # RELATIVE PLACEMENT
+        params.push(win)
+      else
+        params.push(_epath(win))
+      end
+    }
+    opts.each{|k, v|
+      params.push("-#{k}")
+      params.push((v.kind_of?(TkObject))? v.epath: v)
+    }
+    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
+=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',
+                        master, index, *hash_kv(args))
+  end
+
+  def rowconfigure(master, index, args)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    tk_call_without_enc("grid", 'rowconfigure', master, index, *hash_kv(args))
+  end
+
+  def columnconfiginfo(master, index, slot=nil)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if slot
+      case slot
+      when 'uniform', :uniform
+        tk_call_without_enc('grid', 'columnconfigure',
+                            master, index, "-#{slot}")
+      else
+        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',
+                                             master, index))
+      info = {}
+      while key = ilist.shift
+        case key
+        when 'uniform'
+          info[key[1..-1]] = ilist.shift
+        else
+          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+        end
+      end
+      info
+    end
+  end
+
+  def rowconfiginfo(master, index, slot=nil)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if slot
+      case slot
+      when 'uniform', :uniform
+        tk_call_without_enc('grid', 'rowconfigure',
+                            master, index, "-#{slot}")
+      else
+        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',
+                                             master, index))
+      info = {}
+      while key = ilist.shift
+        case key
+        when 'uniform'
+          info[key[1..-1]] = ilist.shift
+        else
+          info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+        end
+      end
+      info
+    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
+
+  def forget(*args)
+    return '' if args.size == 0
+    wins = args.collect{|win|
+      # (win.kind_of?(TkObject))? win.epath: win
+      _epath(win)
+    }
+    tk_call_without_enc('grid', 'forget', *wins)
+  end
+
+  def info(slave)
+    # slave = slave.epath if slave.kind_of?(TkObject)
+    slave = _epath(slave)
+    #ilist = list(tk_call_without_enc('grid', 'info', slave))
+    ilist = simplelist(tk_call_without_enc('grid', 'info', slave))
+    info = {}
+    while key = ilist.shift
+      #info[key[1..-1]] = ilist.shift
+      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+    end
+    return info
+  end
+
+  def location(master, x, y)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('grid', 'location', master, x, y))
+  end
+
+  def propagate(master, mode=None)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if mode == None
+      bool(tk_call_without_enc('grid', 'propagate', master))
+    else
+      tk_call_without_enc('grid', 'propagate', master, mode)
+    end
+  end
+
+  def remove(*args)
+    return '' if args.size == 0
+    wins = args.collect{|win|
+      # (win.kind_of?(TkObject))? win.epath: win
+      _epath(win)
+    }
+    tk_call_without_enc('grid', 'remove', *wins)
+  end
+
+  def size(master)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('grid', 'size', master))
+  end
+
+  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 :anchor, :bbox, :add, :forget, :propagate, :info
+  module_function :remove, :size, :slaves, :location
+  module_function :grid, :configure, :columnconfigure, :rowconfigure
+  module_function :column, :row, :columnconfiginfo, :rowconfiginfo
+end
+=begin
+def TkGrid(win, *args)
+  if args[-1].kind_of?(Hash)
+    opts = args.pop
+  else
+    opts = {}
+  end
+  params = []
+  params.push((win.kind_of?(TkObject))? win.epath: win)
+  args.each{|win|
+    case win
+    when '-', 'x', '^'  # RELATIVE PLACEMENT
+      params.push(win)
+    else
+      params.push((win.kind_of?(TkObject))? win.epath: win)
+    end
+  }
+  opts.each{|k, v|
+    params.push("-#{k}")
+    params.push((v.kind_of?(TkObject))? v.epath: v)
+  }
+  tk_call_without_enc("grid", *params)
+end
+=end
diff --git a/ext/tk/lib/tk/image.rb b/ext/tk/lib/tk/image.rb
new file mode 100644
index 0000000000..972383982f
--- /dev/null
+++ b/ext/tk/lib/tk/image.rb
@@ -0,0 +1,395 @@
+#
+# tk/image.rb : treat Tk image objects
+#
+
+require 'tk'
+
+class TkImage<TkObject
+  include Tk
+
+  TkCommandNames = ['image'.freeze].freeze
+
+  Tk_IMGTBL = TkCore::INTERP.create_table
+
+  (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)
+      name = nil
+      if keys.key?(:imagename)
+        name = keys[:imagename]
+      elsif keys.key?('imagename')
+        name = keys['imagename']
+      end
+      if name
+        if name.kind_of?(TkImage)
+          obj = name
+        else
+          name = _get_eval_string(name)
+          obj = nil
+          Tk_IMGTBL.mutex.synchronize{
+            obj = Tk_IMGTBL[name]
+          }
+        end
+        if obj
+          if !(keys[:without_creating] || keys['without_creating'])
+            keys = _symbolkey2str(keys)
+            keys.delete('imagename')
+            keys.delete('without_creating')
+            obj.instance_eval{
+              tk_call_without_enc('image', 'create',
+                                  @type, @path, *hash_kv(keys, true))
+            }
+          end
+          return obj
+        end
+      end
+    end
+    (obj = self.allocate).instance_eval{
+      Tk_IMGTBL.mutex.synchronize{
+        initialize(keys)
+        Tk_IMGTBL[@path] = self
+      }
+    }
+    obj
+  end
+
+  def initialize(keys=nil)
+    @path = nil
+    without_creating = false
+    if keys.kind_of?(Hash)
+      keys = _symbolkey2str(keys)
+      @path = keys.delete('imagename')
+      without_creating = keys.delete('without_creating')
+    end
+    unless @path
+      Tk_Image_ID.mutex.synchronize{
+        @path = Tk_Image_ID.join(TkCore::INTERP._ip_id_)
+        Tk_Image_ID[1].succ!
+      }
+    end
+    unless without_creating
+      tk_call_without_enc('image', 'create',
+                          @type, @path, *hash_kv(keys, true))
+    end
+  end
+
+  def delete
+    Tk_IMGTBL.mutex.synchronize{
+      Tk_IMGTBL.delete(@id) if @id
+    }
+    tk_call_without_enc('image', 'delete', @path)
+    self
+  end
+  def height
+    number(tk_call_without_enc('image', 'height', @path))
+  end
+  def inuse
+    bool(tk_call_without_enc('image', 'inuse', @path))
+  end
+  def itemtype
+    tk_call_without_enc('image', 'type', @path)
+  end
+  def width
+    number(tk_call_without_enc('image', 'width', @path))
+  end
+
+  def TkImage.names
+    Tk_IMGTBL.mutex.synchronize{
+      Tk.tk_call_without_enc('image', 'names').split.collect!{|id|
+        (Tk_IMGTBL[id])? Tk_IMGTBL[id] : id
+      }
+    }
+  end
+
+  def TkImage.types
+    Tk.tk_call_without_enc('image', 'types').split
+  end
+end
+
+class TkBitmapImage<TkImage
+  def __strval_optkeys
+    super() + ['maskdata', 'maskfile']
+  end
+  private :__strval_optkeys
+
+  def initialize(*args)
+    @type = 'bitmap'
+    super(*args)
+  end
+end
+
+# A photo is an image whose pixels can display any color or be transparent.
+# At present, only GIF and PPM/PGM formats are supported, but an interface
+# exists to allow additional image file formats to be added easily.
+#
+# This class documentation is a copy from the original Tcl/Tk at
+# http://www.tcl.tk/man/tcl8.5/TkCmd/photo.htm with some rewritten parts.
+class TkPhotoImage<TkImage
+  NullArgOptionKeys = [ "shrink", "grayscale" ]
+
+  def _photo_hash_kv(keys)
+    keys = _symbolkey2str(keys)
+    NullArgOptionKeys.collect{|opt|
+      if keys[opt]
+        keys[opt] = None
+      else
+        keys.delete(opt)
+      end
+    }
+    keys.collect{|k,v|
+      ['-' << k, v]
+    }.flatten
+  end
+  private :_photo_hash_kv
+
+  # Create a new image with the given options.
+  # == Examples of use :
+  # === Create an empty image of 300x200 pixels
+  #
+  #		image = TkPhotoImage.new(:height => 200, :width => 300)
+  #
+  # === Create an image from a file
+  #
+  #		image = TkPhotoImage.new(:file: => 'my_image.gif')
+  #
+  # == Options
+  # Photos support the following options:
+  # * :data
+  #   Specifies the contents of the image as a string.
+  # * :format
+  #   Specifies the name of the file format for the data.
+  # * :file
+  #   Gives the name of a file that is to be read to supply data for the image.
+  # * :gamma
+  #   Specifies that the colors allocated for displaying this image in a window
+  #   should be corrected for a non-linear display with the specified gamma
+  #   exponent value.
+  # * height
+  #   Specifies the height of the image, in pixels. This option is useful
+  #   primarily in situations where the user wishes to build up the contents of
+  #   the image piece by piece. A value of zero (the default) allows the image
+  #   to expand or shrink vertically to fit the data stored in it.
+  # * palette
+  #   Specifies the resolution of the color cube to be allocated for displaying
+  #   this image.
+  # * width
+  #   Specifies the width of the image, in pixels. This option is useful
+  #   primarily in situations where the user wishes to build up the contents of
+  #   the image piece by piece. A value of zero (the default) allows the image
+  #   to expand or shrink horizontally to fit the data stored in it.
+  def initialize(*args)
+    @type = 'photo'
+    super(*args)
+  end
+
+  # Blank the image; that is, set the entire image to have no data, so it will
+  # be displayed as transparent, and the background of whatever window it is
+  # displayed in will show through.
+  def blank
+    tk_send_without_enc('blank')
+    self
+  end
+
+  def cget_strict(option)
+    case option.to_s
+    when 'data', 'file'
+      tk_send 'cget', '-' << option.to_s
+    else
+      tk_tcl2ruby(tk_send('cget', '-' << option.to_s))
+    end
+  end
+
+  # Returns the current value of the configuration option given by option.
+  # Example, display name of the file from which <tt>image</tt> was created:
+  # 	puts image.cget :file
+  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
+
+  # Copies a region from the image called source to the image called
+  # destination, possibly with pixel zooming and/or subsampling. If no options
+  # are specified, this method copies the whole of source into destination,
+  # starting at coordinates (0,0) in destination. The following options may be
+  # specified:
+  #
+  # * :from [x1, y1, x2, y2]
+  #   Specifies a rectangular sub-region of the source image to be copied.
+  #   (x1,y1) and (x2,y2) specify diagonally opposite corners of the rectangle.
+  #   If x2 and y2 are not specified, the default value is the bottom-right
+  #   corner of the source image. The pixels copied will include the left and
+  #   top edges of the specified rectangle but not the bottom or right edges.
+  #   If the :from option is not given, the default is the whole source image.
+  # * :to [x1, y1, x2, y2]
+  #   Specifies a rectangular sub-region of the destination image to be
+  #   affected. (x1,y1) and (x2,y2) specify diagonally opposite corners of the
+  #   rectangle. If x2 and y2 are not specified, the default value is (x1,y1)
+  #   plus the size of the source region (after subsampling and zooming, if
+  #   specified). If x2 and  y2 are specified, the source region will be
+  #   replicated if necessary to fill the destination region in a tiled fashion.
+  # * :shrink
+  #   Specifies that the size of the destination image should be reduced, if
+  #   necessary, so that the region being copied into is at the bottom-right
+  #   corner of the image. This option will not affect the width or height of
+  #   the image if the user has specified a non-zero value for the :width or
+  #   :height configuration option, respectively.
+  # * :zoom [x, y]
+  #   Specifies that the source region should be magnified by a factor of x
+  #   in the X direction and y in the Y direction. If y is not given, the
+  #   default value is the same as x. With this option, each pixel in the
+  #   source image will be expanded into a block of x x y pixels in the
+  #   destination image, all the same color. x and y must be greater than 0.
+  # * :subsample [x, y]
+  #   Specifies that the source image should be reduced in size by using only
+  #   every xth pixel in the X direction and yth pixel in the Y direction.
+  #   Negative values will cause the image to be flipped about the Y or X axes,
+  #   respectively. If y is not given, the default value is the same as x.
+  # * :compositingrule rule
+  #   Specifies how transparent pixels in the source image are combined with
+  #   the destination image. When a compositing rule of <tt>overlay</tt> is set,
+  #   the old  contents of the destination image are visible, as if the source
+  #   image were  printed on a piece of transparent film and placed over the
+  #   top of the  destination. When a compositing rule of <tt>set</tt> is set,
+  #   the old contents of  the destination image are discarded and the source
+  #   image is used as-is. The default compositing rule is <tt>overlay</tt>.
+  def copy(src, *opts)
+    if opts.size == 0
+      tk_send('copy', src)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('copy', src, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      args = opts.collect{|term|
+        if term.kind_of?(String) && term.include?(?\s)
+          term.split
+        else
+          term
+        end
+      }.flatten
+      tk_send('copy', src, *args)
+    end
+    self
+  end
+
+  # Returns image data in the form of a string. The following options may be
+  # specified:
+  # * :background color
+  #   If the color is specified, the data will not contain any transparency
+  #   information. In all transparent pixels the color will be replaced by the
+  #   specified color.
+  # * :format format-name
+  #   Specifies the name of the image file format handler to be used.
+  #   Specifically, this subcommand searches for the first handler whose name
+  #   matches an initial substring of format-name and which has the capability
+  #   to read this image data. If this option is not given, this subcommand
+  #   uses the first handler that has the capability to read the image data.
+  # * :from [x1, y1, x2, y2]
+  #   Specifies a rectangular region of imageName to be returned. If only x1
+  #   and y1 are specified, the region extends from (x1,y1) to the bottom-right
+  #   corner of imageName. If all four coordinates are given, they specify
+  #   diagonally opposite corners of the rectangular region, including x1,y1
+  #   and excluding x2,y2. The default, if this option is not given, is the
+  #   whole image.
+  # * :grayscale
+  #   If this options is specified, the data will not contain color information.
+  #   All pixel data will be transformed into grayscale.
+  def data(keys={})
+    tk_split_list(tk_send('data', *_photo_hash_kv(keys)))
+  end
+
+  # Returns the color of the pixel at coordinates (x,y) in the image as a list
+  # of three integers between 0 and 255, representing the red, green and blue
+  # components respectively.
+  def get(x, y)
+    tk_send('get', x, y).split.collect{|n| n.to_i}
+  end
+
+  def put(data, *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]))
+    else
+      # for backward compatibility
+      tk_send('put', data, '-to', *opts)
+    end
+    self
+  end
+
+  def read(file, *opts)
+    if opts.size == 0
+      tk_send('read', file)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('read', file, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      args = opts.collect{|term|
+        if term.kind_of?(String) && term.include?(?\s)
+          term.split
+        else
+          term
+        end
+      }.flatten
+      tk_send('read', file, *args)
+    end
+    self
+  end
+
+  def redither
+    tk_send 'redither'
+    self
+  end
+
+  # Returns a boolean indicating if the pixel at (x,y) is transparent.
+  def get_transparency(x, y)
+    bool(tk_send('transparency', 'get', x, y))
+  end
+
+  # Makes the pixel at (x,y) transparent if <tt>state</tt> is true, and makes
+  # that pixel opaque otherwise.
+  def set_transparency(x, y, state)
+    tk_send('transparency', 'set', x, y, state)
+    self
+  end
+
+  def write(file, *opts)
+    if opts.size == 0
+      tk_send('write', file)
+    elsif opts.size == 1 && opts[0].kind_of?(Hash)
+      tk_send('write', file, *_photo_hash_kv(opts[0]))
+    else
+      # for backward compatibility
+      args = opts.collect{|term|
+        if term.kind_of?(String) && term.include?(?\s)
+          term.split
+        else
+          term
+        end
+      }.flatten
+      tk_send('write', file, *args)
+    end
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/itemconfig.rb b/ext/tk/lib/tk/itemconfig.rb
new file mode 100644
index 0000000000..14396048ba
--- /dev/null
+++ b/ext/tk/lib/tk/itemconfig.rb
@@ -0,0 +1,1222 @@
+#
+# tk/itemconfig.rb : control item/tag configuration of widget
+#
+require 'tk'
+require 'tkutil'
+require 'tk/itemfont.rb'
+
+module TkItemConfigOptkeys
+  include TkUtil
+
+  def __item_optkey_aliases(id)
+    {}
+  end
+  private :__item_optkey_aliases
+
+  def __item_numval_optkeys(id)
+    []
+  end
+  private :__item_numval_optkeys
+
+  def __item_numstrval_optkeys(id)
+    []
+  end
+  private :__item_numstrval_optkeys
+
+  def __item_boolval_optkeys(id)
+    ['exportselection', 'jump', 'setgrid', 'takefocus']
+  end
+  private :__item_boolval_optkeys
+
+  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',
+      'selectbackground', 'selectforeground', 'troughcolor'
+    ]
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+
+  def __item_numlistval_optkeys(id)
+    # maybe need to override
+    ['dash', 'activedash', 'disableddash']
+  end
+  private :__item_numlistval_optkeys
+
+  def __item_tkvariable_optkeys(id)
+    ['variable', 'textvariable']
+  end
+  private :__item_tkvariable_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>method, ... }
+    # The method is used to convert a opt-value to a ruby's object.
+    # When get the value of the option "key", "method.call(id, val)" is called.
+    {}
+  end
+  private :__item_val2ruby_optkeys
+
+  def __item_ruby2val_optkeys(id)  # { key=>method, ... }
+    # The method is used to convert a ruby's object to a opt-value.
+    # When set the value of the option "key", "method.call(id, val)" is called.
+    # That is, "-#{key} #{method.call(id, value)}".
+    {}
+  end
+  private :__item_ruby2val_optkeys
+
+  def __item_methodcall_optkeys(id)  # { key=>method, ... }
+    # Use the method for both of get and set.
+    # Usually, the 'key' will not be a widget option.
+    #
+    # maybe need to override
+    # {'coords'=>'coords'}
+    {}
+  end
+  private :__item_methodcall_optkeys
+
+  ################################################
+
+  def __item_keyonly_optkeys(id)  # { def_key=>(undef_key|nil), ... }
+    # maybe need to override
+    {}
+  end
+  private :__item_keyonly_optkeys
+
+
+  def __conv_item_keyonly_opts(id, keys)
+    return keys unless keys.kind_of?(Hash)
+    keyonly = __item_keyonly_optkeys(id)
+    keys2 = {}
+    keys.each{|k, v|
+      optkey = keyonly.find{|kk,vv| kk.to_s == k.to_s}
+      if optkey
+        defkey, undefkey = optkey
+        if v
+          keys2[defkey.to_s] = None
+        else
+          keys2[undefkey.to_s] = None
+        end
+      else
+        keys2[k.to_s] = v
+      end
+    }
+    keys2
+  end
+
+  def itemconfig_hash_kv(id, keys, enc_mode = nil, conf = nil)
+    hash_kv(__conv_item_keyonly_opts(id, keys), enc_mode, conf)
+  end
+end
+
+module TkItemConfigMethod
+  include TkUtil
+  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]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    # maybe need to override
+    [self.path, 'itemconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_confinfo_cmd(id)
+    # maybe need to override
+    __item_config_cmd(id)
+  end
+  private :__item_confinfo_cmd
+
+  def __item_configinfo_struct(id)
+    # maybe need to override
+    {:key=>0, :alias=>1, :db_name=>1, :db_class=>2,
+      :default_value=>3, :current_value=>4}
+  end
+  private :__item_configinfo_struct
+
+  ################################################
+
+  def tagid(tagOrId)
+    # maybe need to override
+    tagOrId
+  end
+
+  ################################################
+
+
+  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
+
+    if option.length == 0
+      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
+        return method.call(tagOrId, optval)
+      rescue => e
+        warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+        return optval
+      end
+    end
+
+    if ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[option] )
+      return self.__send__(method, tagOrId)
+    end
+
+    case option
+    when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+      begin
+        number(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+      num_or_str(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+
+    when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+      begin
+        bool(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+      rescue
+        nil
+      end
+
+    when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+      simplelist(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+
+    when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+      conf = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
+      if conf =~ /^[0-9]/
+        list(conf)
+      else
+        conf
+      end
+
+    when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+      v = tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}"))
+      (v.empty?)? nil: TkVarAccess.new(v)
+
+    when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+      _fromUTF8(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")))
+
+    when /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/
+      fontcode = $1
+      fontkey  = $2
+      fnt = tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{fontkey}")), true)
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(tagid(tagOrId), fontkey)
+      end
+      if fontcode == 'kanji' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(tk_call_without_enc(*(__item_cget_cmd(tagid(tagOrId)) << "-#{option}")), true)
+    end
+  end
+  private :__itemcget_core
+
+  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
+      }
+
+      __item_ruby2val_optkeys(tagid(tagOrId)).each{|key, method|
+        key = key.to_s
+        slot[key] = method.call(tagOrId, slot[key]) if slot.has_key?(key)
+      }
+
+      __item_keyonly_optkeys(tagid(tagOrId)).each{|defkey, undefkey|
+        conf = slot.find{|kk, vv| kk == defkey.to_s}
+        if conf
+          k, v = conf
+          if v
+            slot[k] = None
+          else
+            slot[undefkey.to_s] = None if undefkey
+            slot.delete(k)
+          end
+        end
+      }
+
+      if (slot.find{|k, v| k =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/})
+        tagfont_configure(tagid(tagOrId), slot)
+      elsif slot.size > 0
+        tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot))))
+      end
+
+    else
+      orig_slot = slot
+      slot = slot.to_s
+      if slot.length == 0
+        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
+          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{defkey}"))
+        elsif undefkey
+          tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{undefkey}"))
+        end
+      elsif ( method = _symbolkey2str(__item_ruby2val_optkeys(tagid(tagOrId)))[slot] )
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << method.call(tagOrId, value)))
+      elsif ( method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot] )
+        self.__send__(method, tagOrId, value)
+      elsif (slot =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        if value == None
+          tagfontobj(tagid(tagOrId), $2)
+        else
+          tagfont_configure(tagid(tagOrId), {slot=>value})
+        end
+      else
+        tk_call(*(__item_config_cmd(tagid(tagOrId)) << "-#{slot}" << value))
+      end
+    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
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        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]][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]][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]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+            end
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return [slot, '', '', '', self.__send__(method, tagOrId)]
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            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]] =
+                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                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
+              end
+            end
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            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]] =
+                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                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
+              end
+            end
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            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]] =
+                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]] =
+                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          else
+            # 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]][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]][1..-1]
+          end
+
+          conf
+
+        else
+          # ret = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).collect{|conflist|
+          #   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]][1..-1]
+
+            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
+            case optkey
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                begin
+                  val = method(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                begin
+                  val = method.call(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+              end
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              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]] =
+                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  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
+                end
+              end
+
+            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]] =
+                  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]] =
+                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              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]] =
+                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  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
+                end
+              end
+
+            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]] =
+                  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]] =
+                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_numlistval_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]] =~ /^[0-9]/ )
+                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]] =
+                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+                end
+              end
+
+            else
+              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]])
+                else
+                  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]])
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                end
+              end
+            end
+
+            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]][1..-1]
+            end
+
+            conf
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            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
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret << [optkey.to_s, '', '', '', self.__send__(method, tagOrId)]
+          }
+
+          ret
+        end
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        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]][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)
+          { 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]][1..-1]
+          end
+          { conf[0] => conf[1] }
+        else
+          { conf.shift => conf }
+        end
+      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]
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+            end
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return {slot => ['', '', '', self.__send__(method, tagOrId)]}
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            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]] =
+                  number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                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
+              end
+            end
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            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]] =
+                  bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+              rescue
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              begin
+                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
+              end
+            end
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __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]] =
+                simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            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]] =
+                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]] =
+                list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            # conf = tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))))
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            conf = tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")), false, true)
+
+            if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+              end
+            end
+            if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+              v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+              if v.empty?
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+              else
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+              end
+            end
+
+          else
+            # 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]][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]][1..-1]
+            end
+            { conf[0] => conf[1] }
+          else
+            { conf.shift => conf }
+          end
+
+        else
+          ret = {}
+          # tk_split_simplelist(_fromUTF8(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))))).each{|conflist|
+          #   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]][1..-1]
+
+            optkey = conf[__item_configinfo_struct(tagid(tagOrId))[:key]]
+            case optkey
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                begin
+                  val = method.call(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = val
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                optval = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                begin
+                  val = method.call(tagOrId, optval)
+                rescue => e
+                  warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                  val = optval
+                end
+                conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = val
+              end
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              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]] =
+                    number(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  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
+                end
+              end
+
+            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]] =
+                  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]] =
+                  num_or_str(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              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]] =
+                    bool(conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]])
+                rescue
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                begin
+                  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
+                end
+              end
+
+            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]] =
+                  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]] =
+                  simplelist(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_numlistval_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]] =~ /^[0-9]/ )
+                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]] =
+                  list(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if ( __item_configinfo_struct(tagid(tagOrId))[:default_value] \
+                  && conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:default_value]] = TkVarAccess.new(v)
+                end
+              end
+              if ( conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] )
+                v = conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]]
+                if v.empty?
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = nil
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] = TkVarAccess.new(v)
+                end
+              end
+
+            else
+              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]])
+                else
+                  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]])
+                else
+                  conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]] =
+                    tk_tcl2ruby(conf[__item_configinfo_struct(tagid(tagOrId))[:current_value]])
+                end
+              end
+            end
+
+            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]][1..-1]
+              end
+              ret[conf[0]] = conf[1]
+            else
+              ret[conf.shift] = conf
+            end
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret[optkey]
+            if fontconf.kind_of?(Array)
+              ret.delete(optkey)
+              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
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret[optkey.to_s] = ['', '', '', self.__send__(method, tagOrId)]
+          }
+
+          ret
+        end
+      end
+    end
+  end
+  private :__itemconfiginfo_core
+
+  def itemconfiginfo(tagOrId, slot = nil)
+    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)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        org_slot = slot
+        begin
+          conf = __itemconfiginfo_core(tagOrId, slot)
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            return {conf[0] => conf[-1]}
+          end
+          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
+        end while(org_slot != slot)
+        fail RuntimeError,
+          "there is a configure alias loop about '#{org_slot}'"
+      else
+        ret = {}
+        __itemconfiginfo_core(tagOrId).each{|conf|
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            ret[conf[0]] = conf[-1]
+          end
+        }
+
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      __itemconfiginfo_core(tagOrId, slot).each{|key, conf|
+        ret[key] = conf[-1] if conf.kind_of?(Array)
+      }
+      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
new file mode 100644
index 0000000000..b5da4fa1ef
--- /dev/null
+++ b/ext/tk/lib/tk/itemfont.rb
@@ -0,0 +1,327 @@
+#
+# tk/itemfont.rb : control font of widget items
+#
+require 'tk'
+
+module TkItemFontOptkeys
+  def __item_font_optkeys(id)
+    # maybe need to override
+    ['font']
+  end
+  private :__item_font_optkeys
+end
+
+module TkTreatItemFont
+  include TkItemFontOptkeys
+
+  def __item_pathname(id)
+    # maybe need to override
+    [self.path, id].join(';')
+  end
+  private :__item_pathname
+
+  ################################################
+
+  def tagfont_configinfo(tagOrId, key = nil)
+    optkeys = __item_font_optkeys(tagid(tagOrId))
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __item_pathname(tagid(tagOrId)).split(';')
+
+    if key
+      pathname = [win, tag, key].join(';')
+      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,
+                                *(__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,
+                                  *(__item_confinfo_cmd(tagid(tagOrId))))
+      }
+      fonts
+    end
+  end
+  alias tagfontobj tagfont_configinfo
+
+  def tagfont_configure(tagOrId, slot)
+    pathname = __item_pathname(tagid(tagOrId))
+
+    slot = _symbolkey2str(slot)
+
+    __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+      optkey = optkey.to_s
+      l_optkey = 'latin' << optkey
+      a_optkey = 'ascii' << optkey
+      k_optkey = 'kanji' << optkey
+
+      if slot.key?(optkey)
+        fnt = slot.delete(optkey)
+        if fnt.kind_of?(TkFont)
+          slot.delete(l_optkey)
+          slot.delete(a_optkey)
+          slot.delete(k_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) ||
+                slot.key?(k_optkey))
+              fnt = TkFont.new(fnt)
+
+              lfnt = slot.delete(l_optkey)
+              lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+              kfnt = slot.delete(k_optkey)
+
+              fnt.latin_replace(lfnt) if lfnt
+              fnt.kanji_replace(kfnt) if kfnt
+
+              fnt.call_font_configure([pathname, optkey],
+                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
+              next
+            else
+              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
+        end
+      end
+
+      lfnt = slot.delete(l_optkey)
+      lfnt = slot.delete(a_optkey) if slot.key?(a_optkey)
+      kfnt = slot.delete(k_optkey)
+
+      if lfnt && kfnt
+        TkFont.new(lfnt, kfnt).call_font_configure([pathname, optkey],
+                                                   *(__item_config_cmd(tagid(tagOrId)) << {}))
+      elsif lfnt
+        latintagfont_configure([lfnt, optkey])
+      elsif kfnt
+        kanjitagfont_configure([kfnt, optkey])
+      end
+    }
+
+    # configure other (without font) options
+    tk_call(*(__item_config_cmd(tagid(tagOrId)).concat(hash_kv(slot)))) if slot != {}
+    self
+  end
+
+  def latintagfont_configure(tagOrId, ltn, keys=nil)
+    if ltn.kind_of?(Array)
+      key = ltn[1]
+      ltn = ltn[0]
+    else
+      key = nil
+    end
+
+    optkeys = __item_font_optkeys(tagid(tagOrId))
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __item_pathname(tagid(tagOrId)).split(';')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        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
+
+      if fobj.kind_of?(TkFont)
+        if ltn.kind_of?(TkFont)
+          conf = {}
+          ltn.latin_configinfo.each{|key,val| conf[key] = val}
+          if keys
+            fobj.latin_configure(conf.update(keys))
+          else
+            fobj.latin_configure(conf)
+          end
+        else
+          fobj.latin_replace(ltn)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
+    }
+    self
+  end
+  alias asciitagfont_configure latintagfont_configure
+
+  def kanjitagfont_configure(tagOrId, knj, keys=nil)
+    if knj.kind_of?(Array)
+      key = knj[1]
+      knj = knj[0]
+    else
+      key = nil
+    end
+
+    optkeys = __item_font_optkeys(tagid(tagOrId))
+    if key && !optkeys.find{|opt| opt.to_s == key.to_s}
+      fail ArgumentError, "unknown font option name `#{key}'"
+    end
+
+    win, tag = __item_pathname(tagid(tagOrId)).split(';')
+
+    optkeys = [key] if key
+
+    optkeys.each{|optkey|
+      optkey = optkey.to_s
+
+      pathname = [win, tag, optkey].join(';')
+
+      if (fobj = TkFont.used_on(pathname))
+        fobj = TkFont.new(fobj) # create a new TkFont object
+      elsif Tk::JAPANIZED_TK
+        fobj = fontobj          # create a new TkFont object
+      else
+        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
+
+      if fobj.kind_of?(TkFont)
+        if knj.kind_of?(TkFont)
+          conf = {}
+          knj.kanji_configinfo.each{|key,val| conf[key] = val}
+          if keys
+            fobj.kanji_configure(conf.update(keys))
+          else
+            fobj.kanji_configure(conf)
+          end
+        else
+          fobj.kanji_replace(knj)
+        end
+      end
+
+      fobj.call_font_configure([pathname, optkey], *(__item_config_cmd(tagid(tagOrId)) << {}))
+    }
+    self
+  end
+
+  def tagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
+    if wintag
+      if winkey
+        fnt = win.tagfontobj(wintag, winkey).dup
+      else
+        fnt = win.tagfontobj(wintag).dup
+      end
+    else
+      if winkey
+        fnt = win.fontobj(winkey).dup
+      else
+        fnt = win.fontobj.dup
+      end
+    end
+
+    if targetkey
+      fnt.call_font_configure([__item_pathname(tagid(tagOrId)), targetkey],
+                              *(__item_config_cmd(tagid(tagOrId)) << {}))
+    else
+      fnt.call_font_configure(__item_pathname(tagid(tagOrId)),
+                              *(__item_config_cmd(tagid(tagOrId)) << {}))
+    end
+    self
+  end
+
+
+  def latintagfont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
+    if 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)),
+                                      *(__item_config_cmd(tagid(tagOrId)) << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.latin_replace(win.tagfontobj(wintag, winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.tagfontobj(wintag).latin_font_id)
+      end
+    else
+      if winkey
+        fontobj.latin_replace(win.fontobj(winkey).latin_font_id)
+      else
+        fontobj.latin_replace(win.fontobj.latin_font_id)
+      end
+    end
+    self
+  end
+  alias asciitagfont_copy latintagfont_copy
+
+  def kanjifont_copy(tagOrId, win, wintag=nil, winkey=nil, targetkey=nil)
+    if 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)),
+                                        *(__item_config_cmd(tagid(tagOrId)) << {}))
+    end
+
+    if wintag
+      if winkey
+        fontobj.kanji_replace(win.tagfontobj(wintag, winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.tagfontobj(wintag).kanji_font_id)
+      end
+    else
+      if winkey
+        fontobj.kanji_replace(win.fontobj(winkey).kanji_font_id)
+      else
+        fontobj.kanji_replace(win.fontobj.kanji_font_id)
+      end
+    end
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/kinput.rb b/ext/tk/lib/tk/kinput.rb
new file mode 100644
index 0000000000..b63f756def
--- /dev/null
+++ b/ext/tk/lib/tk/kinput.rb
@@ -0,0 +1,71 @@
+#
+# tk/kinput.rb : control kinput
+#
+require 'tk'
+
+module TkKinput
+  include Tk
+  extend Tk
+
+  TkCommandNames = [
+    'kinput_start'.freeze,
+    'kinput_send_spot'.freeze,
+    'kanjiInput'.freeze
+  ].freeze
+
+  def TkKinput.start(win, style=None)
+    tk_call('kinput_start', win, style)
+  end
+  def kinput_start(style=None)
+    TkKinput.start(self, style)
+  end
+
+  def TkKinput.send_spot(win)
+    tk_call('kinput_send_spot', win)
+  end
+  def kinput_send_spot
+    TkKinput.send_spot(self)
+  end
+
+  def TkKinput.input_start(win, keys=nil)
+    tk_call('kanjiInput', 'start', win, *hash_kv(keys))
+  end
+  def kanji_input_start(keys=nil)
+    TkKinput.input_start(self, keys)
+  end
+
+  def TkKinput.attribute_config(win, slot, value=None)
+    if slot.kind_of? Hash
+      tk_call('kanjiInput', 'attribute', win, *hash_kv(slot))
+    else
+      tk_call('kanjiInput', 'attribute', win, "-#{slot}", value)
+    end
+  end
+  def kinput_attribute_config(slot, value=None)
+    TkKinput.attribute_config(self, slot, value)
+  end
+
+  def TkKinput.attribute_info(win, slot=nil)
+    if slot
+      conf = tk_split_list(tk_call('kanjiInput', 'attribute',
+                                   win, "-#{slot}"))
+      conf[0] = conf[0][1..-1]
+      conf
+    else
+      tk_split_list(tk_call('kanjiInput', 'attribute', win)).collect{|conf|
+        conf[0] = conf[0][1..-1]
+        conf
+      }
+    end
+  end
+  def kinput_attribute_info(slot=nil)
+    TkKinput.attribute_info(self, slot)
+  end
+
+  def TkKinput.input_end(win)
+    tk_call('kanjiInput', 'end', win)
+  end
+  def kanji_input_end
+    TkKinput.input_end(self)
+  end
+end
diff --git a/ext/tk/lib/tk/label.rb b/ext/tk/lib/tk/label.rb
new file mode 100644
index 0000000000..05e430e49b
--- /dev/null
+++ b/ext/tk/lib/tk/label.rb
@@ -0,0 +1,22 @@
+#
+# tk/label.rb : treat label widget
+#
+require 'tk'
+
+class Tk::Label<TkWindow
+  TkCommandNames = ['label'.freeze].freeze
+  WidgetClassName = 'Label'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('label', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('label', @path)
+  #  end
+  #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
new file mode 100644
index 0000000000..6f679e55b5
--- /dev/null
+++ b/ext/tk/lib/tk/labelframe.rb
@@ -0,0 +1,31 @@
+#
+# tk/labelframe.rb : treat labelframe widget
+#
+require 'tk'
+require 'tk/frame'
+
+class Tk::LabelFrame<Tk::Frame
+  TkCommandNames = ['labelframe'.freeze].freeze
+  WidgetClassName = 'Labelframe'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('labelframe', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('labelframe', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    super().update('labelwidget'=>proc{|v| window(v)})
+  end
+  private :__val2ruby_optkeys
+end
+
+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
new file mode 100644
index 0000000000..6742b2132c
--- /dev/null
+++ b/ext/tk/lib/tk/listbox.rb
@@ -0,0 +1,284 @@
+#
+# tk/listbox.rb : treat listbox widget
+#
+require 'tk'
+require 'tk/itemconfig'
+require 'tk/scrollable'
+require 'tk/txtwin_abst'
+
+module TkListItemConfig
+  include TkItemConfigMethod
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+end
+
+class Tk::Listbox<TkTextWin
+  include TkListItemConfig
+  include Scrollable
+
+  TkCommandNames = ['listbox'.freeze].freeze
+  WidgetClassName = 'Listbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('listbox', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('listbox', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __tkvariable_optkeys
+    super() << 'listvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def tagid(id)
+    #id.to_s
+    _get_eval_string(id)
+  end
+
+  def activate(y)
+    tk_send_without_enc('activate', y)
+    self
+  end
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  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), false, true)
+    else
+      _fromUTF8(tk_send_without_enc('get', first))
+    end
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+
+  def value
+    get('0', 'end')
+  end
+
+  def value= (vals)
+    unless vals.kind_of?(Array)
+      fail ArgumentError, 'an Array is expected'
+    end
+    tk_send_without_enc('delete', '0', 'end')
+    tk_send_without_enc('insert', '0',
+                        *(vals.collect{|v| _get_eval_enc_str(v)}))
+    vals
+  end
+
+  def clear
+    tk_send_without_enc('delete', '0', 'end')
+    self
+  end
+  alias erase clear
+
+=begin
+  def itemcget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      _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,
+                                                      '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(index, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('itemcget', index, "-#{key}")))
+    end
+  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] ||
+          key['asciifont'] || key[:asciifont] )
+        tagfont_configure(index, _symbolkey2str(key))
+      else
+        tk_send_without_enc('itemconfigure', index, *hash_kv(key, true))
+      end
+
+    else
+      if (key == 'font' || key == :font ||
+          key == 'kanjifont' || key == :kanjifont ||
+          key == 'latinfont' || key == :latinfont ||
+          key == 'asciifont' || key == :asciifont )
+        if val == None
+          tagfontobj(index)
+        else
+          tagfont_configure(index, {key=>val})
+        end
+      else
+        tk_call('itemconfigure', index, "-#{key}", val)
+      end
+    end
+    self
+  end
+
+  def itemconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+        fontconf = ret.assoc('font')
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(index, fontconf[4])
+          ret.push(fontconf)
+        else
+          ret
+        end
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('itemconfigure',index,"-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send_without_enc('itemconfigure', index))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(index, fontconf[3])
+          ret['font'] = fontconf
+        end
+        ret
+      end
+    end
+  end
+
+  def current_itemconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = itemconfiginfo(index, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        itemconfiginfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      itemconfiginfo(index, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  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
new file mode 100644
index 0000000000..3ca7953c13
--- /dev/null
+++ b/ext/tk/lib/tk/macpkg.rb
@@ -0,0 +1,80 @@
+#
+#   tk/macpkg.rb : methods for Tcl/Tk packages for Macintosh
+#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+#     ATTENTION !!
+#         This is NOT TESTED. Because I have no test-environment.
+#
+#
+require 'tk'
+
+module Tk
+  def Tk.load_tclscript_rsrc(resource_name, file=None)
+    # Mac only
+    tk_call('source', '-rsrc', resource_name, file)
+  end
+
+  def Tk.load_tclscript_rsrcid(resource_id, file=None)
+    # Mac only
+    tk_call('source', '-rsrcid', resource_id, file)
+  end
+end
+
+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 Tk::MacResource
+
+  TkCommandNames = ['resource'.freeze].freeze
+
+  PACKAGE_NAME = 'resource'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  tk_call_without_enc('package', 'require', 'resource')
+
+  def close(rsrcRef)
+    tk_call('resource', 'close', rsrcRef)
+  end
+
+  def delete(rsrcType, opts=nil)
+    tk_call('resource', 'delete', *(hash_kv(opts) << rsrcType))
+  end
+
+  def files(rsrcRef=nil)
+    if rsrcRef
+      tk_call('resource', 'files', rsrcRef)
+    else
+      tk_split_simplelist(tk_call('resource', 'files'))
+    end
+  end
+
+  def list(rsrcType, rsrcRef=nil)
+    tk_split_simplelist(tk_call('resource', 'list', rsrcType, rsrcRef))
+  end
+
+  def open(fname, access=nil)
+    tk_call('resource', 'open', fname, access)
+  end
+
+  def read(rsrcType, rsrcID, rsrcRef=nil)
+    tk_call('resource', 'read', rsrcType, rsrcID, rsrcRef)
+  end
+
+  def types(rsrcRef=nil)
+    tk_split_simplelist(tk_call('resource', 'types', rsrcRef))
+  end
+
+  def write(rsrcType, data, opts=nil)
+    tk_call('resource', 'write', *(hash_kv(opts) << rsrcType << data))
+  end
+
+  module_function :close, :delete, :files, :list, :open, :read, :types, :write
+end
diff --git a/ext/tk/lib/tk/menu.rb b/ext/tk/lib/tk/menu.rb
new file mode 100644
index 0000000000..bcd250026d
--- /dev/null
+++ b/ext/tk/lib/tk/menu.rb
@@ -0,0 +1,718 @@
+#
+# tk/menu.rb : treat menu and menubutton
+#
+require 'tk'
+require 'tk/itemconfig'
+require 'tk/menuspec'
+
+module TkMenuEntryConfig
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'entrycget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'entryconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'selectcolor'
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+
+  def __item_val2ruby_optkeys(id)  # { key=>proc, ... }
+    super(id).update('menu'=>proc{|i, v| window(v)})
+  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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+end
+
+class Tk::Menu<TkWindow
+  include Wm
+  include TkMenuEntryConfig
+  extend TkMenuSpec
+
+  TkCommandNames = ['menu'.freeze].freeze
+  WidgetClassName = 'Menu'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('menu', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('menu', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __strval_optkeys
+    super() << 'selectcolor' << 'title'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'tearoff'
+  end
+  private :__boolval_optkeys
+
+  def self.new_menuspec(menu_spec, parent = nil, tearoff = false, keys = nil)
+    if parent.kind_of?(Hash)
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      tearoff = keys.delete('tearoff')
+    elsif tearoff.kind_of?(Hash)
+      keys = _symbolkey2str(tearoff)
+      tearoff = keys.delete('tearoff')
+    elsif keys
+      keys = _symbolkey2str(keys)
+    else
+      keys = {}
+    end
+
+    widgetname = keys.delete('widgetname')
+    _create_menu(parent, menu_spec, widgetname, tearoff, keys)
+  end
+
+  def tagid(id)
+    #id.to_s
+    _get_eval_string(id)
+  end
+
+  def activate(index)
+    tk_send_without_enc('activate', _get_eval_enc_str(index))
+    self
+  end
+  def add(type, keys=nil)
+    tk_send_without_enc('add', type, *hash_kv(keys, true))
+    self
+  end
+  def add_cascade(keys=nil)
+    add('cascade', keys)
+  end
+  def add_checkbutton(keys=nil)
+    add('checkbutton', keys)
+  end
+  def add_command(keys=nil)
+    add('command', keys)
+  end
+  def add_radiobutton(keys=nil)
+    add('radiobutton', keys)
+  end
+  def add_separator(keys=nil)
+    add('separator', keys)
+  end
+
+  def clone_menu(*args)
+    if args[0].kind_of?(TkWindow)
+      parent = args.shift
+    else
+      parent = self
+    end
+
+    if args[0].kind_of?(String) || args[0].kind_of?(Symbol) # menu type
+      type = args.shift
+    else
+      type = None # 'normal'
+    end
+
+    if args[0].kind_of?(Hash)
+      keys = _symbolkey2str(args.shift)
+    else
+      keys = {}
+    end
+
+    parent = keys.delete('parent') if keys.has_key?('parent')
+    type = keys.delete('type') if keys.has_key?('type')
+
+    if keys.empty?
+      Tk::MenuClone.new(self, parent, type)
+    else
+      Tk::MenuClone.new(self, parent, type, keys)
+    end
+  end
+
+  def index(idx)
+    ret = tk_send_without_enc('index', _get_eval_enc_str(idx))
+    (ret == 'none')? nil: number(ret)
+  end
+  def invoke(index)
+    _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),
+                        type, *hash_kv(keys, true))
+    self
+  end
+  def delete(first, last=nil)
+    if last
+      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))
+    end
+    self
+  end
+  def popup(x, y, index=nil)
+    if index
+      tk_call_without_enc('tk_popup', path, x, y,
+                          _get_eval_enc_str(index))
+    else
+      tk_call_without_enc('tk_popup', path, x, y)
+    end
+    self
+  end
+  def post(x, y)
+    _fromUTF8(tk_send_without_enc('post', x, y))
+  end
+  def postcascade(index)
+    tk_send_without_enc('postcascade', _get_eval_enc_str(index))
+    self
+  end
+  def postcommand(cmd=Proc.new)
+    configure_cmd 'postcommand', cmd
+    self
+  end
+  def set_focus
+    tk_call_without_enc('tk_menuSetFocus', path)
+    self
+  end
+  def tearoffcommand(cmd=Proc.new)
+    configure_cmd 'tearoffcommand', cmd
+    self
+  end
+  def menutype(index)
+    tk_send_without_enc('type', _get_eval_enc_str(index))
+  end
+  def unpost
+    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
+
+=begin
+  def entrycget(index, key)
+    case key.to_s
+    when 'text', 'label', 'show'
+      _fromUTF8(tk_send_without_enc('entrycget',
+                                    _get_eval_enc_str(index), "-#{key}"))
+    when 'font', 'kanjifont'
+      #fnt = tk_tcl2ruby(tk_send('entrycget', index, "-#{key}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(index, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('entrycget', _get_eval_enc_str(index), "-#{key}")))
+    end
+  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] ||
+          key['asciifont'] || key[:asciifont])
+        tagfont_configure(index, _symbolkey2str(key))
+      else
+        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 ||
+          key == 'asciifont' || key == :asciifont )
+        if val == None
+          tagfontobj(index)
+        else
+          tagfont_configure(index, {key=>val})
+        end
+      else
+        tk_call('entryconfigure', index, "-#{key}", val)
+      end
+    end
+    self
+  end
+
+  def entryconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(index, fontconf[4])
+          ret.push(fontconf)
+        else
+          ret
+        end
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+          conf[4] = tagfont_configinfo(index, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('entryconfigure',_get_eval_enc_str(index),"-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send_without_enc('entryconfigure', _get_eval_enc_str(index)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(index, fontconf[3])
+          ret['font'] = fontconf
+        end
+        ret
+      end
+    end
+  end
+
+  def current_entryconfiginfo(index, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = entryconfiginfo(index, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        entryconfiginfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      entryconfiginfo(index, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=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
+
+    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
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      parent = keys.delete('parent')
+      widgetname = keys.delete('widgetname')
+      type = keys.delete('type'); type = None unless type
+    end
+    #unless parent.kind_of?(TkMenu)
+    #  fail ArgumentError, "parent must be TkMenu"
+    #end
+    @parent = parent
+    install_win(@parent.path, widgetname)
+    tk_call_without_enc(@parent.path, 'clone', @path, type)
+  end
+=end
+  def initialize(src_menu, *args)
+    widgetname = nil
+
+    if args[0].kind_of?(TkWindow)  # parent window
+      parent = args.shift
+    else
+      parent = src_menu
+    end
+
+    if args[0].kind_of?(String) || args[0].kind_of?(Symbol)  # menu type
+      type = args.shift
+    else
+      type = None  # 'normal'
+    end
+
+    if args[0].kind_of?(Hash)
+      keys = _symbolkey2str(args.shift)
+      parent = keys.delete('parent') if keys.has_key?('parent')
+      widgetname = keys.delete('widgetname')
+      type = keys.delete('type') if keys.has_key?('type')
+    else
+      keys = nil
+    end
+
+    @src_menu = src_menu
+    @parent = parent
+    @type = type
+    install_win(@parent.path, widgetname)
+    tk_call_without_enc(@src_menu.path, 'clone', @path, @type)
+    configure(keys) if keys && !keys.empty?
+  end
+
+  def source_menu
+    @src_menu
+  end
+end
+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)
+      parent = keys.delete('parent')
+    end
+    #unless parent.kind_of? TkMenu
+    #  fail ArgumentError, "parent must be a TkMenu object"
+    #end
+    # @path = Kernel.format("%s.%s", parent.path, self.class::SYSMENU_NAME)
+    @path = parent.path + '.' + self.class::SYSMENU_NAME
+    #TkComm::Tk_WINDOWS[@path] = self
+    TkCore::INTERP.tk_windows[@path] = self
+    if self.method(:create_self).arity == 0
+      p 'create_self has no arg' if $DEBUG
+      create_self
+      configure(keys) if keys
+    else
+      p 'create_self has an arg' if $DEBUG
+      create_self(keys)
+    end
+  end
+end
+TkSystemMenu = Tk::SystemMenu
+
+
+class Tk::SysMenu_Help<Tk::Menu
+  # for all platform
+  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 Tk::SysMenu_System<Tk::Menu
+  # for Windows
+  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 Tk::SysMenu_Apple<Tk::Menu
+  # for Machintosh
+  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 Tk::Menubutton<Tk::Label
+  TkCommandNames = ['menubutton'.freeze].freeze
+  WidgetClassName = 'Menubutton'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  def create_self(keys)
+    if keys and keys != None
+      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)
+    end
+  end
+  private :create_self
+
+  def __boolval_optkeys
+    super() << 'indicatoron'
+  end
+  private :__boolval_optkeys
+
+end
+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 Tk::OptionMenubutton<Tk::Menubutton
+  TkCommandNames = ['tk_optionMenu'.freeze].freeze
+
+  class OptionMenu<TkMenu
+    def initialize(path)  #==> return value of tk_optionMenu
+      @path = path
+      #TkComm::Tk_WINDOWS[@path] = self
+      TkCore::INTERP.tk_windows[@path] = self
+    end
+  end
+
+  def initialize(*args)
+    # args :: [parent,] [var,] [value[, ...],] [keys]
+    #    parent --> TkWindow or nil
+    #    var    --> TkVariable or nil
+    #    keys   --> Hash
+    #       keys[:parent] or keys['parent']     --> parent
+    #       keys[:variable] or keys['variable'] --> var
+    #       keys[:values] or keys['values']     --> value, ...
+    #       other Hash keys are menubutton options
+    keys = {}
+    keys = args.pop if args[-1].kind_of?(Hash)
+    keys = _symbolkey2str(keys)
+
+    parent = nil
+    if !args.empty? && (args[0].kind_of?(TkWindow) || args[0] == nil)
+      keys.delete('parent') # ignore
+      parent = args.shift
+    else
+      parent = keys.delete('parent')
+    end
+
+    @variable = nil
+    if !args.empty? && (args[0].kind_of?(TkVariable) || args[0] == nil)
+      keys.delete('variable') # ignore
+      @variable = args.shift
+    else
+      @variable = keys.delete('variable')
+    end
+    @variable = TkVariable.new unless @variable
+
+    (args = keys.delete('values') || []) if args.empty?
+    if args.empty?
+      args << @variable.value
+    else
+      @variable.value = args[0]
+    end
+
+    install_win(if parent then parent.path end)
+    @menu = OptionMenu.new(tk_call('tk_optionMenu',
+                                   @path, @variable.id, *args))
+
+    configure(keys) if keys
+  end
+
+  def value
+    @variable.value
+  end
+
+  def value=(val)
+    @variable.value = val
+  end
+
+  def activate(index)
+    @menu.activate(index)
+    self
+  end
+  def add(value)
+    @menu.add('radiobutton', 'variable'=>@variable,
+              'label'=>value, 'value'=>value)
+    self
+  end
+  def index(index)
+    @menu.index(index)
+  end
+  def invoke(index)
+    @menu.invoke(index)
+  end
+  def insert(index, value)
+    @menu.insert(index, 'radiobutton', 'variable'=>@variable,
+              'label'=>value, 'value'=>value)
+    self
+  end
+  def delete(index, last=None)
+    @menu.delete(index, last)
+    self
+  end
+  def xposition(index)
+    @menu.xposition(index)
+  end
+  def yposition(index)
+    @menu.yposition(index)
+  end
+  def menu
+    @menu
+  end
+  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
+  end
+  def menuconfiginfo(key=nil)
+    @menu.configinfo(key)
+  end
+  def current_menuconfiginfo(key=nil)
+    @menu.current_configinfo(key)
+  end
+  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
+  end
+  def entryconfiginfo(index, key=nil)
+    @menu.entryconfiginfo(index, key)
+  end
+  def current_entryconfiginfo(index, key=nil)
+    @menu.current_entryconfiginfo(index, key)
+  end
+end
+
+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
new file mode 100644
index 0000000000..9d5571c470
--- /dev/null
+++ b/ext/tk/lib/tk/menubar.rb
@@ -0,0 +1,137 @@
+#
+# tk/menubar.rb
+#
+# Original version:
+#   Copyright (C) 1998 maeda shugo. All rights reserved.
+#   This file can be distributed under the terms of the Ruby.
+
+# Usage:
+#
+# menu_spec = [
+#   [['File', 0],
+#     ['Open', proc{puts('Open clicked')}, 0],
+#     '---',
+#     ['Quit', proc{exit}, 0]],
+#   [['Edit', 0],
+#     ['Cut', proc{puts('Cut clicked')}, 2],
+#     ['Copy', proc{puts('Copy clicked')}, 0],
+#     ['Paste', proc{puts('Paste clicked')}, 0]]
+# ]
+# menubar = TkMenubar.new(nil, menu_spec,
+#                       'tearoff'=>false,
+#                       'foreground'=>'grey40',
+#                       'activeforeground'=>'red',
+#                       'font'=>'-adobe-helvetica-bold-r-*--12-*-iso8859-1')
+# menubar.pack('side'=>'top', 'fill'=>'x')
+#
+#
+# OR
+#
+#
+# menubar = TkMenubar.new
+# menubar.add_menu([['File', 0],
+#                  ['Open', proc{puts('Open clicked')}, 0],
+#                  '---',
+#                  ['Quit', proc{exit}, 0]])
+# menubar.add_menu([['Edit', 0],
+#                  ['Cut', proc{puts('Cut clicked')}, 2],
+#                  ['Copy', proc{puts('Copy clicked')}, 0],
+#                  ['Paste', proc{puts('Paste clicked')}, 0]])
+# menubar.configure('tearoff', false)
+# menubar.configure('foreground', 'grey40')
+# menubar.configure('activeforeground', 'red')
+# menubar.configure('font', '-adobe-helvetica-bold-r-*--12-*-iso8859-1')
+# menubar.pack('side'=>'top', 'fill'=>'x')
+#
+#
+# OR
+#
+# radio_var = TkVariable.new('y')
+# menu_spec = [
+#   [['File', 0],
+#     {: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'], 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],
+#                 ], 0],
+#     '---',
+#     ['Quit', proc{exit}, 0]],
+#   [['Edit', 0],
+#     ['Cut', proc{puts('Cut clicked')}, 2],
+#     ['Copy', proc{puts('Copy clicked')}, 0],
+#     ['Paste', proc{puts('Paste clicked')}, 0]]
+# ]
+# menubar = TkMenubar.new(nil, menu_spec,
+#                        'tearoff'=>false,
+#                        'foreground'=>'grey40',
+#                        'activeforeground'=>'red',
+#                        'font'=>'Helvetia 12 bold')
+# menubar.pack('side'=>'top', 'fill'=>'x')
+
+# See tk/menuspce.rb about the format of the menu_spec
+
+# To use add_menu, configuration must be done by calling configure after
+# adding all menus by add_menu, not by the constructor arguments.
+
+require 'tk'
+require 'tk/frame'
+require 'tk/composite'
+require 'tk/menuspec'
+
+class TkMenubar<Tk::Frame
+  include TkComposite
+  include TkMenuSpec
+
+  def initialize(parent = nil, spec = nil, options = {})
+    if parent.kind_of? Hash
+      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, menuspec_opt)} if spec
+
+    options.each{|key, value| configure(key, value)} if options
+  end
+
+  def add_menu(menu_info, menuspec_opt={})
+    mbtn, menu = _create_menubutton(@frame, menu_info, menuspec_opt)
+
+    submenus = _get_cascade_menus(menu).flatten
+
+    @menus.push([mbtn, menu])
+    delegate('tearoff', menu, *submenus)
+    delegate('foreground', mbtn, menu, *submenus)
+    delegate('background', mbtn, menu, *submenus)
+    delegate('disabledforeground', mbtn, menu, *submenus)
+    delegate('activeforeground', mbtn, menu, *submenus)
+    delegate('activebackground', mbtn, menu, *submenus)
+    delegate('font', mbtn, menu, *submenus)
+    delegate('kanjifont', mbtn, menu, *submenus)
+  end
+
+  def [](index)
+    return @menus[index]
+  end
+end
diff --git a/ext/tk/lib/tk/menuspec.rb b/ext/tk/lib/tk/menuspec.rb
new file mode 100644
index 0000000000..cb3597eec9
--- /dev/null
+++ b/ext/tk/lib/tk/menuspec.rb
@@ -0,0 +1,456 @@
+#
+# tk/menuspec.rb
+#                              Hidethoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+# based on tkmenubar.rb :
+#   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:
+#   [ menubutton_info, menubutton_info, ... ]
+#
+# 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],
+#                        underline, accelerator, configs], # radiobutton entry
+#     [label, [[...menu_info...], [...menu_info...], ...],
+#                        underline, accelerator, configs], # cascade entry (*2)
+#     '---', # separator
+#     ...
+#   ]
+#
+# 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
+#   menu button/entry information.
+#
+# NOTE: (*2)
+#   If you want to configure a cascade menu, add :menu_config=>{...configs..}
+#   to the configs of the cascade entry.
+
+module TkMenuSpec
+  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
+      tearoff = false
+    end
+
+    if menu_name.kind_of?(Hash)
+      default_opts = menu_name
+      menu_name = nil
+      tearoff = false
+    end
+
+    if default_opts.kind_of?(Hash)
+      orig_opts = _symbolkey2str(default_opts)
+    else
+      orig_opts = {}
+    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
+
+    for item_info in menu_info
+      if item_info.kind_of?(Hash)
+        options = orig_opts.dup
+        options.update(_symbolkey2str(item_info))
+        item_type = (options.delete('type') || 'command').to_s
+        menu_name = options.delete('menu_name')
+        menu_opts = orig_opts.dup
+        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,
+                                 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)
+        options = orig_opts.dup
+
+        options['label'] = item_info[0] if item_info[0]
+
+        case item_info[1]
+        when TkVariable
+          # checkbutton
+          item_type = 'checkbutton'
+          options['variable'] = item_info[1]
+          options['onvalue']  = true
+          options['offvalue'] = false
+
+        when Array
+          # radiobutton or cascade
+          if item_info[1][0].kind_of?(TkVariable)
+            # radiobutton
+            item_type = 'radiobutton'
+            options['variable'] = item_info[1][0]
+            options['value'] = item_info[1][1] if item_info[1][1]
+
+          else
+            # cascade
+            item_type = 'cascade'
+            menu_opts = orig_opts.dup
+            if item_info[4] && item_info[4].kind_of?(Hash)
+              opts = _symbolkey2str(item_info[4])
+              menu_name = opts.delete('menu_name')
+              menu_config = opts.delete('menu_config') || {}
+              menu_opts.update(_symbolkey2str(menu_config))
+            end
+            submenu = _create_menu(menu, item_info[1], menu_name,
+                                   tearoff, menu_opts)
+            options['menu'] = submenu
+          end
+
+        else
+          # command
+          item_type = 'command'
+          options['command'] = item_info[1] if item_info[1]
+        end
+
+        options['underline'] = item_info[2] if item_info[2]
+        options['accelerator'] = item_info[3] if item_info[3]
+        if item_info[4] && item_info[4].kind_of?(Hash)
+          opts = _symbolkey2str(item_info[4])
+          if item_type == 'cascade'
+            opts.delete('menu_name')
+            opts.delete('menu_config')
+          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
+        menu.add('separator')
+
+      else
+        menu.add('command', 'label' => item_info)
+      end
+    end
+
+    menu
+  end
+  private :_create_menu
+
+  def _use_menubar?(parent)
+    use_menubar = false
+    if parent.kind_of?(Tk::Root) || parent.kind_of?(Tk::Toplevel)
+      true
+    elsif parent.current_configinfo.has_key?('menu')
+      true
+    else
+      false
+    end
+  end
+  private :_use_menubar?
+
+  def _create_menu_for_menubar(parent)
+    #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
+    mbar
+  end
+  private :_create_menu_for_menubar
+
+  def _create_menubutton(parent, menu_info, tearoff=false, default_opts = {})
+    btn_info = menu_info[0]
+
+    if tearoff.kind_of?(Hash)
+      default_opts = tearoff
+      tearoff = false
+    end
+
+    if default_opts.kind_of?(Hash)
+      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) && ! layout_proc
+      # menubar by menu entries
+      mbar = _create_menu_for_menubar(parent)
+
+      menu_name = nil
+
+      if btn_info.kind_of?(Hash)
+        keys.update(_symbolkey2str(btn_info))
+        menu_name = keys.delete('menu_name')
+        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]
+
+        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,
+                          tearoff, default_opts)
+      menu.tearoff(tearoff)
+
+      keys['menu'] = menu
+      mbar.add('cascade', keys)
+
+      [mbar, menu]
+
+    else
+      # menubar by menubuttons
+      #mbtn = Tk::Menubutton.new(parent)
+      # --> use current TkMenubutton class
+      mbtn = TkMenubutton.new(parent)
+
+      menu_name = nil
+
+      if btn_info.kind_of?(Hash)
+        keys.update(_symbolkey2str(btn_info))
+        menu_name = keys.delete('menu_name')
+        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]
+        if btn_info[2]&&btn_info[2].kind_of?(Hash)
+          keys.update(_symbolkey2str(btn_info[2]))
+          menu_name = keys.delete('menu_name')
+          mbtn.configure(keys)
+        end
+
+      else
+        mbtn.configure('text', btn_info)
+      end
+
+      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|
+      if menu.menutype(idx) == 'cascade'
+        submenu = menu.entrycget(idx, 'menu')
+        menus << [submenu, _get_cascade_menus(submenu)]
+      end
+    }
+    menus
+  end
+  private :_get_cascade_menus
+end
diff --git a/ext/tk/lib/tk/message.rb b/ext/tk/lib/tk/message.rb
new file mode 100644
index 0000000000..5f73b3066f
--- /dev/null
+++ b/ext/tk/lib/tk/message.rb
@@ -0,0 +1,24 @@
+#
+# tk/message.rb : treat message widget
+#
+require 'tk'
+require 'tk/label'
+
+class Tk::Message<Tk::Label
+  TkCommandNames = ['message'.freeze].freeze
+  WidgetClassName = 'Message'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('message', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('message', @path)
+  #  end
+  #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
new file mode 100644
index 0000000000..a05fb94f8e
--- /dev/null
+++ b/ext/tk/lib/tk/mngfocus.rb
@@ -0,0 +1,33 @@
+#
+#   tk/mngfocus.rb : methods for Tcl/Tk standard library 'focus.tcl'
+#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+module TkManageFocus
+  extend Tk
+
+  TkCommandNames = [
+    'tk_focusFollowMouse'.freeze,
+    'tk_focusNext'.freeze,
+    'tk_focusPrev'.freeze
+  ].freeze
+
+  def TkManageFocus.followsMouse
+    tk_call_without_enc('tk_focusFollowsMouse')
+  end
+
+  def TkManageFocus.next(win)
+    tk_tcl2ruby(tk_call('tk_focusNext', win))
+  end
+  def focusNext
+    TkManageFocus.next(self)
+  end
+
+  def TkManageFocus.prev(win)
+    tk_tcl2ruby(tk_call('tk_focusPrev', win))
+  end
+  def focusPrev
+    TkManageFocus.prev(self)
+  end
+end
diff --git a/ext/tk/lib/tk/msgcat.rb b/ext/tk/lib/tk/msgcat.rb
new file mode 100644
index 0000000000..f2d0653c69
--- /dev/null
+++ b/ext/tk/lib/tk/msgcat.rb
@@ -0,0 +1,299 @@
+#
+#   tk/msgcat.rb : methods for Tcl message catalog
+#                     by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+#class TkMsgCatalog
+class TkMsgCatalog < TkObject
+  include TkCore
+  extend Tk
+  #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::mcunknown'.freeze
+  ].freeze
+
+  tk_call_without_enc('package', 'require', 'Tcl', '8.2')
+
+  PACKAGE_NAME = 'msgcat'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  if self.const_defined? :FORCE_VERSION
+    tk_call_without_enc('package', 'require', 'msgcat', FORCE_VERSION)
+  else
+    tk_call_without_enc('package', 'require', 'msgcat')
+  end
+
+  MSGCAT_EXT = '.msg'
+
+  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} {
+       #return -code $st $ret
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          return -code $st \
+                 -errorinfo [string range $ret [expr $idx + 2] \
+                                               [string length $ret]] \
+                 [string range $ret 0 [expr $idx - 1]]
+       } else {
+          return -code $st $ret
+       }
+    } else {
+        return $ret
+    }
+  EOL
+
+  def self.callback(namespace, locale, src_str, *args)
+    src_str = sprintf(src_str, *args) unless args.empty?
+    cmd_tbl = TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]
+    cmd = cmd_tbl[namespace]
+    cmd = cmd_tbl['::'] unless cmd  # use global scope as interp default
+    return src_str unless cmd       # no cmd -> return src-str (default action)
+    begin
+      cmd.call(locale, src_str)
+    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")) +
+              "\n---< backtrace of Tk side >-------"
+        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") +
+              "\n---< backtrace of Tk side >-------"
+      end
+      fail(e, msg)
+    end
+  end
+
+  def initialize(namespace = nil)
+    if namespace.kind_of?(TkNamespace)
+      @namespace = namespace
+    elsif namespace == nil
+      @namespace = TkNamespace.new('::')  # global namespace
+    else
+      @namespace = TkNamespace.new(namespace)
+    end
+    @path = @namespace.path
+
+    @msgcat_ext = '.msg'
+  end
+  attr_accessor :msgcat_ext
+
+  def method_missing(id, *args)
+    # locale(src, trans) ==> set_translation(locale, src, trans)
+    loc = id.id2name
+    case args.length
+    when 0 # set locale
+      self.locale=(loc)
+
+    when 1 # src only, or trans_list
+      if args[0].kind_of?(Array)
+        # trans_list
+        #list = args[0].collect{|src, trans|
+        #  [ Tk::UTF8_String.new(src), Tk::UTF8_String.new(trans) ]
+        #}
+        self.set_translation_list(loc, args[0])
+      else
+        # src
+        #self.set_translation(loc, Tk::UTF8_String.new(args[0]))
+        self.set_translation(loc, args[0])
+      end
+
+    when 2 # src and trans, or, trans_list and enc
+      if args[0].kind_of?(Array)
+        # trans_list
+        self.set_translation_list(loc, *args)
+      else
+        #self.set_translation(loc, args[0], Tk::UTF8_String.new(args[1]))
+        self.set_translation(loc, *args)
+      end
+
+    when 3 # src and trans and enc
+      self.set_translation(loc, *args)
+
+    else
+      super(id, *args)
+#      fail NameError, "undefined method `#{name}' for #{self.to_s}", error_at
+
+    end
+  end
+
+  # *args ::= form, arg, arg, ...
+  def self.translate(*args)
+    dst = args.collect{|src|
+      tk_call_without_enc('::msgcat::mc', _get_eval_string(src, true))
+    }
+    Tk.UTF8_String(sprintf(*dst))
+  end
+  class << self
+    alias mc translate
+    alias [] translate
+  end
+  def translate(*args)
+    dst = args.collect{|src|
+      @namespace.eval{tk_call_without_enc('::msgcat::mc',
+                                          _get_eval_string(src, true))}
+    }
+    Tk.UTF8_String(sprintf(*dst))
+  end
+  alias mc translate
+  alias [] translate
+
+  def self.maxlen(*src_strings)
+    tk_call('::msgcat::mcmax', *src_strings).to_i
+  end
+  def maxlen(*src_strings)
+    @namespace.eval{tk_call('::msgcat::mcmax', *src_strings).to_i}
+  end
+
+  def self.locale
+    tk_call('::msgcat::mclocale')
+  end
+  def locale
+    @namespace.eval{tk_call('::msgcat::mclocale')}
+  end
+
+  def self.locale=(locale)
+    tk_call('::msgcat::mclocale', locale)
+  end
+  def locale=(locale)
+    @namespace.eval{tk_call('::msgcat::mclocale', locale)}
+  end
+
+  def self.preferences
+    tk_split_simplelist(tk_call('::msgcat::mcpreferences'))
+  end
+  def preferences
+    tk_split_simplelist(@namespace.eval{tk_call('::msgcat::mcpreferences')})
+  end
+
+  def self.load_tk(dir)
+    number(tk_call('::msgcat::mcload', dir))
+  end
+
+  def self.load_rb(dir)
+    count = 0
+    preferences().each{|loc|
+      file = File.join(dir, loc + self::MSGCAT_EXT)
+      if File.readable?(file)
+        count += 1
+        if TkCore::WITH_ENCODING
+          eval(IO.read(file, :encoding=>"ASCII-8BIT"))
+        else
+          eval(IO.read(file))
+        end
+      end
+    }
+    count
+  end
+
+  def load_tk(dir)
+    number(@namespace.eval{tk_call('::msgcat::mcload', dir)})
+  end
+
+  def load_rb(dir)
+    count = 0
+    preferences().each{|loc|
+      file = File.join(dir, loc + @msgcat_ext)
+      if File.readable?(file)
+        count += 1
+        if TkCore::WITH_ENCODING
+          @namespace.eval(IO.read(file, :encoding=>"ASCII-8BIT"))
+        else
+          @namespace.eval(IO.read(file))
+        end
+      end
+    }
+    count
+  end
+
+  def self.load(dir)
+    self.load_rb(dir)
+  end
+  alias load load_rb
+
+  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(ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}} {#{trans_str}}"))
+    else
+      Tk.UTF8_String(ip_eval_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))
+      Tk.UTF8_String(@namespace.eval{
+                       ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}} {#{trans_str}}")
+                     })
+    else
+      Tk.UTF8_String(@namespace.eval{
+                       ip_eval_without_enc("::msgcat::mcset {#{locale}} {#{_get_eval_string(src_str, true)}}")
+                     })
+    end
+  end
+
+  def self.set_translation_list(locale, trans_list, enc='utf-8')
+    # trans_list ::= [ [src, trans], [src, trans], ... ]
+    list = []
+    trans_list.each{|src, trans|
+      if trans && trans != None
+        list << _get_eval_string(src, true)
+        list << Tk.UTF8_String(_toUTF8(trans, enc))
+      else
+        list << _get_eval_string(src, true) << ''
+      end
+    }
+    #number(tk_call_without_enc('::msgcat::mcmset', locale, list))
+    number(ip_eval_without_enc("::msgcat::mcmset {#{locale}} {#{_get_eval_string(list)}}"))
+  end
+  def set_translation_list(locale, trans_list, enc='utf-8')
+    # trans_list ::= [ [src, trans], [src, trans], ... ]
+    list = []
+    trans_list.each{|src, trans|
+      if trans && trans != None
+        list << _get_eval_string(src, true)
+        list << Tk.UTF8_String(_toUTF8(trans, enc))
+      else
+        list << _get_eval_string(src, true) << ''
+      end
+    }
+    number(@namespace.eval{
+             #tk_call_without_enc('::msgcat::mcmset', locale, list)
+             ip_eval_without_enc("::msgcat::mcmset {#{locale}} {#{_get_eval_string(list)}}")
+           })
+  end
+
+  def self.def_unknown_proc(cmd=Proc.new)
+    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip]['::'] = cmd
+  end
+  def def_unknown_proc(cmd=Proc.new)
+    TkMsgCatalog::UNKNOWN_CBTBL[TkCore::INTERP.__getip][@namespace.path] = cmd
+  end
+end
+
+TkMsgCat = TkMsgCatalog
diff --git a/ext/tk/lib/tk/namespace.rb b/ext/tk/lib/tk/namespace.rb
new file mode 100644
index 0000000000..0119ba5ef7
--- /dev/null
+++ b/ext/tk/lib/tk/namespace.rb
@@ -0,0 +1,546 @@
+#
+#   tk/namespace.rb : methods to manipulate Tcl/Tk namespace
+#                           by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+class TkNamespace < TkObject
+  extend Tk
+
+  TkCommandNames = [
+    'namespace'.freeze,
+  ].freeze
+
+  Tk_Namespace_ID_TBL = TkCore::INTERP.create_table
+
+  (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.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.mutex.synchronize{
+      Tk_Namespace_ID_TBL[id]? Tk_Namespace_ID_TBL[id]: id
+    }
+  end
+
+  #####################################
+
+  class Ensemble < TkObject
+    def __cget_cmd
+      ['namespace', 'ensemble', 'configure', self.path]
+    end
+    private :__cget_cmd
+
+    def __config_cmd
+      ['namespace', 'ensemble', 'configure', self.path]
+    end
+    private :__config_cmd
+
+    def __configinfo_struct
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+        :default_value=>nil, :current_value=>2}
+    end
+    private :__configinfo_struct
+
+    def __boolval_optkeys
+      ['prefixes']
+    end
+    private :__boolval_optkeys
+
+    def __listval_optkeys
+      ['map', 'subcommands', 'unknown']
+    end
+    private :__listval_optkeys
+
+    def self.exist?(ensemble)
+      bool(tk_call('namespace', 'ensemble', 'exists', ensemble))
+    end
+
+    def initialize(keys = {})
+      @ensemble = @path = tk_call('namespace', 'ensemble', 'create', keys)
+    end
+
+    def cget(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
+    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
+    end
+
+    def configinfo(slot = nil)
+      if slot
+        if slot == :namespace || slot == 'namespace'
+          val = super(slot)
+          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
+
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          [slot.to_s, val]
+        else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+          {slot.to_s => val}
+        end
+
+      else
+        info = super()
+
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          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']
+          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
+      end
+    end
+
+    def exists?
+      bool(tk_call('namespace', 'ensemble', 'exists', @path))
+    end
+  end
+
+  #####################################
+
+  class ScopeArgs < Array
+    include Tk
+
+    # alias __tk_call             tk_call
+    # alias __tk_call_without_enc tk_call_without_enc
+    # alias __tk_call_with_enc    tk_call_with_enc
+    def tk_call(*args)
+      #super('namespace', 'eval', @namespace, *args)
+      args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+      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,
+            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,
+            TkCore::INTERP._merge_tklist(*args))
+    end
+
+    def initialize(namespace, *args)
+      @namespace = namespace
+      super(args.size)
+      self.replace(args)
+    end
+  end
+
+  #####################################
+
+  class NsCode < TkObject
+    def initialize(scope, use_obj_id = false)
+      @scope = scope + ' '
+      @use_obj_id = use_obj_id
+    end
+    def path
+      @scope
+    end
+    def to_eval
+      @scope
+    end
+    def call(*args)
+      ret = TkCore::INTERP._eval_without_enc(@scope + array2tk_list(args))
+      if @use_obj_id
+        ret = TkNamespace::Tk_NsCode_RetObjID_TBL.delete(ret.to_i)
+      end
+      ret
+    end
+  end
+
+  #####################################
+
+  def install_cmd(cmd)
+    lst = tk_split_simplelist(super(cmd), false, false)
+    if lst[1] =~ /^::/
+      lst[1] = @fullname
+    else
+      lst.insert(1, @fullname)
+    end
+    TkCore::INTERP._merge_tklist(*lst)
+  end
+
+  alias __tk_call             tk_call
+  alias __tk_call_without_enc tk_call_without_enc
+  alias __tk_call_with_enc    tk_call_with_enc
+  def tk_call(*args)
+    #super('namespace', 'eval', @fullname, *args)
+    args = args.collect{|arg| (s = _get_eval_string(arg, true))? s: ''}
+    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,
+          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,
+          TkCore::INTERP._merge_tklist(*args))
+  end
+  alias ns_tk_call             tk_call
+  alias ns_tk_call_without_enc tk_call_without_enc
+  alias ns_tk_call_with_enc    tk_call_with_enc
+
+  def initialize(name = nil, parent = nil)
+    unless name
+      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
+      if parent =~ /^::/
+        if name =~ /^::/
+          @fullname = parent + name
+        else
+          @fullname = parent +'::'+ name
+        end
+      else
+        ancestor = __tk_call('namespace', 'current')
+        ancestor = '' if ancestor == '::'
+        if name =~ /^::/
+          @fullname = ancestor + '::' + parent + name
+        else
+          @fullname = ancestor + '::'+ parent +'::'+ name
+        end
+      end
+    else # parent == nil
+      ancestor = __tk_call('namespace', 'current')
+      ancestor = '' if ancestor == '::'
+      if name =~ /^::/
+        @fullname = name
+      else
+        @fullname = ancestor + '::' + name
+      end
+    end
+    @path = @fullname
+    @parent = __tk_call('namespace', 'qualifiers', @fullname)
+    @name = __tk_call('namespace', 'tail', @fullname)
+
+    # create namespace
+    __tk_call('namespace', 'eval', @fullname, '')
+
+    Tk_Namespace_ID_TBL.mutex.synchronize{
+      Tk_Namespace_ID_TBL[@fullname] = self
+    }
+  end
+
+  def self.children(*args)
+    # args ::= [<namespace>] [<pattern>]
+    # <pattern> must be glob-style pattern
+    tk_split_simplelist(tk_call('namespace', 'children', *args)).collect{|ns|
+      # ns is fullname
+      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)
+    TkNamespace.children(@fullname, pattern)
+  end
+
+  def self.code(script = Proc.new)
+    TkNamespace.new('').code(script)
+  end
+=begin
+  def code(script = Proc.new)
+    if script.kind_of?(String)
+      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(script)}
+    elsif script.kind_of?(Proc)
+      cmd = proc{|*args| ScopeArgs.new(@fullname,*args).instance_eval(&script)}
+    else
+      fail ArgumentError, "String or Proc is expected"
+    end
+    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)
+        id = ret.object_id
+        TkNamespace::Tk_NsCode_RetObjID_TBL[id] = ret
+        id
+      }
+    elsif script.kind_of?(Proc)
+      cmd = proc{|*args|
+        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
+      }
+    else
+      fail ArgumentError, "String or Proc is expected"
+    end
+    TkNamespace::NsCode.new(tk_call_without_enc('namespace', 'code',
+                                                _get_eval_string(cmd, false)),
+                            true)
+  end
+
+  def self.current_path
+    tk_call('namespace', 'current')
+  end
+  def current_path
+    @fullname
+  end
+
+  def self.current
+    ns = self.current_path
+    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')
+    # @fullname
+    self
+  end
+  alias current current_namespace
+
+  def self.delete(*ns_list)
+    tk_call('namespace', 'delete', *ns_list)
+    ns_list.each{|ns|
+      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
+    TkNamespece.delete(@fullname)
+  end
+
+  def self.ensemble_create(*keys)
+    tk_call('namespace', 'ensemble', 'create', *hash_kv(keys))
+  end
+  def self.ensemble_configure(cmd, slot, value=None)
+    if slot.kind_of?(Hash)
+      tk_call('namespace', 'ensemble', 'configure', cmd, *hash_kv(slot))
+    else
+      tk_call('namespace', 'ensemble', 'configure', cmd, '-'+slot.to_s, value)
+    end
+  end
+  def self.ensemble_configinfo(cmd, slot = nil)
+    if slot
+      tk_call('namespace', 'ensemble', 'configure', cmd, '-' + slot.to_s)
+    else
+      inf = {}
+      Hash(*tk_split_simplelist(tk_call('namespace', 'ensemble', 'configure', cmd))).each{|k, v| inf[k[1..-1]] = v}
+      inf
+    end
+  end
+  def self.ensemble_exist?(cmd)
+    bool(tk_call('namespace', 'ensemble', 'exists', cmd))
+  end
+
+  def self.eval(namespace, cmd = Proc.new, *args)
+    #tk_call('namespace', 'eval', namespace, cmd, *args)
+    TkNamespace.new(namespace).eval(cmd, *args)
+  end
+=begin
+  def eval(cmd = Proc.new, *args)
+    #TkNamespace.eval(@fullname, cmd, *args)
+    #ns_tk_call(cmd, *args)
+    code_obj = code(cmd)
+    ret = code_obj.call(*args)
+    # uninstall_cmd(TkCore::INTERP._split_tklist(code_obj.path)[-1])
+    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
+    tk_tcl2ruby(ret)
+  end
+=end
+  def eval(cmd = Proc.new, *args)
+    code_obj = code(cmd)
+    ret = code_obj.call(*args)
+    uninstall_cmd(_fromUTF8(TkCore::INTERP._split_tklist(_toUTF8(code_obj.path))[-1]))
+    ret
+  end
+
+  def self.exist?(ns)
+    bool(tk_call('namespace', 'exists', ns))
+  end
+  def exist?
+    TkNamespece.exist?(@fullname)
+  end
+
+  def self.export(*patterns)
+    tk_call('namespace', 'export', *patterns)
+  end
+  def self.export_with_clear(*patterns)
+    tk_call('namespace', 'export', '-clear', *patterns)
+  end
+  def export
+    TkNamespace.export(@fullname)
+  end
+  def export_with_clear
+    TkNamespace.export_with_clear(@fullname)
+  end
+
+  def self.forget(*patterns)
+    tk_call('namespace', 'forget', *patterns)
+  end
+  def forget
+    TkNamespace.forget(@fullname)
+  end
+
+  def self.import(*patterns)
+    tk_call('namespace', 'import', *patterns)
+  end
+  def self.force_import(*patterns)
+    tk_call('namespace', 'import', '-force', *patterns)
+  end
+  def import
+    TkNamespace.import(@fullname)
+  end
+  def force_import
+    TkNamespace.force_import(@fullname)
+  end
+
+  def self.inscope(namespace, script, *args)
+    tk_call('namespace', 'inscope', namespace, script, *args)
+  end
+  def inscope(script, *args)
+    TkNamespace.inscope(@fullname, script, *args)
+  end
+
+  def self.origin(cmd)
+    tk_call('namespace', 'origin', cmd)
+  end
+
+  def self.parent(namespace=None)
+    ns = tk_call('namespace', 'parent', namespace)
+    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)
+  end
+
+  def self.get_path
+    tk_call('namespace', 'path')
+  end
+  def self.set_path(*namespace_list)
+    tk_call('namespace', 'path', array2tk_list(namespace_list))
+  end
+  def set_path
+    tk_call('namespace', 'path', @fullname)
+  end
+
+  def self.qualifiers(str)
+    tk_call('namespace', 'qualifiers', str)
+  end
+
+  def self.tail(str)
+    tk_call('namespace', 'tail', str)
+  end
+
+  def self.upvar(namespace, *var_pairs)
+    tk_call('namespace', 'upvar', namespace, *(var_pairs.flatten))
+  end
+  def upvar(*var_pairs)
+    TkNamespace.inscope(@fullname, *(var_pairs.flatten))
+  end
+
+  def self.get_unknown_handler
+    tk_tcl2ruby(tk_call('namespace', 'unknown'))
+  end
+  def self.set_unknown_handler(cmd = Proc.new)
+    tk_call('namespace', 'unknown', cmd)
+  end
+
+  def self.which(name)
+    tk_call('namespace', 'which', name)
+  end
+  def self.which_command(name)
+    tk_call('namespace', 'which', '-command', name)
+  end
+  def self.which_variable(name)
+    tk_call('namespace', 'which', '-variable', name)
+  end
+end
+
+TkNamespace::Global = TkNamespace.new('::')
diff --git a/ext/tk/lib/tk/optiondb.rb b/ext/tk/lib/tk/optiondb.rb
new file mode 100644
index 0000000000..0f3be30ff7
--- /dev/null
+++ b/ext/tk/lib/tk/optiondb.rb
@@ -0,0 +1,377 @@
+#
+# tk/optiondb.rb : treat option database
+#
+require 'tk'
+
+module TkOptionDB
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['option'.freeze].freeze
+  (CmdClassID = ['CMD_CLASS'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  module Priority
+    WidgetDefault = 20
+    StartupFile   = 40
+    UserDefault   = 60
+    Interactive   = 80
+  end
+
+  def add(pat, value, pri=None)
+    # if $SAFE >= 4
+    #   fail SecurityError, "can't call 'TkOptionDB.add' at $SAFE >= 4"
+    # end
+    tk_call('option', 'add', pat, value, pri)
+  end
+  def clear
+    # if $SAFE >= 4
+    #   fail SecurityError, "can't call 'TkOptionDB.crear' at $SAFE >= 4"
+    # end
+    tk_call_without_enc('option', 'clear')
+  end
+  def get(win, name, klass)
+    tk_call('option', 'get', win ,name, klass)
+  end
+  def readfile(file, pri=None)
+    tk_call('option', 'readfile', file, pri)
+  end
+  alias read_file readfile
+  module_function :add, :clear, :get, :readfile, :read_file
+
+  def read_entries(file, f_enc=nil)
+    if TkCore::INTERP.safe?
+      fail SecurityError,
+        "can't call 'TkOptionDB.read_entries' on a safe interpreter"
+    end
+
+    i_enc = ((Tk.encoding)? Tk.encoding : Tk.encoding_system)
+
+    unless f_enc
+      f_enc = i_enc
+    end
+
+    ent = []
+    cline = ''
+    open(file, 'r') {|f|
+      while line = f.gets
+        #cline += line.chomp!
+        cline.concat(line.chomp!)
+        case cline
+        when /\\$/    # continue
+          cline.chop!
+          next
+        when /^\s*(!|#)/     # coment
+          cline = ''
+          next
+        when /^([^:]+):(.*)$/
+          pat = $1.strip
+          val = $2.lstrip
+          p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
+          pat = TkCore::INTERP._toUTF8(pat, f_enc)
+          pat = TkCore::INTERP._fromUTF8(pat, i_enc)
+          val = TkCore::INTERP._toUTF8(val, f_enc)
+          val = TkCore::INTERP._fromUTF8(val, i_enc)
+          ent << [pat, val]
+          cline = ''
+        else          # unknown --> ignore
+          cline = ''
+          next
+        end
+      end
+    }
+    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|
+      add(pat, val, pri)
+    }
+
+=begin
+    i_enc = Tk.encoding()
+
+    unless f_enc
+      f_enc = i_enc
+    end
+
+    cline = ''
+    open(file, 'r') {|f|
+      while line = f.gets
+        cline += line.chomp!
+        case cline
+        when /\\$/    # continue
+          cline.chop!
+          next
+        when /^\s*!/     # coment
+          cline = ''
+          next
+        when /^([^:]+):\s(.*)$/
+          pat = $1
+          val = $2
+          p "ResourceDB: #{[pat, val].inspect}" if $DEBUG
+          pat = TkCore::INTERP._toUTF8(pat, f_enc)
+          pat = TkCore::INTERP._fromUTF8(pat, i_enc)
+          val = TkCore::INTERP._toUTF8(val, f_enc)
+          val = TkCore::INTERP._fromUTF8(val, i_enc)
+          add(pat, val, pri)
+          cline = ''
+        else          # unknown --> ignore
+          cline = ''
+          next
+        end
+      end
+    }
+=end
+  end
+  module_function :read_with_encoding
+
+  # support procs on the resource database
+  @@resource_proc_class = Class.new
+
+  @@resource_proc_class.const_set(:CARRIER, '.'.freeze)
+
+  @@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)
+
+  class << @@resource_proc_class
+    private :new
+
+=begin
+    CARRIER    = '.'.freeze
+    METHOD_TBL = TkCore::INTERP.create_table
+    ADD_METHOD = false
+    SAFE_MODE  = 4
+=end
+
+=begin
+    def __closed_block_check__(str)
+      depth = 0
+      str.scan(/[{}]/){|x|
+        if x == "{"
+          depth += 1
+        elsif x == "}"
+          depth -= 1
+        end
+        if depth <= 0 && !($' =~ /\A\s*\Z/)
+          fail RuntimeError, "bad string for procedure : #{str.inspect}"
+        end
+      }
+      str
+    end
+    private :__closed_block_check__
+=end
+
+    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.
+      str
+    end
+
+    def method_missing(id, *args)
+      #res_proc, proc_str = self::METHOD_TBL[id]
+      res_proc, proc_str = @method_tbl[id]
+
+      proc_source = TkOptionDB.get(self::CARRIER, id.id2name, '').strip
+      res_proc = nil if proc_str != proc_source # resource is changed
+
+      # unless res_proc.kind_of?(Proc)
+      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,
+                "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{
+          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:/,
+                                                      "(#{id.id2name}):"))
+          end
+        }.call
+        #self::METHOD_TBL[id] = [res_proc, proc_source]
+        @method_tbl[id] = [res_proc, proc_source]
+      end
+      res_proc.call(*args)
+    end
+
+    private :__check_proc_string__, :method_missing
+  end
+  @@resource_proc_class.freeze
+
+=begin
+  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
+    klass = klass.to_s if klass.kind_of? Symbol
+    unless (?A..?Z) === klass[0]
+      fail ArgumentError, "bad string '#{klass}' for class name"
+    end
+    unless func.kind_of? Array
+      fail ArgumentError, "method-list must be Array"
+    end
+    func_str = func.join(' ')
+    if parent == nil
+      install_win(parent)
+    elsif parent <= @@resource_proc_class
+      install_win(parent::CARRIER)
+    else
+      fail ArgumentError, "parent must be Resource-Proc class"
+    end
+    carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
+
+    body = <<-"EOD"
+      class #{klass} < TkOptionDB.module_eval('@@resource_proc_class')
+        CARRIER    = '#{carrier}'.freeze
+        METHOD_TBL = TkCore::INTERP.create_table
+        ADD_METHOD = #{add}
+        SAFE_MODE  = #{safe}
+        %w(#{func_str}).each{|f| METHOD_TBL[f.intern] = nil }
+      end
+    EOD
+
+    if parent.kind_of?(Class) && parent <= @@resource_proc_class
+      parent.class_eval(body)
+      eval(parent.name + '::' + klass)
+    else
+      eval(body)
+      eval('TkOptionDB::' + klass)
+    end
+  end
+=end
+  def __create_new_class(klass, func, safe = 4, add = false, parent = nil)
+    if klass.kind_of?(TkWindow)
+      carrier = klass.path
+      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)
+      unless (?A..?Z) === klass[0]
+        fail ArgumentError, "bad string '#{klass}' for class name"
+      end
+      if parent == nil
+        install_win(nil)
+      elsif parent.kind_of?(TkWindow)
+        install_win(parent.path)
+      elsif parent <= @@resource_proc_class
+        install_win(parent::CARRIER)
+      else
+        fail ArgumentError, "parent must be Resource-Proc class"
+      end
+      carrier = Tk.tk_call_without_enc('frame', @path, '-class', klass)
+    end
+
+    unless func.kind_of?(Array)
+      fail ArgumentError, "method-list must be Array"
+    end
+    func_str = func.join(' ')
+
+    if parent.kind_of?(Class) && parent <= @@resource_proc_class
+      cmd_klass = Class.new(parent)
+    else
+      cmd_klass = Class.new(TkOptionDB.module_eval('@@resource_proc_class'))
+    end
+    cmd_klass.const_set(:CARRIER, carrier.dup.freeze)
+
+    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|
+      cmd_klass.instance_variable_get('@method_tbl')[f.to_s.intern] = nil
+    }
+=begin
+    cmd_klass.const_set(:METHOD_TBL, TkCore::INTERP.create_table)
+    cmd_klass.const_set(:ADD_METHOD, add)
+    cmd_klass.const_set(:SAFE_MODE, safe)
+    func.each{|f| cmd_klass::METHOD_TBL[f.to_s.intern] = nil }
+=end
+
+    cmd_klass
+  end
+  module_function :__create_new_class
+  private_class_method :__create_new_class
+
+  def __remove_methods_of_proc_class(klass)
+    # 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_exec, :instance_variables, :kind_of?, :is_a?,
+        :private_methods, :protected_methods, :public_methods ].each{|m|
+        alias_method(m, :__null_method)
+      }
+    end
+  end
+  module_function :__remove_methods_of_proc_class
+  private_class_method :__remove_methods_of_proc_class
+
+  RAND_BASE_CNT = [0]
+  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],
+                       RAND_BASE_CNT[0]]
+    len = RAND_BASE_CHAR.size
+    (6+rand(10)).times{
+      name << RAND_BASE_CHAR[rand(len),1]
+    }
+    RAND_BASE_CNT[0] = RAND_BASE_CNT[0] + 1
+    name
+  end
+  module_function :__get_random_basename
+  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.
+  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?
+    __remove_methods_of_proc_class(new_klass)
+    new_klass.freeze
+    new_klass
+  end
+  module_function :new_proc_class
+
+  def eval_under_random_base(parent = nil, &b)
+    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)
+    new_klass.freeze
+    ret
+  end
+  module_function :eval_under_random_base
+
+  def new_proc_class_random(klass, func, safe = 4, add = false, &b)
+    eval_under_random_base(){
+      TkOptionDB.new_proc_class(klass, func, safe, add, self, &b)
+    }
+  end
+  module_function :new_proc_class_random
+end
+TkOption = TkOptionDB
+TkResourceDB = TkOptionDB
diff --git a/ext/tk/lib/tk/optionobj.rb b/ext/tk/lib/tk/optionobj.rb
new file mode 100644
index 0000000000..29b06da0eb
--- /dev/null
+++ b/ext/tk/lib/tk/optionobj.rb
@@ -0,0 +1,212 @@
+#
+# 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.
+#
+#        e.g. hash_kv({'aaa'=>1, 'bbb'=>Tk::None, 'ccc'=>3})
+#                 => ["-aaa", 1, "-bbb", "-ccc", 3]
+#
+require 'tk'
+
+module Tk
+  class OptionObj < Hash
+    include TkUtil
+
+    def initialize(hash = nil)
+      super()
+      @observ = []
+      update_without_notify(_symbolkey2str(hash)) if hash
+    end
+
+    def observ_info
+      @observ.dup
+    end
+
+    def observs
+      @observ.collect{|win|
+        if win.kind_of?(Array)
+          win[0]
+        else
+          win
+        end
+      }
+    end
+
+    def _remove_win(win)
+      if win.kind_of?(Array)
+        widget, method = win
+        @observ.delete_if{|x|
+          if x.kind_of?(Array)
+            x[0] == widget
+          else
+            x == widget
+          end
+        }
+      else
+        @observ.delete_if{|x|
+          if x.kind_of?(Array)
+            x[0] == win
+          else
+            x == win
+          end
+        }
+      end
+    end
+    private :_remove_win
+
+    def assign(*wins)
+      # win :=
+      #   widget             #==> call widget.configure(hash)
+      #   [widget]           #==> call widget.configure(hash)
+      #   [widget, nil, {src=>target, ... }]
+      #                      #==> call widget.configure(hash)
+      #                               with converting hash-key
+      #   [widget, method]   #==> call widget.method(hash)
+      #   [widget, method, {src=>target, ... }]
+      #                      #==> call widget.method(hash)
+      #                               with converting hash-key
+      #   [widget [receiver, method, arg, ... ]]
+      #                      #==> call receiver.method(arg, ... , hash)
+      #   [widget [receiver, method, arg, ... ], {src=>target, ... }]
+      #                      #==> call receiver.method(arg, ... , hash)
+      #                               with onverting hash-key
+      #
+      # src := option_name_on_optobj
+      #
+      # target :=
+      #   nil                #==> not use the src
+      #   option_name_on_target_widget
+      #   [ option_name_on_target_widget, ... ]
+      #                      #==> set all of them
+      #
+      wins.each{|win|
+        _remove_win(win)
+        @observ << win
+        notify(win)
+      }
+      self
+    end
+
+    def unassign(*wins)
+      wins.each{|win|
+        _remove_win(win)
+      }
+      self
+    end
+
+    def notify(target = nil)
+      if target
+        targets = [target]
+      elsif @observ.empty?
+        return self
+      else
+        targets = @observ.dup
+      end
+
+      return self if empty?
+
+      org_hash = _symbolkey2str(self)
+
+      targets.each{|win|
+        widget = receiver = win
+        hash = org_hash
+        begin
+          if win.kind_of?(Array)
+            widget, method, conv_tbl = win
+            receiver = widget
+
+            if conv_tbl
+              hash = {}
+              org_hash.each{|key, val|
+                key = conv_tbl[key] if conv_tbl.key?(key)
+                next unless key
+                if key.kind_of?(Array)
+                  key.each{|k| hash[k] = val}
+                else
+                  hash[key] = val
+                end
+              }
+            end
+
+            if method.kind_of?(Array)
+              receiver, method, *args = method
+              receiver.__send__(method, *(args << hash))
+            elsif method
+              widget.__send__(method, hash)
+            else
+              widget.configure(hash)
+            end
+
+          else
+            widget.configure(self)
+          end
+        rescue => e
+          if ( ( widget.kind_of?(TkObject) \
+                && widget.respond_to?('exist?') \
+                && ! receiver.exist? ) \
+            || ( receiver.kind_of?(TkObject) \
+                && receiver.respond_to?('exist?') \
+                && ! receiver.exist? ) )
+            @observ.delete(win)
+          else
+            fail e
+          end
+        end
+      }
+
+      self
+    end
+    alias apply notify
+
+    def +(hash)
+      unless hash.kind_of?(Hash)
+        fail ArgumentError, "expect a Hash"
+      end
+      new_obj = self.dup
+      new_obj.update_without_notify(_symbolkey2str(hash))
+      new_obj
+    end
+
+    alias update_without_notify update
+
+    def update(hash)
+      update_without_notify(_symbolkey2str(hash))
+      notify
+    end
+
+    def configure(key, value=nil)
+      if key.kind_of?(Hash)
+        update(key)
+      else
+        store(key,value)
+      end
+    end
+
+    def [](key)
+      super(key.to_s)
+    end
+    alias cget []
+
+    def store(key, val)
+      key = key.to_s
+      super(key, val)
+      notify
+    end
+    def []=(key, val)
+      store(key,val)
+    end
+
+    def replace(hash)
+      super(_symbolkey2str(hash))
+      notify
+    end
+
+    def default(opt)
+      fail RuntimeError, "unknown option `#{opt}'"
+    end
+    private :default
+
+    undef :default=
+  end
+end
diff --git a/ext/tk/lib/tk/pack.rb b/ext/tk/lib/tk/pack.rb
new file mode 100644
index 0000000000..220a38e524
--- /dev/null
+++ b/ext/tk/lib/tk/pack.rb
@@ -0,0 +1,107 @@
+#
+# tk/pack.rb : control pack geometry manager
+#
+require 'tk'
+
+module TkPack
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['pack'.freeze].freeze
+
+=begin
+  def configure(win, *args)
+    if args[-1].kind_of?(Hash)
+      opts = args.pop
+    else
+      opts = {}
+    end
+    params = []
+    # params.push((win.kind_of?(TkObject))? win.epath: win)
+    params.push(_epath(win))
+    args.each{|win|
+      # params.push((win.kind_of?(TkObject))? win.epath: win)
+      params.push(_epath(win))
+    }
+    opts.each{|k, v|
+      params.push("-#{k}")
+      # params.push((v.kind_of?(TkObject))? v.epath: v)
+      params.push(_epath(v))
+    }
+    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)
+    return '' if args.size == 0
+    wins = args.collect{|win|
+      # (win.kind_of?(TkObject))? win.epath: win
+      _epath(win)
+    }
+    tk_call_without_enc('pack', 'forget', *wins)
+  end
+
+  def info(slave)
+    # slave = slave.epath if slave.kind_of?(TkObject)
+    slave = _epath(slave)
+    ilist = list(tk_call_without_enc('pack', 'info', slave))
+    info = {}
+    while key = ilist.shift
+      info[key[1..-1]] = ilist.shift
+    end
+    return info
+  end
+
+  def propagate(master, mode=None)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    if mode == None
+      bool(tk_call_without_enc('pack', 'propagate', master))
+    else
+      tk_call_without_enc('pack', 'propagate', master, mode)
+    end
+  end
+
+  def slaves(master)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call_without_enc('pack', 'slaves', master))
+  end
+
+  module_function :pack, :configure, :forget, :info, :propagate, :slaves
+end
+=begin
+def TkPack(win, *args)
+  if args[-1].kind_of?(Hash)
+    opts = args.pop
+  else
+    opts = {}
+  end
+  params = []
+  params.push((win.kind_of?(TkObject))? win.epath: win)
+  args.each{|win|
+    params.push((win.kind_of?(TkObject))? win.epath: win)
+  }
+  opts.each{|k, v|
+    params.push("-#{k}")
+    params.push((v.kind_of?(TkObject))? v.epath: v)
+  }
+  tk_call_without_enc("pack", *params)
+end
+=end
diff --git a/ext/tk/lib/tk/package.rb b/ext/tk/lib/tk/package.rb
new file mode 100644
index 0000000000..0c329732f5
--- /dev/null
+++ b/ext/tk/lib/tk/package.rb
@@ -0,0 +1,143 @@
+#
+# tk/package.rb : package command
+#
+require 'tk'
+
+module TkPackage
+  include TkCore
+  extend TkPackage
+
+  TkCommandNames = ['package'.freeze].freeze
+
+  def add_path(path)
+    Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path
+  end
+
+  def forget(package)
+    tk_call('package', 'forget', package)
+    nil
+  end
+
+  def if_needed(pkg, ver, *arg, &b)
+    size = arg.size
+
+    if size==0 && !b
+      # proc info
+      procedure(tk_call('package', 'ifneeded', pkg, ver))
+
+    elsif size==0 && b
+      # set proc
+      cmd = proc(&b)
+      tk_call('package', 'ifneeded', pkg, ver, cmd)
+      cmd
+
+    elsif size==1 && !b
+      # set proc
+      cmd = arg[0]
+      if cmd
+        tk_call('package', 'ifneeded', pkg, ver, cmd)
+        cmd
+      else
+        # remove proc
+        tk_call('package', 'ifneeded', pkg, ver, '')
+        nil
+      end
+
+    else
+      fail ArgumentError, 'too many arguments'
+    end
+  end
+
+  def names
+    tk_split_simplelist(tk_call('package', 'names'))
+  end
+
+  def provide(package, version=nil)
+    if version
+      tk_call('package', 'provide', package, version)
+    end
+    if (ret = tk_call('package', 'provide', package)) == ''
+      nil
+    else
+      ret
+    end
+  end
+
+  def present(package, version=None)
+    begin
+      tk_call('package', 'present', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def present_exact(package, version)
+    begin
+      tk_call('package', 'present', '-exact', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def require(package, version=None)
+    begin
+      tk_call('package', 'require', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def require_exact(package, version)
+    begin
+      tk_call('package', 'require', '-exact', package, version)
+    rescue => e
+      fail e.class, 'TkPackage ' << e.message
+    end
+  end
+
+  def unknown_proc(*arg, &b)
+    size = arg.size
+
+    if size==0 && !b
+      # proc info
+      procedure(tk_call('package', 'unknown'))
+
+    elsif size==0 && b
+      # set proc
+      cmd = proc(&b)
+      tk_call('package', 'unknown', cmd)
+      cmd
+
+    elsif size==1 && !b
+      # set proc
+      cmd = arg[0]
+      if cmd
+        tk_call('package', 'unknown', cmd)
+        cmd
+      else
+        # remove proc
+        tk_call('package', 'unknown', '')
+        nil
+      end
+
+    else
+      fail ArgumentError, 'too many arguments'
+    end
+  end
+
+  def versions(package)
+    tk_split_simplelist(tk_call('package', 'versions', package))
+  end
+
+  def vcompare(version1, version2)
+    number(tk_call('package', 'vcompare', version1, version2))
+  end
+
+  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
new file mode 100644
index 0000000000..9462bb0667
--- /dev/null
+++ b/ext/tk/lib/tk/palette.rb
@@ -0,0 +1,55 @@
+#
+#   tk/palette.rb : methods for Tcl/Tk standard library 'palette.tcl'
+#                     1998/06/21 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+module TkPalette
+  include Tk
+  extend Tk
+
+  TkCommandNames = [
+    'tk_setPalette'.freeze,
+    'tk_bisque'.freeze,
+    'tkDarken'.freeze
+  ].freeze
+
+  def TkPalette.set(*args)
+    args = args[0].to_a.flatten if args[0].kind_of? Hash
+    tk_call('tk_setPalette', *args)
+  end
+  def TkPalette.setPalette(*args)
+    TkPalette.set(*args)
+  end
+
+  def TkPalette.bisque
+    tk_call('tk_bisque')
+  end
+
+  def TkPalette.darken(color, percent)
+    tk_call('tkDarken', color, percent)
+  end
+
+  def TkPalette.recolorTree(win, colors)
+    if not colors.kind_of?(Hash)
+      fail "2nd arg need to be Hash"
+    end
+
+    tk_call('global', "tkPalette")
+    colors.each{|key, value|
+      begin
+        if win.cget(key) == tk_call('set', "tkPalette(#{key})")
+          win[key] = colors[key]
+        end
+      rescue
+        # ignore
+      end
+    }
+
+    TkWinfo.children(win).each{|w| TkPalette.recolorTree(w, colors)}
+  end
+
+  def recolorTree(colors)
+    TkPalette.recolorTree(self, colors)
+  end
+end
diff --git a/ext/tk/lib/tk/panedwindow.rb b/ext/tk/lib/tk/panedwindow.rb
new file mode 100644
index 0000000000..04407802ea
--- /dev/null
+++ b/ext/tk/lib/tk/panedwindow.rb
@@ -0,0 +1,260 @@
+#
+# tk/panedwindow.rb : treat panedwindow
+#
+require 'tk'
+
+class Tk::PanedWindow<TkWindow
+  TkCommandNames = ['panedwindow'.freeze].freeze
+  WidgetClassName = 'Panedwindow'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('panedwindow', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('panedwindow', @path)
+  #  end
+  #end
+  #private :create_self
+
+  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 == []
+      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
+      args = args.collect{|w| _epath(w) }
+      #args.push(hash_kv(keys))
+      args.concat(hash_kv(keys))
+    else
+      args.push(keys) if keys
+      # args = args.collect{|w| (w.kind_of?(TkObject))? w.epath: w }
+      args = args.collect{|w| _epath(w) }
+    end
+    tk_send_without_enc('add', *args)
+    self
+  end
+
+  def forget(win, *wins)
+    wins.unshift(win)
+    # tk_send_without_enc('forget', *((w.kind_of?(TkObject))? w.epath: w))
+    tk_send_without_enc('forget', *(wins.collect{|w| _epath(w)}))
+    self
+  end
+  alias del forget
+  alias delete forget
+  alias remove forget
+
+  def identify(x, y)
+    list(tk_send_without_enc('identify', x, y))
+  end
+
+  def proxy_coord
+    list(tk_send_without_enc('proxy', 'coord'))
+  end
+  def proxy_forget
+    tk_send_without_enc('proxy', 'forget')
+    self
+  end
+  def proxy_place(x, y)
+    tk_send_without_enc('proxy', 'place', x, y)
+    self
+  end
+
+  def sash_coord(index)
+    list(tk_send('sash', 'coord', index))
+  end
+  def sash_dragto(index, x, y)
+    tk_send('sash', 'dragto', index, x, y)
+    self
+  end
+  def sash_mark(index, x, y)
+    tk_send('sash', 'mark', index, x, y)
+    self
+  end
+  def sash_place(index, x, y)
+    tk_send('sash', 'place', index, x, y)
+    self
+  end
+
+  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)
+    win = _epath(win)
+    if key.kind_of? Hash
+      params = []
+      key.each{|k, v|
+        params.push("-#{k}")
+        # params.push((v.kind_of?(TkObject))? v.epath: v)
+        params.push(_epath(v))
+      }
+      tk_send_without_enc('paneconfigure', win, *params)
+    else
+      # value = value.epath if value.kind_of?(TkObject)
+      value = _epath(value)
+      tk_send_without_enc('paneconfigure', win, "-#{key}", value)
+    end
+    self
+  end
+  alias pane_config paneconfigure
+
+  def paneconfiginfo(win, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      # win = win.epath if win.kind_of?(TkObject)
+      win = _epath(win)
+      if 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'
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+          conf[4] = bool(conf[4]) unless conf[4].empty?
+        end
+        conf
+      else
+        #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),
+                            false, false).collect{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          conf[0] = conf[0][1..-1]
+          if conf[3]
+            if conf[0] == 'hide'
+              conf[3] = bool(conf[3]) unless conf[3].empty?
+            elsif conf[3].index('{')
+              conf[3] = tk_split_list(conf[3])
+            else
+              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])
+            else
+              conf[4] = tk_tcl2ruby(conf[4])
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      # win = win.epath if win.kind_of?(TkObject)
+      win = _epath(win)
+      if 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'
+          conf[2] = bool(conf[2]) unless conf[2].empty?
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+        end
+        { key => conf }
+      else
+        ret = {}
+        #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),
+                            false, false).each{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          key = conf.shift[1..-1]
+          if key
+            if key == 'hide'
+              conf[2] = bool(conf[2]) unless conf[2].empty?
+            elsif conf[2].index('{')
+              conf[2] = tk_split_list(conf[2])
+            else
+              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])
+            else
+              conf[3] = tk_tcl2ruby(conf[3])
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+  alias pane_configinfo paneconfiginfo
+
+  def current_paneconfiginfo(win, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = paneconfiginfo(win, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        paneconfiginfo(win).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      paneconfiginfo(win, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  alias current_pane_configinfo current_paneconfiginfo
+
+  def panes
+    list(tk_send_without_enc('panes'))
+  end
+end
+
+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
new file mode 100644
index 0000000000..109d866fda
--- /dev/null
+++ b/ext/tk/lib/tk/place.rb
@@ -0,0 +1,128 @@
+#
+# tk/place.rb : control place geometry manager
+#
+require 'tk'
+
+module TkPlace
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['place'.freeze].freeze
+
+  def configure(win, slot, value=None)
+    # for >= Tk8.4a2 ?
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    if slot.kind_of? Hash
+      params = []
+      slot.each{|k, v|
+        params.push("-#{k}")
+        # params.push((v.kind_of?(TkObject))? v.epath: v)
+        params.push(_epath(v))
+      }
+      tk_call_without_enc('place', 'configure', win, *params)
+    else
+      # value = value.epath if value.kind_of?(TkObject)
+      value = _epath(value)
+      tk_call_without_enc('place', 'configure', win, "-#{slot}", value)
+    end
+  end
+  alias place configure
+
+  def configinfo(win, slot = nil)
+    # for >= Tk8.4a2 ?
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      # win = win.epath if win.kind_of?(TkObject)
+      win = _epath(win)
+      if slot
+        #conf = tk_split_list(tk_call_without_enc('place', 'configure',
+        #                                        win, "-#{slot}") )
+        conf = tk_split_simplelist(tk_call_without_enc('place', 'configure',
+                                                       win, "-#{slot}") )
+        conf[0] = conf[0][1..-1]
+        conf[1] = tk_tcl2ruby(conf[1])
+        conf[2] = tk_tcl2ruby(conf[1])
+        conf[3] = tk_tcl2ruby(conf[1])
+        conf[4] = tk_tcl2ruby(conf[1])
+        conf
+      else
+        tk_split_simplelist(tk_call_without_enc('place', 'configure',
+                                                win)).collect{|conflist|
+          #conf = list(conflist)
+          conf = simplelist(conflist).collect!{|inf| tk_tcl2ruby(inf)}
+          conf[0] = conf[0][1..-1]
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      current_configinfo(win, slot)
+    end
+  end
+
+  def current_configinfo(win, slot = nil)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    if slot
+      #conf = tk_split_list(tk_call_without_enc('place', 'configure',
+      #                                         win, "-#{slot}") )
+      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',
+                                              win)).each{|conf_list|
+        #ret[conf[0][1..-1]] = conf[1]
+        conf = simplelist(conf_list)
+        ret[conf[0][1..-1]] = tk_tcl2ruby(conf[4])
+      }
+      ret
+    end
+  end
+
+  def forget(win)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    tk_call_without_enc('place', 'forget', win)
+  end
+
+  def info(win)
+    # win = win.epath if win.kind_of?(TkObject)
+    win = _epath(win)
+    #ilist = list(tk_call_without_enc('place', 'info', win))
+    ilist = simplelist(tk_call_without_enc('place', 'info', win))
+    info = {}
+    while key = ilist.shift
+      #info[key[1..-1]] = ilist.shift
+      info[key[1..-1]] = tk_tcl2ruby(ilist.shift)
+    end
+    return info
+  end
+
+  def slaves(master)
+    # master = master.epath if master.kind_of?(TkObject)
+    master = _epath(master)
+    list(tk_call('place', 'slaves', master))
+  end
+
+  module_function :place, :configure, :configinfo, :current_configinfo
+  module_function :forget, :info, :slaves
+end
+=begin
+def TkPlace(win, slot, value=None)
+  win = win.epath if win.kind_of?(TkObject)
+  if slot.kind_of? Hash
+    params = []
+    slot.each{|k, v|
+      params.push("-#{k}")
+      params.push((v.kind_of?(TkObject))? v.epath: v)
+    }
+    tk_call_without_enc('place', win, *params)
+  else
+    value = value.epath if value.kind_of?(TkObject)
+    tk_call_without_enc('place', win, "-#{slot}", value)
+  end
+end
+=end
diff --git a/ext/tk/lib/tk/radiobutton.rb b/ext/tk/lib/tk/radiobutton.rb
new file mode 100644
index 0000000000..627df6d9cf
--- /dev/null
+++ b/ext/tk/lib/tk/radiobutton.rb
@@ -0,0 +1,73 @@
+#
+# tk/radiobutton.rb : treat radiobutton widget
+#
+require 'tk'
+require 'tk/button'
+
+class Tk::RadioButton<Tk::Button
+  TkCommandNames = ['radiobutton'.freeze].freeze
+  WidgetClassName = 'Radiobutton'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('radiobutton', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('radiobutton', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def __boolval_optkeys
+    super() << 'indicatoron'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'selectcolor'
+  end
+  private :__strval_optkeys
+
+  def __ruby2val_optkeys  # { key=>proc, ... }
+    {
+      'variable'=>proc{|v| tk_trace_variable(v)}  # for backward compatibility
+    }
+  end
+  private :__ruby2val_optkeys
+
+
+  def deselect
+    tk_send_without_enc('deselect')
+    self
+  end
+  def select
+    tk_send_without_enc('select')
+    self
+  end
+
+  def get_value
+    var = tk_send_without_enc('cget', '-variable')
+    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
+      _fromUTF8(INTERP._get_global_var(var))
+    else
+      INTERP._eval(Kernel.format('global %s; set %s', var, var))
+    end
+  end
+
+  def set_value(val)
+    var = tk_send_without_enc('cget', '-variable')
+    if TkVariable::USE_TCLs_SET_VARIABLE_FUNCTIONS
+      _fromUTF8(INTERP._set_global_var(var, _get_eval_string(val, true)))
+    else
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', var, var, s))
+    end
+  end
+end
+
+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
new file mode 100644
index 0000000000..b4f0bd107f
--- /dev/null
+++ b/ext/tk/lib/tk/root.rb
@@ -0,0 +1,95 @@
+#
+# tk/root.rb : treat root widget
+#
+require 'tk'
+require 'tk/wm'
+require 'tk/menuspec'
+
+class Tk::Root<TkWindow
+  include Wm
+  include TkMenuSpec
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    TOPLEVEL_METHODCALL_OPTKEYS
+  end
+  private :__methodcall_optkeys
+
+  def Root.new(keys=nil, &b)
+    unless TkCore::INTERP.tk_windows['.']
+      TkCore::INTERP.tk_windows['.'] =
+        super(:without_creating=>true, :widgetname=>'.'){}
+    end
+    root = TkCore::INTERP.tk_windows['.']
+
+    keys = _symbolkey2str(keys)
+
+    # wm commands
+    root.instance_eval{
+      __methodcall_optkeys.each{|key, method|
+        value = keys.delete(key.to_s)
+        self.__send__(method, value) if value
+      }
+    }
+
+    if keys  # wm commands ( for backward comaptibility )
+      keys.each{|k,v|
+        if v.kind_of? Array
+          root.__send__(k,*v)
+        else
+          root.__send__(k,v)
+        end
+      }
+    end
+
+    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
+
+  def self.to_eval
+    # self::WidgetClassName
+    '.'
+  end
+
+  def create_self
+    @path = '.'
+  end
+  private :create_self
+
+  def path
+    "."
+  end
+
+  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.
+    if tearoff.kind_of?(Hash)
+      opts = tearoff
+      tearoff = false
+    end
+    _create_menubutton(self, menu_info, tearoff, opts)
+  end
+
+  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.
+    menu_spec.each{|info| add_menu(info, tearoff, opts)}
+    self.menu
+  end
+
+  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
new file mode 100644
index 0000000000..0bdcead7f2
--- /dev/null
+++ b/ext/tk/lib/tk/scale.rb
@@ -0,0 +1,112 @@
+#
+# tk/scale.rb : treat scale widget
+#
+require 'tk'
+
+class Tk::Scale<TkWindow
+  TkCommandNames = ['scale'.freeze].freeze
+  WidgetClassName = 'Scale'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def create_self(keys)
+    if keys and keys != None
+      if keys.key?('command') && ! keys['command'].kind_of?(String)
+        cmd = keys.delete('command')
+        keys['command'] = proc{|val| cmd.call(val.to_f)}
+      end
+      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)
+    end
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'label'
+  end
+  private :__strval_optkeys
+
+  def _wrap_command_arg(cmd)
+    proc{|val|
+      if val.kind_of?(String)
+        cmd.call(number(val))
+      else
+        cmd.call(val)
+      end
+    }
+  end
+  private :_wrap_command_arg
+
+  def configure_cmd(slot, value)
+    configure(slot=>value)
+  end
+
+  def configure(slot, value=None)
+    if (slot == 'command' || slot == :command)
+      configure('command'=>value)
+    elsif slot.kind_of?(Hash) &&
+        (slot.key?('command') || slot.key?(:command))
+      slot = _symbolkey2str(slot)
+      slot['command'] = _wrap_command_arg(slot.delete('command'))
+    end
+    super(slot, value)
+  end
+
+  def command(cmd=Proc.new)
+    configure('command'=>cmd)
+  end
+
+  def get(x=None, y=None)
+    number(tk_send_without_enc('get', x, y))
+  end
+
+  def coords(val=None)
+    tk_split_list(tk_send_without_enc('coords', val))
+  end
+
+  def identify(x, y)
+    tk_send_without_enc('identify', x, y)
+  end
+
+  def set(val)
+    tk_send_without_enc('set', val)
+  end
+
+  def value
+    get
+  end
+
+  def value= (val)
+    set(val)
+    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/scrollable.rb b/ext/tk/lib/tk/scrollable.rb
new file mode 100644
index 0000000000..96959b7a4b
--- /dev/null
+++ b/ext/tk/lib/tk/scrollable.rb
@@ -0,0 +1,82 @@
+#
+# tk/scrollable.rb : module for scrollable widget
+#
+require 'tk'
+
+module Tk
+  module XScrollable
+    def xscrollcommand(cmd=Proc.new)
+      configure_cmd 'xscrollcommand', cmd
+      # Tk.update  # avoid scrollbar trouble
+      self
+    end
+
+    def xview(*index)
+      if index.size == 0
+        list(tk_send_without_enc('xview'))
+      else
+        tk_send_without_enc('xview', *index)
+        self
+      end
+    end
+    def xview_moveto(*index)
+      xview('moveto', *index)
+    end
+    def xview_scroll(*index)
+      xview('scroll', *index)
+    end
+
+    def xscrollbar(bar=nil)
+      if bar
+        @xscrollbar = bar
+        @xscrollbar.orient 'horizontal'
+        self.xscrollcommand {|*arg| @xscrollbar.set(*arg)}
+        @xscrollbar.command {|*arg| self.xview(*arg)}
+        Tk.update  # avoid scrollbar trouble
+      end
+      @xscrollbar
+    end
+  end
+
+  module YScrollable
+    def yscrollcommand(cmd=Proc.new)
+      configure_cmd 'yscrollcommand', cmd
+      # Tk.update  # avoid scrollbar trouble
+      self
+    end
+
+    def yview(*index)
+      if index.size == 0
+        list(tk_send_without_enc('yview'))
+      else
+        tk_send_without_enc('yview', *index)
+        self
+      end
+    end
+    def yview_moveto(*index)
+      yview('moveto', *index)
+    end
+    def yview_scroll(*index)
+      yview('scroll', *index)
+    end
+
+    def yscrollbar(bar=nil)
+      if bar
+        @yscrollbar = bar
+        @yscrollbar.orient 'vertical'
+        self.yscrollcommand {|*arg| @yscrollbar.set(*arg)}
+        @yscrollbar.command {|*arg| self.yview(*arg)}
+        Tk.update  # avoid scrollbar trouble
+      end
+      @yscrollbar
+    end
+  end
+
+  X_Scrollable = XScrollable
+  Y_Scrollable = YScrollable
+
+  module Scrollable
+    include XScrollable
+    include YScrollable
+  end
+end
diff --git a/ext/tk/lib/tk/scrollbar.rb b/ext/tk/lib/tk/scrollbar.rb
new file mode 100644
index 0000000000..c0ac201acb
--- /dev/null
+++ b/ext/tk/lib/tk/scrollbar.rb
@@ -0,0 +1,183 @@
+#
+# tk/scrollbar.rb : treat scrollbar widget
+#
+require 'tk'
+
+class Tk::Scrollbar<TkWindow
+  TkCommandNames = ['scrollbar'.freeze].freeze
+  WidgetClassName = 'Scrollbar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def create_self(keys)
+    @assigned = []
+    @scroll_proc = proc{|*args|
+      if self.orient == 'horizontal'
+        @assigned.each{|w| w.xview(*args)}
+      else # 'vertical'
+        @assigned.each{|w| w.yview(*args)}
+      end
+    }
+
+    if keys and keys != None
+      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)
+    end
+  end
+  private :create_self
+
+  def propagate_set(src_win, first, last)
+    self.set(first, last)
+    if self.orient == 'horizontal'
+      @assigned.each{|w| w.xview('moveto', first) if w != src_win}
+    else # 'vertical'
+      @assigned.each{|w| w.yview('moveto', first) if w != src_win}
+    end
+  end
+
+  def assign(*wins)
+    begin
+      self.command(@scroll_proc) if self.cget('command').cmd != @scroll_proc
+    rescue Exception
+      self.command(@scroll_proc)
+    end
+    orient = self.orient
+    wins.each{|w|
+      @assigned << w unless @assigned.index(w)
+      if orient == 'horizontal'
+        w.xscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
+      else # 'vertical'
+        w.yscrollcommand proc{|first, last| self.propagate_set(w, first, last)}
+      end
+    }
+    Tk.update  # avoid scrollbar trouble
+    self
+  end
+
+  def assigned_list
+    begin
+      return @assigned.dup if self.cget('command').cmd == @scroll_proc
+    rescue Exception
+    end
+    fail RuntimeError, "not depend on the assigned_list"
+  end
+
+  def configure(*args)
+    ret = super(*args)
+    # Tk.update  # avoid scrollbar trouble
+    ret
+  end
+
+  #def delta(deltax=None, deltay=None)
+  def delta(deltax, deltay)
+    number(tk_send_without_enc('delta', deltax, deltay))
+  end
+
+  #def fraction(x=None, y=None)
+  def fraction(x, y)
+    number(tk_send_without_enc('fraction', x, y))
+  end
+
+  def identify(x, y)
+    tk_send_without_enc('identify', x, y)
+  end
+
+  def get
+    #ary1 = tk_send('get').split
+    #ary2 = []
+    #for i in ary1
+    #  ary2.push number(i)
+    #end
+    #ary2
+    list(tk_send_without_enc('get'))
+  end
+
+  def set(first, last)
+    tk_send_without_enc('set', first, last)
+    self
+  end
+
+  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
+
+#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'
+    super(keys)
+  end
+  private :create_self
+end
+
+#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'
+    super(keys)
+  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
new file mode 100644
index 0000000000..d20742a666
--- /dev/null
+++ b/ext/tk/lib/tk/scrollbox.rb
@@ -0,0 +1,39 @@
+#
+#               tk/scrollbox.rb - Tk Listbox with Scrollbar
+#                                 as an example of Composite Widget
+#                       by Yukihiro Matsumoto <matz@netlab.co.jp>
+#
+require 'tk'
+require 'tk/listbox'
+
+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
+
+=begin
+    list.configure 'yscroll', scroll.path+" set"
+    list.pack 'side'=>'left','fill'=>'both','expand'=>'yes'
+    scroll.configure 'command', list.path+" yview"
+    scroll.pack 'side'=>'right','fill'=>'y'
+=end
+    list.yscrollbar(scroll)
+    list.pack('side'=>'left','fill'=>'both','expand'=>'yes')
+    scroll.pack('side'=>'right','fill'=>'y')
+
+    delegate('DEFAULT', list)
+    delegate('foreground', list)
+    delegate('background', list, scroll)
+    delegate('borderwidth', @frame)
+    delegate('relief', @frame)
+
+    configure keys if keys
+  end
+  private :initialize_composite
+end
diff --git a/ext/tk/lib/tk/selection.rb b/ext/tk/lib/tk/selection.rb
new file mode 100644
index 0000000000..ba0a6f49f9
--- /dev/null
+++ b/ext/tk/lib/tk/selection.rb
@@ -0,0 +1,86 @@
+#
+# tk/selection.rb : control selection
+#
+require 'tk'
+
+module TkSelection
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['selection'.freeze].freeze
+
+  def self.clear(sel=nil)
+    if sel
+      tk_call_without_enc('selection', 'clear', '-selection', sel)
+    else
+      tk_call_without_enc('selection', 'clear')
+    end
+  end
+  def self.clear_on_display(win, sel=nil)
+    if sel
+      tk_call_without_enc('selection', 'clear',
+                          '-displayof', win, '-selection', sel)
+    else
+      tk_call_without_enc('selection', 'clear', '-displayof', win)
+    end
+  end
+  def clear(sel=nil)
+    TkSelection.clear_on_display(self, sel)
+    self
+  end
+
+  def self.get(keys=nil)
+    #tk_call('selection', 'get', *hash_kv(keys))
+    _fromUTF8(tk_call_without_enc('selection', 'get', *hash_kv(keys)))
+  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',
+                                  win, *hash_kv(keys)))
+  end
+  def get(keys=nil)
+    TkSelection.get_on_display(self, sel)
+  end
+
+  def self.handle(win, func=Proc.new, keys=nil, &b)
+    if func.kind_of?(Hash) && keys == nil
+      keys = func
+      func = Proc.new(&b)
+    end
+    args = ['selection', 'handle']
+    args.concat(hash_kv(keys))
+    args.concat([win, func])
+    tk_call_without_enc(*args)
+  end
+  def handle(func=Proc.new, keys=nil, &b)
+    TkSelection.handle(self, func, keys, &b)
+  end
+
+  def self.get_owner(sel=nil)
+    if sel
+      window(tk_call_without_enc('selection', 'own', '-selection', sel))
+    else
+      window(tk_call_without_enc('selection', 'own'))
+    end
+  end
+  def self.get_owner_on_display(win, sel=nil)
+    if sel
+      window(tk_call_without_enc('selection', 'own',
+                                 '-displayof', win, '-selection', sel))
+    else
+      window(tk_call_without_enc('selection', 'own', '-displayof', win))
+    end
+  end
+  def get_owner(sel=nil)
+    TkSelection.get_owner_on_display(self, sel)
+    self
+  end
+
+  def self.set_owner(win, keys=nil)
+    tk_call_without_enc('selection', 'own', *(hash_kv(keys) << win))
+  end
+  def set_owner(keys=nil)
+    TkSelection.set_owner(self, keys)
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/spinbox.rb b/ext/tk/lib/tk/spinbox.rb
new file mode 100644
index 0000000000..f2917d60ca
--- /dev/null
+++ b/ext/tk/lib/tk/spinbox.rb
@@ -0,0 +1,144 @@
+#
+#               tk/spinbox.rb - Tk spinbox classes
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#
+require 'tk'
+require 'tk/entry'
+
+class Tk::Spinbox<Tk::Entry
+  TkCommandNames = ['spinbox'.freeze].freeze
+  WidgetClassName = 'Spinbox'.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
+      ]
+
+=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)
+        (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 create_self(keys)
+  #  tk_call_without_enc('spinbox', @path)
+  #  if keys and keys != None
+  #    configure(keys)
+  #  end
+  #end
+  #private :create_self
+
+  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 identify(x, y)
+    tk_send_without_enc('identify', x, y)
+  end
+
+  def invoke(elem)
+    tk_send_without_enc('invoke', elem)
+    self
+  end
+
+  def 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
+    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
+
+  def set(str)
+    _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/tagfont.rb b/ext/tk/lib/tk/tagfont.rb
new file mode 100644
index 0000000000..a1807395d2
--- /dev/null
+++ b/ext/tk/lib/tk/tagfont.rb
@@ -0,0 +1,43 @@
+#
+# tk/tagfont.rb : control font of tags
+#
+require 'tk'
+
+module TkTreatTagFont
+  def font_configinfo
+    @parent.tagfont_configinfo(@id)
+  end
+#  alias font font_configinfo
+
+  def font_configure(slot)
+    @parent.tagfont_configure(@id, slot)
+    self
+  end
+
+  def latinfont_configure(ltn, keys=nil)
+    @parent.latintagfont_configure(@id, ltn, keys)
+    self
+  end
+  alias asciifont_configure latinfont_configure
+
+  def kanjifont_configure(knj, keys=nil)
+    @parent.kanjitagfont_configure(@id, ltn, keys)
+    self
+  end
+
+  def font_copy(win, wintag=nil)
+    @parent.tagfont_copy(@id, win, wintag)
+    self
+  end
+
+  def latinfont_copy(win, wintag=nil)
+    @parent.latintagfont_copy(@id, win, wintag)
+    self
+  end
+  alias asciifont_copy latinfont_copy
+
+  def kanjifont_copy(win, wintag=nil)
+    @parent.kanjitagfont_copy(@id, win, wintag)
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/text.rb b/ext/tk/lib/tk/text.rb
new file mode 100644
index 0000000000..c18b3843b4
--- /dev/null
+++ b/ext/tk/lib/tk/text.rb
@@ -0,0 +1,1604 @@
+#
+#               tk/text.rb - Tk text classes
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+require 'tk'
+require 'tk/itemfont'
+require 'tk/itemconfig'
+require 'tk/scrollable'
+require 'tk/txtwin_abst'
+
+module TkTextTagConfig
+  include TkTreatItemFont
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)  # id := [ type, tagOrId ]
+    [self.path, id[0], 'cget', id[1]]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)  # id := [ type, tagOrId ]
+    [self.path, id[0], 'configure', id[1]]
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    if id.kind_of?(Array)
+      id = tagid(id[1])
+    end
+    [self.path, id].join(';')
+  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)
+    itemconfiginfo(['tag', tagOrId], slot)
+  end
+  def current_tag_configinfo(tagOrId, slot=nil)
+    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)
+    itemconfiginfo(['window', tagOrId], slot)
+  end
+  def current_window_configinfo(tagOrId, slot=nil)
+    current_itemconfiginfo(['window', tagOrId], slot)
+  end
+
+  private :itemcget_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+end
+
+class Tk::Text<TkTextWin
+  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
+  #include TkTreatTextTagFont
+  include TkTextTagConfig
+  include Scrollable
+
+  #######################################
+
+  module IndexModMethods
+    def +(mod)
+      return chars(mod) if mod.kind_of?(Numeric)
+
+      mod = mod.to_s
+      if mod =~ /^\s*[+-]?\d/
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod)
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod)
+      end
+    end
+
+    def -(mod)
+      return chars(-mod) if mod.kind_of?(Numeric)
+
+      mod = mod.to_s
+      if mod =~ /^\s*[+-]?\d/
+        Tk::Text::IndexString.new(String.new(id) << ' - ' << mod)
+      elsif mod =~ /^\s*[-]\s+(\d.*)$/
+        Tk::Text::IndexString.new(String.new(id) << ' - -' << $1)
+      else
+        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
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' chars')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' chars')
+      end
+    end
+    alias char chars
+
+    def display_chars(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display chars')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display chars')
+      end
+    end
+    alias display_char display_chars
+
+    def any_chars(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any chars')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any chars')
+      end
+    end
+    alias any_char any_chars
+
+    def indices(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' indices')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' indices')
+      end
+    end
+
+    def display_indices(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display indices')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display indices')
+      end
+    end
+
+    def any_indices(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any indices')
+      else
+        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
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' lines')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' lines')
+      end
+    end
+    alias line lines
+
+    def display_lines(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' display_lines')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' display lines')
+      end
+    end
+    alias display_line display_lines
+
+    def any_lines(mod)
+      # Tk8.5 feature
+      fail ArgumentError, 'expect Integer'  unless mod.kind_of?(Integer)
+      if mod < 0
+        Tk::Text::IndexString.new(String.new(id) << ' ' << mod.to_s << ' any_lines')
+      else
+        Tk::Text::IndexString.new(String.new(id) << ' + ' << mod.to_s << ' any lines')
+      end
+    end
+    alias any_line any_lines
+
+    def linestart
+      Tk::Text::IndexString.new(String.new(id) << ' linestart')
+    end
+    def lineend
+      Tk::Text::IndexString.new(String.new(id) << ' lineend')
+    end
+
+    def display_linestart
+      # Tk8.5 feature
+      Tk::Text::IndexString.new(String.new(id) << ' display linestart')
+    end
+    def display_lineend
+      # Tk8.5 feature
+      Tk::Text::IndexString.new(String.new(id) << ' display lineend')
+    end
+
+    def wordstart
+      Tk::Text::IndexString.new(String.new(id) << ' wordstart')
+    end
+    def wordend
+      Tk::Text::IndexString.new(String.new(id) << ' wordend')
+    end
+
+    def display_wordstart
+      # Tk8.5 feature
+      Tk::Text::IndexString.new(String.new(id) << ' display wordstart')
+    end
+    def display_wordend
+      # Tk8.5 feature
+      Tk::Text::IndexString.new(String.new(id) << ' display wordend')
+    end
+  end
+
+  class IndexString < String
+    include IndexModMethods
+
+    def self.at(x,y)
+      self.new("@#{x},#{y}")
+    end
+
+    def self.new(str)
+      if str.kind_of?(String)
+        super(str)
+      elsif str.kind_of?(Symbol)
+        super(str.to_s)
+      else
+        str
+      end
+    end
+
+    def id
+      self
+    end
+  end
+
+  #######################################
+
+  TkCommandNames = ['text'.freeze].freeze
+  WidgetClassName = 'Text'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def self.new(*args, &block)
+    obj = super(*args){}
+    obj.init_instance_variable
+    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
+
+  def init_instance_variable
+    @cmdtbl = []
+    @tags = {}
+  end
+
+  def __destroy_hook__
+    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,
+    #                     *hash_kv(keys, true))
+    #else
+    #  #tk_call_without_enc('text', @path)
+    #  tk_call_without_enc(self.class::TkCommandNames[0], @path)
+    #end
+    super(keys)
+    init_instance_variable
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'inactiveseletcionbackground'
+  end
+  private :__strval_optkeys
+
+  def self.at(x, y)
+    Tk::Text::IndexString.at(x, y)
+  end
+
+  def at(x, y)
+    Tk::Text::IndexString.at(x, y)
+  end
+
+  def index(idx)
+    Tk::Text::IndexString.new(tk_send_without_enc('index',
+                                                  _get_eval_enc_str(idx)))
+  end
+
+  def get_displaychars(*index)
+    # Tk8.5 feature
+    get('-displaychars', *index)
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get', "1.0", "end - 1 char"))
+  end
+
+  def value= (val)
+    tk_send_without_enc('delete', "1.0", 'end')
+    tk_send_without_enc('insert', "1.0", _get_eval_enc_str(val))
+    val
+  end
+
+  def clear
+    tk_send_without_enc('delete', "1.0", 'end')
+    self
+  end
+  alias erase clear
+
+  def _addcmd(cmd)
+    @cmdtbl.push cmd
+  end
+
+  def _addtag(name, obj)
+    @tags[name] = obj
+  end
+
+  def tagid(tag)
+    if tag.kind_of?(TkTextTag) \
+      || tag.kind_of?(TkTextMark) \
+      || tag.kind_of?(TkTextImage) \
+      || tag.kind_of?(TkTextWindow)
+      tag.id
+    else
+      tag  # maybe an Array of configure parameters
+    end
+  end
+  private :tagid
+
+  def tagid2obj(tagid)
+    if @tags[tagid]
+      @tags[tagid]
+    else
+      tagid
+    end
+  end
+
+  def tag_names(index=None)
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('tag', 'names', _get_eval_enc_str(index)), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_gravity(mark, direction=nil)
+    if direction
+      tk_send_without_enc('mark', 'gravity',
+                          _get_eval_enc_str(mark), direction)
+      self
+    else
+      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
+    end
+  end
+
+  def mark_set(mark, index)
+    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',
+                        *(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',
+                                            _get_eval_enc_str(index))))
+  end
+  alias next_mark mark_next
+
+  def mark_previous(index)
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
+                                            _get_eval_enc_str(index))))
+  end
+  alias previous_mark mark_previous
+
+  def image_cget_strict(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      _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),
+                                                "-#{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),
+                                    *hash_kv(slot, true)))
+    else
+      _fromUTF8(tk_send_without_enc('image', 'configure',
+                                    _get_eval_enc_str(index),
+                                    "-#{slot}",
+                                    _get_eval_enc_str(value)))
+    end
+    self
+  end
+
+  def image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        # tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+
+  def current_image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        conf = image_configinfo(index, slot)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        image_configinfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      image_configinfo(index, slot).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  def image_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def set_insert(index)
+    tk_send_without_enc('mark','set','insert', _get_eval_enc_str(index))
+    self
+  end
+
+  def set_current(index)
+    tk_send_without_enc('mark','set','current', _get_eval_enc_str(index))
+    self
+  end
+
+  def insert(index, chars, *tags)
+    if tags[0].kind_of?(Array)
+      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
+      args = [chars]
+      while tags.size > 0
+        args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
+        args << tags.shift if tags.size > 0                           # chars
+      end
+      super(index, *args)
+    else
+      # single chars-taglist argument :: str, tag, tag, ...
+      if tags.size == 0
+        super(index, chars)
+      else
+        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
+      end
+    end
+  end
+
+  def destroy
+    @tags = {} unless @tags
+    @tags.each_value do |t|
+      t.destroy
+    end
+    super()
+  end
+
+  def backspace
+    self.delete 'insert'
+  end
+
+  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),
+                             op, _get_eval_enc_str(idx2)))
+  end
+
+  def count(idx1, idx2, *opts)
+    # opts are Tk8.5 feature
+    cnt = 0
+    args = opts.collect{|opt|
+      str = opt.to_s
+      cnt += 1 if str != 'update'
+      '-' + str
+    }
+    args << _get_eval_enc_str(idx1) << _get_eval_enc_str(idx2)
+    if cnt <= 1
+      number(tk_send_without_enc('count', *opts))
+    else
+      list(tk_send_without_enc('count', *opts))
+    end
+  end
+
+  def count_info(idx1, idx2, update=true)
+    # Tk8.5 feature
+    opts = [
+      :chars, :displaychars, :displayindices, :displaylines,
+      :indices, :lines, :xpixels, :ypixels
+    ]
+    if update
+      lst = count(idx1, idx2, :update, *opts)
+    else
+      lst = count(idx1, idx2, *opts)
+    end
+    info = {}
+    opts.each_with_index{|key, idx| info[key] = lst[idx]}
+    info
+  end
+
+  def peer_names()
+    # Tk8.5 feature
+    list(tk_send_without_enc('peer', 'names'))
+  end
+
+  def replace(idx1, idx2, *opts)
+    tk_send('replace', idx1, idx2, *opts)
+    self
+  end
+
+  def debug
+    bool(tk_send_without_enc('debug'))
+  end
+  def debug=(boolean)
+    tk_send_without_enc('debug', boolean)
+    #self
+    boolean
+  end
+
+  def dlineinfo(index)
+    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
+  end
+
+  def modified?
+    bool(tk_send_without_enc('edit', 'modified'))
+  end
+  def modified(mode)
+    tk_send_without_enc('edit', 'modified', mode)
+    self
+  end
+  def modified=(mode)
+    modified(mode)
+    mode
+  end
+
+  def edit_redo
+    tk_send_without_enc('edit', 'redo')
+    self
+  end
+  def edit_reset
+    tk_send_without_enc('edit', 'reset')
+    self
+  end
+  def edit_separator
+    tk_send_without_enc('edit', 'separator')
+    self
+  end
+  def edit_undo
+    tk_send_without_enc('edit', 'undo')
+    self
+  end
+
+  def xview_pickplace(index)
+    tk_send_without_enc('xview', '-pickplace', _get_eval_enc_str(index))
+    self
+  end
+
+  def yview_pickplace(index)
+    tk_send_without_enc('yview', '-pickplace', _get_eval_enc_str(index))
+    self
+  end
+
+  def text_copy
+    # Tk8.4 feature
+    tk_call_without_enc('tk_textCopy', @path)
+    self
+  end
+
+  def text_cut
+    # Tk8.4 feature
+    tk_call_without_enc('tk_textCut', @path)
+    self
+  end
+
+  def text_paste
+    # Tk8.4 feature
+    tk_call_without_enc('tk_textPaste', @path)
+    self
+  end
+
+  def tag_add(tag, index1, index2=None)
+    tk_send_without_enc('tag', 'add', _get_eval_enc_str(tag),
+                        _get_eval_enc_str(index1),
+                        _get_eval_enc_str(index2))
+    self
+  end
+  alias addtag tag_add
+  alias add_tag tag_add
+
+  def tag_delete(*tags)
+    tk_send_without_enc('tag', 'delete',
+                        *(tags.collect{|tag| _get_eval_enc_str(tag)}))
+    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
+  alias delete_tag tag_delete
+
+  #def tag_bind(tag, seq, cmd=Proc.new, *args)
+  #  _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
+  #  self
+  #end
+  def tag_bind(tag, seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+
+  #def tag_bind_append(tag, seq, cmd=Proc.new, *args)
+  #  _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
+  #  self
+  #end
+  def tag_bind_append(tag, seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+
+  def tag_bind_remove(tag, seq)
+    _bind_remove([@path, 'tag', 'bind', tag], seq)
+    self
+  end
+
+  def tag_bindinfo(tag, context=nil)
+    _bindinfo([@path, 'tag', 'bind', tag], context)
+  end
+
+=begin
+  def tag_cget(tag, key)
+    case key.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      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}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('tag','cget',_get_eval_enc_str(tag),'-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(tag, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@path,'tag','cget',_get_eval_enc_str(tag),"-#{key}")))
+    end
+  end
+
+  def tag_configure(tag, key, val=None)
+    if key.kind_of?(Hash)
+      key = _symbolkey2str(key)
+      if ( key['font'] || key['kanjifont'] \
+          || key['latinfont'] || key['asciifont'] )
+        tagfont_configure(tag, key)
+      else
+        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
+                            *hash_kv(key, true))
+      end
+
+    else
+      if  key == 'font' || key == :font ||
+          key == 'kanjifont' || key == :kanjifont ||
+          key == 'latinfont' || key == :latinfont ||
+          key == 'asciifont' || key == :asciifont
+        if val == None
+          tagfontobj(tag)
+        else
+          tagfont_configure(tag, {key=>val})
+        end
+      else
+        tk_send_without_enc('tag', 'configure', _get_eval_enc_str(tag),
+                            "-#{key}", _get_eval_enc_str(val))
+      end
+    end
+    self
+  end
+
+  def tag_configinfo(tag, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+          conf[4] = tagfont_configinfo(tag, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        ret = tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+        fontconf = ret.assoc('font')
+        if fontconf
+          ret.delete_if{|item| item[0] == 'font' || item[0] == 'kanjifont'}
+          fontconf[4] = tagfont_configinfo(tag, fontconf[4])
+          ret.push(fontconf)
+        else
+          ret
+        end
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        case key.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        when 'font', 'kanjifont'
+          conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+          conf[4] = tagfont_configinfo(tag, conf[4])
+        else
+          conf = tk_split_list(_fromUTF8(tk_send_without_enc('tag','configure',_get_eval_enc_str(tag),"-#{key}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send('tag','configure',_get_eval_enc_str(tag)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        fontconf = ret['font']
+        if fontconf
+          ret.delete('font')
+          ret.delete('kanjifont')
+          fontconf[3] = tagfont_configinfo(tag, fontconf[3])
+          ret['font'] = fontconf
+        end
+        ret
+      end
+    end
+  end
+
+  def current_tag_configinfo(tag, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = tag_configinfo(tag, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        tag_configinfo(tag).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      tag_configinfo(tag, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+
+  def tag_raise(tag, above=None)
+    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),
+                        _get_eval_enc_str(below))
+    self
+  end
+
+  def tag_remove(tag, *indices)
+    tk_send_without_enc('tag', 'remove', _get_eval_enc_str(tag),
+                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
+    self
+  end
+
+  def tag_ranges(tag)
+    #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)),
+                            false, true)
+    r = []
+    while key=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),
+                                   _get_eval_enc_str(last))).collect{|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),
+                                   _get_eval_enc_str(last))).collect{|idx|
+      Tk::Text::IndexString.new(idx)
+    }
+  end
+
+=begin
+  def window_cget(index, slot)
+    case slot.to_s
+    when 'text', 'label', 'show', 'data', 'file'
+      _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}"))
+      fnt = tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(index), '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(index, fnt)
+      end
+      if slot.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_send_without_enc('window', 'cget', _get_eval_enc_str(index), "-#{slot}")))
+    end
+  end
+
+  def window_configure(index, slot, value=None)
+    if index.kind_of?(TkTextWindow)
+      index.configure(slot, value)
+    else
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        win = slot['window']
+        # slot['window'] = win.epath if win.kind_of?(TkWindow)
+        slot['window'] = _epath(win) if win
+        if slot['create']
+          p_create = slot['create']
+          if p_create.kind_of?(Proc)
+#=begin
+            slot['create'] = install_cmd(proc{
+                                           id = p_create.call
+                                           if id.kind_of?(TkWindow)
+                                             id.epath
+                                           else
+                                             id
+                                           end
+                                         })
+#=end
+            slot['create'] = install_cmd(proc{_epath(p_create.call)})
+          end
+        end
+        tk_send_without_enc('window', 'configure',
+                            _get_eval_enc_str(index),
+                            *hash_kv(slot, true))
+      else
+        if slot == 'window' || slot == :window
+          # id = value
+          # value = id.epath if id.kind_of?(TkWindow)
+          value = _epath(value)
+        end
+        if slot == 'create' || slot == :create
+          p_create = value
+          if p_create.kind_of?(Proc)
+#=begin
+            value = install_cmd(proc{
+                                  id = p_create.call
+                                  if id.kind_of?(TkWindow)
+                                    id.epath
+                                  else
+                                    id
+                                  end
+                                })
+#=end
+            value = install_cmd(proc{_epath(p_create.call)})
+          end
+        end
+        tk_send_without_enc('window', 'configure',
+                            _get_eval_enc_str(index),
+                            "-#{slot}", _get_eval_enc_str(value))
+      end
+    end
+    self
+  end
+
+  def window_configinfo(win, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        else
+          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          conf = tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        else
+          conf = tk_split_list(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win), "-#{slot}")))
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(_fromUTF8(tk_send('window', 'configure', _get_eval_enc_str(win)))).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+
+  def current_window_configinfo(win, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        conf = window_configinfo(win, slot)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        window_configinfo(win).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      window_configinfo(win, slot).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+=end
+
+  def window_names
+    # tk_split_simplelist(_fromUTF8(tk_send_without_enc('window', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('window', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  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',
+                          _get_eval_enc_str(txt)).to_i
+    else
+      begin
+        tk_call_without_enc('encoding', 'convertto', 'ascii',
+                            _get_eval_enc_str(txt)).length
+      rescue StandardError, NameError
+        # sorry, I have no plan
+        txt.length
+      end
+    end
+  end
+  private :_ktext_length
+
+  def tksearch(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    nocase = false
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt|
+        s_opt = opt.to_s
+        nocase = true if s_opt == 'nocase'
+        '-' + s_opt
+      }
+    else
+      opts = []
+    end
+
+    if args[0].kind_of?(Regexp)
+      regexp = args.shift
+      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
+        opts << '-nocase'
+      end
+      args.unshift(regexp.source)
+    end
+
+    opts << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      Tk::Text::IndexString.new(ret)
+    end
+  end
+
+  def tksearch_with_count(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    nocase = false
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt|
+        s_opt = opt.to_s
+        nocase = true if s_opt == 'nocase'
+        '-' + s_opt
+      }
+    else
+      opts = []
+    end
+
+    opts << '-count' << args.shift
+
+    if args[0].kind_of?(Regexp)
+      regexp = args.shift
+      if !nocase && (regexp.options & Regexp::IGNORECASE) != 0
+        opts << '-nocase'
+      end
+      args.unshift(regexp.source)
+    end
+
+    opts << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      Tk::Text::IndexString.new(ret)
+    end
+  end
+
+  def search_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of?(Integer)
+    if stop != None
+      return ["", 0] if compare(start,'>=',stop)
+      txt = get(start,stop)
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        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"),
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"),
+                  _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get(start,'end - 1 char')
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        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"),
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"),
+                  _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.index(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          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"),
+                    _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def search(pat,start,stop=None)
+    search_with_length(pat,start,stop)[0]
+  end
+
+  def rsearch_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of?(Integer)
+    if stop != None
+      return ["", 0] if compare(start,'<=',stop)
+      txt = get(stop,start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of?(String)
+          #return [index(stop + " + #{pos} chars"), pat.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
+        else
+          #return [index(stop + " + #{pos} chars"), $&.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get('1.0',start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        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"), _ktext_length(pat), pat.dup]
+        else
+          #return [index("1.0 + #{pos} chars"), $&.split('').length]
+          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.rindex(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          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"), _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def rsearch(pat,start,stop=None)
+    rsearch_with_length(pat,start,stop)[0]
+  end
+
+  def dump(type_info, *index, &block)
+    if type_info.kind_of?(Symbol)
+      type_info = [ type_info.to_s ]
+    elsif type_info.kind_of?(String)
+      type_info = [ type_info ]
+    end
+    args = type_info.collect{|inf| '-' + inf}
+    args << '-command' << block if block
+    str = tk_send('dump', *(args + index))
+    result = []
+    sel = nil
+    i = 0
+    while i < str.size
+      # retrieve key
+      idx = str.index(/ /, i)
+      result.push str[i..(idx-1)]
+      i = idx + 1
+
+      # retrieve value
+      case result[-1]
+      when 'text'
+        if str[i] == ?{
+          # text formed as {...}
+          val, i = _retrieve_braced_text(str, i)
+          result.push val
+        else
+          # text which may contain backslahes
+          val, i = _retrieve_backslashed_text(str, i)
+          result.push val
+        end
+      else
+        idx = str.index(/ /, i)
+        val = str[i..(idx-1)]
+        case result[-1]
+        when 'mark'
+          case val
+          when 'insert'
+            result.push TkTextMarkInsert.new(self)
+          when 'current'
+            result.push TkTextMarkCurrent.new(self)
+          when 'anchor'
+            result.push TkTextMarkAnchor.new(self)
+          else
+            result.push tk_tcl2ruby(val)
+          end
+        when 'tagon'
+          if val == 'sel'
+            if sel
+              result.push sel
+            else
+              result.push TkTextTagSel.new(self)
+            end
+          else
+            result.push tk_tcl2ruby(val)
+          end
+        when 'tagoff'
+            result.push tk_tcl2ruby(val)
+        when 'window'
+          result.push tk_tcl2ruby(val)
+        when 'image'
+          result.push tk_tcl2ruby(val)
+        end
+        i = idx + 1
+      end
+
+      # retrieve index
+      idx = str.index(/ /, i)
+      if idx
+        result.push(Tk::Text::IndexString.new(str[i..(idx-1)]))
+        i = idx + 1
+      else
+        result.push(Tk::Text::IndexString.new(str[i..-1]))
+        break
+      end
+    end
+
+    kvis = []
+    until result.empty?
+      kvis.push [result.shift, result.shift, result.shift]
+    end
+    kvis  # result is [[key1, value1, index1], [key2, value2, index2], ...]
+  end
+
+  def _retrieve_braced_text(str, i)
+    cnt = 0
+    idx = i
+    while idx < str.size
+      case str[idx]
+      when ?{
+        cnt += 1
+      when ?}
+        cnt -= 1
+        if cnt == 0
+          break
+        end
+      end
+      idx += 1
+    end
+    return str[i+1..idx-1], idx + 2
+  end
+  private :_retrieve_braced_text
+
+  def _retrieve_backslashed_text(str, i)
+    j = i
+    idx = nil
+    loop {
+      idx = str.index(/ /, j)
+      if str[idx-1] == ?\\
+        j += 1
+      else
+        break
+      end
+    }
+    val = str[i..(idx-1)]
+    val.gsub!(/\\( |\{|\})/, '\1')
+    return val, idx + 1
+  end
+  private :_retrieve_backslashed_text
+
+  def dump_all(*index, &block)
+    dump(['all'], *index, &block)
+  end
+  def dump_mark(*index, &block)
+    dump(['mark'], *index, &block)
+  end
+  def dump_tag(*index, &block)
+    dump(['tag'], *index, &block)
+  end
+  def dump_text(*index, &block)
+    dump(['text'], *index, &block)
+  end
+  def dump_window(*index, &block)
+    dump(['window'], *index, &block)
+  end
+  def dump_image(*index, &block)
+    dump(['image'], *index, &block)
+  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 Tk::Text::Peer < Tk::Text
+  # Tk8.5 feature
+  def initialize(text, parent=nil, keys={})
+    unless text.kind_of?(Tk::Text)
+      fail ArgumentError, "Tk::Text is expected for 1st argument"
+    end
+    @src_text = text
+    super(parent, keys)
+  end
+
+  def create_self(keys)
+    if keys and keys != None
+      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
+  end
+  private :create_self
+end
diff --git a/ext/tk/lib/tk/textimage.rb b/ext/tk/lib/tk/textimage.rb
new file mode 100644
index 0000000000..99027a06fb
--- /dev/null
+++ b/ext/tk/lib/tk/textimage.rb
@@ -0,0 +1,88 @@
+#
+# tk/textimage.rb - treat Tk text image object
+#
+require 'tk'
+require 'tk/text'
+
+class TkTextImage<TkObject
+  include Tk::Text::IndexModMethods
+
+  def initialize(parent, index, keys)
+    #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',
+                                                       'end - 1 chars'))
+      else
+        @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',
+                                                     _get_eval_enc_str(index)))
+    end
+    @path.gravity = 'left'
+    @index = @path.path
+    @id = tk_call_without_enc(@t.path, 'image', 'create', @index,
+                              *hash_kv(keys, true)).freeze
+    @path.gravity = 'right'
+  end
+
+  def id
+    Tk::Text::IndexString.new(@id)
+  end
+  def mark
+    @path
+  end
+
+  def [](slot)
+    cget(slot)
+  end
+  def []=(slot, value)
+    configure(slot, value)
+    value
+  end
+
+  def cget(slot)
+    @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
+  end
+#  def configure(slot, value)
+#    tk_call @t.path, 'image', 'configure', @index, "-#{slot}", value
+#  end
+
+  def configinfo(slot = nil)
+    @t.image_configinfo(@index, slot)
+  end
+
+  def current_configinfo(slot = nil)
+    @t.current_image_configinfo(@index, slot)
+  end
+
+  def image
+    img = tk_call_without_enc(@t.path, 'image', 'cget', @index, '-image')
+    TkImage::Tk_IMGTBL[img]? TkImage::Tk_IMGTBL[img] : img
+  end
+
+  def image=(value)
+    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
new file mode 100644
index 0000000000..d1888c5e54
--- /dev/null
+++ b/ext/tk/lib/tk/textmark.rb
@@ -0,0 +1,204 @@
+#
+# tk/textmark.rb - methods for treating text marks
+#
+require 'tk'
+require 'tk/text'
+
+class TkTextMark<TkObject
+  include Tk::Text::IndexModMethods
+
+  TMarkID_TBL = TkCore::INTERP.create_table
+
+  (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
+    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?(Tk::Text)
+    #  fail ArgumentError, "expect Tk::Text for 1st argument"
+    #end
+    @parent = @t = parent
+    @tpath = parent.path
+    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
+    Tk::Text::IndexString.new(@id)
+  end
+
+  def exist?
+    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'names'))).find{|id| id == @id } )
+    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'mark', 'names'), false, true).find{|id| id == @id } )
+      true
+    else
+      false
+    end
+  end
+
+=begin
+  # move to Tk::Text::IndexModMethods module
+  def +(mod)
+    return chars(mod) if mod.kind_of?(Numeric)
+
+    mod = mod.to_s
+    if mod =~ /^\s*[+-]?\d/
+      Tk::Text::IndexString.new(@id + ' + ' + mod)
+    else
+      Tk::Text::IndexString.new(@id + ' ' + mod)
+    end
+  end
+
+  def -(mod)
+    return chars(-mod) if mod.kind_of?(Numeric)
+
+    mod = mod.to_s
+    if mod =~ /^\s*[+-]?\d/
+      Tk::Text::IndexString.new(@id + ' - ' + mod)
+    elsif mod =~ /^\s*[-]\s+(\d.*)$/
+      Tk::Text::IndexString.new(@id + ' - -' + $1)
+    else
+      Tk::Text::IndexString.new(@id + ' ' + mod)
+    end
+  end
+=end
+
+  def pos
+    @t.index(@id)
+  end
+
+  def pos=(where)
+    set(where)
+  end
+
+  def set(where)
+    tk_call_without_enc(@t.path, 'mark', 'set', @id,
+                        _get_eval_enc_str(where))
+    self
+  end
+
+  def unset
+    tk_call_without_enc(@t.path, 'mark', 'unset', @id)
+    self
+  end
+  alias destroy unset
+
+  def gravity
+    tk_call_without_enc(@t.path, 'mark', 'gravity', @id)
+  end
+
+  def gravity=(direction)
+    tk_call_without_enc(@t.path, 'mark', 'gravity', @id, direction)
+    #self
+    direction
+  end
+
+  def next(index = nil)
+    if index
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', _get_eval_enc_str(index))))
+    else
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'next', @id)))
+    end
+  end
+
+  def previous(index = nil)
+    if index
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', _get_eval_enc_str(index))))
+    else
+      @t.tagid2obj(_fromUTF8(tk_call_without_enc(@t.path, 'mark', 'previous', @id)))
+    end
+  end
+end
+TktMark = TkTextMark
+
+class TkTextNamedMark<TkTextMark
+  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)
+    # 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
+    tk_call_without_enc(@t.path, 'mark', 'set', @id,
+                        _get_eval_enc_str(index)) if index
+    @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
new file mode 100644
index 0000000000..96692014e4
--- /dev/null
+++ b/ext/tk/lib/tk/texttag.rb
@@ -0,0 +1,321 @@
+#
+# tk/texttag.rb - methods for treating text tags
+#
+require 'tk'
+require 'tk/text'
+require 'tk/tagfont'
+
+class TkTextTag<TkObject
+  include TkTreatTagFont
+  include Tk::Text::IndexModMethods
+
+  TTagID_TBL = TkCore::INTERP.create_table
+
+  (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
+    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)
+    #unless parent.kind_of?(TkText)
+    #  fail ArgumentError, "expect TkText for 1st argument"
+    #end
+    @parent = @t = parent
+    @tpath = parent.path
+    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
+      if keys.kind_of?(Hash)
+        add(*args) if args != []
+        configure(keys)
+      else
+        args.push keys
+        add(*args)
+      end
+    end
+    @t._addtag id, self
+  end
+
+  def id
+    Tk::Text::IndexString.new(@id)
+  end
+
+  def exist?
+    #if ( tk_split_simplelist(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'names'))).find{|id| id == @id } )
+    if ( tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'names'), false, true).find{|id| id == @id } )
+      true
+    else
+      false
+    end
+  end
+
+  def first
+    Tk::Text::IndexString.new(@id + '.first')
+  end
+
+  def last
+    Tk::Text::IndexString.new(@id + '.last')
+  end
+
+  def add(*indices)
+    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,
+                        *(indices.collect{|idx| _get_eval_enc_str(idx)}))
+    self
+  end
+
+  def ranges
+    l = tk_split_simplelist(tk_call_without_enc(@t.path, 'tag', 'ranges', @id))
+    r = []
+    while key=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),
+                                   _get_eval_enc_str(last))).collect{|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),
+                                   _get_eval_enc_str(last))).collect{|idx|
+      Tk::Text::IndexString.new(idx)
+    }
+  end
+
+  def [](key)
+    cget key
+  end
+
+  def []=(key,val)
+    configure key, val
+    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
+    when 'text', 'label', 'show', 'data', 'file'
+      _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',
+                                                      @id, '-font')))
+      unless fnt.kind_of?(TkFont)
+        fnt = tagfontobj(@id, fnt)
+      end
+      if key.to_s == 'kanjifont' && JAPANIZED_TK && TK_VERSION =~ /^4\.*/
+        # obsolete; just for compatibility
+        fnt.kanji_font
+      else
+        fnt
+      end
+    else
+      tk_tcl2ruby(_fromUTF8(tk_call_without_enc(@t.path, 'tag', 'cget',
+                                                @id, "-#{key}")))
+    end
+  end
+=end
+
+  def configure(key, val=None)
+    @t.tag_configure @id, key, val
+  end
+#  def configure(key, val=None)
+#    if key.kind_of?(Hash)
+#      tk_call @t.path, 'tag', 'configure', @id, *hash_kv(key)
+#    else
+#      tk_call @t.path, 'tag', 'configure', @id, "-#{key}", val
+#    end
+#  end
+#  def configure(key, value)
+#    if value == FALSE
+#      value = "0"
+#    elsif value.kind_of?(Proc)
+#      value = install_cmd(value)
+#    end
+#    tk_call @t.path, 'tag', 'configure', @id, "-#{key}", value
+#  end
+
+  def configinfo(key=nil)
+    @t.tag_configinfo @id, key
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_tag_configinfo @id, key
+  end
+
+  #def bind(seq, cmd=Proc.new, *args)
+  #  _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+  #  self
+  #end
+  def bind(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+    self
+  end
+
+  #def bind_append(seq, cmd=Proc.new, *args)
+  #  _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+  #  self
+  #end
+  def bind_append(seq, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@t.path, 'tag', 'bind', @id], seq, cmd, *args)
+    self
+  end
+
+  def bind_remove(seq)
+    _bind_remove([@t.path, 'tag', 'bind', @id], seq)
+    self
+  end
+
+  def bindinfo(context=nil)
+    _bindinfo([@t.path, 'tag', 'bind', @id], context)
+  end
+
+  def raise(above=None)
+    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,
+                        _get_eval_enc_str(below))
+    self
+  end
+
+  def destroy
+    tk_call_without_enc(@t.path, 'tag', 'delete', @id)
+    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)
+    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
+    end
+
+    tagobj
+  end
+
+  def initialize(parent, name, *args)
+    # 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
+
+    #if mode
+    #  tk_call @t.path, "addtag", @id, *args
+    #end
+    if args != []
+      keys = args.pop
+      if keys.kind_of?(Hash)
+        add(*args) if args != []
+        configure(keys)
+      else
+        args.push keys
+        add(*args)
+      end
+    end
+    @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
new file mode 100644
index 0000000000..49327b2c81
--- /dev/null
+++ b/ext/tk/lib/tk/textwindow.rb
@@ -0,0 +1,154 @@
+#
+# tk/textwindow.rb - treat Tk text window object
+#
+require 'tk'
+require 'tk/text'
+
+class TkTextWindow<TkObject
+  include Tk::Text::IndexModMethods
+
+  def initialize(parent, index, keys = {})
+    #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',
+                                                     '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',
+                                                       'end - 1 chars'))
+      else
+        @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', _get_eval_enc_str(index)))
+    end
+    @path.gravity = 'left'
+    @index = @path.path
+    keys = _symbolkey2str(keys)
+    @id = keys['window']
+    # keys['window'] = @id.epath if @id.kind_of?(TkWindow)
+    keys['window'] = _epath(@id) if @id
+    if keys['create']
+      @p_create = keys['create']
+      # if @p_create.kind_of?(Proc)
+      if TkComm._callback_entry?(@p_create)
+=begin
+        keys['create'] = install_cmd(proc{
+                                       @id = @p_create.call
+                                       if @id.kind_of?(TkWindow)
+                                         @id.epath
+                                       else
+                                         @id
+                                       end
+                                     })
+=end
+        keys['create'] = install_cmd(proc{@id = @p_create.call; _epath(@id)})
+      end
+    end
+    tk_call_without_enc(@t.path, 'window', 'create', @index,
+                        *hash_kv(keys, true))
+    @path.gravity = 'right'
+  end
+
+  def id
+    Tk::Text::IndexString.new(_epath(@id))
+  end
+  def mark
+    @path
+  end
+
+  def [](slot)
+    cget(slot)
+  end
+  def []=(slot, value)
+    configure(slot, value)
+    value
+  end
+
+  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']
+        # slot['window'] = @id.epath if @id.kind_of?(TkWindow)
+        slot['window'] = _epath(@id) if @id
+      end
+      if slot['create']
+        self.create=slot.delete('create')
+      end
+      if slot.size > 0
+        tk_call_without_enc(@t.path, 'window', 'configure', @index,
+                            *hash_kv(slot, true))
+      end
+    else
+      if slot == 'window' || slot == :window
+        @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,
+                            "-#{slot}", _get_eval_enc_str(value))
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    @t.window_configinfo(@index, slot)
+  end
+
+  def current_configinfo(slot = nil)
+    @t.current_window_configinfo(@index, slot)
+  end
+
+  def window
+    @id
+  end
+
+  def window=(value)
+    @id = value
+    # value = @id.epath if @id.kind_of?(TkWindow)
+    value = _epath(@id) if @id
+    tk_call_without_enc(@t.path, 'window', 'configure', @index,
+                        '-window', _get_eval_enc_str(value))
+    value
+  end
+
+  def create
+    @p_create
+  end
+
+  def create=(value)
+    @p_create = value
+    # if @p_create.kind_of?(Proc)
+    if TkComm._callback_entry?(@p_create)
+      value = install_cmd(proc{
+                            @id = @p_create.call
+                            if @id.kind_of?(TkWindow)
+                              @id.epath
+                            else
+                              @id
+                            end
+                          })
+    end
+    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
new file mode 100644
index 0000000000..ddfbfce9be
--- /dev/null
+++ b/ext/tk/lib/tk/timer.rb
@@ -0,0 +1,669 @@
+#
+#   tk/timer.rb : methods for Tcl/Tk after command
+#
+#   $Id$
+#
+require 'tk'
+
+class TkTimer
+  include TkCore
+  extend TkCore
+
+  TkCommandNames = ['after'.freeze].freeze
+
+  (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} {
+        return -code $st $ret
+    } {
+        return $ret
+    }
+  EOL
+
+  DEFAULT_IGNORE_EXCEPTIONS = [ NameError, RuntimeError ].freeze
+
+  ###############################
+  # class methods
+  ###############################
+  def self.start(*args, &b)
+    self.new(*args, &b).start
+  end
+
+  def self.callback(obj_id)
+    ex_obj = Tk_CBTBL[obj_id]
+    return "" if ex_obj == nil; # canceled
+    ex_obj.cb_call
+  end
+
+  def self.info(obj = nil)
+    if obj
+      if obj.kind_of?(TkTimer)
+        if obj.after_id
+          inf = tk_split_list(tk_call_without_enc('after','info',obj.after_id))
+          [Tk_CBTBL[inf[0][1]], inf[1]]
+        else
+          nil
+        end
+      else
+        fail ArgumentError, "TkTimer object is expected"
+      end
+    else
+      tk_call_without_enc('after', 'info').split(' ').collect!{|id|
+        ret = Tk_CBTBL.find{|key,val| val.after_id == id}
+        (ret == nil)? id: ret[1]
+      }
+    end
+  end
+
+
+  ###############################
+  # instance methods
+  ###############################
+  def do_callback
+    @in_callback = true
+    @after_id = nil
+    begin
+      @return_value = @current_proc.call(self)
+    rescue SystemExit
+      exit(0)
+    rescue Interrupt
+      exit!(1)
+    rescue Exception => e
+      if @cancel_on_exception &&
+          @cancel_on_exception.find{|exc| e.kind_of?(exc)}
+        cancel
+        @return_value = e
+        @in_callback = false
+        return e
+      else
+        fail e
+      end
+    end
+    if @set_next
+      set_next_callback(@current_args)
+    else
+      @set_next = true
+    end
+    @in_callback = false
+    @return_value
+  end
+
+  def set_callback(sleep, args=nil)
+    if TkCore::INTERP.deleted?
+      self.cancel
+      return self
+    end
+    @after_script = "rb_after #{@id}"
+    @current_args = args
+    @current_script = [sleep, @after_script]
+    @after_id = tk_call_without_enc('after', sleep, @after_script)
+    self
+  end
+
+  def set_next_callback(args)
+    if @running == false || @proc_max == 0 || @do_loop == 0
+      Tk_CBTBL.delete(@id) ;# for GC
+      @running = false
+      # @wait_var.value = 0
+      __at_end__
+      return
+    end
+    if @current_pos >= @proc_max
+      if @do_loop < 0 || (@do_loop -= 1) > 0
+        @current_pos = 0
+      else
+        Tk_CBTBL.delete(@id) ;# for GC
+        @running = false
+        # @wait_var.value = 0
+        __at_end__
+        return
+      end
+    end
+
+    @current_args = args
+
+    # if @sleep_time.kind_of?(Proc)
+    if TkComm._callback_entry?(@sleep_time)
+      sleep = @sleep_time.call(self)
+    else
+      sleep = @sleep_time
+    end
+    @current_sleep = sleep
+
+    cmd, *cmd_args = @loop_proc[@current_pos]
+    @current_pos += 1
+    @current_proc = cmd
+
+    set_callback(sleep, cmd_args)
+  end
+
+  def initialize(*args, &b)
+    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
+
+    @init_sleep = 0
+    @init_proc = nil
+    @init_args = []
+
+    @current_script = []
+    @current_proc = nil
+    @current_args = nil
+    @return_value = nil
+
+    @sleep_time = 0
+    @current_sleep = 0
+    @loop_exec = 0
+    @do_loop = 0
+    @loop_proc = []
+    @proc_max = 0
+    @current_pos = 0
+
+    @after_id = nil
+    @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).
+
+    if b
+      case args.size
+      when 0
+        add_procs(b)
+      when 1
+        args << -1 << b
+      else
+        args << b
+      end
+    end
+
+    set_procs(*args) if args != []
+
+    @running = false
+    @in_callback = false
+  end
+
+  attr :after_id
+  attr :after_script
+  attr :current_proc
+  attr :current_args
+  attr :current_sleep
+  alias :current_interval :current_sleep
+  attr :return_value
+
+  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
+
+  def get_procs
+    [@init_sleep, @init_proc, @init_args, @sleep_time, @loop_exec, @loop_proc]
+  end
+
+  def current_status
+    [@running, @current_sleep, @current_proc, @current_args,
+      @do_loop, @cancel_on_exception]
+  end
+
+  def cancel_on_exception?
+    @cancel_on_exception
+  end
+
+  def cancel_on_exception=(mode)
+    if mode.kind_of?(Array)
+      @cancel_on_exception = mode
+    elsif mode
+      @cancel_on_exception = DEFAULT_IGNORE_EXCEPTIONS
+    else
+      @cancel_on_exception = false
+    end
+    #self
+  end
+
+  def running?
+    @running
+  end
+
+  def loop_rest
+    @do_loop
+  end
+
+  def loop_rest=(rest)
+    @do_loop = rest
+    #self
+  end
+
+  def set_interval(interval)
+    #if interval != 'idle' && interval != :idle \
+    #  && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
+    if interval != 'idle' && interval != :idle \
+      && !interval.kind_of?(Integer) && !TkComm._callback_entry?(interval)
+      fail ArgumentError, "expect Integer or Proc"
+    end
+    @sleep_time = interval
+  end
+
+  def set_procs(interval, loop_exec, *procs)
+    #if interval != 'idle' && interval != :idle \
+    #   && !interval.kind_of?(Integer) && !interval.kind_of?(Proc)
+    if interval != 'idle' && interval != :idle \
+      && !interval.kind_of?(Integer) && !TkComm._callback_entry?(interval)
+      fail ArgumentError, "expect Integer or Proc for 1st argument"
+    end
+    @sleep_time = interval
+
+    @loop_proc = []
+    procs.each{|e|
+      # if e.kind_of?(Proc)
+      if TkComm._callback_entry?(e)
+        @loop_proc.push([e])
+      else
+        @loop_proc.push(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+    @current_pos = 0
+
+    if loop_exec.kind_of?(Integer) && loop_exec < 0
+      @loop_exec = -1
+    elsif loop_exec == true
+      @loop_exec = -1
+    elsif loop_exec == nil || loop_exec == false || loop_exec == 0
+      @loop_exec = 0
+    else
+      if not loop_exec.kind_of?(Integer)
+        fail ArgumentError, "expect Integer for 2nd argument"
+      end
+      @loop_exec = loop_exec
+    end
+    @do_loop = @loop_exec
+
+    self
+  end
+
+  def add_procs(*procs)
+    procs.each{|e|
+      # if e.kind_of?(Proc)
+      if TkComm._callback_entry?(e)
+        @loop_proc.push([e])
+      else
+        @loop_proc.push(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+
+    self
+  end
+
+  def delete_procs(*procs)
+    procs.each{|e|
+      # if e.kind_of?(Proc)
+      if TkComm._callback_entry?(e)
+        @loop_proc.delete([e])
+      else
+        @loop_proc.delete(e)
+      end
+    }
+    @proc_max = @loop_proc.size
+
+    cancel if @proc_max == 0
+
+    self
+  end
+
+  def delete_at(n)
+    @loop_proc.delete_at(n)
+    @proc_max = @loop_proc.size
+    cancel if @proc_max == 0
+    self
+  end
+
+  def set_start_proc(sleep=nil, init_proc=nil, *init_args, &b)
+    # set parameters for 'restart'
+    sleep = @init_sleep unless sleep
+
+    if sleep != 'idle' && sleep != :idle && !sleep.kind_of?(Integer)
+      fail ArgumentError, "expect Integer or 'idle' for 1st argument"
+    end
+
+    @init_sleep = sleep
+    @init_proc = init_proc
+    @init_args = init_args
+
+    @init_proc = b if !@init_proc && b
+    @init_proc = proc{|*args| } if @init_sleep > 0 && !@init_proc
+
+    self
+  end
+
+  def start(*init_args, &b)
+    return nil if @running
+
+    Tk_CBTBL[@id] = self
+    @do_loop = @loop_exec
+    @current_pos = 0
+    @return_value = nil
+    @after_id = nil
+
+    @init_sleep = 0
+    @init_proc  = nil
+    @init_args  = nil
+
+    argc = init_args.size
+    if argc > 0
+      sleep = init_args.shift
+      if sleep != 'idle' && sleep != :idle && !sleep.kind_of?(Integer)
+        fail ArgumentError, "expect Integer or 'idle' for 1st argument"
+      end
+      @init_sleep = sleep
+    end
+    @init_proc = init_args.shift if argc > 1
+    @init_args = init_args if argc > 2
+
+    @init_proc = b if !@init_proc && b
+    @init_proc = proc{|*args| } if @init_sleep > 0 && !@init_proc
+
+    @current_sleep = @init_sleep
+    @running = true
+    if @init_proc
+      # if not @init_proc.kind_of?(Proc)
+      if !TkComm._callback_entry?(@init_proc)
+        fail ArgumentError, "Argument '#{@init_proc}' need to be Proc"
+      end
+      @current_proc = @init_proc
+      set_callback(@init_sleep, @init_args)
+      @set_next = false if @in_callback
+    else
+      set_next_callback(@init_args)
+    end
+
+    self
+  end
+
+  def reset(*reset_args)
+    restart() if @running
+
+    if @init_proc
+      @return_value = @init_proc.call(self)
+    else
+      @return_value = nil
+    end
+
+    @current_pos   = 0
+    @current_args  = @init_args
+    @current_script = []
+
+    @set_next = false if @in_callback
+
+    self
+  end
+
+  def restart(*restart_args, &b)
+    cancel if @running
+    if restart_args.empty? && !b
+      start(@init_sleep, @init_proc, *@init_args)
+    else
+      start(*restart_args, &b)
+    end
+  end
+
+  def cancel
+    @running = false
+    # @wait_var.value = 0
+    __at_end__
+    tk_call 'after', 'cancel', @after_id if @after_id
+    @after_id = nil
+
+    Tk_CBTBL.delete(@id) ;# for GC
+    self
+  end
+  alias stop cancel
+
+  def continue(wait=nil)
+    fail RuntimeError, "is already running" if @running
+    return restart() if @current_script.empty?
+    sleep, cmd = @current_script
+    fail RuntimeError, "no procedure to continue" unless cmd
+    if wait
+      unless wait.kind_of?(Integer)
+        fail ArgumentError, "expect Integer for 1st argument"
+      end
+      sleep = wait
+    end
+    Tk_CBTBL[@id] = self
+    @running = true
+    @after_id = tk_call_without_enc('after', sleep, cmd)
+    self
+  end
+
+  def skip
+    fail RuntimeError, "is not running now" unless @running
+    cancel
+    Tk_CBTBL[@id] = self
+    @running = true
+    set_next_callback(@current_args)
+    self
+  end
+
+  def info
+    if @after_id
+      inf = tk_split_list(tk_call_without_enc('after', 'info', @after_id))
+      [Tk_CBTBL[inf[0][1]], inf[1]]
+    else
+      nil
+    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"
+    end
+
+    unless @running
+      if @return_value.kind_of?(Exception)
+        fail @return_value
+      else
+        return @return_value
+      end
+    end
+
+    @wait_var.wait(on_thread, check_root)
+    if @return_value.kind_of?(Exception)
+      fail @return_value
+    else
+      @return_value
+    end
+  end
+  def eventloop_wait(check_root = false)
+    wait(false, check_root)
+  end
+  def thread_wait(check_root = false)
+    wait(true, check_root)
+  end
+  def tkwait(on_thread = true)
+    wait(on_thread, true)
+  end
+  def eventloop_tkwait
+    wait(false, true)
+  end
+  def thread_tkwait
+    wait(true, true)
+  end
+end
+
+TkAfter = TkTimer
+
+
+class TkRTTimer < TkTimer
+  DEFAULT_OFFSET_LIST_SIZE = 5
+
+  def initialize(*args, &b)
+    super(*args, &b)
+
+    @offset_list = Array.new(DEFAULT_OFFSET_LIST_SIZE){ [0, 0] }
+    @offset_s = 0
+    @offset_u = 0
+    @est_time = nil
+  end
+
+  def start(*args, &b)
+    return nil if @running
+    @est_time = nil
+    @cb_start_time = Time.now
+    super(*args, &b)
+  end
+
+  def cancel
+    super()
+    @est_time = nil
+    @cb_start_time = Time.now
+    self
+  end
+  alias stop cancel
+
+  def continue(wait=nil)
+    fail RuntimeError, "is already running" if @running
+    @cb_start_time = Time.now
+    super(wait)
+  end
+
+  def set_interval(interval)
+    super(interval)
+    @est_time = nil
+  end
+
+  def _offset_ave
+    size = 0
+    d_sec = 0; d_usec = 0
+    @offset_list.each_with_index{|offset, idx|
+      # weight = 1
+      weight = idx + 1
+      size += weight
+      d_sec += offset[0] * weight
+      d_usec += offset[1] * weight
+    }
+    offset_s, mod = d_sec.divmod(size)
+    offset_u = ((mod * 1000000 + d_usec) / size.to_f).round
+    [offset_s, offset_u]
+  end
+  private :_offset_ave
+
+  def set_next_callback(args)
+    if @running == false || @proc_max == 0 || @do_loop == 0
+      Tk_CBTBL.delete(@id) ;# for GC
+      @running = false
+      # @wait_var.value = 0
+      __at_end__
+      return
+    end
+    if @current_pos >= @proc_max
+      if @do_loop < 0 || (@do_loop -= 1) > 0
+        @current_pos = 0
+      else
+        Tk_CBTBL.delete(@id) ;# for GC
+        @running = false
+        # @wait_var.value = 0
+        __at_end__
+        return
+      end
+    end
+
+    @current_args = args
+
+    cmd, *cmd_args = @loop_proc[@current_pos]
+    @current_pos += 1
+    @current_proc = cmd
+
+    @offset_s, @offset_u = _offset_ave
+
+    if TkComm._callback_entry?(@sleep_time)
+      sleep = @sleep_time.call(self)
+    else
+      sleep = @sleep_time
+    end
+
+    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,
+                          @cb_start_time.usec + sleep*1000)
+    end
+
+    now = Time.now
+    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
+      @offset_s = now.to_i
+      @offset_u = now.usec
+    end
+    @current_sleep = real_sleep
+
+    set_callback(real_sleep, cmd_args)
+  end
+
+  def cb_call
+    if @est_time
+      @offset_list.shift
+
+      @cb_start_time = Time.now
+
+      if @current_sleep == 0
+        @offset_list.push([
+                            @offset_s - @cb_start_time.to_i,
+                            @offset_u - @cb_start_time.usec
+                          ])
+      else
+        @offset_list.push([
+                            @offset_s + (@est_time.to_i - @cb_start_time.to_i),
+                            @offset_u + (@est_time.usec - @cb_start_time.usec)
+                          ])
+      end
+    end
+
+    @cb_cmd.call
+  end
+end
diff --git a/ext/tk/lib/tk/toplevel.rb b/ext/tk/lib/tk/toplevel.rb
new file mode 100644
index 0000000000..30ef009517
--- /dev/null
+++ b/ext/tk/lib/tk/toplevel.rb
@@ -0,0 +1,264 @@
+#
+# tk/toplevel.rb : treat toplevel widget
+#
+require 'tk'
+require 'tk/wm'
+require 'tk/menuspec'
+
+class Tk::Toplevel<TkWindow
+  include Wm
+  include TkMenuSpec
+
+  TkCommandNames = ['toplevel'.freeze].freeze
+  WidgetClassName = 'Toplevel'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+################# old version
+#  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
+#    if screen.kind_of? Hash
+#      keys = screen.dup
+#    else
+#      @screen = screen
+#    end
+#    @classname = classname
+#    if keys.kind_of? Hash
+#      keys = keys.dup
+#      @classname = keys.delete('classname') if keys.key?('classname')
+#      @colormap  = keys.delete('colormap')  if keys.key?('colormap')
+#      @container = keys.delete('container') if keys.key?('container')
+#      @screen    = keys.delete('screen')    if keys.key?('screen')
+#      @use       = keys.delete('use')       if keys.key?('use')
+#      @visual    = keys.delete('visual')    if keys.key?('visual')
+#    end
+#    super(parent, keys)
+#  end
+#
+#  def create_self
+#    s = []
+#    s << "-class"     << @classname if @classname
+#    s << "-colormap"  << @colormap  if @colormap
+#    s << "-container" << @container if @container
+#    s << "-screen"    << @screen    if @screen
+#    s << "-use"       << @use       if @use
+#    s << "-visual"    << @visual    if @visual
+#    tk_call 'toplevel', @path, *s
+#  end
+#################
+
+  def __boolval_optkeys
+    super() << 'container'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'screen'
+  end
+  private :__strval_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    super().update('menu'=>proc{|v| window(v)})
+  end
+  private :__val2ruby_optkeys
+
+  def __methodcall_optkeys  # { key=>method, ... }
+    TOPLEVEL_METHODCALL_OPTKEYS
+  end
+  private :__methodcall_optkeys
+
+  def _wm_command_option_chk(keys)
+    keys = {} unless keys
+    new_keys = {}
+    wm_cmds = {}
+
+    conf_methods = _symbolkey2str(__methodcall_optkeys())
+
+    keys.each{|k,v| # k is a String
+      if conf_methods.key?(k)
+        wm_cmds[conf_methods[k]] = v
+      elsif Wm.method_defined?(k)
+        case k
+        when 'screen','class','colormap','container','use','visual'
+          new_keys[k] = v
+        else
+          case self.method(k).arity
+          when -1,1
+            wm_cmds[k] = v
+          else
+            new_keys[k] = v
+          end
+        end
+      else
+        new_keys[k] = v
+      end
+    }
+    [new_keys, wm_cmds]
+  end
+  private :_wm_command_option_chk
+
+  def initialize(parent=nil, screen=nil, classname=nil, keys=nil)
+    my_class_name = nil
+    if self.class < WidgetClassNames[WidgetClassName]
+      my_class_name = self.class.name
+      my_class_name = nil if my_class_name == ''
+    end
+    if parent.kind_of? Hash
+      keys = _symbolkey2str(parent)
+      if keys.key?('classname')
+        keys['class'] = keys.delete('classname')
+      end
+      @classname = keys['class']
+      @colormap  = keys['colormap']
+      @container = keys['container']
+      @screen    = keys['screen']
+      @use       = keys['use']
+      @visual    = keys['visual']
+      if !@classname && my_class_name
+        keys['class'] = @classname = my_class_name
+      end
+      if @classname.kind_of? TkBindTag
+        @db_class = @classname
+        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|
+        if v.kind_of? Array
+          self.__send__(k,*v)
+        else
+          self.__send__(k,v)
+        end
+      }
+      return
+    end
+
+    if screen.kind_of? Hash
+      keys = screen
+    else
+      @screen = screen
+      if classname.kind_of? Hash
+        keys = classname
+      else
+        @classname = classname
+      end
+    end
+    if keys.kind_of? Hash
+      keys = _symbolkey2str(keys)
+      if keys.key?('classname')
+        keys['class'] = keys.delete('classname')
+      end
+      @classname = keys['class']  unless @classname
+      @colormap  = keys['colormap']
+      @container = keys['container']
+      @screen    = keys['screen'] unless @screen
+      @use       = keys['use']
+      @visual    = keys['visual']
+    else
+      keys = {}
+    end
+    if !@classname && my_class_name
+      keys['class'] = @classname = my_class_name
+    end
+    if @classname.kind_of? TkBindTag
+      @db_class = @classname
+      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|
+      if v.kind_of? Array
+        self.send(k,*v)
+      else
+        self.send(k,v)
+      end
+    }
+  end
+
+  #def create_self(keys)
+  #  if keys and keys != None
+  #    tk_call_without_enc('toplevel', @path, *hash_kv(keys, true))
+  #  else
+  #    tk_call_without_enc('toplevel', @path)
+  #  end
+  #end
+  #private :create_self
+
+  def specific_class
+    @classname
+  end
+
+  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.
+    if tearoff.kind_of?(Hash)
+      opts = tearoff
+      tearoff = false
+    end
+    _create_menubutton(self, menu_info, tearoff, opts)
+  end
+
+  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.
+    menu_spec.each{|info| add_menu(info, tearoff, opts)}
+    self.menu
+  end
+
+  def self.database_class
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      self
+    else
+      TkDatabaseClass.new(self.name)
+    end
+  end
+  def self.database_classname
+    self.database_class.name
+  end
+
+  def self.bind(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind(*args, &b)
+    end
+  end
+  def self.bind_append(*args, &b)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args, &b)
+    else
+      TkDatabaseClass.new(self.name).bind_append(*args, &b)
+    end
+  end
+  def self.bind_remove(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bind_remove(*args)
+    end
+  end
+  def self.bindinfo(*args)
+    if self == WidgetClassNames[WidgetClassName] || self.name == ''
+      super(*args)
+    else
+      TkDatabaseClass.new(self.name).bindinfo(*args)
+    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..cc9e9928cb
--- /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/txtwin_abst.rb b/ext/tk/lib/tk/txtwin_abst.rb
new file mode 100644
index 0000000000..540f806d17
--- /dev/null
+++ b/ext/tk/lib/tk/txtwin_abst.rb
@@ -0,0 +1,39 @@
+#
+# tk/txtwin_abst.rb : TkTextWin abstruct class
+#
+require 'tk'
+
+class TkTextWin<TkWindow
+  TkCommandNames = [].freeze
+  #def create_self
+  #  fail RuntimeError, "TkTextWin is an abstract class"
+  #end
+  #private :create_self
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', index))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+  def insert(index, *args)
+    tk_send('insert', index, *args)
+    self
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+end
diff --git a/ext/tk/lib/tk/validation.rb b/ext/tk/lib/tk/validation.rb
new file mode 100644
index 0000000000..0ebd5c51b7
--- /dev/null
+++ b/ext/tk/lib/tk/validation.rb
@@ -0,0 +1,397 @@
+#
+#  tk/validation.rb - validation support module for entry, spinbox, and so on
+#
+require 'tk'
+
+module Tk
+  module ValidateConfigure
+    def self.__def_validcmd(scope, klass, keys=nil)
+      keys = klass._config_keys unless keys
+      keys.each{|key|
+        eval("def #{key}(*args, &b)
+                 __validcmd_call(#{klass.name}, '#{key}', *args, &b)
+              end", scope)
+      }
+    end
+
+    def __validcmd_call(klass, key, *args, &b)
+      return cget(key) if args.empty? && !b
+
+      cmd = (b)? proc(&b) : args.shift
+
+      if cmd.kind_of?(klass)
+        configure(key, cmd)
+      elsif !args.empty?
+        configure(key, [cmd, args])
+      else
+        configure(key, cmd)
+      end
+    end
+
+    def __validation_class_list
+      # maybe need to override
+      []
+    end
+
+    def __get_validate_key2class
+      k2c = {}
+      __validation_class_list.each{|klass|
+        klass._config_keys.each{|key|
+          k2c[key.to_s] = klass
+        }
+      }
+      k2c
+    end
+
+    def __conv_vcmd_on_hash_kv(keys)
+      key2class = __get_validate_key2class
+
+      keys = _symbolkey2str(keys)
+      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)
+        # elsif keys[key].kind_of?(Proc) ||  keys[key].kind_of?(Method)
+        elsif TkComm._callback_entry?(keys[key])
+          keys[key] = klass.new(keys[key])
+        end
+      }
+      keys
+    end
+
+    def create_self(keys)
+      super(__conv_vcmd_on_hash_kv(keys))
+    end
+    private :create_self
+
+    def configure(slot, value=TkComm::None)
+      if slot.kind_of?(Hash)
+        super(__conv_vcmd_on_hash_kv(slot))
+      else
+        super(__conv_vcmd_on_hash_kv(slot=>value))
+      end
+      self
+    end
+=begin
+    def configure(slot, value=TkComm::None)
+      key2class = __get_validate_key2class
+
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        key2class.each{|key, klass|
+          if slot[key].kind_of?(Array)
+            cmd, *args = slot[key]
+            slot[key] = klass.new(cmd, args.join(' '))
+          elsif slot[key].kind_of?(Proc) || slot[key].kind_of?(Method)
+            slot[key] = klass.new(slot[key])
+          end
+        }
+        super(slot)
+
+      else
+        slot = slot.to_s
+        if (klass = key2class[slot])
+          if value.kind_of?(Array)
+            cmd, *args = value
+            value = klass.new(cmd, args.join(' '))
+          elsif value.kind_of?(Proc) || value.kind_of?(Method)
+            value = klass.new(value)
+          end
+        end
+        super(slot, value)
+      end
+
+      self
+    end
+=end
+  end
+
+  module ItemValidateConfigure
+    def self.__def_validcmd(scope, klass, keys=nil)
+      keys = klass._config_keys unless keys
+      keys.each{|key|
+        eval("def item_#{key}(id, *args, &b)
+                 __item_validcmd_call(#{klass.name}, '#{key}', id, *args, &b)
+              end", scope)
+      }
+    end
+
+    def __item_validcmd_call(tagOrId, klass, key, *args, &b)
+      return itemcget(tagid(tagOrId), key) if args.empty? && !b
+
+      cmd = (b)? proc(&b) : args.shift
+
+      if cmd.kind_of?(klass)
+        itemconfigure(tagid(tagOrId), key, cmd)
+      elsif !args.empty?
+        itemconfigure(tagid(tagOrId), key, [cmd, args])
+      else
+        itemconfigure(tagid(tagOrId), key, cmd)
+      end
+    end
+
+    def __item_validation_class_list(id)
+      # maybe need to override
+      []
+    end
+
+    def __get_item_validate_key2class(id)
+      k2c = {}
+      __item_validation_class_list(id).each{|klass|
+        klass._config_keys.each{|key|
+          k2c[key.to_s] = klass
+        }
+      }
+    end
+
+    def __conv_item_vcmd_on_hash_kv(keys)
+      key2class = __get_item_validate_key2class(tagid(tagOrId))
+
+      keys = _symbolkey2str(keys)
+      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)
+        # elsif keys[key].kind_of?(Proc) || keys[key].kind_of?(Method)
+        elsif TkComm._callback_entry?(keys[key])
+          keys[key] = klass.new(keys[key])
+        end
+      }
+      keys
+    end
+
+    def itemconfigure(tagOrId, slot, value=TkComm::None)
+      if slot.kind_of?(Hash)
+        super(__conv_item_vcmd_on_hash_kv(slot))
+      else
+        super(__conv_item_vcmd_on_hash_kv(slot=>value))
+      end
+      self
+    end
+=begin
+    def itemconfigure(tagOrId, slot, value=TkComm::None)
+      key2class = __get_item_validate_key2class(tagid(tagOrId))
+
+      if slot.kind_of?(Hash)
+        slot = _symbolkey2str(slot)
+        key2class.each{|key, klass|
+          if slot[key].kind_of?(Array)
+            cmd, *args = slot[key]
+            slot[key] = klass.new(cmd, args.join(' '))
+          elsif slot[key].kind_of?(Proc) ||  slot[key].kind_of?(Method)
+            slot[key] = klass.new(slot[key])
+          end
+        }
+        super(slot)
+
+      else
+        slot = slot.to_s
+        if (klass = key2class[slot])
+          if value.kind_of?(Array)
+            cmd, *args = value
+            value = klass.new(cmd, args.join(' '))
+          elsif value.kind_of?(Proc) || value.kind_of?(Method)
+            value = klass.new(value)
+          end
+        end
+        super(slot, value)
+      end
+
+      self
+    end
+=end
+  end
+end
+
+class TkValidateCommand
+  include TkComm
+  extend  TkComm
+
+  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 ],
+      nil
+    ]
+
+    PROC_TBL = [
+      [ ?n, TkComm.method(:number) ],
+      [ ?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
+        }
+      ],
+
+      [ ?x, proc{|val|
+          idx = TkComm::number(val)
+          if idx < 0
+            nil
+          else
+            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
+    #        <extra_arg>, <extra_arg>, ... , <subst_arg>, <subst_arg>, ...
+    #
+
+    #def self._get_extra_args_tbl
+    #  # return an array of convert procs
+    #  []
+    #end
+
+    def self.ret_val(val)
+      (val)? '1': '0'
+    end
+  end
+
+  ###############################################
+
+  def self._config_keys
+    # array of config-option key (string or symbol)
+    ['vcmd', 'validatecommand', 'invcmd', 'invalidcommand']
+  end
+
+  def _initialize_for_cb_class(klass, cmd = Proc.new, *args)
+    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)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        @id = install_cmd(cmd)
+      else
+        @id = install_cmd(proc{|*arg|
+             ex_args = []
+             extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+             klass.ret_val(cmd.call(
+               *(ex_args.concat(klass.scan_args(keys, arg)))
+             ))
+        }) + ' ' + args
+      end
+    else
+      keys, args = klass._get_all_subst_keys
+      if cmd.kind_of?(String)
+        id = cmd
+      elsif cmd.kind_of?(TkCallbackEntry)
+        @id = install_cmd(cmd)
+      else
+        @id = install_cmd(proc{|*arg|
+             ex_args = []
+             extra_args_tbl.reverse_each{|conv| ex_args << conv.call(arg.pop)}
+             klass.ret_val(cmd.call(
+               *(ex_args << klass.new(*klass.scan_args(keys, arg)))
+             ))
+        }) + ' ' + args
+      end
+    end
+  end
+
+  def initialize(cmd = Proc.new, *args)
+    _initialize_for_cb_class(self.class::ValidateArgs, cmd, *args)
+  end
+
+  def to_eval
+    @id
+  end
+end
+
+module TkValidation
+  include Tk::ValidateConfigure
+
+  class ValidateCmd < TkValidateCommand
+    module Action
+      Insert = 1
+      Delete = 0
+      Others = -1
+      Focus  = -1
+      Forced = -1
+      Textvariable = -1
+      TextVariable = -1
+    end
+  end
+
+  #####################################
+
+  def __validation_class_list
+    super() << ValidateCmd
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, ValidateCmd)
+
+=begin
+  def validatecommand(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('validatecommand', cmd)
+    elsif args
+      configure('validatecommand', [cmd, args])
+    else
+      configure('validatecommand', cmd)
+    end
+  end
+=end
+#  def validatecommand(*args, &b)
+#    __validcmd_call(ValidateCmd, 'validatecommand', *args, &b)
+#  end
+#  alias vcmd validatecommand
+
+=begin
+  def invalidcommand(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('invalidcommand', cmd)
+    elsif args
+      configure('invalidcommand', [cmd, args])
+    else
+      configure('invalidcommand', cmd)
+    end
+  end
+=end
+#  def invalidcommand(*args, &b)
+#    __validcmd_call(ValidateCmd, 'invalidcommand', *args, &b)
+#  end
+#  alias invcmd invalidcommand
+end
diff --git a/ext/tk/lib/tk/variable.rb b/ext/tk/lib/tk/variable.rb
new file mode 100644
index 0000000000..0487b034bd
--- /dev/null
+++ b/ext/tk/lib/tk/variable.rb
@@ -0,0 +1,1799 @@
+#
+# tk/variable.rb : treat Tk variable object
+#
+require 'tk'
+
+class TkVariable
+  include Tk
+  extend TkCore
+
+  include Comparable
+
+  #TkCommandNames = ['tkwait'.freeze].freeze
+  TkCommandNames = ['vwait'.freeze].freeze
+
+  #TkVar_CB_TBL = {}
+  #TkVar_ID_TBL = {}
+  TkVar_CB_TBL = TkCore::INTERP.create_table
+  TkVar_ID_TBL = TkCore::INTERP.create_table
+  (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')
+    if {[set st [catch {eval {ruby_cmd TkVariable callback} $args} ret]] != 0} {
+       set idx [string first "\n\n" $ret]
+       if {$idx > 0} {
+          global errorInfo
+          set tcl_backtrace $errorInfo
+          set errorInfo [string range $ret [expr $idx + 2] \
+                                           [string length $ret]]
+          append errorInfo "\n" $tcl_backtrace
+          bgerror [string range $ret 0 [expr $idx - 1]]
+       } else {
+          bgerror $ret
+       }
+       return ""
+       #return -code $st $ret
+    } else {
+        return $ret
+    }
+  EOL
+
+  #def TkVariable.callback(args)
+  def TkVariable.callback(id, name1, name2, op)
+    #name1,name2,op = tk_split_list(args)
+    #name1,name2,op = tk_split_simplelist(args)
+    if cb_obj = TkVar_CB_TBL[id]
+      #_get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
+      begin
+        _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")) +
+                "\n---< backtrace of Tk side >-------"
+          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") +
+                "\n---< backtrace of Tk side >-------"
+        end
+        fail(e, msg)
+      end
+=begin
+      begin
+        raise 'check backtrace'
+      rescue
+        # ignore backtrace before 'callback'
+        pos = -($!.backtrace.size)
+      end
+      begin
+        _get_eval_string(TkVar_CB_TBL[name1].trace_callback(name2,op))
+      rescue
+        trace = $!.backtrace
+        raise $!, "\n#{trace[0]}: #{$!.message} (#{$!.class})\n" +
+                  "\tfrom #{trace[1..pos].join("\n\tfrom ")}"
+      end
+=end
+    else
+      ''
+    end
+  end
+
+  def self.new_hash(val = {})
+    if val.kind_of?(Hash)
+      self.new(val)
+    else
+      fail ArgumentError, 'Hash is expected'
+    end
+  end
+
+  #
+  # default_value is available only when the variable is an assoc array.
+  #
+  def default_value(val=nil, &b)
+    if b
+      @def_default = :proc
+      @default_val = proc(&b)
+    else
+      @def_default = :val
+      @default_val = val
+    end
+    self
+  end
+  def set_default_value(val)
+    @def_default = :val
+    @default_val = val
+    self
+  end
+  alias default_value= set_default_value
+  def default_proc(cmd = Proc.new)
+    @def_default = :proc
+    @default_val = cmd
+    self
+  end
+
+  def undef_default
+    @default_val = nil
+    @def_default = false
+    self
+  end
+
+  def default_value_type
+    @type
+  end
+  def default_element_value_type(idxs)
+    if idxs.kind_of?(Array)
+      index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    else
+      index = _get_eval_string(idxs, true)
+    end
+    @element_type[index]
+  end
+
+  def _set_default_value_type_core(type, idxs)
+    if type.kind_of?(Class)
+      if type == NilClass
+        type = nil
+      elsif type == Numeric
+        type = :numeric
+      elsif type == TrueClass || type == FalseClass
+        type = :bool
+      elsif type == String
+        type = :string
+      elsif type == Symbol
+        type = :symbol
+      elsif type == Array
+        type = :list
+      elsif type <= TkVariable
+        type = :variable
+      elsif type <= TkWindow
+        type = :window
+      elsif TkComm._callback_entry_class?(type)
+        type = :procedure
+      else
+        type = nil
+      end
+    else
+      case(type)
+      when nil
+        type = nil
+      when :numeric, 'numeric'
+        type = :numeric
+      when true, false, :bool, 'bool'
+        type = :bool
+      when :string, 'string'
+        type = :string
+      when :symbol, 'symbol'
+        type = :symbol
+      when :list, 'list'
+        type = :list
+      when :numlist, 'numlist'
+        type = :numlist
+      when :variable, 'variable'
+        type = :variable
+      when :window, 'window'
+        type = :window
+      when :procedure, 'procedure'
+        type = :procedure
+      else
+        return _set_default_value_type_core(type.class, idxs)
+      end
+    end
+    if idxs
+      if idxs.kind_of?(Array)
+        index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      else
+        index = _get_eval_string(idxs, true)
+      end
+      @element_type[index] = type
+    else
+      @type = type
+    end
+    type
+  end
+  private :_set_default_value_type_core
+
+  def set_default_value_type(type)
+    _set_default_value_type_core(type, nil)
+    self
+  end
+  alias default_value_type= set_default_value_type
+
+  def set_default_element_value_type(idxs, type)
+    _set_default_value_type_core(type, idxs)
+    self
+  end
+
+  def _to_default_type(val, idxs = nil)
+    if idxs
+      if idxs.kind_of?(Array)
+        index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      else
+        index = _get_eval_string(idxs, true)
+      end
+      type = @element_type[index]
+    else
+      type = @type
+    end
+    return val unless type
+    if val.kind_of?(Hash)
+      val.keys.each{|k| val[k] = _to_default_type(val[k], idxs) }
+      val
+    else
+      begin
+        case(type)
+        when :numeric
+          number(val)
+        when :bool
+          TkComm.bool(val)
+        when :string
+          val
+        when :symbol
+          val.intern
+        when :list
+          tk_split_simplelist(val)
+        when :numlist
+          tk_split_simplelist(val).collect!{|v| number(v)}
+        when :variable
+          TkVarAccess.new(val)
+        when :window
+          TkComm.window(val)
+        when :procedure
+          TkComm.procedure(val)
+        else
+          val
+        end
+      rescue
+        val
+      end
+    end
+  end
+  private :_to_default_type
+
+  def _to_default_element_type(idxs, val)
+    _to_default_type(val, idxs)
+  end
+  private :_to_default_element_type
+
+  def initialize(val="", type=nil)
+    # @id = Tk_VARIABLE_ID.join('')
+    begin
+      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.mutex.synchronize{
+      TkVar_ID_TBL[@id] = self
+    }
+
+    @var  = @id
+    @elem = nil
+
+    @def_default = false
+    @default_val = nil
+
+    @trace_var  = nil
+    @trace_elem = nil
+    @trace_opts = nil
+
+    @type = nil
+    var = self
+    @element_type = Hash.new{|k,v| var.default_value_type }
+
+    self.default_value_type = type
+
+    # teach Tk-ip that @id is global var
+    INTERP._invoke_without_enc('global', @id)
+    #INTERP._invoke('global', @id)
+
+    # create and init
+    if val.kind_of?(Hash)
+      # assoc-array variable
+      self[''] = 0
+      self.clear
+    end
+    self.value = val
+
+=begin
+    if val == []
+      # INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)',
+      #                     @id, @id, @id))
+    elsif val.kind_of?(Array)
+      a = []
+      # val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
+      # s = '"' + a.join(" ").gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      val.each_with_index{|e,i| a.push(i); a.push(e)}
+      #s = '"' + array2tk_list(a).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + array2tk_list(a).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
+    elsif  val.kind_of?(Hash)
+      #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+      #             .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+                   .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; array set %s %s', @id, @id, s))
+    else
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(format('global %s; set %s %s', @id, @id, s))
+    end
+=end
+=begin
+    if  val.kind_of?(Hash)
+      #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+      #             .gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+                   .gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; array set %s %s', @id, @id, s))
+    else
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+    end
+=end
+  end
+
+  def wait(on_thread = false, check_root = false)
+    if $SAFE >= 4
+      fail SecurityError, "can't wait variable at $SAFE >= 4"
+    end
+    on_thread &= (Thread.list.size != 1)
+    if on_thread
+      if check_root
+        INTERP._thread_tkwait('variable', @id)
+      else
+        INTERP._thread_vwait(@id)
+      end
+    else
+      if check_root
+        INTERP._invoke_without_enc('tkwait', 'variable', @id)
+      else
+        INTERP._invoke_without_enc('vwait', @id)
+      end
+    end
+  end
+  def eventloop_wait(check_root = false)
+    wait(false, check_root)
+  end
+  def thread_wait(check_root = false)
+    wait(true, check_root)
+  end
+  def tkwait(on_thread = true)
+    wait(on_thread, true)
+  end
+  def eventloop_tkwait
+    wait(false, true)
+  end
+  def thread_tkwait
+    wait(true, true)
+  end
+
+  def id
+    @id
+  end
+
+  def ref(*idxs)
+    # "#{@id}(#{idxs.collect{|idx| _get_eval_string(idx)}.join(',')})"
+    TkVarAccess.new("#{@id}(#{idxs.collect{|idx| _get_eval_string(idx)}.join(',')})")
+  end
+
+  def is_hash?
+    #ITNERP._eval("global #{@id}; array exist #{@id}") == '1'
+    INTERP._invoke_without_enc('global', @id)
+    # INTERP._invoke_without_enc('array', 'exist', @id) == '1'
+    TkComm.bool(INTERP._invoke_without_enc('array', 'exist', @id))
+  end
+
+  def is_scalar?
+    ! is_hash?
+  end
+
+  def exist?(*elems)
+    INTERP._invoke_without_enc('global', @id)
+    if elems.empty?
+      TkComm.bool(tk_call('info', 'exist', @id))
+    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}(#{index})"))
+    end
+  end
+
+  def keys
+    if (is_scalar?)
+      fail RuntimeError, 'cannot get keys from a scalar variable'
+    end
+    #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),
+                        false, true)
+  end
+
+  def size
+    INTERP._invoke_without_enc('global', @id)
+    TkComm.number(INTERP._invoke_without_enc('array', 'size', @id))
+  end
+
+  def clear
+    if (is_scalar?)
+      fail RuntimeError, 'cannot clear a scalar variable'
+    end
+    keys.each{|k| unset(k)}
+    self
+  end
+
+  def update(hash)
+    if (is_scalar?)
+      fail RuntimeError, 'cannot update a scalar variable'
+    end
+    hash.each{|k,v| self[k] = v}
+    self
+  end
+
+unless const_defined?(:USE_TCLs_SET_VARIABLE_FUNCTIONS)
+  USE_TCLs_SET_VARIABLE_FUNCTIONS = true
+end
+
+if USE_TCLs_SET_VARIABLE_FUNCTIONS
+  ###########################################################################
+  # use Tcl function version of set tkvariable
+  ###########################################################################
+
+  def _value
+    #if INTERP._eval("global #{@id}; array exist #{@id}") == '1'
+    INTERP._invoke_without_enc('global', @id)
+    # if INTERP._invoke('array', 'exist', @id) == '1'
+    if TkComm.bool(INTERP._invoke('array', 'exist', @id))
+      #Hash[*tk_split_simplelist(INTERP._eval("global #{@id}; array get #{@id}"))]
+      Hash[*tk_split_simplelist(INTERP._invoke('array', 'get', @id))]
+    else
+      _fromUTF8(INTERP._get_global_var(@id))
+    end
+  end
+
+  def value=(val)
+    val = val._value if !@type && @type != :variable && val.kind_of?(TkVariable)
+    if val.kind_of?(Hash)
+      self.clear
+      val.each{|k, v|
+        #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),
+                                _get_eval_string(v, true))
+      }
+      self.value
+#    elsif val.kind_of?(Array)
+=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   |
+                             TclTkLib::VarAccessFlag::LEAVE_ERR_MSG |
+                             TclTkLib::VarAccessFlag::APPEND_VALUE  |
+                             TclTkLib::VarAccessFlag::LIST_ELEMENT)
+      }
+      self.value
+=end
+#      _fromUTF8(INTERP._set_global_var(@id, array2tk_list(val, true)))
+    else
+      #_fromUTF8(INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val))))
+      _fromUTF8(INTERP._set_global_var(@id, _get_eval_string(val, true)))
+    end
+  end
+
+  def _element_value(*idxs)
+    index = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    begin
+      _fromUTF8(INTERP._get_global_var2(@id, index))
+    rescue => e
+      case @def_default
+      when :proc
+        @default_val.call(self, *idxs)
+      when :val
+        @default_val
+      else
+        fail e
+      end
+    end
+    #_fromUTF8(INTERP._get_global_var2(@id, index))
+    #_fromUTF8(INTERP._get_global_var2(@id, _toUTF8(_get_eval_string(index))))
+    #_fromUTF8(INTERP._get_global_var2(@id, _get_eval_string(index, true)))
+  end
+
+  def []=(*args)
+    val = args.pop
+    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, 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)),
+    #                                 _toUTF8(_get_eval_string(val))))
+    #_fromUTF8(INTERP._set_global_var2(@id, _get_eval_string(index, true),
+    #                                 _get_eval_string(val, true)))
+  end
+
+  def unset(*elems)
+    if elems.empty?
+      INTERP._unset_global_var(@id)
+    else
+      index = elems.collect{|idx| _get_eval_string(idx, true)}.join(',')
+      INTERP._unset_global_var2(@id, index)
+    end
+  end
+  alias remove unset
+
+else
+  ###########################################################################
+  # use Ruby script version of set tkvariable (traditional methods)
+  ###########################################################################
+
+  def _value
+    begin
+      INTERP._eval(Kernel.format('global %s; set %s', @id, @id))
+      #INTERP._eval(Kernel.format('set %s', @id))
+      #INTERP._invoke_without_enc('set', @id)
+    rescue
+      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"
+        fail
+      else
+        Hash[*tk_split_simplelist(INTERP._eval(Kernel.format('global %s; array get %s', @id, @id)))]
+        #Hash[*tk_split_simplelist(_fromUTF8(INTERP._invoke_without_enc('array', 'get', @id)))]
+      end
+    end
+  end
+
+  def value=(val)
+    val = val._value if !@type && @type != :variable && val.kind_of?(TkVariable)
+    begin
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"'
+      s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"'
+      INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+      #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',
+                            @id, @id)) != "1"
+      #if INTERP._eval(Kernel.format('array exists %s', @id)) != "1"
+      #if INTERP._invoke_without_enc('array', 'exists', @id) != "1"
+        fail
+      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)',
+          #                          @id, @id, @id))
+          #INTERP._invoke_without_enc('unset', @id)
+          #INTERP._invoke_without_enc('set', @id+'(0)', 0)
+          #INTERP._invoke_without_enc('unset', @id+'(0)')
+        elsif val.kind_of?(Array)
+          a = []
+          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',
+                                     @id, @id, @id, 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)))
+        elsif  val.kind_of?(Hash)
+          #s = '"' + val.to_a.collect{|e| array2tk_list(e)}.join(" ")\
+          #                      .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',
+                                     @id, @id, @id, 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)))
+        else
+          fail
+        end
+      end
+    end
+  end
+
+  def _element_value(*idxs)
+    index = idxs.collect{|idx| _get_eval_string(idx)}.join(',')
+    begin
+      INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
+    rescue => e
+      case @def_default
+      when :proc
+        @default_val.call(self, *idxs)
+      when :val
+        @default_val
+      else
+        fail e
+      end
+    end
+    #INTERP._eval(Kernel.format('global %s; set %s(%s)', @id, @id, index))
+    #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) + ')')
+  end
+
+  def []=(*args)
+    val = args.pop
+    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,
+                              index, _get_eval_string(val)))
+    #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,
+    #                          _get_eval_string(index), _get_eval_string(val)))
+    #INTERP._eval('set ' + @id + '(' + _get_eval_string(index) + ') ' +
+    #            _get_eval_string(val))
+  end
+
+  def unset(*elems)
+    if elems.empty?
+      INTERP._eval(Kernel.format('global %s; unset %s', @id, @id))
+      #INTERP._eval(Kernel.format('unset %s', @id))
+      #INTERP._eval('unset ' + @id)
+    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)',
+      #                           @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) + ')')
+    end
+  end
+  alias remove unset
+
+end
+
+  protected :_value, :_element_value
+
+  def value
+    _to_default_type(_value)
+  end
+
+  def [](*idxs)
+    _to_default_element_type(idxs, _element_value(*idxs))
+  end
+
+  def set_value(val)
+    self.value = val
+    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
+    else
+      self[idxs]=val
+    end
+    self
+  end
+
+  def set_value_type(val)
+    self.default_value_type = val.class
+    self.value = val
+    self
+  end
+
+  alias value_type= set_value_type
+
+  def set_element_value_type(idxs, val)
+    self.set_default_element_value_type(idxs, val.class)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+
+  def numeric
+    number(_value)
+  end
+  def numeric_element(*idxs)
+    number(_element_value(*idxs))
+  end
+  def set_numeric(val)
+    case val
+    when Numeric
+      self.value=(val)
+    when TkVariable
+      self.value=(val.numeric)
+    else
+      raise ArgumentError, "Numeric is expected"
+    end
+    self
+  end
+  alias numeric= set_numeric
+  def set_numeric_element(idxs, val)
+    case val
+    when Numeric
+      val
+    when TkVariable
+      val = val.numeric
+    else
+      raise ArgumentError, "Numeric is expected"
+    end
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_numeric_type(val)
+    @type = :numeric
+    self.numeric=(val)
+    self
+  end
+  alias numeric_type= set_numeric_type
+  def set_numeric_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :numeric)
+    self.set_numeric_element(idxs, val)
+  end
+
+  def bool
+    TkComm.bool(_value)
+=begin
+    # see Tcl_GetBoolean man-page
+    case _value.downcase
+    when '0', 'false', 'no', 'off'
+      false
+    else
+      true
+    end
+=end
+  end
+  def bool_element(*idxs)
+    TkComm.bool(_element_value(*idxs))
+  end
+  def set_bool(val)
+    if ! val
+      self.value = '0'
+    else
+      case val.to_s.downcase
+      when 'false', '0', 'no', 'off'
+        self.value = '0'
+      else
+        self.value = '1'
+      end
+    end
+    self
+  end
+  alias bool= set_bool
+  def set_bool_element(idxs, val)
+    if ! val
+      val = '0'
+    else
+      case val.to_s.downcase
+      when 'false', '0', 'no', 'off'
+        val = '0'
+      else
+        val = '1'
+      end
+    end
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_bool_type(val)
+    @type = :bool
+    self.bool=(val)
+    self
+  end
+  alias bool_type= set_bool_type
+  def set_bool_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :bool)
+    self.set_bool_element(idxs, val)
+  end
+
+  def variable
+    # keeps a Tcl's variable name
+    TkVarAccess.new(self._value)
+  end
+  def variable_element(*idxs)
+    TkVarAccess.new(_element_value(*idxs))
+  end
+  def set_variable(var)
+    var = var.id if var.kind_of?(TkVariable)
+    self.value = var
+    self
+  end
+  alias variable= set_variable
+  def set_variable_element(idxs, var)
+    var = var.id if var.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=var
+    else
+      self[idxs]=var
+    end
+    self
+  end
+  def set_variable_type(var)
+    @type = :variable
+    var = var.id if var.kind_of?(TkVariable)
+    self.value = var
+    self
+  end
+  alias variable_type= set_variable_type
+  def set_variable_element_type(idxs, var)
+    self.set_default_element_value_type(idxs, :variable)
+    self.set_variable_element(idxs, var)
+  end
+
+  def window
+    TkComm.window(self._value)
+  end
+  def window_element(*idxs)
+    TkComm.window(_element_value(*idxs))
+  end
+  def set_window(win)
+    win = win._value if win.kind_of?(TkVariable)
+    self.value = win
+    self
+  end
+  alias window= set_window
+  def set_window_element(idxs, win)
+    win = win._value if win.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=win
+    else
+      self[idxs]=win
+    end
+    self
+  end
+  def set_window_type(win)
+    @type = :window
+    self.window=(win)
+    self
+  end
+  alias window_type= set_window_type
+  def set_window_element_type(idxs, win)
+    self.set_default_element_value_type(idxs, :window)
+    self.set_window_element(idxs, win)
+  end
+
+  def procedure
+    TkComm.procedure(self._value)
+  end
+  def procedure_element(*idxs)
+    TkComm.procedure(_element_value(*idxs))
+  end
+  def set_procedure(cmd)
+    self.value = cmd
+    self
+  end
+  alias procedure= set_procedure
+  def set_procedure_element(idxs, cmd)
+    cmd = cmd._value if cmd.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=cmd
+    else
+      self[idxs]=cmd
+    end
+    self
+  end
+  def set_procedure_type(cmd)
+    @type = :procedure
+    self.procedure=(cmd)
+    self
+  end
+  alias procedure_type= set_procedure_type
+  def set_procedure_element_type(idxs, cmd)
+    self.set_default_element_value_type(idxs, :procedure)
+    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
+
+  def to_f
+    number(_value).to_f
+  end
+  def element_to_f(*idxs)
+    number(_element_value(*idxs)).to_f
+  end
+
+  def to_s
+    #string(value).to_s
+    _value
+  end
+  alias string to_s
+  alias to_str to_s
+  def element_to_s(*idxs)
+    _element_value(*idxs)
+  end
+  def string_element(*idxs)
+    _element_value(*idxs)
+  end
+  def set_string(val)
+    val = val._value if val.kind_of?(TkVariable)
+    self.value=val
+    self
+  end
+  alias string= set_string
+  def set_string_element(idxs, val)
+    val = val._value if val.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_string_type(val)
+    @type = :string
+    self.string=(val)
+    self
+  end
+  alias string_type= set_string_type
+  def set_string_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :string)
+    self.set_string_element(idxs, val)
+  end
+
+  def to_sym
+    _value.intern
+  end
+  alias symbol to_sym
+  def element_to_sym(*idxs)
+    _element_value(*idxs).intern
+  end
+  alias symbol_element element_to_sym
+  def set_symbol(val)
+    val = val._value if val.kind_of?(TkVariable)
+    self.value=val
+    self
+  end
+  alias symbol= set_symbol
+  def set_symbol_element(idxs, val)
+    val = val._value if val.kind_of?(TkVariable)
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  def set_symbol_type(val)
+    @type = :symbol
+    self.value=(val)
+    self
+  end
+  alias symbol_type= set_symbol_type
+  def set_symbol_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :symbol)
+    self.set_symbol_element(idxs, val)
+  end
+
+  def list
+    #tk_split_list(value)
+    tk_split_simplelist(_value)
+  end
+  alias to_a list
+  alias to_ary list
+  def list_element(*idxs)
+    tk_split_simplelist(_element_value(*idxs))
+  end
+  alias element_to_a list_element
+
+  def numlist
+    list.collect!{|val| number(val)}
+  end
+  def numlist_element(*idxs)
+    list_element(*idxs).collect!{|val| number(val)}
+  end
+
+  def set_list(val)
+    case val
+    when Array
+      self.value=(val)
+    when TkVariable
+      self.value=(val.list)
+    else
+      raise ArgumentError, "Array is expected"
+    end
+    self
+  end
+  alias list= set_list
+
+  alias set_numlist set_list
+  alias numlist= set_numlist
+
+  def set_list_element(idxs, val)
+    case val
+    when Array
+      val
+    when TkVariable
+      val = val.list
+    else
+      raise ArgumentError, "Array is expected"
+    end
+    if idxs.kind_of?(Array)
+      self[*idxs]=val
+    else
+      self[idxs]=val
+    end
+    self
+  end
+  alias set_numlist_element set_list_element
+
+  def set_list_type(val)
+    @type = :list
+    self.list=(val)
+    self
+  end
+  alias list_type= set_list_type
+  def set_list_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :list)
+    self.set_list_element(idxs, val)
+  end
+  def set_numlist_type(val)
+    @type = :numlist
+    self.numlist=(val)
+    self
+  end
+  alias numlist_type= set_numlist_type
+  def set_numlist_element_type(idxs, val)
+    self.set_default_element_value_type(idxs, :numlist)
+    self.set_numlist_element(idxs, val)
+  end
+
+  def lappend(*elems)
+    tk_call('lappend', @id, *elems)
+    self
+  end
+  def element_lappend(idxs, *elems)
+    if idxs.kind_of?(Array)
+      idxs = idxs.collect{|idx| _get_eval_string(idx, true)}.join(',')
+    end
+    tk_call('lappend', "#{@id}(#{idxs})", *elems)
+    self
+  end
+
+  def lindex(idx)
+    tk_call('lindex', self._value, idx)
+  end
+  alias lget lindex
+  def element_lindex(elem_idxs, idx)
+    if elem_idxs.kind_of?(Array)
+      val = _element_value(*elem_idxs)
+    else
+      val = _element_value(elem_idxs)
+    end
+    tk_call('lindex', val, idx)
+  end
+  alias element_lget element_lindex
+
+  def lget_i(idx)
+    number(lget(idx)).to_i
+  end
+  def element_lget_i(elem_idxs, idx)
+    number(element_lget(elem_idxs, idx)).to_i
+  end
+
+  def lget_f(idx)
+    number(lget(idx)).to_f
+  end
+  def element_lget_f(elem_idxs, idx)
+    number(element_lget(elem_idxs, idx)).to_f
+  end
+
+  def lset(idx, val)
+    tk_call('lset', @id, idx, val)
+    self
+  end
+  def element_lset(elem_idxs, idx, val)
+    if elem_idxs.kind_of?(Array)
+      idxs = elem_idxs.collect{|i| _get_eval_string(i, true)}.join(',')
+    end
+    tk_call('lset', "#{@id}(#{idxs})", idx, val)
+    self
+  end
+
+  def inspect
+    #Kernel.format "#<TkVariable: %s>", @id
+    '#<TkVariable: ' + @id + '>'
+  end
+
+  def coerce(other)
+    case other
+    when TkVariable
+      [other._value, self._value]
+    when String
+      [other, self.to_s]
+    when Symbol
+      [other, self.to_sym]
+    when Numeric
+      [other, self.numeric]
+    when Array
+      [other, self.to_a]
+    else
+      [other, self._value]
+    end
+  end
+
+  def +@
+    self.numeric
+  end
+  def -@
+    -(self.numeric)
+  end
+
+  def &(other)
+    if other.kind_of?(Array)
+      self.to_a & other.to_a
+    else
+      self.to_i & other.to_i
+    end
+  end
+  def |(other)
+    if other.kind_of?(Array)
+      self.to_a | other.to_a
+    else
+      self.to_i | other.to_i
+    end
+  end
+  def +(other)
+    case other
+    when Array
+      self.to_a + other
+    when String
+      self._value + other
+    else
+      begin
+        number(self._value) + other
+      rescue
+        self._value + other.to_s
+      end
+    end
+  end
+  def -(other)
+    if other.kind_of?(Array)
+      self.to_a - other
+    else
+      number(self._value) - other
+    end
+  end
+  def *(other)
+    num_or_str(self._value) * other
+    #begin
+    #  number(self._value) * other
+    #rescue
+    #  self._value * other
+    #end
+  end
+  def /(other)
+    number(self._value) / other
+  end
+  def %(other)
+    num_or_str(self._value) % other
+    #begin
+    #  number(self._value) % other
+    #rescue
+    #  self._value % other
+    #end
+  end
+  def **(other)
+    number(self._value) ** other
+  end
+  def =~(other)
+    self._value =~ other
+  end
+
+  def ==(other)
+    case other
+    when TkVariable
+      #self.equal?(other)
+      self._value == other._value
+    when String
+      self.to_s == other
+    when Symbol
+      self.to_sym == other
+    when Integer
+      self.to_i == other
+    when Float
+      self.to_f == other
+    when Array
+      self.to_a == other
+    when Hash
+      # false if self is not an assoc array
+      self._value == other
+    else
+      # false
+      self._value == _get_eval_string(other)
+    end
+  end
+
+  def ===(other)
+    if other.kind_of?(TkVariable)
+      self.id == other.id
+    else
+      super
+    end
+  end
+
+  def zero?
+    numeric.zero?
+  end
+  def nonzero?
+    !(numeric.zero?)
+  end
+
+  def <=>(other)
+    if other.kind_of?(TkVariable)
+      begin
+        val = other.numeric
+        other = val
+      rescue
+        other = other._value
+      end
+    elsif other.kind_of?(Numeric)
+      begin
+        return self.numeric <=> other
+      rescue
+        return self._value <=> other.to_s
+      end
+    elsif other.kind_of?(Array)
+      return self.list <=> other
+    else
+      return self._value <=> other
+    end
+  end
+
+  def to_eval
+    @id
+  end
+
+  def trace_callback(elem, op)
+    if @trace_var.kind_of? Array
+      @trace_var.each{|m,e| e.call(self,elem,op) if m.index(op)}
+    end
+    if elem.kind_of?(String) && elem != ''
+      if @trace_elem.kind_of?(Hash) && @trace_elem[elem].kind_of?(Array)
+        @trace_elem[elem].each{|m,e| e.call(self,elem,op) if m.index(op)}
+      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)
+    opts = _check_trace_opt(opts)
+    (@trace_var ||= []).unshift([opts,cmd])
+
+    if @trace_opts == nil
+      TkVar_CB_TBL[@id] = self
+      @trace_opts = opts.dup
+      if USE_OLD_TRACE_OPTION_STYLE
+        Tk.tk_call_without_enc('trace', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
+      else
+        Tk.tk_call_without_enc('trace', 'add', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
+      end
+    else
+      newopts = @trace_opts.dup
+      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', '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', 'add', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
+        end
+      end
+    end
+
+    self
+  end
+
+  def trace_element(elem, opts, cmd = Proc.new)
+    if @elem
+      fail(RuntimeError,
+           "invalid for a TkVariable which denotes an element of Tcl's array")
+    end
+
+    opts = _check_trace_opt(opts)
+
+    ((@trace_elem ||= {})[elem] ||= []).unshift([opts,cmd])
+
+    if @trace_opts == nil
+      TkVar_CB_TBL[@id] = self
+      @trace_opts = opts.dup
+      if USE_OLD_TRACE_OPTION_STYLE
+        Tk.tk_call_without_enc('trace', 'add', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
+      else
+        Tk.tk_call_without_enc('trace', 'variable',
+                               @id, @trace_opts, 'rb_var ' << @id)
+      end
+    else
+      newopts = @trace_opts.dup
+      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', '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', 'add', 'variable',
+                                 @id, @trace_opts, 'rb_var ' << @id)
+        end
+      end
+    end
+
+    self
+  end
+
+  def trace_info
+    return [] unless @trace_var
+    @trace_var.dup
+  end
+  alias trace_vinfo trace_info
+
+  def trace_info_for_element(elem)
+    if @elem
+      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_remove(opts,cmd)
+    return self unless @trace_var.kind_of? Array
+
+    opts = _check_trace_opt(opts)
+
+    idx = -1
+    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)
+    else
+      return self
+    end
+
+    (@trace_elem ||= {}).each{|elem|
+      @trace_elem[elem].each{|e|
+        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
+      }
+    }
+
+    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
+    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
+
+    self
+  end
+  alias trace_delete  trace_remove
+  alias trace_vdelete trace_remove
+
+  def trace_remove_for_element(elem,opts,cmd)
+    if @elem
+      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 = _check_trace_opt(opts)
+
+    idx = -1
+    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
+
+    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
+
+    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
+    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
+
+    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
+    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
+    }
+
+    v.instance_eval{ initialize(name, *args) }
+    v
+  end
+
+  def self.new_hash(name, *args)
+    if name.kind_of?(TkVariable)
+      unless name.is_hash?
+        fail ArgumentError, "already exist as a scalar variable"
+      end
+      name.value = args[0] unless args.empty?
+      return name
+    end
+
+    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
+    }
+
+    INTERP._invoke_without_enc('global', name)
+    if args.empty? && INTERP._invoke_without_enc('array', 'exist', name) == '0'
+      v.instance_eval{ initialize(name, {}) }  # force creating
+    else
+      v.instance_eval{ initialize(name, *args) }
+    end
+    v
+  end
+
+  def initialize(varname, val=nil)
+    # @id = varname
+    # TkVar_ID_TBL[@id] = self
+
+    # @var  = @id
+    @elem = nil
+
+    @def_default = false
+    @default_val = nil
+
+    @trace_var  = nil
+    @trace_elem = nil
+    @trace_opts = nil
+
+    @type = nil
+    var = self
+    @element_type = Hash.new{|k,v| var.default_value_type }
+
+    # is an element?
+    if @id =~ /^([^(]+)\((.+)\)$/
+      # is an element --> var == $1, elem == $2
+      @var  = $1
+      @elem = $2
+    end
+
+    # teach Tk-ip that @id is global var
+    INTERP._invoke_without_enc('global', @var)
+=begin
+    begin
+      INTERP._invoke_without_enc('global', @id)
+    rescue => e
+      if @id =~ /^(.+)\([^()]+\)$/
+        # is an element --> varname == $1
+        INTERP._invoke_without_enc('global', $1)
+      else
+        fail e
+      end
+    end
+=end
+
+    if val
+      if val.kind_of?(Hash)
+        # assoc-array variable
+        self[''] = 0
+        self.clear
+      end
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"]/, '\\\\\&') + '"' #"
+      #s = '"' + _get_eval_string(val).gsub(/[\[\]$"\\]/, '\\\\\&') + '"' #"
+      #INTERP._eval(Kernel.format('global %s; set %s %s', @id, @id, s))
+      #INTERP._set_global_var(@id, _toUTF8(_get_eval_string(val)))
+      self.value = val
+    end
+  end
+end
+
+module Tk
+  begin
+    INTERP._invoke_without_enc('global', 'auto_path')
+    auto_path = INTERP._invoke('set', 'auto_path')
+  rescue => e
+    begin
+      INTERP._invoke_without_enc('global', 'env')
+      auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
+    rescue => e
+      auto_path = Tk::LIBRARY
+    end
+  end
+
+  AUTO_PATH = TkVarAccess.new('auto_path', auto_path)
+
+=begin
+  AUTO_OLDPATH = tk_split_simplelist(INTERP._invoke('set', 'auto_oldpath'))
+  AUTO_OLDPATH.each{|s| s.freeze}
+  AUTO_OLDPATH.freeze
+=end
+
+  TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath')
+  PACKAGE_PATH = TCL_PACKAGE_PATH
+
+  TCL_LIBRARY_PATH = TkVarAccess.new('tcl_libPath')
+  LIBRARY_PATH = TCL_LIBRARY_PATH
+
+  TCL_PRECISION = TkVarAccess.new('tcl_precision')
+end
diff --git a/ext/tk/lib/tk/virtevent.rb b/ext/tk/lib/tk/virtevent.rb
new file mode 100644
index 0000000000..c11e9692e7
--- /dev/null
+++ b/ext/tk/lib/tk/virtevent.rb
@@ -0,0 +1,139 @@
+#
+#   tk/virtevent.rb : treats virtual events
+#                     1998/07/16 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+require 'tk'
+
+class TkVirtualEvent<TkObject
+  extend Tk
+
+  TkCommandNames = ['event'.freeze].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.mutex.synchronize{ TkVirtualEventTBL.clear }
+  }
+
+  class PreDefVirtEvent<self
+    def self.new(event, *sequences)
+      if event =~ /^<(<.*>)>$/
+        event = $1
+      elsif event !~ /^<.*>$/
+        event = '<' + event + '>'
+      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
+      _add_sequences(sequences)
+    end
+  end
+
+  def TkVirtualEvent.getobj(event)
+    obj = nil
+    TkVirtualEventTBL.mutex.synchronize{
+      obj = TkVirtualEventTBL[event]
+    }
+    if obj
+      obj
+    else
+      if tk_call_without_enc('event', 'info').index("<#{event}>")
+        PreDefVirtEvent.new(event)
+      else
+        fail ArgumentError, "undefined virtual event '<#{event}>'"
+      end
+    end
+  end
+
+  def TkVirtualEvent.info
+    tk_call_without_enc('event', 'info').split(/\s+/).collect!{|seq|
+      TkVirtualEvent.getobj(seq[1..-2])
+    }
+  end
+
+  def initialize(*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(seq_ary)
+    unless seq_ary.empty?
+      tk_call_without_enc('event', 'add', "<#{@id}>",
+                          *(seq_ary.collect{|seq|
+                              "<#{tk_event_sequence(seq)}>"
+                            }) )
+    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.empty?
+      tk_call_without_enc('event', 'delete', "<#{@id}>")
+      TkVirtualEventTBL.mutex.synchronize{
+        TkVirtualEventTBL.delete(@id)
+      }
+    else
+      tk_call_without_enc('event', 'delete', "<#{@id}>",
+                          *(sequences.collect{|seq|
+                              "<#{tk_event_sequence(seq)}>"
+                            }) )
+      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|
+      lst = seq.scan(/<*[^<>]+>*/).collect!{|subseq|
+        case (subseq)
+        when /^<<[^<>]+>>$/
+          TkVirtualEvent.getobj(subseq[1..-2])
+        when /^<[^<>]+>$/
+          subseq[1..-2]
+        else
+          subseq.split('')
+        end
+      }.flatten
+      (lst.size == 1) ? lst[0] : lst
+    }
+  end
+end
+
+TkNamedVirtualEvent = TkVirtualEvent::PreDefVirtEvent
diff --git a/ext/tk/lib/tk/winfo.rb b/ext/tk/lib/tk/winfo.rb
new file mode 100644
index 0000000000..b10cfe6760
--- /dev/null
+++ b/ext/tk/lib/tk/winfo.rb
@@ -0,0 +1,392 @@
+#
+# tk/winfo.rb : methods for winfo command
+#
+module TkWinfo
+end
+
+require 'tk'
+
+module TkWinfo
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['winfo'.freeze].freeze
+
+  def TkWinfo.atom(name, win=nil)
+    if 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)))
+    end
+  end
+  def winfo_atom(name)
+    TkWinfo.atom(name, self)
+  end
+
+  def TkWinfo.atomname(id, win=nil)
+    if win
+      _fromUTF8(tk_call_without_enc('winfo', 'atomname',
+                                    '-displayof', win, id))
+    else
+      _fromUTF8(tk_call_without_enc('winfo', 'atomname', id))
+    end
+  end
+  def winfo_atomname(id)
+    TkWinfo.atomname(id, self)
+  end
+
+  def TkWinfo.cells(win)
+    number(tk_call_without_enc('winfo', 'cells', win))
+  end
+  def winfo_cells
+    TkWinfo.cells self
+  end
+
+  def TkWinfo.children(win)
+    list(tk_call_without_enc('winfo', 'children', win))
+  end
+  def winfo_children
+    TkWinfo.children self
+  end
+
+  def TkWinfo.classname(win)
+    tk_call_without_enc('winfo', 'class', win)
+  end
+  def winfo_classname
+    TkWinfo.classname self
+  end
+  alias winfo_class winfo_classname
+
+  def TkWinfo.colormapfull(win)
+     bool(tk_call_without_enc('winfo', 'colormapfull', win))
+  end
+  def winfo_colormapfull
+    TkWinfo.colormapfull self
+  end
+
+  def TkWinfo.containing(rootX, rootY, win=nil)
+    if win
+      window(tk_call_without_enc('winfo', 'containing',
+                                 '-displayof', win, rootX, rootY))
+    else
+      window(tk_call_without_enc('winfo', 'containing', rootX, rootY))
+    end
+  end
+  def winfo_containing(x, y)
+    TkWinfo.containing(x, y, self)
+  end
+
+  def TkWinfo.depth(win)
+    number(tk_call_without_enc('winfo', 'depth', win))
+  end
+  def winfo_depth
+    TkWinfo.depth self
+  end
+
+  def TkWinfo.exist?(win)
+    bool(tk_call_without_enc('winfo', 'exists', win))
+  end
+  def winfo_exist?
+    TkWinfo.exist? self
+  end
+
+  def TkWinfo.fpixels(win, dist)
+    number(tk_call_without_enc('winfo', 'fpixels', win, dist))
+  end
+  def winfo_fpixels(dist)
+    TkWinfo.fpixels self, dist
+  end
+
+  def TkWinfo.geometry(win)
+    tk_call_without_enc('winfo', 'geometry', win)
+  end
+  def winfo_geometry
+    TkWinfo.geometry self
+  end
+
+  def TkWinfo.height(win)
+    number(tk_call_without_enc('winfo', 'height', win))
+  end
+  def winfo_height
+    TkWinfo.height self
+  end
+
+  def TkWinfo.id(win)
+    tk_call_without_enc('winfo', 'id', win)
+  end
+  def winfo_id
+    TkWinfo.id self
+  end
+
+  def TkWinfo.interps(win=nil)
+    if win
+      #tk_split_simplelist(tk_call_without_enc('winfo', 'interps',
+      #                                        '-displayof', win))
+      tk_split_simplelist(tk_call_without_enc('winfo', 'interps',
+                                              '-displayof', win),
+                          false, true)
+    else
+      #tk_split_simplelist(tk_call_without_enc('winfo', 'interps'))
+      tk_split_simplelist(tk_call_without_enc('winfo', 'interps'),
+                          false, true)
+    end
+  end
+  def winfo_interps
+    TkWinfo.interps self
+  end
+
+  def TkWinfo.mapped?(win)
+    bool(tk_call_without_enc('winfo', 'ismapped', win))
+  end
+  def winfo_mapped?
+    TkWinfo.mapped? self
+  end
+
+  def TkWinfo.manager(win)
+    tk_call_without_enc('winfo', 'manager', win)
+  end
+  def winfo_manager
+    TkWinfo.manager self
+  end
+
+  def TkWinfo.appname(win)
+    tk_call('winfo', 'name', win)
+  end
+  def winfo_appname
+    TkWinfo.appname self
+  end
+
+  def TkWinfo.parent(win)
+    window(tk_call_without_enc('winfo', 'parent', win))
+  end
+  def winfo_parent
+    TkWinfo.parent self
+  end
+
+  def TkWinfo.widget(id, win=nil)
+    if win
+      window(tk_call_without_enc('winfo', 'pathname', '-displayof', win, id))
+    else
+      window(tk_call_without_enc('winfo', 'pathname', id))
+    end
+  end
+  def winfo_widget(id)
+    TkWinfo.widget id, self
+  end
+
+  def TkWinfo.pixels(win, dist)
+    number(tk_call_without_enc('winfo', 'pixels', win, dist))
+  end
+  def winfo_pixels(dist)
+    TkWinfo.pixels self, dist
+  end
+
+  def TkWinfo.reqheight(win)
+    number(tk_call_without_enc('winfo', 'reqheight', win))
+  end
+  def winfo_reqheight
+    TkWinfo.reqheight self
+  end
+
+  def TkWinfo.reqwidth(win)
+    number(tk_call_without_enc('winfo', 'reqwidth', win))
+  end
+  def winfo_reqwidth
+    TkWinfo.reqwidth self
+  end
+
+  def TkWinfo.rgb(win, color)
+    list(tk_call_without_enc('winfo', 'rgb', win, color))
+  end
+  def winfo_rgb(color)
+    TkWinfo.rgb self, color
+  end
+
+  def TkWinfo.rootx(win)
+    number(tk_call_without_enc('winfo', 'rootx', win))
+  end
+  def winfo_rootx
+    TkWinfo.rootx self
+  end
+
+  def TkWinfo.rooty(win)
+    number(tk_call_without_enc('winfo', 'rooty', win))
+  end
+  def winfo_rooty
+    TkWinfo.rooty self
+  end
+
+  def TkWinfo.screen(win)
+    tk_call('winfo', 'screen', win)
+  end
+  def winfo_screen
+    TkWinfo.screen self
+  end
+
+  def TkWinfo.screencells(win)
+    number(tk_call_without_enc('winfo', 'screencells', win))
+  end
+  def winfo_screencells
+    TkWinfo.screencells self
+  end
+
+  def TkWinfo.screendepth(win)
+    number(tk_call_without_enc('winfo', 'screendepth', win))
+  end
+  def winfo_screendepth
+    TkWinfo.screendepth self
+  end
+
+  def TkWinfo.screenheight (win)
+    number(tk_call_without_enc('winfo', 'screenheight', win))
+  end
+  def winfo_screenheight
+    TkWinfo.screenheight self
+  end
+
+  def TkWinfo.screenmmheight(win)
+    number(tk_call_without_enc('winfo', 'screenmmheight', win))
+  end
+  def winfo_screenmmheight
+    TkWinfo.screenmmheight self
+  end
+
+  def TkWinfo.screenmmwidth(win)
+    number(tk_call_without_enc('winfo', 'screenmmwidth', win))
+  end
+  def winfo_screenmmwidth
+    TkWinfo.screenmmwidth self
+  end
+
+  def TkWinfo.screenvisual(win)
+    tk_call_without_enc('winfo', 'screenvisual', win)
+  end
+  def winfo_screenvisual
+    TkWinfo.screenvisual self
+  end
+
+  def TkWinfo.screenwidth(win)
+    number(tk_call_without_enc('winfo', 'screenwidth', win))
+  end
+  def winfo_screenwidth
+    TkWinfo.screenwidth self
+  end
+
+  def TkWinfo.server(win)
+    tk_call('winfo', 'server', win)
+  end
+  def winfo_server
+    TkWinfo.server self
+  end
+
+  def TkWinfo.toplevel(win)
+    window(tk_call_without_enc('winfo', 'toplevel', win))
+  end
+  def winfo_toplevel
+    TkWinfo.toplevel self
+  end
+
+  def TkWinfo.visual(win)
+    tk_call_without_enc('winfo', 'visual', win)
+  end
+  def winfo_visual
+    TkWinfo.visual self
+  end
+
+  def TkWinfo.visualid(win)
+    tk_call_without_enc('winfo', 'visualid', win)
+  end
+  def winfo_visualid
+    TkWinfo.visualid self
+  end
+
+  def TkWinfo.visualsavailable(win, includeids=false)
+    if includeids
+      list(tk_call_without_enc('winfo', 'visualsavailable',
+                               win, "includeids"))
+    else
+      list(tk_call_without_enc('winfo', 'visualsavailable', win))
+    end
+  end
+  def winfo_visualsavailable(includeids=false)
+    TkWinfo.visualsavailable self, includeids
+  end
+
+  def TkWinfo.vrootheight(win)
+    number(tk_call_without_enc('winfo', 'vrootheight', win))
+  end
+  def winfo_vrootheight
+    TkWinfo.vrootheight self
+  end
+
+  def TkWinfo.vrootwidth(win)
+    number(tk_call_without_enc('winfo', 'vrootwidth', win))
+  end
+  def winfo_vrootwidth
+    TkWinfo.vrootwidth self
+  end
+
+  def TkWinfo.vrootx(win)
+    number(tk_call_without_enc('winfo', 'vrootx', win))
+  end
+  def winfo_vrootx
+    TkWinfo.vrootx self
+  end
+
+  def TkWinfo.vrooty(win)
+    number(tk_call_without_enc('winfo', 'vrooty', win))
+  end
+  def winfo_vrooty
+    TkWinfo.vrooty self
+  end
+
+  def TkWinfo.width(win)
+    number(tk_call_without_enc('winfo', 'width', win))
+  end
+  def winfo_width
+    TkWinfo.width self
+  end
+
+  def TkWinfo.x(win)
+    number(tk_call_without_enc('winfo', 'x', win))
+  end
+  def winfo_x
+    TkWinfo.x self
+  end
+
+  def TkWinfo.y(win)
+    number(tk_call_without_enc('winfo', 'y', win))
+  end
+  def winfo_y
+    TkWinfo.y self
+  end
+
+  def TkWinfo.viewable(win)
+    bool(tk_call_without_enc('winfo', 'viewable', win))
+  end
+  def winfo_viewable
+    TkWinfo.viewable self
+  end
+
+  def TkWinfo.pointerx(win)
+    number(tk_call_without_enc('winfo', 'pointerx', win))
+  end
+  def winfo_pointerx
+    TkWinfo.pointerx self
+  end
+
+  def TkWinfo.pointery(win)
+    number(tk_call_without_enc('winfo', 'pointery', win))
+  end
+  def winfo_pointery
+    TkWinfo.pointery self
+  end
+
+  def TkWinfo.pointerxy(win)
+    list(tk_call_without_enc('winfo', 'pointerxy', win))
+  end
+  def winfo_pointerxy
+    TkWinfo.pointerxy self
+  end
+end
diff --git a/ext/tk/lib/tk/winpkg.rb b/ext/tk/lib/tk/winpkg.rb
new file mode 100644
index 0000000000..80e0439ace
--- /dev/null
+++ b/ext/tk/lib/tk/winpkg.rb
@@ -0,0 +1,156 @@
+#
+#   tk/winpkg.rb : methods for Tcl/Tk packages for Microsoft Windows
+#                     2000/11/22 by Hidetoshi Nagai <nagai@ai.kyutech.ac.jp>
+#
+#     ATTENTION !!
+#         This is NOT TESTED. Because I have no test-environment.
+#
+require 'tk'
+
+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 Tk::WinDDE
+
+  TkCommandNames = ['dde'.freeze].freeze
+
+  PACKAGE_NAME = 'dde'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  if self.const_defined? :FORCE_VERSION
+    tk_call_without_enc('package', 'require', 'dde', FORCE_VERSION)
+  else
+    tk_call_without_enc('package', 'require', 'dde')
+  end
+
+  #def servername(topic=None)
+  #  tk_call('dde', 'servername', topic)
+  #end
+  def servername(*args)
+    if args.size == 0
+      tk_call('dde', 'servername')
+    else
+      if args[-1].kind_of?(Hash)  # dde 1.2 +
+        keys = _symbolkey2str(args.pop)
+        force = (keys.delete('force'))? '-force': None
+        exact = (keys.delete('exact'))? '-exact': None
+        if keys.size == 0
+          tk_call('dde', 'servername', force, exact)
+        elsif args.size == 0
+          tk_call('dde', 'servername', force, exact, *hash_kv(keys))
+        else
+          tk_call('dde', 'servername', force, exact,
+                  *((hash_kv(keys) << '--') + args))
+        end
+      else
+        tk_call('dde', 'servername', *args)
+      end
+    end
+  end
+
+  def execute(service, topic, data)
+    tk_call('dde', 'execute', service, topic, data)
+  end
+
+  def async_execute(service, topic, data)
+    tk_call('dde', '-async', 'execute', service, topic, data)
+  end
+
+  def poke(service, topic, item, data)
+    tk_call('dde', 'poke', service, topic, item, data)
+  end
+
+  def request(service, topic, item)
+    tk_call('dde', 'request', service, topic, item)
+  end
+
+  def binary_request(service, topic, item)
+    tk_call('dde', 'request', '-binary', service, topic, item)
+  end
+
+  def services(service, topic)
+    tk_call('dde', 'services', service, topic)
+  end
+
+  def eval(topic, cmd, *args)
+    tk_call('dde', 'eval', topic, cmd, *args)
+  end
+
+  def async_eval(topic, cmd, *args)
+    tk_call('dde', 'eval', -async, topic, cmd, *args)
+  end
+
+  module_function :servername, :execute, :async_execute,
+                  :poke, :request, :services, :eval
+end
+
+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 Tk::WinRegistry
+
+  TkCommandNames = ['registry'.freeze].freeze
+
+  if self.const_defined? :FORCE_VERSION
+    tk_call('package', 'require', 'registry', FORCE_VERSION)
+  else
+    tk_call('package', 'require', 'registry')
+  end
+
+  def broadcast(keynam, timeout=nil)
+    if timeout
+      tk_call('registry', 'broadcast', keynam, '-timeout', timeout)
+    else
+      tk_call('registry', 'broadcast', keynam)
+    end
+  end
+
+  def delete(keynam, valnam=None)
+    tk_call('registry', 'delete', keynam, valnam)
+  end
+
+  def get(keynam, valnam)
+    tk_call('registry', 'get', keynam, valnam)
+  end
+
+  def keys(keynam, pattern=nil)
+    lst = tk_split_simplelist(tk_call('registry', 'keys', keynam))
+    if pattern
+      lst.find_all{|key| key =~ pattern}
+    else
+      lst
+    end
+  end
+
+  def set(keynam, valnam=None, data=None, dattype=None)
+    tk_call('registry', 'set', keynam, valnam, data, dattype)
+  end
+
+  def type(keynam, valnam)
+    tk_call('registry', 'type', keynam, valnam)
+  end
+
+  def values(keynam, pattern=nil)
+    lst = tk_split_simplelist(tk_call('registry', 'values', keynam))
+    if pattern
+      lst.find_all{|val| val =~ pattern}
+    else
+      lst
+    end
+  end
+
+  module_function :delete, :get, :keys, :set, :type, :values
+end
diff --git a/ext/tk/lib/tk/wm.rb b/ext/tk/lib/tk/wm.rb
new file mode 100644
index 0000000000..fcd5a2cbd2
--- /dev/null
+++ b/ext/tk/lib/tk/wm.rb
@@ -0,0 +1,552 @@
+#
+# tk/wm.rb : methods for wm command
+#
+require 'tk'
+
+module Tk
+  module Wm
+    #include TkComm
+    extend TkCore
+
+    TkCommandNames = ['wm'.freeze].freeze
+
+    TOPLEVEL_METHODCALL_OPTKEYS = {}
+
+    def Wm.aspect(win, *args)
+      if args.length == 0
+        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', win.epath, *args)
+        win
+      end
+    end
+    def aspect(*args)
+      Wm.aspect(self, *args)
+    end
+    alias wm_aspect aspect
+    TOPLEVEL_METHODCALL_OPTKEYS['aspect'] = 'aspect'
+
+    def Wm.attributes(win, slot=nil,value=TkComm::None)
+      if slot == nil
+        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', win.epath, *hash_kv(slot))
+        win
+      elsif value == TkComm::None
+        tk_call('wm', 'attributes', win.epath, "-#{slot}")
+      else
+        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 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', 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 Wm.colormapwindows(win, *args)
+      if args.size == 0
+        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', 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(win, value=nil)
+      if value
+        tk_call('wm', 'command', win.epath, value)
+        win
+      else
+        #procedure(tk_call('wm', 'command', win.epath))
+        tk_call('wm', 'command', win.epath)
+      end
+    end
+    def wm_command(value=nil)
+      Wm.command(self, value)
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['wm_command'] = 'wm_command'
+
+    def Wm.deiconify(win, ex = true)
+      if ex
+        tk_call_without_enc('wm', 'deiconify', win.epath)
+      else
+        Wm.iconify(win)
+      end
+      win
+    end
+    def deiconify(ex = true)
+      Wm.deiconify(self, ex)
+    end
+    alias wm_deiconify deiconify
+
+    def Wm.focusmodel(win, mode = nil)
+      if mode
+        tk_call_without_enc('wm', 'focusmodel', win.epath, mode)
+        win
+      else
+        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
+      Wm.frame(self)
+    end
+    alias wm_frame frame
+
+    def Wm.geometry(win, geom=nil)
+      if geom
+        tk_call_without_enc('wm', 'geometry', win.epath, geom)
+        win
+      else
+        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(win, *args)
+      if args.size == 0
+        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', win.epath, *args)
+        win
+      end
+    end
+    def wm_grid(*args)
+      Wm.grid(self, *args)
+    end
+    TOPLEVEL_METHODCALL_OPTKEYS['wm_grid'] = 'wm_grid'
+
+    def Wm.group(win, leader = nil)
+      if leader
+        tk_call('wm', 'group', win.epath, leader)
+        win
+      else
+        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 Wm.iconbitmap(win, bmp=nil)
+      if bmp
+        tk_call_without_enc('wm', 'iconbitmap', win.epath, bmp)
+        win
+      else
+        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 Wm.iconphoto(win, *imgs)
+      if imgs.empty?
+        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', 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 Wm.iconphoto_default(win, *imgs)
+      imgs = imgs[0] if imgs.length == 1 && imgs[0].kind_of?(Array)
+      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 Wm.iconify(win, ex = true)
+      if ex
+        tk_call_without_enc('wm', 'iconify', win.epath)
+      else
+        Wm.deiconify(win)
+      end
+      win
+    end
+    def iconify(ex = true)
+      Wm.iconify(self, ex)
+    end
+    alias wm_iconify iconify
+
+    def Wm.iconmask(win, bmp=nil)
+      if bmp
+        tk_call_without_enc('wm', 'iconmask', win.epath, bmp)
+        win
+      else
+        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 Wm.iconname(win, name=nil)
+      if name
+        tk_call('wm', 'iconname', win.epath, name)
+        win
+      else
+        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 Wm.iconposition(win, *args)
+      if args.size == 0
+        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', win.epath, *args)
+        win
+      end
+    end
+    def iconposition(*args)
+      Wm.iconposition(self, *args)
+    end
+    alias wm_iconposition iconposition
+    TOPLEVEL_METHODCALL_OPTKEYS['iconposition'] = 'iconposition'
+
+    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', 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 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', win.epath))
+      else
+        args = args[0] if args.length == 1 && args[0].kind_of?(Array)
+        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 Wm.minsize(win, *args)
+      if args.size == 0
+        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', win.path, *args)
+        win
+      end
+    end
+    def minsize(*args)
+      Wm.minsize(self, *args)
+    end
+    alias wm_minsize minsize
+    TOPLEVEL_METHODCALL_OPTKEYS['minsize'] = 'minsize'
+
+    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', 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 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', 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 Wm.protocol(win, name=nil, cmd=nil, &b)
+      if cmd
+        tk_call_without_enc('wm', 'protocol', win.epath, name, cmd)
+        win
+      elsif b
+        tk_call_without_enc('wm', 'protocol', win.epath, name, proc(&b))
+        win
+      elsif 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', win.epath))
+      end
+    end
+    def protocol(name=nil, cmd=nil, &b)
+      Wm.protocol(self, name, cmd, &b)
+    end
+    alias wm_protocol protocol
+
+    def Wm.protocols(win, kv=nil)
+      unless kv
+        ret = {}
+        Wm.protocol(win).each{|name|
+          ret[name] = Wm.protocol(win, name)
+        }
+        return ret
+      end
+
+      unless kv.kind_of?(Hash)
+        fail ArgumentError, 'expect a hash of protocol=>command'
+      end
+      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 Wm.resizable(win, *args)
+      if args.length == 0
+        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', win.epath, *args)
+        win
+      end
+    end
+    def resizable(*args)
+      Wm.resizable(self, *args)
+    end
+    alias wm_resizable resizable
+    TOPLEVEL_METHODCALL_OPTKEYS['resizable'] = 'resizable'
+
+    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', 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
+      Wm.stackorder(self)
+    end
+    alias wm_stackorder stackorder
+
+    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 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 Wm.state(win, st=nil)
+      if st
+        tk_call_without_enc('wm', 'state', win.epath, st)
+        win
+      else
+        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 Wm.title(win, str=nil)
+      if str
+        tk_call('wm', 'title', win.epath, str)
+        win
+      else
+        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 Wm.transient(win, master=nil)
+      if master
+        tk_call_without_enc('wm', 'transient', win.epath, master)
+        win
+      else
+        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 Wm.withdraw(win, ex = true)
+      if ex
+        tk_call_without_enc('wm', 'withdraw', win.epath)
+      else
+        Wm.deiconify(win)
+      end
+      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
new file mode 100644
index 0000000000..c0126c5175
--- /dev/null
+++ b/ext/tk/lib/tk/xim.rb
@@ -0,0 +1,122 @@
+#
+# tk/xim.rb : control imput_method
+#
+require 'tk'
+
+module TkXIM
+  include Tk
+  extend Tk
+
+  TkCommandNames = ['imconfigure'.freeze].freeze
+
+  def TkXIM.useinputmethods(value = None, win = nil)
+    if value == None
+      if win
+        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',
+                                 '-displayof', win, value))
+      else
+        bool(tk_call_without_enc('tk', 'useinputmethods', value))
+      end
+    end
+  end
+
+  def TkXIM.useinputmethods_displayof(win, value = None)
+    TkXIM.useinputmethods(value, win)
+  end
+
+  def TkXIM.caret(win, keys=nil)
+    if keys
+      tk_call_without_enc('tk', 'caret', win, *hash_kv(keys))
+      self
+    else
+      lst = tk_split_list(tk_call_without_enc('tk', 'caret', win))
+      info = {}
+      while key = lst.shift
+        info[key[1..-1]] = lst.shift
+      end
+      info
+    end
+  end
+
+  def TkXIM.configure(win, slot, value=None)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        if slot.kind_of? Hash
+          tk_call('imconfigure', win, *hash_kv(slot))
+        else
+          tk_call('imconfigure', win, "-#{slot}", value)
+        end
+      end
+    rescue
+    end
+  end
+
+  def TkXIM.configinfo(win, slot=nil)
+    if TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      begin
+        if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+          if slot
+            conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
+            conf[0] = conf[0][1..-1]
+            conf
+          else
+            tk_split_list(tk_call('imconfigure', win)).collect{|conf|
+              conf[0] = conf[0][1..-1]
+              conf
+            }
+          end
+        else
+          []
+        end
+      rescue
+        []
+      end
+    else # ! TkComm::GET_CONFIGINFOwoRES_AS_ARRAY
+      TkXIM.current_configinfo(win, slot)
+    end
+  end
+
+  def TkXIM.current_configinfo(win, slot=nil)
+    begin
+      if /^8\.*/ === Tk::TK_VERSION  && JAPANIZED_TK
+        if slot
+          conf = tk_split_list(tk_call('imconfigure', win, "-#{slot}"))
+          { conf[0][1..-1] => conf[1] }
+        else
+          ret = {}
+          tk_split_list(tk_call('imconfigure', win)).each{|conf|
+            ret[conf[0][1..-1]] = conf[1]
+          }
+          ret
+        end
+      else
+        {}
+      end
+    rescue
+      {}
+    end
+  end
+
+  def useinputmethods(value=None)
+    TkXIM.useinputmethods(value, self)
+  end
+
+  def caret(keys=nil)
+    TkXIM.caret(self, keys=nil)
+  end
+
+  def imconfigure(slot, value=None)
+    TkXIM.configure(self, slot, value)
+  end
+
+  def imconfiginfo(slot=nil)
+    TkXIM.configinfo(self, slot)
+  end
+end
diff --git a/ext/tk/lib/tkafter.rb b/ext/tk/lib/tkafter.rb
new file mode 100644
index 0000000000..f65945884c
--- /dev/null
+++ b/ext/tk/lib/tkafter.rb
@@ -0,0 +1,4 @@
+#
+#   tkafter.rb - load tk/after.rb
+#
+require 'tk/timer'
diff --git a/ext/tk/lib/tkbgerror.rb b/ext/tk/lib/tkbgerror.rb
new file mode 100644
index 0000000000..deba7a57fa
--- /dev/null
+++ b/ext/tk/lib/tkbgerror.rb
@@ -0,0 +1,4 @@
+#
+#   tkbgerror.rb - load tk/bgerror.rb
+#
+require 'tk/bgerror'
diff --git a/ext/tk/lib/tkcanvas.rb b/ext/tk/lib/tkcanvas.rb
new file mode 100644
index 0000000000..9524614291
--- /dev/null
+++ b/ext/tk/lib/tkcanvas.rb
@@ -0,0 +1,4 @@
+#
+#   tkcanvas.rb - load tk/canvas.rb
+#
+require 'tk/canvas'
diff --git a/ext/tk/lib/tkclass.rb b/ext/tk/lib/tkclass.rb
new file mode 100644
index 0000000000..87f5acc453
--- /dev/null
+++ b/ext/tk/lib/tkclass.rb
@@ -0,0 +1,47 @@
+#
+#               tkclass.rb - Tk classes
+#                       Date: 2000/11/27 09:23:36
+#                       by Yukihiro Matsumoto <matz@caelum.co.jp>
+#
+#                       $Id$
+
+require "tk"
+
+TopLevel = TkToplevel
+Frame = TkFrame
+Label = TkLabel
+Button = TkButton
+Radiobutton = TkRadioButton
+Checkbutton = TkCheckButton
+Message = TkMessage
+Entry = TkEntry
+Spinbox = TkSpinbox
+Text = TkText
+Scale = TkScale
+Scrollbar = TkScrollbar
+Listbox = TkListbox
+Menu = TkMenu
+Menubutton = TkMenubutton
+Canvas = TkCanvas
+Arc = TkcArc
+Bitmap = TkcBitmap
+Line = TkcLine
+Oval = TkcOval
+Polygon = TkcPolygon
+Rectangle = TkcRectangle
+TextItem = TkcText
+WindowItem = TkcWindow
+BitmapImage = TkBitmapImage
+PhotoImage = TkPhotoImage
+Selection = TkSelection
+Winfo = TkWinfo
+Pack = TkPack
+Grid = TkGrid
+Place = TkPlace
+Variable = TkVariable
+Font = TkFont
+VirtualEvent = TkVirtualEvent
+
+def Mainloop
+  Tk.mainloop
+end
diff --git a/ext/tk/lib/tkconsole.rb b/ext/tk/lib/tkconsole.rb
new file mode 100644
index 0000000000..9960ddb8ac
--- /dev/null
+++ b/ext/tk/lib/tkconsole.rb
@@ -0,0 +1,4 @@
+#
+#   tkconsole.rb - load tk/console.rb
+#
+require 'tk/console'
diff --git a/ext/tk/lib/tkdialog.rb b/ext/tk/lib/tkdialog.rb
new file mode 100644
index 0000000000..bec5e5d29a
--- /dev/null
+++ b/ext/tk/lib/tkdialog.rb
@@ -0,0 +1,4 @@
+#
+#   tkdialog.rb - load tk/dialog.rb
+#
+require 'tk/dialog'
diff --git a/ext/tk/lib/tkentry.rb b/ext/tk/lib/tkentry.rb
new file mode 100644
index 0000000000..2dcfcab5da
--- /dev/null
+++ b/ext/tk/lib/tkentry.rb
@@ -0,0 +1,4 @@
+#
+#   tkentry.rb - load tk/entry.rb
+#
+require 'tk/entry'
diff --git a/ext/tk/lib/tkextlib/ICONS.rb b/ext/tk/lib/tkextlib/ICONS.rb
new file mode 100644
index 0000000000..18d84c05e9
--- /dev/null
+++ b/ext/tk/lib/tkextlib/ICONS.rb
@@ -0,0 +1,13 @@
+#
+#  ICONS support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/ICONS/setup.rb'
+
+# load library
+require 'tkextlib/ICONS/icons'
diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
new file mode 100644
index 0000000000..bd3180aa55
--- /dev/null
+++ b/ext/tk/lib/tkextlib/ICONS/icons.rb
@@ -0,0 +1,129 @@
+#
+#  tkextlib/ICONS/icons.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/ICONS/setup.rb'
+
+# TkPackage.require('icons', '1.0')
+TkPackage.require('icons')
+
+module Tk
+  class ICONS < TkImage
+    extend Tk
+
+    PACKAGE_NAME = 'icons'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('icons')
+      rescue
+        ''
+      end
+    end
+
+    def self.create(*args)  # icon, icon, ..., ?option=>value, ...?
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        icons = simplelist(tk_call('::icons::icons', 'create',
+                                   *(hash_kv(keys) << (args.flatten))))
+      else
+        icons = simplelist(tk_call('::icons::icons', 'create',
+                                   args.flatten))
+      end
+
+      icons.collect{|icon| self.new(icon, :without_creating=>true)}
+    end
+
+    def self.delete(*icons)  # icon, icon, ...
+      icons = icons.flatten
+      return if icons.empty?
+      icons.map!{|icon|
+        if icon.kind_of?(Tk::ICONS)
+          Tk_IMGTBL.delete(icon.path)
+          icon.name
+        elsif icon.to_s =~ /^::icon::(.*)/
+          name = $1
+          Tk_IMGTBL.delete(icon)
+          name
+        else
+          Tk_IMGTBL.delete("::icon::#{icon}")
+          icon
+        end
+      }
+      tk_call('::icons::icons', 'delete', icons)
+    end
+
+    def self.query(*args)  # icon, icon, ..., ?option=>value, ...?
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        simplelist(tk_call('::icons::icons', 'query',
+                           *(hash_kv(keys) << (args.flatten))))
+      else
+        simplelist(tk_call('::icons::icons', 'query', args.flatten))
+      end . map{|inf| list(inf) }
+    end
+
+    ##########################################
+
+    class << self
+      alias _new new
+
+      def new(name, keys=nil)
+        if obj = Tk_IMGTBL["::icon::#{name}"]
+          if keys
+            keys = _symbolkey2str(keys)
+            unless keys.delete('without_creating')
+              tk_call('::icons::icons', 'create', *(hash_kv(keys) << obj.name))
+            end
+          end
+        else
+          obj = _new(name, keys)
+        end
+        obj
+      end
+    end
+
+    ##########################################
+
+    def initialize(name, keys=nil)
+      if name.kind_of?(String) && name =~ /^::icon::(.+)$/
+          @name = $1
+          @path = name
+      else
+        @name = name.to_s
+        @path = "::icon::#{@name}"
+      end
+      keys = _symbolkey2str(keys)
+      unless keys.delete('without_creating')
+        tk_call('::icons::icons', 'create', *(hash_kv(keys) << @name))
+      end
+      Tk_IMGTBL[@path] = self
+    end
+
+    def name
+      @name
+    end
+
+    def delete
+      Tk_IMGTBL.delete(@path)
+      tk_call('::icons::icons', 'delete', @name)
+      self
+    end
+
+    def query(keys={})
+      list(simplelist(tk_call('::icons::icons', 'query',
+                               *(hash_kv(keys) << @name))
+                      )[0])
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/ICONS/setup.rb b/ext/tk/lib/tkextlib/ICONS/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/ICONS/setup.rb
@@ -0,0 +1,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
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/SUPPORT_STATUS b/ext/tk/lib/tkextlib/SUPPORT_STATUS
new file mode 100644
index 0000000000..de51c519fa
--- /dev/null
+++ b/ext/tk/lib/tkextlib/SUPPORT_STATUS
@@ -0,0 +1,193 @@
+
+  [ current support status of Tcl/Tk extensions ]
+
+  *** RELEASE_DATE of the libraries => see 'tkextlib/version.rb' ***
+
+The following list shows *CURRENT* status when this file was modified
+at last. If you want to add other Tcl/Tk extensions to the planed list
+(or change its status position), please request them at the ruby-talk,
+ruby-list, or ruby-dev ML. Although we cannot promise to support your
+requests, we'll try to do.
+
+If you want to check that wrapper libraries are ready to use on your
+environment, please execute 'pkg_checker.rb' with no arguments. The
+script may give you some hints about that.
+
+
+  ***** IMPORTANT NOTE **********************************************
+
+    'support' means that Ruby/Tk's wrapper libraries are released.
+    'not support' does *NOT* mean that the extension doesn't work
+    on Ruby/Tk.
+
+    The version number of each extension means the latest version
+    which is checked its feature. That is, it does NOT means only
+    version of working. Library files maybe include some features
+    which is included in the former version but removed from the
+    latest, and maybe able to support the later version then the
+    shown version.
+
+    Even if the status of the extension is 'not support', you can
+    control the functions/widgets of the extension without wrapper
+    libraries by Tk.tk_call(), Tk.ip_eval(), and so on.
+
+    If you cannot use installed Tcl/Tk extension, please check the
+    followings.
+
+     (1) On your Tcl/Tk, does the extension work?
+
+     (2) Do DLL libraries of the extension exist on DLL load-path?
+         (See also "<ruby archive>/ext/tcltklib/README.ActiveTcl")
+
+     (3) Is the Tcl library directory of the extension included in
+         library search-path of the Tcl interpreter linked Ruby/Tk?
+
+    The check results may request you to do some setup operations
+    before using the extension. If so, then please write the step
+    of setup operations into the "setup.rb" file in the directory
+    of the wrapper libraries for the extension (It is the wrapper
+    libraries have the standard structure of the libraries in this
+    directory). The "setup" file is required before requiring the
+    Tcl library package (TkPackage.require(<libname>)).
+
+  *******************************************************************
+
+
+===< support with some examples (may be beta quality) >=======================
+
+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
+
+BWidget      1.8 [ CVS/Hd(2009-07-02) ]
+                     http://sourceforge.net/projects/tcllib      ==> bwidget
+
+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 widgets   2.3.0   http://sourceforge.net/projects/tktable     ==> vu
+
+TkHTML       2.0     http://www.hwaci.com/sw/tkhtml/             ==> tkHTML
+
+ICONS        1.0     http://www.satisoft.com/tcltk/icons/        ==> ICONS
+
+TkImg        1.3     http://sourceforge.net/projects/tkimg       ==> tkimg
+
+
+BLT          2.4z    http://sourceforge.net/projects/blt         ==> blt
+
+TkTreeCtrl   2.2.9
+                     http://tktreectrl.sourceforge.net/          ==> treectrl
+
+Tile         0.8.3/8.6b1
+                     http://sourceforge.net/projects/tktable     ==> tile
+
+
+
+===< support (may be alpha or beta quality) >=================================
+
+IncrTcl      CVS/Hd(2008-12-15)
+                     http://sourceforge.net/projects/incrtcl     ==> itcl, itk
+
+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.4   http://math.nist.gov/~DPorter/tcltk/trofs/
+
+
+
+===< possibly available (not tested; alpha quality) >=========================
+
+winico       0.6
+                     http://sourceforge.net/projects/tktable
+                       ==> winico (win32 only)
+
+TkTrans      latest(2004-10-11)
+                     http://www2.cmp.uea.ac.uk/~fuzz/tktrans/default.html
+                       ==>  tktrans (win32 only)
+
+TkDND        1.0a2   http://sourceforge.net/projects/tkdnd       ==> tkDND
+
+
+
+===< plan to support (alpha quality libraries may be included) >==============
+
+GraphViz     ***     http://www.graphviz.org/
+
+Tkgeomap     ***     http://tkgeomap.sourceforge.net/index.html
+
+
+
+===< not determined to supprt or not >========================================
+
+Tix          ***     http://tixlibrary.sourceforge.net/
+
+TkZinc       ***     http://www.tkzinc.org/
+
+Wbc          ***     http://home.t-online.de/home/csaba.nemethi/
+
+Mentry       ***     http://home.t-online.de/home/csaba.nemethi/
+
+Tablelist    ***     http://home.t-online.de/home/csaba.nemethi/
+
+ANIGIF       ***     http://cardtable.sourceforge.net/tcltk/
+
+IMG_ROTATE   ***     http://cardtable.sourceforge.net/tcltk/
+
+TclVfs       ***     http://sourceforge.net/projects/tclvfs/
+
+vfwtcl       ***     http://sourceforge.net/projects/avicaptcl
+                        * Win32 only
+
+multicast    ***     http://sourceforge.net/projects/avicaptcl
+                        * Win32 only
+
+XBit         ***     http://www.geocities.com/~chengye/
+                        * current implementation is for Windows only
+
+QuickTimeTcl ***     http://hem.fyristorg.com/matben/qt/
+                        * works under Mac OS (8,9,X) or Windows
+
+
+
+===< may not support (already exist, out of Ruby/Tk scope, and so on) >=======
+
+TkCon        ***     http://sourceforge.net/projects/tkcon
+
+Expect       ***     http://sourceforge.net/projects/expect
+
+TclXML       ***     http://sourceforge.net/projects/tclxml
+
+TclXSLT      ***     http://sourceforge.net/projects/tclxml
+
+TclDOM       ***     http://sourceforge.net/projects/tclxml
+
+TclSOAP      ***     http://sourceforge.net/projects/tclsoap
+
+Snack        ***     http://www.speech.kth.se/~kare/snack2.2.tar.gz
+                        * use Snack for Ruby
+                              (see http://rbsnack.sourceforge.net/)
+
+Tcom         ***     http://www.vex.net/~cthuang/tcom/
+
+tDOM         ***     http://www.tdom.org
+
+Mk4tcl       ***     http://www.equi4.com/metakit/tcl.html
+
+Memchan      ***     http://sourceforge.net/projects/memchan
+
+XOTcl        ***     http://www.xotcl.org/
+
+
+===< tool (may not supprt) >==================================================
+
+tbcload/tclcompiler
+             ***     http://www.tcl.tk/software/tclpro/
+
+
+(End of List)
diff --git a/ext/tk/lib/tkextlib/blt.rb b/ext/tk/lib/tkextlib/blt.rb
new file mode 100644
index 0000000000..8b132e41a7
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt.rb
@@ -0,0 +1,189 @@
+#
+#  BLT support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/variable'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/blt/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('BLT', '2.4')
+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
+
+    VERSION = tk_call('set', 'blt_version')
+    PATCH_LEVEL = tk_call('set', 'blt_patchLevel')
+
+    begin
+      lib = TkCore::INTERP._invoke('set', 'blt_library')
+    rescue
+      lib = ''
+    end
+    LIBRARY  = TkVarAccess.new('blt_library', lib)
+
+    begin
+      lib = TkCore::INTERP._invoke('set', 'blt_libPath')
+    rescue
+      lib = ''
+    end
+    LIB_PATH = TkVarAccess.new('blt_libPath', lib)
+
+    PACKAGE_NAME = 'BLT'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('BLT')
+      rescue
+        ''
+      end
+    end
+
+    ####################################################
+
+    def self.beep(percent = 50)
+      tk_call('::blt::beep', percent)
+    end
+
+    def self.bgexec(*args)
+      if args[0].kind_of?(TkVariable)
+        var = args.shift
+      else
+        var = TkVariable.new
+      end
+      params = [var]
+
+      params.concat(hash_kv(args.shift, true)) if args[0].kind_of?(Hash)
+
+      params << '--' if args[0] =~ /^\s*-[^-]/
+      params.concat(args)
+
+      tk_call('::blt::bgexec', *params)
+      var
+    end
+
+    def self.detach_bgexec(*args)
+      if args[0].kind_of?(TkVariable)
+        var = args.shift
+      else
+        var = TkVariable.new
+      end
+      params = [var]
+
+      params.concat(hash_kv(args.shift, true)) if args[0].kind_of?(Hash)
+
+      params << '--' if args[0] =~ /^\s*-[^-]/
+      params.concat(args)
+      params << '&'
+
+      [var, tk_split_list(tk_call('::blt::bgexec', *params))]
+    end
+
+    def self.bltdebug(lvl = nil)
+      if lvl
+        tk_call('::blt::bltdebug', lvl)
+      else
+        number(tk_call('::blt::bltdebug'))
+      end
+    end
+
+    def self.crc32_file(name)
+      tk_call_without_enc('::blt::crc32', name)
+    end
+    def self.crc32_data(dat)
+      tk_call_without_enc('::blt::crc32', '-data', dat)
+    end
+
+    ####################################################
+
+    def self.active_legend(graph)
+      tk_call_without_enc('Blt_ActiveLegend', graph)
+    end
+    def self.crosshairs(graph)
+      tk_call_without_enc('Blt_Crosshairs', graph)
+    end
+    def self.zoom_stack(graph)
+      tk_call_without_enc('Blt_ZoomStack', graph)
+    end
+    def self.print_key(graph)
+      tk_call_without_enc('Blt_PrintKey', graph)
+    end
+    def self.closest_point(graph)
+      tk_call_without_enc('Blt_ClosestPoint', graph)
+    end
+
+    module GraphCommand
+      def active_legend
+        tk_call_without_enc('Blt_ActiveLegend', @path)
+        self
+      end
+      def crosshairs
+        tk_call_without_enc('Blt_Crosshairs', @path)
+        self
+      end
+      def zoom_stack
+        tk_call_without_enc('Blt_ZoomStack', @path)
+        self
+      end
+      def print_key
+        tk_call_without_enc('Blt_PrintKey', @path)
+        self
+      end
+      def closest_point
+        tk_call_without_enc('Blt_ClosestPoint', @path)
+        self
+      end
+    end
+
+    ####################################################
+
+    autoload :PlotComponent,'tkextlib/blt/component.rb'
+
+    autoload :Barchart,     'tkextlib/blt/barchart.rb'
+    autoload :Bitmap,       'tkextlib/blt/bitmap.rb'
+    autoload :Busy,         'tkextlib/blt/busy.rb'
+    autoload :Container,    'tkextlib/blt/container.rb'
+    autoload :CutBuffer,    'tkextlib/blt/cutbuffer.rb'
+    autoload :DragDrop,     'tkextlib/blt/dragdrop.rb'
+    autoload :EPS,          'tkextlib/blt/eps.rb'
+    autoload :Htext,        'tkextlib/blt/htext.rb'
+    autoload :Graph,        'tkextlib/blt/graph.rb'
+    autoload :Spline,       'tkextlib/blt/spline.rb'
+    autoload :Stripchart,   'tkextlib/blt/stripchart.rb'
+    autoload :Table,        'tkextlib/blt/table.rb'
+    autoload :Tabnotebook,  'tkextlib/blt/tabnotebook.rb'
+    autoload :Tabset,       'tkextlib/blt/tabset.rb'
+    autoload :Ted,          'tkextlib/blt/ted.rb'
+    autoload :Tile,         'tkextlib/blt/tile.rb'
+    autoload :Tree,         'tkextlib/blt/tree.rb'
+    autoload :TreeView,     'tkextlib/blt/treeview.rb'
+    autoload :Hiertable,    'tkextlib/blt/treeview.rb'
+    # Hierbox is obsolete
+    autoload :Vector,       'tkextlib/blt/vector.rb'
+    autoload :VectorAccess, 'tkextlib/blt/vector.rb'
+    autoload :Watch,        'tkextlib/blt/watch.rb'
+    autoload :Winop,        'tkextlib/blt/winop.rb'
+    autoload :WinOp,        'tkextlib/blt/winop.rb'
+
+    # Unix only
+    autoload :DnD,          'tkextlib/blt/unix_dnd.rb'
+
+    # Windows only
+    autoload :Printer,      'tkextlib/blt/win_printer.rb'
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/barchart.rb b/ext/tk/lib/tkextlib/blt/barchart.rb
new file mode 100644
index 0000000000..a86b91c959
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/barchart.rb
@@ -0,0 +1,79 @@
+#
+#  tkextlib/blt/barchart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/component.rb'
+
+module Tk::BLT
+  class Barchart < TkWindow
+    TkCommandNames = ['::blt::barchart'.freeze].freeze
+    WidgetClassName = 'Barchart'.freeze
+    WidgetClassNames[WidgetClassName] ||= self
+
+    include PlotComponent
+    include GraphCommand
+
+    def __boolval_optkeys
+      ['bufferelements', 'buffergraph', 'invertxy']
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      ['text', 'label', 'title', 'file',
+        'background', 'plotbackground']
+    end
+    private :__strval_optkeys
+
+    def __tkvariable_optkeys
+      super() << 'colormap' << 'fontmap'
+    end
+    private :__tkvariable_optkeys
+
+=begin
+    BarElement_ID = ['blt_barchart_bar'.freeze, TkUtil.untrust('00000')].freeze
+
+    def bar(elem=nil, keys={})
+      if elem.kind_of?(Hash)
+        keys = elem
+        elem = nil
+      end
+      unless elem
+        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
+        BarElement_ID[1].succ!
+      end
+      tk_send('bar', elem, keys)
+      Element.new(self, elem, :without_creating=>true)
+    end
+=end
+
+    def extents(item)
+      num_or_str(tk_send_without_enc('extents', item))
+    end
+
+    def invtransform(x, y)
+      list(tk_send_without_enc('invtransform', x, y))
+    end
+
+    def inside(x, y)
+      bool(tk_send_without_enc('inside', x, y))
+    end
+
+    def metafile(file=None)
+      # Windows only
+      tk_send('metafile', file)
+      self
+    end
+
+    def snap(output, keys={})
+      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
+      self
+    end
+
+    def transform(x, y)
+      list(tk_send_without_enc('transform', x, y))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/bitmap.rb b/ext/tk/lib/tkextlib/blt/bitmap.rb
new file mode 100644
index 0000000000..3254b63116
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/bitmap.rb
@@ -0,0 +1,112 @@
+#
+#  tkextlib/blt/bitmap.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Bitmap < TkObject
+    extend TkCore
+
+    TkCommandNames = ['::blt::bitmap'.freeze].freeze
+
+    BITMAP_ID_TBL = TkCore::INTERP.create_table
+
+    (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))
+      [ tk_split_list(dat[0]), tk_simple_list(dat[1]) ]
+    end
+
+    def self.exist?(name)
+      bool(tk_call('::blt::bitmap', 'exists', name))
+    end
+
+    def self.height(name)
+      number(tk_call('::blt::bitmap', 'height', name))
+    end
+
+    def self.width(name)
+      number(tk_call('::blt::bitmap', 'width', name))
+    end
+
+    def self.source(name)
+      tk_simple_list(tk_call('::blt::bitmap', 'source', name))
+    end
+
+    #################################
+
+    class << self
+      alias _new new
+
+      def new(data, keys={})
+        _new(:data, nil, data, keys)
+      end
+      alias define new
+
+      def new_with_name(name, data, keys={})
+        _new(:data, name, data, keys)
+      end
+      alias define_with_name new_with_name
+
+      def compose(text, keys={})
+        _new(:text, nil, text, keys)
+      end
+
+      def compose_with_name(name, text, keys={})
+        _new(:text, name, text, keys)
+      end
+    end
+
+    def initialize(type, name, data, keys = {})
+      if name
+        @id = name
+      else
+        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
+
+      unless bool(tk_call('::blt::bitmap', 'exists', @id))
+        if type == :text
+          tk_call('::blt::bitmap', 'compose', @id, data, *hash_kv(keys))
+        else # :data
+          tk_call('::blt::bitmap', 'define', @id, data, *hash_kv(keys))
+        end
+      end
+    end
+
+    def exist?
+      bool(tk_call('::blt::bitmap', 'exists', @id))
+    end
+
+    def height
+      number(tk_call('::blt::bitmap', 'height', @id))
+    end
+
+    def width
+      number(tk_call('::blt::bitmap', 'width', @id))
+    end
+
+    def source
+      tk_simple_list(tk_call('::blt::bitmap', 'source', @id))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/busy.rb b/ext/tk/lib/tkextlib/blt/busy.rb
new file mode 100644
index 0000000000..b5287fb5b7
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/busy.rb
@@ -0,0 +1,83 @@
+#
+#  tkextlib/blt/busy.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig.rb'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Busy
+    extend TkCore
+    extend TkItemConfigMethod
+
+    TkCommandNames = ['::blt::busy'.freeze].freeze
+
+    ###########################
+
+    class Shield < TkWindow
+      def self.shield_path(win)
+        win = window(win) unless win.kind_of?(TkWindow)
+        if win.kind_of?(Tk::Toplevel)
+          win.path + '._Busy'
+        else
+          win.path + '_Busy'
+        end
+      end
+
+      def initialize(win)
+        @path = self.class.shield_path(win)
+      end
+    end
+
+    def self.shield_path(win)
+      Tk::BLT::Busy::Shield.shield_path(win)
+    end
+  end
+end
+
+class << Tk::BLT::Busy
+  def __item_config_cmd(win)
+    ['::blt::busy', 'configure', win]
+  end
+  private :__item_config_cmd
+
+  undef itemcget
+  undef itemcget_tkstring
+  alias configure itemconfigure
+  alias configinfo itemconfiginfo
+  alias current_configinfo current_itemconfiginfo
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ##################################
+
+  def hold(win, keys={})
+    tk_call('::blt::busy', 'hold', win, *hash_kv(keys))
+  end
+
+  def release(*wins)
+    tk_call('::blt::busy', 'release', *wins)
+  end
+
+  def forget(*wins)
+    tk_call('::blt::busy', 'forget', *wins)
+  end
+
+  def is_busy(pat=None)
+    tk_split_list(tk_call('::blt::busy', 'isbusy', pat))
+  end
+
+  def names(pat=None)
+    tk_split_list(tk_call('::blt::busy', 'names', pat))
+  end
+  alias windows names
+
+  def check(win)
+    bool(tk_call('::blt::busy', 'check', win))
+  end
+
+  def status(win)
+    bool(tk_call('::blt::busy', 'status', win))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/component.rb b/ext/tk/lib/tkextlib/blt/component.rb
new file mode 100644
index 0000000000..c7ea213cee
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/component.rb
@@ -0,0 +1,2218 @@
+#
+#  tkextlib/blt/component.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module PlotComponent
+    include TkItemConfigMethod
+
+    module OptKeys
+      def __item_font_optkeys(id)
+        ['font', 'tickfont', 'titlefont']
+      end
+      private :__item_font_optkeys
+
+      def __item_numstrval_optkeys(id)
+        ['xoffset', 'yoffset']
+      end
+      private :__item_numstrval_optkeys
+
+      def __item_boolval_optkeys(id)
+        ['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',
+          'color', 'titlecolor', 'fill', 'outline', 'offdash']
+      end
+      private :__item_strval_optkeys
+
+      def __item_listval_optkeys(id)
+        ['bindtags']
+      end
+      private :__item_listval_optkeys
+
+      def __item_numlistval_optkeys(id)
+        ['dashes', 'majorticks', 'minorticks']
+      end
+      private :__item_numlistval_optkeys
+
+      def __item_tkvariable_optkeys(id)
+        ['variable', 'textvariable', 'colormap', 'fontmap']
+      end
+      private :__item_tkvariable_optkeys
+    end
+
+    include OptKeys
+
+    def __item_cget_cmd(id)
+      if id.kind_of?(Array)
+        # id := [ type, name ]
+        [self.path, id[0], 'cget', id[1]]
+      else
+        [self.path, id, 'cget']
+      end
+    end
+    private :__item_cget_cmd
+
+    def __item_config_cmd(id)
+      if id.kind_of?(Array)
+        # id := [ type, name, ... ]
+        type, *names = id
+        [self.path, type, 'configure'].concat(names)
+      else
+        [self.path, id, 'configure']
+      end
+    end
+    private :__item_config_cmd
+
+    def __item_pathname(id)
+      if id.kind_of?(Array)
+        id = tagid(id[1])
+      end
+      [self.path, id].join(';')
+    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|
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      else
+        value = slot
+        slot = args.pop
+        if slot == :command || slot == 'command'
+          cmd = value
+          value = proc{|w, tick|
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('axis')
+      itemconfigure(id_list, slot, value)
+    end
+    def axis_configinfo(id, slot=nil)
+      itemconfiginfo(['axis', tagid(id)], slot)
+    end
+    def current_axis_configinfo(id, slot=nil)
+      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
+    def crosshairs_configinfo(slot=nil)
+      itemconfiginfo('crosshairs', slot)
+    end
+    def current_crosshairs_configinfo(slot=nil)
+      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)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('element')
+      itemconfigure(id_list, slot, value)
+    end
+    def element_configinfo(id, slot=nil)
+      itemconfiginfo(['element', tagid(id)], slot)
+    end
+    def current_element_configinfo(id, slot=nil)
+      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)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('bar')
+      itemconfigure(id_list, slot, value)
+    end
+    def bar_configinfo(id, slot=nil)
+      itemconfiginfo(['bar', tagid(id)], slot)
+    end
+    def current_bar_configinfo(id, slot=nil)
+      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)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('line')
+      itemconfigure(id_list, slot, value)
+    end
+    def line_configinfo(id, slot=nil)
+      itemconfiginfo(['line', tagid(id)], slot)
+    end
+    def current_line_configinfo(id, slot=nil)
+      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
+    def gridline_configinfo(slot=nil)
+      itemconfiginfo('grid', slot)
+    end
+    def current_gridline_configinfo(slot=nil)
+      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
+    def legend_configinfo(slot=nil)
+      itemconfiginfo('legend', slot)
+    end
+    def current_legend_configinfo(slot=nil)
+      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)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('pen')
+      itemconfigure(id_list, slot, value)
+    end
+    def pen_configinfo(id, slot=nil)
+      itemconfiginfo(['pen', tagid(id)], slot)
+    end
+    def current_pen_configinfo(id, slot=nil)
+      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
+    def postscript_configinfo(slot=nil)
+      itemconfiginfo('postscript', slot)
+    end
+    def current_postscript_configinfo(slot=nil)
+      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)
+        value = None
+      else
+        value = slot
+        slot = args.pop
+      end
+      id_list = args.flatten.collect!{|id| tagid(id)}.unshift('marker')
+      itemconfigure(id_list, slot, value)
+    end
+    def marker_configinfo(id, slot=nil)
+      itemconfiginfo(['marker', tagid(id)], slot)
+    end
+    def current_marker_configinfo(id, slot=nil)
+      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_tkstring, :__itemcget, :__itemconfiginfo, :__current_itemconfiginfo
+
+    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)}
+      else
+        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)
+
+      if TkComm::GET_CONFIGINFO_AS_ARRAY
+        if slot
+          if slot == 'bindtags' || slot == :bindtags
+            ret[-2] = ret[-2].collect{|tag| TkBindTag.id2obj(tag)}
+            ret[-1] = ret[-1].collect{|tag| TkBindTag.id2obj(tag)}
+          end
+        else
+          if (inf = ret.assoc('bindtags'))
+            inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+            inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+          end
+        end
+
+      else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+        if (inf = ret['bindtags'])
+          inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+          inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+          ret['bindtags'] = inf
+        end
+      end
+
+      ret
+    end
+    def current_itemconfiginfo(tagOrId, slot = nil)
+      ret = __current_itemconfiginfo(tagid(tagOrId), slot)
+
+      if (val = ret['bindtags'])
+        ret['bindtags'] = val.collect{|tag| TkBindTag.id2obj(tag)}
+      end
+
+      ret
+    end
+
+    private :itemcget_tkstring, :itemcget, :itemcget_strict
+    private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+    #################
+
+    class Axis < TkObject
+      (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
+        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={})
+        if axis.kind_of?(Hash)
+          keys = axis
+          axis = nil
+        end
+        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
+        end
+        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
+        keys = _symbolkey2str(keys)
+        unless keys.delete('without_creating')
+          # @chart.axis_create(@axis, keys)
+          tk_call(@chart, 'axis', 'create', @axis, keys)
+        end
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.axis_configinfo(@id, key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_axis_configinfo(@id, key)
+      end
+
+      def command(cmd=nil, &b)
+        if cmd
+          configure('command', cmd)
+        elsif b
+          configure('command', Proc.new(&b))
+        else
+          cget('command')
+        end
+      end
+
+      def delete
+        @chart.axis_delete(@id)
+        self
+      end
+
+      def invtransform(val)
+        @chart.axis_invtransform(@id, val)
+      end
+
+      def limits
+        @chart.axis_limits(@id)
+      end
+
+      def name
+        @axis
+      end
+
+      def transform(val)
+        @chart.axis_transform(@id, val)
+      end
+
+      def view
+        @chart.axis_view(@id)
+        self
+      end
+
+      def use(name=None) # if @id == xaxis | x2axis | yaxis | y2axis
+        @chart.axis_use(@id, name)
+      end
+
+      def use_as(axis) # axis := xaxis | x2axis | yaxis | y2axis
+        @chart.axis_use(axis, @id)
+      end
+    end
+
+    #################
+
+    class Crosshairs < TkObject
+      CrosshairsID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        CrosshairsID_TBL.mutex.synchronize{ CrosshairsID_TBL.clear }
+      }
+
+      def self.new(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::CrosshairsID_TBL[@cpath] = self
+        @chart.crosshair_configure(keys) unless keys.empty?
+        @path = @id = 'crosshairs'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.crosshair_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_crosshair_configinfo(key)
+      end
+
+      def off
+        @chart.crosshair_off
+        self
+      end
+      def on
+        @chart.crosshair_on
+        self
+      end
+      def toggle
+        @chart.crosshair_toggle
+        self
+      end
+    end
+
+    #################
+
+    class Element < TkObject
+      extend Tk
+      extend TkItemFontOptkeys
+      extend TkItemConfigOptkeys
+
+      extend Tk::BLT::PlotComponent::OptKeys
+
+      ElementTypeName = 'element'
+      ElementTypeToClass = { ElementTypeName=>self }
+
+      ElementID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        ElementID_TBL.mutex.synchronize{ ElementID_TBL.clear }
+      }
+
+      (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]
+      end
+
+      def Element.id2obj(chart, id)
+        cpath = chart.path
+        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={})
+        if element.kind_of?(Hash)
+          keys = element
+          element = nil
+        end
+        if keys
+          keys = _symbolkey2str(keys)
+          not_create = keys.delete('without_creating')
+        else
+          not_create = false
+        end
+
+        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
+        end
+        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
+        keys = _symbolkey2str(keys)
+        unless keys.delete('without_creating')
+          # @chart.element_create(@element, keys)
+          tk_call(@chart, @typename, 'create', @element, keys)
+        end
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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)
+        self
+      end
+      def configinfo(key=nil)
+        # @chart.element_configinfo(@id, key)
+        @chart.__send__(@typename + '_configinfo', @id, key)
+      end
+      def current_configinfo(key=nil)
+        # @chart.current_element_configinfo(@id, key)
+        @chart.__send__('current_' << @typename << '_configinfo', @id, key)
+      end
+
+      def activate(*args)
+        @chart.element_activate(@id, *args)
+      end
+
+      def closest(x, y, var, keys={})
+        # @chart.element_closest(x, y, var, @id, keys)
+        @chart.__send__(@typename + '_closest', x, y, var, @id, keys)
+      end
+
+      def deactivate
+        @chart.element_deactivate(@id)
+        self
+      end
+
+      def delete
+        @chart.element_delete(@id)
+        self
+      end
+
+      def exist?
+        @chart.element_exist?(@id)
+      end
+
+      def name
+        @element
+      end
+
+      def type
+        @chart.element_type(@id)
+      end
+    end
+
+    class Bar < Element
+      ElementTypeName = 'bar'.freeze
+      ElementTypeToClass[ElementTypeName] = self
+    end
+    class Line < Element
+      ElementTypeName = 'line'.freeze
+      ElementTypeToClass[ElementTypeName] = self
+    end
+
+    #################
+
+    class GridLine < TkObject
+      GridLineID_TBL = TkCore::INTERP.create_table
+      TkCore::INTERP.init_ip_env{
+        GridLineID_TBL.mutex.synchronize{ GridLineID_TBL.clear }
+      }
+
+      def self.new(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::GridLineID_TBL[@cpath] = self
+        @chart.gridline_configure(keys) unless keys.empty?
+        @path = @id = 'grid'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.gridline_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_gridline_configinfo(key)
+      end
+
+      def off
+        @chart.gridline_off
+        self
+      end
+      def on
+        @chart.gridline_on
+        self
+      end
+      def toggle
+        @chart.gridline_toggle
+        self
+      end
+    end
+
+    #################
+
+    class Legend < TkObject
+      LegendID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        LegendID_TBL.mutex.synchronize{ LegendID_TBL.clear }
+      }
+
+      def self.new(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
+        # Legend::LegendID_TBL[@cpath] = self
+        @chart.legend_configure(keys) unless keys.empty?
+        @path = @id = 'legend'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.legend_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_legend_configinfo(key)
+      end
+
+      def activate(*args)
+        @chart.legend_activate(*args)
+      end
+
+      def deactivate(*args)
+        @chart.legend_deactivate(*args)
+      end
+
+      def get(pos, y=nil)
+        @chart.legend_get(pos, y)
+      end
+    end
+
+    #################
+
+    class Pen < TkObject
+      (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
+        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={})
+        if pen.kind_of?(Hash)
+          keys = pen
+          pen = nil
+        end
+        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={})
+        if pen.kind_of?(Hash)
+          keys = pen
+          pen = nil
+        end
+        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
+        keys = _symbolkey2str(keys)
+        unless keys.delete('without_creating')
+          # @chart.pen_create(@pen, keys)
+          tk_call(@chart, 'pen', 'create', @pen, keys)
+        end
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.pen_configinfo(@id, key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_pen_configinfo(@id, key)
+      end
+
+      def delete
+        @chart.pen_delete(@id)
+        self
+      end
+
+      def name
+        @pen
+      end
+    end
+
+    #################
+
+    class Postscript < TkObject
+      PostscriptID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        PostscriptID_TBL.mutex.synchronize{ PostscriptID_TBL.clear }
+      }
+
+      def self.new(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::PostscriptID_TBL[@cpath] = self
+        @chart.postscript_configure(keys) unless keys.empty?
+        @path = @id = 'postscript'
+      end
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.postscript_configinfo(key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_postscript_configinfo(key)
+      end
+
+      def output(file=nil, keys={})
+        if file.kind_of?(Hash)
+          keys = file
+          file = nil
+        end
+
+        ret = @chart.postscript_output(file, keys)
+
+        if file
+          self
+        else
+          ret
+        end
+      end
+    end
+
+    #################
+    class Marker < TkObject
+      extend Tk
+      extend TkItemFontOptkeys
+      extend TkItemConfigOptkeys
+
+      extend Tk::BLT::PlotComponent::OptKeys
+
+      MarkerTypeName = nil
+      MarkerTypeToClass = {}
+      MarkerID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        MarkerID_TBL.mutex.synchronize{ MarkerID_TBL.clear }
+      }
+
+      def Marker.type2class(type)
+        MarkerTypeToClass[type]
+      end
+
+      def Marker.id2obj(chart, id)
+        cpath = chart.path
+        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)
+        fontkeys = {}
+        methodkeys = {}
+        if keys.kind_of? Hash
+          keys = _symbolkey2str(keys)
+
+          __item_font_optkeys(nil).each{|key|
+            fkey = key.to_s
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+            fkey = "kanji#{key}"
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+            fkey = "latin#{key}"
+            fontkeys[fkey] = keys.delete(fkey) if keys.key?(fkey)
+
+            fkey = "ascii#{key}"
+            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)
+          }
+
+          __item_ruby2val_optkeys(nil).each{|key, method|
+            key = key.to_s
+            keys[key] = method.call(keys[key]) if keys.has_key?(key)
+          }
+
+          args = itemconfig_hash_kv(nil, keys)
+        else
+          args = []
+        end
+
+        [args, fontkeys, methodkeys]
+      end
+      private_class_method :_parse_create_args
+
+      def self.create(chart, keys={})
+        unless self::MarkerTypeName
+          fail RuntimeError, "#{self} is an abstract class"
+        end
+        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, 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
+          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
+
+      def initialize(parent, *args)
+        @parent = @chart = parent
+        @cpath = parent.path
+
+        @path = @id = create_self(*args) # an integer number as 'item id'
+        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'
+      end
+      private :create_self
+
+      def id
+        @id
+      end
+
+      def to_eval
+        @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
+      end
+      def configinfo(key=nil)
+        @chart.marker_configinfo(@id, key)
+      end
+      def current_configinfo(key=nil)
+        @chart.current_marker_configinfo(@id, key)
+      end
+
+      def after(target=None)
+        @chart.marker_after(@id, target)
+      end
+
+      def before(target=None)
+        @chart.marker_before(@id, target)
+      end
+
+      def delete
+        @chart.marker_delete(@id)
+      end
+
+      def exist?
+        @chart.marker_exist(@id)
+      end
+
+      def type
+        @chart.marker_type(@id)
+      end
+    end
+
+    class TextMarker < Marker
+      MarkerTypeName = 'text'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class LineMarker < Marker
+      MarkerTypeName = 'line'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class BitmapMarker < Marker
+      MarkerTypeName = 'bitmap'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class ImageMarker < Marker
+      MarkerTypeName = 'image'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class PolygonMarker < Marker
+      MarkerTypeName = 'polygon'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+    class WindowMarker < Marker
+      MarkerTypeName = 'window'.freeze
+      MarkerTypeToClass[MarkerTypeName] = self
+    end
+
+    #################
+
+    def __destroy_hook__
+      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
+
+    #################
+
+    def tagid(tag)
+      if tag.kind_of?(Axis) ||
+          tag.kind_of?(Crosshairs) ||
+          tag.kind_of?(Element) ||
+          tag.kind_of?(GridLine) ||
+          tag.kind_of?(Legend) ||
+          tag.kind_of?(Pen) ||
+          tag.kind_of?(Postscript) ||
+          tag.kind_of?(Marker)
+        tag.id
+      else
+        tag  # maybe an Array of configure parameters
+      end
+    end
+
+    def _component_bind(target, tag, context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, target, 'bind', tagid(tag)], context, cmd, *args)
+      self
+    end
+    def _component_bind_append(target, tag, context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, target, 'bind', tagid(tag)], context, cmd, *args)
+      self
+    end
+    def _component_bind_remove(target, tag, context)
+      _bind_remove([path, target, 'bind', tagid(tag)], context)
+      self
+    end
+    def _component_bindinfo(target, tag, context=nil)
+      _bindinfo([path, target, 'bind', tagid(tag)], context)
+    end
+    private :_component_bind, :_component_bind_append
+    private :_component_bind_remove, :_component_bindinfo
+
+    def axis_bind(tag, context, *args)
+      _component_bind('axis', tag, context, *args)
+    end
+    def axis_bind_append(tag, context, *args)
+      _component_bind_append('axis', tag, context, *args)
+    end
+    def axis_bind_remove(tag, context)
+      _component_bind_remove('axis', tag, context)
+    end
+    def axis_bindinfo(tag, context=nil)
+      _component_bindinfo('axis', tag, context)
+    end
+
+    def element_bind(tag, context, *args)
+      _component_bind('element', tag, context, *args)
+    end
+    def element_bind_append(tag, context, *args)
+      _component_bind_append('element', tag, context, *args)
+    end
+    def element_bind_remove(tag, context)
+      _component_bind_remove('element', tag, context)
+    end
+    def element_bindinfo(tag, context=nil)
+      _component_bindinfo('element', tag, context)
+    end
+
+    def bar_bind(tag, context, *args)
+      _component_bind('bar', tag, context, *args)
+    end
+    def bar_bind_append(tag, context, *args)
+      _component_bind_append('bar', tag, context, *args)
+    end
+    def bar_bind_remove(tag, context)
+      _component_bind_remove('bar', tag, context)
+    end
+    def bar_bindinfo(tag, context=nil)
+      _component_bindinfo('bar', tag, context)
+    end
+
+    def line_bind(tag, context, *args)
+      _component_bind('line', tag, context, *args)
+    end
+    def line_bind_append(tag, context, *args)
+      _component_bind_append('line', tag, context, *args)
+    end
+    def line_bind_remove(tag, context)
+      _component_bind_remove('line', tag, context)
+    end
+    def line_bindinfo(tag, context=nil)
+      _component_bindinfo('line', tag, context)
+    end
+
+    def legend_bind(tag, context, *args)
+      _component_bind('legend', tag, context, *args)
+    end
+    def legend_bind_append(tag, context, *args)
+      _component_bind_append('legend', tag, context, *args)
+    end
+    def legend_bind_remove(tag, context)
+      _component_bind_remove('legend', tag, context)
+    end
+    def legend_bindinfo(tag, context=nil)
+      _component_bindinfo('legend', tag, context)
+    end
+
+    def marker_bind(tag, context, *args)
+      _component_bind('marker', tag, context, *args)
+    end
+    def marker_bind_append(tag, context, *args)
+      _component_bind_append('marker', tag, context, *args)
+    end
+    def marker_bind_remove(tag, context)
+      _component_bind_remove('marker', tag, context)
+    end
+    def marker_bindinfo(tag, context=nil)
+      _component_bindinfo('marker', tag, context)
+    end
+
+    ###################
+
+    def axis_create(id=nil, keys={})
+      # tk_send('axis', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Axis.new(self, tagid(id), keys)
+    end
+    def axis_delete(*ids)
+      tk_send('axis', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def axis_invtransform(id, val)
+      list(tk_send('axis', 'invtransform', tagid(id), val))
+    end
+    def axis_limits(id)
+      list(tk_send('axis', 'limits', tagid(id)))
+    end
+    def axis_names(*pats)
+      simplelist(tk_send('axis', 'names',
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|axis|
+        Tk::BLT::PlotComponent::Axis.id2obj(self, axis)
+      }
+    end
+    def axis_transform(id, val)
+      list(tk_send('axis', 'transform', tagid(id), val))
+    end
+    def axis_view(id)
+      tk_send('axis', 'view', tagid(id))
+      self
+    end
+    def axis_use(id, target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('axis', 'use',
+                                                    tagid(id), tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('axis', 'use', tagid(id)))
+      end
+    end
+
+    ###################
+
+    def crosshairs_off
+      tk_send_without_enc('crosshairs', 'off')
+      self
+    end
+    def crosshairs_on
+      tk_send_without_enc('crosshairs', 'on')
+      self
+    end
+    def crosshairs_toggle
+      tk_send_without_enc('crosshairs', 'toggle')
+      self
+    end
+
+    ###################
+
+    def element_create(id=nil, keys={})
+      # tk_send('element', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Element.new(self, tagid(id), keys)
+    end
+    def element_activate(*args)
+      if args.empty?
+        list(tk_send('element', 'activate')).collect{|elem|
+          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+        }
+      else
+        # id, *indices
+        id = args.shift
+        tk_send('element', 'activate', tagid(id), *args)
+      end
+    end
+    def element_closest(x, y, var, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        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,
+                     *(args.collect{|id| tagid(id)})))
+      end
+    end
+    def element_deactivate(*ids)
+      tk_send('element', 'deactivate', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def element_delete(*ids)
+      tk_send('element', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def element_exist?(id)
+      bool(tk_send('element', 'exists', tagid(id)))
+    end
+    def element_names(*pats)
+      simplelist(tk_send('element', 'names',
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def element_show(*names)
+      if names.empty?
+        simplelist(tk_send('element', 'show'))
+      else
+        tk_send('element', 'show', *(names.collect{|n| tagid(n)}))
+        self
+      end
+    end
+    def element_type(id)
+      tk_send('element', 'type', tagid(id))
+    end
+
+    ###################
+
+    def bar_create(id=nil, keys={})
+      # tk_send('bar', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Bar.new(self, tagid(id), keys)
+    end
+    alias bar bar_create
+    def bar_activate(*args)
+      if args.empty?
+        list(tk_send('bar', 'activate')).collect{|elem|
+          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+        }
+      else
+        # id, *indices
+        id = args.shift
+        tk_send('bar', 'activate', tagid(id), *args)
+      end
+    end
+    def bar_closest(x, y, var, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        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,
+                     *(args.collect{|id| tagid(id)})))
+      end
+    end
+    def bar_deactivate(*ids)
+      tk_send('bar', 'deactivate', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def bar_delete(*ids)
+      tk_send('bar', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def bar_exist?(id)
+      bool(tk_send('bar', 'exists', tagid(id)))
+    end
+    def bar_names(*pats)
+      simplelist(tk_send('bar', 'names',
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def bar_show(*names)
+      if names.empty?
+        simplelist(tk_send('bar', 'show'))
+      else
+        tk_send('bar', 'show', *(names.collect{|n| tagid(n)}))
+        self
+      end
+    end
+    def bar_type(id)
+      tk_send('bar', 'type', tagid(id))
+    end
+
+    ###################
+
+    def line_create(id=nil, keys={})
+      # tk_send('line', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Line.new(self, tagid(id), keys)
+    end
+    alias bar line_create
+    def line_activate(*args)
+      if args.empty?
+        list(tk_send('line', 'activate')).collect{|elem|
+          Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+        }
+      else
+        # id, *indices
+        id = args.shift
+        tk_send('line', 'activate', tagid(id), *args)
+      end
+    end
+    def line_closest(x, y, var, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        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,
+                     *(args.collect{|id| tagid(id)})))
+      end
+    end
+    def line_deactivate(*ids)
+      tk_send('line', 'deactivate', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def line_delete(*ids)
+      tk_send('line', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def line_exist?(id)
+      bool(tk_send('line', 'exists', tagid(id)))
+    end
+    def line_names(*pats)
+      simplelist(tk_send('line', 'names',
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|elem|
+        Tk::BLT::PlotComponent::Element.id2obj(self, elem)
+      }
+    end
+    def line_show(*names)
+      if names.empty?
+        simplelist(tk_send('line', 'show'))
+      else
+        tk_send('line', 'show', *(names.collect{|n| tagid(n)}))
+        self
+      end
+    end
+    def line_type(id)
+      tk_send('line', 'type', tagid(id))
+    end
+
+    ###################
+
+    def gridline_off
+      tk_send_without_enc('grid', 'off')
+      self
+    end
+    def gridline_on
+      tk_send_without_enc('grid', 'on')
+      self
+    end
+    def gridline_toggle
+      tk_send_without_enc('grid', 'toggle')
+      self
+    end
+
+    ###################
+
+    def legend_window_create(parent=nil, keys=nil)
+      if parent.kind_of?(Hash)
+        keys = _symbolkey2str(parent)
+        parent = keys.delete('parent')
+        widgetname = keys.delete('widgetname')
+        keys.delete('without_creating')
+      elsif keys
+        keys = _symbolkey2str(keys)
+        widgetname = keys.delete('widgetname')
+        keys.delete('without_creating')
+      end
+
+      legend = self.class.new(parent, :without_creating=>true,
+                              :widgetname=>widgetname)
+      class << legend
+        def __destroy_hook__
+          TkCore::INTERP.tk_windows.delete(@path)
+        end
+      end
+
+      if keys
+        self.legend_configure(keys.update('position'=>legend))
+      else
+        self.legend_configure('position'=>legend)
+      end
+      legend
+    end
+
+    def legend_activate(*pats)
+      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',
+                   *(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',
+                                                       _at(pos, y)))
+      else
+        Tk::BLT::PlotComponent::Element.id2obj(self,
+                                               tk_send('legend', 'get', pos))
+      end
+    end
+
+    ###################
+
+    def pen_create(id=nil, keys={})
+      # tk_send('pen', 'create', tagid(id), keys)
+      Tk::BLT::PlotComponent::Pen.new(self, tagid(id), keys)
+    end
+    def pen_delete(*ids)
+      tk_send('pen', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def pen_names(*pats)
+      simplelist(tk_send('pen', 'names',
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|pen|
+        Tk::BLT::PlotComponent::Pen.id2obj(self, pen)
+      }
+    end
+
+    ###################
+
+    def postscript_output(file=nil, keys={})
+      if file.kind_of?(Hash)
+        keys = file
+        file = nil
+      end
+
+      if file
+        tk_send('postscript', 'output', file, keys)
+        self
+      else
+        tk_send('postscript', 'output', keys)
+      end
+    end
+
+    ###################
+
+    def marker_create(type, keys={})
+      case type
+      when :text, 'text'
+        Tk::BLT::PlotComponent::TextMarker.new(self, keys)
+      when :line, 'line'
+        Tk::BLT::PlotComponent::LineMarker.new(self, keys)
+      when :bitmap, 'bitmap'
+        Tk::BLT::PlotComponent::BitmapMarker.new(self, keys)
+      when :image, 'image'
+        Tk::BLT::PlotComponent::ImageMarker.new(self, keys)
+      when :polygon, 'polygon'
+        Tk::BLT::PlotComponent::PolygonMarker.new(self, keys)
+      when :window, 'window'
+        Tk::BLT::PlotComponent::WindowMarker.new(self, keys)
+      else
+        if type.kind_of?(Tk::BLT::PlotComponent::Marker)
+          type.new(self, keys)
+        else
+          Tk::BLT::PlotComponent::Marker.create_type(self, type, keys)
+        end
+      end
+    end
+    def marker_after(id, target=nil)
+      if target
+        tk_send_without_enc('marker', 'after', tagid(id), tagid(target))
+      else
+        tk_send_without_enc('marker', 'after', tagid(id))
+      end
+      self
+    end
+    def marker_before(id, target=None)
+      if target
+        tk_send_without_enc('marker', 'before', tagid(id), tagid(target))
+      else
+        tk_send_without_enc('marker', 'before', tagid(id))
+      end
+      self
+    end
+    def marker_delete(*ids)
+      tk_send('marker', 'delete', *(ids.collect{|id| tagid(id)}))
+      self
+    end
+    def marker_exist?(id)
+      bool(tk_send('marker', 'exists', tagid(id)))
+    end
+    def marker_names(*pats)
+      simplelist(tk_send('marker', 'names',
+                         *(pats.collect{|pat| tagid(pat)}))).collect{|id|
+        Tk::BLT::PlotComponent::Marker.id2obj(self, id)
+      }
+    end
+    def marker_type(id)
+      tk_send('marker', 'type', tagid(id))
+    end
+
+    ###################
+
+    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|
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick|
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('xaxis', slot, value)
+    end
+    def xaxis_configinfo(slot=nil)
+      itemconfiginfo('xaxis', slot)
+    end
+    def current_xaxis_configinfo(slot=nil)
+      current_itemconfiginfo('xaxis', slot)
+    end
+    def xaxis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'xaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def xaxis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'xaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def xaxis_bind_remove(context)
+      _bind_remove([path, 'xaxis', 'bind'], context)
+      self
+    end
+    def xaxis_bindinfo(context=nil)
+      _bindinfo([path, 'xaxis', 'bind'], context)
+    end
+    def xaxis_invtransform(val)
+      list(tk_send('xaxis', 'invtransform', val))
+    end
+    def xaxis_limits
+      list(tk_send('xaxis', 'limits'))
+    end
+    def xaxis_transform(val)
+      list(tk_send('xaxis', 'transform', val))
+    end
+    def xaxis_use(target=nil)
+      if target
+        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|
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick|
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('x2axis', slot, value)
+    end
+    def x2axis_configinfo(slot=nil)
+      itemconfiginfo('x2axis', slot)
+    end
+    def current_x2axis_configinfo(slot=nil)
+      current_itemconfiginfo('x2axis', slot)
+    end
+    def x2axis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'x2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def x2axis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'x2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def x2axis_bind_remove(context)
+      _bind_remove([path, 'x2axis', 'bind'], context)
+      self
+    end
+    def x2axis_bindinfo(context=nil)
+      _bindinfo([path, 'x2axis', 'bind'], context)
+    end
+    def x2axis_invtransform(val)
+      list(tk_send('x2axis', 'invtransform', val))
+    end
+    def x2axis_limits
+      list(tk_send('x2axis', 'limits'))
+    end
+    def x2axis_transform(val)
+      list(tk_send('x2axis', 'transform', val))
+    end
+    def x2axis_use(target=nil)
+      if target
+        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|
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick|
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('yaxis', slot, value)
+    end
+    def yaxis_configinfo(slot=nil)
+      itemconfiginfo('yaxis', slot)
+    end
+    def current_yaxis_configinfo(slot=nil)
+      current_itemconfiginfo('yaxis', slot)
+    end
+    def yaxis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'yaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def yaxis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'yaxis', 'bind'], context, cmd, *args)
+      self
+    end
+    def yaxis_bind_remove(context)
+      _bind_remove([path, 'yaxis', 'bind'], context)
+      self
+    end
+    def yaxis_bindinfo(context=nil)
+      _bindinfo([path, 'yaxis', 'bind'], context)
+    end
+    def yaxis_invtransform(val)
+      list(tk_send('yaxis', 'invtransform', val))
+    end
+    def yaxis_limits
+      list(tk_send('yaxis', 'limits'))
+    end
+    def yaxis_transform(val)
+      list(tk_send('yaxis', 'transform', val))
+    end
+    def yaxis_use(target=nil)
+      if target
+        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|
+            cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+          }
+        end
+      elsif slot == :command || slot == 'command'
+        cmd = value
+        value = proc{|w, tick|
+          cmd.call(TkComm.window(w), TkComm.num_or_str(tick))
+        }
+      end
+      itemconfigure('y2axis', slot, value)
+    end
+    def y2axis_configinfo(slot=nil)
+      axis_configinfo('y2axis', slot)
+    end
+    def current_y2axis_configinfo(slot=nil)
+      current_itemconfiginfo('y2axis', slot)
+    end
+    def y2axis_bind(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, 'y2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def y2axis_bind_append(context, *args)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, 'y2axis', 'bind'], context, cmd, *args)
+      self
+    end
+    def y2axis_bind_remove(context)
+      _bind_remove([path, 'y2axis', 'bind'], context)
+      self
+    end
+    def y2axis_bindinfo(context=nil)
+      _bindinfo([path, 'y2axis', 'bind'], context)
+    end
+    def y2axis_invtransform(val)
+      list(tk_send('y2axis', 'invtransform', val))
+    end
+    def y2axis_limits
+      list(tk_send('y2axis', 'limits'))
+    end
+    def y2axis_transform(val)
+      list(tk_send('y2axis', 'transform', val))
+    end
+    def y2axis_use(target=nil)
+      if target
+        Tk::BLT::PlotComponent::Axis.id2obj(self,
+                                            tk_send('y2axis', 'use',
+                                                    tagid(target)))
+      else
+        Tk::BLT::PlotComponent::Axis.id2obj(self, tk_send('y2axis', 'use'))
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/container.rb b/ext/tk/lib/tkextlib/blt/container.rb
new file mode 100644
index 0000000000..be05828d95
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/container.rb
@@ -0,0 +1,28 @@
+#
+#  tkextlib/blt/container.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Container < TkWindow
+    TkCommandNames = ['::blt::container'.freeze].freeze
+    WidgetClassName = 'Container'.freeze
+    WidgetClassNames[WidgetClassName] ||= self
+
+    def __strval_optkeys
+      super() << 'name'
+    end
+    private :__strval_optkeys
+
+    def find_command(pat)
+      Hash[*simplelist(tk_send_without_enc('find', '-command', pat))]
+    end
+
+    def find_name(pat)
+      Hash[*simplelist(tk_send_without_enc('find', '-name', pat))]
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/cutbuffer.rb b/ext/tk/lib/tkextlib/blt/cutbuffer.rb
new file mode 100644
index 0000000000..1cc39dfb94
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/cutbuffer.rb
@@ -0,0 +1,23 @@
+#
+#  tkextlib/blt/cutbuffer.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module CutBuffer
+    TkCommandNames = ['::blt::cutbuffer'.freeze].freeze
+
+    def self.get(num = 0)
+      Tk.tk_call('::blt::cutbuffer', 'get', num)
+    end
+    def self.rotate(count = 1)
+      Tk.tk_call('::blt::cutbuffer', 'rotate', count)
+    end
+    def self.set(val, num = 0)
+      Tk.tk_call('::blt::cutbuffer', 'set', val, num)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/dragdrop.rb b/ext/tk/lib/tkextlib/blt/dragdrop.rb
new file mode 100644
index 0000000000..aa5c5654c2
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/dragdrop.rb
@@ -0,0 +1,269 @@
+#
+#  tkextlib/blt/dragdrop.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module DragDrop
+    extend TkCore
+
+    TkCommandNames = ['::blt::drag&drop'.freeze].freeze
+
+    class Token < TkWindow
+      WidgetClassName = 'DragDropToken'.freeze
+      WidgetClassNames[WidgetClassName] ||= self
+
+      def initialize(arg)
+        if arg.kind_of?(Hash) # arg is a hash includes the widgetpath of token
+          arg = _symbolkey2str(arg)
+          install_win(nil, arg['widgetname'])
+        else  # arg is a drag&drop source
+          tk_call('::blt::drag&drop', 'source', arg)
+          install_win(nil, tk_call('::blt::drag&drop', 'token', arg))
+        end
+      end
+    end
+
+    ###################################
+
+    extend TkItemConfigMethod
+    extend Tk::ValidateConfigure
+
+    class << self
+      def __item_config_cmd(id)  # id := ['source'|'target', win]
+        ['::blt::drag&drop', id[0], id[1]]
+      end
+      private :__item_config_cmd
+
+      def __item_boolval_optkeys(id)
+        super(id) << 'selftarget'
+      end
+      private :__item_boolval_optkeys
+
+      def __item_listval_optkeys(id)
+        super(id) << 'send'
+      end
+      private :__item_listval_optkeys
+
+      def __item_strval_optkeys(id)
+        super(id) << 'rejectbg' << 'rejectfg' << 'tokenbg'
+      end
+      private :__item_strval_optkeys
+
+      undef itemcget
+      undef itemcget_tkstring
+      private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+      def source_configure(win, slot, value=None)
+        itemconfigure(['source', win], slot, value)
+      end
+      def source_configinfo(win, slot=nil)
+        itemconfiginfo(['source', win], slot)
+      end
+      def current_source_configinfo(win, slot=nil)
+        current_itemconfiginfo(['source', win], slot)
+      end
+    end
+
+    class PackageCommand < TkValidateCommand
+      class ValidateArgs < TkUtil::CallbackSubst
+        KEY_TBL = [
+          [ ?t, ?w, :token ],
+          [ ?W, ?w, :widget ],
+          nil
+        ]
+
+        PROC_TBL = [
+          [ ?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)
+          val
+        end
+      end
+
+      def self._config_keys
+        ['packagecmd']
+      end
+    end
+
+    class SiteCommand < TkValidateCommand
+      class ValidateArgs < TkUtil::CallbackSubst
+        KEY_TBL = [
+          [ ?s, ?b, :compatible ],
+          [ ?t, ?w, :token ],
+          nil
+        ]
+
+        PROC_TBL = [
+          [ ?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)
+          val
+        end
+      end
+
+      def self._config_keys
+        ['sitecmd']
+      end
+    end
+
+    def self.__validation_class_list
+      super() << PackageCommand << SiteCommand
+    end
+
+    class << self
+      Tk::ValidateConfigure.__def_validcmd(binding, PackageCommand)
+      Tk::ValidateConfigure.__def_validcmd(binding, SiteCommand)
+    end
+
+    ###################################
+
+    class DnD_Handle < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?i, ?s, :ip_name ],
+        [ ?v, ?v, :value ],
+        [ ?W, ?w, :widget ],
+        nil
+      ]
+
+      PROC_TBL = [
+        [ ?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'],
+                            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'],
+                            cmd, *args)
+    end
+
+    ###################################
+
+    def self.init_source(win)
+      tk_call('::blt::drag&drop', 'source', win)
+    end
+
+    def self.source()
+      list(tk_call('::blt::drag&drop', 'source'))
+    end
+
+    def self.source_handler_list(win)
+      simplelist(tk_call('::blt::drag&drop', 'source', win, 'handler'))
+    end
+    def self.source_handler_info(win, type)
+      tk_tcl2ruby(tk_call('::blt::drag&drop', 'source', win, 'handler', type))
+    end
+
+    def self.target
+      list(tk_call('::blt::drag&drop', 'target'))
+    end
+    def self.target_handler_list(win)
+      simplelist(tk_call('::blt::drag&drop', 'target', win, 'handler'))
+    end
+
+    def self.handle_target(win, type, val=None)
+      tk_call('::blt::drag&drop', 'target', win, 'handle', type, val)
+    end
+
+    def self.token(win)
+      window(tk_call('::blt::drag&drop', 'token', win))
+    end
+
+    def self.drag(win, x, y)
+      tk_call('::blt::drag&drop', 'drag', win, x, y)
+    end
+    def self.drop(win, x, y)
+      tk_call('::blt::drag&drop', 'drop', win, x, y)
+    end
+
+    def self.errors(cmd=Proc.new)
+      tk_call('::blt::drag&drop', 'errors', cmd)
+    end
+
+    def self.active
+      bool(tk_call('::blt::drag&drop', 'active'))
+    end
+
+    def self.location(x=None, y=None)
+      list(tk_call('::blt::drag&drop', 'location', x, y))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/eps.rb b/ext/tk/lib/tkextlib/blt/eps.rb
new file mode 100644
index 0000000000..0dba87a7cc
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/eps.rb
@@ -0,0 +1,32 @@
+#
+#  tkextlib/blt/eps.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class EPS < TkcItem
+    CItemTypeName = 'eps'.freeze
+    CItemTypeToClass[CItemTypeName] = self
+  end
+end
+
+class Tk::Canvas
+  alias __BLT_EPS_item_strval_optkeys __item_strval_optkeys
+  def __item_strval_optkeys(id)
+    __BLT_EPS_item_strval_optkeys(id) + [
+      'shadowcolor', 'title', 'titlecolor'
+    ]
+  end
+  private :__item_strval_optkeys
+
+  alias __BLT_EPS_item_boolval_optkeys __item_boolval_optkeys
+  def __item_boolval_optkeys(id)
+    __BLT_EPS_item_boolval_optkeys(id) + ['showimage']
+  end
+  private :__item_boolval_optkeys
+end
+
diff --git a/ext/tk/lib/tkextlib/blt/graph.rb b/ext/tk/lib/tkextlib/blt/graph.rb
new file mode 100644
index 0000000000..6bd4424065
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/graph.rb
@@ -0,0 +1,67 @@
+#
+#  tkextlib/blt/graph.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/component.rb'
+
+module Tk::BLT
+  class Graph < TkWindow
+    TkCommandNames = ['::blt::graph'.freeze].freeze
+    WidgetClassName = 'Graph'.freeze
+    WidgetClassNames[WidgetClassName] ||= self
+
+    include PlotComponent
+    include GraphCommand
+
+    def __boolval_optkeys
+      ['bufferelements', 'invertxy']
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      ['text', 'label', 'title', 'file', 'plotbackground']
+    end
+    private :__strval_optkeys
+
+=begin
+    BarElement_ID = ['blt_graph_bar'.freeze, TkUtil.untrust('00000')].freeze
+
+    def bar(elem=nil, keys={})
+      if elem.kind_of?(Hash)
+        keys = elem
+        elem = nil
+      end
+      unless elem
+        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
+        BarElement_ID[1].succ!
+      end
+      tk_send('bar', elem, keys)
+      Element.new(self, elem, :without_creating=>true)
+    end
+=end
+
+    def extents(item)
+      num_or_str(tk_send_without_enc('extents', item))
+    end
+
+    def invtransform(x, y)
+      list(tk_send_without_enc('invtransform', x, y))
+    end
+
+    def inside(x, y)
+      bool(tk_send_without_enc('inside', x, y))
+    end
+
+    def snap(output, keys={})
+      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
+      self
+    end
+
+    def transform(x, y)
+      list(tk_send_without_enc('transform', x, y))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/htext.rb b/ext/tk/lib/tkextlib/blt/htext.rb
new file mode 100644
index 0000000000..878bd9982d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/htext.rb
@@ -0,0 +1,112 @@
+#
+#  tkextlib/blt/htext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig.rb'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Htext<TkWindow
+    Htext_Var = TkVarAccess.new_hash('htext')
+    Htext_Widget = TkVarAccess.new('htext(widget)', :window)
+    Htext_File = TkVarAccess.new('htext(file)')
+    Htext_Line = TkVarAccess.new('htext(line)')
+
+    include TkItemConfigMethod
+    include Scrollable
+
+    TkCommandNames = ['::blt::htext'.freeze].freeze
+    WidgetClassName = 'Htext'.freeze
+    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
+
+    def __strval_optkeys
+      super() << 'filename'
+    end
+  private :__strval_optkeys
+
+    def append(win, keys={})
+      tk_send('append', _epath(win), keys)
+      self
+    end
+
+    def goto_line(idx)
+      tk_send_without_enc('gotoline', idx)
+      self
+    end
+    def current_line
+      number(tk_send_without_enc('gotoline'))
+    end
+
+    def index(str)
+      number(tk_send('index', str))
+    end
+
+    def line_pos(str)
+      tk_send('linepos', str)
+    end
+
+    def range(from=None, to=None)
+      tk_send_without_enc('range', from, to)
+    end
+
+    def scan_mark(pos)
+      tk_send_without_enc('scan', 'mark', pos)
+      self
+    end
+
+    def scan_dragto(pos)
+      tk_send_without_enc('scan', 'dragto', pos)
+      self
+    end
+
+    def search(pat, from=None, to=None)
+      num = number(tk_send('search', pat, from, to))
+      (num < 0)? nil: num
+    end
+
+    def selection_adjust(index)
+      tk_send_without_enc('selection', 'adjust', index)
+      self
+    end
+    def selection_clear()
+      tk_send_without_enc('selection', 'clear')
+      self
+    end
+    def selection_from(index)
+      tk_send_without_enc('selection', 'from', index)
+      self
+    end
+    def selection_line(index)
+      tk_send_without_enc('selection', 'line', index)
+      self
+    end
+    def selection_present()
+      bool(tk_send_without_enc('selection', 'present'))
+    end
+    def selection_range(first, last)
+      tk_send_without_enc('selection', 'range', first, last)
+      self
+    end
+    def selection_to(index)
+      tk_send_without_enc('selection', 'to', index)
+      self
+    end
+    def selection_word(index)
+      tk_send_without_enc('selection', 'word', index)
+      self
+    end
+
+    def windows(pat=None)
+      list(tk_send('windows', pat))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/setup.rb b/ext/tk/lib/tkextlib/blt/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/setup.rb
@@ -0,0 +1,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
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/blt/spline.rb b/ext/tk/lib/tkextlib/blt/spline.rb
new file mode 100644
index 0000000000..9f75a0b217
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/spline.rb
@@ -0,0 +1,23 @@
+#
+#  tkextlib/blt/spline.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Spline
+    extend TkCore
+
+    TkCommandNames = ['::blt::spline'.freeze].freeze
+
+    def self.natural(x, y, sx, sy)
+      tk_call('::blt::spline', 'natural', x, y, sx, sy)
+    end
+
+    def self.quadratic(x, y, sx, sy)
+      tk_call('::blt::spline', 'quadratic', x, y, sx, sy)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/stripchart.rb b/ext/tk/lib/tkextlib/blt/stripchart.rb
new file mode 100644
index 0000000000..74093f1868
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/stripchart.rb
@@ -0,0 +1,74 @@
+#
+#  tkextlib/blt/stripchart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/component.rb'
+
+module Tk::BLT
+  class Stripchart < TkWindow
+    TkCommandNames = ['::blt::stripchart'.freeze].freeze
+    WidgetClassName = 'Stripchart'.freeze
+    WidgetClassNames[WidgetClassName] ||= self
+
+    include PlotComponent
+    include GraphCommand
+
+    def __boolval_optkeys
+      ['bufferelements', 'buffergraph', 'invertxy']
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      ['text', 'label', 'title', 'file',
+        'background', 'plotbackground']
+    end
+    private :__strval_optkeys
+
+=begin
+    BarElement_ID = ['blt_stripchart_bar'.freeze, TkUtil.untrust('00000')].freeze
+
+    def bar(elem=nil, keys={})
+      if elem.kind_of?(Hash)
+        keys = elem
+        elem = nil
+      end
+      unless elem
+        elem = BarElement_ID.join(TkCore::INTERP._ip_id_).freeze
+        BarElement_ID[1].succ!
+      end
+      tk_send('bar', elem, keys)
+      Element.new(self, elem, :without_creating=>true)
+    end
+=end
+
+    def extents(item)
+      num_or_str(tk_send_without_enc('extents', item))
+    end
+
+    def invtransform(x, y)
+      list(tk_send_without_enc('invtransform', x, y))
+    end
+
+    def inside(x, y)
+      bool(tk_send_without_enc('inside', x, y))
+    end
+
+    def metafile(file=None)
+      # Windows only
+      tk_send('metafile', file)
+      self
+    end
+
+    def snap(output, keys={})
+      tk_send_without_enc('snap', *(hash_kv(keys, false) + output))
+      self
+    end
+
+    def transform(x, y)
+      list(tk_send_without_enc('transform', x, y))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/table.rb b/ext/tk/lib/tkextlib/blt/table.rb
new file mode 100644
index 0000000000..205e29e6c5
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/table.rb
@@ -0,0 +1,412 @@
+#
+#  tkextlib/blt/table.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/itemconfig.rb'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Table
+    include Tk
+    extend Tk
+    extend TkItemConfigMethod
+
+    TkCommandNames = ['::blt::table'.freeze].freeze
+
+    module TableContainer
+      def blt_table_add(*args)
+        Tk::BLT::Table.add(self, *args)
+        self
+      end
+
+      def blt_table_arrange()
+        Tk::BLT::Table.arrange(self)
+        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)
+        self
+      end
+
+      def blt_table_configinfo(*args)
+        Tk::BLT::Table.configinfo(self, *args)
+      end
+
+      def blt_table_current_configinfo(*args)
+        Tk::BLT::Table.current_configinfo(self, *args)
+      end
+
+      def blt_table_locate(x, y)
+        Tk::BLT::Table.locate(self, x, y)
+      end
+
+      def blt_table_delete(*args)
+        Tk::BLT::Table.delete(self, *args)
+        self
+      end
+
+      def blt_table_extents(item)
+        Tk::BLT::Table.extents(self, item)
+      end
+
+      def blt_table_insert(*args)
+        Tk::BLT::Table.insert(self, *args)
+        self
+      end
+
+      def blt_table_insert_before(*args)
+        Tk::BLT::Table.insert_before(self, *args)
+        self
+      end
+
+      def blt_table_insert_after(*args)
+        Tk::BLT::Table.insert_after(self, *args)
+        self
+      end
+
+      def blt_table_join(first, last)
+        Tk::BLT::Table.join(self, first, last)
+        self
+      end
+
+      def blt_table_save()
+        Tk::BLT::Table.save(self)
+      end
+
+      def blt_table_search(*args)
+        Tk::BLT::Table.search(self, *args)
+      end
+
+      def blt_table_split(*args)
+        Tk::BLT::Table.split(self, *args)
+        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)
+        self
+      end
+
+      def blt_table_itemconfiginfo(*args)
+        Tk::BLT::Table.itemconfiginfo(self, *args)
+      end
+
+      def blt_table_current_itemconfiginfo(*args)
+        Tk::BLT::Table.current_itemconfiginfo(self, *args)
+      end
+
+      def blt_table_iteminfo(item)
+        Tk::BLT::Table.iteminfo(self, item)
+      end
+    end
+  end
+end
+
+
+############################################
+class << Tk::BLT::Table
+  def __item_cget_cmd(id) # id := [ container, item ]
+    win = (id[0].kind_of?(TkWindow))? id[0].path: id[0].to_s
+    ['::blt::table', 'cget', win, id[1]]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id) # id := [ container, item, ... ]
+    container, *items = id
+    win = (container.kind_of?(TkWindow))? container.path: container.to_s
+    ['::blt::table', 'configure', win, *items]
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    win = (id[0].kind_of?(TkWindow))? id[0].path: id[0].to_s
+    win + ';'
+  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_tkstring, :__itemcget, :__itemcget_strict
+  private :__itemconfigure, :__itemconfiginfo, :__current_itemconfiginfo
+
+  def __boolval_optkeys
+    super() << 'propagate'
+  end
+  private :__boolval_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(Array)
+      case tag[0]
+      when Integer
+        # [row, col]
+        tag.join(',')
+      when :c, :C, 'c', 'C', :r, :R, 'r', 'R'
+        # c0 or r1 or C*, and so on
+        tag.collect{|elem| elem.to_s}.join('')
+      else
+        tag
+      end
+    elsif tag.kind_of?(TkWindow)
+      _epath(tag)
+    else
+      tag
+    end
+  end
+
+  def tagid2obj(tagid)
+    tagid
+  end
+
+  ############################################
+
+  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)
+  end
+
+  def configinfo(container, *args)
+    __itemconfiginfo([container], *args)
+  end
+
+  def current_configinfo(container, *args)
+    __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)
+      # container, item, item, ... , hash_optkeys
+      keys = args.pop
+      fail ArgumentError, 'no item is given' if args.empty?
+      id = [container]
+      args.each{|item| id << tagid(item)}
+      __itemconfigure(id, keys)
+    else
+      # container, item, item, ... , option, value
+      val = args.pop
+      opt = args.pop
+      fail ArgumentError, 'no item is given' if args.empty?
+      id = [container]
+      args.each{|item| id << tagid(item)}
+      __itemconfigure(id, opt, val)
+    end
+    container
+  end
+
+  def itemconfiginfo(container, *args)
+    slot = args[-1]
+    if slot.kind_of?(String) || slot.kind_of?(Symbol)
+      slot = slot.to_s
+      if slot[0] == ?. || slot =~ /^\d+,\d+$/ || slot =~ /^(c|C|r|R)(\*|\d+)/
+        #   widget     ||    row,col          ||    Ci or Ri
+        slot = nil
+      else
+        # option
+        slot = args.pop
+      end
+    else
+      slot = nil
+    end
+
+    fail ArgumentError, 'no item is given' if args.empty?
+
+    id = [container]
+    args.each{|item| id << tagid(item)}
+    __itemconfiginfo(id, slot)
+  end
+
+  def current_itemconfiginfo(container, *args)
+    slot = args[-1]
+    if slot.kind_of?(String) || slot.kind_of?(Symbol)
+      slot = slot.to_s
+      if slot[0] == ?. || slot =~ /^\d+,\d+$/ || slot =~ /^(c|C|r|R)(\*|\d+)/
+        #   widget     ||    row,col          ||    Ci or Ri
+        slot = nil
+      else
+        # option
+        slot = args.pop
+      end
+    else
+      slot = nil
+    end
+
+    fail ArgumentError, 'no item is given' if args.empty?
+
+    id = [container]
+    args.each{|item| id << tagid(item)}
+    __current_itemconfiginfo(id, slot)
+  end
+
+  def info(container)
+    ret = {}
+    inf = list(tk_call('::blt::table', 'info', container))
+    until inf.empty?
+      opt = inf.slice!(0..1)
+      ret[opt[1..-1]] = opt[1]
+    end
+    ret
+  end
+
+  def iteminfo(container, item)
+    inf = list(tk_call('::blt::table', 'info', container, tagid(item)).chomp)
+
+    ret = []
+    until inf.empty? || (inf[0].kind_of?(String) && inf[0] =~ /^-/)
+      ret << inf.shift
+    end
+
+    if inf.length > 1
+      keys = {}
+      while inf.length > 1
+        opt = inf.slice!(0..1)
+        keys[opt[0][1..-1]] = opt[1]
+      end
+      ret << keys
+    end
+
+    ret
+  end
+
+  ############################################
+
+  def create_container(container)
+    tk_call('::blt::table', container)
+    begin
+      class << container
+        include Tk::BLT::Table::TableContainer
+      end
+    rescue
+      warn('fail to include TableContainer methods (frozen object?)')
+    end
+    container
+  end
+
+  def add(container, *args)
+    if args.empty?
+      tk_call('::blt::table', container)
+    else
+      args = args.collect{|arg|
+        if arg.kind_of?(TkWindow)
+          _epath(arg)
+        elsif arg.kind_of?(Array)  # index
+          arg.join(',')
+        else
+          arg
+        end
+      }
+      tk_call('::blt::table', container, *args)
+    end
+    container
+  end
+
+  def arrange(container)
+    tk_call('::blt::table', 'arrange', container)
+    container
+  end
+
+  def delete(container, *args)
+    tk_call('::blt::table', 'delete', container, *args)
+  end
+
+  def extents(container, item)
+    ret = []
+    inf = list(tk_call('::blt::table', 'extents', container, item))
+    ret << inf.slice!(0..4) until inf.empty?
+    ret
+  end
+
+  def forget(*wins)
+    wins = wins.collect{|win| _epath(win)}
+    tk_call('::blt::table', 'forget', *wins)
+  end
+
+  def insert(container, *args)
+    tk_call('::blt::table', 'insert', container, *args)
+  end
+
+  def insert_before(container, *args)
+    tk_call('::blt::table', 'insert', container, '-before', *args)
+  end
+
+  def insert_after(container, *args)
+    tk_call('::blt::table', 'insert', container, '-after', *args)
+  end
+
+  def join(container, first, last)
+    tk_call('::blt::table', 'join', container, first, last)
+  end
+
+  def locate(container, x, y)
+    tk_call('::blt::table', 'locate', container, x, y)
+  end
+
+  def containers(arg={})
+    list(tk_call('::blt::table', 'containers', *hash_kv(arg)))
+  end
+
+  def containers_pattern(pat)
+    list(tk_call('::blt::table', 'containers', '-pattern', pat))
+  end
+
+  def containers_slave(win)
+    list(tk_call('::blt::table', 'containers', '-slave', win))
+  end
+
+  def save(container)
+    tk_call('::blt::table', 'save', container)
+  end
+
+  def search(container, keys={})
+    list(tk_call('::blt::table', 'containers', *hash_kv(keys)))
+  end
+
+  def split(container, *args)
+    tk_call('::blt::table', 'split', container, *args)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tabnotebook.rb b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
new file mode 100644
index 0000000000..82936c67d3
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tabnotebook.rb
@@ -0,0 +1,110 @@
+#
+#  tkextlib/blt/tabnotebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tkextlib/blt/tabset.rb'
+
+module Tk::BLT
+  class Tabnotebook < Tabset
+    TkCommandNames = ['::blt::tabnotebook'.freeze].freeze
+    WidgetClassName = 'Tabnotebook'.freeze
+    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)
+      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
new file mode 100644
index 0000000000..c4716c7304
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tabset.rb
@@ -0,0 +1,504 @@
+#
+#  tkextlib/blt/tabset.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Tabset < TkWindow
+    class Tab < TkObject
+      include TkTreatItemFont
+
+      TabID_TBL = TkCore::INTERP.create_table
+
+      (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
+        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={})
+        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', '-name', @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
+            pos = 'end' unless pos
+            tk_call(@tpath, 'insert', pos, @id, keys)
+          end
+        else
+          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
+      end
+
+      #def bind(context, cmd=Proc.new, *args)
+      #  @t.tab_bind(@id, context, cmd, *args)
+      #  self
+      #end
+      def bind(context, *args)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @t.tab_bind(@id, context, cmd, *args)
+        self
+      end
+      #def bind_append(context, cmd=Proc.new, *args)
+      #  @t.tab_bind_append(@id, context, cmd, *args)
+      #  self
+      #end
+      def bind_append(context, *args)
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @t.tab_bind_append(@id, context, cmd, *args)
+        self
+      end
+      def bind_remove(context)
+        @t.tab_bind_remove(@id, context)
+        self
+      end
+      def bindinfo(context=nil)
+        @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
+      def configinfo(*args)
+        @t.tab_configinfo(@id, *args)
+      end
+      def current_configinfo(*args)
+        @t.current_tab_configinfo(@id, *args)
+      end
+
+      def delete()
+        @t.delete(@id)
+        TabID_TBL.mutex.synchronize{
+          TabID_TBL[@tpath].delete(@id)
+        }
+        self
+      end
+
+      def get_name()
+        @id.dup
+      end
+
+      def focus()
+        @t.focus(self.index)
+      end
+
+      def index()
+        @t.index_name(@id)
+      end
+
+      def invoke()
+        @t.invoke(self.index)
+      end
+
+      def move_before(idx)
+        @t.move_before(self.index, idx)
+      end
+      def move_after(idx)
+        @t.move_after(self.index, idx)
+      end
+
+      def perforation_highlight(mode)
+        @t.perforation_highlight(self.index, mode)
+      end
+      def perforation_invoke()
+        @t.perforation_invoke(self.index)
+      end
+
+      def see()
+        @t.see(self.index)
+      end
+
+      def tearoff(name=None)
+        @t.tab_tearoff(self.index, *args)
+      end
+    end
+
+    ########################################
+
+    class NamedTab < Tab
+      def self.new(parent, name)
+        super(parent, nil, name, {})
+      end
+    end
+
+    ########################################
+
+    include X_Scrollable
+    include TkItemConfigMethod
+
+    TkCommandNames = ['::blt::tabset'.freeze].freeze
+    WidgetClassName = 'Tabset'.freeze
+    WidgetClassNames[WidgetClassName] ||= self
+
+    def __destroy_hook__
+      Tk::BLT::Tabset::Tab::TabID_TBL.mutex.synchronize{
+        Tk::BLT::Tabset::Tab::TabID_TBL.delete(@path)
+      }
+    end
+
+    ########################################
+
+    def __boolval_optkeys
+      super() << 'samewidth' << 'tearoff'
+    end
+    private :__strval_optkeys
+
+    def __strval_optkeys
+      super() << 'tabbackground' << 'tabforeground'
+    end
+    private :__strval_optkeys
+
+    def __item_cget_cmd(id)
+      [self.path, 'tab', 'cget', id]
+    end
+    private :__item_cget_cmd
+
+    def __item_config_cmd(id)
+      [self.path, 'tab', 'configure', id]
+    end
+    private :__item_config_cmd
+
+    def __item_pathname(tagOrId)
+      if tagOrId.kind_of?(Tk::BLT::Tabset::Tab)
+        self.path + ';' + tagOrId.id.to_s
+      else
+        self.path + ';' + tagOrId.to_s
+      end
+    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
+
+    def __item_strval_optkeys(id)
+      super(id) << 'shadow'
+    end
+    private :__item_strval_optkeys
+
+    def tagid(tab)
+      if tab.kind_of?(Tk::BLT::Tabset::Tab)
+        tab.id
+      else
+        tab
+      end
+    end
+
+    def tagindex(tab)
+      if tab.kind_of?(Tk::BLT::Tabset::Tab)
+        tab.index
+      else
+        tab
+      end
+    end
+
+    ########################################
+
+    def activate(index)
+      tk_send('activate', tagindex(index))
+      self
+    end
+    alias highlight activate
+
+    #def tabbind(tag, context, cmd=Proc.new, *args)
+    #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
+    #  self
+    #end
+    def tabbind(tag, context, *args)
+      # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind([path, "bind", tagid(tag)], context, cmd, *args)
+      self
+    end
+    #def tabbind_append(tag, context, cmd=Proc.new, *args)
+    #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+    #  self
+    #end
+    def tabbind_append(tag, context, *args)
+      # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+      if TkComm._callback_entry?(args[0]) || !block_given?
+        cmd = args.shift
+      else
+        cmd = Proc.new
+      end
+      _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+      self
+    end
+    def tabbind_remove(tag, context)
+      _bind_remove([path, "bind", tagid(tag)], context)
+      self
+    end
+    def tabbindinfo(tag, context=nil)
+      _bindinfo([path, "bind", tagid(tag)], context)
+    end
+
+    def delete(first, last=None)
+      tk_send('delete', tagindex(first), tagindex(last))
+      if first.kind_of?(Tk::BLT::Tabset::Tab)
+        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.mutex.synchronize{
+          TabID_TBL[@path].delete(last.id)
+        }
+      end
+      self
+    end
+
+    def focus(index)
+      tk_send('focus', tagindex(index))
+      self
+    end
+
+    def get_tab(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', '-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))
+    end
+
+    def move_before(index, base_idx)
+      tk_send('move', tagindex(index), 'before', tagindex(base_idx))
+      self
+    end
+    def move_after(index, base_idx)
+      tk_send('move', tagindex(index), 'after', tagindex(base_idx))
+      self
+    end
+
+    def nearest(x, y)
+      Tk::BLT::Tabset::Tab.id2obj(self, num_or_str(tk_send_without_enc('nearest', x, y)))
+    end
+
+    def perforation_activate(mode)
+      tk_send('perforation', 'activate', mode)
+      self
+    end
+    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)
+      tk_send_without_enc('scan', 'mark', x, y)
+      self
+    end
+    def scan_dragto(x, y)
+      tk_send_without_enc('scan', 'dragto', x, y)
+      self
+    end
+
+    def see(index)
+      tk_send('see', tagindex(index))
+      self
+    end
+
+    def size()
+      number(tk_send_without_enc('size'))
+    end
+
+    def select(index)
+      tk_send('select', tagindex(index))
+      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(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_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)
+      configure_cmd 'scrollcommand', cmd
+      self
+    end
+    alias scrollcommand xscrollcommand
+
+    def xview(*index)
+      if index.empty?
+        list(tk_send_without_enc('view'))
+      else
+        tk_send_without_enc('view', *index)
+        self
+      end
+    end
+    alias view xview
+    alias view_moveto xview_moveto
+    alias view_scroll xview_scroll
+
+    alias scrollbar xscrollbar
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/ted.rb b/ext/tk/lib/tkextlib/blt/ted.rb
new file mode 100644
index 0000000000..53ab9acdaa
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/ted.rb
@@ -0,0 +1,68 @@
+#
+#  tkextlib/blt/ted.rb
+#
+#    *** This is alpha version, because there is no document on BLT. ***
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Ted
+    extend TkCore
+
+    TkCommandNames = ['::blt::ted'.freeze].freeze
+
+    ##############################
+
+    extend TkItemConfigMethod
+
+    class << self
+      def __item_cget_cmd(id)
+        ['::blt::ted', 'cget', id]
+      end
+      private :__item_cget_cmd
+
+      def __item_config_cmd(id)
+        ['::blt::ted', 'configure', id]
+      end
+      private :__item_config_cmd
+
+      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)
+        itemcget(master, option)
+      end
+      def cget_strict(master, option)
+        itemcget_strict(master, option)
+      end
+      def configure(master, slot, value=None)
+        itemconfigure(master, slot, value)
+      end
+      def configinfo(master, slot=nil)
+        itemconfiginfo(master, slot)
+      end
+      def current_configinfo(master, slot=nil)
+        current_itemconfiginfo(master, slot)
+      end
+    end
+
+    ##############################
+
+    def self.edit(master, *args)
+      tk_call('::blt::ted', 'edit', master, *args)
+    end
+    def self.rep(master, *args)
+      tk_call('::blt::ted', 'rep', master, *args)
+    end
+    def self.select(master, *args)
+      tk_call('::blt::ted', 'select', master, *args)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile.rb b/ext/tk/lib/tkextlib/blt/tile.rb
new file mode 100644
index 0000000000..c67cafd8d6
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile.rb
@@ -0,0 +1,25 @@
+#
+#  tkextlib/blt/tile.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+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'
+    autoload :Radiobutton, 'tkextlib/blt/tile/radiobutton.rb'
+    autoload :RadioButton, 'tkextlib/blt/tile/radiobutton.rb'
+    autoload :Frame,       'tkextlib/blt/tile/frame.rb'
+    autoload :Label,       'tkextlib/blt/tile/label.rb'
+    autoload :Scrollbar,   'tkextlib/blt/tile/scrollbar.rb'
+    autoload :Toplevel,    'tkextlib/blt/tile/toplevel.rb'
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/button.rb b/ext/tk/lib/tkextlib/blt/tile/button.rb
new file mode 100644
index 0000000000..2e0863cfbe
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/button.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/button.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/button'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Button < Tk::Button
+      TkCommandNames = ['::blt::tile::button'.freeze].freeze
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
new file mode 100644
index 0000000000..da230b5925
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/checkbutton.rb
@@ -0,0 +1,17 @@
+#
+#  tkextlib/blt/tile/checkbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/checkbutton'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class CheckButton < Tk::CheckButton
+      TkCommandNames = ['::blt::tile::checkbutton'.freeze].freeze
+    end
+    Checkbutton = CheckButton
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/frame.rb b/ext/tk/lib/tkextlib/blt/tile/frame.rb
new file mode 100644
index 0000000000..5434af4b72
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/frame.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/frame.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Frame < Tk::Frame
+      TkCommandNames = ['::blt::tile::frame'.freeze].freeze
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/label.rb b/ext/tk/lib/tkextlib/blt/tile/label.rb
new file mode 100644
index 0000000000..f370c1403b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/label.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/label.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/label'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Label < Tk::Label
+      TkCommandNames = ['::blt::tile::label'.freeze].freeze
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
new file mode 100644
index 0000000000..814f9a5cc4
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/radiobutton.rb
@@ -0,0 +1,17 @@
+#
+#  tkextlib/blt/tile/radiobutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/radiobutton'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class RadioButton < Tk::RadioButton
+      TkCommandNames = ['::blt::tile::radiobutton'.freeze].freeze
+    end
+    Radiobutton = RadioButton
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb b/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
new file mode 100644
index 0000000000..2ae871d518
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/scrollbar.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/scrollbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/scrollbar'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Scrollbar < Tk::Scrollbar
+      TkCommandNames = ['::blt::tile::scrollbar'.freeze].freeze
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tile/toplevel.rb b/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
new file mode 100644
index 0000000000..76d5f86b1b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tile/toplevel.rb
@@ -0,0 +1,16 @@
+#
+#  tkextlib/blt/tile/toplevel.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/toplevel'
+require 'tkextlib/blt/tile.rb'
+
+module Tk::BLT
+  module Tile
+    class Toplevel < Tk::Toplevel
+      TkCommandNames = ['::blt::tile::toplevel'.freeze].freeze
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/tree.rb b/ext/tk/lib/tkextlib/blt/tree.rb
new file mode 100644
index 0000000000..1a3563e60d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/tree.rb
@@ -0,0 +1,1058 @@
+#
+#  tkextlib/blt/tree.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Tree < TkObject
+    TkCommandNames = ['::blt::tree'.freeze].freeze
+
+    ###################################
+
+    class Node < TkObject
+      TreeNodeID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        TreeNodeID_TBL.mutex.synchronize{ TreeNodeID_TBL.clear }
+      }
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        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
+
+      def self.new(tree, parent, keys={})
+        keys = _symbolkey2str(keys)
+        tpath = tree.path
+
+        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
+
+          (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
+
+        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
+      end
+
+      def id
+        @id
+      end
+
+      def apply(keys={})
+        @tree.apply(@id, keys)
+        self
+      end
+
+      def children()
+        @tree.children(@id)
+      end
+
+      def copy(parent, keys={})
+        @tree.copy(@id, parent, keys)
+      end
+      def copy_to(dest_tree, parent, keys={})
+        @tree.copy_to(@id, dest_tree, parent, keys)
+      end
+
+      def degree()
+        @tree.degree(@id)
+      end
+
+      def delete()
+        @tree.delete(@id)
+        self
+      end
+
+      def depth()
+        @tree.depth(@id)
+      end
+
+      def dump()
+        @tree.dump(@id)
+      end
+
+      def dump_to_file(file)
+        @tree.dump_to_file(@id, file)
+        self
+      end
+
+      def exist?(keys={})
+        @tree.exist?(@id, keys)
+      end
+
+      def find(keys={})
+        @tree.find(@id, keys)
+      end
+
+      def find_child(label)
+        @tree.find_child(@id, label)
+      end
+
+      def first_child()
+        @tree.first_child(@id)
+      end
+
+      def get()
+        @tree.get(@id)
+      end
+      def get_value(key, default_val=None)
+        @tree.get_value(@id, key, default_val)
+      end
+
+      def index()
+        @tree.index(@id)
+      end
+
+      def leaf?()
+        @tree.leaf?(@id)
+      end
+      def link?()
+        @tree.link?(@id)
+      end
+      def root?()
+        @tree.root?(@id)
+      end
+
+      def keys()
+        @tree.keys(@id)
+      end
+
+      def label(text = nil)
+        @tree.label(@id, nil)
+      end
+      def label=(text)
+        @tree.label(@id, text)
+      end
+
+      def last_child()
+        @tree.last_child(@id)
+      end
+
+      def move(dest, keys={})
+        @tree.keys(@id, dest, keys)
+        self
+      end
+
+      def next()
+        @tree.next(@id)
+      end
+
+      def next_sibling()
+        @tree.next_sibling(@id)
+      end
+
+      def parent()
+        @tree.parent(@id)
+      end
+
+      def fullpath()
+        @tree.fullpath(@id)
+      end
+
+      def position()
+        @tree.position(@id)
+      end
+
+      def previous()
+        @tree.previous(@id)
+      end
+
+      def prev_sibling()
+        @tree.prev_sibling(@id)
+      end
+
+      def restore(str, keys={})
+        @tree.restore(@id, str, keys)
+        self
+      end
+      def restore_overwrite(str, keys={})
+        @tree.restore_overwrite(@id, str, keys)
+        self
+      end
+
+      def restore_from_file(file, keys={})
+        @tree.restore_from_file(@id, file, keys)
+        self
+      end
+      def restore_overwrite_from_file(file, keys={})
+        @tree.restore_overwrite_from_file(@id, file, keys)
+        self
+      end
+
+      def root()
+        @tree.root(@id)
+        self
+      end
+
+      def set(data)
+        @tree.set(@id, data)
+        self
+      end
+
+      def size()
+        @tree.size(@id)
+      end
+
+      def sort(keys={})
+        @tree.sort(@id, keys)
+        self
+      end
+
+      def type(key)
+        @tree.type(@id, key)
+      end
+
+      def unset(*keys)
+        @tree.unset(@id, *keys)
+        self
+      end
+
+      def values(key=None)
+        @tree.values(@id, key)
+      end
+    end
+
+    ###################################
+
+    class Tag < TkObject
+      TreeTagID_TBL = TkCore::INTERP.create_table
+
+      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
+        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)
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        if tag_str
+          @path = @id = tag_str.dup.freeze
+        else
+          TreeTag_ID.mutex.synchronize{
+            @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_)
+            TreeTag_ID[1].succ!
+          }
+        end
+        TreeTagID_TBL.mutex.synchronize{
+          TreeTagID_TBL[@tpath] = {} unless TreeTagID_TBL[@tpath]
+          TreeTagID_TBL[@tpath][@id] = self
+        }
+      end
+
+      def id
+        @id
+      end
+
+      def add(*nodes)
+        tk_call(@tpath, 'tag', 'add', @id, *nodes)
+        self
+      end
+
+      def delete(*nodes)
+        tk_call(@tpath, 'tag', 'delete', @id, *nodes)
+        self
+      end
+
+      def forget()
+        tk_call(@tpath, 'tag', 'forget', @id)
+        TreeTagID_TBL.mutex.synchronize{
+          TreeTagID_TBL[@tpath].delete(@id)
+        }
+        self
+      end
+
+      def nodes()
+        simplelist(tk_call(@tpath, 'tag', 'nodes', @id)).collect{|node|
+          Tk::BLT::Tree::Node.id2obj(@path, node)
+        }
+      end
+
+      def set(node)
+        tk_call(@tpath, 'tag', 'set', node, @id)
+        self
+      end
+
+      def unset(node)
+        tk_call(@tpath, 'tag', 'unset', node, @id)
+        self
+      end
+    end
+
+    ###################################
+
+    class Notify < TkObject
+      NotifyID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        NotifyID_TBL.mutex.synchronize{ NotifyID_TBL.clear }
+      }
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        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
+
+      def self.new(tree, *args, &b)
+        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
+          end
+
+          (obj = self.allocate).instance_eval{
+            initialize(tree, *args, &b)
+            NotifyID_TBL[@tpath] ||= {}
+            NotifyID_TBL[@tpath][@id] = self
+          }
+          return obj
+        }
+      end
+
+      def initialize(tree, *args, &b)
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0])
+          cmd = args.shift
+        # elsif args[-1].kind_of?(Proc) || args[-1].kind_of?(Method)
+        elsif TkComm._callback_entry?(args[-1])
+          cmd = args.pop
+        elsif b
+          cmd = Proc.new(&b)
+        else
+          fail ArgumentError, "lack of 'command' argument"
+        end
+
+        args = args.collect{|arg| '-' << arg.to_s}
+
+        args << proc{|id, type|
+          cmd.call(Tk::BLT::Tree::Node.id2obj(@tree, id),
+                   ((type[0] == ?-)? type[1..-1]: type))
+        }
+
+        @path = @id = tk_call(@tpath, 'notify', 'create', *args)
+      end
+
+      def id
+        @id
+      end
+
+      def delete()
+        tk_call(@tpath, 'notify', 'delete', @id)
+        NotifyID_TBL.mutex.synchronize{
+          NotifyID_TBL[@tpath].delete(@id)
+        }
+        self
+      end
+
+      def info()
+        lst = simplelist(tk_call(@tpath, 'notify', 'info', id))
+        lst[0] = Tk::BLT::Tree::Notify.id2obj(@tree, lst[0])
+        lst[1] = simplelist(lst[1]).collect{|flag| flag[1..-1]}
+        lst[2] = tk_tcl2ruby(lst[2])
+        lst
+      end
+    end
+
+    ###################################
+
+    class Trace < TkObject
+      TraceID_TBL = TkCore::INTERP.create_table
+
+      TkCore::INTERP.init_ip_env{
+        TraceID_TBL.mutex.synchronize{ TraceID_TBL.clear }
+      }
+
+      def self.id2obj(tree, id)
+        tpath = tree.path
+        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
+
+      def self.new(tree, *args, &b)
+        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
+          end
+
+          # 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(tree, node, key, opts, cmd=nil, &b)
+        @parent = @tree = tree
+        @tpath = @parent.path
+
+        if !cmd
+          if b
+            cmd = Proc.new(&b)
+          else
+            fail ArgumentError, "lack of 'command' argument"
+          end
+        end
+
+        @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)
+                                else
+                                  nobj = id
+                                end
+                                cmd.call(tobj, nobj, k, ops)
+                              })
+      end
+
+      def id
+        @id
+      end
+
+      def delete()
+        tk_call(@tpath, 'trace', 'delete', @id)
+        TraceID_TBL.mutex.synchronize{
+          TraceID_TBL[tpath].delete(@id)
+        }
+        self
+      end
+
+      def info()
+        lst = simplelist(tk_call(@tpath, 'trace', 'info', id))
+        lst[0] = Tk::BLT::Tree::Trace.id2obj(@tree, lst[0])
+        lst[2] = simplelist(lst[2])
+        lst[3] = tk_tcl2ruby(lst[3])
+        lst
+      end
+    end
+
+    ###################################
+
+    TreeID_TBL = TkCore::INTERP.create_table
+
+    (Tree_ID = ['blt_tree'.freeze, TkUtil.untrust('00000')]).instance_eval{
+      @mutex = Mutex.new
+      def mutex; @mutex; end
+      freeze
+    }
+
+    def __keyonly_optkeys
+      {
+        # apply / find  command
+        'invert'=>nil, 'leafonly'=>nil, 'nocase'=>nil,
+
+        # apply / find / sort command
+        'path'=>nil,
+
+        # copy / restore / restorefile command
+        'overwrite'=>nil,
+
+        # copy command
+        'recurse'=>nil, 'tags'=>nil,
+
+        # sort command
+        'ascii'=>nil, 'decreasing'=>nil, 'disctionary'=>nil,
+        'integer'=>nil, 'real'=>nil, 'recurse'=>nil, 'reorder'=>nil,
+      }
+    end
+
+    def self.id2obj(id)
+      TreeID_TBL.mutex.synchronize{
+        TreeID_TBL[id]? TreeID_TBL[id]: id
+      }
+    end
+
+    def self.names(pat = None)
+      simplelist(tk_call('::blt::tree', 'names', pat)).collect{|name|
+        id2obj(name)
+      }
+    end
+
+    def self.destroy(*names)
+      tk_call('::blt::tree', 'destroy',
+              *(names.collect{|n| (n.kind_of?(Tk::BLT::Tree))? n.id: n }) )
+    end
+
+    def self.new(name = nil)
+      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
+        Tree_ID.mutex.synchronize{
+          @path = @id = Tree_ID.join(TkCore::INTERP._ip_id_)
+          Tree_ID[1].succ!
+        }
+      end
+
+      tk_call('::blt::tree', 'create', @id)
+    end
+
+    def __destroy_hook__
+      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)
+      if tag.kind_of?(Tk::BLT::Tree::Node) ||
+          tag.kind_of?(Tk::BLT::Tree::Tag) ||
+          tag.kind_of?(Tk::BLT::Tree::Notify) ||
+          tag.kind_of?(Tk::BLT::Tree::Trace)
+        tag.id
+      else
+        tag  # maybe an Array of configure parameters
+      end
+    end
+
+    def destroy()
+      tk_call('::blt::tree', 'destroy', @id)
+      self
+    end
+
+    def ancestor(node1, node2)
+      Tk::BLT::Tree::Node.id2obj(self, tk_call('::blt::tree', 'ancestor',
+                                               tagid(node1), tagid(node2)))
+    end
+
+    def apply(node, keys={})
+      tk_call('::blt::tree', 'apply', tagid(node), __conv_keyonly_opts(keys))
+      self
+    end
+
+    def attach(tree_obj)
+      tk_call('::blt::tree', 'attach', tree_obj)
+      self
+    end
+
+    def children(node)
+      simplelist(tk_call('::blt::tree', 'children', tagid(node))).collect{|n|
+        Tk::BLT::Tree::Node.id2obj(self, n)
+      }
+    end
+
+    def copy(src, parent, keys={})
+      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,
+                   tagid(parent), __conv_keyonly_opts(keys))
+      Tk::BLT::Tree::Node.new(dest_tree, nil, 'node'=>id)
+    end
+
+    def degree(node)
+      number(tk_call('::blt::tree', 'degree', tagid(node)))
+    end
+
+    def delete(*nodes)
+      tk_call('::blt::tree', 'delete', *(nodes.collect{|node| tagid(node)}))
+      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
+
+    def depth(node)
+      number(tk_call('::blt::tree', 'depth', tagid(node)))
+    end
+
+    def dump(node)
+      simplelist(tk_call('::blt::tree', 'dump', tagid(node))).collect{|n|
+        simplelist(n)
+      }
+    end
+
+    def dump_to_file(node, file)
+      tk_call('::blt::tree', 'dumpfile', tagid(node), file)
+      self
+    end
+
+    def exist?(node, key=None)
+      bool(tk_call('::blt::tree', 'exists', tagid(node), key))
+    end
+
+    def find(node, keys={})
+      simplelist(tk_call('::blt::tree', 'find', tagid(node),
+                         __conv_keyonly_opts(keys))).collect{|n|
+        Tk::BLT::Tree::Node.id2obj(self, n)
+      }
+    end
+
+    def find_child(node, label)
+      ret = tk_call('::blt::tree', 'findchild', tagid(node), label)
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def first_child(node)
+      ret = tk_call('::blt::tree', 'firstchild', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def get(node)
+      Hash[*simplelist(tk_call('::blt::tree', 'get', tagid(node)))]
+    end
+    def get_value(node, key, default_val=None)
+      tk_call('::blt::tree', 'get', tagid(node), key, default_val)
+    end
+
+    def index(node)
+      Tk::BLT::Tree::Node.id2obj(self,
+                                 tk_call('::blt::tree', 'index', tagid(node)))
+    end
+
+    def insert(parent, keys={})
+      id = tk_call('::blt::tree', 'insert', tagid(parent), keys)
+      Tk::BLT::Tree::Node.new(self, nil, 'node'=>id)
+    end
+
+    def ancestor?(node1, node2)
+      bool(tk_call('::blt::tree', 'is', 'ancestor',
+                   tagid(node1), tagid(node2)))
+    end
+    def before?(node1, node2)
+      bool(tk_call('::blt::tree', 'is', 'before',
+                   tagid(node1), tagid(node2)))
+    end
+    def leaf?(node)
+      bool(tk_call('::blt::tree', 'is', 'leaf', tagid(node)))
+    end
+    def link?(node)
+      bool(tk_call('::blt::tree', 'is', 'link', tagid(node)))
+    end
+    def root?(node)
+      bool(tk_call('::blt::tree', 'is', 'root', tagid(node)))
+    end
+
+    def keys(node, *nodes)
+      if nodes.empty?
+        simplelist(tk_call('blt::tree', 'keys', tagid(node)))
+      else
+        simplelist(tk_call('blt::tree', 'keys', tagid(node),
+                           *(nodes.collect{|n| tagid(n)}))).collect{|lst|
+          simplelist(lst)
+        }
+      end
+    end
+
+    def label(node, text=nil)
+      if text
+        tk_call('::blt::tree', 'label', tagid(node), text)
+        text
+      else
+        tk_call('::blt::tree', 'label', tagid(node))
+      end
+    end
+
+    def last_child(node)
+      ret = tk_call('::blt::tree', 'lastchild', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def link(parent, node, keys={})
+      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
+
+    def move(node, dest, keys={})
+      tk_call('::blt::tree', 'move', tagid(node), tagid(dest), keys)
+      self
+    end
+
+    def next(node)
+      ret = tk_call('::blt::tree', 'next', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def next_sibling(node)
+      ret = tk_call('::blt::tree', 'nextsibling', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def notify_create(*args, &b)
+      Tk::BLT::Tree::Notify.new(self, *args, &b)
+    end
+
+    def notify_delete(id)
+      if id.kind_of?(Tk::BLT::Tree::Notify)
+        id.delete
+      else
+        tk_call(@path, 'notify', 'delete', id)
+        Tk::BLT::Tree::Notify::NotifyID_TBL.mutex.synchronize{
+          Tk::BLT::Tree::Notify::NotifyID_TBL[@path].delete(id.to_s)
+        }
+      end
+      self
+    end
+
+    def notify_info(id)
+      lst = simplelist(tk_call(@path, 'notify', 'info', tagid(id)))
+      lst[0] = Tk::BLT::Tree::Notify.id2obj(self, lst[0])
+      lst[1] = simplelist(lst[1]).collect{|flag| flag[1..-1]}
+      lst[2] = tk_tcl2ruby(lst[2])
+      lst
+    end
+
+    def notify_names()
+      tk_call(@path, 'notify', 'names').collect{|id|
+        Tk::BLT::Tree::Notify.id2obj(self, id)
+      }
+    end
+
+    def parent(node)
+      ret = tk_call('::blt::tree', 'parent', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def fullpath(node)
+      tk_call('::blt::tree', 'path', tagid(node))
+    end
+
+    def position(node)
+      number(tk_call('::blt::tree', 'position', tagid(node)))
+    end
+
+    def previous(node)
+      ret = tk_call('::blt::tree', 'previous', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def prev_sibling(node)
+      ret = tk_call('::blt::tree', 'prevsibling', tagid(node))
+      (ret == '-1')? nil: Tk::BLT::Tree::Node.id2obj(self, ret)
+    end
+
+    def restore(node, str, keys={})
+      tk_call('::blt::tree', 'restore', tagid(node), str,
+              __conv_keyonly_opts(keys))
+      self
+    end
+    def restore_overwrite(node, str, keys={})
+      keys = __conv_keyonly_opts(keys)
+      keys.delete('overwrite')
+      keys.delete(:overwrite)
+      tk_call('::blt::tree', 'restore', tagid(node), str, '-overwrite', keys)
+      self
+    end
+
+    def restore_from_file(node, file, keys={})
+      tk_call('::blt::tree', 'restorefile', tagid(node), file,
+              __conv_keyonly_opts(keys))
+      self
+    end
+    def restore_overwrite_from_file(node, file, keys={})
+      keys = __conv_keyonly_opts(keys)
+      keys.delete('overwrite')
+      keys.delete(:overwrite)
+      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',
+                                               tagid(node)))
+    end
+
+    def set(node, data)
+      unless data.kind_of?(Hash)
+        fail ArgumentError, 'Hash is expected for data'
+      end
+      args = []
+      data.each{|k, v|  args << k << v}
+      tk_call('::blt::tree', 'set', tagid(node), *args)
+      self
+    end
+
+    def size(node)
+      number(tk_call('::blt::tree', 'size', tagid(node)))
+    end
+
+    def sort(node, keys={})
+      tk_call('::blt::tree', 'sort', tagid(node), __conv_keyonly_opts(keys))
+      self
+    end
+
+    def tag_add(tag, *nodes)
+      tk_call(@path, 'tag', 'add', tagid(tag), *(nodes.collect{|n| tagid(n)}))
+      self
+    end
+
+    def tag_delete(tag, *nodes)
+      tk_call(@path, 'tag', 'delete', tagid(tag),
+              *(nodes.collect{|n| tagid(n)}))
+      self
+    end
+
+    def tag_forget(tag)
+      tag = tag.id if tag.kind_of?(Tk::BLT::Tree::Tag)
+      tk_call(@path, 'tag', 'forget', 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),
+                         *(patterns.collect{|pat| tagid(pat)}))).collect{|str|
+        Tk::BLT::Tree::Tag.id2obj(self, str)
+      }
+    end
+
+    def tag_names(node = None)
+      simplelist(tk_call(@tpath, 'tag', 'names', tagid(node))).collect{|str|
+        Tk::BLT::Tree::Tag.id2obj(self, str)
+      }
+    end
+
+    def tag_nodes(tag)
+      simplelist(tk_call(@tpath, 'tag', 'nodes', tagid(tag))).collect{|node|
+        Tk::BLT::Tree::Node.id2obj(self, node)
+      }
+    end
+
+    def tag_set(node, *tags)
+      tk_call(@path, 'tag', 'set', tagid(node), *(tags.collect{|t| tagid(t)}))
+      self
+    end
+
+    def tag_unset(node, *tags)
+      tk_call(@path, 'tag', 'unset', tagid(node),
+              *(tags.collect{|t| tagid(t)}))
+      self
+    end
+
+    def trace_create(*args, &b)
+      Tk::BLT::Tree::Trace.new(self, *args, &b)
+    end
+
+=begin
+    def trace_delete(*args)
+      args.each{|id|
+        if id.kind_of?(Tk::BLT::Tree::Trace)
+          id.delete
+        else
+          tk_call(@path, 'trace', 'delete', id)
+          Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)
+        end
+        self
+      }
+    end
+=end
+    def trace_delete(*args)
+      args = args.collect{|id| tagid(id)}
+      tk_call(@path, 'trace', 'delete', *args)
+      Tk::BLT::Tree::Trace::TraceID_TBL.mutex.synchronize{
+        args.each{|id| Tk::BLT::Tree::Trace::TraceID_TBL[@path].delete(id.to_s)}
+      }
+      self
+    end
+
+    def trace_info(id)
+      lst = simplelist(tk_call(@path, 'trace', 'info', tagid(id)))
+      lst[0] = Tk::BLT::Tree::Trace.id2obj(self, lst[0])
+      lst[2] = simplelist(lst[2])
+      lst[3] = tk_tcl2ruby(lst[3])
+      lst
+    end
+
+    def trace_names()
+      tk_call(@path, 'trace', 'names').collect{|id|
+        Tk::BLT::Tree::Trace.id2obj(self, id)
+      }
+    end
+
+    def type(node, key)
+      tk_call('::blt::tree', 'type', tagid(node), key)
+    end
+
+    def unset(node, *keys)
+      tk_call('::blt::tree', 'unset', tagid(node), *keys)
+      self
+    end
+
+    def values(node, key=None)
+      simplelist(tk_call('::blt::tree', 'values', tagid(node), key))
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/treeview.rb b/ext/tk/lib/tkextlib/blt/treeview.rb
new file mode 100644
index 0000000000..38d90412e0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/treeview.rb
@@ -0,0 +1,1287 @@
+#
+#  tkextlib/blt/treeview.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+require 'tk/validation.rb'
+
+module Tk::BLT
+  class Treeview < TkWindow
+    module ConfigMethod
+    end
+
+    module TagOrID_Methods
+    end
+
+    class Node < TkObject
+    end
+
+    class Tag < TkObject
+    end
+  end
+
+  class Hiertable < Treeview
+  end
+end
+
+######################################
+
+module Tk::BLT::Treeview::ConfigMethod
+  include TkItemConfigMethod
+
+  def __item_boolval_optkeys(id)
+    case id
+    when Array
+      # id := [ 'column', name ]
+      ['edit', 'hide']
+    when 'sort'
+      ['decreasing']
+    else
+      []
+    end
+  end
+  private :__item_boolval_optkeys
+
+  def __item_strval_optkeys(id)
+    case id
+    when Array
+      # id := [ 'column', name ]
+      super() << 'titleforeground' << 'titleshadow'
+    when 'sort'
+      ['decreasing']
+    else
+      []
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_listval_optkeys(id)
+    case id
+    when 'entry'
+      ['bindtags']
+    else
+      []
+    end
+  end
+  private :__item_listval_optkeys
+
+  def __item_cget_cmd(id)
+    if id.kind_of?(Array)
+      # id := [ type, name ]
+      [self.path, id[0], 'cget', id[1]]
+    else
+      [self.path, id, 'cget']
+    end
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    if id.kind_of?(Array)
+      # id := [ type, name ]
+      [self.path, id[0], 'configure', id[1]]
+    else
+      [self.path, id, 'configure']
+    end
+  end
+  private :__item_config_cmd
+
+  def __item_pathname(id)
+    if id.kind_of?(Array)
+      id = tagid(id[1])
+    end
+    [self.path, id].join(';')
+  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
+  def column_configinfo(name, slot=nil)
+    itemconfiginfo(['column', name], slot)
+  end
+  def current_column_configinfo(name, slot=nil)
+    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
+  def button_configinfo(slot=nil)
+    itemconfiginfo('button', slot)
+  end
+  def current_button_configinfo(slot=nil)
+    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
+      ret.collect{|tag| TkBindTag.id2obj(tag)}
+    else
+      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
+  def entry_configinfo(slot=nil)
+    ret = itemconfiginfo('entry', slot)
+
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        if slot == 'bindtags' || slot == :bindtags
+          ret[-2] = ret[-2].collect{|tag| TkBindTag.id2obj(tag)}
+          ret[-1] = ret[-1].collect{|tag| TkBindTag.id2obj(tag)}
+        end
+      else
+        inf = ret.assoc('bindtags')
+        inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+        inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (inf = ret['bindtags'])
+        inf[-2] = inf[-2].collect{|tag| TkBindTag.id2obj(tag)}
+        inf[-1] = inf[-1].collect{|tag| TkBindTag.id2obj(tag)}
+        ret['bindtags'] = inf
+      end
+    end
+
+    ret
+  end
+  def current_entry_configinfo(slot=nil)
+    ret = current_itemconfiginfo('entry', slot)
+
+    if (val = ret['bindtags'])
+      ret['bindtags'] = val.collect{|tag| TkBindTag.id2obj(tag)}
+    end
+
+    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
+  def sort_configinfo(slot=nil)
+    itemconfiginfo('sort', slot)
+  end
+  def current_sort_configinfo(slot=nil)
+    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
+  def text_configinfo(slot=nil)
+    itemconfiginfo('text', slot)
+  end
+  def current_text_configinfo(slot=nil)
+    current_itemconfiginfo('text', slot)
+  end
+
+  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
+
+  include Scrollable
+  include ValidateConfigure
+  include ItemValidateConfigure
+  include Tk::BLT::Treeview::ConfigMethod
+
+  ########################
+
+  def __boolval_optkeys
+    ['autocreate', 'allowduplicates', 'exportselection', 'flat', 'hideroot',
+      'newtags', 'showtitles', 'sortselection']
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() + ['focusforeground', 'linecolor', 'separator', 'trim']
+  end
+  private :__strval_optkeys
+
+  ########################
+
+  class OpenCloseCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?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) ],
+        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)
+        val
+      end
+    end
+
+    def self._config_keys
+      ['opencommand', 'closecomand']
+    end
+  end
+
+  def __validation_class_list
+    super() << OpenCloseCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, OpenCloseCommand)
+
+  ########################
+
+  def __item_validation_class_list(id)
+    case id
+    when 'entry'
+      super(id) << OpenCloseCommand
+    else
+      super(id)
+    end
+  end
+
+  Tk::ItemValidateConfigure.__def_validcmd(binding, OpenCloseCommand)
+
+  ########################
+
+  def __destroy_hook__
+    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)
+    if tag.kind_of?(Tk::BLT::Treeview::Node) \
+      || tag.kind_of?(Tk::BLT::Treeview::Tag)
+      tag.id
+    else
+      tag  # maybe an Array of configure parameters
+    end
+  end
+  private :tagid
+
+  def tagid2obj(tagid)
+    if tagid.kind_of?(Integer)
+      Tk::BLT::Treeview::Node.id2obj(self, tagid.to_s)
+    elsif tagid.kind_of?(String)
+      if tagid =~ /^\d+$/
+        Tk::BLT::Treeview::Node.id2obj(self, tagid)
+      else
+        Tk::BLT::Treeview::Tag.id2obj(self, tagid)
+      end
+    else
+      tagid
+    end
+  end
+
+  def bbox(*tags)
+    list(tk_send('bbox', *(tags.collect{|tag| tagid(tag)})))
+  end
+
+  def screen_bbox(*tags)
+    list(tk_send('bbox', '-screen', *(tags.collect{|tag| tagid(tag)})))
+  end
+
+  def tag_bind(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def tag_bind_append(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def tag_bind_remove(tag, seq)
+    _bind_remove([@path, 'bind', tagid(tag)], seq)
+    self
+  end
+  def tag_bindinfo(tag, seq=nil)
+    _bindinfo([@path, 'bind', tagid(tag)], seq)
+  end
+
+  def button_activate(tag)
+    tk_send('button', 'activate', tagid(tag))
+    self
+  end
+
+  def button_bind(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def button_bind_append(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'button', 'bind', tagid(tag)], seq, cmd, *args)
+    self
+  end
+  def button_bind_remove(tag, seq)
+    _bind_remove([@path, 'button', 'bind', tagid(tag)], seq)
+    self
+  end
+  def button_bindinfo(tag, seq=nil)
+    _bindinfo([@path, 'button', 'bind', tagid(tag)], seq)
+  end
+
+  def close(*tags)
+    tk_send('close', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+  def close_recurse(*tags)
+    tk_send('close', '-recurse', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def column_activate(column=None)
+    if column == None
+      tk_send('column', 'activate')
+    else
+      tk_send('column', 'activate', column)
+      self
+    end
+  end
+
+  def column_delete(*fields)
+    tk_send('column', 'delete', *fields)
+    self
+  end
+  def column_insert(pos, field, *opts)
+    tk_send('column', 'insert', pos, field, *opts)
+    self
+  end
+  def column_invoke(field)
+    tk_send('column', 'invoke', field)
+    self
+  end
+  def column_move(name, dest)
+    tk_send('column', 'move', name, dest)
+    self
+  end
+  def column_names()
+    simplelist(tk_send('column', 'names'))
+  end
+  def column_nearest(x, y=None)
+    tk_send('column', 'nearest', x, y)
+  end
+
+  def curselection
+    simplelist(tk_send('curselection')).collect{|id| tagid2obj(id)}
+  end
+
+  def delete(*tags)
+    tk_send('delete', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def entry_activate(tag)
+    tk_send('entry', 'activate', tagid(tag))
+    self
+  end
+  def entry_children(tag, first=None, last=None)
+    simplelist(tk_send('entry', 'children', tagid(tag),
+                       first, last)).collect{|id| tagid2obj(id)}
+  end
+  def entry_delete(tag, first=None, last=None)
+    tk_send('entry', 'delete', tagid(tag), first, last)
+  end
+  def entry_before?(tag1, tag2)
+    bool(tk_send('entry', 'isbefore', tagid(tag1), tagid(tag2)))
+  end
+  def entry_hidden?(tag)
+    bool(tk_send('entry', 'ishidden', tagid(tag)))
+  end
+  def entry_open?(tag)
+    bool(tk_send('entry', 'isopen', tagid(tag)))
+  end
+
+  def entry_size(tag)
+    number(tk_send('entry', 'size', tagid(tag)))
+  end
+  def entry_size_recurse(tag)
+    number(tk_send('entry', 'size', '-recurse', tagid(tag)))
+  end
+
+  def _search_flags(keys)
+    keys = _symbolkey2str(keys)
+    keys['exact'] = None if keys.delete('exact')
+    keys['glob'] = None if keys.delete('glob')
+    keys['regexp'] = None if keys.delete('regexp')
+    keys['nonmatching'] = None if keys.delete('nonmatching')
+  end
+  private :_search_flags
+
+  ################################
+
+  class FindExecFlagValue < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL = [
+        [ ?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) ],
+        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)
+        val
+      end
+    end
+
+    def self._config_keys
+      []
+    end
+  end
+
+  def _find_exec_flag_value(val)
+    if val.kind_of?(Array)
+      cmd, *args = val
+      #FindExecFlagValue.new(cmd, args.join(' '))
+      FindExecFlagValue.new(cmd, *args)
+    elsif TkComm._callback_entry?(val)
+      FindExecFlagValue.new(val)
+    else
+      val
+    end
+  end
+
+  ################################
+
+  def find(first, last, keys={})
+    keys = _search_flags(keys)
+    keys['exec'] = _find_exec_flag_value(keys['exec']) if keys.key?('exec')
+    args = hash_kv(keys) << '--' << tagid(first) << tagid(last)
+    simplelist(tk_send('find', *args)).collect{|id| tagid2obj(id)}
+  end
+
+  def tag_focus(tag)
+    tk_send('focus', tagid(tag))
+    self
+  end
+  def get(*tags)
+    simplelist(tk_send('get', *(tags.collect{|tag| tagid(tag)})))
+  end
+  def get_full(*tags)
+    simplelist(tk_send('get', '-full', *(tags.collect{|tag| tagid(tag)})))
+  end
+
+  def hide(*tags)
+    if tags[-1].kind_of?(Hash)
+      keys = tags.pop
+    else
+      keys = {}
+    end
+    keys = _search_flags(keys)
+    args = hash_kv(keys) << '--'
+    args.concat(tags.collect{|t| tagid(t)})
+    tk_send('hide', *args)
+    self
+  end
+
+  def index(str)
+    tagid2obj(tk_send('index', str))
+  end
+  def index_at(tag, str)
+    tagid2obj(tk_send('index', '-at', tagid(tag), str))
+  end
+  def index_at_path(tag, str)
+    tagid2obj(tk_send('index', '-at', tagid(tag), '-path', str))
+  end
+
+  def insert(pos, parent=nil, keys={})
+    Tk::BLT::Treeview::Node.new(pos, parent, keys)
+  end
+  def insert_at(tag, pos, parent=nil, keys={})
+    if parent.kind_of?(Hash)
+      keys = parent
+      parent = nil
+    end
+
+    keys = _symbolkey2str(keys)
+    keys['at'] = tagid(tag)
+
+    Tk::BLT::Treeview::Node.new(pos, parent, keys)
+  end
+
+  def move_before(tag, dest)
+    tk_send('move', tagid(tag), 'before', tagid(dest))
+    self
+  end
+  def move_after(tag, dest)
+    tk_send('move', tagid(tag), 'after', tagid(dest))
+    self
+  end
+  def move_into(tag, dest)
+    tk_send('move', tagid(tag), 'into', tagid(dest))
+    self
+  end
+
+  def nearest(x, y, var=None)
+    tagid2obj(tk_send('nearest', x, y, var))
+  end
+
+  def open(*tags)
+    tk_send('open', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+  def open_recurse(*tags)
+    tk_send('open', '-recurse', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def range(first, last)
+    simplelist(tk_send('range', tagid(first), tagid(last))).collect{|id|
+      tagid2obj(id)
+    }
+  end
+  def range_open(first, last)
+    simplelist(tk_send('range', '-open',
+                       tagid(first), tagid(last))).collect{|id|
+      tagid2obj(id)
+    }
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+
+  def see(tag)
+    tk_send_without_enc('see', tagid(tag))
+    self
+  end
+  def see_anchor(anchor, tag)
+    tk_send_without_enc('see', '-anchor', anchor, tagid(tag))
+    self
+  end
+
+  def selection_anchor(tag)
+    tk_send_without_enc('selection', 'anchor', tagid(tag))
+    self
+  end
+  def selection_cancel()
+    tk_send_without_enc('selection', 'cancel')
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', tagid(first), tagid(last))
+    self
+  end
+  def selection_clear_all()
+    tk_send_without_enc('selection', 'clearall')
+    self
+  end
+  def selection_mark(tag)
+    tk_send_without_enc('selection', 'mark', tagid(tag))
+    self
+  end
+  def selection_include?(tag)
+    bool(tk_send('selection', 'include', tagid(tag)))
+  end
+  def selection_present?()
+    bool(tk_send('selection', 'present'))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', tagid(first), tagid(last))
+    self
+  end
+  def selection_toggle(first, last=None)
+    tk_send_without_enc('selection', 'toggle', tagid(first), tagid(last))
+    self
+  end
+
+  def show(*tags)
+    if tags[-1].kind_of?(Hash)
+      keys = tags.pop
+    else
+      keys = {}
+    end
+    keys = _search_flags(keys)
+    args = hash_kv(keys) << '--'
+    args.concat(tags.collect{|t| tagid(t)})
+    tk_send('show', *args)
+    self
+  end
+
+  def sort_auto(mode)
+    tk_send('sort', 'auto', mode)
+    self
+  end
+  def sort_auto=(mode)
+    tk_send('sort', 'auto', mode)
+    mode
+  end
+  def sort_auto?
+    bool(tk_send('sort', 'auto'))
+  end
+  def sort_once(*tags)
+    tk_send('sort', 'once', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+  def sort_once_recurse(*tags)
+    tk_send('sort', 'once', '-recurse', *(tags.collect{|tag| tagid(tag)}))
+    self
+  end
+
+  def tag_add(tag, *ids)
+    tk_send('tag', 'add', tagid(tag), *ids)
+    self
+  end
+  def tag_delete(tag, *ids)
+    tk_send('tag', 'delete', tagid(tag), *ids)
+    self
+  end
+  def tag_forget(tag)
+    tk_send('tag', 'forget', tagid(tag))
+    self
+  end
+  def tag_names(id=nil)
+    id = (id)? tagid(id): None
+
+    simplelist(tk_send('tag', 'nodes', id)).collect{|tag|
+      Tk::BLT::Treeview::Tag.id2obj(self, tag)
+    }
+  end
+  def tag_nodes(tag)
+    simplelist(tk_send('tag', 'nodes', tagid(tag))).collect{|id|
+      Tk::BLT::Treeview::Node.id2obj(self, id)
+    }
+  end
+
+  def text_apply
+    tk_send('text', 'apply')
+    self
+  end
+  def text_cancel
+    tk_send('text', 'cancel')
+    self
+  end
+
+  def text_delete(first, last)
+    tk_send('text', 'delete', first, last)
+    self
+  end
+  def text_get(x, y)
+    tk_send('text', 'get', x, y)
+  end
+  def text_get_root(x, y)
+    tk_send('text', 'get', '-root', x, y)
+  end
+  def text_icursor(idx)
+    tk_send('text', 'icursor', idx)
+    self
+  end
+  def text_index(idx)
+    num_or_str(tk_send('text', 'index', idx))
+  end
+  def text_insert(idx, str)
+    tk_send('text', 'insert', idx, str)
+    self
+  end
+
+  def text_selection_adjust(idx)
+    tk_send('text', 'selection', 'adjust', idx)
+    self
+  end
+  def text_selection_clear
+    tk_send('text', 'selection', 'clear')
+    self
+  end
+  def text_selection_from(idx)
+    tk_send('text', 'selection', 'from', idx)
+    self
+  end
+  def text_selection_present
+    num_or_str(tk_send('text', 'selection', 'present'))
+  end
+  def text_selection_range(start, last)
+    tk_send('text', 'selection', 'range', start, last)
+    self
+  end
+  def text_selection_to(idx)
+    tk_send('text', 'selection', 'to', idx)
+    self
+  end
+
+  def toggle(tag)
+    tk_send('toggle', tagid(tag))
+    self
+  end
+end
+
+######################################
+
+module Tk::BLT::Treeview::TagOrID_Methods
+  def bbox
+    @tree.bbox(self)
+  end
+  def screen_bbox
+    @tree.screen_bbox(self)
+  end
+
+  def bind(seq, *args)
+    @tree.tag_bind(self, seq, *args)
+    self
+  end
+  def bind_append(seq, *args)
+    @tree.tag_bind_append(self, seq, *args)
+    self
+  end
+  def bind_remove(seq)
+    @tree.tag_bind_remove(self, seq)
+    self
+  end
+  def bindinfo(seq=nil)
+    @tree.tag_bindinfo(self, seq)
+  end
+
+  def button_activate
+    @tree.button_activate(self)
+    self
+  end
+
+  def button_bind(seq, *args)
+    @tree.button_bind(self, seq, *args)
+    self
+  end
+  def button_bind_append(seq, *args)
+    @tree.button_bind_append(self, seq, *args)
+    self
+  end
+  def button_bind_remove(seq)
+    @tree.button_bind_remove(self, seq)
+    self
+  end
+  def button_bindinfo(seq=nil)
+    @tree.button_bindinfo(self, seq)
+  end
+
+  def close
+    @tree.close(self)
+    self
+  end
+  def close_recurse
+    @tree.close_recurse(self)
+    self
+  end
+
+  def delete
+    @tree.delete(self)
+    self
+  end
+
+  def entry_activate
+    @tree.entry_activate(self)
+    self
+  end
+  def entry_children(first=None, last=None)
+    @tree.entry_children(self, first, last)
+  end
+  def entry_delete(first=None, last=None)
+    @tree.entry_delete(self, first, last)
+  end
+  def entry_before?(tag)
+    @tree.entry_before?(self, tag)
+  end
+  def entry_hidden?
+    @tree.entry_before?(self)
+  end
+  def entry_open?
+    @tree.entry_open?(self)
+  end
+
+  def entry_size
+    @tree.entry_size(self)
+  end
+  def entry_size_recurse
+    @tree.entry_size_recurse(self)
+  end
+
+  def focus
+    @tree.tag_focus(self)
+    self
+  end
+
+  def get
+    @tree.get(self)
+  end
+  def get_full
+    @tree.get_full(self)
+  end
+
+  def hide
+    @tree.hide(self)
+    self
+  end
+
+  def index(str)
+    @tree.index_at(self, str)
+  end
+  def index_path(str)
+    @tree.index_at_path(self, str)
+  end
+
+  def insert(pos, parent=nil, keys={})
+    @tree.insert_at(self, pos, parent, keys)
+  end
+
+  def move_before(dest)
+    @tree.move_before(self, dest)
+    self
+  end
+  def move_after(dest)
+    @tree.move_after(self, dest)
+    self
+  end
+  def move_into(dest)
+    @tree.move_into(self, dest)
+    self
+  end
+
+  def open
+    @tree.open(self)
+    self
+  end
+  def open_recurse
+    @tree.open_recurse(self)
+    self
+  end
+
+  def range_to(tag)
+    @tree.range(self, tag)
+  end
+  def range_open_to(tag)
+    @tree.range(self, tag)
+  end
+
+  def see
+    @tree.see(self)
+    self
+  end
+  def see_anchor(anchor)
+    @tree.see_anchor(anchor, self)
+    self
+  end
+
+  def selection_anchor
+    @tree.selection_anchor(self)
+    self
+  end
+  def selection_clear
+    @tree.selection_clear(self)
+    self
+  end
+  def selection_mark
+    @tree.selection_mark(self)
+    self
+  end
+  def selection_include?
+    @tree.selection_include?(self)
+  end
+  def selection_set
+    @tree.selection_set(self)
+    self
+  end
+  def selection_toggle
+    @tree.selection_toggle(self)
+    self
+  end
+
+  def show
+    @tree.show(self)
+    self
+  end
+
+  def sort_once
+    @tree.sort_once(self)
+    self
+  end
+  def sort_once_recurse
+    @tree.sort_once_recurse(self)
+    self
+  end
+
+  def toggle
+    @tree.toggle(self)
+    self
+  end
+end
+
+######################################
+
+class Tk::BLT::Treeview::Node < TkObject
+  include Tk::BLT::Treeview::TagOrID_Methods
+
+  TreeNodeID_TBL = TkCore::INTERP.create_table
+
+  (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
+    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
+
+  def self.new(tree, pos, parent=nil, keys={})
+    if parent.kind_of?(Hash)
+      keys = parent
+      parent = nil
+    end
+
+    keys = _symbolkey2str(keys)
+    tpath = tree.path
+
+    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)
+      (obj = self.allocate).instance_eval{
+        initialize(tree, pos, parent, keys)
+        TreeNodeID_TBL[tpath][@id] = self
+      }
+      obj
+    }
+  end
+
+  def initialize(tree, pos, parent, keys)
+    @parent = @tree = tree
+    @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 = 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) ||
+            parent.kind_of?(Tk::BLT::Treeview::Tag)
+          path = [get_full(parent.id)[0], name]
+          at = nil # ignore 'at' option
+        else
+          path = [parent.to_s, name]
+        end
+      else
+        path = name
+      end
+
+      if at
+        @id = tk_call(@tpath, 'insert', '-at', tagid(at), pos, path, keys)
+      else
+        @id = tk_call(@tpath, 'insert', pos, path, keys)
+      end
+      @path = @id
+    end
+  end
+
+  def id
+    @id
+  end
+end
+
+######################################
+
+class Tk::BLT::Treeview::Tag < TkObject
+  include Tk::BLT::Treeview::TagOrID_Methods
+
+  TreeTagID_TBL = TkCore::INTERP.create_table
+
+  (TreeTag_ID = ['blt_treeview_tag'.freeze, TkUtil.untrust('00000')]).instance_eval{
+    @mutex = Mutex.new
+    def mutex; @mutex; end
+    freeze
+  }
+
+  TkCore::INTERP.init_ip_env{
+    TreeTagID_TBL.mutex.synchronize{ TreeTagID_TBL.clear }
+  }
+
+  def self.id2obj(tree, name)
+    tpath = tree.path
+    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
+
+  def self.new_by_name(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)
+    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)
+    @parent = @tree = tree
+    @tpath = @parent.path
+
+    if name
+      @path = @id = name
+    else
+      TreeTag_ID.mutex.synchronize{
+        @path = @id = TreeTag_ID.join(TkCore::INTERP._ip_id_).freeze
+        TreeTag_ID[1].succ!
+      }
+    end
+
+    unless ids.empty?
+      tk_call(@tpath, 'tag', 'add', @id, *(ids.collect{|id| tagid(id)}))
+    end
+  end
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BLT::Treeview::Node) \
+      || tag.kind_of?(Tk::BLT::Treeview::Tag)
+      tag.id
+    else
+      tag
+    end
+  end
+  private :tagid
+
+  def id
+    @id
+  end
+
+  def add(*ids)
+    tk_call(@tpath, 'tag', 'add', @id, *(ids{|id| tagid(id)}))
+    self
+  end
+
+  def remove(*ids)
+    tk_call(@tpath, 'tag', 'delete', @id, *(ids{|id| tagid(id)}))
+    self
+  end
+
+  def forget
+    tk_call(@tpath, 'tag', 'forget', @id)
+    self
+  end
+
+  def nodes
+    simplelist(tk_call(@tpath, 'tag', 'nodes', @id)).collect{|id|
+      Tk::BLT::Treeview::Node.id2obj(@tree, id)
+    }
+  end
+end
+
+class Tk::BLT::Hiertable
+  TkCommandNames = ['::blt::hiertable'.freeze].freeze
+  WidgetClassName = 'Hiertable'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/blt/unix_dnd.rb b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
new file mode 100644
index 0000000000..8996f7c891
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/unix_dnd.rb
@@ -0,0 +1,141 @@
+#
+#  tkextlib/blt/unix_dnd.rb
+#
+#    *** This is alpha version, because there is no document on BLT. ***
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module DnD
+    extend TkCore
+
+    TkCommandNames = ['::blt::dnd'.freeze].freeze
+
+    ##############################
+
+    extend TkItemConfigMethod
+
+    class << self
+      def __item_cget_cmd(id)
+        ['::blt::dnd', *id]
+      end
+      private :__item_cget_cmd
+
+      def __item_config_cmd(id)
+        ['::blt::dnd', *id]
+      end
+      private :__item_config_cmd
+
+      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)
+        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)
+      end
+      def configinfo(win, slot=nil)
+        itemconfiginfo(['configure', win], slot)
+      end
+      def current_configinfo(win, slot=nil)
+        current_itemconfiginfo(['configure', win], slot)
+      end
+
+      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)
+      end
+      def token_configinfo(win, slot=nil)
+        itemconfiginfo(['token', 'configure', win], slot)
+      end
+      def current_token_configinfo(win, slot=nil)
+        current_itemconfiginfo(['token', 'configure', win], slot)
+      end
+
+      def token_windowconfigure(win, slot, value=None)
+        itemconfigure(['token', 'window', win], slot, value)
+      end
+      def token_windowconfiginfo(win, slot=nil)
+        itemconfiginfo(['token', 'window', win], slot)
+      end
+      def current_token_windowconfiginfo(win, slot=nil)
+        current_itemconfiginfo(['token', 'window', win], slot)
+      end
+    end
+
+    ##############################
+
+    def self.cancel(win)
+      tk_call('::blt::dnd', 'cancel', *wins)
+    end
+    def self.delete(*wins)
+      tk_call('::blt::dnd', 'delete', *wins)
+    end
+    def self.delete_source(*wins)
+      tk_call('::blt::dnd', 'delete', '-source', *wins)
+    end
+    def self.delete_target(*wins)
+      tk_call('::blt::dnd', 'delete', '-target', *wins)
+    end
+    def self.drag(win, x, y, token=None)
+      tk_call('::blt::dnd', 'drag', win, x, y, token)
+    end
+    def self.drop(win, x, y, token=None)
+      tk_call('::blt::dnd', 'drop', win, x, y, token)
+    end
+    def self.get_data(win, fmt=nil, cmd=nil)
+      if fmt
+        tk_call('::blt::dnd', 'getdata', win, fmt, cmd)
+      else
+        list(tk_call('::blt::dnd', 'getdata', win))
+      end
+    end
+    def self.names(pat=None)
+      list(tk_call('::blt::dnd', 'names', pat))
+    end
+    def self.source_names(pat=None)
+      list(tk_call('::blt::dnd', 'names', '-source', pat))
+    end
+    def self.target_names(pat=None)
+      list(tk_call('::blt::dnd', 'names', '-target', pat))
+    end
+    def self.pull(win, fmt)
+      tk_call('::blt::dnd', 'pull', win, fmt)
+    end
+    def self.register(win, keys={})
+      tk_call('::blt::dnd', 'register', win, keys)
+    end
+    def self.select(win, x, y, timestamp)
+      tk_call('::blt::dnd', 'select', win, x, y, timestamp)
+    end
+    def self.set_data(win, fmt=nil, cmd=nil)
+      if fmt
+        tk_call('::blt::dnd', 'setdata', win, fmt, cmd)
+      else
+        list(tk_call('::blt::dnd', 'setdata', win))
+      end
+    end
+    def self.token(*args)
+      tk_call('::blt::dnd', 'token', *args)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/vector.rb b/ext/tk/lib/tkextlib/blt/vector.rb
new file mode 100644
index 0000000000..742e901d3e
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/vector.rb
@@ -0,0 +1,256 @@
+#
+#  tkextlib/blt/vector.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Vector < TkVariable
+    TkCommandNames = ['::blt::vector'.freeze].freeze
+
+    def self.create(*args)
+      tk_call('::blt::vector', 'create', *args)
+    end
+
+    def self.destroy(*args)
+      tk_call('::blt::vector', 'destroy', *args)
+    end
+
+    def self.expr(expression)
+      tk_call('::blt::vector', 'expr', expression)
+    end
+
+    def self.names(pat=None)
+      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
+
+    ####################################
+
+    def initialize(size=nil, keys={})
+      if size.kind_of?(Hash)
+        keys = size
+        size = nil
+      end
+      if size.kind_of?(Array)
+        # [first, last]
+        size = size.join(':')
+      end
+      if size
+        @id = TkCore::INTERP._invoke('::blt::vector', 'create',
+                                     "#auto(#{size})", *hash_kv(keys))
+      else
+        @id = TkCore::INTERP._invoke('::blt::vector', 'create',
+                                     "#auto", *hash_kv(keys))
+      end
+
+      TkVar_ID_TBL.mutex.synchronize{
+        TkVar_ID_TBL[@id] = self
+      }
+
+      @def_default = false
+      @default_val = nil
+
+      @trace_var  = nil
+      @trace_elem = nil
+      @trace_opts = nil
+
+      # teach Tk-ip that @id is global var
+      TkCore::INTERP._invoke_without_enc('global', @id)
+    end
+
+    def destroy
+      tk_call('::blt::vector', 'destroy', @id)
+    end
+
+    def inspect
+      '#<Tk::BLT::Vector: ' + @id + '>'
+    end
+
+    def to_s
+      @id
+    end
+
+    def *(item)
+      list(tk_call(@id, '*', item))
+    end
+
+    def +(item)
+      list(tk_call(@id, '+', item))
+    end
+
+    def -(item)
+      list(tk_call(@id, '-', item))
+    end
+
+    def /(item)
+      list(tk_call(@id, '/', item))
+    end
+
+    def append(*vectors)
+      tk_call(@id, 'append', *vectors)
+    end
+
+    def binread(channel, len=None, keys={})
+      if len.kind_of?(Hash)
+        keys = len
+        len = None
+      end
+      keys = _symbolkey2str(keys)
+      keys['swap'] = None if keys.delete('swap')
+      tk_call(@id, 'binread', channel, len, keys)
+    end
+
+    def clear()
+      tk_call(@id, 'clear')
+      self
+    end
+
+    def delete(*indices)
+      tk_call(@id, 'delete', *indices)
+      self
+    end
+
+    def dup_vector(vec)
+      tk_call(@id, 'dup', vec)
+      self
+    end
+
+    def expr(expression)
+      tk_call(@id, 'expr', expression)
+      self
+    end
+
+    def index(idx, val=None)
+      number(tk_call(@id, 'index', idx, val))
+    end
+
+    def [](idx)
+      index(idx)
+    end
+
+    def []=(idx, val)
+      index(idx, val)
+    end
+
+    def length()
+      number(tk_call(@id, 'length'))
+    end
+
+    def length=(size)
+      number(tk_call(@id, 'length', size))
+    end
+
+    def merge(*vectors)
+      tk_call(@id, 'merge', *vectors)
+      self
+    end
+
+    def normalize(vec=None)
+      tk_call(@id, 'normalize', vec)
+      self
+    end
+
+    def notify(keyword)
+      tk_call(@id, 'notify', keyword)
+      self
+    end
+
+    def offset()
+      number(tk_call(@id, 'offset'))
+    end
+
+    def offset=(val)
+      number(tk_call(@id, 'offset', val))
+    end
+
+    def random()
+      tk_call(@id, 'random')
+    end
+
+    def populate(vector, density=None)
+      tk_call(@id, 'populate', vector, density)
+      self
+    end
+
+    def range(first, last=None)
+      list(tk_call(@id, 'range', first, last))
+    end
+
+    def search(val1, val2=None)
+      list(tk_call(@id, 'search', val1, val2))
+    end
+
+    def set(item)
+      tk_call(@id, 'set', item)
+      self
+    end
+
+    def seq(start, finish=None, step=None)
+      tk_call(@id, 'seq', start, finish, step)
+      self
+    end
+
+    def sort(*vectors)
+      tk_call(@id, 'sort', *vectors)
+      self
+    end
+
+    def sort_reverse(*vectors)
+      tk_call(@id, 'sort', '-reverse', *vectors)
+      self
+    end
+
+    def split(*vectors)
+      tk_call(@id, 'split', *vectors)
+      self
+    end
+
+    def variable(var)
+      tk_call(@id, 'variable', var)
+      self
+    end
+  end
+
+  class VectorAccess < Vector
+    def self.new(name)
+      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
+
+      @def_default = false
+      @default_val = nil
+
+      @trace_var  = nil
+      @trace_elem = nil
+      @trace_opts = nil
+
+      # teach Tk-ip that @id is global var
+      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
new file mode 100644
index 0000000000..292623ff58
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/watch.rb
@@ -0,0 +1,175 @@
+#
+#  tkextlib/blt/watch.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Watch < TkObject
+    extend TkCore
+
+    TkCommandNames = ['::blt::watch'.freeze].freeze
+
+    WATCH_ID_TBL = TkCore::INTERP.create_table
+
+    (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)
+      lst = tk_split_list(tk_call('::blt::watch', 'names', state))
+      WATCH_ID_TBL.mutex.synchronize{
+        lst.collect{|name|
+          WATCH_ID_TBL[name] || name
+        }
+      }
+    end
+
+    def __numval_optkeys
+      ['maxlevel']
+    end
+    private :__numval_optkeys
+
+    def __boolval_optkeys
+      ['active']
+    end
+    private :__boolval_optkeys
+
+    def __config_cmd
+      ['::blt::watch', 'configure', self.path]
+    end
+    private :__config_cmd
+
+    def initialize(name = nil, keys = {})
+      if name.kind_of?(Hash)
+        keys = name
+        name = nil
+      end
+
+      if name
+        @id = name.to_s
+      else
+        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.mutex.synchronize{
+        WATCH_ID_TBL[@id] = self
+      }
+      tk_call('::blt::watch', 'create', @id, *hash_kv(keys))
+    end
+
+    def activate
+      tk_call('::blt::watch', 'activate', @id)
+      self
+    end
+    def deactivate
+      tk_call('::blt::watch', 'deactivate', @id)
+      self
+    end
+    def delete
+      tk_call('::blt::watch', 'delete', @id)
+      self
+    end
+    def info
+      ret = []
+      lst = tk_split_simplelist(tk_call('::blt::watch', 'info', @id))
+      until lst.empty?
+        k, v, *lst = lst
+        k = k[1..-1]
+        case k
+        when /^(#{__strval_optkeys.join('|')})$/
+          # do nothing
+
+        when /^(#{__numval_optkeys.join('|')})$/
+          begin
+            v = number(v)
+          rescue
+            v = nil
+          end
+
+        when /^(#{__numstrval_optkeys.join('|')})$/
+          v = num_or_str(v)
+
+        when /^(#{__boolval_optkeys.join('|')})$/
+          begin
+            v = bool(v)
+          rescue
+            v = nil
+          end
+
+        when /^(#{__listval_optkeys.join('|')})$/
+          v = simplelist(v)
+
+        when /^(#{__numlistval_optkeys.join('|')})$/
+          v = list(v)
+
+        else
+          if v.index('{')
+            v = tk_split_list(v)
+          else
+            v = tk_tcl2ruby(v)
+          end
+        end
+
+        ret << [k, v]
+      end
+
+      ret
+    end
+    def configinfo(slot = nil)
+      if slot
+        slot = slot.to_s
+        v = cget(slot)
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          [slot, v]
+        else
+          {slot=>v}
+        end
+      else
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          info
+        else
+          Hash[*(info.flatten)]
+        end
+      end
+    end
+    def cget_strict(key)
+      key = key.to_s
+      begin
+        info.assoc(key)[1]
+      rescue
+        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/win_printer.rb b/ext/tk/lib/tkextlib/blt/win_printer.rb
new file mode 100644
index 0000000000..7ac6a0dcfc
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/win_printer.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/blt/win_printer.rb
+#
+#      *** Windows only ***
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  class Printer < TkObject
+    extend TkCore
+
+    TkCommandNames = ['::blt::printer'.freeze].freeze
+
+    def self.enum(attribute)
+      simplelist(tk_call('::blt::printer', 'enum', attribute))
+    end
+
+    def self.names(pat=None)
+      simplelist(tk_call('::blt::printer', 'names', pat))
+    end
+
+    def self.open(printer)
+      self.new(printer)
+    end
+
+    #################################
+
+    def initialize(printer)
+      @printer_id = tk_call('::blt::printer', 'open', printer)
+    end
+
+    def close
+      tk_call('::blt::print', 'close', @printer_id)
+      self
+    end
+    def get_attrs(var)
+      tk_call('::blt::print', 'getattrs', @printer_id, var)
+      var
+    end
+    def set_attrs(var)
+      tk_call('::blt::print', 'setattrs', @printer_id, var)
+      self
+    end
+    def snap(win)
+      tk_call('::blt::print', 'snap', @printer_id, win)
+      self
+    end
+    def write(str)
+      tk_call('::blt::print', 'write', @printer_id, str)
+      self
+    end
+    def write_with_title(title, str)
+      tk_call('::blt::print', 'write', @printer_id, title, str)
+      self
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/blt/winop.rb b/ext/tk/lib/tkextlib/blt/winop.rb
new file mode 100644
index 0000000000..03bdb60810
--- /dev/null
+++ b/ext/tk/lib/tkextlib/blt/winop.rb
@@ -0,0 +1,107 @@
+#
+#  tkextlib/blt/winop.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/blt.rb'
+
+module Tk::BLT
+  module Winop
+    extend TkCore
+
+    TkCommandNames = ['::blt::winop'.freeze].freeze
+  end
+  WinOp = Winop
+end
+
+class << Tk::BLT::Winop
+  def changes(win)
+    tk_call('::blt::winop', 'changes', win)
+  end
+
+  def colormap(win)
+    Hash[*list(tk_call('::blt::winop', 'colormap', win))]
+  end
+
+  def convolve(src, dest, filter)
+    tk_call('::blt::winop', 'convolve', src, dest, filter)
+  end
+
+  def image_convolve(src, dest, filter)
+    tk_call('::blt::winop', 'image', 'convolve', src, dest, filter)
+  end
+  def image_gradient(photo, left, right, type)
+    tk_call('::blt::winop', 'image', 'gradient', photo, left, right, type)
+  end
+  def image_read_jpeg(file, photo)
+    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',
+            src, dest, horiz_filter, vert_filter)
+  end
+  def image_rotate(src, dest, angle)
+    tk_call('::blt::winop', 'image', 'rotate', src, dest, angle)
+  end
+  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,
+                      horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'image', 'subsample',
+            src, dest, x, y, width, height, horiz_filter, vert_filter)
+  end
+
+  def quantize(src, dest, colors)
+    tk_call('::blt::winop', 'quantize', src, dest, colors)
+  end
+
+  def query()
+    tk_call('::blt::winop', 'query')
+  end
+
+  def read_jpeg(file, photo)
+    tk_call('::blt::winop', 'readjpeg', file, photo)
+  end
+
+  def resample(src, dest, horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'resample',
+            src, dest, horiz_filter, vert_filter)
+  end
+
+  def subsample(src, dest, x, y, width, height,
+                horiz_filter=None, vert_filter=None)
+    tk_call('::blt::winop', 'subsample',
+            src, dest, x, y, width, height, horiz_filter, vert_filter)
+  end
+
+  def raise(*wins)
+    tk_call('::blt::winop', 'raise', *wins)
+  end
+
+  def lower(*wins)
+    tk_call('::blt::winop', 'lower', *wins)
+  end
+
+  def map(*wins)
+    tk_call('::blt::winop', 'map', *wins)
+  end
+
+  def unmap(*wins)
+    tk_call('::blt::winop', 'unmap', *wins)
+  end
+
+  def move(win, x, y)
+    tk_call('::blt::winop', 'move', win, x, y)
+  end
+
+  def snap(win, photo)
+    tk_call('::blt::winop', 'snap', win, photo)
+  end
+
+  def warpto(win = None)
+    tk_call('::blt::winop', 'warpto', win)
+  end
+  alias warp_to warpto
+end
diff --git a/ext/tk/lib/tkextlib/bwidget.rb b/ext/tk/lib/tkextlib/bwidget.rb
new file mode 100644
index 0000000000..7a1eff51d8
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget.rb
@@ -0,0 +1,153 @@
+#
+#  BWidget extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/bwidget/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('BWidget', '1.7')
+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
+
+    LIBRARY = tk_call('set', '::BWIDGET::LIBRARY')
+
+    PACKAGE_NAME = 'BWidget'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('BWidget')
+      rescue
+        ''
+      end
+    end
+
+    def self.XLFDfont(cmd, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        args.concat(hash_kv(keys))
+      end
+      tk_call('BWidget::XLFDfont', cmd, *args)
+    end
+
+    def self.assert(exp, msg=None)
+      tk_call('BWidget::assert', exp, msg)
+    end
+
+    def self.badOptionString(type, value, list)
+      tk_call('BWidget::badOptionString', type, value, list)
+    end
+
+    def self.bindMouseWheel(widget)
+      tk_call('BWidget::bindMouseWheel', widget)
+    end
+
+    def self.classes(klass)
+      list(tk_call('BWidget::classes', klass))
+    end
+
+    def self.clonename(menu)
+      tk_call('BWidget::clonename', menu)
+    end
+
+    def self.focus(opt, path)
+      tk_call('BWidget::focus', opt, path)
+    end
+
+    def self.get3dcolor(path, bgcolor)
+      tk_call('BWidget::get3dcolor', path, bgcolor)
+    end
+
+    def self.getname(name)
+      tk_call('BWidget::getname', name)
+    end
+
+    def self.grab(opt, path)
+      tk_call('BWidget::grab', opt, path)
+    end
+
+    def self.inuse(klass)
+      bool(tk_call('BWidget::inuse', klass))
+    end
+
+    def self.library(klass, *klasses)
+      tk_call('BWidget::library', klass, *klasses)
+    end
+
+    def self.lreorder(list, neworder)
+      tk_call('BWidget::lreorder', list, neworder)
+    end
+
+    def self.parsetext(text)
+      tk_call('BWidget::parsetext', text)
+    end
+
+    def self.place(path, w, h, *args)
+      if args[-1].kind_of?(Hash)
+        keys = args.pop
+        args.concat(hash_kv(keys))
+      end
+      tk_call('BWidget::place', path, w, h, *(args.flatten))
+    end
+
+    def self.write(file, mode=None)
+      tk_call('BWidget::write', file, mode)
+    end
+
+    def self.wrongNumArgsString(str)
+      tk_call('BWidget::wrongNumArgsString', str)
+    end
+
+    ####################################################
+
+    autoload :ArrowButton,     'tkextlib/bwidget/arrowbutton'
+    autoload :Bitmap,          'tkextlib/bwidget/bitmap'
+    autoload :Button,          'tkextlib/bwidget/button'
+    autoload :ButtonBox,       'tkextlib/bwidget/buttonbox'
+    autoload :ComboBox,        'tkextlib/bwidget/combobox'
+    autoload :Dialog,          'tkextlib/bwidget/dialog'
+    autoload :DragSite,        'tkextlib/bwidget/dragsite'
+    autoload :DropSite,        'tkextlib/bwidget/dropsite'
+    autoload :DynamicHelp,     'tkextlib/bwidget/dynamichelp'
+    autoload :Entry,           'tkextlib/bwidget/entry'
+    autoload :Label,           'tkextlib/bwidget/label'
+    autoload :LabelEntry,      'tkextlib/bwidget/labelentry'
+    autoload :LabelFrame,      'tkextlib/bwidget/labelframe'
+    autoload :ListBox,         'tkextlib/bwidget/listbox'
+    autoload :MainFrame,       'tkextlib/bwidget/mainframe'
+    autoload :MessageDlg,      'tkextlib/bwidget/messagedlg'
+    autoload :NoteBook,        'tkextlib/bwidget/notebook'
+    autoload :PagesManager,    'tkextlib/bwidget/pagesmanager'
+    autoload :PanedWindow,     'tkextlib/bwidget/panedwindow'
+    autoload :PasswdDlg,       'tkextlib/bwidget/passwddlg'
+    autoload :ProgressBar,     'tkextlib/bwidget/progressbar'
+    autoload :ProgressDlg,     'tkextlib/bwidget/progressdlg'
+    autoload :ScrollableFrame, 'tkextlib/bwidget/scrollableframe'
+    autoload :ScrolledWindow,  'tkextlib/bwidget/scrolledwindow'
+    autoload :ScrollView,      'tkextlib/bwidget/scrollview'
+    autoload :SelectColor,     'tkextlib/bwidget/selectcolor'
+    autoload :SelectFont,      'tkextlib/bwidget/selectfont'
+    autoload :Separator,       'tkextlib/bwidget/separator'
+    autoload :SpinBox,         'tkextlib/bwidget/spinbox'
+    autoload :TitleFrame,      'tkextlib/bwidget/titleframe'
+    autoload :Tree,            'tkextlib/bwidget/tree'
+    autoload :Widget,          'tkextlib/bwidget/widget'
+
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
new file mode 100644
index 0000000000..13fe9e59bf
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/arrowbutton.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/bwidget/arrowbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/button'
+
+module Tk
+  module BWidget
+    class ArrowButton < Tk::BWidget::Button
+    end
+  end
+end
+
+class Tk::BWidget::ArrowButton
+  TkCommandNames = ['ArrowButton'.freeze].freeze
+  WidgetClassName = 'ArrowButton'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/bitmap.rb b/ext/tk/lib/tkextlib/bwidget/bitmap.rb
new file mode 100644
index 0000000000..6cfde203e8
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/bitmap.rb
@@ -0,0 +1,21 @@
+#
+#  tkextlib/bwidget/bitmap.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tk/image'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Bitmap < TkPhotoImage
+    end
+  end
+end
+
+class Tk::BWidget::Bitmap
+  def initialize(name)
+    @path = tk_call_without_enc('Bitmap::get', name)
+    Tk_IMGTBL[@path] = self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/button.rb b/ext/tk/lib/tkextlib/bwidget/button.rb
new file mode 100644
index 0000000000..e139fb6708
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/button.rb
@@ -0,0 +1,31 @@
+#
+#  tkextlib/bwidget/button.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/button'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Button < Tk::Button
+    end
+  end
+end
+
+class Tk::BWidget::Button
+  TkCommandNames = ['Button'.freeze].freeze
+  WidgetClassName = 'Button'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helptext'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/buttonbox.rb b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
new file mode 100644
index 0000000000..a6de33c40c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/buttonbox.rb
@@ -0,0 +1,90 @@
+#
+#  tkextlib/bwidget/buttonbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/button'
+
+module Tk
+  module BWidget
+    class ButtonBox < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ButtonBox
+  TkCommandNames = ['ButtonBox'.freeze].freeze
+  WidgetClassName = 'ButtonBox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  include TkItemConfigMethod
+
+  def __boolval_optkeys
+    super() << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::BWidget::Button)
+      name = tagOrId[:name]
+      return index(name) unless name.empty?
+    end
+    if tagOrId.kind_of?(Tk::Button)
+      return index(tagOrId[:text])
+    end
+    # index(tagOrId.to_s)
+    index(_get_eval_string(tagOrId))
+  end
+
+  def add(keys={}, &b)
+    win = window(tk_send('add', *hash_kv(keys)))
+    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 delete(idx)
+    tk_send('delete', tagid(idx))
+    self
+  end
+
+  def index(idx)
+    if idx.kind_of?(Tk::BWidget::Button)
+      name = idx[:name]
+      idx = name unless name.empty?
+    end
+    if idx.kind_of?(Tk::Button)
+      idx = idx[:text]
+    end
+    number(tk_send('index', idx.to_s))
+  end
+
+  def insert(idx, keys={}, &b)
+    win = window(tk_send('insert', tagid(idx), *hash_kv(keys)))
+    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 invoke(idx)
+    tk_send('invoke', tagid(idx))
+    self
+  end
+
+  def set_focus(idx)
+    tk_send('setfocus', tagid(idx))
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/combobox.rb b/ext/tk/lib/tkextlib/bwidget/combobox.rb
new file mode 100644
index 0000000000..16143dfbc6
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/combobox.rb
@@ -0,0 +1,62 @@
+#
+#  tkextlib/bwidget/combobox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/listbox'
+require 'tkextlib/bwidget/spinbox'
+
+module Tk
+  module BWidget
+    class ComboBox < Tk::BWidget::SpinBox
+    end
+  end
+end
+
+class Tk::BWidget::ComboBox
+  include Scrollable
+
+  TkCommandNames = ['ComboBox'.freeze].freeze
+  WidgetClassName = 'ComboBox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'autocomplete' << 'autopost'
+  end
+  private :__boolval_optkeys
+
+  def get_listbox(&b)
+    win = window(tk_send_without_enc('getlistbox'))
+    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
+
+  def post
+    tk_send_without_enc('post')
+    self
+  end
+
+  def unpost
+    tk_send_without_enc('unpost')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/dialog.rb b/ext/tk/lib/tkextlib/bwidget/dialog.rb
new file mode 100644
index 0000000000..3b0656f021
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/dialog.rb
@@ -0,0 +1,194 @@
+#
+#  tkextlib/bwidget/dialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/buttonbox'
+
+module Tk
+  module BWidget
+    class Dialog < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::Dialog
+  TkCommandNames = ['Dialog'.freeze].freeze
+  WidgetClassName = 'Dialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  include TkItemConfigMethod
+
+  def __numstrval_optkeys
+    super() << 'buttonwidth'
+  end
+  private :__numstrval_optkeys
+
+  def __strval_optkeys
+    super() << 'title' << 'geometry'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'transient' << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def initialize(parent=nil, keys=nil)
+    @relative = ''
+    if parent.kind_of?(Hash)
+      keys = _symbolkey2str(parent)
+      @relative = keys['parent'] if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(keys)
+    elsif keys
+      keys = _symbolkey2str(keys)
+      @relative = keys.delete('parent') if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(parent, keys)
+    else
+      super(parent)
+    end
+  end
+
+  def create_self(keys)
+    cmd = self.class::TkCommandNames[0]
+    if keys and keys != None
+      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')
+    else
+      super(slot)
+    end
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      slot['parent'] = slot.delete('relative') if slot.key?('relative')
+      super(slot)
+    else
+      if slot.to_s == 'relative'
+        super('parent', value)
+      else
+        super(slot, value)
+      end
+    end
+  end
+
+  def configinfo(slot=nil)
+    if slot
+      if slot.to_s == 'relative'
+        super('parent')
+      else
+        super(slot)
+      end
+    else
+      ret = super()
+      if TkComm::GET_CONFIGINFO_AS_ARRAY
+        ret << ['relative', 'parent']
+      else
+        ret['relative'] = 'parent'
+      end
+    end
+  end
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::BWidget::Button)
+      name = tagOrId[:name]
+      return index(name) unless name.empty?
+    end
+    if tagOrId.kind_of?(Tk::Button)
+      return index(tagOrId[:text])
+    end
+    # index(tagOrId.to_s)
+    index(_get_eval_string(tagOrId))
+  end
+
+  def add(keys={}, &b)
+    win = window(tk_send('add', *hash_kv(keys)))
+    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'))
+    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')
+    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 draw(focus_win=None)
+    tk_send('draw', focus_win)
+  end
+
+  def enddialog(ret)
+    tk_send('enddialog', ret)
+  end
+
+  def index(idx)
+    get_buttonbox.index(idx)
+  end
+
+  def invoke(idx)
+    tk_send('invoke', tagid(idx))
+    self
+  end
+
+  def set_focus(idx)
+    tk_send('setfocus', tagid(idx))
+    self
+  end
+
+  def withdraw
+    tk_send('withdraw')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/dragsite.rb b/ext/tk/lib/tkextlib/bwidget/dragsite.rb
new file mode 100644
index 0000000000..4d4de1780c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/dragsite.rb
@@ -0,0 +1,31 @@
+#
+#  tkextlib/bwidget/dragsite.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module DragSite
+    end
+  end
+end
+
+module Tk::BWidget::DragSite
+  include Tk
+  extend Tk
+
+  def self.include(klass, type, event)
+    tk_call('DragSite::include', klass, type, event)
+  end
+
+  def self.register(path, keys={})
+    tk_call('DragSite::register', path, *hash_kv(keys))
+  end
+
+  def self.set_drag(path, subpath, initcmd, endcmd, force=None)
+    tk_call('DragSite::setdrag', path, subpath, initcmd, endcmd, force)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/dropsite.rb b/ext/tk/lib/tkextlib/bwidget/dropsite.rb
new file mode 100644
index 0000000000..e5e98fbc51
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/dropsite.rb
@@ -0,0 +1,39 @@
+#
+#  tkextlib/bwidget/dropsite.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module DropSite
+    end
+  end
+end
+
+module Tk::BWidget::DropSite
+  include Tk
+  extend Tk
+
+  def self.include(klass, type)
+    tk_call('DropSite::include', klass, type)
+  end
+
+  def self.register(path, keys={})
+    tk_call('DropSite::register', path, *hash_kv(keys))
+  end
+
+  def self.set_cursor(cursor)
+    tk_call('DropSite::setcursor', cursor)
+  end
+
+  def self.set_drop(path, subpath, dropover, drop, force=None)
+    tk_call('DropSite::setdrop', path, subpath, dropover, drop, force)
+  end
+
+  def self.set_operation(op)
+    tk_call('DropSite::setoperation', op)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb b/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
new file mode 100644
index 0000000000..846e58062d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/dynamichelp.rb
@@ -0,0 +1,63 @@
+#
+#  tkextlib/bwidget/dynamichelp.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module DynamicHelp
+    end
+  end
+end
+
+module Tk::BWidget::DynamicHelp
+  include Tk
+  extend Tk
+
+  def self.__pathname
+    'DynamicHelp::configure'
+  end
+
+  def __strval_optkeys
+    super() << 'topbackground'
+  end
+  private :__strval_optkeys
+
+  def self.__cget_cmd
+    ['DynamicHelp::configure']
+  end
+
+  def self.__config_cmd
+    ['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
+
+  def self.add(widget, keys={})
+    tk_call('DynamicHelp::add', widget, *hash_kv(keys))
+  end
+
+  def self.delete(widget)
+    tk_call('DynamicHelp::delete', widget)
+  end
+
+  def self.include(klass, type)
+    tk_call('DynamicHelp::include', klass, type)
+  end
+
+  def self.sethelp(path, subpath, force=None)
+    tk_call('DynamicHelp::sethelp', path, subpath, force)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/entry.rb b/ext/tk/lib/tkextlib/bwidget/entry.rb
new file mode 100644
index 0000000000..8dc4496123
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/entry.rb
@@ -0,0 +1,43 @@
+#
+#  tkextlib/bwidget/entry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Entry < Tk::Entry
+    end
+  end
+end
+
+class Tk::BWidget::Entry
+  include Scrollable
+
+  TkCommandNames = ['Entry'.freeze].freeze
+  WidgetClassName = 'Entry'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helptext' << 'insertbackground'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled' << 'editable'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def invoke
+    tk_send_without_enc('invoke')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/label.rb b/ext/tk/lib/tkextlib/bwidget/label.rb
new file mode 100644
index 0000000000..e8d9352c62
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/label.rb
@@ -0,0 +1,41 @@
+#
+#  tkextlib/bwidget/label.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/label'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Label < Tk::Label
+    end
+  end
+end
+
+class Tk::BWidget::Label
+  TkCommandNames = ['Label'.freeze].freeze
+  WidgetClassName = 'Label'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helptext'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def set_focus
+    tk_send_without_enc('setfocus')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/labelentry.rb b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
new file mode 100644
index 0000000000..16e7b46933
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/labelentry.rb
@@ -0,0 +1,80 @@
+#
+#  tkextlib/bwidget/labelentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/labelframe'
+require 'tkextlib/bwidget/entry'
+
+module Tk
+  module BWidget
+    class LabelEntry < Tk::Entry
+    end
+  end
+end
+
+class Tk::BWidget::LabelEntry
+  include Scrollable
+
+  TkCommandNames = ['LabelEntry'.freeze].freeze
+  WidgetClassName = 'LabelEntry'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'labelfont'
+  end
+  private :__font_optkeys
+
+  #def entrybind(*args)
+  #  _bind([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind(context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  #def entrybind_append(*args)
+  #  _bind_append([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  def entrybind_remove(*args)
+    _bind_remove([path, 'bind'], *args)
+    self
+  end
+
+  def entrybindinfo(*args)
+    _bindinfo([path, 'bind'], *args)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/labelframe.rb b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
new file mode 100644
index 0000000000..0710f213f0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/labelframe.rb
@@ -0,0 +1,52 @@
+#
+#  tkextlib/bwidget/labelframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/label'
+
+module Tk
+  module BWidget
+    class LabelFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::LabelFrame
+  TkCommandNames = ['LabelFrame'.freeze].freeze
+  WidgetClassName = 'LabelFrame'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helptext'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def self.align(*args)
+    tk_call('LabelFrame::align', *args)
+  end
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    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
new file mode 100644
index 0000000000..930491c869
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/listbox.rb
@@ -0,0 +1,361 @@
+#
+#  tkextlib/bwidget/listbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ListBox < TkWindow
+      # is NOT a subclass of a listbox widget class.
+      # because it constructed on a canvas widget.
+
+      class Item < TkObject
+      end
+    end
+  end
+end
+
+class Tk::BWidget::ListBox
+  include TkItemConfigMethod
+  include Scrollable
+
+  TkCommandNames = ['ListBox'.freeze].freeze
+  WidgetClassName = 'ListBox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  class Event_for_Items < TkEvent::Event
+    def self._get_extra_args_tbl
+      [
+        TkComm.method(:string)   # item idenfier
+      ]
+    end
+  end
+
+  def __boolval_optkeys
+    super() << 'autofocus' << 'dragenabled' << 'dropenabled' << 'selectfill'
+  end
+  private :__boolval_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BWidget::ListBox::Item)
+      tag.id
+    else
+      # tag
+      _get_eval_string(tag)
+    end
+  end
+
+  #def imagebind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
+                          context, cmd, *args)
+    self
+  end
+
+  #def imagebind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    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, 'bindImage'],
+                                 context, cmd, *args)
+    self
+  end
+
+  def imagebind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+    self
+  end
+
+  def imagebindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  end
+
+  #def textbind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindText'],
+                          context, cmd, *args)
+    self
+  end
+
+  #def textbind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    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, 'bindText'],
+                                 context, cmd, *args)
+    self
+  end
+
+  def textbind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+    self
+  end
+
+  def textbindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  end
+
+  def delete(*args)
+    tk_send('delete', *args)
+    self
+  end
+
+  def edit(item, text, *args)
+    tk_send('edit', tagid(item), text, *args)
+    self
+  end
+
+  def exist?(item)
+    bool(tk_send('exists', tagid(item)))
+  end
+
+  def index(item)
+    num_or_str(tk_send('index', tagid(item)))
+  end
+
+  def insert(idx, item, keys={})
+    tk_send('insert', idx, tagid(item), *hash_kv(keys))
+    self
+  end
+
+  def get_item(idx)
+    tk_send('items', idx)
+  end
+
+  def items(first=None, last=None)
+    list(tk_send('items', first, last))
+  end
+
+  def move(item, idx)
+    tk_send('move', tagid(item), idx)
+    self
+  end
+
+  def reorder(neworder)
+    tk_send('reorder', neworder)
+    self
+  end
+
+  def see(item)
+    tk_send('see', tagid(item))
+    self
+  end
+
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+
+  def selection_set(*args)
+    tk_send_without_enc('selection', 'set',
+                        *(args.collect{|item| tagid(item)}))
+    self
+  end
+
+  def selection_add(*args)
+    tk_send_without_enc('selection', 'add',
+                        *(args.collect{|item| tagid(item)}))
+    self
+  end
+
+  def selection_remove(*args)
+    tk_send_without_enc('selection', 'remove',
+                        *(args.collect{|item| tagid(item)}))
+    self
+  end
+
+  def selection_get(*args)
+    simplelist(tk_send_without_enc('selection', 'get')).collect{|item|
+      Tk::BWidget::ListBox::Item.id2obj(self, item)
+    }
+  end
+end
+
+class Tk::BWidget::ListBox::Item
+  include TkTreatTagFont
+
+  ListItem_TBL = TkCore::INTERP.create_table
+
+  (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
+    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,
+        "expect Tk::BWidget::ListBox or Tk::BWidget::ListBox::Item for 1st argument"
+    end
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = {}
+    end
+
+    index = keys.delete('index')
+    unless args.empty?
+      index = args.shift
+    end
+    index = 'end' unless index
+
+    unless args.empty?
+      fail RuntimeError, 'too much arguments'
+    end
+
+    @lpath = @listbox.path
+
+    if keys.key?('itemname')
+      @path = @id = keys.delete('itemname')
+    else
+      ListItem_ID.mutex.synchronize{
+        @path = @id = ListItem_ID.join(TkCore::INTERP._ip_id_)
+        ListItem_ID[1].succ!
+      }
+    end
+
+    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
+
+  def listbox
+    @listbox
+  end
+
+  def id
+    @id
+  end
+
+  def [](key)
+    cget(key)
+  end
+
+  def []=(key, val)
+    configure(key, val)
+    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)
+  end
+
+  def configinfo(key=nil)
+    @listbox.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @listbox.current_itemconfiginfo(@id, key)
+  end
+
+  def delete
+    @listbox.delete(@id)
+    self
+  end
+
+  def edit(*args)
+    @listbox.edit(@id, *args)
+    self
+  end
+
+  def exist?
+    @listbox.exist?(@id)
+  end
+
+  def index
+    @listbox.index(@id)
+  end
+
+  def move(index)
+    @listbox.move(@id, index)
+  end
+
+  def see
+    @listbox.see(@id)
+  end
+
+  def selection_add
+    @listbox.selection_add(@id)
+  end
+
+  def selection_remove
+    @listbox.selection_remove(@id)
+  end
+
+  def selection_set
+    @listbox.selection_set(@id)
+  end
+
+  def selection_toggle
+    @listbox.selection_toggle(@id)
+  end
+end
+
diff --git a/ext/tk/lib/tkextlib/bwidget/mainframe.rb b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
new file mode 100644
index 0000000000..92253bd8d3
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/mainframe.rb
@@ -0,0 +1,132 @@
+#
+#  tkextlib/bwidget/mainframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/progressbar'
+
+module Tk
+  module BWidget
+    class MainFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::MainFrame
+  TkCommandNames = ['MainFrame'.freeze].freeze
+  WidgetClassName = 'MainFrame'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'progressfg'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'progressvar'
+  end
+  private :__tkvariable_optkeys
+
+  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.
+    {
+      'menu'=>proc{|v| simplelist(v).collect!{|elem| simplelist(v)}}
+    }
+  end
+  private :__val2ruby_optkeys
+
+  def add_indicator(keys={}, &b)
+    win = window(tk_send('addindicator', *hash_kv(keys)))
+    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'))
+    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'))
+    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))
+    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))
+    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))
+    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
+  end
+
+  def show_statusbar(name)
+    tk_send('showstatusbar', name)
+    self
+  end
+
+  def show_toolbar(idx, mode)
+    tk_send('showtoolbar', idx, mode)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/messagedlg.rb b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
new file mode 100644
index 0000000000..7b62614737
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/messagedlg.rb
@@ -0,0 +1,192 @@
+#
+#  tkextlib/bwidget/messagedlg.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/dialog.rb'
+
+module Tk
+  module BWidget
+    class MessageDlg < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::MessageDlg
+  TkCommandNames = ['MessageDlg'.freeze].freeze
+  WidgetClassName = 'MessageDlg'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def initialize(parent=nil, keys=nil)
+    @relative = ''
+    if parent.kind_of?(Hash)
+      keys = _symbolkey2str(parent)
+      @relative = keys['parent'] if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(keys)
+    elsif keys
+      keys = _symbolkey2str(keys)
+      @relative = keys.delete('parent') if keys.key?('parent')
+      @relative = keys.delete('relative') if keys.key?('relative')
+      super(parent, keys)
+    else
+      super(parent)
+    end
+  end
+
+  def create_self(keys)
+    # NOT create widget.
+    # Because the widget no longer exist when returning from creation.
+    @keys = _symbolkey2str(keys).update('parent'=>@relative)
+    @info = nil
+  end
+  private :create_self
+
+  def __strval_optkeys
+    super() << 'message' << 'title'
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'buttons'
+  end
+  private :__listval_optkeys
+
+  def cget(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 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?
+      super(slot, value)
+    end
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      slot['parent'] = slot.delete('relative') if slot.key?('relative')
+      @keys.update(slot)
+
+      if @info
+        # update @info
+        slot.each{|k, v|
+          if TkComm::GET_CONFIGINFO_AS_ARRAY
+            if (inf = @info.assoc(k))
+              inf[-1] = v
+            else
+              @info << [k, '', '', '', v]
+            end
+          else
+            if (inf = @info[k])
+              inf[-1] = v
+            else
+              @info[k] = ['', '', '', v]
+            end
+          end
+        }
+      end
+
+    else # ! Hash
+      slot = slot.to_s
+      slot = 'parent' if slot == 'relative'
+      @keys[slot] = value
+
+      if @info
+        # update @info
+        if TkComm::GET_CONFIGINFO_AS_ARRAY
+          if (inf = @info.assoc(slot))
+            inf[-1] = value
+          else
+            @info << [slot, '', '', '', value]
+          end
+        else
+          if (inf = @info[slot])
+            inf[-1] = value
+          else
+            @info[slot] = ['', '', '', value]
+          end
+        end
+      end
+    end
+
+    self
+  end
+
+  def configinfo(slot=nil)
+    if winfo_exist?
+      @info = super()
+      if TkComm::GET_CONFIGINFO_AS_ARRAY
+        @info << ['relative', 'parent']
+      else
+        @info['relative'] = 'parent'
+      end
+    end
+
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if @info
+        if winfo_exist?
+          # update @keys
+          @info.each{|inf| @keys[inf[0]] = inf[-1] if inf.size > 2 }
+        end
+      else
+        @info = []
+        @keys.each{|k, v|
+          @info << [k, '', '', '', v]
+        }
+        @info << ['relative', 'parent']
+      end
+
+      if slot
+        @info.asoc(slot.to_s).dup
+      else
+        @info.dup
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if @info
+        if winfo_exist?
+          # update @keys
+          @info.each{|k, inf| @keys[k] = inf[-1] if inf.size > 2 }
+        end
+      else
+        @info = {}
+        @keys.each{|k, v|
+          @info[k] = ['', '', '', v]
+        }
+        @info['relative'] = 'parent'
+      end
+
+      if slot
+        @info[slot.to_s].dup
+      else
+        @info.dup
+      end
+    end
+  end
+
+  def create
+    # 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
new file mode 100644
index 0000000000..ed28bcd86a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/notebook.rb
@@ -0,0 +1,166 @@
+#
+#  tkextlib/bwidget/notebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class NoteBook < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::NoteBook
+  include TkItemConfigMethod
+
+  TkCommandNames = ['NoteBook'.freeze].freeze
+  WidgetClassName = 'NoteBook'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  class Event_for_Tabs < TkEvent::Event
+    def self._get_extra_args_tbl
+      [
+        TkComm.method(:string)   # page idenfier
+      ]
+    end
+  end
+
+  def __boolval_optkeys
+    super() << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def tagid(id)
+    if id.kind_of?(TkWindow)
+      #id.path
+      id.epath
+    elsif id.kind_of?(TkObject)
+      id.to_eval
+    else
+      # id.to_s
+      _get_eval_string(id)
+    end
+  end
+
+  #def tabbind(*args)
+  #  _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+  #  self
+  #end
+  def tabbind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
+                          context, cmd, *args)
+    self
+  end
+
+  #def tabbind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+  #  self
+  #end
+  def tabbind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append_for_event_class(Event_for_Tabs, [path, 'bindtabs'],
+                                 context, cmd, *args)
+    self
+  end
+
+  def tabbind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+    self
+  end
+
+  def tabbindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Tabs, [path, 'bindtabs'], *args)
+  end
+
+  def add(page, &b)
+    win = window(tk_send('add', tagid(page)))
+    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 compute_size
+    tk_send('compute_size')
+    self
+  end
+
+  def delete(page, destroyframe=None)
+    tk_send('delete', tagid(page), destroyframe)
+    self
+  end
+
+  def get_frame(page, &b)
+    win = window(tk_send('getframe', tagid(page)))
+    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 index(page)
+    num_or_str(tk_send('index', tagid(page)))
+  end
+
+  def insert(index, page, keys={}, &b)
+    win = window(tk_send('insert', index, tagid(page), *hash_kv(keys)))
+    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 move(page, index)
+    tk_send('move', tagid(page), index)
+    self
+  end
+
+  def get_page(page)
+    tk_send('pages', page)
+  end
+
+  def pages(first=None, last=None)
+    list(tk_send('pages', first, last))
+  end
+
+  def raise(page=nil)
+    if page
+      tk_send('raise', page)
+      self
+    else
+      tk_send('raise')
+    end
+  end
+
+  def see(page)
+    tk_send('see', page)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
new file mode 100644
index 0000000000..31bbf1fb8b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/pagesmanager.rb
@@ -0,0 +1,73 @@
+#
+#  tkextlib/bwidget/pagesmanager.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class PagesManager < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::PagesManager
+  TkCommandNames = ['PagesManager'.freeze].freeze
+  WidgetClassName = 'PagesManager'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def tagid(id)
+    # id.to_s
+    _get_eval_string(id)
+  end
+
+  def add(page, &b)
+    win = window(tk_send('add', tagid(page)))
+    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 compute_size
+    tk_send('compute_size')
+    self
+  end
+
+  def delete(page)
+    tk_send('delete', tagid(page))
+    self
+  end
+
+  def get_frame(page, &b)
+    win = window(tk_send('getframe', tagid(page)))
+    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_page(page)
+    tk_send('pages', page)
+  end
+
+  def pages(first=None, last=None)
+    list(tk_send('pages', first, last))
+  end
+
+  def raise(page=None)
+    tk_send('raise', page)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/panedwindow.rb b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
new file mode 100644
index 0000000000..54cf06cbde
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/panedwindow.rb
@@ -0,0 +1,42 @@
+#
+#  tkextlib/bwidget/panedwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class PanedWindow < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::PanedWindow
+  TkCommandNames = ['PanedWindow'.freeze].freeze
+  WidgetClassName = 'PanedWindow'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'activator'
+  end
+  private :__strval_optkeys
+
+  def add(keys={})
+    window(tk_send('add', *hash_kv(keys)))
+  end
+
+  def get_frame(idx, &b)
+    win = window(tk_send_without_enc('getframe', idx))
+    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
new file mode 100644
index 0000000000..1cbf914425
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/panelframe.rb
@@ -0,0 +1,67 @@
+#
+#  tkextlib/bwidget/panelframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class PanelFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::PanelFrame
+  TkCommandNames = ['PanelFrame'.freeze].freeze
+  WidgetClassName = 'PanelFrame'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() + ['panelforeground', 'panelbackground']
+  end
+  private :__strval_optkeys
+
+  def add(win, keys={})
+    tk_send('add', win, keys)
+    self
+  end
+
+  def delete(*wins)
+    tk_send('delete', *wins)
+    self
+  end
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    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
+    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
new file mode 100644
index 0000000000..ea50c87cef
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/passwddlg.rb
@@ -0,0 +1,44 @@
+#
+#  tkextlib/bwidget/passwddlg.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class PasswdDlg < Tk::BWidget::MessageDlg
+    end
+  end
+end
+
+class Tk::BWidget::PasswdDlg
+  TkCommandNames = ['PasswdDlg'.freeze].freeze
+  WidgetClassName = 'PasswdDlg'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'loginhelptext' << 'loginlabel' << 'logintext' <<
+      'passwdlabel' << 'passwdtext'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'passwdeditable' << 'homogeneous'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'loginhelpvar' << 'logintextvariable' <<
+      'passwdhelpvar' << 'passwdtextvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def create
+    login, passwd = simplelist(tk_call(self.class::TkCommandNames[0],
+                                       @path, *hash_kv(@keys)))
+    [login, passwd]
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressbar.rb b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
new file mode 100644
index 0000000000..18eb67349b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/progressbar.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/bwidget/progressbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ProgressBar < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ProgressBar
+  TkCommandNames = ['ProgressBar'.freeze].freeze
+  WidgetClassName = 'ProgressBar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/progressdlg.rb b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
new file mode 100644
index 0000000000..0c0c4540bc
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/progressdlg.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/bwidget/progressdlg.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/variable'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/progressbar'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class ProgressDlg < Tk::BWidget::MessageDlg
+    end
+  end
+end
+
+class Tk::BWidget::ProgressDlg
+  TkCommandNames = ['ProgressDlg'.freeze].freeze
+  WidgetClassName = 'ProgressDlg'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def create_self(keys)
+    # NOT create widget for reusing the object
+    super(keys)
+    @keys['textvariable'] = TkVariable.new unless @keys.key?('textvariable')
+    @keys['variable']     = TkVariable.new unless @keys.key?('variable')
+  end
+
+  def textvariable
+    @keys['textvariable']
+  end
+
+  def text
+    @keys['textvariable'].value
+  end
+
+  def text= (txt)
+    @keys['textvariable'].value = txt
+  end
+
+  def variable
+    @keys['variable']
+  end
+
+  def value
+    @keys['variable'].value
+  end
+
+  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
new file mode 100644
index 0000000000..5bd00d6870
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/scrollableframe.rb
@@ -0,0 +1,40 @@
+#
+#  tkextlib/bwidget/scrollableframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ScrollableFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ScrollableFrame
+  include Scrollable
+
+  TkCommandNames = ['ScrollableFrame'.freeze].freeze
+  WidgetClassName = 'ScrollableFrame'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    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 see(win, vert=None, horiz=None)
+    tk_send_without_enc('see', win, vert, horiz)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
new file mode 100644
index 0000000000..ea5a18cc66
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/scrolledwindow.rb
@@ -0,0 +1,48 @@
+#
+#  tkextlib/bwidget/scrolledwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ScrolledWindow < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ScrolledWindow
+  TkCommandNames = ['ScrolledWindow'.freeze].freeze
+  WidgetClassName = 'ScrolledWindow'.freeze
+  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'))
+    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 set_widget(win)
+    tk_send_without_enc('setwidget', win)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/scrollview.rb b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
new file mode 100644
index 0000000000..ab27bc91cf
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/scrollview.rb
@@ -0,0 +1,25 @@
+#
+#  tkextlib/bwidget/scrollview.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class ScrollView < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::ScrollView
+  TkCommandNames = ['ScrollView'.freeze].freeze
+  WidgetClassName = 'ScrollView'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'fill'
+  end
+  private :__strval_optkeys
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/selectcolor.rb b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
new file mode 100644
index 0000000000..456175e87e
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/selectcolor.rb
@@ -0,0 +1,73 @@
+#
+#  tkextlib/bwidget/selectcolor.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+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
+
+class Tk::BWidget::SelectColor
+  extend Tk
+
+  TkCommandNames = ['SelectColor'.freeze].freeze
+  WidgetClassName = 'SelectColor'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def dialog(keys={})
+    newkeys = @keys.dup
+    newkeys.update(_symbolkey2str(keys))
+    tk_call('SelectColor::dialog', @path, *hash_kv(newkeys))
+  end
+
+  def menu(*args)
+    if args[-1].kind_of?(Hash)
+      keys = args.pop
+    else
+      keys = {}
+    end
+    place = args.flatten
+    newkeys = @keys.dup
+    newkeys.update(_symbolkey2str(keys))
+    tk_call('SelectColor::menu', @path, place, *hash_kv(newkeys))
+  end
+
+  def self.set_color(idx, color)
+    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
new file mode 100644
index 0000000000..23419cb0fa
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/selectfont.rb
@@ -0,0 +1,91 @@
+#
+#  tkextlib/bwidget/selectfont.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/messagedlg'
+
+module Tk
+  module BWidget
+    class SelectFont < Tk::BWidget::MessageDlg
+      class Dialog < Tk::BWidget::SelectFont
+      end
+      class Toolbar < TkWindow
+      end
+    end
+  end
+end
+
+class Tk::BWidget::SelectFont
+  extend Tk
+
+  TkCommandNames = ['SelectFont'.freeze].freeze
+  WidgetClassName = 'SelectFont'.freeze
+  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
+  private :__font_optkeys
+
+  def create
+    tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys))
+  end
+
+  def self.load_font
+    tk_call('SelectFont::loadfont')
+  end
+end
+
+class Tk::BWidget::SelectFont::Dialog
+  def __font_optkeys
+    [] # without fontobj operation
+  end
+
+  def create_self(keys)
+    super(keys)
+    @keys['type'] = 'dialog'
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.delete['type']
+      slot.delete[:type]
+      return self if slot.empty?
+    else
+      return self if slot == 'type' || slot == :type
+    end
+    super(slot, value)
+  end
+
+  def create
+    @keys['type'] = 'dialog'  # 'dialog' type returns font name
+    tk_call(Tk::BWidget::SelectFont::TkCommandNames[0], @path, *hash_kv(@keys))
+  end
+end
+
+class Tk::BWidget::SelectFont::Toolbar
+  def __font_optkeys
+    [] # without fontobj operation
+  end
+
+  def create_self(keys)
+    keys = {} unless keys
+    keys = _symbolkey2str(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
new file mode 100644
index 0000000000..6d92321210
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/separator.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/bwidget/separator.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Separator < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::Separator
+  TkCommandNames = ['Separator'.freeze].freeze
+  WidgetClassName = 'Separator'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/setup.rb b/ext/tk/lib/tkextlib/bwidget/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/setup.rb
@@ -0,0 +1,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
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/bwidget/spinbox.rb b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
new file mode 100644
index 0000000000..0a45b045fb
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/spinbox.rb
@@ -0,0 +1,98 @@
+#
+#  tkextlib/bwidget/entry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+require 'tkextlib/bwidget/arrowbutton'
+require 'tkextlib/bwidget/entry'
+
+module Tk
+  module BWidget
+    class SpinBox < Tk::Entry
+    end
+  end
+end
+
+class Tk::BWidget::SpinBox
+  include Scrollable
+
+  TkCommandNames = ['SpinBox'.freeze].freeze
+  WidgetClassName = 'SpinBox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helptext' << 'insertbackground' << 'entryfg' << 'entrybg'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled' << 'editable'
+  end
+  private :__boolval_optkeys
+
+  def __listval_optkeys
+    super() << 'values'
+  end
+  private :__listval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  #def entrybind(*args)
+  #  _bind([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  #def entrybind_append(*args)
+  #  _bind_append([path, 'bind'], *args)
+  #  self
+  #end
+  def entrybind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, 'bind'], context, cmd, *args)
+    self
+  end
+
+  def entrybind_remove(*args)
+    _bind_remove([path, 'bind'], *args)
+    self
+  end
+
+  def entrybindinfo(*args)
+    _bindinfo([path, 'bind'], *args)
+    self
+  end
+
+  def get_index_of_value
+    number(tk_send_without_enc('getvalue'))
+  end
+  alias get_value get_index_of_value
+  alias get_value_index get_index_of_value
+
+  def set_value_by_index(idx)
+    idx = "@#{idx}" if idx.kind_of?(Integer)
+    tk_send_without_enc('setvalue', idx)
+    self
+  end
+  alias set_value set_value_by_index
+  alias set_index_value set_value_by_index
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/statusbar.rb b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
new file mode 100644
index 0000000000..5c5dd43fe4
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/statusbar.rb
@@ -0,0 +1,62 @@
+#
+#  tkextlib/bwidget/statusbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class StatusBar < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::StatusBar
+  TkCommandNames = ['StatusBar'.freeze].freeze
+  WidgetClassName = 'StatusBar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'showresize' << 'showseparator' << 'showresizesep'
+  end
+  private :__boolval_optkeys
+
+  def add(win, keys={})
+    tk_send('add', win, keys)
+    self
+  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
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    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
+    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
new file mode 100644
index 0000000000..71879111c1
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/titleframe.rb
@@ -0,0 +1,33 @@
+#
+#  tkextlib/bwidget/titleframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/frame'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class TitleFrame < TkWindow
+    end
+  end
+end
+
+class Tk::BWidget::TitleFrame
+  TkCommandNames = ['TitleFrame'.freeze].freeze
+  WidgetClassName = 'TitleFrame'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def get_frame(&b)
+    win = window(tk_send_without_enc('getframe'))
+    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
new file mode 100644
index 0000000000..089c482fe8
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/tree.rb
@@ -0,0 +1,500 @@
+#
+#  tkextlib/bwidget/tree.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    class Tree < TkWindow
+      class Node < TkObject
+      end
+    end
+  end
+end
+
+class Tk::BWidget::Tree
+  include TkItemConfigMethod
+  include Scrollable
+
+  TkCommandNames = ['Tree'.freeze].freeze
+  WidgetClassName = 'Tree'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  class Event_for_Items < TkEvent::Event
+    def self._get_extra_args_tbl
+      [
+        TkComm.method(:string)   # item idenfier
+      ]
+    end
+  end
+
+  def __strval_optkeys
+    super() << 'crossfill' << 'linesfill'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'dragenabled' << 'dropenabled' <<
+      'redraw' << 'selectfill' << 'showlines'
+  end
+  private :__boolval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvar'
+  end
+  private :__tkvariable_optkeys
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::BWidget::Tree::Node)
+      tag.id
+    else
+      # tag
+      _get_eval_string(tag)
+    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
+  #end
+  def imagebind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindImage'],
+                          context, cmd, *args)
+    self
+  end
+
+  #def imagebind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  #  self
+  #end
+  def imagebind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    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, 'bindImage'],
+                                 context, cmd, *args)
+    self
+  end
+
+  def imagebind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+    self
+  end
+
+  def imagebindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindImage'], *args)
+  end
+
+  #def textbind(*args)
+  #  _bind_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_for_event_class(Event_for_Items, [path, 'bindText'],
+                          context, cmd, *args)
+    self
+  end
+
+  #def textbind_append(*args)
+  #  _bind_append_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  #  self
+  #end
+  def textbind_append(context, *args)
+    #if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    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, 'bindText'],
+                                 context, cmd, *args)
+    self
+  end
+
+  def textbind_remove(*args)
+    _bind_remove_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+    self
+  end
+
+  def textbindinfo(*args)
+    _bindinfo_for_event_class(Event_for_Items, [path, 'bindText'], *args)
+  end
+
+  def close_tree(node, recurse=None)
+    tk_send('closetree', tagid(node), recurse)
+    self
+  end
+
+  def delete(*args)
+    tk_send('delete', *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def edit(node, text, *args)
+    tk_send('edit', tagid(node), text, *args)
+    self
+  end
+
+  def exist?(node)
+    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
+
+  def insert(idx, parent, node, keys={})
+    tk_send('insert', idx, tagid(parent), tagid(node), *hash_kv(keys))
+    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
+  end
+
+  def get_node(node, idx)
+    Tk::BWidget::Tree::Node.id2obj(self, tk_send('nodes', tagid(node), idx))
+  end
+
+  def nodes(node, first=None, last=None)
+    simplelist(tk_send('nodes', tagid(node), first, last)).collect{|node|
+      Tk::BWidget::Tree::Node.id2obj(self, node)
+    }
+  end
+
+  def open?(node)
+    bool(self.itemcget(tagid(node), 'open'))
+  end
+
+  def open_tree(node, recurse=None)
+    tk_send('opentree', tagid(node), recurse)
+    self
+  end
+
+  def parent(node)
+    Tk::BWidget::Tree::Node.id2obj(self, tk_send('parent', tagid(node)))
+  end
+
+  def reorder(node, neworder)
+    tk_send('reorder', tagid(node), neworder)
+    self
+  end
+
+  def see(node)
+    tk_send('see', tagid(node))
+    self
+  end
+
+  def selection_add(*args)
+    tk_send_without_enc('selection', 'add',
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+
+  def selection_get
+    list(tk_send_without_enc('selection', 'get'))
+  end
+
+  def selection_include?(*args)
+    bool(tk_send_without_enc('selection', 'get',
+                             *(args.collect{|node| tagid(node)})))
+  end
+
+  def selection_range(*args)
+    tk_send_without_enc('selection', 'range',
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_remove(*args)
+    tk_send_without_enc('selection', 'remove',
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_set(*args)
+    tk_send_without_enc('selection', 'set',
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def selection_toggle(*args)
+    tk_send_without_enc('selection', 'toggle',
+                        *(args.collect{|node| tagid(node)}))
+    self
+  end
+
+  def toggle(node)
+    tk_send_without_enc('toggle', tagid(node))
+    self
+  end
+
+  def visible(node)
+    bool(tk_send_without_enc('visible', tagid(node)))
+  end
+end
+
+class Tk::BWidget::Tree::Node
+  include TkTreatTagFont
+
+  TreeNode_TBL = TkCore::INTERP.create_table
+
+  (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
+    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)
+    if tree.kind_of?(Tk::BWidget::Tree)
+      @tree = tree
+      parent = args.shift
+      if parent.kind_of?(Tk::BWidget::Tree::Node)
+        if parent.tree.path != @tree.path
+          fail RuntimeError, 'tree of parent node is not match'
+        end
+      end
+    elsif tree.kind_of?(Tk::BWidget::Tree::Node)
+      @tree = tree.tree
+      parent = tree.parent
+    else
+      fail RuntimeError,
+        "expect Tk::BWidget::Tree or Tk::BWidget::Tree::Node for 1st argument"
+    end
+
+    if args[-1].kind_of?(Hash)
+      keys = _symbolkey2str(args.pop)
+    else
+      keys = {}
+    end
+
+    index = keys.delete('index')
+    unless args.empty?
+      index = args.shift
+    end
+    index = 'end' unless index
+
+    unless args.empty?
+      fail RuntimeError, 'too much arguments'
+    end
+
+    @tpath = @tree.path
+
+    if keys.key?('nodename')
+      @path = @id = keys.delete('nodename')
+    else
+      TreeNode_ID.mutex.synchronize{
+        @path = @id = TreeNode_ID.join(TkCore::INTERP._ip_id_)
+        TreeNode_ID[1].succ!
+      }
+    end
+
+    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
+
+  def tree
+    @tree
+  end
+
+  def id
+    @id
+  end
+
+  def [](key)
+    cget(key)
+  end
+
+  def []=(key, val)
+    configure(key, val)
+    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)
+  end
+
+  def configinfo(key=nil)
+    @tree.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @tree.current_itemconfiginfo(@id, key)
+  end
+
+  def close_tree(recurse=None)
+    @tree.close_tree(@id, recurse)
+    self
+  end
+
+  def delete
+    @tree.delete(@id)
+    self
+  end
+
+  def edit(*args)
+    @tree.edit(@id, *args)
+    self
+  end
+
+  def exist?
+    @tree.exist?(@id)
+  end
+
+  def index
+    @tree.index(@id)
+  end
+
+  def move(index, parent=nil)
+    if parent
+      @tree.move(parent, @id, index)
+    else
+      @tree.move(self.parent, @id, index)
+    end
+  end
+
+  def open_tree(recurse=None)
+    @tree.open_tree(@id, recurse)
+    self
+  end
+
+  def open?
+    bool(@tree.itemcget(@id, 'open'))
+  end
+
+  def parent
+    @tree.parent(@id)
+  end
+
+  def reorder(neworder)
+    @tree.reorder(@id, neworder)
+  end
+
+  def see
+    @tree.see(@id)
+  end
+
+  def selection_add
+    @tree.selection_add(@id)
+  end
+
+  def selection_remove
+    @tree.selection_remove(@id)
+  end
+
+  def selection_set
+    @tree.selection_set(@id)
+  end
+
+  def selection_toggle
+    @tree.selection_toggle(@id)
+  end
+
+  def toggle
+    @tree.toggle(@id)
+  end
+
+  def visible
+    @tree.visible(@id)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/bwidget/widget.rb b/ext/tk/lib/tkextlib/bwidget/widget.rb
new file mode 100644
index 0000000000..a93364b567
--- /dev/null
+++ b/ext/tk/lib/tkextlib/bwidget/widget.rb
@@ -0,0 +1,129 @@
+#
+#  tkextlib/bwidget/widget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/bwidget.rb'
+
+module Tk
+  module BWidget
+    module Widget
+    end
+  end
+end
+
+module Tk::BWidget::Widget
+  include Tk
+  extend Tk
+
+  def self.__pathname
+    'Widget::configure'
+  end
+
+  def self.__cget_cmd
+    ['Widget::cget']
+  end
+
+  def self.__config_cmd
+    ['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
+
+  def self.add_map(klass, subclass, subpath, opts)
+    tk_call('Widget::addmap', klass, subclass, subpath, opts)
+  end
+
+  def self.bwinclude(klass, subclass, subpath, *args)
+    tk_call('Widget::bwinclude', klass, subclass, subpath, *args)
+  end
+
+  def self.create(klass, path, rename=None, &b)
+    win = window(tk_call('Widget::create', klass, path, rename))
+    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 self.declare(klass, optlist)
+    tk_call('Widget::declare', klass, optlist)
+  end
+
+  def self.define(klass, filename, *args)
+    tk_call('Widget::define', klass, filename, *args)
+  end
+
+  def self.destroy(win)
+    tk_call('Widget::destroy', _epath(win))
+  end
+
+  def self.focus_next(win)
+    tk_call('Widget::focusNext', win)
+  end
+
+  def self.focus_ok(win)
+    tk_call('Widget::focusOk', win)
+  end
+
+  def self.focus_prev(win)
+    tk_call('Widget::focusPrev', win)
+  end
+
+  def self.generate_doc(dir, widgetlist)
+    tk_call('Widget::generate-doc', dir, widgetlist)
+  end
+
+  def self.generate_widget_doc(klass, iscmd, file)
+    tk_call('Widget::generate-widget-doc', klass, iscmd, file)
+  end
+
+  def self.get_option(win, option)
+    tk_call('Widget::getoption', win, option)
+  end
+
+  def self.get_variable(win, varname, my_varname=None)
+    tk_call('Widget::getVariable', win, varname, my_varname)
+  end
+
+  def self.has_changed(win, option, pvalue)
+    tk_call('Widget::hasChanged', win, option, pvalue)
+  end
+
+  def self.init(klass, win, options)
+    tk_call('Widget::init', klass, win, options)
+  end
+
+  def self.set_option(win, option, value)
+    tk_call('Widget::setoption', win, option, value)
+  end
+
+  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)
+  end
+
+  def self.tkinclude(klass, tkwidget, subpath, *args)
+    tk_call('Widget::tkinclude', klass, tkwidget, subpath, *args)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/itcl.rb b/ext/tk/lib/tkextlib/itcl.rb
new file mode 100644
index 0000000000..1d6ecf04f2
--- /dev/null
+++ b/ext/tk/lib/tkextlib/itcl.rb
@@ -0,0 +1,13 @@
+#
+#  [incr Tcl] support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/itcl/setup.rb'
+
+# load library
+require 'tkextlib/itcl/incr_tcl.rb'
diff --git a/ext/tk/lib/tkextlib/itcl/incr_tcl.rb b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
new file mode 100644
index 0000000000..8f6bb33abe
--- /dev/null
+++ b/ext/tk/lib/tkextlib/itcl/incr_tcl.rb
@@ -0,0 +1,178 @@
+#
+#  tkextlib/itk/incr_tcl.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script
+require 'tkextlib/itcl.rb'
+
+# TkPackage.require('Itcl', '3.2')
+TkPackage.require('Itcl')
+
+module Tk
+  module Itcl
+    include Tk
+    extend Tk
+
+    LIBRARY = TkVarAccess.new('::itcl::library')
+    PURIST = TkVarAccess.new('::itcl::purist')
+
+    VERSION    = TkCore::INTERP._invoke("set", "::itcl::version").freeze
+    PATCHLEVEL = TkCore::INTERP._invoke("set", "::itcl::patchLevel").freeze
+
+    PACKAGE_NAME = 'Itcl'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Itcl')
+      rescue
+        ''
+      end
+    end
+
+    ##############################################
+
+    class ItclObject < TkObject
+      ITCL_CLASSNAME = ''.freeze
+
+      (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
+        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
+      end
+
+      def self.call_proc(name, *args)
+        tk_call("#{ITCL_CLASSNAME}::#{cmd}", *args)
+      end
+
+      def call_method(name, *args)
+        tk_call(@path, name, *args)
+      end
+
+      def isa(klass)
+        bool(tk_call(@path, 'isa', klass))
+      end
+      alias itcl_kind_of? isa
+
+      def info_class
+        tk_call(@path, 'info', 'class')
+      end
+
+      def info_inherit
+        simplelist(tk_call(@path, 'info', 'inherit'))
+      end
+
+      def info_heritage
+        list(tk_call(@path, 'info', 'heritage'))
+      end
+
+      def info_function(*args)
+        if args[-1].kind_of?(Array)
+          params = args.pop
+          params.each{|param|
+            param = param.to_s
+            args << ( (param[0] == ?-)? param: "-#{param}" )
+          }
+        end
+        list(tk_call(@path, 'info', 'function', *args))
+      end
+
+      def info_variable(*args)
+        if args[-1].kind_of?(Array)
+          params = args.pop
+          params.each{|param|
+            param = param.to_s
+            args << ( (param[0] == ?-)? param: "-#{param}" )
+          }
+        end
+        list(tk_call(@path, 'info', 'variable', *args))
+      end
+    end
+
+    ##############################################
+
+    def self.body(klass, func, args, body)
+      tk_call('::itcl::body', "#{klass}::#{func}", args, body)
+    end
+
+    def self.code(cmd, *args)
+      tk_call('::itcl::code', cmd, *args)
+    end
+
+    def self.code_in_namespace(namespace, cmd, *args)
+      tk_call('::itcl::code', '-namespace', namespace, cmd, *args)
+    end
+
+    def self.configbody(klass, var, body)
+      tk_call('::itcl::configbody', "#{klass}::#{var}", body)
+    end
+
+    def self.create_itcl_class(name, body)
+      TkCore::INTERP._invoke('::itcl::class', name, body)
+      klass = Class.new(Tk::Itcl::ItclObject)
+      klass.const_set('ITCL_CLASSNAME', name.dup.freeze)
+      klass
+    end
+
+    def self.delete_itcl_class(*names)
+      tk_call('::itcl::delete', 'class',  *names)
+    end
+
+    def self.delete_itcl_object(*names)
+      tk_call('::itcl::delete', 'object',  *names)
+    end
+
+    def self.delete_namespace(*names)
+      tk_call('::itcl::delete', 'namespace',  *names)
+    end
+
+    def self.ensemble(name, *args)
+      tk_call('::itcl::ensemble', name, *args)
+    end
+
+    def self.find_classes(pat=None)
+      simplelist(tk_call('::itcl::find', 'classes', pat))
+    end
+
+    def self.find_objects(*args)
+      simplelist(tk_call('::itcl::find', 'objects', *args))
+    end
+
+    def self.is_itcl_class(target)
+      bool(tk_call('::itcl::is', 'class', target))
+    end
+
+    def self.is_itcl_object(target)
+      bool(tk_call('::itcl::is', 'object', target))
+    end
+
+    def self.create_local_obj(klass, name, *args)
+      tk_call('::itcl::local', klass, name, *args)
+    end
+
+    def self.is_itcl_instance(klass, target)
+      bool(tk_call('::itcl::is', 'object', '-class', klass, target))
+    end
+
+    def self.scope(var)
+      tk_call('::itcl::scope', var)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/itcl/setup.rb b/ext/tk/lib/tkextlib/itcl/setup.rb
new file mode 100644
index 0000000000..70b38e4916
--- /dev/null
+++ b/ext/tk/lib/tkextlib/itcl/setup.rb
@@ -0,0 +1,13 @@
+#
+#  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
+#    operations in this file.
+#
+
+
+# set [incr Tcl] library directory
+
+# ENV['ITCL_LIBRARY'] = '/usr/local/ActiveTcl/lib/itcl3.2/'
diff --git a/ext/tk/lib/tkextlib/itk.rb b/ext/tk/lib/tkextlib/itk.rb
new file mode 100644
index 0000000000..7492bd3eb4
--- /dev/null
+++ b/ext/tk/lib/tkextlib/itk.rb
@@ -0,0 +1,13 @@
+#
+#  [incr Tk] support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/itk/setup.rb'
+
+# load library
+require 'tkextlib/itk/incr_tk.rb'
diff --git a/ext/tk/lib/tkextlib/itk/incr_tk.rb b/ext/tk/lib/tkextlib/itk/incr_tk.rb
new file mode 100644
index 0000000000..989585e33b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/itk/incr_tk.rb
@@ -0,0 +1,446 @@
+#
+#  tkextlib/itk/incr_tk.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/menuspec'
+require 'tkextlib/itcl.rb'
+
+# call setup script
+require 'tkextlib/itk.rb'
+
+#TkPackage.require('Itk', '3.2')
+TkPackage.require('Itk')
+
+module Tk
+  module Itk
+    include Tk
+    extend Tk
+
+    LIBRARY = TkVarAccess.new('::itk::library')
+
+    PACKAGE_NAME = 'Itk'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Itk')
+      rescue
+        ''
+      end
+    end
+
+    def self.usual(arg, *args)
+      tk_call('::itk::usual', arg, *args)
+    end
+
+    def self.usual_names
+      list(tk_call('::itk::usual'))
+    end
+
+    ############################
+
+    class Archetype < TkWindow
+      TkCommandNames = [].freeze
+      # WidgetClassName = 'Archetype'.freeze
+      # WidgetClassNames[WidgetClassName] = self
+
+      def self.to_eval
+        '::itk::' << self::WidgetClassName
+      end
+
+      def __destroy_hook__
+        Tk::Itk::Component::ComponentID_TBL.delete(self.path)
+      end
+
+      #### [incr Tk] public methods
+      def component
+        simplelist(tk_send('component'))
+      end
+
+      def component_path(name)
+        window(tk_send('component', name))
+      end
+      alias component_widget component_path
+
+      def component_invoke(name, cmd, *args)
+        window(tk_send('component', name, cmd, *args))
+      end
+
+      def component_obj(*names)
+        names = component if names.empty?
+        names.collect{|name| Tk::Itk::Component.new(self.path, name) }
+      end
+
+      #### [incr Tk] protected methods
+=begin
+      def itk_component_add(visibility, name, create_cmds, option_cmds=None)
+        args = []
+        visibility.each{|v| v = v.to_s; args << ( (v[0] == ?-)? v: "-#{v}" )}
+        args << '--' << name << create_cmd << option_cmds
+        tk_call('itk_component', 'add', *args)
+      end
+
+      def itk_component_delete(*names)
+        tk_call('itk_component', 'delete', *names)
+      end
+
+      def itk_initialize(keys={})
+        tk_call('itk_initialize', keys)
+      end
+
+      def itk_option_add(*args)
+        tk_call('itk_option', 'add', *args)
+      end
+
+      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
+=end
+    end
+
+    ############################
+
+    class Toplevel < Archetype
+      TkCommandNames = ['::itk::Toplevel'].freeze
+      WidgetClassName = 'Toplevel'.freeze
+      WidgetClassNames[WidgetClassName] ||= self
+
+      include Wm
+      include TkMenuSpec
+
+      def __strval_optkeys
+        super() << 'title'
+      end
+      private :__strval_optkeys
+    end
+
+    ############################
+
+    class Widget < Archetype
+      TkCommandNames = ['::itk::Widget'].freeze
+      WidgetClassName = 'Widget'.freeze
+      WidgetClassNames[WidgetClassName] ||= self
+    end
+
+
+    ############################
+
+    class Component < TkObject
+      def __cget_cmd
+        [self.master, 'component', self.name, 'cget']
+      end
+      private :__cget_cmd
+
+      def __config_cmd
+        [self.master, 'component', self.name, 'configure']
+      end
+      private :__config_cmd
+
+      ComponentID_TBL = TkCore::INTERP.create_table
+
+      (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)
+          master = master.path
+        else
+          master = master.to_s
+        end
+        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)
+        if master.kind_of?(TkObject)
+          master = master.path
+        else
+          master = master.to_s
+        end
+
+        if component.kind_of?(Tk::Itk::Component)
+          component = component.name
+        elsif component
+          component = component.to_s
+        else
+          Itk_Component_ID.mutex.synchronize{
+            component = Itk_Component_ID.join(TkCore::INTERP._ip_id_)
+            Itk_Component_ID[1].succ!
+          }
+        end
+
+        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
+        }
+
+        super(master, component)
+      end
+
+      def initialize(master, component)
+        @master = master
+        @component = component
+
+        ComponentID_TBL.mutex.synchronize{
+          ComponentID_TBL[@master][@component] = self
+        }
+
+        begin
+          @widget = window(tk_call(@master, 'component', @component))
+          @path = @widget.path
+        rescue
+          @widget = nil
+          @path = nil
+        end
+      end
+
+      def path
+        unless @path
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @path
+      end
+
+      def epath
+        path()
+      end
+
+      def to_eval
+        path()
+      end
+
+      def master
+        @master
+      end
+
+      def name
+        @component
+      end
+
+      def widget
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @widget
+      end
+
+      def widget_class
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+            @widget.classname
+          rescue
+            nil
+          end
+        end
+      end
+
+      def method_missing(id, *args)
+        name = id.id2name
+
+        # try 1 : component command
+        begin
+          return tk_call(@master, 'component', @component, name, *args)
+        rescue
+        end
+
+        # try 2 : component configure
+        len = args.length
+        begin
+          case len
+          when 1
+            if name[-1] == ?=
+              return configure(name[0..-2], args[0])
+            else
+              return configure(name, args[0])
+            end
+          when 0
+            return cget(name)
+          end
+        rescue
+        end
+
+        # try 3 : widget method or widget configure
+        begin
+          unless @widget
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          end
+          @widget.__send__(id, *args)
+        rescue
+        end
+
+        # unknown method
+        super(id, *args)
+        # fail RuntimeError, "unknown method '#{name}' for #{self.inspect}"
+      end
+
+      def tk_send(cmd, *rest)
+        begin
+          tk_call(@master, 'component', @component, cmd, *rest)
+        rescue
+          unless @path
+            begin
+              @widget = window(tk_call(@master, 'component', @component))
+              @path = @widget.path
+            rescue
+              fail RuntimeError, 'component is not assigned to a widget'
+            end
+          end
+          tk_call(@path, cmd, *rest)
+        end
+      end
+
+      def tk_send_without_enc(cmd, *rest)
+        begin
+          tk_call_without_enc(@master, 'component', @component, cmd, *rest)
+        rescue
+          unless @path
+            begin
+              @widget = window(tk_call(@master, 'component', @component))
+              @path = @widget.path
+            rescue
+              fail RuntimeError, 'component is not assigned to a widget'
+            end
+          end
+          tk_call_without_enc(@path, cmd, *rest)
+        end
+      end
+
+      def tk_send_with_enc(cmd, *rest)
+        begin
+          tk_call_with_enc(@master, 'component', @component, cmd, *rest)
+        rescue
+          unless @path
+            begin
+              @widget = window(tk_call(@master, 'component', @component))
+              @path = @widget.path
+            rescue
+              fail RuntimeError, 'component is not assigned to a widget'
+            end
+          end
+          tk_call_with_enc(@path, cmd, *rest)
+        end
+      end
+
+      #def bind(*args)
+      #  unless @widget
+      #    begin
+      #      @widget = window(tk_call(@master, 'component', @component))
+      #      @path = @widget.path
+      #    rescue
+      #      fail RuntimeError, 'component is not assigned to a widget'
+      #    end
+      #  end
+      #  @widget.bind(*args)
+      #end
+      def bind(context, *args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @widget.bind(context, cmd, *args)
+      end
+
+      #def bind_append(*args)
+      #  unless @widget
+      #    begin
+      #      @widget = window(tk_call(@master, 'component', @component))
+      #      @path = @widget.path
+      #    rescue
+      #      fail RuntimeError, 'component is not assigned to a widget'
+      #    end
+      #  end
+      #  @widget.bind_append(*args)
+      #end
+      def bind_append(context, *args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+        if TkComm._callback_entry?(args[0]) || !block_given?
+          cmd = args.shift
+        else
+          cmd = Proc.new
+        end
+        @widget.bind_append(context, cmd, *args)
+      end
+
+      def bind_remove(*args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @widget.bind_remove(*args)
+      end
+
+      def bindinfo(*args)
+        unless @widget
+          begin
+            @widget = window(tk_call(@master, 'component', @component))
+            @path = @widget.path
+          rescue
+            fail RuntimeError, 'component is not assigned to a widget'
+          end
+        end
+        @widget.bindinfo(*args)
+      end
+
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/itk/setup.rb b/ext/tk/lib/tkextlib/itk/setup.rb
new file mode 100644
index 0000000000..544926efe0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/itk/setup.rb
@@ -0,0 +1,13 @@
+#
+#  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
+#    operations in this file.
+#
+
+
+# set [incr Tk] library directory
+
+# ENV['ITK_LIBRARY'] = '/usr/local/ActiveTcl/lib/itk3.2/'
diff --git a/ext/tk/lib/tkextlib/iwidgets.rb b/ext/tk/lib/tkextlib/iwidgets.rb
new file mode 100644
index 0000000000..ebd4cf7507
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets.rb
@@ -0,0 +1,94 @@
+#
+#  [incr Widgets] support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/itcl'
+require 'tkextlib/itk'
+
+# call setup script for general 'tkextlib' libraries
+#require 'tkextlib/setup.rb'
+
+# call setup script
+#require 'tkextlib/iwidgets/setup.rb'
+
+# load all image format handlers
+#TkPackage.require('Iwidgets', '4.0')
+TkPackage.require('Iwidgets')
+
+module Tk
+  module Iwidgets
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    extend TkCore
+
+    PACKAGE_NAME = 'Iwidgets'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Iwidgets')
+      rescue
+        ''
+      end
+    end
+
+    ####################################################
+
+    autoload :Buttonbox,             'tkextlib/iwidgets/buttonbox'
+    autoload :Calendar,              'tkextlib/iwidgets/calendar'
+    autoload :Canvasprintbox,        'tkextlib/iwidgets/canvasprintbox'
+    autoload :Canvasprintdialog,     'tkextlib/iwidgets/canvasprintdialog'
+    autoload :Checkbox,              'tkextlib/iwidgets/checkbox'
+    autoload :Combobox,              'tkextlib/iwidgets/combobox'
+    autoload :Dateentry,             'tkextlib/iwidgets/dateentry'
+    autoload :Datefield,             'tkextlib/iwidgets/datefield'
+    autoload :Dialog,                'tkextlib/iwidgets/dialog'
+    autoload :Dialogshell,           'tkextlib/iwidgets/dialogshell'
+    autoload :Disjointlistbox,       'tkextlib/iwidgets/disjointlistbox'
+    autoload :Entryfield,            'tkextlib/iwidgets/entryfield'
+    autoload :Extbutton,             'tkextlib/iwidgets/extbutton'
+    autoload :Extfileselectionbox,   'tkextlib/iwidgets/extfileselectionbox'
+    autoload :Extfileselectiondialog,'tkextlib/iwidgets/extfileselectiondialog'
+    autoload :Feedback,              'tkextlib/iwidgets/feedback'
+    autoload :Fileselectionbox,      'tkextlib/iwidgets/fileselectionbox'
+    autoload :Fileselectiondialog,   'tkextlib/iwidgets/fileselectiondialog'
+    autoload :Finddialog,            'tkextlib/iwidgets/finddialog'
+    autoload :Hierarchy,             'tkextlib/iwidgets/hierarchy'
+    autoload :Hyperhelp,             'tkextlib/iwidgets/hyperhelp'
+    autoload :Labeledframe,          'tkextlib/iwidgets/labeledframe'
+    autoload :Labeledwidget,         'tkextlib/iwidgets/labeledwidget'
+    autoload :Mainwindow,            'tkextlib/iwidgets/mainwindow'
+    autoload :Menubar,               'tkextlib/iwidgets/menubar'
+    autoload :Messagebox,            'tkextlib/iwidgets/messagebox'
+    autoload :Messagedialog,         'tkextlib/iwidgets/messagedialog'
+    autoload :Notebook,              'tkextlib/iwidgets/notebook'
+    autoload :Optionmenu,            'tkextlib/iwidgets/optionmenu'
+    autoload :Panedwindow,           'tkextlib/iwidgets/panedwindow'
+    autoload :Pushbutton,            'tkextlib/iwidgets/pushbutton'
+    autoload :Promptdialog,          'tkextlib/iwidgets/promptdialog'
+    autoload :Radiobox,              'tkextlib/iwidgets/radiobox'
+    autoload :Scrolledcanvas,        'tkextlib/iwidgets/scrolledcanvas'
+    autoload :Scrolledframe,         'tkextlib/iwidgets/scrolledframe'
+    autoload :Scrolledhtml,          'tkextlib/iwidgets/scrolledhtml'
+    autoload :Scrolledlistbox,       'tkextlib/iwidgets/scrolledlistbox'
+    autoload :Scrolledtext,          'tkextlib/iwidgets/scrolledtext'
+    autoload :Scrolledwidget,        'tkextlib/iwidgets/scrolledwidget'
+    autoload :Selectionbox,          'tkextlib/iwidgets/selectionbox'
+    autoload :Selectiondialog,       'tkextlib/iwidgets/selectiondialog'
+    autoload :Shell,                 'tkextlib/iwidgets/shell'
+    autoload :Spindate,              'tkextlib/iwidgets/spindate'
+    autoload :Spinint,               'tkextlib/iwidgets/spinint'
+    autoload :Spinner,               'tkextlib/iwidgets/spinner'
+    autoload :Spintime,              'tkextlib/iwidgets/spintime'
+    autoload :Tabnotebook,           'tkextlib/iwidgets/tabnotebook'
+    autoload :Tabset,                'tkextlib/iwidgets/tabset'
+    autoload :Timeentry,             'tkextlib/iwidgets/timeentry'
+    autoload :Timefield,             'tkextlib/iwidgets/timefield'
+    autoload :Toolbar,               'tkextlib/iwidgets/toolbar'
+    autoload :Watch,                 'tkextlib/iwidgets/watch'
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
new file mode 100644
index 0000000000..91e06d1b52
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/buttonbox.rb
@@ -0,0 +1,121 @@
+#
+#  tkextlib/iwidgets/buttonbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Buttonbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Buttonbox
+  TkCommandNames = ['::iwidgets::buttonbox'.freeze].freeze
+  WidgetClassName = 'Buttonbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def default(idx)
+    tk_call(@path, 'default', index(idx))
+    self
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def hide(idx)
+    tk_call(@path, 'hide', index(idx))
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def invoke(idx=nil)
+    if idx
+      tk_call(@path, 'invoke', index(idx))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def show(idx)
+    tk_call(@path, 'show', index(idx))
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/calendar.rb b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
new file mode 100644
index 0000000000..a5478c7cc6
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/calendar.rb
@@ -0,0 +1,125 @@
+#
+#  tkextlib/iwidgets/calendar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Calendar < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Calendar
+  TkCommandNames = ['::iwidgets::calendar'.freeze].freeze
+  WidgetClassName = 'Calendar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() + [
+      'buttonforeground', 'outline', 'selectcolor',
+      'weekdaybackground', 'weekendbackground'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'days'
+  end
+  private :__listval_optkeys
+
+  def __font_optkeys
+    super() + ['currentdatefont', 'datefont', 'dayfont', 'titlefont']
+  end
+  private :__font_optkeys
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  class CalendarCommand < TkValidateCommand
+    #class CalCmdArgs < TkUtil::CallbackSubst
+    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)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['command']
+    end
+
+    #def initialize(cmd = Proc.new, *args)
+    #  _initialize_for_cb_class(CalCmdArgs, cmd, *args)
+    #end
+  end
+
+  def __validation_class_list
+    super() << CalendarCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, CalendarCommand)
+=begin
+  def command(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(CalendarCommand)
+      configure('command', cmd)
+    elsif args
+      configure('command', [cmd, args])
+    else
+      configure('command', cmd)
+    end
+  end
+=end
+
+  ####################################
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def select(date)
+    tk_call(@path, 'select', date)
+    self
+  end
+
+  def show(date)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
new file mode 100644
index 0000000000..398eec3f1a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/canvasprintbox.rb
@@ -0,0 +1,53 @@
+#
+#  tkextlib/iwidgets/canvasprintbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Canvasprintbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Canvasprintbox
+  TkCommandNames = ['::iwidgets::canvasprintbox'.freeze].freeze
+  WidgetClassName = 'Canvasprintbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'filename'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'stretch'
+  end
+  private :__boolval_optkeys
+
+  def get_output
+    tk_call(@path, 'getoutput')
+  end
+
+  def print
+    bool(tk_call(@path, 'print'))
+  end
+
+  def refresh
+    tk_call(@path, 'refresh')
+    self
+  end
+
+  def set_canvas(win)
+    tk_call(@path, 'setcanvas', win)
+    self
+  end
+
+  def stop
+    tk_call(@path, 'stop')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
new file mode 100644
index 0000000000..e64d8154ca
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/canvasprintdialog.rb
@@ -0,0 +1,38 @@
+#
+#  tkextlib/iwidgets/canvasprintdialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Canvasprintdialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Canvasprintdialog
+  TkCommandNames = ['::iwidgets::canvasprintdialog'.freeze].freeze
+  WidgetClassName = 'Canvasprintdialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def get_output
+    tk_call(@path, 'getoutput')
+  end
+
+  def print
+    bool(tk_call(@path, 'print'))
+  end
+
+  def refresh
+    tk_call(@path, 'refresh')
+    self
+  end
+
+  def set_canvas(win)
+    tk_call(@path, 'setcanvas', win)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/checkbox.rb b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
new file mode 100644
index 0000000000..a7476c824e
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/checkbox.rb
@@ -0,0 +1,130 @@
+#
+#  tkextlib/iwidgets/checkbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Checkbox < Tk::Iwidgets::Labeledframe
+    end
+  end
+end
+
+class Tk::Iwidgets::Checkbox
+  TkCommandNames = ['::iwidgets::checkbox'.freeze].freeze
+  WidgetClassName = 'Checkbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def deselect(idx)
+    tk_call(@path, 'deselect', index(idx))
+    self
+  end
+
+  def flash(idx)
+    tk_call(@path, 'flash', index(idx))
+    self
+  end
+
+  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
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/combobox.rb b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
new file mode 100644
index 0000000000..82dcf25d0b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/combobox.rb
@@ -0,0 +1,104 @@
+#
+#  tkextlib/iwidgets/combobox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Combobox < Tk::Iwidgets::Entryfield
+    end
+  end
+end
+
+class Tk::Iwidgets::Combobox
+  TkCommandNames = ['::iwidgets::combobox'.freeze].freeze
+  WidgetClassName = 'Combobox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'completion' << 'dropdown' << 'editable' << 'unique'
+  end
+  private :__boolval_optkeys
+
+  def clear(component=None)
+    tk_call(@path, 'clear', component)
+    self
+  end
+
+  def delete_list(first, last=None)
+    tk_call(@path, 'delete', 'list', first, last)
+    self
+  end
+
+  def delete_entry(first, last=None)
+    tk_call(@path, 'delete', 'entry', first, last)
+    self
+  end
+
+  def get_list_contents(index)
+    tk_call(@path, 'get', index)
+  end
+
+  def insert_list(idx, *elems)
+    tk_call(@path, 'insert', 'list', idx, *elems)
+    self
+  end
+
+  def insert_entry(idx, *elems)
+    tk_call(@path, 'insert', 'entry', idx, *elems)
+    self
+  end
+
+  # listbox methods
+  def size
+    tk_send_without_enc('size').to_i
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+
+  # scrolledlistbox methods
+  def get_curselection
+    tk_call(@path, 'getcurselection')
+  end
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+  def sort(*params, &b)
+    # see 'lsort' man page about params
+    if b
+      tk_call(@path, 'sort', '-command', proc(&b), *params)
+    else
+      tk_call(@path, 'sort', *params)
+    end
+    self
+  end
+  def sort_ascending
+    tk_call(@path, 'sort', 'ascending')
+    self
+  end
+  def sort_descending
+    tk_call(@path, 'sort', 'descending')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dateentry.rb b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
new file mode 100644
index 0000000000..98a0051e55
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/dateentry.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/dateentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Dateentry < Tk::Iwidgets::Datefield
+    end
+  end
+end
+
+class Tk::Iwidgets::Dateentry
+  TkCommandNames = ['::iwidgets::dateentry'.freeze].freeze
+  WidgetClassName = 'Dateentry'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/datefield.rb b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
new file mode 100644
index 0000000000..50d5405a3b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/datefield.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/iwidgets/datefield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Datefield < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Datefield
+  TkCommandNames = ['::iwidgets::datefield'.freeze].freeze
+  WidgetClassName = 'Datefield'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'gmt'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def valid?
+    bool(tk_call(@path, 'isvalid'))
+  end
+  alias isvalid? valid?
+
+  def show(date=None)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialog.rb b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
new file mode 100644
index 0000000000..2d554ca7b5
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/dialog.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/dialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Dialog < Tk::Iwidgets::Dialogshell
+    end
+  end
+end
+
+class Tk::Iwidgets::Dialog
+  TkCommandNames = ['::iwidgets::dialog'.freeze].freeze
+  WidgetClassName = 'Dialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
new file mode 100644
index 0000000000..e880594532
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/dialogshell.rb
@@ -0,0 +1,121 @@
+#
+#  tkextlib/iwidgets/dialogshell.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Dialogshell < Tk::Iwidgets::Shell
+    end
+  end
+end
+
+class Tk::Iwidgets::Dialogshell
+  TkCommandNames = ['::iwidgets::dialogshell'.freeze].freeze
+  WidgetClassName = 'Dialogshell'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def default(idx)
+    tk_call(@path, 'default', index(idx))
+    self
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def hide(idx)
+    tk_call(@path, 'hide', index(idx))
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def invoke(idx=nil)
+    if idx
+      tk_call(@path, 'invoke', index(idx))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def show(idx)
+    tk_call(@path, 'show', index(idx))
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
new file mode 100644
index 0000000000..07ab025cdf
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/disjointlistbox.rb
@@ -0,0 +1,50 @@
+#
+#  tkextlib/iwidgets/disjointlistbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Disjointlistbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Disjointlistbox
+  TkCommandNames = ['::iwidgets::disjointlistbox'.freeze].freeze
+  WidgetClassName = 'Disjointlistbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'lhslabeltext' << 'rhslabeltext' << 'lhsbuttonlabel' << 'rhsbuttonlabel'
+  end
+  private :__strval_optkeys
+
+  def set_lhs(*items)
+    tk_call(@path, 'setlhs', items)
+    self
+  end
+  def set_rhs(*items)
+    tk_call(@path, 'setrhs', items)
+    self
+  end
+
+  def get_lhs
+    simplelist(tk_call(@path, 'getlhs'))
+  end
+  def get_rhs
+    simplelist(tk_call(@path, 'getrhs'))
+  end
+
+  def insert_lhs(*items)
+    tk_call(@path, 'insertlhs', items)
+    self
+  end
+  def insert_rhs(*items)
+    tk_call(@path, 'insertrhs', items)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/entryfield.rb b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
new file mode 100644
index 0000000000..3e7149a662
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/entryfield.rb
@@ -0,0 +1,185 @@
+#
+#  tkextlib/iwidgets/entryfield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Entryfield < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Entryfield
+  TkCommandNames = ['::iwidgets::entryfield'.freeze].freeze
+  WidgetClassName = 'Entryfield'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  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 ],
+        nil
+      ]
+      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
+
+    def self._config_keys
+      ['validate', 'invalid']
+    end
+  end
+
+  def __validation_class_list
+    super() << EntryfieldValidate
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
+=begin
+  def validate(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('validate', cmd)
+    elsif args
+      configure('validate', [cmd, args])
+    else
+      configure('validate', cmd)
+    end
+  end
+
+  def invalid(cmd = Proc.new, args = nil)
+    if cmd.kind_of?(ValidateCmd)
+      configure('invalid', cmd)
+    elsif args
+      configure('invalid', [cmd, args])
+    else
+      configure('invalid', cmd)
+    end
+  end
+=end
+
+  ####################################
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor cursor=
+
+  def index(index)
+    number(tk_send_without_enc('index', index))
+  end
+
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  # based on tk/scrollable.rb
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extbutton.rb b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
new file mode 100644
index 0000000000..e744fba91a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/extbutton.rb
@@ -0,0 +1,40 @@
+#
+#  tkextlib/iwidgets/extbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Extbutton < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Extbutton
+  TkCommandNames = ['::iwidgets::extbutton'.freeze].freeze
+  WidgetClassName = 'Extbutton'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'bitmapforeground' << 'ringbackground'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'defaultring'
+  end
+  private :__boolval_optkeys
+
+  def invoke
+    tk_call(@path, 'invoke')
+    self
+  end
+
+  def flash
+    tk_call(@path, 'flash')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
new file mode 100644
index 0000000000..2ff15bb509
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/extfileselectionbox.rb
@@ -0,0 +1,46 @@
+#
+#  tkextlib/iwidgets/extfileselectionbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Extfileselectionbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Extfileselectionbox
+  TkCommandNames = ['::iwidgets::extfileselectionbox'.freeze].freeze
+  WidgetClassName = 'Extfileselectionbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() + [
+      'dirslabel', 'fileslabel', 'filterlabel', 'mask', 'nomatchstring',
+      'selectionlabel'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() + ['dirson', 'fileson', 'filteron', 'selectionon']
+  end
+  private :__boolval_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
new file mode 100644
index 0000000000..509fdcf636
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/extfileselectiondialog.rb
@@ -0,0 +1,33 @@
+#
+#  tkextlib/iwidgets/extfileselectiondialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Extfileselectiondialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Extfileselectiondialog
+  TkCommandNames = ['::iwidgets::extfileselectiondialog'.freeze].freeze
+  WidgetClassName = 'Extfileselectiondialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/feedback.rb b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
new file mode 100644
index 0000000000..29d04c8a5d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/feedback.rb
@@ -0,0 +1,35 @@
+#
+#  tkextlib/iwidgets/feedback.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Feedback < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Feedback
+  TkCommandNames = ['::iwidgets::feedback'.freeze].freeze
+  WidgetClassName = 'Feedback'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'barcolor'
+  end
+  private :__strval_optkeys
+
+  def reset
+    tk_call(@path, 'reset')
+    self
+  end
+
+  def step(inc=1)
+    tk_call(@path, 'step', inc)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
new file mode 100644
index 0000000000..a425b53b5f
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/fileselectionbox.rb
@@ -0,0 +1,46 @@
+#
+#  tkextlib/iwidgets/fileselectionbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Fileselectionbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Fileselectionbox
+  TkCommandNames = ['::iwidgets::fileselectionbox'.freeze].freeze
+  WidgetClassName = 'Fileselectionbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() + [
+      'directory', 'dirslabel', 'fileslabel', 'filterlabel', 'mask',
+      'nomatchstring', 'selectionlabel'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() + ['dirson', 'fileson', 'filteron', 'selectionon']
+  end
+  private :__boolval_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
new file mode 100644
index 0000000000..ebcdaf8c0b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/fileselectiondialog.rb
@@ -0,0 +1,33 @@
+#
+#  tkextlib/iwidgets/fileselectiondialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Fileselectiondialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Fileselectiondialog
+  TkCommandNames = ['::iwidgets::fileselectiondialog'.freeze].freeze
+  WidgetClassName = 'Fileselectiondialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def filter
+    tk_call(@path, 'filter')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/finddialog.rb b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
new file mode 100644
index 0000000000..3d522e07c8
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/finddialog.rb
@@ -0,0 +1,42 @@
+#
+#  tkextlib/iwidgets/finddialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Finddialog < Tk::Iwidgets::Dialogshell
+    end
+  end
+end
+
+class Tk::Iwidgets::Finddialog
+  TkCommandNames = ['::iwidgets::finddialog'.freeze].freeze
+  WidgetClassName = 'Finddialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() + [
+      'patternbackground', 'patternforeground',
+      'searchbackground', 'searchforeground'
+    ]
+  end
+  private :__strval_optkeys
+
+  def __val2ruby_optkeys  # { key=>proc, ... }
+    super().update('textwidget'=>proc{|v| window(v)})
+  end
+  private :__val2ruby_optkeys
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def find
+    tk_call(@path, 'find')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
new file mode 100644
index 0000000000..cb9301d0c9
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/hierarchy.rb
@@ -0,0 +1,365 @@
+#
+#  tkextlib/iwidgets/hierarchy.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/text'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Hierarchy < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Hierarchy
+  ItemConfCMD = ['tag'.freeze, 'configure'.freeze].freeze
+  include TkTextTagConfig
+
+  TkCommandNames = ['::iwidgets::hierarchy'.freeze].freeze
+  WidgetClassName = 'Hierarchy'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  class QueryCommand < TkValidateCommand
+    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)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['querycommand']
+    end
+  end
+
+  class IndicatorCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      KEY_TBL  = [
+        [ ?n, ?s, :node ],
+        [ ?s, ?b, :status ],
+        nil
+      ]
+
+      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)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['iconcommand', 'icondblcommand', 'imagedblcommand']
+    end
+  end
+
+  class IconCommand < TkValidateCommand
+    class ValidateArgs < TkUtil::CallbackSubst
+      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)
+        val
+      end
+    end
+
+    def self._config_keys
+      # array of config-option key (string or symbol)
+      ['dblclickcommand', 'imagecommand', 'selectcommand']
+    end
+  end
+
+  def __validation_class_list
+    super() << QueryCommand << IndicatorCommand << IconCommand
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, QueryCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, IndicatorCommand)
+  Tk::ValidateConfigure.__def_validcmd(binding, IconCommand)
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'alwaysquery' << 'expanded' << 'filter'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'markbackground' << 'markforeground' << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def collapse(node)
+    tk_call(@path, 'collapse')
+    self
+  end
+
+  def current
+    tk_call(@path, 'current')
+  end
+
+  def draw(mode=None)
+    case mode
+    when None
+      # do nothing
+    when 'now', :now
+      mode = '-now'
+    when 'eventually', :eventually
+      mode = '-eventually'
+    when String, Symbol
+      mode = mode.to_s
+      mode = '-' << mode if mode[0] != ?-
+    end
+    tk_call(@path, 'draw', mode)
+  end
+
+  def expand(node)
+    tk_call(@path, 'expand', node)
+    self
+  end
+
+  def expanded?(node)
+    bool(tk_call(@path, 'expanded', node))
+  end
+
+  def exp_state
+    list(tk_call(@path, 'expState'))
+  end
+  alias expand_state  exp_state
+  alias expanded_list exp_state
+
+  def mark_clear
+    tk_call(@path, 'mark', 'clear')
+    self
+  end
+  def mark_add(*nodes)
+    tk_call(@path, 'mark', 'add', *nodes)
+    self
+  end
+  def mark_remove(*nodes)
+    tk_call(@path, 'mark', 'remove', *nodes)
+    self
+  end
+  def mark_get
+    list(tk_call(@path, 'mark', 'get'))
+  end
+
+  def refresh(node)
+    tk_call(@path, 'refresh', node)
+    self
+  end
+
+  def prune(node)
+    tk_call(@path, 'prune', node)
+    self
+  end
+
+  def selection_clear
+    tk_call(@path, 'selection', 'clear')
+    self
+  end
+  def selection_add(*nodes)
+    tk_call(@path, 'selection', 'add', *nodes)
+    self
+  end
+  def selection_remove(*nodes)
+    tk_call(@path, 'selection', 'remove', *nodes)
+    self
+  end
+  def selection_get
+    list(tk_call(@path, 'selection', 'get'))
+  end
+
+  def toggle(node)
+    tk_call(@path, 'toggle', node)
+    self
+  end
+
+  # 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),
+                             op, _get_eval_enc_str(idx2)))
+  end
+
+  def debug
+    bool(tk_send_without_enc('debug'))
+  end
+  def debug=(boolean)
+    tk_send_without_enc('debug', boolean)
+    #self
+    boolean
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def dlineinfo(index)
+    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
+  end
+
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+
+  def index(index)
+    tk_send_without_enc('index', _get_eval_enc_str(index))
+  end
+
+  def insert(index, chars, *tags)
+    if tags[0].kind_of? Array
+      # multiple chars-taglist argument :: str, [tag,...], str, [tag,...], ...
+      args = [chars]
+      while tags.size > 0
+        args << tags.shift.collect{|x|_get_eval_string(x)}.join(' ')  # taglist
+        args << tags.shift if tags.size > 0                           # chars
+      end
+      super(index, *args)
+    else
+      # single chars-taglist argument :: str, tag, tag, ...
+      if tags.size == 0
+        super(index, chars)
+      else
+        super(index, chars, tags.collect{|x|_get_eval_string(x)}.join(' '))
+      end
+    end
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+
+  # based on tk/scrollable.rb
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
new file mode 100644
index 0000000000..d4ea1aac65
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/hyperhelp.rb
@@ -0,0 +1,50 @@
+#
+#  tkextlib/iwidgets/hyperhelp.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Hyperhelp < Tk::Iwidgets::Shell
+    end
+  end
+end
+
+class Tk::Iwidgets::Hyperhelp
+  TkCommandNames = ['::iwidgets::hyperhelp'.freeze].freeze
+  WidgetClassName = 'Hyperhelp'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'helpdir'
+  end
+  private :__strval_optkeys
+
+  def __listval_optkeys
+    super() << 'topics'
+  end
+  private :__listval_optkeys
+
+  def show_topic(topic)
+    tk_call(@path, 'showtopic', topic)
+    self
+  end
+
+  def follow_link(href)
+    tk_call(@path, 'followlink', href)
+    self
+  end
+
+  def forward
+    tk_call(@path, 'forward')
+    self
+  end
+
+  def back
+    tk_call(@path, 'back')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
new file mode 100644
index 0000000000..6595398427
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/labeledframe.rb
@@ -0,0 +1,39 @@
+#
+#  tkextlib/iwidgets/labeledframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Labeledframe < Tk::Itk::Archetype
+    end
+  end
+end
+
+class Tk::Iwidgets::Labeledframe
+  TkCommandNames = ['::iwidgets::labeledframe'.freeze].freeze
+  WidgetClassName = 'Labeledframe'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'labeltext'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'labelvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'labelfont'
+  end
+  private :__font_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
new file mode 100644
index 0000000000..d36d42878d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/labeledwidget.rb
@@ -0,0 +1,45 @@
+#
+#  tkextlib/iwidgets/labeledwidget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Labeledwidget < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Labeledwidget
+  extend TkCore
+
+  TkCommandNames = ['::iwidgets::labeledwidget'.freeze].freeze
+  WidgetClassName = 'Labeledwidget'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'labeltext'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'labelvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'labelfont'
+  end
+  private :__font_optkeys
+
+  def self.alignlabels(*wins)
+    tk_call('::iwidgets::Labeledwidget::alignlabels', *wins)
+  end
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
new file mode 100644
index 0000000000..ebf48021db
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/mainwindow.rb
@@ -0,0 +1,67 @@
+#
+#  tkextlib/iwidgets/mainwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Mainwindow < Tk::Iwidgets::Shell
+    end
+  end
+end
+
+class Tk::Iwidgets::Mainwindow
+  TkCommandNames = ['::iwidgets::mainwindow'.freeze].freeze
+  WidgetClassName = 'Mainwindow'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'helpline' << 'statusline'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'menubarbackground' << 'menubarforeground' << 'toolbarforeground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'menubarfont' << 'toolbarfont'
+  end
+  private :__font_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def menubar(*args)
+    unless args.empty?
+      tk_call(@path, 'menubar', *args)
+    end
+    window(tk_call(@path, 'menubar'))
+  end
+
+  def mousebar(*args)
+    unless args.empty?
+      tk_call(@path, 'mousebar', *args)
+    end
+    window(tk_call(@path, 'mousebar'))
+  end
+
+  def msgd(*args)
+    unless args.empty?
+      tk_call(@path, 'msgd', *args)
+    end
+    window(tk_call(@path, 'msgd'))
+  end
+
+  def toolbar(*args)
+    unless args.empty?
+      tk_call(@path, 'toolbar', *args)
+    end
+    window(tk_call(@path, 'toolbar'))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/menubar.rb b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
new file mode 100644
index 0000000000..f9a17d0b55
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/menubar.rb
@@ -0,0 +1,212 @@
+#
+#  tkextlib/iwidgets/menubar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Menubar < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Menubar
+  TkCommandNames = ['::iwidgets::menubar'.freeze].freeze
+  WidgetClassName = 'Menubar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'menubuttons'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvariable'
+  end
+  private :__tkvariable_optkeys
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'menucget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'menuconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'selectcolor'
+  end
+  private :__item_strval_optkeys
+
+  def __item_tkvariable_optkeys(id)
+    super(id) << 'helpstr'
+  end
+  private :__item_tkvariable_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __methodcall_optkeys
+    {'menubuttons'=>'menubuttons'}
+  end
+
+  def menubuttons(val = nil)
+    unless val
+      return tk_call(@path, 'cget', '-menubuttons')
+    end
+
+    tk_call(@path, 'configure', '-menubuttons', _parse_menu_spec(val))
+    self
+  end
+
+  def _parse_menu_spec(menu_spec)
+    ret = ''
+    menu_spec.each{|spec|
+      next unless spec
+
+      if spec.kind_of?(Hash)
+        args = [spec]
+        type = 'options'
+      else
+        type, *args = spec
+      end
+
+      type = type.to_s
+      case type
+      when 'options'
+        keys = args[0]
+        ary = [type]
+        ary.concat(hash_kv(keys))
+        ret << array2tk_list(ary) << "\n"
+
+      when 'menubutton', 'cascade'
+        name, keys = args
+        if keys
+          ary = [type, name]
+          keys = _symbolkey2str(keys)
+          keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
+          ary.concat(hash_kv(keys))
+          ret << array2tk_list(ary) << "\n"
+        else
+          ret << array2tk_list([type, name]) << "\n"
+        end
+
+      else
+        name, keys = args
+        if keys
+          ary = [type, name]
+          ary.concat(hash_kv(keys))
+          ret << array2tk_list(ary) << "\n"
+        else
+          ret << array2tk_list([type, name]) << "\n"
+        end
+      end
+    }
+    ret
+  end
+
+  ####################################
+
+  def add(type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    keys = _symbolkey2str(keys)
+    keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
+    tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def delete(path1, path2=nil)
+    if path2
+    else
+      tk_call(@path, 'delete', index(idx))
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    keys = _symbolkey2str(keys)
+    keys['menu'] = _parse_menu_spec(keys['menu']) if keys.key?('menu')
+    tk_call(@path, 'insert', index(idx), type, tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def invoke(idx)
+    tk_call(@path, 'invoke', index(idx))
+    self
+  end
+
+  def menupath(pat)
+    if (win = tk_call(@path, 'path', pat)) == '-1'
+      return nil
+    end
+    window(win)
+  end
+  def menupath_glob(pat)
+    if (win = tk_call(@path, 'path', '-glob', pat)) == '-1'
+      return nil
+    end
+    window(win)
+  end
+  def menupath_tclregexp(pat)
+    if (win = tk_call(@path, 'path', '-regexp', pat)) == '-1'
+      return nil
+    end
+    window(win)
+  end
+
+  def type(path)
+    tk_call(@path, 'type', path)
+  end
+
+  def yposition(path)
+    number(tk_call(@path, 'yposition', path))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagebox.rb b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
new file mode 100644
index 0000000000..6adb53d941
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/messagebox.rb
@@ -0,0 +1,93 @@
+#
+#  tkextlib/iwidgets/messagebox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Messagebox < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Messagebox
+  TkCommandNames = ['::iwidgets::messagebox'.freeze].freeze
+  WidgetClassName = 'Messagebox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'type', 'cget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'type', 'configure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'bell' << 'show'
+  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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __strval_optkeys
+    super() << 'filename' << 'savedir'
+  end
+  private :__strval_optkeys
+
+  def type_add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    unless tag
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'type', 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def export(file)
+    tk_call(@path, 'export', file)
+    self
+  end
+
+  def issue(string, type=None, *args)
+    tk_call(@path, 'issue', string, tagid(type), *args)
+    self
+  end
+
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
new file mode 100644
index 0000000000..9aa590056f
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/messagedialog.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/messagedialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Messagedialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Messagedialog
+  TkCommandNames = ['::iwidgets::messagedialog'.freeze].freeze
+  WidgetClassName = 'Messagedialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/notebook.rb b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
new file mode 100644
index 0000000000..7ed4126a4d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/notebook.rb
@@ -0,0 +1,175 @@
+#
+#  tkextlib/iwidgets/notebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Notebook < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Notebook
+  TkCommandNames = ['::iwidgets::notebook'.freeze].freeze
+  WidgetClassName = 'Notebook'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'pagecget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'pageconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'auto'
+  end
+  private :__boolval_optkeys
+
+  def add(keys={})
+    window(tk_call(@path, 'add', *hash_kv(keys)))
+  end
+
+  def child_site_list
+    list(tk_call(@path, 'childsite'))
+  end
+
+  def child_site(idx)
+    if (new_idx = self.index(idx)) < 0
+      new_idx = tagid(idx)
+    end
+    window(tk_call(@path, 'childsite', new_idx))
+  end
+
+  def delete(idx1, idx2=nil)
+    if (new_idx1 = self.index(idx1)) < 0
+      new_idx1 = tagid(idx1)
+    end
+    if idx2
+      if (new_idx2 = self.index(idx2)) < 0
+        new_idx2 = tagid(idx2)
+      end
+      tk_call(@path, 'delete', new_idx1, new_idx2)
+    else
+      tk_call(@path, 'delete', new_idx1)
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, keys={})
+    if (new_idx = self.index(idx)) < 0
+      new_idx = tagid(idx)
+    end
+    window(tk_call(@path, 'insert', new_idx, *hash_kv(keys)))
+  end
+
+  def next
+    tk_call(@path, 'next')
+    self
+  end
+
+  def prev
+    tk_call(@path, 'prev')
+    self
+  end
+
+  def select(idx)
+    if (new_idx = self.index(idx)) < 0
+      new_idx = tagid(idx)
+    end
+    tk_call(@path, 'select', new_idx)
+    self
+  end
+
+  def scrollcommand(cmd=Proc.new)
+    configure_cmd 'scrollcommand', cmd
+    self
+  end
+  alias xscrollcommand scrollcommand
+  alias yscrollcommand scrollcommand
+
+  def xscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'horizontal'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.xview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  def yscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'vertical'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.yview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  alias scrollbar yscrollbar
+
+  def view(*idxs)
+    if idxs.size == 0
+      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
+    end
+  end
+  alias xview view
+  alias yview view
+
+  def view_moveto(*idxs)
+    view('moveto', *idxs)
+  end
+  alias xview_moveto view_moveto
+  alias yview_moveto view_moveto
+  def view_scroll(index, what='pages')
+    view('scroll', index, what)
+  end
+  alias xview_scroll view_scroll
+  alias yview_scroll view_scroll
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
new file mode 100644
index 0000000000..57a3cc7d2b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/optionmenu.rb
@@ -0,0 +1,92 @@
+#
+#  tkextlib/iwidgets/optionmenu.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Optionmenu < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Optionmenu
+  TkCommandNames = ['::iwidgets::optionmenu'.freeze].freeze
+  WidgetClassName = 'Optionmenu'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'cyclicon'
+  end
+  private :__boolval_optkeys
+
+  def delete(first, last=nil)
+    if last
+      tk_call(@path, 'delete', first, last)
+    else
+      tk_call(@path, 'delete', first)
+    end
+    self
+  end
+
+  def disable(idx)
+    tk_call(@path, 'disable', idx)
+    self
+  end
+
+  def enable(idx)
+    tk_call(@path, 'enable', idx)
+    self
+  end
+
+  def get(first=nil, last=nil)
+    if last
+      simplelist(tk_call(@path, 'get', first, last))
+    elsif first
+      tk_call(@path, 'get', first)
+    else
+      tk_call(@path, 'get')
+    end
+  end
+  def get_range(first, last)
+    get(first, last)
+  end
+  def get_selected
+    get()
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', idx))
+  end
+
+  def insert(idx, *args)
+    tk_call(@path, 'insert', idx, *args)
+    self
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', idx)
+    self
+  end
+
+  def sort(*params, &b)
+    # see 'lsort' man page about params
+    if b
+      tk_call(@path, 'sort', '-command', proc(&b), *params)
+    else
+      tk_call(@path, 'sort', *params)
+    end
+    self
+  end
+  def sort_ascending
+    tk_call(@path, 'sort', 'ascending')
+    self
+  end
+  def sort_descending
+    tk_call(@path, 'sort', 'descending')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
new file mode 100644
index 0000000000..65463cc85a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/panedwindow.rb
@@ -0,0 +1,134 @@
+#
+#  tkextlib/iwidgets/panedwindow.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Panedwindow < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Panedwindow
+  TkCommandNames = ['::iwidgets::panedwindow'.freeze].freeze
+  WidgetClassName = 'Panedwindow'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'panecget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'paneconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'showhandle'
+  end
+  private :__boolval_optkeys
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'add', tagid(tag), *hash_kv(keys)))
+    tag
+  end
+
+  def child_site_list
+    list(tk_call(@path, 'childsite'))
+  end
+
+  def child_site(idx)
+    window(tk_call(@path, 'childsite', index(idx)))
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def fraction(*percentages)
+    tk_call(@path, 'fraction', *percentages)
+    self
+  end
+
+  def hide(idx)
+    tk_call(@path, 'hide', index(idx))
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys)))
+    tag
+  end
+
+  def invoke(idx=nil)
+    if idx
+      tk_call(@path, 'invoke', index(idx))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def reset
+    tk_call(@path, 'reset')
+    self
+  end
+
+  def show(idx)
+    tk_call(@path, 'show', index(idx))
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
new file mode 100644
index 0000000000..7c7ff7ad62
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/promptdialog.rb
@@ -0,0 +1,131 @@
+#
+#  tkextlib/iwidgets/promptdialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Promptdialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Promptdialog
+  TkCommandNames = ['::iwidgets::promptdialog'.freeze].freeze
+  WidgetClassName = 'Promptdialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  # index method is not available, because it shows index of the entry field
+  def default(name)
+    tk_call(@path, 'default', tagid(name))
+    self
+  end
+
+  def hide(name)
+    tk_call(@path, 'hide', tagid(name))
+    self
+  end
+
+  def invoke(name=nil)
+    if name
+      tk_call(@path, 'invoke', tagid(name))
+    else
+      tk_call(@path, 'invoke')
+    end
+    self
+  end
+
+  def show(name)
+    tk_call(@path, 'show', tagid(name))
+    self
+  end
+
+
+  # based on Tk::Iwidgets::Entryfield
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor cursor=
+
+  def index(idx)
+    number(tk_send_without_enc('index', idx))
+  end
+
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
new file mode 100644
index 0000000000..ae56788289
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/pushbutton.rb
@@ -0,0 +1,35 @@
+#
+#  tkextlib/iwidgets/pushbutton.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Pushbutton < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Pushbutton
+  TkCommandNames = ['::iwidgets::pushbutton'.freeze].freeze
+  WidgetClassName = 'Pushbutton'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'defaultring'
+  end
+  private :__boolval_optkeys
+
+  def invoke
+    tk_call_without_enc(@path, 'invoke')
+    self
+  end
+
+  def flash
+    tk_call_without_enc(@path, 'flash')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/radiobox.rb b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
new file mode 100644
index 0000000000..21181777b5
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/radiobox.rb
@@ -0,0 +1,121 @@
+#
+#  tkextlib/iwidgets/radiobox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Radiobox < Tk::Iwidgets::Labeledframe
+    end
+  end
+end
+
+class Tk::Iwidgets::Radiobox
+  TkCommandNames = ['::iwidgets::radiobox'.freeze].freeze
+  WidgetClassName = 'Radiobox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'buttoncget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'buttonconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_boolval_optkeys(id)
+    super(id) << 'defaultring'
+  end
+  private :__item_boolval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def add(tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'add', tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def delete(idx)
+    tk_call(@path, 'delete', index(idx))
+    self
+  end
+
+  def deselect(idx)
+    tk_call(@path, 'deselect', index(idx))
+    self
+  end
+
+  def flash(idx)
+    tk_call(@path, 'flash', index(idx))
+    self
+  end
+
+  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)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    tk_call(@path, 'insert', index(idx), tagid(tag), *hash_kv(keys))
+    tag
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
new file mode 100644
index 0000000000..056cd85322
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scopedobject.rb
@@ -0,0 +1,24 @@
+#
+#  tkextlib/iwidgets/buttonbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scopedobject < TkObject
+    end
+  end
+end
+
+class Tk::Iwidgets::Scopedobject
+  TkCommandNames = ['::iwidgets::scopedobject'.freeze].freeze
+  WidgetClassName = 'Scopedobject'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def initialize(obj_name, keys={})
+    @path = tk_call(self.class::TkCommandNames[0], obj_name, *hash_kv(keys))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
new file mode 100644
index 0000000000..4dea2f2d5c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb
@@ -0,0 +1,353 @@
+#
+#  tkextlib/iwidgets/scrolledcanvas.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledcanvas < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledcanvas
+  TkCommandNames = ['::iwidgets::scrolledcanvas'.freeze].freeze
+  WidgetClassName = 'Scrolledcanvas'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ################################
+
+  def __boolval_optkeys
+    super() << 'autoresize'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def initialize(*args)
+    super(*args)
+    @canvas = component_widget('canvas')
+  end
+
+  def method_missing(id, *args)
+    if @canvas.respond_to?(id)
+      @canvas.__send__(id, *args)
+    else
+      super(id, *args)
+    end
+  end
+
+  ################################
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+
+  ##########################
+  include TkCanvasItemConfig
+
+  def tagid(tag)
+    if tag.kind_of?(TkcItem) || tag.kind_of?(TkcTag)
+      tag.id
+    elsif tag.kind_of?(Tk::Itk::Component)
+      tag.name
+    else
+      tag  # maybe an Array of configure parameters
+    end
+  end
+  private :tagid
+
+  # create a canvas item without creating a TkcItem object
+  def create(type, *args)
+    type.create(self, *args)
+  end
+
+  #######################
+
+  def addtag(tag, mode, *args)
+    tk_send_without_enc('addtag', tagid(tag), mode, *args)
+    self
+  end
+  def addtag_above(tagOrId, target)
+    addtag(tagOrId, 'above', tagid(target))
+  end
+  def addtag_all(tagOrId)
+    addtag(tagOrId, 'all')
+  end
+  def addtag_below(tagOrId, target)
+    addtag(tagOrId, 'below', tagid(target))
+  end
+  def addtag_closest(tagOrId, x, y, halo=None, start=None)
+    addtag(tagOrId, 'closest', x, y, halo, start)
+  end
+  def addtag_enclosed(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'enclosed', x1, y1, x2, y2)
+  end
+  def addtag_overlapping(tagOrId, x1, y1, x2, y2)
+    addtag(tagOrId, 'overlapping', x1, y1, x2, y2)
+  end
+  def addtag_withtag(tagOrId, tag)
+    addtag(tagOrId, 'withtag', tagid(tag))
+  end
+
+  def bbox(tagOrId, *tags)
+    list(tk_send_without_enc('bbox', tagid(tagOrId),
+                             *tags.collect{|t| tagid(t)}))
+  end
+
+  #def itembind(tag, context, cmd=Proc.new, *args)
+  #  _bind([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  #def itembind_append(tag, context, cmd=Proc.new, *args)
+  #  _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+  #  self
+  #end
+  def itembind_append(tag, context, *args)
+    # if args[0].kind_of?(Proc) || args[0].kind_of?(Method)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([path, "bind", tagid(tag)], context, cmd, *args)
+    self
+  end
+
+  def itembind_remove(tag, context)
+    _bind_remove([path, "bind", tagid(tag)], context)
+    self
+  end
+
+  def itembindinfo(tag, context=nil)
+    _bindinfo([path, "bind", tagid(tag)], context)
+  end
+
+  def canvasx(screen_x, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasx', screen_x, *args))
+    number(tk_send_without_enc('canvasx', screen_x, *args))
+  end
+  def canvasy(screen_y, *args)
+    #tk_tcl2ruby(tk_send_without_enc('canvasy', screen_y, *args))
+    number(tk_send_without_enc('canvasy', screen_y, *args))
+  end
+
+  def coords(tag, *args)
+    if args == []
+      tk_split_list(tk_send_without_enc('coords', tagid(tag)))
+    else
+      tk_send_without_enc('coords', tagid(tag), *(args.flatten))
+      self
+    end
+  end
+
+  def dchars(tag, first, last=None)
+    tk_send_without_enc('dchars', tagid(tag),
+                        _get_eval_enc_str(first), _get_eval_enc_str(last))
+    self
+  end
+
+  def delete(*args)
+    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.mutex.synchronize{
+            tbl.delete(item.id)
+          }
+        end
+      }
+    end
+    tk_send_without_enc('delete', *args.collect{|t| tagid(t)})
+    self
+  end
+  alias remove delete
+
+  def dtag(tag, tag_to_del=None)
+    tk_send_without_enc('dtag', tagid(tag), tag_to_del)
+    self
+  end
+
+  def find(mode, *args)
+    list(tk_send_without_enc('find', mode, *args)).collect!{|id|
+      TkcItem.id2obj(self, id)
+    }
+  end
+  def find_above(target)
+    find('above', tagid(target))
+  end
+  def find_all
+    find('all')
+  end
+  def find_below(target)
+    find('below', tagid(target))
+  end
+  def find_closest(x, y, halo=None, start=None)
+    find('closest', x, y, halo, start)
+  end
+  def find_enclosed(x1, y1, x2, y2)
+    find('enclosed', x1, y1, x2, y2)
+  end
+  def find_overlapping(x1, y1, x2, y2)
+    find('overlapping', x1, y1, x2, y2)
+  end
+  def find_withtag(tag)
+    find('withtag', tag)
+  end
+
+  def itemfocus(tagOrId=nil)
+    if tagOrId
+      tk_send_without_enc('focus', tagid(tagOrId))
+      self
+    else
+      ret = tk_send_without_enc('focus')
+      if ret == ""
+        nil
+      else
+        TkcItem.id2obj(self, ret)
+      end
+    end
+  end
+
+  def gettags(tagOrId)
+    list(tk_send_without_enc('gettags', tagid(tagOrId))).collect{|tag|
+      TkcTag.id2obj(self, tag)
+    }
+  end
+
+  def icursor(tagOrId, index)
+    tk_send_without_enc('icursor', tagid(tagOrId), index)
+    self
+  end
+
+  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,
+                        _get_eval_enc_str(string))
+    self
+  end
+
+  def lower(tag, below=nil)
+    if below
+      tk_send_without_enc('lower', tagid(tag), tagid(below))
+    else
+      tk_send_without_enc('lower', tagid(tag))
+    end
+    self
+  end
+
+  def move(tag, x, y)
+    tk_send_without_enc('move', tagid(tag), x, y)
+    self
+  end
+
+  def postscript(keys)
+    tk_send("postscript", *hash_kv(keys))
+  end
+
+  def raise(tag, above=nil)
+    if above
+      tk_send_without_enc('raise', tagid(tag), tagid(above))
+    else
+      tk_send_without_enc('raise', tagid(tag))
+    end
+    self
+  end
+
+  def scale(tag, x, y, xs, ys)
+    tk_send_without_enc('scale', tagid(tag), x, y, xs, ys)
+    self
+  end
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+
+  def select(mode, *args)
+    r = tk_send_without_enc('select', mode, *args)
+    (mode == 'item')? TkcItem.id2obj(self, r): self
+  end
+  def select_adjust(tagOrId, index)
+    select('adjust', tagid(tagOrId), index)
+  end
+  def select_clear
+    select('clear')
+  end
+  def select_from(tagOrId, index)
+    select('from', tagid(tagOrId), index)
+  end
+  def select_item
+    select('item')
+  end
+  def select_to(tagOrId, index)
+    select('to', tagid(tagOrId), index)
+  end
+
+  def itemtype(tag)
+    TkcItem.type2class(tk_send('type', tagid(tag)))
+  end
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
new file mode 100644
index 0000000000..7b7b95df1c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledframe.rb
@@ -0,0 +1,59 @@
+#
+#  tkextlib/iwidgets/scrolledframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledframe < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledframe
+  TkCommandNames = ['::iwidgets::scrolledframe'.freeze].freeze
+  WidgetClassName = 'Scrolledframe'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
new file mode 100644
index 0000000000..dc2966bd48
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledhtml.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/iwidgets/scrolledhtml.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledhtml < Tk::Iwidgets::Scrolledtext
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledhtml
+  TkCommandNames = ['::iwidgets::scrolledhtml'.freeze].freeze
+  WidgetClassName = 'Scrolledhtml'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'update'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'fontname' << 'link' << 'alink' << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'fixedfont'
+  end
+  private :__font_optkeys
+
+  def import(href)
+    tk_call(@path, 'import', href)
+    self
+  end
+
+  def import_link(href)
+    tk_call(@path, 'import', '-link', href)
+    self
+  end
+
+  def pwd
+    tk_call(@path, 'pwd')
+  end
+
+  def render(htmltext, workdir=None)
+    tk_call(@path, 'render', htmltext, workdir)
+    self
+  end
+
+  def title
+    tk_call(@path, 'title')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
new file mode 100644
index 0000000000..20a4cd1d36
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb
@@ -0,0 +1,207 @@
+#
+#  tkextlib/iwidgets/scrolledlistbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/listbox'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledlistbox < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledlistbox
+  TkCommandNames = ['::iwidgets::scrolledlistbox'.freeze].freeze
+  WidgetClassName = 'Scrolledlistbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'listvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  ################################
+
+  def initialize(*args)
+    super(*args)
+    @listbox = component_widget('listbox')
+  end
+
+  def method_missing(id, *args)
+    if @listbox.respond_to?(id)
+      @listbox.__send__(id, *args)
+    else
+      super(id, *args)
+    end
+  end
+
+  ################################
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def get_curselection
+    tk_call(@path, 'getcurselection')
+  end
+
+  def justify(dir)
+    tk_call(@path, 'justify', dir)
+    self
+  end
+
+  def selected_item_count
+    number(tk_call(@path, 'selecteditemcount'))
+  end
+
+  def sort(*params, &b)
+    # see 'lsort' man page about params
+    if b
+      tk_call(@path, 'sort', '-command', proc(&b), *params)
+    else
+      tk_call(@path, 'sort', *params)
+    end
+    self
+  end
+  def sort_ascending
+    tk_call(@path, 'sort', 'ascending')
+    self
+  end
+  def sort_descending
+    tk_call(@path, 'sort', 'descending')
+    self
+  end
+
+  #####################################
+
+  def bbox(index)
+    list(tk_send_without_enc('bbox', index))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+  def insert(index, *args)
+    tk_send('insert', index, *args)
+    self
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+
+  #####################################
+
+  include TkListItemConfig
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::Itk::Component)
+      tag.name
+    else
+      super(tag)
+    end
+  end
+  private :tagid
+
+  #####################################
+
+  def activate(y)
+    tk_send_without_enc('activate', y)
+    self
+  end
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  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),
+                          false, true)
+    else
+      _fromUTF8(tk_send_without_enc('get', first))
+    end
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+
+  #####################################
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
new file mode 100644
index 0000000000..69b7d314fd
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb
@@ -0,0 +1,568 @@
+#
+#  tkextlib/iwidgets/scrolledtext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/text'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledtext < Tk::Iwidgets::Scrolledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledtext
+  TkCommandNames = ['::iwidgets::scrolledtext'.freeze].freeze
+  WidgetClassName = 'Scrolledtext'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  ################################
+
+  def initialize(*args)
+    super(*args)
+    @text = component_widget('text')
+  end
+
+  def method_missing(id, *args)
+    if @text.respond_to?(id)
+      @text.__send__(id, *args)
+    else
+      super(id, *args)
+    end
+  end
+
+  ################################
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def clear
+    tk_call(@path, 'clear')
+    self
+  end
+
+  def import(file, idx=nil)
+    if idx
+      tk_call(@path, 'import', file, index(idx))
+    else
+      tk_call(@path, 'import', file)
+    end
+    self
+  end
+
+  def export(file)
+    tk_call(@path, 'export', file)
+    self
+  end
+
+  #####################################
+
+  include TkTextTagConfig
+
+  def tagid(tag)
+    if tag.kind_of?(Tk::Itk::Component)
+      tag.name
+    else
+      super(tag)
+    end
+  end
+  private :tagid
+
+  def bbox(index)
+    list(tk_send('bbox', index))
+  end
+  def compare(idx1, op, idx2)
+    bool(tk_send_without_enc('compare', _get_eval_enc_str(idx1),
+                             op, _get_eval_enc_str(idx2)))
+  end
+
+  def debug
+    bool(tk_send_without_enc('debug'))
+  end
+  def debug=(boolean)
+    tk_send_without_enc('debug', boolean)
+    #self
+    boolean
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def dlineinfo(index)
+    list(tk_send_without_enc('dlineinfo', _get_eval_enc_str(index)))
+  end
+
+  def get(*index)
+    _fromUTF8(tk_send_without_enc('get', *index))
+  end
+  def get_displaychars(*index)
+    # Tk8.5 feature
+    get('-displaychars', *index)
+  end
+
+  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',
+                                    _get_eval_enc_str(index), "-#{slot}"))
+    else
+      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),
+                                    *hash_kv(slot, true)))
+    else
+      _fromUTF8(tk_send_without_enc('image', 'configure',
+                                    _get_eval_enc_str(index),
+                                    "-#{slot}",
+                                    _get_eval_enc_str(value)))
+    end
+    self
+  end
+
+  def image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        conf[0] = conf[0][1..-1]
+        conf
+      else
+        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).collect{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).collect{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          conf[0] = conf[0][1..-1]
+          case conf[0]
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+            if conf[4]
+              if conf[4].index('{')
+                conf[4] = tk_split_list(conf[4])
+              else
+                conf[4] = tk_tcl2ruby(conf[4])
+              end
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        case slot.to_s
+        when 'text', 'label', 'show', 'data', 'file'
+          #conf = tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), false, true)
+        else
+          #conf = tk_split_list(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}")))
+          conf = tk_split_list(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index), "-#{slot}"), 0, false, true)
+        end
+        key = conf.shift[1..-1]
+        { key => conf }
+      else
+        ret = {}
+        #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)))).each{|conflist|
+        #  conf = tk_split_simplelist(conflist)
+        tk_split_simplelist(tk_send_without_enc('image', 'configure', _get_eval_enc_str(index)), false, false).each{|conflist|
+          conf = tk_split_simplelist(conflist, false, true)
+          key = conf.shift[1..-1]
+          case key
+          when 'text', 'label', 'show', 'data', 'file'
+          else
+            if conf[2]
+              if conf[2].index('{')
+                conf[2] = tk_split_list(conf[2])
+              else
+                conf[2] = tk_tcl2ruby(conf[2])
+              end
+            end
+            if conf[3]
+              if conf[3].index('{')
+                conf[3] = tk_split_list(conf[3])
+              else
+                conf[3] = tk_tcl2ruby(conf[3])
+              end
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+
+  def current_image_configinfo(index, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        conf = image_configinfo(index, slot)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        image_configinfo(index).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      image_configinfo(index, slot).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  end
+
+  def image_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('image', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('image', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def index(idx)
+    tk_send_without_enc('index', _get_eval_enc_str(idx))
+  end
+
+  def insert(index, *args)
+    tk_send('insert', index, *args)
+    self
+  end
+
+  def mark_names
+    #tk_split_simplelist(_fromUTF8(tk_send_without_enc('mark', 'names'))).collect{|elt|
+    tk_split_simplelist(tk_send_without_enc('mark', 'names'), false, true).collect{|elt|
+      tagid2obj(elt)
+    }
+  end
+
+  def mark_gravity(mark, direction=nil)
+    if direction
+      tk_send_without_enc('mark', 'gravity',
+                          _get_eval_enc_str(mark), direction)
+      self
+    else
+      tk_send_without_enc('mark', 'gravity', _get_eval_enc_str(mark))
+    end
+  end
+
+  def mark_set(mark, index)
+    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',
+                        *(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',
+                                            _get_eval_enc_str(index))))
+  end
+  alias next_mark mark_next
+
+  def mark_previous(index)
+    tagid2obj(_fromUTF8(tk_send_without_enc('mark', 'previous',
+                                            _get_eval_enc_str(index))))
+  end
+  alias previous_mark mark_previous
+
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  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',
+                          _get_eval_enc_str(txt)).to_i
+    else
+      begin
+        tk_call_without_enc('encoding', 'convertto', 'ascii',
+                            _get_eval_enc_str(txt)).length
+      rescue StandardError, NameError
+        # sorry, I have no plan
+        txt.length
+      end
+    end
+  end
+  private :_ktext_length
+
+  def tksearch(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt| '-' + opt.to_s }
+    else
+      opts = []
+    end
+
+    opts << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      ret
+    end
+  end
+
+  def tksearch_with_count(*args)
+    # call 'search' subcommand of text widget
+    #   args ::= [<array_of_opts>] <var> <pattern> <start_index> [<stop_index>]
+    # If <pattern> is regexp, then it must be a regular expression of Tcl
+    if args[0].kind_of?(Array)
+      opts = args.shift.collect{|opt| '-' + opt.to_s }
+    else
+      opts = []
+    end
+
+    opts << '-count' << args.shift << '--'
+
+    ret = tk_send('search', *(opts + args))
+    if ret == ""
+      nil
+    else
+      ret
+    end
+  end
+
+  def search_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of? Integer
+    if stop != None
+      return ["", 0] if compare(start,'>=',stop)
+      txt = get(start,stop)
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        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"),
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"),
+                  _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get(start,'end - 1 char')
+      if (pos = txt.index(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        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"),
+                  _ktext_length(pat), pat.dup]
+        else
+          #return [index(start + " + #{pos} chars"), $&.split('').length]
+          return [index(start + " + #{pos} chars"),
+                  _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.index(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          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"),
+                    _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def search(pat,start,stop=None)
+    search_with_length(pat,start,stop)[0]
+  end
+
+  def rsearch_with_length(pat,start,stop=None)
+    pat = pat.chr if pat.kind_of? Integer
+    if stop != None
+      return ["", 0] if compare(start,'<=',stop)
+      txt = get(stop,start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        pos = _ktext_length(txt[0..(pos-1)]) if pos > 0
+        if pat.kind_of? String
+          #return [index(stop + " + #{pos} chars"), pat.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(pat), pat.dup]
+        else
+          #return [index(stop + " + #{pos} chars"), $&.split('').length]
+          return [index(stop + " + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        return ["", 0]
+      end
+    else
+      txt = get('1.0',start)
+      if (pos = txt.rindex(pat))
+        match = $&
+        #pos = txt[0..(pos-1)].split('').length if pos > 0
+        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"), _ktext_length(pat), pat.dup]
+        else
+          #return [index("1.0 + #{pos} chars"), $&.split('').length]
+          return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+        end
+      else
+        txt = get('1.0','end - 1 char')
+        if (pos = txt.rindex(pat))
+          match = $&
+          #pos = txt[0..(pos-1)].split('').length if pos > 0
+          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"), _ktext_length(pat), pat.dup]
+          else
+            #return [index("1.0 + #{pos} chars"), $&.split('').length]
+            return [index("1.0 + #{pos} chars"), _ktext_length(match), match]
+          end
+        else
+          return ["", 0]
+        end
+      end
+    end
+  end
+
+  def rsearch(pat,start,stop=None)
+    rsearch_with_length(pat,start,stop)[0]
+  end
+
+  def see(index)
+    tk_send_without_enc('see', index)
+    self
+  end
+
+  ###############################
+
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+
+  def yview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('yview'))
+    else
+      tk_send_without_enc('yview', *index)
+      self
+    end
+  end
+  def yview_moveto(*index)
+    yview('moveto', *index)
+  end
+  def yview_scroll(*index)
+    yview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
new file mode 100644
index 0000000000..5ecd2d72d2
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/scrolledwidget.rb
@@ -0,0 +1,20 @@
+#
+#  tkextlib/iwidgets/scrolledwidget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Scrolledwidget < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Scrolledwidget
+  TkCommandNames = ['::iwidgets::scrolledwidget'.freeze].freeze
+  WidgetClassName = 'Scrolledwidget'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
new file mode 100644
index 0000000000..eb8fe3ad52
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/selectionbox.rb
@@ -0,0 +1,102 @@
+#
+#  tkextlib/iwidgets/selectionbox.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Selectionbox < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Selectionbox
+  TkCommandNames = ['::iwidgets::selectionbox'.freeze].freeze
+  WidgetClassName = 'Selectionbox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'itemson' << 'selectionon'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'itemslabel' << 'selectionlabel'
+  end
+  private :__strval_optkeys
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def clear_items
+    tk_call(@path, 'clear', 'items')
+    self
+  end
+
+  def clear_selection
+    tk_call(@path, 'clear', 'selection')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+
+  def insert_items(idx, *args)
+    tk_call(@path, 'insert', 'items', idx, *args)
+  end
+
+  def insert_selection(pos, text)
+    tk_call(@path, 'insert', 'selection', pos, text)
+  end
+
+  def select_item
+    tk_call(@path, 'selectitem')
+    self
+  end
+
+  # based on Tk::Listbox ( and TkTextWin )
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
new file mode 100644
index 0000000000..45aecf3266
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/selectiondialog.rb
@@ -0,0 +1,92 @@
+#
+#  tkextlib/iwidgets/selectiondialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Selectiondialog < Tk::Iwidgets::Dialog
+    end
+  end
+end
+
+class Tk::Iwidgets::Selectiondialog
+  TkCommandNames = ['::iwidgets::selectiondialog'.freeze].freeze
+  WidgetClassName = 'Selectiondialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def clear_items
+    tk_call(@path, 'clear', 'items')
+    self
+  end
+
+  def clear_selection
+    tk_call(@path, 'clear', 'selection')
+    self
+  end
+
+  def get
+    tk_call(@path, 'get')
+  end
+
+  def insert_items(idx, *args)
+    tk_call(@path, 'insert', 'items', idx, *args)
+  end
+
+  def insert_selection(pos, text)
+    tk_call(@path, 'insert', 'selection', pos, text)
+  end
+
+  def select_item
+    tk_call(@path, 'selectitem')
+    self
+  end
+
+  # based on Tk::Listbox ( and TkTextWin )
+  def curselection
+    list(tk_send_without_enc('curselection'))
+  end
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+  def index(idx)
+    tk_send_without_enc('index', idx).to_i
+  end
+  def nearest(y)
+    tk_send_without_enc('nearest', y).to_i
+  end
+  def scan_mark(x, y)
+    tk_send_without_enc('scan', 'mark', x, y)
+    self
+  end
+  def scan_dragto(x, y)
+    tk_send_without_enc('scan', 'dragto', x, y)
+    self
+  end
+  def selection_anchor(index)
+    tk_send_without_enc('selection', 'anchor', index)
+    self
+  end
+  def selection_clear(first, last=None)
+    tk_send_without_enc('selection', 'clear', first, last)
+    self
+  end
+  def selection_includes(index)
+    bool(tk_send_without_enc('selection', 'includes', index))
+  end
+  def selection_set(first, last=None)
+    tk_send_without_enc('selection', 'set', first, last)
+    self
+  end
+  def size
+    tk_send_without_enc('size').to_i
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/setup.rb b/ext/tk/lib/tkextlib/iwidgets/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/setup.rb
@@ -0,0 +1,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
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/iwidgets/shell.rb b/ext/tk/lib/tkextlib/iwidgets/shell.rb
new file mode 100644
index 0000000000..c560e3ac29
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/shell.rb
@@ -0,0 +1,38 @@
+#
+#  tkextlib/iwidgets/shell.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Shell < Tk::Itk::Toplevel
+    end
+  end
+end
+
+class Tk::Iwidgets::Shell
+  TkCommandNames = ['::iwidgets::shell'.freeze].freeze
+  WidgetClassName = 'Shell'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def activate
+    tk_call(@path, 'activate')  # may return val of deactibate method
+  end
+
+  def center(win=None)
+    tk_call(@path, 'center', win)
+    self
+  end
+
+  def child_site
+    window(tk_call(@path, 'childsite'))
+  end
+
+  def deactivate(val=None)
+    tk_call(@path, 'deactivate', val)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spindate.rb b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
new file mode 100644
index 0000000000..b3de9ed989
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/spindate.rb
@@ -0,0 +1,48 @@
+#
+#  tkextlib/iwidgets/spindate.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Spindate < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Spindate
+  TkCommandNames = ['::iwidgets::spindate'.freeze].freeze
+  WidgetClassName = 'Spindate'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'dayon' << 'monthon' << 'yearon'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'daylabel' << 'monthformat' << 'monthlabel' << 'yearlabel'
+  end
+  private :__strval_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def show(date=None)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinint.rb b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
new file mode 100644
index 0000000000..bede3bb1bf
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/spinint.rb
@@ -0,0 +1,30 @@
+#
+#  tkextlib/iwidgets/spinint.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Spinint < Tk::Iwidgets::Spinner
+    end
+  end
+end
+
+class Tk::Iwidgets::Spinint
+  TkCommandNames = ['::iwidgets::spinint'.freeze].freeze
+  WidgetClassName = 'Spinint'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'wrap'
+  end
+  private :__boolval_optkeys
+
+  def __numlistval_optkeys
+    super() << 'range'
+  end
+  private :__numlistval_optkeys
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spinner.rb b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
new file mode 100644
index 0000000000..d960996e22
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/spinner.rb
@@ -0,0 +1,169 @@
+#
+#  tkextlib/iwidgets/spinner.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Spinner < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Spinner
+  TkCommandNames = ['::iwidgets::spinner'.freeze].freeze
+  WidgetClassName = 'Spinner'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include Tk::ValidateConfigure
+
+  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 ],
+        nil
+      ]
+      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
+
+    def self._config_keys
+      ['validate', 'invalid']
+    end
+  end
+
+  def __validation_class_list
+    super() << EntryfieldValidate
+  end
+
+  Tk::ValidateConfigure.__def_validcmd(binding, EntryfieldValidate)
+
+  ####################################
+
+  def up
+    tk_call_without_enc(@path, 'up')
+    self
+  end
+
+  def down
+    tk_call_without_enc(@path, 'down')
+    self
+  end
+
+  def clear
+    tk_call_without_enc(@path, 'clear')
+    self
+  end
+
+  def delete(first, last=None)
+    tk_send_without_enc('delete', first, last)
+    self
+  end
+
+  def value
+    _fromUTF8(tk_send_without_enc('get'))
+  end
+  def value= (val)
+    tk_send_without_enc('delete', 0, 'end')
+    tk_send_without_enc('insert', 0, _get_eval_enc_str(val))
+    val
+  end
+  alias get value
+  alias set value=
+
+  def cursor=(index)
+    tk_send_without_enc('icursor', index)
+    #self
+    index
+  end
+  alias icursor cursor=
+
+  def index(idx)
+    number(tk_send_without_enc('index', idx))
+  end
+
+  def insert(pos,text)
+    tk_send_without_enc('insert', pos, _get_eval_enc_str(text))
+    self
+  end
+
+  def mark(pos)
+    tk_send_without_enc('scan', 'mark', pos)
+    self
+  end
+  def dragto(pos)
+    tk_send_without_enc('scan', 'dragto', pos)
+    self
+  end
+  def selection_adjust(index)
+    tk_send_without_enc('selection', 'adjust', index)
+    self
+  end
+  def selection_clear
+    tk_send_without_enc('selection', 'clear')
+    self
+  end
+  def selection_from(index)
+    tk_send_without_enc('selection', 'from', index)
+    self
+  end
+  def selection_present()
+    bool(tk_send_without_enc('selection', 'present'))
+  end
+  def selection_range(s, e)
+    tk_send_without_enc('selection', 'range', s, e)
+    self
+  end
+  def selection_to(index)
+    tk_send_without_enc('selection', 'to', index)
+    self
+  end
+
+  # based on tk/scrollable.rb
+  def xview(*index)
+    if index.size == 0
+      list(tk_send_without_enc('xview'))
+    else
+      tk_send_without_enc('xview', *index)
+      self
+    end
+  end
+  def xview_moveto(*index)
+    xview('moveto', *index)
+  end
+  def xview_scroll(*index)
+    xview('scroll', *index)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/spintime.rb b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
new file mode 100644
index 0000000000..20f8197a09
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/spintime.rb
@@ -0,0 +1,48 @@
+#
+#  tkextlib/iwidgets/spintime.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Spintime < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Spintime
+  TkCommandNames = ['::iwidgets::spintime'.freeze].freeze
+  WidgetClassName = 'Spintime'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'houron' << 'militaryon' << 'minutelabel' << 'secondlabel'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'hourlabel' << 'minuteon' << 'secondon'
+  end
+  private :__strval_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def show(date=None)
+    tk_call(@path, 'show', date)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
new file mode 100644
index 0000000000..f56efa9aaf
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/tabnotebook.rb
@@ -0,0 +1,181 @@
+#
+#  tkextlib/iwidgets/tabnotebook.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Tabnotebook < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Tabnotebook
+  TkCommandNames = ['::iwidgets::tabnotebook'.freeze].freeze
+  WidgetClassName = 'Tabnotebook'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'pagecget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'pageconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'tabbackground' << 'tabforeground'
+  end
+  private :__item_strval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'auto' << 'equaltabs' << 'raiseselect' << 'tabborders'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'backdrop' << 'tabbackground' << 'tabforeground'
+  end
+  private :__strval_optkeys
+
+  def initialize(*args)
+    super(*args)
+    @tabset = self.component_widget('tabset')
+  end
+
+  def add(keys={})
+    window(tk_call(@path, 'add', *hash_kv(keys)))
+  end
+
+  def child_site_list
+    list(tk_call(@path, 'childsite'))
+  end
+
+  def child_site(idx)
+    window(tk_call(@path, 'childsite', index(idx)))
+  end
+
+  def delete(idx1, idx2=nil)
+    if idx2
+      tk_call(@path, 'delete', index(idx1), index(idx2))
+    else
+      tk_call(@path, 'delete', index(idx1))
+    end
+    self
+  end
+
+  def index(idx)
+    #number(tk_call(@path, 'index', tagid(idx)))
+    @tabset.index(tagid(idx))
+  end
+
+  def insert(idx, keys={})
+    window(tk_call(@path, 'insert', index(idx), *hash_kv(keys)))
+  end
+
+  def next
+    tk_call(@path, 'next')
+    self
+  end
+
+  def prev
+    tk_call(@path, 'prev')
+    self
+  end
+
+  def select(idx)
+    tk_call(@path, 'select', index(idx))
+    self
+  end
+
+  def show_tab(idx)
+    @tabset.show_tab(idx)
+    self
+  end
+
+  def scrollcommand(cmd=Proc.new)
+    configure_cmd 'scrollcommand', cmd
+    self
+  end
+  alias xscrollcommand scrollcommand
+  alias yscrollcommand scrollcommand
+
+  def xscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'horizontal'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.xview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  def yscrollbar(bar=nil)
+    if bar
+      @scrollbar = bar
+      @scrollbar.orient 'vertical'
+      self.scrollcommand {|*arg| @scrollbar.set(*arg)}
+      @scrollbar.command {|*arg| self.yview(*arg)}
+      Tk.update  # avoid scrollbar trouble
+    end
+    @scrollbar
+  end
+  alias scrollbar yscrollbar
+
+  def view(*index)
+    if index.size == 0
+      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
+    end
+  end
+  alias xview view
+  alias yview view
+
+  def view_moveto(*index)
+    view('moveto', *index)
+  end
+  alias xview_moveto view_moveto
+  alias yview_moveto view_moveto
+  def view_scroll(index, what='pages')
+    view('scroll', index, what)
+  end
+  alias xview_scroll view_scroll
+  alias yview_scroll view_scroll
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/tabset.rb b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
new file mode 100644
index 0000000000..501ead4964
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/tabset.rb
@@ -0,0 +1,145 @@
+#
+#  tkextlib/iwidgets/tabset.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Tabset < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Tabset
+  TkCommandNames = ['::iwidgets::tabset'.freeze].freeze
+  WidgetClassName = 'Tabset'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'tabcget', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'tabconfigure', id]
+  end
+  private :__item_config_cmd
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+
+  ####################################
+
+  def __boolval_optkeys
+    super() << 'equaltabs' << 'raiseselect' << 'tabborders'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'backdrop'
+  end
+  private :__strval_optkeys
+
+  def add(keys={})
+    window(tk_call(@path, 'add', *hash_kv(keys)))
+  end
+
+  def delete(idx1, idx2=nil)
+    if idx2
+      tk_call(@path, 'delete', index(idx1), index(idx2))
+    else
+      tk_call(@path, 'delete', index(idx1))
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, keys={})
+    window(tk_call(@path, 'insert', index(idx), *hash_kv(keys)))
+  end
+
+  def next
+    tk_call(@path, 'next')
+    self
+  end
+
+  def prev
+    tk_call(@path, 'prev')
+    self
+  end
+
+  def select(idx)
+    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
new file mode 100644
index 0000000000..b0afb3afd9
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/timeentry.rb
@@ -0,0 +1,25 @@
+#
+#  tkextlib/iwidgets/timeentry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Timeentry < Tk::Iwidgets::Timefield
+    end
+  end
+end
+
+class Tk::Iwidgets::Timeentry
+  TkCommandNames = ['::iwidgets::timeentry'.freeze].freeze
+  WidgetClassName = 'Timeentry'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __strval_optkeys
+    super() << 'closetext'
+  end
+  private :__strval_optkeys
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/timefield.rb b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
new file mode 100644
index 0000000000..c34281d4ff
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/timefield.rb
@@ -0,0 +1,58 @@
+#
+#  tkextlib/iwidgets/timefield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class  Timefield < Tk::Iwidgets::Labeledwidget
+    end
+  end
+end
+
+class Tk::Iwidgets::Timefield
+  TkCommandNames = ['::iwidgets::timefield'.freeze].freeze
+  WidgetClassName = 'Timefield'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'gmt'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'textbackground'
+  end
+  private :__strval_optkeys
+
+  def __font_optkeys
+    super() << 'textfont'
+  end
+  private :__font_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def valid?
+    bool(tk_call(@path, 'isvalid'))
+  end
+  alias isvalid? valid?
+
+  def show(time=None)
+    tk_call(@path, 'show', time)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/toolbar.rb b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
new file mode 100644
index 0000000000..5b474c3816
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/toolbar.rb
@@ -0,0 +1,112 @@
+#
+#  tkextlib/iwidgets/toolbar.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Toolbar < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Toolbar
+  TkCommandNames = ['::iwidgets::toolbar'.freeze].freeze
+  WidgetClassName = 'Toolbar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __tkvariable_optkeys
+    super() << 'helpvariable'
+  end
+  private :__tkvariable_optkeys
+
+  ####################################
+
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'itemcget', self.index(id)]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'itemconfigure', self.index(id)]
+  end
+  private :__item_config_cmd
+
+  def __item_strval_optkeys(id)
+    super(id) << 'helpstr' << 'balloonstr'
+  end
+  private :__item_strval_optkeys
+
+  def tagid(tagOrId)
+    if tagOrId.kind_of?(Tk::Itk::Component)
+      tagOrId.name
+    else
+      #_get_eval_string(tagOrId)
+      tagOrId
+    end
+  end
+
+  ####################################
+
+  def __strval_optkeys
+    super() << 'balloonbackground' << 'balloonforeground'
+  end
+  private :__strval_optkeys
+
+  def __tkvariable_optkeys
+    super() << 'helpvariable'
+  end
+  private :__tkvariable_optkeys
+
+  def __font_optkeys
+    super() << 'balloonfont'
+  end
+  private :__font_optkeys
+
+  def add(type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'add', type, tagid(tag), *hash_kv(keys)))
+    tag
+  end
+
+  def delete(idx1, idx2=nil)
+    if idx2
+      tk_call(@path, 'delete', index(idx1), index(idx2))
+    else
+      tk_call(@path, 'delete', index(idx1))
+    end
+    self
+  end
+
+  def index(idx)
+    number(tk_call(@path, 'index', tagid(idx)))
+  end
+
+  def insert(idx, type, tag=nil, keys={})
+    if tag.kind_of?(Hash)
+      keys = tag
+      tag = nil
+    end
+    if tag
+      tag = Tk::Itk::Component.new(self, tagid(tag))
+    else
+      tag = Tk::Itk::Component.new(self)
+    end
+    window(tk_call(@path, 'insert', index(idx), type,
+                   tagid(tag), *hash_kv(keys)))
+    tag
+  end
+end
diff --git a/ext/tk/lib/tkextlib/iwidgets/watch.rb b/ext/tk/lib/tkextlib/iwidgets/watch.rb
new file mode 100644
index 0000000000..f10ec54cb2
--- /dev/null
+++ b/ext/tk/lib/tkextlib/iwidgets/watch.rb
@@ -0,0 +1,56 @@
+#
+#  tkextlib/iwidgets/watch.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tkextlib/iwidgets.rb'
+
+module Tk
+  module Iwidgets
+    class Watch < Tk::Itk::Widget
+    end
+  end
+end
+
+class Tk::Iwidgets::Watch
+  TkCommandNames = ['::iwidgets::watch'.freeze].freeze
+  WidgetClassName = 'Watch'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'showampm'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'clockcolor' << 'hourcolor' << 'minutecolor' <<
+      'pivotcolor' << 'secondcolor' << 'tickcolor'
+  end
+  private :__strval_optkeys
+
+  def get_string
+    tk_call(@path, 'get', '-string')
+  end
+  alias get get_string
+
+  def get_clicks
+    number(tk_call(@path, 'get', '-clicks'))
+  end
+
+  def show(time=None)
+    tk_call(@path, 'show', time)
+    self
+  end
+  def show_now
+    tk_call(@path, 'show', 'now')
+    self
+  end
+
+  def watch(*args)
+    unless args.empty?
+      tk_call(@path, 'watch', *args)
+    end
+    component_path('canvas')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/pkg_checker.rb b/ext/tk/lib/tkextlib/pkg_checker.rb
new file mode 100755
index 0000000000..e2fd97bb6a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/pkg_checker.rb
@@ -0,0 +1,184 @@
+#!/usr/bin/env ruby
+#
+#  Ruby/Tk extension library checker
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+TkRoot.new.withdraw  # hide root window
+
+name = File.basename(__FILE__)
+
+add_path = false
+verbose  = false
+
+def help_msg
+  print "Usage: #{$0} [-l] [-v] [-h] [--] [dir]\n"
+  print "\tIf dir is omitted, check the directory that this command exists.\n"
+  print "\tAvailable options are \n"
+  print "\t  -l : Add dir to $LOAD_PATH\n"
+  print "\t       (If dir == '<parent>/tkextlib', add <parent> also.)\n"
+  print "\t  -v : Verbose mode (show reason of fail)\n"
+  print "\t  -h : Show this message\n"
+  print "\t  -- : End of options\n"
+end
+
+while(ARGV[0] && ARGV[0][0] == ?-)
+  case ARGV[0]
+  when '--'
+    ARGV.shift
+    break;
+  when '-l'
+    ARGV.shift
+    add_path = true
+  when '-v'
+    ARGV.shift
+    verbose = true
+  when '-h'
+    help_msg
+    exit(0)
+  else
+    print "Argument Error!! : unknown option '#{ARGV[0]}'\n"
+    help_msg
+    exit(1)
+  end
+end
+
+if ARGV[0]
+  dir = File.expand_path(ARGV[0])
+else
+  dir = File.dirname(File.expand_path(__FILE__))
+end
+
+if add_path
+  $LOAD_PATH.unshift(dir)
+  if File.basename(dir) == 'tkextlib'
+    $LOAD_PATH.unshift(File.dirname(dir))
+  end
+end
+
+print "\nRuby/Tk extension library checker\n"
+print "( Note:: This check is very simple one. Shown status may be wrong. )\n"
+print "\n check directory :: #{dir}"
+print "\n $LOAD_PATH :: #{$LOAD_PATH.inspect}\n"
+
+def get_pkg_list(file)
+  pkg_list = []
+
+  File.foreach(file){|l|
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)TkPackage\s*\.\s*require\s*\(?\s*(["'])((\w|:)+)\1/
+      pkg = [$2, :package]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)Tk\s*\.\s*load_tcllibrary\s*\(?\s*(["'])((\w|:)+)\1/
+      pkg = [$2, :library]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)Tk\s*\.\s*load_tclscript\s*\(?\s*(["'])((\w|:)+)\1/
+      pkg = [$2, :script]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+    if l =~ /^(?:[^#]+\s|\s*)(?:|;\s*)require\s*\(?\s*(["'])((\w|\/|:)+)\1/
+      pkg = [$2, :require_ruby_lib]
+      pkg_list << pkg unless pkg_list.member?(pkg)
+    end
+  }
+
+  pkg_list
+end
+
+def check_pkg(file, verbose=false)
+  pkg_list = get_pkg_list(file)
+
+  error_list = []
+  success_list = {}
+
+  pkg_list.each{|name, type|
+    next if success_list[name]
+
+    begin
+      case type
+      when :package
+        ver = TkPackage.require(name)
+        success_list[name] = ver
+        error_list.delete_if{|n, t| n == name}
+
+      when :library
+        Tk.load_tcllibrary(name)
+        success_list[name] = :library
+        error_list.delete_if{|n, t| n == name}
+
+      when :script
+        Tk.load_tclscript(name)
+        success_list[name] = :script
+        error_list.delete_if{|n, t| n == name}
+
+      when :require_ruby_lib
+        require name
+
+      end
+    rescue => e
+      if verbose
+        error_list << [name, type, e.message]
+      else
+        error_list << [name, type]
+      end
+    end
+  }
+
+  success_list.dup.each{|name, ver|
+    unless ver.kind_of?(String)
+      begin
+        ver = TkPackage.require(name)
+        sccess_list[name] = ver
+      rescue
+      end
+    end
+  }
+
+  [success_list, error_list]
+end
+
+def subdir_check(dir, verbose=false)
+  Dir.foreach(dir){|f|
+    next if f == '.' || f == '..'
+    if File.directory?(f)
+      subdir_check(File.join(dir, f))
+    elsif File.extname(f) == '.rb'
+      path = File.join(dir, f)
+      suc, err = check_pkg(path, verbose)
+      if err.empty?
+        print 'Ready : ', path, ' : require->', suc.inspect, "\n"
+      else
+        print '*LACK : ', path, ' : require->', suc.inspect,
+          '  FAIL->', err.inspect, "\n"
+      end
+    end
+  }
+end
+
+Dir.chdir(dir)
+
+(Dir['*.rb'] - ['setup.rb', name]).each{|f|
+  subdir = File.basename(f, '.*')
+=begin
+  begin
+    # read 'setup.rb' as if the library has standard structure
+    require File.join(subdir, 'setup.rb')
+  rescue LoadError
+    # ignore error
+  end
+=end
+  print "\n"
+
+  suc, err = check_pkg(f, verbose)
+  if err.empty?
+    print 'Ready : ', f, ' : require->', suc.inspect, "\n"
+  else
+    print '*LACK : ', f, ' : require->', suc.inspect,
+      '  FAIL->', err.inspect, "\n"
+  end
+
+  subdir_check(subdir, verbose) if File.directory?(subdir)
+}
diff --git a/ext/tk/lib/tkextlib/setup.rb b/ext/tk/lib/tkextlib/setup.rb
new file mode 100644
index 0000000000..79facc5ee3
--- /dev/null
+++ b/ext/tk/lib/tkextlib/setup.rb
@@ -0,0 +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'".
+#
diff --git a/ext/tk/lib/tkextlib/tcllib.rb b/ext/tk/lib/tkextlib/tcllib.rb
new file mode 100644
index 0000000000..2831989759
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib.rb
@@ -0,0 +1,105 @@
+#
+#  tcllib extension support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tcllib/setup.rb'
+
+err = ''
+
+# package:: autoscroll
+target = 'tkextlib/tcllib/autoscroll'
+begin
+  require target
+rescue => e
+  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
+end
+
+# package:: cursor
+target = 'tkextlib/tcllib/cursor'
+begin
+  require target
+rescue => e
+  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
+end
+
+# package:: style
+target = 'tkextlib/tcllib/style'
+begin
+  require target
+rescue => e
+  err << "\n  ['" << target << "'] "  << e.class.name << ' : ' << e.message
+end
+
+# autoload
+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:: ico
+    autoload :ICO,                'tkextlib/tcllib/ico'
+
+    # package:: ipentry
+    autoload :IP_Entry,           'tkextlib/tcllib/ip_entry'
+    autoload :IPEntry,            'tkextlib/tcllib/ip_entry'
+
+    # 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'
+    autoload :Tablelist_Tile,      'tkextlib/tcllib/tablelist_tile'
+    autoload :TableList_Tile,      'tkextlib/tcllib/tablelist_tile'
+
+    # package:: tkpiechart
+    autoload :Tkpiechart,         'tkextlib/tcllib/tkpiechart'
+
+    # package:: tooltip
+    autoload :Tooltip,            'tkextlib/tcllib/tooltip'
+
+    # package:: widget
+    autoload :Widget,             'tkextlib/tcllib/widget'
+  end
+end
+
+if $VERBOSE && !err.empty?
+  warn("Warning: some sub-packages are failed to require : " + err)
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/README b/ext/tk/lib/tkextlib/tcllib/README
new file mode 100644
index 0000000000..441918adce
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/README
@@ -0,0 +1,135 @@
+
+ [ tcllib extension support files ]
+
+Tcllib includes many utilities. But currently, supports TKLib part
+only (see the following 'tcllib contents').
+
+If you request to support others, please send your message to one of
+ruby-talk/ruby-list/ruby-dev/ruby-ext mailing lists.
+
+-----<from "What is tcllib?">----------------------------
+Tcllib is a collection of utility modules for Tcl. These modules provide
+a wide variety of functionality, from implementations of standard data
+structures to implementations of common networking protocols. The intent
+is to collect commonly used function into a single library, which users
+can rely on to be available and stable.
+---------------------------------------------------------
+
+-----< tcllib contents (based on tcllib-1.6.1) >---------
+Programming tools
+    * cmdline - Procedures to process command lines and options.
+    * comm - A remote communications facility for Tcl (7.6, 8.0, and later)
+    * control - Procedures for control flow structures.
+    * fileutil - Procedures implementing some file utilities
+    * log - Procedures to log messages of libraries and applications.
+    * logger - System to control logging of events.
+    * multiplexer - One-to-many communication with sockets.
+    * snit - Snit's Not Incr Tcl
+    * snitfaq - Snit Frequently Asked Questions
+    * stooop - Object oriented extension.
+    * stoop - Simple Tcl Only Object Oriented Programming
+    * switched - stooop switched class
+    * profiler - Tcl source code profiler
+
+Mathematics
+    * math::statistics - Basic statistical functions and procedures
+    * math::calculus - Integration and ordinary differential equations
+    * math::optimize - Optimisation routines
+    * math::fuzzy - Fuzzy comparison of floating-point numbers
+    * counter - Procedures for counters and histograms
+    * combinatorics - Combinatorial functions in the Tcl Math Library
+
+Data structures
+    * struct::list - Procedures for manipulating lists
+    * struct::set - Procedures for manipulating sets
+    * struct::stack - Create and manipulate stack objects
+    * struct::queue - Create and manipulate queue objects
+    * struct::prioqueue - Create and manipulate prioqueue objects
+    * struct::skiplist - Create and manipulate skiplists
+    * struct::tree - Create and manipulate tree objects
+    * struct::graph - Create and manipulate directed graph objects
+    * struct::record - Define and create records (similar to 'C' structures)
+    * struct::matrix - Create and manipulate matrix objects
+    * struct::pool - Create and manipulate pool objects (of discrete items)
+    * report - Create and manipulate report objects
+
+Text processing
+    * expander - Procedures to process templates and expand text.
+    * base64 - Procedures to encode and decode base64
+    * yencode - encode/decoding a binary file
+    * uuencode - encode/decoding a binary file
+    * csv - Procedures to handle CSV data.
+    * inifile - Parsing of Windows INI files
+    * htmlparse - Procedures to parse HTML strings
+    * mime - Manipulation of MIME body parts
+    * Tcl MIME - generates and parses MIME body parts
+    * textutil - Procedures to manipulate texts and strings.
+    * exif - Tcl EXIF extracts and parses EXIF fields from digital images
+    * EXIF - extract and parse EXIF fields from digital images
+
+Hashes, checksums, and encryption
+    * cksum - calculate a cksum(1) compatible checksum
+    * crc16 - Perform a 16bit Cyclic Redundancy Check
+    * crc32 - Perform a 32bit Cyclic Redundancy Check
+    * des - Perform DES encryption of Tcl data
+    * md4 - MD4 Message-Digest Algorithm
+    * md5 - MD5 Message-Digest Algorithm
+    * ripemd160 - RIPEMD-160 Message-Digest Algorithm
+    * ripemd128 - RIPEMD-128 Message-Digest Algorithm
+    * md5crypt - MD5-based password encryption
+    * sha1 - Perform sha1 hashing
+    * sum - calculate a sum(1) compatible checksum
+    * soundex - Soundex
+
+Documentation tools
+    * mpexpand - Markup processor
+    * doctools - Create and manipulate doctools converter object
+    * doctoc_fmt - Specification of simple tcl markup for table of contents
+    * doctools_api - Interface specification for formatter code
+    * doctools_fmt - Specification of simple tcl markup for manpages
+    * docidx - Create and manipulate docidx converter objects
+    * docidx_api - Interface specification for index formatting code
+    * docidx_fmt - Specification of simple tcl markup for an index
+    * doctoc - Create and manipulate doctoc converter objects
+    * doctoc_api - Interface specification for toc formatting code
+    * doctools::changelog - Handle text in Emacs ChangeLog format
+    * doctools::cvs - Handle text in 'cvs log' format
+
+Networking
+    * uri - URI utilities
+    * dns - Tcl Domain Name Service Client
+    * ntp_time - Tcl Time Service Client
+    * nntp - Tcl client for the NNTP protocol
+    * pop3 - Tcl client for POP3 email protocol
+    * pop3d - Tcl POP3 server implementation
+    * pop3d::udb - Simple user database for pop3d
+    * pop3d::dbox - Simple mailbox database for pop3d
+    * ftp - Client-side tcl implementation of the ftp protocol
+    * ftp - Client-side tcl implementation of the ftp protocol
+    * ftpd - Tcl FTP server implementation
+    * smtp - Client-side tcl implementation of the smtp protocol
+    * smtpd - Tcl SMTP server implementation
+    * irc - Create IRC connection and interface.
+
+CGI programming
+    * ncgi - Procedures to manipulate CGI values.
+    * html - Procedures to generate HTML structures
+    * javascript - Procedures to generate HTML and Java Script structures.
+
+Grammars and finite automata
+    * grammar::fa - Create and manipulate finite automatons
+    * grammar::fa::op - Operations on finite automatons
+    * grammar::dacceptor - Create and use deterministic acceptors
+    * grammar::dexec - Execute deterministic finite automatons
+
+TKLib
+    * Plotchart - Simple plotting and charting package
+    * autoscroll - Provides for a scrollbar to automatically mapped and
+                   unmapped as needed
+    * ctext - An extended text widget with customizable Syntax highlighting
+    * cursor - Procedures to handle CURSOR data
+    * datefield - Tk datefield widget
+    * style - Changes default Tk look&feel
+    * ipentry - An IP address entry widget
+    * tkpiechart - Creates and dynamically updates 2D or 3D pie charts
+---------------------------------------------------------
diff --git a/ext/tk/lib/tkextlib/tcllib/autoscroll.rb b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
new file mode 100644
index 0000000000..2def59bf73
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/autoscroll.rb
@@ -0,0 +1,158 @@
+#
+#  tkextlib/tcllib/autoscroll.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Provides for a scrollbar to automatically mapped and unmapped as needed
+#
+# (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
+# 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
+# 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
+# subcommand is not used then this package will have no effect.
+#
+
+require 'tk'
+require 'tk/scrollbar'
+require 'tkextlib/tcllib.rb'
+
+module Tk
+  module Tcllib
+    module Autoscroll
+      PACKAGE_NAME = 'autoscroll'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('autoscroll')
+        rescue
+          ''
+        end
+      end
+
+      def self.not_available
+        fail RuntimeError, "'tkextlib/tcllib/autoscroll' extension is not available on your current environment."
+      end
+
+      def self.autoscroll(win)
+        Tk::Tcllib::Autoscroll.not_available
+      end
+
+      def self.unautoscroll(win)
+        Tk::Tcllib::Autoscroll.not_available
+      end
+    end
+  end
+end
+
+module Tk
+  module Scrollable
+    def autoscroll(mode = nil)
+      case mode
+      when :x, 'x'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@xscrollbar)
+        end
+      when :y, 'y'
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@yscrollbar)
+        end
+      when nil, :both, 'both'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@xscrollbar)
+        end
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.autoscroll(@yscrollbar)
+        end
+      else
+        fail ArgumentError, "'x', 'y' or 'both' (String or Symbol) is expected"
+      end
+      self
+    end
+    def unautoscroll(mode = nil)
+      case mode
+      when :x, 'x'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@xscrollbar)
+        end
+      when :y, 'y'
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@yscrollbar)
+        end
+      when nil, :both, 'both'
+        if @xscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@xscrollbar)
+        end
+        if @yscrollbar
+          Tk::Tcllib::Autoscroll.unautoscroll(@yscrollbar)
+        end
+      else
+        fail ArgumentError, "'x', 'y' or 'both' (String or Symbol) is expected"
+      end
+      self
+    end
+  end
+end
+
+class Tk::Scrollbar
+  def autoscroll
+    # 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.
+    #tk_call_without_enc('::autoscroll::unautoscroll', @path)
+    Tk::Tcllib::Autoscroll.unautoscroll(self)
+    self
+  end
+end
+
+# TkPackage.require('autoscroll', '1.0')
+# TkPackage.require('autoscroll', '1.1')
+TkPackage.require('autoscroll')
+
+module Tk
+  module Tcllib
+    class << Autoscroll
+      undef not_available
+    end
+
+    module Autoscroll
+      extend TkCore
+      def self.autoscroll(win)
+        tk_call_without_enc('::autoscroll::autoscroll', win.path)
+      end
+
+      def self.unautoscroll(win)
+        tk_call_without_enc('::autoscroll::unautoscroll', win.path)
+      end
+
+      def self.wrap
+        # v1.1
+        tk_call_without_enc('::autoscroll::wrap')
+      end
+
+      def self.unwrap
+        # v1.1
+        tk_call_without_enc('::autoscroll::unwrap')
+      end
+    end
+  end
+end
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..ba87cd3aae
--- /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..f4ffb48ece
--- /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..ddb0340c31
--- /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
new file mode 100644
index 0000000000..308847c233
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/ctext.rb
@@ -0,0 +1,160 @@
+#
+#  tkextlib/tcllib/ctext.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Overloads the text widget and provides new commands
+#
+
+require 'tk'
+require 'tk/text'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ctext', '3.1')
+TkPackage.require('ctext')
+
+module Tk
+  module Tcllib
+    class CText < Tk::Text
+      PACKAGE_NAME = 'ctext'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('ctext')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::CText
+  TkCommandNames = ['ctext'.freeze].freeze
+  WidgetClassName = 'Ctext'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  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 __strval_optkeys
+    super() << 'linemapfg' << 'linemapbg' <<
+      'linemap_select_fg' << 'linemap_select_bg'
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() << 'highlight' << 'linemap_markable'
+  end
+  private :__boolval_optkeys
+
+  def append(*args)
+    tk_send('append', *args)
+  end
+
+  def copy
+    tk_send('copy')
+  end
+
+  def cut
+    tk_send('cut')
+  end
+
+  def fast_delete(*args)
+    tk_send('fastdelete', *args)
+  end
+
+  def fast_insert(*args)
+    tk_send('fastinsert', *args)
+  end
+
+  def highlight(*args)
+    tk_send('highlight', *args)
+  end
+
+  def paste
+    tk_send('paste')
+  end
+
+  def edit(*args)
+    tk_send('edit', *args)
+  end
+
+  def add_highlight_class(klass, col, *keywords)
+    tk_call('ctext::addHighlightClass', @path, klass, col, keywords.flatten)
+    self
+  end
+
+  def add_highlight_class_for_special_chars(klass, col, *chrs)
+    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',
+            @path, klass, col, tcl_regexp)
+    self
+  end
+
+  def add_highlight_class_with_only_char_start(klass, col, chr)
+    tk_call('ctext::addHighlightClassWithOnlyCharStart',
+            @path, klass, col, chr)
+    self
+  end
+
+  def clear_highlight_classes
+    tk_call('ctext::clearHighlightClasses', @path)
+    self
+  end
+
+  def get_highlight_classes
+    tk_split_simplelist(tk_call('ctext::getHighlightClasses', @path))
+  end
+
+  def delete_highlight_class(klass)
+    tk_call('ctext::deleteHighlightClass', @path, klass)
+    self
+  end
+
+  def enable_C_comments
+    tk_call('ctext::enableComments', @path)
+    self
+  end
+
+  def disable_C_comments
+    tk_call('ctext::disableComments', @path)
+    self
+  end
+
+  def find_next_char(idx, chr)
+    tk_call('ctext::findNextChar', @path, idx, chr)
+  end
+
+  def find_next_space(idx)
+    tk_call('ctext::findNextSpace', @path, idx)
+  end
+
+  def find_previous_space(idx)
+    tk_call('ctext::findPreviousSpace', @path, idx)
+  end
+
+  def set_update_proc(cmd=Proc.new)
+    tk_call('proc', 'ctext::update', '', cmd)
+    self
+  end
+
+  def modified?(mode)
+    bool(tk_call('ctext::modified', @path, mode))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/cursor.rb b/ext/tk/lib/tkextlib/tcllib/cursor.rb
new file mode 100644
index 0000000000..5c47f9709b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/cursor.rb
@@ -0,0 +1,97 @@
+#
+#  tkextlib/tcllib/cursor.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Procedures to handle CURSOR data
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+module Tk
+  module Tcllib
+    module Cursor
+      PACKAGE_NAME = 'cursor'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('cursor')
+        rescue
+          ''
+        end
+      end
+
+      def self.not_available
+        fail RuntimeError, "'tkextlib/tcllib/cursor' extension is not available on your current environment."
+      end
+
+      def self.cursor_display(win=None)
+        Tk::Tcllib::Cursor.not_available
+      end
+
+      def self.cursor_propagate(win, cursor)
+        Tk::Tcllib::Cursor.not_available
+      end
+
+      def self.cursor_restore(win, cursor = None)
+        Tk::Tcllib::Cursor.not_available
+      end
+    end
+  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.
+    # This is simply for viewing any available cursors on the platform .
+    #tk_call_without_enc('::cursor::display', parent)
+    Tk::Tcllib::Cursor.cursor_display(parent)
+  end
+end
+
+class TkWindow
+  def cursor_propagate(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).
+    #tk_call_without_enc('::cursor::restore', @path, cursor)
+    Tk::Tcllib::Cursor.cursor_restore(self, cursor)
+  end
+end
+
+# TkPackage.require('cursor', '0.1')
+TkPackage.require('cursor')
+
+module Tk
+  module Tcllib
+    class << Cursor
+      undef not_available
+    end
+
+    module Cursor
+      extend TkCore
+      def self.cursor_display(win=None)
+        tk_call_without_enc('::cursor::display', _epath(win))
+      end
+
+      def self.cursor_propagate(win, cursor)
+        #tk_call_without_enc('::cursor::propagate', win.path, cursor)
+        tk_call_without_enc('::cursor::propagate', _epath(win), cursor)
+      end
+
+      def self.cursor_restore(win, cursor = None)
+        #tk_call_without_enc('::cursor::restore', win.path, cursor)
+        tk_call_without_enc('::cursor::restore', _epath(win), cursor)
+      end
+    end
+  end
+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
new file mode 100644
index 0000000000..4c2eae741e
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/datefield.rb
@@ -0,0 +1,57 @@
+#
+#  tkextlib/tcllib/datefield.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Tk datefield widget
+#
+# (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
+# 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
+# equally here.
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('datefield', '0.1')
+TkPackage.require('datefield')
+
+module Tk
+  module Tcllib
+    class Datefield < Tk::Entry
+      PACKAGE_NAME = 'datefield'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('datefield')
+        rescue
+          ''
+        end
+      end
+    end
+    DateField = Datefield
+  end
+end
+
+class Tk::Tcllib::Datefield
+  TkCommandNames = ['::datefield::datefield'.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/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
new file mode 100644
index 0000000000..86a0ef2269
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/dialog.rb
@@ -0,0 +1,84 @@
+#
+#  tkextlib/tcllib/dialog.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Generic dialog widget (themed)
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::dialog', '1.2')
+TkPackage.require('widget::dialog')
+
+module Tk::Tcllib
+  module Widget
+    class Dialog < TkWindow
+      PACKAGE_NAME = 'widget::dialog'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::dialog')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::Widget::Dialog
+  TkCommandNames = ['::widget::dialog'.freeze].freeze
+
+  def __boolval_optkeys
+    ['separator', 'synchronous', 'transient']
+  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 add(what, *args)
+    window(tk_send('add', *args))
+  end
+
+  def get_frame
+    window(tk_send('getframe'))
+  end
+
+  def set_widget(widget)
+    tk_send('setwidget', widget)
+    self
+  end
+
+  def display
+    tk_send('display')
+    self
+  end
+  alias show display
+
+  def cancel
+    tk_send('cancel')
+    self
+  end
+
+  def close(reason = None)
+    tk_send('close', reason)
+  end
+
+  def withdraw
+    tk_send('withdraw')
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/getstring.rb b/ext/tk/lib/tkextlib/tcllib/getstring.rb
new file mode 100644
index 0000000000..48711d3b66
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/getstring.rb
@@ -0,0 +1,134 @@
+#
+#  tkextlib/tcllib/getstring.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A dialog which consists of an Entry, OK, and Cancel buttons.
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('getstring', '0.1')
+TkPackage.require('getstring')
+
+module Tk::Tcllib
+  class GetString_Dialog < TkWindow
+    PACKAGE_NAME = 'getstring'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('getstring')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+
+class Tk::Tcllib::GetString_Dialog
+  TkCommandNames = ['::getstring::tk_getString'.freeze].freeze
+  WidgetClassName = 'TkSDialog'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def self.show(*args)
+    dialog = self.new(*args)
+    dialog.show
+    [dialog.status, dialog.value]
+  end
+  def self.display(*args)
+    self.show(*args)
+  end
+
+  def initialize(*args)   # args = (parent=nil, text='', keys=nil)
+    keys = args.pop
+    if keys.kind_of?(Hash)
+      text = args.pop
+      @keys = _symbolkey2str(keys)
+      args.push(keys)
+    else
+      text = keys
+      @keys = {}
+    end
+    if text
+      @text = text.dup
+    else
+      @text = ''
+    end
+
+    @variable = TkVariable.new
+    @status = nil
+
+    super(*args)
+  end
+
+  def create_self(keys)
+    # dummy
+  end
+  private :create_self
+
+  def show
+    @variable.value = ''
+    @status = bool(tk_call(self.class::TkCommandNames[0],
+                           @path, @variable, @text, *hash_kv(@keys)))
+  end
+  alias display show
+
+  def status
+    @status
+  end
+
+  def value
+    @variable.value
+  end
+
+  def cget_strict(slot)
+    slot = slot.to_s
+    if slot == 'text'
+      @text
+    else
+      @keys[slot]
+    end
+  end
+  def cget(slot)
+    cget_strict(slot)
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.each{|k, v| configure(k, v)}
+    else
+      slot = slot.to_s
+      value = _symbolkey2str(value) if value.kind_of?(Hash)
+      if value && value != None
+        if slot == 'text'
+          @text = value.to_s
+        else
+          @keys[slot] = value
+        end
+      else
+        if slot == 'text'
+          @text = ''
+        else
+          @keys.delete(slot)
+        end
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      slot = slot.to_s
+      [ slot, nil, nil, nil, ( (slot == 'text')? @text: @keys[slot] ) ]
+    else
+      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }   \
+      << [ 'text', nil, nil, nil, @text ]
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/history.rb b/ext/tk/lib/tkextlib/tcllib/history.rb
new file mode 100644
index 0000000000..a01a4ebfcc
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/history.rb
@@ -0,0 +1,73 @@
+#
+#  tkextlib/tcllib/history.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Provides a history for Entry widgets
+#
+
+require 'tk'
+require 'tk/entry'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('history', '0.1')
+TkPackage.require('history')
+
+module Tk::Tcllib
+  module History
+    PACKAGE_NAME = 'history'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('history')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::History
+  extend TkCore
+
+  def self.init(entry, length=None)
+    tk_call_without_enc('::history::init', entry.path, length)
+    entry.extend(self)  # add methods to treat history to the entry widget
+  end
+
+  def self.remove(entry)
+    tk_call_without_enc('::history::remove', entry.path)
+    entry
+  end
+
+  def history_remove
+    tk_call_without_enc('::history::remove', @path)
+    self
+  end
+
+  def history_add(text)
+    tk_call('::history::add', @path, text)
+    self
+  end
+
+  def history_get
+    simplelist(tk_call_without_enc('::history::get', @path))
+  end
+
+  def history_clear
+    tk_call_without_enc('::history::clear', @path)
+    self
+  end
+
+  def history_configure(opt, value)
+    tk_call('::history::configure', @path, opt, value)
+    self
+  end
+
+  def history_configinfo(opt)
+    tk_call('::history::configure', @path, opt)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/ico.rb b/ext/tk/lib/tkextlib/tcllib/ico.rb
new file mode 100644
index 0000000000..36a32c6b09
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/ico.rb
@@ -0,0 +1,146 @@
+#
+#  tkextlib/tcllib/ico.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Reading and writing windows icons
+#
+
+require 'tk'
+require 'tk/image'
+#require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ico', '0.3')
+TkPackage.require('ico')
+
+module Tk
+  module Tcllib
+    class ICO < TkImage
+      PACKAGE_NAME = 'ico'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('ico')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::ICO
+  def self.list(file, keys=nil)
+    tk_split_list(tk_call_without_enc('::ico::getIconList', file,
+                                      *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)
+    keys.delete('format')
+    self.new(file, index, keys)
+  end
+
+  def self.get_data(file, index, keys={})
+    keys['format'] = 'data'
+    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,
+                        *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,
+                        *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,
+                        *hash_kv(keys, true))
+  end
+
+  def self.clear_cache(file=None)
+    tk_call_without_enc('::ico::clearCache', file)
+  end
+
+  def self.transparent_color(image, color)
+    if image.kind_of?(Array)
+      tk_split_list(tk_call_without_enc('::ico::transparentColor',
+                                        image, color))
+    else
+      tk_call_without_enc('::ico::transparentColor', image, color)
+    end
+  end
+
+  def self.show(file, keys=nil)
+    tk_call_without_enc('::ico::Show', file, *hash_kv(keys, true))
+  end
+
+  ###########################
+
+  def initialize(file, index, keys=nil)
+    keys = _symbolkey2str(keys)
+    if keys.key?('name')
+      @path = keys['name'].to_s
+    else
+      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,
+                        '-format', 'image', *hash_kv(keys, true))
+    Tk_IMGTBL[@path] = self
+  end
+
+  def write(file, index, depth, keys=nil)
+    Tk::Tcllib::ICO.write(file, index, depth, @path, keys=nil)
+    self
+  end
+
+  def transparent_color(color)
+    tk_call_without_enc('::ico::transparentColor', @path, color)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/ip_entry.rb b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
new file mode 100644
index 0000000000..4878cc3c23
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/ip_entry.rb
@@ -0,0 +1,75 @@
+#
+#  tkextlib/tcllib/ip_entry.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * An IP address entry widget
+#
+# (The following is the original description of the library.)
+#
+# This package provides a widget for the entering of a IP address.
+# It guarantees a valid address at all times.
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('ipentry', '0.1')
+TkPackage.require('ipentry')
+
+module Tk
+  module Tcllib
+    class IP_Entry < Tk::Entry
+      PACKAGE_NAME = 'ipentry'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('ipentry')
+        rescue
+          ''
+        end
+      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
+
+  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 __strval_optkeys
+    super() << 'fg' << 'bg' << 'insertbackground'
+  end
+  private :__strval_optkeys
+
+  def complete?
+    bool(tk_send_without_enc('complete'))
+  end
+
+  def insert(*ip)
+    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..5dc2130b35
--- /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
new file mode 100644
index 0000000000..020c51cbd1
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/panelframe.rb
@@ -0,0 +1,78 @@
+#
+#  tkextlib/tcllib/panelframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Create PanelFrame widgets.
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::panelframe', '1.0')
+TkPackage.require('widget::panelframe')
+
+module Tk::Tcllib
+  module Widget
+    class PanelFrame < TkWindow
+      PACKAGE_NAME = 'widget::panelframe'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::panelframe')
+        rescue
+          ''
+        end
+      end
+    end
+    Panelframe = PanelFrame
+  end
+end
+
+class Tk::Tcllib::Widget::PanelFrame
+  TkCommandNames = ['::widget::panelframe'.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 add(what, *args)
+    window(tk_send('add', *args))
+  end
+
+  #def get_frame
+  #  window(tk_send('getframe'))
+  #end
+
+  def set_widget(widget)
+    tk_send('setwidget', widget)
+    self
+  end
+
+  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
+
+  def items
+    simplelist(tk_send('items')).collect!{|w| window(w)}
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/plotchart.rb b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
new file mode 100644
index 0000000000..d2f3a0da3a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/plotchart.rb
@@ -0,0 +1,1404 @@
+#
+#  tkextlib/tcllib/plotchart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Simple plotting and charting package
+#
+# (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
+# plot completely automatic.
+#
+# This results in the creation of an xy-plot in, say, ten lines of code:
+# --------------------------------------------------------------------
+#    package require Plotchart
+#
+#    canvas .c -background white -width 400 -height 200
+#    pack   .c -fill both
+#
+#    #
+#    # Create the plot with its x- and y-axes
+#    #
+#    set s [::Plotchart::createXYPlot .c {0.0 100.0 10.0} {0.0 100.0 20.0}]
+#
+#    foreach {x y} {0.0 32.0 10.0 50.0 25.0 60.0 78.0 11.0 } {
+#        $s plot series1 $x $y
+#    }
+#
+#    $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
+# 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
+#      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
+#      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
+#      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
+#      bars side by side.
+#    * 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)
+#
+
+require 'tk'
+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
+  module Tcllib
+    module Plotchart
+      PACKAGE_NAME = 'Plotchart'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('Plotchart')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::Plotchart
+  extend TkCore
+  ############################
+  def self.view_port(w, *args) # args := pxmin, pymin, pxmax, pymax
+    tk_call_without_enc('::Plotchart::viewPort', w.path, *(args.flatten))
+  end
+
+  def self.world_coordinates(w, *args) # args := xmin, ymin, xmax, ymax
+    tk_call_without_enc('::Plotchart::worldCoordinates',
+                        w.path, *(args.flatten))
+  end
+
+  def self.world_3D_coordinates(w, *args)
+    # args := xmin, ymin, zmin, xmax, ymax, zmax
+    tk_call_without_enc('::Plotchart::world3DCoordinates',
+                        w.path, *(args.flatten))
+  end
+
+  def self.coords_to_pixel(w, x, y)
+    list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
+  end
+
+  def self.coords_3D_to_pixel(w, x, y, z)
+    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
+
+  def self.polar_to_pixel(w, rad, phi)
+    list(tk_call_without_enc('::Plotchart::polarToPixel', w.path, rad, phi))
+  end
+
+  def self.pixel_to_coords(w, x, y)
+    list(tk_call_without_enc('::Plotchart::coordsToPixel', w.path, x, y))
+  end
+
+  def self.determine_scale(*args) # (xmin, xmax, inverted=false)
+    tk_call_without_enc('::Plotchart::determineScale', *args)
+  end
+
+  def self.set_zoom_pan(w)
+    tk_call_without_enc('::Plotchart::setZoomPan', w.path)
+  end
+
+  ############################
+  module ChartMethod
+    include TkCore
+
+    def title(str)
+      tk_call_without_enc(@chart, 'title', _get_eval_enc_str(str))
+      self
+    end
+
+    def save_plot(filename)
+      tk_call_without_enc(@chart, 'saveplot', filename)
+      self
+    end
+
+    def xtext(str)
+      tk_call_without_enc(@chart, 'xtext', _get_eval_enc_str(str))
+      self
+    end
+
+    def ytext(str)
+      tk_call_without_enc(@chart, 'ytext', _get_eval_enc_str(str))
+      self
+    end
+
+    def xconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'xconfig', *hash_kv(key, true))
+      else
+        tk_call(@chart, 'xconfig', "-#{key}",value)
+      end
+      self
+    end
+
+    def yconfig(key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'yconfig', *hash_kv(key, true))
+      else
+        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',
+                          @path, *(args.flatten))
+      self
+    end
+
+    def world_3D_coordinates(*args)
+      # args := xmin, ymin, zmin, xmax, ymax, zmax
+      tk_call_without_enc('::Plotchart::world3DCoordinates',
+                          @path, *(args.flatten))
+      self
+    end
+
+    def coords_to_pixel(x, y)
+      list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
+    end
+
+    def coords_3D_to_pixel(x, y, z)
+      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
+    end
+
+    def polar_to_pixel(rad, phi)
+      list(tk_call_without_enc('::Plotchart::polarToPixel', @path, rad, phi))
+    end
+
+    def pixel_to_coords(x, y)
+      list(tk_call_without_enc('::Plotchart::coordsToPixel', @path, x, y))
+    end
+
+    def determine_scale(xmax, ymax)
+      tk_call_without_enc('::Plotchart::determineScale', @path, xmax, ymax)
+      self
+    end
+
+    def set_zoom_pan()
+      tk_call_without_enc('::Plotchart::setZoomPan', @path)
+      self
+    end
+  end
+
+  ############################
+  class XYPlot < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createXYPlot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, yaxis [, keys])
+                          # xaxis := Array of [minimum, maximum, stepsize]
+                          # yaxis := Array of [minimum, maximum, stepsize]
+      if args[0].kind_of?(Array)
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis = 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(@xaxis), 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
+
+    def plot(series, x, y)
+      tk_call_without_enc(@chart, 'plot', _get_eval_enc_str(series), x, y)
+      self
+    end
+
+    def contourlines(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(@chart, 'contourlines', xcrd, ycrd, vals, clss)
+      self
+    end
+
+    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(@chart, 'contourfill', xcrd, ycrd, vals, clss)
+      self
+    end
+
+    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(@chart, 'contourbox', xcrd, ycrd, vals, clss)
+      self
+    end
+
+    def color_map(colors)
+      colors = array2tk_list(colors) if colors.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'colorMap', colors)
+      self
+    end
+
+    def grid_cells(xcrd, ycrd)
+      xcrd = array2tk_list(xcrd) if xcrd.kind_of?(Array)
+      ycrd = array2tk_list(ycrd) if ycrd.kind_of?(Array)
+
+      tk_call_without_enc(@chart, 'grid', xcrd, ycrd)
+      self
+    end
+
+    def dataconfig(series, key, value=None)
+      if key.kind_of?(Hash)
+        tk_call_without_enc(@chart, 'dataconfig', series, *hash_kv(key, true))
+      else
+        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,
+      '::Plotchart::createStripchart'.freeze
+    ].freeze
+  end
+
+  ############################
+  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::createHistogram'.freeze
+    ].freeze
+  end
+
+  ############################
+  class PolarPlot < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createPolarplot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] radius_data [, keys])
+                          # radius_data := Array of [maximum_radius, stepsize]
+      if args[0].kind_of?(Array)
+        @radius_data = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @radius_data = 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(@radius_data))
+    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(series, radius, angle)
+      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', _get_eval_enc_str(series),
+                            *hash_kv(key, true))
+      else
+        tk_call(@chart, 'dataconfig', series, "-#{key}", value)
+      end
+    end
+  end
+  Polarplot = PolarPlot
+
+  ############################
+  class IsometricPlot < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createIsometricPlot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, yaxis, [, step] [, keys])
+                          # xaxis := Array of [minimum, maximum]
+                          # yaxis := Array of [minimum, maximum]
+                          # step := Float of stepsize | "noaxes" | :noaxes
+      if args[0].kind_of?(Array)
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        if args[0].kind_of?(Hash)
+          @stepsize = :noaxes
+        else
+          @stepsize = args.shift
+        end
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis = args.shift
+        @yaxis = args.shift
+
+        if args[0].kind_of?(Hash)
+          @stepsize = :noaxes
+        else
+          @stepsize = args.shift
+        end
+
+        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(@yaxis),
+                          @stepsize)
+    end
+    private :_create_chart
+
+    def plot(type, *args)
+      self.__send__("plot_#{type.to_s.tr('-', '_')}", *args)
+    end
+
+    def plot_rectangle(*args) # args := x1, y1, x2, y2, color
+      tk_call_without_enc(@chart, 'plot', 'rectangle', *(args.flatten))
+      self
+    end
+
+    def plot_filled_rectangle(*args) # args := x1, y1, x2, y2, color
+      tk_call_without_enc(@chart, 'plot', 'filled-rectangle', *(args.flatten))
+      self
+    end
+
+    def plot_circle(*args) # args := xc, yc, radius, color
+      tk_call_without_enc(@chart, 'plot', 'circle', *(args.flatten))
+      self
+    end
+
+    def plot_filled_circle(*args) # args := xc, yc, radius, color
+      tk_call_without_enc(@chart, 'plot', 'filled-circle', *(args.flatten))
+      self
+    end
+  end
+  Isometricplot = IsometricPlot
+
+  ############################
+  class Plot3D < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::create3DPlot'.freeze
+    ].freeze
+
+    def initialize(*args) # args := ([parent,] xaxis, yaxis, zaxis [, keys])
+                          # xaxis := Array of [minimum, maximum, stepsize]
+                          # yaxis := Array of [minimum, maximum, stepsize]
+                          # zaxis := Array of [minimum, maximum, stepsize]
+      if args[0].kind_of?(Array)
+        @xaxis = args.shift
+        @yaxis = args.shift
+        @zaxis = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xaxis = 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(@xaxis),
+                          array2tk_list(@yaxis),
+                          array2tk_list(@zaxis))
+    end
+    private :_create_chart
+
+    def plot_function(cmd=Proc.new)
+      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
+      tk_call_without_enc(@chart, 'plotfunc', "#{@path}_#{@chart}")
+      self
+    end
+
+    def plot_funcont(conts, cmd=Proc.new)
+      conts = array2tk_list(conts) if conts.kind_of?(Array)
+      Tk.ip_eval("proc #{@path}_#{@chart} {x y} {#{install_cmd(cmd)} $x $y}")
+      tk_call_without_enc(@chart, 'plotfuncont', "#{@path}_#{@chart}", conts)
+      self
+    end
+
+    def grid_size(nxcells, nycells)
+      tk_call_without_enc(@chart, 'gridsize', nxcells, nycells)
+      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.
+      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)
+      self
+    end
+    alias colours colour
+    alias colors  colour
+    alias color   colour
+  end
+
+  ############################
+  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,
+      '::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?(Tk::Canvas)
+        parent = args.shift
+        @path = parent.path
+      else
+        super(*args) # create canvas widget
+      end
+      @chart = _create_chart
+    end
+
+    def _create_chart
+      p self.class::TkCommandNames[1] if $DEBUG
+      tk_call_without_enc(self.class::TkCommandNames[1], @path)
+    end
+    private :_create_chart
+
+    def plot(*dat)  # argument is a list of [label, value]
+      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 < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createBarchart'.freeze
+    ].freeze
+
+    def initialize(*args)
+      # args := ([parent,] xlabels, ylabels [, series] [, keys])
+      # xlabels, ylabels := labels | axis ( depend on normal or horizontal )
+      # labels := Array of [label, label, ...]
+      #   (It determines the number of bars that will be plotted per series.)
+      # axis := Array of [minimum, maximum, stepsize]
+      # series := Integer number of data series | 'stacked' | :stacked
+      if args[0].kind_of?(Array)
+        @xlabels = args.shift
+        @ylabels  = args.shift
+
+        if args[0].kind_of?(Hash)
+          @series_size = :stacked
+        else
+          @series_size  = args.shift
+        end
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @xlabels = args.shift
+        @ylabels = args.shift
+
+        if args[0].kind_of?(Hash)
+          @series_size = :stacked
+        else
+          @series_size  = args.shift
+        end
+
+        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(@xlabels), array2tk_list(@ylabels),
+                          @series_size)
+    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(series, dat, col=None)
+      tk_call(@chart, 'plot', series, dat, col)
+      self
+    end
+
+    def colours(*cols)
+      # set the colours to be used
+      tk_call(@chart, 'colours', *cols)
+      self
+    end
+    alias colour colours
+    alias colors colours
+    alias color  colours
+  end
+
+  ############################
+  class HorizontalBarchart < Barchart
+    TkCommandNames = [
+      'canvas'.freeze,
+      '::Plotchart::createHorizontalBarchart'.freeze
+    ].freeze
+  end
+
+  ############################
+  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 = [
+      'canvas'.freeze,
+      '::Plotchart::createTimechart'.freeze
+    ].freeze
+
+    def initialize(*args)
+      # args := ([parent,] time_begin, time_end, items [, 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. )
+      if args[0].kind_of?(String)
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @items      = args.shift
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @items      = 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,
+                          @time_begin, @time_end, @items)
+    end
+    private :_create_chart
+
+    def period(txt, time_begin, time_end, col=None)
+      tk_call(@chart, 'period', txt, time_begin, time_end, col)
+      self
+    end
+
+    def milestone(txt, time, col=None)
+      tk_call(@chart, 'milestone', txt, time, col)
+      self
+    end
+
+    def 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 Ganttchart < Tk::Canvas
+    include ChartMethod
+
+    TkCommandNames = [
+      'canvas'.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")
+      # 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
+        @args  = args
+
+        super(*args) # create canvas widget
+      else
+        parent = args.shift
+
+        @time_begin = args.shift
+        @time_end   = args.shift
+        @args  = args
+
+        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(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(@chart, 'task', txt, time_begin, time_end,
+                   completed)).collect!{|id|
+        TkcItem.id2obj(self, id)
+      }
+    end
+
+    def milestone(txt, time, col=None)
+      tk_call(@chart, 'milestone', txt, time, col)
+      self
+    end
+
+    def vertline(txt, time)
+      tk_call(@chart, 'vertline', txt, time)
+      self
+    end
+
+    def connect(from_task, to_task)
+      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(@chart, 'connect', from_task, to_task)
+      self
+    end
+
+    def summary(txt, tasks)
+      tasks = array2tk_list(tasks) if tasks.kind_of?(Array)
+      tk_call(@chart, 'summary', tasks)
+      self
+    end
+
+    def color_of_part(keyword, newcolor)
+      tk_call(@chart, 'color', keyword, newcolor)
+      self
+    end
+
+    def font_of_part(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
+
+  ############################
+  class PlotSeries < TkObject
+    SeriesID_TBL = TkCore::INTERP.create_table
+
+    (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
+      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
+      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
+
+    def plot(*args)
+      @chart_obj.plot(@series, *args)
+    end
+
+    def dataconfig(key, value=None)
+      @chart_obj.dataconfig(@series, key, value)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/ruler.rb b/ext/tk/lib/tkextlib/tcllib/ruler.rb
new file mode 100644
index 0000000000..d22dafa053
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/ruler.rb
@@ -0,0 +1,65 @@
+#
+#  tkextlib/tcllib/ruler.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * ruler widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::ruler', '1.0')
+TkPackage.require('widget::ruler')
+
+module Tk::Tcllib
+  module Widget
+    class Ruler < TkWindow
+      PACKAGE_NAME = 'widget::ruler'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::ruler')
+        rescue
+          ''
+        end
+      end
+    end
+  end
+end
+
+class Tk::Tcllib::Widget::Ruler
+  TkCommandNames = ['::widget::ruler'.freeze].freeze
+
+  def __boolval_optkeys
+    ['showvalues', 'outline', 'grid']
+  end
+  private :__boolval_optkeys
+
+  def __numlistval_optkeys
+    ['interval', 'sizes']
+  end
+  private :__numlistval_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 redraw
+    tk_send('redraw')
+    self
+  end
+
+  def shade(org, dest, frac)
+    tk_send('shade', org, dest, frac)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/screenruler.rb b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
new file mode 100644
index 0000000000..75fa36b66d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/screenruler.rb
@@ -0,0 +1,68 @@
+#
+#  tkextlib/tcllib/screenruler.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * screenruler dialog
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::screenruler', '1.1')
+TkPackage.require('widget::screenruler')
+
+module Tk::Tcllib
+  module Widget
+    class ScreenRuler < TkWindow
+      PACKAGE_NAME = 'widget::ruler'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::screenruler')
+        rescue
+          ''
+        end
+      end
+    end
+    Screenruler = ScreenRuler
+  end
+end
+
+class Tk::Tcllib::Widget::ScreenRuler
+  TkCommandNames = ['::widget::screenruler'.freeze].freeze
+
+  def __boolval_optkeys
+    ['topmost', 'reflect']
+  end
+  private :__boolval_optkeys
+
+  def __numlistval_optkeys
+    ['alpha']
+  end
+  private :__numlistval_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 display
+    tk_send('display')
+    self
+  end
+  alias show display
+
+  def hide
+    tk_send('hide')
+    self
+  end
+end
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
new file mode 100644
index 0000000000..c9f6062fef
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/scrollwin.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/tcllib/scrollwin.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Scrolled widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::scrolledwindow', '1.0')
+TkPackage.require('widget::scrolledwindow')
+
+module Tk::Tcllib
+  module Widget
+    class ScrolledWindow < TkWindow
+      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 __numlistval_optkeys
+    ['ipad']
+  end
+  private :__numlistval_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_frame
+    window(tk_send('getframe'))
+  end
+
+  def set_widget(widget)
+    tk_send('setwidget', widget)
+    self
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/setup.rb b/ext/tk/lib/tkextlib/tcllib/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/setup.rb
@@ -0,0 +1,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
+#    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/style.rb b/ext/tk/lib/tkextlib/tcllib/style.rb
new file mode 100644
index 0000000000..dac6916e46
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/style.rb
@@ -0,0 +1,61 @@
+#
+#  tkextlib/tcllib/style.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * select and use some 'style' of option (resource) DB
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+module Tk::Tcllib
+  module Style
+    PACKAGE_NAME = 'style'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('style')
+      rescue
+        ''
+      end
+    end
+
+    def self.not_available
+      fail RuntimeError, "'tkextlib/tcllib/style' extension is not available on your current environment."
+    end
+
+    def self.names
+      Tk::Tcllib::Style.not_available
+    end
+
+    def self.use(style)
+      Tk::Tcllib::Style.not_available
+    end
+  end
+end
+
+# TkPackage.require('style', '0.1')
+# TkPackage.require('style', '0.3')
+TkPackage.require('style')
+
+module Tk::Tcllib
+  class << Style
+    undef not_available
+  end
+
+  module Style
+    extend TkCore
+
+    def self.names
+      tk_split_simplelist(tk_call('style::names'))
+    end
+
+    def self.use(style)
+      tk_call('style::use', style)
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/superframe.rb b/ext/tk/lib/tkextlib/tcllib/superframe.rb
new file mode 100644
index 0000000000..adc9c4adbd
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/superframe.rb
@@ -0,0 +1,51 @@
+#
+#  tkextlib/tcllib/superframe.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Superframe widget - enhanced labelframe widget
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget::superframe', '1.0')
+TkPackage.require('widget::superframe')
+
+module Tk::Tcllib
+  module Widget
+    class SuperFrame < TkWindow
+      PACKAGE_NAME = 'widget::superframe'.freeze
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require('widget::superframe')
+        rescue
+          ''
+        end
+      end
+    end
+    Superframe = SuperlFrame
+  end
+end
+
+class Tk::Tcllib::Widget::SuperFrame
+  TkCommandNames = ['::widget::superframe'.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 labelwidget
+    window(tk_send('labelwidget'))
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/swaplist.rb b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
new file mode 100644
index 0000000000..7698640534
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/swaplist.rb
@@ -0,0 +1,150 @@
+#
+#  tkextlib/tcllib/swaplist.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A dialog which allows a user to move options between two lists
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('swaplist', '0.1')
+TkPackage.require('swaplist')
+
+module Tk::Tcllib
+  class Swaplist_Dialog < TkWindow
+    PACKAGE_NAME = 'swaplist'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('swaplist')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+
+class Tk::Tcllib::Swaplist_Dialog
+  TkCommandNames = ['::swaplist::swaplist'.freeze].freeze
+  WidgetClassName = 'Swaplist'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def self.show(*args)
+    dialog = self.new(*args)
+    dialog.show
+    [dialog.status, dialog.value]
+  end
+  def self.display(*args)
+    self.show(*args)
+  end
+
+  def initialize(*args)
+    # args = (parent=nil, complete_list=[], selected_list=[], keys=nil)
+    keys = args.pop
+    if keys.kind_of?(Hash)
+      @selected_list = args.pop
+      @complete_list = args.pop
+      @keys = _symbolkey2str(keys)
+      args.push(keys)
+    else
+      @selected_list = keys
+      @complete_list = args.pop
+      @keys = {}
+    end
+
+    @selected_list = [] unless @selected_list
+    @complete_list = [] unless @complete_list
+
+    @variable = TkVariable.new
+    @status = nil
+
+    super(*args)
+  end
+
+  def create_self(keys)
+    # dummy
+  end
+  private :create_self
+
+  def show
+    @variable.value = ''
+    @status = bool(tk_call(self.class::TkCommandNames[0],
+                           @path, @variable,
+                           @complete_list, @selected_list,
+                           *hash_kv(@keys)))
+  end
+  alias display show
+
+  def status
+    @status
+  end
+
+  def value
+    @variable.list
+  end
+  alias selected value
+
+  def cget_strict(slot)
+    slot = slot.to_s
+    if slot == 'complete_list'
+      @complete_list
+    elsif slot == 'selected_list'
+      @selected_list
+    else
+      @keys[slot]
+    end
+  end
+  def cget(slot)
+    cget_strict(slot)
+  end
+
+  def configure(slot, value=None)
+    if slot.kind_of?(Hash)
+      slot.each{|k, v| configure(k, v)}
+    else
+      slot = slot.to_s
+      value = _symbolkey2str(value) if value.kind_of?(Hash)
+      if value && value != None
+        if slot == 'complete_list'
+          @complete_list = value
+        elsif slot == 'selected_list'
+          @selected_list = value
+        else
+          @keys[slot] = value
+        end
+      else
+        if slot == 'complete_list'
+          @complete_list = []
+        elsif slot == 'selected_list'
+          @selected_list = []
+        else
+          @keys.delete(slot)
+        end
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      slot = slot.to_s
+      if slot == 'complete_list'
+        [ slot, nil, nil, nil, @complete_list ]
+      elsif slot == 'selected_list'
+        [ slot, nil, nil, nil, @selected_list ]
+      else
+        [ slot, nil, nil, nil, @keys[slot] ]
+      end
+    else
+      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }           \
+      << [ 'complete_list', nil, nil, nil, @complete_list ]   \
+      << [ 'selected_list', nil, nil, nil, @selected_list ]
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist.rb b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
new file mode 100644
index 0000000000..bf5ab6620a
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist.rb
@@ -0,0 +1,28 @@
+#
+#  tkextlib/tcllib/tablelist.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A multi-column listbox
+
+require 'tk'
+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') || TkPackage.provide('Ttk')
+end
+
+if Tk::Tcllib::Tablelist_usingTile
+  # with Tile
+  require 'tkextlib/tcllib/tablelist_tile'
+
+else
+  # without Tile
+
+  # 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
new file mode 100644
index 0000000000..2a5c415cc7
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_core.rb
@@ -0,0 +1,1072 @@
+#
+#  tkextlib/tcllib/tablelist_core.rb
+#
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * This file is required by 'tkextlib/tcllib/tablelist.rb' or
+#     'tkextlib/tcllib/tablelist_tile.rb'.
+#
+
+module Tk
+  module Tcllib
+    class Tablelist < TkWindow
+      if Tk::Tcllib::Tablelist_usingTile
+        PACKAGE_NAME = 'Tablelist_tile'.freeze
+      else
+        PACKAGE_NAME = 'Tablelist'.freeze
+      end
+      def self.package_name
+        PACKAGE_NAME
+      end
+
+      def self.package_version
+        begin
+          TkPackage.require(self.package_name)
+        rescue
+          ''
+        end
+      end
+
+      def self.use_Tile?
+        (Tk::Tcllib::Tablelist_usingTile)? true: false
+      end
+    end
+    TableList = Tablelist
+  end
+end
+
+module Tk::Tcllib::TablelistItemConfig
+  include TkItemConfigMethod
+
+  def _to_idx(idx)
+    if idx.kind_of?(Array)
+      idx.collect{|elem| _get_eval_string(elem)}.join(',')
+    else
+      idx
+    end
+  end
+  def _from_idx(idx)
+    return idx unless idx.kind_of?(String)
+
+    if idx[0] == ?@  # '@x,y'
+      idx
+    elsif idx =~ /([^,]+),([^,]+)/
+      row = $1, column = $2
+      [num_or_str(row), num_or_str(column)]
+    else
+      num_or_str(idx)
+    end
+  end
+  private :_to_idx, :_from_idx
+
+  def __item_cget_cmd(mixed_id)
+    [self.path, mixed_id[0] + 'cget', _to_idx(mixed_id[1])]
+  end
+  def __item_config_cmd(mixed_id)
+    [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
+  def cell_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['cell', tagOrId], slot)
+  end
+  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
+  def column_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['column', tagOrId], slot)
+  end
+  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
+  def row_configinfo(tagOrId, slot=nil)
+    itemconfiginfo(['row', tagOrId], slot)
+  end
+  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_tkstring, :itemcget, :itemcget_strict
+  private :itemconfigure, :itemconfiginfo, :current_itemconfiginfo
+end
+
+class Tk::Tcllib::Tablelist
+  include Tk::Tcllib::TablelistItemConfig
+  include Scrollable
+
+  TkCommandNames = ['::tablelist::tablelist'.freeze].freeze
+  WidgetClassName = 'Tablelist'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  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 __numval_optkeys
+    super() + ['titlecolumns']
+  end
+  private :__numval_optkeys
+
+  def __strval_optkeys
+    super() + ['snipstring']
+  end
+  private :__strval_optkeys
+
+  def __boolval_optkeys
+    super() - ['takefocus'] + [
+      'forceeditendcommand', 'movablecolumns', 'movablerows',
+      'protecttitlecolumns', 'resizablecolumns', 'setfocus',
+      'showarrow', 'showlabels', 'showseparators'
+    ]
+  end
+  private :__boolval_optkeys
+
+  def __listval_optkeys
+    super() + ['columns', 'columntitles']
+  end
+  private :__listval_optkeys
+
+  def __tkvariable_optkeys
+    super() + ['listvariable']
+  end
+  private :__tkvariable_optkeys
+
+  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)
+                   },
+                   'takefocus'=>proc{|v|
+                     case v
+                     when '1'
+                       true
+                     when '0'
+                       false
+                     when ''
+                       nil
+                     else # cmd
+                       tk_tcl2ruby(cmd)
+                       end
+                   })
+  end
+  private :__val2ruby_optkeys
+
+  def __ruby2val_optkeys  # { key=>proc, ... }
+    # 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|
+                     (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
+
+  def __font_optkeys
+    super() + ['labelfont']
+  end
+  private :__font_optkeys
+
+  ##########################
+
+  def __item_strval_optkeys(id)
+    if id[0] == 'cell'
+      super(id) + ['title']
+    else
+      super(id) - ['text'] + ['title', 'name']
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_boolval_optkeys(id)
+    super(id) + [
+      'changesnipside', 'editable', 'hide', 'resizable', 'selectable',
+      'showarrow', 'showlinenumbers', 'stretchable', 'stretchwindow', 'wrap'
+    ]
+  end
+  private :__item_boolval_optkeys
+
+  def __item_listval_optkeys(id)
+    if id[0] == 'cell'
+      super(id)
+    else
+      super(id) + ['text']
+    end
+  end
+  private :__item_listval_optkeys
+
+  def __item_font_optkeys(id)
+    # maybe need to override
+    super(id) + ['labelfont']
+  end
+  private :__item_font_optkeys
+
+  ##########################
+
+  def activate(index)
+    tk_send('activate', _to_idx(index))
+    self
+  end
+
+  def activate_cell(index)
+    tk_send('activatecell', _to_idx(index))
+    self
+  end
+  alias activatecell activate_cell
+
+  def get_attrib(name=nil)
+    if name && name != None
+      tk_send('attrib', name)
+    else
+      ret = []
+      lst = simplelist(tk_send('attrib'))
+      until lst.empty?
+        ret << ( [lst.shift] << lst.shift )
+      end
+      ret
+    end
+  end
+  def set_attrib(*args)
+    tk_send('attrib', *(args.flatten))
+    self
+  end
+
+  def bbox(index)
+    list(tk_send('bbox', _to_idx(index)))
+  end
+
+  def bodypath
+    window(tk_send('bodypath'))
+  end
+
+  def bodytag
+    TkBindTag.new_by_name(tk_send('bodytag'))
+  end
+
+  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
+
+  def cellselection_anchor(idx)
+    tk_send('cellselection', 'anchor', _to_idx(idx))
+    self
+  end
+
+  def cellselection_clear(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('cellselection', 'clear', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('cellselection', 'clear', first, last)
+    end
+    self
+  end
+
+  def cellselection_includes(idx)
+    bool(tk_send('cellselection', 'includes', _to_idx(idx)))
+  end
+
+  def cellselection_set(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('cellselection', 'set', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('cellselection', 'set', first, last)
+    end
+    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
+
+  def columnindex(idx)
+    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
+  end
+
+  def containing_cell(x, y)
+    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[1].kind_of?(Fixnum) && idx[1] < 0)?  nil: idx[1])
+      ]
+    else
+      idx
+    end
+  end
+  alias containingcell containing_cell
+
+  def containing_column(x)
+    idx = num_or_str(tk_send('containingcolumn', x))
+    (idx.kind_of?(Fixnum) && idx < 0)?  nil: idx
+  end
+  alias containingcolumn containing_column
+
+  def curcellselection
+    simplelist(tk_send('curcellselection')).collect!{|idx| _from_idx(idx)}
+  end
+
+  def curselection
+    list(tk_send('curselection'))
+  end
+
+  def delete_items(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('delete', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('delete', first, last)
+    end
+    self
+  end
+  alias delete delete_items
+  alias deleteitems delete_items
+
+  def delete_columns(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('deletecolumns', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('deletecolumns', first, last)
+    end
+    self
+  end
+  alias deletecolumns delete_columns
+
+  def edit_cell(idx)
+    tk_send('editcell', _to_idx(idx))
+    self
+  end
+  alias editcell edit_cell
+
+  def editwintag
+    TkBindTag.new_by_name(tk_send('editwintag'))
+  end
+
+  def editwinpath
+    window(tk_send('editwinpath'))
+  end
+
+  def entrypath
+    window(tk_send('entrypath'))
+  end
+
+  def fill_column(idx, txt)
+    tk_send('fillcolumn', _to_idx(idx), txt)
+    self
+  end
+  alias fillcolumn fill_column
+
+  def finish_editing
+    tk_send('finishediting')
+    self
+  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) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('get', first, last))
+    end
+  end
+
+  def get_cells(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('getcells', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('getcells', first, last))
+    end
+  end
+  alias getcells get_cells
+
+  def get_columns(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('getcolumns', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('getcolumns', first, last))
+    end
+  end
+  alias getcolumns get_columns
+
+  def get_keys(first, last=nil)
+    if first.kind_of?(Array)
+      simplelist(tk_send('getkeys', first.collect{|idx| _to_idx(idx)})).collect!{|elem| simplelist(elem) }
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      simplelist(tk_send('getkeys', first, last))
+    end
+  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
+
+  def index(idx)
+    number(tk_send('index', _to_idx(idx)))
+  end
+
+  def insert(idx, *items)
+    tk_send('insert', _to_idx(idx), *items)
+    self
+  end
+
+  def insert_columnlist(idx, columnlist)
+    tk_send('insertcolumnlist', _to_idx(idx), columnlist)
+    self
+  end
+  alias insertcolumnlist insert_columnlist
+
+  def insert_columns(idx, *args)
+    tk_send('insertcolums', _to_idx(idx), *args)
+    self
+  end
+  alias insertcolumns insert_columns
+
+  def insert_list(idx, list)
+    tk_send('insertlist', _to_idx(idx), list)
+    self
+  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
+
+  def labelpath(idx)
+    window(tk_send('labelpath', _to_idx(idx)))
+  end
+
+  def labels
+    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
+  end
+
+  def move_column(src, target)
+    tk_send('movecolumn', _to_idx(src), _to_idx(target))
+    self
+  end
+  alias movecolumn move_column
+
+  def nearest(y)
+    _from_idx(tk_send('nearest', y))
+  end
+
+  def nearest_cell(x, y)
+    _from_idx(tk_send('nearestcell', x, y))
+  end
+  alias nearestcell nearest_cell
+
+  def nearest_column(x)
+    _from_idx(tk_send('nearestcolumn', x))
+  end
+  alias nearestcolumn nearest_column
+
+  def reject_input
+    tk_send('rejectinput')
+    self
+  end
+  alias rejectinput reject_input
+
+  def reset_sortinfo
+    tk_send('resetsortinfo')
+    self
+  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
+  end
+
+  def scan_dragto(x, y)
+    tk_send('scan', 'dragto', x, y)
+    self
+  end
+
+  def see(idx)
+    tk_send('see', _to_idx(idx))
+    self
+  end
+
+  def see_cell(idx)
+    tk_send('seecell', _to_idx(idx))
+    self
+  end
+  alias seecell see_cell
+
+  def see_column(idx)
+    tk_send('seecolumn', _to_idx(idx))
+    self
+  end
+  alias seecolumn see_column
+
+  def selection_anchor(idx)
+    tk_send('selection', 'anchor', _to_idx(idx))
+    self
+  end
+
+  def selection_clear(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('selection', 'clear', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('selection', 'clear', first, last)
+    end
+    self
+  end
+
+  def selection_includes(idx)
+    bool(tk_send('selection', 'includes', _to_idx(idx)))
+  end
+
+  def selection_set(first, last=nil)
+    if first.kind_of?(Array)
+      tk_send('selection', 'set', first.collect{|idx| _to_idx(idx)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('selection', 'set', first, last)
+    end
+    self
+  end
+
+  def separatorpath(idx=nil)
+    if idx
+      window(tk_send('separatorpath', _to_idx(idx)))
+    else
+      window(tk_send('separatorpath'))
+    end
+  end
+
+  def separators
+    simplelist(tk_send('separators')).collect!{|w| window(w)}
+  end
+
+  def size
+    number(tk_send('size'))
+  end
+
+  def sort(order=nil)
+    if order
+      order = order.to_s
+      order = '-' << order if order[0] != ?-
+      if order.length < 2
+        order = nil
+      end
+    end
+    if order
+      tk_send('sort', order)
+    else
+      tk_send('sort')
+    end
+    self
+  end
+  def sort_increasing
+    tk_send('sort', '-increasing')
+    self
+  end
+  def sort_decreasing
+    tk_send('sort', '-decreasing')
+    self
+  end
+
+
+  # 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
+      order = order.to_s
+      order = '-' << order if order[0] != ?-
+      if order.length < 2
+        order = nil
+      end
+    end
+    if order
+      tk_send('sortbycolumn', _to_idx(idx), order)
+    else
+      tk_send('sortbycolumn', _to_idx(idx))
+    end
+    self
+  end
+  def sort_by_column_increasing(idx)
+    tk_send('sortbycolumn', _to_idx(idx), '-increasing')
+    self
+  end
+  def sort_by_column_decreasing(idx)
+    tk_send('sortbycolumn', _to_idx(idx), '-decreasing')
+    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)})
+    else
+      first = _to_idx(first)
+      last = (last)? _to_idx(last): first
+      tk_send('togglevisibility', first, last)
+    end
+    self
+  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
+end
+
+class << Tk::Tcllib::Tablelist
+  ############################################################
+  # helper commands
+  def getTablelistPath(descendant)
+    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
+  def addBWidgetEntry(name=None)
+    Tk.tk_call('::tablelist::addBWidgetEntry', name)
+  end
+
+  def addBWidgetSpinBox(name=None)
+    Tk.tk_call('::tablelist::addBWidgetSpinBox', name)
+  end
+
+  def addBWidgetComboBox(name=None)
+    Tk.tk_call('::tablelist::addBWidgetComboBox', name)
+  end
+
+
+  ############################################################
+  # with the Iwidgets ([incr Widgets]) package
+  def addIncrEntryfield(name=None)
+    Tk.tk_call('::tablelist::addIncrEntry', name)
+  end
+
+  def addIncrDateTimeWidget(type, seconds=false, name=None)
+    # type := 'datefield'|'dateentry'|timefield'|'timeentry'
+    if seconds && seconds != None
+      seconds = '-seconds'
+    else
+      seconds = None
+    end
+    Tk.tk_call('::tablelist::addDateTimeWidget', type, seconds, name)
+  end
+
+  def addIncrSpinner(name=None)
+    Tk.tk_call('::tablelist::addIncrSpinner', name)
+  end
+
+  def addIncrSpinint(name=None)
+    Tk.tk_call('::tablelist::addIncrSpinint', name)
+  end
+
+  def addIncrCombobox(name=None)
+    Tk.tk_call('::tablelist::addIncrCombobox', name)
+  end
+
+
+  ############################################################
+  # with Bryan Oakley's combobox package
+  def addOakleyCombobox(name=None)
+    Tk.tk_call('::tablelist::addOakleyCombobox', name)
+  end
+
+  ############################################################
+  # with the multi-entry package Mentry is a library extension
+  def addDateMentry(format, separator, gmt=false, name=None)
+    if gmt && gmt != None
+      gmt = '-gmt'
+    else
+      gmt = None
+    end
+    Tk.tk_call('::tablelist::addDateMentry', format, separator, gmt, name)
+  end
+
+  def addTimeMentry(format, separator, gmt=false, name=None)
+    if gmt && gmt != None
+      gmt = '-gmt'
+    else
+      gmt = None
+    end
+    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'
+    else
+      comma = None
+    end
+    Tk.tk_call('::tablelist::addFixedPoingMentry', count1, count2, comma, name)
+  end
+
+  def addIPAddrMentry(name=None)
+    Tk.tk_call('::tablelist::addIPAddrMentry', name)
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
new file mode 100644
index 0000000000..0a1458415e
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb
@@ -0,0 +1,43 @@
+#
+#  tkextlib/tcllib/tablelist_tlie.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * A multi-column listbox
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('tablelist_tile', '4.2')
+TkPackage.require('tablelist_tile')
+
+unless defined? Tk::Tcllib::Tablelist_usingTile
+  Tk::Tcllib::Tablelist_usingTile = true
+end
+
+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
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
new file mode 100644
index 0000000000..2f6e4b44fc
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/tkpiechart.rb
@@ -0,0 +1,314 @@
+#
+#  tkextlib/tcllib/tkpiechart.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Create 2D or 3D pies with labels in Tcl canvases
+#
+
+require 'tk'
+require 'tk/canvas'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('tkpiechart', '6.6')
+TkPackage.require('tkpiechart')
+
+module Tk
+  module Tcllib
+    module Tkpiechart
+    end
+  end
+end
+
+module Tk::Tcllib::Tkpiechart
+  PACKAGE_NAME = 'tkpiechart'.freeze
+  def self.package_name
+    PACKAGE_NAME
+  end
+
+  def self.package_version
+    begin
+      TkPackage.require('tkpiechart')
+    rescue
+      ''
+    end
+  end
+
+  module ConfigMethod
+    include TkConfigMethod
+
+    def __pathname
+      self.path + ';' + self.tag
+    end
+    private :__pathname
+
+    def __cget_cmd
+      ['::switched::cget', self.tag]
+    end
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    def __configinfo_struct
+      {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+        :default_value=>1, :current_value=>2}
+    end
+    private :__configinfo_struct
+
+    def __boolval_optkeys
+      super() << 'select' << 'autoupdate' << 'selectable'
+    end
+    private :__boolval_optkeys
+
+    def __strval_optkeys
+      super() << 'bordercolor' << 'textbackground' <<
+        'widestvaluetext' << 'title'
+    end
+    private :__strval_optkeys
+
+    def __listval_optkeys
+      super() << 'colors'
+    end
+    private :__listval_optkeys
+  end
+
+  ####################################
+  class PieChartObj < TkcItem
+    include ConfigMethod
+
+    def __font_optkeys
+      ['titlefont']
+    end
+    private :__font_optkeys
+  end
+
+  ####################################
+  class Pie < TkcItem
+    include ConfigMethod
+
+    def create_self(x, y, width, height, keys=None)
+      if keys and keys != None
+        @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)
+      end
+
+      @slice_tbl = {}
+
+      id = "pie(#{@tag_key})"
+
+      @tag = @tag_pie = TkcNamedTag(@c, id)
+      @tag_slices = TkcNamedTag(@c, "pieSlices(#{@tag_key})")
+
+      id
+    end
+    private :create_self
+
+    def tag_key
+      @tag_key
+    end
+    def tag
+      @tag
+    end
+    def canvas
+      @c
+    end
+    def _entry_slice(slice)
+      @slice_tbl[slice.to_eval] = slice
+    end
+    def _delete_slice(slice)
+      @slice_tbl.delete(slice.to_eval)
+    end
+
+    def delete
+      tk_call_without_enc('::stooop::delete', @tag_key)
+      CItemID_TBL.mutex.synchronize{
+        CItemID_TBL[@path].delete(@id) if CItemID_TBL[@path]
+      }
+      self
+    end
+
+    def new_slice(text=None)
+      Slice.new(self, text)
+    end
+
+    def delete_slice(slice)
+      unless slice.kind_of?(Slice)
+        unless (slice = @slice_tbl[slice])
+          return tk_call_without_enc('pie::deleteSlice', @tag_key, slice)
+        end
+      end
+      unless slice.kind_of?(Slice) && slice.pie == self
+        fail ArgumentError, "argument is not a slice of self"
+      end
+      slice.delete
+    end
+
+    def selected_slices
+      tk_split_simplelist(tk_call_without_enc('pie::selectedSlices',
+                                              @tag_key)).collect{|slice|
+        @slice_tbl[slice] || Slice.new(:no_create, self, slice)
+      }
+    end
+  end
+
+  ####################################
+  class Slice < TkcItem
+    include ConfigMethod
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def initialize(pie, *args)
+      unless pie.kind_of?(Pie) && pie != :no_create
+        fail ArgumentError, "expects TkPiechart::Pie for 1st argument"
+      end
+
+      if pie == :no_create
+        @pie, @tag_key = args
+      else
+        text = args[0] || None
+        @pie = pie
+        @tag_key = tk_call_without_enc('pie::newSlice', @pie.tag_key, text)
+      end
+      @parent = @c = @pie.canvas
+      @path = @parent.path
+
+      @pie._entry_slice(self)
+
+      @id = "slices(#{@tag_key})"
+      @tag = TkcNamedTag.new(@pie.canvas, @id)
+
+      CItemID_TBL.mutex.synchronize{
+        CItemID_TBL[@path] = {} unless CItemID_TBL[@path]
+        CItemID_TBL[@path][@id] = self
+      }
+    end
+
+    def tag_key
+      @tag_key
+    end
+    def tag
+      @tag
+    end
+    def pie
+      @pie
+    end
+
+    def delete
+      tk_call_without_enc('pie::deleteSlice', @pie.tag_key, @tag_key)
+      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',
+                          @pie.tag_key, @tag_key, share, disp)
+      self
+    end
+
+    def label(text)
+      tk_call_without_enc('pie::labelSlice', @pie.tag_key, @tag_key, text)
+      self
+    end
+  end
+
+  ####################################
+  class BoxLabeler < TkcItem
+    include ConfigMethod
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def create_self(keys=None)
+      if keys and keys != None
+        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler',
+                                       *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'pieBoxLabeler')
+      end
+
+      id = "pieBoxLabeler(#{@tag_key})"
+      @tag = TkcNamedTag(@c, id)
+
+      id
+    end
+    private :create_self
+  end
+
+  ####################################
+  class PeripheralLabeler < TkcItem
+    include ConfigMethod
+
+    def __font_optkeys
+      ['font', 'smallfont']
+    end
+    private :__font_optkeys
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    def create_self(keys=None)
+      if keys and keys != None
+        @tag_key = tk_call_without_enc('::stooop::new',
+                                       'piePeripheralLabeler',
+                                       *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'piePeripheralLabeler')
+      end
+
+      id = "piePeripheralLabeler(#{@tag_key})"
+      @tag = TkcNamedTag(@c, id)
+
+      id
+    end
+    private :create_self
+  end
+
+  ####################################
+  class Label < TkcItem
+    include ConfigMethod
+
+    def __config_cmd
+      ['::switched::configure', self.tag]
+    end
+    private :__config_cmd
+
+    #------------------------
+
+    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,
+                                       *hash_kv(keys, true))
+      else
+        @tag_key = tk_call_without_enc('::stooop::new', 'canvasLabel',
+                                       @c, x, y, width, height)
+      end
+
+      id = "canvasLabel(#{@tag_key})"
+      @tag = TkcNamedTag(@c, id)
+
+      id
+    end
+    private :create_self
+  end
+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
new file mode 100644
index 0000000000..070e63a7b5
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/tooltip.rb
@@ -0,0 +1,104 @@
+#
+#  tkextlib/tcllib/tooltip.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * Provides tooltips, a small text message that is displayed when the
+#     mouse hovers over a widget.
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('tooltip', '1.1')
+TkPackage.require('tooltip')
+
+module Tk::Tcllib
+  module Tooltip
+    PACKAGE_NAME = 'tooltip'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('tooltip')
+      rescue
+        ''
+      end
+    end
+  end
+end
+
+module Tk::Tcllib::Tooltip
+  extend TkCore
+
+  WidgetClassName = 'Tooltip'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def self.database_classname
+    self::WidgetClassName
+  end
+  def self.database_class
+    WidgetClassNames[self::WidgetClassName]
+  end
+
+  def self.clear(glob_path_pat = None)
+    self.clear_glob(glob_path_pat)
+  end
+
+  def self.clear_glob(glob_path_pat)
+    tk_call_without_enc('::tooltip::tooltip', 'clear', glob_path_pat)
+  end
+
+  def self.clear_widgets(*args)
+    self.clear_glob("{#{args.collect{|w| _get_eval_string(w)}.join(',')}}")
+  end
+
+  def self.clear_children(*args)
+    self.clear_glob("{#{args.collect{|w| s = _get_eval_string(w); "#{s},#{s}.*"}.join(',')}}")
+  end
+
+  def self.delay(millisecs=None)
+    number(tk_call_without_enc('::tooltip::tooltip', 'delay', millisecs))
+  end
+  def self.delay=(millisecs)
+    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
+  end
+  def self.off
+    self.disable
+  end
+
+  def self.enable
+    tk_call_without_enc('::tooltip::tooltip', 'enable')
+    true
+  end
+  def self.on
+    self.enable
+  end
+
+  def self.register(widget, msg, keys=nil)
+    if keys.kind_of?(Hash)
+      args = hash_kv(keys) << msg
+    else
+      args = msg
+    end
+    tk_call('::tooltip::tooltip', widget.path, *args)
+  end
+
+  def self.erase(widget)
+    tk_call_without_enc('::tooltip::tooltip', widget.path, '')
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tcllib/widget.rb b/ext/tk/lib/tkextlib/tcllib/widget.rb
new file mode 100644
index 0000000000..57fdf7a575
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tcllib/widget.rb
@@ -0,0 +1,82 @@
+#
+#  tkextlib/tcllib/widget.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+#   * Part of tcllib extension
+#   * megawidget package that uses snit as the object system (snidgets)
+#
+
+require 'tk'
+require 'tkextlib/tcllib.rb'
+
+# TkPackage.require('widget', '3.0')
+TkPackage.require('widget')
+
+module Tk::Tcllib
+  module Widget
+    PACKAGE_NAME = 'widget'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('widget')
+      rescue
+        ''
+      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'
+  autoload :PanelFrame,         'tkextlib/tcllib/panelframe'
+
+  autoload :Ruler,              'tkextlib/tcllib/ruler'
+
+  autoload :Screenruler,        'tkextlib/tcllib/screenruler'
+  autoload :ScreenRuler,        'tkextlib/tcllib/screenruler'
+
+  autoload :Scrolledwindow,     'tkextlib/tcllib/scrollwin'
+  autoload :ScrolledWindow,     'tkextlib/tcllib/scrollwin'
+
+  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.rb b/ext/tk/lib/tkextlib/tclx.rb
new file mode 100644
index 0000000000..3a4ff27644
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tclx.rb
@@ -0,0 +1,13 @@
+#
+#  TclX support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tclx/setup.rb'
+
+# load library
+require 'tkextlib/tclx/tclx'
diff --git a/ext/tk/lib/tkextlib/tclx/setup.rb b/ext/tk/lib/tkextlib/tclx/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tclx/setup.rb
@@ -0,0 +1,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
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/tclx/tclx.rb b/ext/tk/lib/tkextlib/tclx/tclx.rb
new file mode 100644
index 0000000000..5a908fcd0b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tclx/tclx.rb
@@ -0,0 +1,74 @@
+#
+#  tclx/tclx.rb
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# call setup script
+require 'tkextlib/tclx/setup.rb'
+
+# TkPackage.require('Tclx', '8.0')
+TkPackage.require('Tclx')
+
+module Tk
+  module TclX
+    PACKAGE_NAME = 'Tclx'.freeze
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        TkPackage.require('Tclx')
+      rescue
+        ''
+      end
+    end
+
+    def self.infox(*args)
+      Tk.tk_call('infox', *args)
+    end
+
+    def self.signal(*args)
+      warn("Warning: Don't recommend to use TclX's 'signal' command. Please use Ruby's 'Signal.trap' method")
+      Tk.tk_call('signal', *args)
+    end
+
+    def self.signal_restart(*args)
+      warn("Warning: Don't recommend to use TclX's 'signal' command. Please use Ruby's 'Signal.trap' method")
+      Tk.tk_call('signal', '-restart', *args)
+    end
+
+    ##############################
+
+    class XPG3_MsgCat
+      class << self
+        alias open new
+      end
+
+      def initialize(catname, fail_mode=false)
+        if fail_mode
+          @msgcat_id = Tk.tk_call('catopen', '-fail', catname)
+        else
+          @msgcat_id = Tk.tk_call('catopen', '-nofail', catname)
+        end
+      end
+
+      def close(fail_mode=false)
+        if fail_mode
+          Tk.tk_call('catclose', '-fail', @msgcat_id)
+        else
+          Tk.tk_call('catclose', '-nofail', @msgcat_id)
+        end
+        self
+      end
+
+      def get(setnum, msgnum, defaultstr)
+        Tk.tk_call('catgets', @msgcat_id, setnum, msgnum, defaultstr)
+      end
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tile.rb b/ext/tk/lib/tkextlib/tile.rb
new file mode 100644
index 0000000000..6c11e212ae
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile.rb
@@ -0,0 +1,449 @@
+#
+#  Tile theme engin (tile widget set) support
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+
+require 'tk'
+require 'tk/ttk_selector'
+
+# call setup script for general 'tkextlib' libraries
+require 'tkextlib/setup.rb'
+
+# library directory
+require 'tkextlib/tile/setup.rb'
+
+# load package
+# TkPackage.require('tile', '0.4')
+# TkPackage.require('tile', '0.6')
+# TkPackage.require('tile', '0.7')
+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
+      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
+  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
+  # 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 = 8
+
+      PACKAGE_NAME = 'Ttk'.freeze
+    end
+  end
+end
+
+# autoload
+module Tk
+  module Tile
+    TkComm::TkExtlibAutoloadModule.unshift(self)
+
+    def self.package_name
+      PACKAGE_NAME
+    end
+
+    def self.package_version
+      begin
+        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.__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
+
+    def self.style(*args)
+      args.map!{|arg| TkComm._get_eval_string(arg)}.join('.')
+    end
+
+    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
+
+      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
+
+    module Font
+      Default      = 'TkDefaultFont'
+      Text         = 'TkTextFont'
+      Heading      = 'TkHeadingFont'
+      Caption      = 'TkCaptionFont'
+      Tooltip      = 'TkTooltipFont'
+
+      Fixed        = 'TkFixedFont'
+      Menu         = 'TkMenuFont'
+      SmallCaption = 'TkSmallCaptionFont'
+      Icon         = 'TkIconFont'
+
+      TkFont::SYSTEM_FONT_NAMES.add [
+        'TkDefaultFont', 'TkTextFont', 'TkHeadingFont',
+        'TkCaptionFont', 'TkTooltipFont', 'TkFixedFont',
+        'TkMenuFont', 'TkSmallCaptionFont', 'TkIconFont'
+      ]
+    end
+
+    module ParseStyleLayout
+      def _style_layout(lst)
+        ret = []
+        until lst.empty?
+          sub = [lst.shift]
+          keys = {}
+
+          until lst.empty?
+            if lst[0][0] == ?-
+              k = lst.shift[1..-1]
+              children = lst.shift
+              children = _style_layout(children) if children.kind_of?(Array)
+              keys[k] = children
+            else
+              break
+            end
+          end
+
+          sub << keys unless keys.empty?
+          ret << sub
+        end
+        ret
+      end
+      private :_style_layout
+    end
+
+    module TileWidget
+      include Tk::Tile::ParseStyleLayout
+
+      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('style'=>proc{|v| _style_layout(list(v))})
+      end
+      private :__val2ruby_optkeys
+
+      def ttk_instate(state, script=nil, &b)
+        if script
+          tk_send('instate', state, script)
+        elsif b
+          tk_send('instate', state, Proc.new(&b))
+        else
+          bool(tk_send('instate', state))
+        end
+      end
+      alias tile_instate ttk_instate
+
+      def ttk_state(state=nil)
+        if state
+          tk_send('state', state)
+        else
+          list(tk_send('state'))
+        end
+      end
+      alias tile_state ttk_state
+
+      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
+
+    ######################################
+
+    autoload :TButton,       'tkextlib/tile/tbutton'
+    autoload :Button,        'tkextlib/tile/tbutton'
+
+    autoload :TCheckButton,  'tkextlib/tile/tcheckbutton'
+    autoload :CheckButton,   'tkextlib/tile/tcheckbutton'
+    autoload :TCheckbutton,  'tkextlib/tile/tcheckbutton'
+    autoload :Checkbutton,   'tkextlib/tile/tcheckbutton'
+
+    autoload :Dialog,        'tkextlib/tile/dialog'
+
+    autoload :TEntry,        'tkextlib/tile/tentry'
+    autoload :Entry,         'tkextlib/tile/tentry'
+
+    autoload :TCombobox,     'tkextlib/tile/tcombobox'
+    autoload :Combobox,      'tkextlib/tile/tcombobox'
+
+    autoload :TFrame,        'tkextlib/tile/tframe'
+    autoload :Frame,         'tkextlib/tile/tframe'
+
+    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'
+
+    autoload :TRadioButton,  'tkextlib/tile/tradiobutton'
+    autoload :RadioButton,   'tkextlib/tile/tradiobutton'
+    autoload :TRadiobutton,  'tkextlib/tile/tradiobutton'
+    autoload :Radiobutton,   'tkextlib/tile/tradiobutton'
+
+    autoload :TScale,        'tkextlib/tile/tscale'
+    autoload :Scale,         'tkextlib/tile/tscale'
+    autoload :TProgress,     'tkextlib/tile/tscale'
+    autoload :Progress,      'tkextlib/tile/tscale'
+
+    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
new file mode 100644
index 0000000000..b112e6152b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/dialog.rb
@@ -0,0 +1,102 @@
+#
+#  ttk::dialog  (tile-0.7+)
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class Dialog < TkWindow
+    end
+  end
+end
+
+begin
+  TkPackage.require('ttk::dialog') # this may be required.
+rescue RuntimeError
+  # ignore
+end
+
+class Tk::Tile::Dialog
+  TkCommandNames = ['::ttk::dialog'.freeze].freeze
+
+  def self.show(*args)
+    dialog = self.new(*args)
+    dialog.show
+    [dialog.status, dialog.value]
+  end
+  def self.display(*args)
+    self.show(*args)
+  end
+
+  def self.define_dialog_type(name, keys)
+    Tk.tk_call('::ttk::dialog::define', name, keys)
+    name
+  end
+
+  def self.style(*args)
+    ['Dialog', *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  #########################
+
+  def initialize(keys={})
+    @keys = _symbolkey2str(keys)
+    super(*args)
+  end
+
+  def create_self(keys)
+    # dummy
+  end
+  private :create_self
+
+  def show
+    tk_call(self.class::TkCommandNames[0], @path, *hash_kv(@keys))
+  end
+  alias display show
+
+  def client_frame
+    window(tk_call_without_enc('::ttk::dialog::clientframe', @path))
+  end
+
+  def cget_strict(slot)
+    @keys[slot.to_s]
+  end
+  def cget(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)
+      slot.each{|k, v| configure(k, v)}
+    else
+      slot = slot.to_s
+      value = _symbolkey2str(value) if value.kind_of?(Hash)
+      if value && value != None
+        @keys[slot] = value
+      else
+        @keys.delete(slot)
+      end
+    end
+    self
+  end
+
+  def configinfo(slot = nil)
+    if slot
+      slot = slot.to_s
+      [ slot, nil, nil, nil, @keys[slot] ]
+    else
+      @keys.collect{|k, v| [ k, nil, nil, nil, v ] }
+    end
+  end
+end
diff --git a/ext/tk/lib/tkextlib/tile/setup.rb b/ext/tk/lib/tkextlib/tile/setup.rb
new file mode 100644
index 0000000000..ee406c6ca0
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/setup.rb
@@ -0,0 +1,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
+#    operations in this file.
+#
diff --git a/ext/tk/lib/tkextlib/tile/sizegrip.rb b/ext/tk/lib/tkextlib/tile/sizegrip.rb
new file mode 100644
index 0000000000..9947e0d870
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/sizegrip.rb
@@ -0,0 +1,32 @@
+#
+#  ttk::sizegrip widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class SizeGrip < TkWindow
+    end
+    Sizegrip = SizeGrip
+  end
+end
+
+class Tk::Tile::SizeGrip < TkWindow
+  include Tk::Tile::TileWidget
+
+  TkCommandNames = ['::ttk::sizegrip'.freeze].freeze
+  WidgetClassName = 'TSizegrip'.freeze
+  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
new file mode 100644
index 0000000000..83a0c9a2e8
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/style.rb
@@ -0,0 +1,336 @@
+#
+#  style commands
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    module Style
+    end
+  end
+end
+
+module Tk::Tile::Style
+  extend TkCore
+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 incompatible changes
+    # depend on the version of the extension. 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
+      style = nil
+    end
+    style = '.' unless style
+
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 7
+      sub_cmd = 'default'
+    else
+      sub_cmd = 'configure'
+    end
+
+    if keys && keys != None
+      tk_call(TkCommandNames[0], sub_cmd, style, *hash_kv(keys))
+    else
+      tk_call(TkCommandNames[0], sub_cmd, style)
+    end
+  end
+  alias default configure
+
+  def map(style=nil, keys=nil)
+    if style.kind_of?(Hash)
+      keys = style
+      style = nil
+    end
+    style = '.' unless style
+
+    if keys && keys != None
+      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
+      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(TkCommandNames[0], 'lookup', style,
+            '-' << opt.to_s, state, fallback_value)
+  end
+
+  include Tk::Tile::ParseStyleLayout
+
+  def layout(style=nil, spec=nil)
+    if style.kind_of?(Hash)
+      spec = style
+      style = nil
+    end
+    style = '.' unless style
+
+    if spec
+      tk_call(TkCommandNames[0], 'layout', style, spec)
+    else
+      _style_layout(list(tk_call(TkCommandNames[0], 'layout', style)))
+    end
+  end
+
+  def 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(TkCommandNames[0], 'element', 'names'))
+  end
+
+  def 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(TkCommandNames[0], 'theme', 'create', name, *hash_kv(keys))
+    else
+      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(TkCommandNames[0], 'theme', 'settings', name, cmd)
+    name
+  end
+
+  def theme_names()
+    list(tk_call(TkCommandNames[0], 'theme', 'names'))
+  end
+
+  def 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
new file mode 100644
index 0000000000..c852024842
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tbutton.rb
@@ -0,0 +1,34 @@
+#
+#  tbutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TButton < Tk::Button
+    end
+    Button = TButton
+  end
+end
+
+class Tk::Tile::TButton < Tk::Button
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::button'.freeze].freeze
+  else
+    TkCommandNames = ['::tbutton'.freeze].freeze
+  end
+  WidgetClassName = 'TButton'.freeze
+  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
new file mode 100644
index 0000000000..01751ede0f
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tcheckbutton.rb
@@ -0,0 +1,38 @@
+#
+#  tcheckbutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TCheckButton < Tk::CheckButton
+    end
+    TCheckbutton = TCheckButton
+    CheckButton  = TCheckButton
+    Checkbutton  = TCheckButton
+  end
+end
+
+class Tk::Tile::TCheckButton < Tk::CheckButton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::checkbutton'.freeze].freeze
+  else
+    TkCommandNames = ['::tcheckbutton'.freeze].freeze
+  end
+  WidgetClassName = 'TCheckbutton'.freeze
+  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
new file mode 100644
index 0000000000..b5ab827e2d
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tcombobox.rb
@@ -0,0 +1,55 @@
+#
+#  tcombobox widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TCombobox < Tk::Tile::TEntry
+    end
+    Combobox = TCombobox
+  end
+end
+
+class Tk::Tile::TCombobox < Tk::Tile::TEntry
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::combobox'.freeze].freeze
+  else
+    TkCommandNames = ['::tcombobox'.freeze].freeze
+  end
+  WidgetClassName = 'TCombobox'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __boolval_optkeys
+    super() << 'exportselection'
+  end
+  private :__boolval_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_without_enc('current', idx)
+  end
+
+  def set(val)
+    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
new file mode 100644
index 0000000000..8d2633a774
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tentry.rb
@@ -0,0 +1,49 @@
+#
+#  tentry widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TEntry < Tk::Entry
+    end
+    Entry = TEntry
+  end
+end
+
+class Tk::Tile::TEntry < Tk::Entry
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::entry'.freeze].freeze
+  else
+    TkCommandNames = ['::tentry'.freeze].freeze
+  end
+  WidgetClassName = 'TEntry'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __optkey_aliases
+    {:vcmd=>:validatecommand, :invcmd=>:invalidcommand}
+  end
+  private :__optkey_aliases
+
+  def __boolval_optkeys
+    super() << 'exportselection'
+  end
+  private :__boolval_optkeys
+
+  def __strval_optkeys
+    super() << 'show'
+  end
+  private :__strval_optkeys
+
+  def self.style(*args)
+    [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
new file mode 100644
index 0000000000..d6d4312628
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tframe.rb
@@ -0,0 +1,34 @@
+#
+#  tframe widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TFrame < Tk::Frame
+    end
+    Frame = TFrame
+  end
+end
+
+class Tk::Tile::TFrame < Tk::Frame
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::frame'.freeze].freeze
+  else
+    TkCommandNames = ['::tframe'.freeze].freeze
+  end
+  WidgetClassName = 'TFrame'.freeze
+  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
new file mode 100644
index 0000000000..55b98acc68
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tlabel.rb
@@ -0,0 +1,34 @@
+#
+#  tlabel widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TLabel < Tk::Label
+    end
+    Label = TLabel
+  end
+end
+
+class Tk::Tile::TLabel < Tk::Label
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::label'.freeze].freeze
+  else
+    TkCommandNames = ['::tlabel'.freeze].freeze
+  end
+  WidgetClassName = 'TLabel'.freeze
+  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
new file mode 100644
index 0000000000..a34c98583f
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tlabelframe.rb
@@ -0,0 +1,38 @@
+#
+#  tlabelframe widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TLabelframe < Tk::Tile::TFrame
+    end
+    TLabelFrame = TLabelframe
+    Labelframe  = TLabelframe
+    LabelFrame  = TLabelframe
+  end
+end
+
+class Tk::Tile::TLabelframe < Tk::Tile::TFrame
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::labelframe'.freeze].freeze
+  else
+    TkCommandNames = ['::tlabelframe'.freeze].freeze
+  end
+  WidgetClassName = 'TLabelframe'.freeze
+  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
new file mode 100644
index 0000000000..1cf553ec8c
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tmenubutton.rb
@@ -0,0 +1,38 @@
+#
+#  tmenubutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TMenubutton < Tk::Menubutton
+    end
+    TMenuButton = TMenubutton
+    Menubutton  = TMenubutton
+    MenuButton  = TMenubutton
+  end
+end
+
+class Tk::Tile::TMenubutton < Tk::Menubutton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::menubutton'.freeze].freeze
+  else
+    TkCommandNames = ['::tmenubutton'.freeze].freeze
+  end
+  WidgetClassName = 'TMenubutton'.freeze
+  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
new file mode 100644
index 0000000000..9e27e2c1fd
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tnotebook.rb
@@ -0,0 +1,147 @@
+#
+#  tnotebook widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TNotebook < TkWindow
+    end
+    Notebook = TNotebook
+  end
+end
+
+class Tk::Tile::TNotebook < TkWindow
+  ################################
+  include TkItemConfigMethod
+
+  def __item_cget_cmd(id)
+    [self.path, 'tab', id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, 'tab', id]
+  end
+  private :__item_config_cmd
+
+  def __item_listval_optkeys(id)
+    []
+  end
+  private :__item_listval_optkeys
+
+  def __item_methodcall_optkeys(id)  # { key=>method, ... }
+    {}
+  end
+  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)
+    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
+  ################################
+
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::notebook'.freeze].freeze
+  else
+    TkCommandNames = ['::tnotebook'.freeze].freeze
+  end
+  WidgetClassName = 'TNotebook'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def enable_traversal()
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
+      tk_call_without_enc('::tile::enableNotebookTraversal', @path)
+    elsif Tk::Tile::TILE_SPEC_VERSION_ID < 7
+      tk_call_without_enc('::tile::notebook::enableTraversal', @path)
+    else
+      tk_call_without_enc('::ttk::notebook::enableTraversal', @path)
+    end
+    self
+  end
+
+  def add(child, keys=nil)
+    if keys && keys != None
+      tk_send('add', _epath(child), *hash_kv(keys))
+    else
+      tk_send('add', _epath(child))
+    end
+    self
+  end
+
+  def forget(idx)
+    tk_send('forget', idx)
+    self
+  end
+
+  def hide(idx)
+    tk_send('hide', idx)
+  end
+
+  def index(idx)
+    number(tk_send('index', idx))
+  end
+
+  def insert(idx, subwin, keys=nil)
+    if keys && keys != None
+      tk_send('insert', idx, subwin, *hash_kv(keys))
+    else
+      tk_send('insert', idx, subwin)
+    end
+    self
+  end
+
+  def select(idx)
+    tk_send('select', idx)
+    self
+  end
+
+  def selected
+    window(tk_send_without_enc('select'))
+  end
+
+  def tabs
+    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
new file mode 100644
index 0000000000..d6ad234559
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tpaned.rb
@@ -0,0 +1,245 @@
+#
+#  tpaned widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TPaned < TkWindow
+    end
+    PanedWindow = Panedwindow = Paned = TPaned
+  end
+end
+
+class Tk::Tile::TPaned < TkWindow
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    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
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  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
+
+  def forget(pane)
+    pane = _epath(pane)
+    tk_send_without_enc('forget', pane)
+    self
+  end
+
+  def insert(pos, win, keys)
+    win = _epath(win)
+    tk_send_without_enc('insert', pos, win, *hash_kv(keys))
+    self
+  end
+
+  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)
+    pane = _epath(pane)
+    if key.kind_of? Hash
+      params = []
+      key.each{|k, v|
+        params.push("-#{k}")
+        # params.push((v.kind_of?(TkObject))? v.epath: v)
+        params.push(_epath(v))
+      }
+      tk_send_without_enc('pane', pane, *params)
+    else
+      # value = value.epath if value.kind_of?(TkObject)
+      value = _epath(value)
+      tk_send_without_enc('pane', pane, "-#{key}", value)
+    end
+    self
+  end
+  alias pane_config paneconfigure
+  alias pane_configure paneconfigure
+
+  def paneconfiginfo(win)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      win = _epath(win)
+      if key
+        conf = tk_split_list(tk_send_without_enc('pane', win, "-#{key}"))
+        conf[0] = conf[0][1..-1]
+        if conf[0] == 'hide'
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+          conf[4] = bool(conf[4]) unless conf[4].empty?
+        end
+        conf
+      else
+        tk_split_simplelist(tk_send_without_enc('pane',
+                                                win)).collect{|conflist|
+          conf = tk_split_simplelist(conflist)
+          conf[0] = conf[0][1..-1]
+          if conf[3]
+            if conf[0] == 'hide'
+              conf[3] = bool(conf[3]) unless conf[3].empty?
+            elsif conf[3].index('{')
+              conf[3] = tk_split_list(conf[3])
+            else
+              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])
+            else
+              conf[4] = tk_tcl2ruby(conf[4])
+            end
+          end
+          conf[1] = conf[1][1..-1] if conf.size == 2 # alias info
+          conf
+        }
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      win = _epath(win)
+      if key
+        conf = tk_split_list(tk_send_without_enc('pane', win, "-#{key}"))
+        key = conf.shift[1..-1]
+        if key == 'hide'
+          conf[2] = bool(conf[2]) unless conf[2].empty?
+          conf[3] = bool(conf[3]) unless conf[3].empty?
+        end
+        { key => conf }
+      else
+        ret = {}
+        tk_split_simplelist(tk_send_without_enc('pane',
+                                                win)).each{|conflist|
+          conf = tk_split_simplelist(conflist)
+          key = conf.shift[1..-1]
+          if key
+            if key == 'hide'
+              conf[2] = bool(conf[2]) unless conf[2].empty?
+            elsif conf[2].index('{')
+              conf[2] = tk_split_list(conf[2])
+            else
+              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])
+            else
+              conf[3] = tk_tcl2ruby(conf[3])
+            end
+          end
+          if conf.size == 1
+            ret[key] = conf[0][1..-1]  # alias info
+          else
+            ret[key] = conf
+          end
+        }
+        ret
+      end
+    end
+  end
+  alias pane_configinfo paneconfiginfo
+
+  def current_paneconfiginfo(win, key=nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if key
+        conf = paneconfiginfo(win, key)
+        {conf[0] => conf[4]}
+      else
+        ret = {}
+        paneconfiginfo(win).each{|conf|
+          ret[conf[0]] = conf[4] if conf.size > 2
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      paneconfiginfo(win, key).each{|k, conf|
+        ret[k] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    end
+  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)
+    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
new file mode 100644
index 0000000000..0c9d15e1b9
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tprogressbar.rb
@@ -0,0 +1,57 @@
+#
+#  tprogressbar widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TProgressbar < TkWindow
+    end
+    Progressbar = TProgressbar
+  end
+end
+
+class Tk::Tile::TProgressbar
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::progressbar'.freeze].freeze
+  else
+    TkCommandNames = ['::tprogressbar'.freeze].freeze
+  end
+  WidgetClassName = 'TProgressbar'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def self.style(*args)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def step(amount=None)
+    tk_send_without_enc('step', amount).to_f
+  end
+  #def step=(amount)
+  #  tk_send_without_enc('step', amount)
+  #end
+
+  def start(interval=None)
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
+      tk_call_without_enc('::tile::progressbar::start', @path, interval)
+    else
+      tk_send_without_enc('start', interval)
+    end
+  end
+
+  def stop(amount=None)
+    if Tk::Tile::TILE_SPEC_VERSION_ID < 5
+      tk_call_without_enc('::tile::progressbar::stop', @path)
+    else
+      tk_send_without_enc('stop', amount)
+    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
new file mode 100644
index 0000000000..5dbf260666
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tradiobutton.rb
@@ -0,0 +1,38 @@
+#
+#  tradiobutton widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TRadioButton < Tk::RadioButton
+    end
+    TRadiobutton = TRadioButton
+    RadioButton  = TRadioButton
+    Radiobutton  = TRadioButton
+  end
+end
+
+class Tk::Tile::TRadioButton < Tk::RadioButton
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::radiobutton'.freeze].freeze
+  else
+    TkCommandNames = ['::tradiobutton'.freeze].freeze
+  end
+  WidgetClassName = 'TRadiobutton'.freeze
+  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
new file mode 100644
index 0000000000..70db3d6d78
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/treeview.rb
@@ -0,0 +1,1306 @@
+#
+#  treeview widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class Treeview < TkWindow
+    end
+  end
+end
+
+module Tk::Tile::TreeviewConfig
+  include TkItemConfigMethod
+
+  def __item_configinfo_struct(id)
+    # maybe need to override
+    {:key=>0, :alias=>nil, :db_name=>nil, :db_class=>nil,
+      :default_value=>nil, :current_value=>1}
+  end
+  private :__item_configinfo_struct
+
+  def __itemconfiginfo_core(tagOrId, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        fontkey  = $2
+        return [slot.to_s, tagfontobj(tagid(tagOrId), fontkey)]
+      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
+              # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << slot))
+            rescue
+              # Maybe, 'state' option has '-' in future.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            end
+            return [slot, val]
+
+          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
+            optval = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            begin
+              val = method.call(tagOrId, optval)
+            rescue => e
+              warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+              val = optval
+            end
+            return [slot, val]
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return [slot, self.__send__(method, tagOrId)]
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = number(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return [slot, val]
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = num_or_str(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return [slot, val]
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = bool(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return [slot, val]
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return [slot, val]
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val =~ /^[0-9]/
+              return [slot, list(val)]
+            else
+              return [slot, val]
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            return [slot, val]
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.empty?
+              return [slot, nil]
+            else
+              return [slot, TkVarAccess.new(val)]
+            end
+
+          else
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.index('{')
+              return [slot, tk_split_list(val)]
+            else
+              return [slot, tk_tcl2ruby(val)]
+            end
+          end
+
+        else # ! slot
+          ret = Hash[*(tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false))].to_a.collect{|conf|
+            conf[0] = conf[0][1..-1] if conf[0][0] == ?-
+            case conf[0]
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[conf[0]]
+              optval = conf[1]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[1] = val
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = number(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = num_or_str(conf[1])
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = bool(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = simplelist(conf[1])
+
+            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1] =~ /^[0-9]/
+                conf[1] = list(conf[1])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1].empty?
+                conf[1] = nil
+              else
+                conf[1] = TkVarAccess.new(conf[1])
+              end
+
+            else
+              if conf[1].index('{')
+                conf[1] = tk_split_list(conf[1])
+              else
+                conf[1] = tk_tcl2ruby(conf[1])
+              end
+            end
+
+            conf
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret.assoc(optkey)
+            if fontconf
+              ret.delete_if{|inf| inf[0] =~ /^(|latin|ascii|kanji)#{optkey}$/}
+              fontconf[1] = tagfontobj(tagid(tagOrId), optkey)
+              ret.push(fontconf)
+            end
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret << [optkey.to_s, self.__send__(method, tagOrId)]
+          }
+
+          ret
+        end
+      end
+
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      if (slot && slot.to_s =~ /^(|latin|ascii|kanji)(#{__item_font_optkeys(tagid(tagOrId)).join('|')})$/)
+        fontkey  = $2
+        return {slot.to_s => tagfontobj(tagid(tagOrId), fontkey)}
+      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
+              # On tile-0.7.{2-8}, 'state' option has no '-' at its head.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << slot))
+            rescue
+              # Maybe, 'state' option has '-' in future.
+              val = tk_call(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            end
+            return {slot => val}
+
+          when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[slot]
+            optval = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            begin
+              val = method.call(tagOrId, optval)
+            rescue => e
+              warn("Warning:: #{e.message} (when #{method}lcall(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+              val = optval
+            end
+            return {slot => val}
+
+          when /^(#{__item_methodcall_optkeys(tagid(tagOrId)).keys.join('|')})$/
+            method = _symbolkey2str(__item_methodcall_optkeys(tagid(tagOrId)))[slot]
+            return {slot => self.__send__(method, tagOrId)}
+
+          when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = number(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return {slot => val}
+
+          when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = num_or_str(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return {slot => val}
+
+          when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+            begin
+              val = bool(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            rescue
+              val = nil
+            end
+            return {slot => val}
+
+          when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}")))
+            return {slot => val}
+
+          when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val =~ /^[0-9]/
+              return {slot => list(val)}
+            else
+              return {slot => val}
+            end
+
+          when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            return {slot => val}
+
+          when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.empty?
+              return {slot => nil}
+            else
+              return {slot => TkVarAccess.new(val)}
+            end
+
+          else
+            val = tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)) << "-#{slot}"))
+            if val.index('{')
+              return {slot => tk_split_list(val)}
+            else
+              return {slot => tk_tcl2ruby(val)}
+            end
+          end
+
+        else # ! slot
+          ret = {}
+          ret = Hash[*(tk_split_simplelist(tk_call_without_enc(*(__item_confinfo_cmd(tagid(tagOrId)))), false, false))].to_a.collect{|conf|
+            conf[0] = conf[0][1..-1] if conf[0][0] == ?-
+
+            optkey = conf[0]
+            case optkey
+            when /^(#{__item_val2ruby_optkeys(tagid(tagOrId)).keys.join('|')})$/
+              method = _symbolkey2str(__item_val2ruby_optkeys(tagid(tagOrId)))[optkey]
+              optval = conf[1]
+              begin
+                val = method.call(tagOrId, optval)
+              rescue => e
+                warn("Warning:: #{e.message} (when #{method}.call(#{tagOrId.inspect}, #{optval.inspect})") if $DEBUG
+                val = optval
+              end
+              conf[1] = val
+
+            when /^(#{__item_strval_optkeys(tagid(tagOrId)).join('|')})$/
+              # do nothing
+
+            when /^(#{__item_numval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = number(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_numstrval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = num_or_str(conf[1])
+
+            when /^(#{__item_boolval_optkeys(tagid(tagOrId)).join('|')})$/
+              begin
+                conf[1] = bool(conf[1])
+              rescue
+                conf[1] = nil
+              end
+
+            when /^(#{__item_listval_optkeys(tagid(tagOrId)).join('|')})$/
+              conf[1] = simplelist(conf[1])
+
+            when /^(#{__item_numlistval_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1] =~ /^[0-9]/
+                conf[1] = list(conf[1])
+              end
+
+            when /^(#{__item_tkvariable_optkeys(tagid(tagOrId)).join('|')})$/
+              if conf[1].empty?
+                conf[1] = nil
+              else
+                conf[1] = TkVarAccess.new(conf[1])
+              end
+
+            else
+              if conf[1].index('{')
+                return [slot, tk_split_list(conf[1])]
+              else
+                return [slot, tk_tcl2ruby(conf[1])]
+              end
+            end
+
+            ret[conf[0]] = conf[1]
+          }
+
+          __item_font_optkeys(tagid(tagOrId)).each{|optkey|
+            optkey = optkey.to_s
+            fontconf = ret[optkey]
+            if fontconf.kind_of?(Array)
+              ret.delete(optkey)
+              ret.delete('latin' << optkey)
+              ret.delete('ascii' << optkey)
+              ret.delete('kanji' << optkey)
+              fontconf[1] = tagfontobj(tagid(tagOrId), optkey)
+              ret[optkey] = fontconf
+            end
+          }
+
+          __item_methodcall_optkeys(tagid(tagOrId)).each{|optkey, method|
+            ret[optkey.to_s] = self.__send__(method, tagOrId)
+          }
+
+          ret
+        end
+      end
+    end
+  end
+
+  ###################
+
+  def __item_cget_cmd(id)
+    [self.path, *id]
+  end
+  private :__item_cget_cmd
+
+  def __item_config_cmd(id)
+    [self.path, *id]
+  end
+  private :__item_config_cmd
+
+  def __item_numstrval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      ['width']
+    when :column, 'column'
+      super(id[1]) + ['minwidth']
+    when :tag, 'tag'
+      super(id[1])
+    when :heading, 'heading'
+      super(id[1])
+    else
+      super(id[1])
+    end
+  end
+  private :__item_numstrval_optkeys
+
+  def __item_strval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      super(id) + ['id']
+    when :column, 'column'
+      super(id[1])
+    when :tag, 'tag'
+      super(id[1])
+    when :heading, 'heading'
+      super(id[1])
+    else
+      super(id[1])
+    end
+  end
+  private :__item_strval_optkeys
+
+  def __item_boolval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      ['open']
+    when :column, 'column'
+      super(id[1]) + ['stretch']
+    when :tag, 'tag'
+      super(id[1])
+    when :heading, 'heading'
+      super(id[1])
+    end
+  end
+  private :__item_boolval_optkeys
+
+  def __item_listval_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      ['values']
+    when :column, 'column'
+      []
+    when :heading, 'heading'
+      []
+    else
+      []
+    end
+  end
+  private :__item_listval_optkeys
+
+  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)
+          }
+        }
+      }
+    when :column, 'column'
+      {}
+    when :heading, 'heading'
+      {}
+    else
+      {}
+    end
+  end
+  private :__item_val2ruby_optkeys
+
+  def __tile_specific_item_optkeys(id)
+    case id[0]
+    when :item, 'item'
+      []
+    when :column, 'column'
+      []
+    when :heading, 'heading'
+      ['state']  # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+    else
+      []
+    end
+  end
+  private :__item_val2ruby_optkeys
+
+  def itemconfiginfo(tagOrId, slot = nil)
+    __itemconfiginfo_core(tagOrId, slot)
+  end
+
+  def current_itemconfiginfo(tagOrId, slot = nil)
+    if TkComm::GET_CONFIGINFO_AS_ARRAY
+      if slot
+        org_slot = slot
+        begin
+          conf = __itemconfiginfo_core(tagOrId, slot)
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            return {conf[0] => conf[-1]}
+          end
+          slot = conf[__item_configinfo_struct(tagid(tagOrId))[:alias]]
+        end while(org_slot != slot)
+        fail RuntimeError,
+          "there is a configure alias loop about '#{org_slot}'"
+      else
+        ret = {}
+        __itemconfiginfo_core(tagOrId).each{|conf|
+          if ( ! __item_configinfo_struct(tagid(tagOrId))[:alias] \
+              || conf.size > __item_configinfo_struct(tagid(tagOrId))[:alias] + 1 )
+            ret[conf[0]] = conf[-1]
+          end
+        }
+        ret
+      end
+    else # ! TkComm::GET_CONFIGINFO_AS_ARRAY
+      ret = {}
+      __itemconfiginfo_core(tagOrId, slot).each{|key, conf|
+        ret[key] = conf[-1] if conf.kind_of?(Array)
+      }
+      ret
+    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_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
+  def itemconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:item, tagOrId], slot)
+  end
+  def current_itemconfiginfo(tagOrId, slot=nil)
+    __current_itemconfiginfo([:item, tagOrId], slot)
+  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
+  def columnconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:column, tagOrId], slot)
+  end
+  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_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.
+        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_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)
+    if slot.kind_of?(Hash)
+      slot = _symbolkey2str(slot)
+      sp_kv = []
+      __tile_specific_item_optkeys([:heading, tagOrId]).each{|k|
+        sp_kv << k << _get_eval_string(slot.delete(k)) if slot.has_key?(k)
+      }
+      tk_call(*(__item_config_cmd([:heading, tagOrId]).concat(sp_kv)))
+      tk_call(*(__item_config_cmd([:heading, tagOrId]).concat(hash_kv(slot))))
+    elsif __tile_specific_item_optkeys([:heading, tagOrId]).index(slot.to_s)
+      begin
+        # On tile-0.7.{2-8}, 'state' options has no '-' at its head.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << slot.to_s << value))
+      rescue
+        # Maybe, 'state' option has '-' in future.
+        tk_call(*(__item_cget_cmd([:heading, tagOrId]) << "-#{slot}" << value))
+      end
+    else
+      __itemconfigure([:heading, tagOrId], slot, value)
+    end
+    self
+  end
+  def headingconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:heading, tagOrId], slot)
+  end
+  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, :configure, tagOrId], option)
+  end
+  def tagcget_strict(tagOrId, option)
+    __itemcget_strict([:tag, :configure, tagOrId], option)
+  end
+  def tagconfigure(tagOrId, slot, value=None)
+    __itemconfigure([:tag, :configure, tagOrId], slot, value)
+  end
+  def tagconfiginfo(tagOrId, slot=nil)
+    __itemconfiginfo([:tag, :configure, tagOrId], slot)
+  end
+  def current_tagconfiginfo(tagOrId, slot=nil)
+    __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
+end
+
+########################
+
+class Tk::Tile::Treeview::Item < TkObject
+  ItemID_TBL = TkCore::INTERP.create_table
+
+  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
+    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
+    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
+      }
+      Tk::Tile::Treeview::Item::ItemID_TBL[tpath] ||= {}
+      Tk::Tile::Treeview::Item::ItemID_TBL[tpath][id] = obj
+    }
+    obj
+  end
+
+  def _insert_item(tree, parent_item, idx, keys={})
+    keys = _symbolkey2str(keys)
+    id = keys.delete('id')
+    if id
+      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)))
+    end
+  end
+  private :_insert_item
+
+  def initialize(tree, parent_item = '', idx = 'end', keys = {})
+    if parent_item.kind_of?(Hash)
+      keys = parent_item
+      idx = 'end'
+      parent_item = ''
+    elsif idx.kind_of?(Hash)
+      keys = idx
+      idx = 'end'
+    end
+
+    @parent = @t = tree
+    @tpath = tree.path
+    @path = @id = _insert_item(@t, parent_item, idx, keys)
+    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)
+    self
+  end
+
+  def configinfo(key=nil)
+    @t.itemconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_itemconfiginfo(@id, key)
+  end
+
+  def open?
+    cget('open')
+  end
+  def open
+    configure('open', true)
+    self
+  end
+  def close
+    configure('open', false)
+    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
+
+  def children
+    @t.children(@id)
+  end
+  def set_children(*items)
+    @t.set_children(@id, *items)
+    self
+  end
+
+  def delete
+    @t.delete(@id)
+    self
+  end
+
+  def detach
+    @t.detach(@id)
+    self
+  end
+
+  def exist?
+    @t.exist?(@id)
+  end
+
+  def focus
+    @t.focus_item(@id)
+  end
+
+  def index
+    @t.index(@id)
+  end
+
+  def insert(idx='end', keys={})
+    @t.insert(@id, idx, keys)
+  end
+
+  def move(parent, idx)
+    @t.move(@id, parent, idx)
+    self
+  end
+
+  def next_item
+    @t.next_item(@id)
+  end
+
+  def parent_item
+    @t.parent_item(@id)
+  end
+
+  def prev_item
+    @t.prev_item(@id)
+  end
+
+  def see
+    @t.see(@id)
+    self
+  end
+
+  def selection_add
+    @t.selection_add(@id)
+    self
+  end
+
+  def selection_remove
+    @t.selection_remove(@id)
+    self
+  end
+
+  def selection_set
+    @t.selection_set(@id)
+    self
+  end
+
+  def selection_toggle
+    @t.selection_toggle(@id)
+    self
+  end
+
+  def get_directory
+    @t.get_directory(@id)
+  end
+  alias get_dictionary get_directory
+
+  def get(col)
+    @t.get(@id, col)
+  end
+
+  def set(col, value)
+    @t.set(@id, col, value)
+  end
+end
+
+########################
+
+class Tk::Tile::Treeview::Root < Tk::Tile::Treeview::Item
+  def self.new(tree, keys = {})
+    tpath = tree.path
+    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 = ''
+    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
+
+########################
+
+class Tk::Tile::Treeview::Tag < TkObject
+  include TkTreatTagFont
+
+  TagID_TBL = TkCore::INTERP.create_table
+
+  (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
+    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
+    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', @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
+    else
+      cmd = Proc.new
+    end
+    @t.tag_bind(@id, seq, cmd, *args)
+    self
+  end
+
+  def bind_append(seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    @t.tag_bind_append(@id, seq, cmd, *args)
+    self
+  end
+
+  def bind_remove(seq)
+    @t.tag_bind_remove(@id, seq)
+    self
+  end
+
+  def bindinfo(seq=nil)
+    @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)
+    self
+  end
+
+  def configinfo(key=nil)
+    @t.tagconfiginfo(@id, key)
+  end
+
+  def current_configinfo(key=nil)
+    @t.current_tagconfiginfo(@id, key)
+  end
+end
+
+########################
+
+class Tk::Tile::Treeview < TkWindow
+  include Tk::Tile::TileWidget
+  include Scrollable
+
+  include Tk::Tile::TreeviewConfig
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::treeview'.freeze].freeze
+  else
+    TkCommandNames = ['::treeview'.freeze].freeze
+  end
+  WidgetClassName = 'Treeview'.freeze
+  WidgetClassNames[WidgetClassName] ||= self
+
+  def __destroy_hook__
+    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)
+    [self::WidgetClassName, *(args.map!{|a| _get_eval_string(a)})].join('.')
+  end
+
+  def tagid(id)
+    if id.kind_of?(Tk::Tile::Treeview::Item) ||
+        id.kind_of?(Tk::Tile::Treeview::Tag)
+      id.id
+    elsif id.kind_of?(Array)
+      # size is 2 or 3
+      id[0..-2] << _get_eval_string(id[-1])
+    else
+      _get_eval_string(id)
+    end
+  end
+
+  def root
+    Tk::Tile::Treeview::Root.new(self)
+  end
+
+  def bbox(item, column=None)
+    list(tk_send('item', 'bbox', item, column))
+  end
+
+  def children(item)
+    simplelist(tk_send_without_enc('children', item)).collect{|id|
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    }
+  end
+  def set_children(item, *items)
+    tk_send_without_enc('children', item,
+                        array2tk_list(items.flatten, true))
+    self
+  end
+
+  def delete(*items)
+    tk_send_without_enc('delete', array2tk_list(items.flatten, true))
+    self
+  end
+
+  def detach(*items)
+    tk_send_without_enc('detach', array2tk_list(items.flatten, true))
+    self
+  end
+
+  def exist?(item)
+    bool(tk_send_without_enc('exists', _get_eval_enc_str(item)))
+  end
+
+  def focus_item(item = nil)
+    if item
+      tk_send('focus', item)
+      item
+    else
+      id = tk_send('focus')
+      (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+    end
+  end
+
+  def identify(x, y)
+    # tile-0.7.2 or previous
+    ret = simplelist(tk_send('identify', x, y))
+    case ret[0]
+    when 'heading', 'separator'
+      ret[-1] = num_or_str(ret[-1])
+    when 'cell'
+      ret[1] = Tk::Tile::Treeview::Item.id2obj(self, ret[1])
+      ret[-1] = num_or_str(ret[-1])
+    when 'item', 'row'
+      ret[1] = Tk::Tile::Treeview::Item.id2obj(self, ret[1])
+    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))
+  end
+
+  # def insert(parent, idx='end', keys={})
+  #   keys = _symbolkey2str(keys)
+  #   id = keys.delete('id')
+  #   if id
+  #     num_or_str(tk_send('insert', parent, idx, '-id', id, *hash_kv(keys)))
+  #   else
+  #     num_or_str(tk_send('insert', parent, idx, *hash_kv(keys)))
+  #   end
+  # end
+  def insert(parent, idx='end', keys={})
+    Tk::Tile::Treeview::Item.new(self, parent, idx, keys)
+  end
+
+  # def instate(spec, cmd=Proc.new)
+  #   tk_send('instate', spec, cmd)
+  # end
+  # def state(spec=None)
+  #   tk_send('state', spec)
+  # end
+
+  def move(item, parent, idx)
+    tk_send('move', item, parent, idx)
+    self
+  end
+
+  def next_item(item)
+    id = tk_send('next', item)
+    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+  end
+
+  def parent_item(item)
+    if (id = tk_send('parent', item)).empty?
+      Tk::Tile::Treeview::Root.new(self)
+    else
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    end
+  end
+
+  def prev_item(item)
+    id = tk_send('prev', item)
+    (id.empty?)? nil: Tk::Tile::Treeview::Item.id2obj(self, id)
+  end
+
+  def see(item)
+    tk_send('see', item)
+    self
+  end
+
+  def selection
+    simplelist(tk_send('selection')).collect{|id|
+      Tk::Tile::Treeview::Item.id2obj(self, id)
+    }
+  end
+  alias selection_get selection
+
+  def selection_add(*items)
+    tk_send('selection', 'add', array2tk_list(items.flatten, true))
+    self
+  end
+  def selection_remove(*items)
+    tk_send('selection', 'remove', array2tk_list(items.flatten, true))
+    self
+  end
+  def selection_set(*items)
+    tk_send('selection', 'set', array2tk_list(items.flatten, true))
+    self
+  end
+  def selection_toggle(*items)
+    tk_send('selection', 'toggle', array2tk_list(items.flatten, true))
+    self
+  end
+
+  def get_directory(item)
+    # tile-0.7+
+    ret = []
+    lst = simplelist(tk_send('set', item))
+    until lst.empty?
+      col = lst.shift
+      val = lst.shift
+      ret << [col, val]
+    end
+    ret
+  end
+  alias get_dictionary get_directory
+
+  def get(item, col)
+    tk_send('set', item, col)
+  end
+  def set(item, col, value)
+    tk_send('set', item, col, value)
+    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
+    else
+      cmd = Proc.new
+    end
+    _bind([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+  alias tagbind tag_bind
+
+  def tag_bind_append(tag, seq, *args)
+    if TkComm._callback_entry?(args[0]) || !block_given?
+      cmd = args.shift
+    else
+      cmd = Proc.new
+    end
+    _bind_append([@path, 'tag', 'bind', tag], seq, cmd, *args)
+    self
+  end
+  alias tagbind_append tag_bind_append
+
+  def tag_bind_remove(tag, seq)
+    _bind_remove([@path, 'tag', 'bind', tag], seq)
+    self
+  end
+  alias tagbind_remove tag_bind_remove
+
+  def tag_bindinfo(tag, context=nil)
+    _bindinfo([@path, 'tag', 'bind', tag], context)
+  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
new file mode 100644
index 0000000000..7eefcef731
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tscale.rb
@@ -0,0 +1,56 @@
+#
+#  tscale & tprogress widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TScale < Tk::Scale
+    end
+    Scale = TScale
+
+    class TProgress < TScale
+    end
+    Progress = TProgress
+  end
+end
+
+class Tk::Tile::TScale < Tk::Scale
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::scale'.freeze].freeze
+  else
+    TkCommandNames = ['::tscale'.freeze].freeze
+  end
+  WidgetClassName = 'TScale'.freeze
+  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
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::progress'.freeze].freeze
+  else
+    TkCommandNames = ['::tprogress'.freeze].freeze
+  end
+  WidgetClassName = 'TProgress'.freeze
+  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
new file mode 100644
index 0000000000..c6bba5810b
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tscrollbar.rb
@@ -0,0 +1,63 @@
+#
+#  tscrollbar widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TScrollbar < Tk::Scrollbar
+    end
+    Scrollbar = TScrollbar
+  end
+end
+
+class Tk::Tile::TScrollbar < Tk::Scrollbar
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::scrollbar'.freeze].freeze
+  else
+    TkCommandNames = ['::tscrollbar'.freeze].freeze
+  end
+  WidgetClassName = 'TScrollbar'.freeze
+  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
new file mode 100644
index 0000000000..ffd2f6f89f
--- /dev/null
+++ b/ext/tk/lib/tkextlib/tile/tseparator.rb
@@ -0,0 +1,34 @@
+#
+#  tseparator widget
+#                               by Hidetoshi NAGAI (nagai@ai.kyutech.ac.jp)
+#
+require 'tk'
+require 'tkextlib/tile.rb'
+
+module Tk
+  module Tile
+    class TSeparator < TkWindow
+    end
+    Separator = TSeparator
+  end
+end
+
+class Tk::Tile::TSeparator < TkWindow
+  include Tk::Tile::TileWidget
+
+  if Tk::Tile::USE_TTK_NAMESPACE
+    TkCommandNames = ['::ttk::separator'.freeze].freeze
+  else
+    TkCommandNames = ['::tseparator'.freeze].freeze
+  end
+  WidgetClassName = 'TSeparator'.freeze
+  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